diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 09cff73b162..e678b68e75b 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Setup Biome
         uses: biomejs/setup-biome@a9763ed3d2388f5746f9dc3e1a55df7f4609bc89 # v2.5.1
         with:
-          version: latest  
+          version: 2.0.0  
 
       - run: pnpm lint
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 266684b034c..367183517b3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,25 +1,8 @@
 {
-  "editor.formatOnSave": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
-    "source.organizeImports.biome": "explicit",
-    "quickfix.biome": "explicit"
-  },
-  "editor.defaultFormatter": "biomejs.biome",
-  "typescript.preferences.autoImportFileExcludePatterns": [
-    "./packages/thirdweb/src/exports"
-  ],
-  "typescript.preferences.autoImportSpecifierExcludeRegexes": [
-    "@radix-ui",
-    "next/router",
-    "next/dist",
-    "^lucide-react/dist/lucide-react.suffixed$"
-  ],
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "[typescriptreact]": {
+  "[css]": {
     "editor.defaultFormatter": "biomejs.biome"
   },
-  "[typescript]": {
+  "[javascript]": {
     "editor.defaultFormatter": "biomejs.biome"
   },
   "[json]": {
@@ -28,14 +11,30 @@
   "[markdown]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "[javascript]": {
+  "[typescript]": {
     "editor.defaultFormatter": "biomejs.biome"
   },
-  "[css]": {
+  "[typescriptreact]": {
     "editor.defaultFormatter": "biomejs.biome"
   },
+  "editor.codeActionsOnSave": {
+    "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"
+  ],
+  "typescript.preferences.autoImportSpecifierExcludeRegexes": [
+    "@radix-ui",
+    "next/router",
+    "next/dist",
+    "^lucide-react/dist/lucide-react.suffixed$"
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/apps/dashboard/.eslintrc.js b/apps/dashboard/.eslintrc.js
index 3c12095ad34..3b380fde313 100644
--- a/apps/dashboard/.eslintrc.js
+++ b/apps/dashboard/.eslintrc.js
@@ -1,51 +1,97 @@
 module.exports = {
+  env: {
+    browser: true,
+    node: true,
+  },
   extends: [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:@next/next/recommended",
     "plugin:storybook/recommended",
   ],
-  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".',
+  overrides: [
+    // disable restricted imports in tw-components
+    {
+      files: "src/tw-components/**/*",
+      rules: {
+        "no-restricted-imports": ["off"],
       },
-      {
-        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.',
+    },
+    // allow direct PostHog imports inside analytics helpers
+    {
+      files: "src/@/analytics/**/*",
+      rules: {
+        "no-restricted-imports": ["off"],
       },
-      {
-        selector: "CallExpression[callee.name='defineChain']",
-        message:
-          "Use useV5DashboardChain instead if you are using it inside a component",
+    },
+    // enable rule specifically for TypeScript files
+    {
+      files: ["*.ts", "*.tsx"],
+      rules: {
+        "@typescript-eslint/explicit-module-boundary-types": ["off"],
       },
-      {
-        selector: "CallExpression[callee.name='defineDashboardChain']",
-        message:
-          "Use useV5DashboardChain instead if you are using it inside a component",
+    },
+
+    // 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",
       },
-      {
-        selector: "CallExpression[callee.name='mapV4ChainToV5Chain']",
-        message:
-          "Use useV5DashboardChain instead if you are using it inside a component",
+    },
+    // 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",
       },
-      {
-        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",
+    },
+    // 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: {
     "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
             importNames: [
               "Card",
@@ -82,52 +128,77 @@ module.exports = {
             ],
             message:
               'Use the equivalent component from "tw-components" instead.',
+            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"',
+            name: "lucide-react",
           },
           {
-            name: "posthog-js",
             message:
               '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: {
@@ -136,67 +207,4 @@ module.exports = {
       version: "detect",
     },
   },
-  overrides: [
-    // disable restricted imports in tw-components
-    {
-      files: "src/tw-components/**/*",
-      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-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,
-  },
 };
diff --git a/apps/dashboard/biome.json b/apps/dashboard/biome.json
index b287b3aca79..780bbdcd1af 100644
--- a/apps/dashboard/biome.json
+++ b/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.0/schema.json",
+  "extends": "//"
 }
diff --git a/apps/dashboard/checkly.config.ts b/apps/dashboard/checkly.config.ts
index 837a6db2a21..756b299fb90 100644
--- a/apps/dashboard/checkly.config.ts
+++ b/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",
 });
diff --git a/apps/dashboard/components.json b/apps/dashboard/components.json
index b1dc07eb643..d6f9c61bbe9 100644
--- a/apps/dashboard/components.json
+++ b/apps/dashboard/components.json
@@ -1,17 +1,17 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils"
+  },
   "rsc": true,
-  "tsx": true,
+  "style": "default",
   "tailwind": {
+    "baseColor": "neutral",
     "config": "tailwind.config.js",
     "css": "src/global.css",
-    "baseColor": "neutral",
     "cssVariables": true,
     "prefix": ""
   },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils"
-  }
-}
\ No newline at end of file
+  "tsx": true
+}
diff --git a/apps/dashboard/knip.json b/apps/dashboard/knip.json
index 4e487ef46d3..a063b5a4a8f 100644
--- a/apps/dashboard/knip.json
+++ b/apps/dashboard/knip.json
@@ -1,18 +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"
   ],
-  "project": ["src/**"],
-  "ignoreBinaries": ["only-allow", "biome"],
+  "ignoreBinaries": ["only-allow"],
   "ignoreDependencies": [
     "@thirdweb-dev/service-utils",
     "@thirdweb-dev/vault-sdk",
     "@types/color",
     "fast-xml-parser"
-  ]
+  ],
+  "next": true,
+  "project": ["src/**"]
 }
diff --git a/apps/dashboard/next-sitemap.config.js b/apps/dashboard/next-sitemap.config.js
index 13c4a59ed2e..1f69b0162dc 100644
--- a/apps/dashboard/next-sitemap.config.js
+++ b/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);
     }),
diff --git a/apps/dashboard/next.config.ts b/apps/dashboard/next.config.ts
index cdf880e3d9f..4baa4b86582 100644
--- a/apps/dashboard/next.config.ts
+++ b/apps/dashboard/next.config.ts
@@ -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 = {
+  // An auth token is required for uploading source maps.
+  authToken: process.env.SENTRY_AUTH_TOKEN,
+
+  // 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",
-  // An auth token is required for uploading source maps.
-  authToken: process.env.SENTRY_AUTH_TOKEN,
   // 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,
-
-  // 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,
 };
 
 // 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,68 +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: "/_ph/static/:path*",
         destination: "https://us-assets.i.posthog.com/static/:path*",
+        source: "/_ph/static/:path*",
       },
       {
-        source: "/_ph/:path*",
         destination: "https://us.i.posthog.com/:path*",
+        source: "/_ph/:path*",
       },
       {
-        source: "/_ph/decide",
         destination: "https://us.i.posthog.com/decide",
+        source: "/_ph/decide",
       },
       {
-        source: "/thirdweb.eth",
         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 {
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
index d653afc294c..783f5d4b54a 100644
--- a/apps/dashboard/package.json
+++ b/apps/dashboard/package.json
@@ -1,26 +1,4 @@
 {
-  "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",
@@ -106,6 +84,7 @@
     "zod": "3.25.62"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.0",
     "@chakra-ui/cli": "^2.4.1",
     "@chromatic-com/storybook": "4.0.0",
     "@next/bundle-analyzer": "15.3.3",
@@ -139,5 +118,27 @@
     "storybook": "9.0.8",
     "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/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"
 }
diff --git a/apps/dashboard/playwright.config.ts b/apps/dashboard/playwright.config.ts
index ca9c4b4b6ee..216151645d1 100644
--- a/apps/dashboard/playwright.config.ts
+++ b/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,
 });
diff --git a/apps/dashboard/postcss.config.js b/apps/dashboard/postcss.config.js
index 12a703d900d..4df9d3ba36d 100644
--- a/apps/dashboard/postcss.config.js
+++ b/apps/dashboard/postcss.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
     autoprefixer: {},
+    tailwindcss: {},
   },
 };
diff --git a/apps/dashboard/redirects.js b/apps/dashboard/redirects.js
index 837fa6a5c5c..39517d59761 100644
--- a/apps/dashboard/redirects.js
+++ b/apps/dashboard/redirects.js
@@ -1,64 +1,64 @@
 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*",
   },
 ];
 
@@ -66,321 +66,321 @@ 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",
     },
     {
-      source: "/create-api-key",
       destination: "/team",
       permanent: false,
+      source: "/create-api-key",
     },
     {
-      source: "/dashboard/settings",
       destination: "/team",
       permanent: false,
+      source: "/dashboard/settings",
     },
     {
-      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://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",
     },
     {
-      source: "/deploy",
       destination: "/contracts/deployment-tool",
       permanent: false,
+      source: "/deploy",
     },
     {
-      source: "/publish",
       destination: "/contracts/deployment-tool",
       permanent: false,
+      source: "/publish",
     },
     {
-      source: "/smart-contracts",
       destination: "/contracts/explore",
       permanent: false,
+      source: "/smart-contracts",
     },
     {
-      source: "/ui-components",
       destination: "/sdk",
       permanent: false,
+      source: "/ui-components",
     },
     {
-      source: "/interact",
       destination: "/sdk",
       permanent: false,
+      source: "/interact",
     },
     {
-      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,
+      source: "/solutions/chains",
     },
     // redirect /rpc to portal
     {
-      source: "/rpc-edge",
       destination:
         "https://portal.thirdweb.com/infrastructure/rpc-edge/overview",
       permanent: false,
+      source: "/rpc-edge",
     },
     // 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 /connect/pay to /universal-bridge
     {
-      source: "/connect/pay",
       destination: "/universal-bridge",
       permanent: false,
+      source: "/connect/pay",
     },
     // 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,
+      source: "/team/:team_slug/:project_slug/connect/pay/:path*",
     },
 
     // 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
     {
-      source: "/grant/superchain",
       destination: "/superchain",
       permanent: false,
+      source: "/grant/superchain",
     },
     // connect -> build redirects
     {
-      source: "/connect",
       destination: "/wallets",
       permanent: false,
+      source: "/connect",
     },
     {
-      source: "/connect/account-abstraction",
       destination: "/account-abstraction",
       permanent: false,
+      source: "/connect/account-abstraction",
     },
     {
-      source: "/connect/universal-bridge",
       destination: "/universal-bridge",
       permanent: false,
+      source: "/connect/universal-bridge",
     },
     {
-      source: "/connect/auth",
       destination: "/auth",
       permanent: false,
+      source: "/connect/auth",
     },
     {
-      source: "/connect/in-app-wallets",
       destination: "/in-app-wallets",
       permanent: false,
+      source: "/connect/in-app-wallets",
     },
     {
-      source: "/engine",
       destination: "/transactions",
       permanent: false,
+      source: "/engine",
     },
 
     ...legacyDashboardToTeamRedirects,
diff --git a/apps/dashboard/sentry.client.config.ts b/apps/dashboard/sentry.client.config.ts
index aa8b26ff8fa..b7ad8de6860 100644
--- a/apps/dashboard/sentry.client.config.ts
+++ b/apps/dashboard/sentry.client.config.ts
@@ -5,28 +5,32 @@
 import * as Sentry from "@sentry/nextjs";
 
 Sentry.init({
-  dsn: "https://8813f5d93c8c4aa89eda86816f0b1bbf@o1378374.ingest.sentry.io/6690186",
-
-  // Adjust this value in production, or use tracesSampler for greater control
-  tracesSampleRate: 0.1,
+  allowUrls: [/thirdweb-dev\.com/i, /thirdweb\.com/, /thirdweb-preview\.com/],
 
   // Setting this option to true will print useful information to the console while you're setting up Sentry.
   debug: false,
-
-  replaysOnErrorSampleRate: 1.0,
-
-  // This sets the sample rate to be 10%. You may want this to be 100% while
-  // in development and sample at a lower rate in production
-  replaysSessionSampleRate: 0.1,
-
-  // You can remove this option if you're not planning to use the Sentry Session Replay feature:
-  integrations: [
-    Sentry.replayIntegration({
-      // Additional Replay configuration goes in here, for example:
-      maskAllText: true,
-      blockAllMedia: true,
-    }),
+  denyUrls: [
+    // Google Adsense
+    /pagead\/js/i,
+    // Facebook flakiness
+    /graph\.facebook\.com/i,
+    // Facebook blocked
+    /connect\.facebook\.net\/en_US\/all\.js/i,
+    // Woopra flakiness
+    /eatdifferent\.com\.woopra-ns\.com/i,
+    /static\.woopra\.com\/js\/woopra\.js/i,
+    // Chrome extensions
+    /extensions\//i,
+    /^chrome:\/\//i,
+    // Other plugins
+    // Cacaoweb
+    /127\.0\.0\.1:4001\/isrunning/i,
+    /webappstoolbarba\.texthelp\.com\//i,
+    /metrics\.itunes\.apple\.com\.edgesuite\.net\//i,
+    // injected (extensions)
+    /inject/i,
   ],
+  dsn: "https://8813f5d93c8c4aa89eda86816f0b1bbf@o1378374.ingest.sentry.io/6690186",
   ignoreErrors: [
     // Random plugins/extensions
     "top.GLOBALS",
@@ -72,26 +76,22 @@ Sentry.init({
     // cannot do anything with these errors
     "Non-Error promise rejection captured",
   ],
-  denyUrls: [
-    // Google Adsense
-    /pagead\/js/i,
-    // Facebook flakiness
-    /graph\.facebook\.com/i,
-    // Facebook blocked
-    /connect\.facebook\.net\/en_US\/all\.js/i,
-    // Woopra flakiness
-    /eatdifferent\.com\.woopra-ns\.com/i,
-    /static\.woopra\.com\/js\/woopra\.js/i,
-    // Chrome extensions
-    /extensions\//i,
-    /^chrome:\/\//i,
-    // Other plugins
-    // Cacaoweb
-    /127\.0\.0\.1:4001\/isrunning/i,
-    /webappstoolbarba\.texthelp\.com\//i,
-    /metrics\.itunes\.apple\.com\.edgesuite\.net\//i,
-    // injected (extensions)
-    /inject/i,
+
+  // You can remove this option if you're not planning to use the Sentry Session Replay feature:
+  integrations: [
+    Sentry.replayIntegration({
+      blockAllMedia: true,
+      // Additional Replay configuration goes in here, for example:
+      maskAllText: true,
+    }),
   ],
-  allowUrls: [/thirdweb-dev\.com/i, /thirdweb\.com/, /thirdweb-preview\.com/],
+
+  replaysOnErrorSampleRate: 1.0,
+
+  // This sets the sample rate to be 10%. You may want this to be 100% while
+  // in development and sample at a lower rate in production
+  replaysSessionSampleRate: 0.1,
+
+  // Adjust this value in production, or use tracesSampler for greater control
+  tracesSampleRate: 0.1,
 });
diff --git a/apps/dashboard/src/@/actions/acceptInvite.ts b/apps/dashboard/src/@/actions/acceptInvite.ts
index 8a579732083..ee71e244632 100644
--- a/apps/dashboard/src/@/actions/acceptInvite.ts
+++ b/apps/dashboard/src/@/actions/acceptInvite.ts
@@ -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",
+      body: JSON.stringify({}),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
       },
-      body: JSON.stringify({}),
+      method: "POST",
     },
   );
 
@@ -42,8 +42,8 @@ export async function acceptInvite(options: {
     } catch {}
 
     return {
-      ok: false,
       errorMessage,
+      ok: false,
     };
   }
 
diff --git a/apps/dashboard/src/@/actions/billing.ts b/apps/dashboard/src/@/actions/billing.ts
index 5af78101fc4..51b9ab3d897 100644
--- a/apps/dashboard/src/@/actions/billing.ts
+++ b/apps/dashboard/src/@/actions/billing.ts
@@ -16,12 +16,12 @@ export async function reSubscribePlan(options: {
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamId}/checkout/resubscribe-plan`,
     {
-      method: "PUT",
+      body: JSON.stringify({}),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
       },
-      body: JSON.stringify({}),
+      method: "PUT",
     },
   );
 
diff --git a/apps/dashboard/src/@/actions/confirmEmail.ts b/apps/dashboard/src/@/actions/confirmEmail.ts
index e9a47325158..db55c639d3e 100644
--- a/apps/dashboard/src/@/actions/confirmEmail.ts
+++ b/apps/dashboard/src/@/actions/confirmEmail.ts
@@ -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",
     },
   );
 
diff --git a/apps/dashboard/src/@/actions/createTeam.ts b/apps/dashboard/src/@/actions/createTeam.ts
index 53f726be8a6..417e702a141 100644
--- a/apps/dashboard/src/@/actions/createTeam.ts
+++ b/apps/dashboard/src/@/actions/createTeam.ts
@@ -3,62 +3,59 @@ import "server-only";
 
 // biome-ignore lint/style/useNodejsImportProtocol: breaks storybook if it's `node:` prefixed
 import { randomBytes } from "crypto";
-import type { Team } from "@/api/team";
 import { format } from "date-fns";
+import type { Team } from "@/api/team";
 import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
 import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
 
-export async function createTeam(options?: {
-  name?: string;
-  slug?: string;
-}) {
+export async function createTeam(options?: { name?: string; slug?: string }) {
   const token = await getAuthToken();
 
   if (!token) {
     return {
-      status: "error",
       errorMessage: "You are not authorized to perform this action",
+      status: "error",
     } as const;
   }
 
   const res = await fetch(`${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json",
-    },
     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"),
-      billingEmail: null,
-      image: null,
     }),
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
 
   if (!res.ok) {
     const reason = await res.text();
     console.error("failed to create team", {
-      status: res.status,
       reason,
+      status: res.status,
     });
     switch (res.status) {
       case 400: {
         return {
-          status: "error",
           errorMessage: "Invalid team name or slug.",
+          status: "error",
         } as const;
       }
       case 401: {
         return {
-          status: "error",
           errorMessage: "You are not authorized to perform this action.",
+          status: "error",
         } as const;
       }
       default: {
         return {
-          status: "error",
           errorMessage: "An unknown error occurred.",
+          status: "error",
         } as const;
       }
     }
@@ -69,7 +66,7 @@ export async function createTeam(options?: {
   };
 
   return {
-    status: "success",
     data: json.result,
+    status: "success",
   } as const;
 }
diff --git a/apps/dashboard/src/@/actions/deleteTeam.ts b/apps/dashboard/src/@/actions/deleteTeam.ts
index bdfa2fe3f43..faf286883fa 100644
--- a/apps/dashboard/src/@/actions/deleteTeam.ts
+++ b/apps/dashboard/src/@/actions/deleteTeam.ts
@@ -3,63 +3,61 @@ import "server-only";
 import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
 import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
 
-export async function deleteTeam(options: {
-  teamId: string;
-}) {
+export async function deleteTeam(options: { teamId: string }) {
   const token = await getAuthToken();
   if (!token) {
     return {
-      status: "error",
       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}`,
     {
-      method: "DELETE",
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      method: "DELETE",
     },
   );
   // handle errors
   if (!res.ok) {
     const reason = await res.text();
     console.error("failed to delete team", {
-      status: res.status,
       reason,
+      status: res.status,
     });
     switch (res.status) {
       case 400: {
         return {
-          status: "error",
           errorMessage: "Invalid team ID.",
+          status: "error",
         } as const;
       }
       case 401: {
         return {
-          status: "error",
           errorMessage: "You are not authorized to perform this action.",
+          status: "error",
         } as const;
       }
 
       case 403: {
         return {
-          status: "error",
           errorMessage: "You do not have permission to delete this team.",
+          status: "error",
         } as const;
       }
       case 404: {
         return {
-          status: "error",
           errorMessage: "Team not found.",
+          status: "error",
         } as const;
       }
       default: {
         return {
-          status: "error",
           errorMessage: "An unknown error occurred.",
+          status: "error",
         } as const;
       }
     }
diff --git a/apps/dashboard/src/@/actions/getBalancesFromMoralis.ts b/apps/dashboard/src/@/actions/getBalancesFromMoralis.ts
index 20559052c6b..ed34bbdd4d6 100644
--- a/apps/dashboard/src/@/actions/getBalancesFromMoralis.ts
+++ b/apps/dashboard/src/@/actions/getBalancesFromMoralis.ts
@@ -1,6 +1,6 @@
 "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";
@@ -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,
   };
 }
diff --git a/apps/dashboard/src/@/actions/getWalletNFTs.ts b/apps/dashboard/src/@/actions/getWalletNFTs.ts
index 291e4a820bf..c30ae6b7432 100644
--- a/apps/dashboard/src/@/actions/getWalletNFTs.ts
+++ b/apps/dashboard/src/@/actions/getWalletNFTs.ts
@@ -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
       },
@@ -156,8 +156,8 @@ async function getWalletNFTsFromInsight(params: {
   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;
diff --git a/apps/dashboard/src/@/actions/proxies.ts b/apps/dashboard/src/@/actions/proxies.ts
index 32df80874ca..83facc34d96 100644
--- a/apps/dashboard/src/@/actions/proxies.ts
+++ b/apps/dashboard/src/@/actions/proxies.ts
@@ -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,
   };
 }
 
diff --git a/apps/dashboard/src/@/actions/sendTeamInvite.ts b/apps/dashboard/src/@/actions/sendTeamInvite.ts
index 36553726f79..a4e22d69fac 100644
--- a/apps/dashboard/src/@/actions/sendTeamInvite.ts
+++ b/apps/dashboard/src/@/actions/sendTeamInvite.ts
@@ -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,
     };
   }
 
diff --git a/apps/dashboard/src/@/actions/updateAccount.ts b/apps/dashboard/src/@/actions/updateAccount.ts
index ab9f967520e..d37c7034f07 100644
--- a/apps/dashboard/src/@/actions/updateAccount.ts
+++ b/apps/dashboard/src/@/actions/updateAccount.ts
@@ -14,12 +14,12 @@ export async function updateAccount(values: {
   }
 
   const res = await fetch(`${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/account`, {
-    method: "PUT",
+    body: JSON.stringify(values),
     headers: {
-      "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
     },
-    body: JSON.stringify(values),
+    method: "PUT",
   });
 
   if (!res.ok) {
diff --git a/apps/dashboard/src/@/analytics/hooks/identify-team.ts b/apps/dashboard/src/@/analytics/hooks/identify-team.ts
index 80ae6da0b28..489ca357bd6 100644
--- a/apps/dashboard/src/@/analytics/hooks/identify-team.ts
+++ b/apps/dashboard/src/@/analytics/hooks/identify-team.ts
@@ -3,9 +3,7 @@
 import posthog from "posthog-js";
 import { useEffect } from "react";
 
-export function useIdentifyTeam(opts?: {
-  teamId: string;
-}) {
+export function useIdentifyTeam(opts?: { teamId: string }) {
   // eslint-disable-next-line no-restricted-syntax
   useEffect(() => {
     // if no teamId, don't identify
diff --git a/apps/dashboard/src/@/analytics/report.ts b/apps/dashboard/src/@/analytics/report.ts
index c579ccb2469..faf869a1e7f 100644
--- a/apps/dashboard/src/@/analytics/report.ts
+++ b/apps/dashboard/src/@/analytics/report.ts
@@ -115,9 +115,7 @@ export function reportOnboardingPlanSelectionSkipped() {
  * @jnsdls
  *
  */
-export function reportOnboardingMembersInvited(properties: {
-  count: number;
-}) {
+export function reportOnboardingMembersInvited(properties: { count: number }) {
   posthog.capture("onboarding members invited", {
     count: properties.count,
   });
@@ -185,9 +183,7 @@ export function reportOnboardingCompleted() {
  * @jnsdls
  *
  */
-export function reportFaucetUsed(properties: {
-  chainId: number;
-}) {
+export function reportFaucetUsed(properties: { chainId: number }) {
   posthog.capture("faucet used", {
     chainId: properties.chainId,
   });
@@ -217,8 +213,8 @@ export function reportChainConfigurationAdded(properties: {
   posthog.capture("chain configuration added", {
     chainId: properties.chainId,
     chainName: properties.chainName,
-    rpcURLs: properties.rpcURLs,
     nativeCurrency: properties.nativeCurrency,
+    rpcURLs: properties.rpcURLs,
   });
 }
 
@@ -242,9 +238,9 @@ export function reportAssetBuySuccessful(properties: {
   assetType: "nft" | "coin";
 }) {
   posthog.capture("asset buy successful", {
+    assetType: properties.assetType,
     chainId: properties.chainId,
     contractType: properties.contractType,
-    assetType: properties.assetType,
   });
 }
 
@@ -263,9 +259,9 @@ export function reportAssetBuyFailed(properties: {
   error: string;
 }) {
   posthog.capture("asset buy failed", {
+    assetType: properties.assetType,
     chainId: properties.chainId,
     contractType: properties.contractType,
-    assetType: properties.assetType,
     error: properties.error,
   });
 }
diff --git a/apps/dashboard/src/@/api/analytics.ts b/apps/dashboard/src/@/api/analytics.ts
index 751fc0ec9a5..230fe35a659 100644
--- a/apps/dashboard/src/@/api/analytics.ts
+++ b/apps/dashboard/src/@/api/analytics.ts
@@ -175,9 +175,9 @@ export async function getAggregateUserOpUsage(
     },
     {
       date: (params.from || new Date()).toISOString(),
-      successful: 0,
       failed: 0,
       sponsoredUsd: 0,
+      successful: 0,
     },
   );
 }
@@ -279,14 +279,14 @@ export async function isProjectActive(params: {
     );
     return {
       bundler: false,
-      storage: false,
-      rpc: false,
-      nebula: false,
-      sdk: false,
+      ecosystemWallet: false,
+      inAppWallet: false,
       insight: false,
+      nebula: false,
       pay: false,
-      inAppWallet: false,
-      ecosystemWallet: false,
+      rpc: false,
+      sdk: false,
+      storage: false,
     } as ActiveStatus;
   }
 
diff --git a/apps/dashboard/src/@/api/audit-log.ts b/apps/dashboard/src/@/api/audit-log.ts
index 4ba20c14fc8..5e48374303c 100644
--- a/apps/dashboard/src/@/api/audit-log.ts
+++ b/apps/dashboard/src/@/api/audit-log.ts
@@ -58,34 +58,34 @@ export async function getAuditLogs(teamSlug: string, cursor?: string) {
   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,
     },
-    headers: {
-      Authorization: `Bearer ${authToken}`,
-    },
   });
   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 {
-        status: "error",
         reason: "higher_plan_required",
+        status: "error",
       } as const;
     }
     const body = await response.text();
     return {
-      status: "error",
-      reason: "unknown",
       body,
+      reason: "unknown",
+      status: "error",
     } as const;
   }
 
   const data = (await response.json()) as AuditLogApiResponse;
 
   return {
-    status: "success",
     data,
+    status: "success",
   } as const;
 }
diff --git a/apps/dashboard/src/@/api/insight/webhooks.ts b/apps/dashboard/src/@/api/insight/webhooks.ts
index 1b14d0a790e..d992dc1a9b8 100644
--- a/apps/dashboard/src/@/api/insight/webhooks.ts
+++ b/apps/dashboard/src/@/api/insight/webhooks.ts
@@ -80,13 +80,13 @@ export async function createWebhook(
     const response = await fetch(
       `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks`,
       {
-        method: "POST",
+        body: JSON.stringify(payload),
         headers: {
+          Authorization: `Bearer ${authToken}`,
           "Content-Type": "application/json",
           "x-client-id": clientId,
-          Authorization: `Bearer ${authToken}`,
         },
-        body: JSON.stringify(payload),
+        method: "POST",
       },
     );
 
@@ -115,11 +115,11 @@ export async function getWebhooks(
     const response = await fetch(
       `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks`,
       {
-        method: "GET",
         headers: {
-          "x-client-id": clientId,
           Authorization: `Bearer ${authToken}`,
+          "x-client-id": clientId,
         },
+        method: "GET",
       },
     );
 
@@ -149,11 +149,11 @@ export async function deleteWebhook(
     const response = await fetch(
       `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks/${encodeURIComponent(webhookId)}`,
       {
-        method: "DELETE",
         headers: {
-          "x-client-id": clientId,
           Authorization: `Bearer ${authToken}`,
+          "x-client-id": clientId,
         },
+        method: "DELETE",
       },
     );
 
@@ -183,29 +183,29 @@ export async function testWebhook(
     const response = await fetch(
       `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks/test`,
       {
-        method: "POST",
+        body: JSON.stringify(payload),
         headers: {
+          Authorization: `Bearer ${authToken}`,
           "Content-Type": "application/json",
           "x-client-id": clientId,
-          Authorization: `Bearer ${authToken}`,
         },
-        body: JSON.stringify(payload),
+        method: "POST",
       },
     );
 
     if (!response.ok) {
       const errorText = await response.text();
       return {
-        success: false,
         error: `Failed to test webhook: ${errorText}`,
+        success: false,
       };
     }
 
     return (await response.json()) as TestWebhookResponse;
   } catch (error) {
     return {
-      success: false,
       error: `Network or parsing error: ${error instanceof Error ? error.message : "Unknown error"}`,
+      success: false,
     };
   }
 }
@@ -215,10 +215,10 @@ export async function getSupportedWebhookChains(): Promise<SupportedWebhookChain
     const response = await fetch(
       `https://${THIRDWEB_INSIGHT_API_DOMAIN}/service/chains`,
       {
-        method: "GET",
         headers: {
           "x-service-api-key": process.env.INSIGHT_SERVICE_API_KEY || "",
         },
+        method: "GET",
       },
     );
 
diff --git a/apps/dashboard/src/@/api/notifications.ts b/apps/dashboard/src/@/api/notifications.ts
index 1c62cb9046c..a230add0dc9 100644
--- a/apps/dashboard/src/@/api/notifications.ts
+++ b/apps/dashboard/src/@/api/notifications.ts
@@ -41,17 +41,17 @@ export async function getUnreadNotifications(cursor?: string) {
   if (!response.ok) {
     const body = await response.text();
     return {
-      status: "error",
-      reason: "unknown",
       body,
+      reason: "unknown",
+      status: "error",
     } as const;
   }
 
   const data = (await response.json()) as NotificationsApiResponse;
 
   return {
-    status: "success",
     data,
+    status: "success",
   } as const;
 }
 
@@ -77,17 +77,17 @@ export async function getArchivedNotifications(cursor?: string) {
   if (!response.ok) {
     const body = await response.text();
     return {
-      status: "error",
-      reason: "unknown",
       body,
+      reason: "unknown",
+      status: "error",
     } as const;
   }
 
   const data = (await response.json()) as NotificationsApiResponse;
 
   return {
-    status: "success",
     data,
+    status: "success",
   } as const;
 }
 
@@ -109,9 +109,9 @@ export async function getUnreadNotificationsCount() {
   if (!response.ok) {
     const body = await response.text();
     return {
-      status: "error",
-      reason: "unknown",
       body,
+      reason: "unknown",
+      status: "error",
     } as const;
   }
   const data = (await response.json()) as {
@@ -120,8 +120,8 @@ export async function getUnreadNotificationsCount() {
     };
   };
   return {
-    status: "success",
     data,
+    status: "success",
   } as const;
 }
 
@@ -135,20 +135,20 @@ export async function markNotificationAsRead(notificationId?: string) {
     NEXT_PUBLIC_THIRDWEB_API_HOST,
   );
   const response = await fetch(url, {
-    method: "PUT",
+    // 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",
     },
-    // if notificationId is provided, mark it as read, otherwise mark all as read
-    body: JSON.stringify(notificationId ? { notificationId } : {}),
+    method: "PUT",
   });
   if (!response.ok) {
     const body = await response.text();
     return {
-      status: "error",
-      reason: "unknown",
       body,
+      reason: "unknown",
+      status: "error",
     } as const;
   }
   return {
diff --git a/apps/dashboard/src/@/api/projects.ts b/apps/dashboard/src/@/api/projects.ts
index 9ec448dc414..6366f9a0e2d 100644
--- a/apps/dashboard/src/@/api/projects.ts
+++ b/apps/dashboard/src/@/api/projects.ts
@@ -1,6 +1,6 @@
 import "server-only";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import type { ProjectResponse } from "@thirdweb-dev/service-utils";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
 
 export type Project = ProjectResponse;
diff --git a/apps/dashboard/src/@/api/team-members.ts b/apps/dashboard/src/@/api/team-members.ts
index 518152bf1e0..01605d2a003 100644
--- a/apps/dashboard/src/@/api/team-members.ts
+++ b/apps/dashboard/src/@/api/team-members.ts
@@ -3,8 +3,8 @@ import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
 
 const TeamAccountRole = {
-  OWNER: "OWNER",
   MEMBER: "MEMBER",
+  OWNER: "OWNER",
 } as const;
 
 export type TeamAccountRole =
diff --git a/apps/dashboard/src/@/api/team.ts b/apps/dashboard/src/@/api/team.ts
index 46ab70029cb..271c723f25a 100644
--- a/apps/dashboard/src/@/api/team.ts
+++ b/apps/dashboard/src/@/api/team.ts
@@ -1,8 +1,8 @@
 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 { 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 "../../app/(app)/api/lib/getAuthToken";
 import { LAST_USED_TEAM_ID } from "../../constants/cookies";
diff --git a/apps/dashboard/src/@/api/universal-bridge/developer.ts b/apps/dashboard/src/@/api/universal-bridge/developer.ts
index e43ab63d861..c80467b1a0e 100644
--- a/apps/dashboard/src/@/api/universal-bridge/developer.ts
+++ b/apps/dashboard/src/@/api/universal-bridge/developer.ts
@@ -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) {
@@ -49,19 +46,19 @@ export async function createWebhook(props: {
   const authToken = await getAuthToken();
 
   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) {
@@ -81,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",
     },
   );
 
@@ -106,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: {
+      Authorization: `Bearer ${authToken}`,
       "Content-Type": "application/json",
-      "x-team-id": props.teamId,
       "x-client-id": props.clientId,
-      Authorization: `Bearer ${authToken}`,
+      "x-team-id": props.teamId,
     },
+    method: "GET",
   });
 
   if (!res.ok) {
@@ -138,17 +132,17 @@ export async function updateFee(props: {
 }) {
   const authToken = await getAuthToken();
   const res = await fetch(`${UB_BASE_URL}/v1/developer/fees`, {
-    method: "PUT",
+    body: JSON.stringify({
+      feeBps: props.feeBps,
+      feeRecipient: props.feeRecipient,
+    }),
     headers: {
+      Authorization: `Bearer ${authToken}`,
       "Content-Type": "application/json",
-      "x-team-id": props.teamId,
       "x-client-id": props.clientId,
-      Authorization: `Bearer ${authToken}`,
+      "x-team-id": props.teamId,
     },
-    body: JSON.stringify({
-      feeRecipient: props.feeRecipient,
-      feeBps: props.feeBps,
-    }),
+    method: "PUT",
   });
 
   if (!res.ok) {
@@ -225,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) {
diff --git a/apps/dashboard/src/@/api/universal-bridge/links.ts b/apps/dashboard/src/@/api/universal-bridge/links.ts
index 47977c3a2a1..d8c3e152c88 100644
--- a/apps/dashboard/src/@/api/universal-bridge/links.ts
+++ b/apps/dashboard/src/@/api/universal-bridge/links.ts
@@ -18,15 +18,13 @@ type PaymentLink = {
   purchaseData: Record<string, unknown> | undefined;
 };
 
-export async function getPaymentLink(props: {
-  paymentId: string;
-}) {
+export async function getPaymentLink(props: { paymentId: string }) {
   const res = await fetch(`${UB_BASE_URL}/v1/links/${props.paymentId}`, {
-    method: "GET",
     headers: {
       "Content-Type": "application/json",
       "x-secret-key": DASHBOARD_THIRDWEB_SECRET_KEY,
     },
+    method: "GET",
   });
 
   if (!res.ok) {
@@ -36,12 +34,12 @@ export async function getPaymentLink(props: {
 
   const { data } = await res.json();
   return {
+    amount: data.amount ? BigInt(data.amount) : undefined,
     clientId: data.clientId,
-    title: data.title,
-    imageUrl: data.imageUrl,
-    receiver: data.receiver,
     destinationToken: data.destinationToken,
-    amount: data.amount ? BigInt(data.amount) : undefined,
+    imageUrl: data.imageUrl,
     purchaseData: data.purchaseData,
+    receiver: data.receiver,
+    title: data.title,
   } as PaymentLink;
 }
diff --git a/apps/dashboard/src/@/api/universal-bridge/tokens.ts b/apps/dashboard/src/@/api/universal-bridge/tokens.ts
index a7e60b5d884..2dc46823d64 100644
--- a/apps/dashboard/src/@/api/universal-bridge/tokens.ts
+++ b/apps/dashboard/src/@/api/universal-bridge/tokens.ts
@@ -1,7 +1,7 @@
 "use server";
-import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
 import type { ProjectResponse } from "@thirdweb-dev/service-utils";
 import { getAuthToken } from "app/(app)/api/lib/getAuthToken";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
 import { UB_BASE_URL } from "./constants";
 
 export type TokenMetadata = {
@@ -13,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) {
@@ -24,11 +22,11 @@ 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) {
@@ -49,16 +47,16 @@ export async function addUniversalBridgeTokenRoute(props: {
   const url = new URL(`${UB_BASE_URL}/v1/tokens`);
 
   const res = await fetch(url.toString(), {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${authToken}`,
-      "x-client-id": props.project.publishableKey,
-    } as Record<string, string>,
     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) {
diff --git a/apps/dashboard/src/@/api/usage/billing-preview.ts b/apps/dashboard/src/@/api/usage/billing-preview.ts
index 70e5e1a0eea..bc4cf815c61 100644
--- a/apps/dashboard/src/@/api/usage/billing-preview.ts
+++ b/apps/dashboard/src/@/api/usage/billing-preview.ts
@@ -34,33 +34,33 @@ export async function getBilledUsage(teamSlug: string) {
       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,
       },
-      headers: {
-        Authorization: `Bearer ${authToken}`,
-      },
     },
   );
   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 {
-        status: "error",
         reason: "free_plan",
+        status: "error",
       } as const;
     }
     const body = await response.text();
     return {
-      status: "error",
-      reason: "unknown",
       body,
+      reason: "unknown",
+      status: "error",
     } as const;
   }
   const data = (await response.json()) as UsageApiResponse;
   return {
-    status: "success",
     data,
+    status: "success",
   } as const;
 }
diff --git a/apps/dashboard/src/@/api/usage/rpc.ts b/apps/dashboard/src/@/api/usage/rpc.ts
index 4d9439170ff..37a39d24504 100644
--- a/apps/dashboard/src/@/api/usage/rpc.ts
+++ b/apps/dashboard/src/@/api/usage/rpc.ts
@@ -23,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);
@@ -44,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"],
diff --git a/apps/dashboard/src/@/api/verified-domain.ts b/apps/dashboard/src/@/api/verified-domain.ts
index 26d2c61f3f4..5fc17fa39bd 100644
--- a/apps/dashboard/src/@/api/verified-domain.ts
+++ b/apps/dashboard/src/@/api/verified-domain.ts
@@ -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",
     },
   );
 
diff --git a/apps/dashboard/src/@/components/ChakraProviderSetup.tsx b/apps/dashboard/src/@/components/ChakraProviderSetup.tsx
index 43556ee2686..d934c8c4f59 100644
--- a/apps/dashboard/src/@/components/ChakraProviderSetup.tsx
+++ b/apps/dashboard/src/@/components/ChakraProviderSetup.tsx
@@ -5,9 +5,7 @@ import { useTheme } from "next-themes";
 import { useEffect } from "react";
 import chakraTheme from "../../theme";
 
-export function ChakraProviderSetup(props: {
-  children: React.ReactNode;
-}) {
+export function ChakraProviderSetup(props: { children: React.ReactNode }) {
   return (
     <ChakraProvider theme={chakraTheme}>
       {props.children}
diff --git a/apps/dashboard/src/@/components/Responsive.tsx b/apps/dashboard/src/@/components/Responsive.tsx
index 6b78fc76779..382258f927d 100644
--- a/apps/dashboard/src/@/components/Responsive.tsx
+++ b/apps/dashboard/src/@/components/Responsive.tsx
@@ -1,6 +1,6 @@
 "use client";
-import { ClientOnly } from "@/components/blocks/client-only";
 import { Suspense } from "react";
+import { ClientOnly } from "@/components/blocks/client-only";
 import { useIsMobile } from "../hooks/use-mobile";
 
 export function ResponsiveLayout(props: {
diff --git a/apps/dashboard/src/@/components/billing.tsx b/apps/dashboard/src/@/components/billing.tsx
index 52384a3fcc4..fbb30634b53 100644
--- a/apps/dashboard/src/@/components/billing.tsx
+++ b/apps/dashboard/src/@/components/billing.tsx
@@ -38,12 +38,12 @@ export function CheckoutButton(props: {
         }}
       >
         <Link
-          target="_blank"
-          rel="noopener noreferrer"
           href={buildCheckoutUrl({
-            teamSlug: props.teamSlug,
             sku: props.sku,
+            teamSlug: props.teamSlug,
           })}
+          rel="noopener noreferrer"
+          target="_blank"
         >
           {props.children}
         </Link>
@@ -59,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}/~/settings/invoices?status=open`}
         >
           pay them
         </Link>{" "}
@@ -78,17 +78,17 @@ 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);
       }}
     >
       <a
         href={buildBillingPortalUrl({ teamSlug: props.teamSlug })}
-        target="_blank"
         rel="noopener noreferrer"
+        target="_blank"
       >
         {props.children}
       </a>
diff --git a/apps/dashboard/src/@/components/blocks/Avatars/GradientAvatar.stories.tsx b/apps/dashboard/src/@/components/blocks/Avatars/GradientAvatar.stories.tsx
index 5faedba9add..a49cec2a51d 100644
--- a/apps/dashboard/src/@/components/blocks/Avatars/GradientAvatar.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/Avatars/GradientAvatar.stories.tsx
@@ -8,8 +8,8 @@ import { Button } from "../../ui/button";
 import { GradientAvatar } from "./GradientAvatar";
 
 const meta = {
-  title: "blocks/Avatars/GradientAvatar",
   component: Story,
+  title: "blocks/Avatars/GradientAvatar",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -26,64 +26,64 @@ function Story() {
 
       <BadgeContainer label="No Src, No id - Skeleton">
         <GradientAvatar
-          id={undefined}
-          src={undefined}
           className="size-20"
           client={storybookThirdwebClient}
+          id={undefined}
+          src={undefined}
         />
       </BadgeContainer>
 
       <BadgeContainer label="No Src, id=foo - Skeleton">
         <GradientAvatar
-          id={"foo"}
-          src={undefined}
           className="size-20"
           client={storybookThirdwebClient}
+          id={"foo"}
+          src={undefined}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Invalid Src, id=foo - Gradient">
         <GradientAvatar
-          id={"foo"}
-          src={""}
           className="size-20"
           client={storybookThirdwebClient}
+          id={"foo"}
+          src={""}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Invalid Src, id=bar - Gradient">
         <GradientAvatar
-          id={"bar"}
-          src={""}
           className="size-20"
           client={storybookThirdwebClient}
+          id={"bar"}
+          src={""}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Empty/Invalid Src, No id - default fallback">
         <GradientAvatar
-          src="invalid-src"
-          id={undefined}
           className="size-20"
           client={storybookThirdwebClient}
+          id={undefined}
+          src="invalid-src"
         />
       </BadgeContainer>
 
       <BadgeContainer label="Valid Src, https">
         <GradientAvatar
-          src="https://picsum.photos/200/300"
-          id={undefined}
           className="size-20"
           client={storybookThirdwebClient}
+          id={undefined}
+          src="https://picsum.photos/200/300"
         />
       </BadgeContainer>
 
       <BadgeContainer label="Valid Src, ipfs">
         <GradientAvatar
-          src="ipfs://QmZbeJYEs7kCJHyQxjxU2SJUtjSAr4m87wzJFJUyWomKdj/Smily.svg"
-          id={undefined}
           className="size-20"
           client={storybookThirdwebClient}
+          id={undefined}
+          src="ipfs://QmZbeJYEs7kCJHyQxjxU2SJUtjSAr4m87wzJFJUyWomKdj/Smily.svg"
         />
       </BadgeContainer>
 
@@ -100,7 +100,7 @@ function ToggleTest() {
   return (
     <div className="relative flex flex-col gap-10 border p-6">
       <Button
-        variant="outline"
+        className="absolute top-6 right-6 inline-flex"
         onClick={() => {
           if (data) {
             setData(undefined);
@@ -111,7 +111,7 @@ function ToggleTest() {
             });
           }
         }}
-        className="absolute top-6 right-6 inline-flex"
+        variant="outline"
       >
         Toggle Src
       </Button>
@@ -120,19 +120,19 @@ function ToggleTest() {
 
       <BadgeContainer label="Valid Src">
         <GradientAvatar
-          src={data?.src}
-          id={data?.id}
           className="size-20"
           client={storybookThirdwebClient}
+          id={data?.id}
+          src={data?.src}
         />
       </BadgeContainer>
 
       <BadgeContainer label="invalid Src">
         <GradientAvatar
           className="size-20"
-          src={data ? "invalid-src" : undefined}
-          id={undefined}
           client={storybookThirdwebClient}
+          id={undefined}
+          src={data ? "invalid-src" : undefined}
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/@/components/blocks/Avatars/GradientAvatar.tsx b/apps/dashboard/src/@/components/blocks/Avatars/GradientAvatar.tsx
index e0c411d6070..195a2e1243b 100644
--- a/apps/dashboard/src/@/components/blocks/Avatars/GradientAvatar.tsx
+++ b/apps/dashboard/src/@/components/blocks/Avatars/GradientAvatar.tsx
@@ -1,5 +1,5 @@
-import { Img } from "@/components/blocks/Img";
 import type { ThirdwebClient } from "thirdweb";
+import { Img } from "@/components/blocks/Img";
 import { resolveSchemeWithErrorHandler } from "../../../lib/resolveSchemeWithErrorHandler";
 import { cn } from "../../../lib/utils";
 import { GradientBlobbie } from "./GradientBlobbie";
@@ -19,9 +19,9 @@ export function GradientAvatar(props: {
 
   return (
     <Img
-      src={resolvedSrc}
       className={cn("rounded-full", props.className)}
       fallback={props.id ? <GradientBlobbie id={props.id} /> : undefined}
+      src={resolvedSrc}
     />
   );
 }
diff --git a/apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.stories.tsx b/apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.stories.tsx
index 11ee5218c0c..5bb27b423dd 100644
--- a/apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.stories.tsx
@@ -8,9 +8,9 @@ import { Button } from "../../ui/button";
 import { ProjectAvatar } from "./ProjectAvatar";
 
 const meta = {
-  title: "blocks/Avatars/ProjectAvatar",
   component: Story,
   parameters: {},
+  title: "blocks/Avatars/ProjectAvatar",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -27,17 +27,17 @@ function Story() {
 
       <BadgeContainer label="No Src - Skeleton">
         <ProjectAvatar
-          src={undefined}
           className="size-6"
           client={storybookThirdwebClient}
+          src={undefined}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Invalid/Empty Src - BoxIcon Fallback">
         <ProjectAvatar
-          src={""}
           className="size-6"
           client={storybookThirdwebClient}
+          src={""}
         />
       </BadgeContainer>
 
@@ -54,7 +54,7 @@ function ToggleTest() {
   return (
     <div className="relative flex flex-col gap-10 border p-6">
       <Button
-        variant="outline"
+        className="absolute top-6 right-6 inline-flex"
         onClick={() => {
           if (data) {
             setData(undefined);
@@ -65,7 +65,7 @@ function ToggleTest() {
             });
           }
         }}
-        className="absolute top-6 right-6 inline-flex"
+        variant="outline"
       >
         Toggle Src
       </Button>
@@ -74,17 +74,17 @@ function ToggleTest() {
 
       <BadgeContainer label="Valid Src">
         <ProjectAvatar
-          src={data?.src}
           className="size-6"
           client={storybookThirdwebClient}
+          src={data?.src}
         />
       </BadgeContainer>
 
       <BadgeContainer label="invalid Src">
         <ProjectAvatar
-          src={data ? "invalid-src" : undefined}
           className="size-6"
           client={storybookThirdwebClient}
+          src={data ? "invalid-src" : undefined}
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.tsx b/apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.tsx
index 73d917c4107..cfd250feb54 100644
--- a/apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.tsx
+++ b/apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.tsx
@@ -1,6 +1,6 @@
-import { Img } from "@/components/blocks/Img";
 import { BoxIcon } from "lucide-react";
 import type { ThirdwebClient } from "thirdweb";
+import { Img } from "@/components/blocks/Img";
 import { resolveSchemeWithErrorHandler } from "../../../lib/resolveSchemeWithErrorHandler";
 import { cn } from "../../../lib/utils";
 
@@ -11,19 +11,19 @@ export function ProjectAvatar(props: {
 }) {
   return (
     <Img
-      src={
-        resolveSchemeWithErrorHandler({
-          uri: props.src,
-          client: props.client,
-        }) || ""
-      }
-      className={cn("rounded-full border border-border", props.className)}
       alt={""}
+      className={cn("rounded-full border border-border", props.className)}
       fallback={
         <div className="flex items-center justify-center bg-card">
           <BoxIcon className="size-[50%] text-muted-foreground" />
         </div>
       }
+      src={
+        resolveSchemeWithErrorHandler({
+          client: props.client,
+          uri: props.src,
+        }) || ""
+      }
     />
   );
 }
diff --git a/apps/dashboard/src/@/components/blocks/DangerSettingCard.stories.tsx b/apps/dashboard/src/@/components/blocks/DangerSettingCard.stories.tsx
index dfe4652eb72..8ab5bcb0dc1 100644
--- a/apps/dashboard/src/@/components/blocks/DangerSettingCard.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/DangerSettingCard.stories.tsx
@@ -3,13 +3,13 @@ import { BadgeContainer } from "../../../stories/utils";
 import { DangerSettingCard } from "./DangerSettingCard";
 
 const meta = {
-  title: "blocks/Cards/DangerSettingCard",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/Cards/DangerSettingCard",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -24,29 +24,29 @@ function Story() {
     <div className="container flex max-w-[1000px] flex-col gap-8 py-10">
       <BadgeContainer label="Base">
         <DangerSettingCard
-          title="This is a title"
-          description="This is a description"
           buttonLabel="Some Action"
           buttonOnClick={() => {}}
-          isPending={false}
           confirmationDialog={{
-            title: "This is confirmation title",
             description: "This is confirmation description",
+            title: "This is confirmation title",
           }}
+          description="This is a description"
+          isPending={false}
+          title="This is a title"
         />
       </BadgeContainer>
 
       <BadgeContainer label="Loading">
         <DangerSettingCard
-          title="This is a title"
-          description="This is a description"
           buttonLabel="Some Action"
           buttonOnClick={() => {}}
-          isPending={true}
           confirmationDialog={{
-            title: "This is confirmation title",
             description: "This is confirmation description",
+            title: "This is confirmation title",
           }}
+          description="This is a description"
+          isPending={true}
+          title="This is a title"
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/@/components/blocks/DangerSettingCard.tsx b/apps/dashboard/src/@/components/blocks/DangerSettingCard.tsx
index 74e5b43bd7c..fbd8018d939 100644
--- a/apps/dashboard/src/@/components/blocks/DangerSettingCard.tsx
+++ b/apps/dashboard/src/@/components/blocks/DangerSettingCard.tsx
@@ -1,4 +1,4 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
 
 import {
@@ -10,7 +10,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
-import { useState } from "react";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { cn } from "../../lib/utils";
 import { DynamicHeight } from "../ui/DynamicHeight";
 
@@ -58,19 +58,19 @@ export function DangerSettingCard(props: {
         )}
       >
         <Dialog
-          open={isConfirmationDialogOpen}
           onOpenChange={(v) => {
             setIsConfirmationDialogOpen(v);
             if (!v) {
               props.confirmationDialog.onClose?.();
             }
           }}
+          open={isConfirmationDialogOpen}
         >
           <DialogTrigger asChild>
             <Button
-              variant="destructive"
               className="gap-2 bg-red-600 font-semibold text-white hover:bg-red-600/80"
               disabled={props.isDisabled || props.isPending}
+              variant="destructive"
             >
               {props.isPending && <Spinner className="size-3" />}
               {props.buttonLabel}
@@ -99,10 +99,10 @@ export function DangerSettingCard(props: {
               </DialogClose>
 
               <Button
-                variant="destructive"
                 className="gap-2 bg-red-600 font-semibold text-white hover:bg-red-600/80"
-                onClick={props.buttonOnClick}
                 disabled={props.isPending}
+                onClick={props.buttonOnClick}
+                variant="destructive"
               >
                 {props.isPending && <Spinner className="size-3" />}
                 {props.buttonLabel}
diff --git a/apps/dashboard/src/@/components/blocks/ExportToCSVButton.tsx b/apps/dashboard/src/@/components/blocks/ExportToCSVButton.tsx
index a95dd84f21f..fc183e72df2 100644
--- a/apps/dashboard/src/@/components/blocks/ExportToCSVButton.tsx
+++ b/apps/dashboard/src/@/components/blocks/ExportToCSVButton.tsx
@@ -1,9 +1,9 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
 import { useMutation } from "@tanstack/react-query";
 import { DownloadIcon } from "lucide-react";
 import Papa from "papaparse";
 import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { cn } from "../../lib/utils";
 
 export function ExportToCSVButton(props: {
@@ -34,12 +34,12 @@ export function ExportToCSVButton(props: {
 
   return (
     <Button
-      variant="outline"
-      disabled={props.disabled || exportMutation.isPending}
       className={cn("flex items-center gap-2 border text-xs", props.className)}
+      disabled={props.disabled || exportMutation.isPending}
       onClick={async () => {
         exportMutation.mutate();
       }}
+      variant="outline"
     >
       {exportMutation.isPending ? (
         <>
@@ -58,8 +58,8 @@ export function ExportToCSVButton(props: {
 
 function convertToCSVFormat(data: { header: string[]; rows: string[][] }) {
   return Papa.unparse({
-    fields: data.header,
     data: data.rows,
+    fields: data.header,
   });
 }
 
diff --git a/apps/dashboard/src/@/components/blocks/FormFieldSetup.tsx b/apps/dashboard/src/@/components/blocks/FormFieldSetup.tsx
index 346310925a9..d1cdfdfee71 100644
--- a/apps/dashboard/src/@/components/blocks/FormFieldSetup.tsx
+++ b/apps/dashboard/src/@/components/blocks/FormFieldSetup.tsx
@@ -1,7 +1,7 @@
-import { Label } from "@/components/ui/label";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { AsteriskIcon, InfoIcon } from "lucide-react";
 import type React from "react";
+import { Label } from "@/components/ui/label";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 export function FormFieldSetup(props: {
   htmlFor?: string;
diff --git a/apps/dashboard/src/@/components/blocks/Img.stories.tsx b/apps/dashboard/src/@/components/blocks/Img.stories.tsx
index 2ecf8f2bf9a..aead7195de1 100644
--- a/apps/dashboard/src/@/components/blocks/Img.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/Img.stories.tsx
@@ -2,13 +2,13 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { ImageIcon } from "lucide-react";
 import { useState } from "react";
 import { BadgeContainer } from "../../../stories/utils";
-import { Spinner } from "../ui/Spinner/Spinner";
 import { Button } from "../ui/button";
+import { Spinner } from "../ui/Spinner/Spinner";
 import { Img } from "./Img";
 
 const meta = {
-  title: "blocks/Img",
   component: Story,
+  title: "blocks/Img",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -51,24 +51,24 @@ function Story() {
 
       <BadgeContainer label="Custom Skeleton">
         <Img
-          src={undefined}
+          className="size-20"
           skeleton={
             <div className="flex items-center justify-center rounded-lg border">
               <Spinner className="size-6" />
             </div>
           }
-          className="size-20"
+          src={undefined}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Custom Fallback">
         <Img
+          className="size-20"
           fallback={
             <div className="flex items-center justify-center rounded-lg border">
               <ImageIcon className="size-10 text-muted-foreground" />
             </div>
           }
-          className="size-20"
           src="invalid-src"
         />
       </BadgeContainer>
@@ -82,7 +82,7 @@ function ToggleTest() {
   return (
     <div className="relative flex flex-col gap-10 border p-6">
       <Button
-        variant="outline"
+        className="absolute top-6 right-6 inline-flex"
         onClick={() => {
           if (src) {
             setSrc(undefined);
@@ -90,7 +90,7 @@ function ToggleTest() {
             setSrc("https://picsum.photos/400");
           }
         }}
-        className="absolute top-6 right-6 inline-flex"
+        variant="outline"
       >
         Toggle Src
       </Button>
diff --git a/apps/dashboard/src/@/components/blocks/Img.tsx b/apps/dashboard/src/@/components/blocks/Img.tsx
index e1fcc37142a..2884cf09e58 100644
--- a/apps/dashboard/src/@/components/blocks/Img.tsx
+++ b/apps/dashboard/src/@/components/blocks/Img.tsx
@@ -53,30 +53,30 @@ export function Img(props: imgElementProps) {
       <img
         {...restProps}
         // avoid setting empty src string to prevent request to the entire page
-        src={restProps.src || undefined}
-        ref={imgRef}
+        alt={restProps.alt || ""}
+        className={cn(
+          "fade-in-0 object-cover transition-opacity duration-300",
+          className,
+        )}
+        decoding="async"
         onError={() => {
           setStatus("fallback");
         }}
+        ref={imgRef}
+        src={restProps.src || undefined}
         style={{
           opacity: status === "loaded" ? 1 : 0,
           ...restProps.style,
         }}
-        alt={restProps.alt || ""}
-        className={cn(
-          "fade-in-0 object-cover transition-opacity duration-300",
-          className,
-        )}
-        decoding="async"
       />
 
       {status !== "loaded" && (
         <div
-          style={restProps.style}
           className={cn(
             "fade-in-0 absolute inset-0 overflow-hidden transition-opacity duration-300 [&>*]:h-full [&>*]:w-full",
             className,
           )}
+          style={restProps.style}
         >
           {status === "pending" && (skeleton || defaultSkeleton)}
           {status === "fallback" && (fallback || defaultFallback)}
diff --git a/apps/dashboard/src/@/components/blocks/MobileSidebar.tsx b/apps/dashboard/src/@/components/blocks/MobileSidebar.tsx
index 0e469c295ce..6d38e34524a 100644
--- a/apps/dashboard/src/@/components/blocks/MobileSidebar.tsx
+++ b/apps/dashboard/src/@/components/blocks/MobileSidebar.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
 import { ChevronDownIcon } from "lucide-react";
 import { usePathname } from "next/navigation";
 import { useMemo, useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
 import { cn } from "../../lib/utils";
 import {
   RenderSidebarLinks,
@@ -35,7 +35,7 @@ export function MobileSidebar(props: {
   );
 
   return (
-    <Dialog open={isOpen} onOpenChange={setIsOpen}>
+    <Dialog onOpenChange={setIsOpen} open={isOpen}>
       <DialogTrigger asChild>{props.trigger || defaultTrigger}</DialogTrigger>
       <DialogContent
         className="no-scrollbar max-h-[80vh] overflow-auto rounded-t-xl rounded-b-none p-4"
diff --git a/apps/dashboard/src/@/components/blocks/MultiNetworkSelector.stories.tsx b/apps/dashboard/src/@/components/blocks/MultiNetworkSelector.stories.tsx
index f8247becedd..70563522ce7 100644
--- a/apps/dashboard/src/@/components/blocks/MultiNetworkSelector.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/MultiNetworkSelector.stories.tsx
@@ -7,13 +7,13 @@ import {
 import { MultiNetworkSelector } from "./NetworkSelectors";
 
 const meta = {
-  title: "blocks/Cards/MultiNetworkSelector",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/Cards/MultiNetworkSelector",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -35,17 +35,14 @@ function Story() {
   );
 }
 
-function Variant(props: {
-  label: string;
-  selectedChainIds: number[];
-}) {
+function Variant(props: { label: string; selectedChainIds: number[] }) {
   const [chainIds, setChainIds] = useState<number[]>(props.selectedChainIds);
   return (
     <BadgeContainer label={props.label}>
       <MultiNetworkSelector
-        selectedChainIds={chainIds}
         client={storybookThirdwebClient}
         onChange={setChainIds}
+        selectedChainIds={chainIds}
       />
     </BadgeContainer>
   );
diff --git a/apps/dashboard/src/@/components/blocks/NetworkSelectors.tsx b/apps/dashboard/src/@/components/blocks/NetworkSelectors.tsx
index 5c46846fc54..0c0fdce92d6 100644
--- a/apps/dashboard/src/@/components/blocks/NetworkSelectors.tsx
+++ b/apps/dashboard/src/@/components/blocks/NetworkSelectors.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { MultiSelect } from "@/components/blocks/multi-select";
-import { SelectWithSearch } from "@/components/blocks/select-with-search";
-import { Badge } from "@/components/ui/badge";
 import { ChainIconClient } from "components/icons/ChainIcon";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { useCallback, useMemo } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { MultiSelect } from "@/components/blocks/multi-select";
+import { SelectWithSearch } from "@/components/blocks/select-with-search";
+import { Badge } from "@/components/ui/badge";
 
 function cleanChainName(chainName: string) {
   return chainName.replace("Mainnet", "");
@@ -98,15 +98,15 @@ export function MultiNetworkSelector(props: {
           <span className="flex grow gap-2 truncate text-left">
             <ChainIconClient
               className="size-5"
+              client={props.client}
               loading="lazy"
               src={chain.icon?.url}
-              client={props.client}
             />
             {cleanChainName(chain.name)}
           </span>
 
           {!props.disableChainId && (
-            <Badge variant="outline" className="gap-2">
+            <Badge className="gap-2" variant="outline">
               <span className="text-muted-foreground">Chain ID</span>
               {chain.chainId}
             </Badge>
@@ -119,24 +119,24 @@ export function MultiNetworkSelector(props: {
 
   return (
     <MultiSelect
-      searchPlaceholder="Search by Name or Chain Id"
-      selectedValues={props.selectedChainIds.map(String)}
-      popoverContentClassName={props.popoverContentClassName}
-      customTrigger={props.customTrigger}
-      options={options}
       align={props.align}
-      side={props.side}
-      showSelectedValuesInModal={props.showSelectedValuesInModal}
+      className={props.className}
+      customTrigger={props.customTrigger}
+      disabled={allChains.length === 0}
       onSelectedValuesChange={(chainIds) => {
         props.onChange(chainIds.map(Number));
       }}
+      options={options}
+      overrideSearchFn={searchFn}
       placeholder={
         allChains.length === 0 ? "Loading Chains..." : "Select Chains"
       }
-      disabled={allChains.length === 0}
-      overrideSearchFn={searchFn}
+      popoverContentClassName={props.popoverContentClassName}
       renderOption={renderOption}
-      className={props.className}
+      searchPlaceholder="Search by Name or Chain Id"
+      selectedValues={props.selectedChainIds.map(String)}
+      showSelectedValuesInModal={props.showSelectedValuesInModal}
+      side={props.side}
     />
   );
 }
@@ -208,15 +208,15 @@ export function SingleNetworkSelector(props: {
           <span className="flex grow gap-2 truncate text-left">
             <ChainIconClient
               className="size-5"
-              src={chain.icon?.url}
               client={props.client}
               loading="lazy"
+              src={chain.icon?.url}
             />
             {cleanChainName(chain.name)}
           </span>
 
           {!props.disableChainId && (
-            <Badge variant="outline" className="gap-2 max-sm:hidden">
+            <Badge className="gap-2 max-sm:hidden" variant="outline">
               <span className="text-muted-foreground">Chain ID</span>
               {chain.chainId}
             </Badge>
@@ -231,26 +231,26 @@ export function SingleNetworkSelector(props: {
 
   return (
     <SelectWithSearch
-      searchPlaceholder="Search by Name or Chain ID"
-      value={String(props.chainId)}
-      showCheck={false}
-      options={options}
+      align={props.align}
+      className={props.className}
+      closeOnSelect={true}
+      disabled={isLoadingChains}
       onValueChange={(chainId) => {
         props.onChange(Number(chainId));
       }}
-      closeOnSelect={true}
+      options={options}
+      overrideSearchFn={searchFn}
       placeholder={
         isLoadingChains
           ? "Loading Chains..."
           : props.placeholder || "Select Chain"
       }
-      overrideSearchFn={searchFn}
-      renderOption={renderOption}
-      className={props.className}
       popoverContentClassName={props.popoverContentClassName}
-      disabled={isLoadingChains}
+      renderOption={renderOption}
+      searchPlaceholder="Search by Name or Chain ID"
+      showCheck={false}
       side={props.side}
-      align={props.align}
+      value={String(props.chainId)}
     />
   );
 }
diff --git a/apps/dashboard/src/@/components/blocks/RouteDiscoveryCard.tsx b/apps/dashboard/src/@/components/blocks/RouteDiscoveryCard.tsx
index 2afdd28fa3c..e2d12445fca 100644
--- a/apps/dashboard/src/@/components/blocks/RouteDiscoveryCard.tsx
+++ b/apps/dashboard/src/@/components/blocks/RouteDiscoveryCard.tsx
@@ -1,7 +1,7 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import type React from "react";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { cn } from "@/lib/utils";
-import type React from "react";
 
 export function RouteDiscoveryCard(
   props: React.PropsWithChildren<{
@@ -66,12 +66,12 @@ export function RouteDiscoveryCard(
 
         {props.saveButton && !props.noPermissionText && (
           <Button
-            size="sm"
             className={cn("gap-2", props.saveButton.className)}
-            onClick={props.saveButton.onClick}
             disabled={props.saveButton.disabled || props.saveButton.isPending}
-            variant={props.saveButton.variant || "outline"}
+            onClick={props.saveButton.onClick}
+            size="sm"
             type={props.saveButton.type}
+            variant={props.saveButton.variant || "outline"}
           >
             {props.saveButton.isPending && <Spinner className="size-3" />}
             {props.saveButton.label ||
diff --git a/apps/dashboard/src/@/components/blocks/SettingsCard.stories.tsx b/apps/dashboard/src/@/components/blocks/SettingsCard.stories.tsx
index ca028d43bca..4921dadff40 100644
--- a/apps/dashboard/src/@/components/blocks/SettingsCard.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/SettingsCard.stories.tsx
@@ -3,13 +3,13 @@ import { BadgeContainer } from "../../../stories/utils";
 import { SettingsCard } from "./SettingsCard";
 
 const meta = {
-  title: "Blocks/Cards/SettingsCard",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Blocks/Cards/SettingsCard",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -25,8 +25,8 @@ function Story() {
       <BadgeContainer label="No Header">
         <SettingsCard
           bottomText="This is bottom text"
-          header={undefined}
           errorText={undefined}
+          header={undefined}
           noPermissionText={undefined}
           saveButton={undefined}
         >
@@ -37,11 +37,11 @@ function Story() {
       <BadgeContainer label="Header">
         <SettingsCard
           bottomText="This is bottom text"
+          errorText={undefined}
           header={{
-            title: "Some Title",
             description: "This is some description for this card",
+            title: "Some Title",
           }}
-          errorText={undefined}
           noPermissionText={undefined}
           saveButton={undefined}
         >
@@ -52,11 +52,11 @@ function Story() {
       <BadgeContainer label="Error">
         <SettingsCard
           bottomText="This is bottom text"
+          errorText="This is error text"
           header={{
-            title: "Some Title",
             description: "This is some description for this card",
+            title: "Some Title",
           }}
-          errorText="This is error text"
           noPermissionText={undefined}
           saveButton={undefined}
         >
@@ -67,17 +67,17 @@ function Story() {
       <BadgeContainer label="No Permission">
         <SettingsCard
           bottomText="This is bottom text"
+          errorText={undefined}
           header={{
-            title: "Some Title",
             description: "This is some description for this card",
+            title: "Some Title",
           }}
+          noPermissionText="You do not have permission to edit this"
           saveButton={{
             disabled: false,
             isPending: false,
             onClick: () => {},
           }}
-          noPermissionText="You do not have permission to edit this"
-          errorText={undefined}
         >
           <ChildrenPlaceholder />
         </SettingsCard>
@@ -86,17 +86,17 @@ function Story() {
       <BadgeContainer label="Save">
         <SettingsCard
           bottomText="This is bottom text"
+          errorText={undefined}
           header={{
-            title: "Some Title",
             description: "This is some description for this card",
+            title: "Some Title",
           }}
+          noPermissionText={undefined}
           saveButton={{
             disabled: false,
             isPending: false,
             onClick: () => {},
           }}
-          noPermissionText={undefined}
-          errorText={undefined}
         >
           <ChildrenPlaceholder />
         </SettingsCard>
@@ -105,17 +105,17 @@ function Story() {
       <BadgeContainer label="Save Disabled">
         <SettingsCard
           bottomText="This is bottom text"
+          errorText={undefined}
           header={{
-            title: "Some Title",
             description: "This is some description for this card",
+            title: "Some Title",
           }}
+          noPermissionText={undefined}
           saveButton={{
             disabled: true,
             isPending: false,
             onClick: () => {},
           }}
-          noPermissionText={undefined}
-          errorText={undefined}
         >
           <ChildrenPlaceholder />
         </SettingsCard>
@@ -124,17 +124,17 @@ function Story() {
       <BadgeContainer label="Save Loading">
         <SettingsCard
           bottomText="This is bottom text"
+          errorText={undefined}
           header={{
-            title: "Some Title",
             description: "This is some description for this card",
+            title: "Some Title",
           }}
+          noPermissionText={undefined}
           saveButton={{
             disabled: false,
             isPending: true,
             onClick: () => {},
           }}
-          noPermissionText={undefined}
-          errorText={undefined}
         >
           <ChildrenPlaceholder />
         </SettingsCard>
diff --git a/apps/dashboard/src/@/components/blocks/SettingsCard.tsx b/apps/dashboard/src/@/components/blocks/SettingsCard.tsx
index ee84d779445..030bbf316dd 100644
--- a/apps/dashboard/src/@/components/blocks/SettingsCard.tsx
+++ b/apps/dashboard/src/@/components/blocks/SettingsCard.tsx
@@ -1,7 +1,7 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import type React from "react";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { cn } from "@/lib/utils";
-import type React from "react";
 
 export function SettingsCard(
   props: React.PropsWithChildren<{
@@ -66,12 +66,12 @@ export function SettingsCard(
 
         {props.saveButton && !props.noPermissionText && (
           <Button
-            size="sm"
             className={cn("gap-2", props.saveButton.className)}
-            onClick={props.saveButton.onClick}
             disabled={props.saveButton.disabled || props.saveButton.isPending}
-            variant={props.saveButton.variant || "outline"}
+            onClick={props.saveButton.onClick}
+            size="sm"
             type={props.saveButton.type}
+            variant={props.saveButton.variant || "outline"}
           >
             {props.saveButton.isPending && <Spinner className="size-3" />}
             {props.saveButton.label ||
diff --git a/apps/dashboard/src/@/components/blocks/Sidebar.tsx b/apps/dashboard/src/@/components/blocks/Sidebar.tsx
index 181abba4fc8..2342f2e6328 100644
--- a/apps/dashboard/src/@/components/blocks/Sidebar.tsx
+++ b/apps/dashboard/src/@/components/blocks/Sidebar.tsx
@@ -65,12 +65,12 @@ export function RenderSidebarLinks(props: { links: SidebarLink[] }) {
         const isExternal = link.href.startsWith("http");
         return (
           <NavLink
-            // biome-ignore lint/suspicious/noArrayIndexKey: items won't be reordered
-            key={i}
-            href={link.href}
-            className="flex items-center gap-2 rounded-md px-3 py-2 text-muted-foreground text-sm hover:bg-accent"
             activeClassName="text-foreground bg-accent"
+            className="flex items-center gap-2 rounded-md px-3 py-2 text-muted-foreground text-sm hover:bg-accent"
             exactMatch={link.exactMatch}
+            href={link.href}
+            // biome-ignore lint/suspicious/noArrayIndexKey: items won't be reordered
+            key={i}
           >
             {link.icon && <link.icon className="size-4" />}
             {link.label}
diff --git a/apps/dashboard/src/@/components/blocks/SidebarLayout.stories.tsx b/apps/dashboard/src/@/components/blocks/SidebarLayout.stories.tsx
index 4cccfc5f202..5ea34677163 100644
--- a/apps/dashboard/src/@/components/blocks/SidebarLayout.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/SidebarLayout.stories.tsx
@@ -2,13 +2,13 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { SidebarLayout } from "./SidebarLayout";
 
 const meta = {
-  title: "blocks/SidebarLayout",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/SidebarLayout",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -35,8 +35,8 @@ function Story() {
           label: "eiusmod",
         },
         {
-          label: "incididunt",
           href: "https://playground.thirdweb.com/",
+          label: "incididunt",
         },
       ]}
     >
diff --git a/apps/dashboard/src/@/components/blocks/SidebarLayout.tsx b/apps/dashboard/src/@/components/blocks/SidebarLayout.tsx
index 87403d09605..e87ae95ac84 100644
--- a/apps/dashboard/src/@/components/blocks/SidebarLayout.tsx
+++ b/apps/dashboard/src/@/components/blocks/SidebarLayout.tsx
@@ -15,9 +15,9 @@ import {
 import { cn } from "../../lib/utils";
 import { NavLink } from "../ui/NavLink";
 import { Separator } from "../ui/separator";
+import { AppFooter } from "./app-footer";
 import { MobileSidebar, useActiveSidebarLink } from "./MobileSidebar";
 import { CustomSidebar, type SidebarLink } from "./Sidebar";
-import { AppFooter } from "./app-footer";
 
 export function SidebarLayout(props: {
   sidebarLinks: SidebarLink[];
@@ -35,8 +35,8 @@ export function SidebarLayout(props: {
       )}
     >
       <CustomSidebar
-        links={sidebarLinks}
         className={props.desktopSidebarClassName}
+        links={sidebarLinks}
       />
       <MobileSidebar
         links={sidebarLinks}
@@ -65,13 +65,13 @@ export function FullWidthSidebarLayout(props: {
       )}
     >
       {/* left - sidebar */}
-      <Sidebar collapsible="icon" side="left" className="pt-2">
+      <Sidebar className="pt-2" collapsible="icon" side="left">
         <SidebarContent>
           <SidebarGroup>
             <SidebarGroupContent>
               <RenderSidebarGroup
-                sidebarLinks={contentSidebarLinks}
                 groupName={undefined}
+                sidebarLinks={contentSidebarLinks}
               />
             </SidebarGroupContent>
           </SidebarGroup>
@@ -80,8 +80,8 @@ export function FullWidthSidebarLayout(props: {
         {footerSidebarLinks && (
           <SidebarFooter className="pb-3">
             <RenderSidebarGroup
-              sidebarLinks={footerSidebarLinks}
               groupName={undefined}
+              sidebarLinks={footerSidebarLinks}
             />
           </SidebarFooter>
         )}
@@ -119,10 +119,10 @@ function RenderSidebarGroup(props: {
             <SidebarMenuItem key={link.href}>
               <SidebarMenuButton asChild>
                 <NavLink
-                  href={link.href}
-                  className="flex items-center gap-2 text-muted-foreground text-sm hover:bg-accent"
                   activeClassName="text-foreground bg-accent"
+                  className="flex items-center gap-2 text-muted-foreground text-sm hover:bg-accent"
                   exactMatch={link.exactMatch}
+                  href={link.href}
                   onClick={() => {
                     sidebar.setOpenMobile(false);
                   }}
@@ -136,14 +136,14 @@ function RenderSidebarGroup(props: {
         }
 
         if ("separator" in link) {
-          return <SidebarSeparator key={Math.random()} className="my-1" />;
+          return <SidebarSeparator className="my-1" key={Math.random()} />;
         }
 
         return (
           <RenderSidebarGroup
-            sidebarLinks={link.links}
             groupName={link.group}
             key={link.group}
+            sidebarLinks={link.links}
           />
         );
       })}
@@ -157,7 +157,7 @@ function MobileSidebarTrigger(props: { links: SidebarLink[] }) {
   return (
     <div className="flex items-center gap-3 border-b px-4 py-4 lg:hidden">
       <SidebarTrigger className="size-4" />
-      <Separator orientation="vertical" className="h-4" />
+      <Separator className="h-4" orientation="vertical" />
       {activeLink && <span className="text-sm">{activeLink.label}</span>}
     </div>
   );
diff --git a/apps/dashboard/src/@/components/blocks/SignatureSelector.tsx b/apps/dashboard/src/@/components/blocks/SignatureSelector.tsx
index 6b83863bdee..f08fc851803 100644
--- a/apps/dashboard/src/@/components/blocks/SignatureSelector.tsx
+++ b/apps/dashboard/src/@/components/blocks/SignatureSelector.tsx
@@ -1,5 +1,5 @@
-import { cn } from "@/lib/utils";
 import { useCallback, useMemo, useRef, useState } from "react";
+import { cn } from "@/lib/utils";
 import { MultiSelect } from "./multi-select";
 
 interface SignatureOption {
@@ -85,38 +85,38 @@ export function SignatureSelector({
   // Custom render for MultiSelect's search input
   const customSearchInput = (
     <input
-      ref={inputRef}
-      type="text"
+      autoComplete="off"
       className={cn(
         "w-full border-0 border-border border-b bg-transparent py-4 pr-2 pl-10 text-sm focus-visible:ring-0 focus-visible:ring-offset-0",
         disabled && "cursor-not-allowed opacity-50",
       )}
-      placeholder={placeholder}
-      value={searchValue}
+      disabled={disabled}
       onChange={(e) => setSearchValue(e.target.value)}
       onKeyDown={handleInputKeyDown}
-      disabled={disabled}
-      autoComplete="off"
+      placeholder={placeholder}
+      ref={inputRef}
+      type="text"
+      value={searchValue}
     />
   );
 
   return (
     <div className={className}>
       <MultiSelect
-        options={allOptions}
-        selectedValues={value ? [value] : []}
-        onSelectedValuesChange={handleSelectedValuesChange}
-        placeholder={placeholder}
-        maxCount={1}
-        disabled={disabled}
-        searchPlaceholder={placeholder}
+        customSearchInput={customSearchInput}
         customTrigger={null}
-        renderOption={(option) => <span>{option.label}</span>}
+        disabled={disabled}
+        maxCount={1}
+        onSelectedValuesChange={handleSelectedValuesChange}
+        options={allOptions}
         overrideSearchFn={(option, searchTerm) =>
           option.label.toLowerCase().includes(searchTerm.toLowerCase()) ||
           option.value.toLowerCase().includes(searchTerm.toLowerCase())
         }
-        customSearchInput={customSearchInput}
+        placeholder={placeholder}
+        renderOption={(option) => <span>{option.label}</span>}
+        searchPlaceholder={placeholder}
+        selectedValues={value ? [value] : []}
       />
       {isCustomValue && (
         <div className="mt-2 rounded border border-warning-200 bg-warning-50 px-2 py-1 text-warning-700 text-xs">
diff --git a/apps/dashboard/src/@/components/blocks/SingleNetworkSelector.stories.tsx b/apps/dashboard/src/@/components/blocks/SingleNetworkSelector.stories.tsx
index 2c65e137f0e..12c2b15ba0b 100644
--- a/apps/dashboard/src/@/components/blocks/SingleNetworkSelector.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/SingleNetworkSelector.stories.tsx
@@ -7,13 +7,13 @@ import {
 import { SingleNetworkSelector } from "./NetworkSelectors";
 
 const meta = {
-  title: "blocks/Cards/SingleNetworkSelector",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/Cards/SingleNetworkSelector",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -26,12 +26,12 @@ export const Variants: Story = {
 function Story() {
   return (
     <div className="container flex max-w-6xl flex-col gap-8 py-10">
-      <Variant label="No Chain ID selected by default" chainId={undefined} />
-      <Variant label="Polygon selected by default" chainId={137} />
+      <Variant chainId={undefined} label="No Chain ID selected by default" />
+      <Variant chainId={137} label="Polygon selected by default" />
       <Variant
-        label="Show certain chains only"
         chainId={undefined}
         chainIds={[1, 137, 10]}
+        label="Show certain chains only"
       />
     </div>
   );
@@ -46,10 +46,10 @@ function Variant(props: {
   return (
     <BadgeContainer label={props.label}>
       <SingleNetworkSelector
-        client={storybookThirdwebClient}
         chainId={chainId}
-        onChange={setChainId}
         chainIds={props.chainIds}
+        client={storybookThirdwebClient}
+        onChange={setChainId}
       />
     </BadgeContainer>
   );
diff --git a/apps/dashboard/src/@/components/blocks/TokenSelector.stories.tsx b/apps/dashboard/src/@/components/blocks/TokenSelector.stories.tsx
index f58c785e546..8967c786b1f 100644
--- a/apps/dashboard/src/@/components/blocks/TokenSelector.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/TokenSelector.stories.tsx
@@ -7,13 +7,13 @@ import {
 import { TokenSelector } from "./TokenSelector";
 
 const meta = {
-  title: "blocks/Cards/TokenSelector",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/Cards/TokenSelector",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -31,10 +31,7 @@ function Story() {
   );
 }
 
-function Variant(props: {
-  label: string;
-  selectedChainId?: number;
-}) {
+function Variant(props: { label: string; selectedChainId?: number }) {
   const [token, setToken] = useState<
     | {
         address: string;
@@ -47,8 +44,6 @@ function Variant(props: {
     <BadgeContainer label={props.label}>
       <TokenSelector
         addNativeTokenIfMissing={false}
-        showCheck={false}
-        selectedToken={token}
         chainId={props.selectedChainId}
         client={storybookThirdwebClient}
         onChange={(v) => {
@@ -57,6 +52,8 @@ function Variant(props: {
             chainId: v.chainId,
           });
         }}
+        selectedToken={token}
+        showCheck={false}
       />
     </BadgeContainer>
   );
diff --git a/apps/dashboard/src/@/components/blocks/TokenSelector.tsx b/apps/dashboard/src/@/components/blocks/TokenSelector.tsx
index 1287ab5732f..be1d3921f67 100644
--- a/apps/dashboard/src/@/components/blocks/TokenSelector.tsx
+++ b/apps/dashboard/src/@/components/blocks/TokenSelector.tsx
@@ -2,9 +2,9 @@ import { useAllChainsData } from "hooks/chains/allChains";
 import { useTokensData } from "hooks/tokens/tokens";
 import { useCallback, useMemo } from "react";
 import {
+  getAddress,
   NATIVE_TOKEN_ADDRESS,
   type ThirdwebClient,
-  getAddress,
 } from "thirdweb";
 import { shortenAddress } from "thirdweb/utils";
 import { replaceIpfsUrl } from "../../../lib/sdk";
@@ -55,14 +55,14 @@ export function TokenSelector(props: {
       if (!hasNativeToken && props.chainId) {
         return [
           {
+            address: checksummedNativeTokenAddress,
+            chainId: props.chainId,
+            decimals: 18,
             name:
               idToChain.get(props.chainId)?.nativeCurrency.name ??
               "Native Token",
             symbol:
               idToChain.get(props.chainId)?.nativeCurrency.symbol ?? "ETH",
-            decimals: 18,
-            chainId: props.chainId,
-            address: checksummedNativeTokenAddress,
           } satisfies TokenMetadata,
           ...tokensQuery.data,
         ];
@@ -129,22 +129,22 @@ export function TokenSelector(props: {
           <span className="flex grow gap-2 truncate text-left">
             <Img
               // render different image element if src changes to avoid showing old image while loading new one
-              key={resolvedSrc}
+              alt=""
               className={cn("size-5 rounded-full object-contain")}
-              src={resolvedSrc}
+              fallback={<img alt="" src={fallbackChainIcon} />}
+              key={resolvedSrc}
               loading={"lazy"}
-              alt=""
               // eslint-disable-next-line @next/next/no-img-element
-              fallback={<img src={fallbackChainIcon} alt="" />}
               skeleton={
                 <div className="animate-pulse rounded-full bg-border" />
               }
+              src={resolvedSrc}
             />
             {token.symbol}
           </span>
 
           {!props.disableAddress && (
-            <Badge variant="outline" className="gap-2 py-1 max-sm:hidden">
+            <Badge className="gap-2 py-1 max-sm:hidden" variant="outline">
               <span className="text-muted-foreground">Address</span>
               {shortenAddress(token.address, 4)}
             </Badge>
@@ -172,9 +172,10 @@ export function TokenSelector(props: {
 
   return (
     <SelectWithSearch
-      searchPlaceholder="Search by name or symbol"
-      value={selectedValue}
-      options={options}
+      align={props.align}
+      className={props.className}
+      closeOnSelect={true}
+      disabled={tokensQuery.isPending || props.disabled}
       onValueChange={(tokenAddress) => {
         const token = addressChainToToken.get(tokenAddress);
         if (!token) {
@@ -182,20 +183,19 @@ export function TokenSelector(props: {
         }
         props.onChange(token);
       }}
-      closeOnSelect={true}
-      showCheck={props.showCheck}
+      options={options}
+      overrideSearchFn={searchFn}
       placeholder={
         tokensQuery.isPending
           ? "Loading Tokens"
           : props.placeholder || "Select Token"
       }
-      overrideSearchFn={searchFn}
-      renderOption={renderOption}
-      className={props.className}
       popoverContentClassName={props.popoverContentClassName}
-      disabled={tokensQuery.isPending || props.disabled}
+      renderOption={renderOption}
+      searchPlaceholder="Search by name or symbol"
+      showCheck={props.showCheck}
       side={props.side}
-      align={props.align}
+      value={selectedValue}
     />
   );
 }
diff --git a/apps/dashboard/src/@/components/blocks/UpsellBannerCard.stories.tsx b/apps/dashboard/src/@/components/blocks/UpsellBannerCard.stories.tsx
index 5dbcfead7c7..f87a31876d8 100644
--- a/apps/dashboard/src/@/components/blocks/UpsellBannerCard.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/UpsellBannerCard.stories.tsx
@@ -8,48 +8,48 @@ function Story() {
     <div className="container flex max-w-4xl flex-col gap-8 py-10">
       <BadgeContainer label="Green with icon (default)">
         <UpsellBannerCard
-          title="Unlock more with thirdweb"
-          description="Upgrade to increase limits and access advanced features."
+          accentColor="green"
           cta={{
-            text: "View plans",
             icon: <ArrowRightIcon className="size-4" />,
             link: "#",
+            text: "View plans",
           }}
+          description="Upgrade to increase limits and access advanced features."
+          icon={<RocketIcon className="size-5" />}
+          title="Unlock more with thirdweb"
           trackingCategory="storybook"
           trackingLabel="green"
-          icon={<RocketIcon className="size-5" />}
-          accentColor="green"
         />
       </BadgeContainer>
 
       <BadgeContainer label="Blue accent">
         <UpsellBannerCard
-          title="Need more storage?"
-          description="Add additional space to your account."
+          accentColor="blue"
           cta={{
-            text: "Upgrade storage",
             icon: <ArrowRightIcon className="size-4" />,
             link: "#",
+            text: "Upgrade storage",
           }}
+          description="Add additional space to your account."
+          icon={<StarIcon className="size-5" />}
+          title="Need more storage?"
           trackingCategory="storybook"
           trackingLabel="blue"
-          icon={<StarIcon className="size-5" />}
-          accentColor="blue"
         />
       </BadgeContainer>
 
       <BadgeContainer label="Purple without leading icon">
         <UpsellBannerCard
-          title="Join the beta"
-          description="Get early access to experimental features."
+          accentColor="purple"
           cta={{
-            text: "Request access",
             icon: <ArrowRightIcon className="size-4" />,
             link: "#",
+            text: "Request access",
           }}
+          description="Get early access to experimental features."
+          title="Join the beta"
           trackingCategory="storybook"
           trackingLabel="purple"
-          accentColor="purple"
         />
       </BadgeContainer>
     </div>
@@ -57,13 +57,13 @@ function Story() {
 }
 
 const meta = {
-  title: "blocks/Banners/UpsellBannerCard",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/Banners/UpsellBannerCard",
 } satisfies Meta<typeof Story>;
 
 export default meta;
diff --git a/apps/dashboard/src/@/components/blocks/UpsellBannerCard.tsx b/apps/dashboard/src/@/components/blocks/UpsellBannerCard.tsx
index 4693a4186cf..8188c02dbe5 100644
--- a/apps/dashboard/src/@/components/blocks/UpsellBannerCard.tsx
+++ b/apps/dashboard/src/@/components/blocks/UpsellBannerCard.tsx
@@ -1,37 +1,37 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import type React from "react";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 
 const ACCENT = {
-  green: {
-    border: "border-green-600 dark:border-green-700",
-    bgFrom: "from-green-50 dark:from-green-900/20",
-    blur: "bg-green-600",
-    title: "text-green-900 dark:text-green-200",
-    desc: "text-green-800 dark:text-green-300",
-    iconBg: "bg-green-600 text-white",
-    btn: "bg-green-600 text-white hover:bg-green-700",
-  },
   blue: {
-    border: "border-blue-600 dark:border-blue-700",
     bgFrom: "from-blue-50 dark:from-blue-900/20",
     blur: "bg-blue-600",
-    title: "text-blue-900 dark:text-blue-200",
+    border: "border-blue-600 dark:border-blue-700",
+    btn: "bg-blue-600 text-white hover:bg-blue-700",
     desc: "text-blue-800 dark:text-blue-300",
     iconBg: "bg-blue-600 text-white",
-    btn: "bg-blue-600 text-white hover:bg-blue-700",
+    title: "text-blue-900 dark:text-blue-200",
+  },
+  green: {
+    bgFrom: "from-green-50 dark:from-green-900/20",
+    blur: "bg-green-600",
+    border: "border-green-600 dark:border-green-700",
+    btn: "bg-green-600 text-white hover:bg-green-700",
+    desc: "text-green-800 dark:text-green-300",
+    iconBg: "bg-green-600 text-white",
+    title: "text-green-900 dark:text-green-200",
   },
   purple: {
-    border: "border-purple-600 dark:border-purple-700",
     bgFrom: "from-purple-50 dark:from-purple-900/20",
     blur: "bg-purple-600",
-    title: "text-purple-900 dark:text-purple-200",
+    border: "border-purple-600 dark:border-purple-700",
+    btn: "bg-purple-600 text-white hover:bg-purple-700",
     desc: "text-purple-800 dark:text-purple-300",
     iconBg: "bg-purple-600 text-white",
-    btn: "bg-purple-600 text-white hover:bg-purple-700",
+    title: "text-purple-900 dark:text-purple-200",
   },
 } as const;
 
@@ -97,18 +97,18 @@ export function UpsellBannerCard(props: UpsellBannerCardProps) {
 
         <Button
           asChild
-          size="sm"
           className={cn(
             "mt-2 gap-2 hover:translate-y-0 hover:shadow-inner sm:mt-0",
             color.btn,
           )}
+          size="sm"
         >
           <Link
             href={props.cta.link}
-            target={props.cta.target}
             rel={
               props.cta.target === "_blank" ? "noopener noreferrer" : undefined
             }
+            target={props.cta.target}
           >
             {props.cta.text}
             {props.cta.icon && <span className="ml-2">{props.cta.icon}</span>}
diff --git a/apps/dashboard/src/@/components/blocks/app-footer.tsx b/apps/dashboard/src/@/components/blocks/app-footer.tsx
index 0ea6c25c6cf..48d2dcaa9ff 100644
--- a/apps/dashboard/src/@/components/blocks/app-footer.tsx
+++ b/apps/dashboard/src/@/components/blocks/app-footer.tsx
@@ -1,5 +1,3 @@
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import { ThirdwebMiniLogo } from "app/(app)/components/ThirdwebMiniLogo";
 import { GithubIcon } from "components/icons/brand-icons/GithubIcon";
 import { InstagramIcon } from "components/icons/brand-icons/InstagramIcon";
@@ -9,6 +7,8 @@ import { TiktokIcon } from "components/icons/brand-icons/TiktokIcon";
 import { XIcon } from "components/icons/brand-icons/XIcon";
 import { YoutubeIcon } from "components/icons/brand-icons/YoutubeIcon";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 
 type AppFooterProps = {
   className?: string;
@@ -69,34 +69,34 @@ export function AppFooter(props: AppFooterProps) {
             </p>
           </div>
           <div className="flex flex-row gap-3">
-            <Button size="icon" variant="ghost" asChild className="size-9">
+            <Button asChild className="size-9" size="icon" variant="ghost">
               <Link
                 href="https://github.com/thirdweb-dev"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 <GithubIcon className="size-5 text-muted-foreground" />
               </Link>
             </Button>
-            <Button size="icon" variant="ghost" asChild className="size-9">
+            <Button asChild className="size-9" size="icon" variant="ghost">
               <Link
                 href="https://www.tiktok.com/@thirdweb"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 <TiktokIcon className="size-5 text-muted-foreground" />
               </Link>
             </Button>
-            <Button size="icon" variant="ghost" asChild className="size-9">
+            <Button asChild className="size-9" size="icon" variant="ghost">
               <Link
                 href="https://www.instagram.com/thirdweb/"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 <InstagramIcon className="size-5 text-muted-foreground" />
               </Link>
             </Button>
-            <Button size="icon" variant="ghost" asChild className="size-9">
+            <Button asChild className="size-9" size="icon" variant="ghost">
               <Link
                 href="hhttps://www.linkedin.com/company/third-web/"
                 target="_blank"
@@ -104,29 +104,29 @@ export function AppFooter(props: AppFooterProps) {
                 <LinkedInIcon className="size-5 text-muted-foreground" />
               </Link>
             </Button>
-            <Button size="icon" variant="ghost" asChild className="size-9">
+            <Button asChild className="size-9" size="icon" variant="ghost">
               <Link
                 href="https://www.youtube.com/@thirdweb_"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 <YoutubeIcon className="size-5 text-muted-foreground" />
               </Link>
             </Button>
-            <Button size="icon" variant="ghost" asChild className="size-9">
+            <Button asChild className="size-9" size="icon" variant="ghost">
               <Link
                 href="https://www.reddit.com/r/thirdweb/"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 <RedditIcon className="size-5 text-muted-foreground" />
               </Link>
             </Button>
-            <Button size="icon" variant="ghost" asChild className="size-9">
+            <Button asChild className="size-9" size="icon" variant="ghost">
               <Link
                 href="https://x.com/thirdweb"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 <XIcon className="size-5 text-muted-foreground" />
               </Link>
@@ -151,9 +151,9 @@ function FooterLink(props: {
 }) {
   return (
     <Link
+      className="px-0 py-[6px] text-muted-foreground text-sm hover:underline"
       href={props.href}
       prefetch={false}
-      className="px-0 py-[6px] text-muted-foreground text-sm hover:underline"
       target="_blank"
     >
       {props.label}
diff --git a/apps/dashboard/src/@/components/blocks/charts/area-chart.tsx b/apps/dashboard/src/@/components/blocks/charts/area-chart.tsx
index dc7fe351bf0..22cd5fc8d4b 100644
--- a/apps/dashboard/src/@/components/blocks/charts/area-chart.tsx
+++ b/apps/dashboard/src/@/components/blocks/charts/area-chart.tsx
@@ -1,5 +1,12 @@
 "use client";
 
+import {
+  EmptyChartState,
+  LoadingChartState,
+} from "components/analytics/empty-chart-state";
+import { format } from "date-fns";
+import { useMemo } from "react";
+import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";
 import {
   Card,
   CardContent,
@@ -16,13 +23,6 @@ import {
   ChartTooltipContent,
 } from "@/components/ui/chart";
 import { cn } from "@/lib/utils";
-import {
-  EmptyChartState,
-  LoadingChartState,
-} from "components/analytics/empty-chart-state";
-import { format } from "date-fns";
-import { useMemo } from "react";
-import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";
 
 type ThirdwebAreaChartProps<TConfig extends ChartConfig> = {
   header?: {
@@ -77,7 +77,7 @@ export function ThirdwebAreaChart<TConfig extends ChartConfig>(
       <CardContent
         className={cn(!props.header && "pt-6", props.cardContentClassName)}
       >
-        <ChartContainer config={props.config} className={props.chartClassName}>
+        <ChartContainer className={props.chartClassName} config={props.config}>
           {props.isPending ? (
             <LoadingChartState />
           ) : props.data.length === 0 ? (
@@ -87,21 +87,20 @@ export function ThirdwebAreaChart<TConfig extends ChartConfig>(
           ) : (
             <AreaChart accessibilityLayer data={props.data}>
               <CartesianGrid vertical={false} />
-              {props.yAxis && <YAxis tickLine={false} axisLine={false} />}
+              {props.yAxis && <YAxis axisLine={false} tickLine={false} />}
               <XAxis
-                dataKey="time"
-                tickLine={false}
                 axisLine={false}
-                tickMargin={20}
+                dataKey="time"
                 tickFormatter={(value) =>
                   format(
                     new Date(value),
                     props.xAxis?.sameDay ? "MMM dd, HH:mm" : "MMM dd",
                   )
                 }
+                tickLine={false}
+                tickMargin={20}
               />
               <ChartTooltip
-                cursor={true}
                 content={
                   <ChartTooltipContent
                     hideLabel={
@@ -111,15 +110,16 @@ export function ThirdwebAreaChart<TConfig extends ChartConfig>(
                     valueFormatter={props.toolTipValueFormatter}
                   />
                 }
+                cursor={true}
               />
               <defs>
                 {configKeys.map((key) => (
                   <linearGradient
-                    key={key}
                     id={`fill_${key}`}
+                    key={key}
                     x1="0"
-                    y1="0"
                     x2="0"
+                    y1="0"
                     y2="1"
                   >
                     <stop
@@ -138,23 +138,23 @@ export function ThirdwebAreaChart<TConfig extends ChartConfig>(
               {configKeys.map((key) =>
                 key === "maxLine" ? (
                   <Area
-                    key={key}
-                    type="monotone"
                     dataKey="maxLine"
+                    fill="none"
+                    key={key}
                     stroke="#ef4444"
-                    strokeWidth={2}
                     strokeDasharray="5 5"
-                    fill="none"
+                    strokeWidth={2}
+                    type="monotone"
                   />
                 ) : (
                   <Area
-                    key={key}
                     dataKey={key}
-                    type="natural"
                     fill={`url(#fill_${key})`}
                     fillOpacity={0.4}
-                    stroke={`var(--color-${key})`}
+                    key={key}
                     stackId={props.variant !== "stacked" ? undefined : "a"}
+                    stroke={`var(--color-${key})`}
+                    type="natural"
                   />
                 ),
               )}
diff --git a/apps/dashboard/src/@/components/blocks/charts/bar-chart.tsx b/apps/dashboard/src/@/components/blocks/charts/bar-chart.tsx
index be4b16bb58c..68a9ec6880a 100644
--- a/apps/dashboard/src/@/components/blocks/charts/bar-chart.tsx
+++ b/apps/dashboard/src/@/components/blocks/charts/bar-chart.tsx
@@ -1,7 +1,12 @@
 "use client";
 
+import {
+  EmptyChartState,
+  LoadingChartState,
+} from "components/analytics/empty-chart-state";
+import { format } from "date-fns";
+import { useMemo } from "react";
 import { Bar, BarChart, CartesianGrid, XAxis } from "recharts";
-
 import {
   Card,
   CardContent,
@@ -18,12 +23,6 @@ import {
   ChartTooltipContent,
 } from "@/components/ui/chart";
 import { cn } from "@/lib/utils";
-import {
-  EmptyChartState,
-  LoadingChartState,
-} from "components/analytics/empty-chart-state";
-import { format } from "date-fns";
-import { useMemo } from "react";
 
 type ThirdwebBarChartProps<TConfig extends ChartConfig> = {
   // metadata
@@ -71,7 +70,7 @@ export function ThirdwebBarChart<TConfig extends ChartConfig>(
       {props.customHeader && props.customHeader}
 
       <CardContent className={cn(!props.header && "pt-6")}>
-        <ChartContainer config={props.config} className={props.chartClassName}>
+        <ChartContainer className={props.chartClassName} config={props.config}>
           {props.isPending ? (
             <LoadingChartState />
           ) : props.data.length === 0 ? (
@@ -82,11 +81,11 @@ export function ThirdwebBarChart<TConfig extends ChartConfig>(
             <BarChart accessibilityLayer data={props.data}>
               <CartesianGrid vertical={false} />
               <XAxis
+                axisLine={false}
                 dataKey="time"
+                tickFormatter={(value) => format(new Date(value), "MMM d")}
                 tickLine={false}
-                axisLine={false}
                 tickMargin={10}
-                tickFormatter={(value) => format(new Date(value), "MMM d")}
               />
               <ChartTooltip
                 content={
@@ -106,15 +105,15 @@ export function ThirdwebBarChart<TConfig extends ChartConfig>(
               )}
               {configKeys.map((key) => (
                 <Bar
-                  key={key}
+                  className="stroke-background"
                   dataKey={key}
                   // if stacked then they should all be the same stackId
                   // if grouped then they should all be unique stackId (so the key works great)
-                  stackId={variant === "stacked" ? "a" : key}
                   fill={props.config[key]?.color}
+                  key={key}
                   radius={[4, 4, 4, 4]}
+                  stackId={variant === "stacked" ? "a" : key}
                   strokeWidth={1}
-                  className="stroke-background"
                 />
               ))}
             </BarChart>
diff --git a/apps/dashboard/src/@/components/blocks/client-only.tsx b/apps/dashboard/src/@/components/blocks/client-only.tsx
index a9640e46b85..26b36f6d503 100644
--- a/apps/dashboard/src/@/components/blocks/client-only.tsx
+++ b/apps/dashboard/src/@/components/blocks/client-only.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { type ReactNode, useEffect, useState } from "react";
+import { cn } from "@/lib/utils";
 
 interface ClientOnlyProps {
   /**
diff --git a/apps/dashboard/src/@/components/blocks/code-segment.client.tsx b/apps/dashboard/src/@/components/blocks/code-segment.client.tsx
index b2b6b76f2e2..39a01462401 100644
--- a/apps/dashboard/src/@/components/blocks/code-segment.client.tsx
+++ b/apps/dashboard/src/@/components/blocks/code-segment.client.tsx
@@ -1,7 +1,7 @@
 "use client";
-import { CodeClient } from "@/components/ui/code/code.client";
 import type React from "react";
 import { type Dispatch, type SetStateAction, useMemo } from "react";
+import { CodeClient } from "@/components/ui/code/code.client";
 import { TabButtons } from "../ui/tabs";
 
 export type CodeEnvironment =
@@ -91,38 +91,36 @@ export const CodeSegment: React.FC<CodeSegmentProps> = ({
     >
       {!hideTabs && (
         <TabButtons
+          hideBottomLine={!!onlyTabs}
+          tabClassName="text-sm gap-2 !text-sm"
+          tabContainerClassName="px-3 pt-1.5 gap-0.5"
+          tabIconClassName="size-4"
           tabs={environments.map((env) => ({
-            label: env.title,
-            onClick: () => setEnvironment(env.environment),
             isActive: activeEnvironment === env.environment,
+            label: env.title,
             name: env.title,
+            onClick: () => setEnvironment(env.environment),
           }))}
-          tabClassName="text-sm gap-2 !text-sm"
-          tabIconClassName="size-4"
-          tabContainerClassName="px-3 pt-1.5 gap-0.5"
-          hideBottomLine={!!onlyTabs}
         />
       )}
 
       {onlyTabs ? null : (
-        <>
-          <CodeClient
-            code={code}
-            className="rounded-none border-none"
-            lang={
-              isInstallCommand
-                ? activeEnvironment === "react-native"
-                  ? "tsx"
-                  : "bash"
-                : activeEnvironment === "react" ||
-                    activeEnvironment === "react-native"
-                  ? "tsx"
-                  : activeEnvironment === "unity"
-                    ? "cpp"
-                    : activeEnvironment
-            }
-          />
-        </>
+        <CodeClient
+          className="rounded-none border-none"
+          code={code}
+          lang={
+            isInstallCommand
+              ? activeEnvironment === "react-native"
+                ? "tsx"
+                : "bash"
+              : activeEnvironment === "react" ||
+                  activeEnvironment === "react-native"
+                ? "tsx"
+                : activeEnvironment === "unity"
+                  ? "cpp"
+                  : activeEnvironment
+          }
+        />
       )}
     </div>
   );
diff --git a/apps/dashboard/src/@/components/blocks/code-segment.stories.tsx b/apps/dashboard/src/@/components/blocks/code-segment.stories.tsx
index 09fb395e000..2bf0c3d94c1 100644
--- a/apps/dashboard/src/@/components/blocks/code-segment.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/code-segment.stories.tsx
@@ -1,3 +1,6 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useState } from "react";
+import { BadgeContainer } from "stories/utils";
 import {
   Select,
   SelectContent,
@@ -6,19 +9,16 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useState } from "react";
-import { BadgeContainer } from "stories/utils";
 import { type CodeEnvironment, CodeSegment } from "./code-segment.client";
 
 const meta = {
-  title: "blocks/CodeSegment",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/CodeSegment",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -37,10 +37,10 @@ function Story() {
   return (
     <div className="container flex max-w-[700px] flex-col gap-10 py-10">
       <Select
-        value={mode}
         onValueChange={(v) => {
           setMode(v as Mode);
         }}
+        value={mode}
       >
         <SelectTrigger className="w-[180px]">
           <SelectValue />
@@ -58,12 +58,12 @@ function Story() {
         </SelectContent>
       </Select>
 
-      <Variant envsToShow={["javascript"]} storyLabel="1 env" mode={mode} />
+      <Variant envsToShow={["javascript"]} mode={mode} storyLabel="1 env" />
 
       <Variant
         envsToShow={["javascript", "typescript"]}
-        storyLabel="2 envs"
         mode={mode}
+        storyLabel="2 envs"
       />
 
       <Variant
@@ -74,8 +74,8 @@ function Story() {
           "react-native",
           "unity",
         ]}
-        storyLabel="5 envs"
         mode={mode}
+        storyLabel="5 envs"
       />
     </div>
   );
@@ -92,23 +92,23 @@ function Variant(props: {
   return (
     <BadgeContainer label={props.storyLabel}>
       <CodeSegment
+        environment={env}
+        hideTabs={props.mode === "no-tabs"}
+        onlyTabs={props.mode === "only-tabs"}
+        setEnvironment={setEnv}
         snippet={{
           javascript: props.envsToShow.includes("javascript")
             ? jsCode
             : undefined,
           react: props.envsToShow.includes("react") ? jsxCode : undefined,
-          unity: props.envsToShow.includes("unity") ? unityCode : undefined,
           "react-native": props.envsToShow.includes("react-native")
             ? jsxCode
             : undefined,
           typescript: props.envsToShow.includes("typescript")
             ? tsCode
             : undefined,
+          unity: props.envsToShow.includes("unity") ? unityCode : undefined,
         }}
-        environment={env}
-        setEnvironment={setEnv}
-        hideTabs={props.mode === "no-tabs"}
-        onlyTabs={props.mode === "only-tabs"}
       />
     </BadgeContainer>
   );
diff --git a/apps/dashboard/src/@/components/blocks/dismissible-alert.tsx b/apps/dashboard/src/@/components/blocks/dismissible-alert.tsx
index daa89d1025a..3bc132f3b93 100644
--- a/apps/dashboard/src/@/components/blocks/dismissible-alert.tsx
+++ b/apps/dashboard/src/@/components/blocks/dismissible-alert.tsx
@@ -20,9 +20,9 @@ export function DismissibleAlert(props: {
   return (
     <div className="relative rounded-lg border border-border bg-card p-4">
       <Button
-        onClick={() => setIsVisible(false)}
-        className="absolute top-4 right-4 h-auto w-auto p-1 text-muted-foreground"
         aria-label="Close alert"
+        className="absolute top-4 right-4 h-auto w-auto p-1 text-muted-foreground"
+        onClick={() => setIsVisible(false)}
         variant="ghost"
       >
         <XIcon className="size-5" />
diff --git a/apps/dashboard/src/@/components/blocks/distribution-chart.tsx b/apps/dashboard/src/@/components/blocks/distribution-chart.tsx
index 2c9b8ea1c5c..8abb8373679 100644
--- a/apps/dashboard/src/@/components/blocks/distribution-chart.tsx
+++ b/apps/dashboard/src/@/components/blocks/distribution-chart.tsx
@@ -38,11 +38,11 @@ export function DistributionBarChart(props: DistributionBarChartProps) {
         {props.segments.map((segment) => {
           return (
             <div
-              key={segment.label}
               className="flex h-full items-center justify-center transition-all duration-200"
+              key={segment.label}
               style={{
-                width: `${segment.percent}%`,
                 backgroundColor: segment.color,
+                width: `${segment.percent}%`,
               }}
             />
           );
@@ -53,7 +53,7 @@ export function DistributionBarChart(props: DistributionBarChartProps) {
       <div className="mt-3 flex flex-col gap-1 lg:flex-row lg:gap-6">
         {props.segments.map((segment) => {
           return (
-            <div key={segment.label} className="flex items-center gap-1.5">
+            <div className="flex items-center gap-1.5" key={segment.label}>
               <div
                 className="size-3 rounded-full"
                 style={{
diff --git a/apps/dashboard/src/@/components/blocks/drop-zone/drop-zone.stories.tsx b/apps/dashboard/src/@/components/blocks/drop-zone/drop-zone.stories.tsx
index 7b90ee2d63e..ae0ebd29c7f 100644
--- a/apps/dashboard/src/@/components/blocks/drop-zone/drop-zone.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/drop-zone/drop-zone.stories.tsx
@@ -2,7 +2,6 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { DropZone } from "./drop-zone";
 
 const meta = {
-  title: "blocks/DropZone",
   component: DropZone,
   decorators: [
     (Story) => (
@@ -11,6 +10,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "blocks/DropZone",
 } satisfies Meta<typeof DropZone>;
 
 export default meta;
@@ -18,36 +18,36 @@ type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
+    accept: undefined,
+    description: "This is a description for drop zone",
     isError: false,
     onDrop: () => {},
-    title: "This is a title",
-    description: "This is a description for drop zone",
-    accept: undefined,
     resetButton: undefined,
+    title: "This is a title",
   },
 };
 
 export const ErrorState: Story = {
   args: {
+    accept: undefined,
+    description: "This is a description",
     isError: true,
     onDrop: () => {},
-    title: "this is title",
-    description: "This is a description",
-    accept: undefined,
     resetButton: undefined,
+    title: "this is title",
   },
 };
 
 export const ErrorStateWithResetButton: Story = {
   args: {
+    accept: undefined,
+    description: "This is a description",
     isError: true,
     onDrop: () => {},
-    title: "this is title",
-    description: "This is a description",
-    accept: undefined,
     resetButton: {
       label: "Remove Files",
       onClick: () => {},
     },
+    title: "this is title",
   },
 };
diff --git a/apps/dashboard/src/@/components/blocks/drop-zone/drop-zone.tsx b/apps/dashboard/src/@/components/blocks/drop-zone/drop-zone.tsx
index 4bc7612177e..519e456254e 100644
--- a/apps/dashboard/src/@/components/blocks/drop-zone/drop-zone.tsx
+++ b/apps/dashboard/src/@/components/blocks/drop-zone/drop-zone.tsx
@@ -1,7 +1,7 @@
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import { UploadIcon, XIcon } from "lucide-react";
 import { useDropzone } from "react-dropzone";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 
 export function DropZone(props: {
   isError: boolean;
@@ -64,11 +64,11 @@ export function DropZone(props: {
             {resetButton && (
               <Button
                 className="relative z-50 mt-4"
-                size="sm"
                 onClick={(e) => {
                   e.stopPropagation();
                   resetButton.onClick();
                 }}
+                size="sm"
               >
                 {resetButton.label}
               </Button>
diff --git a/apps/dashboard/src/@/components/blocks/error-fallbacks/unexpect-value-error-message.tsx b/apps/dashboard/src/@/components/blocks/error-fallbacks/unexpect-value-error-message.tsx
index 2642f46882f..a14d18e0afb 100644
--- a/apps/dashboard/src/@/components/blocks/error-fallbacks/unexpect-value-error-message.tsx
+++ b/apps/dashboard/src/@/components/blocks/error-fallbacks/unexpect-value-error-message.tsx
@@ -1,6 +1,6 @@
+import { useMemo } from "react";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { useMemo } from "react";
 
 export function UnexpectedValueErrorMessage(props: {
   value: unknown;
@@ -30,11 +30,11 @@ export function UnexpectedValueErrorMessage(props: {
           </ScrollShadow>
 
           <CopyTextButton
+            className="-translate-x-2 mt-1 text-muted-foreground"
             copyIconPosition="left"
-            textToShow="Copy value"
             textToCopy={stringifiedValue}
+            textToShow="Copy value"
             tooltip="Copy value"
-            className="-translate-x-2 mt-1 text-muted-foreground"
             variant="ghost"
           />
         </div>
diff --git a/apps/dashboard/src/@/components/blocks/multi-select.stories.tsx b/apps/dashboard/src/@/components/blocks/multi-select.stories.tsx
index 816ae7ca763..0c3af5cc055 100644
--- a/apps/dashboard/src/@/components/blocks/multi-select.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/multi-select.stories.tsx
@@ -4,13 +4,13 @@ import { BadgeContainer } from "../../../stories/utils";
 import { MultiSelect } from "./multi-select";
 
 const meta = {
-  title: "blocks/MultiSelect",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/MultiSelect",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -22,26 +22,26 @@ export const Variants: Story = {
 
 function createList(len: number) {
   return Array.from({ length: len }, (_, i) => ({
-    value: `${i}`,
     label: `Item ${i}`,
+    value: `${i}`,
   }));
 }
 
 function Story() {
   return (
     <div className="container flex max-w-6xl flex-col gap-6 py-10">
-      <VariantTest defaultValues={[]} storyLabel="5 items" listLen={5} />
-      <VariantTest defaultValues={[]} storyLabel="5000 items" listLen={5000} />
+      <VariantTest defaultValues={[]} listLen={5} storyLabel="5 items" />
+      <VariantTest defaultValues={[]} listLen={5000} storyLabel="5000 items" />
       <VariantTest
         defaultValues={["1", "3", "5"]}
-        storyLabel="20 items, 3 selected by default"
         listLen={20}
+        storyLabel="20 items, 3 selected by default"
       />
       <VariantTest
         defaultValues={["1", "2", "3", "4", "5", "6", "7"]}
-        storyLabel="20 items, 7 selected, show max 3"
         listLen={20}
         maxCount={3}
+        storyLabel="20 items, 7 selected, show max 3"
       />
     </div>
   );
@@ -59,13 +59,13 @@ function VariantTest(props: {
   return (
     <BadgeContainer label={props.storyLabel}>
       <MultiSelect
-        selectedValues={values}
-        options={list}
+        maxCount={props.maxCount}
         onSelectedValuesChange={(values) => {
           setValues(values);
         }}
+        options={list}
         placeholder="Select items"
-        maxCount={props.maxCount}
+        selectedValues={values}
       />
     </BadgeContainer>
   );
diff --git a/apps/dashboard/src/@/components/blocks/multi-select.tsx b/apps/dashboard/src/@/components/blocks/multi-select.tsx
index b50ec0befc9..9a2c118c877 100644
--- a/apps/dashboard/src/@/components/blocks/multi-select.tsx
+++ b/apps/dashboard/src/@/components/blocks/multi-select.tsx
@@ -1,6 +1,8 @@
-/* eslint-disable no-restricted-syntax */
+/** biome-ignore-all lint/a11y/useSemanticElements: FIXME */
 "use client";
 
+import { CheckIcon, ChevronDownIcon, SearchIcon, XIcon } from "lucide-react";
+import { forwardRef, useCallback, useMemo, useRef, useState } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Popover,
@@ -9,18 +11,9 @@ import {
 } from "@/components/ui/popover";
 import { Separator } from "@/components/ui/separator";
 import { cn } from "@/lib/utils";
-import { CheckIcon, ChevronDownIcon, SearchIcon, XIcon } from "lucide-react";
-import {
-  forwardRef,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
 import { useShowMore } from "../../lib/useShowMore";
-import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 import { Input } from "../ui/input";
+import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 
 interface MultiSelectProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement> {
@@ -150,58 +143,48 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
 
     // scroll to top when options change
     const popoverElRef = useRef<HTMLDivElement>(null);
-    // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
-    useEffect(() => {
-      const scrollContainer =
-        popoverElRef.current?.querySelector("[data-scrollable]");
-      if (scrollContainer) {
-        scrollContainer.scrollTo({
-          top: 0,
-        });
-      }
-    }, [searchValue]);
 
     return (
-      <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen} modal>
+      <Popover modal onOpenChange={setIsPopoverOpen} open={isPopoverOpen}>
         <PopoverTrigger asChild>
           {props.customTrigger || (
             <Button
               ref={ref}
               {...props}
-              onClick={handleTogglePopover}
               className={cn(
                 "flex h-auto min-h-10 w-full items-center justify-between rounded-md border border-border bg-inherit p-3 hover:bg-inherit",
                 className,
               )}
+              onClick={handleTogglePopover}
             >
               {selectedValues.length > 0 ? (
                 <div className="flex w-full items-center justify-between">
                   <SelectedChainsBadges
-                    selectedValues={selectedValues}
-                    options={options}
+                    clearExtraOptions={clearExtraOptions}
                     maxCount={maxCount}
                     onClose={handleClear}
+                    options={options}
+                    selectedValues={selectedValues}
                     toggleOption={toggleOption}
-                    clearExtraOptions={clearExtraOptions}
                   />
                   <div className="flex items-center justify-between gap-2">
                     {/* Clear All */}
-                    {/* biome-ignore lint/a11y/useKeyWithClickEvents: <explanation> */}
-                    {/* biome-ignore lint/a11y/useFocusableInteractive: <explanation> */}
+                    {/* biome-ignore lint/a11y/useKeyWithClickEvents: FIXME */}
+                    {/* biome-ignore lint/a11y/useFocusableInteractive: FIXME */}
                     <div
-                      role="button"
+                      className="rounded p-1 hover:bg-accent"
                       onClick={(event) => {
                         event.stopPropagation();
                         handleClear();
                       }}
-                      className="rounded p-1 hover:bg-accent"
+                      role="button"
                     >
                       <XIcon className="h-4 cursor-pointer text-muted-foreground" />
                     </div>
 
                     <Separator
-                      orientation="vertical"
                       className="flex h-full min-h-6"
+                      orientation="vertical"
                     />
                     <ChevronDownIcon className="h-4 cursor-pointer text-muted-foreground" />
                   </div>
@@ -218,20 +201,20 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
           )}
         </PopoverTrigger>
         <PopoverContent
+          align={props.align}
           className={cn(
             "flex max-h-[500px] flex-col p-0",
             popoverContentClassName,
           )}
-          align={props.align}
+          onEscapeKeyDown={() => setIsPopoverOpen(false)}
+          ref={popoverElRef}
           side={props.side}
           sideOffset={10}
-          onEscapeKeyDown={() => setIsPopoverOpen(false)}
           style={{
-            width: "var(--radix-popover-trigger-width)",
             height:
               "calc(var(--radix-popover-content-available-height) - 40px)",
+            width: "var(--radix-popover-trigger-width)",
           }}
-          ref={popoverElRef}
         >
           {/* Search */}
           <div className="relative">
@@ -239,13 +222,22 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
               customSearchInput
             ) : (
               <Input
-                placeholder={searchPlaceholder || "Search"}
-                value={searchValue}
-                // do not focus on the input when the popover opens to avoid opening the keyboard
-                tabIndex={-1}
-                onChange={(e) => setSearchValue(e.target.value)}
                 className="!h-auto rounded-b-none border-0 border-border border-b py-4 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0"
+                onChange={(e) => {
+                  setSearchValue(e.target.value);
+                  const scrollContainer =
+                    popoverElRef.current?.querySelector("[data-scrollable]");
+                  if (scrollContainer) {
+                    scrollContainer.scrollTo({
+                      top: 0,
+                    });
+                  }
+                }}
+                // do not focus on the input when the popover opens to avoid opening the keyboard
                 onKeyDown={handleInputKeyDown}
+                placeholder={searchPlaceholder || "Search"}
+                tabIndex={-1}
+                value={searchValue}
               />
             )}
             <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-4 size-4 text-muted-foreground" />
@@ -259,8 +251,8 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
 
           {optionsToShow.length > 0 && (
             <ScrollShadow
-              scrollableClassName="p-1 h-full"
               className="flex-1 rounded"
+              scrollableClassName="p-1 h-full"
             >
               {/* List */}
               <div>
@@ -268,15 +260,15 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
                   const isSelected = selectedValues.includes(option.value);
                   return (
                     <Button
-                      key={option.value}
-                      role="option"
                       aria-selected={isSelected}
-                      onClick={() => toggleOption(option.value)}
-                      variant="ghost"
                       className="flex w-full cursor-pointer justify-start gap-3 rounded-sm px-3 py-2 text-left"
+                      key={option.value}
+                      onClick={() => toggleOption(option.value)}
                       ref={
                         i === optionsToShow.length - 1 ? lastItemRef : undefined
                       }
+                      role="option"
+                      variant="ghost"
                     >
                       <div
                         className={cn(
@@ -302,12 +294,12 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
           {showSelectedValuesInModal && selectedValues.length > 0 && (
             <div className="border-t px-3 py-3">
               <SelectedChainsBadges
-                selectedValues={selectedValues}
-                options={options}
+                clearExtraOptions={clearExtraOptions}
                 maxCount={maxCount}
                 onClose={handleClear}
+                options={options}
+                selectedValues={selectedValues}
                 toggleOption={toggleOption}
-                clearExtraOptions={clearExtraOptions}
               />
             </div>
           )}
@@ -317,10 +309,7 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
   },
 );
 
-function ClosableBadge(props: {
-  label: string;
-  onClose: () => void;
-}) {
+function ClosableBadge(props: { label: string; onClose: () => void }) {
   return (
     <span className="flex items-center gap-3 rounded-xl border border-border bg-muted px-2 py-1 text-foreground text-xs">
       {props.label}
diff --git a/apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.stories.tsx b/apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.stories.tsx
index 866f6e69280..639fa9b7413 100644
--- a/apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.stories.tsx
@@ -2,7 +2,6 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { MultiStepStatus } from "./multi-step-status";
 
 const meta = {
-  title: "Blocks/MultiStepStatus",
   component: MultiStepStatus,
   decorators: [
     (Story) => (
@@ -11,6 +10,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Blocks/MultiStepStatus",
 } satisfies Meta<typeof MultiStepStatus>;
 
 export default meta;
@@ -21,29 +21,29 @@ export const AllStates: Story = {
     onRetry: () => {},
     steps: [
       {
-        status: { type: "completed" },
-        label: "Connect Wallet",
         id: "connect-wallet",
+        label: "Connect Wallet",
+        status: { type: "completed" },
       },
       {
-        status: { type: "pending" },
-        label: "Sign Message",
         id: "sign-message",
+        label: "Sign Message",
+        status: { type: "pending" },
       },
       {
-        status: { type: "error", message: "This is an error message" },
-        label: "Approve Transaction",
         id: "approve-transaction",
+        label: "Approve Transaction",
+        status: { message: "This is an error message", type: "error" },
       },
       {
-        status: { type: "idle" },
-        label: "Confirm Transaction",
         id: "confirm-transaction",
+        label: "Confirm Transaction",
+        status: { type: "idle" },
       },
       {
-        status: { type: "idle" },
-        label: "Finalize",
         id: "finalize",
+        label: "Finalize",
+        status: { type: "idle" },
       },
     ],
   },
diff --git a/apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.tsx b/apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.tsx
index 3f56c48c287..fa37f0f1149 100644
--- a/apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.tsx
+++ b/apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import {
   AlertCircleIcon,
   CircleCheckIcon,
   CircleIcon,
   RefreshCwIcon,
 } from "lucide-react";
+import { Button } from "@/components/ui/button";
 import { DynamicHeight } from "../../ui/DynamicHeight";
 import { Spinner } from "../../ui/Spinner/Spinner";
 
@@ -32,7 +32,7 @@ export function MultiStepStatus<T extends string>(props: {
     <DynamicHeight>
       <div className="space-y-4">
         {props.steps.map((step) => (
-          <div key={step.label} className="flex items-start space-x-3 ">
+          <div className="flex items-start space-x-3 " key={step.label}>
             {step.status.type === "completed" ? (
               <CircleCheckIcon className="mt-0.5 size-5 flex-shrink-0 text-green-500" />
             ) : step.status.type === "pending" ? (
@@ -72,10 +72,10 @@ export function MultiStepStatus<T extends string>(props: {
                     {step.status.message}
                   </p>
                   <Button
-                    variant="destructive"
-                    size="sm"
                     className="gap-2"
                     onClick={() => props.onRetry(step)}
+                    size="sm"
+                    variant="destructive"
                   >
                     <RefreshCwIcon className="size-4" />
                     Retry
diff --git a/apps/dashboard/src/@/components/blocks/notifications/notification-button.tsx b/apps/dashboard/src/@/components/blocks/notifications/notification-button.tsx
index f7ab81f24fc..f52f9f330db 100644
--- a/apps/dashboard/src/@/components/blocks/notifications/notification-button.tsx
+++ b/apps/dashboard/src/@/components/blocks/notifications/notification-button.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { BellIcon } from "lucide-react";
+import { useMemo, useState } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Drawer,
@@ -13,8 +15,6 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { useIsMobile } from "@/hooks/use-mobile";
-import { BellIcon } from "lucide-react";
-import { useMemo, useState } from "react";
 import { NotificationList } from "./notification-list";
 import { useNotifications } from "./state/manager";
 
@@ -26,7 +26,7 @@ export function NotificationsButton(props: { accountId: string }) {
 
   const trigger = useMemo(
     () => (
-      <Button variant="outline" size="icon" className="relative rounded-full">
+      <Button className="relative rounded-full" size="icon" variant="outline">
         <BellIcon className="h-4 w-4" />
         {(manager.unreadNotificationsCount || 0) > 0 && (
           <span className="absolute top-0 right-0 flex h-2 w-2">
@@ -41,7 +41,7 @@ export function NotificationsButton(props: { accountId: string }) {
 
   if (isMobile) {
     return (
-      <Drawer open={open} onOpenChange={setOpen}>
+      <Drawer onOpenChange={setOpen} open={open}>
         <DrawerTrigger asChild>{trigger}</DrawerTrigger>
         <DrawerContent className="max-h-[90vh] min-h-[66vh]">
           <DrawerTitle className="sr-only">Notifications</DrawerTitle>
@@ -52,11 +52,11 @@ export function NotificationsButton(props: { accountId: string }) {
   }
 
   return (
-    <Popover open={open} onOpenChange={setOpen}>
+    <Popover onOpenChange={setOpen} open={open}>
       <PopoverTrigger asChild>{trigger}</PopoverTrigger>
       <PopoverContent
-        className="max-h-[90vh] min-h-[500px] w-[400px] max-w-md p-0"
         align="end"
+        className="max-h-[90vh] min-h-[500px] w-[400px] max-w-md p-0"
       >
         <NotificationList {...manager} />
       </PopoverContent>
diff --git a/apps/dashboard/src/@/components/blocks/notifications/notification-entry.tsx b/apps/dashboard/src/@/components/blocks/notifications/notification-entry.tsx
index d13bbc730d5..341740abfa1 100644
--- a/apps/dashboard/src/@/components/blocks/notifications/notification-entry.tsx
+++ b/apps/dashboard/src/@/components/blocks/notifications/notification-entry.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import type { Notification } from "@/api/notifications";
-import { Button } from "@/components/ui/button";
 import {
   format,
   formatDistanceToNow,
@@ -11,6 +9,8 @@ import {
 } from "date-fns";
 import { ArchiveIcon } from "lucide-react";
 import { useMemo } from "react";
+import type { Notification } from "@/api/notifications";
+import { Button } from "@/components/ui/button";
 
 interface NotificationEntryProps {
   notification: Notification;
@@ -54,11 +54,11 @@ export function NotificationEntry({
               <p className="text-muted-foreground text-xs">{timeAgo}</p>
             )}
             <div className="flex flex-row justify-between gap-2 pt-1">
-              <Button asChild variant="link" size="sm" className="px-0">
+              <Button asChild className="px-0" size="sm" variant="link">
                 <a
                   href={notification.ctaUrl}
-                  target="_blank"
                   rel="noopener noreferrer"
+                  target="_blank"
                 >
                   {notification.ctaText}
                 </a>
@@ -68,10 +68,10 @@ export function NotificationEntry({
         </div>
         {onMarkAsRead && (
           <Button
-            variant="ghost"
-            size="icon"
-            onClick={() => onMarkAsRead(notification.id)}
             className="text-muted-foreground hover:text-foreground"
+            onClick={() => onMarkAsRead(notification.id)}
+            size="icon"
+            variant="ghost"
           >
             <ArchiveIcon className="h-4 w-4" />
           </Button>
diff --git a/apps/dashboard/src/@/components/blocks/notifications/notification-list.tsx b/apps/dashboard/src/@/components/blocks/notifications/notification-list.tsx
index 476c985f172..b13d46130e3 100644
--- a/apps/dashboard/src/@/components/blocks/notifications/notification-list.tsx
+++ b/apps/dashboard/src/@/components/blocks/notifications/notification-list.tsx
@@ -1,7 +1,7 @@
 "use client";
-import { TabButtons } from "@/components/ui/tabs";
 import { ArchiveIcon, BellIcon, Loader2Icon } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
+import { TabButtons } from "@/components/ui/tabs";
 import { Badge } from "../../ui/badge";
 import { NotificationEntry } from "./notification-entry";
 import type { useNotifications } from "./state/manager";
@@ -23,10 +23,11 @@ export function NotificationList(props: ReturnType<typeof useNotifications>) {
   return (
     <div className="flex w-full flex-1 flex-col">
       <TabButtons
-        tabContainerClassName="space-x-6 px-4 pt-2"
         tabClassName="!text-sm hover:!bg-transparent !px-0 !py-1"
+        tabContainerClassName="space-x-6 px-4 pt-2"
         tabs={[
           {
+            isActive: activeTab === "inbox",
             name: (
               <div className="flex items-center gap-1">
                 Inbox
@@ -38,12 +39,11 @@ export function NotificationList(props: ReturnType<typeof useNotifications>) {
               </div>
             ),
             onClick: () => setActiveTab("inbox"),
-            isActive: activeTab === "inbox",
           },
           {
+            isActive: activeTab === "archive",
             name: "Archive",
             onClick: () => setActiveTab("archive"),
-            isActive: activeTab === "archive",
           },
         ]}
       />
@@ -54,21 +54,21 @@ export function NotificationList(props: ReturnType<typeof useNotifications>) {
       >
         {activeTab === "inbox" ? (
           <InboxTab
-            unreadNotifications={props.unreadNotifications}
-            isLoadingUnread={props.isLoadingUnread}
             hasMoreUnread={props.hasMoreUnread}
             isFetchingMoreUnread={props.isFetchingMoreUnread}
+            isLoadingUnread={props.isLoadingUnread}
             loadMoreUnread={props.loadMoreUnread}
-            markAsRead={props.markAsRead}
             markAllAsRead={props.markAllAsRead}
+            markAsRead={props.markAsRead}
             scrollContainerRef={scrollContainerRef}
+            unreadNotifications={props.unreadNotifications}
           />
         ) : (
           <ArchiveTab
             archivedNotifications={props.archivedNotifications}
-            isLoadingArchived={props.isLoadingArchived}
             hasMoreArchived={props.hasMoreArchived}
             isFetchingMoreArchived={props.isFetchingMoreArchived}
+            isLoadingArchived={props.isLoadingArchived}
             loadMoreArchived={props.loadMoreArchived}
             scrollContainerRef={scrollContainerRef}
           />
@@ -110,8 +110,8 @@ function InboxTab(
       ))}
       <AutoLoadMore
         hasMore={props.hasMoreUnread}
-        loadMore={props.loadMoreUnread}
         isLoading={props.isFetchingMoreUnread || props.isLoadingUnread}
+        loadMore={props.loadMoreUnread}
         scrollContainerRef={props.scrollContainerRef}
       />
     </>
@@ -144,8 +144,8 @@ function ArchiveTab(
       ))}
       <AutoLoadMore
         hasMore={props.hasMoreArchived}
-        loadMore={props.loadMoreArchived}
         isLoading={props.isFetchingMoreArchived || props.isLoadingArchived}
+        loadMore={props.loadMoreArchived}
         scrollContainerRef={props.scrollContainerRef}
       />
     </>
@@ -198,5 +198,5 @@ function AutoLoadMore(props: {
     );
   }
 
-  return <div ref={ref} className="h-[1px] w-full opacity-0" aria-hidden />;
+  return <div aria-hidden className="h-[1px] w-full opacity-0" ref={ref} />;
 }
diff --git a/apps/dashboard/src/@/components/blocks/notifications/state/manager.ts b/apps/dashboard/src/@/components/blocks/notifications/state/manager.ts
index 0def2459717..390770b8636 100644
--- a/apps/dashboard/src/@/components/blocks/notifications/state/manager.ts
+++ b/apps/dashboard/src/@/components/blocks/notifications/state/manager.ts
@@ -1,13 +1,5 @@
 "use client";
 
-import {
-  type Notification,
-  type NotificationsApiResponse,
-  getArchivedNotifications,
-  getUnreadNotifications,
-  getUnreadNotificationsCount,
-  markNotificationAsRead,
-} from "@/api/notifications";
 import {
   type InfiniteData,
   useInfiniteQuery,
@@ -15,9 +7,16 @@ import {
   useQuery,
   useQueryClient,
 } from "@tanstack/react-query";
-
 import { useMemo } from "react";
 import { toast } from "sonner";
+import {
+  getArchivedNotifications,
+  getUnreadNotifications,
+  getUnreadNotificationsCount,
+  markNotificationAsRead,
+  type Notification,
+  type NotificationsApiResponse,
+} from "@/api/notifications";
 
 /**
  * Internal helper to safely flatten pages coming from useInfiniteQuery.
@@ -68,7 +67,9 @@ export function useNotifications(accountId: string) {
   );
 
   const unreadQuery = useInfiniteQuery<NotificationsApiResponse>({
-    queryKey: unreadQueryKey,
+    enabled: !!accountId,
+    getNextPageParam: (lastPage) => lastPage?.nextCursor ?? undefined,
+    initialPageParam: undefined as string | undefined,
     queryFn: async ({ pageParam }) => {
       const cursor = (pageParam ?? undefined) as string | undefined;
       const res = await getUnreadNotifications(cursor);
@@ -77,14 +78,14 @@ export function useNotifications(accountId: string) {
       }
       return res.data;
     },
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: (lastPage) => lastPage?.nextCursor ?? undefined,
-    enabled: !!accountId,
+    queryKey: unreadQueryKey,
     refetchInterval: 60_000, // 1min
   });
 
   const archivedQuery = useInfiniteQuery<NotificationsApiResponse>({
-    queryKey: archivedQueryKey,
+    enabled: !!accountId,
+    getNextPageParam: (lastPage) => lastPage?.nextCursor ?? undefined,
+    initialPageParam: undefined as string | undefined,
     queryFn: async ({ pageParam }) => {
       const cursor = (pageParam ?? undefined) as string | undefined;
       const res = await getArchivedNotifications(cursor);
@@ -93,14 +94,12 @@ export function useNotifications(accountId: string) {
       }
       return res.data;
     },
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: (lastPage) => lastPage?.nextCursor ?? undefined,
-    enabled: !!accountId,
+    queryKey: archivedQueryKey,
     refetchInterval: 60_000, // 1min
   });
 
   const unreadCountQuery = useQuery({
-    queryKey: unreadCountKey,
+    enabled: !!accountId,
     queryFn: async () => {
       const res = await getUnreadNotificationsCount();
       if (res.status === "error") {
@@ -108,8 +107,8 @@ export function useNotifications(accountId: string) {
       }
       return res.data.result.unreadCount;
     },
-    refetchInterval: 60_000, // 1min
-    enabled: !!accountId,
+    queryKey: unreadCountKey, // 1min
+    refetchInterval: 60_000,
   });
 
   // --------------------
@@ -172,16 +171,7 @@ export function useNotifications(accountId: string) {
         queryClient.setQueryData(unreadCountKey, optimisticCount);
       }
 
-      return { previousUnread, previousCount } as const;
-    },
-    // Rollback on error
-    onError: (_err, _vars, context) => {
-      if (context?.previousUnread) {
-        queryClient.setQueryData(unreadQueryKey, context.previousUnread);
-      }
-      if (typeof context?.previousCount === "number") {
-        queryClient.setQueryData(unreadCountKey, context.previousCount);
-      }
+      return { previousCount, previousUnread } as const;
     },
     // Always refetch to ensure consistency
     onSettled: () => {
@@ -199,25 +189,25 @@ export function useNotifications(accountId: string) {
   const unreadNotificationsCount = unreadCountQuery.data ?? 0; // this is the total unread count
 
   return {
-    // data
-    unreadNotifications,
     archivedNotifications,
-    unreadNotificationsCount,
+    hasMoreArchived: archivedQuery.hasNextPage ?? false,
+    hasMoreUnread: unreadQuery.hasNextPage ?? false,
+    isFetchingMoreArchived: archivedQuery.isFetchingNextPage,
+    isFetchingMoreUnread: unreadQuery.isFetchingNextPage,
+    isLoadingArchived: archivedQuery.isLoading,
 
     // booleans
     isLoadingUnread: unreadQuery.isLoading,
-    isLoadingArchived: archivedQuery.isLoading,
-    hasMoreUnread: unreadQuery.hasNextPage ?? false,
-    hasMoreArchived: archivedQuery.hasNextPage ?? false,
-    isFetchingMoreUnread: unreadQuery.isFetchingNextPage,
-    isFetchingMoreArchived: archivedQuery.isFetchingNextPage,
+    loadMoreArchived: () => archivedQuery.fetchNextPage(),
 
     // pagination helpers
     loadMoreUnread: () => unreadQuery.fetchNextPage(),
-    loadMoreArchived: () => archivedQuery.fetchNextPage(),
+    markAllAsRead: () => archiveMutation.mutate(undefined),
 
     // mutations
     markAsRead: (id: string) => archiveMutation.mutate(id),
-    markAllAsRead: () => archiveMutation.mutate(undefined),
+    // data
+    unreadNotifications,
+    unreadNotificationsCount,
   } as const;
 }
diff --git a/apps/dashboard/src/@/components/blocks/pricing-card.tsx b/apps/dashboard/src/@/components/blocks/pricing-card.tsx
index d947fe59602..f8e51be3537 100644
--- a/apps/dashboard/src/@/components/blocks/pricing-card.tsx
+++ b/apps/dashboard/src/@/components/blocks/pricing-card.tsx
@@ -1,15 +1,15 @@
 "use client";
-import type { Team } from "@/api/team";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import { RenewSubscriptionButton } from "components/settings/Account/Billing/renew-subscription/renew-subscription-button";
 import { CheckIcon, DollarSignIcon } from "lucide-react";
 import Link from "next/link";
 import type React from "react";
 import { remainingDays } from "utils/date-utils";
 import { TEAM_PLANS } from "utils/pricing";
+import type { Team } from "@/api/team";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
 import type { ProductSKU } from "../../lib/billing";
 import { CheckoutButton } from "../billing";
 
@@ -141,18 +141,18 @@ export const PricingCard: React.FC<PricingCardProps> = ({
       {cta && (
         <div className="flex flex-col gap-3">
           {cta.type === "renew" && (
-            <RenewSubscriptionButton teamId={teamId} getTeam={getTeam} />
+            <RenewSubscriptionButton getTeam={getTeam} teamId={teamId} />
           )}
           {billingPlanToSkuMap[billingPlan] && cta.type === "checkout" && (
             <CheckoutButton
               billingStatus={billingStatus}
               buttonProps={{
-                variant: highlighted ? "default" : "outline",
                 className: highlighted ? undefined : "bg-background",
                 onClick: cta.onClick,
+                variant: highlighted ? "default" : "outline",
               }}
-              teamSlug={teamSlug}
               sku={billingPlanToSkuMap[billingPlan]}
+              teamSlug={teamSlug}
             >
               {has7DayTrial ? "Start 7 Day Free Trial" : cta.label}
             </CheckoutButton>
@@ -160,15 +160,15 @@ export const PricingCard: React.FC<PricingCardProps> = ({
 
           {cta.type === "link" && (
             <Button
-              variant={highlighted ? "default" : "outline"}
-              className={highlighted ? undefined : "bg-background"}
               asChild
+              className={highlighted ? undefined : "bg-background"}
+              variant={highlighted ? "default" : "outline"}
             >
               <Link
                 href={cta.href}
-                target="_blank"
                 onClick={cta.onClick}
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 {has7DayTrial ? "Start 7 Day Free Trial" : cta.label}
               </Link>
@@ -188,14 +188,14 @@ export const PricingCard: React.FC<PricingCardProps> = ({
 
 const billingPlanToSkuMap: Record<Team["billingPlan"], ProductSKU | undefined> =
   {
-    starter: "plan:starter",
-    growth: "plan:growth",
-    scale: "plan:scale",
-    pro: "plan:pro",
     // we can't render checkout buttons for these plans:
     accelerate: undefined,
     free: undefined,
+    growth: "plan:growth",
     growth_legacy: undefined,
+    pro: "plan:pro",
+    scale: "plan:scale",
+    starter: "plan:starter",
   };
 
 type FeatureItemProps = {
diff --git a/apps/dashboard/src/@/components/blocks/select-with-search.stories.tsx b/apps/dashboard/src/@/components/blocks/select-with-search.stories.tsx
index 62141deedab..46bad18f4bd 100644
--- a/apps/dashboard/src/@/components/blocks/select-with-search.stories.tsx
+++ b/apps/dashboard/src/@/components/blocks/select-with-search.stories.tsx
@@ -4,13 +4,13 @@ import { BadgeContainer } from "../../../stories/utils";
 import { SelectWithSearch } from "./select-with-search";
 
 const meta = {
-  title: "blocks/SelectWithSearch",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/SelectWithSearch",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -22,20 +22,20 @@ export const Variants: Story = {
 
 function createList(len: number) {
   return Array.from({ length: len }, (_, i) => ({
-    value: `${i}`,
     label: `Item ${i}`,
+    value: `${i}`,
   }));
 }
 
 function Story() {
   return (
     <div className="container flex max-w-6xl flex-col gap-6 py-10">
-      <VariantTest storyLabel="5 items" listLen={5} />
-      <VariantTest storyLabel="5000 items" listLen={5000} />
+      <VariantTest listLen={5} storyLabel="5 items" />
+      <VariantTest listLen={5000} storyLabel="5000 items" />
       <VariantTest
         defaultValue={"3"}
-        storyLabel="20 items, 3 selected by default"
         listLen={20}
+        storyLabel="20 items, 3 selected by default"
       />
     </div>
   );
@@ -52,10 +52,10 @@ function VariantTest(props: {
   return (
     <BadgeContainer label={props.storyLabel}>
       <SelectWithSearch
-        value={value}
-        options={list}
         onValueChange={setValue}
+        options={list}
         placeholder="Select items"
+        value={value}
       />
     </BadgeContainer>
   );
diff --git a/apps/dashboard/src/@/components/blocks/select-with-search.tsx b/apps/dashboard/src/@/components/blocks/select-with-search.tsx
index ec9663d0358..ed3b8c4fd7e 100644
--- a/apps/dashboard/src/@/components/blocks/select-with-search.tsx
+++ b/apps/dashboard/src/@/components/blocks/select-with-search.tsx
@@ -1,6 +1,7 @@
-/* eslint-disable no-restricted-syntax */
 "use client";
 
+import { CheckIcon, ChevronDownIcon, SearchIcon } from "lucide-react";
+import React, { useMemo, useRef } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Popover,
@@ -8,11 +9,9 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { cn } from "@/lib/utils";
-import { CheckIcon, ChevronDownIcon, SearchIcon } from "lucide-react";
-import React, { useRef, useMemo, useEffect } from "react";
 import { useShowMore } from "../../lib/useShowMore";
-import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 import { Input } from "../ui/input";
+import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 
 interface SelectWithSearchProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement> {
@@ -101,28 +100,18 @@ export const SelectWithSearch = React.forwardRef<
 
     // scroll to top when options change
     const popoverElRef = useRef<HTMLDivElement>(null);
-    // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
-    useEffect(() => {
-      const scrollContainer =
-        popoverElRef.current?.querySelector("[data-scrollable]");
-      if (scrollContainer) {
-        scrollContainer.scrollTo({
-          top: 0,
-        });
-      }
-    }, [searchValue]);
 
     return (
-      <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen} modal>
+      <Popover modal onOpenChange={setIsPopoverOpen} open={isPopoverOpen}>
         <PopoverTrigger asChild>
           <Button
             ref={ref}
             {...props}
-            onClick={() => setIsPopoverOpen(true)}
             className={cn(
               "flex w-full items-center justify-between rounded-md border border-border bg-inherit p-3 hover:bg-inherit",
               className,
             )}
+            onClick={() => setIsPopoverOpen(true)}
           >
             <div className="flex w-full items-center justify-between gap-2">
               <span
@@ -141,32 +130,41 @@ export const SelectWithSearch = React.forwardRef<
         </PopoverTrigger>
 
         <PopoverContent
-          className={cn("p-0", popoverContentClassName)}
           align={props.align || "center"}
+          className={cn("p-0", popoverContentClassName)}
+          onEscapeKeyDown={() => setIsPopoverOpen(false)}
+          ref={popoverElRef}
           side={props.side}
           sideOffset={10}
-          onEscapeKeyDown={() => setIsPopoverOpen(false)}
           style={{
-            width: "var(--radix-popover-trigger-width)",
             maxHeight: "var(--radix-popover-content-available-height)",
+            width: "var(--radix-popover-trigger-width)",
           }}
-          ref={popoverElRef}
         >
           <div>
             {/* Search */}
             <div className="relative">
               <Input
+                className="!h-auto rounded-b-none border-0 border-border border-b py-3 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0"
+                onChange={(e) => {
+                  setSearchValue(e.target.value);
+                  const scrollContainer =
+                    popoverElRef.current?.querySelector("[data-scrollable]");
+                  if (scrollContainer) {
+                    scrollContainer.scrollTo({
+                      top: 0,
+                    });
+                  }
+                }}
                 placeholder={searchPlaceholder || "Search"}
                 value={searchValue}
-                onChange={(e) => setSearchValue(e.target.value)}
-                className="!h-auto rounded-b-none border-0 border-border border-b py-3 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0"
               />
               <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-4 size-4 text-muted-foreground" />
             </div>
 
             <ScrollShadow
-              scrollableClassName="max-h-[min(calc(var(--radix-popover-content-available-height)-60px),350px)] p-1"
               className="rounded"
+              scrollableClassName="max-h-[min(calc(var(--radix-popover-content-available-height)-60px),350px)] p-1"
             >
               {/* List */}
               <div>
@@ -180,20 +178,21 @@ export const SelectWithSearch = React.forwardRef<
                   const isSelected = value === option.value;
                   return (
                     <Button
-                      key={option.value}
-                      role="option"
                       aria-selected={isSelected}
+                      className="flex w-full cursor-pointer justify-start gap-3 rounded-sm px-3 py-2 text-left"
+                      key={option.value}
                       onClick={() => {
                         onValueChange(option.value);
                         if (closeOnSelect) {
                           setIsPopoverOpen(false);
                         }
                       }}
-                      variant="ghost"
-                      className="flex w-full cursor-pointer justify-start gap-3 rounded-sm px-3 py-2 text-left"
                       ref={
                         i === optionsToShow.length - 1 ? lastItemRef : undefined
                       }
+                      // biome-ignore lint/a11y/useSemanticElements: TDOO
+                      role="option"
+                      variant="ghost"
                     >
                       {showCheck && (
                         <div className="flex size-4 items-center justify-center">
diff --git a/apps/dashboard/src/@/components/blocks/skeletons/GenericLoadingPage.tsx b/apps/dashboard/src/@/components/blocks/skeletons/GenericLoadingPage.tsx
index 23a492985fd..bd3ce7076f6 100644
--- a/apps/dashboard/src/@/components/blocks/skeletons/GenericLoadingPage.tsx
+++ b/apps/dashboard/src/@/components/blocks/skeletons/GenericLoadingPage.tsx
@@ -3,11 +3,7 @@
 import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { cn } from "../../../lib/utils";
 
-export function GenericLoadingPage({
-  className,
-}: {
-  className?: string;
-}) {
+export function GenericLoadingPage({ className }: { className?: string }) {
   return (
     <div
       className={cn(
diff --git a/apps/dashboard/src/@/components/blocks/upsell-wrapper.tsx b/apps/dashboard/src/@/components/blocks/upsell-wrapper.tsx
index a499d7161fe..f746dbc5326 100644
--- a/apps/dashboard/src/@/components/blocks/upsell-wrapper.tsx
+++ b/apps/dashboard/src/@/components/blocks/upsell-wrapper.tsx
@@ -1,5 +1,8 @@
 "use client";
 
+import { CrownIcon, LockIcon, SparklesIcon } from "lucide-react";
+import Link from "next/link";
+import type React from "react";
 import { Button } from "@/components/ui/button";
 import {
   Card,
@@ -9,9 +12,6 @@ import {
   CardTitle,
 } from "@/components/ui/card";
 import { cn } from "@/lib/utils";
-import { CrownIcon, LockIcon, SparklesIcon } from "lucide-react";
-import Link from "next/link";
-import type React from "react";
 import { TeamPlanBadge } from "../../../app/(app)/components/TeamPlanBadge";
 import type { Team } from "../../api/team";
 import { Badge } from "../ui/badge";
@@ -69,8 +69,8 @@ export function UpsellWrapper({
             <div className="space-y-2">
               <TeamPlanBadge
                 plan="scale"
-                teamSlug={teamSlug}
                 postfix=" Feature"
+                teamSlug={teamSlug}
               />
               <CardTitle className="font-bold text-2xl text-foreground md:text-3xl">
                 Unlock {featureName}
@@ -90,15 +90,15 @@ export function UpsellWrapper({
                 <div className="grid gap-2">
                   {benefits.map((benefit) => (
                     <div
-                      key={benefit.description}
                       className="flex items-center gap-3"
+                      key={benefit.description}
                     >
                       <div className="flex h-5 w-5 flex-shrink-0 items-center justify-center rounded-full bg-accent">
                         <SparklesIcon className="h-3 w-3 text-success-text" />
                       </div>
                       <span className="text-sm">{benefit.description}</span>
                       {benefit.status === "soon" && (
-                        <Badge variant="secondary" className="text-xs">
+                        <Badge className="text-xs" variant="secondary">
                           Coming Soon
                         </Badge>
                       )}
@@ -109,7 +109,7 @@ export function UpsellWrapper({
             )}
 
             <div className="flex flex-col gap-3 pt-4 sm:flex-row">
-              <Button className="flex-1 py-3 font-semibold" size="lg" asChild>
+              <Button asChild className="flex-1 py-3 font-semibold" size="lg">
                 <Link
                   href={`/team/${teamSlug}/~/settings/billing?showPlans=true&highlight=${requiredPlan}`}
                 >
@@ -118,7 +118,7 @@ export function UpsellWrapper({
                   <span className="ml-1 capitalize">{requiredPlan}</span>
                 </Link>
               </Button>
-              <Button variant="outline" size="lg" className="md:flex-1" asChild>
+              <Button asChild className="md:flex-1" size="lg" variant="outline">
                 <Link
                   href={`/team/${teamSlug}/~/settings/billing?showPlans=true`}
                 >
diff --git a/apps/dashboard/src/@/components/blocks/wallet-address.tsx b/apps/dashboard/src/@/components/blocks/wallet-address.tsx
index 848d647c340..c43b9e36c8b 100644
--- a/apps/dashboard/src/@/components/blocks/wallet-address.tsx
+++ b/apps/dashboard/src/@/components/blocks/wallet-address.tsx
@@ -1,4 +1,9 @@
 "use client";
+import { useClipboard } from "hooks/useClipboard";
+import { CheckIcon, CopyIcon, XIcon } from "lucide-react";
+import { useMemo } from "react";
+import { isAddress, type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
+import { Blobbie, type SocialProfile, useSocialProfiles } from "thirdweb/react";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import {
   HoverCard,
@@ -6,12 +11,6 @@ import {
   HoverCardTrigger,
 } from "@/components/ui/hover-card";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { useClipboard } from "hooks/useClipboard";
-import { CheckIcon, CopyIcon, XIcon } from "lucide-react";
-import { useMemo } from "react";
-import { type ThirdwebClient, isAddress } from "thirdweb";
-import { ZERO_ADDRESS } from "thirdweb";
-import { Blobbie, type SocialProfile, useSocialProfiles } from "thirdweb/react";
 import { cn } from "../../lib/utils";
 import { Badge } from "../ui/badge";
 import { Button } from "../ui/button";
@@ -47,7 +46,7 @@ export function WalletAddress(props: {
 
   if (!isAddress(address)) {
     return (
-      <ToolTipLabel label={address} hoverable>
+      <ToolTipLabel hoverable label={address}>
         <span className="flex items-center gap-2 underline-offset-4 hover:underline">
           <div className="flex size-6 items-center justify-center rounded-full border bg-background">
             <XIcon className="size-4 text-muted-foreground" />
@@ -70,19 +69,19 @@ export function WalletAddress(props: {
         tabIndex={props.preventOpenOnFocus ? -1 : undefined}
       >
         <Button
-          onClick={(e) => e.stopPropagation()}
-          variant="link"
           className={cn(
             "flex flex-row items-center gap-2 px-0",
             props.className,
           )}
+          onClick={(e) => e.stopPropagation()}
+          variant="link"
         >
           {address && (
             <WalletAvatar
               address={address}
+              iconClassName={props.iconClassName}
               profiles={profiles.data || []}
               thirdwebClient={props.client}
-              iconClassName={props.iconClassName}
             />
           )}
           <span className="cursor-pointer font-mono">
@@ -101,10 +100,10 @@ export function WalletAddress(props: {
           <div className="flex items-center justify-between">
             <h3 className="font-semibold text-lg">Wallet Address</h3>
             <Button
-              variant="outline"
-              size="sm"
-              onClick={onCopy}
               className="flex items-center gap-2"
+              onClick={onCopy}
+              size="sm"
+              variant="outline"
             >
               {hasCopied ? (
                 <CheckIcon className="h-4 w-4" />
@@ -137,9 +136,9 @@ export function WalletAddress(props: {
                   {walletAvatarLink && (
                     <Avatar>
                       <AvatarImage
-                        src={walletAvatarLink}
                         alt={profile.name}
                         className="object-cover"
+                        src={walletAvatarLink}
                       />
                       {profile.name && (
                         <AvatarFallback>
@@ -197,14 +196,14 @@ function WalletAvatar(props: {
     >
       {resolvedAvatarSrc ? (
         <Img
-          src={resolvedAvatarSrc}
           className={cn("size-6 object-cover", props.iconClassName)}
+          src={resolvedAvatarSrc}
         />
       ) : (
         <Blobbie
           address={props.address}
-          size={24}
           className={props.iconClassName}
+          size={24}
         />
       )}
     </div>
diff --git a/apps/dashboard/src/@/components/color-mode-toggle.tsx b/apps/dashboard/src/@/components/color-mode-toggle.tsx
index 41dc2be94ba..69fa420315d 100644
--- a/apps/dashboard/src/@/components/color-mode-toggle.tsx
+++ b/apps/dashboard/src/@/components/color-mode-toggle.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { ClientOnly } from "@/components/blocks/client-only";
-import { Button } from "@/components/ui/button";
 import { MoonIcon, SunIcon } from "lucide-react";
 import { useTheme } from "next-themes";
+import { ClientOnly } from "@/components/blocks/client-only";
+import { Button } from "@/components/ui/button";
 import { Skeleton } from "./ui/skeleton";
 
 export function ToggleThemeButton() {
@@ -14,12 +14,12 @@ export function ToggleThemeButton() {
       ssr={<Skeleton className="size-[34px] rounded-full border bg-accent" />}
     >
       <Button
-        variant="outline"
+        aria-label="Toggle theme"
+        className="h-auto w-auto rounded-full border border-border bg-background p-2"
         onClick={() => {
           setTheme(theme === "dark" ? "light" : "dark");
         }}
-        aria-label="Toggle theme"
-        className="h-auto w-auto rounded-full border border-border bg-background p-2"
+        variant="outline"
       >
         {theme === "light" ? (
           <SunIcon className="size-4" />
diff --git a/apps/dashboard/src/@/components/pagination-buttons.stories.tsx b/apps/dashboard/src/@/components/pagination-buttons.stories.tsx
index bf82556944f..401598d7241 100644
--- a/apps/dashboard/src/@/components/pagination-buttons.stories.tsx
+++ b/apps/dashboard/src/@/components/pagination-buttons.stories.tsx
@@ -4,13 +4,13 @@ import { BadgeContainer } from "stories/utils";
 import { PaginationButtons } from "./pagination-buttons";
 
 const meta = {
-  title: "blocks/PaginationButtons",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/PaginationButtons",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -32,10 +32,7 @@ function Story() {
   );
 }
 
-function Variant(props: {
-  label: string;
-  totalPages: number;
-}) {
+function Variant(props: { label: string; totalPages: number }) {
   const [activePage, setActivePage] = useState(1);
   return (
     <BadgeContainer label={props.label}>
diff --git a/apps/dashboard/src/@/components/pagination-buttons.tsx b/apps/dashboard/src/@/components/pagination-buttons.tsx
index 1e3f6851758..a8142024279 100644
--- a/apps/dashboard/src/@/components/pagination-buttons.tsx
+++ b/apps/dashboard/src/@/components/pagination-buttons.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { ArrowUpRightIcon } from "lucide-react";
+import { useState } from "react";
 import {
   Pagination,
   PaginationContent,
@@ -9,8 +11,6 @@ import {
   PaginationNext,
   PaginationPrevious,
 } from "@/components/ui/pagination";
-import { ArrowUpRightIcon } from "lucide-react";
-import { useState } from "react";
 import { cn } from "../lib/utils";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
@@ -179,27 +179,27 @@ export const PaginationButtons = (props: {
 
         <div className="relative flex items-center">
           <Input
-            value={pageNumberInput}
-            onChange={(e) => {
-              setInputHasError(false);
-              setPageNumberInput(e.target.value);
-            }}
-            type="number"
-            placeholder="Page"
             className={cn(
               "w-[60px] bg-transparent [appearance:textfield] max-sm:placeholder:text-sm lg:w-[100px] lg:pr-8 [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none",
               inputHasError && "text-red-500",
             )}
+            onChange={(e) => {
+              setInputHasError(false);
+              setPageNumberInput(e.target.value);
+            }}
             onKeyDown={(e) => {
               if (e.key === "Enter") {
                 handlePageInputSubmit();
               }
             }}
+            placeholder="Page"
+            type="number"
+            value={pageNumberInput}
           />
           <Button
-            variant="ghost"
             className="absolute right-1 h-auto w-auto p-2 max-sm:hidden"
             onClick={handlePageInputSubmit}
+            variant="ghost"
           >
             <ArrowUpRightIcon className="size-4" />
           </Button>
diff --git a/apps/dashboard/src/@/components/ui/ConfirmationDialog.tsx b/apps/dashboard/src/@/components/ui/ConfirmationDialog.tsx
index 71fc93fa063..1df6a543225 100644
--- a/apps/dashboard/src/@/components/ui/ConfirmationDialog.tsx
+++ b/apps/dashboard/src/@/components/ui/ConfirmationDialog.tsx
@@ -1,3 +1,5 @@
+import type { VariantProps } from "class-variance-authority";
+import type React from "react";
 import {
   AlertDialog,
   AlertDialogAction,
@@ -11,8 +13,6 @@ import {
 } from "@/components/ui/alert-dialog";
 import type { buttonVariants } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
-import type { VariantProps } from "class-variance-authority";
-import type React from "react";
 
 export interface ConfirmationDialogProps
   extends VariantProps<typeof buttonVariants> {
@@ -36,7 +36,7 @@ export function ConfirmationDialog({
   className,
 }: ConfirmationDialogProps) {
   return (
-    <AlertDialog open={open} onOpenChange={onOpenChange}>
+    <AlertDialog onOpenChange={onOpenChange} open={open}>
       <AlertDialogTrigger asChild>{children}</AlertDialogTrigger>
 
       <AlertDialogContent className={cn("w-[90vw] sm:w-auto", className)}>
@@ -48,12 +48,12 @@ export function ConfirmationDialog({
           <AlertDialogCancel>Cancel</AlertDialogCancel>
 
           <AlertDialogAction
-            variant={variant}
-            type="submit"
             onClick={() => {
               onSubmit?.();
               onOpenChange?.(false);
             }}
+            type="submit"
+            variant={variant}
           >
             Continue
           </AlertDialogAction>
diff --git a/apps/dashboard/src/@/components/ui/CopyAddressButton.tsx b/apps/dashboard/src/@/components/ui/CopyAddressButton.tsx
index 22115ff1f03..03941891434 100644
--- a/apps/dashboard/src/@/components/ui/CopyAddressButton.tsx
+++ b/apps/dashboard/src/@/components/ui/CopyAddressButton.tsx
@@ -20,12 +20,12 @@ export function CopyAddressButton(props: {
 
   return (
     <CopyTextButton
+      className={cn("font-mono text-sm", props.className)}
+      copyIconPosition={props.copyIconPosition}
       textToCopy={props.address}
       textToShow={shortenedAddress}
       tooltip="Copy Address"
-      className={cn("font-mono text-sm", props.className)}
       variant={props.variant}
-      copyIconPosition={props.copyIconPosition}
     />
   );
 }
diff --git a/apps/dashboard/src/@/components/ui/CopyButton.tsx b/apps/dashboard/src/@/components/ui/CopyButton.tsx
index ffa411fa5c8..4e46643cbd7 100644
--- a/apps/dashboard/src/@/components/ui/CopyButton.tsx
+++ b/apps/dashboard/src/@/components/ui/CopyButton.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { useClipboard } from "hooks/useClipboard";
 import { CheckIcon, CopyIcon } from "lucide-react";
+import { cn } from "@/lib/utils";
 import { Button } from "./button";
 import { ToolTipLabel } from "./tooltip";
 
@@ -16,10 +16,10 @@ export function CopyButton(props: {
   return (
     <ToolTipLabel label="Copy">
       <Button
-        variant={props.variant || "ghost"}
         aria-label="Copy"
         className={cn("h-auto w-auto p-1", props.className)}
         onClick={onCopy}
+        variant={props.variant || "ghost"}
       >
         {hasCopied ? (
           <CheckIcon
diff --git a/apps/dashboard/src/@/components/ui/CopyTextButton.tsx b/apps/dashboard/src/@/components/ui/CopyTextButton.tsx
index 6ec9722bc51..b34e8043b69 100644
--- a/apps/dashboard/src/@/components/ui/CopyTextButton.tsx
+++ b/apps/dashboard/src/@/components/ui/CopyTextButton.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { useClipboard } from "hooks/useClipboard";
 import { CheckIcon, CopyIcon } from "lucide-react";
+import { cn } from "@/lib/utils";
 import { Button } from "./button";
 import { ToolTipLabel } from "./tooltip";
 
@@ -39,7 +39,6 @@ export function CopyTextButton(props: {
   return (
     <ToolTipLabel label={props.tooltip}>
       <Button
-        variant={props.variant || "outline"}
         aria-label={props.tooltip}
         className={cn(
           "flex h-auto w-auto gap-2 rounded-lg px-1.5 py-0.5 font-normal text-foreground",
@@ -50,6 +49,7 @@ export function CopyTextButton(props: {
           e.stopPropagation();
           props.onClick?.();
         }}
+        variant={props.variant || "outline"}
       >
         {props.copyIconPosition === "right" ? (
           <>
diff --git a/apps/dashboard/src/@/components/ui/DatePickerWithRange.tsx b/apps/dashboard/src/@/components/ui/DatePickerWithRange.tsx
index ae396c0d6a7..672df91096c 100644
--- a/apps/dashboard/src/@/components/ui/DatePickerWithRange.tsx
+++ b/apps/dashboard/src/@/components/ui/DatePickerWithRange.tsx
@@ -1,5 +1,8 @@
 "use client";
 
+import { format, isBefore } from "date-fns";
+import { CalendarIcon, CalendarX2Icon, ChevronDownIcon } from "lucide-react";
+import React from "react";
 import { Button } from "@/components/ui/button";
 import { Calendar } from "@/components/ui/calendar";
 import {
@@ -8,9 +11,6 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { cn } from "@/lib/utils";
-import { format, isBefore } from "date-fns";
-import { CalendarIcon, CalendarX2Icon, ChevronDownIcon } from "lucide-react";
-import React from "react";
 import { DynamicHeight } from "./DynamicHeight";
 import { TabButtons } from "./tabs";
 
@@ -33,23 +33,22 @@ export function DatePickerWithRange(props: {
 
   return (
     <Popover
-      open={isOpen}
       onOpenChange={(v) => {
         if (!v) {
           setScreen("from");
         }
         setIsOpen(v);
       }}
+      open={isOpen}
     >
       {/* Button */}
       <PopoverTrigger asChild>
         <Button
-          id="date"
-          variant="outline"
           className={cn(
             "justify-start gap-2 text-left font-normal",
             props.className,
           )}
+          variant="outline"
         >
           <CalendarIcon className="h-4 w-4" />
           {props.labelOverride || (
@@ -63,8 +62,8 @@ export function DatePickerWithRange(props: {
 
       {/* Popover */}
       <PopoverContent
-        className="w-auto p-0"
         align={props.popoverAlign || "start"}
+        className="w-auto p-0"
         sideOffset={10}
       >
         <DynamicHeight>
@@ -79,19 +78,19 @@ export function DatePickerWithRange(props: {
 
             <div className={cn("px-4", !props.header && "py-4")}>
               <TabButtons
-                tabClassName="!text-sm"
                 activeTabClassName="!bg-inverted !text-inverted-foreground"
+                tabClassName="!text-sm"
                 tabContainerClassName="gap-2"
                 tabs={[
                   {
+                    isActive: screen === "from",
                     name: "From",
                     onClick: () => setScreen("from"),
-                    isActive: screen === "from",
                   },
                   {
+                    isActive: screen === "to",
                     name: "To",
                     onClick: () => setScreen("to"),
-                    isActive: screen === "to",
                   },
                 ]}
               />
@@ -99,44 +98,44 @@ export function DatePickerWithRange(props: {
 
             {screen === "from" && (
               <Calendar
-                key={from.toString()}
-                mode="range"
-                selected={{
-                  from,
-                  to,
+                classNames={{
+                  day_range_end:
+                    "!bg-inverted/50 !text-inverted-foreground pointer-events-none",
+                  day_range_start: "!bg-inverted !text-inverted-foreground",
                 }}
                 defaultMonth={from}
+                key={from.toString()}
+                mode="range"
                 onDayClick={(newFrom) => {
                   if (isBefore(newFrom, to)) {
                     setFrom(newFrom);
                   }
                 }}
-                classNames={{
-                  day_range_start: "!bg-inverted !text-inverted-foreground",
-                  day_range_end:
-                    "!bg-inverted/50 !text-inverted-foreground pointer-events-none",
+                selected={{
+                  from,
+                  to,
                 }}
               />
             )}
 
             {screen === "to" && (
               <Calendar
-                key={to.toString()}
-                mode="range"
-                selected={{
-                  from,
-                  to,
+                classNames={{
+                  day_range_end: "!bg-inverted !text-inverted-foreground",
+                  day_range_start:
+                    "!bg-inverted/50 !text-inverted-foreground pointer-events-none",
                 }}
                 defaultMonth={to}
+                key={to.toString()}
+                mode="range"
                 onDayClick={(newTo) => {
                   if (isBefore(from, newTo)) {
                     setTo(newTo);
                   }
                 }}
-                classNames={{
-                  day_range_end: "!bg-inverted !text-inverted-foreground",
-                  day_range_start:
-                    "!bg-inverted/50 !text-inverted-foreground pointer-events-none",
+                selected={{
+                  from,
+                  to,
                 }}
               />
             )}
diff --git a/apps/dashboard/src/@/components/ui/DynamicHeight.tsx b/apps/dashboard/src/@/components/ui/DynamicHeight.tsx
index 9d39437e496..d2bb3b91e78 100644
--- a/apps/dashboard/src/@/components/ui/DynamicHeight.tsx
+++ b/apps/dashboard/src/@/components/ui/DynamicHeight.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 import type React from "react";
 import { useRef, useState } from "react";
+import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 
 export function DynamicHeight(props: {
   children: React.ReactNode;
@@ -14,12 +14,12 @@ export function DynamicHeight(props: {
   return (
     <div
       style={{
+        boxSizing: "border-box",
         height: height ? `${height}px` : "auto",
+        overflow: "hidden",
         transition:
           props.transition ||
           "height 210ms cubic-bezier(0.175, 0.885, 0.32, 1.1)",
-        overflow: "hidden",
-        boxSizing: "border-box",
       }}
     >
       <div
@@ -55,5 +55,5 @@ export function useHeightObserver() {
     };
   }, []);
 
-  return { height, elementRef };
+  return { elementRef, height };
 }
diff --git a/apps/dashboard/src/@/components/ui/NavLink.tsx b/apps/dashboard/src/@/components/ui/NavLink.tsx
index 11bfb2948f4..0f6509855f7 100644
--- a/apps/dashboard/src/@/components/ui/NavLink.tsx
+++ b/apps/dashboard/src/@/components/ui/NavLink.tsx
@@ -1,9 +1,8 @@
 "use client";
 
-import { cn } from "@/lib/utils";
-
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { cn } from "@/lib/utils";
 
 export type NavButtonProps = {
   className?: string;
@@ -22,11 +21,11 @@ export function NavLink(props: React.PropsWithChildren<NavButtonProps>) {
     : false;
   return (
     <Link
-      href={props.href}
       className={cn(props.className, isActive && props.activeClassName)}
-      target={props.href.startsWith("http") ? "_blank" : undefined}
-      prefetch={false}
+      href={props.href}
       onClick={props.onClick}
+      prefetch={false}
+      target={props.href.startsWith("http") ? "_blank" : undefined}
     >
       {props.children}
     </Link>
diff --git a/apps/dashboard/src/@/components/ui/ScrollShadow/ScrollShadow.tsx b/apps/dashboard/src/@/components/ui/ScrollShadow/ScrollShadow.tsx
index 85f605ce09a..360a258a433 100644
--- a/apps/dashboard/src/@/components/ui/ScrollShadow/ScrollShadow.tsx
+++ b/apps/dashboard/src/@/components/ui/ScrollShadow/ScrollShadow.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import { useRef } from "react";
 import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 import { cn } from "@/lib/utils";
-import { useRef } from "react";
 import styles from "./ScrollShadow.module.css";
 
 export function ScrollShadow(props: {
@@ -102,8 +102,8 @@ export function ScrollShadow(props: {
         )}
         ref={shadowTopEl}
         style={{
-          opacity: "0",
           display: props.disableTopShadow ? "none" : "block",
+          opacity: "0",
         }}
       />
       <div
@@ -141,8 +141,8 @@ export function ScrollShadow(props: {
       />
       <div
         className={cn("no-scrollbar overflow-auto", props.scrollableClassName)}
-        ref={scrollableEl}
         data-scrollable
+        ref={scrollableEl}
       >
         {props.children}
       </div>
diff --git a/apps/dashboard/src/@/components/ui/Spinner/Spinner.module.css b/apps/dashboard/src/@/components/ui/Spinner/Spinner.module.css
index 622a43a8a79..0367a2f3d33 100644
--- a/apps/dashboard/src/@/components/ui/Spinner/Spinner.module.css
+++ b/apps/dashboard/src/@/components/ui/Spinner/Spinner.module.css
@@ -1,7 +1,6 @@
 .loader {
   border-radius: 50%;
   position: relative;
-  animation: rotate 1s linear infinite;
   animation: rotate 2s linear infinite;
 }
 
diff --git a/apps/dashboard/src/@/components/ui/Spinner/Spinner.tsx b/apps/dashboard/src/@/components/ui/Spinner/Spinner.tsx
index c1f7d59f39d..4db57326dba 100644
--- a/apps/dashboard/src/@/components/ui/Spinner/Spinner.tsx
+++ b/apps/dashboard/src/@/components/ui/Spinner/Spinner.tsx
@@ -4,15 +4,15 @@ import style from "./Spinner.module.css";
 export function Spinner(props: { className?: string }) {
   return (
     <svg
-      viewBox="0 0 50 50"
       className={cn(style.loader, props.className || "size-4")}
+      viewBox="0 0 50 50"
     >
       <title>loading</title>
       <circle
         cx="25"
         cy="25"
-        r="20"
         fill="none"
+        r="20"
         stroke="currentColor"
         strokeWidth="4"
       />
diff --git a/apps/dashboard/src/@/components/ui/accordion.tsx b/apps/dashboard/src/@/components/ui/accordion.tsx
index 7b4a51c5676..d1b1f784446 100644
--- a/apps/dashboard/src/@/components/ui/accordion.tsx
+++ b/apps/dashboard/src/@/components/ui/accordion.tsx
@@ -13,8 +13,8 @@ const AccordionItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
 >(({ className, ...props }, ref) => (
   <AccordionPrimitive.Item
-    ref={ref}
     className={cn("border-border border-b", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -26,11 +26,11 @@ const AccordionTrigger = React.forwardRef<
 >(({ className, children, ...props }, ref) => (
   <AccordionPrimitive.Header className="flex">
     <AccordionPrimitive.Trigger
-      ref={ref}
       className={cn(
         "flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
         className,
       )}
+      ref={ref}
       {...props}
     >
       {children}
@@ -45,8 +45,8 @@ const AccordionContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
 >(({ className, children, ...props }, ref) => (
   <AccordionPrimitive.Content
-    ref={ref}
     className="overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
+    ref={ref}
     {...props}
   >
     <div className={cn("pt-0 pb-4", className)}>{children}</div>
diff --git a/apps/dashboard/src/@/components/ui/alert-dialog.tsx b/apps/dashboard/src/@/components/ui/alert-dialog.tsx
index ba70f254f9f..d8919ea1f85 100644
--- a/apps/dashboard/src/@/components/ui/alert-dialog.tsx
+++ b/apps/dashboard/src/@/components/ui/alert-dialog.tsx
@@ -1,11 +1,10 @@
 "use client";
 
 import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
+import type { VariantProps } from "class-variance-authority";
 import * as React from "react";
-
 import { buttonVariants } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
-import type { VariantProps } from "class-variance-authority";
 
 const AlertDialog = AlertDialogPrimitive.Root;
 
@@ -35,11 +34,11 @@ const AlertDialogContent = React.forwardRef<
   <AlertDialogPortal>
     <AlertDialogOverlay />
     <AlertDialogPrimitive.Content
-      ref={ref}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed top-[50%] left-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border bg-background p-6 shadow-lg duration-200 data-[state=closed]:animate-out data-[state=open]:animate-in",
         className,
       )}
+      ref={ref}
       {...props}
     />
   </AlertDialogPortal>
@@ -79,8 +78,8 @@ const AlertDialogTitle = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Title
-    ref={ref}
     className={cn("hyphens-auto font-semibold text-lg", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -91,8 +90,8 @@ const AlertDialogDescription = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Description
-    ref={ref}
     className={cn("text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -108,8 +107,8 @@ const AlertDialogAction = React.forwardRef<
   AlertDialogActionProps
 >((props: AlertDialogActionProps, ref) => (
   <AlertDialogPrimitive.Action
-    ref={ref}
     className={cn(buttonVariants({ variant: props.variant }), props.className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -120,12 +119,12 @@ const AlertDialogCancel = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Cancel
-    ref={ref}
     className={cn(
       buttonVariants({ variant: "outline" }),
       "mt-2 sm:mt-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/alert.tsx b/apps/dashboard/src/@/components/ui/alert.tsx
index 7994c5cfbd8..f574853b564 100644
--- a/apps/dashboard/src/@/components/ui/alert.tsx
+++ b/apps/dashboard/src/@/components/ui/alert.tsx
@@ -1,4 +1,4 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -6,6 +6,9 @@ import { cn } from "@/lib/utils";
 const alertVariants = cva(
   "bg-card relative w-full rounded-lg border border-border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",
   {
+    defaultVariants: {
+      variant: "default",
+    },
     variants: {
       variant: {
         default: "text-foreground",
@@ -14,9 +17,6 @@ const alertVariants = cva(
         warning: "text-warning-text [&>svg]:text-warning-text",
       },
     },
-    defaultVariants: {
-      variant: "default",
-    },
   },
 );
 
@@ -25,9 +25,9 @@ const Alert = React.forwardRef<
   React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
 >(({ className, variant, ...props }, ref) => (
   <div
+    className={cn(alertVariants({ variant }), className)}
     ref={ref}
     role="alert"
-    className={cn(alertVariants({ variant }), className)}
     {...props}
   />
 ));
@@ -38,8 +38,8 @@ const AlertTitle = React.forwardRef<
   React.HTMLAttributes<HTMLHeadingElement>
 >(({ className, ...props }, ref) => (
   <h5
-    ref={ref}
     className={cn("font-medium leading-tight tracking-tight", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -50,11 +50,11 @@ const AlertDescription = React.forwardRef<
   React.HTMLAttributes<HTMLParagraphElement>
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
     className={cn(
       "mt-1.5 text-muted-foreground text-sm [&_p]:leading-relaxed",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/avatar.tsx b/apps/dashboard/src/@/components/ui/avatar.tsx
index 9b121d26b7a..d6c12b52ce6 100644
--- a/apps/dashboard/src/@/components/ui/avatar.tsx
+++ b/apps/dashboard/src/@/components/ui/avatar.tsx
@@ -10,11 +10,11 @@ const Avatar = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>
 >(({ className, ...props }, ref) => (
   <AvatarPrimitive.Root
-    ref={ref}
     className={cn(
       "relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -25,8 +25,8 @@ const AvatarImage = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
 >(({ className, ...props }, ref) => (
   <AvatarPrimitive.Image
-    ref={ref}
     className={cn("aspect-square h-full w-full", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -37,11 +37,11 @@ const AvatarFallback = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>
 >(({ className, ...props }, ref) => (
   <AvatarPrimitive.Fallback
-    ref={ref}
     className={cn(
       "flex h-full w-full items-center justify-center rounded-full bg-muted",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/background-patterns.tsx b/apps/dashboard/src/@/components/ui/background-patterns.tsx
index 664031cb7a3..e9d0cbd0484 100644
--- a/apps/dashboard/src/@/components/ui/background-patterns.tsx
+++ b/apps/dashboard/src/@/components/ui/background-patterns.tsx
@@ -1,8 +1,6 @@
 import { cn } from "@/lib/utils";
 
-export function DotsBackgroundPattern(props: {
-  className?: string;
-}) {
+export function DotsBackgroundPattern(props: { className?: string }) {
   return (
     <div
       className={cn(
diff --git a/apps/dashboard/src/@/components/ui/badge.tsx b/apps/dashboard/src/@/components/ui/badge.tsx
index 078708826de..c1f5874fe11 100644
--- a/apps/dashboard/src/@/components/ui/badge.tsx
+++ b/apps/dashboard/src/@/components/ui/badge.tsx
@@ -1,4 +1,4 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import type * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -6,23 +6,23 @@ import { cn } from "@/lib/utils";
 const badgeVariants = cva(
   "inline-flex items-center rounded-full border border-border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 leading-4",
   {
+    defaultVariants: {
+      variant: "default",
+    },
     variants: {
       variant: {
         default: "border-transparent bg-primary/20 text-primary",
-        secondary:
-          "border-transparent bg-accent text-accent-foreground hover:bg-accent/80",
         destructive:
           "border-transparent dark:bg-red-950 dark:text-red-400 bg-red-500/20 text-red-800",
-        warning:
-          "border-transparent dark:bg-yellow-600/20 dark:text-yellow-500 bg-yellow-500/20 text-yellow-900",
         outline: "text-foreground",
+        secondary:
+          "border-transparent bg-accent text-accent-foreground hover:bg-accent/80",
         success:
           "border-transparent dark:bg-green-950/50 dark:text-green-400 bg-green-200 text-green-950",
+        warning:
+          "border-transparent dark:bg-yellow-600/20 dark:text-yellow-500 bg-yellow-500/20 text-yellow-900",
       },
     },
-    defaultVariants: {
-      variant: "default",
-    },
   },
 );
 
diff --git a/apps/dashboard/src/@/components/ui/breadcrumb.tsx b/apps/dashboard/src/@/components/ui/breadcrumb.tsx
index 55a81c58b7d..60e4b7848a3 100644
--- a/apps/dashboard/src/@/components/ui/breadcrumb.tsx
+++ b/apps/dashboard/src/@/components/ui/breadcrumb.tsx
@@ -9,7 +9,7 @@ const Breadcrumb = React.forwardRef<
   React.ComponentPropsWithoutRef<"nav"> & {
     separator?: React.ReactNode;
   }
->(({ ...props }, ref) => <nav ref={ref} aria-label="breadcrumb" {...props} />);
+>(({ ...props }, ref) => <nav aria-label="breadcrumb" ref={ref} {...props} />);
 Breadcrumb.displayName = "Breadcrumb";
 
 const BreadcrumbList = React.forwardRef<
@@ -17,11 +17,11 @@ const BreadcrumbList = React.forwardRef<
   React.ComponentPropsWithoutRef<"ol">
 >(({ className, ...props }, ref) => (
   <ol
-    ref={ref}
     className={cn(
       "flex flex-wrap items-center gap-1.5 break-words text-muted-foreground text-sm sm:gap-2.5",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -32,8 +32,8 @@ const BreadcrumbItem = React.forwardRef<
   React.ComponentPropsWithoutRef<"li">
 >(({ className, ...props }, ref) => (
   <li
-    ref={ref}
     className={cn("inline-flex items-center gap-1.5", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -49,8 +49,8 @@ const BreadcrumbLink = React.forwardRef<
 
   return (
     <Comp
-      ref={ref}
       className={cn("transition-colors hover:text-foreground", className)}
+      ref={ref}
       {...props}
     />
   );
@@ -63,11 +63,11 @@ const BreadcrumbPage = React.forwardRef<
 >(({ className, ...props }, ref) => (
   // biome-ignore lint/a11y/useFocusableInteractive: required
   <span
-    ref={ref}
-    role="link"
-    aria-disabled="true"
     aria-current="page"
+    aria-disabled="true"
     className={cn("font-normal text-foreground", className)}
+    ref={ref}
+    role="link"
     {...props}
   />
 ));
@@ -79,9 +79,9 @@ const BreadcrumbSeparator = ({
   ...props
 }: React.ComponentProps<"li">) => (
   <li
-    role="presentation"
     aria-hidden="true"
     className={cn("[&>svg]:size-3.5", className)}
+    role="presentation"
     {...props}
   >
     {children ?? <ChevronRightIcon />}
@@ -94,19 +94,19 @@ const BreadcrumbEllipsis = ({
   ...props
 }: React.ComponentProps<"span">) => (
   <span
-    role="presentation"
     aria-hidden="true"
     className={cn(
       "relative flex h-9 w-9 items-center justify-center",
       className,
     )}
+    role="presentation"
     {...props}
   >
     <MoreHorizontalIcon className="h-4 w-4" />
     <span className="sr-only">More</span>
   </span>
 );
-BreadcrumbEllipsis.displayName = "BreadcrumbElipssis";
+BreadcrumbEllipsis.displayName = "BreadcrumbEllipsis";
 
 export {
   Breadcrumb,
diff --git a/apps/dashboard/src/@/components/ui/button.stories.tsx b/apps/dashboard/src/@/components/ui/button.stories.tsx
index f0ebbefa022..2ac4a5c33c1 100644
--- a/apps/dashboard/src/@/components/ui/button.stories.tsx
+++ b/apps/dashboard/src/@/components/ui/button.stories.tsx
@@ -1,11 +1,11 @@
-import { Button } from "@/components/ui/button";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { StarIcon } from "lucide-react";
+import { Button } from "@/components/ui/button";
 import { BadgeContainer } from "../../../stories/utils";
 
 const meta = {
-  title: "Shadcn/Buttons",
   component: Component,
+  title: "Shadcn/Buttons",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -26,32 +26,30 @@ function Component() {
   );
 }
 
-function Variants(props: {
-  size: "default" | "icon" | "sm" | "lg";
-}) {
+function Variants(props: { size: "default" | "icon" | "sm" | "lg" }) {
   return (
     <BadgeContainer label={`Size: ${props.size}`}>
       <div className="flex gap-6">
         <Button size={props.size}>
           {props.size === "icon" ? <StarIcon className="size-4" /> : "Default"}
         </Button>
-        <Button variant="primary" size={props.size}>
+        <Button size={props.size} variant="primary">
           {props.size === "icon" ? <StarIcon className="size-4" /> : "Primary"}
         </Button>
-        <Button variant="secondary" size={props.size}>
+        <Button size={props.size} variant="secondary">
           {props.size === "icon" ? (
             <StarIcon className="size-4" />
           ) : (
             "Secondary"
           )}
         </Button>
-        <Button variant="ghost" size={props.size}>
+        <Button size={props.size} variant="ghost">
           {props.size === "icon" ? <StarIcon className="size-4" /> : "Ghost"}
         </Button>
-        <Button variant="outline" size={props.size}>
+        <Button size={props.size} variant="outline">
           {props.size === "icon" ? <StarIcon className="size-4" /> : "Outline"}
         </Button>
-        <Button variant="destructive" size={props.size}>
+        <Button size={props.size} variant="destructive">
           {props.size === "icon" ? (
             <StarIcon className="size-4" />
           ) : (
diff --git a/apps/dashboard/src/@/components/ui/button.tsx b/apps/dashboard/src/@/components/ui/button.tsx
index cb4966e89df..5e36eb49920 100644
--- a/apps/dashboard/src/@/components/ui/button.tsx
+++ b/apps/dashboard/src/@/components/ui/button.tsx
@@ -1,5 +1,5 @@
 import { Slot } from "@radix-ui/react-slot";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -7,32 +7,32 @@ import { cn } from "@/lib/utils";
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
   {
+    defaultVariants: {
+      size: "default",
+      variant: "default",
+    },
     variants: {
+      size: {
+        default: "h-10 px-4 py-2",
+        icon: "h-10 w-10",
+        lg: "h-11 rounded-md px-8",
+        sm: "h-9 rounded-md px-3",
+      },
       variant: {
-        primary: "bg-primary hover:bg-primary/90 text-primary-foreground ",
         default: "bg-foreground text-background hover:bg-foreground/90",
         destructive:
           "bg-destructive hover:bg-destructive/90 text-destructive-foreground ",
+        ghost: "hover:bg-accent hover:text-accent-foreground",
+        link: "underline-offset-4 hover:underline",
         outline:
           "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground",
+        pink: "border border-nebula-pink-foreground !text-nebula-pink-foreground bg-[hsl(var(--nebula-pink-foreground)/5%)] hover:bg-nebula-pink-foreground/10 dark:!text-foreground dark:bg-nebula-pink-foreground/10 dark:hover:bg-nebula-pink-foreground/20",
+        primary: "bg-primary hover:bg-primary/90 text-primary-foreground ",
         secondary:
           "bg-secondary hover:bg-secondary/80 text-secondary-foreground ",
-        ghost: "hover:bg-accent hover:text-accent-foreground",
-        link: "underline-offset-4 hover:underline",
-        pink: "border border-nebula-pink-foreground !text-nebula-pink-foreground bg-[hsl(var(--nebula-pink-foreground)/5%)] hover:bg-nebula-pink-foreground/10 dark:!text-foreground dark:bg-nebula-pink-foreground/10 dark:hover:bg-nebula-pink-foreground/20",
         upsell:
           "bg-green-600 text-white hover:bg-green-700 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5 transition-all duration-200",
       },
-      size: {
-        default: "h-10 px-4 py-2",
-        sm: "h-9 rounded-md px-3",
-        lg: "h-11 rounded-md px-8",
-        icon: "h-10 w-10",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
     },
   },
 );
@@ -66,13 +66,13 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 
     return (
       <Comp
+        aria-disabled={disabled ? true : undefined}
         className={cn(
-          buttonVariants({ variant, size, className }),
+          buttonVariants({ className, size, variant }),
           disabledClass,
         )}
-        ref={ref}
-        aria-disabled={disabled ? true : undefined}
         disabled={disabled}
+        ref={ref}
         {...props}
         {...btnOnlyProps}
       />
diff --git a/apps/dashboard/src/@/components/ui/calendar.tsx b/apps/dashboard/src/@/components/ui/calendar.tsx
index 31bee09c09c..af1ac7c4585 100644
--- a/apps/dashboard/src/@/components/ui/calendar.tsx
+++ b/apps/dashboard/src/@/components/ui/calendar.tsx
@@ -17,50 +17,53 @@ function Calendar({
 }: CalendarProps) {
   return (
     <DayPicker
-      showOutsideDays={showOutsideDays}
       className={cn("p-3", className)}
       classNames={{
-        months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
-        month: "space-y-4",
         caption: "flex justify-center pt-1 relative items-center",
         caption_label: "text-sm font-medium",
-        nav: "space-x-1 flex items-center",
-        nav_button: cn(
-          buttonVariants({ variant: "outline" }),
-          "h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
-        ),
-        nav_button_previous: "absolute left-1",
-        nav_button_next: "absolute right-1",
-        table: "w-full border-collapse space-y-1",
-        head_row: "flex",
-        head_cell:
-          "text-muted-foreground rounded-md w-9 font-normal text-[0.8rem]",
-        row: "flex w-full mt-2",
         cell: "h-9 w-9 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected])]:bg-accent first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20",
         day: cn(
           buttonVariants({ variant: "ghost" }),
           "h-9 w-9 p-0 font-normal aria-selected:opacity-100",
         ),
-        day_range_end: "day-range-end",
-        day_selected:
-          "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
-        day_today: "bg-accent text-accent-foreground",
+        day_disabled: "text-muted-foreground opacity-50",
+        day_hidden: "invisible",
         day_outside:
           "day-outside text-muted-foreground opacity-50 aria-selected:bg-accent/50 aria-selected:text-muted-foreground aria-selected:opacity-30",
-        day_disabled: "text-muted-foreground opacity-50",
+        day_range_end: "day-range-end",
         day_range_middle:
           "aria-selected:bg-accent aria-selected:text-accent-foreground",
-        day_hidden: "invisible",
+        day_selected:
+          "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
+        day_today: "bg-accent text-accent-foreground",
+        head_cell:
+          "text-muted-foreground rounded-md w-9 font-normal text-[0.8rem]",
+        head_row: "flex",
+        month: "space-y-4",
+        months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
+        nav: "space-x-1 flex items-center",
+        nav_button: cn(
+          buttonVariants({ variant: "outline" }),
+          "h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
+        ),
+        nav_button_next: "absolute right-1",
+        nav_button_previous: "absolute left-1",
+        row: "flex w-full mt-2",
+        table: "w-full border-collapse space-y-1",
         ...classNames,
       }}
       components={{
-        IconLeft: () => <ChevronLeftIcon className="size-4" />,
-        IconRight: () => <ChevronRightIcon className="size-4" />,
+        IconLeft,
+        IconRight,
       }}
+      showOutsideDays={showOutsideDays}
       {...props}
     />
   );
 }
 Calendar.displayName = "Calendar";
 
+const IconLeft = () => <ChevronLeftIcon className="size-4" />;
+const IconRight = () => <ChevronRightIcon className="size-4" />;
+
 export { Calendar };
diff --git a/apps/dashboard/src/@/components/ui/card.tsx b/apps/dashboard/src/@/components/ui/card.tsx
index d8bdec68218..4927d2439e0 100644
--- a/apps/dashboard/src/@/components/ui/card.tsx
+++ b/apps/dashboard/src/@/components/ui/card.tsx
@@ -7,11 +7,11 @@ const Card = React.forwardRef<
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
     className={cn(
       "rounded-lg border border-border bg-card text-card-foreground shadow-sm",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -21,7 +21,7 @@ const CardHeader = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
-  <div ref={ref} className={cn("flex flex-col p-6", className)} {...props} />
+  <div className={cn("flex flex-col p-6", className)} ref={ref} {...props} />
 ));
 CardHeader.displayName = "CardHeader";
 
@@ -30,11 +30,11 @@ const CardTitle = React.forwardRef<
   React.HTMLAttributes<HTMLHeadingElement>
 >(({ className, ...props }, ref) => (
   <h3
-    ref={ref}
     className={cn(
       "font-semibold text-2xl leading-none tracking-tight",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -45,8 +45,8 @@ const CardDescription = React.forwardRef<
   React.HTMLAttributes<HTMLParagraphElement>
 >(({ className, ...props }, ref) => (
   <p
-    ref={ref}
     className={cn("text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -56,7 +56,7 @@ const CardContent = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
-  <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
+  <div className={cn("p-6 pt-0", className)} ref={ref} {...props} />
 ));
 CardContent.displayName = "CardContent";
 
@@ -65,8 +65,8 @@ const CardFooter = React.forwardRef<
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
     className={cn("flex items-center p-6 pt-0", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/chart.tsx b/apps/dashboard/src/@/components/ui/chart.tsx
index 6d721e4741a..6981d45180d 100644
--- a/apps/dashboard/src/@/components/ui/chart.tsx
+++ b/apps/dashboard/src/@/components/ui/chart.tsx
@@ -6,7 +6,7 @@ import * as RechartsPrimitive from "recharts";
 import { cn } from "@/lib/utils";
 
 // Format: { THEME_NAME: CSS_SELECTOR }
-const THEMES = { light: "", dark: ".dark" } as const;
+const THEMES = { dark: ".dark", light: "" } as const;
 
 export type ChartConfig = {
   [k in string]: {
@@ -50,15 +50,15 @@ const ChartContainer = React.forwardRef<
   return (
     <ChartContext.Provider value={{ config }}>
       <div
-        data-chart={chartId}
-        ref={ref}
         className={cn(
           "flex aspect-video justify-center text-xs [&_.recharts-cartesian-axis-tick_text]:fill-muted-foreground [&_.recharts-cartesian-grid_line[stroke='#ccc']]:stroke-border/50 [&_.recharts-curve.recharts-tooltip-cursor]:stroke-border [&_.recharts-dot[stroke='#fff']]:stroke-transparent [&_.recharts-layer]:outline-none [&_.recharts-polar-grid_[stroke='#ccc']]:stroke-border [&_.recharts-radial-bar-background-sector]:fill-muted [&_.recharts-rectangle.recharts-tooltip-cursor]:fill-muted [&_.recharts-reference-line_[stroke='#ccc']]:stroke-border [&_.recharts-sector[stroke='#fff']]:stroke-transparent [&_.recharts-sector]:outline-none [&_.recharts-surface]:outline-none",
           className,
         )}
+        data-chart={chartId}
+        ref={ref}
         {...props}
       >
-        <ChartStyle id={chartId} config={config} />
+        <ChartStyle config={config} id={chartId} />
         <RechartsPrimitive.ResponsiveContainer>
           {children}
         </RechartsPrimitive.ResponsiveContainer>
@@ -80,7 +80,7 @@ const ChartStyle = ({ id, config }: { id: string; config: ChartConfig }) => {
 
   return (
     <style
-      // biome-ignore lint/security/noDangerouslySetInnerHtml: <explanation>
+      // biome-ignore lint/security/noDangerouslySetInnerHtml: FIXME
       dangerouslySetInnerHTML={{
         __html: Object.entries(THEMES)
           .map(
@@ -185,11 +185,11 @@ const ChartTooltipContent = React.forwardRef<
 
     return (
       <div
-        ref={ref}
         className={cn(
           "grid min-w-[8rem] items-start gap-1.5 rounded-lg border border-border/50 bg-popover px-2.5 py-1.5 text-xs shadow-xl",
           className,
         )}
+        ref={ref}
       >
         {!nestLabel ? tooltipLabel : null}
         <div className="grid gap-1.5">
@@ -200,11 +200,11 @@ const ChartTooltipContent = React.forwardRef<
 
             return (
               <div
-                key={item.dataKey}
                 className={cn(
                   "flex w-full flex-wrap items-stretch gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5 [&>svg]:text-muted-foreground",
                   indicator === "dot" && "items-center",
                 )}
+                key={item.dataKey}
               >
                 {formatter && item?.value !== undefined && item.name ? (
                   formatter(item.value, item.name, item, index, item.payload)
@@ -220,10 +220,10 @@ const ChartTooltipContent = React.forwardRef<
                             "shrink-0 rounded-[2px] border-[--color-border] bg-[--color-bg]",
                             {
                               "h-2.5 w-2.5": indicator === "dot",
-                              "w-1": indicator === "line",
+                              "my-0.5": nestLabel && indicator === "dashed",
                               "w-0 border-[1.5px] border-dashed bg-transparent":
                                 indicator === "dashed",
-                              "my-0.5": nestLabel && indicator === "dashed",
+                              "w-1": indicator === "line",
                             },
                           )}
                           style={
@@ -289,12 +289,12 @@ const ChartLegendContent = React.forwardRef<
 
     return (
       <div
-        ref={ref}
         className={cn(
           "flex flex-wrap items-center justify-center gap-x-4 gap-y-2 overflow-x-auto",
           verticalAlign === "top" ? "pb-3" : "pt-3",
           className,
         )}
+        ref={ref}
       >
         {payload.map((item) => {
           const key = `${nameKey || item.dataKey || "value"}`;
@@ -302,10 +302,10 @@ const ChartLegendContent = React.forwardRef<
 
           return (
             <div
-              key={item.value}
               className={cn(
                 "flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3 [&>svg]:text-muted-foreground",
               )}
+              key={item.value}
             >
               {itemConfig?.icon && !hideIcon ? (
                 <itemConfig.icon />
diff --git a/apps/dashboard/src/@/components/ui/checkbox.tsx b/apps/dashboard/src/@/components/ui/checkbox.tsx
index 6ef4734e7f3..efb59e0f275 100644
--- a/apps/dashboard/src/@/components/ui/checkbox.tsx
+++ b/apps/dashboard/src/@/components/ui/checkbox.tsx
@@ -11,11 +11,11 @@ const Checkbox = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
 >(({ className, ...props }, ref) => (
   <CheckboxPrimitive.Root
-    ref={ref}
     className={cn(
       "peer h-4 w-4 shrink-0 rounded-sm border border-foreground ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-inverted data-[state=checked]:text-inverted-foreground",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <CheckboxPrimitive.Indicator
diff --git a/apps/dashboard/src/@/components/ui/code/CodeBlockContainer.tsx b/apps/dashboard/src/@/components/ui/code/CodeBlockContainer.tsx
index f5286719c93..aa5bc4d7ec5 100644
--- a/apps/dashboard/src/@/components/ui/code/CodeBlockContainer.tsx
+++ b/apps/dashboard/src/@/components/ui/code/CodeBlockContainer.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { useClipboard } from "hooks/useClipboard";
 import { CheckIcon, CopyIcon } from "lucide-react";
-import { ScrollShadow } from "../ScrollShadow/ScrollShadow";
+import { cn } from "@/lib/utils";
 import { Button } from "../button";
+import { ScrollShadow } from "../ScrollShadow/ScrollShadow";
 
 export function CodeBlockContainer(props: {
   codeToCopy: string;
@@ -26,27 +26,27 @@ export function CodeBlockContainer(props: {
       )}
     >
       <ScrollShadow
-        scrollableClassName={cn("p-4", props.scrollableClassName)}
         className={cn(
           "text-xs md:text-sm [&_*]:leading-relaxed",
           props.scrollableContainerClassName,
         )}
+        scrollableClassName={cn("p-4", props.scrollableClassName)}
         shadowColor={props.shadowColor || "hsl(var(--muted))"}
       >
         {props.children}
       </ScrollShadow>
 
       <Button
-        size="sm"
-        variant="outline"
-        onClick={() => {
-          onCopy();
-          props.onCopy?.(props.codeToCopy);
-        }}
         className={cn(
           "absolute top-3.5 right-3.5 h-auto bg-background p-2",
           props.copyButtonClassName,
         )}
+        onClick={() => {
+          onCopy();
+          props.onCopy?.(props.codeToCopy);
+        }}
+        size="sm"
+        variant="outline"
       >
         {hasCopied ? (
           <CheckIcon className="size-3 text-green-500" />
diff --git a/apps/dashboard/src/@/components/ui/code/RenderCode.tsx b/apps/dashboard/src/@/components/ui/code/RenderCode.tsx
index 29216115e3c..8f9bdc9bb7a 100644
--- a/apps/dashboard/src/@/components/ui/code/RenderCode.tsx
+++ b/apps/dashboard/src/@/components/ui/code/RenderCode.tsx
@@ -12,13 +12,13 @@ export function RenderCode(props: {
 }) {
   return (
     <CodeBlockContainer
-      codeToCopy={props.code}
       className={props.className}
+      codeToCopy={props.code}
       copyButtonClassName={props.copyButtonClassName}
+      onCopy={props.onCopy}
       scrollableClassName={props.scrollableClassName}
       scrollableContainerClassName={props.scrollableContainerClassName}
       shadowColor={props.shadowColor}
-      onCopy={props.onCopy}
     >
       <div
         // biome-ignore lint/security/noDangerouslySetInnerHtml: we know what we're doing here
diff --git a/apps/dashboard/src/@/components/ui/code/code.client.tsx b/apps/dashboard/src/@/components/ui/code/code.client.tsx
index af471fac56f..a56b4ba6543 100644
--- a/apps/dashboard/src/@/components/ui/code/code.client.tsx
+++ b/apps/dashboard/src/@/components/ui/code/code.client.tsx
@@ -1,9 +1,9 @@
 "use client";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
 import type { BundledLanguage } from "shiki";
-import { RenderCode } from "./RenderCode";
 import { getCodeHtml } from "./getCodeHtml";
 import { PlainTextCodeBlock } from "./plaintext-code";
+import { RenderCode } from "./RenderCode";
 
 export type CodeProps = {
   code: string;
@@ -31,41 +31,41 @@ export const CodeClient: React.FC<CodeProps> = ({
   onCopy,
 }) => {
   const codeQuery = useQuery({
-    queryKey: ["html", code],
+    placeholderData: keepPreviousDataOnCodeChange
+      ? keepPreviousData
+      : undefined,
     queryFn: () =>
       getCodeHtml(code, lang, {
         ignoreFormattingErrors: ignoreFormattingErrors,
       }),
-    placeholderData: keepPreviousDataOnCodeChange
-      ? keepPreviousData
-      : undefined,
+    queryKey: ["html", code],
     retry: false,
   });
 
   if (!codeQuery.data) {
     return (
       <PlainTextCodeBlock
-        code={code}
         className={className}
-        scrollableClassName={scrollableClassName}
+        code={code}
         copyButtonClassName={copyButtonClassName}
+        onCopy={onCopy}
+        scrollableClassName={scrollableClassName}
         scrollableContainerClassName={scrollableContainerClassName}
         shadowColor={shadowColor}
-        onCopy={onCopy}
       />
     );
   }
 
   return (
     <RenderCode
+      className={className}
       code={codeQuery.data.formattedCode}
+      copyButtonClassName={copyButtonClassName}
       html={codeQuery.data.html}
-      className={className}
+      onCopy={onCopy}
       scrollableClassName={scrollableClassName}
-      copyButtonClassName={copyButtonClassName}
       scrollableContainerClassName={scrollableContainerClassName}
       shadowColor={shadowColor}
-      onCopy={onCopy}
     />
   );
 };
diff --git a/apps/dashboard/src/@/components/ui/code/code.server.tsx b/apps/dashboard/src/@/components/ui/code/code.server.tsx
index ce6f037a496..82a87a4e8d0 100644
--- a/apps/dashboard/src/@/components/ui/code/code.server.tsx
+++ b/apps/dashboard/src/@/components/ui/code/code.server.tsx
@@ -1,6 +1,6 @@
 import type { BundledLanguage } from "shiki";
-import { RenderCode } from "./RenderCode";
 import { getCodeHtml } from "./getCodeHtml";
+import { RenderCode } from "./RenderCode";
 
 export type CodeProps = {
   code: string;
@@ -18,5 +18,5 @@ export const CodeServer: React.FC<CodeProps> = async ({
   const { html, formattedCode } = await getCodeHtml(code, lang, {
     ignoreFormattingErrors,
   });
-  return <RenderCode code={formattedCode} html={html} className={className} />;
+  return <RenderCode className={className} code={formattedCode} html={html} />;
 };
diff --git a/apps/dashboard/src/@/components/ui/code/code.stories.tsx b/apps/dashboard/src/@/components/ui/code/code.stories.tsx
index 13a9d791eb4..36e86663c3d 100644
--- a/apps/dashboard/src/@/components/ui/code/code.stories.tsx
+++ b/apps/dashboard/src/@/components/ui/code/code.stories.tsx
@@ -3,9 +3,9 @@ import { BadgeContainer } from "stories/utils";
 import { CodeClient } from "./code.client";
 
 const meta = {
-  title: "code/lang",
   component: Component,
   parameters: {},
+  title: "code/lang",
 } satisfies Meta<typeof Component>;
 
 export default meta;
diff --git a/apps/dashboard/src/@/components/ui/code/getCodeHtml.tsx b/apps/dashboard/src/@/components/ui/code/getCodeHtml.tsx
index 8750ec2819d..24e45e077e2 100644
--- a/apps/dashboard/src/@/components/ui/code/getCodeHtml.tsx
+++ b/apps/dashboard/src/@/components/ui/code/getCodeHtml.tsx
@@ -43,10 +43,10 @@ export async function getCodeHtml(
   const html = await codeToHtml(formattedCode, {
     lang: lang,
     themes: {
-      light: "github-light",
       dark: "github-dark-default",
+      light: "github-light",
     },
   });
 
-  return { html, formattedCode };
+  return { formattedCode, html };
 }
diff --git a/apps/dashboard/src/@/components/ui/code/plaintext-code.stories.tsx b/apps/dashboard/src/@/components/ui/code/plaintext-code.stories.tsx
index 5775d612c25..42bcdbd668f 100644
--- a/apps/dashboard/src/@/components/ui/code/plaintext-code.stories.tsx
+++ b/apps/dashboard/src/@/components/ui/code/plaintext-code.stories.tsx
@@ -3,9 +3,9 @@ import { BadgeContainer } from "stories/utils";
 import { PlainTextCodeBlock } from "./plaintext-code";
 
 const meta = {
-  title: "code/plaintext",
   component: Component,
   parameters: {},
+  title: "code/plaintext",
 } satisfies Meta<typeof Component>;
 
 export default meta;
diff --git a/apps/dashboard/src/@/components/ui/code/plaintext-code.tsx b/apps/dashboard/src/@/components/ui/code/plaintext-code.tsx
index b1b05b0c22d..de79cc4d354 100644
--- a/apps/dashboard/src/@/components/ui/code/plaintext-code.tsx
+++ b/apps/dashboard/src/@/components/ui/code/plaintext-code.tsx
@@ -13,13 +13,13 @@ export function PlainTextCodeBlock(props: {
 }) {
   return (
     <CodeBlockContainer
-      codeToCopy={props.code}
       className={props.className}
+      codeToCopy={props.code}
       copyButtonClassName={props.copyButtonClassName}
+      onCopy={props.onCopy}
       scrollableClassName={props.scrollableClassName}
       scrollableContainerClassName={props.scrollableContainerClassName}
       shadowColor={props.shadowColor}
-      onCopy={props.onCopy}
     >
       <code className={cn("block whitespace-pre", props.codeClassName)}>
         {props.code}
diff --git a/apps/dashboard/src/@/components/ui/decimal-input.tsx b/apps/dashboard/src/@/components/ui/decimal-input.tsx
index ed3b7be6591..4d1e57b518a 100644
--- a/apps/dashboard/src/@/components/ui/decimal-input.tsx
+++ b/apps/dashboard/src/@/components/ui/decimal-input.tsx
@@ -10,13 +10,10 @@ export function DecimalInput(props: {
 }) {
   return (
     <Input
-      id={props.id}
-      type="text"
-      value={props.value}
       className={props.className}
-      inputMode="decimal"
-      placeholder={props.placeholder}
       disabled={props.disabled}
+      id={props.id}
+      inputMode="decimal"
       onChange={(e) => {
         const number = Number(e.target.value);
         // ignore if string becomes invalid number
@@ -34,6 +31,9 @@ export function DecimalInput(props: {
         }
         props.onChange(cleanedValue || "0");
       }}
+      placeholder={props.placeholder}
+      type="text"
+      value={props.value}
     />
   );
 }
diff --git a/apps/dashboard/src/@/components/ui/dialog.tsx b/apps/dashboard/src/@/components/ui/dialog.tsx
index df91afb5a27..27250b57c6c 100644
--- a/apps/dashboard/src/@/components/ui/dialog.tsx
+++ b/apps/dashboard/src/@/components/ui/dialog.tsx
@@ -19,11 +19,11 @@ const DialogOverlay = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Overlay
-    ref={ref}
     className={cn(
       "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80 data-[state=closed]:animate-out data-[state=open]:animate-in",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -41,7 +41,6 @@ const DialogContent = React.forwardRef<
     <DialogPortal>
       <DialogOverlay className={dialogOverlayClassName} />
       <DialogPrimitive.Content
-        ref={ref}
         className={cn(
           "fixed z-50 grid w-full gap-4 rounded-t-xl border border-border bg-background p-6 shadow-lg duration-300 md:max-w-lg md:rounded-lg",
           // on mobile - put the dialog at the bottom of the screen, animate - slide up and fade in
@@ -56,6 +55,7 @@ const DialogContent = React.forwardRef<
           "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
           className,
         )}
+        ref={ref}
         {...restProps}
       >
         {children}
@@ -104,11 +104,11 @@ const DialogTitle = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Title
-    ref={ref}
     className={cn(
       "font-semibold text-lg leading-none tracking-tight",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -119,8 +119,8 @@ const DialogDescription = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Description
-    ref={ref}
     className={cn("text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/drawer.tsx b/apps/dashboard/src/@/components/ui/drawer.tsx
index ad6c090e7d1..dd26f0fcaf2 100644
--- a/apps/dashboard/src/@/components/ui/drawer.tsx
+++ b/apps/dashboard/src/@/components/ui/drawer.tsx
@@ -27,8 +27,8 @@ const DrawerOverlay = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Overlay>
 >(({ className, ...props }, ref) => (
   <DrawerPrimitive.Overlay
-    ref={ref}
     className={cn("fixed inset-0 z-50 bg-black/80", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -41,11 +41,11 @@ const DrawerContent = React.forwardRef<
   <DrawerPortal>
     <DrawerOverlay />
     <DrawerPrimitive.Content
-      ref={ref}
       className={cn(
         "fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto flex-col rounded-t-[10px] border bg-background",
         className,
       )}
+      ref={ref}
       {...props}
     >
       <div className="mx-auto mt-4 h-2 w-[100px] rounded-full bg-muted" />
@@ -82,11 +82,11 @@ const DrawerTitle = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <DrawerPrimitive.Title
-    ref={ref}
     className={cn(
       "font-semibold text-lg leading-none tracking-tight",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -97,8 +97,8 @@ const DrawerDescription = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <DrawerPrimitive.Description
-    ref={ref}
     className={cn("text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/dropdown-menu.tsx b/apps/dashboard/src/@/components/ui/dropdown-menu.tsx
index 6cc2642e9fa..cb4a8b09d88 100644
--- a/apps/dashboard/src/@/components/ui/dropdown-menu.tsx
+++ b/apps/dashboard/src/@/components/ui/dropdown-menu.tsx
@@ -25,12 +25,12 @@ const DropdownMenuSubTrigger = React.forwardRef<
   }
 >(({ className, inset, children, ...props }, ref) => (
   <DropdownMenuPrimitive.SubTrigger
-    ref={ref}
     className={cn(
       "flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent",
       inset && "pl-8",
       className,
     )}
+    ref={ref}
     {...props}
   >
     {children}
@@ -45,11 +45,11 @@ const DropdownMenuSubContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
 >(({ className, ...props }, ref) => (
   <DropdownMenuPrimitive.SubContent
-    ref={ref}
     className={cn(
       "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-lg data-[state=closed]:animate-out data-[state=open]:animate-in",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -62,12 +62,12 @@ const DropdownMenuContent = React.forwardRef<
 >(({ className, sideOffset = 4, ...props }, ref) => (
   <DropdownMenuPrimitive.Portal>
     <DropdownMenuPrimitive.Content
-      ref={ref}
-      sideOffset={sideOffset}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
         className,
       )}
+      ref={ref}
+      sideOffset={sideOffset}
       {...props}
     />
   </DropdownMenuPrimitive.Portal>
@@ -81,12 +81,12 @@ const DropdownMenuItem = React.forwardRef<
   }
 >(({ className, inset, ...props }, ref) => (
   <DropdownMenuPrimitive.Item
-    ref={ref}
     className={cn(
       "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       inset && "pl-8",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -97,12 +97,12 @@ const DropdownMenuCheckboxItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
 >(({ className, children, checked, ...props }, ref) => (
   <DropdownMenuPrimitive.CheckboxItem
-    ref={ref}
+    checked={checked}
     className={cn(
       "relative flex cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
-    checked={checked}
+    ref={ref}
     {...props}
   >
     <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
@@ -121,11 +121,11 @@ const DropdownMenuRadioItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
 >(({ className, children, ...props }, ref) => (
   <DropdownMenuPrimitive.RadioItem
-    ref={ref}
     className={cn(
       "relative flex cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
@@ -145,12 +145,12 @@ const DropdownMenuLabel = React.forwardRef<
   }
 >(({ className, inset, ...props }, ref) => (
   <DropdownMenuPrimitive.Label
-    ref={ref}
     className={cn(
       "px-2 py-1.5 font-semibold text-sm",
       inset && "pl-8",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -161,8 +161,8 @@ const DropdownMenuSeparator = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
 >(({ className, ...props }, ref) => (
   <DropdownMenuPrimitive.Separator
-    ref={ref}
     className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/form.tsx b/apps/dashboard/src/@/components/ui/form.tsx
index 23e760c1bb9..e7e6cd964ef 100644
--- a/apps/dashboard/src/@/components/ui/form.tsx
+++ b/apps/dashboard/src/@/components/ui/form.tsx
@@ -54,11 +54,11 @@ const useFormField = () => {
   const { id } = itemContext;
 
   return {
-    id,
-    name: fieldContext.name,
-    formItemId: `${id}-form-item`,
     formDescriptionId: `${id}-form-item-description`,
+    formItemId: `${id}-form-item`,
     formMessageId: `${id}-form-item-message`,
+    id,
+    name: fieldContext.name,
     ...fieldState,
   };
 };
@@ -79,7 +79,7 @@ const FormItem = React.forwardRef<
 
   return (
     <FormItemContext.Provider value={{ id }}>
-      <div ref={ref} className={cn("space-y-2", className)} {...props} />
+      <div className={cn("space-y-2", className)} ref={ref} {...props} />
     </FormItemContext.Provider>
   );
 });
@@ -93,9 +93,9 @@ const FormLabel = React.forwardRef<
 
   return (
     <Label
-      ref={ref}
       className={cn(error && "text-destructive-text", className)}
       htmlFor={formItemId}
+      ref={ref}
       {...props}
     />
   );
@@ -111,9 +111,9 @@ const RequiredFormLabel = React.forwardRef<
   return (
     <ToolTipLabel label="Required">
       <Label
-        ref={ref}
         className={cn(error && "text-destructive-text", "relative", className)}
         htmlFor={formItemId}
+        ref={ref}
         {...props}
       >
         {props.children}
@@ -135,14 +135,14 @@ const FormControl = React.forwardRef<
 
   return (
     <Slot
-      ref={ref}
-      id={formItemId}
       aria-describedby={
         !error
           ? `${formDescriptionId}`
           : `${formDescriptionId} ${formMessageId}`
       }
       aria-invalid={!!error}
+      id={formItemId}
+      ref={ref}
       {...props}
     />
   );
@@ -157,9 +157,9 @@ const FormDescription = React.forwardRef<
 
   return (
     <p
-      ref={ref}
-      id={formDescriptionId}
       className={cn("text-muted-foreground text-sm", className)}
+      id={formDescriptionId}
+      ref={ref}
       {...props}
     />
   );
@@ -179,9 +179,9 @@ const FormMessage = React.forwardRef<
 
   return (
     <p
-      ref={ref}
-      id={formMessageId}
       className={cn("font-medium text-destructive-text text-sm", className)}
+      id={formMessageId}
+      ref={ref}
       {...props}
     >
       {body}
diff --git a/apps/dashboard/src/@/components/ui/hover-card.tsx b/apps/dashboard/src/@/components/ui/hover-card.tsx
index c780522e55c..ff7b195700f 100644
--- a/apps/dashboard/src/@/components/ui/hover-card.tsx
+++ b/apps/dashboard/src/@/components/ui/hover-card.tsx
@@ -14,13 +14,13 @@ const HoverCardContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content>
 >(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
   <HoverCardPrimitive.Content
-    ref={ref}
     align={align}
-    sideOffset={sideOffset}
     className={cn(
       "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-64 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=closed]:animate-out data-[state=open]:animate-in",
       className,
     )}
+    ref={ref}
+    sideOffset={sideOffset}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/image-upload.tsx b/apps/dashboard/src/@/components/ui/image-upload.tsx
index 211062be268..ff77056a1a0 100644
--- a/apps/dashboard/src/@/components/ui/image-upload.tsx
+++ b/apps/dashboard/src/@/components/ui/image-upload.tsx
@@ -1,10 +1,9 @@
 "use client";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
 import { UploadIcon } from "lucide-react";
 import Image from "next/image";
+import * as React from "react";
 import { useDropzone } from "react-dropzone";
+import { cn } from "@/lib/utils";
 
 export interface ImageUploadProps
   extends React.InputHTMLAttributes<HTMLInputElement> {
@@ -42,10 +41,10 @@ const ImageUpload = React.forwardRef<HTMLInputElement, ImageUploadProps>(
           <input ref={ref} {...getInputProps()} {...props} />
           {activeFile ? (
             <Image
+              alt=""
               className="object-contain object-center "
-              src={URL.createObjectURL(activeFile)}
               fill
-              alt=""
+              src={URL.createObjectURL(activeFile)}
             />
           ) : (
             <>
diff --git a/apps/dashboard/src/@/components/ui/inline-code.tsx b/apps/dashboard/src/@/components/ui/inline-code.tsx
index e7e9765242e..de6973aa68a 100644
--- a/apps/dashboard/src/@/components/ui/inline-code.tsx
+++ b/apps/dashboard/src/@/components/ui/inline-code.tsx
@@ -3,7 +3,10 @@ import { cn } from "@/lib/utils";
 export function InlineCode({
   code,
   className,
-}: { code: string; className?: string }) {
+}: {
+  code: string;
+  className?: string;
+}) {
   return (
     <code
       className={cn(
diff --git a/apps/dashboard/src/@/components/ui/input-otp.tsx b/apps/dashboard/src/@/components/ui/input-otp.tsx
index d51fcd3395c..92f37633c79 100644
--- a/apps/dashboard/src/@/components/ui/input-otp.tsx
+++ b/apps/dashboard/src/@/components/ui/input-otp.tsx
@@ -11,12 +11,12 @@ const InputOTP = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof OTPInput>
 >(({ className, containerClassName, ...props }, ref) => (
   <OTPInput
-    ref={ref}
+    className={cn("disabled:cursor-not-allowed", className)}
     containerClassName={cn(
       "flex items-center gap-2 has-[:disabled]:opacity-50",
       containerClassName,
     )}
-    className={cn("disabled:cursor-not-allowed", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -26,7 +26,7 @@ const InputOTPGroup = React.forwardRef<
   React.ElementRef<"div">,
   React.ComponentPropsWithoutRef<"div">
 >(({ className, ...props }, ref) => (
-  <div ref={ref} className={cn("flex items-center", className)} {...props} />
+  <div className={cn("flex items-center", className)} ref={ref} {...props} />
 ));
 InputOTPGroup.displayName = "InputOTPGroup";
 
@@ -40,12 +40,12 @@ const InputOTPSlot = React.forwardRef<
 
   return (
     <div
-      ref={ref}
       className={cn(
         "relative flex h-10 w-10 items-center justify-center border-input border-y border-r text-sm transition-all first:rounded-l-md first:border-l last:rounded-r-md",
         isActive && "z-10 ring-2 ring-ring ring-offset-background",
         className,
       )}
+      ref={ref}
       {...props}
     >
       {char}
@@ -64,6 +64,7 @@ const InputOTPSeparator = React.forwardRef<
   React.ComponentPropsWithoutRef<"div">
 >(({ ...props }, ref) => (
   // biome-ignore lint/a11y/useFocusableInteractive: pure shadcn component - it works
+  // biome-ignore lint/a11y/useAriaPropsSupportedByRole: TODO
   <div ref={ref} role="separator" {...props}>
     <DotIcon />
   </div>
diff --git a/apps/dashboard/src/@/components/ui/input.tsx b/apps/dashboard/src/@/components/ui/input.tsx
index 37529a8f2df..12ff2495f7f 100644
--- a/apps/dashboard/src/@/components/ui/input.tsx
+++ b/apps/dashboard/src/@/components/ui/input.tsx
@@ -9,12 +9,12 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
   ({ className, type, ...props }, ref) => {
     return (
       <input
-        type={type}
         className={cn(
           "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background selection:bg-foreground/10 file:border-0 file:bg-transparent file:font-medium file:text-sm placeholder:text-muted-foreground placeholder:text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:selection:bg-foreground/20",
           className,
         )}
         ref={ref}
+        type={type}
         {...props}
       />
     );
diff --git a/apps/dashboard/src/@/components/ui/label.tsx b/apps/dashboard/src/@/components/ui/label.tsx
index 663ca2319ef..e00b6b9e3eb 100644
--- a/apps/dashboard/src/@/components/ui/label.tsx
+++ b/apps/dashboard/src/@/components/ui/label.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as LabelPrimitive from "@radix-ui/react-label";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -16,8 +16,8 @@ const Label = React.forwardRef<
     VariantProps<typeof labelVariants>
 >(({ className, ...props }, ref) => (
   <LabelPrimitive.Root
-    ref={ref}
     className={cn(labelVariants(), className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/pagination.tsx b/apps/dashboard/src/@/components/ui/pagination.tsx
index 2ab285c2f38..6e1de48bee3 100644
--- a/apps/dashboard/src/@/components/ui/pagination.tsx
+++ b/apps/dashboard/src/@/components/ui/pagination.tsx
@@ -22,8 +22,8 @@ const PaginationContent = React.forwardRef<
   React.ComponentProps<"ul">
 >(({ className, ...props }, ref) => (
   <ul
-    ref={ref}
     className={cn("flex flex-row items-center gap-2", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -33,7 +33,7 @@ const PaginationItem = React.forwardRef<
   HTMLLIElement,
   React.ComponentProps<"li">
 >(({ className, ...props }, ref) => (
-  <li ref={ref} className={cn("", className)} {...props} />
+  <li className={cn("", className)} ref={ref} {...props} />
 ));
 PaginationItem.displayName = "PaginationItem";
 
@@ -48,13 +48,13 @@ const PaginationLink = ({
   ...props
 }: PaginationLinkProps) => (
   <Button
-    variant={!isActive ? "outline" : "default"}
+    aria-current={isActive ? "page" : undefined}
     className={cn(
       "h-auto px-3 py-2",
       className,
       props.disabled && "cursor-not-allowed",
     )}
-    aria-current={isActive ? "page" : undefined}
+    variant={!isActive ? "outline" : "default"}
     {...props}
   />
 );
@@ -66,8 +66,8 @@ const PaginationPrevious = ({
 }: React.ComponentProps<typeof PaginationLink>) => (
   <PaginationLink
     aria-label="Go to previous page"
-    size="default"
     className={cn("h-10 gap-1 pl-2.5", className)}
+    size="default"
     {...props}
   >
     <ChevronLeftIcon className="size-4" />
@@ -82,8 +82,8 @@ const PaginationNext = ({
 }: React.ComponentProps<typeof PaginationLink>) => (
   <PaginationLink
     aria-label="Go to next page"
-    size="default"
     className={cn("h-10 gap-1 pr-2.5", className)}
+    size="default"
     {...props}
   >
     <span className="max-sm:hidden">Next</span>
diff --git a/apps/dashboard/src/@/components/ui/popover.tsx b/apps/dashboard/src/@/components/ui/popover.tsx
index b93e60dd6b5..1d4c0eea199 100644
--- a/apps/dashboard/src/@/components/ui/popover.tsx
+++ b/apps/dashboard/src/@/components/ui/popover.tsx
@@ -15,13 +15,13 @@ const PopoverContent = React.forwardRef<
 >(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
   <PopoverPrimitive.Portal>
     <PopoverPrimitive.Content
-      ref={ref}
       align={align}
-      sideOffset={sideOffset}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border border-border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=closed]:animate-out data-[state=open]:animate-in",
         className,
       )}
+      ref={ref}
+      sideOffset={sideOffset}
       {...props}
     />
   </PopoverPrimitive.Portal>
diff --git a/apps/dashboard/src/@/components/ui/progress.tsx b/apps/dashboard/src/@/components/ui/progress.tsx
index bc8b003e972..7092490dc24 100644
--- a/apps/dashboard/src/@/components/ui/progress.tsx
+++ b/apps/dashboard/src/@/components/ui/progress.tsx
@@ -10,11 +10,11 @@ const Progress = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>
 >(({ className, value, ...props }, ref) => (
   <ProgressPrimitive.Root
-    ref={ref}
     className={cn(
       "relative h-4 w-full overflow-hidden rounded-full bg-secondary",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <ProgressPrimitive.Indicator
diff --git a/apps/dashboard/src/@/components/ui/radio-group.tsx b/apps/dashboard/src/@/components/ui/radio-group.tsx
index 6c35c593ad2..d4397d46148 100644
--- a/apps/dashboard/src/@/components/ui/radio-group.tsx
+++ b/apps/dashboard/src/@/components/ui/radio-group.tsx
@@ -27,11 +27,11 @@ const RadioGroupItem = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <RadioGroupPrimitive.Item
-      ref={ref}
       className={cn(
         "aspect-square h-4 w-4 rounded-full border border-inverted text-inverted ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
         className,
       )}
+      ref={ref}
       {...props}
     >
       <RadioGroupPrimitive.Indicator className="flex items-center justify-center">
@@ -49,11 +49,11 @@ const RadioGroupItemButton = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <RadioGroupPrimitive.Item
-      ref={ref}
       className={cn(
         "group flex min-w-32 cursor-pointer items-center space-x-3 space-y-0 rounded-lg border px-4 py-3 font-medium transition-all hover:border-foreground/25 hover:bg-accent focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 peer-hover:border-nonce data-[state=checked]:border-muted-foreground",
         className,
       )}
+      ref={ref}
       {...props}
     >
       <div className="flex aspect-square h-4 w-4 items-center justify-center rounded-full border text-inverted ring-offset-background transition-all focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 group-hover:border-foreground/25 group-data-[state=checked]:border-inverted">
diff --git a/apps/dashboard/src/@/components/ui/select.stories.tsx b/apps/dashboard/src/@/components/ui/select.stories.tsx
index 8c32f7cfffd..d2a913ea411 100644
--- a/apps/dashboard/src/@/components/ui/select.stories.tsx
+++ b/apps/dashboard/src/@/components/ui/select.stories.tsx
@@ -1,3 +1,4 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
 import {
   Select,
   SelectContent,
@@ -7,12 +8,11 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import type { Meta, StoryObj } from "@storybook/nextjs";
 import { BadgeContainer } from "../../../stories/utils";
 
 const meta = {
-  title: "Shadcn/Select",
   component: Component,
+  title: "Shadcn/Select",
 } satisfies Meta<typeof Component>;
 
 export default meta;
diff --git a/apps/dashboard/src/@/components/ui/select.tsx b/apps/dashboard/src/@/components/ui/select.tsx
index 5447dec4bc3..402d92432f2 100644
--- a/apps/dashboard/src/@/components/ui/select.tsx
+++ b/apps/dashboard/src/@/components/ui/select.tsx
@@ -19,11 +19,11 @@ const SelectTrigger = React.forwardRef<
   }
 >(({ className, children, chevronClassName, ...props }, ref) => (
   <SelectPrimitive.Trigger
-    ref={ref}
     className={cn(
       "flex h-10 w-full items-center justify-between gap-2 rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
       className,
     )}
+    ref={ref}
     {...props}
   >
     {children}
@@ -75,7 +75,6 @@ const SelectContent = React.forwardRef<
 >(({ className, children, position = "popper", ...props }, ref) => (
   <SelectPrimitive.Portal>
     <SelectPrimitive.Content
-      ref={ref}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover text-popover-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
         position === "popper" &&
@@ -83,6 +82,7 @@ const SelectContent = React.forwardRef<
         className,
       )}
       position={position}
+      ref={ref}
       {...props}
     >
       {/* <SelectScrollUpButton /> */}
@@ -106,8 +106,8 @@ const SelectLabel = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.Label
-    ref={ref}
     className={cn("py-1.5 pr-2 pl-8 font-semibold text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -118,11 +118,11 @@ const SelectItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
 >(({ className, children, ...props }, ref) => (
   <SelectPrimitive.Item
-    ref={ref}
     className={cn(
       "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
@@ -141,8 +141,8 @@ const SelectSeparator = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.Separator
-    ref={ref}
     className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/separator.tsx b/apps/dashboard/src/@/components/ui/separator.tsx
index 3cc446d24c2..d1714458e89 100644
--- a/apps/dashboard/src/@/components/ui/separator.tsx
+++ b/apps/dashboard/src/@/components/ui/separator.tsx
@@ -14,14 +14,14 @@ const Separator = React.forwardRef<
     ref,
   ) => (
     <SeparatorPrimitive.Root
-      ref={ref}
-      decorative={decorative}
-      orientation={orientation}
       className={cn(
         "shrink-0 bg-border",
         orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
         className,
       )}
+      decorative={decorative}
+      orientation={orientation}
+      ref={ref}
       {...props}
     />
   ),
diff --git a/apps/dashboard/src/@/components/ui/sheet.tsx b/apps/dashboard/src/@/components/ui/sheet.tsx
index f861b3caadd..dd76042ff3f 100644
--- a/apps/dashboard/src/@/components/ui/sheet.tsx
+++ b/apps/dashboard/src/@/components/ui/sheet.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as SheetPrimitive from "@radix-ui/react-dialog";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import { XIcon } from "lucide-react";
 import * as React from "react";
 
@@ -33,19 +33,19 @@ SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;
 const sheetVariants = cva(
   "fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500 border-border",
   {
+    defaultVariants: {
+      side: "right",
+    },
     variants: {
       side: {
-        top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
         bottom:
           "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
         left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
         right:
           "inset-y-0 right-0 h-full w-3/4  border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
+        top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
       },
     },
-    defaultVariants: {
-      side: "right",
-    },
   },
 );
 
@@ -60,8 +60,8 @@ const SheetContent = React.forwardRef<
   <SheetPortal>
     <SheetOverlay />
     <SheetPrimitive.Content
-      ref={ref}
       className={cn(sheetVariants({ side }), className)}
+      ref={ref}
       {...props}
     >
       {children}
@@ -107,11 +107,11 @@ const SheetTitle = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <SheetPrimitive.Title
-    ref={ref}
     className={cn(
       "border-border font-semibold text-foreground text-lg",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -122,8 +122,8 @@ const SheetDescription = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <SheetPrimitive.Description
-    ref={ref}
     className={cn("border-border text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/dashboard/src/@/components/ui/sidebar.tsx b/apps/dashboard/src/@/components/ui/sidebar.tsx
index 4c4993f7e27..f9bc7744b5e 100644
--- a/apps/dashboard/src/@/components/ui/sidebar.tsx
+++ b/apps/dashboard/src/@/components/ui/sidebar.tsx
@@ -1,5 +1,10 @@
+/** biome-ignore-all lint/suspicious/noDocumentCookie: FIXME */
 "use client";
 
+import { Slot } from "@radix-ui/react-slot";
+import { cva, type VariantProps } from "class-variance-authority";
+import { PanelLeftIcon } from "lucide-react";
+import * as React from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
@@ -19,10 +24,6 @@ import {
 } from "@/components/ui/tooltip";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { cn } from "@/lib/utils";
-import { Slot } from "@radix-ui/react-slot";
-import { type VariantProps, cva } from "class-variance-authority";
-import { PanelLeftIcon } from "lucide-react";
-import * as React from "react";
 
 const SIDEBAR_COOKIE_NAME = "sidebar_state";
 const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
@@ -124,12 +125,12 @@ const SidebarProvider = React.forwardRef<
 
     const contextValue = React.useMemo<SidebarContextProps>(
       () => ({
-        state,
-        open,
-        setOpen,
         isMobile,
+        open,
         openMobile,
+        setOpen,
         setOpenMobile,
+        state,
         toggleSidebar,
       }),
       [state, open, setOpen, isMobile, openMobile, toggleSidebar],
@@ -139,6 +140,11 @@ const SidebarProvider = React.forwardRef<
       <SidebarContext.Provider value={contextValue}>
         <TooltipProvider delayDuration={0}>
           <div
+            className={cn(
+              "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",
+              className,
+            )}
+            ref={ref}
             style={
               {
                 "--sidebar-width": SIDEBAR_WIDTH,
@@ -146,11 +152,6 @@ const SidebarProvider = React.forwardRef<
                 ...style,
               } as React.CSSProperties
             }
-            className={cn(
-              "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",
-              className,
-            )}
-            ref={ref}
             {...props}
           >
             {children}
@@ -200,17 +201,17 @@ const Sidebar = React.forwardRef<
 
     if (isMobile) {
       return (
-        <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
+        <Sheet onOpenChange={setOpenMobile} open={openMobile} {...props}>
           <SheetContent
-            data-sidebar="sidebar"
-            data-mobile="true"
             className="w-[--sidebar-width] bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
+            data-mobile="true"
+            data-sidebar="sidebar"
+            side={side}
             style={
               {
                 "--sidebar-width": SIDEBAR_WIDTH_MOBILE,
               } as React.CSSProperties
             }
-            side={side}
           >
             <SheetHeader className="sr-only">
               <SheetTitle>Sidebar</SheetTitle>
@@ -224,12 +225,12 @@ const Sidebar = React.forwardRef<
 
     return (
       <div
-        ref={ref}
         className="group peer relative hidden flex-shrink-0 text-sidebar-foreground md:block"
-        data-state={state}
         data-collapsible={state === "collapsed" ? collapsible : ""}
-        data-variant={variant}
         data-side={side}
+        data-state={state}
+        data-variant={variant}
+        ref={ref}
       >
         {/* This is what handles the sidebar gap on desktop */}
         <div
@@ -257,8 +258,8 @@ const Sidebar = React.forwardRef<
           {...props}
         >
           <div
-            data-sidebar="sidebar"
             className="flex h-full w-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-sidebar-border group-data-[variant=floating]:shadow"
+            data-sidebar="sidebar"
           >
             {children}
           </div>
@@ -277,15 +278,15 @@ const SidebarTrigger = React.forwardRef<
 
   return (
     <Button
-      ref={ref}
-      data-sidebar="trigger"
-      variant="ghost"
-      size="icon"
       className={cn("h-7 w-7", className)}
+      data-sidebar="trigger"
       onClick={(event) => {
         onClick?.(event);
         toggleSidebar();
       }}
+      ref={ref}
+      size="icon"
+      variant="ghost"
       {...props}
     >
       <PanelLeftIcon />
@@ -303,12 +304,7 @@ const SidebarRail = React.forwardRef<
 
   return (
     <button
-      ref={ref}
-      data-sidebar="rail"
       aria-label="Toggle Sidebar"
-      tabIndex={-1}
-      onClick={toggleSidebar}
-      title="Toggle Sidebar"
       className={cn(
         "-translate-x-1/2 group-data-[side=left]:-right-4 absolute inset-y-0 z-20 hidden w-4 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-sidebar-border group-data-[side=right]:left-0 sm:flex",
         "[[data-side=left]_&]:cursor-w-resize [[data-side=right]_&]:cursor-e-resize",
@@ -318,6 +314,11 @@ const SidebarRail = React.forwardRef<
         "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
         className,
       )}
+      data-sidebar="rail"
+      onClick={toggleSidebar}
+      ref={ref}
+      tabIndex={-1}
+      title="Toggle Sidebar"
       {...props}
     />
   );
@@ -330,12 +331,12 @@ const SidebarInset = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <main
-      ref={ref}
       className={cn(
         "relative flex w-full flex-1 flex-col bg-background",
         "md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",
         className,
       )}
+      ref={ref}
       {...props}
     />
   );
@@ -348,12 +349,12 @@ const SidebarInput = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <Input
-      ref={ref}
-      data-sidebar="input"
       className={cn(
         "h-8 w-full bg-background shadow-none focus-visible:ring-2 focus-visible:ring-sidebar-ring",
         className,
       )}
+      data-sidebar="input"
+      ref={ref}
       {...props}
     />
   );
@@ -366,9 +367,9 @@ const SidebarHeader = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <div
-      ref={ref}
-      data-sidebar="header"
       className={cn("flex flex-col gap-2 p-2", className)}
+      data-sidebar="header"
+      ref={ref}
       {...props}
     />
   );
@@ -381,9 +382,9 @@ const SidebarFooter = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <div
-      ref={ref}
-      data-sidebar="footer"
       className={cn("flex flex-col gap-2 p-2", className)}
+      data-sidebar="footer"
+      ref={ref}
       {...props}
     />
   );
@@ -396,9 +397,9 @@ const SidebarSeparator = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <Separator
-      ref={ref}
-      data-sidebar="separator"
       className={cn("mx-2 w-auto bg-sidebar-border", className)}
+      data-sidebar="separator"
+      ref={ref}
       {...props}
     />
   );
@@ -411,12 +412,12 @@ const SidebarContent = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <div
-      ref={ref}
-      data-sidebar="content"
       className={cn(
         "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
         className,
       )}
+      data-sidebar="content"
+      ref={ref}
       {...props}
     />
   );
@@ -429,9 +430,9 @@ const SidebarGroup = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <div
-      ref={ref}
-      data-sidebar="group"
       className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
+      data-sidebar="group"
+      ref={ref}
       {...props}
     />
   );
@@ -446,13 +447,13 @@ const SidebarGroupLabel = React.forwardRef<
 
   return (
     <Comp
-      ref={ref}
-      data-sidebar="group-label"
       className={cn(
         "flex h-8 shrink-0 items-center rounded-md px-2 font-medium text-sidebar-foreground/70 text-xs outline-none ring-sidebar-ring transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
         "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
         className,
       )}
+      data-sidebar="group-label"
+      ref={ref}
       {...props}
     />
   );
@@ -467,8 +468,6 @@ const SidebarGroupAction = React.forwardRef<
 
   return (
     <Comp
-      ref={ref}
-      data-sidebar="group-action"
       className={cn(
         "absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
         // Increases the hit area of the button on mobile.
@@ -476,6 +475,8 @@ const SidebarGroupAction = React.forwardRef<
         "group-data-[collapsible=icon]:hidden",
         className,
       )}
+      data-sidebar="group-action"
+      ref={ref}
       {...props}
     />
   );
@@ -487,9 +488,9 @@ const SidebarGroupContent = React.forwardRef<
   React.ComponentProps<"div">
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
-    data-sidebar="group-content"
     className={cn("w-full text-sm", className)}
+    data-sidebar="group-content"
+    ref={ref}
     {...props}
   />
 ));
@@ -500,9 +501,9 @@ const SidebarMenu = React.forwardRef<
   React.ComponentProps<"ul">
 >(({ className, ...props }, ref) => (
   <ul
-    ref={ref}
-    data-sidebar="menu"
     className={cn("flex w-full min-w-0 flex-col gap-1", className)}
+    data-sidebar="menu"
+    ref={ref}
     {...props}
   />
 ));
@@ -513,9 +514,9 @@ const SidebarMenuItem = React.forwardRef<
   React.ComponentProps<"li">
 >(({ className, ...props }, ref) => (
   <li
-    ref={ref}
-    data-sidebar="menu-item"
     className={cn("group/menu-item relative", className)}
+    data-sidebar="menu-item"
+    ref={ref}
     {...props}
   />
 ));
@@ -524,21 +525,21 @@ SidebarMenuItem.displayName = "SidebarMenuItem";
 const sidebarMenuButtonVariants = cva(
   "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
   {
+    defaultVariants: {
+      size: "default",
+      variant: "default",
+    },
     variants: {
+      size: {
+        default: "h-8 text-sm",
+        lg: "h-12 text-sm group-data-[collapsible=icon]:!p-0",
+        sm: "h-7 text-xs",
+      },
       variant: {
         default: "hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
         outline:
           "bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]",
       },
-      size: {
-        default: "h-8 text-sm",
-        sm: "h-7 text-xs",
-        lg: "h-12 text-sm group-data-[collapsible=icon]:!p-0",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
     },
   },
 );
@@ -568,11 +569,11 @@ const SidebarMenuButton = React.forwardRef<
 
     const button = (
       <Comp
-        ref={ref}
+        className={cn(sidebarMenuButtonVariants({ size, variant }), className)}
+        data-active={isActive}
         data-sidebar="menu-button"
         data-size={size}
-        data-active={isActive}
-        className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
+        ref={ref}
         {...props}
       />
     );
@@ -591,9 +592,9 @@ const SidebarMenuButton = React.forwardRef<
       <Tooltip>
         <TooltipTrigger asChild>{button}</TooltipTrigger>
         <TooltipContent
-          side="right"
           align="center"
           hidden={state !== "collapsed" || isMobile}
+          side="right"
           {...tooltip}
         />
       </Tooltip>
@@ -613,8 +614,6 @@ const SidebarMenuAction = React.forwardRef<
 
   return (
     <Comp
-      ref={ref}
-      data-sidebar="menu-action"
       className={cn(
         "absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-sidebar-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
         // Increases the hit area of the button on mobile.
@@ -627,6 +626,8 @@ const SidebarMenuAction = React.forwardRef<
           "group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 peer-data-[active=true]/menu-button:text-sidebar-accent-foreground md:opacity-0",
         className,
       )}
+      data-sidebar="menu-action"
+      ref={ref}
       {...props}
     />
   );
@@ -638,8 +639,6 @@ const SidebarMenuBadge = React.forwardRef<
   React.ComponentProps<"div">
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
-    data-sidebar="menu-badge"
     className={cn(
       "pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-md px-1 font-medium text-sidebar-foreground text-xs tabular-nums",
       "peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground",
@@ -649,6 +648,8 @@ const SidebarMenuBadge = React.forwardRef<
       "group-data-[collapsible=icon]:hidden",
       className,
     )}
+    data-sidebar="menu-badge"
+    ref={ref}
     {...props}
   />
 ));
@@ -667,9 +668,9 @@ const SidebarMenuSkeleton = React.forwardRef<
 
   return (
     <div
-      ref={ref}
-      data-sidebar="menu-skeleton"
       className={cn("flex h-8 items-center gap-2 rounded-md px-2", className)}
+      data-sidebar="menu-skeleton"
+      ref={ref}
       {...props}
     >
       {showIcon && (
@@ -697,13 +698,13 @@ const SidebarMenuSub = React.forwardRef<
   React.ComponentProps<"ul">
 >(({ className, ...props }, ref) => (
   <ul
-    ref={ref}
-    data-sidebar="menu-sub"
     className={cn(
       "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-sidebar-border border-l px-2.5 py-0.5",
       "group-data-[collapsible=icon]:hidden",
       className,
     )}
+    data-sidebar="menu-sub"
+    ref={ref}
     {...props}
   />
 ));
@@ -727,10 +728,6 @@ const SidebarMenuSubButton = React.forwardRef<
 
   return (
     <Comp
-      ref={ref}
-      data-sidebar="menu-sub-button"
-      data-size={size}
-      data-active={isActive}
       className={cn(
         "-translate-x-px flex h-7 min-w-0 items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",
         "data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
@@ -739,6 +736,10 @@ const SidebarMenuSubButton = React.forwardRef<
         "group-data-[collapsible=icon]:hidden",
         className,
       )}
+      data-active={isActive}
+      data-sidebar="menu-sub-button"
+      data-size={size}
+      ref={ref}
       {...props}
     />
   );
diff --git a/apps/dashboard/src/@/components/ui/skeleton.tsx b/apps/dashboard/src/@/components/ui/skeleton.tsx
index 17bd1f3ec02..3672f0283ba 100644
--- a/apps/dashboard/src/@/components/ui/skeleton.tsx
+++ b/apps/dashboard/src/@/components/ui/skeleton.tsx
@@ -22,12 +22,12 @@ function SkeletonContainer<T>(props: {
   const isLoading = props.loadedData === undefined;
   return (
     <div
-      style={props.style}
       aria-hidden={isLoading ? "true" : "false"}
       className={cn(
         isLoading && "inline-block animate-pulse rounded-lg bg-muted",
         props.className,
       )}
+      style={props.style}
     >
       <div className={cn(isLoading && "invisible")}>
         <div
diff --git a/apps/dashboard/src/@/components/ui/sonner.tsx b/apps/dashboard/src/@/components/ui/sonner.tsx
index ff1623b3354..3e3ac0df836 100644
--- a/apps/dashboard/src/@/components/ui/sonner.tsx
+++ b/apps/dashboard/src/@/components/ui/sonner.tsx
@@ -10,17 +10,17 @@ const Toaster = ({ ...props }: ToasterProps) => {
 
   return (
     <Sonner
-      theme={theme as ToasterProps["theme"]}
       className="toaster group"
+      theme={theme as ToasterProps["theme"]}
       toastOptions={{
         classNames: {
-          toast:
-            "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg group-[.toaster]:border",
-          description: "group-[.toast]:text-muted-foreground",
           actionButton:
             "group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",
           cancelButton:
             "group-[.toast]:bg-muted group-[.toast]:text-muted-foreground",
+          description: "group-[.toast]:text-muted-foreground",
+          toast:
+            "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg group-[.toaster]:border",
         },
       }}
       {...props}
diff --git a/apps/dashboard/src/@/components/ui/table.stories.tsx b/apps/dashboard/src/@/components/ui/table.stories.tsx
index 094e63cba3c..d2682e07294 100644
--- a/apps/dashboard/src/@/components/ui/table.stories.tsx
+++ b/apps/dashboard/src/@/components/ui/table.stories.tsx
@@ -1,3 +1,5 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import Link from "next/link";
 import {
   Table,
   TableBody,
@@ -8,15 +10,13 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import Link from "next/link";
 import { BadgeContainer } from "../../../stories/utils";
 import { cn } from "../../lib/utils";
 import { Badge } from "./badge";
 
 const meta = {
-  title: "Shadcn/Table",
   component: Component,
+  title: "Shadcn/Table",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -54,40 +54,37 @@ type Invoice = {
 const invoices: Invoice[] = [
   {
     invoice: "INV001",
+    paymentMethod: "Credit Card",
     paymentStatus: "Paid",
     totalAmount: "$250.00",
-    paymentMethod: "Credit Card",
   },
   {
     invoice: "INV002",
+    paymentMethod: "PayPal",
     paymentStatus: "Pending",
     totalAmount: "$150.00",
-    paymentMethod: "PayPal",
   },
   {
     invoice: "INV003",
+    paymentMethod: "Bank Transfer",
     paymentStatus: "Unpaid",
     totalAmount: "$350.00",
-    paymentMethod: "Bank Transfer",
   },
   {
     invoice: "INV004",
+    paymentMethod: "Credit Card",
     paymentStatus: "Paid",
     totalAmount: "$450.00",
-    paymentMethod: "Credit Card",
   },
   {
     invoice: "INV005",
+    paymentMethod: "PayPal",
     paymentStatus: "Paid",
     totalAmount: "$550.00",
-    paymentMethod: "PayPal",
   },
 ];
 
-function TableDemo(props: {
-  footer?: boolean;
-  linkBox?: boolean;
-}) {
+function TableDemo(props: { footer?: boolean; linkBox?: boolean }) {
   return (
     <TableContainer>
       <Table>
@@ -102,18 +99,18 @@ function TableDemo(props: {
         <TableBody>
           {invoices.map((invoice) => (
             <TableRow
-              key={invoice.invoice}
-              linkBox={props.linkBox}
               className={cn(
                 props.linkBox && "cursor-pointer hover:bg-accent/50",
               )}
+              key={invoice.invoice}
+              linkBox={props.linkBox}
             >
               <TableCell className="font-medium">
                 <Link
-                  href={`/invoices/${invoice.invoice}`}
                   className={cn(
                     props.linkBox && "before:absolute before:inset-0",
                   )}
+                  href={`/invoices/${invoice.invoice}`}
                 >
                   {invoice.invoice}
                 </Link>
diff --git a/apps/dashboard/src/@/components/ui/table.tsx b/apps/dashboard/src/@/components/ui/table.tsx
index 5c586685eaf..7f99dc39a1d 100644
--- a/apps/dashboard/src/@/components/ui/table.tsx
+++ b/apps/dashboard/src/@/components/ui/table.tsx
@@ -8,11 +8,11 @@ const Table = React.forwardRef<
   React.HTMLAttributes<HTMLTableElement>
 >(({ className, ...props }, ref) => (
   <table
-    ref={ref}
     className={cn(
       "w-full caption-bottom border-collapse align-top text-sm lining-nums tabular-nums",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -23,8 +23,8 @@ const TableHeader = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <thead
-    ref={ref}
     className={cn("relative border-b bg-background", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -36,8 +36,8 @@ const TableBody = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <tbody
-    ref={ref}
     className={cn("[&_tr:last-child]:border-0", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -48,11 +48,11 @@ const TableFooter = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <tfoot
-    ref={ref}
     className={cn(
       "border-border border-t bg-card font-medium [&>tr]:last:border-b-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -69,12 +69,12 @@ const TableRow = React.forwardRef<
   }
 >(({ className, linkBox, ...props }, ref) => (
   <tr
-    ref={ref}
     className={cn(
       "border-border border-b last:border-0 data-[state=selected]:bg-muted",
       linkBox && "relative translate-x-0 translate-y-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -85,11 +85,11 @@ const TableHead = React.forwardRef<
   React.ThHTMLAttributes<HTMLTableCellElement>
 >(({ className, ...props }, ref) => (
   <th
-    ref={ref}
     className={cn(
       "px-6 py-4 text-left align-middle font-medium text-muted-foreground text-xs uppercase tracking-wider [&:has([role=checkbox])]:pr-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -100,11 +100,11 @@ const TableCell = React.forwardRef<
   React.TdHTMLAttributes<HTMLTableCellElement>
 >(({ className, ...props }, ref) => (
   <td
-    ref={ref}
     className={cn(
       "px-6 py-4 text-start align-middle text-sm [&:has([role=checkbox])]:pr-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -115,8 +115,8 @@ const TableCaption = React.forwardRef<
   React.HTMLAttributes<HTMLTableCaptionElement>
 >(({ className, ...props }, ref) => (
   <caption
-    ref={ref}
     className={cn("py-4 text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -129,13 +129,13 @@ function TableContainer(props: {
 }) {
   return (
     <ScrollShadow
-      shadowClassName="z-30"
-      disableTopShadow
       className={cn(
         "relative whitespace-nowrap rounded-lg border border-border bg-card",
         props.className,
       )}
+      disableTopShadow
       scrollableClassName={props.scrollableContainerClassName}
+      shadowClassName="z-30"
       shadowColor="hsl(var(--muted))"
     >
       {props.children}
diff --git a/apps/dashboard/src/@/components/ui/tabs.tsx b/apps/dashboard/src/@/components/ui/tabs.tsx
index 2fd9d76629b..47acea12b5d 100644
--- a/apps/dashboard/src/@/components/ui/tabs.tsx
+++ b/apps/dashboard/src/@/components/ui/tabs.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useCallback, useRef, useState } from "react";
-import { ScrollShadow } from "./ScrollShadow/ScrollShadow";
+import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
+import { cn } from "@/lib/utils";
 import { Button } from "./button";
+import { ScrollShadow } from "./ScrollShadow/ScrollShadow";
 import { ToolTipLabel } from "./tooltip";
 
 export type TabLink = {
@@ -49,14 +49,11 @@ export function TabLinks(props: {
             return (
               <Button
                 asChild
-                key={tab.href}
                 disabled={tab.isDisabled}
+                key={tab.href}
                 variant="ghost"
               >
                 <Link
-                  data-active={tab.isActive}
-                  ref={tab.isActive ? activeTabRef : undefined}
-                  href={tab.href}
                   aria-disabled={tab.isDisabled}
                   className={cn(
                     "relative h-auto rounded-lg px-3 font-normal text-muted-foreground text-sm hover:bg-accent lg:text-sm",
@@ -64,6 +61,9 @@ export function TabLinks(props: {
                     tab.isDisabled && "pointer-events-none",
                     tab.isActive && "!text-foreground",
                   )}
+                  data-active={tab.isActive}
+                  href={tab.href}
+                  ref={tab.isActive ? activeTabRef : undefined}
                 >
                   {tab.name}
                 </Link>
@@ -74,8 +74,8 @@ export function TabLinks(props: {
 
         {/* Active line */}
         <div
-          ref={lineRef}
           className="fade-in-0 absolute bottom-0 left-0 h-[2px] animate-in rounded-lg bg-foreground"
+          ref={lineRef}
         />
       </ScrollShadow>
     </div>
@@ -124,8 +124,6 @@ export function TabButtons(props: {
                 label={tab.toolTip}
               >
                 <Button
-                  variant="ghost"
-                  ref={tab.isActive ? activeTabRef : undefined}
                   className={cn(
                     "relative inline-flex h-auto items-center gap-1.5 rounded-lg px-2 font-medium text-sm hover:bg-accent lg:px-3 lg:text-base",
                     !tab.isActive &&
@@ -135,6 +133,8 @@ export function TabButtons(props: {
                     tab.isActive && props.activeTabClassName,
                   )}
                   onClick={!tab.isDisabled ? tab.onClick : undefined}
+                  ref={tab.isActive ? activeTabRef : undefined}
+                  variant="ghost"
                 >
                   {tab.icon && (
                     <tab.icon
@@ -150,8 +150,8 @@ export function TabButtons(props: {
 
         {/* Active line */}
         <div
-          ref={lineRef}
           className="fade-in-0 absolute bottom-0 left-0 h-[2px] animate-in rounded-lg bg-foreground"
+          ref={lineRef}
         />
       </ScrollShadow>
     </div>
@@ -188,7 +188,7 @@ function useUnderline<El extends HTMLElement>() {
     }
 
     update();
-    let resizeObserver: ResizeObserver | undefined = undefined;
+    let resizeObserver: ResizeObserver | undefined;
 
     if (containerRef.current) {
       resizeObserver = new ResizeObserver(() => {
@@ -207,7 +207,7 @@ function useUnderline<El extends HTMLElement>() {
     };
   }, [activeTabEl]);
 
-  return { containerRef, lineRef, activeTabRef };
+  return { activeTabRef, containerRef, lineRef };
 }
 
 export function TabPathLinks(props: {
@@ -230,7 +230,6 @@ export function TabPathLinks(props: {
     <TabLinks
       {...restProps}
       links={links.map((l) => ({
-        name: l.name,
         href: l.path,
         isActive: l.isActive
           ? l.isActive(pathname)
@@ -238,6 +237,7 @@ export function TabPathLinks(props: {
             ? pathname === l.path
             : pathname.startsWith(l.path),
         isDisabled: l.isDisabled,
+        name: l.name,
       }))}
     />
   );
diff --git a/apps/dashboard/src/@/components/ui/text-shimmer.tsx b/apps/dashboard/src/@/components/ui/text-shimmer.tsx
index 7355cb8c18a..d9929da529a 100644
--- a/apps/dashboard/src/@/components/ui/text-shimmer.tsx
+++ b/apps/dashboard/src/@/components/ui/text-shimmer.tsx
@@ -1,9 +1,6 @@
 import { cn } from "../../lib/utils";
 
-export function TextShimmer(props: {
-  text: string;
-  className?: string;
-}) {
+export function TextShimmer(props: { text: string; className?: string }) {
   return (
     <div className="flex">
       <p
diff --git a/apps/dashboard/src/@/components/ui/tooltip.tsx b/apps/dashboard/src/@/components/ui/tooltip.tsx
index cc07667ea2f..3a0ea11c6ae 100644
--- a/apps/dashboard/src/@/components/ui/tooltip.tsx
+++ b/apps/dashboard/src/@/components/ui/tooltip.tsx
@@ -16,12 +16,12 @@ const TooltipContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
 >(({ className, sideOffset = 4, ...props }, ref) => (
   <TooltipPrimitive.Content
-    ref={ref}
-    sideOffset={sideOffset}
     className={cn(
       "fade-in-0 zoom-in-95 data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 animate-in overflow-hidden rounded-md border border-border bg-popover px-3 py-1.5 text-popover-foreground text-sm shadow-md data-[state=closed]:animate-out",
       className,
     )}
+    ref={ref}
+    sideOffset={sideOffset}
     {...props}
   />
 ));
@@ -50,13 +50,13 @@ export function ToolTipLabel(props: {
           {props.children}
         </TooltipTrigger>
         <TooltipContent
-          side={props.side}
           align={props.align}
-          sideOffset={10}
           className={cn(
             "max-w-[400px] whitespace-normal p-0 leading-relaxed",
             props.contentClassName,
           )}
+          side={props.side}
+          sideOffset={10}
         >
           <div className="flex items-center gap-1.5 p-4 text-sm">
             {props.leftIcon}
diff --git a/apps/dashboard/src/@/constants/thirdweb-client.server.ts b/apps/dashboard/src/@/constants/thirdweb-client.server.ts
index caca885ad2f..4c804ba4707 100644
--- a/apps/dashboard/src/@/constants/thirdweb-client.server.ts
+++ b/apps/dashboard/src/@/constants/thirdweb-client.server.ts
@@ -4,6 +4,6 @@ import { DASHBOARD_THIRDWEB_SECRET_KEY } from "./server-envs";
 import { getConfiguredThirdwebClient } from "./thirdweb.server";
 
 export const serverThirdwebClient = getConfiguredThirdwebClient({
-  teamId: undefined,
   secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+  teamId: undefined,
 });
diff --git a/apps/dashboard/src/@/constants/thirdweb.server.ts b/apps/dashboard/src/@/constants/thirdweb.server.ts
index 74946a3edab..0773a6d27c9 100644
--- a/apps/dashboard/src/@/constants/thirdweb.server.ts
+++ b/apps/dashboard/src/@/constants/thirdweb.server.ts
@@ -1,7 +1,3 @@
-import {
-  NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
-  NEXT_PUBLIC_IPFS_GATEWAY_URL,
-} from "@/constants/public-envs";
 import {
   THIRDWEB_BRIDGE_URL,
   THIRDWEB_BUNDLER_DOMAIN,
@@ -12,7 +8,7 @@ import {
   THIRDWEB_SOCIAL_API_DOMAIN,
   THIRDWEB_STORAGE_DOMAIN,
 } from "constants/urls";
-import { type ThirdwebClient, createThirdwebClient } from "thirdweb";
+import { createThirdwebClient, type ThirdwebClient } from "thirdweb";
 import { populateEip712Transaction } from "thirdweb/transaction";
 import {
   getTransactionDecorator,
@@ -20,6 +16,10 @@ import {
   setTransactionDecorator,
 } from "thirdweb/utils";
 import { getZkPaymasterData } from "thirdweb/wallets/smart";
+import {
+  NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
+  NEXT_PUBLIC_IPFS_GATEWAY_URL,
+} from "@/constants/public-envs";
 import { getVercelEnv } from "../../lib/vercel-utils";
 
 export function getConfiguredThirdwebClient(options: {
@@ -29,14 +29,14 @@ export function getConfiguredThirdwebClient(options: {
   if (getVercelEnv() !== "production") {
     // if not on production: run this when creating a client to set the domains
     setThirdwebDomains({
-      rpc: THIRDWEB_RPC_DOMAIN,
+      bridge: THIRDWEB_BRIDGE_URL,
+      bundler: THIRDWEB_BUNDLER_DOMAIN,
       inAppWallet: THIRDWEB_INAPP_WALLET_DOMAIN,
+      insight: THIRDWEB_INSIGHT_API_DOMAIN,
       pay: THIRDWEB_PAY_DOMAIN,
-      storage: THIRDWEB_STORAGE_DOMAIN,
+      rpc: THIRDWEB_RPC_DOMAIN,
       social: THIRDWEB_SOCIAL_API_DOMAIN,
-      bundler: THIRDWEB_BUNDLER_DOMAIN,
-      insight: THIRDWEB_INSIGHT_API_DOMAIN,
-      bridge: THIRDWEB_BRIDGE_URL,
+      storage: THIRDWEB_STORAGE_DOMAIN,
     });
   }
 
@@ -50,13 +50,13 @@ export function getConfiguredThirdwebClient(options: {
         transaction.chain.id === 50104
       ) {
         const serializedTx = await populateEip712Transaction({
-          transaction,
           account,
+          transaction,
         });
         const pmData = await getZkPaymasterData({
           options: {
-            client: transaction.client,
             chain: transaction.chain,
+            client: transaction.client,
           },
           transaction: serializedTx,
         });
@@ -77,14 +77,14 @@ export function getConfiguredThirdwebClient(options: {
   }
 
   return createThirdwebClient({
-    teamId: options.teamId,
-    secretKey: options.secretKey,
     clientId: NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
     config: {
       storage: {
         gatewayUrl: NEXT_PUBLIC_IPFS_GATEWAY_URL,
       },
     },
+    secretKey: options.secretKey,
+    teamId: options.teamId,
   });
 }
 
diff --git a/apps/dashboard/src/@/lib/DashboardRouter.tsx b/apps/dashboard/src/@/lib/DashboardRouter.tsx
index 3e15b850aff..6481757b0a6 100644
--- a/apps/dashboard/src/@/lib/DashboardRouter.tsx
+++ b/apps/dashboard/src/@/lib/DashboardRouter.tsx
@@ -30,14 +30,14 @@ export function useDashboardRouter() {
   return useMemo(() => {
     return {
       ...router,
-      replace(href: string, options?: { scroll?: boolean }) {
+      push(href: string, options?: { scroll?: boolean }) {
         startTransition(() => {
-          router.replace(href, options);
+          router.push(href, options);
         });
       },
-      push(href: string, options?: { scroll?: boolean }) {
+      replace(href: string, options?: { scroll?: boolean }) {
         startTransition(() => {
-          router.push(href, options);
+          router.replace(href, options);
         });
       },
     };
@@ -109,10 +109,10 @@ export function DashboardRouterTopProgressBar() {
       className="fixed top-0 block h-[3px] bg-foreground"
       style={{
         opacity: isRouteLoading ? "100" : "0",
-        width: `${width}%`,
+        pointerEvents: "none",
         transition: width === 0 ? "none" : "width 0.2s ease, opacity 0.3s ease",
+        width: `${width}%`,
         zIndex: "100000000",
-        pointerEvents: "none",
       }}
     />
   );
diff --git a/apps/dashboard/src/@/lib/resolveSchemeWithErrorHandler.ts b/apps/dashboard/src/@/lib/resolveSchemeWithErrorHandler.ts
index 38a6a3946eb..193b8c5593c 100644
--- a/apps/dashboard/src/@/lib/resolveSchemeWithErrorHandler.ts
+++ b/apps/dashboard/src/@/lib/resolveSchemeWithErrorHandler.ts
@@ -11,8 +11,8 @@ export function resolveSchemeWithErrorHandler(options: {
   try {
     // eslint-disable-next-line no-restricted-syntax
     return resolveScheme({
-      uri: options.uri,
       client: options.client,
+      uri: options.uri,
     });
   } catch (err) {
     console.error("error resolving ipfs url", options.uri, err);
diff --git a/apps/dashboard/src/@/lib/time.ts b/apps/dashboard/src/@/lib/time.ts
index 43ed6aad84f..c8c1045e645 100644
--- a/apps/dashboard/src/@/lib/time.ts
+++ b/apps/dashboard/src/@/lib/time.ts
@@ -1,7 +1,7 @@
 import {
   type DurationId,
-  type Range,
   getLastNDaysRange,
+  type Range,
 } from "components/analytics/date-range-selector";
 import { differenceInCalendarDays } from "date-fns";
 
@@ -45,12 +45,12 @@ export function getFiltersFromSearchParams(params: {
       : ("day" as const));
 
   return {
-    range,
     interval:
       params.interval === "day"
         ? ("day" as const)
         : params.interval === "week"
           ? ("week" as const)
           : (defaultInterval as "day" | "week"),
+    range,
   };
 }
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/cache-keys.ts b/apps/dashboard/src/@3rdweb-sdk/react/cache-keys.ts
index ee3b5ca6f84..069bb07809c 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/cache-keys.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/cache-keys.ts
@@ -1,12 +1,14 @@
 export const accountKeys = {
   all: ["account"] as const,
-  wallet: (walletAddress: string) =>
-    [...accountKeys.all, walletAddress] as const,
+  billingSession: (walletAddress: string) =>
+    [...accountKeys.wallet(walletAddress), "billing-session"] as const,
+  credits: (walletAddress: string) =>
+    [...accountKeys.wallet(walletAddress), "credits"] as const,
   me: (walletAddress: string) =>
     [...accountKeys.wallet(walletAddress), "me"] as const,
   usage: (walletAddress: string) =>
     [...accountKeys.wallet(walletAddress), "usage"] as const,
-  walletStats: (
+  userOpStats: (
     walletAddress: string,
     clientId: string,
     from: string,
@@ -15,13 +17,15 @@ export const accountKeys = {
   ) =>
     [
       ...accountKeys.wallet(walletAddress),
-      "wallets",
+      "userOps",
       clientId,
       from,
       to,
       period,
     ] as const,
-  userOpStats: (
+  wallet: (walletAddress: string) =>
+    [...accountKeys.all, walletAddress] as const,
+  walletStats: (
     walletAddress: string,
     clientId: string,
     from: string,
@@ -30,68 +34,49 @@ export const accountKeys = {
   ) =>
     [
       ...accountKeys.wallet(walletAddress),
-      "userOps",
+      "wallets",
       clientId,
       from,
       to,
       period,
     ] as const,
-  credits: (walletAddress: string) =>
-    [...accountKeys.wallet(walletAddress), "credits"] as const,
-  billingSession: (walletAddress: string) =>
-    [...accountKeys.wallet(walletAddress), "billing-session"] as const,
 };
 
 export const authorizedWallets = {
   all: ["authorizedWallets"] as const,
-  wallet: (walletAddress: string) =>
-    [...authorizedWallets.all, walletAddress] as const,
   authorizedWallets: (walletAddress: string) =>
     [...authorizedWallets.wallet(walletAddress), "authorizedWallets"] as const,
+  wallet: (walletAddress: string) =>
+    [...authorizedWallets.all, walletAddress] as const,
 };
 
 export const embeddedWalletsKeys = {
   all: ["embeddedWallets"] as const,
-  wallet: (walletAddress: string) =>
-    [...embeddedWalletsKeys.all, walletAddress] as const,
   embeddedWallets: (
     walletAddress: string,
     clientId: string | undefined,
     page: number,
   ) => [...embeddedWalletsKeys.wallet(walletAddress), clientId, page] as const,
+  wallet: (walletAddress: string) =>
+    [...embeddedWalletsKeys.all, walletAddress] as const,
 };
 
 export const engineKeys = {
-  all: ["engine"] as const,
-  instances: (address: string) =>
-    [...engineKeys.all, address, "instances"] as const,
-  backendWallets: (instance: string) =>
-    [...engineKeys.all, instance, "backendWallets"] as const,
-  transactions: (instance: string, params: object) =>
-    [...engineKeys.all, instance, "transactions", params] as const,
-  permissions: (instance: string) =>
-    [...engineKeys.all, instance, "permissions"] as const,
   accessTokens: (instance: string) =>
     [...engineKeys.all, instance, "accessTokens"] as const,
-  keypairs: (instance: string) =>
-    [...engineKeys.all, instance, "keypairs"] as const,
-  relayers: (instance: string) =>
-    [...engineKeys.all, instance, "relayers"] as const,
-  webhooks: (instance: string) =>
-    [...engineKeys.all, instance, "webhooks"] as const,
-  webhookEventTypes: (instance: string) =>
-    [...engineKeys.all, instance, "webhookEventTypes"] as const,
-  walletConfig: (instance: string) =>
-    [...engineKeys.all, instance, "walletConfig"] as const,
+
+  alertRules: (engineId: string) =>
+    [...engineKeys.all, engineId, "alertRules"] as const,
+  alerts: (engineId: string) =>
+    [...engineKeys.all, engineId, "alerts"] as const,
+  all: ["engine"] as const,
   backendWallet: (address: string, chainId: number) =>
     ["backendWallet", address, chainId] as const,
   backendWalletBalance: (address: string, chainId: number) =>
     ["backendWallet", "balance", address, chainId] as const,
   backendWalletBalanceAll: () => ["backendWallet", "balance"] as const,
-  corsUrls: (instance: string) =>
-    [...engineKeys.all, instance, "corsUrls"] as const,
-  ipAllowlist: (instance: string) =>
-    [...engineKeys.all, instance, "ipAllowlist"] as const,
+  backendWallets: (instance: string) =>
+    [...engineKeys.all, instance, "backendWallets"] as const,
   contractSubscriptions: (instance: string) =>
     [...engineKeys.all, instance, "contractSubscriptions"] as const,
   contractSubscriptionsLastBlock: (instance: string, chainId: number) =>
@@ -101,21 +86,36 @@ export const engineKeys = {
       "contractSubscriptionsLastBlock",
       chainId,
     ] as const,
-  health: (instance: string) =>
-    [...engineKeys.all, instance, "health"] as const,
+  corsUrls: (instance: string) =>
+    [...engineKeys.all, instance, "corsUrls"] as const,
   deploymentPublicConfiguration: () =>
     [...engineKeys.all, "deploymentPublicConfiguration"] as const,
-  systemMetrics: (engineId: string) =>
-    [...engineKeys.all, engineId, "systemMetrics"] as const,
-  queueMetrics: (engineId: string) =>
-    [...engineKeys.all, engineId, "queueMetrics"] as const,
-
-  alertRules: (engineId: string) =>
-    [...engineKeys.all, engineId, "alertRules"] as const,
-  alerts: (engineId: string) =>
-    [...engineKeys.all, engineId, "alerts"] as const,
+  health: (instance: string) =>
+    [...engineKeys.all, instance, "health"] as const,
+  instances: (address: string) =>
+    [...engineKeys.all, address, "instances"] as const,
+  ipAllowlist: (instance: string) =>
+    [...engineKeys.all, instance, "ipAllowlist"] as const,
+  keypairs: (instance: string) =>
+    [...engineKeys.all, instance, "keypairs"] as const,
   notificationChannels: (engineId: string) =>
     [...engineKeys.all, engineId, "notificationChannels"] as const,
+  permissions: (instance: string) =>
+    [...engineKeys.all, instance, "permissions"] as const,
+  queueMetrics: (engineId: string) =>
+    [...engineKeys.all, engineId, "queueMetrics"] as const,
+  relayers: (instance: string) =>
+    [...engineKeys.all, instance, "relayers"] as const,
+  systemMetrics: (engineId: string) =>
+    [...engineKeys.all, engineId, "systemMetrics"] as const,
+  transactions: (instance: string, params: object) =>
+    [...engineKeys.all, instance, "transactions", params] as const,
+  walletConfig: (instance: string) =>
+    [...engineKeys.all, instance, "walletConfig"] as const,
   walletCredentials: (instance: string) =>
     [...engineKeys.all, instance, "walletCredentials"] as const,
+  webhookEventTypes: (instance: string) =>
+    [...engineKeys.all, instance, "webhookEventTypes"] as const,
+  webhooks: (instance: string) =>
+    [...engineKeys.all, instance, "webhooks"] as const,
 };
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/components/connect-wallet/index.tsx b/apps/dashboard/src/@3rdweb-sdk/react/components/connect-wallet/index.tsx
index d8e19f84fa8..0f5f8fa344e 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/components/connect-wallet/index.tsx
+++ b/apps/dashboard/src/@3rdweb-sdk/react/components/connect-wallet/index.tsx
@@ -1,17 +1,14 @@
 "use client";
 
-import { resetAnalytics } from "@/analytics/reset";
-import { Button } from "@/components/ui/button";
-import { useStore } from "@/lib/reactive";
 import { getSDKTheme } from "app/(app)/components/sdk-component-theme";
 import { LazyConfigureNetworkModal } from "components/configure-networks/LazyConfigureNetworkModal";
 import { CustomChainRenderer } from "components/selects/CustomChainRenderer";
 import { mapV4ChainToV5Chain } from "contexts/map-chains";
 import { useAllChainsData } from "hooks/chains/allChains";
-import { useTheme } from "next-themes";
 import Image from "next/image";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { useTheme } from "next-themes";
 import { useCallback, useMemo, useState } from "react";
 import type { Chain, ThirdwebClient } from "thirdweb";
 import {
@@ -20,12 +17,15 @@ import {
   useActiveAccount,
   useConnectModal,
 } from "thirdweb/react";
+import { resetAnalytics } from "@/analytics/reset";
+import { Button } from "@/components/ui/button";
+import { useStore } from "@/lib/reactive";
 import { useFavoriteChainIds } from "../../../../app/(app)/(dashboard)/(chain)/components/client/star-button";
 import { doLogout } from "../../../../app/(app)/login/auth-actions";
 import {
-  type StoredChain,
   addRecentlyUsedChainId,
   recentlyUsedChainIdsStore,
+  type StoredChain,
 } from "../../../../stores/chainStores";
 import { popularChains } from "../popularChains";
 
@@ -95,16 +95,16 @@ export const CustomConnectWallet = (props: {
   const chainSections: NetworkSelectorProps["sections"] = useMemo(() => {
     return [
       {
-        label: "Recent",
         chains: recentlyUsedChainsWithMetadata,
+        label: "Recent",
       },
       {
-        label: "Favorites",
         chains: favoriteChainsWithMetadata,
+        label: "Favorites",
       },
       {
-        label: "Popular",
         chains: popularChainsWithMetadata,
+        label: "Popular",
       },
     ];
   }, [
@@ -123,9 +123,9 @@ export const CustomConnectWallet = (props: {
       <>
         <Button
           asChild
-          variant="default"
           className={props.signInLinkButtonClassName}
           size="lg"
+          variant="default"
         >
           <Link
             href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
@@ -140,37 +140,32 @@ export const CustomConnectWallet = (props: {
   return (
     <>
       <ConnectButton
-        theme={getSDKTheme(t)}
-        client={client}
-        connectModal={{
-          privacyPolicyUrl: "/privacy-policy",
-          termsOfServiceUrl: "/terms",
-          showThirdwebBranding: false,
-          welcomeScreen: () => <ConnectWalletWelcomeScreen theme={t} />,
-        }}
         appMetadata={{
-          name: "thirdweb",
           logoUrl: "https://thirdweb.com/favicon.ico",
+          name: "thirdweb",
           url: "https://thirdweb.com",
         }}
-        onDisconnect={async () => {
-          try {
-            await doLogout();
-            resetAnalytics();
-          } catch (err) {
-            console.error("Failed to log out", err);
-          }
-        }}
+        chain={props.chain}
+        chains={allChainsV5}
+        client={client}
         connectButton={{
           className: props.connectButtonClassName,
         }}
+        connectModal={{
+          privacyPolicyUrl: "/privacy-policy",
+          showThirdwebBranding: false,
+          termsOfServiceUrl: "/terms",
+          welcomeScreen: () => <ConnectWalletWelcomeScreen theme={t} />,
+        }}
         detailsButton={{
           className: props.detailsButtonClassName,
         }}
-        chains={allChainsV5}
         detailsModal={{
           networkSelector: {
-            sections: chainSections,
+            onCustomClick: () => {
+              setEditChain(undefined);
+              setIsNetworkConfigModalOpen(true);
+            },
             onSwitch(chain) {
               addRecentlyUsedChainId(chain.id);
             },
@@ -186,20 +181,25 @@ export const CustomConnectWallet = (props: {
                 />
               );
             },
-            onCustomClick: () => {
-              setEditChain(undefined);
-              setIsNetworkConfigModalOpen(true);
-            },
+            sections: chainSections,
           },
         }}
-        chain={props.chain}
+        onDisconnect={async () => {
+          try {
+            await doLogout();
+            resetAnalytics();
+          } catch (err) {
+            console.error("Failed to log out", err);
+          }
+        }}
+        theme={getSDKTheme(t)}
       />
 
       <LazyConfigureNetworkModal
-        open={isNetworkConfigModalOpen}
-        onOpenChange={setIsNetworkConfigModalOpen}
-        editChain={editChain}
         client={client}
+        editChain={editChain}
+        onOpenChange={setIsNetworkConfigModalOpen}
+        open={isNetworkConfigModalOpen}
       />
     </>
   );
@@ -214,26 +214,26 @@ function ConnectWalletWelcomeScreen(props: {
 
   return (
     <div
+      className="flex h-full flex-col bg-center bg-cover bg-no-repeat p-6"
       style={{
         backgroundColor: props.theme === "dark" ? "#18132f" : "#c7b5f1",
         backgroundImage: `url("/assets/connect-wallet/welcome-gradient-${props.theme}.png")`,
       }}
-      className="flex h-full flex-col bg-center bg-cover bg-no-repeat p-6"
     >
       <div className="flex flex-grow flex-col justify-center">
         <div>
           <div className="flex justify-center">
             <Image
+              alt=""
               className="select-none"
+              draggable={false}
+              height={150}
+              loading="eager"
+              src="/assets/connect-wallet/tw-welcome-icon.svg"
               style={{
                 mixBlendMode: props.theme === "dark" ? "soft-light" : "initial",
               }}
-              draggable={false}
               width={200}
-              height={150}
-              alt=""
-              src="/assets/connect-wallet/tw-welcome-icon.svg"
-              loading="eager"
             />
           </div>
 
@@ -262,12 +262,12 @@ function ConnectWalletWelcomeScreen(props: {
 
       <Link
         className="text-center font-semibold opacity-70 hover:no-underline hover:opacity-100"
-        target="_blank"
-        rel="noopener noreferrer"
         href="https://blog.thirdweb.com/web3-wallet/"
+        rel="noopener noreferrer"
         style={{
           color: fontColor,
         }}
+        target="_blank"
       >
         New to Wallets?
       </Link>
@@ -282,22 +282,22 @@ export function useCustomConnectModal() {
   return useCallback(
     (options: { chain?: Chain; client: ThirdwebClient }) => {
       return connect({
-        client: options.client,
         appMetadata: {
-          name: "thirdweb",
           logoUrl: "https://thirdweb.com/favicon.ico",
+          name: "thirdweb",
           url: "https://thirdweb.com",
         },
         chain: options?.chain,
+        client: options.client,
         privacyPolicyUrl: "/privacy-policy",
-        termsOfServiceUrl: "/terms",
         showThirdwebBranding: false,
+        termsOfServiceUrl: "/terms",
+        theme: getSDKTheme(theme === "light" ? "light" : "dark"),
         welcomeScreen: () => (
           <ConnectWalletWelcomeScreen
             theme={theme === "light" ? "light" : "dark"}
           />
         ),
-        theme: getSDKTheme(theme === "light" ? "light" : "dark"),
       });
     },
     [connect, theme],
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/components/roles/admin-only.tsx b/apps/dashboard/src/@3rdweb-sdk/react/components/roles/admin-only.tsx
index 24df7a058e0..2ba21ac1c62 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/components/roles/admin-only.tsx
+++ b/apps/dashboard/src/@3rdweb-sdk/react/components/roles/admin-only.tsx
@@ -2,11 +2,10 @@ import {
   useIsAdmin,
   useIsAdminOrSelf,
 } from "@3rdweb-sdk/react/hooks/useContractRoles";
+import type { JSX } from "react";
 import type { ThirdwebContract } from "thirdweb";
 import type { ComponentWithChildren } from "types/component-with-children";
 
-import type { JSX } from "react";
-
 interface AdminOnlyProps {
   contract: ThirdwebContract;
   failOpen?: boolean;
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useActivity.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useActivity.ts
index 1795a5f2e21..1053b64fec0 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useActivity.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useActivity.ts
@@ -15,8 +15,8 @@ export interface InternalTransaction {
 
 export function useActivity(contract: ThirdwebContract, autoUpdate?: boolean) {
   const eventsQuery = useContractEvents({
-    contract,
     blockRange: 20000,
+    contract,
     watch: autoUpdate,
   });
 
@@ -39,9 +39,9 @@ export function useActivity(contract: ThirdwebContract, autoUpdate?: boolean) {
             }
           } else {
             acc[curr.transactionHash] = {
-              transactionHash: curr.transactionHash,
               blockNumber: curr.blockNumber,
               events: [curr],
+              transactionHash: curr.transactionHash,
             };
           }
           return acc;
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts
index 881004738d4..3c7888062f0 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts
@@ -1,16 +1,16 @@
-import { apiServerProxy } from "@/actions/proxies";
-import type { Project } from "@/api/projects";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useActiveAccount } from "thirdweb/react";
+import { apiServerProxy } from "@/actions/proxies";
+import type { Project } from "@/api/projects";
 import { accountKeys, authorizedWallets } from "../cache-keys";
 
 // FIXME: We keep repeating types, API server should provide them
 
 export const accountPlan = {
+  enterprise: "enterprise",
   free: "free",
   growth: "growth",
   pro: "pro",
-  enterprise: "enterprise",
 } as const;
 
 export type AuthorizedWallet = {
@@ -70,7 +70,7 @@ export interface BillingCredit {
 export function useAccountCredits() {
   const address = useActiveAccount()?.address;
   return useQuery({
-    queryKey: accountKeys.credits(address || ""),
+    enabled: !!address,
     queryFn: async () => {
       type Result = {
         data: BillingCredit[];
@@ -78,11 +78,11 @@ export function useAccountCredits() {
       };
 
       const res = await apiServerProxy<Result>({
-        pathname: "/v1/account/credits",
-        method: "GET",
         headers: {
           "Content-Type": "application/json",
         },
+        method: "GET",
+        pathname: "/v1/account/credits",
       });
 
       if (!res.ok) {
@@ -104,7 +104,7 @@ export function useAccountCredits() {
 
       return credits;
     },
-    enabled: !!address,
+    queryKey: accountKeys.credits(address || ""),
   });
 }
 
@@ -123,12 +123,12 @@ export async function updateAccountClient(input: UpdateAccountParams) {
   };
 
   const res = await apiServerProxy<Result>({
-    pathname: "/v1/account",
-    method: "PUT",
+    body: JSON.stringify(input),
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(input),
+    method: "PUT",
+    pathname: "/v1/account",
   });
 
   if (!res.ok) {
@@ -156,12 +156,12 @@ export function useUpdateNotifications() {
       };
 
       const res = await apiServerProxy<Result>({
-        pathname: "/v1/account/notifications",
-        method: "PUT",
+        body: JSON.stringify({ preferences: input }),
         headers: {
           "Content-Type": "application/json",
         },
-        body: JSON.stringify({ preferences: input }),
+        method: "PUT",
+        pathname: "/v1/account/notifications",
       });
 
       if (!res.ok) {
@@ -191,12 +191,12 @@ export const verifyEmailClient = async (input: ConfirmEmailInput) => {
   };
 
   const res = await apiServerProxy<Result>({
-    pathname: "/v1/account/confirmEmail",
-    method: "PUT",
+    body: JSON.stringify(input),
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(input),
+    method: "PUT",
+    pathname: "/v1/account/confirmEmail",
   });
 
   if (!res.ok) {
@@ -219,12 +219,12 @@ export const resendEmailClient = async () => {
   };
 
   const res = await apiServerProxy<Result>({
-    pathname: "/v1/account/resendEmailConfirmation",
-    method: "POST",
+    body: JSON.stringify({}),
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify({}),
+    method: "POST",
+    pathname: "/v1/account/resendEmailConfirmation",
   });
 
   if (!res.ok) {
@@ -252,12 +252,12 @@ export async function createProjectClient(
   };
 
   const res = await apiServerProxy<Response>({
-    pathname: `/v1/teams/${teamId}/projects`,
-    method: "POST",
+    body: JSON.stringify(body),
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(body),
+    method: "POST",
+    pathname: `/v1/teams/${teamId}/projects`,
   });
 
   if (!res.ok) {
@@ -279,12 +279,12 @@ export async function updateProjectClient(
   };
 
   const res = await apiServerProxy<Response>({
-    pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}`,
-    method: "PUT",
+    body: JSON.stringify(body),
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(body),
+    method: "PUT",
+    pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}`,
   });
 
   if (!res.ok) {
@@ -303,8 +303,8 @@ export async function deleteProjectClient(params: {
   };
 
   const res = await apiServerProxy<Response>({
-    pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}`,
     method: "DELETE",
+    pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}`,
   });
 
   if (!res.ok) {
@@ -326,12 +326,12 @@ export async function rotateSecretKeyClient(params: {
   projectId: string;
 }) {
   const res = await apiServerProxy<RotateSecretKeyAPIReturnType>({
-    pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}/rotate-secret-key`,
-    method: "POST",
     body: JSON.stringify({}),
     headers: {
       "Content-Type": "application/json",
     },
+    method: "POST",
+    pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}/rotate-secret-key`,
   });
 
   if (!res.ok) {
@@ -354,12 +354,12 @@ export function useRevokeAuthorizedWallet() {
       };
 
       const res = await apiServerProxy<Result>({
-        pathname: `/v1/authorized-wallets/${authorizedWalletId}/revoke`,
-        method: "POST",
+        body: JSON.stringify({}),
         headers: {
           "Content-Type": "application/json",
         },
-        body: JSON.stringify({}),
+        method: "POST",
+        pathname: `/v1/authorized-wallets/${authorizedWalletId}/revoke`,
       });
 
       if (!res.ok) {
@@ -385,7 +385,8 @@ export function useRevokeAuthorizedWallet() {
 export function useAuthorizedWallets() {
   const address = useActiveAccount()?.address;
   return useQuery({
-    queryKey: authorizedWallets.authorizedWallets(address || ""),
+    enabled: !!address,
+    gcTime: 0,
     queryFn: async () => {
       type Result = {
         data: AuthorizedWallet[];
@@ -393,11 +394,11 @@ export function useAuthorizedWallets() {
       };
 
       const res = await apiServerProxy<Result>({
-        pathname: "/v1/authorized-wallets",
-        method: "GET",
         headers: {
           "Content-Type": "application/json",
         },
+        method: "GET",
+        pathname: "/v1/authorized-wallets",
       });
 
       if (!res.ok) {
@@ -412,7 +413,6 @@ export function useAuthorizedWallets() {
 
       return json.data;
     },
-    enabled: !!address,
-    gcTime: 0,
+    queryKey: authorizedWallets.authorizedWallets(address || ""),
   });
 }
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useContractRoles.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useContractRoles.ts
index 80a93fbeda4..8a0eeb2c6e0 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useContractRoles.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useContractRoles.ts
@@ -6,9 +6,9 @@ export function useIsAdmin(contract: ThirdwebContract, failOpen = true) {
   const address = useActiveAccount()?.address;
   const { data: userIsAdmin, isError } = useReadContract(hasRole, {
     contract,
-    targetAccountAddress: address ?? "",
-    role: "admin",
     queryOptions: { enabled: !!address },
+    role: "admin",
+    targetAccountAddress: address ?? "",
   });
 
   // If the request results in an error, it's likely that the contract is a non-thirdweb contract
@@ -32,15 +32,15 @@ export function useIsMinter(contract: ThirdwebContract) {
   const address = useActiveAccount()?.address;
   const userCanMintQuery = useReadContract(hasRole, {
     contract,
-    targetAccountAddress: address ?? "",
-    role: "minter",
     queryOptions: { enabled: !!address },
+    role: "minter",
+    targetAccountAddress: address ?? "",
   });
 
   const anyoneCanMintQuery = useReadContract(hasRole, {
     contract,
-    targetAccountAddress: ZERO_ADDRESS,
     role: "minter",
+    targetAccountAddress: ZERO_ADDRESS,
   });
 
   // If both requests "error out", we can safely assume that
@@ -57,15 +57,15 @@ export function useIsLister(contract: ThirdwebContract) {
   const address = useActiveAccount()?.address;
   const { data: userCanList } = useReadContract(hasRole, {
     contract,
-    targetAccountAddress: address ?? "",
-    role: "lister",
     queryOptions: { enabled: !!address },
+    role: "lister",
+    targetAccountAddress: address ?? "",
   });
 
   const { data: anyoneCanList } = useReadContract(hasRole, {
     contract,
-    targetAccountAddress: ZERO_ADDRESS,
     role: "lister",
+    targetAccountAddress: ZERO_ADDRESS,
   });
 
   return anyoneCanList || userCanList;
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useDashboardContractMetadata.tsx b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useDashboardContractMetadata.tsx
index 22b222255d4..035c69aa5c6 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useDashboardContractMetadata.tsx
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useDashboardContractMetadata.tsx
@@ -13,8 +13,8 @@ import { getContractMetadata, name, symbol } from "thirdweb/extensions/common";
  */
 export function useDashboardContractMetadata(contract: ThirdwebContract) {
   return useQuery({
-    queryKey: ["contract-metadata-header", contract.chain.id, contract.address],
     queryFn: () => fetchDashboardContractMetadata(contract),
+    queryKey: ["contract-metadata-header", contract.chain.id, contract.address],
     refetchOnWindowFocus: false,
   });
 }
@@ -58,9 +58,9 @@ export async function fetchDashboardContractMetadata(
   const contractSymbol = contractMetadata?.symbol || _symbol || "";
 
   return {
+    contractType: compilerMetadata?.name || "",
+    image: contractMetadata.image || "",
     name: contractName,
     symbol: contractSymbol,
-    image: contractMetadata.image || "",
-    contractType: compilerMetadata?.name || "",
   };
 }
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useDashboardOwnedNFTs.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useDashboardOwnedNFTs.ts
index c74b382a5c8..39e78fd2027 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useDashboardOwnedNFTs.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useDashboardOwnedNFTs.ts
@@ -15,14 +15,13 @@ export function useDashboardOwnedNFTs({
   contract,
   owner,
   disabled,
-}: { owner?: string; contract?: ThirdwebContract; disabled?: boolean }) {
+}: {
+  owner?: string;
+  contract?: ThirdwebContract;
+  disabled?: boolean;
+}) {
   return useQuery({
-    queryKey: [
-      "owned-nfts",
-      contract?.chain.id || "",
-      contract?.address || "",
-      owner || "",
-    ],
+    enabled: !!contract && !!owner && !disabled,
     queryFn: async (): Promise<NFT[]> => {
       invariant(contract, "Contract is required");
       invariant(owner, "owner address is required");
@@ -34,8 +33,13 @@ export function useDashboardOwnedNFTs({
         });
       }
       // Else default to 1155
-      return getOwnedERC1155({ contract, address: owner });
+      return getOwnedERC1155({ address: owner, contract });
     },
-    enabled: !!contract && !!owner && !disabled,
+    queryKey: [
+      "owned-nfts",
+      contract?.chain.id || "",
+      contract?.address || "",
+      owner || "",
+    ],
   });
 }
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEmbeddedWallets.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEmbeddedWallets.ts
index 86254d1e4e7..fc72a3b7963 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEmbeddedWallets.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEmbeddedWallets.ts
@@ -8,18 +8,22 @@ const fetchAccountList = ({
   jwt,
   clientId,
   pageNumber,
-}: { jwt: string; clientId: string; pageNumber: number }) => {
+}: {
+  jwt: string;
+  clientId: string;
+  pageNumber: number;
+}) => {
   return async () => {
     const url = new URL(`${THIRDWEB_EWS_API_HOST}/api/2024-05-05/account/list`);
     url.searchParams.append("clientId", clientId);
     url.searchParams.append("page", pageNumber.toString());
 
     const res = await fetch(url.href, {
-      method: "GET",
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${jwt}`,
+        "Content-Type": "application/json",
       },
+      method: "GET",
     });
     if (!res.ok) {
       throw new Error(`Failed to fetch wallets: ${await res.text()}`);
@@ -41,24 +45,22 @@ export function useEmbeddedWallets(params: {
   const address = useActiveAccount()?.address;
 
   return useQuery({
+    enabled: !!address && !!clientId,
+    queryFn: fetchAccountList({
+      clientId,
+      jwt: authToken,
+      pageNumber: page,
+    }),
     queryKey: embeddedWalletsKeys.embeddedWallets(
       address || "",
       clientId,
       page,
     ),
-    queryFn: fetchAccountList({
-      jwt: authToken,
-      clientId,
-      pageNumber: page,
-    }),
-    enabled: !!address && !!clientId,
   });
 }
 
 // TODO: fetching list of all users needs to be improved
-export function useAllEmbeddedWallets(params: {
-  authToken: string;
-}) {
+export function useAllEmbeddedWallets(params: { authToken: string }) {
   const { authToken } = params;
   const queryClient = useQueryClient();
   const address = useActiveAccount()?.address;
@@ -72,16 +74,16 @@ export function useAllEmbeddedWallets(params: {
         const res = await queryClient.fetchQuery<{
           users: WalletUser[];
         }>({
+          queryFn: fetchAccountList({
+            clientId,
+            jwt: authToken,
+            pageNumber: page,
+          }),
           queryKey: embeddedWalletsKeys.embeddedWallets(
             address || "",
             clientId,
             page,
           ),
-          queryFn: fetchAccountList({
-            jwt: authToken,
-            clientId,
-            pageNumber: page,
-          }),
         });
 
         if (res.users.length === 0) {
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts
index 87dece15a4b..a143c37b848 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts
@@ -1,6 +1,5 @@
 "use client";
 
-import { apiServerProxy } from "@/actions/proxies";
 import {
   keepPreviousData,
   useMutation,
@@ -11,6 +10,7 @@ import type { EngineBackendWalletType } from "lib/engine";
 import { useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
 import invariant from "tiny-invariant";
+import { apiServerProxy } from "@/actions/proxies";
 import type { ResultItem } from "../../../app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/StatusCodes";
 import type { EngineStatus } from "../../../app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transactions-table";
 import { engineKeys } from "../cache-keys";
@@ -75,18 +75,13 @@ export function useEngineBackendWallets(params: {
 }) {
   const { instanceUrl, authToken } = params;
   return useQuery({
-    queryKey: [
-      ...engineKeys.backendWallets(instanceUrl),
-      authToken,
-      params.limit,
-      params.page,
-    ],
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const res = await fetch(
         `${instanceUrl}backend-wallet/get-all?limit=${params.limit ?? 1000}&page=${params.page ?? 1}`,
         {
-          method: "GET",
           headers: getEngineRequestHeaders(authToken),
+          method: "GET",
         },
       );
 
@@ -94,7 +89,12 @@ export function useEngineBackendWallets(params: {
 
       return (json.result as BackendWallet[]) || [];
     },
-    enabled: !!instanceUrl,
+    queryKey: [
+      ...engineKeys.backendWallets(instanceUrl),
+      authToken,
+      params.limit,
+      params.page,
+    ],
   });
 }
 
@@ -117,7 +117,7 @@ export function useEngineSystemHealth(
   pollInterval: number | false = false,
 ) {
   return useQuery({
-    queryKey: engineKeys.health(instanceUrl),
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}system/health`, {
         headers: getEngineRequestHeaders(null),
@@ -128,7 +128,7 @@ export function useEngineSystemHealth(
       const json = (await res.json()) as EngineSystemHealth;
       return json;
     },
-    enabled: !!instanceUrl,
+    queryKey: engineKeys.health(instanceUrl),
     refetchInterval: pollInterval,
   });
 }
@@ -140,8 +140,8 @@ export function useHasEngineFeature(
 ) {
   const query = useEngineSystemHealth(instanceUrl);
   return {
-    query,
     isSupported: !!query.data?.features?.includes(feature),
+    query,
   };
 }
 
@@ -165,7 +165,6 @@ export function useEngineQueueMetrics(params: {
   const pollInterval = params.pollInterval || false;
 
   return useQuery({
-    queryKey: [...engineKeys.queueMetrics(instanceUrl), authToken],
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}system/queue`, {
         headers: getEngineRequestHeaders(authToken),
@@ -175,6 +174,7 @@ export function useEngineQueueMetrics(params: {
       }
       return (await res.json()) as EngineSystemQueueMetrics;
     },
+    queryKey: [...engineKeys.queueMetrics(instanceUrl), authToken],
     refetchInterval: pollInterval,
   });
 }
@@ -194,13 +194,12 @@ export function useEngineGetDeploymentPublicConfiguration(
   input: GetDeploymentPublicConfigurationInput,
 ) {
   return useQuery<DeploymentPublicConfigurationResponse>({
-    queryKey: engineKeys.deploymentPublicConfiguration(),
     queryFn: async () => {
       const res = await apiServerProxy<{
         data: DeploymentPublicConfigurationResponse;
       }>({
-        pathname: `/v1/teams/${input.teamSlug}/engine/deployments/public-configuration`,
         method: "GET",
+        pathname: `/v1/teams/${input.teamSlug}/engine/deployments/public-configuration`,
       });
 
       if (!res.ok) {
@@ -210,6 +209,7 @@ export function useEngineGetDeploymentPublicConfiguration(
       const json = res.data;
       return json.data;
     },
+    queryKey: engineKeys.deploymentPublicConfiguration(),
   });
 }
 
@@ -223,14 +223,14 @@ export function useEngineUpdateDeployment() {
   return useMutation({
     mutationFn: async (input: UpdateDeploymentInput) => {
       const res = await apiServerProxy({
-        pathname: `/v1/teams/${input.teamSlug}/engine/deployments/${input.deploymentId}`,
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-        },
         body: JSON.stringify({
           serverVersion: input.serverVersion,
         }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+        method: "PUT",
+        pathname: `/v1/teams/${input.teamSlug}/engine/deployments/${input.deploymentId}`,
       });
 
       if (!res.ok) {
@@ -250,8 +250,8 @@ export async function removeEngineFromDashboard({
   teamIdOrSlug,
 }: RemoveEngineFromDashboardIParams) {
   const res = await apiServerProxy({
-    pathname: `/v1/teams/${teamIdOrSlug}/engine/${instanceId}`,
     method: "DELETE",
+    pathname: `/v1/teams/${teamIdOrSlug}/engine/${instanceId}`,
   });
 
   if (!res.ok) {
@@ -271,12 +271,12 @@ export async function deleteCloudHostedEngine({
   feedback,
 }: DeleteCloudHostedEngineParams) {
   const res = await apiServerProxy({
-    pathname: `/v2/engine/deployments/${deploymentId}/infrastructure/delete`,
-    method: "POST",
+    body: JSON.stringify({ feedback, reason }),
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify({ reason, feedback }),
+    method: "POST",
+    pathname: `/v2/engine/deployments/${deploymentId}/infrastructure/delete`,
   });
 
   if (!res.ok) {
@@ -298,12 +298,12 @@ export async function editEngineInstance({
   url,
 }: EditEngineInstanceParams) {
   const res = await apiServerProxy({
-    pathname: `/v1/teams/${teamIdOrSlug}/engine/${instanceId}`,
-    method: "PUT",
+    body: JSON.stringify({ name, url }),
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify({ name, url }),
+    method: "PUT",
+    pathname: `/v1/teams/${teamIdOrSlug}/engine/${instanceId}`,
   });
 
   if (!res.ok) {
@@ -383,7 +383,7 @@ export function useEngineTransactions(params: {
   const { instanceUrl, autoUpdate, authToken } = params;
 
   return useQuery({
-    queryKey: engineKeys.transactions(instanceUrl, params),
+    placeholderData: keepPreviousData,
     queryFn: async () => {
       const url = new URL(`${instanceUrl}transaction/get-all`);
       if (params.queryParams) {
@@ -397,16 +397,16 @@ export function useEngineTransactions(params: {
       }
 
       const res = await fetch(url, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
 
       return (json.result as TransactionResponse) || {};
     },
+    queryKey: engineKeys.transactions(instanceUrl, params),
     refetchInterval: autoUpdate ? 4_000 : false,
-    placeholderData: keepPreviousData,
   });
 }
 
@@ -428,17 +428,17 @@ export function useEngineWalletConfig(params: {
 }) {
   const { instanceUrl, authToken } = params;
   return useQuery<WalletConfigResponse>({
-    queryKey: engineKeys.walletConfig(instanceUrl),
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}configuration/wallets`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
       return json.result;
     },
-    enabled: !!instanceUrl,
+    queryKey: engineKeys.walletConfig(instanceUrl),
   });
 }
 
@@ -459,15 +459,15 @@ export function useEngineBackendWalletBalance(params: {
   const { instanceUrl, address, authToken, chainId } = params;
 
   return useQuery({
-    queryKey: engineKeys.backendWalletBalance(address, chainId),
+    enabled: !!instanceUrl && !!address && !!chainId,
     queryFn: async () => {
       invariant(chainId, "chainId is required");
 
       const res = await fetch(
         `${instanceUrl}backend-wallet/${chainId}/${address}/get-balance`,
         {
-          method: "GET",
           headers: getEngineRequestHeaders(authToken),
+          method: "GET",
         },
       );
 
@@ -475,7 +475,7 @@ export function useEngineBackendWalletBalance(params: {
 
       return (json.result as CurrencyValue) || {};
     },
-    enabled: !!instanceUrl && !!address && !!chainId,
+    queryKey: engineKeys.backendWalletBalance(address, chainId),
   });
 }
 
@@ -493,11 +493,11 @@ export function useEnginePermissions(params: {
   const address = useActiveAccount()?.address;
 
   return useQuery({
-    queryKey: engineKeys.permissions(instanceUrl),
+    enabled: !!instanceUrl && !!address,
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}auth/permissions/get-all`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       if (res.status !== 200) {
@@ -508,8 +508,7 @@ export function useEnginePermissions(params: {
 
       return (json.result as EngineAdmin[]) || [];
     },
-
-    enabled: !!instanceUrl && !!address,
+    queryKey: engineKeys.permissions(instanceUrl),
   });
 }
 
@@ -528,18 +527,18 @@ export function useEngineAccessTokens(params: {
 }) {
   const { instanceUrl, authToken } = params;
   return useQuery({
-    queryKey: engineKeys.accessTokens(instanceUrl),
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}auth/access-tokens/get-all`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
 
       return (json.result as AccessToken[]) || [];
     },
-    enabled: !!instanceUrl,
+    queryKey: engineKeys.accessTokens(instanceUrl),
   });
 }
 
@@ -561,18 +560,18 @@ export function useEngineKeypairs(params: {
   const { instanceUrl, authToken } = params;
 
   return useQuery({
-    queryKey: engineKeys.keypairs(instanceUrl),
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}auth/keypair/get-all`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
 
       return (json.result as Keypair[]) || [];
     },
-    enabled: !!instanceUrl,
+    queryKey: engineKeys.keypairs(instanceUrl),
   });
 }
 
@@ -594,9 +593,9 @@ export function useEngineAddKeypair(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}auth/keypair/add`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -630,9 +629,9 @@ export function useEngineRemoveKeypair(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}auth/keypair/remove`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -666,18 +665,18 @@ export function useEngineRelayer(params: {
   const { instanceUrl, authToken } = params;
 
   return useQuery({
-    queryKey: engineKeys.relayers(instanceUrl),
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}relayer/get-all`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
 
       return (json.result as EngineRelayer[]) || [];
     },
-    enabled: !!instanceUrl,
+    queryKey: engineKeys.relayers(instanceUrl),
   });
 }
 
@@ -701,9 +700,9 @@ export function useEngineCreateRelayer(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}relayer/create`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -737,9 +736,9 @@ export function useEngineRevokeRelayer(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}relayer/revoke`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -778,9 +777,9 @@ export function useEngineUpdateRelayer(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}relayer/update`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -815,18 +814,18 @@ export function useEngineWebhooks(params: {
   const { instanceUrl, authToken } = params;
 
   return useQuery({
-    queryKey: engineKeys.webhooks(instanceUrl),
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}webhooks/get-all`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
 
       return (json.result as EngineWebhook[]) || [];
     },
-    enabled: !!instanceUrl,
+    queryKey: engineKeys.webhooks(instanceUrl),
   });
 }
 
@@ -863,9 +862,9 @@ export function useEngineSetWalletConfig(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}configuration/wallets`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -907,9 +906,9 @@ export function useEngineCreateBackendWallet(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}backend-wallet/create`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -944,9 +943,9 @@ export function useEngineUpdateBackendWallet(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}backend-wallet/update`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -991,9 +990,9 @@ export function useEngineImportBackendWallet(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}backend-wallet/import`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1028,8 +1027,8 @@ export function useEngineDeleteBackendWallet(params: {
       const res = await fetch(
         `${instanceUrl}backend-wallet/${input.walletAddress}`,
         {
-          method: "DELETE",
           headers: getEngineRequestHeaders(authToken),
+          method: "DELETE",
         },
       );
       const json = await res.json();
@@ -1059,9 +1058,9 @@ export function useEngineGrantPermissions(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}auth/permissions/grant`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1095,9 +1094,9 @@ export function useEngineRevokePermissions(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}auth/permissions/revoke`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1131,9 +1130,9 @@ export function useEngineCreateAccessToken(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}auth/access-tokens/create`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify({}),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1167,9 +1166,9 @@ export function useEngineRevokeAccessToken(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}auth/access-tokens/revoke`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1204,9 +1203,9 @@ export function useEngineUpdateAccessToken(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}auth/access-tokens/update`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1242,9 +1241,9 @@ export function useEngineCreateWebhook(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}webhooks/create`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1277,9 +1276,9 @@ export function useEngineDeleteWebhook(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}webhooks/revoke`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
       if (json.error) {
@@ -1315,9 +1314,9 @@ export function useEngineTestWebhook(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}webhooks/${input.id}/test`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify({}),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
       if (json.error) {
@@ -1354,16 +1353,16 @@ export function useEngineSendTokens(params: {
       const res = await fetch(
         `${instanceUrl}backend-wallet/${input.chainId}/transfer`,
         {
-          method: "POST",
-          headers: {
-            ...getEngineRequestHeaders(authToken),
-            "x-backend-wallet-address": input.fromAddress,
-          },
           body: JSON.stringify({
-            to: input.toAddress,
             amount: input.amount.toString(),
             currencyAddress: input.currencyAddress,
+            to: input.toAddress,
           }),
+          headers: {
+            ...getEngineRequestHeaders(authToken),
+            "x-backend-wallet-address": input.fromAddress,
+          },
+          method: "POST",
         },
       );
       const json = await res.json();
@@ -1384,17 +1383,17 @@ export function useEngineCorsConfiguration(params: {
   const { instanceUrl, authToken } = params;
 
   return useQuery({
-    queryKey: engineKeys.corsUrls(instanceUrl),
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}configuration/cors`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
 
       return (json.result as string[]) || [];
     },
+    queryKey: engineKeys.corsUrls(instanceUrl),
   });
 }
 
@@ -1414,9 +1413,9 @@ export function useEngineSetCorsConfiguration(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}configuration/cors`, {
-        method: "PUT",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "PUT",
       });
       const json = await res.json();
 
@@ -1446,18 +1445,17 @@ export function useEngineIpAllowlistConfiguration(params: {
   const { data: health } = useEngineSystemHealth(instanceUrl);
 
   return useQuery({
-    queryKey: engineKeys.ipAllowlist(instanceUrl),
+    enabled: health?.features?.includes("IP_ALLOWLIST"),
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}configuration/ip-allowlist`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
       return (json.result as string[]) || [];
     },
-
-    enabled: health?.features?.includes("IP_ALLOWLIST"),
+    queryKey: engineKeys.ipAllowlist(instanceUrl),
   });
 }
 
@@ -1477,9 +1475,9 @@ export function useEngineSetIpAllowlistConfiguration(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}configuration/ip-allowlist`, {
-        method: "PUT",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "PUT",
       });
       const json = await res.json();
 
@@ -1519,16 +1517,16 @@ export function useEngineContractSubscription(params: {
 }) {
   const { instanceUrl, authToken } = params;
   return useQuery({
-    queryKey: engineKeys.contractSubscriptions(instanceUrl),
     queryFn: async () => {
       const res = await fetch(`${instanceUrl}contract-subscriptions/get-all`, {
-        method: "GET",
         headers: getEngineRequestHeaders(authToken),
+        method: "GET",
       });
 
       const json = await res.json();
       return json.result as EngineContractSubscription[];
     },
+    queryKey: engineKeys.contractSubscriptions(instanceUrl),
   });
 }
 
@@ -1554,9 +1552,9 @@ export function useEngineAddContractSubscription(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}contract-subscriptions/add`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1591,9 +1589,9 @@ export function useEngineRemoveContractSubscription(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}contract-subscriptions/remove`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1621,20 +1619,20 @@ export function useEngineSubscriptionsLastBlock(params: {
   const { instanceUrl, chainId, autoUpdate, authToken } = params;
 
   return useQuery({
-    queryKey: engineKeys.contractSubscriptionsLastBlock(instanceUrl, chainId),
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const response = await fetch(
         `${instanceUrl}contract-subscriptions/last-block?chain=${chainId}`,
         {
-          method: "GET",
           headers: getEngineRequestHeaders(authToken),
+          method: "GET",
         },
       );
 
       const json = await response.json();
       return json.result.lastBlock as number;
     },
-    enabled: !!instanceUrl,
+    queryKey: engineKeys.contractSubscriptionsLastBlock(instanceUrl, chainId),
 
     refetchInterval: autoUpdate ? 5_000 : false,
   });
@@ -1659,7 +1657,8 @@ export function useEngineSystemMetrics(
   const [enabled, setEnabled] = useState(true);
 
   return useQuery({
-    queryKey: engineKeys.systemMetrics(engineId),
+    // Poll every 5s unless disabled.
+    enabled,
     queryFn: async () => {
       const res = await apiServerProxy({
         method: "GET",
@@ -1673,9 +1672,7 @@ export function useEngineSystemMetrics(
       const json = res.data as EngineResourceMetrics;
       return json;
     },
-
-    // Poll every 5s unless disabled.
-    enabled,
+    queryKey: engineKeys.systemMetrics(engineId),
     refetchInterval: 5_000,
   });
 }
@@ -1694,13 +1691,12 @@ export interface EngineAlertRule {
 
 export function useEngineAlertRules(engineId: string, teamIdOrSlug: string) {
   return useQuery({
-    queryKey: engineKeys.alertRules(engineId),
     queryFn: async () => {
       const res = await apiServerProxy<{
         data: EngineAlertRule[];
       }>({
-        pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/alert-rules`,
         method: "GET",
+        pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/alert-rules`,
       });
 
       if (!res.ok) {
@@ -1710,6 +1706,7 @@ export function useEngineAlertRules(engineId: string, teamIdOrSlug: string) {
       const json = res.data;
       return json.data;
     },
+    queryKey: engineKeys.alertRules(engineId),
   });
 }
 
@@ -1728,17 +1725,16 @@ export function useEngineAlerts(
   offset = 0,
 ) {
   return useQuery({
-    queryKey: engineKeys.alerts(engineId),
     queryFn: async () => {
       const res = await apiServerProxy<{
         data: EngineAlert[];
       }>({
+        method: "GET",
         pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/alerts`,
         searchParams: {
           limit: `${limit}`,
           offset: `${offset}`,
         },
-        method: "GET",
       });
 
       if (!res.ok) {
@@ -1748,18 +1744,19 @@ export function useEngineAlerts(
       const json = res.data;
       return json.data;
     },
+    queryKey: engineKeys.alerts(engineId),
   });
 }
 
 export const EngineNotificationChannelTypeConfig = {
-  slack: {
-    display: "Slack",
-    valueDisplay: "Slack Webhook URL",
-  },
   email: {
     display: "Email",
     valueDisplay: "Email Address",
   },
+  slack: {
+    display: "Slack",
+    valueDisplay: "Slack Webhook URL",
+  },
 } as const;
 
 type EngineNotificationChannelType =
@@ -1782,13 +1779,12 @@ export function useEngineNotificationChannels(
   teamIdOrSlug: string,
 ) {
   return useQuery({
-    queryKey: engineKeys.notificationChannels(engineId),
     queryFn: async () => {
       const res = await apiServerProxy<{
         data: EngineNotificationChannel[];
       }>({
-        pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/notification-channels`,
         method: "GET",
+        pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/notification-channels`,
       });
 
       if (!res.ok) {
@@ -1798,6 +1794,7 @@ export function useEngineNotificationChannels(
       const json = res.data;
       return json.data;
     },
+    queryKey: engineKeys.notificationChannels(engineId),
   });
 }
 
@@ -1818,12 +1815,12 @@ export function useEngineCreateNotificationChannel(
       const res = await apiServerProxy<{
         data: EngineNotificationChannel;
       }>({
-        pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/notification-channels`,
-        method: "POST",
+        body: JSON.stringify(input),
         headers: {
           "Content-Type": "application/json",
         },
-        body: JSON.stringify(input),
+        method: "POST",
+        pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/notification-channels`,
       });
 
       if (!res.ok) {
@@ -1850,8 +1847,8 @@ export function useEngineDeleteNotificationChannel(
   return useMutation({
     mutationFn: async (notificationChannelId: string) => {
       const res = await apiServerProxy({
-        pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/notification-channels/${notificationChannelId}`,
         method: "DELETE",
+        pathname: `/v1/teams/${teamIdOrSlug}/engine/${engineId}/notification-channels/${notificationChannelId}`,
       });
 
       if (!res.ok) {
@@ -1891,20 +1888,20 @@ export function useEngineWalletCredentials(params: {
   const { instanceUrl, authToken, page = 1, limit = 100 } = params;
 
   return useQuery({
-    queryKey: [...engineKeys.walletCredentials(instanceUrl), page, limit],
+    enabled: !!instanceUrl,
     queryFn: async () => {
       const res = await fetch(
         `${instanceUrl}wallet-credentials?page=${page}&limit=${limit}`,
         {
-          method: "GET",
           headers: getEngineRequestHeaders(authToken),
+          method: "GET",
         },
       );
 
       const json = await res.json();
       return (json.result as WalletCredential[]) || [];
     },
-    enabled: !!instanceUrl,
+    queryKey: [...engineKeys.walletCredentials(instanceUrl), page, limit],
   });
 }
 
@@ -1920,9 +1917,9 @@ export function useEngineCreateWalletCredential(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}wallet-credentials`, {
-        method: "POST",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "POST",
       });
       const json = await res.json();
 
@@ -1961,9 +1958,9 @@ export function useEngineUpdateWalletCredential(params: {
       invariant(instanceUrl, "instance is required");
 
       const res = await fetch(`${instanceUrl}wallet-credentials/${id}`, {
-        method: "PUT",
-        headers: getEngineRequestHeaders(authToken),
         body: JSON.stringify(input),
+        headers: getEngineRequestHeaders(authToken),
+        method: "PUT",
       });
       const json = await res.json();
 
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useResolveContractAbi.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useResolveContractAbi.ts
index 28547f74da3..2a041785bef 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useResolveContractAbi.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useResolveContractAbi.ts
@@ -6,16 +6,16 @@ import invariant from "tiny-invariant";
 
 export function useResolveContractAbi(contract?: ThirdwebContract) {
   return useQuery({
-    queryKey: [
-      "full-contract-abi",
-      contract?.chain.id || "",
-      contract?.address || "",
-    ],
+    enabled: !!contract,
     queryFn: async () => {
       invariant(contract, "contract is required");
       const abi = await resolveContractAbi<Abi>(contract);
       return abi;
     },
-    enabled: !!contract,
+    queryKey: [
+      "full-contract-abi",
+      contract?.chain.id || "",
+      contract?.address || "",
+    ],
   });
 }
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useSplit.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useSplit.ts
index 46f8c502b0c..219e9b971c6 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useSplit.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useSplit.ts
@@ -1,4 +1,3 @@
-import { getTokenBalancesFromMoralis } from "@/actions/getBalancesFromMoralis";
 import {
   queryOptions,
   useMutation,
@@ -6,14 +5,14 @@ import {
   useQueryClient,
 } from "@tanstack/react-query";
 import { toast } from "sonner";
-import { type ThirdwebContract, sendAndConfirmTransaction } from "thirdweb";
+import { sendAndConfirmTransaction, type ThirdwebContract } from "thirdweb";
 import { distribute, distributeByToken } from "thirdweb/extensions/split";
 import { useActiveAccount } from "thirdweb/react";
 import invariant from "tiny-invariant";
+import { getTokenBalancesFromMoralis } from "@/actions/getBalancesFromMoralis";
 
 function getTokenBalancesQuery(contract: ThirdwebContract) {
   return queryOptions({
-    queryKey: ["split-balances", contract.chain.id, contract.address],
     queryFn: async () => {
       const res = await getTokenBalancesFromMoralis({
         chainId: contract.chain.id,
@@ -25,6 +24,7 @@ function getTokenBalancesQuery(contract: ThirdwebContract) {
       }
       return res.data;
     },
+    queryKey: ["split-balances", contract.chain.id, contract.address],
     retry: false,
   });
 }
@@ -56,13 +56,13 @@ export function useSplitDistributeFunds(contract: ThirdwebContract) {
                   tokenAddress: currency.token_address,
                 });
           const promise = sendAndConfirmTransaction({
-            transaction,
             account,
+            transaction,
           });
           toast.promise(promise, {
-            success: `Successfully distributed ${currency.name}`,
             error: `Error distributing ${currency.name}`,
             loading: `Distributing ${currency.name}`,
+            success: `Successfully distributed ${currency.name}`,
           });
         });
 
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useVote.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useVote.ts
index 88213b4dc92..c40f732aae6 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useVote.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useVote.ts
@@ -1,9 +1,9 @@
 import { useMutation } from "@tanstack/react-query";
 import {
   type BaseTransactionOptions,
-  type ThirdwebContract,
   getAddress,
   getContract,
+  type ThirdwebContract,
   toTokens,
 } from "thirdweb";
 import * as ERC20Ext from "thirdweb/extensions/erc20";
@@ -27,8 +27,8 @@ export async function tokensDelegated(
     address: tokenAddress,
   });
   const delegatedAddress = await ERC20Ext.delegates({
-    contract: tokenContract,
     account: options.account.address,
+    contract: tokenContract,
   });
   return getAddress(delegatedAddress) === getAddress(options.account.address);
 }
@@ -49,7 +49,7 @@ export async function voteTokenBalances(
     ERC20Ext.decimals({ contract: tokenContract }),
     Promise.all(
       options.addresses.map((address) =>
-        ERC20Ext.balanceOf({ contract: tokenContract, address }),
+        ERC20Ext.balanceOf({ address, contract: tokenContract }),
       ),
     ),
   ]);
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useWalletNFTs.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useWalletNFTs.ts
index 67db7375954..36cdd2276f0 100644
--- a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useWalletNFTs.ts
+++ b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useWalletNFTs.ts
@@ -1,6 +1,6 @@
-import { getWalletNFTs } from "@/actions/getWalletNFTs";
 import { useQuery } from "@tanstack/react-query";
 import invariant from "tiny-invariant";
+import { getWalletNFTs } from "@/actions/getWalletNFTs";
 
 export function useWalletNFTs(params: {
   chainId: number;
@@ -8,15 +8,15 @@ export function useWalletNFTs(params: {
   isInsightSupported: boolean;
 }) {
   return useQuery({
-    queryKey: ["walletNfts", params.chainId, params.walletAddress],
+    enabled: !!params.walletAddress,
     queryFn: async () => {
       invariant(params.walletAddress, "walletAddress is required");
       return getWalletNFTs({
         chainId: params.chainId,
-        owner: params.walletAddress,
         isInsightSupported: params.isInsightSupported,
+        owner: params.walletAddress,
       });
     },
-    enabled: !!params.walletAddress,
+    queryKey: ["walletNfts", params.chainId, params.walletAddress],
   });
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/layout.tsx
index df8af93e28d..6d66f7ddf08 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/layout.tsx
@@ -1,10 +1,6 @@
 import { TeamHeader } from "../../team/components/TeamHeader/team-header";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/pagination.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/pagination.tsx
index 2da9d3bede2..019b21bfb80 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/pagination.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/pagination.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { PaginationButtons } from "@/components/pagination-buttons";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useCallback } from "react";
+import { PaginationButtons } from "@/components/pagination-buttons";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 type ChainlistPaginationProps = {
   totalPages: number;
@@ -30,8 +30,8 @@ export const ChainlistPagination: React.FC<ChainlistPaginationProps> = ({
   return (
     <PaginationButtons
       activePage={activePage}
-      totalPages={totalPages}
       onPageClick={(page) => router.push(createPageURL(page))}
+      totalPages={totalPages}
     />
   );
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/search.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/search.tsx
index 47c1eb5a281..8185f594f53 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/search.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/search.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { SearchIcon, XCircleIcon } from "lucide-react";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useEffect, useRef } from "react";
 import { useDebouncedCallback } from "use-debounce";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 function cleanUrl(url: string) {
   if (url.endsWith("?")) {
@@ -47,17 +47,15 @@ export const SearchInput: React.FC = () => {
     <div className="group relative w-full">
       <SearchIcon className="-translate-y-1/2 absolute top-[50%] left-3 size-4 text-muted-foreground" />
       <Input
-        placeholder="Search by token name or symbol"
         className="h-10 rounded-lg bg-card py-2 pl-9 lg:min-w-[300px]"
         defaultValue={searchParams?.get("query") || ""}
         onChange={(e) => handleSearch(e.target.value)}
+        placeholder="Search by token name or symbol"
         ref={inputRef}
       />
       {searchParams?.has("query") && (
         <Button
-          size="icon"
           className="-translate-y-1/2 absolute top-[50%] right-0 bg-background text-muted-foreground opacity-0 transition duration-300 ease-in-out group-hover:opacity-100"
-          variant="outline"
           onClick={() => {
             const params = new URLSearchParams(searchParams ?? undefined);
             params.delete("query");
@@ -65,6 +63,8 @@ export const SearchInput: React.FC = () => {
             const url = cleanUrl(`${pathname}?${params.toString()}`);
             router.replace(url);
           }}
+          size="icon"
+          variant="outline"
         >
           <XCircleIcon className="size-5" />
         </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/type.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/type.tsx
index 450e1641b91..3b1c2aa9720 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/type.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/type.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { ArrowDownLeftIcon, ArrowUpRightIcon } from "lucide-react";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useCallback } from "react";
+import { Button } from "@/components/ui/button";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 type QueryTypeProps = {
   activeType: "origin" | "destination";
@@ -26,26 +26,26 @@ export const QueryType: React.FC<QueryTypeProps> = ({ activeType }) => {
   );
   return (
     <div className="flex flex-row">
-      <ToolTipLabel label="Origin" contentClassName="w-full">
+      <ToolTipLabel contentClassName="w-full" label="Origin">
         <Button
-          size="icon"
-          variant={activeType === "origin" ? "default" : "outline"}
+          className="rounded-r-none"
           onClick={() => {
             router.replace(createPageURL("origin"));
           }}
-          className="rounded-r-none"
+          size="icon"
+          variant={activeType === "origin" ? "default" : "outline"}
         >
           <ArrowUpRightIcon strokeWidth={1} />
         </Button>
       </ToolTipLabel>
-      <ToolTipLabel label="Destination" contentClassName="w-full">
+      <ToolTipLabel contentClassName="w-full" label="Destination">
         <Button
-          variant={activeType === "destination" ? "default" : "outline"}
-          size="icon"
+          className="rounded-l-none"
           onClick={() => {
             router.replace(createPageURL("destination"));
           }}
-          className="rounded-l-none"
+          size="icon"
+          variant={activeType === "destination" ? "default" : "outline"}
         >
           <ArrowDownLeftIcon strokeWidth={1} />
         </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/view.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/view.tsx
index faf526cb5b0..11bed4b154e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/view.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/client/view.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { Grid2X2Icon, ListIcon } from "lucide-react";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useCallback } from "react";
+import { Button } from "@/components/ui/button";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 type RouteListViewProps = {
   activeView: "grid" | "table";
@@ -26,22 +26,22 @@ export const RouteListView: React.FC<RouteListViewProps> = ({ activeView }) => {
   return (
     <div className="flex flex-row">
       <Button
-        size="icon"
-        variant={activeView === "table" ? "default" : "outline"}
+        className="rounded-r-none"
         onClick={() => {
           router.replace(createPageURL("table"));
         }}
-        className="rounded-r-none"
+        size="icon"
+        variant={activeView === "table" ? "default" : "outline"}
       >
         <ListIcon strokeWidth={1} />
       </Button>
       <Button
-        variant={activeView === "grid" ? "default" : "outline"}
-        size="icon"
+        className="rounded-l-none"
         onClick={() => {
           router.replace(createPageURL("grid"));
         }}
-        className="rounded-l-none"
+        size="icon"
+        variant={activeView === "grid" ? "default" : "outline"}
       >
         <Grid2X2Icon strokeWidth={1} />
       </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx
index 7968a7d7854..4d09e36f93e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx
@@ -1,8 +1,8 @@
+import { defineChain } from "thirdweb";
+import { getChainMetadata } from "thirdweb/chains";
 import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { defineChain } from "thirdweb";
-import { getChainMetadata } from "thirdweb/chains";
 
 type RouteListCardProps = {
   originChainId: number;
@@ -39,14 +39,14 @@ export async function RouteListCard({
     getChainMetadata(defineChain(destinationChainId)),
     originTokenIconUri
       ? resolveSchemeWithErrorHandler({
-          uri: originTokenIconUri,
           client: serverThirdwebClient,
+          uri: originTokenIconUri,
         })
       : undefined,
     destinationTokenIconUri
       ? resolveSchemeWithErrorHandler({
-          uri: destinationTokenIconUri,
           client: serverThirdwebClient,
+          uri: destinationTokenIconUri,
         })
       : undefined,
   ]);
@@ -59,9 +59,9 @@ export async function RouteListCard({
             {resolvedOriginTokenIconUri ? (
               // eslint-disable-next-line @next/next/no-img-element
               <img
-                src={resolvedOriginTokenIconUri}
                 alt={originTokenAddress}
                 className="size-8 rounded-full border border-muted-foreground"
+                src={resolvedOriginTokenIconUri}
               />
             ) : (
               <div className="size-8 rounded-full bg-muted-foreground" />
@@ -69,9 +69,9 @@ export async function RouteListCard({
             {resolvedDestinationTokenIconUri ? (
               // eslint-disable-next-line @next/next/no-img-element
               <img
-                src={resolvedDestinationTokenIconUri}
                 alt={destinationTokenAddress}
                 className="-translate-x-4 size-8 rounded-full border border-muted-foreground ring-2 ring-card"
+                src={resolvedDestinationTokenIconUri}
               />
             ) : (
               <div className="-translate-x-4 size-8 rounded-full bg-muted-foreground ring-2 ring-card" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx
index 1775152cc00..a005242aca0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx
@@ -1,8 +1,8 @@
+import { defineChain, getChainMetadata } from "thirdweb/chains";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { TableCell, TableRow } from "@/components/ui/table";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { defineChain, getChainMetadata } from "thirdweb/chains";
 
 type RouteListRowProps = {
   originChainId: number;
@@ -39,20 +39,20 @@ export async function RouteListRow({
     getChainMetadata(defineChain(destinationChainId)),
     originTokenIconUri
       ? resolveSchemeWithErrorHandler({
-          uri: originTokenIconUri,
           client: serverThirdwebClient,
+          uri: originTokenIconUri,
         })
       : undefined,
     destinationTokenIconUri
       ? resolveSchemeWithErrorHandler({
-          uri: destinationTokenIconUri,
           client: serverThirdwebClient,
+          uri: destinationTokenIconUri,
         })
       : undefined,
   ]);
 
   return (
-    <TableRow linkBox className="group transition-colors hover:bg-accent/50">
+    <TableRow className="group transition-colors hover:bg-accent/50" linkBox>
       <TableCell>
         <div className="flex flex-row items-center gap-3">
           <div className="flex items-center gap-2">
@@ -60,15 +60,17 @@ export async function RouteListRow({
               // For now we're using a normal img tag because the domain for these images is unknown
               // eslint-disable-next-line @next/next/no-img-element
               <img
-                src={resolvedOriginTokenIconUri}
                 alt={originTokenAddress}
                 className="size-7 rounded-full border border-border/50 shadow-sm transition-transform group-hover:scale-105"
+                src={resolvedOriginTokenIconUri}
               />
             ) : (
               <div className="size-7 rounded-full bg-muted-foreground/20" />
             )}
             {originTokenSymbol && (
               <CopyTextButton
+                className="relative z-10 font-medium text-base"
+                copyIconPosition="right"
                 textToCopy={originTokenAddress}
                 textToShow={
                   originTokenSymbol === "ETH"
@@ -76,9 +78,7 @@ export async function RouteListRow({
                     : originTokenSymbol
                 }
                 tooltip="Copy Token Address"
-                className="relative z-10 font-medium text-base"
                 variant="ghost"
-                copyIconPosition="right"
               />
             )}
           </div>
@@ -95,15 +95,17 @@ export async function RouteListRow({
             {resolvedDestinationTokenIconUri ? (
               // eslint-disable-next-line @next/next/no-img-element
               <img
-                src={resolvedDestinationTokenIconUri}
                 alt={destinationTokenAddress}
                 className="size-7 rounded-full border border-border/50 shadow-sm transition-transform group-hover:scale-105"
+                src={resolvedDestinationTokenIconUri}
               />
             ) : (
               <div className="size-7 rounded-full bg-muted-foreground/20" />
             )}
             {destinationTokenSymbol && (
               <CopyTextButton
+                className="relative z-10 font-medium text-base"
+                copyIconPosition="right"
                 textToCopy={destinationTokenAddress}
                 textToShow={
                   destinationTokenSymbol === "ETH"
@@ -111,9 +113,7 @@ export async function RouteListRow({
                     : destinationTokenSymbol
                 }
                 tooltip="Copy Token Address"
-                className="relative z-10 font-medium text-base"
                 variant="ghost"
-                copyIconPosition="right"
               />
             )}
           </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routes-table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routes-table.tsx
index 4d52b7a40e0..701da89643c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routes-table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routes-table.tsx
@@ -1,3 +1,4 @@
+import type { Address } from "thirdweb";
 import {
   Table,
   TableBody,
@@ -6,7 +7,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import type { Address } from "thirdweb";
 import { getRoutes } from "../../../utils";
 import { ChainlistPagination } from "../client/pagination";
 import { RouteListCard } from "./routelist-card";
@@ -53,16 +53,16 @@ async function getRoutesToRender(params: SearchParams) {
     }
   }
   const routes = await getRoutes({
+    destinationQuery: filters.destinationQuery,
     limit: DEFAULT_PAGE_SIZE,
     offset: DEFAULT_PAGE_SIZE * ((params.page || 1) - 1),
     originQuery: filters.originQuery,
-    destinationQuery: filters.destinationQuery,
   });
 
   return {
+    filteredCount: routes.meta.filteredCount,
     routesToRender: routes.data,
     totalCount: routes.meta.totalCount,
-    filteredCount: routes.meta.filteredCount,
   };
 }
 
@@ -107,17 +107,17 @@ export async function RoutesData(props: {
               <TableBody>
                 {routesToRender.map((route) => (
                   <RouteListRow
+                    destinationChainId={route.destinationToken.chainId}
+                    destinationTokenAddress={route.destinationToken.address}
+                    destinationTokenIconUri={route.destinationToken.iconUri}
+                    destinationTokenName={route.destinationToken.name}
+                    destinationTokenSymbol={route.destinationToken.symbol}
                     key={`${route.originToken.chainId}:${route.originToken.address}-${route.destinationToken.chainId}:${route.destinationToken.address}`}
                     originChainId={route.originToken.chainId}
                     originTokenAddress={route.originToken.address}
                     originTokenIconUri={route.originToken.iconUri}
-                    originTokenSymbol={route.originToken.symbol}
                     originTokenName={route.originToken.name}
-                    destinationChainId={route.destinationToken.chainId}
-                    destinationTokenAddress={route.destinationToken.address}
-                    destinationTokenIconUri={route.destinationToken.iconUri}
-                    destinationTokenSymbol={route.destinationToken.symbol}
-                    destinationTokenName={route.destinationToken.name}
+                    originTokenSymbol={route.originToken.symbol}
                   />
                 ))}
               </TableBody>
@@ -127,20 +127,20 @@ export async function RoutesData(props: {
           <ul className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
             {routesToRender.map((route) => (
               <li
-                key={`${route.originToken.chainId}:${route.originToken.address}-${route.destinationToken.chainId}:${route.destinationToken.address}`}
                 className="h-full"
+                key={`${route.originToken.chainId}:${route.originToken.address}-${route.destinationToken.chainId}:${route.destinationToken.address}`}
               >
                 <RouteListCard
-                  originChainId={route.originToken.chainId}
-                  originTokenAddress={route.originToken.address}
-                  originTokenIconUri={route.originToken.iconUri}
-                  originTokenSymbol={route.originToken.symbol}
-                  originTokenName={route.originToken.name}
                   destinationChainId={route.destinationToken.chainId}
                   destinationTokenAddress={route.destinationToken.address}
                   destinationTokenIconUri={route.destinationToken.iconUri}
-                  destinationTokenSymbol={route.destinationToken.symbol}
                   destinationTokenName={route.destinationToken.name}
+                  destinationTokenSymbol={route.destinationToken.symbol}
+                  originChainId={route.originToken.chainId}
+                  originTokenAddress={route.originToken.address}
+                  originTokenIconUri={route.originToken.iconUri}
+                  originTokenName={route.originToken.name}
+                  originTokenSymbol={route.originToken.symbol}
                 />
               </li>
             ))}
@@ -150,8 +150,8 @@ export async function RoutesData(props: {
       <div className="h-10" />
       {totalPages > 1 && (
         <ChainlistPagination
-          totalPages={totalPages}
           activePage={Number(props.searchParams.page) || 1}
+          totalPages={totalPages}
         />
       )}
       <div className="h-4" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/page.tsx
index 6b9345594e6..ec642a24722 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/page.tsx
@@ -15,12 +15,12 @@ const description =
   "A list of token routes for swapping, bridging, and on-ramping between EVM chains with thirdweb.";
 
 export const metadata: Metadata = {
-  title,
   description,
   openGraph: {
-    title,
     description,
+    title,
   },
+  title,
 };
 
 export default async function RoutesPage(props: {
@@ -73,10 +73,10 @@ export default async function RoutesPage(props: {
             </p>
           </div>
           <a
+            className="inline-flex items-center gap-2 rounded-md bg-green-600 px-4 py-2 font-medium text-sm text-white transition-all hover:bg-green-600/90 hover:shadow-sm"
             href="https://portal.thirdweb.com/pay"
-            target="_blank"
             rel="noopener noreferrer"
-            className="inline-flex items-center gap-2 rounded-md bg-green-600 px-4 py-2 font-medium text-sm text-white transition-all hover:bg-green-600/90 hover:shadow-sm"
+            target="_blank"
           >
             Learn More
             <ArrowUpRightIcon className="size-4" />
@@ -85,9 +85,9 @@ export default async function RoutesPage(props: {
       </div>
       <div className="h-10" />
       <RoutesData
-        searchParams={searchParams}
         activeView={activeView}
         isLoggedIn={!!authToken}
+        searchParams={searchParams}
       />
     </section>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/utils.ts b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/utils.ts
index cdeadfba530..df7095df8ec 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/utils.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(bridge)/utils.ts
@@ -1,8 +1,8 @@
 import "server-only";
 
+import type { Address } from "thirdweb";
 import { NEXT_PUBLIC_THIRDWEB_BRIDGE_HOST } from "@/constants/public-envs";
 import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
-import type { Address } from "thirdweb";
 import type { Route } from "./types/route";
 
 export async function getRoutes({
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/FaucetButton.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/FaucetButton.tsx
index f51b2603c1d..40a66801e43 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/FaucetButton.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/FaucetButton.tsx
@@ -1,29 +1,4 @@
 "use client";
-import { reportFaucetUsed } from "@/analytics/report";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-  NEXT_PUBLIC_THIRDWEB_ENGINE_FAUCET_WALLET,
-  NEXT_PUBLIC_TURNSTILE_SITE_KEY,
-} from "@/constants/public-envs";
 import { CustomConnectWallet } from "@3rdweb-sdk/react/components/connect-wallet";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Turnstile } from "@marsidev/react-turnstile";
@@ -35,13 +10,12 @@ import { usePathname } from "next/navigation";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import {
-  type ThirdwebClient,
   prepareTransaction,
+  type ThirdwebClient,
   toUnits,
   toWei,
 } from "thirdweb";
-import type { ChainMetadata } from "thirdweb/chains";
-import type { Chain } from "thirdweb/chains";
+import type { Chain, ChainMetadata } from "thirdweb/chains";
 import {
   useActiveAccount,
   useActiveWalletChain,
@@ -51,6 +25,31 @@ import {
 } from "thirdweb/react";
 import { parseError } from "utils/errorParser";
 import { z } from "zod";
+import { reportFaucetUsed } from "@/analytics/report";
+import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  NEXT_PUBLIC_THIRDWEB_ENGINE_FAUCET_WALLET,
+  NEXT_PUBLIC_TURNSTILE_SITE_KEY,
+} from "@/constants/public-envs";
 
 function formatTime(seconds: number) {
   const rtf = new Intl.RelativeTimeFormat("en", { numeric: "auto" });
@@ -101,15 +100,15 @@ export function FaucetButton({
   const claimMutation = useMutation({
     mutationFn: async (turnstileToken: string) => {
       const response = await fetch("/api/testnet-faucet/claim", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
         body: JSON.stringify({
           chainId: chainId,
           toAddress: address,
           turnstileToken,
         }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+        method: "POST",
       });
 
       if (!response.ok) {
@@ -117,20 +116,19 @@ export function FaucetButton({
         throw new Error(data?.error || "Failed to claim funds");
       }
     },
-    onSuccess: () => {
-      reportFaucetUsed({
-        chainId,
-      });
-    },
     onSettled: () => {
       return queryClient.invalidateQueries({
         queryKey: ["testnet-faucet-can-claim", chainId],
       });
     },
+    onSuccess: () => {
+      reportFaucetUsed({
+        chainId,
+      });
+    },
   });
 
   const canClaimFaucetQuery = useQuery({
-    queryKey: ["testnet-faucet-can-claim", chainId],
     queryFn: async () => {
       const response = await fetch(
         `/api/testnet-faucet/can-claim?chainId=${chainId}`,
@@ -141,6 +139,7 @@ export function FaucetButton({
       const data = (await response.json()) as CanClaimResponseType;
       return data;
     },
+    queryKey: ["testnet-faucet-can-claim", chainId],
   });
 
   const isFaucetEmpty =
@@ -152,7 +151,7 @@ export function FaucetButton({
   // loading state
   if (faucetWalletBalanceQuery.isPending || canClaimFaucetQuery.isPending) {
     return (
-      <Button variant="outline" className="w-full gap-2">
+      <Button className="w-full gap-2" variant="outline">
         Checking Faucet <Spinner className="size-3" />
       </Button>
     );
@@ -167,9 +166,9 @@ export function FaucetButton({
         </div>
         <SendFundsToFaucetModalButton
           chain={definedChain}
-          isLoggedIn={isLoggedIn}
-          client={client}
           chainMeta={chain}
+          client={client}
+          isLoggedIn={isLoggedIn}
           onFaucetRefill={() => {
             faucetWalletBalanceQuery.refetch();
           }}
@@ -181,7 +180,7 @@ export function FaucetButton({
   // Force users to log in to claim the faucet
   if (!address || !isLoggedIn) {
     return (
-      <Button variant="primary" className="w-full" asChild>
+      <Button asChild className="w-full" variant="primary">
         <Link
           href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
         >
@@ -194,7 +193,7 @@ export function FaucetButton({
   // Can not claim
   if (canClaimFaucetQuery.data && canClaimFaucetQuery.data.canClaim === false) {
     return (
-      <Button variant="outline" className="!opacity-100 w-full " disabled>
+      <Button className="!opacity-100 w-full " disabled variant="outline">
         {canClaimFaucetQuery.data.type === "throttle" && (
           <>
             Your next claim is available{" "}
@@ -217,13 +216,13 @@ export function FaucetButton({
     // we can just attach the token in the payload and send it to the claim-faucet endpoint, to avoid a round-trip request
     const claimPromise = claimMutation.mutateAsync(values.turnstileToken);
     toast.promise(claimPromise, {
-      success: `${amount} ${chain.nativeCurrency.symbol} sent successfully`,
       error: (err) => {
         return {
-          message: `Failed to claim ${amount} ${chain.nativeCurrency.symbol}`,
           description: parseError(err),
+          message: `Failed to claim ${amount} ${chain.nativeCurrency.symbol}`,
         };
       },
+      success: `${amount} ${chain.nativeCurrency.symbol} sent successfully`,
     });
   };
 
@@ -232,7 +231,7 @@ export function FaucetButton({
     <div className="flex w-full flex-col text-center">
       <Form {...form}>
         <form onSubmit={form.handleSubmit(claimFunds)}>
-          <Button variant="primary" className="w-full gap-2" type="submit">
+          <Button className="w-full gap-2" type="submit" variant="primary">
             {claimMutation.isPending ? (
               <>
                 Claiming <Spinner className="size-3" />
@@ -249,8 +248,8 @@ export function FaucetButton({
                 <FormControl>
                   <Turnstile
                     className="mt-4"
-                    siteKey={NEXT_PUBLIC_TURNSTILE_SITE_KEY}
                     onSuccess={(token) => field.onChange(token)}
+                    siteKey={NEXT_PUBLIC_TURNSTILE_SITE_KEY}
                   />
                 </FormControl>
               </FormItem>
@@ -285,7 +284,7 @@ function SendFundsToFaucetModalButton(props: {
   return (
     <Dialog>
       <DialogTrigger asChild>
-        <Button variant="default" className="w-full">
+        <Button className="w-full" variant="default">
           Refill Faucet
         </Button>
       </DialogTrigger>
@@ -321,10 +320,10 @@ function SendFundsToFaucetModalContent(props: {
   });
 
   const form = useForm<z.infer<typeof faucetFormSchema>>({
-    resolver: zodResolver(faucetFormSchema),
     defaultValues: {
       amount: 0.1,
     },
+    resolver: zodResolver(faucetFormSchema),
   });
 
   function onSubmit(values: z.infer<typeof faucetFormSchema>) {
@@ -338,8 +337,8 @@ function SendFundsToFaucetModalContent(props: {
     const promise = sendTxMutation.mutateAsync(sendNativeTokenTx);
 
     toast.promise(promise, {
-      success: `Sent ${values.amount} ${props.chainMeta.nativeCurrency.symbol} to faucet`,
       error: `Failed to send ${values.amount} ${props.chainMeta.nativeCurrency.symbol} to faucet`,
+      success: `Sent ${values.amount} ${props.chainMeta.nativeCurrency.symbol} to faucet`,
     });
 
     promise.then(() => {
@@ -350,18 +349,18 @@ function SendFundsToFaucetModalContent(props: {
   return (
     <Form {...form}>
       <form
-        onSubmit={form.handleSubmit(onSubmit)}
         className="flex min-w-0 flex-col gap-5"
+        onSubmit={form.handleSubmit(onSubmit)}
       >
         <div className="min-w-0">
           <p className="mb-2 text-foreground text-sm"> Faucet Wallet </p>
           <CopyTextButton
-            copyIconPosition="right"
-            variant="outline"
             className="w-full justify-between bg-card py-2 font-mono"
+            copyIconPosition="right"
             textToCopy={NEXT_PUBLIC_THIRDWEB_ENGINE_FAUCET_WALLET}
             textToShow={NEXT_PUBLIC_THIRDWEB_ENGINE_FAUCET_WALLET}
             tooltip={undefined}
+            variant="outline"
           />
         </div>
 
@@ -375,8 +374,8 @@ function SendFundsToFaucetModalContent(props: {
                 <div className="relative">
                   <Input
                     {...field}
-                    type="number"
                     className="h-auto bg-card text-2xl md:text-2xl [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
+                    type="number"
                   />
                   <div className="-translate-y-1/2 absolute top-1/2 right-4 text-muted-foreground text-sm">
                     {props.chainMeta.nativeCurrency.symbol}
@@ -392,11 +391,11 @@ function SendFundsToFaucetModalContent(props: {
         {!account && (
           <CustomConnectWallet
             chain={props.chain}
-            loginRequired={false}
-            isLoggedIn={props.isLoggedIn}
+            client={props.client}
             connectButtonClassName="!w-full"
             detailsButtonClassName="!w-full"
-            client={props.client}
+            isLoggedIn={props.isLoggedIn}
+            loginRequired={false}
           />
         )}
 
@@ -404,19 +403,19 @@ function SendFundsToFaucetModalContent(props: {
           <div>
             {activeChain.id === props.chain.id ? (
               <Button
-                key="submit"
-                type="submit"
                 className="mt-4 w-full gap-2"
                 disabled={sendTxMutation.isPending}
+                key="submit"
+                type="submit"
               >
                 {sendTxMutation.isPending && <Spinner className="size-4" />}
                 Send funds to faucet
               </Button>
             ) : (
               <Button
-                key="switch"
                 className="mt-4 w-full gap-2"
                 disabled={switchChainMutation.isPending}
+                key="switch"
                 onClick={() => switchChainMutation.mutate()}
               >
                 Switch to {props.chainMeta.name}{" "}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/NextSteps.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/NextSteps.tsx
index 4bf6301236b..9f759c3f985 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/NextSteps.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/NextSteps.tsx
@@ -16,12 +16,12 @@ export default function NextSteps(props: { chain: ChainMetadata }) {
           <div>
             <h3 className="mb-1.5 font-medium">
               <Link
+                className="before:absolute before:inset-0"
                 href={
                   "https://blog.thirdweb.com/supercharge-user-adoption-integrate-embedded-wallets-in-minutes/"
                 }
-                className="before:absolute before:inset-0"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 Create a login for {chain.name}
               </Link>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/PayModal.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/PayModal.tsx
index 22568b02aa2..bf116bc4217 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/PayModal.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/PayModal.tsx
@@ -1,10 +1,10 @@
 "use client";
-import { Button } from "@/components/ui/button";
-import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
 import { defineDashboardChain } from "lib/defineDashboardChain";
 import { useTheme } from "next-themes";
 import type { ThirdwebClient } from "thirdweb";
 import { PayEmbed } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
 import { getSDKTheme } from "../../../../../../components/sdk-component-theme";
 
 export function PayModalButton(props: {
@@ -17,31 +17,31 @@ export function PayModalButton(props: {
   return (
     <Dialog>
       <DialogTrigger asChild>
-        <Button variant="primary" className="w-full">
+        <Button className="w-full" variant="primary">
           {props.label}
         </Button>
       </DialogTrigger>
       <DialogContent
         className="border-none bg-transparent p-0 md:max-w-[360px]"
-        dialogOverlayClassName="backdrop-blur-lg"
         dialogCloseClassName="focus:ring-0"
+        dialogOverlayClassName="backdrop-blur-lg"
       >
         <PayEmbed
-          client={props.client}
-          theme={getSDKTheme(theme === "dark" ? "dark" : "light")}
           className="!w-auto"
+          client={props.client}
           payOptions={{
             prefillBuy: {
-              // Do not include local chain overrides for chain pages
-              // eslint-disable-next-line no-restricted-syntax
-              chain: defineDashboardChain(props.chainId, undefined),
               allowEdits: {
-                chain: false,
                 amount: true,
+                chain: false,
                 token: true,
               },
+              // Do not include local chain overrides for chain pages
+              // eslint-disable-next-line no-restricted-syntax
+              chain: defineDashboardChain(props.chainId, undefined),
             },
           }}
+          theme={getSDKTheme(theme === "dark" ? "dark" : "light")}
         />
       </DialogContent>
     </Dialog>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/add-chain-to-wallet.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/add-chain-to-wallet.tsx
index 7a5b370dd12..fd308a218a9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/add-chain-to-wallet.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/add-chain-to-wallet.tsx
@@ -1,8 +1,5 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { useCustomConnectModal } from "@3rdweb-sdk/react/components/connect-wallet";
 import { useMutation } from "@tanstack/react-query";
 import { toast } from "sonner";
@@ -13,6 +10,9 @@ import {
   useSwitchActiveWalletChain,
 } from "thirdweb/react";
 import { useDebounce } from "use-debounce";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 type AddChainToWalletProps = {
   chain: Chain;
@@ -44,9 +44,8 @@ export const AddChainToWallet: React.FC<AddChainToWalletProps> = (props) => {
       }
     >
       <Button
-        disabled={disabled}
         className="w-full gap-2"
-        variant="outline"
+        disabled={disabled}
         onClick={() => {
           // Connect directly to this chain
           if (!account) {
@@ -59,10 +58,11 @@ export const AddChainToWallet: React.FC<AddChainToWalletProps> = (props) => {
           // switch to this chain
           const switchPromise = switchChainMutation.mutateAsync();
           toast.promise(switchPromise, {
-            success: `${props.chain.name} added to wallet`,
             error: `Failed to add ${props.chain.name} to wallet`,
+            success: `${props.chain.name} added to wallet`,
           });
         }}
+        variant="outline"
       >
         <span>Add to wallet</span>
         {debouncedLoading && <Spinner className="size-3" />}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/live-stats.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/live-stats.tsx
index 3506a49963b..9b13408f9fc 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/live-stats.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/live-stats.tsx
@@ -1,18 +1,19 @@
 "use client";
 
+import { useQuery } from "@tanstack/react-query";
+import { CircleCheckIcon, XIcon } from "lucide-react";
+import { hostnameEndsWith } from "utils/url";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Skeleton } from "@/components/ui/skeleton";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { isProd } from "@/constants/env-utils";
 import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
-import { useQuery } from "@tanstack/react-query";
-import { CircleCheckIcon, XIcon } from "lucide-react";
-import { hostnameEndsWith } from "utils/url";
 import { PrimaryInfoItem } from "../server/primary-info-item";
 
 function useChainStatswithRPC(_rpcUrl: string) {
   let rpcUrl = _rpcUrl.replace(
     // eslint-disable-next-line no-template-curly-in-string
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: this is expected in this case
     "${THIRDWEB_API_KEY}",
     NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
   );
@@ -25,17 +26,17 @@ function useChainStatswithRPC(_rpcUrl: string) {
   }
 
   return useQuery({
-    queryKey: ["chain-stats", { rpcUrl }],
+    enabled: !!rpcUrl,
     queryFn: async () => {
       const startTimeStamp = performance.now();
       const res = await fetch(rpcUrl, {
-        method: "POST",
         body: JSON.stringify({
+          id: 1,
           jsonrpc: "2.0",
           method: "eth_getBlockByNumber",
           params: ["latest", false],
-          id: 1,
         }),
+        method: "POST",
       });
 
       const json = await res.json();
@@ -44,18 +45,18 @@ function useChainStatswithRPC(_rpcUrl: string) {
       const blockNumber = Number.parseInt(json.result.number, 16);
       const blockGasLimit = Number.parseInt(json.result.gasLimit, 16);
       return {
-        latency,
-        blockNumber,
         blockGasLimit,
+        blockNumber,
+        latency,
       };
     },
+    queryKey: ["chain-stats", { rpcUrl }],
     refetchInterval: (query) => {
       if (query.state.error) {
         return false;
       }
       return 5 * 1000;
     },
-    enabled: !!rpcUrl,
     refetchOnWindowFocus: false,
   });
 }
@@ -82,13 +83,13 @@ export function ChainLiveStats(props: { rpc: string }) {
       >
         <div className="flex items-center gap-1">
           <CopyTextButton
-            tooltip="Copy RPC URL"
-            textToShow={new URL(props.rpc).origin}
-            textToCopy={props.rpc}
-            copyIconPosition="right"
-            variant="ghost"
             className="-translate-x-2 px-2 py-1 text-base"
+            copyIconPosition="right"
             iconClassName="size-4"
+            textToCopy={props.rpc}
+            textToShow={new URL(props.rpc).origin}
+            tooltip="Copy RPC URL"
+            variant="ghost"
           />
         </div>
       </PrimaryInfoItem>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/CreditCardIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/CreditCardIcon.tsx
index 55c7ed1d89a..0879e1b75d7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/CreditCardIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/CreditCardIcon.tsx
@@ -1,53 +1,56 @@
-export function CreditCardIcon(props: {
-  bg: string;
-  className?: string;
-}) {
+import { useId } from "react";
+
+export function CreditCardIcon(props: { bg: string; className?: string }) {
+  const linearGradientId = useId();
+  const linearGradientId2 = useId();
+  const linearGradientId3 = useId();
+
   return (
     <svg
-      width={48}
+      aria-hidden="true"
+      className={props.className}
+      fill="none"
       height={48}
       viewBox="0 0 48 48"
-      fill="none"
+      width={48}
       xmlns="http://www.w3.org/2000/svg"
-      aria-hidden="true"
-      className={props.className}
     >
-      <rect width={48} height={48} rx={16} fill={props.bg} />
+      <rect fill={props.bg} height={48} rx={16} width={48} />
       <rect
-        x={1}
-        y={1}
-        width={46}
         height={46}
         rx={15}
-        stroke="url(#paint0_linear_1315_3638)"
+        stroke={`url(#${linearGradientId})`}
         strokeOpacity="0.2"
         strokeWidth={2}
+        width={46}
+        x={1}
+        y={1}
       />
-      <rect x={5} y={5} width={38} height={38} rx={11} fill={props.bg} />
+      <rect fill={props.bg} height={38} rx={11} width={38} x={5} y={5} />
       <rect
-        x={5}
-        y={5}
-        width={38}
         height={38}
         rx={11}
-        stroke="url(#paint1_linear_1315_3638)"
+        stroke={`url(#${linearGradientId2})`}
         strokeWidth={2}
+        width={38}
+        x={5}
+        y={5}
       />
       <path
         d="M32.3337 22.3333H15.667M23.167 25.6666H19.0003M15.667 20.8333L15.667 27.1666C15.667 28.1 15.667 28.5668 15.8486 28.9233C16.0084 29.2369 16.2634 29.4918 16.577 29.6516C16.9335 29.8333 17.4002 29.8333 18.3337 29.8333L29.667 29.8333C30.6004 29.8333 31.0671 29.8333 31.4236 29.6516C31.7372 29.4918 31.9922 29.2369 32.152 28.9233C32.3337 28.5668 32.3337 28.1 32.3337 27.1666V20.8333C32.3337 19.8999 32.3337 19.4332 32.152 19.0766C31.9922 18.763 31.7372 18.5081 31.4236 18.3483C31.0671 18.1666 30.6004 18.1666 29.667 18.1666L18.3337 18.1666C17.4002 18.1666 16.9335 18.1666 16.577 18.3483C16.2634 18.5081 16.0084 18.763 15.8486 19.0766C15.667 19.4332 15.667 19.8999 15.667 20.8333Z"
-        stroke="url(#paint2_linear_1315_3638)"
-        strokeWidth="1.5"
+        stroke={`url(#${linearGradientId3})`}
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <defs>
         <linearGradient
-          id="paint0_linear_1315_3638"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="-3.26045"
-          y1="15.4021"
           x2="45.7807"
+          y1="15.4021"
           y2="50.1547"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -56,12 +59,12 @@ export function CreditCardIcon(props: {
           <stop offset={1} stopColor="#5204BF" />
         </linearGradient>
         <linearGradient
-          id="paint1_linear_1315_3638"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId2}
           x1="1.28296"
-          y1="16.835"
           x2="42.1506"
+          y1="16.835"
           y2="45.7956"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -70,12 +73,12 @@ export function CreditCardIcon(props: {
           <stop offset={1} stopColor="#5204BF" />
         </linearGradient>
         <linearGradient
-          id="paint2_linear_1315_3638"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId3}
           x1="14.5349"
-          y1="21.9102"
           x2="27.1676"
+          y1="21.9102"
           y2="34.6989"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/GiftIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/GiftIcon.tsx
index 4d3b8ab7c2a..b12f1667eaa 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/GiftIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/GiftIcon.tsx
@@ -1,54 +1,58 @@
-export function GiftIcon(props: {
-  bg: string;
-  className?: string;
-}) {
+import { useId } from "react";
+
+export function GiftIcon(props: { bg: string; className?: string }) {
+  const linearGradientId = useId();
+  const linearGradientId2 = useId();
+  const linearGradientId3 = useId();
+  const clipPathId = useId();
+
   return (
     <svg
-      width={48}
+      aria-hidden="true"
+      fill="none"
       height={48}
       viewBox="0 0 48 48"
-      fill="none"
+      width={48}
       xmlns="http://www.w3.org/2000/svg"
-      aria-hidden="true"
     >
-      <rect width={48} height={48} rx={16} fill={props.bg} />
+      <rect fill={props.bg} height={48} rx={16} width={48} />
       <rect
-        x={1}
-        y={1}
-        width={46}
         height={46}
         rx={15}
-        stroke="url(#paint0_linear_1214_43510)"
+        stroke={`url(#${linearGradientId})`}
         strokeOpacity="0.2"
         strokeWidth={2}
+        width={46}
+        x={1}
+        y={1}
       />
-      <rect x={5} y={5} width={38} height={38} rx={11} fill={props.bg} />
+      <rect fill={props.bg} height={38} rx={11} width={38} x={5} y={5} />
       <rect
-        x={5}
-        y={5}
-        width={38}
         height={38}
         rx={11}
-        stroke="url(#paint1_linear_1214_43510)"
+        stroke={`url(#${linearGradientId2})`}
         strokeWidth={2}
+        width={38}
+        x={5}
+        y={5}
       />
-      <g clipPath="url(#clip0_1214_43510)">
+      <g clipPath={`url(#${clipPathId})`}>
         <path
           d="M23.9993 19.0001V32.3334M23.9993 19.0001H21.0529C20.6188 19.0001 20.2024 18.8245 19.8955 18.5119C19.5885 18.1994 19.416 17.7754 19.416 17.3334C19.416 16.8914 19.5885 16.4675 19.8955 16.1549C20.2024 15.8423 20.6188 15.6667 21.0529 15.6667C23.3446 15.6667 23.9993 19.0001 23.9993 19.0001ZM23.9993 19.0001H26.9458C27.3799 19.0001 27.7963 18.8245 28.1032 18.5119C28.4102 18.1994 28.5827 17.7754 28.5827 17.3334C28.5827 16.8914 28.4102 16.4675 28.1032 16.1549C27.7963 15.8423 27.3799 15.6667 26.9458 15.6667C24.6541 15.6667 23.9993 19.0001 23.9993 19.0001ZM30.666 23.1667V29.6667C30.666 30.6002 30.666 31.0669 30.4844 31.4234C30.3246 31.737 30.0696 31.992 29.756 32.1518C29.3995 32.3334 28.9328 32.3334 27.9993 32.3334L19.9993 32.3334C19.0659 32.3334 18.5992 32.3334 18.2427 32.1518C17.9291 31.992 17.6741 31.737 17.5143 31.4234C17.3327 31.0669 17.3327 30.6002 17.3327 29.6667V23.1667M15.666 20.3334L15.666 21.8334C15.666 22.3001 15.666 22.5335 15.7568 22.7117C15.8367 22.8685 15.9642 22.996 16.121 23.0759C16.2993 23.1667 16.5326 23.1667 16.9993 23.1667L30.9994 23.1667C31.4661 23.1667 31.6994 23.1667 31.8777 23.0759C32.0345 22.996 32.162 22.8685 32.2419 22.7117C32.3327 22.5335 32.3327 22.3001 32.3327 21.8334V20.3334C32.3327 19.8667 32.3327 19.6333 32.2419 19.4551C32.162 19.2983 32.0345 19.1708 31.8777 19.0909C31.6994 19.0001 31.4661 19.0001 30.9993 19.0001L16.9993 19.0001C16.5326 19.0001 16.2993 19.0001 16.121 19.0909C15.9642 19.1708 15.8367 19.2983 15.7568 19.4551C15.666 19.6333 15.666 19.8667 15.666 20.3334Z"
-          stroke="url(#paint2_linear_1214_43510)"
-          strokeWidth="1.5"
+          stroke={`url(#${linearGradientId3})`}
           strokeLinecap="round"
           strokeLinejoin="round"
+          strokeWidth="1.5"
         />
       </g>
       <defs>
         <linearGradient
-          id="paint0_linear_1214_43510"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="-3.26045"
-          y1="15.4021"
           x2="45.7807"
+          y1="15.4021"
           y2="50.1547"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -57,12 +61,12 @@ export function GiftIcon(props: {
           <stop offset={1} stopColor="#5204BF" />
         </linearGradient>
         <linearGradient
-          id="paint1_linear_1214_43510"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId2}
           x1="1.28296"
-          y1="16.835"
           x2="42.1506"
+          y1="16.835"
           y2="45.7956"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -71,12 +75,12 @@ export function GiftIcon(props: {
           <stop offset={1} stopColor="#5204BF" />
         </linearGradient>
         <linearGradient
-          id="paint2_linear_1214_43510"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId3}
           x1="14.5339"
-          y1="21.0147"
           x2="31.5621"
+          y1="21.0147"
           y2="33.0816"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -84,12 +88,12 @@ export function GiftIcon(props: {
           <stop offset="0.8789" stopColor="#6806BB" />
           <stop offset={1} stopColor="#5204BF" />
         </linearGradient>
-        <clipPath id="clip0_1214_43510">
+        <clipPath id={clipPathId}>
           <rect
-            width={20}
-            height={20}
             fill="white"
+            height={20}
             transform="translate(14 14)"
+            width={20}
           />
         </clipPath>
       </defs>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/BuyFundsSection.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/BuyFundsSection.tsx
index 0daca279495..a1080462cda 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/BuyFundsSection.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/BuyFundsSection.tsx
@@ -46,17 +46,17 @@ export function BuyFundsSection(props: {
 
           <PayModalButton
             chainId={props.chain.chainId}
-            label={`Bridge to ${sanitizedChainName}`}
             client={props.client}
+            label={`Bridge to ${sanitizedChainName}`}
           />
 
           <div className="h-4" />
 
           <Link
-            href="https://portal.thirdweb.com/connect/pay/overview"
             className="inline-flex items-center gap-1.5 text-muted-foreground text-sm hover:text-foreground"
-            target="_blank"
+            href="https://portal.thirdweb.com/connect/pay/overview"
             rel="noopener noreferrer"
+            target="_blank"
           >
             Learn more about Universal Bridge
             <ExternalLinkIcon className="size-3" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/ChainOverviewSection.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/ChainOverviewSection.tsx
index 8148b1c99fb..398ded3900a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/ChainOverviewSection.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/ChainOverviewSection.tsx
@@ -1,10 +1,10 @@
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
 import type { ChainMetadata } from "thirdweb/chains";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { ChainLiveStats } from "../client/live-stats";
-import { SectionTitle } from "./SectionTitle";
 import { PrimaryInfoItem } from "./primary-info-item";
+import { SectionTitle } from "./SectionTitle";
 
 export function ChainOverviewSection(props: { chain: ChainMetadata }) {
   const { chain } = props;
@@ -16,10 +16,10 @@ export function ChainOverviewSection(props: { chain: ChainMetadata }) {
         {chain.infoURL && (
           <PrimaryInfoItem title="Info">
             <Link
+              className="inline-flex items-center gap-1.5 hover:text-link-foreground"
               href={chain.infoURL}
-              target="_blank"
               rel="noopener noreferrer"
-              className="inline-flex items-center gap-1.5 hover:text-link-foreground"
+              target="_blank"
             >
               {new URL(chain.infoURL).hostname}
               <ExternalLinkIcon className="size-4" />
@@ -30,13 +30,13 @@ export function ChainOverviewSection(props: { chain: ChainMetadata }) {
         {/* Chain Id */}
         <PrimaryInfoItem title="Chain ID">
           <CopyTextButton
+            className="-translate-x-2 px-2 py-1 text-base"
+            copyIconPosition="right"
+            iconClassName="size-4"
             textToCopy={chain.chainId.toString()}
             textToShow={chain.chainId.toString()}
             tooltip="Copy Chain ID"
             variant="ghost"
-            className="-translate-x-2 px-2 py-1 text-base"
-            iconClassName="size-4"
-            copyIconPosition="right"
           />
         </PrimaryInfoItem>
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/ClaimChainSection.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/ClaimChainSection.tsx
index 263925325b3..3a9afa678fb 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/ClaimChainSection.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/ClaimChainSection.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@/components/ui/button";
 import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 import { SectionTitle } from "./SectionTitle";
 
 export function ClaimChainSection() {
@@ -14,12 +14,12 @@ export function ClaimChainSection() {
           information on this page to help your developers get started!
         </p>
 
-        <Button variant="outline" asChild>
+        <Button asChild variant="outline">
           <Link
             className="gap-2"
             href="https://share.hsforms.com/1qAViW3U5SoKbabNhRZy4Kgea58c"
-            target="_blank"
             rel="noopener noreferrer"
+            target="_blank"
           >
             <span>Claim Chain</span>
             <ExternalLinkIcon className="-mt-[3px] size-4" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/FaucetSection.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/FaucetSection.tsx
index 07a3537267c..bce1529397d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/FaucetSection.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/FaucetSection.tsx
@@ -46,9 +46,9 @@ export async function FaucetSection(props: {
           <div className="h-8" />
 
           <FaucetButton
-            client={client}
-            chain={chain}
             amount={amountToGive}
+            chain={chain}
+            client={client}
             isLoggedIn={isLoggedIn}
           />
         </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/SupportedProductsSection.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/SupportedProductsSection.tsx
index 8f6c1d3d3c8..11fd5ccae53 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/SupportedProductsSection.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/SupportedProductsSection.tsx
@@ -24,18 +24,18 @@ export function SupportedProductsSection(props: {
         {enabledProducts.map((product) => {
           return (
             <div
-              key={product.id}
               className="relative flex gap-3 rounded-lg border bg-card p-4 pr-8 transition-colors hover:border-active-border"
+              key={product.id}
             >
               <CircleCheckIcon className="absolute top-4 right-4 size-5 text-success-text" />
               <product.icon className="mt-0.5 size-5 shrink-0" />
               <div>
                 <h3 className="mb-1.5 font-medium">
                   <Link
-                    href={product.link}
                     className="before:absolute before:inset-0"
-                    target="_blank"
+                    href={product.link}
                     rel="noopener noreferrer"
+                    target="_blank"
                   >
                     {product.name}
                   </Link>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/chain-header.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/chain-header.tsx
index 878fcf14f81..fa9a49c909c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/chain-header.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/chain-header.tsx
@@ -1,8 +1,8 @@
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import type { ThirdwebClient } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 import { mapV4ChainToV5Chain } from "../../../../../../../../contexts/map-chains";
 import { ChainIcon } from "../../../../components/server/chain-icon";
 import { AddChainToWallet } from "../client/add-chain-to-wallet";
@@ -30,9 +30,9 @@ export function ChainHeader(props: ChainHeaderProps) {
         {props.headerImageUrl && (
           // eslint-disable-next-line @next/next/no-img-element
           <img
-            src={props.headerImageUrl}
             alt=""
             className="h-full w-full object-cover object-center"
+            src={props.headerImageUrl}
           />
         )}
       </div>
@@ -41,11 +41,11 @@ export function ChainHeader(props: ChainHeaderProps) {
         {/* chain logo */}
 
         <ChainIcon
-          iconUrl={props.logoUrl}
           className={cn(
             "-translate-y-[50%] absolute top-0 left-0 size-20 overflow-hidden rounded-full border border-border bg-muted p-2 lg:size-36 lg:p-4",
             props.headerImageUrl && "lg:left-4",
           )}
+          iconUrl={props.logoUrl}
         />
 
         {/* action group */}
@@ -53,15 +53,15 @@ export function ChainHeader(props: ChainHeaderProps) {
           {/* Desktop only */}
           <div className="hidden flex-row gap-2 lg:flex">
             <AddChainToWallet
-              client={props.client}
               chain={
                 // Do not include chain overrides for chain pages
                 // eslint-disable-next-line no-restricted-syntax
                 mapV4ChainToV5Chain(props.chain)
               }
+              client={props.client}
             />
-            <Button variant="default" asChild>
-              <Link href="/team" target="_blank" rel="noopener noreferrer">
+            <Button asChild variant="default">
+              <Link href="/team" rel="noopener noreferrer" target="_blank">
                 Get started with thirdweb
               </Link>
             </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/cta-card.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/cta-card.tsx
index 4e837acde1b..1e32ea47bd7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/cta-card.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/cta-card.tsx
@@ -1,5 +1,5 @@
-import { Button } from "@/components/ui/button";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
 export type ChainCTAProps = {
   backgroundImageUrl: string;
@@ -30,10 +30,10 @@ export function ChainCTA(props: ChainCTAProps) {
         </div>
         <Button asChild>
           <Link
+            className="font-semibold"
             href={props.buttonLink}
             prefetch={false}
             target={props.buttonLink.startsWith("http") ? "_blank" : undefined}
-            className="font-semibold"
           >
             {props.buttonText}
           </Link>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/explorer-section.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/explorer-section.tsx
index 3d6ade2fe4c..3c6049c8ff6 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/explorer-section.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/explorer-section.tsx
@@ -13,18 +13,18 @@ export function ExplorersSection(props: {
         {props.explorers.map((explorer) => {
           return (
             <div
-              key={explorer.url}
               className="relative rounded-xl border bg-card p-4 transition-colors hover:border-active-border"
+              key={explorer.url}
             >
               <ExternalLinkIcon className="absolute top-4 right-4 size-4 text-muted-foreground" />
               <h3 className="mb-1 font-semibold text-base capitalize">
                 {explorer.name}
               </h3>
               <Link
+                className="flex items-center gap-1.5 text-muted-foreground text-sm before:absolute before:inset-0 before:z-0"
                 href={explorer.url}
-                target="_blank"
                 rel="noopener noreferrer"
-                className="flex items-center gap-1.5 text-muted-foreground text-sm before:absolute before:inset-0 before:z-0"
+                target="_blank"
               >
                 {explorer.url.endsWith("/")
                   ? explorer.url.slice(0, -1)
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/layout.tsx
index c7863f28718..40dbd464f00 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/layout.tsx
@@ -1,3 +1,8 @@
+import { getAuthToken } from "@app/api/lib/getAuthToken";
+import { ChevronDownIcon, TicketCheckIcon } from "lucide-react";
+import type { Metadata } from "next";
+import Link from "next/link";
+import { redirect } from "next/navigation";
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -14,11 +19,6 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { getAuthToken } from "@app/api/lib/getAuthToken";
-import { ChevronDownIcon, TicketCheckIcon } from "lucide-react";
-import type { Metadata } from "next";
-import Link from "next/link";
-import { redirect } from "next/navigation";
 import { mapV4ChainToV5Chain } from "../../../../../../contexts/map-chains";
 import { TeamHeader } from "../../../../team/components/TeamHeader/team-header";
 import { StarButton } from "../../components/client/star-button";
@@ -41,12 +41,12 @@ export async function generateMetadata(props: {
   }.`;
 
   return {
-    title,
     description,
     openGraph: {
-      title,
       description,
+      title,
     },
+    title,
   };
 }
 
@@ -119,10 +119,10 @@ export default async function ChainPageLayout(props: {
         <div className="flex w-full flex-col pb-10">
           {/* Icon + Background */}
           <ChainHeader
-            headerImageUrl={chainMetadata?.headerImgUrl}
-            logoUrl={chain.icon?.url}
             chain={chain}
             client={client}
+            headerImageUrl={chainMetadata?.headerImgUrl}
+            logoUrl={chain.icon?.url}
           />
 
           <div className="h-4 md:h-8" />
@@ -145,8 +145,8 @@ export default async function ChainPageLayout(props: {
               {authToken && (
                 <StarButton
                   chainId={chain.chainId}
-                  iconClassName="size-5"
                   className="p-1"
+                  iconClassName="size-5"
                 />
               )}
 
@@ -169,15 +169,15 @@ export default async function ChainPageLayout(props: {
             <div className="w-full sm:hidden">
               <div className="grid grid-cols-2 gap-2">
                 <AddChainToWallet
-                  client={client}
                   chain={
                     // Do not include chain overrides for chain pages
                     // eslint-disable-next-line no-restricted-syntax
                     mapV4ChainToV5Chain(chain)
                   }
+                  client={client}
                 />
-                <Button variant="primary" asChild>
-                  <Link href="/team" target="_blank" rel="noopener noreferrer">
+                <Button asChild variant="primary">
+                  <Link href="/team" rel="noopener noreferrer" target="_blank">
                     Get started
                   </Link>
                 </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/opengraph-image.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/opengraph-image.tsx
index 6d75fdc8cea..b016ed308af 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/opengraph-image.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/opengraph-image.tsx
@@ -1,7 +1,8 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { ImageResponse } from "next/og";
+import { useId } from "react";
 import { download } from "thirdweb/storage";
 import { fetchChain } from "utils/fetchChain";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 
 // Route segment config
 export const runtime = "edge";
@@ -9,58 +10,64 @@ export const runtime = "edge";
 // Image metadata
 export const alt = "thirdweb chain og image";
 export const size = {
-  width: 1200,
   height: 630,
+  width: 1200,
 };
 
 export const contentType = "image/png";
 
-const TWLogo: React.FC = () => (
-  // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
-  <svg
-    width="255"
-    height="37"
-    viewBox="0 0 255 37"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <g clip-path="url(#clip0_4_1228)">
+const TWLogo: React.FC = () => {
+  const clipPathId = useId();
+  const linearGradientId = useId();
+  return (
+    // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
+    <svg
+      fill="none"
+      height="37"
+      viewBox="0 0 255 37"
+      width="255"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g clip-path={`url(#${clipPathId})`}>
+        <path
+          clip-rule="evenodd"
+          d="M0.162424 3.11312C-0.434663 1.61668 0.67809 0 2.30651 0H12.4163C13.3662 0 14.2075 0.561163 14.5604 1.42963L22.6075 21.3643C22.8246 21.8987 22.8246 22.5 22.6075 23.0478L17.5458 35.567C16.7723 37.4777 14.0311 37.4777 13.2576 35.567L0.162424 3.11312ZM19.6905 3.04631C19.1477 1.56324 20.2604 0 21.8617 0H30.6687C31.6458 0 32.5143 0.601246 32.84 1.49643L40.1543 21.4311C40.3307 21.9254 40.3307 22.4732 40.1543 22.981L35.7575 34.9658C35.0248 36.9699 32.1479 36.9699 31.4151 34.9658L19.6905 3.04631ZM39.4623 0C37.8339 0 36.7211 1.61668 37.3182 3.11312L50.4134 35.567C51.1869 37.4777 53.9281 37.4777 54.7015 35.567L59.7632 23.0478C59.9803 22.5 59.9803 21.8987 59.7632 21.3643L51.7161 1.42963C51.3633 0.561163 50.5219 0 49.572 0H39.4623Z"
+          fill={`url(#${linearGradientId})`}
+          fill-rule="evenodd"
+        />
+      </g>
       <path
-        fill-rule="evenodd"
         clip-rule="evenodd"
-        d="M0.162424 3.11312C-0.434663 1.61668 0.67809 0 2.30651 0H12.4163C13.3662 0 14.2075 0.561163 14.5604 1.42963L22.6075 21.3643C22.8246 21.8987 22.8246 22.5 22.6075 23.0478L17.5458 35.567C16.7723 37.4777 14.0311 37.4777 13.2576 35.567L0.162424 3.11312ZM19.6905 3.04631C19.1477 1.56324 20.2604 0 21.8617 0H30.6687C31.6458 0 32.5143 0.601246 32.84 1.49643L40.1543 21.4311C40.3307 21.9254 40.3307 22.4732 40.1543 22.981L35.7575 34.9658C35.0248 36.9699 32.1479 36.9699 31.4151 34.9658L19.6905 3.04631ZM39.4623 0C37.8339 0 36.7211 1.61668 37.3182 3.11312L50.4134 35.567C51.1869 37.4777 53.9281 37.4777 54.7015 35.567L59.7632 23.0478C59.9803 22.5 59.9803 21.8987 59.7632 21.3643L51.7161 1.42963C51.3633 0.561163 50.5219 0 49.572 0H39.4623Z"
-        fill="url(#paint0_linear_4_1228)"
+        d="M119.093 0.839844C116.933 0.839844 115.163 2.59497 115.163 4.83275C115.163 7.02665 116.933 8.78177 119.093 8.78177C121.252 8.78177 123.023 7.02665 123.023 4.83275C123.023 2.59497 121.252 0.839844 119.093 0.839844ZM122.548 10.8001H115.681V34.4504H122.548V10.8001ZM75.6036 1.71743H82.2975V10.8002H87.4367V17.1186H82.2975V25.4555C82.2975 26.684 83.2476 27.6494 84.4136 27.6494H87.3935V34.3627H84.4136C79.5767 34.3627 75.6036 30.3698 75.6036 25.4116V17.0747H72.4941V10.7563H75.6036V1.71743ZM103.805 10.2736C100.695 10.2736 98.2338 11.59 97.2837 13.6523V1.71743H90.4171V34.4066H97.2837V21.1554C97.2837 18.3911 99.0543 16.4605 101.559 16.4605C104.107 16.4605 105.532 18.1278 105.532 20.936V34.4505H112.399V20.0585C112.399 13.9155 109.29 10.2736 103.805 10.2736ZM132.35 10.7563V14.0033C133.387 11.6339 135.891 10.2736 139.044 10.2298C139.519 10.2298 140.124 10.2736 140.858 10.3614V16.9431C140.167 16.8115 139.39 16.7237 138.569 16.7237C134.639 16.7237 132.35 18.9615 132.35 22.8666V34.4066H125.484V10.7563H132.35ZM160.162 13.8717C159.471 11.8094 156.751 10.3614 153.253 10.3614C149.97 10.3614 147.207 11.5461 145.004 13.9155C142.845 16.2411 141.722 19.1809 141.722 22.6034C141.722 26.0259 142.845 28.9218 145.004 31.3351C147.207 33.6607 149.97 34.8454 153.253 34.8454C156.751 34.8454 159.471 33.3974 160.162 31.3351V34.4505H167.029V1.71743H160.162V13.8717ZM158.78 26.8157C157.614 27.9565 156.189 28.483 154.505 28.483C152.864 28.483 151.439 27.9126 150.316 26.8157C149.15 25.631 148.588 24.2269 148.588 22.6034C148.588 20.9799 149.15 19.5758 150.316 18.435C151.482 17.2503 152.864 16.6798 154.505 16.6798C156.232 16.6798 157.658 17.2503 158.78 18.435C159.99 19.5758 160.594 20.9799 160.594 22.6034C160.594 24.2269 159.99 25.631 158.78 26.8157ZM186.852 10.8879L193.07 22.1207L197.259 10.8001H203.997L194.409 35.8106L186.852 22.2084L179.294 35.8106L169.75 10.8001H176.487L180.633 22.1207L186.852 10.8879ZM215.311 10.2298C211.769 10.2298 208.79 11.3706 206.457 13.6523C204.169 15.89 203.003 18.8737 203.003 22.5595V22.7789C203.003 26.4646 204.169 29.4483 206.457 31.6861C208.833 33.88 211.856 35.0209 215.656 35.0209C219.197 35.0209 222.091 34.3188 224.293 32.8708V26.7718C222.134 28.3075 219.37 29.0534 216.045 29.0534C212.417 29.0534 210.042 27.2544 209.912 24.4463H226.971C227.057 23.7442 227.101 22.9544 227.101 22.1646C227.101 18.786 225.978 15.9778 223.818 13.6961C221.659 11.3706 218.766 10.2298 215.311 10.2298ZM209.912 19.9268C209.956 18.8299 210.517 17.9084 211.553 17.1625C212.633 16.4166 213.842 16.0217 215.311 16.0217C218.031 16.0217 220.148 17.8207 220.148 19.9268H209.912ZM243.469 10.3614C246.752 10.3614 249.516 11.5461 251.675 13.9155C253.877 16.2849 255 19.137 255 22.5595C255 25.982 253.877 28.8779 251.675 31.2912C249.516 33.6168 246.752 34.8015 243.469 34.8015C239.971 34.8015 237.251 33.3535 236.56 31.2912V34.4066H229.693V1.71743H236.56V13.8716C237.251 11.8094 239.971 10.3614 243.469 10.3614ZM242.217 28.483C243.858 28.483 245.24 27.9565 246.406 26.8157C247.572 25.631 248.134 24.2269 248.134 22.6034C248.134 20.9799 247.572 19.5758 246.406 18.435C245.283 17.2503 243.858 16.6798 242.217 16.6798C240.533 16.6798 239.108 17.2503 237.898 18.435C236.732 19.5758 236.128 20.9799 236.128 22.6034C236.128 24.2269 236.732 25.631 237.898 26.8157C239.064 27.9126 240.49 28.483 242.217 28.483Z"
+        fill="#F1F1F1"
+        fill-rule="evenodd"
       />
-    </g>
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M119.093 0.839844C116.933 0.839844 115.163 2.59497 115.163 4.83275C115.163 7.02665 116.933 8.78177 119.093 8.78177C121.252 8.78177 123.023 7.02665 123.023 4.83275C123.023 2.59497 121.252 0.839844 119.093 0.839844ZM122.548 10.8001H115.681V34.4504H122.548V10.8001ZM75.6036 1.71743H82.2975V10.8002H87.4367V17.1186H82.2975V25.4555C82.2975 26.684 83.2476 27.6494 84.4136 27.6494H87.3935V34.3627H84.4136C79.5767 34.3627 75.6036 30.3698 75.6036 25.4116V17.0747H72.4941V10.7563H75.6036V1.71743ZM103.805 10.2736C100.695 10.2736 98.2338 11.59 97.2837 13.6523V1.71743H90.4171V34.4066H97.2837V21.1554C97.2837 18.3911 99.0543 16.4605 101.559 16.4605C104.107 16.4605 105.532 18.1278 105.532 20.936V34.4505H112.399V20.0585C112.399 13.9155 109.29 10.2736 103.805 10.2736ZM132.35 10.7563V14.0033C133.387 11.6339 135.891 10.2736 139.044 10.2298C139.519 10.2298 140.124 10.2736 140.858 10.3614V16.9431C140.167 16.8115 139.39 16.7237 138.569 16.7237C134.639 16.7237 132.35 18.9615 132.35 22.8666V34.4066H125.484V10.7563H132.35ZM160.162 13.8717C159.471 11.8094 156.751 10.3614 153.253 10.3614C149.97 10.3614 147.207 11.5461 145.004 13.9155C142.845 16.2411 141.722 19.1809 141.722 22.6034C141.722 26.0259 142.845 28.9218 145.004 31.3351C147.207 33.6607 149.97 34.8454 153.253 34.8454C156.751 34.8454 159.471 33.3974 160.162 31.3351V34.4505H167.029V1.71743H160.162V13.8717ZM158.78 26.8157C157.614 27.9565 156.189 28.483 154.505 28.483C152.864 28.483 151.439 27.9126 150.316 26.8157C149.15 25.631 148.588 24.2269 148.588 22.6034C148.588 20.9799 149.15 19.5758 150.316 18.435C151.482 17.2503 152.864 16.6798 154.505 16.6798C156.232 16.6798 157.658 17.2503 158.78 18.435C159.99 19.5758 160.594 20.9799 160.594 22.6034C160.594 24.2269 159.99 25.631 158.78 26.8157ZM186.852 10.8879L193.07 22.1207L197.259 10.8001H203.997L194.409 35.8106L186.852 22.2084L179.294 35.8106L169.75 10.8001H176.487L180.633 22.1207L186.852 10.8879ZM215.311 10.2298C211.769 10.2298 208.79 11.3706 206.457 13.6523C204.169 15.89 203.003 18.8737 203.003 22.5595V22.7789C203.003 26.4646 204.169 29.4483 206.457 31.6861C208.833 33.88 211.856 35.0209 215.656 35.0209C219.197 35.0209 222.091 34.3188 224.293 32.8708V26.7718C222.134 28.3075 219.37 29.0534 216.045 29.0534C212.417 29.0534 210.042 27.2544 209.912 24.4463H226.971C227.057 23.7442 227.101 22.9544 227.101 22.1646C227.101 18.786 225.978 15.9778 223.818 13.6961C221.659 11.3706 218.766 10.2298 215.311 10.2298ZM209.912 19.9268C209.956 18.8299 210.517 17.9084 211.553 17.1625C212.633 16.4166 213.842 16.0217 215.311 16.0217C218.031 16.0217 220.148 17.8207 220.148 19.9268H209.912ZM243.469 10.3614C246.752 10.3614 249.516 11.5461 251.675 13.9155C253.877 16.2849 255 19.137 255 22.5595C255 25.982 253.877 28.8779 251.675 31.2912C249.516 33.6168 246.752 34.8015 243.469 34.8015C239.971 34.8015 237.251 33.3535 236.56 31.2912V34.4066H229.693V1.71743H236.56V13.8716C237.251 11.8094 239.971 10.3614 243.469 10.3614ZM242.217 28.483C243.858 28.483 245.24 27.9565 246.406 26.8157C247.572 25.631 248.134 24.2269 248.134 22.6034C248.134 20.9799 247.572 19.5758 246.406 18.435C245.283 17.2503 243.858 16.6798 242.217 16.6798C240.533 16.6798 239.108 17.2503 237.898 18.435C236.732 19.5758 236.128 20.9799 236.128 22.6034C236.128 24.2269 236.732 25.631 237.898 26.8157C239.064 27.9126 240.49 28.483 242.217 28.483Z"
-      fill="#F1F1F1"
-    />
-    <defs>
-      <linearGradient
-        id="paint0_linear_4_1228"
-        x1="30.0033"
-        y1="-8.73611"
-        x2="71.0412"
-        y2="46.872"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#F213A4" />
-        <stop offset="1" stop-color="#5204BF" />
-      </linearGradient>
-      <clipPath id="clip0_4_1228">
-        <rect width="59.9096" height="37" fill="white" />
-      </clipPath>
-    </defs>
-  </svg>
-);
+      <defs>
+        <linearGradient
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
+          x1="30.0033"
+          x2="71.0412"
+          y1="-8.73611"
+          y2="46.872"
+        >
+          <stop stop-color="#F213A4" />
+          <stop offset="1" stop-color="#5204BF" />
+        </linearGradient>
+        <clipPath id={clipPathId}>
+          <rect fill="white" height="37" width="59.9096" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+};
 
 // Image generation
 export default async function Image({
   params,
-}: { params: { chain_id: string } }) {
+}: {
+  params: { chain_id: string };
+}) {
   const chain = await fetchChain(params.chain_id);
   if (!chain) {
     return new Response("Chain not found", { status: 400 });
@@ -77,8 +84,8 @@ export default async function Image({
     // download the chain icon if there is one
     chain.icon?.url && hasWorkingChainIcon
       ? download({
-          uri: chain.icon.url,
           client: serverThirdwebClient,
+          uri: chain.icon.url,
         }).then((res) => res.arrayBuffer())
       : undefined,
     // download the background image (based on chain)
@@ -95,19 +102,19 @@ export default async function Image({
 
   return new ImageResponse(
     <div
-      tw="w-full h-full flex justify-center py-20 px-16"
       style={{
         background: "#0D0D12",
         fontFamily: "Inter",
       }}
+      tw="w-full h-full flex justify-center py-20 px-16"
     >
       <img
+        alt=""
+        height="630px"
         // @ts-expect-error - TS doesn't know about the ImageResponse component
         src={imageData}
-        width="1200px"
-        height="630px"
         tw="absolute"
-        alt=""
+        width="1200px"
       />
       {/* the actual component starts here */}
 
@@ -116,14 +123,14 @@ export default async function Image({
           alt=""
           // @ts-expect-error - TS doesn't know about the ImageResponse component
           src={chainIcon}
-          tw="absolute rounded-full"
           style={{
-            top: 240,
-            right: -2,
             height: 150,
-            width: 150,
             objectFit: "contain",
+            right: -2,
+            top: 240,
+            width: 150,
           }}
+          tw="absolute rounded-full"
         />
       )}
 
@@ -145,8 +152,8 @@ export default async function Image({
       ...size,
       fonts: [
         {
-          name: "Inter",
           data: interBold,
+          name: "Inter",
           style: "normal",
           weight: 700,
         },
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/page.tsx
index 262494d5641..d9915174260 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/page.tsx
@@ -1,15 +1,15 @@
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { CircleAlertIcon } from "lucide-react";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { getRawAccount } from "../../../../account/settings/getAccount";
 import { getChain, getChainMetadata } from "../../utils";
 import NextSteps from "./components/client/NextSteps";
 import { BuyFundsSection } from "./components/server/BuyFundsSection";
 import { ChainOverviewSection } from "./components/server/ChainOverviewSection";
 import { ClaimChainSection } from "./components/server/ClaimChainSection";
-import { FaucetSection } from "./components/server/FaucetSection";
-import { SupportedProductsSection } from "./components/server/SupportedProductsSection";
 import { ChainCTA } from "./components/server/cta-card";
 import { ExplorersSection } from "./components/server/explorer-section";
+import { FaucetSection } from "./components/server/FaucetSection";
+import { SupportedProductsSection } from "./components/server/SupportedProductsSection";
 
 export default async function Page(props: {
   params: Promise<{ chain_id: string }>;
@@ -44,7 +44,7 @@ export default async function Page(props: {
 
       {/* Faucet / Buy Funds */}
       {chain.testnet ? (
-        <FaucetSection chain={chain} isLoggedIn={!!account} client={client} />
+        <FaucetSection chain={chain} client={client} isLoggedIn={!!account} />
       ) : chain.services.find((c) => c.service === "pay" && c.enabled) ? (
         <BuyFundsSection chain={chain} client={client} />
       ) : null}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx
index a990cd4e4fa..a9ed442bda0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx
@@ -19,16 +19,15 @@ export const CancelTab: React.FC<CancelTabProps> = ({
   isLoggedIn,
 }) => {
   const transaction = isAuction
-    ? cancelAuction({ contract, auctionId: BigInt(id) })
+    ? cancelAuction({ auctionId: BigInt(id), contract })
     : cancelListing({ contract, listingId: BigInt(id) });
   const cancelQuery = useSendAndConfirmTransaction();
   return (
     <div className="flex flex-col gap-3 pt-3">
       <TransactionButton
+        className="self-end"
         client={contract.client}
         isLoggedIn={isLoggedIn}
-        txChainID={contract.chain.id}
-        transactionCount={1}
         isPending={cancelQuery.isPending}
         onClick={() => {
           const promise = cancelQuery.mutateAsync(transaction, {
@@ -37,12 +36,13 @@ export const CancelTab: React.FC<CancelTabProps> = ({
             },
           });
           toast.promise(promise, {
+            error: "Failed to cancel",
             loading: `Cancelling ${isAuction ? "auction" : "listing"}`,
             success: "Item cancelled successfully",
-            error: "Failed to cancel",
           });
         }}
-        className="self-end"
+        transactionCount={1}
+        txChainID={contract.chain.id}
       >
         Cancel {isAuction ? "Auction" : "Listing"}
       </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-button.tsx
index 009a68239c5..7e9b9839d5a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-button.tsx
@@ -1,5 +1,12 @@
 "use client";
 
+import { ListerOnly } from "@3rdweb-sdk/react/components/roles/lister-only";
+import { isAlchemySupported } from "lib/wallet/nfts/isAlchemySupported";
+import { isMoralisSupported } from "lib/wallet/nfts/isMoralisSupported";
+import { PlusIcon } from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebContract } from "thirdweb";
+import { useActiveAccount } from "thirdweb/react";
 import { Button } from "@/components/ui/button";
 import {
   Sheet,
@@ -9,13 +16,6 @@ import {
   SheetTrigger,
 } from "@/components/ui/sheet";
 import { TabButtons } from "@/components/ui/tabs";
-import { ListerOnly } from "@3rdweb-sdk/react/components/roles/lister-only";
-import { isAlchemySupported } from "lib/wallet/nfts/isAlchemySupported";
-import { isMoralisSupported } from "lib/wallet/nfts/isMoralisSupported";
-import { PlusIcon } from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebContract } from "thirdweb";
-import { useActiveAccount } from "thirdweb/react";
 import { CreateListingsForm } from "./list-form";
 
 interface CreateListingButtonProps {
@@ -49,7 +49,7 @@ export const CreateListingButton: React.FC<CreateListingButtonProps> = ({
 
   return (
     <ListerOnly contract={contract}>
-      <Sheet open={open} onOpenChange={setOpen}>
+      <Sheet onOpenChange={setOpen} open={open}>
         <SheetTrigger asChild>
           <Button variant="primary" {...restButtonProps} disabled={!address}>
             {createText} <PlusIcon className="ml-2 size-5" />
@@ -66,36 +66,36 @@ export const CreateListingButton: React.FC<CreateListingButtonProps> = ({
           {isSupportedChain ? (
             <>
               <TabButtons
+                tabClassName="text-sm gap-2 !text-sm"
+                tabContainerClassName="gap-0.5"
                 tabs={LISTING_MODES.map((mode) => ({
-                  name: mode,
                   isActive: mode === listingMode,
+                  name: mode,
                   onClick: () => setListingMode(mode),
                 }))}
-                tabClassName="text-sm gap-2 !text-sm"
-                tabContainerClassName="gap-0.5"
               />
               <div className="mt-5">
                 <CreateListingsForm
-                  isLoggedIn={isLoggedIn}
-                  contract={contract}
-                  type={type}
                   actionText={createText}
-                  setOpen={setOpen}
-                  mode={listingMode === "Select NFT" ? "automatic" : "manual"}
+                  contract={contract}
                   isInsightSupported={isInsightSupported}
+                  isLoggedIn={isLoggedIn}
+                  mode={listingMode === "Select NFT" ? "automatic" : "manual"}
+                  setOpen={setOpen}
+                  type={type}
                 />
               </div>
             </>
           ) : (
             <div className="mt-5">
               <CreateListingsForm
-                isLoggedIn={isLoggedIn}
-                contract={contract}
-                type={type}
                 actionText={createText}
-                setOpen={setOpen}
-                mode="manual"
+                contract={contract}
                 isInsightSupported={isInsightSupported}
+                isLoggedIn={isLoggedIn}
+                mode="manual"
+                setOpen={setOpen}
+                type={type}
               />
             </div>
           )}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx
index f2a9807b1bc..44efde22947 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx
@@ -1,6 +1,3 @@
-import { Alert, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import { Card } from "@/components/ui/card";
 import { useDashboardOwnedNFTs } from "@3rdweb-sdk/react/hooks/useDashboardOwnedNFTs";
 import { useWalletNFTs } from "@3rdweb-sdk/react/hooks/useWalletNFTs";
 import {
@@ -25,9 +22,9 @@ import { type Dispatch, type SetStateAction, useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import {
+  getContract,
   NATIVE_TOKEN_ADDRESS,
   type ThirdwebContract,
-  getContract,
   toUnits,
   toWei,
 } from "thirdweb";
@@ -44,16 +41,19 @@ import {
   isERC1155,
   setApprovalForAll as setApprovalForAll1155,
 } from "thirdweb/extensions/erc1155";
-import { createAuction, createListing } from "thirdweb/extensions/marketplace";
 import type {
   CreateAuctionParams,
   CreateListingParams,
 } from "thirdweb/extensions/marketplace";
+import { createAuction, createListing } from "thirdweb/extensions/marketplace";
 import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
 import { shortenAddress } from "thirdweb/utils";
 import { FormErrorMessage, FormHelperText, FormLabel } from "tw-components";
 import { NFTMediaWithEmptyState } from "tw-components/nft-media";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { Alert, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Card } from "@/components/ui/card";
 
 const LIST_FORM_ID = "marketplace-list-form";
 
@@ -119,8 +119,8 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
 
   const { data: walletNFTs, isPending: isWalletNFTsLoading } = useWalletNFTs({
     chainId,
-    walletAddress: account?.address,
     isInsightSupported,
+    walletAddress: account?.address,
   });
 
   const sendAndConfirmTx = useSendAndConfirmTransaction();
@@ -138,25 +138,25 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
     defaultValues:
       type === "direct-listings"
         ? {
-            selected: undefined,
             currencyContractAddress: NATIVE_TOKEN_ADDRESS,
-            quantity: "1",
-            pricePerToken: "0",
-            listingType: "direct",
-            startTimestamp: new Date(),
             // Default to one month duration
             listingDurationInSeconds: (60 * 60 * 24 * 30).toString(),
+            listingType: "direct",
+            pricePerToken: "0",
+            quantity: "1",
+            selected: undefined,
+            startTimestamp: new Date(),
           }
         : {
-            selected: undefined,
-            currencyContractAddress: NATIVE_TOKEN_ADDRESS,
-            quantity: "1",
             buyoutPricePerToken: "0",
+            currencyContractAddress: NATIVE_TOKEN_ADDRESS,
+            // Default to one month duration
+            listingDurationInSeconds: (60 * 60 * 24 * 30).toString(),
             listingType: "auction",
+            quantity: "1",
             reservePricePerToken: "0",
+            selected: undefined,
             startTimestamp: new Date(),
-            // Default to one month duration
-            listingDurationInSeconds: (60 * 60 * 24 * 30).toString(),
           },
   });
 
@@ -171,7 +171,6 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
   const { data: ownedNFTs, isPending: isOwnedNFTsLoading } =
     useDashboardOwnedNFTs({
       contract: selectedContract,
-      owner: account?.address,
       // Only run this hook as the last resort if this chain is not supported by the API services we are using
       disabled:
         !selectedContract ||
@@ -179,6 +178,7 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
         isWalletNFTsLoading ||
         (walletNFTs?.result || []).length > 0 ||
         mode === "manual",
+      owner: account?.address,
     });
 
   const isSelected = (nft: WalletNFT) => {
@@ -192,29 +192,29 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
     return ownedNFTs?.map((nft) => {
       if (nft.type === "ERC721") {
         return {
+          chainId: nft.chainId,
+          contractAddress: form.watch("selected.contractAddress"),
           id: String(nft.id),
           metadata: nft.metadata,
+          owner: nft.owner,
           supply: "1",
-          contractAddress: form.watch("selected.contractAddress"),
+          tokenAddress: nft.tokenAddress,
           tokenId: nft.id.toString(),
-          owner: nft.owner,
-          type: "ERC721",
           tokenURI: nft.tokenURI,
-          chainId: nft.chainId,
-          tokenAddress: nft.tokenAddress,
+          type: "ERC721",
         };
       }
       return {
+        chainId: nft.chainId,
+        contractAddress: form.watch("selected.contractAddress"),
         id: String(nft.id),
         metadata: nft.metadata,
+        owner: nft.owner,
         supply: String(nft.supply),
-        contractAddress: form.watch("selected.contractAddress"),
+        tokenAddress: nft.tokenAddress,
         tokenId: nft.id.toString(),
-        owner: nft.owner,
-        type: "ERC1155",
         tokenURI: nft.tokenURI,
-        chainId: nft.chainId,
-        tokenAddress: nft.tokenAddress,
+        type: "ERC1155",
       };
     }) as WalletNFT[];
   }, [ownedNFTs, form]);
@@ -271,8 +271,8 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
             if (nftType === "ERC1155") {
               const balance = await balanceOf({
                 contract: _selectedContract,
-                tokenId: selectedTokenId,
                 owner: account.address,
+                tokenId: selectedTokenId,
               });
               if (balance === 0n) {
                 setIsFormLoading(false);
@@ -333,16 +333,16 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
                 ? setApprovalForAll1155
                 : setApprovalForAll721;
             const approveTx = setNftApproval({
+              approved: true,
               contract: _selectedContract,
               operator: contract.address,
-              approved: true,
             });
 
             const promise = sendAndConfirmTx.mutateAsync(approveTx);
             toast.promise(promise, {
+              error: "Failed to approve NFT",
               loading: "Approving NFT for listing",
               success: "NFT approved successfully",
-              error: "Failed to approve NFT",
             });
             await promise;
           }
@@ -353,14 +353,14 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
               new Date().setFullYear(new Date().getFullYear() + 100),
             );
             const transaction = createListing({
-              contract,
               assetContractAddress: _selectedContract.address,
-              tokenId: selectedTokenId,
+              contract,
               currencyContractAddress: formData.currencyContractAddress,
+              endTimestamp,
+              pricePerToken: String(formData.pricePerToken),
               quantity: selectedQuantity,
               startTimestamp: formData.startTimestamp,
-              pricePerToken: String(formData.pricePerToken),
-              endTimestamp,
+              tokenId: selectedTokenId,
             });
 
             await sendAndConfirmTx.mutateAsync(transaction, {
@@ -399,17 +399,17 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
             }
 
             const transaction = createAuction({
-              contract,
               assetContractAddress: _selectedContract.address,
-              tokenId: selectedTokenId,
-              startTimestamp: formData.startTimestamp,
+              buyoutBidAmountWei: buyoutBidAmountWei * selectedQuantity,
+              contract,
               currencyContractAddress: formData.currencyContractAddress,
               endTimestamp: new Date(
-                new Date().getTime() +
+                Date.now() +
                   Number.parseInt(formData.listingDurationInSeconds) * 1000,
               ),
               minimumBidAmountWei: minimumBidAmountWei * selectedQuantity,
-              buyoutBidAmountWei: buyoutBidAmountWei * selectedQuantity,
+              startTimestamp: formData.startTimestamp,
+              tokenId: selectedTokenId,
             });
 
             await sendAndConfirmTx.mutateAsync(transaction, {
@@ -447,142 +447,137 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
           </FormControl>
         </>
       ) : (
-        <>
-          <FormControl>
-            <FormHelperText className="!mt-0 mb-5">
-              Select the NFT you want to list for sale
-            </FormHelperText>
-            {!isSupportedChain ? (
-              <Flex flexDir="column" gap={4} mb={4}>
-                <div className="flex flex-row items-center gap-3 rounded-md border border-border border-orange-100 bg-orange-50 p-[10px] dark:border-orange-300 dark:bg-orange-300">
-                  <InfoIcon className="size-6 text-orange-400 dark:text-orange-900" />
-                  <p className="text-orange-800 dark:text-orange-900">
-                    This chain is not supported by our NFT API yet, please enter
-                    the contract address of the NFT you want to list.
-                  </p>
-                </div>
-                <FormControl
-                  isInvalid={!!form.formState.errors.selected?.contractAddress}
-                >
-                  <FormLabel>Contract address</FormLabel>
-                  <SolidityInput
-                    client={contract.client}
-                    solidityType="address"
-                    formContext={form}
-                    {...form.register("selected.contractAddress", {
-                      required: "Contract address is required",
-                    })}
-                    placeholder="0x..."
-                  />
-                  <FormErrorMessage>
-                    {form.formState.errors.selected?.contractAddress?.message}
-                  </FormErrorMessage>
-                  <FormHelperText>
-                    This will display all the NFTs you own from this contract.
-                  </FormHelperText>
-                </FormControl>
-              </Flex>
-            ) : null}
-            {isWalletNFTsLoading ||
-            (isOwnedNFTsLoading &&
-              !isSupportedChain &&
-              form.watch("selected.contractAddress")) ? (
-              <div className="flex h-[60px] items-center justify-center">
-                <Spinner />
-              </div>
-            ) : nfts && nfts.length !== 0 ? (
-              <Flex gap={2} flexWrap="wrap">
-                {nfts?.map((nft) => {
-                  return (
-                    <Tooltip
-                      bg="transparent"
-                      boxShadow="none"
-                      shouldWrapChildren
-                      placement="left-end"
-                      key={nft.contractAddress + nft.id}
-                      label={
-                        <Card className="p-4">
-                          <ul>
-                            <li>
-                              <strong>Name:</strong>{" "}
-                              {nft.metadata?.name || "N/A"}
-                            </li>
-                            <li>
-                              <strong>Contract Address:</strong>{" "}
-                              {shortenIfAddress(nft.contractAddress)}
-                            </li>
-                            <li>
-                              <strong>Token ID: </strong> {nft.id.toString()}
-                            </li>
-                            <li>
-                              <strong>Token Standard: </strong> {nft.type}
-                            </li>
-                          </ul>
-                        </Card>
-                      }
-                    >
-                      <Box
-                        borderRadius="lg"
-                        cursor="pointer"
-                        onClick={() =>
-                          isSelected(nft)
-                            ? form.setValue("selected", undefined)
-                            : form.setValue("selected", nft)
-                        }
-                        outline={isSelected(nft) ? "3px solid" : undefined}
-                        outlineColor={
-                          isSelected(nft) ? "purple.500" : undefined
-                        }
-                        overflow="hidden"
-                      >
-                        <NFTMediaWithEmptyState
-                          metadata={nft.metadata}
-                          width="140px"
-                          height="140px"
-                          requireInteraction
-                          client={contract.client}
-                        />
-                      </Box>
-                    </Tooltip>
-                  );
-                })}
-              </Flex>
-            ) : nfts && nfts.length === 0 ? (
+        <FormControl>
+          <FormHelperText className="!mt-0 mb-5">
+            Select the NFT you want to list for sale
+          </FormHelperText>
+          {!isSupportedChain ? (
+            <Flex flexDir="column" gap={4} mb={4}>
               <div className="flex flex-row items-center gap-3 rounded-md border border-border border-orange-100 bg-orange-50 p-[10px] dark:border-orange-300 dark:bg-orange-300">
                 <InfoIcon className="size-6 text-orange-400 dark:text-orange-900" />
                 <p className="text-orange-800 dark:text-orange-900">
-                  There are no NFTs owned by this wallet. You need NFTs to
-                  create a listing. You can create NFTs with thirdweb.{" "}
-                  <Link
-                    href="/explore/nft"
-                    color="blue.600"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    Explore NFT contracts
-                  </Link>
-                  .
+                  This chain is not supported by our NFT API yet, please enter
+                  the contract address of the NFT you want to list.
                 </p>
               </div>
-            ) : null}
-          </FormControl>
-        </>
+              <FormControl
+                isInvalid={!!form.formState.errors.selected?.contractAddress}
+              >
+                <FormLabel>Contract address</FormLabel>
+                <SolidityInput
+                  client={contract.client}
+                  formContext={form}
+                  solidityType="address"
+                  {...form.register("selected.contractAddress", {
+                    required: "Contract address is required",
+                  })}
+                  placeholder="0x..."
+                />
+                <FormErrorMessage>
+                  {form.formState.errors.selected?.contractAddress?.message}
+                </FormErrorMessage>
+                <FormHelperText>
+                  This will display all the NFTs you own from this contract.
+                </FormHelperText>
+              </FormControl>
+            </Flex>
+          ) : null}
+          {isWalletNFTsLoading ||
+          (isOwnedNFTsLoading &&
+            !isSupportedChain &&
+            form.watch("selected.contractAddress")) ? (
+            <div className="flex h-[60px] items-center justify-center">
+              <Spinner />
+            </div>
+          ) : nfts && nfts.length !== 0 ? (
+            <Flex flexWrap="wrap" gap={2}>
+              {nfts?.map((nft) => {
+                return (
+                  <Tooltip
+                    bg="transparent"
+                    boxShadow="none"
+                    key={nft.contractAddress + nft.id}
+                    label={
+                      <Card className="p-4">
+                        <ul>
+                          <li>
+                            <strong>Name:</strong> {nft.metadata?.name || "N/A"}
+                          </li>
+                          <li>
+                            <strong>Contract Address:</strong>{" "}
+                            {shortenIfAddress(nft.contractAddress)}
+                          </li>
+                          <li>
+                            <strong>Token ID: </strong> {nft.id.toString()}
+                          </li>
+                          <li>
+                            <strong>Token Standard: </strong> {nft.type}
+                          </li>
+                        </ul>
+                      </Card>
+                    }
+                    placement="left-end"
+                    shouldWrapChildren
+                  >
+                    <Box
+                      borderRadius="lg"
+                      cursor="pointer"
+                      onClick={() =>
+                        isSelected(nft)
+                          ? form.setValue("selected", undefined)
+                          : form.setValue("selected", nft)
+                      }
+                      outline={isSelected(nft) ? "3px solid" : undefined}
+                      outlineColor={isSelected(nft) ? "purple.500" : undefined}
+                      overflow="hidden"
+                    >
+                      <NFTMediaWithEmptyState
+                        client={contract.client}
+                        height="140px"
+                        metadata={nft.metadata}
+                        requireInteraction
+                        width="140px"
+                      />
+                    </Box>
+                  </Tooltip>
+                );
+              })}
+            </Flex>
+          ) : nfts && nfts.length === 0 ? (
+            <div className="flex flex-row items-center gap-3 rounded-md border border-border border-orange-100 bg-orange-50 p-[10px] dark:border-orange-300 dark:bg-orange-300">
+              <InfoIcon className="size-6 text-orange-400 dark:text-orange-900" />
+              <p className="text-orange-800 dark:text-orange-900">
+                There are no NFTs owned by this wallet. You need NFTs to create
+                a listing. You can create NFTs with thirdweb.{" "}
+                <Link
+                  color="blue.600"
+                  href="/explore/nft"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Explore NFT contracts
+                </Link>
+                .
+              </p>
+            </div>
+          ) : null}
+        </FormControl>
       )}
 
-      <FormControl isRequired isDisabled={mode === "automatic" && noNfts}>
+      <FormControl isDisabled={mode === "automatic" && noNfts} isRequired>
         <FormLabel>Listing Currency</FormLabel>
         <CurrencySelector
           contractChainId={chainId}
-          value={form.watch("currencyContractAddress")}
           onChange={(e) =>
             form.setValue("currencyContractAddress", e.target.value)
           }
+          value={form.watch("currencyContractAddress")}
         />
         <FormHelperText>
           The currency you want to sell your tokens for.
         </FormHelperText>
       </FormControl>
-      <FormControl isRequired isDisabled={mode === "automatic" && noNfts}>
+      <FormControl isDisabled={mode === "automatic" && noNfts} isRequired>
         <FormLabel>
           {form.watch("listingType") === "auction"
             ? "Buyout Price Per Token"
@@ -596,7 +591,7 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
         </FormHelperText>
       </FormControl>
       {form.watch("selected")?.type?.toLowerCase() !== "erc721" && (
-        <FormControl isRequired isDisabled={mode === "automatic" && noNfts}>
+        <FormControl isDisabled={mode === "automatic" && noNfts} isRequired>
           <div className="flex flex-row justify-between gap-2">
             <FormLabel>Quantity</FormLabel>
           </div>
@@ -608,7 +603,7 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
       )}
       {form.watch("listingType") === "auction" && (
         <>
-          <FormControl isRequired isDisabled={mode === "automatic" && noNfts}>
+          <FormControl isDisabled={mode === "automatic" && noNfts} isRequired>
             <FormLabel>Reserve Price Per Token</FormLabel>
             <Input {...form.register("reservePricePerToken")} />
             <FormHelperText>
@@ -640,18 +635,18 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
       <div className="fixed right-6 bottom-4 flex flex-row items-center justify-end gap-3">
         <Button
           disabled={isFormLoading}
-          variant="default"
           onClick={() => setOpen(false)}
+          variant="default"
         >
           Cancel
         </Button>
         <TransactionButton
           client={contract.client}
+          form={LIST_FORM_ID}
           isLoggedIn={isLoggedIn}
-          txChainID={contract.chain.id}
           isPending={isFormLoading}
           transactionCount={2}
-          form={LIST_FORM_ID}
+          txChainID={contract.chain.id}
           type="submit"
         >
           {actionText}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/listing-drawer.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/listing-drawer.tsx
index 11e821adaca..06a7456b02c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/listing-drawer.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/listing-drawer.tsx
@@ -1,10 +1,3 @@
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Badge } from "@/components/ui/badge";
-import { Card } from "@/components/ui/card";
-import { CodeClient } from "@/components/ui/code/code.client";
-import { Sheet, SheetContent } from "@/components/ui/sheet";
 import { Flex, GridItem, SimpleGrid, usePrevious } from "@chakra-ui/react";
 import { toast } from "sonner";
 import type { ThirdwebContract } from "thirdweb";
@@ -14,6 +7,13 @@ import type {
 } from "thirdweb/extensions/marketplace";
 import { BuyDirectListingButton, useActiveAccount } from "thirdweb/react";
 import { NFTMediaWithEmptyState } from "tw-components/nft-media";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Badge } from "@/components/ui/badge";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Card } from "@/components/ui/card";
+import { CodeClient } from "@/components/ui/code/code.client";
+import { Sheet, SheetContent } from "@/components/ui/sheet";
 import { CancelTab } from "./cancel-tab";
 import { LISTING_STATUS } from "./types";
 
@@ -46,15 +46,15 @@ export const ListingDrawer: React.FC<NFTDrawerProps> = ({
   }
 
   return (
-    <Sheet open={isOpen} onOpenChange={onClose}>
+    <Sheet onOpenChange={onClose} open={isOpen}>
       <SheetContent className="flex w-full flex-col gap-6 py-6 md:min-w-[600px]">
         <div className="flex flex-row gap-6">
           <NFTMediaWithEmptyState
-            metadata={renderData.asset.metadata}
             client={contract.client}
+            height="150px"
+            metadata={renderData.asset.metadata}
             requireInteraction
             width="150px"
-            height="150px"
           />
           <Flex flexDir="column" gap={2} w="70%">
             <p className="font-bold text-lg">
@@ -68,7 +68,7 @@ export const ListingDrawer: React.FC<NFTDrawerProps> = ({
 
         <Flex flexDir="column" gap={4}>
           <Card className="flex flex-col gap-3 p-4">
-            <SimpleGrid rowGap={3} columns={12} placeItems="center left">
+            <SimpleGrid columns={12} placeItems="center left" rowGap={3}>
               <GridItem colSpan={3}>
                 <p className="font-bold">Asset contract address</p>
               </GridItem>
@@ -83,9 +83,9 @@ export const ListingDrawer: React.FC<NFTDrawerProps> = ({
               </GridItem>
               <GridItem colSpan={9}>
                 <CopyTextButton
+                  copyIconPosition="right"
                   textToCopy={tokenId}
                   textToShow={tokenId}
-                  copyIconPosition="right"
                   tooltip="Token ID"
                 />
               </GridItem>
@@ -103,9 +103,9 @@ export const ListingDrawer: React.FC<NFTDrawerProps> = ({
               </GridItem>
               <GridItem colSpan={9}>
                 <CopyTextButton
+                  copyIconPosition="right"
                   textToCopy={renderData.id.toString()}
                   textToShow={renderData.id.toString()}
-                  copyIconPosition="right"
                   tooltip="Listing ID"
                 />
               </GridItem>
@@ -169,12 +169,11 @@ export const ListingDrawer: React.FC<NFTDrawerProps> = ({
 
         {!isOwner && renderData.status === "ACTIVE" && (
           <BuyDirectListingButton
-            listingId={renderData.id}
-            contractAddress={renderData.assetContractAddress}
             chain={contract.chain}
-            client={contract.client}
             className="w-full"
-            quantity={1n}
+            client={contract.client}
+            contractAddress={renderData.assetContractAddress}
+            listingId={renderData.id}
             onError={(error) => {
               toast.error("Failed to buy listing", {
                 description: error.message,
@@ -183,6 +182,7 @@ export const ListingDrawer: React.FC<NFTDrawerProps> = ({
             onTransactionConfirmed={() => {
               toast.success("Listing bought successfully");
             }}
+            quantity={1n}
           >
             Buy Listing
           </BuyDirectListingButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/marketplace-table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/marketplace-table.tsx
index 1cc24abf148..ca406bd9446 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/marketplace-table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/marketplace-table.tsx
@@ -1,5 +1,5 @@
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { Button } from "@/components/ui/button";
+// biome-ignore-all lint/nursery/noNestedComponentDefinitions: TODO
+
 import {
   IconButton,
   Select,
@@ -37,6 +37,8 @@ import type {
   EnglishAuction,
 } from "thirdweb/extensions/marketplace";
 import { min } from "thirdweb/utils";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Button } from "@/components/ui/button";
 import { ListingDrawer } from "./listing-drawer";
 import { LISTING_STATUS } from "./types";
 
@@ -92,29 +94,28 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
   const tableColumns: Column<DirectListing | EnglishAuction>[] = useMemo(() => {
     return [
       {
-        Header: "Listing Id",
         accessor: (row) => row.id.toString(),
+        Header: "Listing Id",
       },
       {
-        Header: "Media",
         accessor: (row) => row.asset.metadata,
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         Cell: (cell: any) => <MediaCell cell={cell} client={contract.client} />,
+        Header: "Media",
       },
       {
-        Header: "Name",
         accessor: (row) => row.asset.metadata.name ?? "N/A",
+        Header: "Name",
       },
       {
-        Header: "Creator",
         accessor: (row) => row.creatorAddress,
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         Cell: ({ cell }: { cell: Cell<any, string> }) => (
           <WalletAddress address={cell.value} client={contract.client} />
         ),
+        Header: "Creator",
       },
       {
-        Header: "Price",
         accessor: (row) =>
           (row as DirectListing)?.currencyValuePerToken ||
           (row as EnglishAuction)?.buyoutCurrencyValue,
@@ -126,10 +127,11 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
             </p>
           );
         },
+        Header: "Price",
       },
       {
-        Header: "Status",
         accessor: (row) => LISTING_STATUS[row.status],
+        Header: "Status",
       },
     ];
   }, [contract.client]);
@@ -154,8 +156,8 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
       // biome-ignore lint/suspicious/noExplicitAny: FIXME
       data: (renderData as any) || [],
       initialState: {
-        pageSize: queryParams.count,
         pageIndex: 0,
+        pageSize: queryParams.count,
       },
       manualPagination: true,
       pageCount: Math.max(
@@ -176,7 +178,7 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
   // FIXME: re-work tables and pagination with @tanstack/table@latest - which (I believe) does not need this workaround anymore
   // eslint-disable-next-line no-restricted-syntax
   useEffect(() => {
-    setQueryParams({ start: pageIndex * pageSize, count: pageSize });
+    setQueryParams({ count: pageSize, start: pageIndex * pageSize });
   }, [pageIndex, pageSize, setQueryParams]);
 
   const [tokenRow, setTokenRow] = useState<
@@ -187,37 +189,37 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
     <div className="flex flex-col gap-4">
       <div className="flex flex-row">
         <Button
+          className="w-18 rounded-r-none"
           onClick={() => setListingsToShow("all")}
           variant={listingsToShow === "all" ? "default" : "outline"}
-          className="w-18 rounded-r-none"
         >
           All
         </Button>
         <Button
+          className="rounded-l-none"
           onClick={() => setListingsToShow("valid")}
           variant={listingsToShow === "valid" ? "default" : "outline"}
-          className="rounded-l-none"
         >
           Valid
         </Button>
       </div>
-      <TableContainer maxW="100%" className="relative">
+      <TableContainer className="relative" maxW="100%">
         {((listingsToShow === "all" && getAllQueryResult.isFetching) ||
           (listingsToShow === "valid" && getValidQueryResult.isFetching)) && (
           <Spinner
             color="primary"
-            size="xs"
             position="absolute"
-            top={2}
             right={4}
+            size="xs"
+            top={2}
           />
         )}
         <ListingDrawer
           contract={contract}
           data={tokenRow}
+          isLoggedIn={isLoggedIn}
           isOpen={!!tokenRow}
           onClose={() => setTokenRow(null)}
-          isLoggedIn={isLoggedIn}
         />
         <Table {...getTableProps()}>
           <Thead>
@@ -247,15 +249,16 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
               return (
                 <Tr
                   {...row.getRowProps()}
-                  role="group"
-                  className="hover:bg-card"
-                  style={{ cursor: "pointer" }}
-                  onClick={() => setTokenRow(row.original)}
-                  borderBottomWidth={1}
                   _last={{ borderBottomWidth: 0 }}
+                  borderBottomWidth={1}
                   borderColor="borderColor"
+                  className="hover:bg-card"
                   // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
                   key={rowIndex}
+                  onClick={() => setTokenRow(row.original)}
+                  // biome-ignore lint/a11y/useSemanticElements: FIXME
+                  role="group"
+                  style={{ cursor: "pointer" }}
                 >
                   {row.cells.map((cell, cellIndex) => (
                     <Td
@@ -280,15 +283,15 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
       <div className="flex w-full items-center justify-center">
         <div className="flex flex-row items-center gap-2">
           <IconButton
-            isDisabled={!canPreviousPage || totalCountQuery.isPending}
             aria-label="first page"
             icon={<ChevronFirstIcon className="size-4" />}
+            isDisabled={!canPreviousPage || totalCountQuery.isPending}
             onClick={() => gotoPage(0)}
           />
           <IconButton
-            isDisabled={!canPreviousPage || totalCountQuery.isPending}
             aria-label="previous page"
             icon={<ChevronLeftIcon className="size-4" />}
+            isDisabled={!canPreviousPage || totalCountQuery.isPending}
             onClick={() => previousPage()}
           />
           <p className="whitespace-nowrap">
@@ -302,24 +305,24 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
             </Skeleton>
           </p>
           <IconButton
-            isDisabled={!canNextPage || totalCountQuery.isPending}
             aria-label="next page"
             icon={<ChevronRightIcon className="size-4" />}
+            isDisabled={!canNextPage || totalCountQuery.isPending}
             onClick={() => nextPage()}
           />
           <IconButton
-            isDisabled={!canNextPage || totalCountQuery.isPending}
             aria-label="last page"
             icon={<ChevronLastIcon className="size-4" />}
+            isDisabled={!canNextPage || totalCountQuery.isPending}
             onClick={() => gotoPage(pageCount - 1)}
           />
 
           <Select
+            isDisabled={totalCountQuery.isPending}
             onChange={(e) => {
               setPageSize(Number.parseInt(e.target.value as string, 10));
             }}
             value={pageSize}
-            isDisabled={totalCountQuery.isPending}
           >
             <option value="25">25</option>
             <option value="50">50</option>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/types.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/types.ts
index 099e149c03e..722a289c4d5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/types.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/types.ts
@@ -2,10 +2,10 @@
 import type { ListingStatus } from "thirdweb/dist/types/extensions/marketplace/types";
 
 export const LISTING_STATUS: Record<ListingStatus, string> = {
-  UNSET: "Does not exist",
-  CREATED: "Created",
-  COMPLETED: "Completed",
-  CANCELLED: "Cancelled",
   ACTIVE: "Active",
+  CANCELLED: "Cancelled",
+  COMPLETED: "Completed",
+  CREATED: "Created",
   EXPIRED: "Expired",
+  UNSET: "Does not exist",
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/ContractDirectListingsPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/ContractDirectListingsPage.client.tsx
index a02e6bf35c2..9b4ef89cab1 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/ContractDirectListingsPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/ContractDirectListingsPage.client.tsx
@@ -34,8 +34,8 @@ export function ContractDirectListingsPageClient(props: {
   return (
     <ContractDirectListingsPage
       contract={props.contract}
-      isLoggedIn={props.isLoggedIn}
       isInsightSupported={metadataQuery.data.isInsightSupported}
+      isLoggedIn={props.isLoggedIn}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/ContractDirectListingsPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/ContractDirectListingsPage.tsx
index 3c3aa1a4c77..db5f9e1d015 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/ContractDirectListingsPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/ContractDirectListingsPage.tsx
@@ -21,11 +21,11 @@ export const ContractDirectListingsPage: React.FC<
         </h2>
         <div className="flex flex-row gap-4">
           <CreateListingButton
-            isInsightSupported={isInsightSupported}
             contract={contract}
-            type="direct-listings"
             createText="Create Direct Listing"
+            isInsightSupported={isInsightSupported}
             isLoggedIn={isLoggedIn}
+            type="direct-listings"
           />
         </div>
       </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/components/table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/components/table.tsx
index 73958adc9ce..4ccbaadbd0d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/components/table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/components/table.tsx
@@ -39,10 +39,10 @@ export const DirectListingsTable: React.FC<DirectListingsTableProps> = ({
       contract={contract}
       getAllQueryResult={getAllQueryResult}
       getValidQueryResult={getValidQueryResult}
-      totalCountQuery={totalCountQuery}
+      isLoggedIn={isLoggedIn}
       queryParams={queryParams}
       setQueryParams={setQueryParams}
-      isLoggedIn={isLoggedIn}
+      totalCountQuery={totalCountQuery}
     />
   );
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/page.tsx
index cb45767bc19..768cb948e3a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/page.tsx
@@ -9,10 +9,10 @@ export default async function Page(props: {
 
   return (
     <SharedDirectListingsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/shared-direct-listings-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/shared-direct-listings-page.tsx
index c0babf8d735..a6efcac0993 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/shared-direct-listings-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/shared-direct-listings-page.tsx
@@ -13,8 +13,8 @@ export async function SharedDirectListingsPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -46,8 +46,8 @@ export async function SharedDirectListingsPage(props: {
   return (
     <ContractDirectListingsPage
       contract={info.clientContract}
-      isLoggedIn={props.isLoggedIn}
       isInsightSupported={isInsightSupported}
+      isLoggedIn={props.isLoggedIn}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/ContractEnglishAuctionsPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/ContractEnglishAuctionsPage.client.tsx
index cb52a20dce7..838692fcf77 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/ContractEnglishAuctionsPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/ContractEnglishAuctionsPage.client.tsx
@@ -34,8 +34,8 @@ export function ContractEnglishAuctionsPageClient(props: {
   return (
     <ContractEnglishAuctionsPage
       contract={props.contract}
-      isLoggedIn={props.isLoggedIn}
       isInsightSupported={metadataQuery.data.isInsightSupported}
+      isLoggedIn={props.isLoggedIn}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/ContractEnglishAuctionsPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/ContractEnglishAuctionsPage.tsx
index b2d6e01e300..805ab5c34c3 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/ContractEnglishAuctionsPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/ContractEnglishAuctionsPage.tsx
@@ -22,10 +22,10 @@ export const ContractEnglishAuctionsPage: React.FC<
         <div className="flex flex-row gap-4">
           <CreateListingButton
             contract={contract}
-            type="english-auctions"
             createText="Create English Auction"
-            isLoggedIn={isLoggedIn}
             isInsightSupported={isInsightSupported}
+            isLoggedIn={isLoggedIn}
+            type="english-auctions"
           />
         </div>
       </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/components/table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/components/table.tsx
index 34a4006ccc1..2d20b7360fd 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/components/table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/components/table.tsx
@@ -36,13 +36,13 @@ export const EnglishAuctionsTable: React.FC<EnglishAuctionsTableProps> = ({
 
   return (
     <MarketplaceTable
-      isLoggedIn={isLoggedIn}
       contract={contract}
       getAllQueryResult={getAllQueryResult}
       getValidQueryResult={getValidQueryResult}
-      totalCountQuery={totalCountQuery}
+      isLoggedIn={isLoggedIn}
       queryParams={queryParams}
       setQueryParams={setQueryParams}
+      totalCountQuery={totalCountQuery}
     />
   );
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/page.tsx
index 7dab8f11b57..dd17a1f476b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/page.tsx
@@ -9,10 +9,10 @@ export default async function Page(props: {
 
   return (
     <SharedEnglishAuctionsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/shared-english-auctions-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/shared-english-auctions-page.tsx
index adf4355a739..87827142c34 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/shared-english-auctions-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/shared-english-auctions-page.tsx
@@ -13,8 +13,8 @@ export async function SharedEnglishAuctionsPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -36,8 +36,8 @@ export async function SharedEnglishAuctionsPage(props: {
 
   if (!metadata.isEnglishAuctionSupported) {
     redirectToContractLandingPage({
-      contractAddress: props.contractAddress,
       chainIdOrSlug: props.chainIdOrSlug,
+      contractAddress: props.contractAddress,
       projectMeta: props.projectMeta,
     });
   }
@@ -45,8 +45,8 @@ export async function SharedEnglishAuctionsPage(props: {
   return (
     <ContractEnglishAuctionsPage
       contract={info.clientContract}
-      isLoggedIn={props.isLoggedIn}
       isInsightSupported={metadata.isInsightSupported}
+      isLoggedIn={props.isLoggedIn}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/NFTCards.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/NFTCards.tsx
index 430cb2355db..e96a5755e3b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/NFTCards.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/NFTCards.tsx
@@ -1,8 +1,8 @@
-import { SkeletonContainer } from "@/components/ui/skeleton";
 import Link from "next/link";
 import { useMemo } from "react";
 import { type NFT, type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
 import { NFTMediaWithEmptyState } from "tw-components/nft-media";
+import { SkeletonContainer } from "@/components/ui/skeleton";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../_utils/contract-page-path";
 
@@ -12,18 +12,18 @@ const dummyMetadata: (idx: number) => NFTWithContract = (idx) => ({
   chainId: 1,
   contractAddress: ZERO_ADDRESS,
   id: BigInt(idx || 0),
-  tokenURI: `1-0x123-${idx}`,
   metadata: {
-    name: "Loading...",
     description:
       "lorem ipsum loading sit amet consectetur adipisicing elit. Quisquam, quos.",
     id: BigInt(idx || 0),
+    name: "Loading...",
     uri: `1-0x123-${idx}`,
   },
   owner: `0x_fake_${idx}`,
-  type: "ERC721",
   supply: 1n,
   tokenAddress: ZERO_ADDRESS,
+  tokenURI: `1-0x123-${idx}`,
+  type: "ERC721",
 });
 
 interface NFTCardsProps {
@@ -54,8 +54,8 @@ export const NFTCards: React.FC<NFTCardsProps> = ({
 
         return (
           <div
-            key={`${token.chainId}_${token.contractAddress}_${tokenId}`}
             className="hover:-translate-y-0.5 relative flex h-full cursor-pointer flex-col overflow-hidden rounded-lg bg-background duration-200 hover:scale-[1.01]"
+            key={`${token.chainId}_${token.contractAddress}_${tokenId}`}
           >
             {/* border */}
             <div className="absolute inset-0 rounded-lg border border-border" />
@@ -63,51 +63,50 @@ export const NFTCards: React.FC<NFTCardsProps> = ({
             {/* image */}
             <div className="relative aspect-square w-full overflow-hidden">
               <SkeletonContainer
-                skeletonData={token.metadata}
-                loadedData={isPending ? undefined : token.metadata}
                 className="h-full w-full rounded-lg"
+                loadedData={isPending ? undefined : token.metadata}
                 render={(v) => {
                   return (
                     <NFTMediaWithEmptyState
+                      client={client}
+                      height="100%"
                       metadata={v}
                       requireInteraction
                       width="100%"
-                      height="100%"
-                      client={client}
                     />
                   );
                 }}
+                skeletonData={token.metadata}
               />
             </div>
 
             <div className="p-4">
               {/* title */}
               <SkeletonContainer
-                skeletonData={token.metadata}
-                loadedData={isPending ? undefined : token.metadata}
                 className="mb-2"
+                loadedData={isPending ? undefined : token.metadata}
                 render={(v) => {
                   return (
                     <h2 className="font-semibold tracking-tight">
                       <Link
+                        className="before:absolute before:inset-0"
                         href={buildContractPagePath({
-                          projectMeta,
                           chainIdOrSlug: token.chainId.toString(),
                           contractAddress: token.contractAddress,
+                          projectMeta,
                           subpath: `/nfts/${tokenId}`,
                         })}
-                        className="before:absolute before:inset-0"
                       >
                         {v.name}
                       </Link>
                     </h2>
                   );
                 }}
+                skeletonData={token.metadata}
               />
 
               {/* Description */}
               <SkeletonContainer
-                skeletonData={token.metadata}
                 loadedData={isPending ? undefined : token.metadata}
                 render={(v) => {
                   return (
@@ -116,6 +115,7 @@ export const NFTCards: React.FC<NFTCardsProps> = ({
                     </p>
                   );
                 }}
+                skeletonData={token.metadata}
               />
             </div>
           </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/ClaimPriceInput.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/ClaimPriceInput.tsx
index 45adba454db..a2e7ee67e16 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/ClaimPriceInput.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/ClaimPriceInput.tsx
@@ -1,16 +1,14 @@
 import { Box, Flex } from "@chakra-ui/react";
 import { CurrencySelector } from "components/shared/CurrencySelector";
 import { NATIVE_TOKEN_ADDRESS } from "thirdweb";
-import { useClaimConditionsFormContext } from "..";
 import { PriceInput } from "../../price-input";
+import { useClaimConditionsFormContext } from "..";
 import { CustomFormControl } from "../common";
 
 /**
  * Allows the user to select how much they want to charge to claim each NFT
  */
-export const ClaimPriceInput = (props: {
-  contractChainId: number;
-}) => {
+export const ClaimPriceInput = (props: { contractChainId: number }) => {
   const {
     formDisabled,
     isErc20,
@@ -28,32 +26,32 @@ export const ClaimPriceInput = (props: {
   return (
     <CustomFormControl
       disabled={formDisabled}
-      label={`How much do you want to charge to claim each ${
-        isErc20 ? "token" : "NFT"
-      }?`}
       error={
         form.getFieldState(`phases.${phaseIndex}.price`, form.formState).error
       }
+      label={`How much do you want to charge to claim each ${
+        isErc20 ? "token" : "NFT"
+      }?`}
     >
-      <Flex gap={2} flexDir={{ base: "column", md: "row" }}>
-        <Box w={{ base: "100%", md: "50%" }} minW="70px">
+      <Flex flexDir={{ base: "column", md: "row" }} gap={2}>
+        <Box minW="70px" w={{ base: "100%", md: "50%" }}>
           <PriceInput
-            w="full"
-            value={field.price?.toString() || ""}
             onChange={(val) => form.setValue(`phases.${phaseIndex}.price`, val)}
+            value={field.price?.toString() || ""}
+            w="full"
           />
         </Box>
         <Box w={{ base: "100%", md: isColumn ? "50%" : "100%" }}>
           <CurrencySelector
             contractChainId={props.contractChainId}
             isDisabled={formDisabled}
-            value={field?.currencyAddress || NATIVE_TOKEN_ADDRESS}
             onChange={(e) =>
               form.setValue(
                 `phases.${phaseIndex}.currencyAddress`,
                 e.target.value,
               )
             }
+            value={field?.currencyAddress || NATIVE_TOKEN_ADDRESS}
           />
         </Box>
       </Flex>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/ClaimerSelection.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/ClaimerSelection.tsx
index aab2ee3fd38..932e065a672 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/ClaimerSelection.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/ClaimerSelection.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@/components/ui/button";
 import { Box, Flex, Select } from "@chakra-ui/react";
 import { UploadIcon } from "lucide-react";
+import { Button } from "@/components/ui/button";
 import { useClaimConditionsFormContext } from "..";
 import { CustomFormControl } from "../common";
 
@@ -82,21 +82,21 @@ export const ClaimerSelection = () => {
   return (
     <CustomFormControl
       disabled={formDisabled}
-      label={label}
       error={
         form.getFieldState(`phases.${phaseIndex}.snapshot`, form.formState)
           .error
       }
       helperText={helperText}
+      label={label}
     >
       <Flex direction={{ base: "column", md: "row" }} gap={4}>
         {claimConditionType === "overrides" ||
         claimConditionType === "specific" ? null : (
           <Select
             isDisabled={formDisabled}
-            w={{ base: "100%", md: "50%" }}
-            value={dropType}
             onChange={handleClaimerChange}
+            value={dropType}
+            w={{ base: "100%", md: "50%" }}
           >
             <option value="any">Any wallet</option>
             <option value="overrides">Any wallet (with overrides)</option>
@@ -115,26 +115,26 @@ export const ClaimerSelection = () => {
           >
             {/* disable the "Edit" button when form is disabled, but not when it's a "See" button */}
             <Button
-              variant="primary"
-              disabled={disabledSnapshotButton}
               className="gap-2 rounded-md"
+              disabled={disabledSnapshotButton}
               onClick={() => setOpenIndex(phaseIndex)}
+              variant="primary"
             >
               {isAdmin ? "Edit" : "See"} Claimer Snapshot
               <UploadIcon className="size-4" />
             </Button>
 
             <Flex
-              gap={2}
-              direction="row"
-              align="center"
-              justify="center"
-              opacity={disabledSnapshotButton ? 0.5 : 1}
-              color={field.snapshot?.length === 0 ? "red.400" : "green.400"}
               _light={{
                 color: field.snapshot?.length === 0 ? "red.500" : "green.500",
               }}
+              align="center"
+              color={field.snapshot?.length === 0 ? "red.400" : "green.400"}
+              direction="row"
+              gap={2}
+              justify="center"
               ml={2}
+              opacity={disabledSnapshotButton ? 0.5 : 1}
             >
               <p>
                 ●{" "}
@@ -148,8 +148,8 @@ export const ClaimerSelection = () => {
           </Flex>
         ) : (
           <Box
-            w={{ base: "100%", md: "50%" }}
             display={{ base: "none", md: "block" }}
+            w={{ base: "100%", md: "50%" }}
           />
         )}
       </Flex>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/CreatorInput.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/CreatorInput.tsx
index 8b889b73228..b5510fcea4b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/CreatorInput.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/CreatorInput.tsx
@@ -1,5 +1,5 @@
-import { Input } from "@/components/ui/input";
 import { useActiveAccount } from "thirdweb/react";
+import { Input } from "@/components/ui/input";
 import { CustomFormControl } from "../common";
 import { useClaimConditionsFormContext } from "../index";
 
@@ -25,7 +25,6 @@ export const CreatorInput: React.FC<CreatorInputProps> = ({
   return (
     <CustomFormControl
       disabled={formDisabled}
-      label="Creator address"
       helperText={
         <>
           This wallet address will be able to indefinitely claim.{" "}
@@ -33,6 +32,7 @@ export const CreatorInput: React.FC<CreatorInputProps> = ({
             "To use a different address, please connect a different wallet."}
         </>
       }
+      label="Creator address"
     >
       <Input disabled readOnly value={creatorAddress || walletAddress} />
     </CustomFormControl>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/MaxClaimablePerWalletInput.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/MaxClaimablePerWalletInput.tsx
index a50bb18eed5..50b6362804e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/MaxClaimablePerWalletInput.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/MaxClaimablePerWalletInput.tsx
@@ -25,7 +25,6 @@ export const MaxClaimablePerWalletInput: React.FC = () => {
   return (
     <CustomFormControl
       disabled={formDisabled}
-      label={`How many ${isErc20 ? "tokens" : "NFTs"} can be claimed per wallet?`}
       error={
         form.getFieldState(
           `phases.${phaseIndex}.maxClaimablePerWallet`,
@@ -42,29 +41,30 @@ export const MaxClaimablePerWalletInput: React.FC = () => {
           could get around wallet restrictions.{" "}
           <Link
             className="text-blue-500"
-            target="_blank"
-            rel="noopener noreferrer"
             href="https://portal.thirdweb.com/contracts/design/Drop#sybil-attacks"
+            rel="noopener noreferrer"
+            target="_blank"
           >
             Learn more
           </Link>
           .
         </>
       }
+      label={`How many ${isErc20 ? "tokens" : "NFTs"} can be claimed per wallet?`}
     >
       <QuantityInputWithUnlimited
-        isRequired
         decimals={tokenDecimals}
         isDisabled={
           dropType === "specific" || formDisabled || (isErc20 && !tokenDecimals)
         }
-        value={field?.maxClaimablePerWallet?.toString() || "0"}
+        isRequired
         onChange={(value) =>
           form.setValue(
             `phases.${phaseIndex}.maxClaimablePerWallet`,
             value.toString(),
           )
         }
+        value={field?.maxClaimablePerWallet?.toString() || "0"}
       />
     </CustomFormControl>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/MaxClaimableSupplyInput.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/MaxClaimableSupplyInput.tsx
index be2c3b57458..5af987c32ef 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/MaxClaimableSupplyInput.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/MaxClaimableSupplyInput.tsx
@@ -1,5 +1,5 @@
-import { useClaimConditionsFormContext } from "..";
 import { QuantityInputWithUnlimited } from "../../quantity-input-with-unlimited";
+import { useClaimConditionsFormContext } from "..";
 import { CustomFormControl } from "../common";
 
 /**
@@ -22,28 +22,28 @@ export const MaxClaimableSupplyInput: React.FC = () => {
 
   return (
     <CustomFormControl
-      label={`How many ${
-        isErc20 ? "tokens" : "NFTs"
-      } will you drop in this phase?`}
+      disabled={formDisabled}
       error={
         form.getFieldState(
           `phases.${phaseIndex}.maxClaimableSupply`,
           form.formState,
         ).error
       }
-      disabled={formDisabled}
+      label={`How many ${
+        isErc20 ? "tokens" : "NFTs"
+      } will you drop in this phase?`}
     >
       <QuantityInputWithUnlimited
-        isRequired
-        isDisabled={formDisabled || (isErc20 && !tokenDecimals)}
         decimals={tokenDecimals}
-        value={field.maxClaimableSupply?.toString() || "0"}
+        isDisabled={formDisabled || (isErc20 && !tokenDecimals)}
+        isRequired
         onChange={(value) =>
           form.setValue(
             `phases.${phaseIndex}.maxClaimableSupply`,
             value.toString(),
           )
         }
+        value={field.maxClaimableSupply?.toString() || "0"}
       />
     </CustomFormControl>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/PhaseNameInput.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/PhaseNameInput.tsx
index ce8476beb28..0ee9fe6647e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/PhaseNameInput.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/PhaseNameInput.tsx
@@ -14,17 +14,17 @@ export const PhaseNameInput: React.FC = () => {
   return (
     <CustomFormControl
       disabled={formDisabled}
-      label="Name"
       helperText="This does not affect how your claim phase functions and is for organizational purposes only."
+      label="Name"
     >
       <Input
         disabled={formDisabled}
-        type="text"
-        value={inputValue}
-        placeholder={inputPlaceholder}
         onChange={(e) => {
           form.setValue(`phases.${phaseIndex}.metadata.name`, e.target.value);
         }}
+        placeholder={inputPlaceholder}
+        type="text"
+        value={inputValue}
       />
     </CustomFormControl>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/PhaseStartTimeInput.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/PhaseStartTimeInput.tsx
index 8d7cc89daeb..9d959b87cde 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/PhaseStartTimeInput.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/Inputs/PhaseStartTimeInput.tsx
@@ -11,23 +11,23 @@ export const PhaseStartTimeInput: React.FC = () => {
     useClaimConditionsFormContext();
   return (
     <CustomFormControl
-      label="When will this phase start?"
-      helperText="This time is in your local timezone."
       disabled={formDisabled}
       error={
         form.getFieldState(`phases.${phaseIndex}.startTime`, form.formState)
           .error
       }
+      helperText="This time is in your local timezone."
+      label="When will this phase start?"
     >
       <Input
-        type="datetime-local"
-        value={toDateTimeLocal(field.startTime)}
         onChange={(e) =>
           form.setValue(
             `phases.${phaseIndex}.startTime`,
             new Date(e.target.value),
           )
         }
+        type="datetime-local"
+        value={toDateTimeLocal(field.startTime)}
       />
     </CustomFormControl>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/hooks.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/hooks.ts
index ae3d9c2e81b..3c1e991731b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/hooks.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/hooks.ts
@@ -85,8 +85,8 @@ export async function getClaimPhasesInLegacyFormat(
           value: condition.pricePerToken,
         })),
         download({
-          uri: condition.metadata,
           client: options.contract.client,
+          uri: condition.metadata,
         }).then((r) => r.json()),
         getContractMetadata(options),
       ]);
@@ -97,16 +97,7 @@ export async function getClaimPhasesInLegacyFormat(
       );
       return {
         ...condition,
-        startTime: new Date(Number(condition.startTimestamp * 1000n)),
         currencyAddress: condition.currency,
-        price: condition.pricePerToken,
-        maxClaimableSupply:
-          options.type === "erc20"
-            ? convertERC20ValueToDisplayValue(
-                condition.maxClaimableSupply,
-                options.decimals,
-              )
-            : toUnlimited(condition.maxClaimableSupply),
         currencyMetadata,
         currentMintSupply: (
           condition.maxClaimableSupply - condition.supplyClaimed
@@ -118,9 +109,18 @@ export async function getClaimPhasesInLegacyFormat(
                 options.decimals,
               )
             : toUnlimited(condition.quantityLimitPerWallet),
+        maxClaimableSupply:
+          options.type === "erc20"
+            ? convertERC20ValueToDisplayValue(
+                condition.maxClaimableSupply,
+                options.decimals,
+              )
+            : toUnlimited(condition.maxClaimableSupply),
         merkleRootHash: condition.merkleRoot,
         metadata,
+        price: condition.pricePerToken,
         snapshot,
+        startTime: new Date(Number(condition.startTimestamp * 1000n)),
       } satisfies CombinedClaimCondition;
     }),
   );
@@ -134,28 +134,28 @@ export function setClaimPhasesTx(
 ) {
   const phases = rawPhases.map((phase) => {
     return {
-      startTime: toDate(phase.startTime),
-      maxClaimableSupply:
+      currencyAddress: phase.currencyAddress,
+      maxClaimablePerWallet:
         baseOptions.type === "erc20"
           ? convertERC20ValueToWei(
-              phase.maxClaimableSupply,
+              phase.maxClaimablePerWallet,
               baseOptions.decimals,
             )
-          : toBigInt(phase.maxClaimableSupply),
-      maxClaimablePerWallet:
+          : toBigInt(phase.maxClaimablePerWallet),
+      maxClaimableSupply:
         baseOptions.type === "erc20"
           ? convertERC20ValueToWei(
-              phase.maxClaimablePerWallet,
+              phase.maxClaimableSupply,
               baseOptions.decimals,
             )
-          : toBigInt(phase.maxClaimablePerWallet),
+          : toBigInt(phase.maxClaimableSupply),
       merkleRootHash: phase.merkleRootHash as string | undefined,
+      metadata: phase.metadata,
       overrideList: phase.snapshot?.length
         ? snapshotToOverrides(phase.snapshot)
         : undefined,
       price: phase.price?.toString(),
-      currencyAddress: phase.currencyAddress,
-      metadata: phase.metadata,
+      startTime: toDate(phase.startTime),
     } satisfies ERC20Ext.SetClaimConditionsParams["phases"][0];
   });
 
@@ -174,8 +174,8 @@ export function setClaimPhasesTx(
       return ERC1155Ext.setClaimConditions({
         contract: baseOptions.contract,
         phases,
-        tokenId: baseOptions.tokenId,
         singlePhaseDrop: baseOptions.isSinglePhase,
+        tokenId: baseOptions.tokenId,
       });
   }
 }
@@ -194,9 +194,9 @@ function snapshotToOverrides(snapshot: PhaseInput["snapshot"]) {
     }
     return {
       address: entry.address,
+      currencyAddress: entry.currencyAddress,
       maxClaimable: entry.maxClaimable?.toString(),
       price: entry.price?.toString(),
-      currencyAddress: entry.currencyAddress,
     } satisfies OverrideEntry;
   });
 }
@@ -275,13 +275,13 @@ async function fetchSnapshot(
     const snapshotUri = merkleMetadata[merkleRoot];
     if (snapshotUri) {
       const raw = await download({
-        uri: snapshotUri,
         client: client,
+        uri: snapshotUri,
       }).then((r) => r.json());
       if (raw.isShardedMerkleTree && raw.merkleRoot === merkleRoot) {
         return download({
-          uri: raw.originalEntriesUri,
           client: client,
+          uri: raw.originalEntriesUri,
         })
           .then((r) => r.json())
           .catch(() => null);
@@ -295,9 +295,9 @@ async function fetchSnapshot(
             currencyAddress: string;
           }) => ({
             address: claim.address,
+            currencyAddress: claim.currencyAddress,
             maxClaimable: claim.maxClaimable,
             price: claim.price,
-            currencyAddress: claim.currencyAddress,
           }),
         );
       }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx
index 75d74e4ea69..766d6de563f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { AdminOnly } from "@3rdweb-sdk/react/components/roles/admin-only";
 import { useIsAdmin } from "@3rdweb-sdk/react/hooks/useContractRoles";
 import {
@@ -19,7 +17,7 @@ import {
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { CircleHelpIcon, PlusIcon } from "lucide-react";
-import { Fragment, createContext, useContext, useMemo, useState } from "react";
+import { createContext, Fragment, useContext, useMemo, useState } from "react";
 import {
   type UseFieldArrayReturn,
   type UseFormReturn,
@@ -42,6 +40,8 @@ import invariant from "tiny-invariant";
 import { Button, Heading, Text } from "tw-components";
 import * as z from "zod";
 import { ZodError } from "zod";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import {
   type ClaimConditionInput,
   ClaimConditionInputSchema,
@@ -58,25 +58,25 @@ type ClaimConditionDashboardInput = ClaimConditionInput & {
 };
 
 const DEFAULT_PHASE: ClaimConditionDashboardInput = {
-  startTime: new Date(),
-  maxClaimableSupply: "unlimited",
-  maxClaimablePerWallet: "unlimited",
-  price: "0",
   currencyAddress: NATIVE_TOKEN_ADDRESS,
-  snapshot: undefined,
+  fromSdk: false,
+  isEditing: true,
+  maxClaimablePerWallet: "unlimited",
+  maxClaimableSupply: "unlimited",
   merkleRootHash: undefined,
   metadata: {
     name: "",
   },
-  isEditing: true,
-  fromSdk: false,
+  price: "0",
+  snapshot: undefined,
+  startTime: new Date(),
 };
 
 const ClaimConditionsSchema = z.object({
   phases: z.array(
     ClaimConditionInputSchema.extend({
-      isEditing: z.boolean(),
       fromSdk: z.boolean(),
+      isEditing: z.boolean(),
     }),
   ),
 });
@@ -94,28 +94,28 @@ export const ClaimConditionTypeData: Record<
   ClaimConditionType,
   { name: string; description: string }
 > = Object.freeze({
-  public: {
-    name: "Public",
-    description: "Allow any wallet to claim this drop during this claim phase.",
+  creator: {
+    description:
+      "A phase for the owner of the contract to indefinitely claim with no cost, (only gas).",
+    name: "Only Owner",
+  },
+  custom: {
+    description: "Create a custom claim phase catered to your drop.",
+    name: "Custom",
   },
   overrides: {
-    name: "Public (With Allowlist)",
     description:
       "Allow any wallet to claim this drop during this claim phase with special overrides for some wallet addresses.",
+    name: "Public (With Allowlist)",
+  },
+  public: {
+    description: "Allow any wallet to claim this drop during this claim phase.",
+    name: "Public",
   },
   specific: {
-    name: "Allowlist Only",
     description:
       "Only wallet addresses in the allowlist can claim this drop during this claim phase.",
-  },
-  creator: {
-    name: "Only Owner",
-    description:
-      "A phase for the owner of the contract to indefinitely claim with no cost, (only gas).",
-  },
-  custom: {
-    name: "Custom",
-    description: "Create a custom claim phase catered to your drop.",
+    name: "Allowlist Only",
   },
 });
 
@@ -223,12 +223,12 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
     contract,
     isMultiPhase,
     ...(isErc20
-      ? { type: "erc20", decimals: tokenDecimals.data }
+      ? { decimals: tokenDecimals.data, type: "erc20" }
       : isErc721
         ? { type: "erc721" }
         : {
-            type: "erc1155",
             tokenId: BigInt(tokenId || 0),
+            type: "erc1155",
           }),
   });
 
@@ -236,30 +236,30 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
     return (claimConditionsQuery.data || [])
       .map((phase, idx) => ({
         ...phase,
-        merkleRootHash: (phase.merkleRootHash || "") as string,
-        price: phase.currencyMetadata.displayValue,
-        maxClaimableSupply: phase.maxClaimableSupply?.toString() || "0",
+        currencyAddress: phase.currencyAddress?.toLowerCase() || "0",
         currencyMetadata: {
           ...phase.currencyMetadata,
           value: phase.currencyMetadata.value?.toString() || "0",
         },
-        currencyAddress: phase.currencyAddress?.toLowerCase() || "0",
+        fromSdk: true,
+        isEditing: false,
         maxClaimablePerWallet: phase.maxClaimablePerWallet?.toString() || "0",
-        startTime: new Date(phase.startTime),
+        maxClaimableSupply: phase.maxClaimableSupply?.toString() || "0",
+        merkleRootHash: (phase.merkleRootHash || "") as string,
+        metadata: {
+          ...phase.metadata,
+          name: phase?.metadata?.name || `Phase ${idx + 1}`,
+        },
+        price: phase.currencyMetadata.displayValue,
         snapshot: phase.snapshot?.map(
           ({ address, maxClaimable, price, currencyAddress }) => ({
             address,
+            currencyAddress: currencyAddress || undefined,
             maxClaimable: maxClaimable || "0",
             price: price || undefined,
-            currencyAddress: currencyAddress || undefined,
           }),
         ),
-        metadata: {
-          ...phase.metadata,
-          name: phase?.metadata?.name || `Phase ${idx + 1}`,
-        },
-        isEditing: false,
-        fromSdk: true,
+        startTime: new Date(phase.startTime),
       }))
       .filter(
         (phase) => isMultiPhase || Number(phase.maxClaimableSupply) !== 0,
@@ -276,11 +276,11 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
 
   const form = useForm<FormData>({
     defaultValues: { phases: transformedQueryData },
-    values: { phases: transformedQueryData },
     resetOptions: {
       keepDirty: true,
       keepDirtyValues: true,
     },
+    values: { phases: transformedQueryData },
   });
 
   const { append, remove, fields } = useFieldArray({
@@ -302,8 +302,8 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
       case "specific":
         append({
           ...DEFAULT_PHASE,
-          metadata: { name },
           maxClaimablePerWallet: "0",
+          metadata: { name },
           snapshot: [],
         });
         break;
@@ -311,8 +311,8 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
       case "overrides":
         append({
           ...DEFAULT_PHASE,
-          metadata: { name },
           maxClaimablePerWallet: "1",
+          metadata: { name },
           snapshot: [],
         });
         break;
@@ -320,10 +320,10 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
       case "creator":
         append({
           ...DEFAULT_PHASE,
-          metadata: { name },
           maxClaimablePerWallet: "0",
-          price: "0",
           maxClaimableSupply: "unlimited",
+          metadata: { name },
+          price: "0",
           snapshot: walletAddress
             ? [
                 {
@@ -368,10 +368,10 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
           contract,
           isSinglePhase: !isMultiPhase,
           ...(isErc20
-            ? { type: "erc20", decimals: tokenDecimals.data }
+            ? { decimals: tokenDecimals.data, type: "erc20" }
             : isErc721
               ? { type: "erc721" }
-              : { type: "erc1155", tokenId: BigInt(tokenId || 0) }),
+              : { tokenId: BigInt(tokenId || 0), type: "erc1155" }),
         },
         d.phases,
       );
@@ -381,8 +381,8 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
 
       const newPhases = d.phases.map((phase) => ({
         ...phase,
-        isEditing: false,
         fromSdk: true,
+        isEditing: false,
       }));
 
       form.setValue("phases", newPhases);
@@ -390,7 +390,6 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
       console.error(error);
 
       if (error instanceof ZodError) {
-        // biome-ignore lint/complexity/noForEach: FIXME
         error.errors.forEach((e) => {
           const path = `phases.${e.path.join(".")}`;
           // biome-ignore lint/suspicious/noExplicitAny: FIXME
@@ -406,7 +405,6 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
     let phaseId: string | null = null;
     let latestStartTime = 0;
 
-    // biome-ignore lint/complexity/noForEach: FIXME
     controlledFields.forEach((phase) => {
       if (!phase.startTime || !phase.fromSdk) {
         return;
@@ -416,7 +414,7 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
         typeof phase.startTime === "object"
           ? phase.startTime.getTime()
           : phase.startTime;
-      const currentTime = new Date().getTime();
+      const currentTime = Date.now();
 
       if (phaseStartTime < currentTime && phaseStartTime > latestStartTime) {
         latestStartTime = phaseStartTime;
@@ -465,7 +463,7 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
 
   return (
     <>
-      <Flex onSubmit={handleFormSubmit} direction="column" as="form" gap={10}>
+      <Flex as="form" direction="column" gap={10} onSubmit={handleFormSubmit}>
         <Flex direction="column" gap={6}>
           {/* Show the reason why the form is disabled */}
           {!isAdmin && (
@@ -486,14 +484,14 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
               typeof v === "string"
                 ? {
                     address: v,
-                    maxClaimable: "unlimited",
                     currencyAddress: ZERO_ADDRESS,
+                    maxClaimable: "unlimited",
                     price: "unlimited",
                   }
                 : {
                     ...v,
-                    maxClaimable: v?.maxClaimable?.toString() || "unlimited",
                     currencyAddress: v?.currencyAddress || ZERO_ADDRESS,
+                    maxClaimable: v?.maxClaimable?.toString() || "unlimited",
                     price: v?.price?.toString() || "unlimited",
                   },
             );
@@ -501,42 +499,42 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
             return (
               <Fragment key={`snapshot_${field.id}_${index}`}>
                 <SnapshotViewerSheet
+                  client={contract.client}
                   dropType={dropType}
+                  isDisabled={!canEditForm}
                   isOpen={openSnapshotIndex === index}
                   onClose={() => {
                     setOpenSnapshotIndex(-1);
                   }}
-                  value={snapshotValue}
                   setSnapshot={(snapshot) =>
                     form.setValue(`phases.${index}.snapshot`, snapshot)
                   }
-                  isDisabled={!canEditForm}
-                  client={contract.client}
+                  value={snapshotValue}
                 />
 
                 <ClaimsConditionFormContext.Provider
                   value={{
-                    form,
+                    claimConditionType,
+                    dropType,
                     field,
-                    phaseIndex: index,
+                    form,
                     formDisabled: !canEditForm,
-                    isErc20,
-                    tokenDecimals: tokenDecimals.data,
-                    dropType,
-                    setOpenSnapshotIndex,
+                    isActive,
                     isAdmin,
                     isColumn,
-                    claimConditionType,
+                    isErc20,
                     isMultiPhase,
-                    isActive,
+                    phaseIndex: index,
+                    setOpenSnapshotIndex,
+                    tokenDecimals: tokenDecimals.data,
                   }}
                 >
                   <ClaimConditionsPhase
                     contract={contract}
+                    isPending={sendTx.isPending}
                     onRemove={() => {
                       removePhase(index);
                     }}
-                    isPending={sendTx.isPending}
                   />
                 </ClaimsConditionFormContext.Provider>
               </Fragment>
@@ -544,7 +542,7 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
           })}
 
           {phases?.length === 0 && (
-            <Alert status="warning" borderRadius="md">
+            <Alert borderRadius="md" status="warning">
               <AlertIcon />
               <div className="flex flex-col">
                 <AlertTitle as={Heading} size="label.lg">
@@ -562,23 +560,23 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
           )}
 
           <Flex
-            justifyContent="space-between"
             flexDir={{ base: "column", md: "row" }}
             gap={2}
+            justifyContent="space-between"
           >
             <div className="flex flex-row gap-2">
               <AdminOnly contract={contract}>
                 <Menu>
                   <MenuButton
                     as={Button}
-                    size="sm"
-                    colorScheme="primary"
-                    variant={phases?.length > 0 ? "outline" : "solid"}
                     borderRadius="md"
-                    leftIcon={<PlusIcon className="size-5" />}
+                    colorScheme="primary"
                     isDisabled={
                       sendTx.isPending || (!isMultiPhase && phases?.length > 0)
                     }
+                    leftIcon={<PlusIcon className="size-5" />}
+                    size="sm"
+                    variant={phases?.length > 0 ? "outline" : "solid"}
                   >
                     Add {isMultiPhase ? "Phase" : "Claim Conditions"}
                   </MenuButton>
@@ -621,18 +619,18 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
 
               {controlledFields.some((field) => field.fromSdk) && (
                 <ResetClaimEligibility
-                  isLoggedIn={isLoggedIn}
-                  isErc20={isErc20}
                   contract={contract}
-                  tokenId={tokenId}
+                  isErc20={isErc20}
+                  isLoggedIn={isLoggedIn}
                   isMultiphase={isMultiPhase}
+                  tokenId={tokenId}
                 />
               )}
             </div>
 
             <div className="flex flex-row">
               <AdminOnly contract={contract} fallback={<Box pb={5} />}>
-                <Flex justifyContent="center" alignItems="center" gap={3}>
+                <Flex alignItems="center" gap={3} justifyContent="center">
                   {(hasRemovedPhases || hasAddedPhases) && (
                     <Text color="red.500" fontWeight="bold">
                       You have unsaved changes
@@ -643,12 +641,12 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
                   !isMultiPhase ? (
                     <TransactionButton
                       client={contract.client}
+                      disabled={claimConditionsQuery.isPending}
                       isLoggedIn={isLoggedIn}
-                      txChainID={contract.chain.id}
+                      isPending={sendTx.isPending}
                       transactionCount={1}
-                      disabled={claimConditionsQuery.isPending}
+                      txChainID={contract.chain.id}
                       type="submit"
-                      isPending={sendTx.isPending}
                     >
                       {claimConditionsQuery.isPending
                         ? "Saving Phases"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/phase.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/phase.tsx
index 063ed1d40bd..51d6af09ddb 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/phase.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/phase.tsx
@@ -1,19 +1,19 @@
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card } from "@/components/ui/card";
 import { AdminOnly } from "@3rdweb-sdk/react/components/roles/admin-only";
 import { ChevronDownIcon, ChevronUpIcon, XIcon } from "lucide-react";
 import type { ThirdwebContract } from "thirdweb";
-import { ClaimConditionTypeData, useClaimConditionsFormContext } from ".";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Card } from "@/components/ui/card";
 import { PricePreview } from "../price-preview";
-import { ClaimPriceInput } from "./Inputs/ClaimPriceInput";
+import { ClaimConditionTypeData, useClaimConditionsFormContext } from ".";
+import { CustomFormGroup } from "./common";
 import { ClaimerSelection } from "./Inputs/ClaimerSelection";
+import { ClaimPriceInput } from "./Inputs/ClaimPriceInput";
 import { CreatorInput } from "./Inputs/CreatorInput";
 import { MaxClaimablePerWalletInput } from "./Inputs/MaxClaimablePerWalletInput";
 import { MaxClaimableSupplyInput } from "./Inputs/MaxClaimableSupplyInput";
 import { PhaseNameInput } from "./Inputs/PhaseNameInput";
 import { PhaseStartTimeInput } from "./Inputs/PhaseStartTimeInput";
-import { CustomFormGroup } from "./common";
 
 interface ClaimConditionsPhaseProps {
   contract: ThirdwebContract;
@@ -45,10 +45,10 @@ export const ClaimConditionsPhase: React.FC<ClaimConditionsPhaseProps> = ({
     <Card className="relative flex flex-col gap-8 p-8">
       <div className="absolute top-3 right-3 flex flex-row items-start justify-between gap-1">
         <Button
-          variant="ghost"
+          className="gap-2"
           onClick={toggleEditing}
           size="sm"
-          className="gap-2"
+          variant="ghost"
         >
           {field.isEditing ? "Collapse" : isAdmin ? "Edit" : "See Phase"}
           {field.isEditing ? (
@@ -59,11 +59,11 @@ export const ClaimConditionsPhase: React.FC<ClaimConditionsPhaseProps> = ({
         </Button>
         <AdminOnly contract={contract}>
           <Button
-            variant="ghost"
-            onClick={onRemove}
+            className="gap-2 text-red-300"
             disabled={isPending}
+            onClick={onRemove}
             size="sm"
-            className="gap-2 text-red-300"
+            variant="ghost"
           >
             Remove <XIcon className="size-4" />
           </Button>
@@ -76,7 +76,7 @@ export const ClaimConditionsPhase: React.FC<ClaimConditionsPhaseProps> = ({
             {ClaimConditionTypeData[claimConditionType].name}
           </p>
           {isActive && (
-            <Badge variant="success" className="rounded-lg p-1.5">
+            <Badge className="rounded-lg p-1.5" variant="success">
               Currently active
             </Badge>
           )}
@@ -104,9 +104,9 @@ export const ClaimConditionsPhase: React.FC<ClaimConditionsPhaseProps> = ({
             </p>
           </div>
           <PricePreview
-            price={field.price}
-            currencyAddress={field.currencyAddress}
             contractChainId={contract.chain.id}
+            currencyAddress={field.currencyAddress}
+            price={field.price}
           />
           <div className="flex flex-col">
             <p className="font-bold text-muted-foreground">Limit per wallet</p>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions.tsx
index e9cfd9acbef..dfac6793bb2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions.tsx
@@ -33,12 +33,12 @@ export const ClaimConditions: React.FC<ClaimConditionsProps> = ({
 
       {/* Set Claim Conditions */}
       <ClaimConditionsForm
-        isLoggedIn={isLoggedIn}
-        isErc20={isERC20}
         contract={contract}
-        tokenId={tokenId}
         isColumn={isColumn}
+        isErc20={isERC20}
+        isLoggedIn={isLoggedIn}
         isMultiPhase={isMultiphase}
+        tokenId={tokenId}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/legacy-zod-schema.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/legacy-zod-schema.ts
index 130fc651c89..c1cd6480f2b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/legacy-zod-schema.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/legacy-zod-schema.ts
@@ -1,4 +1,4 @@
-import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, toHex } from "thirdweb";
+import { NATIVE_TOKEN_ADDRESS, toHex, ZERO_ADDRESS } from "thirdweb";
 import { z } from "zod";
 
 const RawDateSchema = /* @__PURE__ */ (() =>
@@ -38,9 +38,9 @@ const BigNumberishSchema = /* @__PURE__ */ (() =>
 const SnapshotEntryInput = /* @__PURE__ */ (() =>
   z.object({
     address: z.string(),
-    maxClaimable: QuantitySchema.default(0), // defaults to 0
-    price: QuantitySchema.optional(), // defaults to unlimited, but can be undefined in old snapshots
-    currencyAddress: z.string().default(ZERO_ADDRESS).optional(), // defaults to AddressZero, but can be undefined for old snapshots
+    currencyAddress: z.string().default(ZERO_ADDRESS).optional(), // defaults to 0
+    maxClaimable: QuantitySchema.default(0), // defaults to unlimited, but can be undefined in old snapshots
+    price: QuantitySchema.optional(), // defaults to AddressZero, but can be undefined for old snapshots
   }))();
 
 const SnapshotInputSchema = /* @__PURE__ */ (() =>
@@ -60,15 +60,15 @@ const SnapshotInputSchema = /* @__PURE__ */ (() =>
 
 export const ClaimConditionInputSchema = /* @__PURE__ */ (() =>
   z.object({
-    startTime: StartDateSchema,
     currencyAddress: z.string().default(NATIVE_TOKEN_ADDRESS),
-    price: AmountSchema.default(0),
-    maxClaimableSupply: QuantitySchema,
     maxClaimablePerWallet: QuantitySchema,
-    waitInSeconds: BigNumberishSchema.default(0),
+    maxClaimableSupply: QuantitySchema,
     merkleRootHash: z.string().default(toHex("", { size: 32 })),
-    snapshot: z.optional(SnapshotInputSchema).nullable(),
     metadata: ClaimConditionMetadataSchema.optional(),
+    price: AmountSchema.default(0),
+    snapshot: z.optional(SnapshotInputSchema).nullable(),
+    startTime: StartDateSchema,
+    waitInSeconds: BigNumberishSchema.default(0),
   }))();
 
 const PartialClaimConditionInputSchema = /* @__PURE__ */ (() =>
@@ -79,9 +79,9 @@ const PartialClaimConditionInputSchema = /* @__PURE__ */ (() =>
  */
 const CurrencySchema = /* @__PURE__ */ (() =>
   z.object({
+    decimals: z.number(),
     name: z.string(),
     symbol: z.string(),
-    decimals: z.number(),
   }))();
 
 /**
@@ -89,25 +89,25 @@ const CurrencySchema = /* @__PURE__ */ (() =>
  */
 const CurrencyValueSchema = /* @__PURE__ */ (() =>
   CurrencySchema.extend({
-    value: BigNumberSchema,
     displayValue: z.string(),
+    value: BigNumberSchema,
   }))();
 
 const ClaimConditionOutputSchema = /* @__PURE__ */ (() =>
   ClaimConditionInputSchema.extend({
     availableSupply: QuantitySchema,
-    currentMintSupply: QuantitySchema,
     currencyMetadata: CurrencyValueSchema.default({
-      value: 0n,
-      displayValue: "0",
-      symbol: "",
       decimals: 18,
+      displayValue: "0",
       name: "",
+      symbol: "",
+      value: 0n,
     }),
+    currentMintSupply: QuantitySchema,
     price: BigNumberSchema,
-    waitInSeconds: BigNumberSchema,
-    startTime: BigNumberSchema.transform((n) => new Date(Number(n) * 1000)),
     snapshot: SnapshotInputSchema.optional().nullable(),
+    startTime: BigNumberSchema.transform((n) => new Date(Number(n) * 1000)),
+    waitInSeconds: BigNumberSchema,
   }))();
 
 export type SnapshotEntry = z.output<typeof SnapshotEntryInput>;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/quantity-input-with-unlimited.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/quantity-input-with-unlimited.tsx
index d540531ab74..e8a31f23d0b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/quantity-input-with-unlimited.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/quantity-input-with-unlimited.tsx
@@ -1,6 +1,6 @@
+import { useEffect, useState } from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import { useEffect, useState } from "react";
 
 interface QuantityInputWithUnlimitedProps {
   value: string;
@@ -47,10 +47,8 @@ export const QuantityInputWithUnlimited: React.FC<
   return (
     <div className="flex flex-row items-center rounded-md border border-border">
       <Input
-        required={isRequired}
+        className="border-none"
         disabled={isDisabled}
-        value={stringValue === "unlimited" ? "Unlimited" : stringValue}
-        onChange={(e) => updateValue(e.currentTarget.value)}
         onBlur={() => {
           if (value === "unlimited") {
             setStringValue("unlimited");
@@ -60,17 +58,19 @@ export const QuantityInputWithUnlimited: React.FC<
             setStringValue("0");
           }
         }}
-        className="border-none"
+        onChange={(e) => updateValue(e.currentTarget.value)}
+        required={isRequired}
+        value={stringValue === "unlimited" ? "Unlimited" : stringValue}
       />
       {hideMaxButton ? null : (
         <Button
-          disabled={isDisabled}
-          variant="ghost"
-          size="sm"
           className="mr-1 text-primary"
+          disabled={isDisabled}
           onClick={() => {
             updateValue("unlimited");
           }}
+          size="sm"
+          variant="ghost"
         >
           Unlimited
         </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/reset-claim-eligibility.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/reset-claim-eligibility.tsx
index 99ec0e80978..f92e0d60c54 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/reset-claim-eligibility.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/reset-claim-eligibility.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { AdminOnly } from "@3rdweb-sdk/react/components/roles/admin-only";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { useTxNotifications } from "hooks/useTxNotifications";
@@ -10,6 +9,7 @@ import * as ERC20Ext from "thirdweb/extensions/erc20";
 import * as ERC721Ext from "thirdweb/extensions/erc721";
 import * as ERC1155Ext from "thirdweb/extensions/erc1155";
 import { useSendAndConfirmTransaction } from "thirdweb/react";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 interface ResetClaimEligibilityProps {
   isErc20: boolean;
@@ -44,8 +44,8 @@ export const ResetClaimEligibility: React.FC<ResetClaimEligibilityProps> = ({
         case tokenId !== undefined: {
           return ERC1155Ext.resetClaimEligibility({
             contract,
-            tokenId: BigInt(tokenId),
             singlePhaseDrop: !isMultiphase,
+            tokenId: BigInt(tokenId),
           });
         }
         // assume erc 721
@@ -56,12 +56,12 @@ export const ResetClaimEligibility: React.FC<ResetClaimEligibilityProps> = ({
     })();
 
     sendTxMutation.mutate(tx, {
-      onSuccess: () => {
-        txNotification.onSuccess();
-      },
       onError: (error) => {
         txNotification.onError(error);
       },
+      onSuccess: () => {
+        txNotification.onSuccess();
+      },
     });
   };
 
@@ -74,12 +74,12 @@ export const ResetClaimEligibility: React.FC<ResetClaimEligibilityProps> = ({
       <TransactionButton
         client={contract.client}
         isLoggedIn={isLoggedIn}
-        transactionCount={1}
-        type="button"
         isPending={sendTxMutation.isPending}
         onClick={handleResetClaimEligibility}
         size="sm"
+        transactionCount={1}
         txChainID={contract.chain.id}
+        type="button"
       >
         {sendTxMutation.isPending ? (
           "Resetting Eligibility"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/snapshot-upload.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/snapshot-upload.tsx
index 49a7b6ab908..f59fd23d6c4 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/snapshot-upload.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/snapshot-upload.tsx
@@ -1,7 +1,13 @@
-import { UnorderedList } from "@/components/ui/List/List";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { useCsvUpload } from "hooks/useCsvUpload";
+import { CircleAlertIcon, DownloadIcon, UploadIcon } from "lucide-react";
+import { useRef } from "react";
+import { useDropzone } from "react-dropzone";
+import type { Column } from "react-table";
+import { type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
 import { Button } from "@/components/ui/button";
 import { InlineCode } from "@/components/ui/inline-code";
+import { UnorderedList } from "@/components/ui/List/List";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Sheet,
   SheetContent,
@@ -10,12 +16,6 @@ import {
 } from "@/components/ui/sheet";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { useCsvUpload } from "hooks/useCsvUpload";
-import { CircleAlertIcon, DownloadIcon, UploadIcon } from "lucide-react";
-import { useRef } from "react";
-import { useDropzone } from "react-dropzone";
-import type { Column } from "react-table";
-import { type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
 import { CsvDataTable } from "../csv-data-table";
 
 interface SnapshotAddressInput {
@@ -38,9 +38,9 @@ const csvParser = (items: SnapshotAddressInput[]): SnapshotAddressInput[] => {
   return items
     .map(({ address, maxClaimable, price, currencyAddress }) => ({
       address: (address || "").trim(),
+      currencyAddress: (currencyAddress || "").trim() || undefined,
       maxClaimable: (maxClaimable || "0").trim().toLowerCase(),
       price: (price || "").trim() || undefined,
-      currencyAddress: (currencyAddress || "").trim() || undefined,
     }))
     .filter(({ address }) => address !== "");
 };
@@ -54,9 +54,9 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
   client,
 }) => {
   const csvUpload = useCsvUpload<SnapshotAddressInput>({
+    client,
     csvParser,
     defaultRawData: value,
-    client,
   });
 
   const dropzone = useDropzone({
@@ -80,9 +80,9 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
     setSnapshot(
       normalizeData.result.map((o) => ({
         address: o.resolvedAddress,
+        currencyAddress: o.currencyAddress,
         maxClaimable: o.maxClaimable,
         price: o.price,
-        currencyAddress: o.currencyAddress,
       })),
     );
     onClose();
@@ -90,7 +90,6 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
 
   const columns = [
     {
-      Header: "Address",
       accessor: ({ address, isValid }) => {
         if (isValid) {
           return address;
@@ -114,9 +113,9 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
           </ToolTipLabel>
         );
       },
+      Header: "Address",
     },
     {
-      Header: "Max claimable",
       accessor: ({ maxClaimable }) => {
         return maxClaimable === "0" || !maxClaimable
           ? "Default"
@@ -124,9 +123,9 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
             ? "Unlimited"
             : maxClaimable;
       },
+      Header: "Max claimable",
     },
     {
-      Header: "Price",
       accessor: ({ price }) => {
         return price === "0"
           ? "Free"
@@ -134,15 +133,16 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
             ? "Default"
             : price;
       },
+      Header: "Price",
     },
     {
-      Header: "Currency Address",
       accessor: ({ currencyAddress }) => {
         return currencyAddress ===
           "0x0000000000000000000000000000000000000000" || !currencyAddress
           ? "Default"
           : currencyAddress;
       },
+      Header: "Currency Address",
     },
   ] as Column<SnapshotAddressInput>[];
 
@@ -151,9 +151,9 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
       {csvUpload.rawData.length > 0 ? (
         <div>
           <CsvDataTable<SnapshotAddressInput>
-            portalRef={paginationPortalRef}
-            data={csvUpload.normalizeQuery.data.result}
             columns={columns}
+            data={csvUpload.normalizeQuery.data.result}
+            portalRef={paginationPortalRef}
           />
         </div>
       ) : (
@@ -216,8 +216,8 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
                     to charge per wallet you specified
                     <br />
                     <a
-                      download
                       className="text-link-foreground hover:text-foreground"
+                      download
                       href="/assets/examples/snapshot-with-overrides.csv"
                     >
                       <DownloadIcon className="inline size-3" /> Example
@@ -232,8 +232,8 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
                     addresses.
                     <br />
                     <a
-                      download
                       className="text-link-foreground hover:text-foreground"
+                      download
                       href="/assets/examples/snapshot.csv"
                     >
                       <DownloadIcon className="inline size-3" /> Example
@@ -247,8 +247,8 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
                     your claim phase.
                     <br />
                     <a
-                      download
                       className="text-link-foreground hover:text-foreground"
+                      download
                       href="/assets/examples/snapshot-with-maxclaimable.csv"
                     >
                       <DownloadIcon className="inline size-3" /> Example
@@ -266,8 +266,8 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
                     </strong>
                     <br />
                     <a
-                      download
                       className="text-link-foreground hover:text-foreground"
+                      download
                       href="/assets/examples/snapshot-with-overrides.csv"
                     >
                       <DownloadIcon className="inline size-3" /> Example
@@ -304,20 +304,20 @@ const SnapshotViewerSheetContent: React.FC<SnapshotUploadProps> = ({
             {csvUpload.normalizeQuery.data?.invalidFound ? (
               <Button
                 className="w-full rounded-md md:w-auto"
-                variant="primary"
                 disabled={isDisabled || csvUpload.rawData.length === 0}
                 onClick={() => {
                   csvUpload.removeInvalid();
                 }}
+                variant="primary"
               >
                 Remove invalid
               </Button>
             ) : (
               <Button
                 className="w-full rounded-md md:w-auto"
-                variant="primary"
-                onClick={onSave}
                 disabled={isDisabled || csvUpload.rawData.length === 0}
+                onClick={onSave}
+                variant="primary"
               >
                 Next
               </Button>
@@ -336,12 +336,12 @@ export function SnapshotViewerSheet(
 ) {
   return (
     <Sheet
-      open={props.isOpen}
       onOpenChange={(open) => {
         if (!open) {
           props.onClose();
         }
       }}
+      open={props.isOpen}
     >
       <SheetContent className="flex w-full flex-col overflow-y-auto sm:min-w-[540px] lg:min-w-[900px]">
         <SheetHeader>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/csv-data-table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/csv-data-table.tsx
index a0605e54cdc..d11f1506011 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/csv-data-table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/csv-data-table.tsx
@@ -1,4 +1,3 @@
-import { TableContainer } from "@/components/ui/table";
 import {
   IconButton,
   Portal,
@@ -17,6 +16,7 @@ import {
   ChevronRightIcon,
 } from "lucide-react";
 import { type Column, usePagination, useTable } from "react-table";
+import { TableContainer } from "@/components/ui/table";
 
 interface CsvDataTableProps<T extends object> {
   data: T[];
@@ -54,8 +54,8 @@ export function CsvDataTable<T extends object>({
       columns,
       data,
       initialState: {
-        pageSize: 50,
         pageIndex: 0,
+        pageSize: 50,
       },
     },
     // old package: this will be removed
@@ -113,15 +113,15 @@ export function CsvDataTable<T extends object>({
           <div className="flex w-full items-center justify-center">
             <div className="flex flex-row gap-1">
               <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="my-auto whitespace-nowrap">
@@ -129,15 +129,15 @@ export function CsvDataTable<T extends object>({
                 <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)}
               />
               <Select
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/redirect-contract-overview.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/redirect-contract-overview.client.tsx
index 221582e459a..7d00eda622f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/redirect-contract-overview.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/redirect-contract-overview.client.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { useEffect, useRef } from "react";
 import type { ThirdwebContract } from "thirdweb";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../_utils/contract-page-path";
 import { LoadingPage } from "./page-skeletons";
@@ -21,9 +21,9 @@ export function RedirectToContractOverview(props: {
     }
     redirected.current = true;
     const landingPage = buildContractPagePath({
-      projectMeta: props.projectMeta,
       chainIdOrSlug: props.contract.chain.id.toString(),
       contractAddress: props.contract.address,
+      projectMeta: props.projectMeta,
     });
 
     router.replace(landingPage);
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_hooks/useContractPageMetadata.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_hooks/useContractPageMetadata.ts
index 788f47e19ba..3450bb390c6 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_hooks/useContractPageMetadata.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_hooks/useContractPageMetadata.ts
@@ -6,13 +6,13 @@ import { getContractPageMetadataSetup } from "../_utils/getContractPageMetadataS
 
 export function useContractPageMetadata(contract: ThirdwebContract) {
   return useQuery({
-    queryKey: ["getContractPageMetadataSetup", contract],
     queryFn: () => {
       return getContractPageMetadataSetup(contract, () =>
         Promise.resolve(false),
       );
     },
-    retry: false,
+    queryKey: ["getContractPageMetadataSetup", contract],
     refetchOnWindowFocus: false,
+    retry: false,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_hooks/useResolveContractABI.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_hooks/useResolveContractABI.ts
index c202aab8590..4b4988712f7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_hooks/useResolveContractABI.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_hooks/useResolveContractABI.ts
@@ -1,13 +1,13 @@
 import { useQuery } from "@tanstack/react-query";
-import { type ThirdwebContract, resolveContractAbi } from "thirdweb/contract";
+import { resolveContractAbi, type ThirdwebContract } from "thirdweb/contract";
 
 export function useResolveContractABI(contract: ThirdwebContract) {
   return useQuery({
-    queryKey: ["resolveContractAbi", contract],
     queryFn: () => {
       return resolveContractAbi(contract);
     },
-    retry: false,
+    queryKey: ["resolveContractAbi", contract],
     refetchOnWindowFocus: false,
+    retry: false,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/ConfigureCustomChain.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/ConfigureCustomChain.tsx
index 1b853d5a778..be1e2247753 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/ConfigureCustomChain.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/ConfigureCustomChain.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
 import { ConfigureNetworks } from "components/configure-networks/ConfigureNetworks";
 import { CheckIcon, CircleAlertIcon, RotateCcwIcon } from "lucide-react";
 import { useState } from "react";
 import { addChainOverrides } from "stores/chainStores";
 import type { ThirdwebClient } from "thirdweb";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
 
 export function ConfigureCustomChain(props: {
   chainSlug: string;
@@ -25,8 +25,8 @@ export function ConfigureCustomChain(props: {
         </Alert>
         <div className="h-6" />
         <Button
-          onClick={() => window.location.reload()}
           className="w-full gap-2"
+          onClick={() => window.location.reload()}
         >
           <RotateCcwIcon className="size-4" />
           Reload Page to Continue
@@ -51,8 +51,8 @@ export function ConfigureCustomChain(props: {
       <div className="h-6" />
       <div className="rounded-lg border border-border">
         <ConfigureNetworks
-          prefillSlug={isSlugNumber ? undefined : chainSlug}
-          prefillChainId={isSlugNumber ? chainSlug : undefined}
+          client={props.client}
+          editChain={undefined}
           onNetworkAdded={(network) => {
             if (
               chainSlug === network.slug ||
@@ -62,8 +62,8 @@ export function ConfigureCustomChain(props: {
               setIsConfigured(true);
             }
           }}
-          editChain={undefined}
-          client={props.client}
+          prefillChainId={isSlugNumber ? chainSlug : undefined}
+          prefillSlug={isSlugNumber ? undefined : chainSlug}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-metadata.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-metadata.tsx
index c1e18c9401c..4cf044ec843 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-metadata.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-metadata.tsx
@@ -27,11 +27,11 @@ export function ContractMetadata({
 }: ContractMetadataProps) {
   return (
     <MetadataHeader
-      data={contractMetadata}
-      chain={chain}
       address={contract.address}
-      externalLinks={externalLinks}
+      chain={chain}
       client={contract.client}
+      data={contractMetadata}
+      externalLinks={externalLinks}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-page-layout.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-page-layout.client.tsx
index 012cdf64db1..2caf76fc87d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-page-layout.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-page-layout.client.tsx
@@ -20,12 +20,12 @@ export function ContractPageLayoutClient(props: {
 }) {
   const metadataQuery = useContractPageMetadata(props.contract);
   const headerMetadataQuery = useQuery({
-    queryKey: ["getContractMetadataHeaderData", props.contract],
     queryFn: async () => {
       return await getContractMetadataHeaderData(props.contract);
     },
-    retry: false,
+    queryKey: ["getContractMetadataHeaderData", props.contract],
     refetchOnWindowFocus: false,
+    retry: false,
   });
 
   if (metadataQuery.isPending) {
@@ -46,9 +46,9 @@ export function ContractPageLayoutClient(props: {
   return (
     <ContractPageLayout
       {...props}
-      sidebarLinks={sidebarLinks}
       dashboardContractMetadata={headerMetadataQuery.data?.contractMetadata}
       externalLinks={headerMetadataQuery.data?.externalLinks}
+      sidebarLinks={sidebarLinks}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-page-layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-page-layout.tsx
index 8604f1b41a2..5894dce6755 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-page-layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/contract-page-layout.tsx
@@ -1,11 +1,11 @@
-import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
-import type { SidebarLink } from "@/components/blocks/Sidebar";
-import { SidebarLayout } from "@/components/blocks/SidebarLayout";
 import type { DashboardContractMetadata } from "@3rdweb-sdk/react/hooks/useDashboardContractMetadata";
 import type { MinimalTeamsAndProjects } from "components/contract-components/contract-deploy-form/add-to-project-card";
 import { DeprecatedAlert } from "components/shared/DeprecatedAlert";
 import type { ThirdwebContract } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
+import type { SidebarLink } from "@/components/blocks/Sidebar";
+import { SidebarLayout } from "@/components/blocks/SidebarLayout";
+import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { ContractMetadata } from "./contract-metadata";
 import { PrimaryDashboardButton } from "./primary-dashboard-button";
@@ -41,22 +41,22 @@ export function ContractPageLayout(props: {
         <div className="container flex flex-col gap-4">
           <div className="flex flex-col justify-between gap-4 md:flex-row">
             <ContractMetadata
-              contract={contract}
               chain={chainMetadata}
+              contract={contract}
               contractMetadata={dashboardContractMetadata}
               externalLinks={externalLinks}
             />
             <PrimaryDashboardButton
-              projectMeta={projectMeta}
-              contractAddress={contract.address}
               chain={contract.chain}
+              client={contract.client}
+              contractAddress={contract.address}
               contractInfo={{
                 chain: chainMetadata,
                 chainSlug: chainMetadata.slug,
                 contractAddress: contract.address,
               }}
+              projectMeta={projectMeta}
               teamsAndProjects={teamsAndProjects}
-              client={contract.client}
             />
           </div>
           <DeprecatedAlert chain={chainMetadata} />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/metadata-header.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/metadata-header.tsx
index 5b2d147a891..af0bc421a1e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/metadata-header.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/metadata-header.tsx
@@ -1,13 +1,13 @@
 "use client";
 
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { Button } from "@/components/ui/button";
 import { ChainIconClient } from "components/icons/ChainIcon";
 import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
 import type { ThirdwebClient } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
 import { MediaRenderer } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
 
 interface ExternalLink {
   name: string;
@@ -57,10 +57,10 @@ export const MetadataHeader: React.FC<MetadataHeaderProps> = ({
       {data?.image && (
         <div className="size-16 shrink-0 overflow-hidden rounded-lg border border-border bg-muted md:size-20">
           <MediaRenderer
-            src={data?.image}
-            client={client}
             alt={""}
             className="h-full w-full"
+            client={client}
+            src={data?.image}
             style={{
               objectFit: "contain",
             }}
@@ -83,13 +83,13 @@ export const MetadataHeader: React.FC<MetadataHeaderProps> = ({
             )}
 
             <Link
-              href={`/${chain.slug}`}
               className="flex w-fit shrink-0 items-center gap-2 rounded-3xl border border-border bg-card px-2.5 py-1.5 hover:bg-accent"
+              href={`/${chain.slug}`}
             >
               <ChainIconClient
-                src={chain.icon?.url}
-                client={client}
                 className="size-4"
+                client={client}
+                src={chain.icon?.url}
               />
               {cleanedChainName && (
                 <span className="text-xs">{cleanedChainName}</span>
@@ -112,21 +112,21 @@ export const MetadataHeader: React.FC<MetadataHeaderProps> = ({
         <div className="flex flex-row flex-wrap items-center gap-2">
           <CopyAddressButton
             address={address}
-            copyIconPosition="left"
             className="bg-card px-2.5 py-1.5 text-xs"
+            copyIconPosition="left"
             variant="outline"
           />
 
           {validBlockExplorers?.map((validBlockExplorer) => (
             <BadgeLink
+              href={`${validBlockExplorer.url.endsWith("/") ? validBlockExplorer.url : `${validBlockExplorer.url}/`}address/${address}`}
               key={validBlockExplorer.url}
               name={validBlockExplorer.name}
-              href={`${validBlockExplorer.url.endsWith("/") ? validBlockExplorer.url : `${validBlockExplorer.url}/`}address/${address}`}
             />
           ))}
 
           {validExternalLinks?.map((e) => (
-            <BadgeLink href={e.url} name={e.name} key={e.url} />
+            <BadgeLink href={e.url} key={e.url} name={e.name} />
           ))}
         </div>
       </div>
@@ -134,17 +134,14 @@ export const MetadataHeader: React.FC<MetadataHeaderProps> = ({
   );
 };
 
-function BadgeLink(props: {
-  name: string;
-  href: string;
-}) {
+function BadgeLink(props: { name: string; href: string }) {
   return (
     <Button
-      variant="outline"
       asChild
       className="!h-auto gap-2 rounded-lg bg-card px-3 py-1.5 text-xs capitalize"
+      variant="outline"
     >
-      <Link href={props.href} target="_blank" rel="noopener noreferrer">
+      <Link href={props.href} rel="noopener noreferrer" target="_blank">
         {props.name}
         <ExternalLinkIcon className="size-3 text-muted-foreground" />
       </Link>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/primary-dashboard-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/primary-dashboard-button.tsx
index 2a4e93c7c09..f3e90b9b6c9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/primary-dashboard-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_layout/primary-dashboard-button.tsx
@@ -1,30 +1,33 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
 import type { EVMContractInfo } from "@3rdweb-sdk/react";
 import {
   AddToProjectSelector,
   type MinimalTeamsAndProjects,
 } from "components/contract-components/contract-deploy-form/add-to-project-card";
-
-import { CodeIcon, PlusIcon } from "lucide-react";
-import { CircleAlertIcon, ExternalLinkIcon } from "lucide-react";
+import {
+  CircleAlertIcon,
+  CodeIcon,
+  ExternalLinkIcon,
+  PlusIcon,
+} from "lucide-react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
 import type { Chain, ThirdwebClient } from "thirdweb";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { useAddContractToProject } from "../../../../../team/[team_slug]/[project_slug]/(sidebar)/hooks/project-contracts";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../_utils/contract-page-path";
@@ -51,9 +54,9 @@ export const PrimaryDashboardButton: React.FC<AddToDashboardCardProps> = ({
   const pathname = usePathname();
 
   const codePagePath = buildContractPagePath({
-    projectMeta,
     chainIdOrSlug: contractInfo.chainSlug,
     contractAddress: contractAddress,
+    projectMeta,
     subpath: "/code",
   });
 
@@ -65,7 +68,7 @@ export const PrimaryDashboardButton: React.FC<AddToDashboardCardProps> = ({
 
     if (!pathname?.endsWith("/code")) {
       return (
-        <Button variant="outline" asChild className="gap-2">
+        <Button asChild className="gap-2" variant="outline">
           <Link href={codePagePath}>
             <CodeIcon className="size-4" />
             Code Snippets
@@ -80,12 +83,12 @@ export const PrimaryDashboardButton: React.FC<AddToDashboardCardProps> = ({
   // if user is on a project page
   if (projectMeta) {
     return (
-      <Button variant="default" asChild>
+      <Button asChild variant="default">
         <Link
+          className="gap-2"
           href={`/${contractInfo.chainSlug}/${contractAddress}`}
-          target="_blank"
           rel="noopener noreferrer"
-          className="gap-2"
+          target="_blank"
         >
           View Asset Page <ExternalLinkIcon className="size-3.5" />
         </Link>
@@ -95,10 +98,10 @@ export const PrimaryDashboardButton: React.FC<AddToDashboardCardProps> = ({
 
   return (
     <AddToProjectButton
-      contractAddress={contractAddress}
-      teamsAndProjects={teamsAndProjects}
       chainId={chain.id.toString()}
       client={client}
+      contractAddress={contractAddress}
+      teamsAndProjects={teamsAndProjects}
     />
   );
 };
@@ -126,10 +129,10 @@ function AddToProjectButton(props: {
           </DialogDescription>
         </DialogHeader>
         <AddToProjectModalContent
-          teamsAndProjects={props.teamsAndProjects}
           chainId={props.chainId}
-          contractAddress={props.contractAddress}
           client={props.client}
+          contractAddress={props.contractAddress}
+          teamsAndProjects={props.teamsAndProjects}
         />
       </DialogContent>
     </Dialog>
@@ -145,31 +148,25 @@ function AddToProjectModalContent(props: {
   const addContractToProject = useAddContractToProject();
 
   const [importSelection, setImportSelection] = useState({
-    team: props.teamsAndProjects[0]?.team,
     project: props.teamsAndProjects[0]?.projects[0],
+    team: props.teamsAndProjects[0]?.team,
   });
 
   const selectedTeam = props.teamsAndProjects.find(
     (t) => t.team.id === importSelection.team?.id,
   );
 
-  function handleImport(params: {
-    teamId: string;
-    projectId: string;
-  }) {
+  function handleImport(params: { teamId: string; projectId: string }) {
     addContractToProject.mutate(
       {
-        contractAddress: props.contractAddress,
-        teamId: params.teamId,
-        projectId: params.projectId,
         chainId: props.chainId,
-        deploymentType: undefined,
+        contractAddress: props.contractAddress,
         contractType: undefined,
+        deploymentType: undefined,
+        projectId: params.projectId,
+        teamId: params.teamId,
       },
       {
-        onSuccess: () => {
-          toast.success("Contract added to the project successfully");
-        },
         onError: (err) => {
           if (err.message.includes("PROJECT_CONTRACT_ALREADY_EXISTS")) {
             toast.error("Contract is already added to the project");
@@ -177,6 +174,9 @@ function AddToProjectModalContent(props: {
             toast.error("Failed to import contract");
           }
         },
+        onSuccess: () => {
+          toast.success("Contract added to the project successfully");
+        },
       },
     );
   }
@@ -187,10 +187,10 @@ function AddToProjectModalContent(props: {
     <div>
       <div className="flex flex-col gap-4 border-border border-t px-6 py-6">
         <AddToProjectSelector
-          selection={importSelection}
+          client={props.client}
           onSelectionChange={setImportSelection}
+          selection={importSelection}
           teamsAndProjects={props.teamsAndProjects}
-          client={props.client}
         />
 
         {/* No projects alert */}
@@ -200,8 +200,8 @@ function AddToProjectModalContent(props: {
             <AlertTitle> Selected team has no projects </AlertTitle>
             <AlertDescription>
               <UnderlineLink
-                href={`/team/${selectedTeam.team.slug}`}
                 className="inline-flex items-center gap-2"
+                href={`/team/${selectedTeam.team.slug}`}
                 target="_blank"
               >
                 Create Project <ExternalLinkIcon className="size-3.5" />
@@ -212,16 +212,16 @@ function AddToProjectModalContent(props: {
       </div>
       <div className="mt-3 flex justify-end border-border border-t bg-card p-6">
         <Button
-          disabled={!isImportEnabled}
           className="gap-2"
+          disabled={!isImportEnabled}
           onClick={() => {
             if (!importSelection.team || !importSelection.project) {
               return;
             }
 
             handleImport({
-              teamId: importSelection.team.id,
               projectId: importSelection.project.id,
+              teamId: importSelection.team.id,
             });
           }}
         >
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/detectedFeatures/supportedERCs.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/detectedFeatures/supportedERCs.ts
index af6495fa766..0481f63c8eb 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/detectedFeatures/supportedERCs.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/detectedFeatures/supportedERCs.ts
@@ -7,8 +7,8 @@ export function supportedERCs(functionSelectors: string[]) {
   const isERC1155 = isGetNFTSupported_ERC1155(functionSelectors);
   const isERC20 = isERC20_ERC20(functionSelectors);
   return {
+    isERC20,
     isERC721,
     isERC1155,
-    isERC20,
   };
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractFromParams.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractFromParams.ts
index ea9b967c14d..d8e96af2d75 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractFromParams.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractFromParams.ts
@@ -1,7 +1,7 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { mapV4ChainToV5Chain } from "contexts/map-chains";
 import { getAddress, getContract, isAddress } from "thirdweb";
 import { localhost } from "thirdweb/chains";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { fetchChainWithLocalOverrides } from "../../../../../../../utils/fetchChainWithLocalOverrides";
 import { getUserThirdwebClient } from "../../../../../api/lib/getAuthToken";
 
@@ -39,9 +39,9 @@ export async function getContractPageParamsInfo(params: {
 
   return {
     chainMetadata,
-    serverContract,
     clientContract,
     isLocalhostChain: chainMetadata.chainId === localhost.id,
+    serverContract,
   };
 }
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageMetadataSetup.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageMetadataSetup.ts
index be8de76a811..f6c64793b0e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageMetadataSetup.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageMetadataSetup.ts
@@ -73,25 +73,25 @@ export async function getContractPageMetadataSetup(
     contractTypeResult.status === "fulfilled" ? contractTypeResult.value : null;
 
   return {
-    supportedERCs: supportedERCs(functionSelectors),
+    embedType: getEmbedTypeToShow(functionSelectors),
+    functionSelectors,
+    isAccount: isAccountContract(functionSelectors),
+    isAccountFactory: isAccountFactoryContract(functionSelectors),
+    isAccountPermissionsSupported:
+      isAccountPermissionsSupported(functionSelectors),
     isDirectListingSupported: isDirectListingSupported(functionSelectors),
     isEnglishAuctionSupported: isEnglishAuctionSupported(functionSelectors),
-    isPermissionsSupported: isPermissionsSupported(functionSelectors),
+    isERC20ClaimConditionsSupported:
+      isERC20ClaimConditionsSupported(functionSelectors),
+    isERC721ClaimConditionsSupported:
+      isERC721ClaimConditionsSupported(functionSelectors),
+    isInsightSupported: isInsightSupported,
+    isModularCore: isModularCoreContract(functionSelectors),
     isPermissionsEnumerableSupported:
       isPermissionsEnumerableSupported(functionSelectors),
-    isModularCore: isModularCoreContract(functionSelectors),
-    embedType: getEmbedTypeToShow(functionSelectors),
-    isInsightSupported: isInsightSupported,
+    isPermissionsSupported: isPermissionsSupported(functionSelectors),
     isSplitSupported: contractType === "Split",
     isVoteContract: contractType === "VoteERC20",
-    isERC721ClaimConditionsSupported:
-      isERC721ClaimConditionsSupported(functionSelectors),
-    isERC20ClaimConditionsSupported:
-      isERC20ClaimConditionsSupported(functionSelectors),
-    isAccountFactory: isAccountFactoryContract(functionSelectors),
-    isAccount: isAccountContract(functionSelectors),
-    isAccountPermissionsSupported:
-      isAccountPermissionsSupported(functionSelectors),
-    functionSelectors,
+    supportedERCs: supportedERCs(functionSelectors),
   };
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageSidebarLinks.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageSidebarLinks.ts
index 31c7647b7c5..c6e714628d9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageSidebarLinks.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageSidebarLinks.ts
@@ -14,131 +14,131 @@ export function getContractPageSidebarLinks(data: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const layoutPrefix = buildContractPagePath({
-    projectMeta: data.projectMeta,
     chainIdOrSlug: data.chainSlug,
     contractAddress: data.contractAddress,
+    projectMeta: data.projectMeta,
   });
 
   const generalLinks: SidebarBaseLinkWithHide[] = [
     {
-      label: "Overview",
-      href: layoutPrefix,
       exactMatch: true,
+      href: layoutPrefix,
+      label: "Overview",
     },
     {
-      label: "Modules",
-      href: `${layoutPrefix}/modules`,
-      hide: !data.metadata.isModularCore,
       exactMatch: true,
+      hide: !data.metadata.isModularCore,
+      href: `${layoutPrefix}/modules`,
+      label: "Modules",
     },
     {
-      label: "Cross Chain (Beta)",
-      href: `${layoutPrefix}/cross-chain`,
       exactMatch: true,
+      href: `${layoutPrefix}/cross-chain`,
+      label: "Cross Chain (Beta)",
     },
     {
-      label: "Code Snippets",
-      href: `${layoutPrefix}/code`,
       exactMatch: true,
+      href: `${layoutPrefix}/code`,
+      label: "Code Snippets",
     },
     {
-      label: "Explorer",
-      href: `${layoutPrefix}/explorer`,
       exactMatch: true,
+      href: `${layoutPrefix}/explorer`,
+      label: "Explorer",
     },
     {
-      label: "Events",
-      href: `${layoutPrefix}/events`,
       exactMatch: true,
+      href: `${layoutPrefix}/events`,
+      label: "Events",
     },
     {
-      label: "Analytics",
-      href: `${layoutPrefix}/analytics`,
-      hide: !data.metadata.isInsightSupported,
       exactMatch: true,
+      hide: !data.metadata.isInsightSupported,
+      href: `${layoutPrefix}/analytics`,
+      label: "Analytics",
     },
     {
-      label: "Settings",
-      href: `${layoutPrefix}/settings`,
       exactMatch: true,
+      href: `${layoutPrefix}/settings`,
+      label: "Settings",
     },
     {
-      label: "Sources",
-      href: `${layoutPrefix}/sources`,
       exactMatch: true,
+      href: `${layoutPrefix}/sources`,
+      label: "Sources",
     },
   ];
 
   const extensionsLinks: SidebarBaseLinkWithHide[] = [
     {
-      label: "NFTs",
-      href: `${layoutPrefix}/nfts`,
       hide:
         !data.metadata.supportedERCs.isERC721 &&
         !data.metadata.supportedERCs.isERC1155,
+      href: `${layoutPrefix}/nfts`,
+      label: "NFTs",
     },
     {
-      label: "Tokens",
-      href: `${layoutPrefix}/tokens`,
-      hide: !data.metadata.supportedERCs.isERC20,
       exactMatch: true,
+      hide: !data.metadata.supportedERCs.isERC20,
+      href: `${layoutPrefix}/tokens`,
+      label: "Tokens",
     },
     {
-      label: "Direct Listings",
-      href: `${layoutPrefix}/direct-listings`,
-      hide: !data.metadata.isDirectListingSupported,
       exactMatch: true,
+      hide: !data.metadata.isDirectListingSupported,
+      href: `${layoutPrefix}/direct-listings`,
+      label: "Direct Listings",
     },
     {
-      label: "English Auctions",
-      href: `${layoutPrefix}/english-auctions`,
-      hide: !data.metadata.isEnglishAuctionSupported,
       exactMatch: true,
+      hide: !data.metadata.isEnglishAuctionSupported,
+      href: `${layoutPrefix}/english-auctions`,
+      label: "English Auctions",
     },
     {
-      label: "Balances",
-      href: `${layoutPrefix}/split`,
-      hide: !data.metadata.isSplitSupported,
       exactMatch: true,
+      hide: !data.metadata.isSplitSupported,
+      href: `${layoutPrefix}/split`,
+      label: "Balances",
     },
     {
-      label: "Proposals",
-      href: `${layoutPrefix}/proposals`,
-      hide: !data.metadata.isVoteContract,
       exactMatch: true,
+      hide: !data.metadata.isVoteContract,
+      href: `${layoutPrefix}/proposals`,
+      label: "Proposals",
     },
     {
-      label: "Claim Conditions",
-      href: `${layoutPrefix}/claim-conditions`,
+      exactMatch: true,
       hide: !(
         data.metadata.isERC721ClaimConditionsSupported ||
         data.metadata.isERC20ClaimConditionsSupported
       ),
-      exactMatch: true,
+      href: `${layoutPrefix}/claim-conditions`,
+      label: "Claim Conditions",
     },
     {
-      label: "Accounts",
-      href: `${layoutPrefix}/accounts`,
-      hide: !data.metadata.isAccountFactory,
       exactMatch: true,
+      hide: !data.metadata.isAccountFactory,
+      href: `${layoutPrefix}/accounts`,
+      label: "Accounts",
     },
     {
-      label: "Balance",
-      href: `${layoutPrefix}/account`,
-      hide: !data.metadata.isAccount,
       exactMatch: true,
+      hide: !data.metadata.isAccount,
+      href: `${layoutPrefix}/account`,
+      label: "Balance",
     },
     {
-      label: "Account Permissions",
-      href: `${layoutPrefix}/account-permissions`,
-      hide: !data.metadata.isAccountPermissionsSupported,
       exactMatch: true,
+      hide: !data.metadata.isAccountPermissionsSupported,
+      href: `${layoutPrefix}/account-permissions`,
+      label: "Account Permissions",
     },
     {
-      label: "Permissions",
-      href: `${layoutPrefix}/permissions`,
       exactMatch: true,
       hide: !data.metadata.isPermissionsSupported,
+      href: `${layoutPrefix}/permissions`,
+      label: "Permissions",
     },
   ];
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/isAnalyticsSupportedForChain.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/isAnalyticsSupportedForChain.ts
index 5f155643510..82dfdf74e86 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/isAnalyticsSupportedForChain.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/isAnalyticsSupportedForChain.ts
@@ -1,5 +1,5 @@
-import { INSIGHT_SERVICE_API_KEY } from "@/constants/server-envs";
 import { getVercelEnv } from "lib/vercel-utils";
+import { INSIGHT_SERVICE_API_KEY } from "@/constants/server-envs";
 
 const thirdwebDomain =
   getVercelEnv() !== "production" ? "thirdweb-dev" : "thirdweb";
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx
index 2754326467a..4016e9514f9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx
@@ -1,11 +1,11 @@
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { Badge } from "@/components/ui/badge";
 import { Flex, SimpleGrid, useBreakpointValue } from "@chakra-ui/react";
 import { formatDistance } from "date-fns";
 import { useAllChainsData } from "hooks/chains/allChains";
 import type { ThirdwebClient } from "thirdweb";
 import { useActiveAccount } from "thirdweb/react";
 import { Card, Heading, Text } from "tw-components";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Badge } from "@/components/ui/badge";
 
 export type AccountSignerType = {
   signer: string;
@@ -37,19 +37,19 @@ export const AccountSigner: React.FC<AccountSignerProps> = ({
     endTimestamp,
   } = item;
   return (
-    <Card position="relative" p={8}>
+    <Card p={8} position="relative">
       <Flex direction="column" gap={8}>
         <Flex flexDir="column" gap={2} mt={{ base: 4, md: 0 }}>
           <Flex
-            gap={3}
             alignItems="center"
             flexDir={{ base: "column", lg: "row" }}
+            gap={3}
           >
             <Heading size="label.lg">
               <WalletAddress
-                shortenAddress={isMobile}
                 address={signer}
                 client={client}
+                shortenAddress={isMobile}
               />
             </Heading>
             <div className="flex flex-row gap-2">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signers.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signers.tsx
index f11481b3e24..157a54b214c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signers.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signers.tsx
@@ -14,12 +14,12 @@ export const AccountSigners: React.FC<AccountSignersProps> = ({ contract }) => {
   const transformedAdmins: AccountSignerType[] = (allAdmins || []).map(
     (admin) => {
       return {
-        isAdmin: true,
-        signer: admin,
+        approvedTargets: [],
         // default here has to be in seconds not milliseconds (because contract stores in seconds...)
         endTimestamp: BigInt(new Date(0).getTime() / 1000),
+        isAdmin: true,
         nativeTokenLimitPerTransaction: 0n,
-        approvedTargets: [],
+        signer: admin,
       };
     },
   );
@@ -38,10 +38,10 @@ export const AccountSigners: React.FC<AccountSignersProps> = ({ contract }) => {
       <div className="flex flex-col gap-6">
         {data.map((item) => (
           <AccountSigner
-            key={item.signer}
-            item={item}
             client={contract.client}
             contractChainId={contract.chain.id}
+            item={item}
+            key={item.signer}
           />
         ))}
       </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/page.tsx
index 6b23d6c1738..a237a065bfd 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/page.tsx
@@ -7,8 +7,8 @@ export default async function Page(props: {
   const params = await props.params;
   return (
     <SharedContractAccountPermissionsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
+      contractAddress={params.contractAddress}
       projectMeta={undefined}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/shared-account-permissions-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/shared-account-permissions-page.tsx
index ded93ffeb4a..18f1599d82b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/shared-account-permissions-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/shared-account-permissions-page.tsx
@@ -12,8 +12,8 @@ export async function SharedContractAccountPermissionsPage(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/AccountPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/AccountPage.client.tsx
index 195c65e9635..5b8d0fe539b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/AccountPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/AccountPage.client.tsx
@@ -35,10 +35,10 @@ export function AccountPageClient(props: {
 
   return (
     <AccountPage
-      contract={props.contract}
       chainMetadata={props.chainMetadata}
-      isLoggedIn={props.isLoggedIn}
+      contract={props.contract}
       isInsightSupported={metadataQuery.data.isInsightSupported}
+      isLoggedIn={props.isLoggedIn}
       projectMeta={props.projectMeta}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/AccountPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/AccountPage.tsx
index ded8db2b720..ea0d9062e1e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/AccountPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/AccountPage.tsx
@@ -37,11 +37,11 @@ export const AccountPage: React.FC<AccountPageProps> = ({
 
       {chainMetadata && (
         <DepositNative
-          isLoggedIn={isLoggedIn}
           address={contract.address}
-          symbol={symbol}
           chain={chainMetadata}
           client={contract.client}
+          isLoggedIn={isLoggedIn}
+          symbol={symbol}
         />
       )}
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/account-balance.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/account-balance.tsx
index dd8fe24f3d5..deb35eb7a41 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/account-balance.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/account-balance.tsx
@@ -20,7 +20,7 @@ export const AccountBalance: React.FC<AccountBalanceProps> = ({ contract }) => {
   const balanceQuery = useSplitBalances(contract);
 
   return (
-    <SimpleGrid spacing={{ base: 3, md: 6 }} columns={{ base: 2, md: 4 }}>
+    <SimpleGrid columns={{ base: 2, md: 4 }} spacing={{ base: 3, md: 6 }}>
       <Card as={Stat}>
         <StatLabel mb={{ base: 1, md: 0 }}>{balance?.symbol}</StatLabel>
         <StatNumber>{balance?.displayValue}</StatNumber>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/deposit-native.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/deposit-native.tsx
index 4b1ef181ba1..5fabfb483c1 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/deposit-native.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/deposit-native.tsx
@@ -5,7 +5,7 @@ import { TransactionButton } from "components/buttons/TransactionButton";
 import { useV5DashboardChain } from "lib/v5-adapter";
 import { type ChangeEvent, useState } from "react";
 import type { StoredChain } from "stores/chainStores";
-import { type ThirdwebClient, prepareTransaction, toWei } from "thirdweb";
+import { prepareTransaction, type ThirdwebClient, toWei } from "thirdweb";
 import { useSendAndConfirmTransaction } from "thirdweb/react";
 import { Card } from "tw-components";
 
@@ -33,38 +33,36 @@ export const DepositNative: React.FC<DepositNativeProps> = ({
 
   return (
     <Card
+      maxW={{ base: "100%", md: "49%" }}
       style={{
+        alignItems: "center",
         display: "flex",
         flexDirection: "row",
         gap: 16,
-        alignItems: "center",
       }}
-      maxW={{ base: "100%", md: "49%" }}
     >
       <Input
-        placeholder={`Amount in ${symbol}. ex: 0.001`}
         onChange={handleChange}
+        placeholder={`Amount in ${symbol}. ex: 0.001`}
         type="number"
         value={amount}
       />
       <TransactionButton
         client={client}
-        isLoggedIn={isLoggedIn}
-        txChainID={v5Chain.id}
-        transactionCount={1}
-        isPending={isPending}
         disabled={
           amount.length === 0 || Number.parseFloat(amount) <= 0 || !address
         }
+        isLoggedIn={isLoggedIn}
+        isPending={isPending}
         onClick={() => {
           if (!address) {
             throw new Error("Invalid address");
           }
 
           const transaction = prepareTransaction({
-            to: address,
             chain: v5Chain,
             client,
+            to: address,
             value: toWei(amount),
           });
           transfer(transaction, {
@@ -74,6 +72,8 @@ export const DepositNative: React.FC<DepositNativeProps> = ({
           });
         }}
         style={{ minWidth: 160 }}
+        transactionCount={1}
+        txChainID={v5Chain.id}
       >
         Deposit
       </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/nfts-owned.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/nfts-owned.tsx
index 4689ae80833..46e1c6ced42 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/nfts-owned.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/nfts-owned.tsx
@@ -18,8 +18,8 @@ export const NftsOwned: React.FC<NftsOwnedProps> = ({
 }) => {
   const { data: walletNFTs, isPending: isWalletNFTsLoading } = useWalletNFTs({
     chainId: contract.chain.id,
-    walletAddress: contract.address,
     isInsightSupported: isInsightSupported,
+    walletAddress: contract.address,
   });
 
   const nfts = walletNFTs?.result || [];
@@ -27,21 +27,21 @@ export const NftsOwned: React.FC<NftsOwnedProps> = ({
 
   return nfts.length !== 0 ? (
     <NFTCards
+      allNfts
       client={contract.client}
-      projectMeta={projectMeta}
+      isPending={isWalletNFTsLoading}
       nfts={nfts.map((nft) => ({
+        chainId: contract.chain.id,
+        contractAddress: nft.contractAddress,
         id: BigInt(nft.id),
-        supply: BigInt(nft.supply),
+        metadata: nft.metadata,
         owner: nft.owner,
+        supply: BigInt(nft.supply),
+        tokenAddress: nft.tokenAddress,
         tokenURI: nft.tokenURI,
-        metadata: nft.metadata,
         type: nft.type,
-        contractAddress: nft.contractAddress,
-        chainId: contract.chain.id,
-        tokenAddress: nft.tokenAddress,
       }))}
-      allNfts
-      isPending={isWalletNFTsLoading}
+      projectMeta={projectMeta}
     />
   ) : isWalletNFTsLoading ? null : error ? (
     <p>Failed to fetch NFTs for this account: {error}</p>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/page.tsx
index 23fe1c9b997..2870a426fec 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/page.tsx
@@ -8,10 +8,10 @@ export default async function Page(props: {
   const [params, account] = await Promise.all([props.params, getRawAccount()]);
   return (
     <SharedContractAccountPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/shared-account-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/shared-account-page.tsx
index cd140b2d726..2d030691375 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/shared-account-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/shared-account-page.tsx
@@ -13,8 +13,8 @@ export async function SharedContractAccountPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -25,8 +25,8 @@ export async function SharedContractAccountPage(props: {
   if (info.isLocalhostChain) {
     return (
       <AccountPageClient
-        contract={info.clientContract}
         chainMetadata={info.chainMetadata}
+        contract={info.clientContract}
         isLoggedIn={props.isLoggedIn}
         projectMeta={props.projectMeta}
       />
@@ -47,10 +47,10 @@ export async function SharedContractAccountPage(props: {
 
   return (
     <AccountPage
-      contract={info.clientContract}
       chainMetadata={info.chainMetadata}
-      isLoggedIn={props.isLoggedIn}
+      contract={info.clientContract}
       isInsightSupported={isInsightSupported}
+      isLoggedIn={props.isLoggedIn}
       projectMeta={props.projectMeta}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/AccountsPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/AccountsPage.tsx
index 37c8e0920ed..3b0c66bd87f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/AccountsPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/AccountsPage.tsx
@@ -22,10 +22,10 @@ export const AccountsPage: React.FC<AccountsPageProps> = ({
   return (
     <Flex direction="column" gap={6}>
       <Flex
-        direction={{ base: "column", md: "row" }}
-        justify="space-between"
         align={{ base: "left", md: "center" }}
+        direction={{ base: "column", md: "row" }}
         gap={4}
+        justify="space-between"
       >
         <Heading size="title.sm">Accounts</Heading>
         <ButtonGroup
@@ -34,9 +34,9 @@ export const AccountsPage: React.FC<AccountsPageProps> = ({
           w="inherit"
         >
           <LinkButton
-            variant="solid"
             href="https://portal.thirdweb.com/wallets/smart-wallet/get-started#3-connect-smart-wallets-in-your-application"
             isExternal
+            variant="solid"
           >
             View Documentation
           </LinkButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-count.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-count.tsx
index d82213e7dca..ad67c38ac80 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-count.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-count.tsx
@@ -14,9 +14,9 @@ export const AccountsCount: React.FC<AccountsCountProps> = ({ contract }) => {
   return (
     <div className="grid grid-cols-1 gap-3 md:grid-cols-3 md:gap-6">
       <StatCard
+        isPending={totalAccountsQuery.isPending}
         label="Total Accounts"
         value={totalAccountsQuery.data?.toString() || "0"}
-        isPending={totalAccountsQuery.isPending}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-table.tsx
index dc87b3ce7cb..f9d12000baf 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-table.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { Flex, IconButton, Select, Skeleton } from "@chakra-ui/react";
 import { createColumnHelper } from "@tanstack/react-table";
 import { TWTable } from "components/shared/TWTable";
@@ -16,6 +15,7 @@ import type { ThirdwebContract } from "thirdweb";
 import { getAccounts, totalAccounts } from "thirdweb/extensions/erc4337";
 import { useReadContract } from "thirdweb/react";
 import { Legacy_CopyButton, Text } from "tw-components";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../../_utils/contract-page-path";
 
@@ -23,17 +23,17 @@ const columnHelper = createColumnHelper<{ account: string }>();
 
 const columns = [
   columnHelper.accessor("account", {
-    header: "Account",
     cell: (info) => (
-      <Flex gap={2} align="center">
+      <Flex align="center" gap={2}>
         <Text fontFamily="mono">{info.getValue()}</Text>
         <Legacy_CopyButton
-          value={info.getValue()}
           aria-label="Copy account address"
           colorScheme="primary"
+          value={info.getValue()}
         />
       </Flex>
     ),
+    header: "Account",
   }),
 ];
 
@@ -75,9 +75,9 @@ export const AccountsTable: React.FC<AccountsTableProps> = ({
 
   const accountsQuery = useReadContract(getAccounts, {
     contract,
-    start: BigInt(currentPage * pageSize),
     // of we have the total accounts, limit the end to the total accounts
     end: BigInt(maxQueryEndValue),
+    start: BigInt(currentPage * pageSize),
   });
 
   const totalPages = Math.ceil(totalAccountsNum / pageSize);
@@ -91,34 +91,34 @@ export const AccountsTable: React.FC<AccountsTableProps> = ({
     <Flex direction="column" gap={4}>
       {/* TODO add a skeleton when loading*/}
       <TWTable
-        title="account"
         columns={columns}
         data={data.map((account) => ({ account }))}
-        isPending={accountsQuery.isPending}
         isFetched={accountsQuery.isFetched}
+        isPending={accountsQuery.isPending}
         onRowClick={(row) => {
           const accountContractPagePath = buildContractPagePath({
-            projectMeta,
             chainIdOrSlug: chainSlug.toString(),
             contractAddress: row.account,
+            projectMeta,
           });
 
           router.push(accountContractPagePath);
         }}
+        title="account"
       />
       {/* pagination */}
       <div className="flex w-full items-center justify-center">
-        <Flex gap={2} direction="row" align="center">
+        <Flex align="center" direction="row" gap={2}>
           <IconButton
-            isDisabled={totalAccountsQuery.isPending}
             aria-label="first page"
             icon={<ChevronFirstIcon className="size-4" />}
+            isDisabled={totalAccountsQuery.isPending}
             onClick={() => setCurrentPage(0)}
           />
           <IconButton
-            isDisabled={totalAccountsQuery.isPending || !canPreviousPage}
             aria-label="previous page"
             icon={<ChevronLeftIcon className="size-4" />}
+            isDisabled={totalAccountsQuery.isPending || !canPreviousPage}
             onClick={() => {
               setCurrentPage((curr) => {
                 if (curr > 0) {
@@ -139,9 +139,9 @@ export const AccountsTable: React.FC<AccountsTableProps> = ({
             </Skeleton>
           </Text>
           <IconButton
-            isDisabled={totalAccountsQuery.isPending || !canNextPage}
             aria-label="next page"
             icon={<ChevronRightIcon className="size-4" />}
+            isDisabled={totalAccountsQuery.isPending || !canNextPage}
             onClick={() =>
               setCurrentPage((curr) => {
                 if (curr < totalPages - 1) {
@@ -152,13 +152,14 @@ export const AccountsTable: React.FC<AccountsTableProps> = ({
             }
           />
           <IconButton
-            isDisabled={totalAccountsQuery.isPending || !canNextPage}
             aria-label="last page"
             icon={<ChevronLastIcon className="size-4" />}
+            isDisabled={totalAccountsQuery.isPending || !canNextPage}
             onClick={() => setCurrentPage(totalPages - 1)}
           />
 
           <Select
+            isDisabled={totalAccountsQuery.isPending}
             onChange={(e) => {
               const newPageSize = Number.parseInt(e.target.value as string, 10);
               // compute the new page number based on the new page size
@@ -169,7 +170,6 @@ export const AccountsTable: React.FC<AccountsTableProps> = ({
               setPageSize(newPageSize);
             }}
             value={pageSize}
-            isDisabled={totalAccountsQuery.isPending}
           >
             <option value="25">25</option>
             <option value="50">50</option>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx
index b5af78e870b..0175eaeff4e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import type { ThirdwebContract } from "thirdweb";
 import * as ERC4337Ext from "thirdweb/extensions/erc4337";
@@ -10,6 +8,8 @@ import {
   useReadContract,
   useSendAndConfirmTransaction,
 } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 interface CreateAccountButtonProps {
   contract: ThirdwebContract;
@@ -26,8 +26,8 @@ export const CreateAccountButton: React.FC<CreateAccountButtonProps> = ({
   const address = useActiveAccount()?.address;
 
   const isAccountDeployedQuery = useReadContract(ERC4337Ext.isAccountDeployed, {
-    contract,
     adminSigner: address || "",
+    contract,
     data: "0x",
     queryOptions: {
       enabled: !!address,
@@ -38,10 +38,10 @@ export const CreateAccountButton: React.FC<CreateAccountButtonProps> = ({
     ERC4337Ext.getAccountsOfSigner,
     {
       contract,
-      signer: address || "",
       queryOptions: {
         enabled: !!address,
       },
+      signer: address || "",
     },
   );
 
@@ -52,7 +52,7 @@ export const CreateAccountButton: React.FC<CreateAccountButtonProps> = ({
   if (isAccountDeployedQuery.data && accountsForAddressQuery.data?.length) {
     return (
       <ToolTipLabel label="You can only initialize one account per EOA.">
-        <Button variant="primary" disabled>
+        <Button disabled variant="primary">
           Account Created
         </Button>
       </ToolTipLabel>
@@ -62,19 +62,19 @@ export const CreateAccountButton: React.FC<CreateAccountButtonProps> = ({
   return (
     <TransactionButton
       client={contract.client}
+      disabled={isAccountDeployedQuery.data}
       isLoggedIn={isLoggedIn}
-      txChainID={contract.chain.id}
+      isPending={sendTxMutation.isPending}
       onClick={() => {
         const tx = ERC4337Ext.createAccount({
-          contract,
           admin: address,
+          contract,
           data: "0x",
         });
         sendTxMutation.mutate(tx);
       }}
-      isPending={sendTxMutation.isPending}
       transactionCount={1}
-      disabled={isAccountDeployedQuery.data}
+      txChainID={contract.chain.id}
       {...restButtonProps}
     >
       Create Account
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/page.tsx
index b031a7525a1..b1f58e7ba55 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/page.tsx
@@ -8,10 +8,10 @@ export default async function Page(props: {
   const [params, account] = await Promise.all([props.params, getRawAccount()]);
   return (
     <SharedAccountsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/shared-accounts-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/shared-accounts-page.tsx
index 75f57184797..0629b9d3618 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/shared-accounts-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/shared-accounts-page.tsx
@@ -13,8 +13,8 @@ export async function SharedAccountsPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/ContractAnalyticsPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/ContractAnalyticsPage.tsx
index 2173f77322b..1b240e4ea37 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/ContractAnalyticsPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/ContractAnalyticsPage.tsx
@@ -1,11 +1,9 @@
 "use client";
-import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
-import { SkeletonContainer } from "@/components/ui/skeleton";
 import type { UseQueryResult } from "@tanstack/react-query";
 import {
   DateRangeSelector,
-  type Range,
   getLastNDaysRange,
+  type Range,
 } from "components/analytics/date-range-selector";
 import {
   type AnalyticsQueryParams,
@@ -22,6 +20,8 @@ import {
 import { format } from "date-fns";
 import { useMemo, useState } from "react";
 import type { ThirdwebContract } from "thirdweb";
+import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
+import { SkeletonContainer } from "@/components/ui/skeleton";
 
 interface ContractAnalyticsPageProps {
   contract: ThirdwebContract;
@@ -46,26 +46,26 @@ export const ContractAnalyticsPage: React.FC<ContractAnalyticsPageProps> = ({
         <AnalyticsStat
           chainId={contract.chain.id}
           contractAddress={contract.address}
+          label="Unique Wallets"
           // FIXME
           // eslint-disable-next-line react-compiler/react-compiler
           useTotal={useTotalContractUniqueWallets}
-          label="Unique Wallets"
         />
         <AnalyticsStat
           chainId={contract.chain.id}
           contractAddress={contract.address}
+          label="Total Transactions"
           // FIXME
           // eslint-disable-next-line react-compiler/react-compiler
           useTotal={useTotalContractTransactionAnalytics}
-          label="Total Transactions"
         />
         <AnalyticsStat
           chainId={contract.chain.id}
           contractAddress={contract.address}
+          label="Total Events"
           // FIXME
           // eslint-disable-next-line react-compiler/react-compiler
           useTotal={useTotalContractEvents}
-          label="Total Events"
         />
       </div>
 
@@ -77,38 +77,38 @@ export const ContractAnalyticsPage: React.FC<ContractAnalyticsPageProps> = ({
         <UniqueWalletsChart
           chainId={contract.chain.id}
           contractAddress={contract.address}
-          startDate={range.from}
           endDate={range.to}
+          startDate={range.from}
         />
 
         <TotalTransactionsChart
           chainId={contract.chain.id}
           contractAddress={contract.address}
-          startDate={range.from}
           endDate={range.to}
+          startDate={range.from}
         />
 
         <TotalEventsChart
           chainId={contract.chain.id}
           contractAddress={contract.address}
-          startDate={range.from}
           endDate={range.to}
+          startDate={range.from}
         />
 
         <FunctionBreakdownChart
           chainId={contract.chain.id}
           contractAddress={contract.address}
-          startDate={range.from}
           endDate={range.to}
+          startDate={range.from}
           writeFnSelectorToNameRecord={writeFnSelectorToNameRecord}
         />
 
         <EventBreakdownChart
           chainId={contract.chain.id}
           contractAddress={contract.address}
-          startDate={range.from}
           endDate={range.to}
           eventSelectorToNameRecord={eventSelectorToNameRecord}
+          startDate={range.from}
         />
       </div>
     </div>
@@ -135,22 +135,22 @@ function UniqueWalletsChart(props: ChartProps) {
 
   return (
     <ThirdwebBarChart
-      header={{
-        title: "Unique Wallets",
-        titleClassName: "mb-0.5 text-xl",
-        description:
-          "The number of unique wallet addresses that have sent a transaction to this contract.",
-      }}
-      data={analyticsQuery.data || []}
-      isPending={analyticsQuery.isPending}
+      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
       config={{
         count: {
-          label: "Unique Wallets",
           color: "hsl(var(--chart-1))",
+          label: "Unique Wallets",
         },
       }}
-      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
+      data={analyticsQuery.data || []}
+      header={{
+        description:
+          "The number of unique wallet addresses that have sent a transaction to this contract.",
+        title: "Unique Wallets",
+        titleClassName: "mb-0.5 text-xl",
+      }}
       hideLabel={false}
+      isPending={analyticsQuery.isPending}
       toolTipLabelFormatter={toolTipLabelFormatter}
     />
   );
@@ -166,22 +166,22 @@ function TotalTransactionsChart(props: ChartProps) {
 
   return (
     <ThirdwebBarChart
-      header={{
-        title: "Total Transactions",
-        titleClassName: "mb-0.5 text-xl",
-        description:
-          "The number of transactions that have been sent to this contract.",
-      }}
-      data={analyticsQuery.data || []}
-      isPending={analyticsQuery.isPending}
+      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
       config={{
         count: {
-          label: "Transactions",
           color: "hsl(var(--chart-1))",
+          label: "Transactions",
         },
       }}
-      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
+      data={analyticsQuery.data || []}
+      header={{
+        description:
+          "The number of transactions that have been sent to this contract.",
+        title: "Total Transactions",
+        titleClassName: "mb-0.5 text-xl",
+      }}
       hideLabel={false}
+      isPending={analyticsQuery.isPending}
       toolTipLabelFormatter={toolTipLabelFormatter}
     />
   );
@@ -192,22 +192,22 @@ function TotalEventsChart(props: ChartProps) {
 
   return (
     <ThirdwebBarChart
-      header={{
-        title: "Total Events",
-        titleClassName: "mb-0.5 text-xl",
-        description:
-          "The number of on-chain events that have been emitted from this contract.",
-      }}
-      data={analyticsQuery.data || []}
-      isPending={analyticsQuery.isPending}
+      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
       config={{
         count: {
-          label: "Events",
           color: "hsl(var(--chart-1))",
+          label: "Events",
         },
       }}
-      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
+      data={analyticsQuery.data || []}
+      header={{
+        description:
+          "The number of on-chain events that have been emitted from this contract.",
+        title: "Total Events",
+        titleClassName: "mb-0.5 text-xl",
+      }}
       hideLabel={false}
+      isPending={analyticsQuery.isPending}
       toolTipLabelFormatter={toolTipLabelFormatter}
     />
   );
@@ -243,30 +243,30 @@ function FunctionBreakdownChart(
 
   return (
     <ThirdwebBarChart
-      header={{
-        title: "Function Breakdown",
-        titleClassName: "mb-0.5 text-xl",
-        description:
-          "The breakdown of calls to each write function from transactions.",
-      }}
-      data={mappedQueryData || []}
-      isPending={analyticsQuery.isPending}
+      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
       config={Object.keys(mappedQueryData?.[0] || {}).reduce(
         (acc, key) => {
           if (key === "time") {
             return acc;
           }
           acc[key] = {
-            label: key,
             color: `hsl(var(--chart-${(Object.keys(acc).length % 15) + 1}))`,
+            label: key,
           };
           return acc;
         },
         {} as Record<string, { label: string; color: string }>,
       )}
-      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
-      showLegend
+      data={mappedQueryData || []}
+      header={{
+        description:
+          "The breakdown of calls to each write function from transactions.",
+        title: "Function Breakdown",
+        titleClassName: "mb-0.5 text-xl",
+      }}
       hideLabel={false}
+      isPending={analyticsQuery.isPending}
+      showLegend
       toolTipLabelFormatter={toolTipLabelFormatter}
     />
   );
@@ -302,29 +302,29 @@ function EventBreakdownChart(
 
   return (
     <ThirdwebBarChart
-      header={{
-        title: "Event Breakdown",
-        titleClassName: "mb-0.5 text-xl",
-        description: "The breakdown of events emitted by this contract.",
-      }}
-      data={mappedQueryData || []}
-      isPending={analyticsQuery.isPending}
+      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
       config={Object.keys(mappedQueryData?.[0] || {}).reduce(
         (acc, key) => {
           if (key === "time") {
             return acc;
           }
           acc[key] = {
-            label: key,
             color: `hsl(var(--chart-${(Object.keys(acc).length % 15) + 1}))`,
+            label: key,
           };
           return acc;
         },
         {} as Record<string, { label: string; color: string }>,
       )}
-      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
-      showLegend
+      data={mappedQueryData || []}
+      header={{
+        description: "The breakdown of events emitted by this contract.",
+        title: "Event Breakdown",
+        titleClassName: "mb-0.5 text-xl",
+      }}
       hideLabel={false}
+      isPending={analyticsQuery.isPending}
+      showLegend
       toolTipLabelFormatter={toolTipLabelFormatter}
     />
   );
@@ -347,8 +347,8 @@ const AnalyticsStat: React.FC<AnalyticsStatProps> = ({
     <AnalyticsData
       chainId={chainId}
       contractAddress={contractAddress}
-      useTotal={useTotal}
       label={label}
+      useTotal={useTotal}
     />
   );
 };
@@ -362,26 +362,23 @@ const AnalyticsData: React.FC<AnalyticsStatProps> = ({
   // FIXME: re-work this to not pass the hook down
   // eslint-disable-next-line react-compiler/react-compiler
   const totalQuery = useTotal({
-    contractAddress,
     chainId,
+    contractAddress,
   });
 
-  return <AnalyticsStatUI label={label} data={totalQuery.data?.count} />;
+  return <AnalyticsStatUI data={totalQuery.data?.count} label={label} />;
 };
 
-function AnalyticsStatUI(props: {
-  label: string;
-  data: number | undefined;
-}) {
+function AnalyticsStatUI(props: { label: string; data: number | undefined }) {
   return (
     <dl className="rounded-lg border bg-card p-4">
       <dt className="font-semibold">{props.label}</dt>
       <SkeletonContainer
-        skeletonData={10000}
         loadedData={props.data}
         render={(v) => {
           return <dd className="font-normal text-xl">{v.toLocaleString()}</dd>;
         }}
+        skeletonData={10000}
       />
     </dl>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/page.tsx
index e9e12b8192b..dc3c3002250 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/page.tsx
@@ -7,8 +7,8 @@ export default async function Page(props: {
   const params = await props.params;
   return (
     <SharedAnalyticsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
+      contractAddress={params.contractAddress}
       projectMeta={undefined}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/shared-analytics-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/shared-analytics-page.tsx
index 436237b44e6..551c9b84fc4 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/shared-analytics-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/shared-analytics-page.tsx
@@ -1,5 +1,5 @@
 import { notFound } from "next/navigation";
-import { type ThirdwebContract, resolveContractAbi } from "thirdweb/contract";
+import { resolveContractAbi, type ThirdwebContract } from "thirdweb/contract";
 import { type Abi, toEventSelector, toFunctionSelector } from "thirdweb/utils";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { redirectToContractLandingPage } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/utils";
@@ -14,8 +14,8 @@ export async function SharedAnalyticsPage(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -28,8 +28,8 @@ export async function SharedAnalyticsPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
@@ -54,8 +54,8 @@ export async function SharedAnalyticsPage(props: {
   return (
     <ContractAnalyticsPage
       contract={info.clientContract}
-      writeFnSelectorToNameRecord={writeFnSelectorToName}
       eventSelectorToNameRecord={eventSelectorToName}
+      writeFnSelectorToNameRecord={writeFnSelectorToName}
     />
   );
 }
@@ -80,13 +80,13 @@ async function getSelectors(contract: ThirdwebContract) {
     }
 
     return {
-      writeFnSelectorToName,
       eventSelectorToName,
+      writeFnSelectorToName,
     };
   } catch {
     return {
-      writeFnSelectorToName: {},
       eventSelectorToName: {},
+      writeFnSelectorToName: {},
     };
   }
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/page.tsx
index 9ec0a25816b..1dcb98c2265 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/page.tsx
@@ -8,10 +8,10 @@ export default async function Page(props: {
   const [params, account] = await Promise.all([props.params, getRawAccount()]);
   return (
     <SharedClaimConditionsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/shared-claim-conditions-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/shared-claim-conditions-page.tsx
index c02c148fa31..da838282343 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/shared-claim-conditions-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/shared-claim-conditions-page.tsx
@@ -14,8 +14,8 @@ export async function SharedClaimConditionsPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -28,8 +28,8 @@ export async function SharedClaimConditionsPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/contract-code-page.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/contract-code-page.client.tsx
index b0829bb0b15..d76995378a3 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/contract-code-page.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/contract-code-page.client.tsx
@@ -19,8 +19,8 @@ export function ContractCodePageClient(props: {
   return (
     <ContractCodePage
       abi={abiQuery.data}
-      contract={props.contract}
       chainMetadata={props.chainMetadata}
+      contract={props.contract}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/contract-code-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/contract-code-page.tsx
index d529c03b46e..8708d33ac37 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/contract-code-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/contract-code-page.tsx
@@ -1,9 +1,9 @@
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import type { Abi } from "abitype";
 import { CodeOverview } from "contract-ui/tabs/code/components/code-overview";
 import { CircleAlertIcon } from "lucide-react";
 import type { ChainMetadata } from "thirdweb/chains";
 import type { ThirdwebContract } from "thirdweb/contract";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 
 export function ContractCodePage(props: {
   abi: Abi | undefined;
@@ -14,8 +14,8 @@ export function ContractCodePage(props: {
     return (
       <CodeOverview
         abi={props.abi}
-        contractAddress={props.contract.address}
         chainId={props.contract.chain.id}
+        contractAddress={props.contract.address}
       />
     );
   }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/page.tsx
index 96b28930185..fcb6e129c06 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/page.tsx
@@ -7,8 +7,8 @@ export default async function Page(props: {
   const params = await props.params;
   return (
     <SharedCodePage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
+      contractAddress={params.contractAddress}
       projectMeta={undefined}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/shared-code-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/shared-code-page.tsx
index ac7281d408f..ffd39f503f3 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/shared-code-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/code/shared-code-page.tsx
@@ -13,8 +13,8 @@ export async function SharedCodePage(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -27,8 +27,8 @@ export async function SharedCodePage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
@@ -40,8 +40,8 @@ export async function SharedCodePage(props: {
   if (isLocalhostChain) {
     return (
       <ContractCodePageClient
-        contract={clientContract}
         chainMetadata={chainMetadata}
+        contract={clientContract}
       />
     );
   }
@@ -51,8 +51,8 @@ export async function SharedCodePage(props: {
   return (
     <ContractCodePage
       abi={abi}
-      contract={clientContract}
       chainMetadata={chainMetadata}
+      contract={clientContract}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/data-table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/data-table.tsx
index d8079087908..aa44bcb748f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/data-table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/data-table.tsx
@@ -1,24 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
 import {
@@ -38,7 +19,6 @@ import Link from "next/link";
 import { useEffect, useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
 import {
-  type ThirdwebClient,
   defineChain,
   eth_getCode,
   getContract,
@@ -46,6 +26,7 @@ import {
   prepareContractCall,
   prepareTransaction,
   sendAndConfirmTransaction,
+  type ThirdwebClient,
 } from "thirdweb";
 import type {
   FetchDeployMetadataResult,
@@ -58,6 +39,25 @@ import {
 import { useActiveAccount, useSwitchActiveWalletChain } from "thirdweb/react";
 import { concatHex, padHex } from "thirdweb/utils";
 import { z } from "zod";
+import { Button } from "@/components/ui/button";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../_utils/contract-page-path";
 import { SingleNetworkSelector } from "./single-network-selector";
@@ -127,16 +127,16 @@ export function DataTable({
       const c = defineChain(chain.chainId);
       const code = await eth_getCode(
         getRpcClient({
-          client: client,
           chain: c,
+          client: client,
         }),
         { address: coreContract.address },
       );
 
       const newRow: CrossChain = {
+        chainId: chain.chainId,
         id: chain.chainId,
         network: chain.name,
-        chainId: chain.chainId,
         status: code?.length > 2 ? "DEPLOYED" : "NOT_DEPLOYED",
       };
 
@@ -179,13 +179,13 @@ export function DataTable({
   }, [data, customChainData]);
 
   const form = useForm<FormSchema>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
       amounts: {
         "420120000": "",
         "420120001": "",
       },
     },
+    resolver: zodResolver(formSchema),
   });
 
   const crossChainTransfer = async (chainId: ChainId) => {
@@ -229,28 +229,27 @@ export function DataTable({
 
   const crossChainTransferMutation = useMutation({
     mutationFn: crossChainTransfer,
-    onSuccess: crossChainTransferNotifications.onSuccess,
     onError: crossChainTransferNotifications.onError,
+    onSuccess: crossChainTransferNotifications.onSuccess,
   });
 
   const columns: ColumnDef<CrossChain>[] = [
     {
       accessorKey: "network",
-      header: "Network",
       cell: ({ row }) => {
         if (row.getValue("status") === "DEPLOYED") {
           const href = buildContractPagePath({
-            projectMeta,
             chainIdOrSlug: `${row.getValue("chainId")}`,
             contractAddress: coreContract.address,
+            projectMeta,
           });
 
           return (
             <Link
-              target="_blank"
-              rel="noopener noreferrer"
               className="text-blue-500 underline"
               href={href}
+              rel="noopener noreferrer"
+              target="_blank"
             >
               {row.getValue("network")}
             </Link>
@@ -258,6 +257,7 @@ export function DataTable({
         }
         return row.getValue("network");
       },
+      header: "Network",
     },
     {
       accessorKey: "chainId",
@@ -265,24 +265,23 @@ export function DataTable({
     },
     {
       accessorKey: "status",
-      header: "Status",
       cell: ({ row }) => {
         if (row.getValue("status") === "DEPLOYED") {
           return <p>Deployed</p>;
         }
         return (
           <Button
-            type="button"
             onClick={() => deployContract(row.getValue("chainId"), client)}
+            type="button"
           >
             Deploy
           </Button>
         );
       },
+      header: "Status",
     },
     {
       accessorKey: "transfer",
-      header: "",
       cell: ({ row }) => {
         const chain = row.getValue("chainId");
         if (
@@ -292,8 +291,8 @@ export function DataTable({
         ) {
           return (
             <FormField
-              disabled={false}
               control={form.control}
+              disabled={false}
               name={`amounts.${row.getValue("chainId") as ChainId}`}
               render={({ field }) => (
                 <FormItem>
@@ -306,14 +305,14 @@ export function DataTable({
                           {...field}
                         />
                         <Button
-                          type="button"
+                          className="rounded-lg rounded-l-none border border-l-0"
                           disabled={false}
                           onClick={() =>
                             crossChainTransferMutation.mutate(
                               row.getValue("chainId"),
                             )
                           }
-                          className="rounded-lg rounded-l-none border border-l-0"
+                          type="button"
                         >
                           Bridge
                         </Button>
@@ -327,12 +326,13 @@ export function DataTable({
           );
         }
       },
+      header: "",
     },
   ];
 
   const table = useReactTable({
-    data: mergedChainData,
     columns,
+    data: mergedChainData,
     getCoreRowModel: getCoreRowModel(),
   });
 
@@ -351,8 +351,8 @@ export function DataTable({
 
       const steps: DeployModalStep[] = [
         {
-          type: "deploy",
           signatureCount: 1,
+          type: "deploy",
         },
       ];
 
@@ -362,21 +362,21 @@ export function DataTable({
       let crosschainContractAddress: string | undefined;
       if (initCode && isDirectDeploy) {
         const tx = prepareTransaction({
-          client,
           chain,
-          to: "0x4e59b44847b379578588920cA78FbF26c0B4956C",
+          client,
           data: initCode,
+          to: "0x4e59b44847b379578588920cA78FbF26c0B4956C",
         });
 
         await sendAndConfirmTransaction({
-          transaction: tx,
           account: activeAccount,
+          transaction: tx,
         });
 
         const code = await eth_getCode(
           getRpcClient({
-            client,
             chain,
+            client,
           }),
           {
             address: coreContract.address,
@@ -390,9 +390,9 @@ export function DataTable({
         if (modulesMetadata) {
           for (const m of modulesMetadata) {
             await getOrDeployInfraForPublishedContract({
+              account: activeAccount,
               chain,
               client,
-              account: activeAccount,
               contractId: m.name,
               publisher: m.publisher,
             });
@@ -404,8 +404,8 @@ export function DataTable({
           chain,
           client,
           deployMetadata: coreMetadata,
-          isCrosschain: true,
           initializeData,
+          isCrosschain: true,
           salt,
         });
 
@@ -419,9 +419,9 @@ export function DataTable({
 
       if (crosschainContractAddress) {
         const contractLink = buildContractPagePath({
-          projectMeta,
           chainIdOrSlug: `${chain.id}`,
           contractAddress: crosschainContractAddress,
+          projectMeta,
         });
 
         deployStatusModal.setViewContractLink(contractLink);
@@ -473,8 +473,8 @@ export function DataTable({
               <TableBody>
                 {table.getRowModel().rows.map((row) => (
                   <TableRow
-                    key={row.id}
                     data-state={row.getIsSelected() && "selected"}
+                    key={row.id}
                   >
                     {row.getVisibleCells().map((cell) => (
                       <TableCell key={cell.id}>
@@ -506,10 +506,10 @@ export function DataTable({
 
         <div className="mt-4">
           <SingleNetworkSelector
+            className="w-full"
             client={client}
-            onAddRow={addRowMutation.mutate}
             isAddingRow={addRowMutation.isPending}
-            className="w-full"
+            onAddRow={addRowMutation.mutate}
           />
         </div>
       </form>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/no-crosschain-prompt.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/no-crosschain-prompt.tsx
index 78bfb8e81d4..8eb9a5790e0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/no-crosschain-prompt.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/no-crosschain-prompt.tsx
@@ -10,10 +10,10 @@ export function NoCrossChainPrompt() {
       <br />
       <br />
       <Link
-        href="/explore"
-        target="_blank"
         className="text-blue-500 underline"
+        href="/explore"
         rel="noopener noreferrer"
+        target="_blank"
       >
         Explore contracts
       </Link>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/page.tsx
index 8aa8cbb8206..a77bd349e9b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/page.tsx
@@ -7,8 +7,8 @@ export default async function Page(props: {
   const params = await props.params;
   return (
     <SharedCrossChainPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
+      contractAddress={params.contractAddress}
       projectMeta={undefined}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/shared-cross-chain-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/shared-cross-chain-page.tsx
index 4cc217dc947..31d6449843c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/shared-cross-chain-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/shared-cross-chain-page.tsx
@@ -33,17 +33,17 @@ export async function SharedCrossChainPage(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
   const ProxyDeployedEvent = prepareEvent({
-    signature:
-      "event ProxyDeployedV2(address indexed implementation, address indexed proxy, address indexed deployer, bytes32 inputSalt, bytes data, bytes extraData)",
     filters: {
       proxy: props.contractAddress.toLowerCase(),
     },
+    signature:
+      "event ProxyDeployedV2(address indexed implementation, address indexed proxy, address indexed deployer, bytes32 inputSalt, bytes data, bytes extraData)",
   });
 
   if (!info) {
@@ -55,8 +55,8 @@ export async function SharedCrossChainPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
@@ -79,8 +79,8 @@ export async function SharedCrossChainPage(props: {
 
   const originalCode = await eth_getCode(
     getRpcClient({
-      client: serverContract.client,
       chain: serverContract.chain,
+      client: serverContract.client,
     }),
     {
       address: serverContract.address,
@@ -98,8 +98,8 @@ export async function SharedCrossChainPage(props: {
 
     if (creationData.status === "1" && creationData.result[0]?.txHash) {
       const rpcClient = getRpcClient({
-        client: serverContract.client,
         chain: serverContract.chain,
+        client: serverContract.client,
       });
       creationTxReceipt = await eth_getTransactionReceipt(rpcClient, {
         hash: creationData.result[0]?.txHash,
@@ -150,17 +150,17 @@ export async function SharedCrossChainPage(props: {
           const chainMetadata = await getChainMetadata(chain);
 
           const rpcRequest = getRpcClient({
-            client: serverContract.client,
             chain,
+            client: serverContract.client,
           });
           const code = await eth_getCode(rpcRequest, {
             address: props.contractAddress,
           });
 
           return {
+            chainId: chain.id,
             id: chain.id,
             network: chainMetadata.name,
-            chainId: chain.id,
             status:
               code === originalCode
                 ? ("DEPLOYED" as const)
@@ -168,9 +168,9 @@ export async function SharedCrossChainPage(props: {
           };
         } catch {
           return {
+            chainId: chain.id,
             id: chain.id,
             network: "",
-            chainId: chain.id,
             status: "NOT_DEPLOYED" as const,
           };
         }
@@ -251,9 +251,9 @@ export async function SharedCrossChainPage(props: {
             (
               await fetchPublishedContractsFromDeploy({
                 contract: getContract({
+                  address: m,
                   chain: serverContract.chain,
                   client: serverContract.client,
-                  address: m,
                 }),
               })
             ).at(-1),
@@ -279,14 +279,14 @@ export async function SharedCrossChainPage(props: {
       </div>
       <div className="h-10" />
       <DataTable
+        coreContract={clientContract}
         coreMetadata={coreMetadata}
-        modulesMetadata={modulesMetadata}
-        initializeData={initializeData}
-        inputSalt={inputSalt}
         data={chainsDeployedOn}
-        coreContract={clientContract}
         initCode={initCode}
+        initializeData={initializeData}
+        inputSalt={inputSalt}
         isDirectDeploy={isDirectDeploy}
+        modulesMetadata={modulesMetadata}
         projectMeta={props.projectMeta}
       />
     </>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/single-network-selector.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/single-network-selector.tsx
index fd0f43faa88..e0786cc3eff 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/single-network-selector.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/single-network-selector.tsx
@@ -1,9 +1,9 @@
-import { SelectWithSearch } from "@/components/blocks/select-with-search";
-import { Badge } from "@/components/ui/badge";
 import { ChainIconClient } from "components/icons/ChainIcon";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { useCallback, useMemo } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { SelectWithSearch } from "@/components/blocks/select-with-search";
+import { Badge } from "@/components/ui/badge";
 
 type Option = { label: string; value: string };
 
@@ -49,13 +49,13 @@ export function SingleNetworkSelector(props: {
           <span className="flex grow gap-2 truncate text-left">
             <ChainIconClient
               className="size-5"
-              src={chain.icon?.url}
               client={props.client}
               loading="lazy"
+              src={chain.icon?.url}
             />
             {chain.name}
           </span>
-          <Badge variant="outline" className="gap-2 max-sm:hidden">
+          <Badge className="gap-2 max-sm:hidden" variant="outline">
             <span className="text-muted-foreground">Chain ID</span>
             {chain.chainId}
           </Badge>
@@ -74,20 +74,20 @@ export function SingleNetworkSelector(props: {
 
   return (
     <SelectWithSearch
-      searchPlaceholder="Search by Name or Chain ID"
-      value={undefined}
-      options={options}
+      className={props.className}
+      closeOnSelect={true}
+      disabled={props.isAddingRow || allChains.length === 0}
       onValueChange={handleChange}
+      options={options}
+      overrideSearchFn={searchFn}
       placeholder={
         allChains.length === 0
           ? "Loading chains..."
           : "Select chain to deploy on"
       }
-      overrideSearchFn={searchFn}
       renderOption={renderOption}
-      className={props.className}
-      disabled={props.isAddingRow || allChains.length === 0}
-      closeOnSelect={true}
+      searchPlaceholder="Search by Name or Chain ID"
+      value={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/events-feed.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/events-feed.tsx
index 295d7eec31d..ef3bc86b8c8 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/events-feed.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/events-feed.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { CodeClient } from "@/components/ui/code/code.client";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import {
   type InternalTransaction,
   useActivity,
@@ -28,11 +26,13 @@ import { useChainSlug } from "hooks/chains/chainSlug";
 import { useClipboard } from "hooks/useClipboard";
 import { ChevronDownIcon, CircleHelpIcon, CopyIcon } from "lucide-react";
 import { useSearchParams } from "next/navigation";
-import { Fragment, useMemo, useState } from "react";
+import { Fragment, useId, useMemo, useState } from "react";
 import { toast } from "sonner";
 import type { ThirdwebContract } from "thirdweb";
 import { stringify } from "thirdweb/utils";
 import { Button, Card, FormLabel, Heading, Text } from "tw-components";
+import { CodeClient } from "@/components/ui/code/code.client";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../_utils/contract-page-path";
 
@@ -75,24 +75,24 @@ export const EventsFeed: React.FC<EventsFeedProps> = ({
     [allEvents, selectedEvent],
   );
 
+  const autoUpdateId = useId();
+
   return (
-    <Flex gap={6} flexDirection="column">
+    <Flex flexDirection="column" gap={6}>
       <Flex align="center" justify="space-between" w="full">
-        <Flex gap={4} alignItems="center">
+        <Flex alignItems="center" gap={4}>
           <Heading flexShrink={0} size="title.sm">
             Latest Transactions
           </Heading>
           <Select
-            w="50%"
-            value={selectedEvent}
             onChange={(e) => {
               const val = e.target.value;
 
               if (eventTypes.includes(val)) {
                 const path = buildContractPagePath({
-                  projectMeta,
                   chainIdOrSlug: chainSlug.toString(),
                   contractAddress: contract.address,
+                  projectMeta,
                   subpath:
                     e.target.value === "all"
                       ? "/events"
@@ -103,6 +103,8 @@ export const EventsFeed: React.FC<EventsFeedProps> = ({
                 setSelectedEvent(val);
               }
             }}
+            value={selectedEvent}
+            w="50%"
           >
             <option value="all">All</option>
             {eventTypes.map((eventType) => (
@@ -113,29 +115,29 @@ export const EventsFeed: React.FC<EventsFeedProps> = ({
           </Select>
         </Flex>
         <div>
-          <FormControl display="flex" alignItems="center">
-            <FormLabel htmlFor="auto-update" mb="0">
+          <FormControl alignItems="center" display="flex">
+            <FormLabel htmlFor={autoUpdateId} mb="0">
               Auto-Update
             </FormLabel>
             <LightMode>
               <Switch
+                id={autoUpdateId}
                 isChecked={autoUpdate}
                 onChange={() => setAutoUpdate((val) => !val)}
-                id="auto-update"
               />
             </LightMode>
           </FormControl>
         </div>
       </Flex>
-      <Card p={0} overflow="hidden">
+      <Card overflow="hidden" p={0}>
         <SimpleGrid
-          gap={2}
-          columns={12}
+          _dark={{ bg: "whiteAlpha.50" }}
+          bg="blackAlpha.50"
           borderBottomWidth="1px"
           borderColor="borderColor"
+          columns={12}
+          gap={2}
           padding={4}
-          bg="blackAlpha.50"
-          _dark={{ bg: "whiteAlpha.50" }}
         >
           <Heading gridColumn="span 4" size="label.md">
             Transaction Hash
@@ -153,7 +155,7 @@ export const EventsFeed: React.FC<EventsFeedProps> = ({
             <div className="flex items-center justify-center py-4">
               <Flex align="center" gap={2}>
                 {autoUpdate && <Spinner size="sm" speed="0.69s" />}
-                <Text size="body.md" fontStyle="italic">
+                <Text fontStyle="italic" size="body.md">
                   {autoUpdate ? "listening for events" : "no events to show"}
                 </Text>
               </Flex>
@@ -162,12 +164,12 @@ export const EventsFeed: React.FC<EventsFeedProps> = ({
           <Accordion allowMultiple defaultIndex={[]}>
             {filteredEvents?.slice(0, 10).map((e) => (
               <EventsFeedItem
-                key={e.transactionHash}
-                transaction={e}
-                setSelectedEvent={setSelectedEvent}
-                contractAddress={contract.address}
                 chainSlug={chainSlug}
+                contractAddress={contract.address}
+                key={e.transactionHash}
                 projectMeta={projectMeta}
+                setSelectedEvent={setSelectedEvent}
+                transaction={e}
               />
             ))}
           </Accordion>
@@ -197,43 +199,43 @@ const EventsFeedItem: React.FC<EventsFeedItemProps> = ({
 
   return (
     <AccordionItem
+      _first={{ borderTop: "none" }}
       borderBottom="none"
       borderColor="borderColor"
-      _first={{ borderTop: "none" }}
     >
       <AccordionButton padding={0}>
         <SimpleGrid
-          columns={12}
-          gap={2}
+          _last={{ borderBottomWidth: 0 }}
+          alignItems="center"
           as="li"
           borderBottomWidth="1px"
           borderColor="borderColor"
-          padding={4}
+          columns={12}
+          gap={2}
           overflow="hidden"
-          alignItems="center"
-          _last={{ borderBottomWidth: 0 }}
+          padding={4}
         >
           <Box gridColumn="span 3">
             <div className="flex flex-row items-center gap-3">
               <Tooltip
-                p={0}
                 bg="transparent"
                 boxShadow="none"
                 label={
-                  <Card py={2} px={4} bgColor="backgroundHighlight">
+                  <Card bgColor="backgroundHighlight" px={4} py={2}>
                     <Text size="label.sm">
                       Copy transaction hash to clipboard
                     </Text>
                   </Card>
                 }
+                p={0}
               >
                 <Button
-                  size="sm"
                   bg="transparent"
                   onClick={() => {
                     onCopy();
                     toast.info("Transaction hash copied.");
                   }}
+                  size="sm"
                 >
                   <CopyIcon className="size-4" />
                 </Button>
@@ -247,12 +249,12 @@ const EventsFeedItem: React.FC<EventsFeedItemProps> = ({
           <Box gridColumn="span 1" />
 
           <ButtonGroup
-            size="sm"
-            variant="outline"
-            gridColumn="span 5"
             flexWrap="wrap"
             gap={2}
+            gridColumn="span 5"
+            size="sm"
             spacing={0}
+            variant="outline"
           >
             {transaction.events.slice(0, 2).map((e, idx) => (
               <Button
@@ -262,9 +264,9 @@ const EventsFeedItem: React.FC<EventsFeedItemProps> = ({
                 onClick={(ev) => {
                   ev.stopPropagation();
                   const path = buildContractPagePath({
-                    projectMeta,
                     chainIdOrSlug: chainSlug.toString(),
                     contractAddress: contractAddress,
+                    projectMeta,
                     subpath: `/events?event=${e.eventName}`,
                   });
 
@@ -297,31 +299,31 @@ const EventsFeedItem: React.FC<EventsFeedItemProps> = ({
       <AccordionPanel>
         <Card>
           <div className="flex flex-col gap-4">
-            <Heading size="subtitle.sm" fontWeight="bold">
+            <Heading fontWeight="bold" size="subtitle.sm">
               Transaction Data
             </Heading>
 
             <Divider />
 
             <TransactionData
-              name="Transaction Hash"
-              value={transaction.transactionHash}
               description={`
                   A transaction hash is a unique 66 character identifier
                   that is generated whenever a transaction is executed.
                 `}
+              name="Transaction Hash"
+              value={transaction.transactionHash}
             />
 
             <TransactionData
-              name="Block Number"
-              value={transaction.blockNumber}
               description={`
                   The number of the block in which the transaction was recorded.
                   Block confirmation indicate how many blocks since the transaction was validated.
                 `}
+              name="Block Number"
+              value={transaction.blockNumber}
             />
 
-            <Heading size="subtitle.sm" fontWeight="bold" pt={6}>
+            <Heading fontWeight="bold" pt={6} size="subtitle.sm">
               Event Data
             </Heading>
 
@@ -369,14 +371,14 @@ const TransactionData: React.FC<TransactionDataProps> = ({
       <SimpleGrid columns={12} gap={2}>
         <div className="col-span-3 flex flex-row items-center gap-2">
           <Tooltip
-            p={0}
             bg="transparent"
             boxShadow="none"
             label={
-              <Card py={2} px={4} bgColor="backgroundHighlight">
+              <Card bgColor="backgroundHighlight" px={4} py={2}>
                 <Text size="label.sm">{description}</Text>
               </Card>
             }
+            p={0}
           >
             <div className="flex items-center justify-center">
               <CircleHelpIcon className="size-4 text-gray-600" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/page.tsx
index 532bfc1faf2..7b14fc06036 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/page.tsx
@@ -7,8 +7,8 @@ export default async function Page(props: {
   const params = await props.params;
   return (
     <SharedEventsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
+      contractAddress={params.contractAddress}
       projectMeta={undefined}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/shared-events-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/shared-events-page.tsx
index cf089d87dfb..832db0ecc9d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/shared-events-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/events/shared-events-page.tsx
@@ -11,8 +11,8 @@ export async function SharedEventsPage(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -25,8 +25,8 @@ export async function SharedEventsPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/ContractExplorerPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/ContractExplorerPage.client.tsx
index 96965e7f9a6..0dd6f6ae534 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/ContractExplorerPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/ContractExplorerPage.client.tsx
@@ -26,8 +26,8 @@ export const ContractExplorerPageClient: React.FC<ContractExplorePageProps> = ({
   return (
     <ContractExplorerPage
       abi={abiQuery.data}
-      contract={contract}
       chainMetadata={chainMetadata}
+      contract={contract}
       isLoggedIn={isLoggedIn}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/ContractExplorerPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/ContractExplorerPage.tsx
index e6ba456c7fd..ca05cf1e0ac 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/ContractExplorerPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/ContractExplorerPage.tsx
@@ -1,10 +1,10 @@
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import type { Abi } from "abitype";
 import { getContractFunctionsFromAbi } from "components/contract-components/getContractFunctionsFromAbi";
 import { ContractFunctionsOverview } from "components/contract-functions/contract-functions";
 import { CircleAlertIcon } from "lucide-react";
 import type { ThirdwebContract } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 
 interface ContractExplorePageProps {
   contract: ThirdwebContract;
@@ -37,10 +37,10 @@ export const ContractExplorerPage: React.FC<ContractExplorePageProps> = ({
     <div className="flex h-[70vh] flex-col ">
       {functions && functions.length > 0 ? (
         <ContractFunctionsOverview
-          onlyFunctions
-          functions={functions}
           contract={contract}
+          functions={functions}
           isLoggedIn={isLoggedIn}
+          onlyFunctions
         />
       ) : (
         <div className="flex flex-col items-center justify-center gap-2 bg-card text-center">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/page.tsx
index f1f2a612b58..9d4dea99f23 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/page.tsx
@@ -9,10 +9,10 @@ export default async function Page(props: {
   const account = await getRawAccount();
   return (
     <SharedExplorerPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/shared-explorer-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/shared-explorer-page.tsx
index efaac5d00d7..b2e94bc3237 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/shared-explorer-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/shared-explorer-page.tsx
@@ -14,8 +14,8 @@ export async function SharedExplorerPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -28,8 +28,8 @@ export async function SharedExplorerPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
@@ -41,8 +41,8 @@ export async function SharedExplorerPage(props: {
   if (isLocalhostChain) {
     return (
       <ContractExplorerPageClient
-        contract={clientContract}
         chainMetadata={chainMetadata}
+        contract={clientContract}
         isLoggedIn={props.isLoggedIn}
       />
     );
@@ -52,9 +52,9 @@ export async function SharedExplorerPage(props: {
 
   return (
     <ContractExplorerPage
-      contract={clientContract}
       abi={abi}
       chainMetadata={chainMetadata}
+      contract={clientContract}
       isLoggedIn={props.isLoggedIn}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/layout.tsx
index 5f75485f9b6..98be66e3e68 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/layout.tsx
@@ -1,8 +1,8 @@
 import { getAuthToken } from "@app/api/lib/getAuthToken";
 import type { Metadata } from "next";
 import {
-  SharedContractLayout,
   generateContractLayoutMetadata,
+  SharedContractLayout,
 } from "./shared-layout";
 
 export default async function Layout(props: {
@@ -15,10 +15,10 @@ export default async function Layout(props: {
   const [params, authToken] = await Promise.all([props.params, getAuthToken()]);
   return (
     <SharedContractLayout
-      contractAddress={params.contractAddress}
+      authToken={authToken}
       chainIdOrSlug={params.chain_id}
+      contractAddress={params.contractAddress}
       projectMeta={undefined}
-      authToken={authToken}
     >
       {props.children}
     </SharedContractLayout>
@@ -33,7 +33,7 @@ export async function generateMetadata(props: {
 }): Promise<Metadata> {
   const params = await props.params;
   return generateContractLayoutMetadata({
-    contractAddress: params.contractAddress,
     chainIdOrSlug: params.chain_id,
+    contractAddress: params.contractAddress,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/ContractEditModulesPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/ContractEditModulesPage.tsx
index e8d0ddead5f..8eed785a280 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/ContractEditModulesPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/ContractEditModulesPage.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { UserXIcon } from "lucide-react";
 import type { ThirdwebContract } from "thirdweb";
 import { getInstalledModules, owner } from "thirdweb/modules";
 import { useActiveAccount, useReadContract } from "thirdweb/react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { InstalledModulesTable } from "./components/InstalledModulesTable";
 import { InstallModuleForm } from "./components/ModuleForm";
 
@@ -46,10 +46,10 @@ export const ContractEditModulesPage: React.FC<
   const isOwner = ownerQuery.data === account?.address;
 
   const installedModules = {
-    isPending: installedModulesQuery.isPending,
     data: installedModulesQuery.data
       ? installedModulesQuery.data.map((x) => x.implementation)
       : [],
+    isPending: installedModulesQuery.isPending,
   };
 
   return (
@@ -67,11 +67,11 @@ export const ContractEditModulesPage: React.FC<
           </div>
           <div className="h-10" />
           <InstallModuleForm
-            isLoggedIn={isLoggedIn}
-            contract={contract}
-            refetchModules={() => installedModulesQuery.refetch()}
             account={account}
+            contract={contract}
             installedModules={installedModules}
+            isLoggedIn={isLoggedIn}
+            refetchModules={() => installedModulesQuery.refetch()}
           />
         </div>
       )}
@@ -95,11 +95,11 @@ export const ContractEditModulesPage: React.FC<
       <div className="h-10" />
 
       <InstalledModulesTable
-        installedModules={installedModules}
-        refetchModules={() => installedModulesQuery.refetch()}
         contract={contract}
-        ownerAccount={isOwner ? account : undefined}
+        installedModules={installedModules}
         isLoggedIn={isLoggedIn}
+        ownerAccount={isOwner ? account : undefined}
+        refetchModules={() => installedModulesQuery.refetch()}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
index 4402b162f59..54a52621593 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
@@ -1,4 +1,15 @@
 "use client";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import { TransactionButton } from "components/buttons/TransactionButton";
+import { useTxNotifications } from "hooks/useTxNotifications";
+import { CircleAlertIcon } from "lucide-react";
+import { useCallback } from "react";
+import { useForm } from "react-hook-form";
+import { sendAndConfirmTransaction, type ThirdwebClient } from "thirdweb";
+import { BatchMetadataERC721, BatchMetadataERC1155 } from "thirdweb/modules";
+import { parseAttributes } from "utils/parseAttributes";
+import { z } from "zod";
 import {
   Accordion,
   AccordionContent,
@@ -16,17 +27,6 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import { useTxNotifications } from "hooks/useTxNotifications";
-import { CircleAlertIcon } from "lucide-react";
-import { useCallback } from "react";
-import { useForm } from "react-hook-form";
-import { type ThirdwebClient, sendAndConfirmTransaction } from "thirdweb";
-import { BatchMetadataERC721, BatchMetadataERC1155 } from "thirdweb/modules";
-import { parseAttributes } from "utils/parseAttributes";
-import { z } from "zod";
 import { fileBufferOrStringSchema } from "../zod-schemas";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
@@ -35,11 +35,13 @@ import { NFTMediaFormGroup } from "./nft/NFTMediaFormGroup";
 import { PropertiesFormControl } from "./nft/PropertiesFormControl";
 
 const uploadMetadataFormSchema = z.object({
-  name: z.string().min(1),
-  description: z.string().optional(),
-  image: fileBufferOrStringSchema.optional(),
   animationUri: fileBufferOrStringSchema.optional(),
-  external_url: fileBufferOrStringSchema.optional(),
+  attributes: z.array(
+    z.object({
+      trait_type: z.string().min(1),
+      value: z.string().min(1),
+    }),
+  ),
   background_color: z
     .string()
     .refine(
@@ -51,12 +53,10 @@ const uploadMetadataFormSchema = z.object({
       },
     )
     .optional(),
-  attributes: z.array(
-    z.object({
-      trait_type: z.string().min(1),
-      value: z.string().min(1),
-    }),
-  ),
+  description: z.string().optional(),
+  external_url: fileBufferOrStringSchema.optional(),
+  image: fileBufferOrStringSchema.optional(),
+  name: z.string().min(1),
 });
 
 export type UploadMetadataFormValues = z.infer<typeof uploadMetadataFormSchema>;
@@ -91,10 +91,10 @@ function BatchMetadataModule(props: ModuleInstanceProps) {
   return (
     <BatchMetadataModuleUI
       {...props}
-      uploadMetadata={uploadMetadata}
-      isOwnerAccount={!!ownerAccount}
-      contractChainId={contract.chain.id}
       client={contract.client}
+      contractChainId={contract.chain.id}
+      isOwnerAccount={!!ownerAccount}
+      uploadMetadata={uploadMetadata}
     />
   );
 }
@@ -111,19 +111,19 @@ export function BatchMetadataModuleUI(
   return (
     <ModuleCardUI {...props}>
       <div className="flex flex-col gap-4">
-        <Accordion type="single" collapsible className="-mx-1">
+        <Accordion className="-mx-1" collapsible type="single">
           {/* uploadMetadata  */}
-          <AccordionItem value="metadata" className="border-none">
+          <AccordionItem className="border-none" value="metadata">
             <AccordionTrigger className="border-border border-t px-1">
               Upload NFT Metadata
             </AccordionTrigger>
             <AccordionContent className="px-1">
               {props.isOwnerAccount && (
                 <UploadMetadataNFTSection
+                  client={props.client}
+                  contractChainId={props.contractChainId}
                   isLoggedIn={props.isLoggedIn}
                   uploadMetadata={props.uploadMetadata}
-                  contractChainId={props.contractChainId}
-                  client={props.client}
                 />
               )}
               {!props.isOwnerAccount && (
@@ -139,7 +139,7 @@ export function BatchMetadataModuleUI(
           </AccordionItem>
 
           {/* batchMetadata  */}
-          <AccordionItem value="batch-metadata" className="border-none">
+          <AccordionItem className="border-none" value="batch-metadata">
             <AccordionTrigger className="border-border border-t px-1">
               Batch Upload NFT Metadata
             </AccordionTrigger>
@@ -170,11 +170,11 @@ function UploadMetadataNFTSection(props: {
 }) {
   const form = useForm<UploadMetadataFormValues>({
     resolver: zodResolver(uploadMetadataFormSchema),
+    reValidateMode: "onChange",
     values: {
-      name: "",
       attributes: [],
+      name: "",
     },
-    reValidateMode: "onChange",
   });
 
   const uploadNotifications = useTxNotifications(
@@ -184,8 +184,8 @@ function UploadMetadataNFTSection(props: {
 
   const uploadMetadataMutation = useMutation({
     mutationFn: props.uploadMetadata,
-    onSuccess: uploadNotifications.onSuccess,
     onError: uploadNotifications.onError,
+    onSuccess: uploadNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -200,9 +200,9 @@ function UploadMetadataNFTSection(props: {
             {/* Left */}
             <div className="shrink-0 lg:w-[300px]">
               <NFTMediaFormGroup
+                client={props.client}
                 form={form}
                 previewMaxWidth="300px"
-                client={props.client}
               />
             </div>
 
@@ -244,17 +244,17 @@ function UploadMetadataNFTSection(props: {
 
               {/* Advanced options */}
               <Accordion
-                type="single"
                 collapsible={
                   !(
                     form.formState.errors.background_color ||
                     form.formState.errors.external_url
                   )
                 }
+                type="single"
               >
                 <AccordionItem
-                  value="advanced-options"
                   className="-mx-1 border-y"
+                  value="advanced-options"
                 >
                   <AccordionTrigger className="px-1">
                     Advanced Options
@@ -269,15 +269,15 @@ function UploadMetadataNFTSection(props: {
 
           <div className="flex justify-end">
             <TransactionButton
-              client={props.client}
-              isLoggedIn={props.isLoggedIn}
-              size="sm"
               className="min-w-24"
+              client={props.client}
               disabled={uploadMetadataMutation.isPending}
-              type="submit"
+              isLoggedIn={props.isLoggedIn}
               isPending={uploadMetadataMutation.isPending}
-              txChainID={props.contractChainId}
+              size="sm"
               transactionCount={1}
+              txChainID={props.contractChainId}
+              type="submit"
             >
               Upload
             </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
index 8893e8b53b8..e8002fc22d9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
@@ -1,31 +1,7 @@
 "use client";
 
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { DatePickerWithRange } from "@/components/ui/DatePickerWithRange";
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-} from "@/components/ui/accordion";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Separator } from "@/components/ui/separator";
-import { Skeleton } from "@/components/ui/skeleton";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { addDays, fromUnixTime } from "date-fns";
 import { useAllChainsData } from "hooks/chains/allChains";
@@ -39,13 +15,13 @@ import {
 } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
 import {
+  getContract,
   NATIVE_TOKEN_ADDRESS,
   type PreparedTransaction,
-  type ThirdwebClient,
-  ZERO_ADDRESS,
-  getContract,
   sendAndConfirmTransaction,
+  type ThirdwebClient,
   toTokens,
+  ZERO_ADDRESS,
 } from "thirdweb";
 import { decimals } from "thirdweb/extensions/erc20";
 import {
@@ -55,6 +31,29 @@ import {
 } from "thirdweb/modules";
 import { useActiveAccount, useReadContract } from "thirdweb/react";
 import { z } from "zod";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@/components/ui/accordion";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { DatePickerWithRange } from "@/components/ui/DatePickerWithRange";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Separator } from "@/components/ui/separator";
+import { Skeleton } from "@/components/ui/skeleton";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import { addressSchema } from "../zod-schemas";
 import { CurrencySelector } from "./CurrencySelector";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
@@ -98,7 +97,6 @@ function ClaimableModule(props: ModuleInstanceProps) {
         ? ClaimableERC20.getClaimCondition
         : ClaimableERC1155.getClaimCondition,
     {
-      tokenId: positiveIntegerRegex.test(tokenId) ? BigInt(tokenId) : 0n,
       contract: contract,
       queryOptions: {
         enabled:
@@ -107,6 +105,7 @@ function ClaimableModule(props: ModuleInstanceProps) {
           ) ||
           (!!tokenId && isValidTokenId),
       },
+      tokenId: positiveIntegerRegex.test(tokenId) ? BigInt(tokenId) : 0n,
     },
   );
 
@@ -126,14 +125,7 @@ function ClaimableModule(props: ModuleInstanceProps) {
     !!claimConditionCurrency && claimConditionCurrency !== ZERO_ADDRESS;
 
   const currencyDecimalsQuery = useQuery({
-    queryKey: [
-      "currency-decimals",
-      {
-        contractAddress: props.contract.address,
-        chainId: props.contract.chain.id,
-        claimConditionCurrency,
-      },
-    ],
+    enabled: shouldFetchCurrencyDecimals,
     queryFn: async () => {
       if (!claimConditionCurrency) {
         throw new Error();
@@ -150,7 +142,14 @@ function ClaimableModule(props: ModuleInstanceProps) {
 
       return decimalsVal;
     },
-    enabled: shouldFetchCurrencyDecimals,
+    queryKey: [
+      "currency-decimals",
+      {
+        chainId: props.contract.chain.id,
+        claimConditionCurrency,
+        contractAddress: props.contract.address,
+      },
+    ],
   });
 
   const tokenDecimalsQuery = useReadContract(decimals, {
@@ -170,20 +169,20 @@ function ClaimableModule(props: ModuleInstanceProps) {
       if (props.contractInfo.name === "ClaimableERC721") {
         mintTx = ClaimableERC721.mint({
           contract,
-          to: values.recipient,
           quantity: values.quantity,
+          to: values.recipient,
         });
       } else if (props.contractInfo.name === "ClaimableERC20") {
         mintTx = ClaimableERC20.mint({
           contract,
-          to: values.recipient,
           quantity: values.quantity,
+          to: values.recipient,
         });
       } else if (values.tokenId) {
         mintTx = ClaimableERC1155.mint({
           contract,
-          to: values.recipient,
           quantity: values.quantity,
+          to: values.recipient,
           tokenId: BigInt(values.tokenId),
         });
       } else {
@@ -208,29 +207,29 @@ function ClaimableModule(props: ModuleInstanceProps) {
       if (props.contractInfo.name === "ClaimableERC721") {
         setClaimConditionTx = ClaimableERC721.setClaimCondition({
           ...values,
-          contract,
           allowList:
             values.allowList && values.allowList.length > 0
               ? values.allowList.map(({ address }) => address)
               : undefined,
+          contract,
         });
       } else if (props.contractInfo.name === "ClaimableERC20") {
         setClaimConditionTx = ClaimableERC20.setClaimCondition({
           ...values,
-          contract,
           allowList:
             values.allowList && values.allowList.length > 0
               ? values.allowList.map(({ address }) => address)
               : undefined,
+          contract,
         });
       } else if (values.tokenId) {
         setClaimConditionTx = ClaimableERC1155.setClaimCondition({
           ...values,
-          contract,
           allowList:
             values.allowList && values.allowList.length > 0
               ? values.allowList.map(({ address }) => address)
               : undefined,
+          contract,
           tokenId: BigInt(values.tokenId),
         });
       } else {
@@ -272,13 +271,6 @@ function ClaimableModule(props: ModuleInstanceProps) {
   return (
     <ClaimableModuleUI
       {...props}
-      client={props.contract.client}
-      primarySaleRecipientSection={{
-        data: primarySaleRecipientQuery.data
-          ? { primarySaleRecipient: primarySaleRecipientQuery.data }
-          : undefined,
-        setPrimarySaleRecipient,
-      }}
       claimConditionSection={{
         data:
           // claim conditions data is present
@@ -291,21 +283,28 @@ function ClaimableModule(props: ModuleInstanceProps) {
                 tokenDecimals: tokenDecimalsQuery.data,
               }
             : undefined,
-        setClaimCondition,
-        tokenId,
         isLoading:
           claimConditionQuery.isLoading ||
           (!!shouldFetchCurrencyDecimals && currencyDecimalsQuery.isLoading),
+        setClaimCondition,
+        tokenId,
       }}
-      isOwnerAccount={!!ownerAccount}
-      name={props.contractInfo.name}
+      client={props.contract.client}
       contractChainId={props.contract.chain.id}
-      setTokenId={setTokenId}
+      isOwnerAccount={!!ownerAccount}
       isValidTokenId={isValidTokenId}
-      noClaimConditionSet={noClaimConditionSet}
       mintSection={{
         mint,
       }}
+      name={props.contractInfo.name}
+      noClaimConditionSet={noClaimConditionSet}
+      primarySaleRecipientSection={{
+        data: primarySaleRecipientQuery.data
+          ? { primarySaleRecipient: primarySaleRecipientQuery.data }
+          : undefined,
+        setPrimarySaleRecipient,
+      }}
+      setTokenId={setTokenId}
     />
   );
 }
@@ -353,23 +352,23 @@ export function ClaimableModuleUI(
 
       <div className="flex flex-col gap-4">
         {/* Mint NFT */}
-        <Accordion type="single" collapsible className="-mx-1">
-          <AccordionItem value="metadata" className="border-none">
+        <Accordion className="-mx-1" collapsible type="single">
+          <AccordionItem className="border-none" value="metadata">
             <AccordionTrigger className="border-border border-t px-1">
               Mint {props.name === "ClaimableERC20" ? "Token" : "NFT"}
             </AccordionTrigger>
             <AccordionContent className="px-1">
               <MintNFTSection
                 client={props.client}
-                mint={props.mintSection.mint}
-                name={props.name}
                 contractChainId={props.contractChainId}
                 isLoggedIn={props.isLoggedIn}
+                mint={props.mintSection.mint}
+                name={props.name}
               />
             </AccordionContent>
           </AccordionItem>
 
-          <AccordionItem value="claim-conditions" className="border-none ">
+          <AccordionItem className="border-none " value="claim-conditions">
             <AccordionTrigger className="border-border border-t px-1 text-left">
               Claim Conditions
             </AccordionTrigger>
@@ -393,23 +392,23 @@ export function ClaimableModuleUI(
               {props.name !== "ClaimableERC1155" || props.isValidTokenId ? (
                 props.claimConditionSection.data ? (
                   <ClaimConditionSection
-                    client={props.client}
-                    isLoggedIn={props.isLoggedIn}
-                    isOwnerAccount={props.isOwnerAccount}
+                    chainId={props.contractChainId}
                     claimCondition={
                       props.claimConditionSection.data.claimCondition
                     }
-                    update={props.claimConditionSection.setClaimCondition}
-                    name={props.name}
-                    chainId={props.contractChainId}
-                    noClaimConditionSet={props.noClaimConditionSet}
+                    client={props.client}
                     currencyDecimals={
                       props.claimConditionSection.data?.currencyDecimals
                     }
+                    isLoggedIn={props.isLoggedIn}
+                    isOwnerAccount={props.isOwnerAccount}
+                    name={props.name}
+                    noClaimConditionSet={props.noClaimConditionSet}
                     tokenDecimals={
                       props.claimConditionSection.data?.tokenDecimals
                     }
                     tokenId={props.claimConditionSection.tokenId}
+                    update={props.claimConditionSection.setClaimCondition}
                   />
                 ) : (
                   <Skeleton className="h-[350px]" />
@@ -419,8 +418,8 @@ export function ClaimableModuleUI(
           </AccordionItem>
 
           <AccordionItem
-            value="primary-sale-recipient"
             className="border-none "
+            value="primary-sale-recipient"
           >
             <AccordionTrigger className="border-border border-t px-1 text-left">
               Primary Sale Recipient
@@ -429,6 +428,7 @@ export function ClaimableModuleUI(
               {props.primarySaleRecipientSection.data ? (
                 <PrimarySaleRecipientSection
                   client={props.client}
+                  contractChainId={props.contractChainId}
                   isLoggedIn={props.isLoggedIn}
                   isOwnerAccount={props.isOwnerAccount}
                   primarySaleRecipient={
@@ -437,7 +437,6 @@ export function ClaimableModuleUI(
                   update={
                     props.primarySaleRecipientSection.setPrimarySaleRecipient
                   }
-                  contractChainId={props.contractChainId}
                 />
               ) : (
                 <Skeleton className="h-[74px]" />
@@ -451,29 +450,29 @@ export function ClaimableModuleUI(
 }
 
 const claimConditionFormSchema = z.object({
-  tokenId: z.string().refine((v) => BigInt(v) >= 0n, {
-    message: "Invalid tokenId",
-  }),
-  pricePerToken: z.coerce
-    .number()
-    .min(0, { message: "Invalid price per token" })
-    .optional(),
+  allowList: z.array(z.object({ address: addressSchema })).optional(),
   currencyAddress: z.string().optional(),
-
-  maxClaimableSupply: z
+  endTime: z.date(),
+  maxClaimablePerWallet: z
     .string()
     .refine((v) => v.length === 0 || Number(v) >= 0, {
-      message: "Invalid max claimable supply",
+      message: "Invalid max claimable per wallet",
     }),
-  maxClaimablePerWallet: z
+
+  maxClaimableSupply: z
     .string()
     .refine((v) => v.length === 0 || Number(v) >= 0, {
-      message: "Invalid max claimable per wallet",
+      message: "Invalid max claimable supply",
     }),
+  pricePerToken: z.coerce
+    .number()
+    .min(0, { message: "Invalid price per token" })
+    .optional(),
 
   startTime: z.date(),
-  endTime: z.date(),
-  allowList: z.array(z.object({ address: addressSchema })).optional(),
+  tokenId: z.string().refine((v) => BigInt(v) >= 0n, {
+    message: "Invalid tokenId",
+  }),
 });
 
 export type ClaimConditionFormValues = z.infer<typeof claimConditionFormSchema>;
@@ -506,25 +505,14 @@ function ClaimConditionSection(props: {
   const form = useForm<ClaimConditionFormValues>({
     resolver: zodResolver(claimConditionFormSchema),
     values: {
-      tokenId,
+      allowList: [],
       currencyAddress:
         claimCondition?.currency === ZERO_ADDRESS
           ? NATIVE_TOKEN_ADDRESS // default to the native token address
           : claimCondition?.currency,
-      // default case is zero state, so 0 // 10 ** 18 still results in 0
-      pricePerToken: Number(
-        toTokens(claimCondition?.pricePerUnit, props.currencyDecimals || 18),
-      ),
-      maxClaimableSupply:
-        claimCondition?.availableSupply.toString() === "0" ||
-        claimCondition?.availableSupply.toString() === MAX_UINT_256
-          ? ""
-          : props.name === "ClaimableERC20"
-            ? toTokens(
-                claimCondition?.availableSupply,
-                props.tokenDecimals || 18,
-              )
-            : claimCondition?.availableSupply.toString() || "",
+      endTime: claimCondition?.endTimestamp
+        ? fromUnixTime(claimCondition?.endTimestamp)
+        : defaultEndDate,
       maxClaimablePerWallet:
         claimCondition?.maxMintPerWallet.toString() === "0" ||
         claimCondition?.maxMintPerWallet.toString() === MAX_UINT_256
@@ -535,13 +523,24 @@ function ClaimConditionSection(props: {
                 props.tokenDecimals || 18,
               )
             : claimCondition?.maxMintPerWallet.toString() || "",
+      maxClaimableSupply:
+        claimCondition?.availableSupply.toString() === "0" ||
+        claimCondition?.availableSupply.toString() === MAX_UINT_256
+          ? ""
+          : props.name === "ClaimableERC20"
+            ? toTokens(
+                claimCondition?.availableSupply,
+                props.tokenDecimals || 18,
+              )
+            : claimCondition?.availableSupply.toString() || "",
+      // default case is zero state, so 0 // 10 ** 18 still results in 0
+      pricePerToken: Number(
+        toTokens(claimCondition?.pricePerUnit, props.currencyDecimals || 18),
+      ),
       startTime: claimCondition?.startTimestamp
         ? fromUnixTime(claimCondition?.startTimestamp)
         : defaultStartDate,
-      endTime: claimCondition?.endTimestamp
-        ? fromUnixTime(claimCondition?.endTimestamp)
-        : defaultEndDate,
-      allowList: [],
+      tokenId,
     },
   });
 
@@ -559,8 +558,8 @@ function ClaimConditionSection(props: {
 
   const updateMutation = useMutation({
     mutationFn: props.update,
-    onSuccess: updateNotifications.onSuccess,
     onError: updateNotifications.onError,
+    onSuccess: updateNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -586,10 +585,10 @@ function ClaimConditionSection(props: {
           </Alert>
 
           <Button
-            onClick={() => setAddClaimConditionButtonClicked(true)}
-            variant="outline"
             className="w-full"
             disabled={!props.isOwnerAccount}
+            onClick={() => setAddClaimConditionButtonClicked(true)}
+            variant="outline"
           >
             Add Claim Condition
           </Button>
@@ -658,20 +657,20 @@ function ClaimConditionSection(props: {
               </div>
 
               <FormFieldSetup
-                htmlFor="duration"
-                label="Duration"
-                isRequired
                 errorMessage={
                   form.formState.errors?.startTime?.message ||
                   form.formState.errors?.endTime?.message
                 }
+                htmlFor="duration"
+                isRequired
+                label="Duration"
               >
                 <div>
                   <DatePickerWithRange
                     from={startTime}
-                    to={endTime}
                     setFrom={(from: Date) => form.setValue("startTime", from)}
                     setTo={(to: Date) => form.setValue("endTime", to)}
+                    to={endTime}
                   />
                 </div>
               </FormFieldSetup>
@@ -701,12 +700,12 @@ function ClaimConditionSection(props: {
                       />
                       <ToolTipLabel label="Remove address">
                         <Button
-                          variant="outline"
                           className="!text-destructive-text bg-background"
+                          disabled={!props.isOwnerAccount}
                           onClick={() => {
                             allowListFields.remove(index);
                           }}
-                          disabled={!props.isOwnerAccount}
+                          variant="outline"
                         >
                           <Trash2Icon className="size-4" />
                         </Button>
@@ -728,16 +727,16 @@ function ClaimConditionSection(props: {
 
                 <div className="flex gap-3">
                   <Button
-                    variant="outline"
-                    size="sm"
+                    className="gap-2"
+                    disabled={!props.isOwnerAccount}
                     onClick={() => {
                       // add admin by default if adding the first input
                       allowListFields.append({
                         address: "",
                       });
                     }}
-                    className="gap-2"
-                    disabled={!props.isOwnerAccount}
+                    size="sm"
+                    variant="outline"
                   >
                     <PlusIcon className="size-3" />
                     Add Address
@@ -747,15 +746,15 @@ function ClaimConditionSection(props: {
 
               <div className="flex justify-end">
                 <TransactionButton
-                  client={props.client}
-                  isLoggedIn={props.isLoggedIn}
-                  size="sm"
                   className="min-w-24"
+                  client={props.client}
                   disabled={updateMutation.isPending || !props.isOwnerAccount}
-                  type="submit"
+                  isLoggedIn={props.isLoggedIn}
                   isPending={updateMutation.isPending}
-                  txChainID={props.chainId}
+                  size="sm"
                   transactionCount={1}
+                  txChainID={props.chainId}
+                  type="submit"
                 >
                   Update
                 </TransactionButton>
@@ -798,8 +797,8 @@ function PrimarySaleRecipientSection(props: {
 
   const updateMutation = useMutation({
     mutationFn: props.update,
-    onSuccess: updateNotifications.onSuccess,
     onError: updateNotifications.onError,
+    onSuccess: updateNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -831,19 +830,19 @@ function PrimarySaleRecipientSection(props: {
 
         <div className="flex justify-end">
           <TransactionButton
-            client={props.client}
-            isLoggedIn={props.isLoggedIn}
-            size="sm"
             className="min-w-24 gap-2"
+            client={props.client}
             disabled={
               updateMutation.isPending ||
               !props.isOwnerAccount ||
               !form.formState.isDirty
             }
-            type="submit"
+            isLoggedIn={props.isLoggedIn}
             isPending={updateMutation.isPending}
-            txChainID={props.contractChainId}
+            size="sm"
             transactionCount={1}
+            txChainID={props.contractChainId}
+            type="submit"
           >
             Update
           </TransactionButton>
@@ -854,11 +853,11 @@ function PrimarySaleRecipientSection(props: {
 }
 
 const mintFormSchema = z.object({
+  quantity: z.coerce.number().min(0, { message: "Invalid quantity" }),
+  recipient: addressSchema,
   tokenId: z.string().refine((v) => v.length === 0 || Number(v) >= 0, {
     message: "Invalid tokenId",
   }),
-  quantity: z.coerce.number().min(0, { message: "Invalid quantity" }),
-  recipient: addressSchema,
 });
 
 export type MintFormValues = z.infer<typeof mintFormSchema>;
@@ -872,12 +871,12 @@ function MintNFTSection(props: {
 }) {
   const form = useForm<MintFormValues>({
     resolver: zodResolver(mintFormSchema),
+    reValidateMode: "onChange",
     values: {
-      tokenId: "",
       quantity: 0,
       recipient: "",
+      tokenId: "",
     },
-    reValidateMode: "onChange",
   });
 
   const updateNotifications = useTxNotifications(
@@ -887,8 +886,8 @@ function MintNFTSection(props: {
 
   const mintMutation = useMutation({
     mutationFn: props.mint,
-    onSuccess: updateNotifications.onSuccess,
     onError: updateNotifications.onError,
+    onSuccess: updateNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -950,15 +949,15 @@ function MintNFTSection(props: {
 
           <div className="flex justify-end">
             <TransactionButton
-              client={props.client}
-              size="sm"
               className="min-w-24 gap-2"
+              client={props.client}
               disabled={mintMutation.isPending}
-              type="submit"
+              isLoggedIn={props.isLoggedIn}
               isPending={mintMutation.isPending}
-              txChainID={props.contractChainId}
+              size="sm"
               transactionCount={1}
-              isLoggedIn={props.isLoggedIn}
+              txChainID={props.contractChainId}
+              type="submit"
             >
               Mint
             </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/CurrencySelector.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/CurrencySelector.tsx
index fb9408534e3..e604f2cbef6 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/CurrencySelector.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/CurrencySelector.tsx
@@ -1,3 +1,8 @@
+import { CURRENCIES, type CurrencyMetadata } from "constants/currencies";
+import { useMemo, useState } from "react";
+import type { ControllerRenderProps, FieldValues } from "react-hook-form";
+import type { StoredChain } from "stores/chainStores";
+import { isAddress, NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS } from "thirdweb";
 import { Button } from "@/components/ui/button";
 import { FormControl } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
@@ -9,11 +14,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { cn } from "@/lib/utils";
-import { CURRENCIES, type CurrencyMetadata } from "constants/currencies";
-import { useMemo, useState } from "react";
-import type { ControllerRenderProps, FieldValues } from "react-hook-form";
-import type { StoredChain } from "stores/chainStores";
-import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, isAddress } from "thirdweb";
 
 interface CurrencySelectorProps<
   TFieldValues extends FieldValues = FieldValues,
@@ -114,15 +114,15 @@ export function CurrencySelector<
         <Input
           {...field}
           className="w-full rounded-none"
-          required
+          onChange={(e) => setEditCustomCurrency(e.target.value)}
           placeholder="ERC20 Address"
+          required
           value={editCustomCurrency}
-          onChange={(e) => setEditCustomCurrency(e.target.value)}
         />
         <Button
           className="rounded-r-lg rounded-l-none"
-          onClick={addCustomCurrency}
           disabled={!isAddress(editCustomCurrency)}
+          onClick={addCustomCurrency}
         >
           Save
         </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/InstalledModulesTable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/InstalledModulesTable.tsx
index b61f4a2f305..ad1dfd05db9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/InstalledModulesTable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/InstalledModulesTable.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Alert, AlertTitle } from "@/components/ui/alert";
 import { CircleSlashIcon } from "lucide-react";
 import type { ThirdwebContract } from "thirdweb/contract";
 import type { Account } from "thirdweb/wallets";
+import { Alert, AlertTitle } from "@/components/ui/alert";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
 import { ModuleCard } from "./module-card";
 import { useAllModuleContractInfo } from "./moduleContractInfo";
 
@@ -52,13 +52,13 @@ export const InstalledModulesTable = (props: {
         <div className="flex flex-col gap-6">
           {installedModules.data?.map((moduleAddress) => (
             <ModuleCard
-              key={moduleAddress}
-              moduleAddress={moduleAddress}
               allModuleContractInfo={allModuleContractInfo?.data || []}
               contract={props.contract}
+              isLoggedIn={props.isLoggedIn}
+              key={moduleAddress}
+              moduleAddress={moduleAddress}
               onRemoveModule={props.refetchModules}
               ownerAccount={ownerAccount}
-              isLoggedIn={props.isLoggedIn}
             />
           ))}
         </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
index 3b5d812b91b..533ec5e7d91 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
@@ -1,4 +1,27 @@
 "use client";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import { TransactionButton } from "components/buttons/TransactionButton";
+import { useTxNotifications } from "hooks/useTxNotifications";
+import { CircleAlertIcon } from "lucide-react";
+import { useCallback } from "react";
+import { useForm } from "react-hook-form";
+import {
+  type PreparedTransaction,
+  sendAndConfirmTransaction,
+  type ThirdwebClient,
+} from "thirdweb";
+import {
+  grantRoles,
+  hasAllRoles,
+  MintableERC20,
+  MintableERC721,
+  MintableERC1155,
+} from "thirdweb/modules";
+import { useReadContract } from "thirdweb/react";
+import type { NFTMetadataInputLimited } from "types/modified-types";
+import { parseAttributes } from "utils/parseAttributes";
+import { z } from "zod";
 import {
   Accordion,
   AccordionContent,
@@ -20,28 +43,6 @@ import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Textarea } from "@/components/ui/textarea";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import { useTxNotifications } from "hooks/useTxNotifications";
-import { CircleAlertIcon } from "lucide-react";
-import { useCallback } from "react";
-import { useForm } from "react-hook-form";
-import {
-  type PreparedTransaction,
-  type ThirdwebClient,
-  sendAndConfirmTransaction,
-} from "thirdweb";
-import {
-  MintableERC20,
-  MintableERC721,
-  MintableERC1155,
-} from "thirdweb/modules";
-import { grantRoles, hasAllRoles } from "thirdweb/modules";
-import { useReadContract } from "thirdweb/react";
-import type { NFTMetadataInputLimited } from "types/modified-types";
-import { parseAttributes } from "utils/parseAttributes";
-import { z } from "zod";
 import { addressSchema } from "../zod-schemas";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
@@ -83,8 +84,8 @@ function MintableModule(props: ModuleInstanceProps) {
   );
   const hasMinterRole = useReadContract(hasAllRoles, {
     contract: contract,
-    user: ownerAccount?.address || "",
     roles: MINTER_ROLE,
+    user: ownerAccount?.address || "",
   });
 
   const isBatchMetadataInstalled = !!props.allModuleContractInfo.find(
@@ -101,8 +102,8 @@ function MintableModule(props: ModuleInstanceProps) {
       if (!hasMinterRole.data) {
         const grantRoleTx = grantRoles({
           contract,
-          user: ownerAccount.address,
           roles: MINTER_ROLE,
+          user: ownerAccount.address,
         });
 
         await sendAndConfirmTransaction({
@@ -115,22 +116,22 @@ function MintableModule(props: ModuleInstanceProps) {
       if (props.contractInfo.name === "MintableERC721") {
         mintTx = MintableERC721.mintWithRole({
           contract,
-          to: values.recipient,
           nfts: [nft],
+          to: values.recipient,
         });
       } else if (props.contractInfo.name === "MintableERC20") {
         mintTx = MintableERC20.mintWithRole({
           contract,
-          to: values.recipient,
           quantity: String(values.amount),
+          to: values.recipient,
         });
       } else if (values.useNextTokenId || values.tokenId) {
         mintTx = MintableERC1155.mintWithRole({
+          amount: BigInt(values.amount),
           contract,
+          nft,
           to: values.recipient,
-          amount: BigInt(values.amount),
           tokenId: values.tokenId ? BigInt(values.tokenId) : undefined,
-          nft,
         });
       } else {
         throw new Error("Invalid token ID");
@@ -173,15 +174,15 @@ function MintableModule(props: ModuleInstanceProps) {
   return (
     <MintableModuleUI
       {...props}
+      client={contract.client}
+      contractChainId={contract.chain.id}
+      isBatchMetadataInstalled={isBatchMetadataInstalled}
+      isOwnerAccount={!!ownerAccount}
       isPending={primarySaleRecipientQuery.isPending}
-      primarySaleRecipient={primarySaleRecipientQuery.data}
-      updatePrimaryRecipient={update}
       mint={mint}
-      isOwnerAccount={!!ownerAccount}
       name={props.contractInfo.name}
-      isBatchMetadataInstalled={isBatchMetadataInstalled}
-      contractChainId={contract.chain.id}
-      client={contract.client}
+      primarySaleRecipient={primarySaleRecipientQuery.data}
+      updatePrimaryRecipient={update}
     />
   );
 }
@@ -208,20 +209,20 @@ export function MintableModuleUI(
       {!props.isPending && (
         <div className="flex flex-col gap-4">
           {/* Mint NFT */}
-          <Accordion type="single" collapsible className="-mx-1">
-            <AccordionItem value="metadata" className="border-none">
+          <Accordion className="-mx-1" collapsible type="single">
+            <AccordionItem className="border-none" value="metadata">
               <AccordionTrigger className="border-border border-t px-1">
                 Mint NFT
               </AccordionTrigger>
               <AccordionContent className="px-1">
                 {props.isOwnerAccount && (
                   <MintNFTSection
+                    client={props.client}
+                    contractChainId={props.contractChainId}
+                    isBatchMetadataInstalled={props.isBatchMetadataInstalled}
                     isLoggedIn={props.isLoggedIn}
                     mint={props.mint}
                     name={props.name}
-                    isBatchMetadataInstalled={props.isBatchMetadataInstalled}
-                    contractChainId={props.contractChainId}
-                    client={props.client}
                   />
                 )}
                 {!props.isOwnerAccount && (
@@ -236,20 +237,20 @@ export function MintableModuleUI(
             </AccordionItem>
 
             <AccordionItem
-              value="primary-sale-recipient"
               className="border-none "
+              value="primary-sale-recipient"
             >
               <AccordionTrigger className="border-border border-t px-1">
                 Primary Sale Recipient
               </AccordionTrigger>
               <AccordionContent className="px-1">
                 <PrimarySalesSection
+                  client={props.client}
+                  contractChainId={props.contractChainId}
+                  isLoggedIn={props.isLoggedIn}
                   isOwnerAccount={props.isOwnerAccount}
                   primarySaleRecipient={props.primarySaleRecipient}
                   update={props.updatePrimaryRecipient}
-                  contractChainId={props.contractChainId}
-                  isLoggedIn={props.isLoggedIn}
-                  client={props.client}
                 />
               </AccordionContent>
             </AccordionItem>
@@ -286,8 +287,8 @@ function PrimarySalesSection(props: {
 
   const updateMutation = useMutation({
     mutationFn: props.update,
-    onSuccess: updateNotifications.onSuccess,
     onError: updateNotifications.onError,
+    onSuccess: updateNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -320,15 +321,15 @@ function PrimarySalesSection(props: {
 
         <div className="mt-4 flex justify-end">
           <TransactionButton
-            client={props.client}
-            isLoggedIn={props.isLoggedIn}
-            size="sm"
             className="min-w-24"
+            client={props.client}
             disabled={updateMutation.isPending || !props.isOwnerAccount}
-            type="submit"
+            isLoggedIn={props.isLoggedIn}
             isPending={updateMutation.isPending}
+            size="sm"
             transactionCount={1}
             txChainID={props.contractChainId}
+            type="submit"
           >
             Update
           </TransactionButton>
@@ -339,9 +340,9 @@ function PrimarySalesSection(props: {
 }
 
 const mintFormSchema = z.object({
-  useNextTokenId: z.boolean(),
   recipient: addressSchema,
   tokenId: z.coerce.number().min(0, { message: "Invalid tokenId" }).optional(),
+  useNextTokenId: z.boolean(),
 });
 
 function MintNFTSection(props: {
@@ -354,13 +355,13 @@ function MintNFTSection(props: {
 }) {
   const form = useForm<MintFormValues>({
     resolver: zodResolver(mintFormSchema),
+    reValidateMode: "onChange",
     values: {
-      useNextTokenId: false,
-      recipient: "",
-      attributes: [{ trait_type: "", value: "" }],
       amount: 1,
+      attributes: [{ trait_type: "", value: "" }],
+      recipient: "",
+      useNextTokenId: false,
     },
-    reValidateMode: "onChange",
   });
 
   const mintNotifications = useTxNotifications(
@@ -370,8 +371,8 @@ function MintNFTSection(props: {
 
   const mintMutation = useMutation({
     mutationFn: props.mint,
-    onSuccess: mintNotifications.onSuccess,
     onError: mintNotifications.onError,
+    onSuccess: mintNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -398,9 +399,9 @@ function MintNFTSection(props: {
               {/* Left */}
               <div className="shrink-0 lg:w-[300px]">
                 <NFTMediaFormGroup
+                  client={props.client}
                   form={form}
                   previewMaxWidth="300px"
-                  client={props.client}
                 />
               </div>
 
@@ -442,17 +443,17 @@ function MintNFTSection(props: {
 
                 {/* Advanced options */}
                 <Accordion
-                  type="single"
                   collapsible={
                     !(
                       form.formState.errors.background_color ||
                       form.formState.errors.external_url
                     )
                   }
+                  type="single"
                 >
                   <AccordionItem
-                    value="advanced-options"
                     className="-mx-1 border-t border-b-0"
+                    value="advanced-options"
                   >
                     <AccordionTrigger className="px-1">
                       Advanced Options
@@ -522,8 +523,8 @@ function MintNFTSection(props: {
                     <FormItem className="absolute top-0 right-0 flex items-center gap-2">
                       <CheckboxWithLabel>
                         <Checkbox
-                          className="mt-0"
                           checked={field.value}
+                          className="mt-0"
                           onCheckedChange={field.onChange}
                         />
                         Use next token ID
@@ -538,15 +539,15 @@ function MintNFTSection(props: {
 
           <div className="flex justify-end">
             <TransactionButton
-              client={props.client}
-              isLoggedIn={props.isLoggedIn}
-              size="sm"
               className="min-w-24"
+              client={props.client}
               disabled={mintMutation.isPending}
-              type="submit"
+              isLoggedIn={props.isLoggedIn}
               isPending={mintMutation.isPending}
-              txChainID={props.contractChainId}
+              size="sm"
               transactionCount={1}
+              txChainID={props.contractChainId}
+              type="submit"
             >
               Mint
             </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx
index 70f99c54f70..e451315fb3d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { FormControl, Input, Select, Skeleton, Spacer } from "@chakra-ui/react";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { TransactionButton } from "components/buttons/TransactionButton";
@@ -13,10 +12,10 @@ import { FormProvider, type UseFormReturn, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import {
   type Chain,
-  type ThirdwebClient,
-  type ThirdwebContract,
   getContract,
   sendTransaction,
+  type ThirdwebClient,
+  type ThirdwebContract,
   waitForReceipt,
 } from "thirdweb";
 import {
@@ -32,6 +31,7 @@ import {
 } from "thirdweb/utils";
 import type { Account } from "thirdweb/wallets";
 import { FormErrorMessage, FormLabel } from "tw-components";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   ModuleInstallParams,
   useModuleInstallParams,
@@ -70,8 +70,8 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
   const { errors } = formState;
 
   const { data, isPending, isFetching } = usePublishedContractsQuery({
-    client: contract.client,
     address: watch("publisherAddress"),
+    client: contract.client,
   });
 
   // filter out all the contracts that AREN'T modules
@@ -108,36 +108,36 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
       }
 
       const installTransaction = installPublishedModule({
-        contract,
         account,
+        contract,
+        moduleData,
         moduleName: watch("moduleContract"),
         publisher: watch("publisherAddress"),
         version: watch("version"),
-        moduleData,
       });
 
       const txResult = await sendTransaction({
-        transaction: installTransaction,
         account,
+        transaction: installTransaction,
       });
 
       await waitForReceipt(txResult);
     },
+    onError(err) {
+      toast.error("Failed to install module");
+      console.error("Error during installation:", err);
+    },
     onSuccess() {
       props.refetchModules();
       toast.success("Module installed successfully");
       // clear form
       reset({
-        publisherAddress: "",
         moduleContract: "",
-        version: "latest",
         moduleInstallFormParams: undefined,
+        publisherAddress: "",
+        version: "latest",
       });
     },
-    onError(err) {
-      toast.error("Failed to install module");
-      console.error("Error during installation:", err);
-    },
   });
 
   const onSubmit = async () => {
@@ -154,11 +154,11 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
 
   // Get core contract bytecode
   const coreContractByteCodeQuery = useQuery({
-    queryKey: ["getBytecode", contract.address, contract.chain.id],
     queryFn: async () => {
       const coreImplementation = await resolveImplementation(contract);
       return coreImplementation.bytecode;
     },
+    queryKey: ["getBytecode", contract.address, contract.chain.id],
     retry: false,
     // 30 minutes
     // staleTime: 1000 * 60 * 30,
@@ -166,12 +166,7 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
 
   // Get Installed module bytecodes
   const installedModuleBytecodesQuery = useQuery({
-    queryKey: [
-      "installedModuleBytecodes",
-      contract.address,
-      contract.chain.id,
-      props.installedModules.data,
-    ],
+    enabled: !!props.installedModules.data,
     queryFn: async () => {
       const moduleAddress = props.installedModules.data;
       if (!moduleAddress) {
@@ -182,9 +177,9 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
         moduleAddress.map(async (address) => {
           const result = await resolveImplementation(
             getContract({
-              client: contract.client,
               address,
               chain: contract.chain,
+              client: contract.client,
             }),
           );
 
@@ -196,7 +191,12 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
         }),
       );
     },
-    enabled: !!props.installedModules.data,
+    queryKey: [
+      "installedModuleBytecodes",
+      contract.address,
+      contract.chain.id,
+      props.installedModules.data,
+    ],
     retry: false,
     // 30 minutes
     staleTime: 1000 * 60 * 30,
@@ -204,15 +204,10 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
 
   // check if selected module is compatible with the core contract and installed modules
   const isModuleCompatibleQuery = useQuery({
-    queryKey: [
-      "isModuleCompatible",
-      contract.address,
-      contract.chain.id,
-      installedModuleBytecodesQuery.data,
-      coreContractByteCodeQuery.data,
-      selectedModule?.contractId,
-      selectedModule?.bytecodeHash,
-    ],
+    enabled:
+      !!selectedModule &&
+      !!coreContractByteCodeQuery.data &&
+      !!installedModuleBytecodesQuery.data,
     queryFn: async () => {
       if (
         !coreContractByteCodeQuery.data ||
@@ -223,24 +218,29 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
       }
 
       return isModuleCompatible({
+        client: contract.client,
         contractInfo: {
           bytecode: coreContractByteCodeQuery.data,
-          installedModuleBytecodes: installedModuleBytecodesQuery.data,
           chain: contract.chain,
+          installedModuleBytecodes: installedModuleBytecodesQuery.data,
         },
         moduleInfo: {
           bytecodeUri: selectedModule.metadata.bytecodeUri,
         },
-        client: contract.client,
       });
     },
+    queryKey: [
+      "isModuleCompatible",
+      contract.address,
+      contract.chain.id,
+      installedModuleBytecodesQuery.data,
+      coreContractByteCodeQuery.data,
+      selectedModule?.contractId,
+      selectedModule?.bytecodeHash,
+    ],
     retry: false,
     // 30 minutes
     staleTime: 1000 * 60 * 30,
-    enabled:
-      !!selectedModule &&
-      !!coreContractByteCodeQuery.data &&
-      !!installedModuleBytecodesQuery.data,
   });
 
   const selectedModuleMeta =
@@ -253,9 +253,9 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
       : undefined;
 
   const moduleInstallParams = useModuleInstallParams({
-    module: selectedModuleMeta,
-    isQueryEnabled: !!selectedModule && !!isModuleCompatibleQuery.data,
     client: contract.client,
+    isQueryEnabled: !!selectedModule && !!isModuleCompatibleQuery.data,
+    module: selectedModuleMeta,
   });
 
   return (
@@ -270,8 +270,8 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
           <FormControl isInvalid={!!errors.publisherAddress}>
             <FormLabel>Publisher</FormLabel>
             <Input
-              disabled={installMutation.isPending}
               bg="backgroundHighlight"
+              disabled={installMutation.isPending}
               placeholder="Publisher address"
               {...register("publisherAddress", {
                 required: "Publisher address is required",
@@ -290,16 +290,16 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
           >
             <FormLabel>Module Name</FormLabel>
             <Skeleton
-              isLoaded={!!modulesOnly.length || !isFetching}
               borderRadius="lg"
+              isLoaded={!!modulesOnly.length || !isFetching}
             >
               <Select
+                bg="backgroundHighlight"
                 disabled={
                   installMutation.isPending ||
                   modulesOnly?.length === 0 ||
                   isPending
                 }
-                bg="backgroundHighlight"
                 {...moduleContractInputProps}
                 onChange={(e) => {
                   // reset version when module changes
@@ -342,8 +342,9 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
 
           <FormControl isInvalid={!!errors.version} isRequired={true}>
             <FormLabel>Module Version</FormLabel>
-            <Skeleton isLoaded={!allVersions.isFetching} borderRadius="lg">
+            <Skeleton borderRadius="lg" isLoaded={!allVersions.isFetching}>
               <Select
+                bg="backgroundHighlight"
                 disabled={
                   !allVersions.data ||
                   allVersions.isPending ||
@@ -351,7 +352,6 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
                   installMutation.isPending ||
                   isModuleCompatibleQuery.isFetching
                 }
-                bg="backgroundHighlight"
                 w="full"
                 {...register("version", {
                   required: "Version is required",
@@ -376,9 +376,9 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
           !isModuleCompatibleQuery.isFetching &&
           moduleInstallParams.data.params.length > 0 && (
             <ModuleInstallParams
-              installParams={moduleInstallParams.data}
-              form={form}
               disableInputs={installMutation.isPending}
+              form={form}
+              installParams={moduleInstallParams.data}
             />
           )
         )}
@@ -388,18 +388,18 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
         {/* Submit */}
         <div className="flex justify-end">
           <TransactionButton
-            client={contract.client}
-            isLoggedIn={props.isLoggedIn}
-            txChainID={contract.chain.id}
-            transactionCount={1}
-            isPending={installMutation.isPending}
-            type="submit"
             className="self-end"
+            client={contract.client}
             disabled={
               !formState.isValid ||
               isModuleCompatibleQuery.data === false ||
               isModuleCompatibleQuery.isFetching
             }
+            isLoggedIn={props.isLoggedIn}
+            isPending={installMutation.isPending}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             Install
           </TransactionButton>
@@ -432,8 +432,8 @@ async function isModuleCompatible(options: {
   try {
     const isCompatible = await checkModulesCompatibility({
       chain: options.contractInfo.chain,
-      coreBytecode: options.contractInfo.bytecode,
       client: options.client,
+      coreBytecode: options.contractInfo.bytecode,
       moduleBytecodes: [
         moduleBytecode,
         ...options.contractInfo.installedModuleBytecodes,
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/OpenEditionMetadata.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/OpenEditionMetadata.tsx
index 3e4d888cd9d..4d45fbf2f89 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/OpenEditionMetadata.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/OpenEditionMetadata.tsx
@@ -1,4 +1,14 @@
 "use client";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import { TransactionButton } from "components/buttons/TransactionButton";
+import { useTxNotifications } from "hooks/useTxNotifications";
+import { CircleAlertIcon } from "lucide-react";
+import { useCallback } from "react";
+import { useForm } from "react-hook-form";
+import { sendAndConfirmTransaction, type ThirdwebClient } from "thirdweb";
+import { OpenEditionMetadataERC721 } from "thirdweb/modules";
+import { z } from "zod";
 import {
   Accordion,
   AccordionContent,
@@ -16,24 +26,14 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import { useTxNotifications } from "hooks/useTxNotifications";
-import { CircleAlertIcon } from "lucide-react";
-import { useCallback } from "react";
-import { useForm } from "react-hook-form";
-import { type ThirdwebClient, sendAndConfirmTransaction } from "thirdweb";
-import { OpenEditionMetadataERC721 } from "thirdweb/modules";
-import { z } from "zod";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
 
 const setSharedMetadataFormSchema = z.object({
-  name: z.string().min(1),
+  animationUri: z.string().optional(),
   description: z.string().min(1),
   imageUri: z.string().optional(),
-  animationUri: z.string().optional(),
+  name: z.string().min(1),
 });
 
 export type SetSharedMetadataFormValues = z.infer<
@@ -52,16 +52,16 @@ function OpenEditionMetadataModule(props: ModuleInstanceProps) {
       const setSharedMetadataTx = OpenEditionMetadataERC721.setSharedMetadata({
         contract,
         metadata: {
-          name: values.name,
+          animationURI: values.animationUri || "",
           description: values.description,
           imageURI: values.imageUri || "",
-          animationURI: values.animationUri || "",
+          name: values.name,
         },
       });
 
       await sendAndConfirmTransaction({
-        transaction: setSharedMetadataTx,
         account: ownerAccount,
+        transaction: setSharedMetadataTx,
       });
     },
     [contract, ownerAccount],
@@ -70,10 +70,10 @@ function OpenEditionMetadataModule(props: ModuleInstanceProps) {
   return (
     <OpenEditionMetadataModuleUI
       {...props}
-      setSharedMetadata={setSharedMetadata}
-      isOwnerAccount={!!props.ownerAccount}
-      contractChainId={props.contract.chain.id}
       client={props.contract.client}
+      contractChainId={props.contract.chain.id}
+      isOwnerAccount={!!props.ownerAccount}
+      setSharedMetadata={setSharedMetadata}
     />
   );
 }
@@ -89,18 +89,18 @@ export function OpenEditionMetadataModuleUI(
   return (
     <ModuleCardUI {...props}>
       <div className="h-1" />
-      <Accordion type="single" collapsible className="-mx-1">
-        <AccordionItem value="metadata" className="border-none">
+      <Accordion className="-mx-1" collapsible type="single">
+        <AccordionItem className="border-none" value="metadata">
           <AccordionTrigger className="border-border border-t px-1">
             Set Shared Metadata
           </AccordionTrigger>
           <AccordionContent className="px-1">
             {props.isOwnerAccount && (
               <SetSharedMetadataSection
-                setSharedMetadata={props.setSharedMetadata}
+                client={props.client}
                 contractChainId={props.contractChainId}
                 isLoggedIn={props.isLoggedIn}
-                client={props.client}
+                setSharedMetadata={props.setSharedMetadata}
               />
             )}
             {!props.isOwnerAccount && (
@@ -127,13 +127,13 @@ function SetSharedMetadataSection(props: {
 }) {
   const form = useForm<SetSharedMetadataFormValues>({
     resolver: zodResolver(setSharedMetadataFormSchema),
+    reValidateMode: "onChange",
     values: {
-      name: "",
+      animationUri: "",
       description: "",
       imageUri: "",
-      animationUri: "",
+      name: "",
     },
-    reValidateMode: "onChange",
   });
 
   const setSharedMetadataNotifications = useTxNotifications(
@@ -143,8 +143,8 @@ function SetSharedMetadataSection(props: {
 
   const setSharedMetadataMutation = useMutation({
     mutationFn: props.setSharedMetadata,
-    onSuccess: setSharedMetadataNotifications.onSuccess,
     onError: setSharedMetadataNotifications.onError,
+    onSuccess: setSharedMetadataNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -214,15 +214,15 @@ function SetSharedMetadataSection(props: {
 
           <div className="flex justify-end">
             <TransactionButton
-              size="sm"
-              client={props.client}
               className="min-w-24"
+              client={props.client}
               disabled={setSharedMetadataMutation.isPending}
-              type="submit"
+              isLoggedIn={props.isLoggedIn}
               isPending={setSharedMetadataMutation.isPending}
+              size="sm"
               transactionCount={1}
               txChainID={props.contractChainId}
-              isLoggedIn={props.isLoggedIn}
+              type="submit"
             >
               Update
             </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx
index 3583194cf69..63886ec52ef 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx
@@ -1,4 +1,15 @@
 "use client";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import { TransactionButton } from "components/buttons/TransactionButton";
+import { useTxNotifications } from "hooks/useTxNotifications";
+import { CircleAlertIcon } from "lucide-react";
+import { useCallback } from "react";
+import { useForm } from "react-hook-form";
+import { sendAndConfirmTransaction, type ThirdwebClient } from "thirdweb";
+import { RoyaltyERC721, RoyaltyERC1155 } from "thirdweb/modules";
+import { useReadContract } from "thirdweb/react";
+import { z } from "zod";
 import {
   Accordion,
   AccordionContent,
@@ -16,17 +27,6 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Skeleton } from "@/components/ui/skeleton";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import { useTxNotifications } from "hooks/useTxNotifications";
-import { CircleAlertIcon } from "lucide-react";
-import { useCallback } from "react";
-import { useForm } from "react-hook-form";
-import { type ThirdwebClient, sendAndConfirmTransaction } from "thirdweb";
-import { RoyaltyERC721, RoyaltyERC1155 } from "thirdweb/modules";
-import { useReadContract } from "thirdweb/react";
-import { z } from "zod";
 import { addressSchema } from "../zod-schemas";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
@@ -63,10 +63,10 @@ function RoyaltyModule(props: ModuleInstanceProps) {
         ? RoyaltyERC721.setRoyaltyInfoForToken
         : RoyaltyERC1155.setRoyaltyInfoForToken;
       const setRoyaltyForTokenTx = setRoyaltyInfoForToken({
-        contract: contract,
-        recipient: values.recipient,
         // BPS is 10_000 so we need to multiply by 100
         bps: Number(values.percentage) * 100,
+        contract: contract,
+        recipient: values.recipient,
         tokenId: BigInt(values.tokenId),
       });
 
@@ -124,8 +124,8 @@ function RoyaltyModule(props: ModuleInstanceProps) {
 
         const setSaleConfigTx = setDefaultRoyaltyInfo({
           contract: contract,
-          royaltyRecipient: values.recipient,
           royaltyBps: Number(values.percentage) * 100,
+          royaltyRecipient: values.recipient,
         });
 
         await sendAndConfirmTransaction({
@@ -140,17 +140,17 @@ function RoyaltyModule(props: ModuleInstanceProps) {
   return (
     <RoyaltyModuleUI
       {...props}
+      client={props.contract.client}
+      contractChainId={props.contract.chain.id}
+      defaultRoyaltyInfo={defaultRoyaltyInfoQuery.data}
+      isOwnerAccount={!!ownerAccount}
       isPending={
         transferValidatorQuery.isPending || defaultRoyaltyInfoQuery.isPending
       }
-      transferValidator={transferValidatorQuery.data}
-      defaultRoyaltyInfo={defaultRoyaltyInfoQuery.data}
       setDefaultRoyaltyInfo={setDefaultRoyaltyInfo}
-      setTransferValidator={setTransferValidator}
       setRoyaltyInfoForToken={setRoyaltyInfoForToken}
-      isOwnerAccount={!!ownerAccount}
-      contractChainId={props.contract.chain.id}
-      client={props.contract.client}
+      setTransferValidator={setTransferValidator}
+      transferValidator={transferValidatorQuery.data}
     />
   );
 }
@@ -176,18 +176,18 @@ export function RoyaltyModuleUI(
       {props.isPending && <Skeleton className="h-[74px]" />}
 
       {!props.isPending && (
-        <Accordion type="single" collapsible className="-mx-1">
-          <AccordionItem value="royaltyPerToken" className="border-none">
+        <Accordion className="-mx-1" collapsible type="single">
+          <AccordionItem className="border-none" value="royaltyPerToken">
             <AccordionTrigger className="border-border border-t px-1">
               Royalty Info Per Token
             </AccordionTrigger>
             <AccordionContent className="px-1">
               {props.isOwnerAccount ? (
                 <RoyaltyInfoPerTokenSection
-                  setRoyaltyInfoForToken={props.setRoyaltyInfoForToken}
+                  client={props.client}
                   contractChainId={props.contractChainId}
                   isLoggedIn={props.isLoggedIn}
-                  client={props.client}
+                  setRoyaltyInfoForToken={props.setRoyaltyInfoForToken}
                 />
               ) : (
                 <Alert variant="info">
@@ -200,18 +200,18 @@ export function RoyaltyModuleUI(
             </AccordionContent>
           </AccordionItem>
 
-          <AccordionItem value="default-royalty-info" className="border-none">
+          <AccordionItem className="border-none" value="default-royalty-info">
             <AccordionTrigger className="border-border border-t px-1">
               Default Royalty Info
             </AccordionTrigger>
             <AccordionContent className="px-1">
               {props.isOwnerAccount ? (
                 <DefaultRoyaltyInfoSection
-                  update={props.setDefaultRoyaltyInfo}
-                  defaultRoyaltyInfo={props.defaultRoyaltyInfo}
+                  client={props.client}
                   contractChainId={props.contractChainId}
+                  defaultRoyaltyInfo={props.defaultRoyaltyInfo}
                   isLoggedIn={props.isLoggedIn}
-                  client={props.client}
+                  update={props.setDefaultRoyaltyInfo}
                 />
               ) : (
                 <Alert variant="info">
@@ -224,18 +224,18 @@ export function RoyaltyModuleUI(
             </AccordionContent>
           </AccordionItem>
 
-          <AccordionItem value="transfer-validator" className="border-none">
+          <AccordionItem className="border-none" value="transfer-validator">
             <AccordionTrigger className="border-border border-t px-1">
               Transfer Validator
             </AccordionTrigger>
             <AccordionContent className="px-1">
               {props.isOwnerAccount ? (
                 <TransferValidatorSection
-                  update={props.setTransferValidator}
-                  transferValidator={props.transferValidator}
+                  client={props.client}
                   contractChainId={props.contractChainId}
                   isLoggedIn={props.isLoggedIn}
-                  client={props.client}
+                  transferValidator={props.transferValidator}
+                  update={props.setTransferValidator}
                 />
               ) : (
                 <Alert variant="info">
@@ -254,17 +254,17 @@ export function RoyaltyModuleUI(
 }
 
 const royaltyInfoFormSchema = z.object({
-  tokenId: z.string().refine((v) => v.length > 0 && Number(v) >= 0, {
-    message: "Invalid tokenId",
-  }),
-
-  recipient: addressSchema,
   percentage: z
     .string()
     .min(1, { message: "Invalid percentage" })
     .refine((v) => Number(v) === 0 || (Number(v) >= 0.01 && Number(v) <= 100), {
       message: "Invalid percentage",
     }),
+
+  recipient: addressSchema,
+  tokenId: z.string().refine((v) => v.length > 0 && Number(v) >= 0, {
+    message: "Invalid tokenId",
+  }),
 });
 
 export type RoyaltyInfoFormValues = z.infer<typeof royaltyInfoFormSchema>;
@@ -277,12 +277,12 @@ function RoyaltyInfoPerTokenSection(props: {
 }) {
   const form = useForm<RoyaltyInfoFormValues>({
     resolver: zodResolver(royaltyInfoFormSchema),
+    reValidateMode: "onChange",
     values: {
-      tokenId: "",
-      recipient: "",
       percentage: "",
+      recipient: "",
+      tokenId: "",
     },
-    reValidateMode: "onChange",
   });
 
   const setRoyaltyInfoForTokenNotifications = useTxNotifications(
@@ -292,8 +292,8 @@ function RoyaltyInfoPerTokenSection(props: {
 
   const setRoyaltyInfoForTokenMutation = useMutation({
     mutationFn: props.setRoyaltyInfoForToken,
-    onSuccess: setRoyaltyInfoForTokenNotifications.onSuccess,
     onError: setRoyaltyInfoForTokenNotifications.onError,
+    onSuccess: setRoyaltyInfoForTokenNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -353,15 +353,15 @@ function RoyaltyInfoPerTokenSection(props: {
 
           <div className="mt-4 flex justify-end">
             <TransactionButton
-              client={props.client}
-              isLoggedIn={props.isLoggedIn}
-              size="sm"
               className="min-w-24"
+              client={props.client}
               disabled={setRoyaltyInfoForTokenMutation.isPending}
-              type="submit"
+              isLoggedIn={props.isLoggedIn}
               isPending={setRoyaltyInfoForTokenMutation.isPending}
+              size="sm"
               transactionCount={1}
               txChainID={props.contractChainId}
+              type="submit"
             >
               Update
             </TransactionButton>
@@ -373,13 +373,13 @@ function RoyaltyInfoPerTokenSection(props: {
 }
 
 const defaultRoyaltyFormSchema = z.object({
-  recipient: addressSchema,
   percentage: z
     .string()
     .min(1, { message: "Invalid percentage" })
     .refine((v) => Number(v) === 0 || (Number(v) >= 0.01 && Number(v) <= 100), {
       message: "Invalid percentage",
     }),
+  recipient: addressSchema,
 });
 
 export type DefaultRoyaltyFormValues = z.infer<typeof defaultRoyaltyFormSchema>;
@@ -396,13 +396,13 @@ function DefaultRoyaltyInfoSection(props: {
 
   const form = useForm<DefaultRoyaltyFormValues>({
     resolver: zodResolver(defaultRoyaltyFormSchema),
+    reValidateMode: "onChange",
     values: {
-      recipient: defaultRoyaltyRecipient || "",
       percentage: defaultRoyaltyPercentage
         ? String(defaultRoyaltyPercentage / 100)
         : "",
+      recipient: defaultRoyaltyRecipient || "",
     },
-    reValidateMode: "onChange",
   });
 
   const updateNotifications = useTxNotifications(
@@ -412,8 +412,8 @@ function DefaultRoyaltyInfoSection(props: {
 
   const updateMutation = useMutation({
     mutationFn: props.update,
-    onSuccess: updateNotifications.onSuccess,
     onError: updateNotifications.onError,
+    onSuccess: updateNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -459,15 +459,15 @@ function DefaultRoyaltyInfoSection(props: {
 
           <div className="mt-4 flex justify-end">
             <TransactionButton
-              client={props.client}
-              size="sm"
               className="min-w-24"
+              client={props.client}
               disabled={updateMutation.isPending}
-              type="submit"
-              transactionCount={1}
+              isLoggedIn={props.isLoggedIn}
               isPending={updateMutation.isPending}
+              size="sm"
+              transactionCount={1}
               txChainID={props.contractChainId}
-              isLoggedIn={props.isLoggedIn}
+              type="submit"
             >
               Update
             </TransactionButton>
@@ -495,10 +495,10 @@ function TransferValidatorSection(props: {
 }) {
   const form = useForm<TransferValidatorFormValues>({
     resolver: zodResolver(transferValidatorFormSchema),
+    reValidateMode: "onChange",
     values: {
       transferValidator: props.transferValidator || "",
     },
-    reValidateMode: "onChange",
   });
 
   const updateNotifications = useTxNotifications(
@@ -508,8 +508,8 @@ function TransferValidatorSection(props: {
 
   const updateMutation = useMutation({
     mutationFn: props.update,
-    onSuccess: updateNotifications.onSuccess,
     onError: updateNotifications.onError,
+    onSuccess: updateNotifications.onSuccess,
   });
 
   const onSubmit = async () => {
@@ -539,15 +539,15 @@ function TransferValidatorSection(props: {
 
         <div className="mt-4 flex justify-end">
           <TransactionButton
-            client={props.client}
-            isLoggedIn={props.isLoggedIn}
-            size="sm"
             className="min-w-24 gap-2"
+            client={props.client}
             disabled={updateMutation.isPending}
-            type="submit"
+            isLoggedIn={props.isLoggedIn}
             isPending={updateMutation.isPending}
+            size="sm"
             transactionCount={1}
             txChainID={props.contractChainId}
+            type="submit"
           >
             Update
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
index 7a4f069c667..24388a9a7fc 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
@@ -1,19 +1,5 @@
 "use client";
 
-import { Alert, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { Skeleton } from "@/components/ui/skeleton";
-import { Switch } from "@/components/ui/switch";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
 import { TransactionButton } from "components/buttons/TransactionButton";
@@ -29,6 +15,20 @@ import {
 } from "thirdweb/modules";
 import { useReadContract } from "thirdweb/react";
 import { z } from "zod";
+import { Alert, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Skeleton } from "@/components/ui/skeleton";
+import { Switch } from "@/components/ui/switch";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import { addressSchema } from "../zod-schemas";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
@@ -80,8 +80,8 @@ function TransferableModule(props: ModuleInstanceProps) {
         });
 
         await sendAndConfirmTransaction({
-          transaction: setTransferableTx,
           account: ownerAccount,
+          transaction: setTransferableTx,
         });
       }
 
@@ -100,8 +100,8 @@ function TransferableModule(props: ModuleInstanceProps) {
           });
 
           await sendAndConfirmTransaction({
-            transaction: setTransferableForTx,
             account: ownerAccount,
+            transaction: setTransferableForTx,
           });
         }),
       );
@@ -117,13 +117,13 @@ function TransferableModule(props: ModuleInstanceProps) {
   return (
     <TransferableModuleUI
       {...props}
+      adminAddress={props.ownerAccount?.address || ""}
+      client={props.contract.client}
+      contractChainId={props.contract.chain.id}
+      isOwnerAccount={!!props.ownerAccount}
       isPending={isTransferEnabledQuery.isPending}
       isRestricted={!isTransferEnabledQuery.data}
-      adminAddress={props.ownerAccount?.address || ""}
       update={update}
-      isOwnerAccount={!!props.ownerAccount}
-      contractChainId={props.contract.chain.id}
-      client={props.contract.client}
     />
   );
 }
@@ -142,11 +142,11 @@ export function TransferableModuleUI(
 ) {
   const form = useForm<TransferableModuleFormValues>({
     resolver: zodResolver(formSchema),
+    reValidateMode: "onChange",
     values: {
       allowList: [],
       isRestricted: props.isRestricted,
     },
-    reValidateMode: "onChange",
   });
 
   const updateMutation = useMutation({
@@ -169,8 +169,8 @@ export function TransferableModuleUI(
 
     const promise = updateMutation.mutateAsync(values);
     toast.promise(promise, {
-      success: "Successfully updated transfer restrictions",
       error: (error) => `Failed to update transfer restrictions: ${error}`,
+      success: "Successfully updated transfer restrictions",
     });
   };
 
@@ -185,23 +185,23 @@ export function TransferableModuleUI(
           updateButton={() => {
             return (
               <TransactionButton
-                client={props.client}
-                size="sm"
                 className="min-w-24 gap-2"
-                type="submit"
+                client={props.client}
                 disabled={
                   props.isPending ||
                   !props.isOwnerAccount ||
                   !form.formState.isDirty
                 }
+                isLoggedIn={props.isLoggedIn}
                 isPending={updateMutation.isPending}
+                size="sm"
                 transactionCount={
                   // if already restricted, only need to send the allowlist txs
                   // else - need to send one more
                   (props.isRestricted ? 0 : 1) + allowListLength
                 }
                 txChainID={props.contractChainId}
-                isLoggedIn={props.isLoggedIn}
+                type="submit"
               >
                 Update
               </TransactionButton>
@@ -218,7 +218,7 @@ export function TransferableModuleUI(
                   control={form.control}
                   name="isRestricted"
                   render={({ field }) => {
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    // biome-ignore lint/correctness/noUnusedVariables: explicitly removing the value field here
                     const { value, ...restField } = field;
 
                     return (
@@ -228,8 +228,8 @@ export function TransferableModuleUI(
                           <Switch
                             {...restField}
                             checked={field.value}
-                            disabled={!props.isOwnerAccount}
                             className="!m-0"
+                            disabled={!props.isOwnerAccount}
                             onCheckedChange={(v) => {
                               field.onChange(v);
 
@@ -296,12 +296,12 @@ export function TransferableModuleUI(
                         />
                         <ToolTipLabel label="Remove address">
                           <Button
-                            variant="outline"
                             className="!text-destructive-text bg-background"
+                            disabled={!props.isOwnerAccount}
                             onClick={() => {
                               formFields.remove(index);
                             }}
-                            disabled={!props.isOwnerAccount}
+                            variant="outline"
                           >
                             <Trash2Icon className="size-4" />
                           </Button>
@@ -315,8 +315,8 @@ export function TransferableModuleUI(
                   {/* Add Addresses Actions */}
                   <div className="flex gap-3">
                     <Button
-                      variant="outline"
-                      size="sm"
+                      className="gap-2"
+                      disabled={!props.isOwnerAccount}
                       onClick={() => {
                         // add admin by default if adding the first input
                         formFields.append({
@@ -326,8 +326,8 @@ export function TransferableModuleUI(
                               : "",
                         });
                       }}
-                      className="gap-2"
-                      disabled={!props.isOwnerAccount}
+                      size="sm"
+                      variant="outline"
                     >
                       <PlusIcon className="size-3" />
                       Add Address
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/batchMetadata.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/batchMetadata.stories.tsx
index 2944d50fd79..df6cccd3f77 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/batchMetadata.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/batchMetadata.stories.tsx
@@ -1,25 +1,25 @@
-import { Checkbox } from "@/components/ui/checkbox";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useMutation } from "@tanstack/react-query";
 import type { TransactionError } from "contexts/error-handler";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { toast } from "sonner";
 import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
 import { ZERO_ADDRESS } from "thirdweb";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   BatchMetadataModuleUI,
   type UploadMetadataFormValues,
 } from "./BatchMetadata";
 
 const meta = {
-  title: "Modules/BatchMetadata",
   component: Component,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Modules/BatchMetadata",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -39,11 +39,11 @@ function Component() {
     (error as TransactionError).reason = "This is a test reason error";
     (error as TransactionError).info = {
       from: ZERO_ADDRESS,
-      to: ZERO_ADDRESS,
       network: {
-        name: "test",
         chainId: 1,
+        name: "test",
       },
+      to: ZERO_ADDRESS,
     };
     throw error;
   }
@@ -58,9 +58,9 @@ function Component() {
   });
 
   const contractInfo = {
-    name: "Module Name",
     description:
       "lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore ",
+    name: "Module Name",
     publisher: "0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024",
     version: "1.0.0",
   };
@@ -74,26 +74,25 @@ function Component() {
 
         <div className="flex items-center gap-5">
           <CheckboxWithLabel
-            value={isOwner}
-            onChange={setIsOwner}
-            id="isOwner"
             label="Is Owner"
+            onChange={setIsOwner}
+            value={isOwner}
           />
         </div>
 
         <BadgeContainer label="Default">
           <BatchMetadataModuleUI
-            isLoggedIn={true}
+            client={storybookThirdwebClient}
+            contractChainId={1}
             contractInfo={contractInfo}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             moduleAddress="0x0000000000000000000000000000000000000000"
-            uploadMetadata={uploadMetadataStub}
-            client={storybookThirdwebClient}
             uninstallButton={{
-              onClick: async () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: async () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            contractChainId={1}
+            uploadMetadata={uploadMetadataStub}
           />
         </BadgeContainer>
       </div>
@@ -104,20 +103,20 @@ function Component() {
 function CheckboxWithLabel(props: {
   value: boolean;
   onChange: (value: boolean) => void;
-  id: string;
   label: string;
 }) {
+  const id = useId();
   return (
     <div className="items-top flex space-x-2">
       <Checkbox
-        id={props.id}
         checked={props.value}
+        id={id}
         onCheckedChange={(v) => props.onChange(!!v)}
       />
       <div className="grid gap-1.5 leading-none">
         <label
-          htmlFor={props.id}
           className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+          htmlFor={id}
         >
           {props.label}
         </label>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx
index 71a9a1897af..c4e2f909e6d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx
@@ -1,36 +1,36 @@
-import { Checkbox } from "@/components/ui/checkbox";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useMutation } from "@tanstack/react-query";
 import { subDays } from "date-fns";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { toast } from "sonner";
 import { storybookThirdwebClient } from "stories/utils";
 import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS } from "thirdweb";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { checksumAddress } from "thirdweb/utils";
+import { Checkbox } from "@/components/ui/checkbox";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import {
+  ClaimableModuleUI,
   type ClaimConditionFormValues,
   type ClaimConditionValue,
-  ClaimableModuleUI,
   type MintFormValues,
   type PrimarySaleRecipientFormValues,
 } from "./Claimable";
 
 const meta = {
-  title: "Modules/Claimable",
   component: Component,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Modules/Claimable",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -43,16 +43,16 @@ export const Variants: Story = {
 const testAddress1 = "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37";
 
 const claimCondition = {
+  allowlistMerkleRoot: ZERO_ADDRESS,
+  auxData: "0x",
   availableSupply: BigInt(100),
-  maxMintPerWallet: BigInt(10),
-  pricePerUnit: 10000000000000000000n,
   // we get checksummed NATIVE_TOKEN_ADDRESS from claim condition query for native token
   currency: checksumAddress(NATIVE_TOKEN_ADDRESS),
+  endTimestamp: Date.now() / 1000,
+  maxMintPerWallet: BigInt(10),
+  pricePerUnit: 10000000000000000000n,
   // last week
   startTimestamp: subDays(new Date(), 7).getTime() / 1000,
-  endTimestamp: new Date().getTime() / 1000,
-  allowlistMerkleRoot: ZERO_ADDRESS,
-  auxData: "0x",
 } as ClaimConditionValue;
 
 function Component() {
@@ -91,9 +91,9 @@ function Component() {
   });
 
   const contractInfo = {
-    name: "Module Name",
     description:
       "lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore ",
+    name: "Module Name",
     publisher: "0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024",
     version: "1.0.0",
   };
@@ -107,13 +107,12 @@ function Component() {
 
         <div className="flex flex-wrap items-center gap-5">
           <CheckboxWithLabel
-            value={isOwner}
-            onChange={setIsOwner}
-            id="isOwner"
             label="Is Owner"
+            onChange={setIsOwner}
+            value={isOwner}
           />
 
-          <Select value={name} onValueChange={(v) => setName(v)}>
+          <Select onValueChange={(v) => setName(v)} value={name}>
             <SelectTrigger>
               <SelectValue />
             </SelectTrigger>
@@ -125,40 +124,25 @@ function Component() {
           </Select>
 
           <CheckboxWithLabel
-            value={isClaimConditionLoading}
-            onChange={setIsClaimConditionLoading}
-            id="isClaimConditionLoading"
             label="Claim Condition Section Loading"
+            onChange={setIsClaimConditionLoading}
+            value={isClaimConditionLoading}
           />
 
           <CheckboxWithLabel
-            value={isPrimarySaleRecipientLoading}
-            onChange={setIsPrimarySaleRecipientLoading}
-            id="isPrimarySaleRecipientLoading"
             label="Primary Sale Recipient Section Loading"
+            onChange={setIsPrimarySaleRecipientLoading}
+            value={isPrimarySaleRecipientLoading}
           />
 
           <CheckboxWithLabel
-            value={noClaimConditionSet}
-            onChange={setNoClaimConditionSet}
-            id="noClaimConditionSet"
             label="No Claim Condition Set"
+            onChange={setNoClaimConditionSet}
+            value={noClaimConditionSet}
           />
         </div>
 
         <ClaimableModuleUI
-          client={storybookThirdwebClient}
-          isLoggedIn={true}
-          contractInfo={contractInfo}
-          moduleAddress="0x0000000000000000000000000000000000000000"
-          primarySaleRecipientSection={{
-            data: isPrimarySaleRecipientLoading
-              ? undefined
-              : {
-                  primarySaleRecipient: testAddress1,
-                },
-            setPrimarySaleRecipient: updatePrimarySaleRecipientStub,
-          }}
           claimConditionSection={{
             data:
               isClaimConditionLoading ||
@@ -173,19 +157,31 @@ function Component() {
             setClaimCondition: updateClaimConditionStub,
             tokenId,
           }}
+          client={storybookThirdwebClient}
+          contractChainId={1}
+          contractInfo={contractInfo}
+          isLoggedIn={true}
+          isOwnerAccount={isOwner}
+          isValidTokenId={true}
           mintSection={{
             mint: mintStub,
           }}
+          moduleAddress="0x0000000000000000000000000000000000000000"
+          name={name}
+          noClaimConditionSet={noClaimConditionSet}
+          primarySaleRecipientSection={{
+            data: isPrimarySaleRecipientLoading
+              ? undefined
+              : {
+                  primarySaleRecipient: testAddress1,
+                },
+            setPrimarySaleRecipient: updatePrimarySaleRecipientStub,
+          }}
+          setTokenId={setTokenId}
           uninstallButton={{
-            onClick: async () => removeMutation.mutateAsync(),
             isPending: removeMutation.isPending,
+            onClick: async () => removeMutation.mutateAsync(),
           }}
-          isOwnerAccount={isOwner}
-          name={name}
-          contractChainId={1}
-          setTokenId={setTokenId}
-          isValidTokenId={true}
-          noClaimConditionSet={noClaimConditionSet}
         />
       </div>
     </ThirdwebProvider>
@@ -195,20 +191,21 @@ function Component() {
 function CheckboxWithLabel(props: {
   value: boolean;
   onChange: (value: boolean) => void;
-  id: string;
+
   label: string;
 }) {
+  const id = useId();
   return (
     <div className="items-top flex space-x-2">
       <Checkbox
-        id={props.id}
         checked={props.value}
+        id={id}
         onCheckedChange={(v) => props.onChange(!!v)}
       />
       <div className="grid gap-1.5 leading-none">
         <label
-          htmlFor={props.id}
           className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+          htmlFor={id}
         >
           {props.label}
         </label>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/getModuleInstalledParams.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/getModuleInstalledParams.ts
index e942650ab21..b6072c5e229 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/getModuleInstalledParams.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/getModuleInstalledParams.ts
@@ -2,7 +2,7 @@ import {
   fetchLatestPublishedContractVersion,
   fetchPublishedContractVersions,
 } from "components/contract-components/fetch-contracts-with-versions";
-import { type ThirdwebClient, isAddress } from "thirdweb";
+import { isAddress, type ThirdwebClient } from "thirdweb";
 import type { FetchDeployMetadataResult } from "thirdweb/contract";
 import { resolveAddress } from "thirdweb/extensions/ens";
 import invariant from "tiny-invariant";
@@ -21,7 +21,7 @@ export async function getModuleInstalledParams(
         name: ext.publisherAddress,
       });
 
-  let publishedModule: FetchDeployMetadataResult | undefined = undefined;
+  let publishedModule: FetchDeployMetadataResult | undefined;
 
   if (ext.moduleVersion === "latest") {
     publishedModule = await fetchLatestPublishedContractVersion(
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/install-module-params.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/install-module-params.tsx
index f3bd83c86ba..f4ffd416195 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/install-module-params.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/install-module-params.tsx
@@ -4,8 +4,8 @@ import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import type { ThirdwebClient } from "thirdweb";
 import invariant from "tiny-invariant";
 import { FormErrorMessage, FormLabel } from "tw-components";
-import type { InstallModuleForm } from "./ModuleForm";
 import { getModuleInstalledParams } from "./getModuleInstalledParams";
+import type { InstallModuleForm } from "./ModuleForm";
 
 export type ModuleMeta = {
   moduleName: string;
@@ -24,12 +24,12 @@ export function useModuleInstallParams(props: {
 }) {
   const { module, isQueryEnabled, client } = props;
   return useQuery({
-    queryKey: ["useModuleInstallParams", module],
+    enabled: !!(isQueryEnabled && module),
     queryFn: async () => {
       invariant(module, "module must be defined");
       return await getModuleInstalledParams(module, client);
     },
-    enabled: !!(isQueryEnabled && module),
+    queryKey: ["useModuleInstallParams", module],
     refetchOnWindowFocus: false,
   });
 }
@@ -49,19 +49,19 @@ export function ModuleInstallParams(props: {
 
           return (
             <FormControl
-              key={formFieldKey}
-              isRequired
               isInvalid={
                 !!form.getFieldState(formFieldKey, form.formState).error
               }
+              isRequired
+              key={formFieldKey}
             >
               <FormLabel> {param.name}</FormLabel>
               <SolidityInput
-                solidityType={param.type}
                 // @ts-expect-error - old types, need to update
                 solidityComponents={
                   "components" in param ? param.components : undefined
                 }
+                solidityType={param.type}
                 variant="filled"
                 {...form.register(formFieldKey)}
                 isDisabled={props.disableInputs}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx
index d5e648767f1..16a711e22c4 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx
@@ -1,4 +1,10 @@
 "use client";
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useMutation } from "@tanstack/react-query";
+import { useId, useState } from "react";
+import { toast } from "sonner";
+import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
+import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { Checkbox } from "@/components/ui/checkbox";
 import {
   Select,
@@ -7,26 +13,20 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useMutation } from "@tanstack/react-query";
-import { useState } from "react";
-import { toast } from "sonner";
-import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
-import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import {
-  type MintFormValues,
   MintableModuleUI,
+  type MintFormValues,
   type UpdateFormValues,
 } from "./Mintable";
 
 const meta = {
-  title: "Modules/Mintable",
   component: Component,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Modules/Mintable",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -63,9 +63,9 @@ function Component() {
   });
 
   const contractInfo = {
-    name: "Module Name",
     description:
       "lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore ",
+    name: "Module Name",
     publisher: "0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024",
     version: "1.0.0",
   };
@@ -79,20 +79,18 @@ function Component() {
 
         <div className="flex flex-wrap items-center gap-5">
           <CheckboxWithLabel
-            value={isOwner}
-            onChange={setIsOwner}
-            id="isOwner"
             label="Is Owner"
+            onChange={setIsOwner}
+            value={isOwner}
           />
 
           <CheckboxWithLabel
-            value={isBatchMetadataInstalled}
-            onChange={setIsBatchMetadataInstalled}
-            id="isBatchMetadataInstalled"
             label="isBatchMetadataInstalled"
+            onChange={setIsBatchMetadataInstalled}
+            value={isBatchMetadataInstalled}
           />
 
-          <Select value={name} onValueChange={(v) => setName(v)}>
+          <Select onValueChange={(v) => setName(v)} value={name}>
             <SelectTrigger>
               <SelectValue />
             </SelectTrigger>
@@ -107,63 +105,63 @@ function Component() {
         <BadgeContainer label="Empty Primary Sale Recipient">
           <MintableModuleUI
             client={storybookThirdwebClient}
-            isLoggedIn={true}
+            contractChainId={1}
             contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            isBatchMetadataInstalled={isBatchMetadataInstalled}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={false}
-            primarySaleRecipient={""}
-            updatePrimaryRecipient={updatePrimaryRecipientStub}
             mint={mintStub}
+            moduleAddress="0x0000000000000000000000000000000000000000"
+            name={name}
+            primarySaleRecipient={""}
             uninstallButton={{
-              onClick: async () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: async () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            name={name}
-            isBatchMetadataInstalled={isBatchMetadataInstalled}
-            contractChainId={1}
+            updatePrimaryRecipient={updatePrimaryRecipientStub}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Filled Primary Sale Recipient">
           <MintableModuleUI
             client={storybookThirdwebClient}
-            isLoggedIn={true}
+            contractChainId={1}
             contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            isBatchMetadataInstalled={isBatchMetadataInstalled}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={false}
-            primarySaleRecipient={testAddress1}
-            updatePrimaryRecipient={updatePrimaryRecipientStub}
             mint={mintStub}
+            moduleAddress="0x0000000000000000000000000000000000000000"
+            name={name}
+            primarySaleRecipient={testAddress1}
             uninstallButton={{
-              onClick: () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            name={name}
-            isBatchMetadataInstalled={isBatchMetadataInstalled}
-            contractChainId={1}
+            updatePrimaryRecipient={updatePrimaryRecipientStub}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Pending">
           <MintableModuleUI
             client={storybookThirdwebClient}
-            isLoggedIn={true}
+            contractChainId={1}
             contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            isBatchMetadataInstalled={isBatchMetadataInstalled}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={true}
-            primarySaleRecipient={testAddress1}
-            updatePrimaryRecipient={updatePrimaryRecipientStub}
             mint={mintStub}
+            moduleAddress="0x0000000000000000000000000000000000000000"
+            name={name}
+            primarySaleRecipient={testAddress1}
             uninstallButton={{
-              onClick: () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            name={name}
-            isBatchMetadataInstalled={isBatchMetadataInstalled}
-            contractChainId={1}
+            updatePrimaryRecipient={updatePrimaryRecipientStub}
           />
         </BadgeContainer>
       </div>
@@ -174,20 +172,20 @@ function Component() {
 function CheckboxWithLabel(props: {
   value: boolean;
   onChange: (value: boolean) => void;
-  id: string;
   label: string;
 }) {
+  const id = useId();
   return (
     <div className="items-top flex space-x-2">
       <Checkbox
-        id={props.id}
         checked={props.value}
+        id={id}
         onCheckedChange={(v) => props.onChange(!!v)}
       />
       <div className="grid gap-1.5 leading-none">
         <label
-          htmlFor={props.id}
           className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+          htmlFor={id}
         >
           {props.label}
         </label>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.stories.tsx
index 128f969f420..33ec54d1bef 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.stories.tsx
@@ -1,14 +1,14 @@
-import { Checkbox } from "@/components/ui/checkbox";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useMutation } from "@tanstack/react-query";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
 import { ThirdwebProvider } from "thirdweb/react";
+import { Checkbox } from "@/components/ui/checkbox";
 import { ModuleCardUI } from "./module-card";
 
 const meta = {
-  title: "Modules/ModuleCard",
   component: Component,
+  title: "Modules/ModuleCard",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -34,26 +34,28 @@ function Component() {
   });
 
   const contractInfo = {
-    name: "Module Name",
     description:
       "lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore ",
+    name: "Module Name",
     publisher: "0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024",
     version: "1.0.0",
   };
 
+  const terms1Id = useId();
+
   return (
     <ThirdwebProvider>
       <div className="container flex max-w-[1150px] flex-col gap-10 py-10">
         <div className="flex gap-2">
           <Checkbox
-            id="terms1"
             checked={isOwner}
+            id={terms1Id}
             onCheckedChange={(v) => setIsOwner(!!v)}
           />
           <div className="grid gap-1.5 leading-none">
             <label
-              htmlFor="terms1"
               className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+              htmlFor={terms1Id}
             >
               Is Owner
             </label>
@@ -62,50 +64,50 @@ function Component() {
 
         <BadgeContainer label="No Update, No Children">
           <ModuleCardUI
-            contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
             client={storybookThirdwebClient}
+            contractInfo={contractInfo}
             isOwnerAccount={isOwner}
+            moduleAddress="0x0000000000000000000000000000000000000000"
             uninstallButton={{
-              onClick: () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: () => removeMutation.mutateAsync(),
             }}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Update Button (disabled), No Children">
           <ModuleCardUI
+            client={storybookThirdwebClient}
             contractInfo={contractInfo}
+            isOwnerAccount={isOwner}
             moduleAddress="0x0000000000000000000000000000000000000000"
-            client={storybookThirdwebClient}
             uninstallButton={{
-              onClick: () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: () => removeMutation.mutateAsync(),
             }}
             updateButton={{
               isDisabled: true,
               isPending: updateMutation.isPending,
               onClick: () => updateMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Update Button (enabled), Children, Owner">
           <ModuleCardUI
+            client={storybookThirdwebClient}
             contractInfo={contractInfo}
+            isOwnerAccount={isOwner}
             moduleAddress="0x0000000000000000000000000000000000000000"
-            client={storybookThirdwebClient}
             uninstallButton={{
-              onClick: () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: () => removeMutation.mutateAsync(),
             }}
             updateButton={{
               isDisabled: false,
               isPending: updateMutation.isPending,
               onClick: () => updateMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
           >
             <div className="flex h-36 items-center justify-center rounded-lg bg-muted text-muted-foreground text-sm">
               CHILDREN
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx
index 48ff244a1fa..496237f9354 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx
@@ -1,19 +1,5 @@
 "use client";
 
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import { Skeleton } from "@/components/ui/skeleton";
 import * as Sentry from "@sentry/nextjs";
 import { useMutation } from "@tanstack/react-query";
 import { TransactionButton } from "components/buttons/TransactionButton";
@@ -22,14 +8,28 @@ import { Suspense, useEffect, useState } from "react";
 import { ErrorBoundary, type FallbackProps } from "react-error-boundary";
 import { toast } from "sonner";
 import {
-  type ThirdwebClient,
-  type ThirdwebContract,
   getContract,
   sendTransaction,
+  type ThirdwebClient,
+  type ThirdwebContract,
   waitForReceipt,
 } from "thirdweb";
 import { uninstallModuleByProxy } from "thirdweb/modules";
 import type { Account } from "thirdweb/wallets";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Button } from "@/components/ui/button";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Skeleton } from "@/components/ui/skeleton";
 import { ModuleInstance } from "./module-instance";
 import { useModuleContractInfo } from "./moduleContractInfo";
 
@@ -62,28 +62,28 @@ export function ModuleCard(props: ModuleCardProps) {
   const uninstallMutation = useMutation({
     mutationFn: async (account: Account) => {
       const uninstallTransaction = uninstallModuleByProxy({
-        contract,
         chain: contract.chain,
         client: contract.client,
-        moduleProxyAddress: moduleAddress,
+        contract,
         moduleData: "0x",
+        moduleProxyAddress: moduleAddress,
       });
 
       const txResult = await sendTransaction({
-        transaction: uninstallTransaction,
         account,
+        transaction: uninstallTransaction,
       });
 
       await waitForReceipt(txResult);
     },
-    onSuccess() {
-      toast.success("Module uninstalled successfully");
-      props.onRemoveModule();
-    },
     onError(error) {
       toast.error("Failed to uninstall module");
       console.error(error);
     },
+    onSuccess() {
+      toast.success("Module uninstalled successfully");
+      props.onRemoveModule();
+    },
   });
 
   const handleRemove = async () => {
@@ -108,30 +108,30 @@ export function ModuleCard(props: ModuleCardProps) {
           )}
         >
           <ModuleInstance
-            isLoggedIn={props.isLoggedIn}
+            allModuleContractInfo={props.allModuleContractInfo}
             contract={contract}
             contractInfo={{
-              name: contractInfo.name,
               description: contractInfo.description,
+              name: contractInfo.name,
               publisher: contractInfo.publisher,
               version: contractInfo.version,
             }}
+            isLoggedIn={props.isLoggedIn}
+            moduleAddress={moduleAddress}
             ownerAccount={ownerAccount}
             uninstallButton={{
+              isPending: uninstallMutation.isPending,
               onClick: () => {
                 setIsUninstallModalOpen(true);
               },
-              isPending: uninstallMutation.isPending,
             }}
-            moduleAddress={moduleAddress}
-            allModuleContractInfo={props.allModuleContractInfo}
           />
         </ErrorBoundary>
       </Suspense>
 
       <Dialog
-        open={isUninstallModalOpen}
         onOpenChange={setIsUninstallModalOpen}
+        open={isUninstallModalOpen}
       >
         <DialogContent>
           <form
@@ -153,22 +153,22 @@ export function ModuleCard(props: ModuleCardProps) {
 
             <DialogFooter className="mt-10 flex-row justify-end gap-3 md:gap-1">
               <Button
-                type="button"
                 onClick={() => setIsUninstallModalOpen(false)}
+                type="button"
                 variant="outline"
               >
                 Cancel
               </Button>
 
               <TransactionButton
+                className="flex"
                 client={contract.client}
                 isLoggedIn={props.isLoggedIn}
-                txChainID={contract.chain.id}
-                transactionCount={1}
                 isPending={uninstallMutation.isPending}
+                transactionCount={1}
+                txChainID={contract.chain.id}
                 type="submit"
                 variant="destructive"
-                className="flex"
               >
                 Uninstall
               </TransactionButton>
@@ -218,8 +218,8 @@ export function ModuleCardUI(props: ModuleCardUIProps) {
             <Dialog>
               <DialogTrigger asChild>
                 <Button
-                  variant="ghost"
                   className="absolute top-4 right-4 h-auto w-auto p-2 text-muted-foreground"
+                  variant="ghost"
                 >
                   <InfoIcon className="size-5" />
                 </Button>
@@ -232,7 +232,7 @@ export function ModuleCardUI(props: ModuleCardUIProps) {
                   </DialogDescription>
 
                   {/* Avoid adding focus on other elements to prevent tooltips from opening on modal open */}
-                  <input className="sr-only" aria-hidden />
+                  <input aria-hidden className="sr-only" />
 
                   <div className="h-2" />
 
@@ -264,8 +264,8 @@ export function ModuleCardUI(props: ModuleCardUIProps) {
                         Module Address
                       </p>
                       <CopyAddressButton
-                        className="text-xs"
                         address={props.moduleAddress}
+                        className="text-xs"
                         copyIconPosition="left"
                         variant="outline"
                       />
@@ -292,11 +292,11 @@ export function ModuleCardUI(props: ModuleCardUIProps) {
 
       <div className="flex flex-row justify-end gap-3 border-border border-t p-4 lg:p-6">
         <Button
-          size="sm"
-          onClick={props.uninstallButton.onClick}
-          variant="destructive"
           className="min-w-24 gap-2"
           disabled={!props.isOwnerAccount}
+          onClick={props.uninstallButton.onClick}
+          size="sm"
+          variant="destructive"
         >
           {props.uninstallButton.isPending && <Spinner className="size-4" />}
           Uninstall
@@ -306,11 +306,11 @@ export function ModuleCardUI(props: ModuleCardUIProps) {
           props.updateButton &&
           typeof props.updateButton !== "function" && (
             <Button
-              size="sm"
               className="min-w-24 gap-2"
-              type="submit"
-              onClick={props.updateButton.onClick}
               disabled={props.updateButton.isPending || !props.isOwnerAccount}
+              onClick={props.updateButton.onClick}
+              size="sm"
+              type="submit"
             >
               {props.updateButton.isPending && <Spinner className="size-4" />}
               Update
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-instance.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-instance.tsx
index 6a2588c952b..d5de42d1f98 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-instance.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-instance.tsx
@@ -55,8 +55,8 @@ export function ModuleInstance(props: ModuleInstanceProps) {
   return (
     <ModuleCardUI
       {...props}
-      isOwnerAccount={!!props.ownerAccount}
       client={props.contract.client}
+      isOwnerAccount={!!props.ownerAccount}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/moduleContractInfo.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/moduleContractInfo.ts
index 2ce30a5b2be..5c28288e449 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/moduleContractInfo.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/moduleContractInfo.ts
@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
 import { usePublishedContractsFromDeploy } from "components/contract-components/hooks";
 import { THIRDWEB_DEPLOYER_ADDRESS } from "constants/addresses";
 import { useMemo } from "react";
-import { type ThirdwebContract, getContract } from "thirdweb";
+import { getContract, type ThirdwebContract } from "thirdweb";
 import { getCompilerMetadata } from "thirdweb/contract";
 import { useActiveAccount } from "thirdweb/react";
 
@@ -29,9 +29,9 @@ export function useAllModuleContractInfo(
   contract: ThirdwebContract,
 ) {
   return useQuery({
-    queryKey: ["all-module-contract-info", installedModules, contract],
-    queryFn: () => getAllModuleContractInfo(installedModules || [], contract),
     enabled: !!contract,
+    queryFn: () => getAllModuleContractInfo(installedModules || [], contract),
+    queryKey: ["all-module-contract-info", installedModules, contract],
   });
 }
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/AdvancedNFTMetadataFormGroup.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/AdvancedNFTMetadataFormGroup.tsx
index bce2afaa91c..4cecd94d0da 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/AdvancedNFTMetadataFormGroup.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/AdvancedNFTMetadataFormGroup.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import type { UseFormReturn } from "react-hook-form";
+import type { NFTInput } from "thirdweb/utils";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import {
   FormControl,
@@ -10,8 +12,6 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import type { UseFormReturn } from "react-hook-form";
-import type { NFTInput } from "thirdweb/utils";
 
 type AdvancedNFTMetadataFormGroupValues = {
   image?: NFTInput["image"];
@@ -22,9 +22,7 @@ type AdvancedNFTMetadataFormGroupValues = {
 
 export function AdvancedNFTMetadataFormGroup<
   T extends AdvancedNFTMetadataFormGroupValues,
->(props: {
-  form: UseFormReturn<T>;
-}) {
+>(props: { form: UseFormReturn<T> }) {
   // T contains all properties of AdvancedNFTMetadataFormGroupValues, so this is a-ok
   const form =
     props.form as unknown as UseFormReturn<AdvancedNFTMetadataFormGroupValues>;
@@ -99,10 +97,10 @@ export function AdvancedNFTMetadataFormGroup<
       {!externalIsTextFile && (
         <FormFieldSetup
           errorMessage={form.formState.errors.external_url?.message}
+          helperText="This is the URL that will appear below the asset's image on OpenSea and will allow users to leave OpenSea and view the item on your site."
           htmlFor="external-url"
           isRequired={false}
           label="External URL"
-          helperText="This is the URL that will appear below the asset's image on OpenSea and will allow users to leave OpenSea and view the item on your site."
         >
           <Input
             placeholder="https://"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/NFTMediaFormGroup.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/NFTMediaFormGroup.tsx
index 9b4d4ac9c24..7d5128524c5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/NFTMediaFormGroup.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/NFTMediaFormGroup.tsx
@@ -1,9 +1,9 @@
 "use client";
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { FileInput } from "components/shared/FileInput";
 import type { UseFormReturn } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
 import type { NFTInput } from "thirdweb/utils";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import {
   getUploadedNFTMediaMeta,
   handleNFTMediaUpload,
@@ -37,21 +37,21 @@ export function NFTMediaFormGroup<T extends NFTMediaFormGroupValues>(props: {
       <FormFieldSetup
         errorMessage={mediaFileError?.message}
         htmlFor="media"
-        label="Media"
         isRequired={false}
+        label="Media"
       >
         <p className="mb-2 text-muted-foreground text-sm">
           You can upload image, audio, video, html, text, pdf, or 3d model file
         </p>
         <FileInput
-          previewMaxWidth={previewMaxWidth}
-          value={media}
-          showPreview={true}
-          setValue={setFile}
           className="max-sm:!max-w-full rounded border border-border transition-all duration-200"
-          selectOrUpload="Upload"
           client={props.client}
           helperText="Media"
+          previewMaxWidth={previewMaxWidth}
+          selectOrUpload="Upload"
+          setValue={setFile}
+          showPreview={true}
+          value={media}
         />
       </FormFieldSetup>
 
@@ -59,20 +59,20 @@ export function NFTMediaFormGroup<T extends NFTMediaFormGroupValues>(props: {
         <FormFieldSetup
           errorMessage={form.formState.errors?.image?.message}
           htmlFor="cover-image"
+          isRequired={false}
           label="Cover Image"
           tooltip="You can optionally upload an image as the cover of your NFT."
-          isRequired={false}
         >
           <FileInput
-            previewMaxWidth={previewMaxWidth}
-            client={props.client}
             accept={{ "image/*": [] }}
-            value={image}
-            showUploadButton
+            className="rounded border border-border transition-all"
+            client={props.client}
+            previewMaxWidth={previewMaxWidth}
             setValue={(file) => {
               form.setValue("image", file);
             }}
-            className="rounded border border-border transition-all"
+            showUploadButton
+            value={image}
           />
         </FormFieldSetup>
       )}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/PropertiesFormControl.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/PropertiesFormControl.tsx
index e3346fa4b77..068244c66e6 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/PropertiesFormControl.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/PropertiesFormControl.tsx
@@ -1,3 +1,5 @@
+import { PlusIcon, RotateCcwIcon, Trash2Icon } from "lucide-react";
+import { type UseFormReturn, useFieldArray } from "react-hook-form";
 import { Button } from "@/components/ui/button";
 import {
   FormControl,
@@ -6,8 +8,6 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { PlusIcon, RotateCcwIcon, Trash2Icon } from "lucide-react";
-import { type UseFormReturn, useFieldArray } from "react-hook-form";
 
 type PropertiesFormValues = {
   attributes?: {
@@ -63,9 +63,9 @@ export function PropertiesFormControl<T extends PropertiesFormValues>(props: {
               />
 
               <Button
-                variant="outline"
                 className="!text-destructive-text bg-background"
                 onClick={() => remove(index)}
+                variant="outline"
               >
                 <Trash2Icon className="size-4" />
               </Button>
@@ -76,10 +76,10 @@ export function PropertiesFormControl<T extends PropertiesFormValues>(props: {
 
       <div className="flex flex-row gap-3">
         <Button
-          size="sm"
-          variant="outline"
           className="flex items-center gap-2"
           onClick={() => append({ trait_type: "", value: "" })}
+          size="sm"
+          variant="outline"
         >
           <PlusIcon className="size-4" />
           Add Attribute
@@ -88,9 +88,9 @@ export function PropertiesFormControl<T extends PropertiesFormValues>(props: {
         {fields.length > 0 && (
           <Button
             className="flex items-center gap-2"
-            variant="outline"
-            size="sm"
             onClick={() => form.setValue("attributes", [])}
+            size="sm"
+            variant="outline"
           >
             Reset
             <RotateCcwIcon className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/handleNFTMediaUpload.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/handleNFTMediaUpload.ts
index 774de5b24d0..2e965394542 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/handleNFTMediaUpload.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/handleNFTMediaUpload.ts
@@ -66,13 +66,13 @@ export function getUploadedNFTMediaMeta<T extends MinimalNFTMetadata>(
   const errors = form.formState.errors;
 
   return {
-    media: stringOrFile(_media),
+    animation_url: stringOrFile(_animation_url),
+    external_url: stringOrFile(_external_url),
     image: stringOrFile(_image),
+    media: stringOrFile(_media),
     mediaFileError:
       errors?.animation_url || errors.external_url || errors?.image,
     showCoverImageUpload: !!_animation_url || !!_external_url,
-    animation_url: stringOrFile(_animation_url),
-    external_url: stringOrFile(_external_url),
   };
 }
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/openEditionMetadata.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/openEditionMetadata.stories.tsx
index 3e39475091d..f18c68006a1 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/openEditionMetadata.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/openEditionMetadata.stories.tsx
@@ -1,23 +1,23 @@
-import { Checkbox } from "@/components/ui/checkbox";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useMutation } from "@tanstack/react-query";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { toast } from "sonner";
 import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   OpenEditionMetadataModuleUI,
   type SetSharedMetadataFormValues,
 } from "./OpenEditionMetadata";
 
 const meta = {
-  title: "Modules/OpenEditionMetadata",
   component: Component,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Modules/OpenEditionMetadata",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -44,13 +44,15 @@ function Component() {
   });
 
   const contractInfo = {
-    name: "Module Name",
     description:
       "lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore ",
+    name: "Module Name",
     publisher: "0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024",
     version: "1.0.0",
   };
 
+  const terms1Id = useId();
+
   return (
     <ThirdwebProvider>
       <div className="container flex max-w-[1150px] flex-col gap-10 py-10">
@@ -60,14 +62,14 @@ function Component() {
 
         <div className="flex gap-2">
           <Checkbox
-            id="terms1"
             checked={isOwner}
+            id={terms1Id}
             onCheckedChange={(v) => setIsOwner(!!v)}
           />
           <div className="grid gap-1.5 leading-none">
             <label
-              htmlFor="terms1"
               className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+              htmlFor="terms1"
             >
               Is Owner
             </label>
@@ -76,17 +78,17 @@ function Component() {
 
         <BadgeContainer label="Default">
           <OpenEditionMetadataModuleUI
+            client={storybookThirdwebClient}
+            contractChainId={1}
             contractInfo={contractInfo}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             moduleAddress="0x0000000000000000000000000000000000000000"
             setSharedMetadata={setSharedMetadataStub}
             uninstallButton={{
-              onClick: async () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: async () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            client={storybookThirdwebClient}
-            contractChainId={1}
-            isLoggedIn={true}
           />
         </BadgeContainer>
       </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/royalty.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/royalty.stories.tsx
index 712a1d523d0..924822ccd77 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/royalty.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/royalty.stories.tsx
@@ -1,10 +1,10 @@
-import { Checkbox } from "@/components/ui/checkbox";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useMutation } from "@tanstack/react-query";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { toast } from "sonner";
 import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   type DefaultRoyaltyFormValues,
   type RoyaltyInfoFormValues,
@@ -13,13 +13,13 @@ import {
 } from "./Royalty";
 
 const meta = {
-  title: "Modules/Royalty",
   component: Component,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Modules/Royalty",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -58,9 +58,9 @@ function Component() {
   });
 
   const contractInfo = {
-    name: "Module Name",
     description:
       "lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore ",
+    name: "Module Name",
     publisher: "0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024",
     version: "1.0.0",
   };
@@ -74,90 +74,89 @@ function Component() {
 
         <div className="flex items-center gap-5">
           <CheckboxWithLabel
-            value={isOwner}
-            onChange={setIsOwner}
-            id="isOwner"
             label="Is Owner"
+            onChange={setIsOwner}
+            value={isOwner}
           />
         </div>
 
         <BadgeContainer label="Empty Transfer Validator & Default Royalty Info">
           <RoyaltyModuleUI
             client={storybookThirdwebClient}
+            contractChainId={1}
             contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={false}
-            setRoyaltyInfoForToken={setRoyaltyInfoForToken}
+            moduleAddress="0x0000000000000000000000000000000000000000"
             setDefaultRoyaltyInfo={setDefaultRoyaltyInfoStub}
+            setRoyaltyInfoForToken={setRoyaltyInfoForToken}
             setTransferValidator={setTransferValidatorStub}
             uninstallButton={{
-              onClick: async () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: async () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            contractChainId={1}
-            isLoggedIn={true}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Empty Transfer Validator & Non-Empty Default Royalty Info">
           <RoyaltyModuleUI
+            client={storybookThirdwebClient}
+            contractChainId={1}
             contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            defaultRoyaltyInfo={[_testAddress1, 100]}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={false}
-            setRoyaltyInfoForToken={setRoyaltyInfoForToken}
+            moduleAddress="0x0000000000000000000000000000000000000000"
             setDefaultRoyaltyInfo={setDefaultRoyaltyInfoStub}
+            setRoyaltyInfoForToken={setRoyaltyInfoForToken}
             setTransferValidator={setTransferValidatorStub}
-            defaultRoyaltyInfo={[_testAddress1, 100]}
             uninstallButton={{
-              onClick: async () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: async () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            contractChainId={1}
-            isLoggedIn={true}
-            client={storybookThirdwebClient}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Non-Empty Transfer Validator & Empty Default Royalty Info">
           <RoyaltyModuleUI
             client={storybookThirdwebClient}
+            contractChainId={1}
             contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={false}
-            setRoyaltyInfoForToken={setRoyaltyInfoForToken}
+            moduleAddress="0x0000000000000000000000000000000000000000"
             setDefaultRoyaltyInfo={setDefaultRoyaltyInfoStub}
+            setRoyaltyInfoForToken={setRoyaltyInfoForToken}
             setTransferValidator={setTransferValidatorStub}
             transferValidator={"0x0000000000000000000000000000000000000000"}
             uninstallButton={{
-              onClick: async () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: async () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            contractChainId={1}
-            isLoggedIn={true}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Non-Empty Transfer Validator & Default Royalty Info">
           <RoyaltyModuleUI
+            client={storybookThirdwebClient}
+            contractChainId={1}
             contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            defaultRoyaltyInfo={[_testAddress1, 100]}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={false}
-            setRoyaltyInfoForToken={setRoyaltyInfoForToken}
+            moduleAddress="0x0000000000000000000000000000000000000000"
             setDefaultRoyaltyInfo={setDefaultRoyaltyInfoStub}
+            setRoyaltyInfoForToken={setRoyaltyInfoForToken}
             setTransferValidator={setTransferValidatorStub}
-            defaultRoyaltyInfo={[_testAddress1, 100]}
             transferValidator={"0x0000000000000000000000000000000000000000"}
             uninstallButton={{
-              onClick: async () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: async () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            contractChainId={1}
-            isLoggedIn={true}
-            client={storybookThirdwebClient}
           />
         </BadgeContainer>
       </div>
@@ -168,20 +167,20 @@ function Component() {
 function CheckboxWithLabel(props: {
   value: boolean;
   onChange: (value: boolean) => void;
-  id: string;
   label: string;
 }) {
+  const id = useId();
   return (
     <div className="items-top flex space-x-2">
       <Checkbox
-        id={props.id}
         checked={props.value}
+        id={id}
         onCheckedChange={(v) => props.onChange(!!v)}
       />
       <div className="grid gap-1.5 leading-none">
         <label
-          htmlFor={props.id}
           className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+          htmlFor={id}
         >
           {props.label}
         </label>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/transferable.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/transferable.stories.tsx
index ecb3a21faf8..77f60940cbe 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/transferable.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/transferable.stories.tsx
@@ -1,23 +1,23 @@
-import { Checkbox } from "@/components/ui/checkbox";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useMutation } from "@tanstack/react-query";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { toast } from "sonner";
 import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   type TransferableModuleFormValues,
   TransferableModuleUI,
 } from "./Transferable";
 
 const meta = {
-  title: "Modules/Transferable",
   component: Component,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Modules/Transferable",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -46,26 +46,28 @@ function Component() {
   });
 
   const contractInfo = {
-    name: "Module Name",
     description:
       "lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore ",
+    name: "Module Name",
     publisher: "0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024",
     version: "1.0.0",
   };
 
+  const terms1Id = useId();
+
   return (
     <ThirdwebProvider>
       <div className="container flex max-w-6xl flex-col gap-10 py-10">
         <div className="flex gap-2">
           <Checkbox
-            id="terms1"
             checked={isOwner}
+            id={terms1Id}
             onCheckedChange={(v) => setIsOwner(!!v)}
           />
           <div className="grid gap-1.5 leading-none">
             <label
-              htmlFor="terms1"
               className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+              htmlFor={terms1Id}
             >
               Is Owner
             </label>
@@ -78,58 +80,58 @@ function Component() {
 
         <BadgeContainer label="Empty AllowList, Not Restricted">
           <TransferableModuleUI
-            contractInfo={contractInfo}
+            adminAddress={testAddress1}
             client={storybookThirdwebClient}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            contractChainId={1}
+            contractInfo={contractInfo}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={false}
             isRestricted={false}
-            adminAddress={testAddress1}
-            update={updateStub}
+            moduleAddress="0x0000000000000000000000000000000000000000"
             uninstallButton={{
-              onClick: async () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: async () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            contractChainId={1}
-            isLoggedIn={true}
+            update={updateStub}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Empty AllowList, Restricted">
           <TransferableModuleUI
-            contractInfo={contractInfo}
+            adminAddress={testAddress1}
             client={storybookThirdwebClient}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            contractChainId={1}
+            contractInfo={contractInfo}
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={false}
             isRestricted={true}
-            adminAddress={testAddress1}
-            update={updateStub}
+            moduleAddress="0x0000000000000000000000000000000000000000"
             uninstallButton={{
-              onClick: () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            contractChainId={1}
-            isLoggedIn={true}
+            update={updateStub}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Pending">
           <TransferableModuleUI
+            adminAddress={testAddress1}
+            client={storybookThirdwebClient}
+            contractChainId={1}
             contractInfo={contractInfo}
-            moduleAddress="0x0000000000000000000000000000000000000000"
+            isLoggedIn={true}
+            isOwnerAccount={isOwner}
             isPending={true}
-            adminAddress={testAddress1}
             isRestricted={false}
-            update={updateStub}
+            moduleAddress="0x0000000000000000000000000000000000000000"
             uninstallButton={{
-              onClick: () => removeMutation.mutateAsync(),
               isPending: removeMutation.isPending,
+              onClick: () => removeMutation.mutateAsync(),
             }}
-            isOwnerAccount={isOwner}
-            contractChainId={1}
-            client={storybookThirdwebClient}
-            isLoggedIn={true}
+            update={updateStub}
           />
         </BadgeContainer>
       </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/page.tsx
index 27cd34a2842..fa7b53c9637 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/page.tsx
@@ -8,10 +8,10 @@ export default async function Page(props: {
   const [params, account] = await Promise.all([props.params, getRawAccount()]);
   return (
     <SharedModulesPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/shared-modules-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/shared-modules-page.tsx
index f31df2faf92..550185c4b88 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/shared-modules-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/shared-modules-page.tsx
@@ -13,8 +13,8 @@ export async function SharedModulesPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/ContractNFTPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/ContractNFTPage.client.tsx
index 20cdde90c23..4305d317a5f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/ContractNFTPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/ContractNFTPage.client.tsx
@@ -36,8 +36,8 @@ export function ContractNFTPageClient(props: {
   return (
     <ContractNFTPage
       contract={props.contract}
-      isErc721={supportedERCs.isERC721}
       functionSelectors={functionSelectors}
+      isErc721={supportedERCs.isERC721}
       isLoggedIn={props.isLoggedIn}
       projectMeta={props.projectMeta}
     />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/ContractNFTPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/ContractNFTPage.tsx
index d33b37d13c9..5f142e92905 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/ContractNFTPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/ContractNFTPage.tsx
@@ -96,10 +96,10 @@ export const ContractNFTPage: React.FC<NftOverviewPageProps> = ({
           )}
           {isLazyMintable && (
             <BatchLazyMintButton
-              isLoggedIn={isLoggedIn}
               canCreateDelayedRevealBatch={canCreateDelayedRevealBatch}
-              isErc721={isErc721}
               contract={contract}
+              isErc721={isErc721}
+              isLoggedIn={isLoggedIn}
             />
           )}
         </div>
@@ -109,8 +109,8 @@ export const ContractNFTPage: React.FC<NftOverviewPageProps> = ({
         <NFTGetAllTable
           contract={contract}
           isErc721={isErc721}
-          tokenByIndex={isTokenByIndexSupported}
           projectMeta={projectMeta}
+          tokenByIndex={isTokenByIndexSupported}
         />
       )}
     </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/TokenIdPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/TokenIdPage.client.tsx
index ed3618ee203..ad108e57a8c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/TokenIdPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/TokenIdPage.client.tsx
@@ -38,12 +38,12 @@ export function TokenIdPageClient(props: {
 
   return (
     <TokenIdPage
+      accountAddress={props.accountAddress}
       contract={contract}
       isErc721={supportedERCs.isERC721}
-      tokenId={props.tokenId}
       isLoggedIn={props.isLoggedIn}
-      accountAddress={props.accountAddress}
       projectMeta={props.projectMeta}
+      tokenId={props.tokenId}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx
index 212da33ff25..b7f99ee9971 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Sheet,
-  SheetContent,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
-import { cn } from "@/lib/utils";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { UploadIcon } from "lucide-react";
@@ -19,6 +10,15 @@ import type { ThirdwebContract } from "thirdweb";
 import { multicall } from "thirdweb/extensions/common";
 import { balanceOf, encodeSafeTransferFrom } from "thirdweb/extensions/erc1155";
 import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import {
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
+import { cn } from "@/lib/utils";
 import {
   type AirdropAddressInput,
   AirdropUpload,
@@ -59,8 +59,8 @@ const AirdropTab: React.FC<AirdropTabProps> = ({
           try {
             const totalOwned = await balanceOf({
               contract,
-              tokenId: BigInt(tokenId),
               owner: address ?? "",
+              tokenId: BigInt(tokenId),
             });
             // todo: make a batch-transfer extension for erc1155?
             const totalToAirdrop = _data.addresses.reduce((prev, curr) => {
@@ -73,11 +73,11 @@ const AirdropTab: React.FC<AirdropTabProps> = ({
             }
             const data = _data.addresses.map(({ address: to, quantity }) =>
               encodeSafeTransferFrom({
+                data: "0x",
                 from: address ?? "",
                 to,
-                value: BigInt(quantity),
-                data: "0x",
                 tokenId: BigInt(tokenId),
+                value: BigInt(quantity),
               }),
             );
             const transaction = multicall({ contract, data });
@@ -96,9 +96,9 @@ const AirdropTab: React.FC<AirdropTabProps> = ({
       >
         <div className="flex flex-col gap-2">
           <div className="mb-3 flex w-full flex-col gap-4 md:flex-row">
-            <Sheet open={open} onOpenChange={setOpen}>
+            <Sheet onOpenChange={setOpen} open={open}>
               <SheetTrigger asChild>
-                <Button variant="primary" className="gap-2">
+                <Button className="gap-2" variant="primary">
                   Upload addresses <UploadIcon className="size-4" />
                 </Button>
               </SheetTrigger>
@@ -120,8 +120,8 @@ const AirdropTab: React.FC<AirdropTabProps> = ({
 
             <div
               className={cn("flex flex-row items-center justify-center gap-2", {
-                "text-orange-500": addresses.length === 0,
                 "text-green-500": addresses.length > 0,
+                "text-orange-500": addresses.length === 0,
               })}
             >
               {addresses.length > 0 && (
@@ -137,14 +137,14 @@ const AirdropTab: React.FC<AirdropTabProps> = ({
             more, please do it in multiple transactions.
           </p>
           <TransactionButton
+            className="self-end"
             client={contract.client}
+            disabled={!!address && addresses.length === 0}
             isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
-            transactionCount={1}
             isPending={sendAndConfirmTx.isPending}
+            transactionCount={1}
+            txChainID={contract.chain.id}
             type="submit"
-            disabled={!!address && addresses.length === 0}
-            className="self-end"
           >
             Airdrop
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/burn-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/burn-tab.tsx
index 67fddebb3cd..73d34eb15ba 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/burn-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/burn-tab.tsx
@@ -60,12 +60,15 @@ const BurnTab: React.FC<BurnTabProps> = ({ contract, tokenId, isLoggedIn }) => {
           const transaction = isErc721
             ? burn721({ contract, tokenId: BigInt(tokenId) })
             : burn1155({
+                account: account?.address ?? "",
                 contract,
                 id: BigInt(tokenId),
                 value: BigInt(data.amount),
-                account: account?.address ?? "",
               });
           mutate(transaction, {
+            onError: (error) => {
+              onError(error);
+            },
             onSuccess: () => {
               onSuccess();
               if (contract) {
@@ -76,16 +79,13 @@ const BurnTab: React.FC<BurnTabProps> = ({ contract, tokenId, isLoggedIn }) => {
               }
               reset();
             },
-            onError: (error) => {
-              onError(error);
-            },
           });
         })}
       >
         <div className="flex flex-col gap-3">
           {isErc1155 && (
             <div className="flex w-full flex-col gap-6 md:flex-row">
-              <FormControl isRequired={isErc1155} isInvalid={!!errors.amount}>
+              <FormControl isInvalid={!!errors.amount} isRequired={isErc1155}>
                 <FormLabel>Amount</FormLabel>
                 <Input placeholder="1" {...register("amount")} />
                 <FormHelperText>
@@ -113,14 +113,14 @@ const BurnTab: React.FC<BurnTabProps> = ({ contract, tokenId, isLoggedIn }) => {
             </Text>
           )}
           <TransactionButton
+            className="self-end"
             client={contract.client}
-            transactionCount={1}
-            isPending={isPending}
             disabled={checking1155 || checking721 || isPending || !account}
-            type="submit"
-            className="self-end"
-            txChainID={contract.chain.id}
             isLoggedIn={isLoggedIn}
+            isPending={isPending}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             Burn
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/claim-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/claim-tab.tsx
index 8ebc0412b71..7478f1acdea 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/claim-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/claim-tab.tsx
@@ -30,9 +30,8 @@ const ClaimTabERC1155: React.FC<ClaimTabProps> = ({
   const account = useActiveAccount();
   return (
     <Flex
-      w="full"
-      direction="column"
       as="form"
+      direction="column"
       onSubmit={form.handleSubmit(async (data) => {
         if (!account) {
           return toast.error("No account detected");
@@ -40,33 +39,33 @@ const ClaimTabERC1155: React.FC<ClaimTabProps> = ({
         try {
           const transaction = claimTo({
             contract,
-            tokenId: BigInt(tokenId),
+            from: account.address,
             quantity: BigInt(data.amount),
             to: data.to,
-            from: account.address,
+            tokenId: BigInt(tokenId),
           });
           const approveTx = await getApprovalForTransaction({
-            transaction,
             account,
+            transaction,
           });
           if (approveTx) {
             const approvalPromise = sendAndConfirmTx.mutateAsync(approveTx);
             toast.promise(approvalPromise, {
-              success: "Approved successfully",
               error: "Failed to approve ERC20",
+              success: "Approved successfully",
             });
             await approvalPromise;
           }
           const promise = sendAndConfirmTx.mutateAsync(transaction);
           toast.promise(promise, {
-            loading: "Claiming NFT",
-            success: "NFT claimed successfully",
             error: (error) => {
               return {
-                message: "Failed to claim NFT",
                 description: parseError(error),
+                message: "Failed to claim NFT",
               };
             },
+            loading: "Claiming NFT",
+            success: "NFT claimed successfully",
           });
 
           form.reset();
@@ -74,12 +73,13 @@ const ClaimTabERC1155: React.FC<ClaimTabProps> = ({
           console.error(error);
         }
       })}
+      w="full"
     >
-      <Flex gap={3} direction="column">
-        <Flex gap={6} w="100%" direction="column">
+      <Flex direction="column" gap={3}>
+        <Flex direction="column" gap={6} w="100%">
           <FormControl
-            isRequired
             isInvalid={!!form.getFieldState("to", form.formState).error}
+            isRequired
           >
             <FormLabel>To Address</FormLabel>
             <Input placeholder={ZERO_ADDRESS} {...form.register("to")} />
@@ -89,8 +89,8 @@ const ClaimTabERC1155: React.FC<ClaimTabProps> = ({
             </FormErrorMessage>
           </FormControl>
           <FormControl
-            isRequired
             isInvalid={!!form.getFieldState("amount", form.formState).error}
+            isRequired
           >
             <FormLabel>Amount</FormLabel>
             <Input
@@ -113,13 +113,13 @@ const ClaimTabERC1155: React.FC<ClaimTabProps> = ({
         </Flex>
 
         <TransactionButton
+          className="self-end"
           client={contract.client}
           isLoggedIn={isLoggedIn}
-          txChainID={contract.chain.id}
-          transactionCount={1}
           isPending={form.formState.isSubmitting}
+          transactionCount={1}
+          txChainID={contract.chain.id}
           type="submit"
-          className="self-end"
         >
           Claim
         </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/mint-supply-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/mint-supply-tab.tsx
index 2e712fe30bd..67b2630c31e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/mint-supply-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/mint-supply-tab.tsx
@@ -1,5 +1,13 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { TransactionButton } from "components/buttons/TransactionButton";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { isAddress, type ThirdwebContract } from "thirdweb";
+import { mintAdditionalSupplyTo } from "thirdweb/extensions/erc1155";
+import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
+import { z } from "zod";
 import {
   Form,
   FormControl,
@@ -10,14 +18,6 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { type ThirdwebContract, isAddress } from "thirdweb";
-import { mintAdditionalSupplyTo } from "thirdweb/extensions/erc1155";
-import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
-import { z } from "zod";
 
 interface MintSupplyTabProps {
   contract: ThirdwebContract;
@@ -26,10 +26,10 @@ interface MintSupplyTabProps {
 }
 
 const mintAdditionalSupplyFormSchema = z.object({
+  amount: z.coerce.number().int().min(1, "Amount must be at least 1"),
   to: z.string().refine((value) => isAddress(value), {
     message: "Invalid Ethereum address",
   }),
-  amount: z.coerce.number().int().min(1, "Amount must be at least 1"),
 });
 
 const MintSupplyTab: React.FC<MintSupplyTabProps> = ({
@@ -40,11 +40,11 @@ const MintSupplyTab: React.FC<MintSupplyTabProps> = ({
   const address = useActiveAccount()?.address;
 
   const form = useForm<z.input<typeof mintAdditionalSupplyFormSchema>>({
-    resolver: zodResolver(mintAdditionalSupplyFormSchema),
     defaultValues: {
       amount: 1,
       to: address || "",
     },
+    resolver: zodResolver(mintAdditionalSupplyFormSchema),
   });
 
   const sendAndConfirmTx = useSendAndConfirmTransaction();
@@ -52,9 +52,9 @@ const MintSupplyTab: React.FC<MintSupplyTabProps> = ({
   function onSubmit(values: z.input<typeof mintAdditionalSupplyFormSchema>) {
     const transaction = mintAdditionalSupplyTo({
       contract,
+      supply: BigInt(values.amount),
       to: values.to,
       tokenId: BigInt(tokenId),
-      supply: BigInt(values.amount),
     });
     const promise = sendAndConfirmTx.mutateAsync(transaction, {
       onSuccess: () => {
@@ -62,17 +62,17 @@ const MintSupplyTab: React.FC<MintSupplyTabProps> = ({
       },
     });
     toast.promise(promise, {
+      error: "Failed to mint",
       loading: "Minting NFT",
       success: "Minted successfully",
-      error: "Failed to mint",
     });
   }
 
   return (
     <Form {...form}>
       <form
-        onSubmit={form.handleSubmit(onSubmit)}
         className="flex w-full flex-col gap-2"
+        onSubmit={form.handleSubmit(onSubmit)}
       >
         <FormField
           control={form.control}
@@ -106,13 +106,13 @@ const MintSupplyTab: React.FC<MintSupplyTabProps> = ({
         />
 
         <TransactionButton
+          className="self-end"
           client={contract.client}
-          txChainID={contract.chain.id}
-          transactionCount={1}
+          isLoggedIn={isLoggedIn}
           isPending={sendAndConfirmTx.isPending}
+          transactionCount={1}
+          txChainID={contract.chain.id}
           type="submit"
-          className="self-end"
-          isLoggedIn={isLoggedIn}
         >
           Mint
         </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/transfer-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/transfer-tab.tsx
index 4768866fe43..acbaac2dfb8 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/transfer-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/transfer-tab.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import { FormControl, Input } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
@@ -15,6 +14,7 @@ import {
   useSendAndConfirmTransaction,
 } from "thirdweb/react";
 import { FormErrorMessage, FormHelperText, FormLabel } from "tw-components";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 
 interface TransferTabProps {
   contract: ThirdwebContract;
@@ -30,7 +30,7 @@ const TransferTab: React.FC<TransferTabProps> = ({
   const account = useActiveAccount();
 
   const form = useForm<{ to: string; amount: string }>({
-    defaultValues: { to: "", amount: "1" },
+    defaultValues: { amount: "1", to: "" },
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -57,38 +57,38 @@ const TransferTab: React.FC<TransferTabProps> = ({
           const transaction = isErc1155
             ? safeTransferFrom({
                 contract,
+                data: "0x",
+                from: account?.address ?? "",
                 to: data.to,
                 tokenId: BigInt(tokenId),
                 value: BigInt(data.amount),
-                data: "0x",
-                from: account?.address ?? "",
               })
             : transferFrom({
                 contract,
+                from: account?.address ?? "",
                 to: data.to,
                 tokenId: BigInt(tokenId),
-                from: account?.address ?? "",
               });
           sendTxAndConfirm.mutate(transaction, {
+            onError: (error) => {
+              onError(error);
+            },
             onSuccess: () => {
               onSuccess();
               form.reset();
             },
-            onError: (error) => {
-              onError(error);
-            },
           });
         })}
       >
         <div className="flex flex-col gap-3">
           <div className="flex w-full flex-col gap-6 md:flex-row">
-            <FormControl isRequired isInvalid={!!form.formState.errors.to}>
+            <FormControl isInvalid={!!form.formState.errors.to} isRequired>
               <FormLabel>To Address</FormLabel>
               <SolidityInput
                 client={contract.client}
-                solidityType="address"
                 formContext={form}
                 placeholder={ZERO_ADDRESS}
+                solidityType="address"
                 {...form.register("to")}
               />
               <FormHelperText>Enter the address to transfer to.</FormHelperText>
@@ -98,8 +98,8 @@ const TransferTab: React.FC<TransferTabProps> = ({
             </FormControl>
             {isErc1155 && (
               <FormControl
-                isRequired={isErc1155}
                 isInvalid={!!form.formState.errors.to}
+                isRequired={isErc1155}
               >
                 <FormLabel>Amount</FormLabel>
                 <Input placeholder="1" {...form.register("amount")} />
@@ -113,19 +113,19 @@ const TransferTab: React.FC<TransferTabProps> = ({
             )}
           </div>
           <TransactionButton
-            client={contract.client}
-            isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
-            transactionCount={1}
-            isPending={sendTxAndConfirm.isPending}
-            type="submit"
             className="self-end"
+            client={contract.client}
             disabled={
               !form.formState.isDirty ||
               checking1155 ||
               sendTxAndConfirm.isPending ||
               !account
             }
+            isLoggedIn={isLoggedIn}
+            isPending={sendTxAndConfirm.isPending}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             Transfer
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-form.tsx
index 03689bdbdcd..57a9019dd1f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-form.tsx
@@ -68,16 +68,16 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
 
   const transformedQueryData = useMemo(() => {
     const nftMetadata: Partial<NFTMetadata> = {
-      // basic
-      name: nft.metadata.name || "",
-      description: nft.metadata.description || "",
-      // media
-      image: nft.metadata.image,
       animation_url: nft.metadata.animation_url,
+      attributes: nft.metadata.attributes,
+      background_color: nft.metadata.background_color || "",
+      description: nft.metadata.description || "",
       // advanced
       external_url: nft.metadata.external_url || "",
-      background_color: nft.metadata.background_color || "",
-      attributes: nft.metadata.attributes,
+      // media
+      image: nft.metadata.image,
+      // basic
+      name: nft.metadata.name || "",
     };
 
     return nftMetadata;
@@ -128,8 +128,8 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
         try {
           const newMetadata = parseAttributes({
             ...data,
-            image: data.image || nft.metadata.image,
             animation_url: data.animation_url || nft.metadata.animation_url,
+            image: data.image || nft.metadata.image,
           });
 
           const transaction = useUpdateMetadata
@@ -137,33 +137,33 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
               nft.type === "ERC721"
               ? updateMetadata721({
                   contract,
-                  targetTokenId: BigInt(nft.id),
                   newMetadata,
+                  targetTokenId: BigInt(nft.id),
                 })
               : updateMetadata1155({
                   contract,
-                  targetTokenId: BigInt(nft.id),
                   newMetadata,
+                  targetTokenId: BigInt(nft.id),
                 })
             : // For Collection contracts, we need to call the `setTokenURI` method
               nft.type === "ERC721"
               ? updateTokenURI721({
                   contract,
-                  tokenId: BigInt(nft.id),
                   newMetadata,
+                  tokenId: BigInt(nft.id),
                 })
               : updateTokenURI1155({
                   contract,
-                  tokenId: BigInt(nft.id),
                   newMetadata,
+                  tokenId: BigInt(nft.id),
                 });
           await sendAndConfirmTx.mutateAsync(transaction, {
-            onSuccess: () => {
-              setOpen(false);
-            },
             onError: (error) => {
               console.error(error);
             },
+            onSuccess: () => {
+              setOpen(false);
+            },
           });
 
           updateMetadataNotifications.onSuccess();
@@ -173,7 +173,7 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
         }
       })}
     >
-      <FormControl isRequired isInvalid={!!errors.name}>
+      <FormControl isInvalid={!!errors.name} isRequired>
         <FormLabel>Name</FormLabel>
         <Input autoFocus {...register("name")} />
         <FormErrorMessage>{errors?.name?.message}</FormErrorMessage>
@@ -183,15 +183,15 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
         <FormLabel>Media</FormLabel>
         <div className="flex flex-row flex-wrap gap-3">
           <FileInput
-            previewMaxWidth="200px"
-            value={media}
-            showUploadButton
-            showPreview
-            setValue={setFile}
             className="shrink-0 rounded border border-border transition-all duration-200"
-            selectOrUpload="Upload"
-            helperText={nft?.metadata ? "New Media" : "Media"}
             client={contract.client}
+            helperText={nft?.metadata ? "New Media" : "Media"}
+            previewMaxWidth="200px"
+            selectOrUpload="Upload"
+            setValue={setFile}
+            showPreview
+            showUploadButton
+            value={media}
           />
         </div>
 
@@ -208,13 +208,13 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
         <FormControl isInvalid={!!errors.image}>
           <FormLabel>Cover Image</FormLabel>
           <FileInput
-            previewMaxWidth="200px"
-            client={contract.client}
             accept={{ "image/*": [] }}
-            value={image}
-            showUploadButton
-            setValue={(file) => setValue("image", file)}
             className="rounded border border-border transition-all"
+            client={contract.client}
+            previewMaxWidth="200px"
+            setValue={(file) => setValue("image", file)}
+            showUploadButton
+            value={image}
           />
           <FormHelperText>
             You can optionally upload an image as the cover of your NFT.
@@ -230,13 +230,13 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
         <FormErrorMessage>{errors?.description?.message}</FormErrorMessage>
       </FormControl>
       <PropertiesFormControl
-        watch={watch}
+        client={contract.client}
+        control={control}
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         errors={errors as any}
-        control={control}
         register={register}
         setValue={setValue}
-        client={contract.client}
+        watch={watch}
       />
 
       <Accordion
@@ -244,7 +244,7 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
         index={errors.background_color || errors.external_url ? [0] : undefined}
       >
         <AccordionItem>
-          <AccordionButton px={0} justifyContent="space-between">
+          <AccordionButton justifyContent="space-between" px={0}>
             <Heading size="subtitle.md">Advanced Options</Heading>
             <AccordionIcon />
           </AccordionButton>
@@ -283,10 +283,10 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
               <FormControl isInvalid={!!errors.image}>
                 <FormLabel>Image URL</FormLabel>
                 <Input
-                  value={typeof image === "string" ? image : ""}
                   onChange={(e) => {
                     setValue("image", e.target.value);
                   }}
+                  value={typeof image === "string" ? image : ""}
                 />
                 <FormHelperText>
                   If you already have your NFT image pre-uploaded to a URL, you
@@ -300,10 +300,10 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
               <FormControl isInvalid={!!errors.animation_url}>
                 <FormLabel>Animation URL</FormLabel>
                 <Input
-                  value={typeof animation_url === "string" ? animation_url : ""}
                   onChange={(e) => {
                     setValue("animation_url", e.target.value);
                   }}
+                  value={typeof animation_url === "string" ? animation_url : ""}
                 />
                 <FormHelperText>
                   If you already have your NFT Animation URL pre-uploaded to a
@@ -321,20 +321,20 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
       <div className="mt-8 flex flex-row justify-end gap-3">
         <Button
           isDisabled={sendAndConfirmTx.isPending}
-          variant="outline"
           onClick={() => setOpen(false)}
+          variant="outline"
         >
           Cancel
         </Button>
         <TransactionButton
           client={contract.client}
+          disabled={!isDirty}
+          form={UPDATE_METADATA_FORM_ID}
           isLoggedIn={isLoggedIn}
-          txChainID={contract.chain.id}
-          transactionCount={1}
           isPending={sendAndConfirmTx.isPending}
-          form={UPDATE_METADATA_FORM_ID}
+          transactionCount={1}
+          txChainID={contract.chain.id}
           type="submit"
-          disabled={!isDirty}
         >
           Update NFT
         </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-tab.tsx
index a4fd2873cbb..7a929d9f4c2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-tab.tsx
@@ -1,3 +1,5 @@
+import { useState } from "react";
+import type { NFT, ThirdwebContract } from "thirdweb";
 import { Button } from "@/components/ui/button";
 import {
   Sheet,
@@ -6,9 +8,8 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { useState } from "react";
-import type { NFT, ThirdwebContract } from "thirdweb";
 import { UpdateNftMetadata } from "./update-metadata-form";
+
 interface UpdateMetadataTabProps {
   contract: ThirdwebContract;
   nft: NFT;
@@ -30,7 +31,7 @@ const UpdateMetadataTab: React.FC<UpdateMetadataTabProps> = ({
   const [open, setOpen] = useState(false);
 
   return (
-    <Sheet open={open} onOpenChange={setOpen}>
+    <Sheet onOpenChange={setOpen} open={open}>
       <SheetTrigger asChild>
         <Button variant="primary">Update Metadata</Button>
       </SheetTrigger>
@@ -39,11 +40,11 @@ const UpdateMetadataTab: React.FC<UpdateMetadataTabProps> = ({
           <SheetTitle className="text-left">Update NFT Metadata</SheetTitle>
         </SheetHeader>
         <UpdateNftMetadata
-          isLoggedIn={isLoggedIn}
           contract={contract}
+          isLoggedIn={isLoggedIn}
           nft={nft}
-          useUpdateMetadata={useUpdateMetadata}
           setOpen={setOpen}
+          useUpdateMetadata={useUpdateMetadata}
         />
       </SheetContent>
     </Sheet>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/page.tsx
index d60c38511b0..ebfb74f4dd0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/page.tsx
@@ -13,11 +13,11 @@ export default async function Page(props: {
 
   return (
     <SharedNFTTokenPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      tokenId={params.tokenId}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
+      tokenId={params.tokenId}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/shared-nfts-token-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/shared-nfts-token-page.tsx
index 496ccf8e485..5155412614e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/shared-nfts-token-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/shared-nfts-token-page.tsx
@@ -19,8 +19,8 @@ export async function SharedNFTTokenPage(props: {
 }) {
   const [info, accountAddress] = await Promise.all([
     getContractPageParamsInfo({
-      contractAddress: props.contractAddress,
       chainIdOrSlug: props.chainIdOrSlug,
+      contractAddress: props.contractAddress,
       teamId: props.projectMeta?.teamId,
     }),
     getAuthTokenWalletAddress(),
@@ -34,9 +34,9 @@ export async function SharedNFTTokenPage(props: {
   if (!isOnlyNumbers(props.tokenId)) {
     redirect(
       buildContractPagePath({
-        projectMeta: props.projectMeta,
         chainIdOrSlug: props.chainIdOrSlug,
         contractAddress: props.contractAddress,
+        projectMeta: props.projectMeta,
         subpath: "/nfts",
       }),
     );
@@ -48,9 +48,9 @@ export async function SharedNFTTokenPage(props: {
     if (meta && (meta.type === "erc721" || meta.type === "erc1155")) {
       return (
         <NFTPublicPage
-          serverContract={info.serverContract}
-          clientContract={info.clientContract}
           chainMetadata={info.chainMetadata}
+          clientContract={info.clientContract}
+          serverContract={info.serverContract}
           tokenId={props.tokenId}
           type={meta.type}
         />
@@ -62,11 +62,11 @@ export async function SharedNFTTokenPage(props: {
   if (isLocalhostChain) {
     return (
       <TokenIdPageClient
+        accountAddress={accountAddress || undefined}
         contract={clientContract}
-        tokenId={props.tokenId}
         isLoggedIn={props.isLoggedIn}
-        accountAddress={accountAddress || undefined}
         projectMeta={props.projectMeta}
+        tokenId={props.tokenId}
       />
     );
   }
@@ -83,12 +83,12 @@ export async function SharedNFTTokenPage(props: {
 
   return (
     <TokenIdPage
+      accountAddress={accountAddress || undefined}
       contract={clientContract}
       isErc721={supportedERCs.isERC721}
-      tokenId={props.tokenId}
       isLoggedIn={props.isLoggedIn}
-      accountAddress={accountAddress || undefined}
       projectMeta={props.projectMeta}
+      tokenId={props.tokenId}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx
index 33b9e647947..30d45249b29 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx
@@ -1,9 +1,16 @@
 "use client";
 
+import { useChainSlug } from "hooks/chains/chainSlug";
+import { ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import type { NFT, ThirdwebClient, ThirdwebContract } from "thirdweb";
+import { getNFT as getErc721NFT } from "thirdweb/extensions/erc721";
+import { getNFT as getErc1155NFT } from "thirdweb/extensions/erc1155";
+import { useReadContract } from "thirdweb/react";
+import { NFTMediaWithEmptyState } from "tw-components/nft-media";
 import { UnexpectedValueErrorMessage } from "@/components/blocks/error-fallbacks/unexpect-value-error-message";
 import { WalletAddress } from "@/components/blocks/wallet-address";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Badge } from "@/components/ui/badge";
 import {
   Breadcrumb,
@@ -13,19 +20,12 @@ import {
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { CodeClient } from "@/components/ui/code/code.client";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { TabButtons } from "@/components/ui/tabs";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { useChainSlug } from "hooks/chains/chainSlug";
-import { ExternalLinkIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import type { NFT, ThirdwebClient, ThirdwebContract } from "thirdweb";
-import { getNFT as getErc721NFT } from "thirdweb/extensions/erc721";
-import { getNFT as getErc1155NFT } from "thirdweb/extensions/erc1155";
-import { useReadContract } from "thirdweb/react";
-import { NFTMediaWithEmptyState } from "tw-components/nft-media";
 import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../../_utils/contract-page-path";
 import { NftProperty } from "../components/nft-property";
@@ -71,19 +71,19 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
   const chainSlug = useChainSlug(chainId || 1);
 
   const tabs = useNFTDrawerTabs({
+    accountAddress,
     contract,
-    tokenId,
     isLoggedIn,
-    accountAddress,
+    tokenId,
   });
 
   const { data: nft, isPending } = useReadContract(
     isErc721 ? getErc721NFT : getErc1155NFT,
     {
       contract,
-      tokenId: BigInt(tokenId || 0),
       includeOwner: true,
       tokenByIndex: false,
+      tokenId: BigInt(tokenId || 0),
     },
   );
 
@@ -113,9 +113,9 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
   };
 
   const nftsPagePath = buildContractPagePath({
-    projectMeta,
     chainIdOrSlug: chainSlug.toString(),
     contractAddress: contract.address,
+    projectMeta,
     subpath: "/nfts",
   });
 
@@ -127,9 +127,9 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
           <div className="absolute inset-0 z-0 rounded-lg border" />
           {/* media */}
           <NFTMediaWithEmptyState
-            metadata={nftMetadata}
             className="z-10"
             client={contract.client}
+            metadata={nftMetadata}
           />
         </div>
 
@@ -160,16 +160,16 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
             tabClassName="!text-sm"
             tabs={[
               {
-                name: "Details",
-                onClick: () => setTab("Details"),
                 isActive: tab === "Details",
                 isDisabled: false,
+                name: "Details",
+                onClick: () => setTab("Details"),
               },
               ...tabs.map((tb) => ({
-                name: tb.title,
-                onClick: () => setTab(tb.title),
                 isActive: tab === tb.title,
                 isDisabled: tb.isDisabled,
+                name: tb.title,
+                onClick: () => setTab(tb.title),
                 toolTip: tb.isDisabled ? tb.disabledText : undefined,
               })),
             ].sort((a, b) => (a.isDisabled ? 1 : b.isDisabled ? -1 : 0))}
@@ -177,13 +177,13 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
 
           {/* tab contents */}
           {tab === "Details" && (
-            <NFTDetailsTab nft={nft} client={contract.client} />
+            <NFTDetailsTab client={contract.client} nft={nft} />
           )}
 
           {tabs.map((tb) => {
             return (
               tb.title === tab && (
-                <div key={tb.title} className="w-full">
+                <div className="w-full" key={tb.title}>
                   {tb.children}
                 </div>
               )
@@ -195,10 +195,7 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
   );
 };
 
-function NFTDetailsTab(props: {
-  nft: NFT;
-  client: ThirdwebClient;
-}) {
+function NFTDetailsTab(props: { nft: NFT; client: ThirdwebClient }) {
   const { nft, client } = props;
   const properties = nft.metadata.attributes || nft.metadata.properties;
 
@@ -211,6 +208,8 @@ function NFTDetailsTab(props: {
           <div>
             <p className="mb-1 text-muted-foreground text-sm">Token ID</p>
             <CopyTextButton
+              className="min-w-16 justify-between bg-card"
+              copyIconPosition="right"
               textToCopy={nft.id?.toString()}
               textToShow={
                 nft.id?.toString().length > 8
@@ -218,8 +217,6 @@ function NFTDetailsTab(props: {
                   : nft.id?.toString()
               }
               tooltip="Token ID"
-              copyIconPosition="right"
-              className="min-w-16 justify-between bg-card"
             />
           </div>
 
@@ -228,9 +225,9 @@ function NFTDetailsTab(props: {
             <div>
               <p className="mb-1 text-muted-foreground text-sm">Owner</p>
               <WalletAddress
-                client={client}
                 address={nft.owner}
                 className="h-auto rounded-full border bg-card px-2 py-1 pr-4 text-foreground text-sm"
+                client={client}
               />
             </div>
           )}
@@ -239,8 +236,8 @@ function NFTDetailsTab(props: {
           <div>
             <p className="mb-1 text-muted-foreground text-sm">Token Standard</p>
             <Badge
-              variant="outline"
               className="bg-card py-1 font-normal text-sm"
+              variant="outline"
             >
               {nft.type}
             </Badge>
@@ -251,8 +248,8 @@ function NFTDetailsTab(props: {
             <div className="w-full">
               <p className="mb-1 text-muted-foreground text-sm">Supply</p>
               <ToolTipLabel
-                label={nft.supply.toLocaleString("en-US")}
                 contentClassName="text-sm break-all"
+                label={nft.supply.toLocaleString("en-US")}
               >
                 <p className="max-w-[200px] truncate text-sm">
                   {nft.supply.toLocaleString("en-US")}
@@ -265,10 +262,10 @@ function NFTDetailsTab(props: {
           <div>
             <p className="mb-1 text-muted-foreground text-sm">Token URI</p>
             <IPFSLinkGroup
-              ipfsLink={nft.tokenURI}
-              tooltip="The URI of this NFT"
               client={client}
               httpsLinkTooltip="View URI"
+              ipfsLink={nft.tokenURI}
+              tooltip="The URI of this NFT"
             />
           </div>
 
@@ -277,10 +274,10 @@ function NFTDetailsTab(props: {
             <div>
               <p className="mb-1 text-muted-foreground text-sm">Media URI</p>
               <IPFSLinkGroup
-                ipfsLink={nft.metadata.image}
-                tooltip="The media URI of this NFT"
                 client={client}
                 httpsLinkTooltip="View Media"
+                ipfsLink={nft.metadata.image}
+                tooltip="The media URI of this NFT"
               />
             </div>
           )}
@@ -294,8 +291,8 @@ function NFTDetailsTab(props: {
             Attributes
             {Array.isArray(properties) && properties.length > 0 && (
               <Badge
-                variant="outline"
                 className="bg-card px-2 text-muted-foreground"
+                variant="outline"
               >
                 {properties.length}
               </Badge>
@@ -324,9 +321,7 @@ function NFTDetailsTab(props: {
   );
 }
 
-function NFTName(props: {
-  value: unknown;
-}) {
+function NFTName(props: { value: unknown }) {
   if (typeof props.value === "string") {
     return (
       <h2 className="font-bold text-3xl tracking-tight"> {props.value}</h2>
@@ -335,10 +330,10 @@ function NFTName(props: {
 
   return (
     <UnexpectedValueErrorMessage
-      title="Invalid Name"
+      className="mb-3 rounded-lg border border-border p-4"
       description="Name is not a string"
+      title="Invalid Name"
       value={props.value}
-      className="mb-3 rounded-lg border border-border p-4"
     />
   );
 }
@@ -357,21 +352,21 @@ function IPFSLinkGroup(props: {
   return (
     <div className="flex flex-row items-center gap-1.5">
       <CopyTextButton
+        className="max-w-[200px] truncate bg-card"
+        copyIconPosition="right"
         textToCopy={props.ipfsLink}
         textToShow={props.ipfsLink}
         tooltip={props.tooltip}
-        copyIconPosition="right"
-        className="max-w-[200px] truncate bg-card"
       />
       {httpLink && (
         <ToolTipLabel label={props.httpsLinkTooltip}>
           <Button
-            variant="outline"
-            size="sm"
             asChild
             className="size-[34px] rounded-full bg-card p-0 text-muted-foreground"
+            size="sm"
+            variant="outline"
           >
-            <Link href={httpLink} target="_blank" rel="noopener noreferrer">
+            <Link href={httpLink} rel="noopener noreferrer" target="_blank">
               <ExternalLinkIcon className="size-3" />
             </Link>
           </Button>
@@ -381,19 +376,17 @@ function IPFSLinkGroup(props: {
   );
 }
 
-function NFTDescription(props: {
-  value: unknown;
-}) {
+function NFTDescription(props: { value: unknown }) {
   if (typeof props.value === "string") {
     return <p className="text-muted-foreground text-sm"> {props.value}</p>;
   }
 
   return (
     <UnexpectedValueErrorMessage
-      title="Invalid Description"
+      className="mb-3 rounded-lg border border-border p-4"
       description="Description is not a string"
+      title="Invalid Description"
       value={props.value}
-      className="mb-3 rounded-lg border border-border p-4"
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/useNftDrawerTabs.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/useNftDrawerTabs.tsx
index 8eb81def2ff..694ff041c9e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/useNftDrawerTabs.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/useNftDrawerTabs.tsx
@@ -51,9 +51,9 @@ export function useNFTDrawerTabs({
     isERC721 ? ERC721Ext.getNFT : ERC1155Ext.getNFT,
     {
       contract,
-      tokenId: BigInt(tokenId || 0),
       includeOwner: true,
       queryOptions: { enabled: isERC721 || isERC1155 },
+      tokenId: BigInt(tokenId || 0),
     },
   );
   const isMinterRole = useIsMinter(contract);
@@ -122,117 +122,117 @@ export function useNFTDrawerTabs({
     if (hasERC1155ClaimConditions) {
       tabs = tabs.concat([
         {
-          title: "Claim Conditions",
-          isDisabled: false,
           children: (
             <ClaimConditionTab
-              isERC20={false}
               contract={contract}
-              tokenId={tokenId}
               isColumn
+              isERC20={false}
               isLoggedIn={isLoggedIn}
               isMultiphase={isERC1155Multiphase}
+              tokenId={tokenId}
             />
           ),
+          isDisabled: false,
+          title: "Claim Conditions",
         },
       ]);
     }
 
     tabs = tabs.concat([
       {
-        title: "Transfer",
-        isDisabled: !isOwner,
-        disabledText: isERC1155
-          ? "You don't own any copy of this NFT"
-          : "You don't own this NFT",
         children: (
           <TransferTab
             contract={contract}
-            tokenId={tokenId}
             isLoggedIn={isLoggedIn}
+            tokenId={tokenId}
           />
         ),
+        disabledText: isERC1155
+          ? "You don't own any copy of this NFT"
+          : "You don't own this NFT",
+        isDisabled: !isOwner,
+        title: "Transfer",
       },
     ]);
 
     if (isERC1155) {
       tabs = tabs.concat([
         {
-          title: "Airdrop",
-          isDisabled: !isOwner,
-          disabledText: "You don't own any copy of this NFT",
           children: (
             <AirdropTab
               contract={contract}
-              tokenId={tokenId}
               isLoggedIn={isLoggedIn}
+              tokenId={tokenId}
             />
           ),
+          disabledText: "You don't own any copy of this NFT",
+          isDisabled: !isOwner,
+          title: "Airdrop",
         },
       ]);
     }
     if (isBurnable) {
       tabs = tabs.concat([
         {
-          title: "Burn",
-          isDisabled: !isOwner,
-          disabledText: "You don't own this NFT",
           children: (
             <BurnTab
               contract={contract}
-              tokenId={tokenId}
               isLoggedIn={isLoggedIn}
+              tokenId={tokenId}
             />
           ),
+          disabledText: "You don't own this NFT",
+          isDisabled: !isOwner,
+          title: "Burn",
         },
       ]);
     }
     if (ERC1155Ext.isMintAdditionalSupplyToSupported(functionSelectors)) {
       tabs = tabs.concat([
         {
-          title: "Mint",
-          isDisabled: false,
-          disabledText: "You don't have minter permissions",
           children: (
             <MintSupplyTab
               contract={contract}
-              tokenId={tokenId}
               isLoggedIn={isLoggedIn}
+              tokenId={tokenId}
             />
           ),
+          disabledText: "You don't have minter permissions",
+          isDisabled: false,
+          title: "Mint",
         },
       ]);
     }
     if (hasERC1155ClaimConditions) {
       tabs = tabs.concat([
         {
-          title: "Claim",
-          isDisabled: false,
           children: (
             <ClaimTabERC1155
               contract={contract}
-              tokenId={tokenId}
               isLoggedIn={isLoggedIn}
+              tokenId={tokenId}
             />
           ),
+          isDisabled: false,
+          title: "Claim",
         },
       ]);
     }
     if ((supportsUpdateTokenURI || supportsUpdateMetadata) && nft) {
       tabs = tabs.concat([
         {
-          title: "Update Metadata",
-          isDisabled: !isMinterRole,
-          disabledText:
-            "You don't have minter permissions to be able to update metadata",
           children: (
             <UpdateMetadataTab
               contract={contract}
+              isLoggedIn={isLoggedIn}
               nft={nft}
               useUpdateMetadata={supportsUpdateMetadata}
-              isLoggedIn={isLoggedIn}
             />
           ),
+          disabledText:
+            "You don't have minter permissions to be able to update metadata",
+          isDisabled: !isMinterRole,
+          title: "Update Metadata",
         },
       ]);
     }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/batch-lazy-mint-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/batch-lazy-mint-button.tsx
index 2875c12ebac..0d7ff3e0b09 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/batch-lazy-mint-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/batch-lazy-mint-button.tsx
@@ -1,13 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Sheet,
-  SheetContent,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
 import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
 import { BatchLazyMint } from "core-ui/batch-upload/batch-lazy-mint";
 import { useTxNotifications } from "hooks/useTxNotifications";
@@ -17,6 +9,14 @@ import type { ThirdwebContract } from "thirdweb";
 import * as ERC721Ext from "thirdweb/extensions/erc721";
 import * as ERC1155Ext from "thirdweb/extensions/erc1155";
 import { useReadContract, useSendAndConfirmTransaction } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import {
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
 
 interface BatchLazyMintButtonProps {
   canCreateDelayedRevealBatch: boolean;
@@ -55,7 +55,7 @@ export const BatchLazyMintButton: React.FC<BatchLazyMintButtonProps> = ({
     <MinterOnly contract={contract}>
       <Sheet onOpenChange={setOpen} open={open}>
         <SheetTrigger asChild>
-          <Button variant="primary" className="gap-2">
+          <Button className="gap-2" variant="primary">
             <FileStackIcon className="size-4" />
             Batch Upload
           </Button>
@@ -65,9 +65,11 @@ export const BatchLazyMintButton: React.FC<BatchLazyMintButtonProps> = ({
             <SheetTitle className="text-left">Upload NFTs</SheetTitle>
           </SheetHeader>
           <BatchLazyMint
-            isLoggedIn={isLoggedIn}
-            client={contract.client}
+            canCreateDelayedRevealBatch={canCreateDelayedRevealBatch}
             chainId={contract.chain.id}
+            client={contract.client}
+            isLoggedIn={isLoggedIn}
+            nextTokenIdToMint={nextTokenIdToMintQuery.data || 0n}
             onSubmit={async ({ revealType, data }) => {
               try {
                 const tx = (() => {
@@ -110,8 +112,6 @@ export const BatchLazyMintButton: React.FC<BatchLazyMintButtonProps> = ({
                 txNotifications.onError(error);
               }
             }}
-            nextTokenIdToMint={nextTokenIdToMintQuery.data || 0n}
-            canCreateDelayedRevealBatch={canCreateDelayedRevealBatch}
           />
         </SheetContent>
       </Sheet>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx
index 1dc23ce2bdd..f97a0a19ed6 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx
@@ -1,13 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Sheet,
-  SheetContent,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
 import { FormControl, Input } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { useTxNotifications } from "hooks/useTxNotifications";
@@ -15,11 +7,19 @@ import { GemIcon } from "lucide-react";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
-import { type ThirdwebContract, ZERO_ADDRESS, isAddress } from "thirdweb";
+import { isAddress, type ThirdwebContract, ZERO_ADDRESS } from "thirdweb";
 import { getApprovalForTransaction } from "thirdweb/extensions/erc20";
 import { claimTo } from "thirdweb/extensions/erc721";
 import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
 import { FormErrorMessage, FormHelperText, FormLabel } from "tw-components";
+import { Button } from "@/components/ui/button";
+import {
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
 
 const CLAIM_FORM_ID = "nft-claim-form";
 
@@ -50,9 +50,9 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
   );
 
   return (
-    <Sheet open={open} onOpenChange={setOpen}>
+    <Sheet onOpenChange={setOpen} open={open}>
       <SheetTrigger asChild>
-        <Button variant="primary" className="gap-2">
+        <Button className="gap-2" variant="primary">
           <GemIcon className="size-4" /> Claim
         </Button>
       </SheetTrigger>
@@ -62,11 +62,16 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
         </SheetHeader>
         <form className="mt-8 flex w-full flex-col gap-3 md:flex-row">
           <div className="flex w-full flex-col gap-6 md:flex-row">
-            <FormControl isRequired isInvalid={!!errors.to}>
+            <FormControl isInvalid={!!errors.to} isRequired>
               <FormLabel>To Address</FormLabel>
               <Input
                 placeholder={ZERO_ADDRESS}
                 {...register("to", {
+                  onChange: (e) => {
+                    setValue("to", e.target.value.trim(), {
+                      shouldValidate: true,
+                    });
+                  },
                   validate: (value) => {
                     if (!value) {
                       return "Enter a recipient address";
@@ -75,17 +80,12 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
                       return "Invalid EVM address";
                     }
                   },
-                  onChange: (e) => {
-                    setValue("to", e.target.value.trim(), {
-                      shouldValidate: true,
-                    });
-                  },
                 })}
               />
               <FormHelperText>Enter the address to claim to.</FormHelperText>
               <FormErrorMessage>{errors.to?.message}</FormErrorMessage>
             </FormControl>
-            <FormControl isRequired isInvalid={!!errors.amount}>
+            <FormControl isInvalid={!!errors.amount} isRequired>
               <FormLabel>Amount</FormLabel>
               <Input
                 type="text"
@@ -106,12 +106,9 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
         <div className="mt-4 flex justify-end">
           <TransactionButton
             client={contract.client}
-            isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
-            transactionCount={1}
             form={CLAIM_FORM_ID}
+            isLoggedIn={isLoggedIn}
             isPending={formState.isSubmitting}
-            type="submit"
             onClick={handleSubmit(async (d) => {
               try {
                 if (!account) {
@@ -125,14 +122,14 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
 
                 const transaction = claimTo({
                   contract,
-                  to: d.to.trim(),
-                  quantity: BigInt(d.amount),
                   from: account.address,
+                  quantity: BigInt(d.amount),
+                  to: d.to.trim(),
                 });
 
                 const approveTx = await getApprovalForTransaction({
-                  transaction,
                   account,
+                  transaction,
                 });
 
                 if (approveTx) {
@@ -142,21 +139,21 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
                     },
                   });
                   toast.promise(promise, {
+                    error: "Failed to approve token",
                     loading: "Approving ERC20 tokens for this claim",
                     success: "Tokens approved successfully",
-                    error: "Failed to approve token",
                   });
 
                   await promise;
                 }
 
                 await sendAndConfirmTx.mutateAsync(transaction, {
-                  onSuccess: () => {
-                    setOpen(false);
-                  },
                   onError: (error) => {
                     console.error(error);
                   },
+                  onSuccess: () => {
+                    setOpen(false);
+                  },
                 });
 
                 claimNFTNotifications.onSuccess();
@@ -165,6 +162,9 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
                 claimNFTNotifications.onError(error);
               }
             })}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             Claim NFT
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-button.tsx
index 7ac96c65fb1..9b588a49fd7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-button.tsx
@@ -1,4 +1,8 @@
 "use client";
+import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
+import { PlusIcon } from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebContract } from "thirdweb";
 import { Button } from "@/components/ui/button";
 import {
   Sheet,
@@ -7,10 +11,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
-import { PlusIcon } from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebContract } from "thirdweb";
 import { LazyMintNftForm } from "./lazy-mint-form";
 
 interface NFTLazyMintButtonProps {
@@ -28,9 +28,9 @@ export const NFTLazyMintButton: React.FC<NFTLazyMintButtonProps> = ({
   const [open, setOpen] = useState(false);
   return (
     <MinterOnly contract={contract}>
-      <Sheet open={open} onOpenChange={setOpen}>
+      <Sheet onOpenChange={setOpen} open={open}>
         <SheetTrigger asChild>
-          <Button variant="primary" className="gap-2" {...restButtonProps}>
+          <Button className="gap-2" variant="primary" {...restButtonProps}>
             <PlusIcon className="size-5" />
             Single Upload
           </Button>
@@ -42,8 +42,8 @@ export const NFTLazyMintButton: React.FC<NFTLazyMintButtonProps> = ({
           <LazyMintNftForm
             contract={contract}
             isErc721={isErc721}
-            setOpen={setOpen}
             isLoggedIn={isLoggedIn}
+            setOpen={setOpen}
           />
         </SheetContent>
       </Sheet>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-form.tsx
index 479f8e7762a..e1d9f4049ab 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-form.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import {
   Accordion,
   AccordionButton,
@@ -32,6 +31,7 @@ import {
 } from "tw-components";
 import type { NFTMetadataInputLimited } from "types/modified-types";
 import { parseAttributes } from "utils/parseAttributes";
+import { Button } from "@/components/ui/button";
 import {
   getUploadedNFTMediaMeta,
   handleNFTMediaUpload,
@@ -101,12 +101,12 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
               : lazyMint1155({ contract, nfts });
 
             await sendAndConfirmTx.mutateAsync(transaction, {
-              onSuccess: () => {
-                setOpen(false);
-              },
               onError: (error) => {
                 console.error(error);
               },
+              onSuccess: () => {
+                setOpen(false);
+              },
             });
 
             lazyMintNotifications.onSuccess();
@@ -120,7 +120,7 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
           <Heading size="subtitle.md">Metadata </Heading>
           <Divider />
         </div>
-        <FormControl isRequired isInvalid={!!errors.name}>
+        <FormControl isInvalid={!!errors.name} isRequired>
           <FormLabel>Name</FormLabel>
           <Input autoFocus {...register("name")} />
           <FormErrorMessage>{errors?.name?.message}</FormErrorMessage>
@@ -129,15 +129,15 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
           <FormLabel>Media</FormLabel>
           <div>
             <FileInput
-              previewMaxWidth="200px"
-              value={media}
-              showUploadButton
-              showPreview={true}
-              setValue={setFile}
               className="rounded border border-border transition-all duration-200"
-              selectOrUpload="Upload"
-              helperText="Media"
               client={contract.client}
+              helperText="Media"
+              previewMaxWidth="200px"
+              selectOrUpload="Upload"
+              setValue={setFile}
+              showPreview={true}
+              showUploadButton
+              value={media}
             />
           </div>
           <FormHelperText>
@@ -152,13 +152,13 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
           <FormControl isInvalid={!!errors.image}>
             <FormLabel>Cover Image</FormLabel>
             <FileInput
-              previewMaxWidth="200px"
-              client={contract.client}
               accept={{ "image/*": [] }}
-              value={image}
-              showUploadButton
-              setValue={(file) => setValue("image", file)}
               className="rounded border border-border transition-all"
+              client={contract.client}
+              previewMaxWidth="200px"
+              setValue={(file) => setValue("image", file)}
+              showUploadButton
+              value={image}
             />
             <FormHelperText>
               You can optionally upload an image as the cover of your NFT.
@@ -174,13 +174,13 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
           <FormErrorMessage>{errors?.description?.message}</FormErrorMessage>
         </FormControl>
         <PropertiesFormControl
-          watch={watch}
+          client={contract.client}
+          control={control}
           // biome-ignore lint/suspicious/noExplicitAny: FIXME
           errors={errors as any}
-          control={control}
           register={register}
           setValue={setValue}
-          client={contract.client}
+          watch={watch}
         />
         <Accordion
           allowToggle={!(errors.background_color || errors.external_url)}
@@ -189,7 +189,7 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
           }
         >
           <AccordionItem>
-            <AccordionButton px={0} justifyContent="space-between">
+            <AccordionButton justifyContent="space-between" px={0}>
               <Heading size="subtitle.md">Advanced Options</Heading>
               <AccordionIcon />
             </AccordionButton>
@@ -229,10 +229,10 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
                   <FormLabel>Image URL</FormLabel>
                   <Input
                     {...register("image")}
-                    value={image}
                     onChange={(e) => {
                       setValue("image", e.target.value);
                     }}
+                    value={image}
                   />
                   <FormHelperText>
                     If you already have your NFT image pre-uploaded to a URL,
@@ -247,10 +247,10 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
                   <FormLabel>Animation URL</FormLabel>
                   <Input
                     {...register("animation_url")}
-                    value={animation_url}
                     onChange={(e) => {
                       setValue("animation_url", e.target.value);
                     }}
+                    value={animation_url}
                   />
                   <FormHelperText>
                     If you already have your NFT Animation URL pre-uploaded to a
@@ -268,22 +268,22 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
       </form>
       <div className="mt-8 flex flex-row justify-end gap-3">
         <Button
-          disabled={sendAndConfirmTx.isPending}
-          variant="outline"
           className="mr-3"
+          disabled={sendAndConfirmTx.isPending}
           onClick={() => setOpen(false)}
+          variant="outline"
         >
           Cancel
         </Button>
         <TransactionButton
           client={contract.client}
+          disabled={!isDirty}
+          form={LAZY_MINT_FORM_ID}
           isLoggedIn={isLoggedIn}
-          txChainID={contract.chain.id}
-          transactionCount={1}
           isPending={sendAndConfirmTx.isPending}
-          form={LAZY_MINT_FORM_ID}
+          transactionCount={1}
+          txChainID={contract.chain.id}
           type="submit"
-          disabled={!isDirty}
         >
           Lazy Mint NFT
         </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-button.tsx
index 70b476631a8..5d4cecde2fc 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-button.tsx
@@ -1,5 +1,9 @@
 "use client";
 
+import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
+import { PlusIcon } from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebContract } from "thirdweb";
 import { Button } from "@/components/ui/button";
 import {
   Sheet,
@@ -8,10 +12,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
-import { PlusIcon } from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebContract } from "thirdweb";
 import { NFTMintForm } from "./mint-form";
 
 interface NFTMintButtonProps {
@@ -30,9 +30,9 @@ export const NFTMintButton: React.FC<NFTMintButtonProps> = ({
 
   return (
     <MinterOnly contract={contract}>
-      <Sheet open={open} onOpenChange={setOpen}>
+      <Sheet onOpenChange={setOpen} open={open}>
         <SheetTrigger asChild>
-          <Button variant="primary" className="gap-2" {...restButtonProps}>
+          <Button className="gap-2" variant="primary" {...restButtonProps}>
             <PlusIcon className="size-5" />
             Mint
           </Button>
@@ -44,8 +44,8 @@ export const NFTMintButton: React.FC<NFTMintButtonProps> = ({
           <NFTMintForm
             contract={contract}
             isErc721={isErc721}
-            setOpen={setOpen}
             isLoggedIn={isLoggedIn}
+            setOpen={setOpen}
           />
         </SheetContent>
       </Sheet>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-form.tsx
index 35323e3ee86..827c5630a3a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-form.tsx
@@ -101,26 +101,26 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
           try {
             const dataWithCustom = {
               ...data,
-              image: data.image,
               animation_url: data.animation_url,
+              image: data.image,
             };
 
             const nft = parseAttributes(dataWithCustom);
             const transaction = isErc721
-              ? erc721MintTo({ contract, to: address, nft })
+              ? erc721MintTo({ contract, nft, to: address })
               : erc1155MintTo({
                   contract,
-                  to: address,
                   nft,
                   supply: BigInt(supply),
+                  to: address,
                 });
             await sendAndConfirmTx.mutateAsync(transaction, {
-              onSuccess: () => {
-                setOpen(false);
-              },
               onError: (error) => {
                 console.error(error);
               },
+              onSuccess: () => {
+                setOpen(false);
+              },
             });
 
             nftMintNotifications.onSuccess();
@@ -134,7 +134,7 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
           <Heading size="subtitle.md">Metadata xx</Heading>
           <Divider />
         </div>
-        <FormControl isRequired isInvalid={!!errors.name}>
+        <FormControl isInvalid={!!errors.name} isRequired>
           <FormLabel>Name</FormLabel>
           <Input autoFocus {...register("name")} />
           <FormErrorMessage>{errors?.name?.message}</FormErrorMessage>
@@ -143,15 +143,15 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
           <FormLabel>Media</FormLabel>
           <div>
             <FileInput
-              previewMaxWidth="200px"
-              client={contract.client}
-              value={media}
-              showUploadButton
-              showPreview={true}
-              setValue={setFile}
               className="shrink-0 rounded border border-border transition-all duration-200"
-              selectOrUpload="Upload"
+              client={contract.client}
               helperText="Media"
+              previewMaxWidth="200px"
+              selectOrUpload="Upload"
+              setValue={setFile}
+              showPreview={true}
+              showUploadButton
+              value={media}
             />
           </div>
           <FormHelperText>
@@ -166,13 +166,13 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
           <FormControl isInvalid={!!errors.image}>
             <FormLabel>Cover Image</FormLabel>
             <FileInput
+              accept={{ "image/*": [] }}
+              className="shrink-0 rounded border border-border transition-all"
               client={contract.client}
               previewMaxWidth="200px"
-              accept={{ "image/*": [] }}
-              value={image}
-              showUploadButton
               setValue={(file) => setValue("image", file)}
-              className="shrink-0 rounded border border-border transition-all"
+              showUploadButton
+              value={image}
             />
             <FormHelperText>
               You can optionally upload an image as the cover of your NFT.
@@ -188,25 +188,25 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
           <FormErrorMessage>{errors?.description?.message}</FormErrorMessage>
         </FormControl>
         {!isErc721 && (
-          <FormControl isRequired isInvalid={!!errors.supply}>
+          <FormControl isInvalid={!!errors.supply} isRequired>
             <FormLabel>Initial Supply</FormLabel>
             <Input
-              type="number"
-              step="1"
               pattern="[0-9]"
+              step="1"
+              type="number"
               {...register("supply")}
             />
             <FormErrorMessage>{errors?.supply?.message}</FormErrorMessage>
           </FormControl>
         )}
         <PropertiesFormControl
-          watch={watch}
           client={contract.client}
+          control={control}
           // biome-ignore lint/suspicious/noExplicitAny: FIXME
           errors={errors as any}
-          control={control}
           register={register}
           setValue={setValue}
+          watch={watch}
         />
         <Accordion
           allowToggle={!(errors.background_color || errors.external_url)}
@@ -215,7 +215,7 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
           }
         >
           <AccordionItem>
-            <AccordionButton px={0} justifyContent="space-between">
+            <AccordionButton justifyContent="space-between" px={0}>
               <Heading size="subtitle.md">Advanced Options</Heading>
               <AccordionIcon />
             </AccordionButton>
@@ -254,10 +254,10 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
                 <FormControl isInvalid={!!errors.image}>
                   <FormLabel>Image URL</FormLabel>
                   <Input
-                    value={image}
                     onChange={(e) => {
                       setValue("image", e.target.value);
                     }}
+                    value={image}
                   />
                   <FormHelperText>
                     If you already have your NFT image pre-uploaded to a URL,
@@ -271,10 +271,10 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
                 <FormControl isInvalid={!!errors.animation_url}>
                   <FormLabel>Animation URL</FormLabel>
                   <Input
-                    value={animation_url}
                     onChange={(e) => {
                       setValue("animation_url", e.target.value);
                     }}
+                    value={animation_url}
                   />
                   <FormHelperText>
                     If you already have your NFT Animation URL pre-uploaded to a
@@ -292,21 +292,21 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
       <div className="mt-8 flex flex-row justify-end gap-3">
         <Button
           isDisabled={sendAndConfirmTx.isPending}
-          variant="outline"
           mr={3}
           onClick={() => setOpen(false)}
+          variant="outline"
         >
           Cancel
         </Button>
         <TransactionButton
-          txChainID={contract.chain.id}
           client={contract.client}
-          transactionCount={1}
-          isPending={sendAndConfirmTx.isPending}
-          form={MINT_FORM_ID}
-          type="submit"
           disabled={!isDirty}
+          form={MINT_FORM_ID}
           isLoggedIn={isLoggedIn}
+          isPending={sendAndConfirmTx.isPending}
+          transactionCount={1}
+          txChainID={contract.chain.id}
+          type="submit"
         >
           Mint NFT
         </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/reveal-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/reveal-button.tsx
index afd6f62fede..c0606f7522a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/reveal-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/reveal-button.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Sheet,
-  SheetContent,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
 import { FormControl, Input, Select } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
@@ -20,6 +11,15 @@ import type { ThirdwebContract } from "thirdweb";
 import { getBatchesToReveal, reveal } from "thirdweb/extensions/erc721";
 import { useReadContract, useSendAndConfirmTransaction } from "thirdweb/react";
 import { FormErrorMessage, FormLabel } from "tw-components";
+import { Button } from "@/components/ui/button";
+import {
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 interface NFTRevealButtonProps {
   contract: ThirdwebContract;
@@ -60,7 +60,7 @@ export const NFTRevealButton: React.FC<NFTRevealButtonProps> = ({
   if (allBatchesRevealed) {
     return (
       <ToolTipLabel label="All batches are revealed">
-        <Button variant="primary" className="gap-2" disabled>
+        <Button className="gap-2" disabled variant="primary">
           <EyeIcon className="size-4" /> Reveal NFTs
         </Button>
       </ToolTipLabel>
@@ -69,9 +69,9 @@ export const NFTRevealButton: React.FC<NFTRevealButtonProps> = ({
 
   return (
     <MinterOnly contract={contract}>
-      <Sheet open={open} onOpenChange={setOpen}>
+      <Sheet onOpenChange={setOpen} open={open}>
         <SheetTrigger asChild>
-          <Button variant="primary" className="gap-2">
+          <Button className="gap-2" variant="primary">
             <EyeIcon className="size-4" /> Reveal NFTs
           </Button>
         </SheetTrigger>
@@ -84,35 +84,35 @@ export const NFTRevealButton: React.FC<NFTRevealButtonProps> = ({
             id={REVEAL_FORM_ID}
             onSubmit={handleSubmit((data) => {
               const tx = reveal({
-                contract,
                 batchId: BigInt(data.batchId),
+                contract,
                 password: data.password,
               });
 
               const promise = sendTxMutation.mutateAsync(tx, {
-                onSuccess: () => {
-                  setOpen(false);
-                },
                 onError: (error) => {
                   console.error(error);
                 },
+                onSuccess: () => {
+                  setOpen(false);
+                },
               });
 
               toast.promise(promise, {
+                error: "Failed to reveal batch",
                 loading: "Revealing batch",
                 success: "Batch revealed successfully",
-                error: "Failed to reveal batch",
               });
             })}
           >
-            <FormControl isRequired isInvalid={!!errors.password} mr={4}>
+            <FormControl isInvalid={!!errors.password} isRequired mr={4}>
               <FormLabel>Select a batch</FormLabel>
               <Select {...register("batchId")} autoFocus>
                 {batchesQuery.data.map((batch) => (
                   <option
+                    disabled={batch.batchUri === "0x"}
                     key={batch.batchId.toString()}
                     value={batch.batchId.toString()}
-                    disabled={batch.batchUri === "0x"}
                   >
                     {batch.placeholderMetadata?.name ||
                       batch.batchId.toString()}{" "}
@@ -122,7 +122,7 @@ export const NFTRevealButton: React.FC<NFTRevealButtonProps> = ({
               </Select>
               <FormErrorMessage>{errors?.password?.message}</FormErrorMessage>
             </FormControl>
-            <FormControl isRequired isInvalid={!!errors.password} mr={4}>
+            <FormControl isInvalid={!!errors.password} isRequired mr={4}>
               <FormLabel>Password</FormLabel>
               <Input
                 {...register("password")}
@@ -136,13 +136,13 @@ export const NFTRevealButton: React.FC<NFTRevealButtonProps> = ({
           <div className="mt-4 flex justify-end">
             <TransactionButton
               client={contract.client}
+              disabled={!isDirty}
+              form={REVEAL_FORM_ID}
               isLoggedIn={isLoggedIn}
-              txChainID={contract.chain.id}
-              transactionCount={1}
               isPending={sendTxMutation.isPending}
-              form={REVEAL_FORM_ID}
+              transactionCount={1}
+              txChainID={contract.chain.id}
               type="submit"
-              disabled={!isDirty}
             >
               Reveal NFTs
             </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-button.tsx
index d8d4b7ebf20..b8fa48aada0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-button.tsx
@@ -1,4 +1,8 @@
 "use client";
+import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
+import { PlusIcon } from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebContract } from "thirdweb";
 import { Button } from "@/components/ui/button";
 import {
   Sheet,
@@ -7,10 +11,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
-import { PlusIcon } from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebContract } from "thirdweb";
 import { SharedMetadataForm } from "./shared-metadata-form";
 
 interface NFTSharedMetadataButtonProps {
@@ -24,9 +24,9 @@ export const NFTSharedMetadataButton: React.FC<
   const [open, setOpen] = useState(false);
   return (
     <MinterOnly contract={contract}>
-      <Sheet open={open} onOpenChange={setOpen}>
+      <Sheet onOpenChange={setOpen} open={open}>
         <SheetTrigger asChild>
-          <Button variant="primary" className="gap-2" {...restButtonProps}>
+          <Button className="gap-2" variant="primary" {...restButtonProps}>
             <PlusIcon className="size-5" /> Set NFT Metadata
           </Button>
         </SheetTrigger>
@@ -36,8 +36,8 @@ export const NFTSharedMetadataButton: React.FC<
           </SheetHeader>
           <SharedMetadataForm
             contract={contract}
-            setOpen={setOpen}
             isLoggedIn={isLoggedIn}
+            setOpen={setOpen}
           />
         </SheetContent>
       </Sheet>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-form.tsx
index ef244734728..8d2326d807c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-form.tsx
@@ -76,8 +76,8 @@ export const SharedMetadataForm: React.FC<{
 
           const dataWithCustom = {
             ...data,
-            image: data.image,
             animation_url: data.animation_url,
+            image: data.image,
           };
 
           try {
@@ -86,12 +86,12 @@ export const SharedMetadataForm: React.FC<{
               nft: parseAttributes(dataWithCustom),
             });
             await sendAndConfirmTx.mutateAsync(transaction, {
-              onSuccess: () => {
-                setOpen(false);
-              },
               onError: (error) => {
                 console.error(error);
               },
+              onSuccess: () => {
+                setOpen(false);
+              },
             });
 
             setSharedMetaNotifications.onSuccess();
@@ -105,7 +105,7 @@ export const SharedMetadataForm: React.FC<{
           <Heading size="subtitle.md">Metadata</Heading>
           <Divider />
         </div>
-        <FormControl isRequired isInvalid={!!errors.name}>
+        <FormControl isInvalid={!!errors.name} isRequired>
           <FormLabel>Name</FormLabel>
           <Input autoFocus {...register("name")} />
           <FormErrorMessage>{errors?.name?.message}</FormErrorMessage>
@@ -114,15 +114,15 @@ export const SharedMetadataForm: React.FC<{
           <FormLabel>Media</FormLabel>
           <div>
             <FileInput
-              previewMaxWidth="200px"
-              value={media}
-              client={contract.client}
-              showUploadButton
-              showPreview={true}
-              setValue={setFile}
               className="shrink-0 rounded border border-border transition-all duration-200"
-              selectOrUpload="Upload"
+              client={contract.client}
               helperText="Media"
+              previewMaxWidth="200px"
+              selectOrUpload="Upload"
+              setValue={setFile}
+              showPreview={true}
+              showUploadButton
+              value={media}
             />
           </div>
           <FormHelperText>
@@ -137,13 +137,13 @@ export const SharedMetadataForm: React.FC<{
           <FormControl isInvalid={!!errors.image}>
             <FormLabel>Cover Image</FormLabel>
             <FileInput
+              accept={{ "image/*": [] }}
+              className="shrink-0 rounded border border-border transition-all"
               client={contract.client}
               previewMaxWidth="200px"
-              accept={{ "image/*": [] }}
-              value={image}
-              showUploadButton
               setValue={(file) => setValue("image", file)}
-              className="shrink-0 rounded border border-border transition-all"
+              showUploadButton
+              value={image}
             />
             <FormHelperText>
               You can optionally upload an image as the cover of your NFT.
@@ -165,7 +165,7 @@ export const SharedMetadataForm: React.FC<{
           }
         >
           <AccordionItem>
-            <AccordionButton px={0} justifyContent="space-between">
+            <AccordionButton justifyContent="space-between" px={0}>
               <Heading size="subtitle.md">Advanced Options</Heading>
               <AccordionIcon />
             </AccordionButton>
@@ -174,10 +174,10 @@ export const SharedMetadataForm: React.FC<{
                 <FormControl isInvalid={!!errors.image}>
                   <FormLabel>Image URL</FormLabel>
                   <Input
-                    value={image}
                     onChange={(e) => {
                       setValue("image", e.target.value);
                     }}
+                    value={image}
                   />
                   <FormHelperText>
                     If you already have your NFT image pre-uploaded, you can set
@@ -191,10 +191,10 @@ export const SharedMetadataForm: React.FC<{
                 <FormControl isInvalid={!!errors.animation_url}>
                   <FormLabel>Animation URL</FormLabel>
                   <Input
-                    value={animation_url}
                     onChange={(e) => {
                       setValue("animation_url", e.target.value);
                     }}
+                    value={animation_url}
                   />
                   <FormHelperText>
                     If you already have your NFT Animation URL pre-uploaded, you
@@ -212,21 +212,21 @@ export const SharedMetadataForm: React.FC<{
       <div className="mt-8 flex flex-row justify-end gap-3">
         <Button
           isDisabled={sendAndConfirmTx.isPending}
-          variant="outline"
           mr={3}
           onClick={() => setOpen(false)}
+          variant="outline"
         >
           Cancel
         </Button>
         <TransactionButton
           client={contract.client}
-          txChainID={contract.chain.id}
-          transactionCount={1}
-          isPending={sendAndConfirmTx.isPending}
-          form={SHARED_METADATA_FORM_ID}
-          type="submit"
           disabled={!isDirty}
+          form={SHARED_METADATA_FORM_ID}
           isLoggedIn={isLoggedIn}
+          isPending={sendAndConfirmTx.isPending}
+          transactionCount={1}
+          txChainID={contract.chain.id}
+          type="submit"
         >
           Set NFT Metadata
         </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/supply-cards.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/supply-cards.tsx
index 0d0da49dcf6..4565f3e0079 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/supply-cards.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/supply-cards.tsx
@@ -37,19 +37,19 @@ export const SupplyCards: React.FC<SupplyCardsProps> = ({ contract }) => {
   return (
     <div className="grid grid-cols-1 gap-4 lg:grid-cols-3">
       <StatCard
-        value={realTotalSupply.toString()}
-        label="Total Supply"
         isPending={nextTokenIdQuery.isPending}
+        label="Total Supply"
+        value={realTotalSupply.toString()}
       />
       <StatCard
-        value={totalSupplyQuery?.data?.toString() || "N/A"}
-        label="Claimed Supply"
         isPending={totalSupplyQuery.isPending}
+        label="Claimed Supply"
+        value={totalSupplyQuery?.data?.toString() || "N/A"}
       />
       <StatCard
-        value={unclaimedSupply}
-        label="Unclaimed Supply"
         isPending={totalSupplyQuery.isPending || nextTokenIdQuery.isPending}
+        label="Unclaimed Supply"
+        value={unclaimedSupply}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/table.tsx
index 34e2ed09b68..1ffe106157b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/table.tsx
@@ -1,10 +1,6 @@
+/** biome-ignore-all lint/nursery/noNestedComponentDefinitions: FIXME */
 "use client";
 
-import { UnexpectedValueErrorMessage } from "@/components/blocks/error-fallbacks/unexpect-value-error-message";
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { cn } from "@/lib/utils";
 import {
   Flex,
   IconButton,
@@ -41,6 +37,11 @@ import type { NFT, ThirdwebContract } from "thirdweb";
 import * as ERC721Ext from "thirdweb/extensions/erc721";
 import * as ERC1155Ext from "thirdweb/extensions/erc1155";
 import { useReadContract } from "thirdweb/react";
+import { UnexpectedValueErrorMessage } from "@/components/blocks/error-fallbacks/unexpect-value-error-message";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { cn } from "@/lib/utils";
 import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../../_utils/contract-page-path";
 
@@ -64,31 +65,30 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
   const tableColumns = useMemo(() => {
     const cols: Column<NFT>[] = [
       {
-        Header: "Token Id",
         accessor: (row) =>
           row.id?.toString().length > 8
             ? `${row.id.toString().slice(0, 4)}...${row.id.toString().slice(-4)}`
             : row.id?.toString(),
         Cell: (cell: CellProps<NFT, string>) => <p>{cell.value}</p>,
+        Header: "Token Id",
       },
       {
-        Header: "Media",
         accessor: (row) => row.metadata,
         Cell: (cell: CellProps<NFT, NFT["metadata"]>) => (
           <MediaCell cell={cell} client={contract.client} />
         ),
+        Header: "Media",
       },
       {
-        Header: "Name",
         accessor: (row) => row.metadata.name,
         Cell: (cell: CellProps<NFT, string>) => {
           if (typeof cell.value !== "string") {
             return (
               <UnexpectedValueErrorMessage
-                title="Invalid Name"
+                className="w-[300px] py-3"
                 description="Name is not a string"
+                title="Invalid Name"
                 value={cell.value}
-                className="w-[300px] py-3"
               />
             );
           }
@@ -99,18 +99,18 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
             </p>
           );
         },
+        Header: "Name",
       },
       {
-        Header: "Description",
         accessor: (row) => row.metadata.description,
         Cell: (cell: CellProps<NFT, string>) => {
           if (cell.value && typeof cell.value !== "string") {
             return (
               <UnexpectedValueErrorMessage
-                title="Invalid description"
+                className="w-[300px] py-3"
                 description="Description is not a string"
+                title="Invalid description"
                 value={cell.value}
-                className="w-[300px] py-3"
               />
             );
           }
@@ -126,20 +126,20 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
             </p>
           );
         },
+        Header: "Description",
       },
     ];
     if (isErc721) {
       cols.push({
-        Header: "Owner",
         accessor: (row) => row.owner,
         Cell: (cell: CellProps<NFT, string>) => (
           <WalletAddress address={cell.value} client={contract.client} />
         ),
+        Header: "Owner",
       });
     }
     if (isErc1155) {
       cols.push({
-        Header: "Circulating Supply",
         accessor: (row) => row,
         Cell: (cell: CellProps<NFT, number>) => {
           if (cell.row.original.type === "ERC1155") {
@@ -150,6 +150,7 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
             );
           }
         },
+        Header: "Circulating Supply",
       });
     }
     return cols;
@@ -161,9 +162,9 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
     isErc1155 ? ERC1155Ext.getNFTs : ERC721Ext.getNFTs,
     {
       contract,
-      start: queryParams.start,
       count: queryParams.count,
       includeOwners: true,
+      start: queryParams.start,
       tokenByIndex,
     },
   );
@@ -227,8 +228,8 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
       columns: tableColumns,
       data: getNFTsQuery.data || [],
       initialState: {
-        pageSize: queryParams.count,
         pageIndex: 0,
+        pageSize: queryParams.count,
       },
       manualPagination: true,
       pageCount: Math.max(
@@ -242,22 +243,22 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
   // FIXME: re-work tables and pagination with @tanstack/table@latest - which (I believe) does not need this workaround anymore
   // eslint-disable-next-line no-restricted-syntax
   useEffect(() => {
-    setQueryParams({ start: pageIndex * pageSize, count: pageSize });
+    setQueryParams({ count: pageSize, start: pageIndex * pageSize });
   }, [pageIndex, pageSize]);
 
   return (
-    <Flex gap={4} direction="column">
+    <Flex direction="column" gap={4}>
       <TableContainer
-        maxW="100%"
         className="relative rounded-lg border border-border bg-card"
+        maxW="100%"
       >
         {getNFTsQuery.isFetching && (
           <Spinner
             color="primary"
-            size="xs"
             position="absolute"
-            top={2}
             right={4}
+            size="xs"
+            top={2}
           />
         )}
         <Table {...getTableProps()}>
@@ -284,8 +285,8 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
           </Thead>
           <Tbody
             {...getTableBodyProps()}
-            position="relative"
             className="!bg-card"
+            position="relative"
           >
             {page.map((row, rowIndex) => {
               const failedToLoad = !row.original.tokenURI;
@@ -293,9 +294,13 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
               return (
                 <Tr
                   {...row.getRowProps()}
-                  role="group"
+                  _last={{ borderBottomWidth: 0 }}
+                  borderBottomWidth={1}
+                  borderColor="borderColor"
                   className="bg-card hover:bg-accent/50"
-                  style={{ cursor: "pointer" }}
+                  cursor={failedToLoad ? "not-allowed" : "pointer"}
+                  // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
+                  key={rowIndex}
                   onClick={() => {
                     const tokenId = row.original.id;
                     if (!tokenId && tokenId !== 0n) {
@@ -303,9 +308,9 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
                     }
 
                     const path = buildContractPagePath({
-                      projectMeta,
                       chainIdOrSlug: chainSlug.toString(),
                       contractAddress: contract.address,
+                      projectMeta,
                       subpath: `/nfts/${tokenId.toString()}`,
                     });
 
@@ -313,14 +318,11 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
                       scroll: true,
                     });
                   }}
-                  borderBottomWidth={1}
-                  _last={{ borderBottomWidth: 0 }}
-                  pointerEvents={failedToLoad ? "none" : "auto"}
                   opacity={failedToLoad ? 0.3 : 1}
-                  cursor={failedToLoad ? "not-allowed" : "pointer"}
-                  borderColor="borderColor"
-                  // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
-                  key={rowIndex}
+                  pointerEvents={failedToLoad ? "none" : "auto"}
+                  // biome-ignore lint/a11y/useSemanticElements: FIXME
+                  role="group"
+                  style={{ cursor: "pointer" }}
                 >
                   {row.cells.map((cell, cellIndex) => {
                     return (
@@ -328,9 +330,9 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
                         {...cell.getCellProps()}
                         borderBottomWidth="inherit"
                         borderColor="borderColor"
-                        maxW="sm"
                         // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
                         key={cellIndex}
+                        maxW="sm"
                       >
                         <ErrorBoundary FallbackComponent={NFTCellErrorBoundary}>
                           {cell.render("Cell")}
@@ -346,19 +348,19 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
             })}
             {getNFTsQuery.isPlaceholderData && (
               <Flex
-                zIndex="above"
-                position="absolute"
-                top={0}
-                bottom={0}
-                left={0}
-                right={0}
+                _dark={{ bg: "whiteAlpha.50" }}
+                align="flex-end"
                 backdropFilter="blur(5px)"
                 bg="blackAlpha.100"
-                _dark={{ bg: "whiteAlpha.50" }}
                 borderRadius="md"
-                align="flex-end"
+                bottom={0}
                 justify="center"
+                left={0}
                 p={8}
+                position="absolute"
+                right={0}
+                top={0}
+                zIndex="above"
               >
                 <Flex align="center" gap={4}>
                   <Spinner size="sm" />
@@ -372,15 +374,15 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
       <div className="flex w-full items-center justify-center">
         <div className="flex flex-row items-center gap-1">
           <IconButton
-            isDisabled={!canPreviousPage || queryLoading}
             aria-label="first page"
             icon={<ChevronFirstIcon className="size-4" />}
+            isDisabled={!canPreviousPage || queryLoading}
             onClick={() => gotoPage(0)}
           />
           <IconButton
-            isDisabled={!canPreviousPage || queryLoading}
             aria-label="previous page"
             icon={<ChevronLeftIcon className="size-4" />}
+            isDisabled={!canPreviousPage || queryLoading}
             onClick={() => previousPage()}
           />
           <p className="whitespace-nowrap">
@@ -390,24 +392,24 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
             </Skeleton>
           </p>
           <IconButton
-            isDisabled={!canNextPage || queryLoading}
             aria-label="next page"
             icon={<ChevronRightIcon className="size-4" />}
+            isDisabled={!canNextPage || queryLoading}
             onClick={() => nextPage()}
           />
           <IconButton
-            isDisabled={!canNextPage || queryLoading}
             aria-label="last page"
             icon={<ChevronLastIcon className="size-4" />}
+            isDisabled={!canNextPage || queryLoading}
             onClick={() => gotoPage(pageCount - 1)}
           />
 
           <Select
+            isDisabled={queryLoading}
             onChange={(e) => {
               setPageSize(Number.parseInt(e.target.value as string, 10));
             }}
             value={pageSize}
-            isDisabled={queryLoading}
           >
             <option value="25">25</option>
             <option value="50">50</option>
@@ -434,11 +436,11 @@ function NFTCellErrorBoundary(errorProps: FallbackProps) {
 
   return (
     <CopyTextButton
-      textToShow={errorProps.error.message}
-      textToCopy={errorProps.error.message}
+      className="max-w-[250px] truncate text-destructive-text"
       copyIconPosition="left"
+      textToCopy={errorProps.error.message}
+      textToShow={errorProps.error.message}
       tooltip={errorProps.error.message}
-      className="max-w-[250px] truncate text-destructive-text"
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/page.tsx
index 57bafdc4b93..8c760062950 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/page.tsx
@@ -9,10 +9,10 @@ export default async function Page(props: {
 
   return (
     <SharedNFTPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/shared-nfts-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/shared-nfts-page.tsx
index 3ee02bab62f..2fccd9cde9e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/shared-nfts-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/shared-nfts-page.tsx
@@ -14,8 +14,8 @@ export async function SharedNFTPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -50,8 +50,8 @@ export async function SharedNFTPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
@@ -60,8 +60,8 @@ export async function SharedNFTPage(props: {
   return (
     <ContractNFTPage
       contract={clientContract}
-      isErc721={supportedERCs.isERC721}
       functionSelectors={functionSelectors}
+      isErc721={supportedERCs.isERC721}
       isLoggedIn={props.isLoggedIn}
       projectMeta={props.projectMeta}
     />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/opengraph-image.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/opengraph-image.tsx
index c6a9a035bcc..42b5d589b51 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/opengraph-image.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/opengraph-image.tsx
@@ -1,15 +1,16 @@
-import { isProd } from "@/constants/env-utils";
-import { API_ROUTES_CLIENT_ID } from "@/constants/server-envs";
 /* eslint-disable @next/next/no-img-element */
 import { ImageResponse } from "@vercel/og";
+import { useId } from "react";
 import { getContractMetadata } from "thirdweb/extensions/common";
+import { isProd } from "@/constants/env-utils";
+import { API_ROUTES_CLIENT_ID } from "@/constants/server-envs";
 import { getContractPageParamsInfo } from "./_utils/getContractFromParams";
 
 export const runtime = "edge";
 
 export const size = {
-  width: 1200,
   height: 630,
+  width: 1200,
 };
 
 export default async function Image({
@@ -22,8 +23,8 @@ export default async function Image({
 }) {
   try {
     const info = await getContractPageParamsInfo({
-      contractAddress: params.contractAddress,
       chainIdOrSlug: params.chain_id,
+      contractAddress: params.contractAddress,
       teamId: undefined,
     });
 
@@ -44,15 +45,15 @@ export default async function Image({
     }`;
 
     return contractOGImageTemplate({
-      displayName: contractDisplayName,
-      contractAddress: info.serverContract.address,
       chainName: info.chainMetadata.name,
+      contractAddress: info.serverContract.address,
+      displayName: contractDisplayName,
       logo: contractMetadata.image,
     });
   } catch {
     return contractOGImageTemplate({
-      contractAddress: params.contractAddress,
       chainName: params.chain_id,
+      contractAddress: params.contractAddress,
     });
   }
 }
@@ -61,42 +62,45 @@ function shortenString(str: string) {
   return `${str.substring(0, 7)}...${str.substring(str.length - 5)}`;
 }
 
-const OgBrandIcon: React.FC = () => (
-  // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="147"
-    height="21"
-    viewBox="0 0 147 21"
-    fill="none"
-  >
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M67.4653 0C66.2016 0 65.1654 1.03968 65.1654 2.36528C65.1654 3.66488 66.2016 4.70456 67.4653 4.70456C68.7289 4.70456 69.7651 3.66488 69.7651 2.36528C69.7651 1.03968 68.7289 0 67.4653 0ZM69.4869 5.9002H65.4685V19.9099H69.4869V5.9002ZM42.015 0.519887H45.9323V5.90025H48.9398V9.6431H45.9323V14.5816C45.9323 15.3094 46.4883 15.8812 47.1707 15.8812H48.9146V19.858H47.1707C44.3401 19.858 42.015 17.4927 42.015 14.5556V9.61711H40.1953V5.87425H42.015V0.519887ZM58.5187 5.58834C56.6991 5.58834 55.2585 6.3681 54.7025 7.58973V0.519887H50.6841V19.884H54.7025V12.0344C54.7025 10.3969 55.7387 9.25322 57.2045 9.25322C58.6957 9.25322 59.5297 10.2409 59.5297 11.9044V19.91H63.5481V11.3846C63.5481 7.74568 61.7284 5.58834 58.5187 5.58834ZM75.2238 5.87422V7.79763C75.8304 6.39406 77.2962 5.58831 79.1411 5.56232C79.4191 5.56232 79.773 5.58831 80.2026 5.64029V9.5391C79.7982 9.46113 79.3433 9.40914 78.8631 9.40914C76.5633 9.40914 75.2238 10.7347 75.2238 13.048V19.8839H71.2054V5.87422H75.2238ZM91.4997 7.71969C91.0953 6.49806 89.5031 5.64033 87.456 5.64033C85.5352 5.64033 83.9177 6.34211 82.6288 7.74568C81.3651 9.12326 80.708 10.8647 80.708 12.8921C80.708 14.9195 81.3651 16.635 82.6288 18.0645C83.9177 19.4421 85.5352 20.1439 87.456 20.1439C89.5031 20.1439 91.0953 19.2862 91.4997 18.0645V19.91H95.5181V0.519887H91.4997V7.71969ZM90.6909 15.3874C90.0086 16.0631 89.1745 16.3751 88.1889 16.3751C87.2285 16.3751 86.3945 16.0372 85.7374 15.3874C85.055 14.6856 84.7265 13.8538 84.7265 12.8921C84.7265 11.9304 85.055 11.0987 85.7374 10.4229C86.4198 9.72108 87.2285 9.38318 88.1889 9.38318C89.1998 9.38318 90.0338 9.72108 90.6909 10.4229C91.3986 11.0987 91.7524 11.9304 91.7524 12.8921C91.7524 13.8538 91.3986 14.6856 90.6909 15.3874ZM107.119 5.95218L110.758 12.6061L113.21 5.9002H117.152L111.542 20.7157L107.119 12.6581L102.696 20.7157L97.1105 5.9002H101.053L103.479 12.6061L107.119 5.95218ZM123.773 5.56232C121.701 5.56232 119.957 6.23811 118.592 7.5897C117.253 8.91529 116.57 10.6828 116.57 12.8661V12.996C116.57 15.1794 117.253 16.9468 118.592 18.2724C119.982 19.572 121.751 20.2478 123.975 20.2478C126.048 20.2478 127.741 19.832 129.03 18.9742V15.3613C127.766 16.271 126.149 16.7129 124.203 16.7129C122.08 16.7129 120.69 15.6472 120.614 13.9837H130.597C130.647 13.5679 130.673 13.1 130.673 12.6322C130.673 10.6308 130.016 8.96728 128.752 7.61569C127.488 6.23811 125.795 5.56232 123.773 5.56232ZM120.614 11.3066C120.639 10.6568 120.968 10.1109 121.574 9.66906C122.206 9.2272 122.914 8.99327 123.773 8.99327C125.365 8.99327 126.604 10.0589 126.604 11.3066H120.614ZM140.252 5.64032C142.173 5.64032 143.79 6.34211 145.054 7.74568C146.343 9.14925 147 10.8387 147 12.8661C147 14.8935 146.343 16.609 145.054 18.0385C143.79 19.4161 142.173 20.1179 140.252 20.1179C138.205 20.1179 136.613 19.2602 136.208 18.0385V19.884H132.19V0.519887H136.208V7.71969C136.613 6.49806 138.205 5.64032 140.252 5.64032ZM139.519 16.375C140.48 16.375 141.288 16.0631 141.971 15.3873C142.653 14.6856 142.982 13.8538 142.982 12.8921C142.982 11.9304 142.653 11.0987 141.971 10.4229C141.314 9.72108 140.48 9.38318 139.519 9.38318C138.534 9.38318 137.7 9.72108 136.992 10.4229C136.31 11.0987 135.956 11.9304 135.956 12.8921C135.956 13.8538 136.31 14.6856 136.992 15.3873C137.674 16.0371 138.508 16.375 139.519 16.375Z"
-      fill="#F1F1F1"
-    />
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M0.0899952 1.76662C-0.238847 0.917876 0.373972 0 1.27068 0H6.83785C7.36094 0 7.8242 0.318498 8.01854 0.811118L12.4499 12.1256C12.5694 12.4292 12.5694 12.7705 12.4499 13.0811L9.66249 20.1869C9.23657 21.271 7.72713 21.271 7.30112 20.1869L0.0899952 1.76662ZM10.8434 1.72899C10.5445 0.887252 11.1573 0 12.0391 0H16.8888C17.4269 0 17.9052 0.34124 18.0845 0.849609L22.1123 12.1632C22.2094 12.4441 22.2094 12.7547 22.1123 13.0435L19.6911 19.8457C19.2876 20.9831 17.7034 20.9831 17.2999 19.8457L10.8434 1.72899ZM21.7312 0C20.8345 0 20.2217 0.917876 20.5505 1.76662L27.7617 20.1869C28.1876 21.271 29.6971 21.271 30.123 20.1869L32.9103 13.0811C33.0299 12.7705 33.0299 12.4292 32.9103 12.1256L28.4791 0.811118C28.2847 0.318498 27.8215 0 27.2984 0H21.7312Z"
-      fill="url(#paint0_linear_152_1820)"
-    />
-    <defs>
-      <linearGradient
-        id="paint0_linear_152_1820"
-        x1="16.5224"
-        y1="-4.95833"
-        x2="40.0128"
-        y2="25.9245"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#F213A4" />
-        <stop offset="1" stop-color="#5204BF" />
-      </linearGradient>
-    </defs>
-  </svg>
-);
+const OgBrandIcon: React.FC = () => {
+  const gradientId = useId();
+  return (
+    // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
+    <svg
+      fill="none"
+      height="21"
+      viewBox="0 0 147 21"
+      width="147"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        clip-rule="evenodd"
+        d="M67.4653 0C66.2016 0 65.1654 1.03968 65.1654 2.36528C65.1654 3.66488 66.2016 4.70456 67.4653 4.70456C68.7289 4.70456 69.7651 3.66488 69.7651 2.36528C69.7651 1.03968 68.7289 0 67.4653 0ZM69.4869 5.9002H65.4685V19.9099H69.4869V5.9002ZM42.015 0.519887H45.9323V5.90025H48.9398V9.6431H45.9323V14.5816C45.9323 15.3094 46.4883 15.8812 47.1707 15.8812H48.9146V19.858H47.1707C44.3401 19.858 42.015 17.4927 42.015 14.5556V9.61711H40.1953V5.87425H42.015V0.519887ZM58.5187 5.58834C56.6991 5.58834 55.2585 6.3681 54.7025 7.58973V0.519887H50.6841V19.884H54.7025V12.0344C54.7025 10.3969 55.7387 9.25322 57.2045 9.25322C58.6957 9.25322 59.5297 10.2409 59.5297 11.9044V19.91H63.5481V11.3846C63.5481 7.74568 61.7284 5.58834 58.5187 5.58834ZM75.2238 5.87422V7.79763C75.8304 6.39406 77.2962 5.58831 79.1411 5.56232C79.4191 5.56232 79.773 5.58831 80.2026 5.64029V9.5391C79.7982 9.46113 79.3433 9.40914 78.8631 9.40914C76.5633 9.40914 75.2238 10.7347 75.2238 13.048V19.8839H71.2054V5.87422H75.2238ZM91.4997 7.71969C91.0953 6.49806 89.5031 5.64033 87.456 5.64033C85.5352 5.64033 83.9177 6.34211 82.6288 7.74568C81.3651 9.12326 80.708 10.8647 80.708 12.8921C80.708 14.9195 81.3651 16.635 82.6288 18.0645C83.9177 19.4421 85.5352 20.1439 87.456 20.1439C89.5031 20.1439 91.0953 19.2862 91.4997 18.0645V19.91H95.5181V0.519887H91.4997V7.71969ZM90.6909 15.3874C90.0086 16.0631 89.1745 16.3751 88.1889 16.3751C87.2285 16.3751 86.3945 16.0372 85.7374 15.3874C85.055 14.6856 84.7265 13.8538 84.7265 12.8921C84.7265 11.9304 85.055 11.0987 85.7374 10.4229C86.4198 9.72108 87.2285 9.38318 88.1889 9.38318C89.1998 9.38318 90.0338 9.72108 90.6909 10.4229C91.3986 11.0987 91.7524 11.9304 91.7524 12.8921C91.7524 13.8538 91.3986 14.6856 90.6909 15.3874ZM107.119 5.95218L110.758 12.6061L113.21 5.9002H117.152L111.542 20.7157L107.119 12.6581L102.696 20.7157L97.1105 5.9002H101.053L103.479 12.6061L107.119 5.95218ZM123.773 5.56232C121.701 5.56232 119.957 6.23811 118.592 7.5897C117.253 8.91529 116.57 10.6828 116.57 12.8661V12.996C116.57 15.1794 117.253 16.9468 118.592 18.2724C119.982 19.572 121.751 20.2478 123.975 20.2478C126.048 20.2478 127.741 19.832 129.03 18.9742V15.3613C127.766 16.271 126.149 16.7129 124.203 16.7129C122.08 16.7129 120.69 15.6472 120.614 13.9837H130.597C130.647 13.5679 130.673 13.1 130.673 12.6322C130.673 10.6308 130.016 8.96728 128.752 7.61569C127.488 6.23811 125.795 5.56232 123.773 5.56232ZM120.614 11.3066C120.639 10.6568 120.968 10.1109 121.574 9.66906C122.206 9.2272 122.914 8.99327 123.773 8.99327C125.365 8.99327 126.604 10.0589 126.604 11.3066H120.614ZM140.252 5.64032C142.173 5.64032 143.79 6.34211 145.054 7.74568C146.343 9.14925 147 10.8387 147 12.8661C147 14.8935 146.343 16.609 145.054 18.0385C143.79 19.4161 142.173 20.1179 140.252 20.1179C138.205 20.1179 136.613 19.2602 136.208 18.0385V19.884H132.19V0.519887H136.208V7.71969C136.613 6.49806 138.205 5.64032 140.252 5.64032ZM139.519 16.375C140.48 16.375 141.288 16.0631 141.971 15.3873C142.653 14.6856 142.982 13.8538 142.982 12.8921C142.982 11.9304 142.653 11.0987 141.971 10.4229C141.314 9.72108 140.48 9.38318 139.519 9.38318C138.534 9.38318 137.7 9.72108 136.992 10.4229C136.31 11.0987 135.956 11.9304 135.956 12.8921C135.956 13.8538 136.31 14.6856 136.992 15.3873C137.674 16.0371 138.508 16.375 139.519 16.375Z"
+        fill="#F1F1F1"
+        fill-rule="evenodd"
+      />
+      <path
+        clip-rule="evenodd"
+        d="M0.0899952 1.76662C-0.238847 0.917876 0.373972 0 1.27068 0H6.83785C7.36094 0 7.8242 0.318498 8.01854 0.811118L12.4499 12.1256C12.5694 12.4292 12.5694 12.7705 12.4499 13.0811L9.66249 20.1869C9.23657 21.271 7.72713 21.271 7.30112 20.1869L0.0899952 1.76662ZM10.8434 1.72899C10.5445 0.887252 11.1573 0 12.0391 0H16.8888C17.4269 0 17.9052 0.34124 18.0845 0.849609L22.1123 12.1632C22.2094 12.4441 22.2094 12.7547 22.1123 13.0435L19.6911 19.8457C19.2876 20.9831 17.7034 20.9831 17.2999 19.8457L10.8434 1.72899ZM21.7312 0C20.8345 0 20.2217 0.917876 20.5505 1.76662L27.7617 20.1869C28.1876 21.271 29.6971 21.271 30.123 20.1869L32.9103 13.0811C33.0299 12.7705 33.0299 12.4292 32.9103 12.1256L28.4791 0.811118C28.2847 0.318498 27.8215 0 27.2984 0H21.7312Z"
+        fill={`url(#${gradientId})`}
+        fill-rule="evenodd"
+      />
+      <defs>
+        <linearGradient
+          gradientUnits="userSpaceOnUse"
+          id={gradientId}
+          x1="16.5224"
+          x2="40.0128"
+          y1="-4.95833"
+          y2="25.9245"
+        >
+          <stop stop-color="#F213A4" />
+          <stop offset="1" stop-color="#5204BF" />
+        </linearGradient>
+      </defs>
+    </svg>
+  );
+};
 
 function textShortener(text: string) {
   const MAX_LENGTH = 50;
@@ -173,11 +177,11 @@ async function contractOGImageTemplate(params: {
 
   return new ImageResponse(
     <div
-      tw="w-full h-full flex justify-center py-8 px-8 "
       style={{
         background: "#000",
         fontFamily: "Inter",
       }}
+      tw="w-full h-full flex justify-center py-8 px-8 "
     >
       {/* the actual component starts here */}
 
@@ -186,17 +190,17 @@ async function contractOGImageTemplate(params: {
         {params.logo && (
           <img
             alt=""
-            tw="w-50 h-50 rounded-lg mb-8 flex mx-auto"
             src={replaceAnyIpfsUrlWithGateway(params.logo)}
+            tw="w-50 h-50 rounded-lg mb-8 flex mx-auto"
           />
         )}
 
         {params.displayName && params.displayName !== params.contractAddress ? (
           <h3
-            tw="text-2xl font-bold flex text-center my-0 mb-4 mx-auto"
             style={{
               color: "#626262",
             }}
+            tw="text-2xl font-bold flex text-center my-0 mb-4 mx-auto"
           >
             {shortenString(params.contractAddress)}
           </h3>
@@ -218,8 +222,6 @@ async function contractOGImageTemplate(params: {
       </div>
     </div>,
     {
-      width: 1200,
-      height: 630,
       fonts: [
         {
           data: inter400,
@@ -237,6 +239,8 @@ async function contractOGImageTemplate(params: {
           weight: 700,
         },
       ],
+      height: 630,
+      width: 1200,
     },
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/ContractOverviewPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/ContractOverviewPage.tsx
index 16a9a8df78e..c3b99560076 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/ContractOverviewPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/ContractOverviewPage.tsx
@@ -1,6 +1,6 @@
-import { UpsellBannerCard } from "@/components/blocks/UpsellBannerCard";
 import { ExternalLinkIcon } from "lucide-react";
 import type { ThirdwebContract } from "thirdweb";
+import { UpsellBannerCard } from "@/components/blocks/UpsellBannerCard";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { TokenDetailsCard } from "../tokens/components/supply";
 import { ContractAnalyticsOverviewCard } from "./components/Analytics";
@@ -45,54 +45,54 @@ export const ContractOverviewPage: React.FC<ContractOverviewPageProps> = ({
       <div className="flex grow flex-col gap-10 overflow-hidden">
         {isErc20 && (
           <UpsellBannerCard
-            title="Public asset page available"
-            description="A public page is available for this contract for anyone to buy this asset"
+            accentColor="blue"
             cta={{
-              text: "View asset page",
               icon: <ExternalLinkIcon className="size-4" />,
-              target: "_blank",
               link: `/${chainSlug}/${contract.address}`,
+              target: "_blank",
+              text: "View asset page",
             }}
+            description="A public page is available for this contract for anyone to buy this asset"
+            title="Public asset page available"
             trackingCategory="erc20-contract"
             trackingLabel="view-asset-page"
-            accentColor="blue"
           />
         )}
 
         <ContractChecklist
-          isErc721={isErc721}
-          isErc1155={isErc1155}
-          isErc20={isErc20}
-          contract={contract}
           chainSlug={chainSlug}
+          contract={contract}
           functionSelectors={functionSelectors}
+          isErc20={isErc20}
+          isErc721={isErc721}
+          isErc1155={isErc1155}
           projectMeta={projectMeta}
         />
 
         {isAnalyticsSupported && (
           <ContractAnalyticsOverviewCard
-            contractAddress={contract.address}
             chainId={contract.chain.id}
             chainSlug={chainSlug}
+            contractAddress={contract.address}
             projectMeta={projectMeta}
           />
         )}
 
         {(hasEnglishAuctions || hasDirectListings) && (
           <MarketplaceDetails
+            chainSlug={chainSlug}
             contract={contract}
-            projectMeta={projectMeta}
-            hasEnglishAuctions={hasEnglishAuctions}
             hasDirectListings={hasDirectListings}
-            chainSlug={chainSlug}
+            hasEnglishAuctions={hasEnglishAuctions}
+            projectMeta={projectMeta}
           />
         )}
 
         {(isErc1155 || isErc721) && (
           <NFTDetails
+            chainSlug={chainSlug}
             contract={contract}
             isErc721={isErc721}
-            chainSlug={chainSlug}
             projectMeta={projectMeta}
           />
         )}
@@ -100,15 +100,15 @@ export const ContractOverviewPage: React.FC<ContractOverviewPageProps> = ({
         {isErc20 && <TokenDetailsCard contract={contract} />}
 
         <LatestEvents
-          contract={contract}
           chainSlug={chainSlug}
+          contract={contract}
           projectMeta={projectMeta}
         />
 
         {isPermissionsEnumerable && (
           <PermissionsTable
-            contract={contract}
             chainSlug={chainSlug}
+            contract={contract}
             projectMeta={projectMeta}
           />
         )}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/Analytics.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/Analytics.tsx
index cfde2a3a965..543e5f776a2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/Analytics.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/Analytics.tsx
@@ -1,17 +1,16 @@
 "use client";
 
-import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
-import { Button } from "@/components/ui/button";
 import {
   useContractEventAnalytics,
   useContractTransactionAnalytics,
   useContractUniqueWalletAnalytics,
 } from "data/analytics/hooks";
 import { differenceInCalendarDays, format } from "date-fns";
-
 import { ArrowRightIcon } from "lucide-react";
 import Link from "next/link";
 import { useMemo, useState } from "react";
+import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
+import { Button } from "@/components/ui/button";
 import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../../_utils/contract-page-path";
 
@@ -42,38 +41,34 @@ export function ContractAnalyticsOverviewCard(props: {
   const { data, precision, isPending } = useContractAnalyticsOverview({
     chainId: props.chainId,
     contractAddress: props.contractAddress,
-    startDate,
     endDate,
+    startDate,
   });
 
   const analyticsPath = buildContractPagePath({
-    projectMeta: props.projectMeta,
     chainIdOrSlug: props.chainSlug,
     contractAddress: props.contractAddress,
+    projectMeta: props.projectMeta,
     subpath: "/analytics",
   });
 
   return (
     <ThirdwebAreaChart
+      chartClassName="aspect-[1.5] lg:aspect-[3]"
       config={{
-        wallets: {
-          label: "Unique Wallets",
-          color: "hsl(var(--chart-1))",
+        events: {
+          color: "hsl(var(--chart-3))",
+          label: "Events",
         },
         transactions: {
-          label: "Transactions",
           color: "hsl(var(--chart-2))",
+          label: "Transactions",
         },
-        events: {
-          label: "Events",
-          color: "hsl(var(--chart-3))",
+        wallets: {
+          color: "hsl(var(--chart-1))",
+          label: "Unique Wallets",
         },
       }}
-      data={data || []}
-      isPending={isPending}
-      showLegend
-      chartClassName="aspect-[1.5] lg:aspect-[3]"
-      toolTipLabelFormatter={toolTipLabelFormatterWithPrecision(precision)}
       customHeader={
         <div className="flex items-center justify-between gap-4 border-b p-6 py-4">
           <h2 className="font-semibold text-xl tracking-tight">Analytics</h2>
@@ -90,6 +85,10 @@ export function ContractAnalyticsOverviewCard(props: {
           </Button>
         </div>
       }
+      data={data || []}
+      isPending={isPending}
+      showLegend
+      toolTipLabelFormatter={toolTipLabelFormatterWithPrecision(precision)}
     />
   );
 }
@@ -104,22 +103,22 @@ export function useContractAnalyticsOverview(props: {
   const wallets = useContractUniqueWalletAnalytics({
     chainId: chainId,
     contractAddress: contractAddress,
-    startDate,
     endDate,
+    startDate,
   });
 
   const transactions = useContractTransactionAnalytics({
     chainId: chainId,
     contractAddress: contractAddress,
-    startDate,
     endDate,
+    startDate,
   });
 
   const events = useContractEventAnalytics({
     chainId: chainId,
     contractAddress: contractAddress,
-    startDate,
     endDate,
+    startDate,
   });
 
   const isPending =
@@ -170,10 +169,10 @@ export function useContractAnalyticsOverview(props: {
         });
 
         return {
+          events: event?.count || 0,
           time,
-          wallets: wallet?.count || 0,
           transactions: transaction?.count || 0,
-          events: event?.count || 0,
+          wallets: wallet?.count || 0,
         };
       }),
       precision,
@@ -182,8 +181,8 @@ export function useContractAnalyticsOverview(props: {
 
   return {
     data,
-    precision,
     isPending,
+    precision,
   };
 }
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/BuildYourApp.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/BuildYourApp.tsx
index 340f027af23..fb029ad63f3 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/BuildYourApp.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/BuildYourApp.tsx
@@ -10,9 +10,9 @@ export function BuildYourApp(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const codePath = buildContractPagePath({
-    projectMeta: props.projectMeta,
     chainIdOrSlug: props.chainSlug,
     contractAddress: props.contractAddress,
+    projectMeta: props.projectMeta,
     subpath: "/code",
   });
 
@@ -24,8 +24,8 @@ export function BuildYourApp(props: {
           Build your app
         </h2>
         <Link
-          href={codePath}
           className="block text-balance text-muted-foreground text-sm before:absolute before:inset-0"
+          href={codePath}
         >
           Learn more about how you can use thirdweb tools to build apps on top
           of this contract
@@ -36,8 +36,8 @@ export function BuildYourApp(props: {
       <div className="flex items-center justify-end gap-3">
         {[TypeScriptIcon, ReactIcon].map((Icon, i) => {
           return (
-            // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-            <div key={i} className="rounded-full border bg-background p-3">
+            // biome-ignore lint/suspicious/noArrayIndexKey: this is stable
+            <div className="rounded-full border bg-background p-3" key={i}>
               <Icon className="size-5 text-muted-foreground" />
             </div>
           );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/ContractChecklist.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/ContractChecklist.tsx
index 9cc354793fb..7936bbba301 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/ContractChecklist.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/ContractChecklist.tsx
@@ -52,9 +52,9 @@ function Inner({
   functionSelectors: string[];
 }) {
   const contractLayout = buildContractPagePath({
-    projectMeta,
     chainIdOrSlug: chainSlug,
     contractAddress: contract.address,
+    projectMeta,
   });
 
   const nftHref = `${contractLayout}/nfts`;
@@ -84,8 +84,8 @@ function Inner({
   }, [functionSelectors]);
   const accounts = useReadContract(getAccounts, {
     contract,
-    start: 0n,
     end: 1n,
+    start: 0n,
   });
   // end account factory
 
@@ -93,9 +93,9 @@ function Inner({
     isErc721 ? ERC721Ext.getNFTs : ERC1155Ext.getNFTs,
     {
       contract,
-      start: 0,
       count: 1,
       queryOptions: { enabled: isErc721 || isErc1155 },
+      start: 0,
     },
   );
 
@@ -179,20 +179,19 @@ function Inner({
 
     const steps: Step[] = [
       {
-        title: "Contract deployed",
         children: null,
         completed: true,
+        title: "Contract deployed",
       },
     ];
     if (isLazyMintable && isMinter) {
       steps.push({
-        title: "First NFT uploaded",
         children: (
           <p className="text-muted-foreground text-sm">
             Head to the{" "}
             <Link
-              href={nftHref}
               className="text-link-foreground hover:text-foreground"
+              href={nftHref}
             >
               NFTs tab
             </Link>{" "}
@@ -201,18 +200,18 @@ function Inner({
         ),
         // can be either 721 or 1155
         completed: (nftsQuery.data?.length || 0) > 0,
+        title: "First NFT uploaded",
       });
     }
 
     if (ERC721Ext.isSharedMetadataSupported(functionSelectors)) {
       steps.push({
-        title: "Set NFT Metadata",
         children: (
           <p className="text-muted-foreground text-sm">
             Head to the{" "}
             <Link
-              href={nftHref}
               className="text-link-foreground hover:text-foreground"
+              href={nftHref}
             >
               NFTs tab
             </Link>{" "}
@@ -220,18 +219,18 @@ function Inner({
           </p>
         ),
         completed: !!sharedMetadataQuery?.data,
+        title: "Set NFT Metadata",
       });
     }
 
     if (hasERC721ClaimConditions || hasERC20ClaimConditions) {
       steps.push({
-        title: "Set Claim Conditions",
         children: (
           <p className="text-muted-foreground text-sm">
             Head to the{" "}
             <Link
-              href={claimConditionsHref}
               className="text-link-foreground hover:text-foreground"
+              href={claimConditionsHref}
             >
               Claim Conditions tab
             </Link>{" "}
@@ -243,41 +242,41 @@ function Inner({
           (claimConditions.data?.length || 0) > 0 ||
           (erc721Claimed.data || 0n) > 0n ||
           (erc20Supply.data || 0n) > 0n,
+        title: "Set Claim Conditions",
       });
     }
     if (hasERC721ClaimConditions && isErc721) {
       steps.push({
-        title: "First NFT claimed",
         children: (
           <p className="text-muted-foreground text-sm">
             No NFTs have been claimed so far.
           </p>
         ),
         completed: (erc721Claimed.data || 0n) > 0n,
+        title: "First NFT claimed",
       });
     }
 
     if (hasERC20ClaimConditions) {
       steps.push({
-        title: "First token claimed",
         children: (
           <p className="text-muted-foreground text-sm">
             No tokens have been claimed so far.
           </p>
         ),
         completed: (erc20Supply.data || 0n) > 0n,
+        title: "First token claimed",
       });
     }
 
     if (isErc20 && ERC20Ext.isMintToSupported(functionSelectors) && isMinter) {
       steps.push({
-        title: "First token minted",
         children: (
           <p className="text-muted-foreground text-sm">
             Head to the{" "}
             <Link
-              href={tokenHref}
               className="text-link-foreground hover:text-foreground"
+              href={tokenHref}
             >
               token tab
             </Link>{" "}
@@ -285,18 +284,18 @@ function Inner({
           </p>
         ),
         completed: (erc20Supply.data || 0n) > 0n,
+        title: "First token minted",
       });
     }
 
     if (nftIsMintable && isMinter) {
       steps.push({
-        title: "First NFT minted",
         children: (
           <p className="text-muted-foreground text-sm">
             Head to the{" "}
             <Link
-              href={nftHref}
               className="text-link-foreground hover:text-foreground"
+              href={nftHref}
             >
               NFTs tab
             </Link>{" "}
@@ -305,18 +304,18 @@ function Inner({
         ),
         // can be either 721 or 1155
         completed: (nftsQuery.data?.length || 0) > 0,
+        title: "First NFT minted",
       });
     }
 
     if (accountFactory) {
       steps.push({
-        title: "First account created",
         children: (
           <p className="text-muted-foreground text-sm">
             Head to the{" "}
             <Link
-              href={accountsHref}
               className="text-link-foreground hover:text-foreground"
+              href={accountsHref}
             >
               Accounts tab
             </Link>{" "}
@@ -324,18 +323,18 @@ function Inner({
           </p>
         ),
         completed: (accounts.data?.length || 0) > 0,
+        title: "First account created",
       });
     }
 
     if (isRevealable && needsReveal) {
       steps.push({
-        title: "NFTs revealed",
         children: (
           <p className="text-muted-foreground text-sm">
             Head to the{" "}
             <Link
-              href={nftHref}
               className="text-link-foreground hover:text-foreground"
+              href={nftHref}
             >
               NFTs tab
             </Link>{" "}
@@ -344,6 +343,7 @@ function Inner({
         ),
         // This is always false because if there are batches to reveal, the step doesn't show.
         completed: false,
+        title: "NFTs revealed",
       });
     }
 
@@ -375,6 +375,6 @@ function Inner({
   }
 
   return (
-    <StepsCard title="Contract checklist" steps={finalSteps} delay={1000} />
+    <StepsCard delay={1000} steps={finalSteps} title="Contract checklist" />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/LatestEvents.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/LatestEvents.stories.tsx
index 1cfaaa1aad6..86e596ddd34 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/LatestEvents.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/LatestEvents.stories.tsx
@@ -2,7 +2,11 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { LatestEventsUI } from "./LatestEvents";
 
 const meta: Meta<typeof LatestEventsUI> = {
-  title: "Contracts/Overview/LatestEvents",
+  args: {
+    allEvents: [],
+    autoUpdate: false,
+    eventsHref: "/ethereum/0x123456789/events",
+  },
   component: LatestEventsUI,
   decorators: [
     (Story) => (
@@ -11,19 +15,15 @@ const meta: Meta<typeof LatestEventsUI> = {
       </div>
     ),
   ],
-  args: {
-    allEvents: [],
-    autoUpdate: false,
-    eventsHref: "/ethereum/0x123456789/events",
-  },
+  title: "Contracts/Overview/LatestEvents",
 };
 
 function eventStub(eventName: string) {
   return {
-    logIndex: 0,
-    eventName,
     address: "0x",
     args: [],
+    eventName,
+    logIndex: 0,
   };
 }
 
@@ -53,20 +53,20 @@ export const WithEvents: Story = {
   args: {
     allEvents: [
       {
-        transactionHash: txStub,
         events: [eventStub("Transfer"), eventStub("Approval")],
+        transactionHash: txStub,
       },
       {
-        transactionHash: txStub,
         events: [eventStub("Mint")],
+        transactionHash: txStub,
       },
       {
-        transactionHash: txStub,
         events: [
           eventStub("Transfer"),
           eventStub("Burn"),
           eventStub("Approval"),
         ],
+        transactionHash: txStub,
       },
     ],
     autoUpdate: false,
@@ -78,24 +78,24 @@ export const LiveWithEvents: Story = {
   args: {
     allEvents: [
       {
-        transactionHash: txStub,
         events: [eventStub("Transfer"), eventStub("Approval")],
+        transactionHash: txStub,
       },
       {
-        transactionHash: txStub,
         events: [eventStub("Mint")],
+        transactionHash: txStub,
       },
       {
-        transactionHash: txStub,
         events: [
           eventStub("Transfer"),
           eventStub("Burn"),
           eventStub("Approval"),
         ],
+        transactionHash: txStub,
       },
       {
-        transactionHash: txStub,
         events: [eventStub("RoleGranted"), eventStub("OwnershipTransferred")],
+        transactionHash: txStub,
       },
     ],
     autoUpdate: true,
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/LatestEvents.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/LatestEvents.tsx
index 4d8e9d1b587..bfca5d5e4bb 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/LatestEvents.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/LatestEvents.tsx
@@ -1,9 +1,17 @@
 "use client";
 
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  type InternalTransaction,
+  useActivity,
+} from "@3rdweb-sdk/react/hooks/useActivity";
+import { ArrowRightIcon } from "lucide-react";
+import Link from "next/link";
+import type { ThirdwebContract } from "thirdweb";
+import { shortenString } from "utils/usedapp-external";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Table,
   TableBody,
@@ -13,14 +21,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import {
-  type InternalTransaction,
-  useActivity,
-} from "@3rdweb-sdk/react/hooks/useActivity";
-import { ArrowRightIcon } from "lucide-react";
-import Link from "next/link";
-import type { ThirdwebContract } from "thirdweb";
-import { shortenString } from "utils/usedapp-external";
 import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../../_utils/contract-page-path";
 
@@ -33,9 +33,9 @@ export function LatestEvents(props: {
   const allEvents = useActivity(props.contract, autoUpdate);
 
   const eventsHref = buildContractPagePath({
-    projectMeta: props.projectMeta,
     chainIdOrSlug: props.chainSlug,
     contractAddress: props.contract.address,
+    projectMeta: props.projectMeta,
     subpath: "/events",
   });
 
@@ -64,8 +64,8 @@ export function LatestEventsUI(props: {
           </h2>
           {autoUpdate && (
             <Badge
-              variant="outline"
               className="hidden gap-2 bg-background text-sm lg:flex"
+              variant="outline"
             >
               <span className="!pointer-events-auto relative flex size-2">
                 <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-sky-400 opacity-75" />
@@ -75,10 +75,10 @@ export function LatestEventsUI(props: {
             </Badge>
           )}
         </div>
-        <Button asChild variant="outline" size="sm" className="bg-background">
+        <Button asChild className="bg-background" size="sm" variant="outline">
           <Link
-            href={eventsHref}
             className="flex items-center gap-2 text-muted-foreground text-sm"
+            href={eventsHref}
           >
             View all <ArrowRightIcon className="size-4" />
           </Link>
@@ -101,23 +101,23 @@ export function LatestEventsUI(props: {
                 <TableRow key={transaction.transactionHash}>
                   <TableCell>
                     <CopyTextButton
-                      textToShow={shortenString(transaction.transactionHash)}
+                      className="-translate-x-2 font-mono"
+                      copyIconPosition="left"
                       textToCopy={transaction.transactionHash}
+                      textToShow={shortenString(transaction.transactionHash)}
                       tooltip="Copy transaction hash"
-                      copyIconPosition="left"
                       variant="ghost"
-                      className="-translate-x-2 font-mono"
                     />
                   </TableCell>
                   <TableCell>
                     <div className="flex w-max flex-wrap gap-2">
                       {transaction.events.slice(0, 3).map((e) => (
                         <Button
+                          asChild
+                          className="h-auto rounded-full py-1"
                           key={e.logIndex + e.address + e.eventName}
-                          variant="outline"
                           size="sm"
-                          className="h-auto rounded-full py-1"
-                          asChild
+                          variant="outline"
                         >
                           <Link href={`${eventsHref}?event=${e.eventName}`}>
                             {e.eventName}
@@ -127,10 +127,10 @@ export function LatestEventsUI(props: {
 
                       {transaction.events.length > 3 && (
                         <Button
-                          variant="outline"
-                          size="sm"
-                          className="h-auto rounded-full py-1 hover:bg-transparent"
                           asChild
+                          className="h-auto rounded-full py-1 hover:bg-transparent"
+                          size="sm"
+                          variant="outline"
                         >
                           <div>+ {transaction.events.length - 3}</div>
                         </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/MarketplaceDetails.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/MarketplaceDetails.tsx
index 9c9e198168f..268a1017a9d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/MarketplaceDetails.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/MarketplaceDetails.tsx
@@ -1,9 +1,5 @@
 "use client";
 
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { SkeletonContainer } from "@/components/ui/skeleton";
 import { ArrowRightIcon } from "lucide-react";
 import Link from "next/link";
 import { useMemo } from "react";
@@ -23,6 +19,10 @@ import {
 import { useReadContract } from "thirdweb/react";
 import { min } from "thirdweb/utils";
 import { NFTMediaWithEmptyState } from "tw-components/nft-media";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { SkeletonContainer } from "@/components/ui/skeleton";
 import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../../_utils/contract-page-path";
 import { ListingStatsV3 } from "./listing-stats";
@@ -55,9 +55,9 @@ const DirectListingCards: React.FC<ListingCardsSectionProps> = ({
   projectMeta,
 }) => {
   const directListingsHref = buildContractPagePath({
-    projectMeta,
     chainIdOrSlug: chainSlug,
     contractAddress: contract.address,
+    projectMeta,
     subpath: "/direct-listings",
   });
 
@@ -77,9 +77,9 @@ const DirectListingCards: React.FC<ListingCardsSectionProps> = ({
       listingsQuery?.data
         ?.map((v) => ({
           ...v,
+          currencyValue: v.currencyValuePerToken,
           sellerAddress: v.creatorAddress,
           type: "direct-listing" as const,
-          currencyValue: v.currencyValuePerToken,
         }))
         .reverse() || [],
     [listingsQuery?.data],
@@ -100,9 +100,9 @@ const DirectListingCards: React.FC<ListingCardsSectionProps> = ({
         </h2>
         <Button
           asChild
-          variant="outline"
-          size="sm"
           className="gap-2 bg-background text-muted-foreground"
+          size="sm"
+          variant="outline"
         >
           <Link href={directListingsHref}>
             View all <ArrowRightIcon className="size-4" />
@@ -112,12 +112,12 @@ const DirectListingCards: React.FC<ListingCardsSectionProps> = ({
 
       <div className="p-6">
         <ListingCards
-          listings={listings}
-          isPending={listingsQuery.isPending}
           chainSlug={chainSlug}
+          client={contract.client}
           contractAddress={contract.address}
+          isPending={listingsQuery.isPending}
+          listings={listings}
           projectMeta={projectMeta}
-          client={contract.client}
         />
       </div>
     </div>
@@ -130,9 +130,9 @@ const EnglishAuctionCards: React.FC<ListingCardsSectionProps> = ({
   projectMeta,
 }) => {
   const englishAuctionsHref = buildContractPagePath({
-    projectMeta,
     chainIdOrSlug: chainSlug,
     contractAddress: contract.address,
+    projectMeta,
     subpath: "/english-auctions",
   });
 
@@ -152,9 +152,9 @@ const EnglishAuctionCards: React.FC<ListingCardsSectionProps> = ({
       auctionsQuery?.data
         ?.map<ListingData>((v) => ({
           ...v,
+          currencyValue: v.buyoutCurrencyValue,
           sellerAddress: v.creatorAddress,
           type: "english-auction",
-          currencyValue: v.buyoutCurrencyValue,
         }))
         .reverse() || [],
     [auctionsQuery?.data],
@@ -175,9 +175,9 @@ const EnglishAuctionCards: React.FC<ListingCardsSectionProps> = ({
         </h2>
         <Button
           asChild
-          variant="outline"
-          size="sm"
           className="gap-2 bg-background text-muted-foreground"
+          size="sm"
+          variant="outline"
         >
           <Link href={englishAuctionsHref}>
             View all <ArrowRightIcon className="size-4" />
@@ -186,11 +186,11 @@ const EnglishAuctionCards: React.FC<ListingCardsSectionProps> = ({
       </div>
       <div className="p-6">
         <ListingCards
-          client={contract.client}
-          listings={auctions}
-          isPending={auctionsQuery.isPending}
           chainSlug={chainSlug}
+          client={contract.client}
           contractAddress={contract.address}
+          isPending={auctionsQuery.isPending}
+          listings={auctions}
           projectMeta={projectMeta}
         />
       </div>
@@ -223,16 +223,16 @@ export const MarketplaceDetails: React.FC<MarketplaceDetailsVersionProps> = ({
 
       {hasDirectListings && (
         <DirectListingCards
-          contract={contract}
           chainSlug={chainSlug}
+          contract={contract}
           projectMeta={projectMeta}
         />
       )}
 
       {hasEnglishAuctions && (
         <EnglishAuctionCards
-          contract={contract}
           chainSlug={chainSlug}
+          contract={contract}
           projectMeta={projectMeta}
         />
       )}
@@ -241,37 +241,37 @@ export const MarketplaceDetails: React.FC<MarketplaceDetailsVersionProps> = ({
 };
 
 const dummyMetadata: (idx: number) => ListingData = (idx) => ({
-  id: BigInt(idx),
   asset: {
+    chainId: 1,
     id: BigInt(idx),
-    metadata: { name: `NFT #${idx}`, id: BigInt(idx), uri: "" },
+    metadata: { id: BigInt(idx), name: `NFT #${idx}`, uri: "" },
     owner: "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
     supply: BigInt(1),
+    tokenAddress: ZERO_ADDRESS,
     tokenURI: "",
     type: "ERC721",
-    tokenAddress: ZERO_ADDRESS,
-    chainId: 1,
   },
-  currencyValuePerToken: {
+  creatorAddress: "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
+  currencyValue: {
+    chainId: 1,
     decimals: 18,
     displayValue: "0.0",
     name: "Ether",
     symbol: "ETH",
-    value: 0n,
     tokenAddress: ZERO_ADDRESS,
-    chainId: 1,
+    value: 0n,
   },
-  creatorAddress: "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
-  type: "direct-listing",
-  currencyValue: {
+  currencyValuePerToken: {
+    chainId: 1,
+    decimals: 18,
+    displayValue: "0.0",
     name: "Ether",
     symbol: "ETH",
-    value: 0n,
-    displayValue: "0.0",
-    decimals: 18,
     tokenAddress: ZERO_ADDRESS,
-    chainId: 1,
+    value: 0n,
   },
+  id: BigInt(idx),
+  type: "direct-listing",
 });
 
 interface ListingCardsProps {
@@ -293,9 +293,9 @@ const ListingCards: React.FC<ListingCardsProps> = ({
   client,
 }) => {
   const contractLayout = buildContractPagePath({
-    projectMeta,
     chainIdOrSlug: chainSlug,
     contractAddress,
+    projectMeta,
   });
 
   listings = isPending
@@ -319,20 +319,20 @@ const ListingCards: React.FC<ListingCardsProps> = ({
           <div className="relative aspect-square w-full overflow-hidden rounded-lg">
             {/* Image */}
             <SkeletonContainer
-              loadedData={isPending ? undefined : listing.asset.metadata}
-              skeletonData={listing.asset.metadata}
               className="block h-full w-full"
+              loadedData={isPending ? undefined : listing.asset.metadata}
               render={(v) => {
                 return (
                   <NFTMediaWithEmptyState
                     client={client}
+                    height="100%"
                     metadata={v}
                     requireInteraction
                     width="100%"
-                    height="100%"
                   />
                 );
               }}
+              skeletonData={listing.asset.metadata}
             />
           </div>
 
@@ -340,7 +340,6 @@ const ListingCards: React.FC<ListingCardsProps> = ({
             {/* Card Link + Title */}
             <SkeletonContainer
               loadedData={isPending ? undefined : listing.asset.metadata.name}
-              skeletonData="Listing Title"
               render={(v) => (
                 <Link
                   className="before:absolute before:inset-0"
@@ -353,6 +352,7 @@ const ListingCards: React.FC<ListingCardsProps> = ({
                   {v}
                 </Link>
               )}
+              skeletonData="Listing Title"
             />
 
             {isMarketplaceV1 && (
@@ -365,35 +365,35 @@ const ListingCards: React.FC<ListingCardsProps> = ({
                       ? "Direct Listing"
                       : "English Auction"
                 }
-                skeletonData={listing.type}
                 render={(v) => (
                   <p className="text-muted-foreground text-sm">{v}</p>
                 )}
+                skeletonData={listing.type}
               />
             )}
 
             {/* seller */}
             <SkeletonContainer
-              loadedData={isPending ? undefined : listing.creatorAddress}
-              skeletonData={listing.creatorAddress}
               className="mt-4 border-t pt-4"
+              loadedData={isPending ? undefined : listing.creatorAddress}
               render={(v) => (
                 <div>
                   <p className="text-muted-foreground text-xs">Seller</p>
                   <WalletAddress
-                    className="relative z-[1] self-start text-xs"
                     address={v}
+                    className="relative z-[1] self-start text-xs"
                     client={client}
                   />
                 </div>
               )}
+              skeletonData={listing.creatorAddress}
             />
 
             {/* price */}
             {!isPending && (
               <Badge
-                variant="outline"
                 className="absolute top-2 right-2 bg-background py-1.5"
+                variant="outline"
               >
                 <p className="line-clamp-1">
                   <b>{listing.currencyValue.displayValue}</b>{" "}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/NFTDetails.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/NFTDetails.tsx
index a1c1567741c..5e8e381d7b4 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/NFTDetails.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/NFTDetails.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import { ArrowRightIcon } from "lucide-react";
 import Link from "next/link";
 import type { ThirdwebContract } from "thirdweb";
 import * as ERC721 from "thirdweb/extensions/erc721";
 import * as ERC1155 from "thirdweb/extensions/erc1155";
 import { useReadContract } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
 import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { NFTCards } from "../../_components/NFTCards";
 import { buildContractPagePath } from "../../_utils/contract-page-path";
@@ -25,9 +25,9 @@ export function NFTDetails({
   projectMeta,
 }: NFTDetailsProps) {
   const nftsHref = buildContractPagePath({
-    projectMeta,
     chainIdOrSlug: chainSlug,
     contractAddress: contract.address,
+    projectMeta,
     subpath: "/nfts",
   });
 
@@ -50,8 +50,8 @@ export function NFTDetails({
       {/* header */}
       <div className="flex items-center justify-between border-b px-6 py-4">
         <h2 className="font-semibold text-xl tracking-tight">NFTs</h2>
-        <Button variant="outline" asChild className="bg-background" size="sm">
-          <Link href={nftsHref} className="text-muted-foreground">
+        <Button asChild className="bg-background" size="sm" variant="outline">
+          <Link className="text-muted-foreground" href={nftsHref}>
             View all <ArrowRightIcon className="ml-2 size-4 " />
           </Link>
         </Button>
@@ -61,13 +61,13 @@ export function NFTDetails({
       <div className="p-6">
         <NFTCards
           client={contract.client}
-          projectMeta={projectMeta}
+          isPending={nftQuery.isPending}
           nfts={displayableNFTs.map((t) => ({
             ...t,
-            contractAddress: contract.address,
             chainId: contract.chain.id,
+            contractAddress: contract.address,
           }))}
-          isPending={nftQuery.isPending}
+          projectMeta={projectMeta}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/PermissionsTable.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/PermissionsTable.stories.tsx
index 6ccae2ad2c8..abfd4e85281 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/PermissionsTable.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/PermissionsTable.stories.tsx
@@ -3,7 +3,11 @@ import { ThirdwebProvider } from "thirdweb/react";
 import { PermissionsTableUI } from "./PermissionsTable";
 
 const meta: Meta<typeof PermissionsTableUI> = {
-  title: "Contracts/Overview/PermissionsTable",
+  args: {
+    isPending: false,
+    members: [],
+    viewMoreLink: "#",
+  },
   component: PermissionsTableUI,
   decorators: [
     (Story) => (
@@ -14,11 +18,7 @@ const meta: Meta<typeof PermissionsTableUI> = {
       </ThirdwebProvider>
     ),
   ],
-  args: {
-    viewMoreLink: "#",
-    members: [],
-    isPending: false,
-  },
+  title: "Contracts/Overview/PermissionsTable",
 };
 
 export default meta;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/PermissionsTable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/PermissionsTable.tsx
index 16163b9ab0f..d760142875c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/PermissionsTable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/PermissionsTable.tsx
@@ -1,9 +1,19 @@
 "use client";
 
+import { getAllRoleMembers } from "contract-ui/hooks/permissions";
+import { ArrowRightIcon } from "lucide-react";
+import Link from "next/link";
+import { useMemo } from "react";
+import {
+  type ThirdwebClient,
+  type ThirdwebContract,
+  ZERO_ADDRESS,
+} from "thirdweb";
+import { useReadContract } from "thirdweb/react";
 import { WalletAddress } from "@/components/blocks/wallet-address";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Table,
   TableBody,
@@ -13,16 +23,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { getAllRoleMembers } from "contract-ui/hooks/permissions";
-import { ArrowRightIcon } from "lucide-react";
-import Link from "next/link";
-import { useMemo } from "react";
-import {
-  type ThirdwebClient,
-  type ThirdwebContract,
-  ZERO_ADDRESS,
-} from "thirdweb";
-import { useReadContract } from "thirdweb/react";
 import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../../_utils/contract-page-path";
 
@@ -32,9 +32,9 @@ export function PermissionsTable(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const permissionsHref = buildContractPagePath({
-    projectMeta: props.projectMeta,
     chainIdOrSlug: props.chainSlug,
     contractAddress: props.contract.address,
+    projectMeta: props.projectMeta,
     subpath: "/permissions",
   });
 
@@ -46,7 +46,6 @@ export function PermissionsTable(props: {
     return (
       Object.entries(allRoleMembers.data || {}).reduce(
         (acc, [role, roleMembers]) => {
-          // biome-ignore lint/complexity/noForEach: FIXME
           roleMembers.forEach((member) => {
             return !acc.find((m) => m.member === member)
               ? acc.push({ member, roles: [role] })
@@ -64,10 +63,10 @@ export function PermissionsTable(props: {
 
   return (
     <PermissionsTableUI
-      members={members}
+      client={props.contract.client}
       isPending={allRoleMembers.isPending}
+      members={members}
       viewMoreLink={permissionsHref}
-      client={props.contract.client}
     />
   );
 }
@@ -83,10 +82,10 @@ export function PermissionsTableUI(props: {
       {/* header */}
       <div className="flex w-full items-center justify-between border-b px-6 py-4">
         <h2 className="font-semibold text-xl tracking-tight">Permissions</h2>
-        <Button asChild variant="outline" size="sm" className="bg-background">
+        <Button asChild className="bg-background" size="sm" variant="outline">
           <Link
-            href={props.viewMoreLink}
             className="flex items-center gap-2 text-muted-foreground text-sm"
+            href={props.viewMoreLink}
           >
             View all <ArrowRightIcon className="size-4" />
           </Link>
@@ -113,9 +112,9 @@ export function PermissionsTableUI(props: {
                   <div className="flex w-max flex-wrap gap-2">
                     {data.roles.map((role) => (
                       <Badge
-                        variant="outline"
-                        key={role}
                         className="bg-background py-1 font-normal text-sm capitalize"
+                        key={role}
+                        variant="outline"
                       >
                         {role}
                       </Badge>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/listing-stats.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/listing-stats.tsx
index ca9ecf570ac..ec3f63ac0b5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/listing-stats.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/listing-stats.tsx
@@ -20,11 +20,11 @@ const TotalListingsStat: React.FC<{ contract: ThirdwebContract }> = ({
 
   return (
     <Stat
-      value={combinedListingCount.toString()}
-      label="Total Listings"
       isPending={
         directListingsQuery.isPending || englishAuctionsQuery.isPending
       }
+      label="Total Listings"
+      value={combinedListingCount.toString()}
     />
   );
 };
@@ -38,9 +38,9 @@ const DirectListingsStat: React.FC<{ contract: ThirdwebContract }> = ({
 
   return (
     <Stat
-      value={(directListingsQuery.data || 0n).toString()}
       isPending={directListingsQuery.isPending}
       label="Direct Listings"
+      value={(directListingsQuery.data || 0n).toString()}
     />
   );
 };
@@ -54,9 +54,9 @@ const EnglishAuctionsStat: React.FC<{ contract: ThirdwebContract }> = ({
 
   return (
     <Stat
-      value={(englishAuctionsQuery.data || 0n).toString()}
       isPending={englishAuctionsQuery.isPending}
       label="English Auctions"
+      value={(englishAuctionsQuery.data || 0n).toString()}
     />
   );
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/published-by-ui.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/published-by-ui.tsx
index 3a7aabd4f74..be64d3512d5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/published-by-ui.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/published-by-ui.tsx
@@ -86,12 +86,12 @@ export async function getPublishedByCardProps(params: {
               throw new Error("No IPFS URI found in bytecode");
             }
             let uris = await getPublishedUriFromCompilerUri({
+              compilerMetadataUri: ipfsUri,
               contract: {
+                address: "0xf5b896Ddb5146D5dA77efF4efBb3Eae36E300808",
                 chain: polygon,
                 client: contract.client,
-                address: "0xf5b896Ddb5146D5dA77efF4efBb3Eae36E300808",
               },
-              compilerMetadataUri: ipfsUri,
             }).catch((e) => {
               console.error("Error fetching published URI", e);
               return [];
@@ -105,8 +105,8 @@ export async function getPublishedByCardProps(params: {
             const results = await Promise.allSettled(
               uris.map(async (uri) => {
                 const content = await download({
-                  uri,
                   client: contract.client,
+                  uri,
                 });
                 return JSON.parse(
                   await content.text(),
@@ -132,13 +132,13 @@ export async function getPublishedByCardProps(params: {
   }
 
   return {
+    isBeta: (publishedContractToShow.displayName || "")
+      .toLowerCase()
+      .includes("beta"),
     modules,
     name: publishedContractToShow.name,
     publisher: publisherAddressOrEns,
     version: publishedContractToShow.version,
-    isBeta: (publishedContractToShow.displayName || "")
-      .toLowerCase()
-      .includes("beta"),
   };
 }
 
@@ -152,14 +152,14 @@ export function PublishedByUI(props: {
   return (
     <ContractCard
       contractId={props.name}
-      publisher={props.publisher}
-      version={props.version}
       isBeta={props.isBeta}
       modules={props.modules.map((m) => ({
-        publisher: m.publisher,
         moduleId: m.name,
+        publisher: m.publisher,
         version: m.version,
       }))}
+      publisher={props.publisher}
+      version={props.version}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/published-by.server.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/published-by.server.tsx
index eea2e7378a9..897557b9f6d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/published-by.server.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/published-by.server.tsx
@@ -1,6 +1,6 @@
 import type { ThirdwebContract } from "thirdweb";
 import { getAuthTokenWalletAddress } from "../../../../../../api/lib/getAuthToken";
-import { PublishedByUI, getPublishedByCardProps } from "./published-by-ui";
+import { getPublishedByCardProps, PublishedByUI } from "./published-by-ui";
 
 interface PublishedByProps {
   contract: ThirdwebContract;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/stat-card.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/stat-card.tsx
index 5bcd6aa6ac7..9d7a901cf37 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/stat-card.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/components/stat-card.tsx
@@ -4,14 +4,18 @@ export function Stat({
   label,
   value,
   isPending,
-}: { label: string; value: string; isPending: boolean }) {
+}: {
+  label: string;
+  value: string;
+  isPending: boolean;
+}) {
   return (
     <dl className="grow">
       <dt className="text-muted-foreground text-sm">{label}</dt>
       <SkeletonContainer
-        skeletonData={"000000"}
         loadedData={isPending ? undefined : value}
         render={(v) => <dd className="font-medium text-lg">{v}</dd>}
+        skeletonData={"000000"}
       />
     </dl>
   );
@@ -21,14 +25,18 @@ export function StatCard({
   label,
   value,
   isPending,
-}: { label: string; value: string; isPending: boolean }) {
+}: {
+  label: string;
+  value: string;
+  isPending: boolean;
+}) {
   return (
     <dl className="grow rounded-lg border bg-card p-4">
       <dt className="text-muted-foreground text-sm">{label}</dt>
       <SkeletonContainer
-        skeletonData={"000000"}
         loadedData={isPending ? undefined : value}
         render={(v) => <dd className="font-medium text-lg">{v}</dd>}
+        skeletonData={"000000"}
       />
     </dl>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/contract-overview-page.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/contract-overview-page.client.tsx
index 4e0a626de01..275b1ab30d8 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/contract-overview-page.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/contract-overview-page.client.tsx
@@ -26,19 +26,19 @@ export function ContractOverviewPageClient(props: {
 
   return (
     <ContractOverviewPage
+      chainSlug={chainMetadata.slug}
       contract={contract}
-      projectMeta={projectMeta}
+      functionSelectors={contractPageMetadata.functionSelectors}
       hasDirectListings={contractPageMetadata.isDirectListingSupported}
       hasEnglishAuctions={contractPageMetadata.isEnglishAuctionSupported}
-      isErc1155={contractPageMetadata.supportedERCs.isERC1155}
+      isAnalyticsSupported={contractPageMetadata.isInsightSupported}
       isErc20={contractPageMetadata.supportedERCs.isERC20}
       isErc721={contractPageMetadata.supportedERCs.isERC721}
+      isErc1155={contractPageMetadata.supportedERCs.isERC1155}
       isPermissionsEnumerable={
         contractPageMetadata.isPermissionsEnumerableSupported
       }
-      chainSlug={chainMetadata.slug}
-      isAnalyticsSupported={contractPageMetadata.isInsightSupported}
-      functionSelectors={contractPageMetadata.functionSelectors}
+      projectMeta={projectMeta}
       // TODO - create a fully client rendered version of publishedBy and ContractCard and plug it here
       publishedBy={undefined}
     />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/page.tsx
index b85c813c5ab..2b618f5ec1c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/page.tsx
@@ -7,8 +7,8 @@ export default async function Page(props: {
   const params = await props.params;
   return (
     <SharedContractOverviewPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
+      contractAddress={params.contractAddress}
       projectMeta={undefined}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/ContractPermissionsPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/ContractPermissionsPage.client.tsx
index d8de49694b0..0d40df003d5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/ContractPermissionsPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/ContractPermissionsPage.client.tsx
@@ -25,13 +25,13 @@ export function ContractPermissionsPageClient(props: {
 
   return (
     <ContractPermissionsPage
-      projectMeta={props.projectMeta}
-      contract={props.contract}
       chainSlug={props.chainMetadata.slug}
-      isLoggedIn={props.isLoggedIn}
+      contract={props.contract}
       detectedPermissionEnumerable={
         metadataQuery.data.isPermissionsEnumerableSupported
       }
+      isLoggedIn={props.isLoggedIn}
+      projectMeta={props.projectMeta}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/ContractPermissionsPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/ContractPermissionsPage.tsx
index 93186fbff25..cb52f96ce4e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/ContractPermissionsPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/ContractPermissionsPage.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { InlineCode } from "@/components/ui/inline-code";
 import { ButtonGroup, Divider, Flex } from "@chakra-ui/react";
 import type { ThirdwebContract } from "thirdweb";
 import { Card, Heading, Link, LinkButton, Text } from "tw-components";
+import { InlineCode } from "@/components/ui/inline-code";
 import type { ProjectMeta } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { buildContractPagePath } from "../_utils/contract-page-path";
 import { Permissions } from "./components";
@@ -26,9 +26,9 @@ export const ContractPermissionsPage: React.FC<
   projectMeta,
 }) => {
   const explorerHref = buildContractPagePath({
-    projectMeta,
     chainIdOrSlug: chainSlug,
     contractAddress: contract.address,
+    projectMeta,
     subpath: "/explorer",
   });
 
@@ -45,19 +45,19 @@ export const ContractPermissionsPage: React.FC<
           extension.
           <br />
           As a result, you can only view and manage basic permissions via the{" "}
-          <Link href={explorerHref} color="primary.500">
+          <Link color="primary.500" href={explorerHref}>
             Explorer
           </Link>{" "}
           at the moment.
         </Text>
 
         <Divider my={1} />
-        <Flex gap={4} align="center">
+        <Flex align="center" gap={4}>
           <Heading size="label.md">Learn more: </Heading>
           <ButtonGroup colorScheme="purple" size="sm" variant="solid">
             <LinkButton
-              isExternal
               href="https://portal.thirdweb.com/contracts/build/extensions/general/Permissions"
+              isExternal
             >
               Permissions
             </LinkButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/contract-permission.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/contract-permission.tsx
index 9031a76a847..7e5f7e8944e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/contract-permission.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/contract-permission.tsx
@@ -1,9 +1,9 @@
-import { Card } from "@/components/ui/card";
 import { useIsAdmin } from "@3rdweb-sdk/react/hooks/useContractRoles";
 import { Flex, Select, Spinner } from "@chakra-ui/react";
 import { InfoIcon } from "lucide-react";
 import { useFormContext } from "react-hook-form";
 import { type ThirdwebContract, ZERO_ADDRESS } from "thirdweb";
+import { Card } from "@/components/ui/card";
 import { PermissionEditor } from "./permissions-editor";
 
 interface ContractPermissionProps {
@@ -44,7 +44,7 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
             </div>
 
             {role === "transfer" && (
-              <Flex align="center" justify="center" flexGrow={0} flexShrink={0}>
+              <Flex align="center" flexGrow={0} flexShrink={0} justify="center">
                 {isPending || isSubmitting ? (
                   <Flex align="center" gap={2} px={2}>
                     <Spinner size="sm" />
@@ -53,8 +53,6 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
                 ) : (
                   <Select
                     isDisabled={!isAdmin}
-                    variant="filled"
-                    value={isRestricted ? 1 : 0}
                     onChange={(e) => {
                       if (e.target.value === "1") {
                         setValue(
@@ -70,6 +68,8 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
                         });
                       }
                     }}
+                    value={isRestricted ? 1 : 0}
+                    variant="filled"
                   >
                     <option value={1}>Non-Transferable</option>
                     <option value={0}>Transferable</option>
@@ -79,7 +79,7 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
             )}
 
             {role === "lister" && (
-              <Flex align="center" justify="center" flexGrow={0} flexShrink={0}>
+              <Flex align="center" flexGrow={0} flexShrink={0} justify="center">
                 {isPending || isSubmitting ? (
                   <Flex align="center" gap={2} px={2}>
                     <Spinner size="sm" />
@@ -88,8 +88,6 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
                 ) : (
                   <Select
                     isDisabled={!isAdmin}
-                    variant="filled"
-                    value={isRestricted ? 1 : 0}
                     onChange={(e) => {
                       if (e.target.value === "1") {
                         setValue(
@@ -105,6 +103,8 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
                         });
                       }
                     }}
+                    value={isRestricted ? 1 : 0}
+                    variant="filled"
                   >
                     <option value={1}>Only specific wallets</option>
                     <option value={0}>Any wallet</option>
@@ -114,7 +114,7 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
             )}
 
             {role === "asset" && (
-              <Flex align="center" justify="center" flexGrow={0} flexShrink={0}>
+              <Flex align="center" flexGrow={0} flexShrink={0} justify="center">
                 {isPending || isSubmitting ? (
                   <Flex align="center" gap={2} px={2}>
                     <Spinner size="sm" />
@@ -123,8 +123,6 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
                 ) : (
                   <Select
                     isDisabled={!isAdmin}
-                    variant="filled"
-                    value={isRestricted ? 1 : 0}
                     onChange={(e) => {
                       if (e.target.value === "1") {
                         setValue(
@@ -140,6 +138,8 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
                         });
                       }
                     }}
+                    value={isRestricted ? 1 : 0}
+                    variant="filled"
                   >
                     <option value={1}>Only specific assets</option>
                     <option value={0}>Any asset</option>
@@ -151,18 +151,18 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
 
           {role === "transfer" && (
             <Flex
-              direction="row"
-              borderRadius="md"
-              borderWidth="1px"
-              bg="primary.50"
-              borderColor="primary.100"
               _dark={{
                 bg: "primary.800",
                 borderColor: "primary.800",
               }}
               align="center"
-              padding="10px"
+              bg="primary.50"
+              borderColor="primary.100"
+              borderRadius="md"
+              borderWidth="1px"
+              direction="row"
               gap={3}
+              padding="10px"
             >
               <InfoIcon className="size-6 text-primary hover:opacity-10 dark:text-primary-foreground" />
               <p className="text-primary dark:text-primary-foreground">
@@ -186,61 +186,48 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
 
           {role === "lister" && (
             <Flex
-              direction="row"
-              borderRadius="md"
-              borderWidth="1px"
-              bg="primary.50"
-              borderColor="primary.100"
               _dark={{
                 bg: "primary.800",
                 borderColor: "primary.800",
               }}
               align="center"
-              padding="10px"
+              bg="primary.50"
+              borderColor="primary.100"
+              borderRadius="md"
+              borderWidth="1px"
+              direction="row"
               gap={3}
+              padding="10px"
             >
               <InfoIcon className="size-6 text-primary hover:opacity-10 dark:text-primary-foreground" />
               <p className="text-primary dark:text-primary-foreground">
-                {isRestricted ? (
-                  <>
-                    Currently, only addresses specified below will be able to
-                    create listings on this marketplace.
-                  </>
-                ) : (
-                  <>This marketplace is open for anyone to create listings.</>
-                )}
+                {isRestricted
+                  ? "Currently, only addresses specified below will be able to create listings on this marketplace."
+                  : "This marketplace is open for anyone to create listings."}
               </p>
             </Flex>
           )}
 
           {role === "asset" && (
             <Flex
-              direction="row"
-              borderRadius="md"
-              borderWidth="1px"
-              bg="primary.50"
-              borderColor="primary.100"
               _dark={{
                 bg: "primary.800",
                 borderColor: "primary.800",
               }}
               align="center"
-              padding="10px"
+              bg="primary.50"
+              borderColor="primary.100"
+              borderRadius="md"
+              borderWidth="1px"
+              direction="row"
               gap={3}
+              padding="10px"
             >
               <InfoIcon className="size-6 text-primary hover:opacity-10 dark:text-primary-foreground" />
               <p className="text-primary dark:text-primary-foreground">
-                {isRestricted ? (
-                  <>
-                    Currently, only assets from the contracts specified below
-                    will be able to be used on this contract.
-                  </>
-                ) : (
-                  <>
-                    This contract is open for people to list assets from any
-                    contract.
-                  </>
-                )}
+                {isRestricted
+                  ? "Currently, only assets from the contracts specified below will be able to be used on this contract."
+                  : "This contract is open for people to list assets from any contract."}
               </p>
             </Flex>
           )}
@@ -249,7 +236,7 @@ export const ContractPermission: React.FC<ContractPermissionProps> = ({
             <Spinner />
           ) : (
             isRestricted &&
-            role && <PermissionEditor role={role} contract={contract} />
+            role && <PermissionEditor contract={contract} role={role} />
           )}
         </div>
       </Flex>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/index.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/index.tsx
index 7ed509724c4..ff390eef552 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/index.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/index.tsx
@@ -60,9 +60,9 @@ export function Permissions({
   return (
     <FormProvider {...form}>
       <Flex
-        gap={4}
-        direction="column"
         as="form"
+        direction="column"
+        gap={4}
         onSubmit={form.handleSubmit((d) => {
           if (!account) {
             onError(new Error("Wallet not connected!"));
@@ -74,24 +74,24 @@ export function Permissions({
             roleMemberMap: d,
           });
           sendTx.mutate(tx, {
+            onError: (error) => {
+              onError(error);
+            },
             onSuccess: () => {
               form.reset(d);
               onSuccess();
             },
-            onError: (error) => {
-              onError(error);
-            },
           });
         })}
       >
         {roles.map((role) => {
           return (
             <ContractPermission
+              contract={contract}
+              description={ROLE_DESCRIPTION_MAP[role] || ""}
               isPending={allRoleMembers.isPending}
               key={role}
               role={role}
-              description={ROLE_DESCRIPTION_MAP[role] || ""}
-              contract={contract}
             />
           );
         })}
@@ -108,13 +108,13 @@ export function Permissions({
             Reset
           </Button>
           <TransactionButton
-            isLoggedIn={isLoggedIn}
             client={contract.client}
-            txChainID={contract.chain.id}
-            transactionCount={1}
             disabled={!form.formState.isDirty}
-            type="submit"
+            isLoggedIn={isLoggedIn}
             isPending={sendTx.isPending}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             {sendTx.isPending ? "Updating permissions" : "Update permissions"}
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/permissions-editor.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/permissions-editor.tsx
index 690809fddca..9dc19ca20da 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/permissions-editor.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/permissions-editor.tsx
@@ -1,4 +1,3 @@
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import {
   AdminOnly,
   AdminOrSelfOnly,
@@ -24,8 +23,9 @@ import {
 import { useState } from "react";
 import { useFieldArray, useFormContext } from "react-hook-form";
 import { toast } from "sonner";
-import { type ThirdwebContract, ZERO_ADDRESS, isAddress } from "thirdweb";
+import { isAddress, type ThirdwebContract, ZERO_ADDRESS } from "thirdweb";
 import { Button, FormErrorMessage, Text } from "tw-components";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 interface PermissionEditorProps {
   role: string;
@@ -75,12 +75,12 @@ export const PermissionEditor: React.FC<PermissionEditorProps> = ({
       )}
       {fields?.map((field, index) => (
         <PermissionAddress
-          key={field.id}
+          contract={contract}
           isSubmitting={isSubmitting}
-          role={role}
+          key={field.id}
           member={watch(`${role}.${index}`)}
           removeAddress={() => remove(index)}
-          contract={contract}
+          role={role}
         />
       ))}
       <AdminOnly contract={contract}>
@@ -89,15 +89,14 @@ export const PermissionEditor: React.FC<PermissionEditorProps> = ({
           isInvalid={address && isDisabled}
         >
           <InputGroup>
-            <InputLeftAddon p={0} border="none">
+            <InputLeftAddon border="none" p={0}>
               <ToolTipLabel label="Paste address from clipboard">
                 <IconButton
-                  borderRadius="sm"
-                  borderLeftRadius="md"
                   aria-label="paste address"
-                  icon={<ClipboardPasteIcon className="size-4" />}
-                  width="100%"
+                  borderLeftRadius="md"
+                  borderRadius="sm"
                   height="100%"
+                  icon={<ClipboardPasteIcon className="size-4" />}
                   onClick={() => {
                     navigator.clipboard
                       .readText()
@@ -110,30 +109,31 @@ export const PermissionEditor: React.FC<PermissionEditorProps> = ({
                         toast.error("Failed to paste from clipboard");
                       });
                   }}
+                  width="100%"
                 />
               </ToolTipLabel>
             </InputLeftAddon>
             <Input
-              variant="filled"
               fontFamily="mono"
-              value={address}
               onChange={(e) => setAddress(e.target.value)}
               placeholder={ZERO_ADDRESS}
               px={2}
+              value={address}
+              variant="filled"
             />
-            <InputRightAddon p={0} border="none">
+            <InputRightAddon border="none" p={0}>
               <Button
-                leftIcon={<PlusIcon className="size-4" />}
-                size="sm"
+                alignItems="center"
                 borderLeftRadius="none"
                 borderRightRadius="md"
                 colorScheme="primary"
+                height="100%"
                 isDisabled={isDisabled}
+                justifyContent="center"
+                leftIcon={<PlusIcon className="size-4" />}
                 onClick={addAddress}
-                height="100%"
+                size="sm"
                 width="100%"
-                justifyContent="center"
-                alignItems="center"
               >
                 Add Address
               </Button>
@@ -169,46 +169,46 @@ const PermissionAddress: React.FC<PermissionAddressProps> = ({
   const { onCopy } = useClipboard(member);
 
   return (
-    <Flex gap={0} align="center">
+    <Flex align="center" gap={0}>
       <InputGroup>
-        <InputLeftAddon p={0} border="none">
+        <InputLeftAddon border="none" p={0}>
           <ToolTipLabel label="Copy address to clipboard">
             <IconButton
-              borderRadius="sm"
-              borderLeftRadius="md"
               aria-label="copy address"
-              icon={<CopyIcon className="size-4" />}
-              width="100%"
+              borderLeftRadius="md"
+              borderRadius="sm"
               height="100%"
+              icon={<CopyIcon className="size-4" />}
               onClick={(e) => {
                 e.stopPropagation();
                 e.preventDefault();
                 onCopy();
                 toast.info("Address copied.");
               }}
+              width="100%"
             />
           </ToolTipLabel>
         </InputLeftAddon>
         <Input
-          variant="filled"
-          fontFamily="mono"
           defaultValue={member}
+          fontFamily="mono"
           px={2}
+          variant="filled"
         />
         <AdminOrSelfOnly contract={contract} self={member}>
-          <InputRightAddon p={0} border="none">
+          <InputRightAddon border="none" p={0}>
             <Button
-              leftIcon={<TrashIcon className="size-3" />}
-              size="sm"
+              alignItems="center"
               borderLeftRadius="none"
               borderRightRadius="md"
               colorScheme="red"
+              height="100%"
               isDisabled={isSubmitting}
+              justifyContent="center"
+              leftIcon={<TrashIcon className="size-3" />}
               onClick={removeAddress}
-              height="100%"
+              size="sm"
               width="100%"
-              justifyContent="center"
-              alignItems="center"
             >
               Remove
             </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/page.tsx
index 558c38b9704..6521b9177f1 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/page.tsx
@@ -8,10 +8,10 @@ export default async function Page(props: {
   const [params, account] = await Promise.all([props.params, getRawAccount()]);
   return (
     <SharedPermissionsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/shared-permissions-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/shared-permissions-page.tsx
index 6bee04d58a6..2d591678090 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/shared-permissions-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/shared-permissions-page.tsx
@@ -14,8 +14,8 @@ export async function SharedPermissionsPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -28,8 +28,8 @@ export async function SharedPermissionsPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
@@ -39,8 +39,8 @@ export async function SharedPermissionsPage(props: {
   if (isLocalhostChain) {
     return (
       <ContractPermissionsPageClient
-        contract={clientContract}
         chainMetadata={info.chainMetadata}
+        contract={clientContract}
         isLoggedIn={props.isLoggedIn}
         projectMeta={props.projectMeta}
       />
@@ -52,11 +52,11 @@ export async function SharedPermissionsPage(props: {
 
   return (
     <ContractPermissionsPage
-      projectMeta={props.projectMeta}
-      contract={clientContract}
       chainSlug={info.chainMetadata.slug}
+      contract={clientContract}
       detectedPermissionEnumerable={isPermissionsEnumerableSupported}
       isLoggedIn={props.isLoggedIn}
+      projectMeta={props.projectMeta}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/ContractProposalsPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/ContractProposalsPage.tsx
index a73537b1c4d..64eefa6cd3a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/ContractProposalsPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/ContractProposalsPage.tsx
@@ -32,8 +32,8 @@ export const ContractProposalsPage: React.FC<ProposalsPageProps> = ({
     [proposalsQuery.data],
   );
   const voteTokenBalancesQuery = useReadContract(voteTokenBalances, {
-    contract,
     addresses: balanceAddresses,
+    contract,
     queryOptions: {
       enabled: balanceAddresses.length > 0,
     },
@@ -51,10 +51,10 @@ export const ContractProposalsPage: React.FC<ProposalsPageProps> = ({
       <div className="flex flex-col gap-4">
         {proposals.map((proposal) => (
           <Proposal
-            key={proposal.proposalId.toString()}
             contract={contract}
-            proposal={proposal}
             isLoggedIn={isLoggedIn}
+            key={proposal.proposalId.toString()}
+            proposal={proposal}
           />
         ))}
         <Divider />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/delegate-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/delegate-button.tsx
index e245d7b70d0..6f985caab63 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/delegate-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/delegate-button.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import {
   tokensDelegated,
   useDelegateMutation,
@@ -9,6 +8,7 @@ import { TransactionButton } from "components/buttons/TransactionButton";
 import { toast } from "sonner";
 import type { ThirdwebContract } from "thirdweb";
 import { useActiveAccount, useReadContract } from "thirdweb/react";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 interface VoteButtonProps {
   contract: ThirdwebContract;
@@ -21,8 +21,8 @@ export const DelegateButton: React.FC<VoteButtonProps> = ({
 }) => {
   const account = useActiveAccount();
   const tokensDelegatedQuery = useReadContract(tokensDelegated, {
-    contract,
     account,
+    contract,
     queryOptions: {
       enabled: !!account,
     },
@@ -38,8 +38,7 @@ export const DelegateButton: React.FC<VoteButtonProps> = ({
       <TransactionButton
         client={contract.client}
         isLoggedIn={isLoggedIn}
-        txChainID={contract.chain.id}
-        transactionCount={1}
+        isPending={delegateMutation.isPending}
         onClick={() => {
           toast.promise(
             delegateMutation.mutateAsync(contract, {
@@ -48,13 +47,14 @@ export const DelegateButton: React.FC<VoteButtonProps> = ({
               },
             }),
             {
+              error: "Error delegating tokens",
               loading: "Delegating tokens...",
               success: "Tokens delegated",
-              error: "Error delegating tokens",
             },
           );
         }}
-        isPending={delegateMutation.isPending}
+        transactionCount={1}
+        txChainID={contract.chain.id}
       >
         Delegate Tokens
       </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal-button.tsx
index a2e2440f6cc..0bffa7bc022 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal-button.tsx
@@ -1,12 +1,5 @@
 "use client";
 
-import {
-  Sheet,
-  SheetContent,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
 import { FormControl, Textarea } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { PlusIcon } from "lucide-react";
@@ -17,6 +10,13 @@ import type { ThirdwebContract } from "thirdweb";
 import * as VoteExt from "thirdweb/extensions/vote";
 import { useSendAndConfirmTransaction } from "thirdweb/react";
 import { Button, FormErrorMessage, FormLabel } from "tw-components";
+import {
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
 
 interface VoteButtonProps {
   contract: ThirdwebContract;
@@ -38,7 +38,7 @@ export const ProposalButton: React.FC<VoteButtonProps> = ({
   } = useForm<{ description: string }>();
 
   return (
-    <Sheet open={open} onOpenChange={setOpen}>
+    <Sheet onOpenChange={setOpen} open={open}>
       <SheetTrigger asChild>
         <Button
           colorScheme="primary"
@@ -56,30 +56,30 @@ export const ProposalButton: React.FC<VoteButtonProps> = ({
           id={PROPOSAL_FORM_ID}
           onSubmit={handleSubmit((data) => {
             const tx = VoteExt.propose({
-              contract,
               calldatas: ["0x"],
-              values: [0n],
-              targets: [contract.address],
+              contract,
               description: data.description,
+              targets: [contract.address],
+              values: [0n],
             });
             toast.promise(
               sendTx.mutateAsync(tx, {
-                onSuccess: () => {
-                  setOpen(false);
-                },
                 onError: (error) => {
                   console.error(error);
                 },
+                onSuccess: () => {
+                  setOpen(false);
+                },
               }),
               {
+                error: "Failed to create proposal",
                 loading: "Creating proposal...",
                 success: "Proposal created successfully",
-                error: "Failed to create proposal",
               },
             );
           })}
         >
-          <FormControl isRequired isInvalid={!!errors.description}>
+          <FormControl isInvalid={!!errors.description} isRequired>
             <FormLabel>Description</FormLabel>
             <Textarea {...register("description")} />
             <FormErrorMessage>{errors?.description?.message}</FormErrorMessage>
@@ -88,18 +88,18 @@ export const ProposalButton: React.FC<VoteButtonProps> = ({
         <div className="mt-6 flex flex-row justify-end gap-3">
           <Button
             isDisabled={sendTx.isPending}
-            variant="outline"
             onClick={() => setOpen(false)}
+            variant="outline"
           >
             Cancel
           </Button>
           <TransactionButton
             client={contract.client}
+            form={PROPOSAL_FORM_ID}
             isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
-            transactionCount={1}
             isPending={sendTx.isPending}
-            form={PROPOSAL_FORM_ID}
+            transactionCount={1}
+            txChainID={contract.chain.id}
             type="submit"
           >
             Submit
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx
index be8b4ebb010..5e04cd7044c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx
@@ -21,14 +21,14 @@ const ProposalStateToMetadataMap: Record<
   keyof typeof VoteExt.ProposalState,
   string
 > = {
-  pending: "gray.500",
   active: "primary.500",
   canceled: "red.500",
   defeated: "red.500",
-  succeeded: "green.500",
-  queued: "yellow.500",
-  expired: "gray.500",
   executed: "green.500",
+  expired: "gray.500",
+  pending: "gray.500",
+  queued: "yellow.500",
+  succeeded: "green.500",
 };
 
 interface IProposal {
@@ -44,8 +44,8 @@ export const Proposal: React.FC<IProposal> = ({
 }) => {
   const account = useActiveAccount();
   const hasVotedQuery = useReadContract(VoteExt.hasVoted, {
-    contract,
     account: account?.address || "",
+    contract,
     proposalId: proposal.proposalId,
     queryOptions: {
       enabled: !!account,
@@ -59,8 +59,8 @@ export const Proposal: React.FC<IProposal> = ({
     contract,
   });
   const tokensDelegatedQuery = useReadContract(tokensDelegated, {
-    contract,
     account,
+    contract,
     queryOptions: { enabled: !!account },
   });
 
@@ -76,10 +76,10 @@ export const Proposal: React.FC<IProposal> = ({
       support: vote,
     });
     toast.promise(sendTx.mutateAsync(castVoteTx), {
-      loading: "Casting vote...",
-      success: "Vote cast successfully",
       error: "Error casting vote",
+      loading: "Casting vote...",
       onAutoClose: () => setVoteType(null),
+      success: "Vote cast successfully",
     });
   }
 
@@ -138,13 +138,13 @@ export const Proposal: React.FC<IProposal> = ({
         <div className="mt-6 flex gap-2">
           <TransactionButton
             client={contract.client}
+            disabled={sendTx.isPending && voteType !== 1}
             isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
+            isPending={sendTx.isPending && voteType === 1}
+            onClick={() => castVote(1)}
             size="sm"
             transactionCount={1}
-            onClick={() => castVote(1)}
-            disabled={sendTx.isPending && voteType !== 1}
-            isPending={sendTx.isPending && voteType === 1}
+            txChainID={contract.chain.id}
           >
             <div className="flex items-center gap-2">
               <CheckIcon className="size-4" />
@@ -153,14 +153,14 @@ export const Proposal: React.FC<IProposal> = ({
           </TransactionButton>
           <TransactionButton
             client={contract.client}
+            disabled={sendTx.isPending && voteType !== 0}
             isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
+            isPending={sendTx.isPending && voteType === 0}
+            onClick={() => castVote(0)}
             size="sm"
             transactionCount={1}
-            onClick={() => castVote(0)}
+            txChainID={contract.chain.id}
             variant="destructive"
-            disabled={sendTx.isPending && voteType !== 0}
-            isPending={sendTx.isPending && voteType === 0}
           >
             <div className="flex items-center gap-2">
               <XIcon className="size-4" />
@@ -169,13 +169,13 @@ export const Proposal: React.FC<IProposal> = ({
           </TransactionButton>
           <TransactionButton
             client={contract.client}
+            disabled={sendTx.isPending && voteType !== 2}
             isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
+            isPending={sendTx.isPending && voteType === 2}
+            onClick={() => castVote(2)}
             size="sm"
             transactionCount={1}
-            onClick={() => castVote(2)}
-            disabled={sendTx.isPending && voteType !== 2}
-            isPending={sendTx.isPending && voteType === 2}
+            txChainID={contract.chain.id}
           >
             <div className="flex items-center gap-2">
               <MinusIcon className="size-4" />
@@ -187,21 +187,21 @@ export const Proposal: React.FC<IProposal> = ({
         canExecuteQuery.data && (
           <Button
             colorScheme="primary"
-            size="sm"
+            isLoading={sendTx.isPending}
             leftIcon={<CheckIcon />}
+            mt="24px"
             onClick={() => {
               const executeTx = VoteExt.executeProposal({
                 contract,
                 proposalId: proposal.proposalId,
               });
               toast.promise(sendTx.mutateAsync(executeTx), {
+                error: "Error executing proposal",
                 loading: "Executing proposal...",
                 success: "Proposal executed successfully",
-                error: "Error executing proposal",
               });
             }}
-            isLoading={sendTx.isPending}
-            mt="24px"
+            size="sm"
           >
             Execute
           </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/page.tsx
index ad4495e4f03..cf1cd7a2d14 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/page.tsx
@@ -9,10 +9,10 @@ export default async function Page(props: {
 
   return (
     <SharedContractProposalsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/shared-proposals-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/shared-proposals-page.tsx
index 230e73dc82f..bf52c77fac2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/shared-proposals-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/shared-proposals-page.tsx
@@ -13,8 +13,8 @@ export async function SharedContractProposalsPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -37,9 +37,9 @@ export async function SharedContractProposalsPage(props: {
 
   if (!isVoteContract) {
     redirectToContractLandingPage({
-      projectMeta: props.projectMeta,
       chainIdOrSlug: props.chainIdOrSlug,
       contractAddress: props.contractAddress,
+      projectMeta: props.projectMeta,
     });
   }
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/PageHeader.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/PageHeader.tsx
index 576f55bfe3e..20dda38a7dd 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/PageHeader.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/PageHeader.tsx
@@ -1,12 +1,10 @@
+import Link from "next/link";
 import { ToggleThemeButton } from "@/components/color-mode-toggle";
 import { cn } from "@/lib/utils";
-import Link from "next/link";
 import { ThirdwebMiniLogo } from "../../../../../../components/ThirdwebMiniLogo";
 import { PublicPageConnectButton } from "./PublicPageConnectButton";
 
-export function PageHeader(props: {
-  containerClassName?: string;
-}) {
+export function PageHeader(props: { containerClassName?: string }) {
   return (
     <div className="border-b border-dashed">
       <header
@@ -16,7 +14,7 @@ export function PageHeader(props: {
         )}
       >
         <div className="flex items-center gap-4">
-          <Link href="/team" className="flex items-center gap-2">
+          <Link className="flex items-center gap-2" href="/team">
             <ThirdwebMiniLogo className="h-5" />
             <span className="hidden font-bold text-2xl tracking-tight lg:block">
               thirdweb
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/PublicPageConnectButton.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/PublicPageConnectButton.tsx
index 0e1aede509a..6d16627a850 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/PublicPageConnectButton.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/PublicPageConnectButton.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { getSDKTheme } from "app/(app)/components/sdk-component-theme";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { useTheme } from "next-themes";
 import { ConnectButton } from "thirdweb/react";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 
 const client = getClientThirdwebClient();
 
@@ -17,24 +17,24 @@ export function PublicPageConnectButton(props: {
 
   return (
     <ConnectButton
-      theme={getSDKTheme(t)}
-      client={client}
-      connectModal={{
-        privacyPolicyUrl: "/privacy-policy",
-        termsOfServiceUrl: "/terms",
-        showThirdwebBranding: false,
-      }}
-      connectButton={{
-        className: props.connectButtonClassName,
-      }}
       appMetadata={{
-        name: "thirdweb",
         logoUrl: "https://thirdweb.com/favicon.ico",
+        name: "thirdweb",
         url: "https://thirdweb.com",
       }}
+      autoConnect={false}
       chains={allChainsV5}
+      client={client}
+      connectButton={{
+        className: props.connectButtonClassName,
+      }}
+      connectModal={{
+        privacyPolicyUrl: "/privacy-policy",
+        showThirdwebBranding: false,
+        termsOfServiceUrl: "/terms",
+      }}
       // we have an AutoConnect already added in root layout with AA configuration
-      autoConnect={false}
+      theme={getSDKTheme(t)}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/supply-claimed-progress.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/supply-claimed-progress.stories.tsx
index 255c630cac0..5dcc41f3c60 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/supply-claimed-progress.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/supply-claimed-progress.stories.tsx
@@ -4,8 +4,8 @@ import { BadgeContainer } from "../../../../../../../../stories/utils";
 import { SupplyClaimedProgress } from "./supply-claimed-progress";
 
 const meta = {
-  title: "Assets/NFT/SupplyClaimedProgress",
   component: StoryVariants,
+  title: "Assets/NFT/SupplyClaimedProgress",
 } satisfies Meta<typeof StoryVariants>;
 
 export default meta;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/supply-claimed-progress.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/supply-claimed-progress.tsx
index 3fd1e3a672d..f408ccc6957 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/supply-claimed-progress.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/supply-claimed-progress.tsx
@@ -1,6 +1,6 @@
-import { Progress } from "@/components/ui/progress";
 import { InfinityIcon } from "lucide-react";
 import { maxUint256 } from "thirdweb/utils";
+import { Progress } from "@/components/ui/progress";
 import { supplyFormatter } from "../nft/format";
 
 export function SupplyClaimedProgress(props: {
@@ -14,7 +14,7 @@ export function SupplyClaimedProgress(props: {
         <span className="font-medium text-sm">Claimed Supply </span>
         <span className="flex items-center gap-1 font-bold text-sm">
           {supplyFormatter.format(props.claimedSupply)} /{" "}
-          <InfinityIcon className="size-4" aria-label="Unlimited" />
+          <InfinityIcon aria-label="Unlimited" className="size-4" />
         </span>
       </p>
     );
@@ -40,7 +40,7 @@ export function SupplyClaimedProgress(props: {
           {supplyFormatter.format(props.totalSupply)}
         </span>
       </div>
-      <Progress value={soldPercentage} className="h-2.5" />
+      <Progress className="h-2.5" value={soldPercentage} />
       <p className="font-medium text-muted-foreground text-xs">
         {soldPercentage === 0 && props.claimedSupply !== 0n && "~"}
         {soldPercentage.toFixed(2)}% Sold
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/token-price.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/token-price.tsx
index 8925a8a74cc..370624b155e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/token-price.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/token-price.tsx
@@ -11,7 +11,6 @@ export function TokenPrice(props: {
 }) {
   return (
     <SkeletonContainer
-      skeletonData={"0.00 ETH"}
       loadedData={
         props.data
           ? props.data.priceInTokens === 0
@@ -29,11 +28,12 @@ export function TokenPrice(props: {
         }
         return <span className="font-medium text-foreground text-sm">{v}</span>;
       }}
+      skeletonData={"0.00 ETH"}
     />
   );
 }
 
 const tokenPriceFormatter = new Intl.NumberFormat("en-US", {
-  notation: "compact",
   maximumFractionDigits: 10,
+  notation: "compact",
 });
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.stories.tsx
index cce50eace2c..a9f1a9aea06 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.stories.tsx
@@ -6,13 +6,7 @@ import { ThirdwebProvider } from "thirdweb/react";
 import { ContractHeaderUI } from "./ContractHeader";
 
 const meta = {
-  title: "ERC20/ContractHeader",
   component: ContractHeaderUI,
-  parameters: {
-    nextjs: {
-      appDirectory: true,
-    },
-  },
   decorators: [
     (Story) => (
       <ThirdwebProvider>
@@ -22,6 +16,12 @@ const meta = {
       </ThirdwebProvider>
     ),
   ],
+  parameters: {
+    nextjs: {
+      appDirectory: true,
+    },
+  },
+  title: "ERC20/ContractHeader",
 } satisfies Meta<typeof ContractHeaderUI>;
 
 export default meta;
@@ -31,169 +31,169 @@ const mockTokenImage =
   "ipfs://ipfs/QmXYgTEavjF6c9X1a2pt5E379MYqSwFzzKvsUbSnRiSUEc/ea207d218948137.67aa26cfbd956.png";
 
 const ethereumChainMetadata: ChainMetadata = {
-  name: "Ethereum Mainnet",
   chain: "ethereum",
   chainId: 1,
-  networkId: 1,
+  explorers: [
+    {
+      name: "Etherscan",
+      standard: "EIP3091",
+      url: "https://etherscan.io",
+    },
+  ],
+  icon: {
+    format: "svg",
+    height: 24,
+    url: "https://thirdweb.com/chain-icons/ethereum.svg",
+    width: 24,
+  },
+  name: "Ethereum Mainnet",
   nativeCurrency: {
+    decimals: 18,
     name: "Ether",
     symbol: "ETH",
-    decimals: 18,
   },
+  networkId: 1,
   rpc: ["https://eth.llamarpc.com"],
   shortName: "eth",
   slug: "ethereum",
-  testnet: false,
-  icon: {
-    url: "https://thirdweb.com/chain-icons/ethereum.svg",
-    width: 24,
-    height: 24,
-    format: "svg",
-  },
-  explorers: [
-    {
-      name: "Etherscan",
-      url: "https://etherscan.io",
-      standard: "EIP3091",
-    },
-  ],
   stackType: "evm",
+  testnet: false,
 };
 
 const mockContract = getContract({
-  client: storybookThirdwebClient,
+  address: "0x1234567890123456789012345678901234567890",
   chain: {
     id: 1,
     name: "Ethereum",
     rpc: "https://eth.llamarpc.com",
   },
-  address: "0x1234567890123456789012345678901234567890",
+  client: storybookThirdwebClient,
 });
 
 const mockSocialUrls = {
-  twitter: "https://twitter.com",
+  custom: "https://example.com",
   discord: "https://discord.gg",
-  telegram: "https://web.telegram.org/",
-  website: "https://example.com",
   github: "https://github.com",
-  linkedin: "https://linkedin.com",
-  tiktok: "https://tiktok.com",
   instagram: "https://instagram.com",
-  custom: "https://example.com",
+  linkedin: "https://linkedin.com",
   reddit: "https://reddit.com",
+  telegram: "https://web.telegram.org/",
+  tiktok: "https://tiktok.com",
+  twitter: "https://twitter.com",
+  website: "https://example.com",
   youtube: "https://youtube.com",
 };
 
 export const WithImageAndMultipleSocialUrls: Story = {
   args: {
-    name: "Sample Token",
-    symbol: "SMPL",
-    image: mockTokenImage,
     chainMetadata: ethereumChainMetadata,
     clientContract: mockContract,
+    image: mockTokenImage,
+    name: "Sample Token",
     socialUrls: {
-      twitter: mockSocialUrls.twitter,
       discord: mockSocialUrls.discord,
+      github: mockSocialUrls.github,
       telegram: mockSocialUrls.telegram,
+      twitter: mockSocialUrls.twitter,
       website: mockSocialUrls.website,
-      github: mockSocialUrls.github,
     },
+    symbol: "SMPL",
   },
 };
 
 export const WithBrokenImageAndSingleSocialUrl: Story = {
   args: {
-    name: "Sample Token",
-    symbol: "SMPL",
-    image: "broken-image.png",
     chainMetadata: ethereumChainMetadata,
     clientContract: mockContract,
+    image: "broken-image.png",
+    name: "Sample Token",
     socialUrls: {
       website: mockSocialUrls.website,
     },
+    symbol: "SMPL",
   },
 };
 
 export const WithoutImageAndNoSocialUrls: Story = {
   args: {
-    name: "Sample Token",
-    symbol: "SMPL",
-    image: undefined,
     chainMetadata: ethereumChainMetadata,
     clientContract: mockContract,
+    image: undefined,
+    name: "Sample Token",
     socialUrls: {},
+    symbol: "SMPL",
   },
 };
 
 export const LongNameAndLotsOfSocialUrls: Story = {
   args: {
-    name: "This is a very long token name that should wrap to multiple lines",
-    symbol: "LONG",
-    image: "https://thirdweb.com/chain-icons/ethereum.svg",
     chainMetadata: ethereumChainMetadata,
     clientContract: mockContract,
+    image: "https://thirdweb.com/chain-icons/ethereum.svg",
+    name: "This is a very long token name that should wrap to multiple lines",
     socialUrls: {
-      twitter: mockSocialUrls.twitter,
       discord: mockSocialUrls.discord,
-      telegram: mockSocialUrls.telegram,
+      github: mockSocialUrls.github,
       reddit: mockSocialUrls.reddit,
-      youtube: mockSocialUrls.youtube,
+      telegram: mockSocialUrls.telegram,
+      twitter: mockSocialUrls.twitter,
       website: mockSocialUrls.website,
-      github: mockSocialUrls.github,
+      youtube: mockSocialUrls.youtube,
     },
+    symbol: "LONG",
   },
 };
 
 export const AllSocialUrls: Story = {
   args: {
-    name: "Sample Token",
-    symbol: "SMPL",
-    image: "https://thirdweb.com/chain-icons/ethereum.svg",
     chainMetadata: ethereumChainMetadata,
     clientContract: mockContract,
+    image: "https://thirdweb.com/chain-icons/ethereum.svg",
+    name: "Sample Token",
     socialUrls: {
-      twitter: mockSocialUrls.twitter,
+      custom: mockSocialUrls.custom,
       discord: mockSocialUrls.discord,
-      telegram: mockSocialUrls.telegram,
-      reddit: mockSocialUrls.reddit,
-      youtube: mockSocialUrls.youtube,
-      website: mockSocialUrls.website,
       github: mockSocialUrls.github,
+      instagram: mockSocialUrls.instagram,
       linkedin: mockSocialUrls.linkedin,
+      reddit: mockSocialUrls.reddit,
+      telegram: mockSocialUrls.telegram,
       tiktok: mockSocialUrls.tiktok,
-      instagram: mockSocialUrls.instagram,
-      custom: mockSocialUrls.custom,
+      twitter: mockSocialUrls.twitter,
+      website: mockSocialUrls.website,
+      youtube: mockSocialUrls.youtube,
     },
+    symbol: "SMPL",
   },
 };
 
 export const InvalidSocialUrls: Story = {
   args: {
-    name: "Sample Token",
-    symbol: "SMPL",
-    image: "https://thirdweb.com/chain-icons/ethereum.svg",
     chainMetadata: ethereumChainMetadata,
     clientContract: mockContract,
+    image: "https://thirdweb.com/chain-icons/ethereum.svg",
+    name: "Sample Token",
     socialUrls: {
-      twitter: "invalid-url",
       discord: "invalid-url",
-      telegram: "invalid-url",
       reddit: "",
+      telegram: "invalid-url",
+      twitter: "invalid-url",
       youtube: mockSocialUrls.youtube,
     },
+    symbol: "SMPL",
   },
 };
 
 export const SomeSocialUrls: Story = {
   args: {
-    name: "Sample Token",
-    symbol: "SMPL",
-    image: "https://thirdweb.com/chain-icons/ethereum.svg",
     chainMetadata: ethereumChainMetadata,
     clientContract: mockContract,
+    image: "https://thirdweb.com/chain-icons/ethereum.svg",
+    name: "Sample Token",
     socialUrls: {
-      website: mockSocialUrls.website,
       twitter: mockSocialUrls.twitter,
+      website: mockSocialUrls.website,
     },
+    symbol: "SMPL",
   },
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.tsx
index 105260fefbd..5b4c89c6db9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.tsx
@@ -1,10 +1,3 @@
-import { Img } from "@/components/blocks/Img";
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { Button } from "@/components/ui/button";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { cn } from "@/lib/utils";
-import { ChainIconClient } from "components/icons/ChainIcon";
 import { DiscordIcon } from "components/icons/brand-icons/DiscordIcon";
 import { GithubIcon } from "components/icons/brand-icons/GithubIcon";
 import { InstagramIcon } from "components/icons/brand-icons/InstagramIcon";
@@ -14,24 +7,31 @@ import { TelegramIcon } from "components/icons/brand-icons/TelegramIcon";
 import { TiktokIcon } from "components/icons/brand-icons/TiktokIcon";
 import { XIcon as TwitterXIcon } from "components/icons/brand-icons/XIcon";
 import { YoutubeIcon } from "components/icons/brand-icons/YoutubeIcon";
+import { ChainIconClient } from "components/icons/ChainIcon";
 import { ExternalLinkIcon, GlobeIcon } from "lucide-react";
 import Link from "next/link";
 import { useMemo } from "react";
 import type { ThirdwebContract } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
+import { Img } from "@/components/blocks/Img";
+import { Button } from "@/components/ui/button";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
+import { cn } from "@/lib/utils";
 
 const platformToIcons: Record<string, React.FC<{ className?: string }>> = {
-  twitter: TwitterXIcon,
-  x: TwitterXIcon,
   discord: DiscordIcon,
-  telegram: TelegramIcon,
-  reddit: RedditIcon,
-  website: GlobeIcon,
   github: GithubIcon,
-  youtube: YoutubeIcon,
   instagram: InstagramIcon,
-  tiktok: TiktokIcon,
   linkedin: LinkedInIcon,
+  reddit: RedditIcon,
+  telegram: TelegramIcon,
+  tiktok: TiktokIcon,
+  twitter: TwitterXIcon,
+  website: GlobeIcon,
+  x: TwitterXIcon,
+  youtube: YoutubeIcon,
 };
 
 export function ContractHeaderUI(props: {
@@ -51,7 +51,7 @@ export function ContractHeaderUI(props: {
         typeof key === "string" &&
         isValidUrl(value)
       ) {
-        socialUrlsValue.push({ name: key, href: value });
+        socialUrlsValue.push({ href: value, name: key });
       }
     }
 
@@ -72,19 +72,19 @@ export function ContractHeaderUI(props: {
             "size-20 shrink-0 rounded-full border bg-muted",
             props.imageClassName,
           )}
+          fallback={
+            <div className="flex items-center justify-center font-bold text-3xl text-muted-foreground/80">
+              {props.name[0]}
+            </div>
+          }
           src={
             props.image
               ? resolveSchemeWithErrorHandler({
-                  uri: props.image,
                   client: props.clientContract.client,
+                  uri: props.image,
                 })
               : ""
           }
-          fallback={
-            <div className="flex items-center justify-center font-bold text-3xl text-muted-foreground/80">
-              {props.name[0]}
-            </div>
-          }
         />
       )}
 
@@ -98,13 +98,13 @@ export function ContractHeaderUI(props: {
 
             <div className="flex flex-wrap gap-2">
               <Link
-                href={`/${props.chainMetadata.slug}`}
                 className="flex w-fit shrink-0 items-center gap-2 rounded-3xl border border-border bg-card px-2.5 py-1.5 hover:bg-accent"
+                href={`/${props.chainMetadata.slug}`}
               >
                 <ChainIconClient
-                  src={props.chainMetadata.icon?.url || ""}
-                  client={props.clientContract.client}
                   className="size-4"
+                  client={props.clientContract.client}
+                  src={props.chainMetadata.icon?.url || ""}
                 />
                 {cleanedChainName && (
                   <span className="text-xs">{cleanedChainName}</span>
@@ -128,10 +128,10 @@ export function ContractHeaderUI(props: {
                 })
                 .map(({ name, href }) => (
                   <SocialLink
-                    key={name}
-                    name={name}
                     href={href}
                     icon={platformToIcons[name.toLowerCase()]}
+                    key={name}
+                    name={name}
                   />
                 ))}
             </div>
@@ -142,16 +142,16 @@ export function ContractHeaderUI(props: {
         <div className="flex flex-row flex-wrap items-center gap-2">
           <CopyAddressButton
             address={props.clientContract.address}
-            copyIconPosition="left"
             className="rounded-full bg-card px-2.5 py-1.5 text-xs"
+            copyIconPosition="left"
             variant="outline"
           />
 
           {explorersToShow?.map((validBlockExplorer) => (
             <BadgeLink
+              href={`${validBlockExplorer.url.endsWith("/") ? validBlockExplorer.url : `${validBlockExplorer.url}/`}address/${props.clientContract.address}`}
               key={validBlockExplorer.url}
               name={validBlockExplorer.name}
-              href={`${validBlockExplorer.url.endsWith("/") ? validBlockExplorer.url : `${validBlockExplorer.url}/`}address/${props.clientContract.address}`}
             />
           ))}
 
@@ -179,17 +179,14 @@ function getExplorersToShow(chainMetadata: ChainMetadata) {
   return validBlockExplorers?.slice(0, 1);
 }
 
-function BadgeLink(props: {
-  name: string;
-  href: string;
-}) {
+function BadgeLink(props: { name: string; href: string }) {
   return (
     <Button
-      variant="outline"
       asChild
       className="!h-auto gap-2 rounded-full bg-card px-3 py-1.5 text-xs capitalize"
+      variant="outline"
     >
-      <Link href={props.href} target="_blank" rel="noopener noreferrer">
+      <Link href={props.href} rel="noopener noreferrer" target="_blank">
         {props.name}
         <ExternalLinkIcon className="size-3 text-muted-foreground/70" />
       </Link>
@@ -203,20 +200,20 @@ function SocialLink(props: {
   icon?: React.FC<{ className?: string }>;
 }) {
   return (
-    <ToolTipLabel label={props.name} contentClassName="capitalize">
+    <ToolTipLabel contentClassName="capitalize" label={props.name}>
       <Button
-        variant="outline"
         asChild
         className={cn(
           "!h-auto gap-2 rounded-full bg-card px-3 py-1.5 text-xs capitalize",
           props.icon && "rounded-full p-1.5",
         )}
+        variant="outline"
       >
         <Link
-          href={props.href}
-          target="_blank"
           className="capitalize"
+          href={props.href}
           rel="noopener noreferrer"
+          target="_blank"
         >
           {props.icon ? <props.icon className="size-4" /> : props.name}
           {!props.icon && (
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/PayEmbedSection.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/PayEmbedSection.tsx
index f384e7bc4e1..2018a60ae40 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/PayEmbedSection.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/PayEmbedSection.tsx
@@ -17,30 +17,30 @@ export function BuyTokenEmbed(props: {
     <PayEmbed
       className="!rounded-xl !w-full"
       client={props.client}
+      connectOptions={{
+        autoConnect: false,
+      }}
       payOptions={{
-        mode: "fund_wallet",
         metadata: {
           name: `Buy ${props.tokenSymbol}`,
         },
+        mode: "fund_wallet",
         prefillBuy: {
+          allowEdits: {
+            amount: true,
+            chain: false,
+            token: false,
+          },
+          amount: "1",
           chain: props.chain,
           token: {
+            address: props.tokenAddress,
             name: props.tokenName,
             symbol: props.tokenSymbol,
-            address: props.tokenAddress,
-          },
-          amount: "1",
-          allowEdits: {
-            token: false,
-            chain: false,
-            amount: true,
           },
         },
       }}
       theme={getSDKTheme(theme === "light" ? "light" : "dark")}
-      connectOptions={{
-        autoConnect: false,
-      }}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/PriceChart.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/PriceChart.tsx
index eb26925ad30..c28296a6d21 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/PriceChart.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/PriceChart.tsx
@@ -1,15 +1,14 @@
 "use client";
 
+import { differenceInCalendarDays, format } from "date-fns";
+import { ArrowDownIcon, ArrowUpIcon, InfoIcon } from "lucide-react";
+import { useMemo, useState } from "react";
 import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { SkeletonContainer } from "@/components/ui/skeleton";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { differenceInCalendarDays, format } from "date-fns";
-import { ArrowUpIcon, InfoIcon } from "lucide-react";
-import { ArrowDownIcon } from "lucide-react";
-import { useMemo, useState } from "react";
 import { useTokenPriceData } from "../_hooks/useTokenPriceData";
 
 function PriceChartUI(props: {
@@ -28,18 +27,18 @@ function PriceChartUI(props: {
 
   return (
     <ThirdwebAreaChart
-      className="border-none bg-background p-0"
       cardContentClassName="p-0"
+      chartClassName="aspect-[1.5] lg:aspect-[3]"
+      className="border-none bg-background p-0"
       config={{
         price: {
-          label: "Price",
           color: "hsl(var(--chart-1))",
+          label: "Price",
         },
       }}
       data={data}
-      isPending={props.isPending}
-      chartClassName="aspect-[1.5] lg:aspect-[3]"
       hideLabel={false}
+      isPending={props.isPending}
       toolTipLabelFormatter={getTooltipLabelFormatter(props.showTimeOfDay)}
       toolTipValueFormatter={(value) => {
         return tokenPriceUSDFormatter.format(value as number);
@@ -49,32 +48,32 @@ function PriceChartUI(props: {
 }
 
 const tokenPriceUSDFormatter = new Intl.NumberFormat("en-US", {
-  style: "currency",
   currency: "USD",
-  minimumFractionDigits: 0,
   maximumFractionDigits: 10,
-  roundingMode: "halfEven",
+  minimumFractionDigits: 0,
   notation: "compact",
+  roundingMode: "halfEven",
+  style: "currency",
 });
 
 const marketCapFormatter = new Intl.NumberFormat("en-US", {
-  style: "currency",
   currency: "USD",
-  minimumFractionDigits: 0,
   maximumFractionDigits: 0,
-  roundingMode: "halfEven",
+  minimumFractionDigits: 0,
   notation: "compact",
+  roundingMode: "halfEven",
+  style: "currency",
 });
 
 const holdersFormatter = new Intl.NumberFormat("en-US", {
-  minimumFractionDigits: 0,
   maximumFractionDigits: 0,
+  minimumFractionDigits: 0,
   notation: "compact",
 });
 
 const percentChangeFormatter = new Intl.NumberFormat("en-US", {
-  minimumFractionDigits: 0,
   maximumFractionDigits: 2,
+  minimumFractionDigits: 0,
 });
 
 function getTooltipLabelFormatter(includeTimeOfDay: boolean) {
@@ -152,7 +151,6 @@ export function TokenStats(params: {
           <div className="flex items-center gap-2">
             <SkeletonContainer
               loadedData={priceUsd}
-              skeletonData={10.0001}
               render={(v) => {
                 return (
                   <p className="font-bold text-4xl tracking-tight">
@@ -162,10 +160,10 @@ export function TokenStats(params: {
                   </p>
                 );
               }}
+              skeletonData={10.0001}
             />
             <SkeletonContainer
               loadedData={percentChange24h}
-              skeletonData={0.001}
               render={(data) => {
                 if (typeof data === "string") {
                   return null;
@@ -180,6 +178,7 @@ export function TokenStats(params: {
 
                 return (
                   <Badge
+                    className="gap-2 text-sm"
                     variant={
                       isAlmostZero
                         ? "default"
@@ -187,7 +186,6 @@ export function TokenStats(params: {
                           ? "success"
                           : "destructive"
                     }
-                    className="gap-2 text-sm"
                   >
                     <div className="flex items-center gap-0.5">
                       {isAlmostZero ? null : data > 0 ? (
@@ -203,6 +201,7 @@ export function TokenStats(params: {
                   </Badge>
                 );
               }}
+              skeletonData={0.001}
             />
           </div>
         </div>
@@ -212,25 +211,27 @@ export function TokenStats(params: {
 
       <div className="h-4" />
       <PriceChartUI
-        showTimeOfDay={interval === "24h"}
-        isPending={tokenPriceQuery.isPending}
         data={filteredHistoricalPrices || []}
+        isPending={tokenPriceQuery.isPending}
+        showTimeOfDay={interval === "24h"}
       />
 
       <div className="mt-8 flex gap-6 border-y border-dashed py-4 [&>*:not(:first-child)]:border-l [&>*:not(:first-child)]:border-dashed [&>*:not(:first-child)]:pl-5 [&>*]:grow">
         <TokenStat
+          label="Market Cap"
+          skeletonData={"1000000000"}
+          tooltip="Market capitalization is the total value of all tokens in circulation, calculated by multiplying the current price by the circulating supply"
           value={
             typeof marketCap === "number"
               ? marketCapFormatter.format(marketCap)
               : marketCap
           }
-          skeletonData={"1000000000"}
-          label="Market Cap"
-          tooltip="Market capitalization is the total value of all tokens in circulation, calculated by multiplying the current price by the circulating supply"
         />
 
         <TokenStat
+          label="Number of Holders"
           skeletonData={"1000000000"}
+          tooltip="The total number of unique wallet addresses that currently hold this token on the blockchain"
           value={
             // show 0 value as N/A
             holders === 0
@@ -239,8 +240,6 @@ export function TokenStats(params: {
                 ? holdersFormatter.format(holders)
                 : holders
           }
-          label="Number of Holders"
-          tooltip="The total number of unique wallet addresses that currently hold this token on the blockchain"
         />
       </div>
     </div>
@@ -263,7 +262,6 @@ function TokenStat<T extends string | number>(props: {
       </div>
       <div className="flex">
         <SkeletonContainer
-          skeletonData={props.skeletonData}
           loadedData={props.value}
           render={(v) => {
             return (
@@ -272,6 +270,7 @@ function TokenStat<T extends string | number>(props: {
               </p>
             );
           }}
+          skeletonData={props.skeletonData}
         />
       </div>
     </div>
@@ -285,10 +284,10 @@ function IntervalSelector(props: {
   setInterval: (timeframe: Interval) => void;
 }) {
   const intervals: Record<Interval, string> = {
-    "24h": "1D",
+    "1y": "1Y",
     "7d": "1W",
+    "24h": "1D",
     "30d": "1M",
-    "1y": "1Y",
     max: "MAX",
   };
 
@@ -296,15 +295,15 @@ function IntervalSelector(props: {
     <div className="flex gap-2">
       {Object.entries(intervals).map(([key, value]) => (
         <Button
-          key={key}
-          variant="outline"
           className={cn(
             "rounded-full",
             props.interval === key && "border-active-border bg-accent",
           )}
-          size="sm"
+          key={key}
           onClick={() => props.setInterval(key as Interval)}
+          size="sm"
           tabIndex={0}
+          variant="outline"
         >
           {value}
         </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/RecentTransfers.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/RecentTransfers.tsx
index 10ce5e4b37a..f77ba6834b9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/RecentTransfers.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/RecentTransfers.tsx
@@ -1,4 +1,13 @@
 "use client";
+import { formatDistanceToNow } from "date-fns";
+import {
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  ExternalLinkIcon,
+} from "lucide-react";
+import { useState } from "react";
+import { type ThirdwebClient, type ThirdwebContract, toTokens } from "thirdweb";
+import type { ChainMetadata } from "thirdweb/chains";
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
@@ -12,24 +21,15 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { cn } from "@/lib/utils";
-import { formatDistanceToNow } from "date-fns";
-import {
-  ChevronLeftIcon,
-  ChevronRightIcon,
-  ExternalLinkIcon,
-} from "lucide-react";
-import { useState } from "react";
-import { type ThirdwebClient, type ThirdwebContract, toTokens } from "thirdweb";
-import type { ChainMetadata } from "thirdweb/chains";
 import {
   type TokenTransfersData,
   useTokenTransfers,
 } from "../_hooks/useTokenTransfers";
 
 const tokenAmountFormatter = new Intl.NumberFormat("en-US", {
-  notation: "compact",
   maximumFractionDigits: 3,
   minimumFractionDigits: 0,
+  notation: "compact",
 });
 
 function RecentTransfersUI(props: {
@@ -71,7 +71,7 @@ function RecentTransfersUI(props: {
           <TableBody>
             {props.isPending
               ? Array.from({ length: props.rowsPerPage }).map((_, index) => (
-                  // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+                  // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
                   <SkeletonRow key={index} />
                 ))
               : props.data.map((transfer) => (
@@ -127,19 +127,19 @@ function RecentTransfersUI(props: {
                     </TableCell>
                     <TableCell>
                       <Button
-                        variant="ghost"
-                        size="sm"
-                        className="h-8 w-8 p-0"
                         asChild
+                        className="h-8 w-8 p-0"
+                        size="sm"
+                        variant="ghost"
                       >
                         <a
-                          href={`${props.explorerUrl}/tx/${transfer.transaction_hash}`}
-                          target="_blank"
-                          rel="noopener noreferrer"
                           className={cn(
                             "flex items-center justify-center",
                             "hover:bg-accent hover:text-accent-foreground",
                           )}
+                          href={`${props.explorerUrl}/tx/${transfer.transaction_hash}`}
+                          rel="noopener noreferrer"
+                          target="_blank"
                         >
                           <ExternalLinkIcon className="h-4 w-4" />
                         </a>
@@ -159,21 +159,21 @@ function RecentTransfersUI(props: {
 
       <div className="flex items-center justify-end gap-3 rounded-b-lg border-x border-b bg-card px-6 py-5">
         <Button
-          variant="outline"
-          size="sm"
           className="gap-1.5 bg-background"
           disabled={props.page === 0 || props.isPending}
           onClick={() => props.setPage(props.page - 1)}
+          size="sm"
+          variant="outline"
         >
           <ChevronLeftIcon className="size-4 text-muted-foreground" />
           Previous
         </Button>
         <Button
-          variant="outline"
-          size="sm"
-          disabled={props.isPending || props.data.length < props.rowsPerPage}
           className="gap-1.5 bg-background"
+          disabled={props.isPending || props.data.length < props.rowsPerPage}
           onClick={() => props.setPage(props.page + 1)}
+          size="sm"
+          variant="outline"
         >
           Next
           <ChevronRightIcon className="size-4 text-muted-foreground" />
@@ -217,27 +217,27 @@ export function RecentTransfers(props: {
   const tokenQuery = useTokenTransfers({
     chainId: props.clientContract.chain.id,
     contractAddress: props.clientContract.address,
-    page,
     limit: rowsPerPage,
+    page,
   });
 
   return (
     <div>
       <RecentTransfersUI
+        client={props.clientContract.client}
         data={tokenQuery.data ?? []}
+        explorerUrl={
+          props.chainMetadata.explorers?.[0]?.url ||
+          `https://thirdweb.com/${props.chainMetadata.slug}`
+        }
         isPending={tokenQuery.isPending}
+        page={page}
         rowsPerPage={rowsPerPage}
-        client={props.clientContract.client}
+        setPage={setPage}
         tokenMetadata={{
           decimals: props.decimals,
           symbol: props.tokenSymbol,
         }}
-        page={page}
-        setPage={setPage}
-        explorerUrl={
-          props.chainMetadata.explorers?.[0]?.url ||
-          `https://thirdweb.com/${props.chainMetadata.slug}`
-        }
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.stories.tsx
index d4e7d3d3eed..1e37b679e0a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.stories.tsx
@@ -6,13 +6,7 @@ import { ThirdwebProvider } from "thirdweb/react";
 import { TokenDropClaim } from "./claim-tokens-ui";
 
 const meta = {
-  title: "ERC20/ClaimTokenCardUI",
   component: Story,
-  parameters: {
-    nextjs: {
-      appDirectory: true,
-    },
-  },
   decorators: [
     (Story) => (
       <ThirdwebProvider>
@@ -24,6 +18,12 @@ const meta = {
       </ThirdwebProvider>
     ),
   ],
+  parameters: {
+    nextjs: {
+      appDirectory: true,
+    },
+  },
+  title: "ERC20/ClaimTokenCardUI",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -33,9 +33,9 @@ export const Variants: Story = {
 };
 
 const mockContract = getContract({
-  client: storybookThirdwebClient,
-  chain: baseSepolia,
   address: "0xD6866d1EcB82D37556B6cFEc0dFE8800D8b4B50A",
+  chain: baseSepolia,
+  client: storybookThirdwebClient,
 });
 
 const claimConditionCurrency = {
@@ -45,42 +45,43 @@ const claimConditionCurrency = {
 };
 
 const mockClaimCondition = {
-  startTimestamp: 1747918865n,
+  currency: claimConditionCurrency.address,
   maxClaimableSupply:
     115792089237316195423570985008687907853269984665640564039457584007913129639935n,
-  supplyClaimed: 790000000000000000000000n,
-  quantityLimitPerWallet: 0n,
   merkleRoot:
     "0x369b56a08dc68160042e86415132e683545596577b2f6afa272046c18cbab38b",
-  pricePerToken: 0n,
-  currency: claimConditionCurrency.address,
   metadata: "ipfs://QmPgawkS1jYSudujQGzx2UbodZzNPbMgWto1LPEba1Pxpj/0",
+  pricePerToken: 0n,
+  quantityLimitPerWallet: 0n,
+  startTimestamp: 1747918865n,
+  supplyClaimed: 790000000000000000000000n,
 };
 
 function Story() {
   return (
     <TokenDropClaim
-      contract={mockContract}
-      name="Example Token"
-      symbol="EXP"
-      claimCondition={mockClaimCondition}
-      claimConditionCurrency={claimConditionCurrency}
       chainMetadata={{
-        stackType: "evm",
+        chain: "ETH",
         chainId: 11155111,
         name: "Sepolia",
-        chain: "ETH",
-        shortName: "sep",
         nativeCurrency: {
+          decimals: 18,
           name: "Sepolia Ether",
           symbol: "ETH",
-          decimals: 18,
         },
+        // biome-ignore lint/suspicious/noTemplateCurlyInString: EXPECTED
         rpc: ["https://11155111.rpc.thirdweb.com/${THIRDWEB_API_KEY}"],
-        testnet: true,
+        shortName: "sep",
         slug: "sepolia",
+        stackType: "evm",
+        testnet: true,
       }}
+      claimCondition={mockClaimCondition}
+      claimConditionCurrency={claimConditionCurrency}
+      contract={mockContract}
       decimals={18}
+      name="Example Token"
+      symbol="EXP"
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.tsx
index 3b58ce26e95..34ecb8756c7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.tsx
@@ -1,15 +1,5 @@
 "use client";
 
-import {
-  reportAssetBuyFailed,
-  reportAssetBuySuccessful,
-} from "@/analytics/report";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { DecimalInput } from "@/components/ui/decimal-input";
-import { Label } from "@/components/ui/label";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import {
@@ -19,14 +9,14 @@ import {
   ExternalLinkIcon,
   XIcon,
 } from "lucide-react";
-import { useTheme } from "next-themes";
 import Link from "next/link";
-import { useState } from "react";
+import { useTheme } from "next-themes";
+import { useId, useState } from "react";
 import { toast } from "sonner";
 import {
-  type ThirdwebContract,
   padHex,
   sendAndConfirmTransaction,
+  type ThirdwebContract,
   toTokens,
   waitForReceipt,
 } from "thirdweb";
@@ -40,6 +30,16 @@ import { useActiveAccount, useSendTransaction } from "thirdweb/react";
 import { getClaimParams } from "thirdweb/utils";
 import { parseError } from "utils/errorParser";
 import { tryCatch } from "utils/try-catch";
+import {
+  reportAssetBuyFailed,
+  reportAssetBuySuccessful,
+} from "@/analytics/report";
+import { Button } from "@/components/ui/button";
+import { DecimalInput } from "@/components/ui/decimal-input";
+import { Label } from "@/components/ui/label";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
 import { getSDKTheme } from "../../../../../../../../components/sdk-component-theme";
 import { PublicPageConnectButton } from "../../../_components/PublicPageConnectButton";
 import { SupplyClaimedProgress } from "../../../_components/supply-claimed-progress";
@@ -99,14 +99,14 @@ export function TokenDropClaim(props: {
 
       const transaction = claimTo({
         contract: props.contract,
-        to: account.address,
-        quantity: String(quantity),
         from: account.address,
+        quantity: String(quantity),
+        to: account.address,
       });
 
       const approveTx = await getApprovalForTransaction({
-        transaction,
         account,
+        transaction,
       });
 
       if (approveTx) {
@@ -117,8 +117,8 @@ export function TokenDropClaim(props: {
 
         const approveTxResult = await tryCatch(
           sendAndConfirmTransaction({
-            transaction: approveTx,
             account,
+            transaction: approveTx,
           }),
         );
 
@@ -133,9 +133,9 @@ export function TokenDropClaim(props: {
           const errorMessage = parseError(approveTxResult.error);
 
           reportAssetBuyFailed({
+            assetType: "coin",
             chainId: props.contract.chain.id,
             contractType: "DropERC20",
-            assetType: "coin",
             error: errorMessage,
           });
 
@@ -171,9 +171,9 @@ export function TokenDropClaim(props: {
         });
 
         reportAssetBuyFailed({
+          assetType: "coin",
           chainId: props.contract.chain.id,
           contractType: "DropERC20",
-          assetType: "coin",
           error: errorMessage,
         });
 
@@ -184,9 +184,9 @@ export function TokenDropClaim(props: {
       }
 
       reportAssetBuySuccessful({
+        assetType: "coin",
         chainId: props.contract.chain.id,
         contractType: "DropERC20",
-        assetType: "coin",
       });
 
       setStepsUI({
@@ -201,14 +201,13 @@ export function TokenDropClaim(props: {
   });
 
   const publicPrice = {
-    pricePerTokenWei: props.claimCondition.pricePerToken,
     currencyAddress: props.claimCondition.currency,
     decimals: props.claimConditionCurrency.decimals,
+    pricePerTokenWei: props.claimCondition.pricePerToken,
     symbol: props.claimConditionCurrency.symbol,
   };
 
   const claimParamsQuery = useQuery({
-    queryKey: ["claim-params", props.contract.address, account?.address],
     queryFn: async () => {
       if (!account) {
         return publicPrice;
@@ -221,31 +220,34 @@ export function TokenDropClaim(props: {
 
       const claimParams = await getClaimParams({
         contract: props.contract,
-        to: account.address,
+        from: account.address,
         quantity: 1n, // not relevant
-        type: "erc20",
+        to: account.address,
         tokenDecimals: props.decimals,
-        from: account.address,
+        type: "erc20",
       });
 
       const meta = await getCurrencyMeta({
-        currencyAddress: claimParams.currency,
-        chainMetadata: props.chainMetadata,
         chain: props.contract.chain,
+        chainMetadata: props.chainMetadata,
         client: props.contract.client,
+        currencyAddress: claimParams.currency,
       });
 
       return {
-        pricePerTokenWei: claimParams.pricePerToken,
         currencyAddress: claimParams.currency,
         decimals: meta.decimals,
+        pricePerTokenWei: claimParams.pricePerToken,
         symbol: meta.symbol,
       };
     },
+    queryKey: ["claim-params", props.contract.address, account?.address],
   });
 
   const claimParamsData = claimParamsQuery.data;
 
+  const tokenAmountId = useId();
+
   if (successScreen) {
     const explorerUrl =
       props.chainMetadata.explorers?.[0]?.url ??
@@ -270,12 +272,12 @@ export function TokenDropClaim(props: {
           </p>
         </div>
 
-        <Button className="w-full bg-muted/50" variant="outline" asChild>
+        <Button asChild className="w-full bg-muted/50" variant="outline">
           <Link
-            href={`${explorerUrl}/tx/${successScreen.txHash}`}
-            target="_blank"
             className="gap-1.5"
+            href={`${explorerUrl}/tx/${successScreen.txHash}`}
             rel="noopener noreferrer"
+            target="_blank"
           >
             View Transaction{" "}
             <ExternalLinkIcon className="size-3.5 text-muted-foreground" />
@@ -283,8 +285,8 @@ export function TokenDropClaim(props: {
         </Button>
 
         <Button
-          onClick={() => setSuccessScreen(undefined)}
           className="mt-3 w-full"
+          onClick={() => setSuccessScreen(undefined)}
         >
           Buy More
         </Button>
@@ -311,11 +313,11 @@ export function TokenDropClaim(props: {
       <div className="p-4 lg:p-5">
         <div>
           <div className="space-y-2">
-            <Label htmlFor="token-amount">Tokens</Label>
+            <Label htmlFor={tokenAmountId}>Tokens</Label>
             <PriceInput
+              id={tokenAmountId}
               quantity={quantity}
               setQuantity={setQuantity}
-              id="token-amount"
               symbol={props.symbol}
             />
           </div>
@@ -350,13 +352,13 @@ export function TokenDropClaim(props: {
                 {isShowingCustomPrice && (
                   <TokenPrice
                     data={{
-                      symbol: publicPrice.symbol,
                       priceInTokens: Number(
                         toTokens(
                           publicPrice.pricePerTokenWei,
                           publicPrice.decimals,
                         ),
                       ),
+                      symbol: publicPrice.symbol,
                     }}
                     strikethrough={true}
                   />
@@ -367,13 +369,13 @@ export function TokenDropClaim(props: {
                   data={
                     claimParamsData
                       ? {
-                          symbol: claimParamsData.symbol,
                           priceInTokens: Number(
                             toTokens(
                               claimParamsData.pricePerTokenWei,
                               claimParamsData.decimals,
                             ),
                           ),
+                          symbol: claimParamsData.symbol,
                         }
                       : undefined
                   }
@@ -418,18 +420,18 @@ export function TokenDropClaim(props: {
 
           {account ? (
             <TransactionButton
-              client={props.contract.client}
-              transactionCount={undefined}
               checkBalance={false}
+              className="!w-full"
+              client={props.contract.client}
+              disabled={approveAndClaim.isPending || !claimParamsData}
               isLoggedIn={true}
               isPending={approveAndClaim.isPending}
               onClick={async () => {
                 approveAndClaim.mutate();
               }}
-              variant="default"
-              className="!w-full"
+              transactionCount={undefined}
               txChainID={props.contract.chain.id}
-              disabled={approveAndClaim.isPending || !claimParamsData}
+              variant="default"
             >
               Buy
             </TransactionButton>
@@ -443,11 +445,11 @@ export function TokenDropClaim(props: {
               <h2 className="mb-2 font-semibold">Status</h2>
               <div className="space-y-2">
                 {stepsUI.approve && (
-                  <StepUI title="Approve Spending" status={stepsUI.approve} />
+                  <StepUI status={stepsUI.approve} title="Approve Spending" />
                 )}
 
                 {stepsUI.claim && (
-                  <StepUI title={"Buy Tokens"} status={stepsUI.claim} />
+                  <StepUI status={stepsUI.claim} title={"Buy Tokens"} />
                 )}
               </div>
             </div>
@@ -461,16 +463,13 @@ export function TokenDropClaim(props: {
 type Status = "idle" | "pending" | "success" | "error";
 
 const statusToIcon: Record<Status, React.FC<{ className: string }>> = {
-  pending: Spinner,
-  success: CheckIcon,
   error: XIcon,
   idle: CircleIcon,
+  pending: Spinner,
+  success: CheckIcon,
 };
 
-function StepUI(props: {
-  title: string;
-  status: Status;
-}) {
+function StepUI(props: { title: string; status: Status }) {
   const Icon = statusToIcon[props.status];
   return (
     <div
@@ -496,12 +495,12 @@ function PriceInput(props: {
   return (
     <div className="relative">
       <DecimalInput
+        className="!text-2xl h-auto truncate bg-muted/50 pr-14 font-bold"
         id={props.id}
-        value={String(props.quantity)}
         onChange={(value) => {
           props.setQuantity(value);
         }}
-        className="!text-2xl h-auto truncate bg-muted/50 pr-14 font-bold"
+        value={String(props.quantity)}
       />
       {props.symbol && (
         <div className="-translate-y-1/2 absolute top-1/2 right-3 font-medium text-muted-foreground text-sm">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/contract-analytics/contract-analytics.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/contract-analytics/contract-analytics.tsx
index 297574dad0c..794413a155a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/contract-analytics/contract-analytics.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/contract-analytics/contract-analytics.tsx
@@ -1,8 +1,7 @@
 "use client";
 
-import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
-import {} from "data/analytics/hooks";
 import { useState } from "react";
+import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
 import {
   toolTipLabelFormatterWithPrecision,
   useContractAnalyticsOverview,
@@ -25,8 +24,8 @@ export function ContractAnalyticsOverview(props: {
   const { data, precision, isPending } = useContractAnalyticsOverview({
     chainId: props.chainId,
     contractAddress: props.contractAddress,
-    startDate,
     endDate,
+    startDate,
   });
 
   return (
@@ -39,27 +38,27 @@ export function ContractAnalyticsOverview(props: {
         </p>
       </div>
       <ThirdwebAreaChart
-        className="border-none bg-background p-0"
         cardContentClassName="p-0"
+        chartClassName="aspect-[1.5] lg:aspect-[3]"
+        className="border-none bg-background p-0"
         config={{
-          wallets: {
-            label: "Unique Wallets",
-            color: "hsl(var(--chart-1))",
+          events: {
+            color: "hsl(var(--chart-3))",
+            label: "Events",
           },
           transactions: {
-            label: "Transactions",
             color: "hsl(var(--chart-2))",
+            label: "Transactions",
           },
-          events: {
-            label: "Events",
-            color: "hsl(var(--chart-3))",
+          wallets: {
+            color: "hsl(var(--chart-1))",
+            label: "Unique Wallets",
           },
         }}
         data={data || []}
+        hideLabel={false}
         isPending={isPending}
         showLegend
-        hideLabel={false}
-        chartClassName="aspect-[1.5] lg:aspect-[3]"
         toolTipLabelFormatter={toolTipLabelFormatterWithPrecision(precision)}
       />
     </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_hooks/useTokenPriceData.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_hooks/useTokenPriceData.ts
index a3966a81057..a3ff6a4db99 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_hooks/useTokenPriceData.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_hooks/useTokenPriceData.ts
@@ -1,6 +1,6 @@
+import { useQuery } from "@tanstack/react-query";
 import { isProd } from "@/constants/env-utils";
 import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
-import { useQuery } from "@tanstack/react-query";
 
 type TokenPriceData = {
   price_usd: number;
@@ -22,10 +22,6 @@ export function useTokenPriceData(params: {
   contractAddress: string;
 }) {
   return useQuery({
-    queryKey: ["token-price-chart", params.chainId, params.contractAddress],
-    retry: false,
-    retryOnMount: false,
-    refetchOnWindowFocus: false,
     queryFn: async () => {
       const url = new URL(
         `https://insight.${isProd ? "thirdweb" : "thirdweb-dev"}.com/v1/tokens/price`,
@@ -46,11 +42,15 @@ export function useTokenPriceData(params: {
       const priceData = json.data[0] as TokenPriceData | undefined;
       return priceData
         ? {
-            type: "data-found" as const,
             data: priceData,
+            type: "data-found" as const,
           }
         : { type: "no-data" as const };
     },
+    queryKey: ["token-price-chart", params.chainId, params.contractAddress],
     refetchInterval: 5000,
+    refetchOnWindowFocus: false,
+    retry: false,
+    retryOnMount: false,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_hooks/useTokenTransfers.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_hooks/useTokenTransfers.ts
index a4afca3d8c2..fa09266874b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_hooks/useTokenTransfers.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_hooks/useTokenTransfers.ts
@@ -1,6 +1,6 @@
+import { useQuery } from "@tanstack/react-query";
 import { isProd } from "@/constants/env-utils";
 import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
-import { useQuery } from "@tanstack/react-query";
 
 export type TokenTransfersData = {
   from_address: string;
@@ -23,10 +23,6 @@ export function useTokenTransfers(params: {
   limit: number;
 }) {
   return useQuery({
-    queryKey: ["token-transfers", params],
-    retry: false,
-    retryOnMount: false,
-    refetchOnWindowFocus: false,
     queryFn: async () => {
       const domain = isProd ? "thirdweb" : "thirdweb-dev";
       const url = new URL(
@@ -49,6 +45,10 @@ export function useTokenTransfers(params: {
       const data = json.data as TokenTransfersData[];
       return data;
     },
+    queryKey: ["token-transfers", params],
     refetchInterval: 5000,
+    refetchOnWindowFocus: false,
+    retry: false,
+    retryOnMount: false,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_utils/getCurrencyMeta.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_utils/getCurrencyMeta.ts
index 9819e1a3b2c..becb558a033 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_utils/getCurrencyMeta.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_utils/getCurrencyMeta.ts
@@ -1,6 +1,9 @@
-import { type ThirdwebClient, getContract } from "thirdweb";
-import { NATIVE_TOKEN_ADDRESS } from "thirdweb";
-import { getAddress } from "thirdweb";
+import {
+  getAddress,
+  getContract,
+  NATIVE_TOKEN_ADDRESS,
+  type ThirdwebClient,
+} from "thirdweb";
 import type { Chain, ChainMetadata } from "thirdweb/chains";
 import { symbol } from "thirdweb/extensions/common";
 import { decimals } from "thirdweb/extensions/erc20";
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/erc20.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/erc20.tsx
index cd0b39470cc..6da03dbf5c7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/erc20.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/erc20.tsx
@@ -1,15 +1,14 @@
 import type { ThirdwebContract } from "thirdweb";
-import {} from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
 import { getContractMetadata } from "thirdweb/extensions/common";
 import { decimals, getActiveClaimCondition } from "thirdweb/extensions/erc20";
 import { PageHeader } from "../_components/PageHeader";
 import { ContractHeaderUI } from "./_components/ContractHeader";
+import { TokenDropClaim } from "./_components/claim-tokens/claim-tokens-ui";
+import { ContractAnalyticsOverview } from "./_components/contract-analytics/contract-analytics";
 import { BuyTokenEmbed } from "./_components/PayEmbedSection";
 import { TokenStats } from "./_components/PriceChart";
 import { RecentTransfers } from "./_components/RecentTransfers";
-import { TokenDropClaim } from "./_components/claim-tokens/claim-tokens-ui";
-import { ContractAnalyticsOverview } from "./_components/contract-analytics/contract-analytics";
 import { getCurrencyMeta } from "./_utils/getCurrencyMeta";
 
 export async function ERC20PublicPage(props: {
@@ -30,21 +29,16 @@ export async function ERC20PublicPage(props: {
 
   const claimConditionCurrencyMeta = activeClaimCondition
     ? await getCurrencyMeta({
-        currencyAddress: activeClaimCondition.currency,
-        chainMetadata: props.chainMetadata,
         chain: props.serverContract.chain,
+        chainMetadata: props.chainMetadata,
         client: props.serverContract.client,
+        currencyAddress: activeClaimCondition.currency,
       }).catch(() => undefined)
     : undefined;
 
   const buyEmbed = (
     <BuyEmbed
-      clientContract={props.clientContract}
       chainMetadata={props.chainMetadata}
-      tokenDecimals={tokenDecimals}
-      tokenName={contractMetadata.name}
-      tokenSymbol={contractMetadata.symbol}
-      tokenAddress={props.clientContract.address}
       claimConditionMeta={
         activeClaimCondition && claimConditionCurrencyMeta
           ? {
@@ -53,6 +47,11 @@ export async function ERC20PublicPage(props: {
             }
           : undefined
       }
+      clientContract={props.clientContract}
+      tokenAddress={props.clientContract.address}
+      tokenDecimals={tokenDecimals}
+      tokenName={contractMetadata.name}
+      tokenSymbol={contractMetadata.symbol}
     />
   );
 
@@ -65,13 +64,13 @@ export async function ERC20PublicPage(props: {
           clientContract={props.clientContract}
           image={contractMetadata.image}
           name={contractMetadata.name}
-          symbol={contractMetadata.symbol}
           socialUrls={
             typeof contractMetadata.social_urls === "object" &&
             contractMetadata.social_urls !== null
               ? contractMetadata.social_urls
               : {}
           }
+          symbol={contractMetadata.symbol}
         />
 
         <div className="h-6" />
@@ -81,9 +80,9 @@ export async function ERC20PublicPage(props: {
             {activeClaimCondition ? (
               <div className="border-b border-dashed pb-6">
                 <ContractAnalyticsOverview
-                  contractAddress={props.clientContract.address}
                   chainId={props.chainMetadata.chainId}
                   chainSlug={props.chainMetadata.slug}
+                  contractAddress={props.clientContract.address}
                 />
               </div>
             ) : (
@@ -96,17 +95,17 @@ export async function ERC20PublicPage(props: {
             <div className="xl:hidden">{buyEmbed}</div>
 
             <RecentTransfers
-              clientContract={props.clientContract}
-              tokenSymbol={contractMetadata.symbol}
               chainMetadata={props.chainMetadata}
+              clientContract={props.clientContract}
               decimals={tokenDecimals}
+              tokenSymbol={contractMetadata.symbol}
             />
 
             {!activeClaimCondition && (
               <ContractAnalyticsOverview
-                contractAddress={props.clientContract.address}
                 chainId={props.chainMetadata.chainId}
                 chainSlug={props.chainMetadata.slug}
+                contractAddress={props.clientContract.address}
               />
             )}
           </div>
@@ -139,24 +138,24 @@ function BuyEmbed(props: {
   if (!props.claimConditionMeta) {
     return (
       <BuyTokenEmbed
-        client={props.clientContract.client}
         chain={props.clientContract.chain}
-        tokenSymbol={props.tokenSymbol}
-        tokenName={props.tokenName}
+        client={props.clientContract.client}
         tokenAddress={props.clientContract.address}
+        tokenName={props.tokenName}
+        tokenSymbol={props.tokenSymbol}
       />
     );
   }
 
   return (
     <TokenDropClaim
+      chainMetadata={props.chainMetadata}
+      claimCondition={props.claimConditionMeta.activeClaimCondition}
+      claimConditionCurrency={props.claimConditionMeta.claimConditionCurrency}
       contract={props.clientContract}
       decimals={props.tokenDecimals}
       name={props.tokenName}
       symbol={props.tokenSymbol}
-      chainMetadata={props.chainMetadata}
-      claimCondition={props.claimConditionMeta.activeClaimCondition}
-      claimConditionCurrency={props.claimConditionMeta.claimConditionCurrency}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/client-utils.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/client-utils.ts
index 1cdb36f5f8d..837c74c1ef4 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/client-utils.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/client-utils.ts
@@ -16,14 +16,7 @@ export function useERC1155ClaimCondition(params: {
 }) {
   const account = useActiveAccount();
   const claimConditionQuery = useQuery({
-    queryKey: [
-      ASSET_PAGE_ERC1155_QUERIES_ROOT_KEY,
-      "ERC1155_getActiveClaimCondition",
-      {
-        contract: params.contract,
-        tokenId: params.tokenId.toString(),
-      },
-    ],
+    enabled: params.enabled,
     queryFn: async () => {
       const activeClaimCondition = await ERC1155_getActiveClaimCondition({
         contract: params.contract,
@@ -37,8 +30,8 @@ export function useERC1155ClaimCondition(params: {
       const currencyMeta = await getCurrencyMeta({
         chain: params.contract.chain,
         chainMetadata: params.chainMetadata,
-        currencyAddress: activeClaimCondition.currency,
         client: params.contract.client,
+        currencyAddress: activeClaimCondition.currency,
       });
 
       if (!currencyMeta) {
@@ -47,77 +40,84 @@ export function useERC1155ClaimCondition(params: {
 
       return {
         ...activeClaimCondition,
-        symbol: currencyMeta.symbol,
         decimals: currencyMeta.decimals,
+        symbol: currencyMeta.symbol,
       };
     },
-    enabled: params.enabled,
+    queryKey: [
+      ASSET_PAGE_ERC1155_QUERIES_ROOT_KEY,
+      "ERC1155_getActiveClaimCondition",
+      {
+        contract: params.contract,
+        tokenId: params.tokenId.toString(),
+      },
+    ],
   });
 
   const publicPrice = claimConditionQuery.data
     ? {
-        pricePerTokenWei: claimConditionQuery.data.pricePerToken,
         currencyAddress: claimConditionQuery.data.currency,
         decimals: claimConditionQuery.data.decimals,
+        pricePerTokenWei: claimConditionQuery.data.pricePerToken,
         symbol: claimConditionQuery.data.symbol,
       }
     : null;
 
   const claimParamsQuery = useQuery({
-    queryKey: [
-      ASSET_PAGE_ERC1155_QUERIES_ROOT_KEY,
-      "ERC1155_getClaimParams",
-      {
-        contract: params.contract,
-        accountAddress: account?.address,
-        tokenId: params.tokenId.toString(),
-      },
-    ],
+    enabled: params.enabled,
     queryFn: async () => {
       if (!account) {
         return null;
       }
 
       const claimParams = await getClaimParams({
-        type: "erc1155",
-        tokenId: params.tokenId,
         contract: params.contract,
+        from: account?.address,
         quantity: BigInt(1),
         to: account?.address,
-        from: account?.address,
+        tokenId: params.tokenId,
+        type: "erc1155",
       });
 
       const meta = await getCurrencyMeta({
-        currencyAddress: claimParams.currency,
-        chainMetadata: params.chainMetadata,
         chain: params.contract.chain,
+        chainMetadata: params.chainMetadata,
         client: params.contract.client,
+        currencyAddress: claimParams.currency,
       });
 
       return {
-        pricePerTokenWei: claimParams.pricePerToken,
         currencyAddress: claimParams.currency,
         decimals: meta.decimals,
+        pricePerTokenWei: claimParams.pricePerToken,
         symbol: meta.symbol,
       };
     },
-    enabled: params.enabled,
+    queryKey: [
+      ASSET_PAGE_ERC1155_QUERIES_ROOT_KEY,
+      "ERC1155_getClaimParams",
+      {
+        accountAddress: account?.address,
+        contract: params.contract,
+        tokenId: params.tokenId.toString(),
+      },
+    ],
   });
 
   const publicPriceData = claimConditionQuery.data
     ? {
-        pricePerTokenWei: claimConditionQuery.data.pricePerToken,
         currencyAddress: claimConditionQuery.data.currency,
         decimals: claimConditionQuery.data.decimals,
+        pricePerTokenWei: claimConditionQuery.data.pricePerToken,
         symbol: claimConditionQuery.data.symbol,
       }
     : undefined;
 
   const userSpecificPriceData = claimParamsQuery.data
     ? {
-        pricePerTokenWei: claimParamsQuery.data.pricePerTokenWei,
         currencyAddress: claimParamsQuery.data.currencyAddress,
         decimals: claimParamsQuery.data.decimals,
+        pricePerTokenWei: claimParamsQuery.data.pricePerTokenWei,
         symbol: claimParamsQuery.data.symbol,
       }
     : undefined;
@@ -132,9 +132,9 @@ export function useERC1155ClaimCondition(params: {
     claimCondition: {
       data: claimConditionQuery.data
         ? {
+            maxClaimableSupply: claimConditionQuery.data?.maxClaimableSupply,
             quantityLimitPerWallet:
               claimConditionQuery.data?.quantityLimitPerWallet,
-            maxClaimableSupply: claimConditionQuery.data?.maxClaimableSupply,
             supplyClaimed: claimConditionQuery.data?.supplyClaimed,
           }
         : undefined,
@@ -144,6 +144,7 @@ export function useERC1155ClaimCondition(params: {
       data: claimParamsQuery.data || publicPrice,
       isPending: claimParamsQuery.isPending,
     },
+    isUserPriceDifferent,
     publicPriceQuery: {
       data: publicPriceData,
       isPending: claimConditionQuery.isPending,
@@ -152,6 +153,5 @@ export function useERC1155ClaimCondition(params: {
       data: userSpecificPriceData || publicPriceData,
       isPending: claimParamsQuery.isPending || claimConditionQuery.isPending,
     },
-    isUserPriceDifferent,
   };
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/format.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/format.ts
index 94597bdc6d0..e3c19fef736 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/format.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/format.ts
@@ -1,4 +1,4 @@
 export const supplyFormatter = new Intl.NumberFormat("en-US", {
-  notation: "compact",
   maximumFractionDigits: 10,
+  notation: "compact",
 });
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/nft-page-layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/nft-page-layout.tsx
index 9bc49ccaa1f..a00efe60d54 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/nft-page-layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/nft-page-layout.tsx
@@ -19,21 +19,21 @@ export function NFTPublicPageLayout(props: {
       <div className="container flex max-w-8xl grow flex-col">
         <ContractHeaderUI
           chainMetadata={props.chainMetadata}
-          imageClassName="rounded-lg"
           clientContract={props.clientContract}
           image={
             typeof props.contractMetadata.image === "string"
               ? props.contractMetadata.image
               : undefined
           }
+          imageClassName="rounded-lg"
           name={props.contractMetadata.name}
-          symbol={props.contractMetadata.symbol}
           socialUrls={
             typeof props.contractMetadata.social_urls === "object" &&
             props.contractMetadata.social_urls !== null
               ? props.contractMetadata.social_urls
               : {}
           }
+          symbol={props.contractMetadata.symbol}
         />
         {props.children}
       </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/nft-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/nft-page.tsx
index 896e9648a7b..ef2839dcf06 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/nft-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/nft-page.tsx
@@ -1,10 +1,10 @@
-import { ResponsiveLayout } from "@/components/Responsive";
-import { Skeleton } from "@/components/ui/skeleton";
-import { cn } from "@/lib/utils";
 import type { ThirdwebContract } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
 import { getContractMetadata } from "thirdweb/extensions/common";
 import { isTokenByIndexSupported } from "thirdweb/extensions/erc721";
+import { ResponsiveLayout } from "@/components/Responsive";
+import { Skeleton } from "@/components/ui/skeleton";
+import { cn } from "@/lib/utils";
 import { resolveFunctionSelectors } from "../../../../../../../../lib/selectors";
 import { NFTPublicPageLayout } from "./nft-page-layout";
 import {
@@ -30,17 +30,17 @@ export async function NFTPublicPage(props: {
       }),
       resolveFunctionSelectors(props.serverContract),
       getTotalNFTCount({
-        type: props.type,
         contract: props.serverContract,
+        type: props.type,
       }),
     ]);
 
   const nftDropClaimParams =
     props.type === "erc721"
       ? await getNFTDropClaimParams({
-          serverContract: props.serverContract,
           chainMetadata: props.chainMetadata,
           functionSelectors,
+          serverContract: props.serverContract,
           totalNFTCount,
         })
       : undefined;
@@ -50,10 +50,7 @@ export async function NFTPublicPage(props: {
 
   const buyNFTDropCard = nftDropClaimParams ? (
     <BuyNFTDropCardServer
-      serverContract={props.serverContract}
       chainMetadata={props.chainMetadata}
-      functionSelectors={functionSelectors}
-      totalNFTCount={totalNFTCount}
       clientContract={props.clientContract}
       erc721ActiveClaimCondition={nftDropClaimParams.erc721ActiveClaimCondition}
       erc721ClaimConditionCurrencyMeta={
@@ -61,35 +58,38 @@ export async function NFTPublicPage(props: {
       }
       erc721NextTokenIdToClaim={nftDropClaimParams.erc721NextTokenIdToClaim}
       erc721TotalUnclaimedSupply={nftDropClaimParams.erc721TotalUnclaimedSupply}
+      functionSelectors={functionSelectors}
+      serverContract={props.serverContract}
+      totalNFTCount={totalNFTCount}
     />
   ) : null;
 
   const nftsGrid = (
     <NFTsGrid
-      isTokenByIndexSupported={_isTokenByIndexSupported}
-      collectionMetadata={contractMetadata}
-      type={props.type}
-      clientContract={props.clientContract}
       chainMetadata={props.chainMetadata}
-      totalNFTCount={totalNFTCount}
+      clientContract={props.clientContract}
+      collectionMetadata={contractMetadata}
       gridClassName={
         buyNFTDropCard
           ? "grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4"
           : undefined
       }
+      isTokenByIndexSupported={_isTokenByIndexSupported}
+      totalNFTCount={totalNFTCount}
+      type={props.type}
     />
   );
 
   const nftGridSkeleton = (
     <NFTGridSkeleton
-      clientContract={props.clientContract}
       chainMetadata={props.chainMetadata}
-      type={props.type}
+      clientContract={props.clientContract}
       gridClassName={
         buyNFTDropCard
           ? "grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4"
           : undefined
       }
+      type={props.type}
     />
   );
 
@@ -99,39 +99,39 @@ export async function NFTPublicPage(props: {
 
   return (
     <NFTPublicPageLayout
-      clientContract={props.clientContract}
       chainMetadata={props.chainMetadata}
+      clientContract={props.clientContract}
       contractMetadata={contractMetadata}
     >
       <ResponsiveLayout
+        desktop={
+          <DesktopLayout buyEmbed={buyNFTDropCard} nftsGrid={nftsGrid} />
+        }
         fallback={
           <div className="flex grow flex-col">
             <DesktopLayout
+              buyEmbed={buyEmbedSkeleton}
               className="max-sm:hidden"
               nftsGrid={nftGridSkeleton}
-              buyEmbed={buyEmbedSkeleton}
             />
 
             <MobileLayout
+              buyEmbed={buyEmbedSkeleton}
               className="sm:hidden"
               nftsGrid={nftGridSkeleton}
-              buyEmbed={buyEmbedSkeleton}
             />
           </div>
         }
-        desktop={
-          <DesktopLayout nftsGrid={nftsGrid} buyEmbed={buyNFTDropCard} />
-        }
-        mobile={<MobileLayout nftsGrid={nftsGrid} buyEmbed={buyNFTDropCard} />}
+        mobile={<MobileLayout buyEmbed={buyNFTDropCard} nftsGrid={nftsGrid} />}
       />
       {props.tokenId && (
         <PageLoadTokenViewerSheet
-          clientContract={props.clientContract}
           chainMetadata={props.chainMetadata}
-          type={props.type}
-          tokenId={BigInt(props.tokenId)}
-          tokenByIndexSupported={_isTokenByIndexSupported}
+          clientContract={props.clientContract}
           collectionMetadata={contractMetadata}
+          tokenByIndexSupported={_isTokenByIndexSupported}
+          tokenId={BigInt(props.tokenId)}
+          type={props.type}
         />
       )}
     </NFTPublicPageLayout>
@@ -163,12 +163,12 @@ function MobileLayout(props: {
   return (
     <div className={cn("pt-2 pb-10", props.className)}>
       <NFTPublicPageTabs
-        nftsPage={<div className="pt-2">{props.nftsGrid}</div>}
         buyPage={
           props.buyEmbed ? (
             <div className="pt-2">{props.buyEmbed}</div>
           ) : undefined
         }
+        nftsPage={<div className="pt-2">{props.nftsGrid}</div>}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-edition-drop/buy-edition-drop.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-edition-drop/buy-edition-drop.client.tsx
index 223fc27babd..2715d9ae0b0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-edition-drop/buy-edition-drop.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-edition-drop/buy-edition-drop.client.tsx
@@ -1,5 +1,18 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useQueryClient } from "@tanstack/react-query";
+import { TransactionButton } from "components/buttons/TransactionButton";
+import { CircleAlertIcon } from "lucide-react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { type ThirdwebContract, toTokens } from "thirdweb";
+import type { ChainMetadata } from "thirdweb/chains";
+import { getApprovalForTransaction } from "thirdweb/extensions/erc20";
+import { claimTo } from "thirdweb/extensions/erc1155";
+import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
+import { parseError } from "utils/errorParser";
+import * as z from "zod";
 import {
   reportAssetBuyFailed,
   reportAssetBuySuccessful,
@@ -15,19 +28,6 @@ import {
 import { Input } from "@/components/ui/input";
 import { Skeleton } from "@/components/ui/skeleton";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useQueryClient } from "@tanstack/react-query";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import { CircleAlertIcon } from "lucide-react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { type ThirdwebContract, toTokens } from "thirdweb";
-import type { ChainMetadata } from "thirdweb/chains";
-import { getApprovalForTransaction } from "thirdweb/extensions/erc20";
-import { claimTo } from "thirdweb/extensions/erc1155";
-import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
-import { parseError } from "utils/errorParser";
-import * as z from "zod";
 import { PublicPageConnectButton } from "../../../_components/PublicPageConnectButton";
 import { SupplyClaimedProgress } from "../../../_components/supply-claimed-progress";
 import { TokenPrice } from "../../../_components/token-price";
@@ -49,10 +49,10 @@ type BuyEditionDropProps = {
 
 export function BuyEditionDrop(props: BuyEditionDropProps) {
   const form = useForm<z.infer<typeof formSchema>>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
       amount: 1,
     },
+    resolver: zodResolver(formSchema),
     reValidateMode: "onChange",
   });
   const nftAmountToClaim = Number(form.watch("amount"));
@@ -68,9 +68,9 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
     isUserPriceDifferent,
   } = useERC1155ClaimCondition({
     chainMetadata: props.chainMetadata,
-    tokenId: props.tokenId,
     contract: props.contract,
     enabled: true,
+    tokenId: props.tokenId,
   });
 
   const handleSubmit = form.handleSubmit(async (data) => {
@@ -81,15 +81,15 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
 
       const transaction = claimTo({
         contract: props.contract,
-        to: account.address,
-        quantity: BigInt(data.amount),
         from: account.address,
+        quantity: BigInt(data.amount),
+        to: account.address,
         tokenId: props.tokenId,
       });
 
       const approveTx = await getApprovalForTransaction({
-        transaction,
         account,
+        transaction,
       });
 
       if (approveTx) {
@@ -100,12 +100,12 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
         });
 
         toast.promise(approveTxPromise, {
-          loading: "Requesting approval to spend ERC20 tokens for NFT purchase",
-          success: "ERC20 token spending request approved successfully",
           error: (err) => ({
-            message: "Approval to spend ERC20 tokens failed",
             description: parseError(err),
+            message: "Approval to spend ERC20 tokens failed",
           }),
+          loading: "Requesting approval to spend ERC20 tokens for NFT purchase",
+          success: "ERC20 token spending request approved successfully",
         });
 
         try {
@@ -114,9 +114,9 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
           const errorMessage = parseError(err);
 
           reportAssetBuyFailed({
+            assetType: "nft",
             chainId: props.contract.chain.id,
             contractType: "DropERC1155",
-            assetType: "nft",
             error: errorMessage,
           });
 
@@ -130,21 +130,21 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
       const nftOrNfts = nftAmountToClaim > 1 ? "NFTs" : "NFT";
 
       toast.promise(claimTxPromise, {
-        loading: `Buying ${nftAmountToClaim} ${nftOrNfts}`,
-        success: `${nftOrNfts} bought successfully`,
         error: (err) => ({
-          message: `Failed to buy ${nftAmountToClaim} ${nftOrNfts}`,
           description: parseError(err),
+          message: `Failed to buy ${nftAmountToClaim} ${nftOrNfts}`,
         }),
+        loading: `Buying ${nftAmountToClaim} ${nftOrNfts}`,
+        success: `${nftOrNfts} bought successfully`,
       });
 
       try {
         await claimTxPromise;
 
         reportAssetBuySuccessful({
+          assetType: "nft",
           chainId: props.contract.chain.id,
           contractType: "DropERC1155",
-          assetType: "nft",
         });
 
         props.onSuccess?.();
@@ -157,9 +157,9 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
         const errorMessage = parseError(err);
 
         reportAssetBuyFailed({
+          assetType: "nft",
           chainId: props.contract.chain.id,
           contractType: "DropERC1155",
-          assetType: "nft",
           error: errorMessage,
         });
 
@@ -174,9 +174,9 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
       });
 
       reportAssetBuyFailed({
+        assetType: "nft",
         chainId: props.contract.chain.id,
         contractType: "DropERC1155",
-        assetType: "nft",
         error: errorMessage,
       });
     }
@@ -196,6 +196,7 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
                   autoComplete="off"
                   type="text"
                   {...field}
+                  className="bg-muted/50"
                   onChange={(e) => {
                     const num = Number(e.target.value);
                     const value = Number.isNaN(num) ? 0 : num;
@@ -215,7 +216,6 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
                       }
                     }
                   }}
-                  className="bg-muted/50"
                 />
               </FormControl>
               <FormMessage />
@@ -311,14 +311,14 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
         </div>
         {account ? (
           <TransactionButton
+            className="w-full"
             client={props.contract.client}
             isLoggedIn={true}
-            txChainID={props.contract.chain.id}
-            transactionCount={undefined}
             isPending={form.formState.isSubmitting}
+            transactionCount={undefined}
+            txChainID={props.contract.chain.id}
             type="submit"
             variant="default"
-            className="w-full"
           >
             Buy NFT{nftAmountToClaim > 1 ? "s" : ""}
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-card.server.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-card.server.tsx
index 53bac0dbf15..89c99783d3e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-card.server.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-card.server.tsx
@@ -29,15 +29,15 @@ export async function BuyNFTDropCardServer(props: {
 }) {
   return (
     <BuyNFTDropCardClient
-      contract={props.clientContract}
       chainMetadata={props.chainMetadata}
       claimCondition={{
         ...props.erc721ActiveClaimCondition,
         decimals: props.erc721ClaimConditionCurrencyMeta.decimals,
         symbol: props.erc721ClaimConditionCurrencyMeta.symbol,
       }}
-      totalNFTs={props.totalNFTCount}
+      contract={props.clientContract}
       nextTokenIdToClaim={props.erc721NextTokenIdToClaim}
+      totalNFTs={props.totalNFTCount}
       totalUnclaimedSupply={props.erc721TotalUnclaimedSupply}
     />
   );
@@ -80,10 +80,10 @@ export async function getNFTDropClaimParams(params: {
   }
 
   const erc721ClaimConditionCurrencyMeta = await getCurrencyMeta({
-    currencyAddress: erc721ActiveClaimCondition.currency,
-    chainMetadata: params.chainMetadata,
     chain: params.serverContract.chain,
+    chainMetadata: params.chainMetadata,
     client: params.serverContract.client,
+    currencyAddress: erc721ActiveClaimCondition.currency,
   }).catch(() => undefined);
 
   if (!erc721ClaimConditionCurrencyMeta) {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-ui.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-ui.client.tsx
index c13e44e0924..17592479fc6 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-ui.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-ui.client.tsx
@@ -1,5 +1,15 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useQuery } from "@tanstack/react-query";
+import { TransactionButton } from "components/buttons/TransactionButton";
+import { CircleAlertIcon } from "lucide-react";
+import { type UseFormReturn, useForm } from "react-hook-form";
+import type { NFT, ThirdwebClient } from "thirdweb";
+import { type ThirdwebContract, toTokens } from "thirdweb";
+import type { ChainMetadata } from "thirdweb/chains";
+import type { getActiveClaimCondition } from "thirdweb/extensions/erc721";
+import * as z from "zod";
 import { CustomMediaRenderer } from "@/components/blocks/media-renderer";
 import {
   Form,
@@ -14,16 +24,6 @@ import { Input } from "@/components/ui/input";
 import { Skeleton } from "@/components/ui/skeleton";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useQuery } from "@tanstack/react-query";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import { CircleAlertIcon } from "lucide-react";
-import { type UseFormReturn, useForm } from "react-hook-form";
-import { type ThirdwebContract, toTokens } from "thirdweb";
-import type { NFT, ThirdwebClient } from "thirdweb";
-import type { ChainMetadata } from "thirdweb/chains";
-import type { getActiveClaimCondition } from "thirdweb/extensions/erc721";
-import * as z from "zod";
 import { PublicPageConnectButton } from "../../../_components/PublicPageConnectButton";
 import { SupplyClaimedProgress } from "../../../_components/supply-claimed-progress";
 import { TokenPrice } from "../../../_components/token-price";
@@ -66,64 +66,64 @@ export type BuyNFTDropUIProps = {
 
 export function BuyNFTDropUI(props: BuyNFTDropUIProps) {
   const form = useForm<z.infer<typeof buyNFTDropFormSchema>>({
-    resolver: zodResolver(buyNFTDropFormSchema),
     defaultValues: {
       amount: 1,
     },
+    resolver: zodResolver(buyNFTDropFormSchema),
     reValidateMode: "onChange",
   });
   const nftAmountToClaim = Number(form.watch("amount"));
 
   const claimParamsQuery = useQuery({
-    queryKey: [
-      NFT_ASSET_PAGE_ERC721_QUERIES_KEY_ROOT,
-      "erc721-claimParamsQuery",
-      {
-        contract: props.contract,
-        accountAddress: props.activeAccountAddress,
-      },
-    ],
     queryFn: async () => {
       if (!props.activeAccountAddress) {
         return publicPrice;
       }
 
       return props.getNFTDropClaimParams({
-        contract: props.contract,
-        chainMetadata: props.chainMetadata,
         accountAddress: props.activeAccountAddress,
+        chainMetadata: props.chainMetadata,
+        contract: props.contract,
       });
     },
+    queryKey: [
+      NFT_ASSET_PAGE_ERC721_QUERIES_KEY_ROOT,
+      "erc721-claimParamsQuery",
+      {
+        accountAddress: props.activeAccountAddress,
+        contract: props.contract,
+      },
+    ],
   });
 
   const publicPrice = {
-    pricePerTokenWei: props.claimCondition.pricePerToken,
     currencyAddress: props.claimCondition.currency,
     decimals: props.claimCondition.decimals,
-    symbol: props.claimCondition.symbol,
     maxClaimableSupply: props.claimCondition.maxClaimableSupply,
+    pricePerTokenWei: props.claimCondition.pricePerToken,
+    symbol: props.claimCondition.symbol,
   };
 
   const isAmountValid = !form.formState.errors.amount;
 
   const nftsToClaimQuery = useQuery({
+    enabled: isAmountValid,
+    queryFn: async () => {
+      return props.getNFTsToClaim({
+        contract: props.contract,
+        count: nftAmountToClaim,
+        nextTokenIdToClaim: props.nextTokenIdToClaim,
+      });
+    },
     queryKey: [
       NFT_ASSET_PAGE_ERC721_QUERIES_KEY_ROOT,
       "erc721-nftsToClaimQuery",
       {
         contract: props.contract,
-        start: props.nextTokenIdToClaim.toString(),
         count: nftAmountToClaim,
+        start: props.nextTokenIdToClaim.toString(),
       },
     ],
-    enabled: isAmountValid,
-    queryFn: async () => {
-      return props.getNFTsToClaim({
-        contract: props.contract,
-        nextTokenIdToClaim: props.nextTokenIdToClaim,
-        count: nftAmountToClaim,
-      });
-    },
   });
 
   const isShowingCustomPrice =
@@ -156,6 +156,7 @@ export function BuyNFTDropUI(props: BuyNFTDropUIProps) {
                   autoComplete="off"
                   type="text"
                   {...field}
+                  className="!text-2xl h-auto bg-muted/50 font-bold"
                   onChange={(e) => {
                     const num = Number(e.target.value);
                     const value = Number.isNaN(num) ? 0 : num;
@@ -170,7 +171,6 @@ export function BuyNFTDropUI(props: BuyNFTDropUIProps) {
                       form.trigger("amount");
                     }
                   }}
-                  className="!text-2xl h-auto bg-muted/50 font-bold"
                 />
               </FormControl>
               <FormDescription>
@@ -202,9 +202,9 @@ export function BuyNFTDropUI(props: BuyNFTDropUIProps) {
               {!nftsToClaimQuery.isPending &&
                 nftsToShow?.map((nft) => (
                   <MiniNFTCard
-                    key={nft.id}
-                    data={nft}
                     client={props.contract.client}
+                    data={nft}
+                    key={nft.id}
                   />
                 ))}
 
@@ -220,10 +220,10 @@ export function BuyNFTDropUI(props: BuyNFTDropUIProps) {
                   length: Math.min(nftAmountToClaim, maxNFTsToShow),
                 }).map((_, index) => (
                   <MiniNFTCard
-                    // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-                    key={index}
-                    data={undefined}
                     client={props.contract.client}
+                    data={undefined}
+                    // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
+                    key={index}
                   />
                 ))}
             </div>
@@ -311,14 +311,14 @@ export function BuyNFTDropUI(props: BuyNFTDropUIProps) {
 
         {props.activeAccountAddress ? (
           <TransactionButton
+            className="w-full"
             client={props.contract.client}
             isLoggedIn={true}
-            txChainID={props.contract.chain.id}
-            transactionCount={undefined}
             isPending={form.formState.isSubmitting}
+            transactionCount={undefined}
+            txChainID={props.contract.chain.id}
             type="submit"
             variant="default"
-            className="w-full"
           >
             Buy NFT{nftAmountToClaim > 1 ? "s" : ""}
           </TransactionButton>
@@ -330,10 +330,7 @@ export function BuyNFTDropUI(props: BuyNFTDropUIProps) {
   );
 }
 
-function MiniNFTCard(props: {
-  data: NFT | undefined;
-  client: ThirdwebClient;
-}) {
+function MiniNFTCard(props: { data: NFT | undefined; client: ThirdwebClient }) {
   return (
     <ToolTipLabel
       label={
@@ -360,13 +357,13 @@ function MiniNFTCard(props: {
           <Skeleton className="absolute inset-0" />
           {props.data ? (
             <CustomMediaRenderer
+              alt={props.data.metadata.name?.toString() || ""}
+              className="aspect-square h-full w-full"
               client={props.client}
+              poster={props.data.metadata.image}
               src={
                 props.data.metadata.animation_url || props.data.metadata.image
               }
-              alt={props.data.metadata.name?.toString() || ""}
-              poster={props.data.metadata.image}
-              className="aspect-square h-full w-full"
             />
           ) : (
             <Skeleton className="aspect-square h-full w-full" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-ui.stories.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-ui.stories.tsx
index bc5cc8b8f48..1f48bb4a042 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-ui.stories.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop-ui.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { storybookLog, storybookThirdwebClient } from "stories/utils";
-import { NATIVE_TOKEN_ADDRESS, type NFT, getContract, toUnits } from "thirdweb";
-import { type ChainMetadata, baseSepolia } from "thirdweb/chains";
+import { getContract, NATIVE_TOKEN_ADDRESS, type NFT, toUnits } from "thirdweb";
+import { baseSepolia, type ChainMetadata } from "thirdweb/chains";
 import type { getActiveClaimCondition } from "thirdweb/extensions/erc721";
 import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
 import { PublicPageConnectButton } from "../../../_components/PublicPageConnectButton";
@@ -14,13 +14,7 @@ const baseUSDC = {
 };
 
 const meta = {
-  title: "Assets/NFT/BuyNFTDropUI",
   component: Variant,
-  parameters: {
-    nextjs: {
-      appDirectory: true,
-    },
-  },
   decorators: [
     (Story) => (
       <div>
@@ -30,6 +24,12 @@ const meta = {
       </div>
     ),
   ],
+  parameters: {
+    nextjs: {
+      appDirectory: true,
+    },
+  },
+  title: "Assets/NFT/BuyNFTDropUI",
 } satisfies Meta<typeof Variant>;
 
 export default meta;
@@ -37,68 +37,68 @@ type Story = StoryObj<typeof meta>;
 
 export const PriceInNativeToken: Story = {
   args: {
-    totalUnclaimedSupply: BigInt(50),
     totalNFTs: 1000,
+    totalUnclaimedSupply: BigInt(50),
   },
 };
 
 export const PriceInERC20: Story = {
   args: {
-    totalUnclaimedSupply: BigInt(5),
-    totalNFTs: 10000,
     claimCondition: {
       ...getClaimConditionMock(),
       currency: baseUSDC.address,
-      pricePerToken: toUnits("10", baseUSDC.decimals),
       decimals: baseUSDC.decimals,
+      pricePerToken: toUnits("10", baseUSDC.decimals),
       symbol: baseUSDC.symbol,
     },
     getNFTDropClaimParams: async (params) => {
       const values = await getNFTDropClaimParamsMock(params);
       return {
         ...values,
-        pricePerTokenWei: toUnits("10", baseUSDC.decimals),
         currencyAddress: baseUSDC.address,
         decimals: baseUSDC.decimals,
+        pricePerTokenWei: toUnits("10", baseUSDC.decimals),
         symbol: baseUSDC.symbol,
       };
     },
+    totalNFTs: 10000,
+    totalUnclaimedSupply: BigInt(5),
   },
 };
 
 export const UserGetsSpecialPrice: Story = {
   args: {
-    totalUnclaimedSupply: BigInt(5),
-    totalNFTs: 10000,
+    claimCondition: {
+      ...getClaimConditionMock(),
+      pricePerToken: toUnits("0.5", 18),
+    },
     getNFTDropClaimParams: async (params) => {
       const values = await getNFTDropClaimParamsMock(params);
       return {
         ...values,
-        pricePerTokenWei: toUnits("0.1", 18),
         currencyAddress: NATIVE_TOKEN_ADDRESS,
         decimals: 18,
+        pricePerTokenWei: toUnits("0.1", 18),
         symbol: "ETH",
       };
     },
-    claimCondition: {
-      ...getClaimConditionMock(),
-      pricePerToken: toUnits("0.5", 18),
-    },
+    totalNFTs: 10000,
+    totalUnclaimedSupply: BigInt(5),
   },
 };
 
 export const Pending: Story = {
   args: {
-    totalUnclaimedSupply: BigInt(10000),
-    totalNFTs: 20000,
     forcePending: true,
+    totalNFTs: 20000,
+    totalUnclaimedSupply: BigInt(10000),
   },
 };
 
 export const AllClaimed: Story = {
   args: {
-    totalUnclaimedSupply: BigInt(0),
     totalNFTs: 1000,
+    totalUnclaimedSupply: BigInt(0),
   },
 };
 
@@ -124,37 +124,37 @@ function Variant(props: {
       <div className="container max-w-md py-10">
         <BuyNFTDropUI
           activeAccountAddress={account?.address}
-          contract={mockContract}
           chainMetadata={baseSepoliaChainMetadata}
           claimCondition={props.claimCondition || getClaimConditionMock()}
-          totalNFTs={props.totalNFTs}
-          nextTokenIdToClaim={BigInt(5)}
-          totalUnclaimedSupply={props.totalUnclaimedSupply}
-          getNFTsToClaim={
-            props.getNFTsToClaim ||
+          contract={mockContract}
+          getNFTDropClaimParams={
+            props.getNFTDropClaimParams ||
             (props.forcePending
               ? async (values) => {
                   await new Promise((resolve) =>
                     setTimeout(resolve, 10000000000),
                   );
-                  return getNFTsToClaimMock(values);
+                  return getNFTDropClaimParamsMock(values);
                 }
-              : getNFTsToClaimMock)
+              : getNFTDropClaimParamsMock)
           }
-          getNFTDropClaimParams={
-            props.getNFTDropClaimParams ||
+          getNFTsToClaim={
+            props.getNFTsToClaim ||
             (props.forcePending
               ? async (values) => {
                   await new Promise((resolve) =>
                     setTimeout(resolve, 10000000000),
                   );
-                  return getNFTDropClaimParamsMock(values);
+                  return getNFTsToClaimMock(values);
                 }
-              : getNFTDropClaimParamsMock)
+              : getNFTsToClaimMock)
           }
           handleSubmit={async (form) => {
             storybookLog(form.getValues());
           }}
+          nextTokenIdToClaim={BigInt(5)}
+          totalNFTs={props.totalNFTs}
+          totalUnclaimedSupply={props.totalUnclaimedSupply}
         />
       </div>
     </div>
@@ -168,40 +168,41 @@ const mockContract = getContract({
 });
 
 const baseSepoliaChainMetadata: ChainMetadata = {
-  chainId: 84532,
-  name: "Base Sepolia Testnet",
   chain: "ETH",
-  shortName: "basesep",
-  icon: {
-    url: "ipfs://QmaxRoHpxZd8PqccAynherrMznMufG6sdmHZLihkECXmZv",
-    width: 1200,
-    height: 1200,
-    format: "png",
-  },
-  nativeCurrency: {
-    name: "Sepolia Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
-  stackType: "evm",
+  chainId: 84532,
   explorers: [
     {
-      name: "basescout",
-      url: "https://base-sepolia.blockscout.com",
-      standard: "EIP3091",
       icon: {
+        format: "png",
+        height: 540,
         url: "ipfs://QmYtUimyqHkkFxYdbXXRbUqNg2VLPUg6Uu2C2nmFWowiZM",
         width: 551,
-        height: 540,
-        format: "png",
       },
+      name: "basescout",
+      standard: "EIP3091",
+      url: "https://base-sepolia.blockscout.com",
     },
   ],
-  rpc: ["https://84532.rpc.thirdweb.com/${THIRDWEB_API_KEY}"],
-  testnet: true,
+  icon: {
+    format: "png",
+    height: 1200,
+    url: "ipfs://QmaxRoHpxZd8PqccAynherrMznMufG6sdmHZLihkECXmZv",
+    width: 1200,
+  },
   infoURL: "https://base.org",
-  slug: "base-sepolia-testnet",
+  name: "Base Sepolia Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Sepolia Ether",
+    symbol: "ETH",
+  },
   networkId: 84532,
+  // biome-ignore lint/suspicious/noTemplateCurlyInString: EXPECTED
+  rpc: ["https://84532.rpc.thirdweb.com/${THIRDWEB_API_KEY}"],
+  shortName: "basesep",
+  slug: "base-sepolia-testnet",
+  stackType: "evm",
+  testnet: true,
 };
 
 type ClaimCondition = Awaited<ReturnType<typeof getActiveClaimCondition>>;
@@ -212,15 +213,15 @@ function getClaimConditionMock() {
     decimals: number;
     symbol: string;
   } = {
-    startTimestamp: BigInt(Date.now()),
+    currency: NATIVE_TOKEN_ADDRESS,
+    decimals: 18,
     maxClaimableSupply: BigInt(100),
-    supplyClaimed: BigInt(0),
-    quantityLimitPerWallet: BigInt(10),
     merkleRoot: "0x0",
-    pricePerToken: toUnits("1.5", 18), // 1.5 ETH in wei
-    currency: NATIVE_TOKEN_ADDRESS,
     metadata: "",
-    decimals: 18,
+    pricePerToken: toUnits("1.5", 18), // 1.5 ETH in wei
+    quantityLimitPerWallet: BigInt(10),
+    startTimestamp: BigInt(Date.now()),
+    supplyClaimed: BigInt(0),
     symbol: "ETH",
   };
 
@@ -232,28 +233,28 @@ const getNFTDropClaimParamsMock: BuyNFTDropUIProps["getNFTDropClaimParams"] =
   async () => {
     await new Promise((resolve) => setTimeout(resolve, 2000));
     return {
-      pricePerTokenWei: toUnits("1.5", 18), // 1.5 ETH in wei
-      currencyAddress: NATIVE_TOKEN_ADDRESS,
+      currencyAddress: NATIVE_TOKEN_ADDRESS, // 1.5 ETH in wei
       decimals: 18,
+      pricePerTokenWei: toUnits("1.5", 18),
       symbol: "ETH",
     };
   };
 
 function getMockERC721NFT(id: bigint) {
   const mockNFT: NFT = {
+    chainId: baseSepolia.id,
+    id,
     metadata: {
-      uri: "",
-      name: "Mock NFT",
+      animation_url: "",
       description: "A mock NFT for storybook.",
       image: `https://picsum.photos/200/200?random=${id}`,
-      animation_url: "",
+      name: "Mock NFT",
+      uri: "",
     },
     owner: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
-    id,
+    tokenAddress: "0x0000000000000000000000000000000000000000",
     tokenURI: "...",
     type: "ERC721",
-    tokenAddress: "0x0000000000000000000000000000000000000000",
-    chainId: baseSepolia.id,
   };
 
   return mockNFT;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop.client.tsx
index 25efe376fe8..2b91bdc348d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-nft-drop/buy-nft-drop.client.tsx
@@ -1,17 +1,16 @@
 "use client";
-import {
-  reportAssetBuyFailed,
-  reportAssetBuySuccessful,
-} from "@/analytics/report";
 import { toast } from "sonner";
-import type { ThirdwebContract } from "thirdweb";
-import type { NFT } from "thirdweb";
+import type { NFT, ThirdwebContract } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
 import { getApprovalForTransaction } from "thirdweb/extensions/erc20";
 import { claimTo, getNFT } from "thirdweb/extensions/erc721";
 import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
 import { getClaimParams } from "thirdweb/utils";
 import { parseError } from "utils/errorParser";
+import {
+  reportAssetBuyFailed,
+  reportAssetBuySuccessful,
+} from "@/analytics/report";
 import { getCurrencyMeta } from "../../../erc20/_utils/getCurrencyMeta";
 import {
   type BuyNFTDropForm,
@@ -40,14 +39,14 @@ export function BuyNFTDrop(props: BuyNFTDropProps) {
 
       const transaction = claimTo({
         contract: props.contract,
-        to: account.address,
-        quantity: BigInt(nftAmountToClaim),
         from: account.address,
+        quantity: BigInt(nftAmountToClaim),
+        to: account.address,
       });
 
       const approveTx = await getApprovalForTransaction({
-        transaction,
         account,
+        transaction,
       });
 
       if (approveTx) {
@@ -58,12 +57,12 @@ export function BuyNFTDrop(props: BuyNFTDropProps) {
         });
 
         toast.promise(approveTxPromise, {
-          loading: "Requesting approval to spend ERC20 tokens for NFT purchase",
-          success: "ERC20 token spending request approved successfully",
           error: (err) => ({
-            message: "Approval to spend ERC20 tokens failed",
             description: parseError(err),
+            message: "Approval to spend ERC20 tokens failed",
           }),
+          loading: "Requesting approval to spend ERC20 tokens for NFT purchase",
+          success: "ERC20 token spending request approved successfully",
         });
 
         try {
@@ -73,9 +72,9 @@ export function BuyNFTDrop(props: BuyNFTDropProps) {
           const errorMessage = parseError(err);
 
           reportAssetBuyFailed({
+            assetType: "nft",
             chainId: props.contract.chain.id,
             contractType: "DropERC721",
-            assetType: "nft",
             error: errorMessage,
           });
 
@@ -88,21 +87,21 @@ export function BuyNFTDrop(props: BuyNFTDropProps) {
       const nftOrNfts = nftAmountToClaim > 1 ? "NFTs" : "NFT";
 
       toast.promise(claimTxPromise, {
-        loading: `Buying ${nftAmountToClaim} ${nftOrNfts}`,
-        success: `${nftOrNfts} bought successfully`,
         error: (err) => ({
-          message: `Failed to buy ${nftAmountToClaim} ${nftOrNfts}`,
           description: parseError(err),
+          message: `Failed to buy ${nftAmountToClaim} ${nftOrNfts}`,
         }),
+        loading: `Buying ${nftAmountToClaim} ${nftOrNfts}`,
+        success: `${nftOrNfts} bought successfully`,
       });
 
       try {
         await claimTxPromise;
 
         reportAssetBuySuccessful({
+          assetType: "nft",
           chainId: props.contract.chain.id,
           contractType: "DropERC721",
-          assetType: "nft",
         });
 
         props.onSuccess?.();
@@ -111,9 +110,9 @@ export function BuyNFTDrop(props: BuyNFTDropProps) {
         const errorMessage = parseError(err);
 
         reportAssetBuyFailed({
+          assetType: "nft",
           chainId: props.contract.chain.id,
           contractType: "DropERC721",
-          assetType: "nft",
           error: errorMessage,
         });
 
@@ -127,9 +126,9 @@ export function BuyNFTDrop(props: BuyNFTDropProps) {
         description: errorMessage,
       });
       reportAssetBuyFailed({
+        assetType: "nft",
         chainId: props.contract.chain.id,
         contractType: "DropERC721",
-        assetType: "nft",
         error: errorMessage,
       });
     }
@@ -137,16 +136,16 @@ export function BuyNFTDrop(props: BuyNFTDropProps) {
 
   return (
     <BuyNFTDropUI
-      contract={props.contract}
       activeAccountAddress={account?.address}
       chainMetadata={props.chainMetadata}
       claimCondition={props.claimCondition}
-      totalNFTs={props.totalNFTs}
-      nextTokenIdToClaim={props.nextTokenIdToClaim}
-      totalUnclaimedSupply={props.totalUnclaimedSupply}
+      contract={props.contract}
       getNFTDropClaimParams={getNFTDropClaimParams}
       getNFTsToClaim={getNFTsToClaim}
       handleSubmit={handleSubmit}
+      nextTokenIdToClaim={props.nextTokenIdToClaim}
+      totalNFTs={props.totalNFTs}
+      totalUnclaimedSupply={props.totalUnclaimedSupply}
     />
   );
 }
@@ -157,24 +156,24 @@ async function getNFTDropClaimParams(params: {
   accountAddress: string;
 }) {
   const claimParams = await getClaimParams({
-    type: "erc721",
     contract: params.contract,
+    from: params.accountAddress,
     quantity: BigInt(1),
     to: params.accountAddress,
-    from: params.accountAddress,
+    type: "erc721",
   });
 
   const meta = await getCurrencyMeta({
-    currencyAddress: claimParams.currency,
-    chainMetadata: params.chainMetadata,
     chain: params.contract.chain,
+    chainMetadata: params.chainMetadata,
     client: params.contract.client,
+    currencyAddress: claimParams.currency,
   });
 
   return {
-    pricePerTokenWei: claimParams.pricePerToken,
     currencyAddress: claimParams.currency,
     decimals: meta.decimals,
+    pricePerTokenWei: claimParams.pricePerToken,
     symbol: meta.symbol,
   };
 }
@@ -188,9 +187,9 @@ async function getNFTsToClaim(params: {
   for (let i = 0; i < params.count; i++) {
     const nftPromise = getNFT({
       contract: params.contract,
-      tokenId: params.nextTokenIdToClaim + BigInt(i),
       includeOwner: true,
       tokenByIndex: true,
+      tokenId: params.nextTokenIdToClaim + BigInt(i),
     });
     nftPromises.push(nftPromise);
   }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/nfts-grid.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/nfts-grid.tsx
index 338e107b70d..3be8aefa9bf 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/nfts-grid.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/nfts-grid.tsx
@@ -1,10 +1,5 @@
 "use client";
 
-import { CustomMediaRenderer } from "@/components/blocks/media-renderer";
-import { PaginationButtons } from "@/components/pagination-buttons";
-import { Skeleton, SkeletonContainer } from "@/components/ui/skeleton";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import { CheckCheckIcon } from "lucide-react";
 import { useState } from "react";
 import { type NFT, type ThirdwebContract, toTokens } from "thirdweb";
@@ -13,6 +8,11 @@ import * as ERC721Ext from "thirdweb/extensions/erc721";
 import * as ERC1155Ext from "thirdweb/extensions/erc1155";
 import { useReadContract } from "thirdweb/react";
 import { maxUint256 } from "thirdweb/utils";
+import { CustomMediaRenderer } from "@/components/blocks/media-renderer";
+import { PaginationButtons } from "@/components/pagination-buttons";
+import { Skeleton, SkeletonContainer } from "@/components/ui/skeleton";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
 import { TokenPrice } from "../../_components/token-price";
 import { useERC1155ClaimCondition } from "../client-utils";
 import { supplyFormatter } from "../format";
@@ -45,9 +45,9 @@ export function NFTsGrid(props: {
     props.type === "erc1155" ? ERC1155Ext.getNFTs : ERC721Ext.getNFTs,
     {
       contract: props.clientContract,
-      start,
       count: pageSize,
       includeOwners: true,
+      start,
       tokenByIndex: props.isTokenByIndexSupported,
     },
   );
@@ -76,14 +76,10 @@ export function NFTsGrid(props: {
     <div className="flex grow flex-col">
       {viewToken && (
         <TokenViewerSheet
-          variant="view-data"
-          clientContract={props.clientContract}
           chainMetadata={props.chainMetadata}
-          type={props.type}
-          nft={viewToken.nft}
-          tokenByIndexSupported={props.isTokenByIndexSupported}
-          open={viewToken.open}
+          clientContract={props.clientContract}
           collectionMetadata={props.collectionMetadata}
+          nft={viewToken.nft}
           onClose={() => {
             window.history.replaceState({}, "", `${contractLayoutPath}`);
             setViewToken({
@@ -91,6 +87,10 @@ export function NFTsGrid(props: {
               open: false,
             });
           }}
+          open={viewToken.open}
+          tokenByIndexSupported={props.isTokenByIndexSupported}
+          type={props.type}
+          variant="view-data"
         />
       )}
 
@@ -105,28 +105,28 @@ export function NFTsGrid(props: {
           {!nftsQuery.isPending &&
             nftsQuery.data?.map((nft) => (
               <NFTCard
-                key={nft.id}
-                data={nft}
-                tokenId={nft.id}
+                chainMetadata={props.chainMetadata}
                 clientContract={props.clientContract}
                 contractLayoutPath={contractLayoutPath}
+                data={nft}
+                key={nft.id}
                 onClick={() => handleNFTCardClick(nft)}
+                tokenId={nft.id}
                 type={props.type}
-                chainMetadata={props.chainMetadata}
               />
             ))}
 
           {nftsQuery.isPending &&
             Array.from({ length: pageSize }).map((_, idx) => (
               <NFTCard
+                chainMetadata={props.chainMetadata}
+                clientContract={props.clientContract}
+                contractLayoutPath={contractLayoutPath}
+                data={undefined}
                 // biome-ignore lint/suspicious/noArrayIndexKey: idx is not relevant
                 key={idx}
                 tokenId={0n}
-                data={undefined}
-                contractLayoutPath={contractLayoutPath}
-                clientContract={props.clientContract}
                 type={props.type}
-                chainMetadata={props.chainMetadata}
               />
             ))}
         </NFTGridContainer>
@@ -137,9 +137,9 @@ export function NFTsGrid(props: {
           <div className="flex justify-start">
             <PaginationButtons
               activePage={page}
-              totalPages={totalPages}
-              onPageClick={setPage}
               className="mx-0 w-auto"
+              onPageClick={setPage}
+              totalPages={totalPages}
             />
           </div>
         </div>
@@ -174,14 +174,14 @@ export function NFTGridSkeleton(props: {
     <NFTGridContainer gridClassName={props.gridClassName}>
       {Array.from({ length: pageSize }).map((_, idx) => (
         <NFTCard
-          // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-          key={idx}
-          data={undefined}
-          contractLayoutPath={""}
-          type={props.type}
           chainMetadata={props.chainMetadata}
           clientContract={props.clientContract}
+          contractLayoutPath={""}
+          data={undefined}
+          // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
+          key={idx}
           tokenId={0n}
+          type={props.type}
         />
       ))}
     </NFTGridContainer>
@@ -199,8 +199,8 @@ function NFTCard(props: {
 }) {
   return (
     <div
-      role="button"
-      tabIndex={props.onClick ? 0 : undefined}
+      className="group hover:-translate-y-0.5 relative flex h-full cursor-pointer flex-col overflow-hidden rounded-lg border bg-card duration-200 hover:scale-[1.01] hover:border-active-border"
+      onClick={props.onClick}
       onKeyDown={
         props.onClick
           ? (e) => {
@@ -210,18 +210,19 @@ function NFTCard(props: {
             }
           : undefined
       }
-      onClick={props.onClick}
-      className="group hover:-translate-y-0.5 relative flex h-full cursor-pointer flex-col overflow-hidden rounded-lg border bg-card duration-200 hover:scale-[1.01] hover:border-active-border"
+      // biome-ignore lint/a11y/useSemanticElements: FIXME
+      role="button"
+      tabIndex={props.onClick ? 0 : undefined}
     >
       {/* image */}
       <div className="relative aspect-square w-full overflow-hidden">
         {props.data ? (
           <CustomMediaRenderer
-            client={props.clientContract.client}
-            src={props.data.metadata.animation_url || props.data.metadata.image}
             alt={props.data.metadata.name?.toString() || ""}
-            poster={props.data.metadata.image}
             className="aspect-square h-full w-full"
+            client={props.clientContract.client}
+            poster={props.data.metadata.image}
+            src={props.data.metadata.animation_url || props.data.metadata.image}
           />
         ) : (
           <Skeleton className="aspect-square h-full w-full" />
@@ -253,10 +254,10 @@ function NFTCard(props: {
 
         {props.type === "erc1155" && (
           <RenderClaimConditionInfo
-            tokenId={props.tokenId}
             chainMetadata={props.chainMetadata}
             contract={props.clientContract}
             isSkeleton={!props.data}
+            tokenId={props.tokenId}
           />
         )}
       </div>
@@ -277,9 +278,9 @@ function RenderClaimConditionInfo(props: {
     claimCondition,
   } = useERC1155ClaimCondition({
     chainMetadata: props.chainMetadata,
-    tokenId: props.tokenId,
     contract: props.contract,
     enabled: !props.isSkeleton,
+    tokenId: props.tokenId,
   });
 
   const noClaimConditionSet = !claimCondition.isPending && !claimCondition.data;
@@ -347,10 +348,6 @@ function RenderClaimConditionInfo(props: {
               }
             : undefined
         }
-        skeletonData={{
-          maxClaimableSupply: 100n,
-          supplyClaimed: 10n,
-        }}
         render={(value) => {
           const isFullyClaimed =
             value.supplyClaimed === value.maxClaimableSupply;
@@ -369,6 +366,10 @@ function RenderClaimConditionInfo(props: {
             </div>
           );
         }}
+        skeletonData={{
+          maxClaimableSupply: 100n,
+          supplyClaimed: 10n,
+        }}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/tabs.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/tabs.tsx
index ab4346ddb75..53e13247da0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/tabs.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/tabs.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { TabButtons } from "@/components/ui/tabs";
 import { useState } from "react";
+import { TabButtons } from "@/components/ui/tabs";
 
 export function NFTPublicPageTabs(props: {
   nftsPage: React.ReactNode;
@@ -15,14 +15,14 @@ export function NFTPublicPageTabs(props: {
         <TabButtons
           tabs={[
             {
+              isActive: tab === "nfts",
               name: "NFTs",
               onClick: () => setTab("nfts"),
-              isActive: tab === "nfts",
             },
             {
+              isActive: tab === "buy",
               name: "Buy NFTs",
               onClick: () => setTab("buy"),
-              isActive: tab === "buy",
             },
           ]}
         />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/token-viewer/token-viewer.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/token-viewer/token-viewer.tsx
index 1d244b7f9c4..8e8fb7340af 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/token-viewer/token-viewer.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/token-viewer/token-viewer.tsx
@@ -1,20 +1,5 @@
 "use client";
 
-import { Img } from "@/components/blocks/Img";
-import { CustomMediaRenderer } from "@/components/blocks/media-renderer";
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Badge } from "@/components/ui/badge";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Skeleton, SkeletonContainer } from "@/components/ui/skeleton";
-import { TabButtons } from "@/components/ui/tabs";
-import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import {
   BoxIcon,
   CircleSlashIcon,
@@ -29,6 +14,21 @@ import type { ChainMetadata } from "thirdweb/chains";
 import { getNFT as ERC721_getNFT } from "thirdweb/extensions/erc721";
 import { getNFT as ERC1155_getNFT } from "thirdweb/extensions/erc1155";
 import { useReadContract } from "thirdweb/react";
+import { Img } from "@/components/blocks/Img";
+import { CustomMediaRenderer } from "@/components/blocks/media-renderer";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Badge } from "@/components/ui/badge";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
+import { Skeleton, SkeletonContainer } from "@/components/ui/skeleton";
+import { TabButtons } from "@/components/ui/tabs";
+import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { useERC1155ClaimCondition } from "../client-utils";
 import { BuyEditionDrop } from "../overview/buy-edition-drop/buy-edition-drop.client";
 
@@ -59,12 +59,12 @@ export function TokenViewerSheet(
 
   return (
     <Dialog
-      open={props.open}
       onOpenChange={(open) => {
         if (!open) {
           props.onClose();
         }
       }}
+      open={props.open}
     >
       <DialogContent
         className="lg:!max-w-6xl !rounded-xl flex flex-col gap-0 p-0 max-sm:max-h-[calc(100dvh-60px)] max-sm:overflow-y-auto"
@@ -76,21 +76,21 @@ export function TokenViewerSheet(
 
         {props.variant === "fetch-data" ? (
           <FetchAndRenderTokenInfo
-            clientContract={props.clientContract}
             chainMetadata={props.chainMetadata}
-            type={props.type}
-            tokenId={props.tokenId}
-            tokenByIndexSupported={props.tokenByIndexSupported}
+            clientContract={props.clientContract}
             collectionMetadata={props.collectionMetadata}
+            tokenByIndexSupported={props.tokenByIndexSupported}
+            tokenId={props.tokenId}
+            type={props.type}
           />
         ) : (
           <TokenInfoUI
-            data={props.nft}
-            contract={props.clientContract}
-            type={props.type}
-            tokenId={tokenId}
             chainMetadata={props.chainMetadata}
             collectionMetadata={props.collectionMetadata}
+            contract={props.clientContract}
+            data={props.nft}
+            tokenId={tokenId}
+            type={props.type}
           />
         )}
       </DialogContent>
@@ -112,9 +112,9 @@ function FetchAndRenderTokenInfo(props: {
     props.type === "erc721" ? ERC721_getNFT : ERC1155_getNFT,
     {
       contract: props.clientContract,
-      tokenId: props.tokenId,
       includeOwner: true,
       tokenByIndex: props.tokenByIndexSupported,
+      tokenId: props.tokenId,
     },
   );
 
@@ -135,12 +135,12 @@ function FetchAndRenderTokenInfo(props: {
 
   return (
     <TokenInfoUI
-      data={nftQuery.data}
-      contract={props.clientContract}
-      type={props.type}
-      tokenId={props.tokenId}
       chainMetadata={props.chainMetadata}
       collectionMetadata={props.collectionMetadata}
+      contract={props.clientContract}
+      data={nftQuery.data}
+      tokenId={props.tokenId}
+      type={props.type}
     />
   );
 }
@@ -159,9 +159,9 @@ function TokenInfoUI(props: {
   const attributes = props.data ? getAttributes(props.data) : [];
   const { claimCondition } = useERC1155ClaimCondition({
     chainMetadata: props.chainMetadata,
-    tokenId: props.tokenId,
     contract: props.contract,
     enabled: props.type === "erc1155",
+    tokenId: props.tokenId,
   });
 
   const [tab, setTab] = useState<"traits" | "buy">("traits");
@@ -198,11 +198,11 @@ function TokenInfoUI(props: {
       <div className="p-4 lg:p-2">
         {props.data ? (
           <CustomMediaRenderer
-            client={props.contract.client}
-            src={props.data.metadata.animation_url || props.data.metadata.image}
             alt={props.data.metadata.name?.toString() || ""}
-            poster={props.data.metadata.image}
             className="[&>div]:!bg-accent [&_a]:!text-muted-foreground [&_a]:!no-underline [&_svg]:!size-6 [&_svg]:!text-muted-foreground aspect-square w-full rounded-lg"
+            client={props.contract.client}
+            poster={props.data.metadata.image}
+            src={props.data.metadata.animation_url || props.data.metadata.image}
           />
         ) : (
           <Skeleton className="aspect-square rounded-lg border" />
@@ -217,10 +217,10 @@ function TokenInfoUI(props: {
               {/* title */}
               <SkeletonContainer
                 loadedData={props.data?.metadata.name}
-                skeletonData="NFTCollection #0"
                 render={(title) => (
                   <h2 className="font-bold text-3xl tracking-tight">{title}</h2>
                 )}
+                skeletonData="NFTCollection #0"
               />
 
               {/* description */}
@@ -239,6 +239,11 @@ function TokenInfoUI(props: {
             <div className="flex flex-col gap-3 border-y border-dashed py-4 lg:flex-row lg:items-center lg:[&>*:not(:first-child)]:border-l lg:[&>*:not(:first-child)]:pl-3 ">
               <div className="flex items-center gap-1.5">
                 <Img
+                  alt={props.collectionMetadata.name}
+                  className="size-3.5 rounded-lg"
+                  fallback={
+                    <BoxIcon className="size-3.5 text-muted-foreground" />
+                  }
                   src={
                     props.collectionMetadata.image
                       ? resolveSchemeWithErrorHandler({
@@ -247,11 +252,6 @@ function TokenInfoUI(props: {
                         }) || ""
                       : ""
                   }
-                  alt={props.collectionMetadata.name}
-                  fallback={
-                    <BoxIcon className="size-3.5 text-muted-foreground" />
-                  }
-                  className="size-3.5 rounded-lg"
                 />
                 <span className="text-foreground text-sm ">
                   {props.collectionMetadata.name}
@@ -266,9 +266,9 @@ function TokenInfoUI(props: {
                   <span className="text-muted-foreground">Owned by</span>
                   <WalletAddress
                     address={props.data.owner}
+                    className="h-auto py-0 text-sm"
                     client={props.contract.client}
                     iconClassName="hidden"
-                    className="h-auto py-0 text-sm"
                     preventOpenOnFocus
                   />
                 </div>
@@ -300,24 +300,26 @@ function TokenInfoUI(props: {
             {/* badges */}
             <div className="flex flex-wrap gap-2">
               <Badge
-                variant="outline"
                 className="bg-muted/50 py-1 font-normal text-muted-foreground"
+                variant="outline"
               >
                 {props.type === "erc721" ? "ERC721" : "ERC1155"}
               </Badge>
 
               <Badge
-                variant="outline"
                 className="bg-muted/50 py-1 font-normal text-muted-foreground"
+                variant="outline"
               >
                 Token #{props.tokenId}
               </Badge>
 
               <Badge
-                variant="outline"
                 className="flex items-center gap-2 bg-muted/50 px-1.5 py-1 font-normal text-muted-foreground"
+                variant="outline"
               >
                 <Img
+                  alt={props.chainMetadata.name}
+                  className="size-3 rounded-full"
                   src={
                     props.chainMetadata.icon?.url
                       ? resolveSchemeWithErrorHandler({
@@ -326,8 +328,6 @@ function TokenInfoUI(props: {
                         })
                       : ""
                   }
-                  alt={props.chainMetadata.name}
-                  className="size-3 rounded-full"
                 />
                 <span className="text-muted-foreground text-xs">
                   {props.chainMetadata.name}
@@ -342,14 +342,14 @@ function TokenInfoUI(props: {
                   tabClassName="!text-sm"
                   tabs={[
                     {
+                      isActive: tab === "traits",
                       name: "Traits",
                       onClick: () => setTab("traits"),
-                      isActive: tab === "traits",
                     },
                     {
+                      isActive: tab === "buy",
                       name: "Buy NFT",
                       onClick: () => setTab("buy"),
-                      isActive: tab === "buy",
                     },
                   ]}
                 />
@@ -366,9 +366,9 @@ function TokenInfoUI(props: {
                       </div>
                     ) : (
                       <BuyEditionDrop
+                        chainMetadata={props.chainMetadata}
                         contract={props.contract}
                         tokenId={props.tokenId}
-                        chainMetadata={props.chainMetadata}
                       />
                     )}
                   </div>
@@ -410,15 +410,15 @@ export function PageLoadTokenViewerSheet(props: {
 
   return (
     <TokenViewerSheet
-      variant="fetch-data"
-      clientContract={props.clientContract}
       chainMetadata={props.chainMetadata}
-      type={props.type}
-      tokenId={props.tokenId}
+      clientContract={props.clientContract}
+      collectionMetadata={props.collectionMetadata}
+      onClose={() => setOpen(false)}
       open={open}
       tokenByIndexSupported={props.tokenByIndexSupported}
-      onClose={() => setOpen(false)}
-      collectionMetadata={props.collectionMetadata}
+      tokenId={props.tokenId}
+      type={props.type}
+      variant="fetch-data"
     />
   );
 }
@@ -462,10 +462,7 @@ function getAttributes(nft: NFT) {
   return attributes;
 }
 
-function TraitCard(props: {
-  trait_type: string;
-  value: string;
-}) {
+function TraitCard(props: { trait_type: string; value: string }) {
   return (
     <div className="relative rounded-md border bg-card px-3 py-2">
       <SparkleIcon className="absolute top-2 right-2 size-3 fill-muted-foreground text-muted-foreground opacity-30" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/ContractSettingsPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/ContractSettingsPage.client.tsx
index 2acb8a54f12..6780d8fedb7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/ContractSettingsPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/ContractSettingsPage.client.tsx
@@ -23,8 +23,8 @@ export function ContractSettingsPageClient(props: {
     <ContractSettingsPage
       contract={props.contract}
       functionSelectors={metadataQuery.data.functionSelectors}
-      isLoggedIn={props.isLoggedIn}
       hasDefaultFeeConfig={true}
+      isLoggedIn={props.isLoggedIn}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/ContractSettingsPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/ContractSettingsPage.tsx
index 1cf47685d4e..d6e8d5bde72 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/ContractSettingsPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/ContractSettingsPage.tsx
@@ -27,15 +27,15 @@ const ContractSettingsPageInner: React.FC<ContractSettingsPageProps> = ({
   return (
     <Flex direction="column" gap={4}>
       <Flex gap={8} w="100%">
-        <SimpleGrid columns={1} w="100%" gap={8}>
+        <SimpleGrid columns={1} gap={8} w="100%">
           {contract && (
             <GridItem order={isContractMetadataSupported ? 0 : 100}>
               <SettingsMetadata
                 contract={contract}
-                isLoggedIn={isLoggedIn}
                 detectedState={
                   isContractMetadataSupported ? "enabled" : "disabled"
                 }
+                isLoggedIn={isLoggedIn}
               />
             </GridItem>
           )}
@@ -89,6 +89,14 @@ export function ContractSettingsPage(props: {
         CommonExt.isGetContractMetadataSupported(functionSelectors),
         CommonExt.isSetContractMetadataSupported(functionSelectors),
       ].every(Boolean)}
+      isLoggedIn={isLoggedIn}
+      isPlatformFeesSupported={
+        !hasDefaultFeeConfig &&
+        [
+          CommonExt.isGetPlatformFeeInfoSupported(functionSelectors),
+          CommonExt.isSetPlatformFeeInfoSupported(functionSelectors),
+        ].every(Boolean)
+      }
       isPrimarySaleSupported={[
         CommonExt.isPrimarySaleRecipientSupported(functionSelectors),
         CommonExt.isSetPrimarySaleRecipientSupported(functionSelectors),
@@ -97,14 +105,6 @@ export function ContractSettingsPage(props: {
         CommonExt.isGetDefaultRoyaltyInfoSupported(functionSelectors),
         CommonExt.isSetDefaultRoyaltyInfoSupported(functionSelectors),
       ].every(Boolean)}
-      isPlatformFeesSupported={
-        !hasDefaultFeeConfig &&
-        [
-          CommonExt.isGetPlatformFeeInfoSupported(functionSelectors),
-          CommonExt.isSetPlatformFeeInfoSupported(functionSelectors),
-        ].every(Boolean)
-      }
-      isLoggedIn={isLoggedIn}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/detected-state.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/detected-state.tsx
index 7ff8752be35..b206bc731d2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/detected-state.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/detected-state.tsx
@@ -1,7 +1,7 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import type { ExtensionDetectedState } from "components/buttons/ExtensionDetectedState";
 import { Grid2x2XIcon } from "lucide-react";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
 const settingTypeMap = {
   metadata: {
@@ -9,6 +9,11 @@ const settingTypeMap = {
     portalLink:
       "https://portal.thirdweb.com/contracts/build/extensions/general/ContractMetadata",
   },
+  platformFee: {
+    name: "Platform Fee",
+    portalLink:
+      "https://portal.thirdweb.com/contracts/build/extensions/general/PlatformFee",
+  },
   primarySale: {
     name: "Primary Sales",
     portalLink:
@@ -19,11 +24,6 @@ const settingTypeMap = {
     portalLink:
       "https://portal.thirdweb.com/contracts/build/extensions/general/Royalty",
   },
-  platformFee: {
-    name: "Platform Fee",
-    portalLink:
-      "https://portal.thirdweb.com/contracts/build/extensions/general/PlatformFee",
-  },
 } as const;
 
 export function SettingDetectedState({
@@ -55,10 +55,10 @@ export function SettingDetectedState({
               <span className="text-foreground">{metadata.name}</span>
             </p>
             <UnderlineLink
+              className="text-muted-foreground text-sm"
               href={metadata.portalLink}
-              target="_blank"
               rel="noopener noreferrer"
-              className="text-muted-foreground text-sm"
+              target="_blank"
             >
               Learn how to enable this extension
             </UnderlineLink>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/metadata.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/metadata.tsx
index bd35e80ddd4..f5332c66149 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/metadata.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/metadata.tsx
@@ -74,8 +74,8 @@ export const SettingsMetadata = ({
 
   const transformedQueryData = useMemo(() => {
     let socialUrls: z.infer<typeof SocialUrlSchema> = {
-      twitter: "",
       discord: "",
+      twitter: "",
     };
     if (metadata.data?.social_urls) {
       try {
@@ -99,12 +99,12 @@ export const SettingsMetadata = ({
     }
     return {
       ...metadata.data,
-      name: metadata.data?.name || "",
-      image: image || "",
       dashboard_social_urls: Object.entries(socialUrls).map(([key, value]) => ({
         key,
         value,
       })),
+      image: image || "",
+      name: metadata.data?.name || "",
     };
   }, [metadata.data, contract.client]);
 
@@ -117,13 +117,13 @@ export const SettingsMetadata = ({
     formState,
     getFieldState,
   } = useForm<z.input<typeof DashboardCommonContractSchema>>({
-    resolver: zodResolver(DashboardCommonContractSchema),
     defaultValues: transformedQueryData,
-    values: transformedQueryData,
     resetOptions: {
       keepDirty: true,
       keepDirtyValues: true,
     },
+    resolver: zodResolver(DashboardCommonContractSchema),
+    values: transformedQueryData,
   });
 
   const { fields, append, remove } = useFieldArray({
@@ -139,10 +139,11 @@ export const SettingsMetadata = ({
   );
 
   return (
-    <Card p={0} position="relative" overflow="hidden">
-      <SettingDetectedState type="metadata" detectedState={detectedState} />
+    <Card overflow="hidden" p={0} position="relative">
+      <SettingDetectedState detectedState={detectedState} type="metadata" />
       <Flex
         as="form"
+        direction="column"
         onSubmit={handleSubmit((d) => {
           const { dashboard_social_urls, ...data } = d;
 
@@ -172,28 +173,27 @@ export const SettingsMetadata = ({
           });
 
           sendTransaction.mutate(tx, {
-            onSuccess: () => {
-              onSuccess();
-            },
             onError: (error) => {
               onError(error);
             },
+            onSuccess: () => {
+              onSuccess();
+            },
           });
         })}
-        direction="column"
       >
-        <Flex p={{ base: 6, md: 10 }} as="section" direction="column" gap={4}>
+        <Flex as="section" direction="column" gap={4} p={{ base: 6, md: 10 }}>
           <div className="flex flex-col">
             <Heading size="title.md">Metadata</Heading>
-            <Text size="body.md" fontStyle="italic">
+            <Text fontStyle="italic" size="body.md">
               Settings to organize and distinguish between your different
               contracts.
             </Text>
           </div>
-          <Flex gap={4} direction={{ base: "column", md: "row" }}>
+          <Flex direction={{ base: "column", md: "row" }} gap={4}>
             <Flex
-              flexShrink={0}
               flexGrow={1}
+              flexShrink={0}
               maxW={{ base: "100%", md: "160px" }}
             >
               <FormControl
@@ -204,17 +204,17 @@ export const SettingsMetadata = ({
               >
                 <FormLabel>Image</FormLabel>
                 <FileInput
+                  accept={{ "image/*": [] }}
+                  className="rounded border border-border transition-all duration-200"
                   client={contract.client}
                   isDisabled={metadata.isPending || sendTransaction.isPending}
-                  accept={{ "image/*": [] }}
-                  value={watch("image")}
                   setValue={(file) =>
                     setValue("image", file, {
-                      shouldTouch: true,
                       shouldDirty: true,
+                      shouldTouch: true,
                     })
                   }
-                  className="rounded border border-border transition-all duration-200"
+                  value={watch("image")}
                 />
                 <FormErrorMessage>
                   {getFieldState("image", formState).error?.message}
@@ -224,11 +224,11 @@ export const SettingsMetadata = ({
 
             <Flex
               direction="column"
-              gap={4}
               flexGrow={1}
+              gap={4}
               justify="space-between"
             >
-              <Flex gap={4} direction={{ base: "column", md: "row" }}>
+              <Flex direction={{ base: "column", md: "row" }} gap={4}>
                 <FormControl
                   isDisabled={metadata.isPending || sendTransaction.isPending}
                   isInvalid={!!getFieldState("name", formState).error}
@@ -278,15 +278,15 @@ export const SettingsMetadata = ({
                         metadata.isPending || sendTransaction.isPending
                       }
                       {...register(`dashboard_social_urls.${index}.value`)}
-                      type="url"
                       placeholder="https://..."
+                      type="url"
                     />
                     <IconButton
+                      aria-label="Remove row"
+                      icon={<Trash2Icon className="size-5" />}
                       isDisabled={
                         metadata.isPending || sendTransaction.isPending
                       }
-                      icon={<Trash2Icon className="size-5" />}
-                      aria-label="Remove row"
                       onClick={() => remove(index)}
                     />
                   </div>
@@ -295,13 +295,13 @@ export const SettingsMetadata = ({
             ))}
             <div>
               <Button
-                isDisabled={metadata.isPending || sendTransaction.isPending}
-                type="button"
-                size="sm"
-                colorScheme="primary"
                 borderRadius="md"
+                colorScheme="primary"
+                isDisabled={metadata.isPending || sendTransaction.isPending}
                 leftIcon={<PlusIcon className="size-5" />}
                 onClick={() => append({ key: "", value: "" })}
+                size="sm"
+                type="button"
               >
                 Add URL
               </Button>
@@ -311,14 +311,14 @@ export const SettingsMetadata = ({
 
         <AdminOnly contract={contract}>
           <TransactionButton
+            className="!rounded-t-none rounded-xl"
             client={contract.client}
+            disabled={metadata.isPending || !formState.isDirty}
             isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
+            isPending={sendTransaction.isPending}
             transactionCount={1}
-            disabled={metadata.isPending || !formState.isDirty}
+            txChainID={contract.chain.id}
             type="submit"
-            isPending={sendTransaction.isPending}
-            className="!rounded-t-none rounded-xl"
           >
             {sendTransaction.isPending
               ? "Updating Metadata"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/platform-fees.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/platform-fees.tsx
index b820b96154a..79f83543a83 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/platform-fees.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/platform-fees.tsx
@@ -55,14 +55,14 @@ export const SettingsPlatformFees = ({
   const platformFeesQuery = useReadContract(getPlatformFeeInfo, { contract });
   const platformFeeInfo = platformFeesQuery.data
     ? {
-        platform_fee_recipient: platformFeesQuery.data[0],
         platform_fee_basis_points: platformFeesQuery.data[1],
+        platform_fee_recipient: platformFeesQuery.data[0],
       }
     : undefined;
 
   const form = useForm<z.input<typeof CommonPlatformFeeSchema>>({
-    resolver: zodResolver(CommonPlatformFeeSchema),
     defaultValues: platformFeeInfo,
+    resolver: zodResolver(CommonPlatformFeeSchema),
     values: platformFeeInfo,
   });
 
@@ -73,48 +73,48 @@ export const SettingsPlatformFees = ({
   );
 
   return (
-    <Card p={0} position="relative" overflow="hidden">
-      <SettingDetectedState type="platformFee" detectedState={detectedState} />
+    <Card overflow="hidden" p={0} position="relative">
+      <SettingDetectedState detectedState={detectedState} type="platformFee" />
       <Flex
         as="form"
+        direction="column"
         onSubmit={form.handleSubmit((data) => {
           const transaction = setPlatformFeeInfo({
             contract,
-            platformFeeRecipient: data.platform_fee_recipient,
             platformFeeBps: BigInt(data.platform_fee_basis_points),
+            platformFeeRecipient: data.platform_fee_recipient,
           });
           sendAndConfirmTx.mutate(transaction, {
-            onSuccess: () => {
-              form.reset(data);
-              onSuccess();
-            },
             onError: (error) => {
               console.error(error);
               onError(error);
             },
+            onSuccess: () => {
+              form.reset(data);
+              onSuccess();
+            },
           });
         })}
-        direction="column"
       >
-        <Flex p={{ base: 6, md: 10 }} as="section" direction="column" gap={4}>
+        <Flex as="section" direction="column" gap={4} p={{ base: 6, md: 10 }}>
           <Heading size="title.sm">Platform fee</Heading>
-          <Text size="body.md" fontStyle="italic">
+          <Text fontStyle="italic" size="body.md">
             The wallet address that should receive the revenue from platform
             fees.
           </Text>
-          <Flex gap={4} direction={{ base: "column", md: "row" }}>
+          <Flex direction={{ base: "column", md: "row" }} gap={4}>
             <FormControl
+              isDisabled={!address}
               isInvalid={
                 !!form.getFieldState("platform_fee_recipient", form.formState)
                   .error
               }
-              isDisabled={!address}
             >
               <FormLabel>Recipient Address</FormLabel>
               <SolidityInput
                 client={contract.client}
-                solidityType="address"
                 formContext={form}
+                solidityType="address"
                 {...form.register("platform_fee_recipient")}
                 disabled={!address || sendAndConfirmTx.isPending}
               />
@@ -127,24 +127,24 @@ export const SettingsPlatformFees = ({
             </FormControl>
             <FormControl
               isDisabled={!address}
-              maxW={{ base: "100%", md: "200px" }}
               isInvalid={
                 !!form.getFieldState(
                   "platform_fee_basis_points",
                   form.formState,
                 ).error
               }
+              maxW={{ base: "100%", md: "200px" }}
             >
               <FormLabel>Percentage</FormLabel>
               <BasisPointsInput
-                value={form.watch("platform_fee_basis_points")}
+                disabled={sendAndConfirmTx.isPending}
                 onChange={(value) =>
                   form.setValue("platform_fee_basis_points", value, {
                     shouldDirty: true,
                     shouldTouch: true,
                   })
                 }
-                disabled={sendAndConfirmTx.isPending}
+                value={form.watch("platform_fee_basis_points")}
               />
               <FormErrorMessage>
                 {
@@ -159,14 +159,14 @@ export const SettingsPlatformFees = ({
         </Flex>
         <AdminOnly contract={contract}>
           <TransactionButton
+            className="!rounded-t-none rounded-xl"
             client={contract.client}
+            disabled={platformFeesQuery.isPending || !form.formState.isDirty}
             isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
+            isPending={sendAndConfirmTx.isPending}
             transactionCount={1}
-            disabled={platformFeesQuery.isPending || !form.formState.isDirty}
+            txChainID={contract.chain.id}
             type="submit"
-            isPending={sendAndConfirmTx.isPending}
-            className="!rounded-t-none rounded-xl"
           >
             {sendAndConfirmTx.isPending
               ? "Updating Platform Fee Settings"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/primary-sale.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/primary-sale.tsx
index 38cf195bbc7..10065d9d2b1 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/primary-sale.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/primary-sale.tsx
@@ -55,8 +55,8 @@ export const SettingsPrimarySale = ({
   };
 
   const form = useForm<z.input<typeof CommonPrimarySaleSchema>>({
-    resolver: zodResolver(CommonPrimarySaleSchema),
     defaultValues: transformedQueryData,
+    resolver: zodResolver(CommonPrimarySaleSchema),
     values: transformedQueryData,
   });
 
@@ -67,10 +67,11 @@ export const SettingsPrimarySale = ({
   );
 
   return (
-    <Card p={0} position="relative" overflow="hidden">
-      <SettingDetectedState type="primarySale" detectedState={detectedState} />
+    <Card overflow="hidden" p={0} position="relative">
+      <SettingDetectedState detectedState={detectedState} type="primarySale" />
       <Flex
         as="form"
+        direction="column"
         onSubmit={form.handleSubmit((d) => {
           const saleRecipient = d.primary_sale_recipient;
           if (!saleRecipient) {
@@ -84,25 +85,24 @@ export const SettingsPrimarySale = ({
           });
           // if we switch back to mutateAsync then *need* to catch errors
           mutation.mutate(transaction, {
-            onSuccess: () => {
-              form.reset({ primary_sale_recipient: saleRecipient });
-              onSuccess();
-            },
             onError: (error) => {
               console.error(error);
               onError(error);
             },
+            onSuccess: () => {
+              form.reset({ primary_sale_recipient: saleRecipient });
+              onSuccess();
+            },
           });
         })}
-        direction="column"
       >
-        <Flex p={{ base: 6, md: 10 }} as="section" direction="column" gap={4}>
+        <Flex as="section" direction="column" gap={4} p={{ base: 6, md: 10 }}>
           <Heading size="title.sm">Primary Sales</Heading>
-          <Text size="body.md" fontStyle="italic">
+          <Text fontStyle="italic" size="body.md">
             The wallet address that should receive the revenue from initial
             sales of the assets.
           </Text>
-          <Flex gap={4} direction={{ base: "column", md: "row" }}>
+          <Flex direction={{ base: "column", md: "row" }} gap={4}>
             <FormControl
               isDisabled={mutation.isPending || !address}
               isInvalid={
@@ -114,8 +114,8 @@ export const SettingsPrimarySale = ({
               <SolidityInput
                 client={contract.client}
                 disabled={mutation.isPending || !address}
-                solidityType="address"
                 formContext={form}
+                solidityType="address"
                 {...form.register("primary_sale_recipient")}
               />
               <FormErrorMessage>
@@ -129,14 +129,14 @@ export const SettingsPrimarySale = ({
         </Flex>
         <AdminOnly contract={contract}>
           <TransactionButton
+            className="!rounded-t-none rounded-xl"
             client={contract.client}
+            disabled={query.isPending || !form.formState.isDirty}
             isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
+            isPending={mutation.isPending}
             transactionCount={1}
-            disabled={query.isPending || !form.formState.isDirty}
+            txChainID={contract.chain.id}
             type="submit"
-            isPending={mutation.isPending}
-            className="!rounded-t-none rounded-xl"
           >
             {mutation.isPending
               ? "Updating Primary Sale Settings"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/royalties.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/royalties.tsx
index b9db6020636..86f77231407 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/royalties.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/royalties.tsx
@@ -33,6 +33,13 @@ import { SettingDetectedState } from "./detected-state";
  * @internal
  */
 const CommonRoyaltySchema = z.object({
+  /**
+   * The address of the royalty recipient. All royalties will be sent
+   * to this address.
+   * @internal
+   * @remarks used by OpenSea "fee_recipient"
+   */
+  fee_recipient: AddressOrEnsSchema,
   /**
    * The amount of royalty collected on all royalties represented as basis points.
    * The default is 0 (no royalties).
@@ -45,14 +52,6 @@ const CommonRoyaltySchema = z.object({
    * @remarks used by OpenSea "seller_fee_basis_points"
    */
   seller_fee_basis_points: BasisPointsSchema,
-
-  /**
-   * The address of the royalty recipient. All royalties will be sent
-   * to this address.
-   * @internal
-   * @remarks used by OpenSea "fee_recipient"
-   */
-  fee_recipient: AddressOrEnsSchema,
 });
 
 export const SettingsRoyalties = ({
@@ -68,12 +67,12 @@ export const SettingsRoyalties = ({
     contract,
   });
   const royaltyInfo = query.data
-    ? { seller_fee_basis_points: query.data[1], fee_recipient: query.data[0] }
+    ? { fee_recipient: query.data[0], seller_fee_basis_points: query.data[1] }
     : undefined;
   const mutation = useSendAndConfirmTransaction();
   const form = useForm<z.input<typeof CommonRoyaltySchema>>({
-    resolver: zodResolver(CommonRoyaltySchema),
     defaultValues: royaltyInfo,
+    resolver: zodResolver(CommonRoyaltySchema),
     values: royaltyInfo,
   });
 
@@ -86,47 +85,47 @@ export const SettingsRoyalties = ({
   );
 
   return (
-    <Card p={0} position="relative" overflow="hidden">
-      <SettingDetectedState type="royalties" detectedState={detectedState} />
+    <Card overflow="hidden" p={0} position="relative">
+      <SettingDetectedState detectedState={detectedState} type="royalties" />
       <Flex
         as="form"
+        direction="column"
         onSubmit={form.handleSubmit((d) => {
           const transaction = setDefaultRoyaltyInfo({
             contract,
-            royaltyRecipient: d.fee_recipient,
             royaltyBps: BigInt(d.seller_fee_basis_points),
+            royaltyRecipient: d.fee_recipient,
           });
           mutation.mutate(transaction, {
-            onSuccess: () => {
-              form.reset(d);
-              onSuccess();
-            },
             onError: (error) => {
               console.error(error);
               onError(error);
             },
+            onSuccess: () => {
+              form.reset(d);
+              onSuccess();
+            },
           });
         })}
-        direction="column"
       >
-        <Flex p={{ base: 6, md: 10 }} as="section" direction="column" gap={4}>
+        <Flex as="section" direction="column" gap={4} p={{ base: 6, md: 10 }}>
           <Heading size="title.sm">Royalties</Heading>
-          <Text size="body.md" fontStyle="italic">
+          <Text fontStyle="italic" size="body.md">
             The wallet address that should receive the revenue from royalties
             earned from secondary sales of the assets.
           </Text>
-          <Flex gap={4} direction={{ base: "column", md: "row" }}>
+          <Flex direction={{ base: "column", md: "row" }} gap={4}>
             <FormControl
+              isDisabled={!address}
               isInvalid={
                 !!form.getFieldState("fee_recipient", form.formState).error
               }
-              isDisabled={!address}
             >
               <FormLabel>Recipient Address</FormLabel>
               <SolidityInput
                 client={contract.client}
-                solidityType="address"
                 formContext={form}
+                solidityType="address"
                 {...form.register("fee_recipient")}
                 disabled={!address}
               />
@@ -138,22 +137,22 @@ export const SettingsRoyalties = ({
               </FormErrorMessage>
             </FormControl>
             <FormControl
-              maxW={{ base: "100%", md: "200px" }}
+              isDisabled={!address}
               isInvalid={
                 !!form.getFieldState("seller_fee_basis_points", form.formState)
                   .error
               }
-              isDisabled={!address}
+              maxW={{ base: "100%", md: "200px" }}
             >
               <FormLabel>Percentage</FormLabel>
               <BasisPointsInput
-                value={form.watch("seller_fee_basis_points")}
                 onChange={(value) =>
                   form.setValue("seller_fee_basis_points", value, {
                     shouldDirty: true,
                     shouldTouch: true,
                   })
                 }
+                value={form.watch("seller_fee_basis_points")}
               />
               <FormErrorMessage>
                 {
@@ -166,14 +165,14 @@ export const SettingsRoyalties = ({
         </Flex>
         <AdminOnly contract={contract}>
           <TransactionButton
+            className="!rounded-t-none rounded-xl"
             client={contract.client}
-            txChainID={contract.chain.id}
-            transactionCount={1}
             disabled={query.isPending || !form.formState.isDirty}
-            type="submit"
-            isPending={mutation.isPending}
-            className="!rounded-t-none rounded-xl"
             isLoggedIn={isLoggedIn}
+            isPending={mutation.isPending}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             {mutation.isPending
               ? "Updating Royalty Settings"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/page.tsx
index ed13122da57..0041aa4802c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/page.tsx
@@ -9,10 +9,10 @@ export default async function Page(props: {
 
   return (
     <SharedContractSettingsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/shared-settings-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/shared-settings-page.tsx
index 3ee088bd2f7..ca085b58d08 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/shared-settings-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/shared-settings-page.tsx
@@ -17,8 +17,8 @@ export async function SharedContractSettingsPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -31,8 +31,8 @@ export async function SharedContractSettingsPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
@@ -58,8 +58,8 @@ export async function SharedContractSettingsPage(props: {
     <ContractSettingsPage
       contract={clientContract}
       functionSelectors={metadata.functionSelectors}
-      isLoggedIn={props.isLoggedIn}
       hasDefaultFeeConfig={hasDefaultFeeConfig}
+      isLoggedIn={props.isLoggedIn}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-layout.tsx
index 8cdb83288d4..54978bd3dbb 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-layout.tsx
@@ -1,6 +1,3 @@
-import { getProjects } from "@/api/projects";
-import { getTeams } from "@/api/team";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import type { MinimalTeamsAndProjects } from "components/contract-components/contract-deploy-form/add-to-project-card";
 import { resolveFunctionSelectors } from "lib/selectors";
 import type { Metadata } from "next";
@@ -8,6 +5,9 @@ import { notFound } from "next/navigation";
 import { getContractMetadata } from "thirdweb/extensions/common";
 import { isAddress, isContractDeployed } from "thirdweb/utils";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { getProjects } from "@/api/projects";
+import { getTeams } from "@/api/team";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import type { ProjectMeta } from "../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { TeamHeader } from "../../../../team/components/TeamHeader/team-header";
 import { ConfigureCustomChain } from "./_layout/ConfigureCustomChain";
@@ -33,8 +33,8 @@ export async function SharedContractLayout(props: {
 
   const [info, teamsAndProjects] = await Promise.all([
     getContractPageParamsInfo({
-      contractAddress: props.contractAddress,
       chainIdOrSlug: props.chainIdOrSlug,
+      contractAddress: props.contractAddress,
       teamId: props.projectMeta?.teamId,
     }),
     getTeamsAndProjectsIfLoggedIn(),
@@ -65,8 +65,8 @@ export async function SharedContractLayout(props: {
         <ContractPageLayoutClient
           chainMetadata={chainMetadata}
           contract={clientContract}
-          teamsAndProjects={teamsAndProjects}
           projectMeta={props.projectMeta}
+          teamsAndProjects={teamsAndProjects}
         >
           {props.children}
         </ContractPageLayoutClient>
@@ -110,11 +110,11 @@ export async function SharedContractLayout(props: {
       <ContractPageLayout
         chainMetadata={chainMetadata}
         contract={clientContract}
-        sidebarLinks={sidebarLinks}
         dashboardContractMetadata={contractMetadata}
         externalLinks={externalLinks}
-        teamsAndProjects={teamsAndProjects}
         projectMeta={props.projectMeta}
+        sidebarLinks={sidebarLinks}
+        teamsAndProjects={teamsAndProjects}
       >
         {props.children}
       </ContractPageLayout>
@@ -132,18 +132,18 @@ async function getTeamsAndProjectsIfLoggedIn() {
 
     const teamsAndProjects: MinimalTeamsAndProjects = await Promise.all(
       teams.map(async (team) => ({
-        team: {
-          id: team.id,
-          name: team.name,
-          slug: team.slug,
-          image: team.image,
-        },
         projects: (await getProjects(team.slug)).map((x) => ({
           id: x.id,
-          name: x.name,
           image: x.image,
+          name: x.name,
           slug: x.slug,
         })),
+        team: {
+          id: team.id,
+          image: team.image,
+          name: team.name,
+          slug: team.slug,
+        },
       })),
     );
 
@@ -159,8 +159,8 @@ export async function generateContractLayoutMetadata(params: {
 }): Promise<Metadata> {
   try {
     const info = await getContractPageParamsInfo({
-      contractAddress: params.contractAddress,
       chainIdOrSlug: params.chainIdOrSlug,
+      contractAddress: params.contractAddress,
       teamId: undefined,
     });
 
@@ -202,13 +202,13 @@ export async function generateContractLayoutMetadata(params: {
     }
 
     return {
-      title: title,
       description: description,
+      title: title,
     };
   } catch {
     return {
-      title: `${shortenIfAddress(params.contractAddress)} | ${params.chainIdOrSlug}`,
       description: `View tokens, transactions, balances, source code, and analytics for the smart contract  on Chain ID ${params.chainIdOrSlug}`,
+      title: `${shortenIfAddress(params.contractAddress)} | ${params.chainIdOrSlug}`,
     };
   }
 }
@@ -216,7 +216,10 @@ export async function generateContractLayoutMetadata(params: {
 function ConditionalTeamHeaderLayout({
   children,
   projectMeta,
-}: { children: React.ReactNode; projectMeta: ProjectMeta | undefined }) {
+}: {
+  children: React.ReactNode;
+  projectMeta: ProjectMeta | undefined;
+}) {
   // if inside a project page - do not another team header
   if (projectMeta) {
     return children;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-overview-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-overview-page.tsx
index 3b8ae7b00a3..bb090c31087 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-overview-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-overview-page.tsx
@@ -21,8 +21,8 @@ export async function SharedContractOverviewPage(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -36,9 +36,9 @@ export async function SharedContractOverviewPage(props: {
   if (isLocalhostChain) {
     return (
       <ContractOverviewPageClient
-        projectMeta={props.projectMeta}
         chainMetadata={chainMetadata}
         contract={clientContract}
+        projectMeta={props.projectMeta}
       />
     );
   }
@@ -49,9 +49,9 @@ export async function SharedContractOverviewPage(props: {
     if (renderNewPublicPage) {
       return (
         <RenderNewPublicContractPage
-          serverContract={serverContract}
-          clientContract={clientContract}
           chainMetadata={chainMetadata}
+          clientContract={clientContract}
+          serverContract={serverContract}
           type={renderNewPublicPage.type}
         />
       );
@@ -62,19 +62,19 @@ export async function SharedContractOverviewPage(props: {
 
   return (
     <ContractOverviewPage
+      chainSlug={chainMetadata.slug}
       contract={clientContract}
-      projectMeta={props.projectMeta}
+      functionSelectors={contractPageMetadata.functionSelectors}
       hasDirectListings={contractPageMetadata.isDirectListingSupported}
       hasEnglishAuctions={contractPageMetadata.isEnglishAuctionSupported}
-      isErc1155={contractPageMetadata.supportedERCs.isERC1155}
+      isAnalyticsSupported={contractPageMetadata.isInsightSupported}
       isErc20={contractPageMetadata.supportedERCs.isERC20}
       isErc721={contractPageMetadata.supportedERCs.isERC721}
+      isErc1155={contractPageMetadata.supportedERCs.isERC1155}
       isPermissionsEnumerable={
         contractPageMetadata.isPermissionsEnumerableSupported
       }
-      chainSlug={chainMetadata.slug}
-      isAnalyticsSupported={contractPageMetadata.isInsightSupported}
-      functionSelectors={contractPageMetadata.functionSelectors}
+      projectMeta={props.projectMeta}
       publishedBy={
         <ErrorBoundary fallback={null}>
           <PublishedBy contract={serverContract} />
@@ -94,9 +94,9 @@ function RenderNewPublicContractPage(props: {
     case "erc20": {
       return (
         <ERC20PublicPage
-          serverContract={props.serverContract}
-          clientContract={props.clientContract}
           chainMetadata={props.chainMetadata}
+          clientContract={props.clientContract}
+          serverContract={props.serverContract}
         />
       );
     }
@@ -105,11 +105,11 @@ function RenderNewPublicContractPage(props: {
     case "erc721": {
       return (
         <NFTPublicPage
-          serverContract={props.serverContract}
-          clientContract={props.clientContract}
           chainMetadata={props.chainMetadata}
-          type={props.type}
+          clientContract={props.clientContract}
+          serverContract={props.serverContract}
           tokenId={undefined}
+          type={props.type}
         />
       );
     }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx
index 13020d4b0b5..bb31e88e8ba 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx
@@ -1,16 +1,5 @@
 "use client";
 
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { useResolveContractAbi } from "@3rdweb-sdk/react/hooks/useResolveContractAbi";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { SourcesPanel } from "components/contract-components/shared/sources-panel";
@@ -24,6 +13,17 @@ import {
 import { useMemo } from "react";
 import { toast } from "sonner";
 import type { ThirdwebContract } from "thirdweb";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 type VerificationResult = {
   explorerUrl: string;
@@ -37,14 +37,14 @@ export async function verifyContract(contract: ThirdwebContract) {
     const response = await fetch(
       "https://contract.thirdweb.com/verify/contract",
       {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
         body: JSON.stringify({
-          contractAddress: contract.address,
           chainId: contract.chain.id,
+          contractAddress: contract.address,
         }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+        method: "POST",
       },
     );
 
@@ -64,8 +64,8 @@ function VerifyContractModalContent({
   contract: ThirdwebContract;
 }) {
   const verifyQuery = useQuery({
-    queryKey: ["verify-contract", contract.chain.id, contract.address],
     queryFn: () => verifyContract(contract),
+    queryKey: ["verify-contract", contract.chain.id, contract.address],
   });
 
   return (
@@ -94,8 +94,8 @@ function VerifyContractModalContent({
         <div className="flex flex-col gap-2">
           {verifyQuery.data.results.map(
             (result: VerificationResult, index: number) => (
-              // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-              <div key={index} className="flex items-center gap-2">
+              // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
+              <div className="flex items-center gap-2" key={index}>
                 {result.success && (
                   <>
                     <CircleCheckIcon className="size-4 text-green-600" />
@@ -131,7 +131,9 @@ function VerifyContractModalContent({
 
 export function ContractSourcesPage({
   contract,
-}: { contract: ThirdwebContract }) {
+}: {
+  contract: ThirdwebContract;
+}) {
   const contractSourcesQuery = useContractSources(contract);
   const abiQuery = useResolveContractAbi(contract);
 
@@ -189,7 +191,7 @@ export function ContractSourcesPage({
 
       <div className="h-4" />
       <div className="rounded-lg border bg-card">
-        <SourcesPanel sources={sources} abi={abiQuery.data} />
+        <SourcesPanel abi={abiQuery.data} sources={sources} />
       </div>
     </div>
   );
@@ -234,17 +236,17 @@ function RefreshContractMetadataButton(props: {
 
   return (
     <Button
+      className="gap-2 bg-card"
       disabled={contractCacheMutation.isPending}
-      variant="outline"
       onClick={() => {
         toast.promise(contractCacheMutation.mutateAsync(), {
           duration: 5000,
-          success: () => "Contract refreshed successfully",
           error: (e) => e?.message || "Failed to refresh contract data.",
+          success: () => "Contract refreshed successfully",
         });
       }}
       size="sm"
-      className="gap-2 bg-card"
+      variant="outline"
     >
       {contractCacheMutation.isPending ? (
         <Spinner className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/page.tsx
index 906d0357729..08b824a32ae 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/page.tsx
@@ -7,8 +7,8 @@ export default async function Page(props: {
   const params = await props.params;
   return (
     <SharedContractSourcesPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
+      contractAddress={params.contractAddress}
       projectMeta={undefined}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/shared-sources-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/shared-sources-page.tsx
index b1b54816993..2ab5402f501 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/shared-sources-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/shared-sources-page.tsx
@@ -11,8 +11,8 @@ export async function SharedContractSourcesPage(props: {
   projectMeta: ProjectMeta | undefined;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -25,8 +25,8 @@ export async function SharedContractSourcesPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/ContractSplitPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/ContractSplitPage.tsx
index 48886eb96fa..55cc0cfc6e2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/ContractSplitPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/ContractSplitPage.tsx
@@ -13,9 +13,9 @@ import { useAllChainsData } from "hooks/chains/allChains";
 import { useMemo } from "react";
 import {
   type ThirdwebContract,
-  ZERO_ADDRESS,
   toEther,
   toTokens,
+  ZERO_ADDRESS,
 } from "thirdweb";
 import { getAllRecipientsPercentages } from "thirdweb/extensions/split";
 import {
@@ -51,8 +51,8 @@ export const ContractSplitPage: React.FC<SplitPageProps> = ({
   const contractAddress = contract.address;
   const nativeBalanceQuery = useWalletBalance({
     address: contractAddress,
-    client: contract.client,
     chain: contract.chain,
+    client: contract.client,
   });
   const { data: allRecipientsPercentages } = useReadContract(
     getAllRecipientsPercentages,
@@ -66,11 +66,11 @@ export const ContractSplitPage: React.FC<SplitPageProps> = ({
 
     return [
       {
-        name: "Native Token",
-        token_address: ZERO_ADDRESS,
         balance: nativeBalanceQuery?.data?.value?.toString() || "0",
-        display_balance: nativeBalanceQuery?.data?.displayValue || "0.0",
         decimals: nativeBalanceQuery?.data?.decimals || 18,
+        display_balance: nativeBalanceQuery?.data?.displayValue || "0.0",
+        name: "Native Token",
+        token_address: ZERO_ADDRESS,
       },
       ...(balanceQuery.data || []).filter((bl) => bl.name !== "Native Token"),
     ];
@@ -104,23 +104,23 @@ export const ContractSplitPage: React.FC<SplitPageProps> = ({
 
   return (
     <Flex direction="column" gap={6}>
-      <Flex direction="row" justify="space-between" align="center">
+      <Flex align="center" direction="row" justify="space-between">
         <Heading size="title.sm">Balances</Heading>
         <Flex gap={4}>
           <DistributeButton
             balances={balances as Balance[]}
+            balancesIsError={balanceQuery.isError && nativeBalanceQuery.isError}
             balancesIsPending={
               balanceQuery.isPending || nativeBalanceQuery.isPending
             }
-            balancesIsError={balanceQuery.isError && nativeBalanceQuery.isError}
             contract={contract}
             isLoggedIn={isLoggedIn}
           />
         </Flex>
       </Flex>
       <div className="flex flex-col gap-8">
-        <Flex gap={4} flexDir="column">
-          <SimpleGrid spacing={{ base: 3, md: 6 }} columns={{ base: 2, md: 4 }}>
+        <Flex flexDir="column" gap={4}>
+          <SimpleGrid columns={{ base: 2, md: 4 }} spacing={{ base: 3, md: 6 }}>
             <Card as={Stat}>
               <StatLabel mb={{ base: 1, md: 0 }}>
                 {nativeBalanceQuery.data?.symbol}
@@ -195,7 +195,7 @@ export const ContractSplitPage: React.FC<SplitPageProps> = ({
         </Flex>
 
         <div className="flex flex-col gap-2">
-          <Heading size="label.lg" mb="8px">
+          <Heading mb="8px" size="label.lg">
             Split Recipients
           </Heading>
           {(allRecipientsPercentages || []).map((split) => (
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/components/distribute-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/components/distribute-button.tsx
index 78d398a81c4..dbc10627113 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/components/distribute-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/components/distribute-button.tsx
@@ -1,12 +1,11 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import { useSplitDistributeFunds } from "@3rdweb-sdk/react/hooks/useSplit";
 import { TransactionButton } from "components/buttons/TransactionButton";
-
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { useMemo } from "react";
 import type { ThirdwebContract } from "thirdweb";
+import { Button } from "@/components/ui/button";
 import type { Balance } from "../ContractSplitPage";
 
 interface DistributeButtonProps {
@@ -52,26 +51,26 @@ export const DistributeButton: React.FC<DistributeButtonProps> = ({
 
   const distributeFunds = () => {
     mutation.mutate(undefined, {
-      onSuccess: () => {
-        onSuccess();
-      },
       onError: (error) => {
         console.error(error);
         onError(error);
       },
+      onSuccess: () => {
+        onSuccess();
+      },
     });
   };
 
   if (balancesIsError) {
     return (
       <TransactionButton
-        isLoggedIn={isLoggedIn}
         client={contract.client}
+        isLoggedIn={isLoggedIn}
         isPending={mutation.isPending}
         onClick={distributeFunds}
-        txChainID={contract.chain.id}
-        // if we fail to get the balances, we can't know how many transactions there are going to be
         transactionCount={undefined}
+        // if we fail to get the balances, we can't know how many transactions there are going to be
+        txChainID={contract.chain.id}
         {...restButtonProps}
       >
         Distribute Funds
@@ -89,11 +88,11 @@ export const DistributeButton: React.FC<DistributeButtonProps> = ({
 
   return (
     <TransactionButton
-      isLoggedIn={isLoggedIn}
       client={contract.client}
-      transactionCount={numTransactions}
+      isLoggedIn={isLoggedIn}
       isPending={mutation.isPending}
       onClick={distributeFunds}
+      transactionCount={numTransactions}
       {...restButtonProps}
       txChainID={contract.chain.id}
     >
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/page.tsx
index 7631d86e62d..f399e8cc6da 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/page.tsx
@@ -9,10 +9,10 @@ export default async function Page(props: {
 
   return (
     <SharedContractSplitPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/shared-split-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/shared-split-page.tsx
index 9a00561e6c7..010740d1160 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/shared-split-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/shared-split-page.tsx
@@ -13,8 +13,8 @@ export async function SharedContractSplitPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -26,9 +26,9 @@ export async function SharedContractSplitPage(props: {
   if (isLocalhostChain) {
     return (
       <ContractSplitPageClient
-        projectMeta={props.projectMeta}
         contract={clientContract}
         isLoggedIn={props.isLoggedIn}
+        projectMeta={props.projectMeta}
       />
     );
   }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/ContractTokensPage.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/ContractTokensPage.client.tsx
index f7fc95cd489..b0852cbe3e4 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/ContractTokensPage.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/ContractTokensPage.client.tsx
@@ -27,10 +27,10 @@ export function ContractTokensPageClient(props: {
   return (
     <ContractTokensPage
       contract={props.contract}
-      isERC20={supportedERCs.isERC20}
-      isMintToSupported={isMintToSupported(functionSelectors)}
       isClaimToSupported={isClaimToSupported(functionSelectors)}
+      isERC20={supportedERCs.isERC20}
       isLoggedIn={props.isLoggedIn}
+      isMintToSupported={isMintToSupported(functionSelectors)}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/ContractTokensPage.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/ContractTokensPage.tsx
index 4e2fa0c4215..87cc509c228 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/ContractTokensPage.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/ContractTokensPage.tsx
@@ -34,9 +34,9 @@ export const ContractTokensPage: React.FC<ContractTokenPageProps> = ({
         </Text>
         <div>
           <LinkButton
-            isExternal
-            href="https://portal.thirdweb.com/contracts/build/extensions/erc-20/ERC20"
             colorScheme="purple"
+            href="https://portal.thirdweb.com/contracts/build/extensions/erc-20/ERC20"
+            isExternal
           >
             Learn more
           </LinkButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-button.tsx
index f3dc088d3a6..8f25d0c7a96 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-button.tsx
@@ -1,5 +1,10 @@
 "use client";
 
+import { DropletIcon } from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebContract } from "thirdweb";
+import { balanceOf } from "thirdweb/extensions/erc20";
+import { useActiveAccount, useReadContract } from "thirdweb/react";
 import { Button } from "@/components/ui/button";
 import {
   Sheet,
@@ -8,11 +13,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { DropletIcon } from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebContract } from "thirdweb";
-import { balanceOf } from "thirdweb/extensions/erc20";
-import { useActiveAccount, useReadContract } from "thirdweb/react";
 import { TokenAirdropForm } from "./airdrop-form";
 
 interface TokenAirdropButtonProps {
@@ -27,20 +27,20 @@ export const TokenAirdropButton: React.FC<TokenAirdropButtonProps> = ({
 }) => {
   const address = useActiveAccount()?.address;
   const tokenBalanceQuery = useReadContract(balanceOf, {
-    contract,
     address: address || "",
+    contract,
     queryOptions: { enabled: !!address },
   });
   const hasBalance = tokenBalanceQuery.data && tokenBalanceQuery.data > 0n;
   const [open, setOpen] = useState(false);
   return (
-    <Sheet open={open} onOpenChange={setOpen}>
+    <Sheet onOpenChange={setOpen} open={open}>
       <SheetTrigger asChild>
         <Button
           variant="primary"
           {...restButtonProps}
-          disabled={!hasBalance}
           className="gap-2"
+          disabled={!hasBalance}
         >
           <DropletIcon size={16} /> Airdrop
         </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx
index c9fac250ea1..ec95dd8b45e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx
@@ -48,24 +48,24 @@ export const TokenAirdropForm: React.FC<TokenAirdropFormProps> = ({
           onSubmit={handleSubmit(async (data) => {
             try {
               const tx = transferBatch({
-                contract,
                 batch: data.addresses
                   .filter((address) => address.quantity !== undefined)
                   .map((address) => ({
-                    to: address.address,
                     amount: address.quantity,
+                    to: address.address,
                   })),
+                contract,
               });
               await sendTransaction.mutateAsync(tx, {
+                onError: (error) => {
+                  console.error(error);
+                },
                 onSuccess: () => {
                   // Close the sheet/modal on success
                   if (toggle) {
                     toggle(false);
                   }
                 },
-                onError: (error) => {
-                  console.error(error);
-                },
               });
               airdropNotifications.onSuccess();
             } catch (err) {
@@ -86,8 +86,8 @@ export const TokenAirdropForm: React.FC<TokenAirdropFormProps> = ({
             ) : (
               <div className="flex flex-col gap-4 md:flex-row">
                 <Button
-                  colorScheme="primary"
                   borderRadius="md"
+                  colorScheme="primary"
                   onClick={() => setAirdropFormOpen(true)}
                   rightIcon={<UploadIcon className="size-4" />}
                 >
@@ -96,7 +96,7 @@ export const TokenAirdropForm: React.FC<TokenAirdropFormProps> = ({
                 {addresses.length > 0 && (
                   <div className="flex flex-row items-center justify-center gap-2 text-green-500">
                     <CircleCheckIcon className="text-green-500" size={16} />
-                    <Text size="body.sm" color="inherit">
+                    <Text color="inherit" size="body.sm">
                       <strong>{addresses.length} addresses</strong> ready to be
                       airdropped
                     </Text>
@@ -116,13 +116,13 @@ export const TokenAirdropForm: React.FC<TokenAirdropFormProps> = ({
                 </Text>
               )}
               <TransactionButton
+                className="self-end"
                 client={contract.client}
                 isLoggedIn={isLoggedIn}
-                transactionCount={1}
                 isPending={sendTransaction.isPending}
-                type="submit"
-                className="self-end"
+                transactionCount={1}
                 txChainID={contract.chain.id}
+                type="submit"
               >
                 Airdrop
               </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-upload.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-upload.tsx
index 7b715894668..9818a6bb45a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-upload.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-upload.tsx
@@ -1,7 +1,3 @@
-import { UnorderedList } from "@/components/ui/List/List";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import { Link } from "@chakra-ui/react";
 import { useCsvUpload } from "hooks/useCsvUpload";
 import { CircleAlertIcon, UploadIcon } from "lucide-react";
@@ -10,6 +6,10 @@ import { useDropzone } from "react-dropzone";
 import type { Column } from "react-table";
 import { type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
 import { Button, Heading, Text } from "tw-components";
+import { UnorderedList } from "@/components/ui/List/List";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
 import { CsvDataTable } from "../../_components/csv-data-table";
 
 export interface AirdropAddressInput {
@@ -37,7 +37,7 @@ export const AirdropUpload: React.FC<AirdropUploadProps> = ({
   onClose,
   client,
 }) => {
-  const csvUpload = useCsvUpload<AirdropAddressInput>({ csvParser, client });
+  const csvUpload = useCsvUpload<AirdropAddressInput>({ client, csvParser });
   const dropzone = useDropzone({
     onDrop: csvUpload.setFiles,
   });
@@ -49,7 +49,6 @@ export const AirdropUpload: React.FC<AirdropUploadProps> = ({
   const columns = useMemo(() => {
     return [
       {
-        Header: "Address",
         accessor: ({ address, isValid }) => {
           if (isValid) {
             return address;
@@ -73,12 +72,13 @@ export const AirdropUpload: React.FC<AirdropUploadProps> = ({
             </ToolTipLabel>
           );
         },
+        Header: "Address",
       },
       {
-        Header: "Quantity",
         accessor: ({ quantity }: { quantity: string }) => {
           return quantity || "1";
         },
+        Header: "Quantity",
       },
     ] as Column<AirdropAddressInput>[];
   }, []);
@@ -106,9 +106,9 @@ export const AirdropUpload: React.FC<AirdropUploadProps> = ({
       {normalizeData.result.length && csvUpload.rawData.length > 0 ? (
         <>
           <CsvDataTable<AirdropAddressInput>
-            portalRef={paginationPortalRef}
-            data={csvUpload.normalizeQuery.data.result}
             columns={columns}
+            data={csvUpload.normalizeQuery.data.result}
+            portalRef={paginationPortalRef}
           />
           <div className="mt-4 flex flex-col justify-between md:mt-0">
             <div ref={paginationPortalRef} />
@@ -139,9 +139,9 @@ export const AirdropUpload: React.FC<AirdropUploadProps> = ({
                 <Button
                   borderRadius="md"
                   colorScheme="primary"
+                  isDisabled={csvUpload.rawData.length === 0}
                   onClick={onSave}
                   w={{ base: "100%", md: "auto" }}
-                  isDisabled={csvUpload.rawData.length === 0}
                 >
                   Next
                 </Button>
@@ -173,8 +173,8 @@ export const AirdropUpload: React.FC<AirdropUploadProps> = ({
                 ) : (
                   <Heading
                     as={Text}
-                    size="label.md"
                     color={csvUpload.noCsv ? "red.500" : "gray.600"}
+                    size="label.md"
                   >
                     {csvUpload.noCsv
                       ? `No valid CSV file found, make sure your CSV includes the "address" & "quantity" column.`
@@ -192,8 +192,8 @@ export const AirdropUpload: React.FC<AirdropUploadProps> = ({
                 quantity column, if the quantity column is not provided, that
                 record will be flagged as invalid.
                 <Link
-                  download
                   color="primary.500"
+                  download
                   href="/assets/examples/airdrop.csv"
                 >
                   Download an example CSV
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/burn-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/burn-button.tsx
index 5072eba3d2e..04673d952f5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/burn-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/burn-button.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Sheet,
-  SheetContent,
-  SheetFooter,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
 import { FormControl, Input } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { FlameIcon } from "lucide-react";
@@ -28,6 +19,15 @@ import {
   FormLabel,
   Text,
 } from "tw-components";
+import { Button } from "@/components/ui/button";
+import {
+  Sheet,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
 
 interface TokenBurnButtonProps {
   contract: ThirdwebContract;
@@ -44,8 +44,8 @@ export const TokenBurnButton: React.FC<TokenBurnButtonProps> = ({
   const address = useActiveAccount()?.address;
 
   const tokenBalanceQuery = useReadContract(ERC20Ext.balanceOf, {
-    contract,
     address: address || "",
+    contract,
     queryOptions: { enabled: !!address },
   });
 
@@ -56,13 +56,13 @@ export const TokenBurnButton: React.FC<TokenBurnButtonProps> = ({
   const decimalsQuery = useReadContract(ERC20Ext.decimals, { contract });
 
   return (
-    <Sheet open={open} onOpenChange={setOpen}>
+    <Sheet onOpenChange={setOpen} open={open}>
       <SheetTrigger asChild>
         <Button
           variant="primary"
           {...restButtonProps}
-          disabled={!hasBalance}
           className="gap-2"
+          disabled={!hasBalance}
         >
           <FlameIcon className="size-4" /> Burn
         </Button>
@@ -73,11 +73,11 @@ export const TokenBurnButton: React.FC<TokenBurnButtonProps> = ({
         </SheetHeader>
         <form className="mt-10 flex flex-col gap-3">
           <div className="flex w-full flex-col gap-6 md:flex-row">
-            <FormControl isRequired isInvalid={!!form.formState.errors.amount}>
+            <FormControl isInvalid={!!form.formState.errors.amount} isRequired>
               <FormLabel>Amount</FormLabel>
               <Input
-                type="text"
                 pattern={`^\\d+(\\.\\d{1,${decimalsQuery.data || 18}})?$`}
+                type="text"
                 {...form.register("amount")}
               />
               <FormHelperText>How many would you like to burn?</FormHelperText>
@@ -95,19 +95,15 @@ export const TokenBurnButton: React.FC<TokenBurnButtonProps> = ({
         </form>
         <SheetFooter className="mt-10">
           <TransactionButton
-            isLoggedIn={isLoggedIn}
             client={contract.client}
-            txChainID={contract.chain.id}
-            transactionCount={1}
+            disabled={!form.formState.isDirty}
             form={BURN_FORM_ID}
+            isLoggedIn={isLoggedIn}
             isPending={sendConfirmation.isPending}
-            type="submit"
-            disabled={!form.formState.isDirty}
             onClick={form.handleSubmit((data) => {
               if (address) {
                 // TODO: burn should be updated to take amount / amountWei (v6?)
                 const tx = ERC20Ext.burn({
-                  contract,
                   asyncParams: async () => {
                     return {
                       amount: toUnits(
@@ -116,24 +112,28 @@ export const TokenBurnButton: React.FC<TokenBurnButtonProps> = ({
                       ),
                     };
                   },
+                  contract,
                 });
 
                 const promise = sendConfirmation.mutateAsync(tx, {
+                  onError: (error) => {
+                    console.error(error);
+                  },
                   onSuccess: () => {
                     form.reset({ amount: "0" });
                     setOpen(false);
                   },
-                  onError: (error) => {
-                    console.error(error);
-                  },
                 });
                 toast.promise(promise, {
+                  error: "Failed to burn tokens",
                   loading: `Burning ${data.amount} token(s)`,
                   success: "Tokens burned successfully",
-                  error: "Failed to burn tokens",
                 });
               }
             })}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             Burn Tokens
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/claim-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/claim-button.tsx
index 1cc58ca872b..74753fc797a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/claim-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/claim-button.tsx
@@ -1,17 +1,7 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Sheet,
-  SheetContent,
-  SheetFooter,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
 import { FormControl, Input } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
-
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { GemIcon } from "lucide-react";
 import { useState } from "react";
@@ -25,6 +15,15 @@ import {
   useSendAndConfirmTransaction,
 } from "thirdweb/react";
 import { FormErrorMessage, FormHelperText, FormLabel } from "tw-components";
+import { Button } from "@/components/ui/button";
+import {
+  Sheet,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
 
 interface TokenClaimButtonProps {
   contract: ThirdwebContract;
@@ -52,9 +51,9 @@ export const TokenClaimButton: React.FC<TokenClaimButtonProps> = ({
     "Failed to claim tokens",
   );
   return (
-    <Sheet open={open} onOpenChange={setOpen}>
+    <Sheet onOpenChange={setOpen} open={open}>
       <SheetTrigger asChild>
-        <Button variant="primary" className="gap-2" {...restButtonProps}>
+        <Button className="gap-2" variant="primary" {...restButtonProps}>
           <GemIcon size={16} /> Claim
         </Button>
       </SheetTrigger>
@@ -64,7 +63,7 @@ export const TokenClaimButton: React.FC<TokenClaimButtonProps> = ({
         </SheetHeader>
         <form>
           <div className="mt-10 flex flex-col gap-6">
-            <FormControl isRequired isInvalid={!!form.formState.errors.to}>
+            <FormControl isInvalid={!!form.formState.errors.to} isRequired>
               <FormLabel>To Address</FormLabel>
               <Input
                 placeholder={ZERO_ADDRESS}
@@ -75,11 +74,11 @@ export const TokenClaimButton: React.FC<TokenClaimButtonProps> = ({
                 {form.formState.errors.to?.message}
               </FormErrorMessage>
             </FormControl>
-            <FormControl isRequired isInvalid={!!form.formState.errors.amount}>
+            <FormControl isInvalid={!!form.formState.errors.amount} isRequired>
               <FormLabel>Amount</FormLabel>
               <Input
-                type="text"
                 pattern={`^\\d+(\\.\\d{1,${_decimals || 18}})?$`}
+                type="text"
                 {...form.register("amount", { required: true })}
               />
               <FormHelperText>How many would you like to claim?</FormHelperText>
@@ -91,14 +90,11 @@ export const TokenClaimButton: React.FC<TokenClaimButtonProps> = ({
         </form>
         <SheetFooter className="mt-10">
           <TransactionButton
-            isLoggedIn={isLoggedIn}
-            txChainID={contract.chain.id}
             client={contract.client}
-            transactionCount={1}
+            disabled={!form.formState.isDirty || isPending}
             form={CLAIM_FORM_ID}
+            isLoggedIn={isLoggedIn}
             isPending={form.formState.isSubmitting}
-            type="submit"
-            disabled={!form.formState.isDirty || isPending}
             onClick={form.handleSubmit(async (d) => {
               try {
                 if (!d.to) {
@@ -112,14 +108,14 @@ export const TokenClaimButton: React.FC<TokenClaimButtonProps> = ({
                 }
                 const transaction = ERC20Ext.claimTo({
                   contract,
-                  to: d.to,
-                  quantity: d.amount,
                   from: account.address,
+                  quantity: d.amount,
+                  to: d.to,
                 });
 
                 const approveTx = await ERC20Ext.getApprovalForTransaction({
-                  transaction,
                   account,
+                  transaction,
                 });
 
                 if (approveTx) {
@@ -132,22 +128,22 @@ export const TokenClaimButton: React.FC<TokenClaimButtonProps> = ({
                     },
                   );
                   toast.promise(promise, {
+                    error: "Failed to approve token",
                     loading: "Approving ERC20 tokens for this claim",
                     success: "Tokens approved successfully",
-                    error: "Failed to approve token",
                   });
 
                   await promise;
                 }
 
                 await sendAndConfirmTransaction.mutateAsync(transaction, {
+                  onError: (error) => {
+                    console.error(error);
+                  },
                   onSuccess: () => {
                     form.reset({ amount: "0", to: account?.address });
                     setOpen(false);
                   },
-                  onError: (error) => {
-                    console.error(error);
-                  },
                 });
 
                 claimTokensNotifications.onSuccess();
@@ -156,6 +152,9 @@ export const TokenClaimButton: React.FC<TokenClaimButtonProps> = ({
                 claimTokensNotifications.onError(error);
               }
             })}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             Claim Tokens
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/mint-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/mint-button.tsx
index 551d14df178..c21dea948f9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/mint-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/mint-button.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Sheet,
-  SheetContent,
-  SheetFooter,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
 import { MinterOnly } from "@3rdweb-sdk/react/components/roles/minter-only";
 import { FormControl, Input } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
@@ -24,6 +15,15 @@ import {
   useSendAndConfirmTransaction,
 } from "thirdweb/react";
 import { FormErrorMessage, FormLabel } from "tw-components";
+import { Button } from "@/components/ui/button";
+import {
+  Sheet,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
 
 interface TokenMintButtonProps {
   contract: ThirdwebContract;
@@ -49,7 +49,7 @@ export const TokenMintButton: React.FC<TokenMintButtonProps> = ({
   const form = useForm({ defaultValues: { amount: "0" } });
   return (
     <MinterOnly contract={contract}>
-      <Sheet open={open} onOpenChange={setOpen}>
+      <Sheet onOpenChange={setOpen} open={open}>
         <SheetTrigger asChild>
           <Button variant="primary" {...restButtonProps} className="gap-2">
             <PlusIcon size={16} /> Mint
@@ -69,34 +69,34 @@ export const TokenMintButton: React.FC<TokenMintButtonProps> = ({
                 return toast.error("No wallet connected");
               }
               const transaction = ERC20Ext.mintTo({
-                contract,
                 amount: d.amount,
+                contract,
                 to: address,
               });
               const promise = sendAndConfirmTransaction.mutateAsync(
                 transaction,
                 {
+                  onError: (error) => {
+                    console.error(error);
+                  },
                   onSuccess: () => {
                     form.reset({ amount: "0" });
                     setOpen(false);
                   },
-                  onError: (error) => {
-                    console.error(error);
-                  },
                 },
               );
               toast.promise(promise, {
+                error: "Failed to mint tokens",
                 loading: "Minting tokens",
                 success: "Tokens minted successfully",
-                error: "Failed to mint tokens",
               });
             })}
           >
-            <FormControl isRequired isInvalid={!!form.formState.errors.amount}>
+            <FormControl isInvalid={!!form.formState.errors.amount} isRequired>
               <FormLabel>Additional Supply</FormLabel>
               <Input
-                type="text"
                 pattern={`^\\d+(\\.\\d{1,${tokenDecimals || 18}})?$`}
+                type="text"
                 {...form.register("amount")}
               />
               <FormErrorMessage>
@@ -107,13 +107,13 @@ export const TokenMintButton: React.FC<TokenMintButtonProps> = ({
           <SheetFooter className="mt-10">
             <TransactionButton
               client={contract.client}
+              disabled={!form.formState.isDirty}
+              form={MINT_FORM_ID}
               isLoggedIn={isLoggedIn}
-              txChainID={contract.chain.id}
-              transactionCount={1}
               isPending={sendAndConfirmTransaction.isPending}
-              form={MINT_FORM_ID}
+              transactionCount={1}
+              txChainID={contract.chain.id}
               type="submit"
-              disabled={!form.formState.isDirty}
             >
               Mint Tokens
             </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/supply-layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/supply-layout.tsx
index 83da520d1be..d8e7f2f967a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/supply-layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/supply-layout.tsx
@@ -14,8 +14,8 @@ export function TokenDetailsCardUI(props: {
       </h2>
       <div className="flex flex-col gap-5 p-6 lg:flex-row">
         <Stat
-          label="Circulating Supply"
           isPending={!tokenSupply}
+          label="Circulating Supply"
           value={
             tokenSupply
               ? `${tokenSupply.displayValue} ${tokenSupply.symbol}`
@@ -25,8 +25,8 @@ export function TokenDetailsCardUI(props: {
 
         {isWalletConnected && (
           <Stat
-            label="Owned by you"
             isPending={!ownedBalance}
+            label="Owned by you"
             value={
               ownedBalance
                 ? `${ownedBalance?.displayValue} ${ownedBalance?.symbol}`
@@ -36,8 +36,8 @@ export function TokenDetailsCardUI(props: {
         )}
 
         <Stat
-          label="Decimals"
           isPending={!tokenSupply}
+          label="Decimals"
           value={tokenSupply ? tokenSupply?.decimals.toString() : ""}
         />
       </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/supply.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/supply.tsx
index 39997d601fe..3ffc9c8a674 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/supply.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/supply.tsx
@@ -20,8 +20,8 @@ export const TokenDetailsCard: React.FC<TokenBalancesProps> = ({
   const address = useActiveAccount()?.address;
 
   const ownedTokenBalanceQuery = useReadContract(getBalance, {
-    contract,
     address: address || "",
+    contract,
     queryOptions: { enabled: !!address },
   });
 
@@ -41,13 +41,13 @@ export const TokenDetailsCard: React.FC<TokenBalancesProps> = ({
 
     return {
       ...tokenMetadataQuery.data,
-      value: tokenSupplyQuery.data,
+      chainId: contract.chain.id,
       displayValue: toTokens(
         tokenSupplyQuery.data,
         tokenMetadataQuery.data.decimals,
       ),
       tokenAddress: contract.address,
-      chainId: contract.chain.id,
+      value: tokenSupplyQuery.data,
     };
   }, [
     tokenMetadataQuery.data,
@@ -59,8 +59,8 @@ export const TokenDetailsCard: React.FC<TokenBalancesProps> = ({
   return (
     <TokenDetailsCardUI
       isWalletConnected={!!address}
-      tokenSupply={tokenSupply}
       ownedBalance={ownedTokenBalanceQuery.data}
+      tokenSupply={tokenSupply}
     />
   );
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/transfer-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/transfer-button.tsx
index 5000213892e..b290561be10 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/transfer-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/transfer-button.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Sheet,
-  SheetContent,
-  SheetFooter,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from "@/components/ui/sheet";
 import { FormControl, Input } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
@@ -24,6 +15,15 @@ import {
   useSendAndConfirmTransaction,
 } from "thirdweb/react";
 import { FormErrorMessage, FormHelperText, FormLabel } from "tw-components";
+import { Button } from "@/components/ui/button";
+import {
+  Sheet,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
 
 interface TokenTransferButtonProps {
   contract: ThirdwebContract;
@@ -39,8 +39,8 @@ export const TokenTransferButton: React.FC<TokenTransferButtonProps> = ({
 }) => {
   const address = useActiveAccount()?.address;
   const tokenBalanceQuery = useReadContract(ERC20Ext.balanceOf, {
-    contract,
     address: address || "",
+    contract,
     queryOptions: { enabled: !!address },
   });
   const form = useForm({ defaultValues: { amount: "0", to: "" } });
@@ -50,13 +50,13 @@ export const TokenTransferButton: React.FC<TokenTransferButtonProps> = ({
   const [open, setOpen] = useState(false);
 
   return (
-    <Sheet open={open} onOpenChange={setOpen}>
+    <Sheet onOpenChange={setOpen} open={open}>
       <SheetTrigger asChild>
         <Button
           variant="primary"
           {...restButtonProps}
-          disabled={!hasBalance}
           className="gap-2"
+          disabled={!hasBalance}
         >
           <SendIcon size={16} /> Transfer
         </Button>
@@ -67,13 +67,13 @@ export const TokenTransferButton: React.FC<TokenTransferButtonProps> = ({
         </SheetHeader>
         <form className="mt-10">
           <div className="flex flex-col gap-6">
-            <FormControl isRequired isInvalid={!!form.formState.errors.to}>
+            <FormControl isInvalid={!!form.formState.errors.to} isRequired>
               <FormLabel>To Address</FormLabel>
               <SolidityInput
                 client={contract.client}
                 formContext={form}
-                solidityType="address"
                 placeholder={ZERO_ADDRESS}
+                solidityType="address"
                 {...form.register("to")}
               />
               <FormHelperText>Enter the address to transfer to.</FormHelperText>
@@ -81,11 +81,11 @@ export const TokenTransferButton: React.FC<TokenTransferButtonProps> = ({
                 {form.formState.errors.to?.message}
               </FormErrorMessage>
             </FormControl>
-            <FormControl isRequired isInvalid={!!form.formState.errors.amount}>
+            <FormControl isInvalid={!!form.formState.errors.amount} isRequired>
               <FormLabel>Amount</FormLabel>
               <Input
-                type="text"
                 pattern={`^\\d+(\\.\\d{1,${decimalsQuery.data || 18}})?$`}
+                type="text"
                 {...form.register("amount")}
               />
               <FormHelperText>
@@ -100,34 +100,34 @@ export const TokenTransferButton: React.FC<TokenTransferButtonProps> = ({
         <SheetFooter className="mt-10">
           <TransactionButton
             client={contract.client}
-            txChainID={contract.chain.id}
-            transactionCount={1}
-            isLoggedIn={isLoggedIn}
+            disabled={!form.formState.isDirty}
             form={TRANSFER_FORM_ID}
+            isLoggedIn={isLoggedIn}
             isPending={sendConfirmation.isPending}
-            type="submit"
-            disabled={!form.formState.isDirty}
             onClick={form.handleSubmit((d) => {
               const transaction = ERC20Ext.transfer({
-                contract,
                 amount: d.amount,
+                contract,
                 to: d.to,
               });
               const promise = sendConfirmation.mutateAsync(transaction, {
+                onError: (error) => {
+                  console.error(error);
+                },
                 onSuccess: () => {
                   form.reset({ amount: "0", to: "" });
                   setOpen(false);
                 },
-                onError: (error) => {
-                  console.error(error);
-                },
               });
               toast.promise(promise, {
+                error: "Failed to transfer tokens",
                 loading: "Transferring tokens",
                 success: "Successfully transferred tokens",
-                error: "Failed to transfer tokens",
               });
             })}
+            transactionCount={1}
+            txChainID={contract.chain.id}
+            type="submit"
           >
             Transfer Tokens
           </TransactionButton>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/page.tsx
index 721da7ea7ba..b45f7a6f02c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/page.tsx
@@ -9,10 +9,10 @@ export default async function Page(props: {
 
   return (
     <SharedContractTokensPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chain_id}
-      projectMeta={undefined}
+      contractAddress={params.contractAddress}
       isLoggedIn={!!account}
+      projectMeta={undefined}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/shared-page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/shared-page.tsx
index 49c28f18dc3..81aa34ab0bb 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/shared-page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/shared-page.tsx
@@ -18,8 +18,8 @@ export async function SharedContractTokensPage(props: {
   isLoggedIn: boolean;
 }) {
   const info = await getContractPageParamsInfo({
-    contractAddress: props.contractAddress,
     chainIdOrSlug: props.chainIdOrSlug,
+    contractAddress: props.contractAddress,
     teamId: props.projectMeta?.teamId,
   });
 
@@ -32,8 +32,8 @@ export async function SharedContractTokensPage(props: {
     const shouldHide = await shouldRenderNewPublicPage(info.serverContract);
     if (shouldHide) {
       redirectToContractLandingPage({
-        contractAddress: props.contractAddress,
         chainIdOrSlug: props.chainIdOrSlug,
+        contractAddress: props.contractAddress,
         projectMeta: props.projectMeta,
       });
     }
@@ -55,10 +55,10 @@ export async function SharedContractTokensPage(props: {
   return (
     <ContractTokensPage
       contract={info.clientContract}
-      isERC20={supportedERCs.isERC20}
-      isMintToSupported={isMintToSupported(functionSelectors)}
       isClaimToSupported={isClaimToSupported(functionSelectors)}
+      isERC20={supportedERCs.isERC20}
       isLoggedIn={props.isLoggedIn}
+      isMintToSupported={isMintToSupported(functionSelectors)}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/[txHash]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/[txHash]/page.tsx
index 665af1a0780..2a1337a3660 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/[txHash]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/[txHash]/page.tsx
@@ -1,8 +1,5 @@
-import { Badge } from "@/components/ui/badge";
-import { Separator } from "@/components/ui/separator";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { mapV4ChainToV5Chain } from "contexts/map-chains";
-import { ZERO_ADDRESS, toTokens } from "thirdweb";
+import { toTokens, ZERO_ADDRESS } from "thirdweb";
 import {
   eth_getBlockByHash,
   eth_getTransactionByHash,
@@ -10,6 +7,9 @@ import {
   getRpcClient,
 } from "thirdweb/rpc";
 import { hexToNumber, shortenAddress, toEther } from "thirdweb/utils";
+import { Badge } from "@/components/ui/badge";
+import { Separator } from "@/components/ui/separator";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { getChain } from "../../../utils";
 
 export default async function Page(props: {
@@ -19,10 +19,10 @@ export default async function Page(props: {
   const chain = await getChain(params.chain_id);
 
   const rpcRequest = getRpcClient({
-    client: serverThirdwebClient,
     // Do not include chain overrides for chain pages
     // eslint-disable-next-line no-restricted-syntax
     chain: mapV4ChainToV5Chain(chain),
+    client: serverThirdwebClient,
   });
 
   const [transaction, receipt] = await Promise.all([
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/layout.tsx
index 54487a6a596..3e1080ab125 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/layout.tsx
@@ -1,10 +1,6 @@
 import { TeamHeader } from "../../../../team/components/TeamHeader/team-header";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/[chain_type]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/[chain_type]/page.tsx
index cab118039a2..d058a60417a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/[chain_type]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/[chain_type]/page.tsx
@@ -1,3 +1,6 @@
+import { ChevronDownIcon } from "lucide-react";
+import { headers } from "next/headers";
+import Link from "next/link";
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -11,9 +14,6 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { ChevronDownIcon } from "lucide-react";
-import { headers } from "next/headers";
-import Link from "next/link";
 import { getAuthToken } from "../../../../api/lib/getAuthToken";
 import {
   AllFilters,
@@ -34,22 +34,22 @@ export async function generateMetadata(props: {
   const params = await props.params;
   if (params.chain_type === "mainnets") {
     return {
-      title: "List of Mainnets | Explorers, Popular Contracts & Chain IDs",
       description:
         "A list of EVM mainnets with RPCs, smart contracts, block explorers & faucets. Deploy smart contracts to all EVM chains with thirdweb.",
+      title: "List of Mainnets | Explorers, Popular Contracts & Chain IDs",
     };
   }
   if (params.chain_type === "testnets") {
     return {
-      title: "List of Testnets | Explorers, Popular Contracts & Chain IDs",
       description:
         "Browse all Testnets across web3 ecosystems, BNB Smart Chain Testnet, Ethereum Sepolia Testnets, Chain IDs, Enabled Services and more. ",
+      title: "List of Testnets | Explorers, Popular Contracts & Chain IDs",
     };
   }
   return {
-    title: "Chainlist: RPCs, Block Explorers, Faucets",
     description:
       "A list of EVM networks with RPCs, smart contracts, block explorers & faucets. Deploy smart contracts to all EVM chains with thirdweb.",
+    title: "Chainlist: RPCs, Block Explorers, Faucets",
   };
 }
 
@@ -147,9 +147,9 @@ export default async function ChainListLayout(props: {
         <div className="h-10" />
         {/* we used to have suspense + spinner here, that feels more jarring than the page loading _minutely_ slower */}
         <ChainsData
-          searchParams={searchParams}
           activeView={activeView}
           isLoggedIn={!!authToken}
+          searchParams={searchParams}
         />
       </section>
     </>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/filters.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/filters.tsx
index 5303a5c7a6b..cb69e35cdd2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/filters.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/filters.tsx
@@ -1,5 +1,9 @@
 "use client";
 
+import { ChevronDownIcon, FilterIcon, XIcon } from "lucide-react";
+import { usePathname, useSearchParams } from "next/navigation";
+import type React from "react";
+import { type PropsWithChildren, useCallback, useId, useMemo } from "react";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Label } from "@/components/ui/label";
@@ -11,10 +15,6 @@ import {
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { Separator } from "@/components/ui/separator";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { ChevronDownIcon, FilterIcon, XIcon } from "lucide-react";
-import { usePathname, useSearchParams } from "next/navigation";
-import type React from "react";
-import { type PropsWithChildren, useCallback, useMemo } from "react";
 import { products } from "../../../components/server/products";
 
 function cleanUrl(url: string) {
@@ -29,10 +29,10 @@ export function AllFilters(props: { hideChainType?: boolean }) {
     <Popover>
       <PopoverTrigger asChild>
         <Button
-          variant="outline"
           className="h-10 w-auto gap-2 p-2 lg:h-10 lg:border-0 lg:px-4 lg:py-2"
+          variant="outline"
         >
-          <FilterIcon strokeWidth={1} className="lg:size-4" />
+          <FilterIcon className="lg:size-4" strokeWidth={1} />
           <span className="hidden lg:inline">All Filters</span>
         </Button>
       </PopoverTrigger>
@@ -83,8 +83,6 @@ const FilterResetButton: React.FC<
 
   return (
     <Button
-      variant="outline"
-      size="sm"
       className="font-semibold"
       onClick={() => {
         // delete every filter (however keep the search term)
@@ -96,6 +94,8 @@ const FilterResetButton: React.FC<
         const url = cleanUrl(`${pathname}?${mutableSearchParams.toString()}`);
         router.push(url);
       }}
+      size="sm"
+      variant="outline"
     >
       {children}
     </Button>
@@ -147,26 +147,30 @@ export const ChainTypeFilter: React.FC<ChainTypeFilterProps> = ({
     }
   }, []);
 
+  const allId = useId();
+  const mainnetsId = useId();
+  const testnetsId = useId();
+
   const section = (
     <FilterSection title="Chain Type">
       <RadioGroup
-        value={value}
         onValueChange={(newValue) => {
           const url = makeUrl(newValue);
           router.replace(url);
         }}
+        value={value}
       >
         <div className="flex items-center gap-2">
-          <RadioGroupItem value="all" id="all" />
-          <Label htmlFor="all">All Chains</Label>
+          <RadioGroupItem id={allId} value="all" />
+          <Label htmlFor={allId}>All Chains</Label>
         </div>
         <div className="flex items-center gap-2">
-          <RadioGroupItem value="mainnets" id="mainnets" />
-          <Label htmlFor="mainnets">Mainnets Only</Label>
+          <RadioGroupItem id={mainnetsId} value="mainnets" />
+          <Label htmlFor={mainnetsId}>Mainnets Only</Label>
         </div>
         <div className="flex items-center gap-2">
-          <RadioGroupItem value="testnets" id="testnets" />
-          <Label htmlFor="testnets">Testnets Only</Label>
+          <RadioGroupItem id={testnetsId} value="testnets" />
+          <Label htmlFor={testnetsId}>Testnets Only</Label>
         </div>
       </RadioGroup>
     </FilterSection>
@@ -181,10 +185,10 @@ export const ChainTypeFilter: React.FC<ChainTypeFilterProps> = ({
       <div className="relative">
         <PopoverTrigger asChild>
           <Button
-            variant="outline"
             className={
               value === "all" ? "bg-card" : "border-active-border bg-card pr-11"
             }
+            variant="outline"
           >
             {value === "mainnets"
               ? "Mainnets Only"
@@ -196,13 +200,13 @@ export const ChainTypeFilter: React.FC<ChainTypeFilterProps> = ({
         </PopoverTrigger>
         {value !== "all" && (
           <Button
-            variant="ghost"
-            size="icon"
             className="absolute top-[1px] right-[1px] bottom-[1px] h-auto w-10 bg-card"
             onClick={() => {
               const url = makeUrl("all");
               router.replace(url);
             }}
+            size="icon"
+            variant="ghost"
           >
             <XIcon className="size-4" />
           </Button>
@@ -235,12 +239,14 @@ export const ChainOptionsFilter: React.FC<ChainOptionsFilterProps> = ({
     return searchParams?.has("includeDeprecated") || false;
   }, [searchParams]);
 
+  const deprecatedId = useId();
+
   const section = (
     <FilterSection title="Options">
       <div className="flex items-center gap-2">
         <Checkbox
-          id="deprecated"
           checked={hasDeprecated}
+          id={deprecatedId}
           onClick={() => {
             if (!hasDeprecated) {
               mutableSearchParams.set("includeDeprecated", "true");
@@ -255,8 +261,8 @@ export const ChainOptionsFilter: React.FC<ChainOptionsFilterProps> = ({
           }}
         />
         <Label
-          htmlFor="deprecated"
           className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+          htmlFor={deprecatedId}
         >
           Include Deprecated
         </Label>
@@ -276,10 +282,10 @@ export const ChainOptionsFilter: React.FC<ChainOptionsFilterProps> = ({
       <div className="relative">
         <PopoverTrigger asChild>
           <Button
-            variant="outline"
             className={
               hasFilters ? "border-active-border bg-card pr-11" : "bg-card"
             }
+            variant="outline"
           >
             Chain Options
             {!hasFilters && <ChevronDownIcon className="ml-2 size-4" />}
@@ -287,8 +293,6 @@ export const ChainOptionsFilter: React.FC<ChainOptionsFilterProps> = ({
         </PopoverTrigger>
         {hasFilters && (
           <Button
-            variant="ghost"
-            size="icon"
             className="absolute top-[1px] right-[1px] bottom-[1px] h-auto w-10 bg-card"
             onClick={() => {
               mutableSearchParams.delete("includeDeprecated");
@@ -298,6 +302,8 @@ export const ChainOptionsFilter: React.FC<ChainOptionsFilterProps> = ({
               );
               router.replace(url);
             }}
+            size="icon"
+            variant="ghost"
           >
             <XIcon className="size-4" />
           </Button>
@@ -342,8 +348,8 @@ export const ChainServiceFilter: React.FC<ChainServiceFilterProps> = ({
       {products.map((product) => (
         <div className="group flex items-center gap-2" key={product.id}>
           <Checkbox
-            id={product.id}
             checked={isServiceActive(mutableSearchParams, product.id)}
+            id={product.id}
             onClick={() => {
               toggleService(mutableSearchParams, product.id);
               mutableSearchParams.delete("page");
@@ -354,12 +360,13 @@ export const ChainServiceFilter: React.FC<ChainServiceFilterProps> = ({
             }}
           />
           <Label
-            htmlFor={product.id}
             className="font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+            htmlFor={product.id}
           >
             {product.name}
           </Label>
           <Button
+            className="ml-auto rounded-full group-hover:opacity-100 lg:opacity-0"
             onClick={() => {
               mutableSearchParams.delete("service");
               mutableSearchParams.append("service", product.id);
@@ -370,7 +377,6 @@ export const ChainServiceFilter: React.FC<ChainServiceFilterProps> = ({
               router.push(url);
             }}
             size="sm"
-            className="ml-auto rounded-full group-hover:opacity-100 lg:opacity-0"
             variant="ghost"
           >
             Only
@@ -402,10 +408,10 @@ export const ChainServiceFilter: React.FC<ChainServiceFilterProps> = ({
       <div className="relative">
         <PopoverTrigger asChild>
           <Button
-            variant="outline"
             className={
               hasActiveFilter ? "border-active-border bg-card pr-11" : "bg-card"
             }
+            variant="outline"
           >
             {buttonTitle}
             {!hasActiveFilter && <ChevronDownIcon className="ml-2 size-4" />}
@@ -413,8 +419,6 @@ export const ChainServiceFilter: React.FC<ChainServiceFilterProps> = ({
         </PopoverTrigger>
         {hasActiveFilter && (
           <Button
-            variant="ghost"
-            size="icon"
             className="absolute top-[1px] right-[1px] bottom-[1px] h-auto w-10"
             onClick={() => {
               mutableSearchParams.delete("service");
@@ -424,6 +428,8 @@ export const ChainServiceFilter: React.FC<ChainServiceFilterProps> = ({
               );
               router.replace(url);
             }}
+            size="icon"
+            variant="ghost"
           >
             <XIcon className="size-4" />
           </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/pagination.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/pagination.tsx
index 2da9d3bede2..019b21bfb80 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/pagination.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/pagination.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { PaginationButtons } from "@/components/pagination-buttons";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useCallback } from "react";
+import { PaginationButtons } from "@/components/pagination-buttons";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 type ChainlistPaginationProps = {
   totalPages: number;
@@ -30,8 +30,8 @@ export const ChainlistPagination: React.FC<ChainlistPaginationProps> = ({
   return (
     <PaginationButtons
       activePage={activePage}
-      totalPages={totalPages}
       onPageClick={(page) => router.push(createPageURL(page))}
+      totalPages={totalPages}
     />
   );
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/search.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/search.tsx
index 7d3734df15c..c90c5cce70f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/search.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/search.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { SearchIcon, XCircleIcon } from "lucide-react";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useEffect, useRef } from "react";
 import { useDebouncedCallback } from "use-debounce";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 function cleanUrl(url: string) {
   if (url.endsWith("?")) {
@@ -47,17 +47,15 @@ export const SearchInput: React.FC = () => {
     <div className="relative w-full">
       <SearchIcon className="-translate-y-1/2 absolute top-[50%] left-3 size-4 text-muted-foreground" />
       <Input
-        placeholder="Search by name or chain ID"
         className="h-10 rounded-lg bg-card py-2 pl-9 lg:min-w-[300px]"
         defaultValue={searchParams?.get("query") || ""}
         onChange={(e) => handleSearch(e.target.value)}
+        placeholder="Search by name or chain ID"
         ref={inputRef}
       />
       {searchParams?.has("query") && (
         <Button
-          size="icon"
           className="-translate-y-1/2 absolute top-[50%] right-2 text-muted-foreground"
-          variant="ghost"
           onClick={() => {
             const params = new URLSearchParams(searchParams ?? undefined);
             params.delete("query");
@@ -65,6 +63,8 @@ export const SearchInput: React.FC = () => {
             const url = cleanUrl(`${pathname}?${params.toString()}`);
             router.replace(url);
           }}
+          size="icon"
+          variant="ghost"
         >
           <XCircleIcon className="size-5" />
         </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/view.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/view.tsx
index e1f1677c01b..fbdc8fa454a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/view.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/view.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { Grid2X2Icon, ListIcon } from "lucide-react";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useCallback } from "react";
+import { Button } from "@/components/ui/button";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 type ChainListViewProps = {
   activeView: "grid" | "table";
@@ -26,22 +26,22 @@ export const ChainListView: React.FC<ChainListViewProps> = ({ activeView }) => {
   return (
     <div className="flex flex-row">
       <Button
-        size="icon"
-        variant={activeView === "table" ? "default" : "outline"}
+        className="rounded-r-none"
         onClick={() => {
           router.replace(createPageURL("table"));
         }}
-        className="rounded-r-none"
+        size="icon"
+        variant={activeView === "table" ? "default" : "outline"}
       >
         <ListIcon strokeWidth={1} />
       </Button>
       <Button
-        variant={activeView === "grid" ? "default" : "outline"}
-        size="icon"
+        className="rounded-l-none"
         onClick={() => {
           router.replace(createPageURL("grid"));
         }}
-        className="rounded-l-none"
+        size="icon"
+        variant={activeView === "grid" ? "default" : "outline"}
       >
         <Grid2X2Icon strokeWidth={1} />
       </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/add-chain-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/add-chain-button.tsx
index 309275211d9..5618eab206e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/add-chain-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/add-chain-button.tsx
@@ -1,15 +1,15 @@
-import { Button } from "@/components/ui/button";
 import { PlusIcon } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
 export function AddYourChainButton(props: { className?: string }) {
   return (
-    <Button asChild variant="default" className={props.className}>
+    <Button asChild className={props.className} variant="default">
       <Link
+        className="flex items-center gap-2"
         href="https://share.hsforms.com/1XDi-ieM9Rl6oIkn7ynK6Lgea58c"
-        target="_blank"
         rel="noopener noreferrer"
-        className="flex items-center gap-2"
+        target="_blank"
       >
         <PlusIcon className="size-4" />
         Add your chain
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chain-table.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chain-table.tsx
index 51fafdfe7cb..859556b5e2d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chain-table.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chain-table.tsx
@@ -1,3 +1,4 @@
+import Fuse from "fuse.js";
 import {
   Table,
   TableBody,
@@ -6,7 +7,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import Fuse from "fuse.js";
 import { StarButton } from "../../../components/client/star-button";
 import type {
   ChainMetadataWithServices,
@@ -126,14 +126,14 @@ async function getChainsToRender(params: SearchParams) {
           limit: DEFAULT_PAGE_SIZE,
         })
         .map((e) => e.item),
-      totalCount,
       filteredCount,
+      totalCount,
     };
   }
   return {
     chainsToRender: filteredChains,
-    totalCount,
     filteredCount,
+    totalCount,
   };
 }
 
@@ -177,7 +177,6 @@ export async function ChainsData(props: {
               <TableBody>
                 {paginatedChains.map((chain) => (
                   <ChainListRow
-                    key={chain.chainId}
                     chainId={chain.chainId}
                     chainName={chain.name}
                     chainSlug={chain.slug}
@@ -185,7 +184,6 @@ export async function ChainsData(props: {
                     enabledServices={chain.services
                       .filter((c) => c.enabled)
                       .map((c) => c.service)}
-                    isDeprecated={chain.status === "deprecated"}
                     favoriteButton={
                       props.isLoggedIn ? (
                         <div className="relative h-6 w-6">
@@ -197,6 +195,8 @@ export async function ChainsData(props: {
                       ) : undefined
                     }
                     iconUrl={chain.icon?.url}
+                    isDeprecated={chain.status === "deprecated"}
+                    key={chain.chainId}
                   />
                 ))}
               </TableBody>
@@ -205,9 +205,8 @@ export async function ChainsData(props: {
         ) : (
           <ul className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
             {paginatedChains.map((chain) => (
-              <li key={chain.chainId} className="h-full">
+              <li className="h-full" key={chain.chainId}>
                 <ChainListCard
-                  key={chain.chainId}
                   chainId={chain.chainId}
                   chainName={chain.name}
                   chainSlug={chain.slug}
@@ -215,7 +214,6 @@ export async function ChainsData(props: {
                   enabledServices={chain.services
                     .filter((c) => c.enabled)
                     .map((c) => c.service)}
-                  isDeprecated={chain.status === "deprecated"}
                   favoriteButton={
                     props.isLoggedIn ? (
                       <div className="relative h-6 w-6">
@@ -227,6 +225,8 @@ export async function ChainsData(props: {
                     ) : undefined
                   }
                   iconUrl={chain.icon?.url}
+                  isDeprecated={chain.status === "deprecated"}
+                  key={chain.chainId}
                 />
               </li>
             ))}
@@ -235,7 +235,7 @@ export async function ChainsData(props: {
       </main>
       <div className="h-10" />
       {totalPages > 1 && (
-        <ChainlistPagination totalPages={totalPages} activePage={activePage} />
+        <ChainlistPagination activePage={activePage} totalPages={totalPages} />
       )}
       <div className="h-4" />
       <p className="text-balance text-center text-muted-foreground text-sm">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-card.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-card.tsx
index 9deed1215c7..678ab2c5ced 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-card.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-card.tsx
@@ -1,8 +1,8 @@
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { CircleAlertIcon, TicketCheckIcon } from "lucide-react";
 import Link from "next/link";
 import type { JSX } from "react";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { ChainIcon } from "../../../components/server/chain-icon";
 import type { ChainSupportedService } from "../../../types/chain";
 import { getChainMetadata } from "../../../utils";
@@ -35,7 +35,7 @@ export async function ChainListCard({
       <Card className="h-full w-full transition-colors hover:border-active-border">
         <CardHeader className="flex flex-row items-center justify-between p-4">
           <div className="flex flex-row items-center gap-2">
-            <ChainIcon iconUrl={iconUrl} className="size-6" />
+            <ChainIcon className="size-6" iconUrl={iconUrl} />
             <Link
               className="group static before:absolute before:top-0 before:right-0 before:bottom-0 before:left-0 before:z-0 before:content-['']"
               href={`/${chainSlug}`}
@@ -57,12 +57,12 @@ export async function ChainListCard({
                 </th>
                 <td className="text-right">
                   <CopyTextButton
+                    className="relative z-10 inline-flex translate-x-2 py-0.5 text-base"
+                    copyIconPosition="left"
                     textToCopy={chainId.toString()}
                     textToShow={chainId.toString()}
                     tooltip="Copy Chain ID"
-                    className="relative z-10 inline-flex translate-x-2 py-0.5 text-base"
                     variant="ghost"
-                    copyIconPosition="left"
                   />
                 </td>
               </tr>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-row.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-row.tsx
index e448dc92431..379295bd5b4 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-row.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-row.tsx
@@ -1,7 +1,3 @@
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { TableCell, TableRow } from "@/components/ui/table";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import {
   CheckIcon,
   CircleAlertIcon,
@@ -10,6 +6,10 @@ import {
 } from "lucide-react";
 import Link from "next/link";
 import type { JSX } from "react";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { TableCell, TableRow } from "@/components/ui/table";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
 import { ChainIcon } from "../../../components/server/chain-icon";
 import { products } from "../../../components/server/products";
 import type { ChainSupportedService } from "../../../types/chain";
@@ -38,16 +38,16 @@ export async function ChainListRow({
 }: ChainListRowProps) {
   const chainMetadata = await getChainMetadata(chainId);
   return (
-    <TableRow linkBox className="hover:bg-accent/50">
+    <TableRow className="hover:bg-accent/50" linkBox>
       {/* Name */}
       <TableCell>
         <div className="flex w-[370px] flex-row items-center gap-4">
           <div className="flex items-center gap-2">
             {favoriteButton && <div className="mr-6"> {favoriteButton} </div>}
-            <ChainIcon iconUrl={iconUrl} className="size-6" />
+            <ChainIcon className="size-6" iconUrl={iconUrl} />
             <Link
-              href={`/${chainSlug}`}
               className="group static before:absolute before:top-0 before:right-0 before:bottom-0 before:left-0 before:z-0 before:content-['']"
+              href={`/${chainSlug}`}
             >
               {chainName}
             </Link>
@@ -69,12 +69,12 @@ export async function ChainListRow({
 
       <TableCell>
         <CopyTextButton
+          className="relative z-10 text-base"
+          copyIconPosition="right"
           textToCopy={chainId.toString()}
           textToShow={chainId.toString()}
           tooltip="Copy Chain ID"
-          className="relative z-10 text-base"
           variant="ghost"
-          copyIconPosition="right"
         />
       </TableCell>
 
@@ -86,11 +86,11 @@ export async function ChainListRow({
             {products.map((p) => {
               return (
                 <ProductIcon
-                  key={p.name}
-                  icon={p.icon}
-                  label={p.name}
                   href={p.link}
+                  icon={p.icon}
                   isEnabled={enabledServices.includes(p.id)}
+                  key={p.name}
+                  label={p.name}
                 />
               );
             })}
@@ -119,9 +119,9 @@ function ProductIcon(props: {
       }
     >
       <Link
+        className="group rounded-lg p-2 hover:bg-accent"
         href={props.href}
         target={props.href.startsWith("http") ? "_blank" : undefined}
-        className="group rounded-lg p-2 hover:bg-accent"
       >
         <props.icon
           className={cn(
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/layout.tsx
index 5e413be4947..fc1a732bd48 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/layout.tsx
@@ -1,10 +1,6 @@
 import { TeamHeader } from "../../../team/components/TeamHeader/team-header";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/page.tsx
index 3946d6dd00c..3dc4071e630 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/page.tsx
@@ -17,12 +17,12 @@ const description =
   "A list of EVM networks with RPCs, smart contracts, block explorers & faucets. Deploy smart contracts to all EVM chains with thirdweb.";
 
 export const metadata: Metadata = {
-  title,
   description,
   openGraph: {
-    title,
     description,
+    title,
   },
+  title,
 };
 
 export default async function ChainListPage(props: {
@@ -73,9 +73,9 @@ export default async function ChainListPage(props: {
       <div className="h-10" />
       {/* we used to have suspense + spinner here, that feels more jarring than the page loading _minutely_ slower */}
       <ChainsData
-        searchParams={searchParams}
         activeView={activeView}
         isLoggedIn={!!authToken}
+        searchParams={searchParams}
       />
     </section>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/client/star-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/client/star-button.tsx
index cb70ddf8763..e05fd945903 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/client/star-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/client/star-button.tsx
@@ -1,18 +1,18 @@
 "use client";
 
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { StarIcon } from "lucide-react";
+import { useActiveAccount } from "thirdweb/react";
 import { apiServerProxy } from "@/actions/proxies";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button, type ButtonProps } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { StarIcon } from "lucide-react";
-import { useActiveAccount } from "thirdweb/react";
 
 async function favoriteChains() {
   const res = await apiServerProxy<{ data: string[] }>({
-    pathname: "/v1/chains/favorites",
     method: "GET",
+    pathname: "/v1/chains/favorites",
   });
 
   if (!res.ok) {
@@ -25,8 +25,8 @@ async function favoriteChains() {
 
 async function addChainToFavorites(chainId: number) {
   const res = await apiServerProxy({
-    method: "POST",
     body: JSON.stringify({}),
+    method: "POST",
     pathname: `/v1/chains/${chainId}/favorite`,
   });
 
@@ -40,8 +40,8 @@ async function addChainToFavorites(chainId: number) {
 
 async function removeChainFromFavorites(chainId: number) {
   const res = await apiServerProxy<{ data?: { favorite: boolean } }>({
-    pathname: `/v1/chains/${chainId}/favorite`,
     method: "DELETE",
+    pathname: `/v1/chains/${chainId}/favorite`,
   });
 
   if (!res.ok) {
@@ -55,9 +55,9 @@ async function removeChainFromFavorites(chainId: number) {
 export function useFavoriteChainIds() {
   const address = useActiveAccount()?.address;
   return useQuery({
-    queryKey: ["favoriteChains", address],
-    queryFn: () => favoriteChains(),
     enabled: !!address,
+    queryFn: () => favoriteChains(),
+    queryKey: ["favoriteChains", address],
   });
 }
 
@@ -92,14 +92,14 @@ export function StarButton(props: {
   return (
     <ToolTipLabel label={label} side="right">
       <Button
-        className={props.className}
-        variant={props.variant ?? "ghost"}
-        size="icon"
         aria-label={label}
+        className={props.className}
+        disabled={mutation.isPending || favChainsQuery.isPending}
         onClick={() => {
           mutation.mutate(isPreferred);
         }}
-        disabled={mutation.isPending || favChainsQuery.isPending}
+        size="icon"
+        variant={props.variant ?? "ghost"}
       >
         {mutation.isPending ? (
           <Spinner className={cn("size-6", props.iconClassName)} />
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/chain-icon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/chain-icon.tsx
index 2adb0509b6b..254ab94e34c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/chain-icon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/chain-icon.tsx
@@ -21,14 +21,14 @@ export async function ChainIcon(props: {
     if (resolved) {
       // check if it loads or not
       const res = await fetch(resolved, {
-        // revalidate every hour
-        next: { revalidate: 60 * 60 },
-        method: "HEAD",
         headers: DASHBOARD_THIRDWEB_SECRET_KEY
           ? {
               "x-secret-key": DASHBOARD_THIRDWEB_SECRET_KEY,
             }
           : {},
+        method: "HEAD",
+        // revalidate every hour
+        next: { revalidate: 60 * 60 },
       }).catch(() => null);
 
       if (res?.status === 200) {
@@ -44,16 +44,16 @@ export async function ChainIcon(props: {
     return (
       <img
         alt=""
-        src={imageLink}
         className={cn("object-contain", props.className)}
+        src={imageLink}
       />
     );
   }
   return (
     <img
       alt=""
-      src={fallbackChainIcon}
       className={cn("object-contain", props.className)}
+      src={fallbackChainIcon}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/ConnectSDKIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/ConnectSDKIcon.tsx
index ffbdb05543d..fa1e9a2e7f8 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/ConnectSDKIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/ConnectSDKIcon.tsx
@@ -1,20 +1,20 @@
 export function ConnectSDKIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
-      role="presentation"
     >
       <path
         d="M16 8.00007V4.50073C16 3.66899 16 3.25312 15.8248 2.99755C15.6717 2.77425 15.4346 2.62257 15.1678 2.57715C14.8623 2.52517 14.4847 2.69944 13.7295 3.04799L4.85901 7.14206C4.18551 7.45291 3.84875 7.60834 3.60211 7.84939C3.38406 8.06249 3.21762 8.32262 3.1155 8.6099C3 8.93486 3 9.30575 3 10.0475V15.0001M16.5 14.5001H16.51M3 11.2001L3 17.8001C3 18.9202 3 19.4802 3.21799 19.9081C3.40973 20.2844 3.71569 20.5903 4.09202 20.7821C4.51984 21.0001 5.07989 21.0001 6.2 21.0001H17.8C18.9201 21.0001 19.4802 21.0001 19.908 20.7821C20.2843 20.5903 20.5903 20.2844 20.782 19.9081C21 19.4802 21 18.9202 21 17.8001V11.2001C21 10.08 21 9.51992 20.782 9.09209C20.5903 8.71577 20.2843 8.40981 19.908 8.21806C19.4802 8.00007 18.9201 8.00007 17.8 8.00007L6.2 8.00007C5.0799 8.00007 4.51984 8.00007 4.09202 8.21806C3.7157 8.40981 3.40973 8.71577 3.21799 9.09209C3 9.51991 3 10.08 3 11.2001ZM17 14.5001C17 14.7762 16.7761 15.0001 16.5 15.0001C16.2239 15.0001 16 14.7762 16 14.5001C16 14.2239 16.2239 14.0001 16.5 14.0001C16.7761 14.0001 17 14.2239 17 14.5001Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/ContractIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/ContractIcon.tsx
index a8f757e3da5..ec922a8af7c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/ContractIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/ContractIcon.tsx
@@ -1,20 +1,20 @@
 export function ContractIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
-      role="presentation"
     >
       <path
         d="M14 11H8M10 15H8M16 7H8M20 6.8V17.2C20 18.8802 20 19.7202 19.673 20.362C19.3854 20.9265 18.9265 21.3854 18.362 21.673C17.7202 22 16.8802 22 15.2 22H8.8C7.11984 22 6.27976 22 5.63803 21.673C5.07354 21.3854 4.6146 20.9265 4.32698 20.362C4 19.7202 4 18.8802 4 17.2V6.8C4 5.11984 4 4.27976 4.32698 3.63803C4.6146 3.07354 5.07354 2.6146 5.63803 2.32698C6.27976 2 7.11984 2 8.8 2H15.2C16.8802 2 17.7202 2 18.362 2.32698C18.9265 2.6146 19.3854 3.07354 19.673 3.63803C20 4.27976 20 5.11984 20 6.8Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/EngineIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/EngineIcon.tsx
index 530ab18a48a..af37b08afc6 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/EngineIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/EngineIcon.tsx
@@ -1,20 +1,20 @@
 export function EngineIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
-      role="presentation"
     >
       <path
         d="M6.5 19C4.01472 19 2 16.9853 2 14.5C2 12.1564 3.79151 10.2313 6.07974 10.0194C6.54781 7.17213 9.02024 5 12 5C14.9798 5 17.4522 7.17213 17.9203 10.0194C20.2085 10.2313 22 12.1564 22 14.5C22 16.9853 19.9853 19 17.5 19C13.1102 19 10.3433 19 6.5 19Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/InsightIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/InsightIcon.tsx
index 2c1226d5161..3122e1e46a0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/InsightIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/InsightIcon.tsx
@@ -1,20 +1,20 @@
 export function InsightIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
-      role="presentation"
     >
       <path
         d="M20.5 7.27783L12 12.0001M12 12.0001L3.49997 7.27783M12 12.0001L12 21.5001M21 12.0001V7.94153C21 7.59889 21 7.42757 20.9495 7.27477C20.9049 7.13959 20.8318 7.01551 20.7354 6.91082C20.6263 6.79248 20.4766 6.70928 20.177 6.54288L12.777 2.43177C12.4934 2.27421 12.3516 2.19543 12.2015 2.16454C12.0685 2.13721 11.9315 2.13721 11.7986 2.16454C11.6484 2.19543 11.5066 2.27421 11.223 2.43177L3.82297 6.54288C3.52345 6.70928 3.37368 6.79248 3.26463 6.91082C3.16816 7.01551 3.09515 7.13959 3.05048 7.27477C3 7.42757 3 7.59889 3 7.94153V16.0586C3 16.4013 3 16.5726 3.05048 16.7254C3.09515 16.8606 3.16816 16.9847 3.26463 17.0893C3.37368 17.2077 3.52346 17.2909 3.82297 17.4573L11.223 21.5684C11.5066 21.726 11.6484 21.8047 11.7986 21.8356C11.9315 21.863 12.0685 21.863 12.2015 21.8356C12.3516 21.8047 12.4934 21.726 12.777 21.5684L13 21.4445M7.5 4.50008L16.5 9.50008M22 21.5001L21 20.5001M22 18.0001C22 19.6569 20.6569 21.0001 19 21.0001C17.3431 21.0001 16 19.6569 16 18.0001C16 16.3432 17.3431 15.0001 19 15.0001C20.6569 15.0001 22 16.3432 22 18.0001Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/NebulaIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/NebulaIcon.tsx
index bfd2636bf1b..1a59d089f01 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/NebulaIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/NebulaIcon.tsx
@@ -1,12 +1,12 @@
 export function NebulaIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
-      height="24"
-      viewBox="0 0 153 153"
       className={props.className}
-      role="presentation"
       fill="none"
+      height="24"
+      role="presentation"
+      viewBox="0 0 153 153"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
@@ -14,10 +14,10 @@ export function NebulaIcon(props: { className?: string }) {
         fill="currentColor"
       />
       <path
-        fillRule="evenodd"
         clipRule="evenodd"
         d="M91.9481 29.4892C78.7023 32.4916 63.6745 40.7425 50.4663 53.9508C46.781 57.636 43.4817 61.4629 40.5746 65.3532C44.5585 68.8492 47.0735 73.9786 47.0735 79.6955C47.0735 90.2299 38.5336 98.7698 27.9992 98.7698C27.1107 98.7698 26.2364 98.7091 25.3803 98.5915C23.3955 110.414 25.9579 119.384 31.3537 124.78C37.2202 130.646 47.3123 133.164 60.701 130.129C73.9468 127.126 88.9745 118.875 102.183 105.667C105.888 101.962 109.204 98.1131 112.122 94.2007C108.103 90.7037 105.562 85.551 105.562 79.8048C105.562 69.2704 114.102 60.7305 124.636 60.7305C125.536 60.7305 126.421 60.7928 127.288 60.9133C129.237 49.147 126.674 40.2167 121.295 34.8381C115.429 28.9716 105.337 26.4545 91.9481 29.4892ZM16.3791 94.8229C13.4047 109.493 15.9004 122.818 24.608 131.526C42.6147 149.532 80.3662 140.975 108.928 112.413C113.381 107.96 117.348 103.284 120.803 98.494C122.042 98.7466 123.324 98.8792 124.636 98.8792C135.171 98.8792 143.711 90.3393 143.711 79.8048C143.711 73.6582 140.803 68.1906 136.289 64.7023C139.234 50.0687 136.73 36.7817 128.041 28.0925C110.034 10.0859 72.2829 18.6429 43.7206 47.2051C39.2988 51.627 35.3564 56.2691 31.9179 61.024C30.6531 60.7599 29.3423 60.6211 27.9992 60.6211C17.4647 60.6211 8.9248 69.161 8.9248 79.6955C8.9248 85.8567 11.8461 91.3357 16.3791 94.8229ZM124.636 70.2677C119.369 70.2677 115.099 74.5376 115.099 79.8048C115.099 85.0721 119.369 89.342 124.636 89.342C129.904 89.342 134.174 85.0721 134.174 79.8048C134.174 74.5376 129.904 70.2677 124.636 70.2677ZM18.462 79.6955C18.462 74.4282 22.7319 70.1583 27.9992 70.1583C33.2664 70.1583 37.5363 74.4282 37.5363 79.6955C37.5363 84.9627 33.2664 89.2326 27.9992 89.2326C22.7319 89.2326 18.462 84.9627 18.462 79.6955Z"
         fill="currentColor"
+        fillRule="evenodd"
       />
     </svg>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/PayIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/PayIcon.tsx
index 0b5bfa6da53..386d0a6dc9f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/PayIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/PayIcon.tsx
@@ -1,20 +1,20 @@
 export function PayIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
-      role="presentation"
     >
       <path
         d="M22 10H2M2 8.2L2 15.8C2 16.9201 2 17.4802 2.21799 17.908C2.40973 18.2843 2.71569 18.5903 3.09202 18.782C3.51984 19 4.07989 19 5.2 19L18.8 19C19.9201 19 20.4802 19 20.908 18.782C21.2843 18.5903 21.5903 18.2843 21.782 17.908C22 17.4802 22 16.9201 22 15.8V8.2C22 7.0799 22 6.51984 21.782 6.09202C21.5903 5.7157 21.2843 5.40974 20.908 5.21799C20.4802 5 19.9201 5 18.8 5L5.2 5C4.0799 5 3.51984 5 3.09202 5.21799C2.7157 5.40973 2.40973 5.71569 2.21799 6.09202C2 6.51984 2 7.07989 2 8.2Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/RPCIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/RPCIcon.tsx
index bb7301cb599..534dbec6c15 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/RPCIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/RPCIcon.tsx
@@ -1,20 +1,20 @@
 export function RPCIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
-      role="presentation"
     >
       <path
         d="M4 11C6.38695 11 8.67613 11.9482 10.364 13.636C12.0518 15.3239 13 17.6131 13 20M4 4C8.24346 4 12.3131 5.68571 15.3137 8.68629C18.3143 11.6869 20 15.7565 20 20M6 19C6 19.5523 5.55228 20 5 20C4.44772 20 4 19.5523 4 19C4 18.4477 4.44772 18 5 18C5.55228 18 6 18.4477 6 19Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/SmartAccountIcon.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/SmartAccountIcon.tsx
index 7a759616cc7..88c9b8ea379 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/SmartAccountIcon.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/icons/SmartAccountIcon.tsx
@@ -1,20 +1,20 @@
 export function SmartAccountIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
-      role="presentation"
     >
       <path
         d="M13 7L11.8845 4.76892C11.5634 4.1268 11.4029 3.80573 11.1634 3.57116C10.9516 3.36373 10.6963 3.20597 10.4161 3.10931C10.0992 3 9.74021 3 9.02229 3H5.2C4.0799 3 3.51984 3 3.09202 3.21799C2.71569 3.40973 2.40973 3.71569 2.21799 4.09202C2 4.51984 2 5.0799 2 6.2V7M2 7H17.2C18.8802 7 19.7202 7 20.362 7.32698C20.9265 7.6146 21.3854 8.07354 21.673 8.63803C22 9.27976 22 10.1198 22 11.8V16.2C22 17.8802 22 18.7202 21.673 19.362C21.3854 19.9265 20.9265 20.3854 20.362 20.673C19.7202 21 18.8802 21 17.2 21H6.8C5.11984 21 4.27976 21 3.63803 20.673C3.07354 20.3854 2.6146 19.9265 2.32698 19.362C2 18.7202 2 17.8802 2 16.2V7ZM12 17.5C12 17.5 15 16.0701 15 13.9252V11.4229L12.8124 10.6412C12.2868 10.4529 11.712 10.4529 11.1864 10.6412L9 11.4229V13.9252C9 16.0701 12 17.5 12 17.5Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/products.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/products.ts
index ed3b9bc72c4..10a4fe39a3d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/products.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/products.ts
@@ -10,60 +10,60 @@ import { SmartAccountIcon } from "./icons/SmartAccountIcon";
 
 export const products = [
   {
-    name: "Contracts",
-    id: "contracts",
-    icon: ContractIcon,
     description: "Pre-built contracts & deployment tools",
+    icon: ContractIcon,
+    id: "contracts",
     link: "https://thirdweb.com/explore",
+    name: "Contracts",
   },
   {
-    name: "Connect SDK",
-    id: "connect-sdk",
-    icon: ConnectSDKIcon,
     description: "Client-side SDKs for wallets and blockchain interactions",
+    icon: ConnectSDKIcon,
+    id: "connect-sdk",
     link: "https://thirdweb.com/connect",
+    name: "Connect SDK",
   },
   {
-    name: "RPC Edge",
-    id: "rpc-edge",
-    icon: RPCIcon,
     description: "Performant and scalable RPC service",
+    icon: RPCIcon,
+    id: "rpc-edge",
     link: "https://portal.thirdweb.com/infrastructure/rpc-edge/overview",
+    name: "RPC Edge",
   },
   {
-    name: "Engine",
-    id: "engine",
-    icon: EngineIcon,
     description: "Backend server that reads, writes, and deploys contracts",
+    icon: EngineIcon,
+    id: "engine",
     link: "https://thirdweb.com/engine",
+    name: "Engine",
   },
   {
-    name: "Account Abstraction",
-    id: "account-abstraction",
-    icon: SmartAccountIcon,
     description: "Account factory contracts, bundler & paymaster",
+    icon: SmartAccountIcon,
+    id: "account-abstraction",
     link: "https://portal.thirdweb.com/connect/account-abstraction/overview",
+    name: "Account Abstraction",
   },
   {
-    name: "Universal Bridge",
-    id: "pay",
-    icon: PayIcon,
     description: "Point of sale solution for bridging, onramping & swapping",
+    icon: PayIcon,
+    id: "pay",
     link: "https://portal.thirdweb.com/connect/pay/overview",
+    name: "Universal Bridge",
   },
   {
-    name: "Insight",
-    id: "insight",
-    icon: InsightIcon,
     description: "Query, transform and analyze blockchain data",
+    icon: InsightIcon,
+    id: "insight",
     link: "https://thirdweb.com/insight",
+    name: "Insight",
   },
   {
-    name: "Nebula",
-    id: "nebula",
-    icon: NebulaIcon,
     description: "The most powerful AI for interacting with the blockchain",
+    icon: NebulaIcon,
+    id: "nebula",
     link: "https://thirdweb.com/nebula",
+    name: "Nebula",
   },
 ] satisfies Array<{
   name: string;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/utils.ts b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/utils.ts
index a540b773d9c..c4aef39fc49 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/utils.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/utils.ts
@@ -6,12 +6,6 @@ import zeroGCTA from "./temp-assets/0gCTA.png";
 import zeroGBanner from "./temp-assets/0gLabsBanner.png";
 import alephZeroBaner from "./temp-assets/AlephZeroBanner.jpg";
 import alephZeroCTA from "./temp-assets/AlephZeroCTA.jpg";
-import cotiBanner from "./temp-assets/COTI_Banner.jpg";
-import cotiCTA from "./temp-assets/COTI_CTA.jpg";
-import eduBanner from "./temp-assets/EDUBanner.jpeg";
-import eduCTA from "./temp-assets/EDUCTA.png";
-import hemiSepoliaBanner from "./temp-assets/HemiBanner.png";
-import hemiSepoliaCTA from "./temp-assets/HemiCTA.png";
 import ancient8Banner from "./temp-assets/ancient8-banner.png";
 import appChainBanner from "./temp-assets/appChainBanner.jpg";
 // TEMPORARY
@@ -19,17 +13,27 @@ import appchainCTA from "./temp-assets/appchainCTA.png";
 import assetChainBanner from "./temp-assets/assetChainBanner.png";
 import assetChainCTABG from "./temp-assets/assetChainCTABanner.png";
 import baseBanner from "./temp-assets/base-banner.jpeg";
+import cotiBanner from "./temp-assets/COTI_Banner.jpg";
+import cotiCTA from "./temp-assets/COTI_CTA.jpg";
+import creatorBanner from "./temp-assets/creatorBanner.png";
+import creatorCTA from "./temp-assets/creatorCTA.png";
 import superchainCTABG from "./temp-assets/cta-bg-superchain.png";
 import xaiCTABg from "./temp-assets/cta-bg-xai-connect.png";
 import thirdwebCTA from "./temp-assets/cta-thirdweb.png";
-import cyberCTA from "./temp-assets/cyberCTA.png";
 import cyberChainBanner from "./temp-assets/cyberChainBanner.png";
+import cyberCTA from "./temp-assets/cyberCTA.png";
+import eduBanner from "./temp-assets/EDUBanner.jpeg";
+import eduCTA from "./temp-assets/EDUCTA.png";
 import etherlinkBanner from "./temp-assets/etherlinkBanner.png";
 import etherlinkCTA from "./temp-assets/etherlinkCTA.png";
+import flowBanner from "./temp-assets/flowBanner.png";
+import flowCTA from "./temp-assets/flowCTA.png";
 import funkiBanner from "./temp-assets/funkiBanner.jpg";
 import funkiCTA from "./temp-assets/funkiCTA.jpg";
-import gptCTA from "./temp-assets/gptCTA.jpg";
 import gptChainBanner from "./temp-assets/gptChainBanner.jpg";
+import gptCTA from "./temp-assets/gptCTA.jpg";
+import hemiSepoliaBanner from "./temp-assets/HemiBanner.png";
+import hemiSepoliaCTA from "./temp-assets/HemiCTA.png";
 import hashfireBanner from "./temp-assets/hashfireBanner.png";
 import hashfireCTA from "./temp-assets/hashfireCTA.png";
 import inkBanner from "./temp-assets/inkBanner.jpg";
@@ -37,22 +41,14 @@ import laosBanner from "./temp-assets/laosBanner.jpg";
 import laosCTA from "./temp-assets/laosCTA.jpg";
 import liskBanner from "./temp-assets/liskBanner.png";
 import liskCTA from "./temp-assets/liskCTA.png";
-
-import creatorBanner from "./temp-assets/creatorBanner.png";
-import creatorCTA from "./temp-assets/creatorCTA.png";
 import lumiaBanner from "./temp-assets/lumiaBanner.png";
-import somniaBanner from "./temp-assets/somniaBanner.png";
-
-import NeoXBanner from "./temp-assets/NeoXBanner.jpg";
-import NeoXCTA from "./temp-assets/NeoXCTA.jpg";
-import flowBanner from "./temp-assets/flowBanner.png";
-import flowCTA from "./temp-assets/flowCTA.png";
 import mantleBanner from "./temp-assets/mantle.png";
 import metalBanner from "./temp-assets/metalBanner.png";
+import NeoXBanner from "./temp-assets/NeoXBanner.jpg";
+import NeoXCTA from "./temp-assets/NeoXCTA.jpg";
 import onyxBanner from "./temp-assets/onyxBanner.png";
 import onyxCTA from "./temp-assets/onyxCTA.png";
 import plumeBanner from "./temp-assets/plumeBanner.png";
-
 import plumeCTA from "./temp-assets/plumeCTA.png";
 import reactiveBanner from "./temp-assets/reactiveBanner.jpg";
 import reactiveCTA from "./temp-assets/reactiveCTA.jpg";
@@ -64,6 +60,7 @@ import saakuruBanner from "./temp-assets/saakuruBanner.png";
 import saakuruCTA from "./temp-assets/saakuruCTA.png";
 import shidoBanner from "./temp-assets/shidoBanner.png";
 import shidoCta from "./temp-assets/shidoCta.png";
+import somniaBanner from "./temp-assets/somniaBanner.png";
 import soneiumBanner from "./temp-assets/soneiumBanner.png";
 import superpositionBanner from "./temp-assets/superpositionBanner.png";
 import superpositionCTA from "./temp-assets/superpositionCTA.png";
@@ -82,15 +79,16 @@ import zetachainCTA from "./temp-assets/zetachainCTA.png";
 import zkCandyBanner from "./temp-assets/zkCandyBanner.jpg";
 import zytronBanner from "./temp-assets/zytronBanner.png";
 import zytronCTA from "./temp-assets/zytronCTA.jpg";
+
 // END TEMPORARY
 
+import type { ChainMetadata } from "thirdweb/chains";
 import {
   getChainServices,
   getChains,
   getGasSponsoredChains,
 } from "@/api/chain";
 import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
-import type { ChainMetadata } from "thirdweb/chains";
 import type { ChainMetadataWithServices, ChainServices } from "./types/chain";
 
 export async function getChainsWithServices() {
@@ -143,63 +141,14 @@ type ExtraChainMetadata = Partial<{
 
 const OP_CTA = {
   backgroundImageUrl: superchainCTABG.src,
-  title: "Optimism Superchain App Accelerator",
+  buttonLink: "/team/~/~/settings/credits",
+  buttonText: "Apply now",
   description:
     "Successful applicants receive gas grants for use across all supported Optimism Superchain networks. These grants can sponsor gas fees for any onchain activity using our Account Abstraction tools.",
-  buttonText: "Apply now",
-  buttonLink: "/team/~/~/settings/credits",
+  title: "Optimism Superchain App Accelerator",
 } satisfies ChainCTAProps;
 
 const chainMetaRecord = {
-  // XAI
-  660279: {
-    headerImgUrl: xaiBanner.src,
-    about:
-      "Xai was developed to enable real economies and open trade in the next generation of video games. With Xai, potentially billions of traditional gamers can own and trade valuable in-game items in their favorite games for the first time, without the need to use crypto-wallets.",
-
-    cta: {
-      title: "Unlock ultimate possibility with Xai Connect",
-      backgroundImageUrl: xaiCTABg.src,
-      buttonLink: "https://connect.xai.games",
-      buttonText: "Learn more",
-    },
-  },
-  // base
-  8453: {
-    headerImgUrl: baseBanner.src,
-    about:
-      "Base is a secure, low-cost, builder-friendly Ethereum L2 built to bring the next billion users onchain.",
-  },
-  // cyber
-  7560: {
-    headerImgUrl: cyberChainBanner.src,
-    about:
-      "Cyber is a Layer 2 blockchain specifically designed for social applications. Built on the Optimism Superchain, it combines high-performance infrastructure with specialized tools for social features to simplify developer workflows and accelerate their time to market.",
-    cta: {
-      backgroundImageUrl: cyberCTA.src,
-      title: "Discover Web3 Social with Cyber",
-      buttonLink: "https://cyber.co/",
-      buttonText: "Learn more",
-    },
-  },
-
-  // ancient8
-  888888888: {
-    about:
-      "Ancient8 is building an ETH gaming Layer 2 built with OP Stack, offering a suite of Web3 gaming infrastructure tools that serve as the distribution and marketing channel for games globally. With Space3 Game Publishing Platform, Ancient8 Gaming Guild, Reneverse Web3 Ads engine, A8ID, and Gosu Network, Ancient8 is dedicated to onboard millions of gamers to Web3 gaming, while providing unparalleled support to game developers looking to reach more players. Ancient8’s products have helped 100+ Web3 games and 200K+ users better navigate Web3.\n\nAncient8 has raised $10M in total financing from leading investors including Pantera, Dragonfly, Hashed, Makers Fund, Mechanism, Coinbase, IOSG, Jump and Animoca.",
-    headerImgUrl: ancient8Banner.src,
-  },
-  // mantle
-  5000: {
-    about: `Build dApps with exceptional UX, all while relying on Ethereum's unrivaled security, with our high-performance Ethereum layer-2 network built with modular architecture.`,
-    headerImgUrl: mantleBanner.src,
-    cta: {
-      backgroundImageUrl: mantleBanner.src,
-      title: "Reach out to bring your brilliant ideas to life",
-      buttonText: "Learn More",
-      buttonLink: "https://x.com/0xMantleDevs",
-    },
-  },
   // Flare
   14: {
     about:
@@ -207,729 +156,778 @@ const chainMetaRecord = {
   },
   // rootstock
   30: {
-    headerImgUrl: rootStockBanner.src,
     about:
       "Deploy EVM compatible smart contracts on Rootstock and leverage the security of the Bitcoin network.",
     cta: {
       backgroundImageUrl: rootStockCTABG.src,
-      title: "Fully EVM-compatible Bitcoin L2",
       buttonLink: "https://rootstock.io/",
       buttonText: "Learn more",
+      title: "Fully EVM-compatible Bitcoin L2",
     },
+    headerImgUrl: rootStockBanner.src,
   },
-
-  // Ink
-  57073: {
-    headerImgUrl: inkBanner.src,
-    about:
-      "Ink is an Ethereum OP Stack layer 2 blockchain designed to be the house of DeFi for the Superchain, a powerful base layer for deploying innovative DeFi protocols.",
-  },
-  // vanar
-  2040: {
-    headerImgUrl: vanarBanner.src,
+  //viction Mainnet
+  88: {
     about:
-      "Discover VANAR – The future of blockchain technology tailored for global adoption. This cutting-edge, L1 EVM blockchain offers high-speed transactions and scalability, powered by Google's renewable energy sources. With a suite of apps, low fixed transaction costs and a zero-cost option for brands, VANAR makes blockchain scalable, accessible and affordable.",
+      "Viction is a global layer-1 EVM blockchain that empowers builders at every level, provides both the foundation and enhancements necessary for projects to achieve stability and soar to their higher selves. \n We provide seamless interoperability, scalability, flexible development, zero gas fees, enhanced security, and speed to enable builders with tech capabilities. Beyond technical advantages, Viction offers holistic guidance through consultation, resources, funding, and strong network connections to foster project growth.",
     cta: {
-      buttonLink: "https://docs.vanarchain.com",
-      buttonText: "Learn more",
-      backgroundImageUrl: vanarCTABG.src,
-      title: "Fully EVM compatible L1 for Entertainment",
+      backgroundImageUrl: victionCTA.src,
+      buttonLink: "https://thirdweb.com/viction",
+      buttonText: "Learn More",
+      title:
+        "Build, own, win, and be part of Viction World Wide Chain where everyone scales beyond limits.",
     },
+    headerImgUrl: victionBanner.src,
   },
-  // lumia Mainnet
-  994873017: {
-    headerImgUrl: lumiaBanner.src,
+  //viction Testnet
+  89: {
     about:
-      "Lumia is the only full-cycle RWA chain, merging zkEVM technology with a robust infrastructure purpose-built for institutional and retail asset tokenization. Featuring advanced compliance tools such as on-chain KYC/AML via PolygonID, OFAC sanctions screening at the sequencer level, and AI-powered threat detection, Lumia Chain ensures security and regulatory adherence. Its unique volition architecture enables users to toggle between cost-efficient validium mode and highly secure rollup mode, providing flexibility for diverse needs. Lumia goes beyond tokenization by seamlessly integrating RWAs into DeFi. RWAs minted on Lumia Chain are instantly composable with native DeFi protocols like lending, AMMs, and perpetual markets, creating a tailored environment for RWA owners. With ERC-20 compatibility, native interoperability, and integration with major DeFi aggregators like 1inch and 0x, Lumia ensures that tokenized RWAs are not only secure and scalable but also accessible across the broader DeFi ecosystem.",
+      "Viction is a global layer-1 EVM blockchain that empowers builders at every level, provides both the foundation and enhancements necessary for projects to achieve stability and soar to their higher selves. \n We provide seamless interoperability, scalability, flexible development, zero gas fees, enhanced security, and speed to enable builders with tech capabilities. Beyond technical advantages, Viction offers holistic guidance through consultation, resources, funding, and strong network connections to foster project growth.",
     cta: {
-      backgroundImageUrl: lumiaBanner.src,
+      backgroundImageUrl: victionCTA.src,
+      buttonLink: "https://thirdweb.com/viction",
+      buttonText: "Learn More",
       title:
-        "Build Smarter. Scale Faster. Lumia - The Only Full-Cycle RWA Chain",
-      buttonLink:
-        "https://docs.lumia.org/build/smartcontracts/deployment#deploy-contract-on-shiden",
-      buttonText: "Learn more",
+        "Build, own, win, and be part of Viction World Wide Chain where everyone scales beyond limits.",
     },
+    headerImgUrl: victionBanner.src,
   },
-  // lumia Testnet
-  1952959480: {
-    headerImgUrl: lumiaBanner.src,
+  //Fuse
+  122: {
     about:
-      "Lumia is the only full-cycle RWA chain, merging zkEVM technology with a robust infrastructure purpose-built for institutional and retail asset tokenization. Featuring advanced compliance tools such as on-chain KYC/AML via PolygonID, OFAC sanctions screening at the sequencer level, and AI-powered threat detection, Lumia Chain ensures security and regulatory adherence. Its unique volition architecture enables users to toggle between cost-efficient validium mode and highly secure rollup mode, providing flexibility for diverse needs. Lumia goes beyond tokenization by seamlessly integrating RWAs into DeFi. RWAs minted on Lumia Chain are instantly composable with native DeFi protocols like lending, AMMs, and perpetual markets, creating a tailored environment for RWA owners. With ERC-20 compatibility, native interoperability, and integration with major DeFi aggregators like 1inch and 0x, Lumia ensures that tokenized RWAs are not only secure and scalable but also accessible across the broader DeFi ecosystem.",
+      "Build and grow on the leading web3 platform for business and finance, powered by a performant zkEVM tailor made to get millions of consumers on-chain.",
     cta: {
-      backgroundImageUrl: lumiaBanner.src,
-      title:
-        "Build Smarter. Scale Faster. Lumia - The Only Full-Cycle RWA Chain",
-      buttonLink:
-        "https://docs.lumia.org/build/smartcontracts/deployment#deploy-contract-on-shiden",
+      backgroundImageUrl: thirdwebCTA.src,
+      buttonLink: "https://www.fuse.io/",
       buttonText: "Learn more",
+      title: "",
     },
+    headerImgUrl: thirdwebBanner.src,
   },
-  // Superposition Testnet
-  98985: {
-    headerImgUrl: superpositionBanner.src,
+  //zkCandy Testnet
+  302: {
     about:
-      "Superposition is the first blockchain that pays you to use it. It is a DeFi native Layer-3 that focuses on novel incentives and order-flow for growth and value capture for developers and users alike.\n\nSuperpositions includes a native on-chain orderbook with faster execution speeds through Stylus, providing shared and permissionless liquidity for all apps onchain, and Super Assets, which pay yield when you both hold and use them.",
+      "Explore our cutting-edge Layer2 Ethereum scaling ZK Chain built for gaming and entertainment with the latest zk-proof technology.",
     cta: {
-      backgroundImageUrl: superpositionCTA.src,
-      title: "The Blockchain that pays you to use it",
-      buttonLink: "https://superposition.so/",
+      backgroundImageUrl: thirdwebCTA.src,
+      buttonLink: "https://zkcandy.io/",
       buttonText: "Learn more",
+      title: "",
     },
+    headerImgUrl: thirdwebBanner.src,
   },
-  // Superposition Mainnet
-  55244: {
-    headerImgUrl: superpositionBanner.src,
+
+  //zkCandy Mainnet
+  320: {
     about:
-      "Superposition is the first blockchain that pays you to use it. It is a DeFi native Layer-3 that focuses on novel incentives and order-flow for growth and value capture for developers and users alike.\n\nSuperpositions includes a native on-chain orderbook with faster execution speeds through Stylus, providing shared and permissionless liquidity for all apps onchain, and Super Assets, which pay yield when you both hold and use them.",
+      "ZKcandy is an AI-powered Layer-2 aiming to redefine what’s possible in gaming and entertainment. As a ZK Chain built on ZKsync’s Elastic Network, it focuses on building immersive gaming ecosystems where players make the most of today’s AI capabilities. Emerged from a groundbreaking collaboration between ZKsync and the award-winning game studio iCandy Interactive, It's the first L2 ZK chain for gaming in the ZKsync ecosystem.",
     cta: {
-      backgroundImageUrl: superpositionCTA.src,
-      title: "The Blockchain that pays you to use it",
-      buttonLink: "https://superposition.so/",
-      buttonText: "Learn more",
+      backgroundImageUrl: zkCandyBanner.src,
+      buttonLink: "https://litepaper.zkcandy.io/dev-guide/",
+      buttonText: "Learn More",
+      title: " ",
     },
+    headerImgUrl: zkCandyBanner.src,
   },
-  // Aleph 0 Mainnet
-  41455: {
-    headerImgUrl: alephZeroBaner.src,
+  //zkSync
+  324: {
     about:
-      "Aleph Zero is a privacy-enhancing blockchain ecosystem boasting a WASM L1 and an EVM L2 that offer instant transactions, the fastest ZK-based privacy features, and a seamless developer experience.",
+      "ZKsync is an ever expanding verifiable blockchain network, secured by math.",
     cta: {
-      backgroundImageUrl: alephZeroCTA.src,
-      title: "See how Aleph Zero redefines EVM privacy",
-      buttonLink: "https://zkos.alephzero.org/",
+      backgroundImageUrl: thirdwebCTA.src,
+      buttonLink: "https://zksync.io/",
       buttonText: "Learn more",
+      title: "",
     },
+    headerImgUrl: thirdwebBanner.src,
   },
   //Appchain
   466: {
-    headerImgUrl: appChainBanner.src,
     about:
       "Appchain is building useful onchain apps. We're an L2 on top of Ethereum, built on the Arbitrum Orbit stack. We are a low cost, high throughput chain with the goal of building apps for all internet users",
     cta: {
-      title: "Bringing the world onchain through useful apps.",
       backgroundImageUrl: appchainCTA.src,
       buttonLink: "https://appchain.xyz/",
       buttonText: "Learn more",
+      title: "Bringing the world onchain through useful apps.",
     },
+    headerImgUrl: appChainBanner.src,
   },
-  // B3 Mainnet
-  8333: {
-    headerImgUrl: thirdwebBanner.src,
+  // World Chain Mainnet
+  480: {
     about:
-      "Created by a team of Base/Coinbase alumni and OG ETH contributors, B3 is a horizontally scaled gaming ecosystem built on Base. \n\nOur rollup network settles on Base, ensuring B3 transactions inherit the security of the EVM.",
-    cta: {
-      backgroundImageUrl: thirdwebCTA.src,
-      title: "",
-      buttonLink: "https://b3.fun/",
-      buttonText: "Learn more",
-    },
+      "World Chain is the blockchain for real humans, offering priority blockspace and gas-free transactions for World ID-verified users.",
+    headerImgUrl: worldChainBanner.src,
   },
-  //CampNetwork Testnet v2
-  325000: {
-    headerImgUrl: thirdwebBanner.src,
+  //EVM on Flow testnet
+  545: {
     about:
-      "Camp Network is the user identity layer across blockchains. Camp aggregates online user data, enabling users to own and monetize their identity while helping teams better understand user behavior.",
+      "Flow is a secure, high-performance, decentralized L1 EVM equivalent chain, with innovative next-generation features not available on other EVM compatible chains, the lowest fees anywhere, and a vibrant ecosystem of major consumer brands",
     cta: {
-      backgroundImageUrl: thirdwebCTA.src,
-      title: "",
-      buttonLink: "https://www.campnetwork.xyz/",
-      buttonText: "Learn more",
+      backgroundImageUrl: flowCTA.src,
+      buttonLink: "https://developers.flow.com/evm/how-it-works",
+      buttonText: "Learn More",
+      title:
+        "Explore Flow's innovative features not available on any other EVM compatible chain",
     },
+    headerImgUrl: flowBanner.src,
   },
-  //Creator Mainnet
-  66665: {
-    headerImgUrl: creatorBanner.src,
+  //EVM on Flow Mainnet
+  747: {
     about:
-      "From Builders to Builders, From Idea to Creation ⚡\nCreator is AI Superhero Layer 2 Blockchain 🦇\nBuilt on the OP Stack, leveraging the robust foundation of Optimism 🟡🔴. We adopt the OP Stack's design principles because, as builders, we know they work and align perfectly with our values.\nWhy Creator?\nWe're constructing our Testnet on the Bedrock release of the OP Stack, ensuring a scalable and modular infrastructure that supports innovative and decentralized applications.\nCore Features:\n- Lightning Fast Transactions: Say goodbye to slow speeds with Creator's Layer 2 technology.\n- Low Fees: Lower transaction costs make blockchain accessible to all.\n- Scalable Infrastructure: Creator's network adapts effortlessly as you grow.",
+      "Flow is a secure, high-performance, decentralized L1 EVM equivalent chain, with innovative next-generation features not available on other EVM compatible chains, the lowest fees anywhere, and a vibrant ecosystem of major consumer brands",
     cta: {
-      backgroundImageUrl: creatorCTA.src,
-      title: "From Builders to Builders, From Idea to Creation ⚡",
-      buttonLink: "https://www.creatorchain.io/",
+      backgroundImageUrl: flowCTA.src,
+      buttonLink: "https://developers.flow.com/evm/how-it-works",
       buttonText: "Learn More",
+      title:
+        "Learn about innovative features not available on any other EVM compatible chains!",
     },
+    headerImgUrl: flowBanner.src,
   },
-  //COTI Mainnet
-  2632500: {
-    headerImgUrl: cotiBanner.src,
+  //Rivalz Mainnet
+  753: {
     about:
-      "COTI is the fastest, lightest privacy layer in Web3, powered by the breakthrough cryptographic protocol Garbled Circuits. Build with privacy. Scale with speed.",
+      "Rivalz merges real-world economies with AI, redefining how agents interact with global resources. Through its modular infrastructure, Rivalz enables AI agents to tap into the global workforce, digital services, and DePIN—from computers to smart homes—seamlessly connecting AI with reality.",
     cta: {
-      backgroundImageUrl: cotiCTA.src,
-      title: "The Fastest, Lightest Privacy Layer in Web3",
-      buttonLink: "https://thirdweb.com/coti",
+      backgroundImageUrl: rivalzCTA.src,
+      buttonLink: "https://rivalz.ai/download",
       buttonText: "Learn More",
+      title: "Empower the Age of AI Agents with Rivalz",
     },
+    headerImgUrl: rivalzBanner.src,
   },
-  //COTI Testnet
-  7082400: {
-    headerImgUrl: cotiBanner.src,
+  //Lisk Mainnet
+  1135: {
     about:
-      "COTI is the fastest, lightest privacy layer in Web3, powered by the breakthrough cryptographic protocol Garbled Circuits. Build with privacy. Scale with speed.",
+      "Lisk is focused on serving builders in high-growth markets like Africa and Southeast Asia. When you build on Lisk, you become part of the strongest Ethereum collective, alongside Coinbase, Sony, World, Kraken and Uniswap -- the OP Superchain.",
+    headerImgUrl: liskBanner.src,
+  },
+  //Reactive Mainnet
+  1597: {
+    about:
+      "Web3’s first IFTTT infrastructure. Automate multi-chain workflows with event-driven logic – execute actions without compromising decentralization.",
     cta: {
-      backgroundImageUrl: cotiCTA.src,
-      title: "The Fastest, Lightest Privacy Layer in Web3",
-      buttonLink: "https://thirdweb.com/coti",
+      backgroundImageUrl: reactiveCTA.src,
+      buttonLink: "https://dev.reactive.network",
       buttonText: "Learn More",
+      title: "Turn Smart Contracts Reactive",
     },
+    headerImgUrl: reactiveBanner.src,
   },
-  //Donatuz
-  42026: {
-    headerImgUrl: thirdwebBanner.src,
+  //Metal L2
+  1750: {
     about:
-      "Monetize your passion, your way. Discover the freedom to grow with our creator-focused platform.",
+      "Metal L2 is a banking-focused Layer 2 blockchain built on the Optimism Superchain, designed to enable direct on-chain fiat deposits through its connection to The Digital Banking Network—an open-source blockchain banking protocol developed by Metallicus",
+    headerImgUrl: metalBanner.src,
   },
-  //EDUMainnet
-  41923: {
-    headerImgUrl: eduBanner.src,
+  //Soneium Mainnet
+  1868: {
     about:
-      "Education On-Chain - A Layer 3 blockchain preparing students and learners for the future of work while advancing onchain education finance (EduFi).",
+      "Soneium, an Ethereum layer-2 developed by Sony Block Solutions Labs. This versatile chain is a general-purpose blockchain platform that aims to evoke emotion, empower creativity, and meet diverse needs to go mainstream. Soneium will be simplifying blockchain experiences while empowering developers, creators, and communities. Built on accessibility, scalability, and efficiency, it aims to solve real-world problems across industries globally. Soneium will change the way we interact with the internet, opening up a world of innovative applications and unlimited potential for users worldwide.",
+    headerImgUrl: soneiumBanner.src,
+  },
+  //Soneium Testnet
+  1946: {
+    about:
+      "Soneium, an Ethereum layer-2 developed by Sony Block Solutions Labs. This versatile chain is a general-purpose blockchain platform that aims to evoke emotion, empower creativity, and meet diverse needs to go mainstream. Soneium will be simplifying blockchain experiences while empowering developers, creators, and communities. Built on accessibility, scalability, and efficiency, it aims to solve real-world problems across industries globally. Soneium will change the way we interact with the internet, opening up a world of innovative applications and unlimited potential for users worldwide.",
+    headerImgUrl: soneiumBanner.src,
+  },
+  // vanar
+  2040: {
+    about:
+      "Discover VANAR – The future of blockchain technology tailored for global adoption. This cutting-edge, L1 EVM blockchain offers high-speed transactions and scalability, powered by Google's renewable energy sources. With a suite of apps, low fixed transaction costs and a zero-cost option for brands, VANAR makes blockchain scalable, accessible and affordable.",
     cta: {
-      backgroundImageUrl: eduCTA.src,
-      title: "Education On-Chain",
-      buttonLink: "https://educhain.xyz/",
-      buttonText: "Learn More",
+      backgroundImageUrl: vanarCTABG.src,
+      buttonLink: "https://docs.vanarchain.com",
+      buttonText: "Learn more",
+      title: "Fully EVM compatible L1 for Entertainment",
     },
+    headerImgUrl: vanarBanner.src,
   },
-  //EDU Testnet <Open Campus Codex>
-  656476: {
-    headerImgUrl: eduBanner.src,
+  //Lisk Testnet
+  4202: {
     about:
-      "Education On-Chain - A Layer 3 blockchain preparing students and learners for the future of work while advancing onchain education finance (EduFi).",
+      "Lisk is focused on serving builders in high-growth markets like Africa and Southeast Asia. When you build on Lisk, you become part of the strongest Ethereum collective, alongside Coinbase, Sony, World, Kraken and Uniswap -- the OP Superchain.",
     cta: {
-      backgroundImageUrl: eduCTA.src,
-      title: "Education On-Chain",
-      buttonLink: "https://educhain.xyz/",
-      buttonText: "Learn More",
+      backgroundImageUrl: liskCTA.src,
+      buttonLink: "https://lisk.com",
+      buttonText: "Learn more",
+      title: "Ready to reshape the world?",
     },
+    headerImgUrl: liskBanner.src,
   },
-
-  //Etherlink Testnet
-  128123: {
-    headerImgUrl: etherlinkBanner.src,
+  //Hashfire
+  4227: {
     about:
-      "Etherlink is powered by a Smart Rollup, an enshrined, optimistic rollup technology implemented by Tezos. Smoothly deploy any EVM codebase enabling seamless interaction across interoperable chains with subsecond block times and (nearly) free transactions.",
+      "Imagine a world where every agreement is dynamic, verified, and automated. This is Hashfire—a platform that transforms how agreements are managed by leveraging blockchain technology to provide unparalleled security, automation, and transparency. With Hashfire, signing a document activates a powerful chain of actions, ensuring that agreements are secure, automated, and continuously verified.",
     cta: {
-      backgroundImageUrl: etherlinkCTA.src,
-      title: "The fast, fair and (nearly) free L2",
-      buttonLink: "https://www.etherlink.com",
-      buttonText: "Learn More",
+      backgroundImageUrl: hashfireCTA.src,
+      buttonLink: "https://www.hashfire.xyz/",
+      buttonText: "Learn more",
+      title:
+        "Transform contracts into secure, maximally enforceable agreements",
     },
+    headerImgUrl: hashfireBanner.src,
   },
-  //Etherlink mainnet
-  42793: {
-    headerImgUrl: etherlinkBanner.src,
+  //World Chain Testnet
+  4801: {
     about:
-      "Etherlink is powered by a Smart Rollup, an enshrined, optimistic rollup technology implemented by Tezos. Smoothly deploy any EVM codebase enabling seamless interaction across interoperable chains with subsecond block times and (nearly) free transactions.",
+      "World Chain is the blockchain for real humans, offering priority blockspace and gas-free transactions for World ID-verified users.",
     cta: {
-      backgroundImageUrl: etherlinkCTA.src,
-      title: "The fast, fair and (nearly) free L2",
-      buttonLink: "https://www.etherlink.com",
+      backgroundImageUrl: worldChainCTA.src,
+      buttonLink: "https://world.org/world-chain",
       buttonText: "Learn More",
+      title: "Build for real humans with World Chain",
     },
+    headerImgUrl: worldChainBanner.src,
   },
-  //EVM on Flow testnet
-  545: {
-    headerImgUrl: flowBanner.src,
-    about:
-      "Flow is a secure, high-performance, decentralized L1 EVM equivalent chain, with innovative next-generation features not available on other EVM compatible chains, the lowest fees anywhere, and a vibrant ecosystem of major consumer brands",
+  // mantle
+  5000: {
+    about: `Build dApps with exceptional UX, all while relying on Ethereum's unrivaled security, with our high-performance Ethereum layer-2 network built with modular architecture.`,
     cta: {
-      backgroundImageUrl: flowCTA.src,
-      title:
-        "Explore Flow's innovative features not available on any other EVM compatible chain",
-      buttonLink: "https://developers.flow.com/evm/how-it-works",
+      backgroundImageUrl: mantleBanner.src,
+      buttonLink: "https://x.com/0xMantleDevs",
       buttonText: "Learn More",
+      title: "Reach out to bring your brilliant ideas to life",
     },
+    headerImgUrl: mantleBanner.src,
   },
-  //EVM on Flow Mainnet
-  747: {
-    headerImgUrl: flowBanner.src,
+  //LAOS Mainnet
+  6283: {
     about:
-      "Flow is a secure, high-performance, decentralized L1 EVM equivalent chain, with innovative next-generation features not available on other EVM compatible chains, the lowest fees anywhere, and a vibrant ecosystem of major consumer brands",
+      "LAOS is the first Layer 1 protocol connected without bridges to Ethereum, Polygon and other EVM-compatible chains, capable of offloading more than 20% of all their transactions. It enables unlimited NFT minting on these networks at lower costs, bypassing native gas fees. This approach eliminates the need for bridges or wrapped currencies while maintaining compatibility with existing DApps",
     cta: {
-      backgroundImageUrl: flowCTA.src,
-      title:
-        "Learn about innovative features not available on any other EVM compatible chains!",
-      buttonLink: "https://developers.flow.com/evm/how-it-works",
+      backgroundImageUrl: laosCTA.src,
+      buttonLink: "https://laosnetwork.io/build",
+      buttonText: "Learn more",
+      title: "Mint NFTs at Scale on any EVM Chain with LAOS",
+    },
+    headerImgUrl: laosBanner.src,
+  },
+  //Rivalz Testnet
+  6966: {
+    about:
+      "Rivalz merges real-world economies with AI, redefining how agents interact with global resources. Through its modular infrastructure, Rivalz enables AI agents to tap into the global workforce, digital services, and DePIN—from computers to smart homes—seamlessly connecting AI with reality.",
+    cta: {
+      backgroundImageUrl: rivalzCTA.src,
+      buttonLink: "https://rivalz.ai/download",
       buttonText: "Learn More",
+      title: "Empower the Age of AI Agents with Rivalz",
     },
+    headerImgUrl: rivalzBanner.src,
   },
-  //Fuse
-  122: {
-    headerImgUrl: thirdwebBanner.src,
+  // Zetachain
+  7000: {
     about:
-      "Build and grow on the leading web3 platform for business and finance, powered by a performant zkEVM tailor made to get millions of consumers on-chain.",
+      "ZetaChain is the first Universal Blockchain with native access to Bitcoin, Ethereum, Solana, and more, offering seamless UX and unified liquidity to the next billions of users. With its Universal EVM, ZetaChain empowers developers to build Universal Apps that operate natively across any blockchain, creating a fluid crypto ecosystem from a single platform.",
     cta: {
-      backgroundImageUrl: thirdwebCTA.src,
-      title: "",
-      buttonLink: "https://www.fuse.io/",
+      backgroundImageUrl: zetachainCTA.src,
+      buttonLink: "https://www.zetachain.com/docs/",
       buttonText: "Learn more",
+      title: "The First Universal Blockchain",
     },
+    headerImgUrl: zetachainBanner.src,
   },
-  //Funki Mainnet
-  33979: {
-    headerImgUrl: funkiBanner.src,
+  // ZetaChain Testnet
+  7001: {
     about:
-      "Funki is a fun-first L2 using OP stack, focused on onchain gaming and social experiments.\nFunki is the playground where innovative ideas come to life. We’re dedicated to building an ecosystem that upholds bold, persistent experiments.",
+      "ZetaChain is the first Universal Blockchain with native access to Bitcoin, Ethereum, Solana, and more, offering seamless UX and unified liquidity to the next billions of users. With its Universal EVM, ZetaChain empowers developers to build Universal Apps that operate natively across any blockchain, creating a fluid crypto ecosystem from a single platform.",
     cta: {
-      backgroundImageUrl: funkiCTA.src,
-      title: "Enter the Rabbit hole",
-      buttonLink: "https://docs.funkichain.com/docs",
-      buttonText: "Learn More",
+      backgroundImageUrl: zetachainCTA.src,
+      buttonLink: "https://www.zetachain.com/docs/",
+      buttonText: "Learn more",
+      title: "The First Universal Blockchain",
     },
+    headerImgUrl: zetachainBanner.src,
   },
-  //Funki Testnet
-  3397901: {
-    headerImgUrl: funkiBanner.src,
+  // cyber
+  7560: {
     about:
-      "Funki is a fun-first L2 using OP stack, focused on onchain gaming and social experiments.\nFunki is the playground where innovative ideas come to life. We’re dedicated to building an ecosystem that upholds bold, persistent experiments.",
+      "Cyber is a Layer 2 blockchain specifically designed for social applications. Built on the Optimism Superchain, it combines high-performance infrastructure with specialized tools for social features to simplify developer workflows and accelerate their time to market.",
     cta: {
-      backgroundImageUrl: funkiCTA.src,
-      title: "Enter the Rabbit hole",
-      buttonLink: "https://docs.funkichain.com/docs",
-      buttonText: "Learn More",
+      backgroundImageUrl: cyberCTA.src,
+      buttonLink: "https://cyber.co/",
+      buttonText: "Learn more",
+      title: "Discover Web3 Social with Cyber",
     },
+    headerImgUrl: cyberChainBanner.src,
   },
-  //Gemuchain -- Deprecated
-  1903648807: {
-    headerImgUrl: thirdwebBanner.src,
+  // B3 Mainnet
+  8333: {
     about:
-      "Is a new Layer 2 integrating Al, Cybersecurity, ZK and a new Consensus layer - Proof Of Longevity. It will protect projects from bad actors and practices including hacks, manipulations, MEV bots and more, penalize bad actors and reward good actors and long term holders, so unlike anything out there today.",
+      "Created by a team of Base/Coinbase alumni and OG ETH contributors, B3 is a horizontally scaled gaming ecosystem built on Base. \n\nOur rollup network settles on Base, ensuring B3 transactions inherit the security of the EVM.",
     cta: {
       backgroundImageUrl: thirdwebCTA.src,
-      title: "",
-      buttonLink: "https://gemuchain.io/",
+      buttonLink: "https://b3.fun/",
       buttonText: "Learn more",
+      title: "",
     },
+    headerImgUrl: thirdwebBanner.src,
   },
-  //GPT Mainnet
-  1511670449: {
-    headerImgUrl: gptChainBanner.src,
+  // base
+  8453: {
     about:
-      "GPT Protocol combines cutting-edge L2 EVM technology with seamless AI integration to power the future of decentralized applications. By enabling ultra-fast transactions, unmatched scalability, and eco-friendly solutions, GPT Protocol opens doors to developers, brands, and users alike. With innovative tools, a robust ecosystem, and low transaction costs, GPT Protocol is designed for a smarter, more connected blockchain experience. Join us in building the next generation of decentralized innovation.",
+      "Base is a secure, low-cost, builder-friendly Ethereum L2 built to bring the next billion users onchain.",
+    headerImgUrl: baseBanner.src,
+  },
+  //Shido
+  9008: {
+    about:
+      "Shido Network is a superfast EVM chain with the lowest fees. Seamlessly interoperable with Cosmos, EVM and WASM. Bringing you the future of DeFi, unlocking unified liquidity through chain abstraction.",
     cta: {
-      backgroundImageUrl: gptCTA.src,
-      title: "Build on the blockchain for AI",
-      buttonLink: "https://www.gptprotocol.com/",
+      backgroundImageUrl: shidoCta.src,
+      buttonLink: "https://shido.io/",
       buttonText: "Learn more",
+      title: "Endless scalability with Shido Network",
     },
+    headerImgUrl: shidoBanner.src,
   },
-  //HemiSepolia
-  743111: {
-    headerImgUrl: hemiSepoliaBanner.src,
+  //zytron
+  9901: {
     about:
-      "The Hemi Network is a modular Layer-2 protocol for superior scaling, security, and interoperability, powered by Bitcoin and Ethereum.",
+      "Discover Zytron - a highly customizable Layer 3 roll up stack, natively supporting Zypher’s blockchain abstraction layer for games. It is designed for production level gaming experiences, from autonomous worlds to TON-based hyper casual games.",
     cta: {
-      backgroundImageUrl: hemiSepoliaCTA.src,
-      title: "One Network, Powered by Bitcoin and Ethereum",
-      buttonLink: "https://hemi.xyz/",
-      buttonText: "Learn More",
+      backgroundImageUrl: zytronCTA.src,
+      buttonLink: "https://zytron.zypher.network/",
+      buttonText: "Learn more",
+      title: "Unlock ZK Gaming with Zytron Layer3.",
     },
+    headerImgUrl: zytronBanner.src,
   },
-  //Hashfire
-  4227: {
-    headerImgUrl: hashfireBanner.src,
+  //0G-Newton-Testnet
+  16600: {
     about:
-      "Imagine a world where every agreement is dynamic, verified, and automated. This is Hashfire—a platform that transforms how agreements are managed by leveraging blockchain technology to provide unparalleled security, automation, and transparency. With Hashfire, signing a document activates a powerful chain of actions, ensuring that agreements are secure, automated, and continuously verified.",
+      "ZeroGravity (0G) is the first infinitely scalable and decentralized data availability layer with a built-in general-purpose storage layer.",
     cta: {
-      backgroundImageUrl: hashfireCTA.src,
-      title:
-        "Transform contracts into secure, maximally enforceable agreements",
-      buttonLink: "https://www.hashfire.xyz/",
+      backgroundImageUrl: zeroGCTA.src,
+      buttonLink: "https://docs.0g.ai/0g-doc",
       buttonText: "Learn more",
+      title: "Unlock web3's full potential with 0G",
     },
+    headerImgUrl: zeroGBanner.src,
   },
-  //LAOS Mainnet
-  6283: {
-    headerImgUrl: laosBanner.src,
+  //Funki Mainnet
+  33979: {
     about:
-      "LAOS is the first Layer 1 protocol connected without bridges to Ethereum, Polygon and other EVM-compatible chains, capable of offloading more than 20% of all their transactions. It enables unlimited NFT minting on these networks at lower costs, bypassing native gas fees. This approach eliminates the need for bridges or wrapped currencies while maintaining compatibility with existing DApps",
+      "Funki is a fun-first L2 using OP stack, focused on onchain gaming and social experiments.\nFunki is the playground where innovative ideas come to life. We’re dedicated to building an ecosystem that upholds bold, persistent experiments.",
     cta: {
-      backgroundImageUrl: laosCTA.src,
-      title: "Mint NFTs at Scale on any EVM Chain with LAOS",
-      buttonLink: "https://laosnetwork.io/build",
-      buttonText: "Learn more",
+      backgroundImageUrl: funkiCTA.src,
+      buttonLink: "https://docs.funkichain.com/docs",
+      buttonText: "Learn More",
+      title: "Enter the Rabbit hole",
     },
+    headerImgUrl: funkiBanner.src,
   },
-  //Lisk Testnet
-  4202: {
-    headerImgUrl: liskBanner.src,
+  // Aleph 0 Mainnet
+  41455: {
     about:
-      "Lisk is focused on serving builders in high-growth markets like Africa and Southeast Asia. When you build on Lisk, you become part of the strongest Ethereum collective, alongside Coinbase, Sony, World, Kraken and Uniswap -- the OP Superchain.",
+      "Aleph Zero is a privacy-enhancing blockchain ecosystem boasting a WASM L1 and an EVM L2 that offer instant transactions, the fastest ZK-based privacy features, and a seamless developer experience.",
     cta: {
-      backgroundImageUrl: liskCTA.src,
-      title: "Ready to reshape the world?",
-      buttonLink: "https://lisk.com",
+      backgroundImageUrl: alephZeroCTA.src,
+      buttonLink: "https://zkos.alephzero.org/",
       buttonText: "Learn more",
+      title: "See how Aleph Zero redefines EVM privacy",
     },
+    headerImgUrl: alephZeroBaner.src,
   },
-  //Lisk Mainnet
-  1135: {
-    headerImgUrl: liskBanner.src,
+  //EDUMainnet
+  41923: {
     about:
-      "Lisk is focused on serving builders in high-growth markets like Africa and Southeast Asia. When you build on Lisk, you become part of the strongest Ethereum collective, alongside Coinbase, Sony, World, Kraken and Uniswap -- the OP Superchain.",
+      "Education On-Chain - A Layer 3 blockchain preparing students and learners for the future of work while advancing onchain education finance (EduFi).",
+    cta: {
+      backgroundImageUrl: eduCTA.src,
+      buttonLink: "https://educhain.xyz/",
+      buttonText: "Learn More",
+      title: "Education On-Chain",
+    },
+    headerImgUrl: eduBanner.src,
   },
-  //Metal L2
-  1750: {
-    headerImgUrl: metalBanner.src,
+  //Donatuz
+  42026: {
     about:
-      "Metal L2 is a banking-focused Layer 2 blockchain built on the Optimism Superchain, designed to enable direct on-chain fiat deposits through its connection to The Digital Banking Network—an open-source blockchain banking protocol developed by Metallicus",
+      "Monetize your passion, your way. Discover the freedom to grow with our creator-focused platform.",
+    headerImgUrl: thirdwebBanner.src,
+  },
+  //AssetChain
+  42421: {
+    about:
+      "Asset Chain is the native blockchain for Xend Finance's Real-World Asset OAE (Onchain Asset Environment), with its consensus based on Fantom's Lachesis consensus mechanism.",
+    cta: {
+      backgroundImageUrl: assetChainCTABG.src,
+      buttonLink: "https://docs.assetchain.org",
+      buttonText: "Learn more",
+      title: "Start Building",
+    },
+    headerImgUrl: assetChainBanner.src,
+  },
+  //Etherlink mainnet
+  42793: {
+    about:
+      "Etherlink is powered by a Smart Rollup, an enshrined, optimistic rollup technology implemented by Tezos. Smoothly deploy any EVM codebase enabling seamless interaction across interoperable chains with subsecond block times and (nearly) free transactions.",
+    cta: {
+      backgroundImageUrl: etherlinkCTA.src,
+      buttonLink: "https://www.etherlink.com",
+      buttonText: "Learn More",
+      title: "The fast, fair and (nearly) free L2",
+    },
+    headerImgUrl: etherlinkBanner.src,
   },
   //NEO X
   47763: {
-    headerImgUrl: NeoXBanner.src,
     about:
       "Neo X is an EVM-compatible sidechain built by Neo, incorporating Neo's distinctive dBFT consensus mechanism. Serving as a bridge between Neo N3 and the widely used EVM network, Neo X will play a crucial role in expanding the Neo ecosystem and offering developers more opportunities for innovation.",
     cta: {
       backgroundImageUrl: NeoXCTA.src,
-      title: "Learn more about Neo X",
       buttonLink: "https://x.neo.org/",
       buttonText: "Learn More",
+      title: "Learn more about Neo X",
     },
-  },
-  //NEO X Testnet
-  12227332: {
     headerImgUrl: NeoXBanner.src,
+  },
+  //Somnia Devnet
+  50311: {
     about:
-      "Neo X is an EVM-compatible sidechain built by Neo, incorporating Neo's distinctive dBFT consensus mechanism. Serving as a bridge between Neo N3 and the widely used EVM network, Neo X will play a crucial role in expanding the Neo ecosystem and offering developers more opportunities for innovation.",
+      "We are committed to building technology to make fully on-chain, real-time mass-scale applications possible and practical. We believe this is essential for creating a composable, open internet. We believe in a collection of applications, each with distinct, interconnected experiences, much like countries within a global community, sharing utilities that enhance mutual growth. \nCentral to our vision is the principle of composability—the ability for builders to build upon each other’s work, creating a culture of collaboration in which the collective output surpasses the sum of its parts. We will empower builders with the freedom to build sustainable models of engagement and ownership. This includes safeguarding the rights to digital assets and creating an environment where platform constraints do not stifle innovation.",
     cta: {
-      backgroundImageUrl: NeoXCTA.src,
-      title: "Learn more about Neo X",
-      buttonLink: "https://x.neo.org/",
+      backgroundImageUrl: somniaBanner.src,
+      buttonLink: "https://codex.somnia.network",
       buttonText: "Learn More",
+      title: "Somnia Devnet",
     },
+    headerImgUrl: somniaBanner.src,
   },
-  //0G-Newton-Testnet
-  16600: {
-    headerImgUrl: zeroGBanner.src,
+  // Superposition Mainnet
+  55244: {
     about:
-      "ZeroGravity (0G) is the first infinitely scalable and decentralized data availability layer with a built-in general-purpose storage layer.",
+      "Superposition is the first blockchain that pays you to use it. It is a DeFi native Layer-3 that focuses on novel incentives and order-flow for growth and value capture for developers and users alike.\n\nSuperpositions includes a native on-chain orderbook with faster execution speeds through Stylus, providing shared and permissionless liquidity for all apps onchain, and Super Assets, which pay yield when you both hold and use them.",
     cta: {
-      backgroundImageUrl: zeroGCTA.src,
-      title: "Unlock web3's full potential with 0G",
-      buttonLink: "https://docs.0g.ai/0g-doc",
+      backgroundImageUrl: superpositionCTA.src,
+      buttonLink: "https://superposition.so/",
+      buttonText: "Learn more",
+      title: "The Blockchain that pays you to use it",
+    },
+    headerImgUrl: superpositionBanner.src,
+  },
+
+  // Ink
+  57073: {
+    about:
+      "Ink is an Ethereum OP Stack layer 2 blockchain designed to be the house of DeFi for the Superchain, a powerful base layer for deploying innovative DeFi protocols.",
+    headerImgUrl: inkBanner.src,
+  },
+  //Treasure Mainnet
+  61166: {
+    about:
+      'Treasure is the decentralized game console. Powered by $MAGIC, the Treasure L2 serves as the base layer for the best cryptonative games and projects. Treasure and its network of "Infinity Chains" L3s offers EVM compatibility, massive scale, and decentralized infrastructure enshrined throughout. Combined with a passionate community and builder support, developers on Treasure are equipped with all of the tools they need to not only build great games and products, but also distribute to the masses.',
+    cta: {
+      backgroundImageUrl: treasureCTA.src,
+      buttonLink: "https://portal.treasure.lol",
       buttonText: "Learn more",
+      title: "Start building on Treasure!",
     },
+    headerImgUrl: treasureBanner.src,
+  },
+  //Creator Mainnet
+  66665: {
+    about:
+      "From Builders to Builders, From Idea to Creation ⚡\nCreator is AI Superhero Layer 2 Blockchain 🦇\nBuilt on the OP Stack, leveraging the robust foundation of Optimism 🟡🔴. We adopt the OP Stack's design principles because, as builders, we know they work and align perfectly with our values.\nWhy Creator?\nWe're constructing our Testnet on the Bedrock release of the OP Stack, ensuring a scalable and modular infrastructure that supports innovative and decentralized applications.\nCore Features:\n- Lightning Fast Transactions: Say goodbye to slow speeds with Creator's Layer 2 technology.\n- Low Fees: Lower transaction costs make blockchain accessible to all.\n- Scalable Infrastructure: Creator's network adapts effortlessly as you grow.",
+    cta: {
+      backgroundImageUrl: creatorCTA.src,
+      buttonLink: "https://www.creatorchain.io/",
+      buttonText: "Learn More",
+      title: "From Builders to Builders, From Idea to Creation ⚡",
+    },
+    headerImgUrl: creatorBanner.src,
   },
   //Onyx Mainnet
   80888: {
-    headerImgUrl: onyxBanner.src,
     about:
       "Onyx is a layer 3 blockchain secured by Ethereum and Base providing developers and institutions a secure financial-purposed decentralized blockchain for banking and securities based applications. Powered by XCN.",
     cta: {
       backgroundImageUrl: onyxCTA.src,
-      title: "Unlock the potential of your application with Onyx Connect",
       buttonLink: "https://onyx.org/",
       buttonText: "Learn More",
+      title: "Unlock the potential of your application with Onyx Connect",
     },
+    headerImgUrl: onyxBanner.src,
   },
   //Plume Testnet
   98864: {
-    headerImgUrl: plumeBanner.src,
     about:
       "Plume Network is the first full-stack L1 RWA Chain and ecosystem purpose-built for RWAfi, enabling the rapid adoption and demand-driven integration of real world assets. With 180+ projects building on the network, Plume offers a composable, EVM-compatible environment for onboarding and managing diverse real world assets. Coupled with an end-to-end tokenization engine and a network of financial infrastructure partners, Plume simplifies asset onboarding and enables seamless DeFi integration for RWAs so anyone can tokenize real world assets, distribute them globally, and make them useful for native crypto users.",
     cta: {
       backgroundImageUrl: plumeCTA.src,
-      title: "Participate on the Testnet Now!",
       buttonLink: "https://miles.plumenetwork.xyz/",
       buttonText: "Learn more",
+      title: "Participate on the Testnet Now!",
     },
+    headerImgUrl: plumeBanner.src,
   },
   //Plume Mainnet
   98865: {
-    headerImgUrl: plumeBanner.src,
     about:
       "Plume Network is the first full-stack L1 RWA Chain and ecosystem purpose-built for RWAfi, enabling the rapid adoption and demand-driven integration of real world assets. With 180+ projects building on the network, Plume offers a composable, EVM-compatible environment for onboarding and managing diverse real world assets. Coupled with an end-to-end tokenization engine and a network of financial infrastructure partners, Plume simplifies asset onboarding and enables seamless DeFi integration for RWAs so anyone can tokenize real world assets, distribute them globally, and make them useful for native crypto users.",
     cta: {
       backgroundImageUrl: plumeCTA.src,
-      title: "Bringing the Real World Onchain",
       buttonLink: "https://miles.plumenetwork.xyz/",
       buttonText: "Learn more",
+      title: "Bringing the Real World Onchain",
     },
+    headerImgUrl: plumeBanner.src,
   },
   //Plume Mainnet
   98866: {
-    headerImgUrl: plumeBanner.src,
     about:
       "Plume Network is the first full-stack L1 RWA Chain and ecosystem purpose-built for RWAfi, enabling the rapid adoption and demand-driven integration of real world assets. With 180+ projects building on the network, Plume offers a composable, EVM-compatible environment for onboarding and managing diverse real world assets. Coupled with an end-to-end tokenization engine and a network of financial infrastructure partners, Plume simplifies asset onboarding and enables seamless DeFi integration for RWAs so anyone can tokenize real world assets, distribute them globally, and make them useful for native crypto users.",
     cta: {
       backgroundImageUrl: plumeCTA.src,
-      title: "Bringing the Real World Onchain",
       buttonLink: "https://miles.plumenetwork.xyz/",
       buttonText: "Learn more",
+      title: "Bringing the Real World Onchain",
     },
+    headerImgUrl: plumeBanner.src,
   },
   //Plume Mainnet
   98867: {
-    headerImgUrl: plumeBanner.src,
     about:
       "Plume Network is the first full-stack L1 RWA Chain and ecosystem purpose-built for RWAfi, enabling the rapid adoption and demand-driven integration of real world assets. With 180+ projects building on the network, Plume offers a composable, EVM-compatible environment for onboarding and managing diverse real world assets. Coupled with an end-to-end tokenization engine and a network of financial infrastructure partners, Plume simplifies asset onboarding and enables seamless DeFi integration for RWAs so anyone can tokenize real world assets, distribute them globally, and make them useful for native crypto users.",
     cta: {
       backgroundImageUrl: plumeCTA.src,
-      title: "Bringing the Real World Onchain",
       buttonLink: "https://miles.plumenetwork.xyz/",
       buttonText: "Learn more",
+      title: "Bringing the Real World Onchain",
     },
-  },
-  //Rivalz Mainnet
-  753: {
-    headerImgUrl: rivalzBanner.src,
-    about:
-      "Rivalz merges real-world economies with AI, redefining how agents interact with global resources. Through its modular infrastructure, Rivalz enables AI agents to tap into the global workforce, digital services, and DePIN—from computers to smart homes—seamlessly connecting AI with reality.",
-    cta: {
-      backgroundImageUrl: rivalzCTA.src,
-      title: "Empower the Age of AI Agents with Rivalz",
-      buttonLink: "https://rivalz.ai/download",
-      buttonText: "Learn More",
-    },
-  },
-  //Rivalz Testnet
-  6966: {
-    headerImgUrl: rivalzBanner.src,
-    about:
-      "Rivalz merges real-world economies with AI, redefining how agents interact with global resources. Through its modular infrastructure, Rivalz enables AI agents to tap into the global workforce, digital services, and DePIN—from computers to smart homes—seamlessly connecting AI with reality.",
-    cta: {
-      backgroundImageUrl: rivalzCTA.src,
-      title: "Empower the Age of AI Agents with Rivalz",
-      buttonLink: "https://rivalz.ai/download",
-      buttonText: "Learn More",
-    },
-  },
-  //Reactive Mainnet
-  1597: {
-    headerImgUrl: reactiveBanner.src,
-    about:
-      "Web3’s first IFTTT infrastructure. Automate multi-chain workflows with event-driven logic – execute actions without compromising decentralization.",
-    cta: {
-      backgroundImageUrl: reactiveCTA.src,
-      title: "Turn Smart Contracts Reactive",
-      buttonLink: "https://dev.reactive.network",
-      buttonText: "Learn More",
-    },
-  },
-  //Saakuru Mainnet
-  7225878: {
-    headerImgUrl: saakuruBanner.src,
-    about:
-      "Saakuru Labs is a Web3 GameFi innovation and growth hub, dedicated to empowering game studios through tailored collaborations that cater to their unique needs and stages of game development. By providing a structured process to evaluate and support studios, Saakuru Labs aims to expand the Saakuru gaming ecosystem while ensuring the success of its partners.",
-    cta: {
-      backgroundImageUrl: saakuruCTA.src,
-      title: "Empowering Next-Gen Blockchain Gaming",
-      buttonLink: "https://saakuru.com/",
-      buttonText: "Learn More",
-    },
-  },
-  //Saakuru Testnet
-  247253: {
-    headerImgUrl: saakuruBanner.src,
-    about:
-      "Saakuru Labs is a Web3 GameFi innovation and growth hub, dedicated to empowering game studios through tailored collaborations that cater to their unique needs and stages of game development. By providing a structured process to evaluate and support studios, Saakuru Labs aims to expand the Saakuru gaming ecosystem while ensuring the success of its partners.",
-    cta: {
-      backgroundImageUrl: saakuruCTA.src,
-      title: "Empowering Next-Gen Blockchain Gaming",
-      buttonLink: "https://saakuru.com/",
-      buttonText: "Learn More",
-    },
-  },
-  //Somnia Devnet
-  50311: {
-    headerImgUrl: somniaBanner.src,
-    about:
-      "We are committed to building technology to make fully on-chain, real-time mass-scale applications possible and practical. We believe this is essential for creating a composable, open internet. We believe in a collection of applications, each with distinct, interconnected experiences, much like countries within a global community, sharing utilities that enhance mutual growth. \nCentral to our vision is the principle of composability—the ability for builders to build upon each other’s work, creating a culture of collaboration in which the collective output surpasses the sum of its parts. We will empower builders with the freedom to build sustainable models of engagement and ownership. This includes safeguarding the rights to digital assets and creating an environment where platform constraints do not stifle innovation.",
-    cta: {
-      backgroundImageUrl: somniaBanner.src,
-      title: "Somnia Devnet",
-      buttonLink: "https://codex.somnia.network",
-      buttonText: "Learn More",
-    },
-  },
-  //viction Mainnet
-  88: {
-    headerImgUrl: victionBanner.src,
+    headerImgUrl: plumeBanner.src,
+  },
+  // Superposition Testnet
+  98985: {
     about:
-      "Viction is a global layer-1 EVM blockchain that empowers builders at every level, provides both the foundation and enhancements necessary for projects to achieve stability and soar to their higher selves. \n We provide seamless interoperability, scalability, flexible development, zero gas fees, enhanced security, and speed to enable builders with tech capabilities. Beyond technical advantages, Viction offers holistic guidance through consultation, resources, funding, and strong network connections to foster project growth.",
+      "Superposition is the first blockchain that pays you to use it. It is a DeFi native Layer-3 that focuses on novel incentives and order-flow for growth and value capture for developers and users alike.\n\nSuperpositions includes a native on-chain orderbook with faster execution speeds through Stylus, providing shared and permissionless liquidity for all apps onchain, and Super Assets, which pay yield when you both hold and use them.",
     cta: {
-      backgroundImageUrl: victionCTA.src,
-      title:
-        "Build, own, win, and be part of Viction World Wide Chain where everyone scales beyond limits.",
-      buttonLink: "https://thirdweb.com/viction",
-      buttonText: "Learn More",
+      backgroundImageUrl: superpositionCTA.src,
+      buttonLink: "https://superposition.so/",
+      buttonText: "Learn more",
+      title: "The Blockchain that pays you to use it",
     },
+    headerImgUrl: superpositionBanner.src,
   },
-  //viction Testnet
-  89: {
-    headerImgUrl: victionBanner.src,
+
+  //Etherlink Testnet
+  128123: {
     about:
-      "Viction is a global layer-1 EVM blockchain that empowers builders at every level, provides both the foundation and enhancements necessary for projects to achieve stability and soar to their higher selves. \n We provide seamless interoperability, scalability, flexible development, zero gas fees, enhanced security, and speed to enable builders with tech capabilities. Beyond technical advantages, Viction offers holistic guidance through consultation, resources, funding, and strong network connections to foster project growth.",
+      "Etherlink is powered by a Smart Rollup, an enshrined, optimistic rollup technology implemented by Tezos. Smoothly deploy any EVM codebase enabling seamless interaction across interoperable chains with subsecond block times and (nearly) free transactions.",
     cta: {
-      backgroundImageUrl: victionCTA.src,
-      title:
-        "Build, own, win, and be part of Viction World Wide Chain where everyone scales beyond limits.",
-      buttonLink: "https://thirdweb.com/viction",
+      backgroundImageUrl: etherlinkCTA.src,
+      buttonLink: "https://www.etherlink.com",
       buttonText: "Learn More",
+      title: "The fast, fair and (nearly) free L2",
     },
+    headerImgUrl: etherlinkBanner.src,
   },
-  // World Chain Mainnet
-  480: {
-    headerImgUrl: worldChainBanner.src,
-    about:
-      "World Chain is the blockchain for real humans, offering priority blockspace and gas-free transactions for World ID-verified users.",
-  },
-  //World Chain Testnet
-  4801: {
-    headerImgUrl: worldChainBanner.src,
+  //Saakuru Testnet
+  247253: {
     about:
-      "World Chain is the blockchain for real humans, offering priority blockspace and gas-free transactions for World ID-verified users.",
+      "Saakuru Labs is a Web3 GameFi innovation and growth hub, dedicated to empowering game studios through tailored collaborations that cater to their unique needs and stages of game development. By providing a structured process to evaluate and support studios, Saakuru Labs aims to expand the Saakuru gaming ecosystem while ensuring the success of its partners.",
     cta: {
-      backgroundImageUrl: worldChainCTA.src,
-      title: "Build for real humans with World Chain",
-      buttonLink: "https://world.org/world-chain",
+      backgroundImageUrl: saakuruCTA.src,
+      buttonLink: "https://saakuru.com/",
       buttonText: "Learn More",
+      title: "Empowering Next-Gen Blockchain Gaming",
     },
+    headerImgUrl: saakuruBanner.src,
   },
-  //zkCandy Testnet
-  302: {
-    headerImgUrl: thirdwebBanner.src,
+  //CampNetwork Testnet v2
+  325000: {
     about:
-      "Explore our cutting-edge Layer2 Ethereum scaling ZK Chain built for gaming and entertainment with the latest zk-proof technology.",
+      "Camp Network is the user identity layer across blockchains. Camp aggregates online user data, enabling users to own and monetize their identity while helping teams better understand user behavior.",
     cta: {
       backgroundImageUrl: thirdwebCTA.src,
-      title: "",
-      buttonLink: "https://zkcandy.io/",
+      buttonLink: "https://www.campnetwork.xyz/",
       buttonText: "Learn more",
+      title: "",
     },
+    headerImgUrl: thirdwebBanner.src,
   },
-
-  //zkCandy Mainnet
-  320: {
-    headerImgUrl: zkCandyBanner.src,
+  //EDU Testnet <Open Campus Codex>
+  656476: {
     about:
-      "ZKcandy is an AI-powered Layer-2 aiming to redefine what’s possible in gaming and entertainment. As a ZK Chain built on ZKsync’s Elastic Network, it focuses on building immersive gaming ecosystems where players make the most of today’s AI capabilities. Emerged from a groundbreaking collaboration between ZKsync and the award-winning game studio iCandy Interactive, It's the first L2 ZK chain for gaming in the ZKsync ecosystem.",
+      "Education On-Chain - A Layer 3 blockchain preparing students and learners for the future of work while advancing onchain education finance (EduFi).",
     cta: {
-      backgroundImageUrl: zkCandyBanner.src,
-      title: " ",
-      buttonLink: "https://litepaper.zkcandy.io/dev-guide/",
+      backgroundImageUrl: eduCTA.src,
+      buttonLink: "https://educhain.xyz/",
       buttonText: "Learn More",
+      title: "Education On-Chain",
     },
+    headerImgUrl: eduBanner.src,
   },
-  //zkSync
-  324: {
-    headerImgUrl: thirdwebBanner.src,
+  // XAI
+  660279: {
     about:
-      "ZKsync is an ever expanding verifiable blockchain network, secured by math.",
+      "Xai was developed to enable real economies and open trade in the next generation of video games. With Xai, potentially billions of traditional gamers can own and trade valuable in-game items in their favorite games for the first time, without the need to use crypto-wallets.",
+
     cta: {
-      backgroundImageUrl: thirdwebCTA.src,
-      title: "",
-      buttonLink: "https://zksync.io/",
+      backgroundImageUrl: xaiCTABg.src,
+      buttonLink: "https://connect.xai.games",
       buttonText: "Learn more",
+      title: "Unlock ultimate possibility with Xai Connect",
+    },
+    headerImgUrl: xaiBanner.src,
+  },
+  //HemiSepolia
+  743111: {
+    about:
+      "The Hemi Network is a modular Layer-2 protocol for superior scaling, security, and interoperability, powered by Bitcoin and Ethereum.",
+    cta: {
+      backgroundImageUrl: hemiSepoliaCTA.src,
+      buttonLink: "https://hemi.xyz/",
+      buttonText: "Learn More",
+      title: "One Network, Powered by Bitcoin and Ethereum",
     },
+    headerImgUrl: hemiSepoliaBanner.src,
   },
   //treasure-Ruby
   978657: {
-    headerImgUrl: treasureBanner.src,
     about:
       'Treasure is the decentralized game console. Powered by $MAGIC, the Treasure L2 serves as the base layer for the best cryptonative games and projects. Treasure and its network of "Infinity Chains" L3s offers EVM compatibility, massive scale, and decentralized infrastructure enshrined throughout. Combined with a passionate community and builder support, developers on Treasure are equipped with all of the tools they need to not only build great games and products, but also distribute to the masses.',
     cta: {
       backgroundImageUrl: treasureCTA.src,
-      title: "Start building on Treasure!",
       buttonLink: "https://portal.treasure.lol",
       buttonText: "Learn more",
+      title: "Start building on Treasure!",
     },
+    headerImgUrl: treasureBanner.src,
   },
   //Treasure Topaz
   978658: {
-    headerImgUrl: treasureBanner.src,
     about:
       'Treasure is the decentralized game console. Powered by $MAGIC, the Treasure L2 serves as the base layer for the best cryptonative games and projects. Treasure and its network of "Infinity Chains" L3s offers EVM compatibility, massive scale, and decentralized infrastructure enshrined throughout. Combined with a passionate community and builder support, developers on Treasure are equipped with all of the tools they need to not only build great games and products, but also distribute to the masses.',
     cta: {
       backgroundImageUrl: treasureCTA.src,
-      title: "Start building on Treasure!",
       buttonLink: "https://portal.treasure.lol",
       buttonText: "Learn more",
+      title: "Start building on Treasure!",
     },
-  },
-  //Treasure Mainnet
-  61166: {
     headerImgUrl: treasureBanner.src,
+  },
+  //COTI Mainnet
+  2632500: {
     about:
-      'Treasure is the decentralized game console. Powered by $MAGIC, the Treasure L2 serves as the base layer for the best cryptonative games and projects. Treasure and its network of "Infinity Chains" L3s offers EVM compatibility, massive scale, and decentralized infrastructure enshrined throughout. Combined with a passionate community and builder support, developers on Treasure are equipped with all of the tools they need to not only build great games and products, but also distribute to the masses.',
+      "COTI is the fastest, lightest privacy layer in Web3, powered by the breakthrough cryptographic protocol Garbled Circuits. Build with privacy. Scale with speed.",
     cta: {
-      backgroundImageUrl: treasureCTA.src,
-      title: "Start building on Treasure!",
-      buttonLink: "https://portal.treasure.lol",
-      buttonText: "Learn more",
+      backgroundImageUrl: cotiCTA.src,
+      buttonLink: "https://thirdweb.com/coti",
+      buttonText: "Learn More",
+      title: "The Fastest, Lightest Privacy Layer in Web3",
     },
+    headerImgUrl: cotiBanner.src,
   },
-  //AssetChain
-  42421: {
-    headerImgUrl: assetChainBanner.src,
+  //Funki Testnet
+  3397901: {
     about:
-      "Asset Chain is the native blockchain for Xend Finance's Real-World Asset OAE (Onchain Asset Environment), with its consensus based on Fantom's Lachesis consensus mechanism.",
+      "Funki is a fun-first L2 using OP stack, focused on onchain gaming and social experiments.\nFunki is the playground where innovative ideas come to life. We’re dedicated to building an ecosystem that upholds bold, persistent experiments.",
     cta: {
-      backgroundImageUrl: assetChainCTABG.src,
-      title: "Start Building",
-      buttonLink: "https://docs.assetchain.org",
-      buttonText: "Learn more",
+      backgroundImageUrl: funkiCTA.src,
+      buttonLink: "https://docs.funkichain.com/docs",
+      buttonText: "Learn More",
+      title: "Enter the Rabbit hole",
     },
+    headerImgUrl: funkiBanner.src,
   },
-  // Zetachain
-  7000: {
-    headerImgUrl: zetachainBanner.src,
+  //COTI Testnet
+  7082400: {
     about:
-      "ZetaChain is the first Universal Blockchain with native access to Bitcoin, Ethereum, Solana, and more, offering seamless UX and unified liquidity to the next billions of users. With its Universal EVM, ZetaChain empowers developers to build Universal Apps that operate natively across any blockchain, creating a fluid crypto ecosystem from a single platform.",
+      "COTI is the fastest, lightest privacy layer in Web3, powered by the breakthrough cryptographic protocol Garbled Circuits. Build with privacy. Scale with speed.",
     cta: {
-      backgroundImageUrl: zetachainCTA.src,
-      title: "The First Universal Blockchain",
-      buttonLink: "https://www.zetachain.com/docs/",
-      buttonText: "Learn more",
+      backgroundImageUrl: cotiCTA.src,
+      buttonLink: "https://thirdweb.com/coti",
+      buttonText: "Learn More",
+      title: "The Fastest, Lightest Privacy Layer in Web3",
     },
+    headerImgUrl: cotiBanner.src,
   },
-  // ZetaChain Testnet
-  7001: {
-    headerImgUrl: zetachainBanner.src,
+  //Saakuru Mainnet
+  7225878: {
     about:
-      "ZetaChain is the first Universal Blockchain with native access to Bitcoin, Ethereum, Solana, and more, offering seamless UX and unified liquidity to the next billions of users. With its Universal EVM, ZetaChain empowers developers to build Universal Apps that operate natively across any blockchain, creating a fluid crypto ecosystem from a single platform.",
+      "Saakuru Labs is a Web3 GameFi innovation and growth hub, dedicated to empowering game studios through tailored collaborations that cater to their unique needs and stages of game development. By providing a structured process to evaluate and support studios, Saakuru Labs aims to expand the Saakuru gaming ecosystem while ensuring the success of its partners.",
     cta: {
-      backgroundImageUrl: zetachainCTA.src,
-      title: "The First Universal Blockchain",
-      buttonLink: "https://www.zetachain.com/docs/",
-      buttonText: "Learn more",
+      backgroundImageUrl: saakuruCTA.src,
+      buttonLink: "https://saakuru.com/",
+      buttonText: "Learn More",
+      title: "Empowering Next-Gen Blockchain Gaming",
     },
+    headerImgUrl: saakuruBanner.src,
   },
-  //zytron
-  9901: {
-    headerImgUrl: zytronBanner.src,
+  //NEO X Testnet
+  12227332: {
     about:
-      "Discover Zytron - a highly customizable Layer 3 roll up stack, natively supporting Zypher’s blockchain abstraction layer for games. It is designed for production level gaming experiences, from autonomous worlds to TON-based hyper casual games.",
+      "Neo X is an EVM-compatible sidechain built by Neo, incorporating Neo's distinctive dBFT consensus mechanism. Serving as a bridge between Neo N3 and the widely used EVM network, Neo X will play a crucial role in expanding the Neo ecosystem and offering developers more opportunities for innovation.",
     cta: {
-      backgroundImageUrl: zytronCTA.src,
-      title: "Unlock ZK Gaming with Zytron Layer3.",
-      buttonLink: "https://zytron.zypher.network/",
+      backgroundImageUrl: NeoXCTA.src,
+      buttonLink: "https://x.neo.org/",
+      buttonText: "Learn More",
+      title: "Learn more about Neo X",
+    },
+    headerImgUrl: NeoXBanner.src,
+  },
+
+  // ancient8
+  888888888: {
+    about:
+      "Ancient8 is building an ETH gaming Layer 2 built with OP Stack, offering a suite of Web3 gaming infrastructure tools that serve as the distribution and marketing channel for games globally. With Space3 Game Publishing Platform, Ancient8 Gaming Guild, Reneverse Web3 Ads engine, A8ID, and Gosu Network, Ancient8 is dedicated to onboard millions of gamers to Web3 gaming, while providing unparalleled support to game developers looking to reach more players. Ancient8’s products have helped 100+ Web3 games and 200K+ users better navigate Web3.\n\nAncient8 has raised $10M in total financing from leading investors including Pantera, Dragonfly, Hashed, Makers Fund, Mechanism, Coinbase, IOSG, Jump and Animoca.",
+    headerImgUrl: ancient8Banner.src,
+  },
+  // lumia Mainnet
+  994873017: {
+    about:
+      "Lumia is the only full-cycle RWA chain, merging zkEVM technology with a robust infrastructure purpose-built for institutional and retail asset tokenization. Featuring advanced compliance tools such as on-chain KYC/AML via PolygonID, OFAC sanctions screening at the sequencer level, and AI-powered threat detection, Lumia Chain ensures security and regulatory adherence. Its unique volition architecture enables users to toggle between cost-efficient validium mode and highly secure rollup mode, providing flexibility for diverse needs. Lumia goes beyond tokenization by seamlessly integrating RWAs into DeFi. RWAs minted on Lumia Chain are instantly composable with native DeFi protocols like lending, AMMs, and perpetual markets, creating a tailored environment for RWA owners. With ERC-20 compatibility, native interoperability, and integration with major DeFi aggregators like 1inch and 0x, Lumia ensures that tokenized RWAs are not only secure and scalable but also accessible across the broader DeFi ecosystem.",
+    cta: {
+      backgroundImageUrl: lumiaBanner.src,
+      buttonLink:
+        "https://docs.lumia.org/build/smartcontracts/deployment#deploy-contract-on-shiden",
       buttonText: "Learn more",
+      title:
+        "Build Smarter. Scale Faster. Lumia - The Only Full-Cycle RWA Chain",
     },
+    headerImgUrl: lumiaBanner.src,
   },
-  //Soneium Testnet
-  1946: {
-    headerImgUrl: soneiumBanner.src,
+  //GPT Mainnet
+  1511670449: {
     about:
-      "Soneium, an Ethereum layer-2 developed by Sony Block Solutions Labs. This versatile chain is a general-purpose blockchain platform that aims to evoke emotion, empower creativity, and meet diverse needs to go mainstream. Soneium will be simplifying blockchain experiences while empowering developers, creators, and communities. Built on accessibility, scalability, and efficiency, it aims to solve real-world problems across industries globally. Soneium will change the way we interact with the internet, opening up a world of innovative applications and unlimited potential for users worldwide.",
+      "GPT Protocol combines cutting-edge L2 EVM technology with seamless AI integration to power the future of decentralized applications. By enabling ultra-fast transactions, unmatched scalability, and eco-friendly solutions, GPT Protocol opens doors to developers, brands, and users alike. With innovative tools, a robust ecosystem, and low transaction costs, GPT Protocol is designed for a smarter, more connected blockchain experience. Join us in building the next generation of decentralized innovation.",
+    cta: {
+      backgroundImageUrl: gptCTA.src,
+      buttonLink: "https://www.gptprotocol.com/",
+      buttonText: "Learn more",
+      title: "Build on the blockchain for AI",
+    },
+    headerImgUrl: gptChainBanner.src,
   },
-  //Soneium Mainnet
-  1868: {
-    headerImgUrl: soneiumBanner.src,
+  //Gemuchain -- Deprecated
+  1903648807: {
     about:
-      "Soneium, an Ethereum layer-2 developed by Sony Block Solutions Labs. This versatile chain is a general-purpose blockchain platform that aims to evoke emotion, empower creativity, and meet diverse needs to go mainstream. Soneium will be simplifying blockchain experiences while empowering developers, creators, and communities. Built on accessibility, scalability, and efficiency, it aims to solve real-world problems across industries globally. Soneium will change the way we interact with the internet, opening up a world of innovative applications and unlimited potential for users worldwide.",
+      "Is a new Layer 2 integrating Al, Cybersecurity, ZK and a new Consensus layer - Proof Of Longevity. It will protect projects from bad actors and practices including hacks, manipulations, MEV bots and more, penalize bad actors and reward good actors and long term holders, so unlike anything out there today.",
+    cta: {
+      backgroundImageUrl: thirdwebCTA.src,
+      buttonLink: "https://gemuchain.io/",
+      buttonText: "Learn more",
+      title: "",
+    },
+    headerImgUrl: thirdwebBanner.src,
   },
-  //Shido
-  9008: {
-    headerImgUrl: shidoBanner.src,
+  // lumia Testnet
+  1952959480: {
     about:
-      "Shido Network is a superfast EVM chain with the lowest fees. Seamlessly interoperable with Cosmos, EVM and WASM. Bringing you the future of DeFi, unlocking unified liquidity through chain abstraction.",
+      "Lumia is the only full-cycle RWA chain, merging zkEVM technology with a robust infrastructure purpose-built for institutional and retail asset tokenization. Featuring advanced compliance tools such as on-chain KYC/AML via PolygonID, OFAC sanctions screening at the sequencer level, and AI-powered threat detection, Lumia Chain ensures security and regulatory adherence. Its unique volition architecture enables users to toggle between cost-efficient validium mode and highly secure rollup mode, providing flexibility for diverse needs. Lumia goes beyond tokenization by seamlessly integrating RWAs into DeFi. RWAs minted on Lumia Chain are instantly composable with native DeFi protocols like lending, AMMs, and perpetual markets, creating a tailored environment for RWA owners. With ERC-20 compatibility, native interoperability, and integration with major DeFi aggregators like 1inch and 0x, Lumia ensures that tokenized RWAs are not only secure and scalable but also accessible across the broader DeFi ecosystem.",
     cta: {
-      backgroundImageUrl: shidoCta.src,
-      title: "Endless scalability with Shido Network",
-      buttonLink: "https://shido.io/",
+      backgroundImageUrl: lumiaBanner.src,
+      buttonLink:
+        "https://docs.lumia.org/build/smartcontracts/deployment#deploy-contract-on-shiden",
       buttonText: "Learn more",
+      title:
+        "Build Smarter. Scale Faster. Lumia - The Only Full-Cycle RWA Chain",
     },
+    headerImgUrl: lumiaBanner.src,
   },
 } satisfies Record<number, ExtraChainMetadata>;
 // END TEMPORARY
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/contracts/deploy/[compiler_uri]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/contracts/deploy/[compiler_uri]/page.tsx
index 8315c85a091..6c9497bed1e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/contracts/deploy/[compiler_uri]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/contracts/deploy/[compiler_uri]/page.tsx
@@ -1,6 +1,6 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { notFound } from "next/navigation";
 import { fetchDeployMetadata } from "thirdweb/contract";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { DeployContractInfo } from "../../../published-contract/components/contract-info";
 import { DeployFormForUri } from "../../../published-contract/components/uri-based-deploy";
 
@@ -27,10 +27,10 @@ export default async function DirectDeployPage(props: DirectDeployPageProps) {
   return (
     <div className="container flex flex-col gap-4 py-8">
       <DeployContractInfo
-        name={metadata.name}
-        displayName={metadata.displayName}
         description={metadata.description}
+        displayName={metadata.displayName}
         logo={metadata.logo}
+        name={metadata.name}
       />
       <DeployFormForUri
         contractMetadata={metadata}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/contracts/deploy/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/contracts/deploy/page.tsx
index 053327e08c6..6cc53273785 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/contracts/deploy/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/contracts/deploy/page.tsx
@@ -1,8 +1,8 @@
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import { DeployableContractTable } from "components/contract-components/contract-table";
 import Link from "next/link";
 import { notFound } from "next/navigation";
 import { Suspense } from "react";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 
 export default async function DeployMultipleContractsPage(props: {
   searchParams?: Promise<{
@@ -25,9 +25,9 @@ export default async function DeployMultipleContractsPage(props: {
         Welcome to the thirdweb contract deployment flow.{" "}
         <Link
           className="text-link-foreground hover:text-foreground"
-          target="_blank"
-          rel="noopener noreferrer"
           href="https://portal.thirdweb.com/contracts/deploy/overview"
+          rel="noopener noreferrer"
+          target="_blank"
         >
           Learn more about deploying your contracts.
         </Link>
@@ -36,7 +36,7 @@ export default async function DeployMultipleContractsPage(props: {
       <div className="h-6" />
 
       <Suspense fallback={<GenericLoadingPage />}>
-        <DeployableContractTable contractIds={ipfsHashes} context="deploy" />
+        <DeployableContractTable context="deploy" contractIds={ipfsHashes} />
       </Suspense>
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/contracts/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/contracts/layout.tsx
index df8af93e28d..6d66f7ddf08 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/contracts/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/contracts/layout.tsx
@@ -1,10 +1,6 @@
 import { TeamHeader } from "../../team/components/TeamHeader/team-header";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/contracts/publish/[publish_uri]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/contracts/publish/[publish_uri]/page.tsx
index 100a53a15d5..8dd725007fd 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/contracts/publish/[publish_uri]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/contracts/publish/[publish_uri]/page.tsx
@@ -1,11 +1,11 @@
-import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
-import { getActiveAccountCookie, getJWTCookie } from "@/constants/cookie";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { ContractPublishForm } from "components/contract-components/contract-publish-form";
 import { revalidatePath } from "next/cache";
 import { notFound, redirect } from "next/navigation";
 import { fetchDeployMetadata } from "thirdweb/contract";
+import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
+import { getActiveAccountCookie, getJWTCookie } from "@/constants/cookie";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { getLatestPublishedContractsWithPublisherMapping } from "../../../published-contract/[publisher]/[contract_id]/utils/getPublishedContractsWithPublisherMapping";
 
 type DirectDeployPageProps = {
@@ -24,8 +24,8 @@ export default async function PublishContractPage(
     : `ipfs://${decodedPublishUri}`;
 
   const publishMetadataFromUri = await fetchDeployMetadata({
-    uri: publishUri,
     client: serverThirdwebClient,
+    uri: publishUri,
   }).catch(() => null);
 
   if (!publishMetadataFromUri) {
@@ -49,9 +49,9 @@ export default async function PublishContractPage(
   if (!publishMetadataFromUri.version) {
     const publishedContract =
       await getLatestPublishedContractsWithPublisherMapping({
-        publisher: address,
-        contract_id: publishMetadataFromUri.name,
         client: serverThirdwebClient,
+        contract_id: publishMetadataFromUri.name,
+        publisher: address,
       });
 
     if (publishedContract) {
@@ -72,8 +72,11 @@ export default async function PublishContractPage(
     <div className="container flex max-w-[1130px] flex-col gap-8 py-8">
       <ChakraProviderSetup>
         <ContractPublishForm
+          client={getClientThirdwebClient({
+            jwt: token,
+            teamId: undefined,
+          })}
           isLoggedIn={!!token}
-          publishMetadata={publishMetadata}
           onPublishSuccess={async () => {
             "use server";
             // we are pretty brutal here and simply invalidate ALL published contracts (for everyone!) and versions no matter what
@@ -83,10 +86,7 @@ export default async function PublishContractPage(
               "layout",
             );
           }}
-          client={getClientThirdwebClient({
-            jwt: token,
-            teamId: undefined,
-          })}
+          publishMetadata={publishMetadata}
         />
       </ChakraProviderSetup>
     </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/contracts/publish/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/contracts/publish/page.tsx
index feb025ac806..8072e229d0e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/contracts/publish/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/contracts/publish/page.tsx
@@ -1,8 +1,8 @@
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import { DeployableContractTable } from "components/contract-components/contract-table";
 import Link from "next/link";
 import { notFound } from "next/navigation";
 import { Suspense } from "react";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 
 export default async function PublishMultipleContractsPage(props: {
   searchParams?: Promise<{
@@ -25,9 +25,9 @@ export default async function PublishMultipleContractsPage(props: {
         Welcome to the thirdweb contract publish flow.{" "}
         <Link
           className="text-link-foreground hover:text-foreground"
-          target="_blank"
-          rel="noopener noreferrer"
           href="https://portal.thirdweb.com/contracts/publish/overview"
+          rel="noopener noreferrer"
+          target="_blank"
         >
           Learn more about publishing your contracts.
         </Link>
@@ -36,7 +36,7 @@ export default async function PublishMultipleContractsPage(props: {
       <div className="h-6" />
 
       <Suspense fallback={<GenericLoadingPage />}>
-        <DeployableContractTable contractIds={ipfsHashes} context="publish" />
+        <DeployableContractTable context="publish" contractIds={ipfsHashes} />
       </Suspense>
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/explore/[category]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/explore/[category]/page.tsx
index 699d782e6b7..100cb2c7cc5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/explore/[category]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/explore/[category]/page.tsx
@@ -1,11 +1,3 @@
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbLink,
-  BreadcrumbList,
-  BreadcrumbPage,
-  BreadcrumbSeparator,
-} from "@/components/ui/breadcrumb";
 import {
   ContractCard,
   ContractCardSkeleton,
@@ -16,6 +8,14 @@ import type { Metadata } from "next";
 import Link from "next/link";
 import { notFound } from "next/navigation";
 import { Suspense } from "react";
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbPage,
+  BreadcrumbSeparator,
+} from "@/components/ui/breadcrumb";
 
 type ExploreCategoryPageProps = {
   params: Promise<{
@@ -32,8 +32,8 @@ export async function generateMetadata(
     notFound();
   }
   return {
-    title: `${category.name} Smart Contracts | Explore`,
     description: `${category.description} Deploy with one click to Ethereum, Polygon, Optimism, and other EVM blockchains with thirdweb.`,
+    title: `${category.name} Smart Contracts | Explore`,
   };
 }
 
@@ -103,19 +103,19 @@ export default async function ExploreCategoryPage(
                 key={publisher + contractId + overrides?.title}
               >
                 <ContractCard
-                  publisher={publisher}
                   contractId={contractId}
-                  titleOverride={overrides?.title}
                   descriptionOverride={overrides?.description}
                   isBeta={category.isBeta}
                   modules={
                     modules?.length
                       ? modules.map((m) => ({
-                          publisher: m.split("/")[0] || "",
                           moduleId: m.split("/")[1] || "",
+                          publisher: m.split("/")[0] || "",
                         }))
                       : undefined
                   }
+                  publisher={publisher}
+                  titleOverride={overrides?.title}
                 />
               </Suspense>
             );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/explore/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/explore/layout.tsx
index df8af93e28d..6d66f7ddf08 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/explore/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/explore/layout.tsx
@@ -1,10 +1,6 @@
 import { TeamHeader } from "../../team/components/TeamHeader/team-header";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/explore/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/explore/page.tsx
index e22665d01c0..4491aac7c7c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/explore/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/explore/page.tsx
@@ -10,12 +10,12 @@ const description =
   "A list of Ethereum smart contract templates for web3 developers, including the most popular evm smart contracts for dapps, NFTs and more.";
 
 export const metadata: Metadata = {
-  title,
   description,
   openGraph: {
-    title,
     description,
+    title,
   },
+  title,
 };
 
 export default async function ExplorePage() {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/layout.tsx
index bf871c68266..ad240d4c32e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/layout.tsx
@@ -1,9 +1,7 @@
 import { AppFooter } from "@/components/blocks/app-footer";
 import { ErrorProvider } from "../../../contexts/error-handler";
 
-export default function DashboardLayout(props: {
-  children: React.ReactNode;
-}) {
+export default function DashboardLayout(props: { children: React.ReactNode }) {
   return (
     <ErrorProvider>
       <div className="flex min-h-dvh flex-col bg-background">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/ProfileUI.tsx b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/ProfileUI.tsx
index 5261e28667d..14d9b797c43 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/ProfileUI.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/ProfileUI.tsx
@@ -1,8 +1,8 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { fetchPublishedContracts } from "components/contract-components/fetchPublishedContracts";
 import { Suspense } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { ProfileHeader } from "./components/profile-header";
 import { PublishedContracts } from "./components/published-contracts";
 
@@ -16,9 +16,9 @@ export function ProfileUI(props: {
   return (
     <div className="container pt-8 pb-20">
       <ProfileHeader
-        profileAddress={profileAddress}
-        ensName={ensName}
         client={props.client}
+        ensName={ensName}
+        profileAddress={profileAddress}
       />
       <div className="h-8" />
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/PublishedContractTable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/PublishedContractTable.tsx
index 91a0ab80812..f05283f157e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/PublishedContractTable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/PublishedContractTable.tsx
@@ -1,3 +1,12 @@
+/** biome-ignore-all lint/nursery/noNestedComponentDefinitions: FIXME */
+import type { PublishedContractDetails } from "components/contract-components/hooks";
+import { replaceDeployerAddress } from "lib/publisher-utils";
+import { replaceIpfsUrl } from "lib/sdk";
+import { ShieldCheckIcon } from "lucide-react";
+import Link from "next/link";
+import { useMemo } from "react";
+import { type Column, type Row, useTable } from "react-table";
+import type { ThirdwebClient } from "thirdweb";
 import { Img } from "@/components/blocks/Img";
 import { Button } from "@/components/ui/button";
 import {
@@ -10,14 +19,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import type { PublishedContractDetails } from "components/contract-components/hooks";
-import { replaceDeployerAddress } from "lib/publisher-utils";
-import { replaceIpfsUrl } from "lib/sdk";
-import { ShieldCheckIcon } from "lucide-react";
-import Link from "next/link";
-import { useMemo } from "react";
-import { type Column, type Row, useTable } from "react-table";
-import type { ThirdwebClient } from "thirdweb";
 
 interface PublishedContractTableProps {
   contractDetails: ContractDataInput[];
@@ -51,39 +52,38 @@ export function PublishedContractTable(props: PublishedContractTableProps) {
   const tableColumns: Column<ContractDataRow>[] = useMemo(() => {
     const cols: Column<ContractDataRow>[] = [
       {
-        Header: "Logo",
         accessor: (row) => row.logo,
-        // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+        // biome-ignore lint/suspicious/noExplicitAny: FIXME
         Cell: (cell: any) => (
           <Img
             alt=""
-            src={cell.value ? replaceIpfsUrl(cell.value, props.client) : ""}
+            className="size-8"
             fallback={
               <div className="size-8 rounded-full border border-border bg-muted" />
             }
-            className="size-8"
+            src={cell.value ? replaceIpfsUrl(cell.value, props.client) : ""}
           />
         ),
+        Header: "Logo",
       },
       {
-        Header: "Name",
         accessor: (row) => row.name,
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         Cell: (cell: any) => {
           return (
             <Link
+              className="whitespace-nowrap text-foreground before:absolute before:inset-0"
               href={replaceDeployerAddress(
                 `/${publisherEnsName || cell.row.original.publisher}/${cell.row.original.id}`,
               )}
-              className="whitespace-nowrap text-foreground before:absolute before:inset-0"
             >
               {cell.value}
             </Link>
           );
         },
+        Header: "Name",
       },
       {
-        Header: "Description",
         accessor: (row) => row.description,
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         Cell: (cell: any) => (
@@ -91,17 +91,17 @@ export function PublishedContractTable(props: PublishedContractTableProps) {
             {cell.value}
           </span>
         ),
+        Header: "Description",
       },
       {
-        Header: "Version",
         accessor: (row) => row.version,
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         Cell: (cell: any) => (
           <span className="text-muted-foreground">{cell.value}</span>
         ),
+        Header: "Version",
       },
       {
-        id: "audit-badge",
         accessor: (row) => ({ audit: row.audit }),
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         Cell: (cell: any) => (
@@ -110,17 +110,17 @@ export function PublishedContractTable(props: PublishedContractTableProps) {
               <ToolTipLabel label="View Contract Audit">
                 <Button
                   asChild
-                  variant="ghost"
                   className="relative z-10 h-auto w-auto p-2"
+                  variant="ghost"
                 >
                   <Link
-                    href={replaceIpfsUrl(cell.value.audit, props.client)}
                     aria-label="View Contract Audit"
-                    rel="noopener noreferrer"
-                    target="_blank"
+                    href={replaceIpfsUrl(cell.value.audit, props.client)}
                     onClick={(e) => {
                       e.stopPropagation();
                     }}
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
                     <ShieldCheckIcon className="size-5 text-success-text" />
                   </Link>
@@ -129,6 +129,7 @@ export function PublishedContractTable(props: PublishedContractTableProps) {
             ) : null}
           </span>
         ),
+        id: "audit-badge",
       },
     ];
 
@@ -167,7 +168,7 @@ export function PublishedContractTable(props: PublishedContractTableProps) {
         <TableBody {...tableInstance.getTableBodyProps()} className="relative">
           {tableInstance.rows.map((row) => {
             tableInstance.prepareRow(row);
-            return <ContractTableRow row={row} key={row.getRowProps().key} />;
+            return <ContractTableRow key={row.getRowProps().key} row={row} />;
           })}
         </TableBody>
       </Table>
@@ -176,16 +177,14 @@ export function PublishedContractTable(props: PublishedContractTableProps) {
   );
 }
 
-function ContractTableRow(props: {
-  row: Row<ContractDataRow>;
-}) {
+function ContractTableRow(props: { row: Row<ContractDataRow> }) {
   const { row } = props;
   const { key, ...rowProps } = row.getRowProps();
   return (
     <>
       <TableRow
-        linkBox
         className="cursor-pointer hover:bg-card"
+        linkBox
         {...rowProps}
         key={key}
       >
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/profile-header.tsx b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/profile-header.tsx
index 5c8673e807d..95a377993ec 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/profile-header.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/profile-header.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Skeleton } from "@/components/ui/skeleton";
 import { replaceDeployerAddress } from "lib/publisher-utils";
 import type { ThirdwebClient } from "thirdweb";
 import {
@@ -11,6 +10,7 @@ import {
   AccountProvider,
 } from "thirdweb/react";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { Skeleton } from "@/components/ui/skeleton";
 
 export function ProfileHeader(props: {
   profileAddress: string;
@@ -23,10 +23,10 @@ export function ProfileHeader(props: {
         <div className="flex w-full items-center gap-4">
           <AccountAvatar
             className="size-20 rounded-full object-cover"
-            loadingComponent={<Skeleton className="size-20 rounded-full" />}
             fallbackComponent={
               <AccountBlobbie className="size-20 rounded-full" />
             }
+            loadingComponent={<Skeleton className="size-20 rounded-full" />}
           />
           <div>
             <h1 className="font-semibold text-4xl tracking-tight">
@@ -42,8 +42,8 @@ export function ProfileHeader(props: {
                       }
                     />
                   }
-                  loadingComponent={<Skeleton className="h-8 w-40" />}
                   formatFn={(name) => replaceDeployerAddress(name)}
+                  loadingComponent={<Skeleton className="h-8 w-40" />}
                 />
               )}
             </h1>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/published-contracts.tsx b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/published-contracts.tsx
index 6d44524b383..c5a6b26efc7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/published-contracts.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/published-contracts.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import type { fetchPublishedContracts } from "components/contract-components/fetchPublishedContracts";
 import { ShowMoreButton } from "components/contract-components/tables/show-more-button";
 import { useState } from "react";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { PublishedContractTable } from "./PublishedContractTable";
 
 interface PublishedContractsProps {
@@ -25,16 +25,16 @@ export const PublishedContracts: React.FC<PublishedContractsProps> = ({
     <PublishedContractTable
       client={client}
       contractDetails={slicedData}
-      publisherEnsName={publisherEnsName}
       footer={
         publishedContracts.length > slicedData.length ? (
           <ShowMoreButton
             limit={limit}
-            showMoreLimit={showMoreLimit}
             setShowMoreLimit={setShowMoreLimit}
+            showMoreLimit={showMoreLimit}
           />
         ) : undefined
       }
+      publisherEnsName={publisherEnsName}
     />
   );
 };
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/opengraph-image.tsx b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/opengraph-image.tsx
index c00d20fe57a..82b178df354 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/opengraph-image.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/opengraph-image.tsx
@@ -1,18 +1,18 @@
-import { GradientBlobbie } from "@/components/blocks/Avatars/GradientBlobbie";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
-/* eslint-disable @next/next/no-img-element */
-import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { notFound } from "next/navigation";
 import { ImageResponse } from "next/og";
 import { resolveAvatar } from "thirdweb/extensions/ens";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { GradientBlobbie } from "@/components/blocks/Avatars/GradientBlobbie";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+/* eslint-disable @next/next/no-img-element */
+import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { resolveAddressAndEns } from "./resolveAddressAndEns";
 
 export const runtime = "edge";
 
 export const size = {
-  width: 1200,
   height: 630,
+  width: 1200,
 };
 
 type PageProps = {
@@ -57,32 +57,32 @@ export default async function Image(props: PageProps) {
 
   return new ImageResponse(
     <div
-      tw="w-full h-full flex justify-center py-20 px-16"
       style={{
         background: "#0D0D12",
         fontFamily: "Inter",
       }}
+      tw="w-full h-full flex justify-center py-20 px-16"
     >
       <img
+        alt=""
+        height="630px"
         // @ts-expect-error - this works fine
         src={profileBackground}
-        width="1200px"
-        height="630px"
         tw="absolute"
-        alt=""
+        width="1200px"
       />
 
       <div tw="w-full h-full flex flex-col justify-between">
         <div tw="flex flex-col w-full">
           {resolvedENSImageSrc ? (
-            <img alt="" tw="w-32 h-32 rounded-full" src={resolvedENSImageSrc} />
+            <img alt="" src={resolvedENSImageSrc} tw="w-32 h-32 rounded-full" />
           ) : (
             <GradientBlobbie
               id={resolvedInfo.address}
               style={{
-                width: "128px",
-                height: "128px",
                 borderRadius: "50%",
+                height: "128px",
+                width: "128px",
               }}
             />
           )}
@@ -114,18 +114,18 @@ export default async function Image(props: PageProps) {
 const OgBrandIcon: React.FC = () => (
   // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
   <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="59"
+    fill="none"
     height="36"
     viewBox="0 0 59 36"
-    fill="none"
+    width="59"
+    xmlns="http://www.w3.org/2000/svg"
   >
     <path
-      fillRule="evenodd"
       clipRule="evenodd"
       d="M0.157801 3.02898C-0.425237 1.57299 0.661334 0 2.25144 0H12.1233C13.0509 0 13.8725 0.545996 14.217 1.39099L22.0747 20.7869C22.2868 21.3068 22.2868 21.8918 22.0747 22.4248L17.1322 34.6058C16.3769 36.4647 13.7002 36.4647 12.9449 34.6058L0.157801 3.02898ZM19.227 2.96398C18.697 1.52099 19.7835 0 21.3471 0H29.9469C30.901 0 31.7491 0.584996 32.0671 1.45599L39.2093 20.8519C39.3816 21.3328 39.3816 21.8658 39.2093 22.3598L34.916 34.0208C34.2005 35.9707 31.3913 35.9707 30.6757 34.0208L19.227 2.96398ZM38.5336 0C36.9435 0 35.8569 1.57299 36.4399 3.02898L49.227 34.6058C49.9823 36.4647 52.659 36.4647 53.4143 34.6058L58.3569 22.4248C58.5689 21.8918 58.5689 21.3068 58.3569 20.7869L50.4991 1.39099C50.1546 0.545996 49.333 0 48.4055 0H38.5336Z"
       fill="white"
       fillOpacity="0.5"
+      fillRule="evenodd"
     />
   </svg>
 );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/page.tsx
index 34f2d484a74..15d991ae814 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/page.tsx
@@ -1,9 +1,9 @@
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { replaceDeployerAddress } from "lib/publisher-utils";
 import type { Metadata } from "next";
 import { notFound } from "next/navigation";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { ProfileUI } from "./ProfileUI";
 import { resolveAddressAndEns } from "./resolveAddressAndEns";
 
@@ -26,9 +26,9 @@ export default async function Page(props: PageProps) {
 
   return (
     <ProfileUI
+      client={getClientThirdwebClient()}
       ensName={replaceDeployerAddress(resolvedInfo.ensName || "")}
       profileAddress={resolvedInfo.address}
-      client={getClientThirdwebClient()}
     />
   );
 }
@@ -52,11 +52,11 @@ export async function generateMetadata(props: PageProps): Promise<Metadata> {
   const description = `Visit ${displayName}'s profile. See their published contracts and deploy them in one click.`;
 
   return {
-    title,
     description,
     openGraph: {
-      title,
       description,
+      title,
     },
+    title,
   };
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/resolveAddressAndEns.tsx b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/resolveAddressAndEns.tsx
index 65f1319558a..4b9c10acff7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/resolveAddressAndEns.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/resolveAddressAndEns.tsx
@@ -1,6 +1,6 @@
 import { mapThirdwebPublisher } from "components/contract-components/fetch-contracts-with-versions";
 import { resolveEns } from "lib/ens";
-import { type ThirdwebClient, getAddress, isAddress } from "thirdweb";
+import { getAddress, isAddress, type ThirdwebClient } from "thirdweb";
 import { isValidENSName } from "thirdweb/utils";
 
 type ResolvedAddressInfo = {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/profile/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/profile/layout.tsx
index df8af93e28d..6d66f7ddf08 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/profile/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/profile/layout.tsx
@@ -1,10 +1,6 @@
 import { TeamHeader } from "../../team/components/TeamHeader/team-header";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/opengraph-image.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/opengraph-image.tsx
index f95305e0cf7..96d5846f5e2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/opengraph-image.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/opengraph-image.tsx
@@ -1,16 +1,16 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { format } from "date-fns";
 import { resolveEns } from "lib/ens";
 import { correctAndUniqueLicenses } from "lib/licenses";
 import { getSocialProfiles } from "thirdweb/social";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { getPublishedContractsWithPublisherMapping } from "../utils/getPublishedContractsWithPublisherMapping";
 import { publishedContractOGImageTemplate } from "../utils/publishedContractOGImageTemplate";
 
 export const runtime = "edge";
 
 export const size = {
-  width: 1200,
   height: 630,
+  width: 1200,
 };
 
 export default async function Image(props: {
@@ -24,9 +24,9 @@ export default async function Image(props: {
 
   const [publishedContracts, socialProfiles] = await Promise.all([
     getPublishedContractsWithPublisherMapping({
-      publisher: publisher,
-      contract_id: contract_id,
       client: serverThirdwebClient,
+      contract_id: contract_id,
+      publisher: publisher,
     }),
     getSocialProfiles({
       address:
@@ -44,8 +44,8 @@ export default async function Image(props: {
     const name = socialProfiles.find((p) => p.name)?.name || publisher;
     const avatar = socialProfiles.find((p) => p.avatar)?.avatar;
     return {
-      name,
       avatar,
+      name,
     };
   })();
 
@@ -61,11 +61,9 @@ export default async function Image(props: {
     publishedContract?.displayName || publishedContract?.name;
 
   return publishedContractOGImageTemplate({
-    title: publishedContractName,
     description: publishedContract.description,
-    version: publishedContract.version || "latest",
-    publisher: publisherProfile?.name || publisher,
     license: correctAndUniqueLicenses(publishedContract.licenses),
+    logo: publishedContract.logo,
     publishDate: format(
       new Date(
         Number.parseInt(publishedContract.publishTimestamp.toString() || "0") *
@@ -73,7 +71,9 @@ export default async function Image(props: {
       ),
       "MMM dd, yyyy",
     ),
-    logo: publishedContract.logo,
+    publisher: publisherProfile?.name || publisher,
     publisherAvatar: publisherProfile?.avatar,
+    title: publishedContractName,
+    version: publishedContract.version || "latest",
   });
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/page.tsx
index d58b296790c..0c337953221 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/page.tsx
@@ -1,12 +1,12 @@
-import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
-import { Separator } from "@/components/ui/separator";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { SimpleGrid } from "@chakra-ui/react";
 import { fetchPublishedContractVersions } from "components/contract-components/fetch-contracts-with-versions";
 import { PublishedContract } from "components/contract-components/published-contract";
 import { notFound } from "next/navigation";
 import { isAddress } from "thirdweb";
 import { resolveAddress } from "thirdweb/extensions/ens";
+import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
+import { Separator } from "@/components/ui/separator";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { getRawAccount } from "../../../../../account/settings/getAccount";
 import { getUserThirdwebClient } from "../../../../../api/lib/getAuthToken";
 import { PublishedActions } from "../../../components/contract-actions-published.client";
@@ -32,7 +32,7 @@ export default async function PublishedContractPage(
 ) {
   const params = await props.params;
   // resolve ENS if required
-  let publisherAddress: string | undefined = undefined;
+  let publisherAddress: string | undefined;
 
   if (isAddress(params.publisher)) {
     publisherAddress = params.publisher;
@@ -78,8 +78,8 @@ export default async function PublishedContractPage(
     <>
       <DeployContractHeader
         {...params}
-        allVersions={publishedContractVersions}
         activeVersion={publishedContract}
+        allVersions={publishedContractVersions}
       >
         <PublishedActions
           {...params}
@@ -91,9 +91,9 @@ export default async function PublishedContractPage(
       <ChakraProviderSetup>
         <SimpleGrid columns={12} gap={{ base: 6, md: 10 }} w="full">
           <PublishedContract
-            publishedContract={publishedContract}
-            isLoggedIn={!!account}
             client={client}
+            isLoggedIn={!!account}
+            publishedContract={publishedContract}
           />
         </SimpleGrid>
       </ChakraProviderSetup>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/components/breadcrumbs.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/components/breadcrumbs.client.tsx
index d362ad97d9e..8f314800f91 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/components/breadcrumbs.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/components/breadcrumbs.client.tsx
@@ -1,5 +1,10 @@
 "use client";
 
+import Link from "next/link";
+import { usePathname } from "next/navigation";
+import { Fragment } from "react";
+import { isAddress } from "thirdweb";
+import { shortenAddress } from "thirdweb/utils";
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -8,11 +13,6 @@ import {
   BreadcrumbPage,
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
-import Link from "next/link";
-import { usePathname } from "next/navigation";
-import { Fragment } from "react";
-import { isAddress } from "thirdweb";
-import { shortenAddress } from "thirdweb/utils";
 
 export function PublishedContractBreadcrumbs() {
   const pathname = usePathname() || "";
@@ -41,7 +41,7 @@ export function PublishedContractBreadcrumbs() {
                 {isLast ? (
                   <BreadcrumbPage>{renderedSegment}</BreadcrumbPage>
                 ) : (
-                  <BreadcrumbLink asChild aria-label={segment}>
+                  <BreadcrumbLink aria-label={segment} asChild>
                     <Link href={href}>{renderedSegment}</Link>
                   </BreadcrumbLink>
                 )}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/components/module-list.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/components/module-list.client.tsx
index 575cc85c8fe..aa65db1fd01 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/components/module-list.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/components/module-list.client.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { Badge } from "@/components/ui/badge";
 import { useSearchParams } from "next/navigation";
 import { useMemo } from "react";
+import { Badge } from "@/components/ui/badge";
 import { moduleFromBase64 } from "../../../utils/module-base-64";
 
 function useModules() {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/layout.tsx
index 3afe7c48984..7a453b8d398 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/layout.tsx
@@ -22,15 +22,15 @@ export async function generateMetadata(props: { params: Promise<Params> }) {
 
   const publishedContract =
     await getLatestPublishedContractsWithPublisherMapping({
-      publisher: publisher,
-      contract_id: contract_id,
       client: serverThirdwebClient,
+      contract_id: contract_id,
+      publisher: publisher,
     });
 
   if (!publishedContract) {
     return {
-      title: `${contract_id} | Published Smart Contract`,
       description: `Deploy ${contract_id} Smart Contract in one click with thirdweb.`,
+      title: `${contract_id} | Published Smart Contract`,
     };
   }
 
@@ -38,7 +38,7 @@ export async function generateMetadata(props: { params: Promise<Params> }) {
     publishedContract?.displayName || publishedContract?.name;
 
   return {
-    title: `${publishedContractName} | Published Smart Contract`,
     description: `${publishedContract.description}${publishedContract.description ? ". " : ""}Deploy ${publishedContractName} in one click with thirdweb.`,
+    title: `${publishedContractName} | Published Smart Contract`,
   };
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/opengraph-image.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/opengraph-image.tsx
index 449cece382a..e78b377845b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/opengraph-image.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/opengraph-image.tsx
@@ -1,16 +1,16 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { format } from "date-fns";
 import { resolveEns } from "lib/ens";
 import { correctAndUniqueLicenses } from "lib/licenses";
 import { getSocialProfiles } from "thirdweb/social";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { getLatestPublishedContractsWithPublisherMapping } from "./utils/getPublishedContractsWithPublisherMapping";
 import { publishedContractOGImageTemplate } from "./utils/publishedContractOGImageTemplate";
 
 export const runtime = "edge";
 
 export const size = {
-  width: 1200,
   height: 630,
+  width: 1200,
 };
 
 export default async function Image(props: {
@@ -23,9 +23,9 @@ export default async function Image(props: {
 
   const [publishedContract, socialProfiles] = await Promise.all([
     getLatestPublishedContractsWithPublisherMapping({
-      publisher: publisher,
-      contract_id: contract_id,
       client: serverThirdwebClient,
+      contract_id: contract_id,
+      publisher: publisher,
     }),
     getSocialProfiles({
       address:
@@ -39,8 +39,8 @@ export default async function Image(props: {
     const name = socialProfiles.find((p) => p.name)?.name || publisher;
     const avatar = socialProfiles.find((p) => p.avatar)?.avatar;
     return {
-      name,
       avatar,
+      name,
     };
   })();
 
@@ -52,11 +52,9 @@ export default async function Image(props: {
     publishedContract?.displayName || publishedContract?.name;
 
   return publishedContractOGImageTemplate({
-    title: publishedContractName,
     description: publishedContract.description,
-    version: publishedContract.version || "latest",
-    publisher: publisherProfile?.name || publisher,
     license: correctAndUniqueLicenses(publishedContract.licenses),
+    logo: publishedContract.logo,
     publishDate: format(
       new Date(
         Number.parseInt(publishedContract.publishTimestamp.toString() || "0") *
@@ -64,7 +62,9 @@ export default async function Image(props: {
       ),
       "MMM dd, yyyy",
     ),
-    logo: publishedContract.logo,
+    publisher: publisherProfile?.name || publisher,
     publisherAvatar: publisherProfile?.avatar,
+    title: publishedContractName,
+    version: publishedContract.version || "latest",
   });
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/page.tsx
index ebfc62113fc..b3f9c018b1f 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/page.tsx
@@ -1,9 +1,9 @@
+import { PublishedContract } from "components/contract-components/published-contract";
+import { notFound } from "next/navigation";
 import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
 import { Separator } from "@/components/ui/separator";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
-import { PublishedContract } from "components/contract-components/published-contract";
-import { notFound } from "next/navigation";
 import { getRawAccount } from "../../../../account/settings/getAccount";
 import { getAuthToken } from "../../../../api/lib/getAuthToken";
 import { PublishedActions } from "../../components/contract-actions-published.client";
@@ -23,9 +23,9 @@ export default async function PublishedContractPage(
   const params = await props.params;
   const publishedContractVersions =
     await getPublishedContractsWithPublisherMapping({
-      publisher: params.publisher,
-      contract_id: params.contract_id,
       client: serverThirdwebClient,
+      contract_id: params.contract_id,
+      publisher: params.publisher,
     });
 
   if (!publishedContractVersions) {
@@ -47,8 +47,8 @@ export default async function PublishedContractPage(
     <>
       <DeployContractHeader
         {...params}
-        allVersions={publishedContractVersions}
         activeVersion={publishedContract}
+        allVersions={publishedContractVersions}
       >
         <PublishedActions
           {...params}
@@ -60,12 +60,12 @@ export default async function PublishedContractPage(
       <ChakraProviderSetup>
         <div className="grid w-full grid-cols-12 gap-6 md:gap-10">
           <PublishedContract
-            publishedContract={publishedContract}
-            isLoggedIn={!!account}
             client={getClientThirdwebClient({
               jwt: authToken,
               teamId: undefined,
             })}
+            isLoggedIn={!!account}
+            publishedContract={publishedContract}
           />
         </div>
       </ChakraProviderSetup>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/getPublishedContractsWithPublisherMapping.ts b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/getPublishedContractsWithPublisherMapping.ts
index 32e8e0091a0..2d01fb7301a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/getPublishedContractsWithPublisherMapping.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/getPublishedContractsWithPublisherMapping.ts
@@ -2,7 +2,7 @@ import {
   fetchLatestPublishedContractVersion,
   fetchPublishedContractVersions,
 } from "components/contract-components/fetch-contracts-with-versions";
-import { type ThirdwebClient, isAddress } from "thirdweb";
+import { isAddress, type ThirdwebClient } from "thirdweb";
 import { resolveAddress } from "thirdweb/extensions/ens";
 
 function mapThirdwebPublisher(publisher: string) {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/publishedContractOGImageTemplate.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/publishedContractOGImageTemplate.tsx
index 6593a8c7a38..37173a1b24c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/publishedContractOGImageTemplate.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/publishedContractOGImageTemplate.tsx
@@ -1,25 +1,26 @@
 /* eslint-disable @next/next/no-img-element */
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+
 import { ImageResponse } from "next/og";
 import { isAddress } from "thirdweb";
 import { download } from "thirdweb/storage";
 import { shortenAddress } from "thirdweb/utils";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 
 const OgBrandIcon: React.FC = () => (
   // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
   <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="59"
+    fill="none"
     height="36"
     viewBox="0 0 59 36"
-    fill="none"
+    width="59"
+    xmlns="http://www.w3.org/2000/svg"
   >
     <path
-      fillRule="evenodd"
       clipRule="evenodd"
       d="M0.157801 3.02898C-0.425237 1.57299 0.661334 0 2.25144 0H12.1233C13.0509 0 13.8725 0.545996 14.217 1.39099L22.0747 20.7869C22.2868 21.3068 22.2868 21.8918 22.0747 22.4248L17.1322 34.6058C16.3769 36.4647 13.7002 36.4647 12.9449 34.6058L0.157801 3.02898ZM19.227 2.96398C18.697 1.52099 19.7835 0 21.3471 0H29.9469C30.901 0 31.7491 0.584996 32.0671 1.45599L39.2093 20.8519C39.3816 21.3328 39.3816 21.8658 39.2093 22.3598L34.916 34.0208C34.2005 35.9707 31.3913 35.9707 30.6757 34.0208L19.227 2.96398ZM38.5336 0C36.9435 0 35.8569 1.57299 36.4399 3.02898L49.227 34.6058C49.9823 36.4647 52.659 36.4647 53.4143 34.6058L58.3569 22.4248C58.5689 21.8918 58.5689 21.3068 58.3569 20.7869L50.4991 1.39099C50.1546 0.545996 49.333 0 48.4055 0H38.5336Z"
       fill="white"
       fillOpacity="0.5"
+      fillRule="evenodd"
     />
   </svg>
 );
@@ -27,40 +28,40 @@ const OgBrandIcon: React.FC = () => (
 const PackageIcon: React.FC = () => (
   // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
   <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="24"
-    height="24"
-    viewBox="0 0 24 24"
     fill="none"
+    height="24"
     stroke="rgba(255,255,255,.5)"
-    strokeWidth="2"
     strokeLinecap="round"
     strokeLinejoin="round"
+    strokeWidth="2"
+    viewBox="0 0 24 24"
+    width="24"
+    xmlns="http://www.w3.org/2000/svg"
   >
-    <line x1="16.5" y1="9.4" x2="7.5" y2="4.21" />
+    <line x1="16.5" x2="7.5" y1="9.4" y2="4.21" />
     <path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z" />
     <polyline points="3.27 6.96 12 12.01 20.73 6.96" />
-    <line x1="12" y1="22.08" x2="12" y2="12" />
+    <line x1="12" x2="12" y1="22.08" y2="12" />
   </svg>
 );
 
 const FileTextIcon: React.FC = () => (
   // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
   <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="24"
-    height="24"
-    viewBox="0 0 24 24"
     fill="none"
+    height="24"
     stroke="rgba(255,255,255,.5)"
-    strokeWidth="2"
     strokeLinecap="round"
     strokeLinejoin="round"
+    strokeWidth="2"
+    viewBox="0 0 24 24"
+    width="24"
+    xmlns="http://www.w3.org/2000/svg"
   >
     <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
     <polyline points="14 2 14 8 20 8" />
-    <line x1="16" y1="13" x2="8" y2="13" />
-    <line x1="16" y1="17" x2="8" y2="17" />
+    <line x1="16" x2="8" y1="13" y2="13" />
+    <line x1="16" x2="8" y1="17" y2="17" />
     <polyline points="10 9 9 9 8 9" />
   </svg>
 );
@@ -68,37 +69,37 @@ const FileTextIcon: React.FC = () => (
 const CalendarIcon: React.FC = () => (
   // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
   <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="24"
-    height="24"
-    viewBox="0 0 24 24"
     fill="none"
+    height="24"
     stroke="rgba(255,255,255,.5)"
-    strokeWidth="2"
     strokeLinecap="round"
     strokeLinejoin="round"
+    strokeWidth="2"
+    viewBox="0 0 24 24"
+    width="24"
+    xmlns="http://www.w3.org/2000/svg"
   >
-    <rect x="3" y="4" width="18" height="18" rx="2" ry="2" />
-    <line x1="16" y1="2" x2="16" y2="6" />
-    <line x1="8" y1="2" x2="8" y2="6" />
-    <line x1="3" y1="10" x2="21" y2="10" />
+    <rect height="18" rx="2" ry="2" width="18" x="3" y="4" />
+    <line x1="16" x2="16" y1="2" y2="6" />
+    <line x1="8" x2="8" y1="2" y2="6" />
+    <line x1="3" x2="21" y1="10" y2="10" />
   </svg>
 );
 
 const VersionIcon: React.FC = () => (
   // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
   <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="24"
-    height="24"
-    viewBox="0 0 24 24"
     fill="none"
+    height="24"
     stroke="rgba(255,255,255,.5)"
-    strokeWidth="2"
     strokeLinecap="round"
     strokeLinejoin="round"
+    strokeWidth="2"
+    viewBox="0 0 24 24"
+    width="24"
+    xmlns="http://www.w3.org/2000/svg"
   >
-    <line x1="6" y1="3" x2="6" y2="15" />
+    <line x1="6" x2="6" y1="3" y2="15" />
     <circle cx="18" cy="6" r="3" />
     <circle cx="6" cy="18" r="3" />
     <path d="M18 9a9 9 0 0 1-9 9" />
@@ -188,33 +189,33 @@ export async function publishedContractOGImageTemplate(params: {
     image,
     params.logo
       ? download({
-          uri: params.logo,
           client: serverThirdwebClient,
+          uri: params.logo,
         }).then((res) => res.arrayBuffer())
       : undefined,
     params.publisherAvatar
       ? download({
-          uri: params.publisherAvatar,
           client: serverThirdwebClient,
+          uri: params.publisherAvatar,
         }).then((res) => res.arrayBuffer())
       : undefined,
   ]);
 
   return new ImageResponse(
     <div
-      tw="w-full h-full flex justify-center py-20 px-16"
       style={{
         background: "#0D0D12",
         fontFamily: "Inter",
       }}
+      tw="w-full h-full flex justify-center py-20 px-16"
     >
       <img
+        alt=""
+        height="630px"
         // @ts-expect-error - this works fine
         src={imageData}
-        width="1200px"
-        height="630px"
         tw="absolute"
-        alt=""
+        width="1200px"
       />
       {/* the actual component starts here */}
 
@@ -224,7 +225,7 @@ export async function publishedContractOGImageTemplate(params: {
           <div tw="flex flex-col flex-shrink">
             <div tw="flex items-center">
               {/* @ts-expect-error - this works fine */}
-              {logo && <img src={logo} tw="w-16 h-16 rounded-xl mr-4" alt="" />}
+              {logo && <img alt="" src={logo} tw="w-16 h-16 rounded-xl mr-4" />}
               <h1 tw="text-6xl font-bold text-white">{params.title}</h1>
             </div>
             {params?.description && (
@@ -237,11 +238,11 @@ export async function publishedContractOGImageTemplate(params: {
             {avatar && (
               <img
                 alt=""
-                width={100}
                 height={100}
-                tw="w-32 h-32 rounded-full"
                 // @ts-expect-error - this works fine
                 src={avatar}
+                tw="w-32 h-32 rounded-full"
+                width={100}
               />
             )}
 
@@ -254,15 +255,15 @@ export async function publishedContractOGImageTemplate(params: {
         </div>
         <div tw="flex justify-between w-full items-end">
           <ul
-            tw="flex-col text-white font-medium text-2xl max-w-4xl"
             style={{
               fontFamily: "IBM Plex Mono",
             }}
+            tw="flex-col text-white font-medium text-2xl max-w-4xl"
           >
             {params.extension?.length ? (
               <li
-                tw="flex flex-row items-center overflow-hidden w-full"
                 style={{ whiteSpace: "nowrap" }}
+                tw="flex flex-row items-center overflow-hidden w-full"
               >
                 <PackageIcon />
                 <span tw="ml-2">
@@ -307,8 +308,6 @@ export async function publishedContractOGImageTemplate(params: {
       </div>
     </div>,
     {
-      width: 1200,
-      height: 630,
       fonts: [
         {
           data: inter400,
@@ -341,6 +340,8 @@ export async function publishedContractOGImageTemplate(params: {
           weight: 700,
         },
       ],
+      height: 630,
+      width: 1200,
     },
   );
 }
@@ -352,12 +353,12 @@ function categorizeExtensions(extensions: string[]) {
     (typeof ERC_CATEGORIES)[number] | "Other",
     number
   > = {
+    ERC20: 0,
     ERC721: 0,
     ERC1155: 0,
-    ERC20: 0,
     Other: 0,
   };
-  // biome-ignore lint/complexity/noForEach: FIXME
+
   extensions.forEach((extension) => {
     if (extension.startsWith("ERC721")) {
       categoriesWithCount.ERC721 += 1;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-actions-published.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-actions-published.client.tsx
index 1621ac1e123..ac85ec66d93 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-actions-published.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-actions-published.client.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { shareLink } from "@/lib/shareLink";
 import { ChevronsRightIcon } from "lucide-react";
 import Link from "next/link";
 import { useSearchParams } from "next/navigation";
+import { Button } from "@/components/ui/button";
+import { shareLink } from "@/lib/shareLink";
 
 export function PublishedActions(props: {
   publisher: string;
@@ -18,13 +18,13 @@ export function PublishedActions(props: {
   return (
     <div className="flex gap-3">
       <Button
-        variant="outline"
         className="bg-card"
         onClick={() => {
           shareLink({
             title: `Deploy ${props.displayName}`,
           });
         }}
+        variant="outline"
       >
         Share
       </Button>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-header.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-header.tsx
index 6d1172a9c2d..9cf57b5fd0c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-header.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-header.tsx
@@ -19,10 +19,10 @@ export function DeployContractHeader(
     <div className="flex flex-col gap-4 py-2">
       <div className="flex flex-col justify-between gap-6 md:flex-row md:items-center">
         <DeployContractInfo
-          name={props.activeVersion.name}
-          displayName={props.activeVersion.displayName}
           description={props.activeVersion.description}
+          displayName={props.activeVersion.displayName}
           logo={props.activeVersion.logo}
+          name={props.activeVersion.name}
         />
         <div className="flex flex-col-reverse gap-3 md:flex-row">
           {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-info.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-info.tsx
index d3a03decea4..6e9126817aa 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-info.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/contract-info.tsx
@@ -20,7 +20,7 @@ export function DeployContractInfo(props: {
         {contractImageLink && (
           <div className="hidden shrink-0 items-center justify-center rounded-xl border border-border bg-card p-2 md:flex">
             {/*eslint-disable-next-line @next/next/no-img-element*/}
-            <img className="size-12" alt={props.name} src={contractImageLink} />
+            <img alt={props.name} className="size-12" src={contractImageLink} />
           </div>
         )}
 
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/publish-based-deploy.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/publish-based-deploy.tsx
index f1cd76fe11d..99d6ad320e2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/publish-based-deploy.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/publish-based-deploy.tsx
@@ -1,4 +1,3 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import {
   fetchPublishedContractVersion,
   fetchPublishedContractVersions,
@@ -7,6 +6,7 @@ import { ZERO_FEE_VERSIONS } from "constants/fee-config";
 import { isAddress } from "thirdweb";
 import { fetchDeployMetadata } from "thirdweb/contract";
 import { resolveAddress } from "thirdweb/extensions/ens";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { DeployContractHeader } from "./contract-header";
 import { DeployFormForUri } from "./uri-based-deploy";
 
@@ -95,8 +95,8 @@ export async function DeployFormForPublishInfo(props: PublishBasedDeployProps) {
     <div className="mx-auto flex w-full max-w-[1000px] flex-col gap-8 pb-20">
       <DeployContractHeader
         {...props}
-        allVersions={publishedContractVersions}
         activeVersion={publishedContract}
+        allVersions={publishedContractVersions}
       />
       <DeployFormForUri
         contractMetadata={contractMetadata}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/uri-based-deploy.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/uri-based-deploy.tsx
index 03c51526151..20c207653ef 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/uri-based-deploy.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/uri-based-deploy.tsx
@@ -1,8 +1,8 @@
+import { CustomContractForm } from "components/contract-components/contract-deploy-form/custom-contract";
+import type { FetchDeployMetadataResult } from "thirdweb/contract";
 import { getProjects } from "@/api/projects";
 import { getTeams } from "@/api/team";
 import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
-import { CustomContractForm } from "components/contract-components/contract-deploy-form/custom-contract";
-import type { FetchDeployMetadataResult } from "thirdweb/contract";
 import { getUserThirdwebClient } from "../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../login/loginRedirect";
 
@@ -33,18 +33,18 @@ export async function DeployFormForUri(props: DeployFormForUriProps) {
 
   const teamsAndProjects = await Promise.all(
     teams.map(async (team) => ({
-      team: {
-        id: team.id,
-        name: team.name,
-        slug: team.slug,
-        image: team.image,
-      },
       projects: (await getProjects(team.slug)).map((x) => ({
         id: x.id,
-        name: x.name,
         image: x.image,
+        name: x.name,
         slug: x.slug,
       })),
+      team: {
+        id: team.id,
+        image: team.image,
+        name: team.name,
+        slug: team.slug,
+      },
     })),
   );
 
@@ -52,12 +52,12 @@ export async function DeployFormForUri(props: DeployFormForUriProps) {
   return (
     <ChakraProviderSetup>
       <CustomContractForm
+        client={client}
+        isLoggedIn={true}
         metadata={contractMetadata}
         metadataNoFee={contractMetadataNoFee}
         modules={modules?.filter((m) => m !== null)}
-        isLoggedIn={true}
         teamsAndProjects={teamsAndProjects}
-        client={client}
       />
     </ChakraProviderSetup>
   );
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/version-selector.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/version-selector.tsx
index 95d02db6cb2..0bda2c1d3f0 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/version-selector.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/components/version-selector.tsx
@@ -1,4 +1,6 @@
 "use client";
+import { usePathname, useSearchParams } from "next/navigation";
+import { useMemo } from "react";
 import {
   Select,
   SelectContent,
@@ -7,8 +9,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { usePathname, useSearchParams } from "next/navigation";
-import { useMemo } from "react";
 
 type DeployContractVersionSelectorProps = {
   availableVersions: string[];
@@ -34,7 +34,6 @@ export function DeployContractVersionSelector({
 
   return (
     <Select
-      value={version}
       onValueChange={(val) => {
         if (availableVersions.includes(val)) {
           const stringifiedSearchParams = searchParams?.toString();
@@ -56,6 +55,7 @@ export function DeployContractVersionSelector({
           router.push(pathName);
         }
       }}
+      value={version}
     >
       <SelectTrigger className="min-w-[180px] bg-card hover:bg-accent">
         <SelectValue />
@@ -63,7 +63,7 @@ export function DeployContractVersionSelector({
       <SelectContent>
         {availableVersions.map((v, idx) => {
           return (
-            <SelectItem value={v || "latest"} key={v}>
+            <SelectItem key={v} value={v || "latest"}>
               {v}
               {idx === 0 && (
                 <span className="text-muted-foreground"> (latest) </span>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/layout.tsx
index df8af93e28d..6d66f7ddf08 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/layout.tsx
@@ -1,10 +1,6 @@
 import { TeamHeader } from "../../team/components/TeamHeader/team-header";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/page.tsx
index aa61003d508..6bc576809dc 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/page.tsx
@@ -1,6 +1,6 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { redirect } from "next/navigation";
 import { fetchDeployMetadata } from "thirdweb/contract";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 
 export default async function Page(props: {
   searchParams: Promise<{
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/utils/module-base-64.ts b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/utils/module-base-64.ts
index 46dbc7435e2..319160ed3e5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/published-contract/utils/module-base-64.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/published-contract/utils/module-base-64.ts
@@ -23,8 +23,8 @@ export function moduleFromBase64(base64: string) {
     assertModule(mod);
     return {
       ...mod,
-      version: mod.version || "latest",
       displayName: mod.moduleId.split("ERC")[0],
+      version: mod.version || "latest",
     };
   } catch {
     return null;
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/styleguide/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/styleguide/page.tsx
index b7a1682b523..974efee088e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/styleguide/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/styleguide/page.tsx
@@ -1,3 +1,4 @@
+import { CircleAlertIcon } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -5,7 +6,6 @@ import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { cn } from "@/lib/utils";
-import { CircleAlertIcon } from "lucide-react";
 
 export const metadata = {
   robots: "noindex, nofollow",
@@ -105,10 +105,10 @@ function Colors() {
       <div className="my-10" />
 
       <div className="flex flex-col gap-6">
-        <AlertPreview variant="default" showDescription />
-        <AlertPreview variant="destructive" showDescription />
-        <AlertPreview variant="info" showDescription />
-        <AlertPreview variant="warning" showDescription />
+        <AlertPreview showDescription variant="default" />
+        <AlertPreview showDescription variant="destructive" />
+        <AlertPreview showDescription variant="info" />
+        <AlertPreview showDescription variant="warning" />
       </div>
 
       <div className="my-14" />
@@ -135,7 +135,7 @@ function Colors() {
 
         <div>
           <Label className="mb-2 block">Disabled</Label>
-          <Input value="some value" disabled />
+          <Input disabled value="some value" />
         </div>
       </div>
 
@@ -151,25 +151,23 @@ function Colors() {
   );
 }
 
-function ButtonsPreview(props: {
-  disabled?: boolean;
-}) {
+function ButtonsPreview(props: { disabled?: boolean }) {
   return (
     <div className="flex items-center gap-4">
       <Button disabled={props.disabled}> Default </Button>
-      <Button variant="outline" disabled={props.disabled}>
+      <Button disabled={props.disabled} variant="outline">
         Outline
       </Button>
-      <Button variant="secondary" disabled={props.disabled}>
+      <Button disabled={props.disabled} variant="secondary">
         Secondary
       </Button>
-      <Button variant="destructive" disabled={props.disabled}>
+      <Button disabled={props.disabled} variant="destructive">
         Destructive
       </Button>
-      <Button variant="primary" disabled={props.disabled}>
+      <Button disabled={props.disabled} variant="primary">
         Primary
       </Button>
-      <Button variant="ghost" disabled={props.disabled}>
+      <Button disabled={props.disabled} variant="ghost">
         Ghost
       </Button>
     </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/create-ticket.action.ts b/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/create-ticket.action.ts
index 393ea4d9c08..14234c20a56 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/create-ticket.action.ts
+++ b/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/create-ticket.action.ts
@@ -14,13 +14,13 @@ type State = {
 const UNTHREAD_API_KEY = process.env.UNTHREAD_API_KEY || "";
 
 const planToCustomerId = {
+  accelerate: process.env.UNTHREAD_ACCELERATE_TIER_ID as string,
   free: process.env.UNTHREAD_FREE_TIER_ID as string,
-  // treat starter as free
-  starter: process.env.UNTHREAD_FREE_TIER_ID as string,
   growth: process.env.UNTHREAD_GROWTH_TIER_ID as string,
-  accelerate: process.env.UNTHREAD_ACCELERATE_TIER_ID as string,
-  scale: process.env.UNTHREAD_SCALE_TIER_ID as string,
   pro: process.env.UNTHREAD_PRO_TIER_ID as string,
+  scale: process.env.UNTHREAD_SCALE_TIER_ID as string,
+  // treat starter as free
+  starter: process.env.UNTHREAD_FREE_TIER_ID as string,
 } as const;
 
 function isValidPlan(plan: string): plan is keyof typeof planToCustomerId {
@@ -88,8 +88,8 @@ export async function createTicketAction(
 
   if (!teamId) {
     return {
-      success: false,
       message: "teamId is required",
+      success: false,
     };
   }
 
@@ -97,8 +97,8 @@ export async function createTicketAction(
 
   if (!team) {
     return {
-      success: false,
       message: `Team with id "${teamId}" not found`,
+      success: false,
     };
   }
 
@@ -134,38 +134,38 @@ export async function createTicketAction(
   }
 
   const markdown = prepareEmailBody({
-    product,
-    markdownInput: keyVal.markdown || "",
     email: account.email || "",
-    name: account.name || "",
     extraInfoInput: keyVal,
-    walletAddress: walletAddress,
+    markdownInput: keyVal.markdown || "",
+    name: account.name || "",
+    product,
     telegramHandle: telegramHandle,
+    walletAddress: walletAddress,
   });
 
   const content = {
-    type: "email",
-    title,
+    customerId,
+    emailInboxId: process.env.UNTHREAD_EMAIL_INBOX_ID,
     markdown,
-    status: "open",
     onBehalfOf: {
       email: account.email,
-      name: account.name,
       id: account.id,
+      name: account.name,
     },
-    customerId,
-    emailInboxId: process.env.UNTHREAD_EMAIL_INBOX_ID,
+    status: "open",
+    title,
     triageChannelId: process.env.UNTHREAD_TRIAGE_CHANNEL_ID,
+    type: "email",
   };
 
   // check files
   const files = formData.getAll("files") as File[];
 
   if (files.length > 10) {
-    return { success: false, message: "You can only attach 10 files at once." };
+    return { message: "You can only attach 10 files at once.", success: false };
   }
   if (files.some((file) => file.size > 10 * 1024 * 1024)) {
-    return { success: false, message: "The max file size is 20MB." };
+    return { message: "The max file size is 20MB.", success: false };
   }
 
   // add the content
@@ -182,11 +182,11 @@ export async function createTicketAction(
 
   // actually create the ticket
   const res = await fetch("https://api.unthread.io/api/conversations", {
-    method: "POST",
+    body: formData,
     headers: {
       "X-Api-Key": UNTHREAD_API_KEY,
     },
-    body: formData,
+    method: "POST",
   });
   if (!res.ok) {
     console.error(
@@ -196,13 +196,13 @@ export async function createTicketAction(
       await res.text(),
     );
     return {
-      success: false,
       message: "Failed to create ticket, please try again later.",
+      success: false,
     };
   }
 
   return {
-    success: true,
     message: "Ticket created successfully",
+    success: true,
   };
 }
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/create-ticket.client.tsx b/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/create-ticket.client.tsx
index 8f8d4fad010..1251f18937d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/create-ticket.client.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/create-ticket.client.tsx
@@ -1,9 +1,5 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { Skeleton } from "@/components/ui/skeleton";
-import { cn } from "@/lib/utils";
 import { SupportForm_SelectInput } from "components/help/contact-forms/shared/SupportForm_SelectInput";
 import { SupportForm_TeamSelection } from "components/help/contact-forms/shared/SupportForm_TeamSelection";
 import { SupportForm_TelegramInput } from "components/help/contact-forms/shared/SupportForm_TelegramInput";
@@ -17,64 +13,68 @@ import {
 } from "react";
 import { useFormStatus } from "react-dom";
 import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Skeleton } from "@/components/ui/skeleton";
+import { cn } from "@/lib/utils";
 import { createTicketAction } from "./create-ticket.action";
 
 const ConnectSupportForm = dynamic(
   () => import("../../../../../../components/help/contact-forms/connect"),
   {
-    ssr: false,
     loading: () => <Skeleton className="h-12" />,
+    ssr: false,
   },
 );
 const EngineSupportForm = dynamic(
   () => import("../../../../../../components/help/contact-forms/engine"),
   {
-    ssr: false,
     loading: () => <Skeleton className="h-12" />,
+    ssr: false,
   },
 );
 const ContractSupportForm = dynamic(
   () => import("../../../../../../components/help/contact-forms/contracts"),
   {
-    ssr: false,
     loading: () => <Skeleton className="h-12" />,
+    ssr: false,
   },
 );
 const AccountSupportForm = dynamic(
   () => import("../../../../../../components/help/contact-forms/account"),
   {
-    ssr: false,
     loading: () => <Skeleton className="h-12" />,
+    ssr: false,
   },
 );
 const OtherSupportForm = dynamic(
   () => import("../../../../../../components/help/contact-forms/other"),
   {
-    ssr: false,
     loading: () => <Skeleton className="h-12" />,
+    ssr: false,
   },
 );
 
 const productOptions: { label: string; component: ReactElement }[] = [
   {
-    label: "Connect",
     component: <ConnectSupportForm />,
+    label: "Connect",
   },
   {
-    label: "Engine",
     component: <EngineSupportForm />,
+    label: "Engine",
   },
   {
-    label: "Contracts",
     component: <ContractSupportForm />,
+    label: "Contracts",
   },
   {
-    label: "Account",
     component: <AccountSupportForm />,
+    label: "Account",
   },
   {
-    label: "Other",
     component: <OtherSupportForm />,
+    label: "Other",
   },
 ];
 
@@ -89,11 +89,11 @@ function ProductAreaSelection(props: {
       <SupportForm_SelectInput
         formLabel="What do you need help with?"
         name="product"
+        onValueChange={setProductLabel}
         options={productOptions.map((o) => o.label)}
         promptText="Select a product"
-        onValueChange={setProductLabel}
-        value={productLabel}
         required={true}
+        value={productLabel}
       />
       {productOptions.find((o) => o.label === productLabel)?.component}
     </div>
@@ -133,9 +133,9 @@ export function CreateTicket(props: {
 
   return (
     <form
-      ref={formRef}
       action={formAction}
       className="rounded-lg border bg-card"
+      ref={formRef}
     >
       <div className="px-4 py-6 lg:px-6">
         <h2 className="font-semibold text-2xl tracking-tight">Get Support</h2>
@@ -150,8 +150,8 @@ export function CreateTicket(props: {
           {/* Don't conditionally render this - it has be rendered to submit the input values */}
           <div className={cn(props.teams.length === 1 && "hidden")}>
             <SupportForm_TeamSelection
-              selectedTeamId={selectedTeamId}
               onChange={(teamId) => setSelectedTeamId(teamId)}
+              selectedTeamId={selectedTeamId}
               teams={props.teams}
             />
           </div>
@@ -187,9 +187,9 @@ function SubmitButton() {
   const { pending } = useFormStatus();
   return (
     <Button
-      type="submit"
-      disabled={pending}
       className="flex min-w-24 flex-row gap-2"
+      disabled={pending}
+      type="submit"
     >
       {pending && <Spinner className="size-4" />}
       {pending ? "Submitting" : "Submit"}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/page.tsx
index 4ae7c561213..20d150e8513 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/page.tsx
@@ -1,3 +1,4 @@
+import Link from "next/link";
 import { getTeams } from "@/api/team";
 import {
   Breadcrumb,
@@ -7,7 +8,6 @@ import {
   BreadcrumbPage,
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
-import Link from "next/link";
 import { loginRedirect } from "../../../login/loginRedirect";
 import { CreateTicket } from "./components/create-ticket.client";
 
@@ -38,8 +38,8 @@ export default async function Page() {
       <div className="container max-w-[750px] py-10">
         <CreateTicket
           teams={teams.map((t) => ({
-            name: t.name,
             id: t.id,
+            name: t.name,
           }))}
         />
       </div>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/support/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/support/layout.tsx
index df8af93e28d..6d66f7ddf08 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/support/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/support/layout.tsx
@@ -1,10 +1,6 @@
 import { TeamHeader } from "../../team/components/TeamHeader/team-header";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/support/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/support/page.tsx
index 251fa788805..9c24db20de2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/support/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/support/page.tsx
@@ -1,65 +1,69 @@
+import {
+  BookOpenIcon,
+  ChevronRightIcon,
+  HomeIcon,
+  WalletIcon,
+} from "lucide-react";
+import type { Metadata } from "next";
+import Link from "next/link";
 import { getTeams } from "@/api/team";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { BookOpenIcon, ChevronRightIcon } from "lucide-react";
-import { HomeIcon, WalletIcon } from "lucide-react";
-import type { Metadata } from "next";
-import Link from "next/link";
-import { NebulaIcon } from "../(chain)/components/server/icons/NebulaIcon";
+import { CustomChatButton } from "../../../../components/CustomChat/CustomChatButton";
 import { EngineIcon } from "../../(dashboard)/(chain)/components/server/icons/EngineIcon";
 import { InsightIcon } from "../../(dashboard)/(chain)/components/server/icons/InsightIcon";
 import { PayIcon } from "../../(dashboard)/(chain)/components/server/icons/PayIcon";
-import { CustomChatButton } from "../../../../components/CustomChat/CustomChatButton";
 import {
   getAuthToken,
   getAuthTokenWalletAddress,
 } from "../../api/lib/getAuthToken";
+import { NebulaIcon } from "../(chain)/components/server/icons/NebulaIcon";
 import { siwaExamplePrompts } from "./definitions";
 
 export const metadata: Metadata = {
-  title: "thirdweb Support",
   openGraph: {
     title: "thirdweb Support",
   },
+  title: "thirdweb Support",
 };
 
 const HELP_PRODUCTS = [
   {
-    title: "Playground",
+    description: "Try out our interactive playground to get started",
     icon: HomeIcon,
+    title: "Playground",
     viewAllUrl:
       "https://playground.thirdweb.com/connect/sign-in/button?tab=code",
-    description: "Try out our interactive playground to get started",
   },
   {
-    title: "Connect",
+    description: "Wallets, auth, and onchain interactions",
     icon: WalletIcon,
+    title: "Connect",
     viewAllUrl: "https://portal.thirdweb.com/connect",
-    description: "Wallets, auth, and onchain interactions",
   },
   {
-    title: "Universal Bridge",
+    description: "Bridge and onramp tokens on any chain",
     icon: PayIcon,
+    title: "Universal Bridge",
     viewAllUrl: "https://portal.thirdweb.com/pay",
-    description: "Bridge and onramp tokens on any chain",
   },
   {
-    title: "Engine",
+    description: "Reliable transactions and monitoring",
     icon: EngineIcon,
+    title: "Engine",
     viewAllUrl: "https://portal.thirdweb.com/engine/v3",
-    description: "Reliable transactions and monitoring",
   },
   {
-    title: "Insight",
+    description: "Blockchain data queries and transformations",
     icon: InsightIcon,
+    title: "Insight",
     viewAllUrl: "https://portal.thirdweb.com/insight",
-    description: "Blockchain data queries and transformations",
   },
   {
-    title: "Nebula",
+    description: "API interface for LLMs",
     icon: NebulaIcon,
+    title: "Nebula",
     viewAllUrl: "https://portal.thirdweb.com/nebula",
-    description: "API interface for LLMs",
   },
 ] as const;
 
@@ -92,22 +96,22 @@ export default async function SupportPage() {
             </p>
             <div className="mt-6 flex w-full flex-col items-center gap-3">
               <CustomChatButton
+                authToken={authToken || undefined}
+                clientId={undefined}
+                examplePrompts={siwaExamplePrompts}
+                isFloating={false}
                 isLoggedIn={!!accountAddress}
+                label="Ask AI for support"
                 networks="all"
-                isFloating={false}
                 pageType="support"
-                label="Ask AI for support"
-                examplePrompts={siwaExamplePrompts}
-                authToken={authToken || undefined}
                 teamId={teamId}
-                clientId={undefined}
               />
 
               <Link
+                className="text-muted-foreground text-sm hover:underline"
                 href="/support/create-ticket"
-                target="_blank"
                 rel="noopener noreferrer"
-                className="text-muted-foreground text-sm hover:underline"
+                target="_blank"
               >
                 Open a support case
               </Link>
@@ -126,10 +130,10 @@ export default async function SupportPage() {
                   <CardTitle className="text-xl">{product.title}</CardTitle>
                 </div>
                 <Button
-                  variant="ghost"
-                  size="sm"
                   asChild
                   className="absolute top-4 right-2 flex flex-row gap-1 px-2 text-muted-foreground text-sm hover:text-foreground"
+                  size="sm"
+                  variant="ghost"
                 >
                   <Link href={product.viewAllUrl} target="_blank">
                     <span>View</span>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/components/share.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/components/share.tsx
index 1a6c14ca4e7..6c70019d3df 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/components/share.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/components/share.tsx
@@ -1,21 +1,15 @@
-import { Button } from "@/components/ui/button";
 import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
-export const ShareButton = ({
-  cta,
-  href,
-}: {
-  cta: string;
-  href: string;
-}) => {
+export const ShareButton = ({ cta, href }: { cta: string; href: string }) => {
   return (
     <Button asChild variant="outline">
       <Link
-        href={href}
         className="items-center gap-2"
-        target="_blank"
+        href={href}
         rel="noopener noreferrer"
+        target="_blank"
       >
         {cta} <ExternalLinkIcon className="size-3 text-muted-foreground" />
       </Link>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/hex-converter/components/HexConverter.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/hex-converter/components/HexConverter.tsx
index 8abeb70b0b5..ea332f1d06e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/hex-converter/components/HexConverter.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/hex-converter/components/HexConverter.tsx
@@ -1,11 +1,11 @@
 "use client";
 
+import { useId, useState } from "react";
+import { fromHex, type Hex, toHex } from "thirdweb";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Card } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { useState } from "react";
-import { type Hex, fromHex, toHex } from "thirdweb";
 import { ShareButton } from "../../components/share";
 
 export const HexConverter = () => {
@@ -24,30 +24,33 @@ export const HexConverter = () => {
     } catch {}
   };
 
+  const hexInputId = useId();
+  const decInputId = useId();
+
   return (
     <div className="space-y-24">
       <div className="space-y-4">
         <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-          <Label htmlFor="hex-input" className="min-w-60 text-xl">
+          <Label className="min-w-60 text-xl" htmlFor={hexInputId}>
             Hex
           </Label>
           <Input
-            id="hex-input"
-            value={hex}
-            onChange={(e) => onChange({ hex: e.target.value })}
             className="p-6 text-xl"
+            id={hexInputId}
+            onChange={(e) => onChange({ hex: e.target.value })}
+            value={hex}
           />
         </div>
         <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-          <Label htmlFor="dec-input" className="min-w-60 text-xl">
+          <Label className="min-w-60 text-xl" htmlFor={decInputId}>
             Decimal
           </Label>
           <Input
-            id="dec-input"
+            className="p-6 text-xl"
+            id={decInputId}
+            onChange={(e) => onChange({ dec: e.target.valueAsNumber })}
             type="number"
             value={dec}
-            onChange={(e) => onChange({ dec: e.target.valueAsNumber })}
-            className="p-6 text-xl"
           />
         </div>
         <div className="mt-4 flex justify-end">
@@ -62,10 +65,10 @@ export const HexConverter = () => {
         <p>
           Or use the
           <a
+            className="underline"
             href="https://portal.thirdweb.com/typescript/v5"
-            target="_blank"
             rel="noopener noreferrer"
-            className="underline"
+            target="_blank"
           >
             Connect SDK
           </a>
@@ -73,18 +76,18 @@ export const HexConverter = () => {
         </p>
         <div>
           <CopyTextButton
-            textToShow={`fromHex("${hex}", "number")`}
+            copyIconPosition="right"
             textToCopy={`fromHex("${hex}", "number")`}
+            textToShow={`fromHex("${hex}", "number")`}
             tooltip="Copy"
-            copyIconPosition="right"
           />
         </div>
         <div>
           <CopyTextButton
-            textToShow={`toHex(${dec})`}
+            copyIconPosition="right"
             textToCopy={`toHex(${dec})`}
+            textToShow={`toHex(${dec})`}
             tooltip="Copy"
-            copyIconPosition="right"
           />
         </div>
       </Card>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/hex-converter/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/hex-converter/page.tsx
index 8d38d86f4e6..6c49b859b47 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/hex-converter/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/hex-converter/page.tsx
@@ -2,8 +2,8 @@ import type { Metadata } from "next";
 import { HexConverter } from "./components/HexConverter";
 
 export const metadata: Metadata = {
-  title: "thirdweb Hex / Decimal Converter",
   description: "Convert between hexadecimal and decimal numbers.",
+  title: "thirdweb Hex / Decimal Converter",
 };
 
 export default async function Page() {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/keccak256-converter/components/Keccak256Converter.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/keccak256-converter/components/Keccak256Converter.tsx
index 85fa31cd464..9b1c08ad06b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/keccak256-converter/components/Keccak256Converter.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/keccak256-converter/components/Keccak256Converter.tsx
@@ -1,39 +1,41 @@
 "use client";
 
+import { useId, useState } from "react";
+import { keccakId } from "thirdweb/utils";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Card } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { useState } from "react";
-import { keccakId } from "thirdweb/utils";
 import { ShareButton } from "../../components/share";
 
 export const Keccak256Converter = () => {
   const [rawString, setRawString] = useState("MINTER_ROLE");
   const keccak256Hash = keccakId(rawString);
 
+  const rawStringId = useId();
+
   return (
     <div className="space-y-24">
       <div className="space-y-4">
         <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-          <Label htmlFor="raw-string-input" className="min-w-64 text-xl">
+          <Label className="min-w-64 text-xl" htmlFor={rawStringId}>
             Input String
           </Label>
           <Input
-            id="raw-string-input"
-            value={rawString}
-            onChange={(e) => setRawString(e.target.value)}
             className="p-6 text-xl"
+            id={rawStringId}
+            onChange={(e) => setRawString(e.target.value)}
+            value={rawString}
           />
         </div>
         <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
           <Label className="min-w-64 text-xl">Keccak-256 Hash</Label>
           <CopyTextButton
-            textToShow={keccak256Hash}
+            className="overflow-auto font-mono text-xl"
+            copyIconPosition="right"
             textToCopy={keccak256Hash}
+            textToShow={keccak256Hash}
             tooltip="Copy"
-            copyIconPosition="right"
-            className="overflow-auto font-mono text-xl"
           />
         </div>
 
@@ -49,10 +51,10 @@ export const Keccak256Converter = () => {
         <p>
           Or use the{" "}
           <a
+            className="underline"
             href="https://portal.thirdweb.com/typescript/v5"
-            target="_blank"
             rel="noopener noreferrer"
-            className="underline"
+            target="_blank"
           >
             Connect SDK
           </a>
@@ -60,11 +62,11 @@ export const Keccak256Converter = () => {
         </p>
         <div>
           <CopyTextButton
-            textToShow={`keccakId("${rawString}")`}
+            className="font-mono"
+            copyIconPosition="right"
             textToCopy={`keccakId("${rawString}")`}
+            textToShow={`keccakId("${rawString}")`}
             tooltip="Copy"
-            copyIconPosition="right"
-            className="font-mono"
           />
         </div>
       </Card>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/keccak256-converter/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/keccak256-converter/page.tsx
index 3a1b84ec1bb..517a85be980 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/keccak256-converter/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/keccak256-converter/page.tsx
@@ -2,8 +2,8 @@ import type { Metadata } from "next";
 import { Keccak256Converter } from "./components/Keccak256Converter";
 
 export const metadata: Metadata = {
-  title: "thirdweb Keccak256 Converter",
   description: "Convert a string to a Keccak-256 hash.",
+  title: "thirdweb Keccak256 Converter",
 };
 
 export default async function Page() {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/layout.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/layout.tsx
index 2db4b33569d..9f259b54c18 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/layout.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/layout.tsx
@@ -1,16 +1,18 @@
-import { SidebarLayout } from "@/components/blocks/SidebarLayout";
 import type { Metadata } from "next";
+import { SidebarLayout } from "@/components/blocks/SidebarLayout";
 import { TeamHeader } from "../../team/components/TeamHeader/team-header";
 
 export const metadata: Metadata = {
-  title: "thirdweb Blockchain Tools",
   description:
     "A collection of EVM development tools to help with blockchain development.",
+  title: "thirdweb Blockchain Tools",
 };
 
 export default function ToolLayout({
   children,
-}: { children: React.ReactNode }) {
+}: {
+  children: React.ReactNode;
+}) {
   return (
     <div className="flex grow flex-col">
       <div className="border-border border-b bg-card">
@@ -19,24 +21,24 @@ export default function ToolLayout({
       <SidebarLayout
         sidebarLinks={[
           {
-            label: "Transaction Simulator",
             href: "/tools/transaction-simulator",
+            label: "Transaction Simulator",
           },
           {
-            label: "Wei Converter",
             href: "/tools/wei-converter",
+            label: "Wei Converter",
           },
           {
-            label: "Hex Converter",
             href: "/tools/hex-converter",
+            label: "Hex Converter",
           },
           {
-            label: "Unix Time Converter",
             href: "/tools/unixtime-converter",
+            label: "Unix Time Converter",
           },
           {
-            label: "Keccak-256 Converter",
             href: "/tools/keccak256-converter",
+            label: "Keccak-256 Converter",
           },
         ]}
       >
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/transaction-simulator/components/TransactionSimulator.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/transaction-simulator/components/TransactionSimulator.tsx
index b752e403afe..6df60bccceb 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/transaction-simulator/components/TransactionSimulator.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/transaction-simulator/components/TransactionSimulator.tsx
@@ -1,14 +1,4 @@
 "use client";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { Card } from "@/components/ui/card";
-import { CodeClient } from "@/components/ui/code/code.client";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Textarea } from "@/components/ui/textarea";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import type { Abi, AbiFunction } from "abitype";
 import { useV5DashboardChain } from "lib/v5-adapter";
 import { ArrowDownIcon, WalletIcon } from "lucide-react";
@@ -25,6 +15,16 @@ import {
 import { resolveContractAbi } from "thirdweb/contract";
 import { useActiveAccount } from "thirdweb/react";
 import { parseAbiParams } from "thirdweb/utils";
+import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Card } from "@/components/ui/card";
+import { CodeClient } from "@/components/ui/code/code.client";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Textarea } from "@/components/ui/textarea";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { ShareButton } from "../../components/share";
 
 export type SimulateTransactionForm = {
@@ -51,10 +51,10 @@ export const TransactionSimulator = (props: {
   // TODO - replace this with a mutation.isPending
   const [isPending, setIsPending] = useState(false);
   const [state, setState] = useState<State>({
-    success: false,
-    message: "",
     codeExample: "",
+    message: "",
     shareUrl: "",
+    success: false,
   });
   const form = useForm<SimulateTransactionForm>();
   const chainId = form.watch("chainId");
@@ -70,9 +70,9 @@ export const TransactionSimulator = (props: {
         throw new Error("Invalid chainId");
       }
       const contract = getContract({
-        client,
-        chain,
         address: to,
+        chain,
+        client,
       });
       const abi = (await resolveContractAbi(contract)) as Abi;
       const abiItem = abi.find(
@@ -98,20 +98,20 @@ export const TransactionSimulator = (props: {
         {
           chainId: chain.id,
           from,
-          to,
-          value,
           functionArgs,
           functionName,
+          to,
+          value,
         },
         params,
       );
       const shareUrl = getShareUrl({
         chainId: chain.id,
         from,
-        to,
-        value,
         functionArgs,
         functionName,
+        to,
+        value,
       });
       const transaction = prepareContractCall({
         contract,
@@ -130,7 +130,7 @@ export const TransactionSimulator = (props: {
         }),
       ]);
       setState({
-        success: true,
+        codeExample,
         message: `result: ${simulateResult.length > 0 ? simulateResult.join(",") : "Method did not return a result."}\n
 ${Object.keys(populatedTransaction)
   .map((key) => {
@@ -141,15 +141,15 @@ ${Object.keys(populatedTransaction)
     return `${key}: ${_val}\n`;
   })
   .join("")}`,
-        codeExample,
         shareUrl,
+        success: true,
       });
     } catch (err) {
       setState({
-        success: false,
-        message: `${err}`,
         codeExample: "",
+        message: `${err}`,
         shareUrl: "",
+        success: false,
       });
     }
     setIsPending(false);
@@ -162,19 +162,19 @@ ${Object.keys(populatedTransaction)
       </p>
 
       <form
-        onSubmit={form.handleSubmit(handleSimulation)}
         className="flex-col space-y-4"
+        onSubmit={form.handleSubmit(handleSimulation)}
       >
         <Card className="flex flex-col gap-4 p-4">
           <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-            <Label htmlFor="chainId" className="min-w-60">
+            <Label className="min-w-60" htmlFor="chainId">
               Chain ID
             </Label>
             <Input
-              type="number"
-              required
-              placeholder="The chain ID of the sender wallet"
               defaultValue={initialFormValues.chainId}
+              placeholder="The chain ID of the sender wallet"
+              required
+              type="number"
               {...form.register("chainId", { required: true })}
               // Hide spinner.
               className="[appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
@@ -182,21 +182,21 @@ ${Object.keys(populatedTransaction)
           </div>
 
           <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-            <Label htmlFor="from" className="min-w-60">
+            <Label className="min-w-60" htmlFor="from">
               From Address
             </Label>
             <Input
-              required
-              placeholder="The sender wallet address"
               defaultValue={initialFormValues.from}
+              placeholder="The sender wallet address"
+              required
               {...form.register("from", { required: true })}
             />
             {activeAccount && (
               <ToolTipLabel label="Use current wallet address">
                 <Button
-                  variant="ghost"
-                  size="icon"
                   onClick={() => form.setValue("from", activeAccount.address)}
+                  size="icon"
+                  variant="ghost"
                 >
                   <WalletIcon className="size-4" />
                 </Button>
@@ -211,33 +211,33 @@ ${Object.keys(populatedTransaction)
 
         <Card className="flex flex-col gap-4 p-4">
           <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-            <Label htmlFor="to" className="min-w-60">
+            <Label className="min-w-60" htmlFor="to">
               Contract Address
             </Label>
             <Input
-              placeholder="The contract address to call"
               defaultValue={initialFormValues.to}
+              placeholder="The contract address to call"
               {...form.register("to", { required: true })}
             />
           </div>
           <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-            <Label htmlFor="functionName" className="min-w-60">
+            <Label className="min-w-60" htmlFor="functionName">
               Function Name
             </Label>
             <Input
-              placeholder="The contract function name (i.e. mintTo)"
               defaultValue={initialFormValues.functionName}
+              placeholder="The contract function name (i.e. mintTo)"
               {...form.register("functionName", { required: true })}
             />
           </div>
           <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-            <Label htmlFor="functionArgs" className="min-w-60">
+            <Label className="min-w-60" htmlFor="functionArgs">
               Function Arguments
             </Label>
             <Textarea
+              className="bg-transparent"
               placeholder="Comma-separated arguments to call the function"
               rows={3}
-              className="bg-transparent"
               {...form.register("functionArgs")}
               defaultValue={
                 initialFormValues.functionArgs
@@ -247,7 +247,7 @@ ${Object.keys(populatedTransaction)
             />
           </div>
           <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-            <Label htmlFor="value" className="min-w-60">
+            <Label className="min-w-60" htmlFor="value">
               Value
             </Label>
             <Input
@@ -288,10 +288,10 @@ ${Object.keys(populatedTransaction)
       <div className="flex justify-between">
         {state.shareUrl && (
           <CopyTextButton
+            copyIconPosition="right"
+            textToCopy={state.shareUrl}
             textToShow="Copy Simulation Link"
             tooltip="Copy Simulation Link"
-            textToCopy={state.shareUrl}
-            copyIconPosition="right"
           />
         )}
         <ShareButton
@@ -303,10 +303,10 @@ ${Object.keys(populatedTransaction)
       {state.codeExample && (
         <div className="flex max-w-[800px] flex-col gap-2 pt-16 ">
           <a
+            className="underline"
             href="https://portal.thirdweb.com/references/typescript/v5/simulateTransaction"
-            target="_blank"
             rel="noopener noreferrer"
-            className="underline"
+            target="_blank"
           >
             Connect SDK example
           </a>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/transaction-simulator/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/transaction-simulator/page.tsx
index eaaf848020c..497a0bd9a93 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/transaction-simulator/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/transaction-simulator/page.tsx
@@ -5,9 +5,9 @@ import {
 } from "./components/TransactionSimulator";
 
 export const metadata: Metadata = {
-  title: "thirdweb Transaction Simulator",
   description:
     "Simulate any EVM transaction. Get gas estimates and onchain error messages to debug your contract calls.",
+  title: "thirdweb Transaction Simulator",
 };
 
 export default async function Page(props: {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/unixtime-converter/components/UnixTimeConverter.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/unixtime-converter/components/UnixTimeConverter.tsx
index 6cfba1b538e..cd04f2064db 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/unixtime-converter/components/UnixTimeConverter.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/unixtime-converter/components/UnixTimeConverter.tsx
@@ -1,8 +1,5 @@
 "use client";
 
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
 import {
   formatDistanceToNow,
   formatISO9075,
@@ -10,7 +7,10 @@ import {
   formatRFC7231,
   fromUnixTime,
 } from "date-fns";
-import { useMemo, useState } from "react";
+import { useId, useMemo, useState } from "react";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
 
 export function UnixTimeConverter() {
   const [unixTime, setUnixTime] = useState(() => {
@@ -20,8 +20,8 @@ export function UnixTimeConverter() {
   const { date, error } = useMemo(() => {
     if (Number.isNaN(unixTime) || !Number.isInteger(unixTime)) {
       return {
-        error: "Invalid Unix Timestamp",
         date: null,
+        error: "Invalid Unix Timestamp",
       };
     }
 
@@ -40,6 +40,8 @@ export function UnixTimeConverter() {
     };
   }, [unixTime]);
 
+  const unixTimeId = useId();
+
   return (
     <div className="mx-auto max-w-2xl">
       <Card>
@@ -51,16 +53,16 @@ export function UnixTimeConverter() {
 
         <CardContent>
           <div className="mb-4">
-            <Label htmlFor="unixTime">Enter Unix Timestamp</Label>
+            <Label htmlFor={unixTimeId}>Enter Unix Timestamp</Label>
             <Input
-              id="unixTime"
-              type="number"
-              value={unixTime}
+              className="mt-1"
+              id={unixTimeId}
               onChange={(e) => {
                 setUnixTime(Number(e.target.value));
               }}
               placeholder="e.g., 1609459200"
-              className="mt-1"
+              type="number"
+              value={unixTime}
             />
             {error && (
               <p className="mt-2 text-destructive-text text-sm">{error}</p>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/unixtime-converter/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/unixtime-converter/page.tsx
index 2c148b4d162..b966eca3d68 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/unixtime-converter/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/unixtime-converter/page.tsx
@@ -1,10 +1,10 @@
-import { ClientOnly } from "@/components/blocks/client-only";
 import type { Metadata } from "next";
+import { ClientOnly } from "@/components/blocks/client-only";
 import { UnixTimeConverter } from "./components/UnixTimeConverter";
 
 export const metadata: Metadata = {
-  title: "thirdweb Unix Time Converter",
   description: "Convert Unix time to a human-readable time.",
+  title: "thirdweb Unix Time Converter",
 };
 
 export default async function Page() {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/wei-converter/components/WeiConverter.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/wei-converter/components/WeiConverter.tsx
index 8fdfa71d5be..e35c8e52bfd 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/wei-converter/components/WeiConverter.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/wei-converter/components/WeiConverter.tsx
@@ -1,11 +1,11 @@
 "use client";
 
+import { useId, useState } from "react";
+import { toEther, toTokens, toWei } from "thirdweb";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Card } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { useState } from "react";
-import { toEther, toTokens, toWei } from "thirdweb";
 import { ShareButton } from "../../components/share";
 
 export const WeiConverter = () => {
@@ -29,40 +29,44 @@ export const WeiConverter = () => {
     } catch {}
   };
 
+  const weiInputId = useId();
+  const gweiInputId = useId();
+  const etherInputId = useId();
+
   return (
     <div className="space-y-24">
       <div className="space-y-4">
         <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-          <Label htmlFor="wei-input" className="min-w-64 text-xl">
+          <Label className="min-w-64 text-xl" htmlFor={weiInputId}>
             Wei
           </Label>
           <Input
-            id="wei-input"
-            value={wei}
-            onChange={(e) => onChange({ wei: e.target.value })}
             className="p-6 text-xl"
+            id={weiInputId}
+            onChange={(e) => onChange({ wei: e.target.value })}
+            value={wei}
           />
         </div>
         <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-          <Label htmlFor="gwei-input" className="min-w-64 text-xl">
+          <Label className="min-w-64 text-xl" htmlFor={gweiInputId}>
             Gwei
           </Label>
           <Input
-            id="gwei-input"
-            value={gwei}
-            onChange={(e) => onChange({ gwei: e.target.value })}
             className="p-6 text-xl"
+            id={gweiInputId}
+            onChange={(e) => onChange({ gwei: e.target.value })}
+            value={gwei}
           />
         </div>
         <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
-          <Label htmlFor="ether-input" className="min-w-64 text-xl">
+          <Label className="min-w-64 text-xl" htmlFor={etherInputId}>
             Ether
           </Label>
           <Input
-            id="ether-input"
-            value={ether}
-            onChange={(e) => onChange({ ether: e.target.value })}
             className="p-6 text-xl"
+            id={etherInputId}
+            onChange={(e) => onChange({ ether: e.target.value })}
+            value={ether}
           />
         </div>
         <div className="flex justify-end">
@@ -77,10 +81,10 @@ export const WeiConverter = () => {
         <p>
           Or use the{" "}
           <a
+            className="underline"
             href="https://portal.thirdweb.com/typescript/v5"
-            target="_blank"
             rel="noopener noreferrer"
-            className="underline"
+            target="_blank"
           >
             Connect SDK
           </a>
@@ -88,18 +92,18 @@ export const WeiConverter = () => {
         </p>
         <div>
           <CopyTextButton
-            textToShow={`toTokens(${wei}n, 9)`}
+            copyIconPosition="right"
             textToCopy={`toTokens(${wei}n, 9)`}
+            textToShow={`toTokens(${wei}n, 9)`}
             tooltip="Copy"
-            copyIconPosition="right"
           />
         </div>
         <div>
           <CopyTextButton
-            textToShow={`toEther(${wei}n)`}
+            copyIconPosition="right"
             textToCopy={`toEther(${wei}n)`}
+            textToShow={`toEther(${wei}n)`}
             tooltip="Copy"
-            copyIconPosition="right"
           />
         </div>
       </Card>
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/tools/wei-converter/page.tsx b/apps/dashboard/src/app/(app)/(dashboard)/tools/wei-converter/page.tsx
index ff05c1e0d18..6aa0956bf21 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/tools/wei-converter/page.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/tools/wei-converter/page.tsx
@@ -2,8 +2,8 @@ import type { Metadata } from "next";
 import { WeiConverter } from "./components/WeiConverter";
 
 export const metadata: Metadata = {
-  title: "thirdweb Wei / Gwei / Ether Converter",
   description: "Convert between wei, gwei, and ether units.",
+  title: "thirdweb Wei / Gwei / Ether Converter",
 };
 
 export default async function Page() {
diff --git a/apps/dashboard/src/app/(app)/(stripe)/_components/StripeRedirectErrorPage.tsx b/apps/dashboard/src/app/(app)/(stripe)/_components/StripeRedirectErrorPage.tsx
index a1d0a288767..da6db0fa99e 100644
--- a/apps/dashboard/src/app/(app)/(stripe)/_components/StripeRedirectErrorPage.tsx
+++ b/apps/dashboard/src/app/(app)/(stripe)/_components/StripeRedirectErrorPage.tsx
@@ -1,12 +1,10 @@
 "use client";
 
+import { AlertTriangleIcon } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { AlertTriangleIcon } from "lucide-react";
 
-export function StripeRedirectErrorPage(props: {
-  errorMessage: string;
-}) {
+export function StripeRedirectErrorPage(props: { errorMessage: string }) {
   const router = useDashboardRouter();
 
   return (
@@ -18,9 +16,9 @@ export function StripeRedirectErrorPage(props: {
         <p className="font-medium text-base">{props.errorMessage}</p>
 
         <Button
-          variant="outline"
           className="mt-4"
           onClick={() => router.back()}
+          variant="outline"
         >
           Go back
         </Button>
diff --git a/apps/dashboard/src/app/(app)/(stripe)/checkout/[team_slug]/[sku]/page.tsx b/apps/dashboard/src/app/(app)/(stripe)/checkout/[team_slug]/[sku]/page.tsx
index b154fcf05d2..e2f75be2416 100644
--- a/apps/dashboard/src/app/(app)/(stripe)/checkout/[team_slug]/[sku]/page.tsx
+++ b/apps/dashboard/src/app/(app)/(stripe)/checkout/[team_slug]/[sku]/page.tsx
@@ -1,5 +1,5 @@
-import type { ProductSKU } from "@/lib/billing";
 import { redirect } from "next/navigation";
+import type { ProductSKU } from "@/lib/billing";
 import { StripeRedirectErrorPage } from "../../../_components/StripeRedirectErrorPage";
 import {
   getBillingCheckoutUrl,
@@ -28,8 +28,8 @@ export default async function CheckoutPage(props: {
         return <StripeRedirectErrorPage errorMessage="Invalid amount" />;
       }
       const topupUrl = await getCryptoTopupUrl({
-        teamSlug: params.team_slug,
         amountUSD,
+        teamSlug: params.team_slug,
       });
       if (!topupUrl) {
         // TODO: make a better error page
@@ -46,8 +46,8 @@ export default async function CheckoutPage(props: {
         return <StripeRedirectErrorPage errorMessage="Invalid invoice ID" />;
       }
       const invoice = await getInvoicePaymentUrl({
-        teamSlug: params.team_slug,
         invoiceId,
+        teamSlug: params.team_slug,
       });
       if (!invoice) {
         return (
@@ -59,8 +59,8 @@ export default async function CheckoutPage(props: {
     }
     default: {
       const response = await getBillingCheckoutUrl({
-        teamSlug: params.team_slug,
         sku: decodeURIComponent(params.sku) as Exclude<ProductSKU, null>,
+        teamSlug: params.team_slug,
       });
 
       if (response.status === "error") {
diff --git a/apps/dashboard/src/app/(app)/(stripe)/stripe-redirect/page.tsx b/apps/dashboard/src/app/(app)/(stripe)/stripe-redirect/page.tsx
index fdb04fcd840..c71930a29ea 100644
--- a/apps/dashboard/src/app/(app)/(stripe)/stripe-redirect/page.tsx
+++ b/apps/dashboard/src/app/(app)/(stripe)/stripe-redirect/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useEffect } from "react";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { stripeRedirectPageChannel } from "./stripeRedirectChannel";
 
 export default function ClosePage() {
diff --git a/apps/dashboard/src/app/(app)/(stripe)/utils/billing.ts b/apps/dashboard/src/app/(app)/(stripe)/utils/billing.ts
index dd93e0c1725..77546be2d06 100644
--- a/apps/dashboard/src/app/(app)/(stripe)/utils/billing.ts
+++ b/apps/dashboard/src/app/(app)/(stripe)/utils/billing.ts
@@ -12,23 +12,23 @@ export async function getBillingCheckoutUrl(options: {
 
   if (!token) {
     return {
-      status: "error",
       error: "You are not logged in",
+      status: "error",
     } as const;
   }
 
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamSlug}/checkout/create-link`,
     {
-      method: "POST",
       body: JSON.stringify({
-        sku: options.sku,
         redirectTo: getAbsoluteStripeRedirectUrl(),
+        sku: options.sku,
       }),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
   if (!res.ok) {
@@ -37,21 +37,21 @@ export async function getBillingCheckoutUrl(options: {
     switch (res.status) {
       case 402: {
         return {
-          status: "error",
           error:
             "You have outstanding invoices, please pay these first before re-subscribing.",
+          status: "error",
         } as const;
       }
       case 429: {
         return {
-          status: "error",
           error: "Too many requests, please try again later.",
+          status: "error",
         } as const;
       }
       default: {
         return {
-          status: "error",
           error: "An unknown error occurred, please try again later.",
+          status: "error",
         } as const;
       }
     }
@@ -60,14 +60,14 @@ export async function getBillingCheckoutUrl(options: {
   const json = await res.json();
   if (!json.result) {
     return {
-      status: "error",
       error: "An unknown error occurred, please try again later.",
+      status: "error",
     } as const;
   }
 
   return {
-    status: "success",
     data: json.result as string,
+    status: "success",
   } as const;
 }
 
@@ -82,14 +82,14 @@ export async function getPlanCancelUrl(options: {
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamId}/checkout/cancel-plan-link`,
     {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${token}`,
-      },
       body: JSON.stringify({
         redirectTo: getAbsoluteStripeRedirectUrl(),
       }),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      },
+      method: "POST",
     },
   );
 
@@ -120,14 +120,14 @@ export async function getBillingPortalUrl(options: {
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamSlug}/checkout/create-session-link`,
     {
-      method: "POST",
       body: JSON.stringify({
         redirectTo: getAbsoluteStripeRedirectUrl(),
       }),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
 
@@ -166,14 +166,14 @@ export async function getCryptoTopupUrl(options: {
       NEXT_PUBLIC_THIRDWEB_API_HOST,
     ),
     {
-      method: "POST",
       body: JSON.stringify({
         amountUSD: options.amountUSD,
       }),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
 
@@ -204,14 +204,14 @@ export async function getInvoicePaymentUrl(options: {
       NEXT_PUBLIC_THIRDWEB_API_HOST,
     ),
     {
-      method: "POST",
       body: JSON.stringify({
         invoiceId: options.invoiceId,
       }),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
 
diff --git a/apps/dashboard/src/app/(app)/(stripe)/utils/build-url.ts b/apps/dashboard/src/app/(app)/(stripe)/utils/build-url.ts
index e831e8d8e07..2afd9f894e5 100644
--- a/apps/dashboard/src/app/(app)/(stripe)/utils/build-url.ts
+++ b/apps/dashboard/src/app/(app)/(stripe)/utils/build-url.ts
@@ -7,14 +7,10 @@ export function buildCheckoutUrl(options: {
   return `/checkout/${options.teamSlug}/${options.sku}`;
 }
 
-export function buildCancelPlanUrl(options: {
-  teamId: string;
-}) {
+export function buildCancelPlanUrl(options: { teamId: string }) {
   return `/cancel-plan/${options.teamId}`;
 }
 
-export function buildBillingPortalUrl(options: {
-  teamSlug: string;
-}) {
+export function buildBillingPortalUrl(options: { teamSlug: string }) {
   return `/manage-billing/${options.teamSlug}`;
 }
diff --git a/apps/dashboard/src/app/(app)/account/components/AccountHeader.tsx b/apps/dashboard/src/app/(app)/account/components/AccountHeader.tsx
index 895cc022a12..10b69c776f8 100644
--- a/apps/dashboard/src/app/(app)/account/components/AccountHeader.tsx
+++ b/apps/dashboard/src/app/(app)/account/components/AccountHeader.tsx
@@ -1,10 +1,5 @@
 "use client";
 
-import { createTeam } from "@/actions/createTeam";
-import { resetAnalytics } from "@/analytics/reset";
-import type { Project } from "@/api/projects";
-import type { Team } from "@/api/team";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { CustomConnectWallet } from "@3rdweb-sdk/react/components/connect-wallet";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { LazyCreateProjectDialog } from "components/settings/ApiKeys/Create/LazyCreateAPIKeyDialog";
@@ -12,6 +7,11 @@ import { useCallback, useState } from "react";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
 import { useActiveWallet, useDisconnect } from "thirdweb/react";
+import { createTeam } from "@/actions/createTeam";
+import { resetAnalytics } from "@/analytics/reset";
+import type { Project } from "@/api/projects";
+import type { Team } from "@/api/team";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { doLogout } from "../../login/auth-actions";
 import {
   type AccountHeaderCompProps,
@@ -47,15 +47,16 @@ export function AccountHeader(props: {
   }, [router, disconnect, wallet]);
 
   const headerProps: AccountHeaderCompProps = {
-    teamsAndProjects: props.teamsAndProjects,
-    logout: logout,
+    account: props.account,
+    accountAddress: props.accountAddress,
+    client: props.client,
     connectButton: (
-      <CustomConnectWallet isLoggedIn={true} client={props.client} />
+      <CustomConnectWallet client={props.client} isLoggedIn={true} />
     ),
     createProject: (team: Team) =>
       setCreateProjectDialogState({
-        team,
         isOpen: true,
+        team,
       }),
     createTeam: () => {
       toast.promise(
@@ -66,15 +67,14 @@ export function AccountHeader(props: {
           router.push(`/team/${res.data.slug}`);
         }),
         {
+          error: "Failed to create team",
           loading: "Creating team",
           success: "Team created",
-          error: "Failed to create team",
         },
       );
     },
-    account: props.account,
-    client: props.client,
-    accountAddress: props.accountAddress,
+    logout: logout,
+    teamsAndProjects: props.teamsAndProjects,
   };
 
   return (
@@ -84,22 +84,22 @@ export function AccountHeader(props: {
 
       {createProjectDialogState.isOpen && (
         <LazyCreateProjectDialog
-          open={true}
-          onOpenChange={() =>
-            setCreateProjectDialogState({
-              isOpen: false,
-            })
+          enableNebulaServiceByDefault={
+            createProjectDialogState.isOpen &&
+            createProjectDialogState.team.enabledScopes.includes("nebula")
           }
           onCreateAndComplete={() => {
             // refresh projects
             router.refresh();
           }}
+          onOpenChange={() =>
+            setCreateProjectDialogState({
+              isOpen: false,
+            })
+          }
+          open={true}
           teamId={createProjectDialogState.team.id}
           teamSlug={createProjectDialogState.team.slug}
-          enableNebulaServiceByDefault={
-            createProjectDialogState.isOpen &&
-            createProjectDialogState.team.enabledScopes.includes("nebula")
-          }
         />
       )}
     </div>
diff --git a/apps/dashboard/src/app/(app)/account/components/AccountHeaderUI.stories.tsx b/apps/dashboard/src/app/(app)/account/components/AccountHeaderUI.stories.tsx
index 0b6766e133b..115727eecac 100644
--- a/apps/dashboard/src/app/(app)/account/components/AccountHeaderUI.stories.tsx
+++ b/apps/dashboard/src/app/(app)/account/components/AccountHeaderUI.stories.tsx
@@ -1,4 +1,3 @@
-import { Button } from "@/components/ui/button";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { teamsAndProjectsStub } from "stories/stubs";
 import {
@@ -7,19 +6,20 @@ import {
   storybookThirdwebClient,
 } from "stories/utils";
 import { ThirdwebProvider } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
 import {
   AccountHeaderDesktopUI,
   AccountHeaderMobileUI,
 } from "./AccountHeaderUI";
 
 const meta = {
-  title: "Headers/AccountHeader",
   component: Variants,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Headers/AccountHeader",
 } satisfies Meta<typeof Variants>;
 
 export default meta;
@@ -42,9 +42,7 @@ export const Mobile: Story = {
 
 const accountAddressStub = "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37";
 
-function Variants(props: {
-  type: "mobile" | "desktop";
-}) {
+function Variants(props: { type: "mobile" | "desktop" }) {
   const Comp =
     props.type === "mobile" ? AccountHeaderMobileUI : AccountHeaderDesktopUI;
 
@@ -54,17 +52,17 @@ function Variants(props: {
         <BadgeContainer label="Account Loaded">
           <div className="border-y bg-card">
             <Comp
-              teamsAndProjects={teamsAndProjectsStub}
-              logout={() => {}}
-              accountAddress={accountAddressStub}
-              connectButton={<ConnectButtonStub />}
-              createProject={() => {}}
-              createTeam={() => {}}
               account={{
-                id: "foo",
                 email: "foo@example.com",
+                id: "foo",
               }}
+              accountAddress={accountAddressStub}
               client={storybookThirdwebClient}
+              connectButton={<ConnectButtonStub />}
+              createProject={() => {}}
+              createTeam={() => {}}
+              logout={() => {}}
+              teamsAndProjects={teamsAndProjectsStub}
             />
           </div>
         </BadgeContainer>
diff --git a/apps/dashboard/src/app/(app)/account/components/AccountHeaderUI.tsx b/apps/dashboard/src/app/(app)/account/components/AccountHeaderUI.tsx
index 88f44b06f5d..0ac43981db2 100644
--- a/apps/dashboard/src/app/(app)/account/components/AccountHeaderUI.tsx
+++ b/apps/dashboard/src/app/(app)/account/components/AccountHeaderUI.tsx
@@ -1,10 +1,10 @@
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import Link from "next/link";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import type { Team } from "@/api/team";
 import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
 import { cn } from "@/lib/utils";
-import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import Link from "next/link";
-import type { ThirdwebClient } from "thirdweb";
 import { NotificationsButton } from "../../../../@/components/blocks/notifications/notification-button";
 import { SecondaryNav } from "../../components/Header/SecondaryNav/SecondaryNav";
 import { MobileBurgerMenuButton } from "../../components/MobileBurgerMenuButton";
@@ -41,28 +41,28 @@ export function AccountHeaderDesktopUI(props: AccountHeaderCompProps) {
 
         <div className="flex items-center gap-1">
           <Link
-            href="/account"
             className="flex flex-row items-center gap-2 font-normal text-sm"
+            href="/account"
           >
             <GradientAvatar
-              id={props.account?.id || "default"}
-              src={props.account?.image || ""}
               className="size-6"
               client={props.client}
+              id={props.account?.id || "default"}
+              src={props.account?.image || ""}
             />
             <span> My Account </span>
           </Link>
 
           {props.teamsAndProjects.length > 0 && (
             <TeamAndProjectSelectorPopoverButton
+              account={props.account}
+              client={props.client}
+              createProject={props.createProject}
+              createTeam={props.createTeam}
               currentProject={undefined}
               currentTeam={undefined}
-              teamsAndProjects={props.teamsAndProjects}
               focus="team-selection"
-              createProject={props.createProject}
-              createTeam={props.createTeam}
-              account={props.account}
-              client={props.client}
+              teamsAndProjects={props.teamsAndProjects}
             />
           )}
         </div>
@@ -70,10 +70,10 @@ export function AccountHeaderDesktopUI(props: AccountHeaderCompProps) {
 
       <SecondaryNav
         account={props.account}
-        logout={props.logout}
-        connectButton={props.connectButton}
-        client={props.client}
         accountAddress={props.accountAddress}
+        client={props.client}
+        connectButton={props.connectButton}
+        logout={props.logout}
       />
     </header>
   );
@@ -90,29 +90,29 @@ export function AccountHeaderMobileUI(props: AccountHeaderCompProps) {
       <div className="flex items-center gap-2">
         <div className="flex items-center gap-1">
           <Link
-            href="/account"
             className={cn(
               "flex flex-row items-center gap-2 font-normal text-foreground text-sm",
             )}
+            href="/account"
           >
             <GradientAvatar
-              id={props.account?.id}
-              src={props.account?.image || ""}
               className="size-6"
               client={props.client}
+              id={props.account?.id}
+              src={props.account?.image || ""}
             />
             <span> My Account </span>
           </Link>
 
           {props.teamsAndProjects.length > 0 && (
             <TeamSelectorMobileMenuButton
-              isOnProjectPage={false}
-              currentTeam={undefined}
-              teamsAndProjects={props.teamsAndProjects}
-              upgradeTeamLink={undefined}
               account={props.account}
               client={props.client}
               createTeam={props.createTeam}
+              currentTeam={undefined}
+              isOnProjectPage={false}
+              teamsAndProjects={props.teamsAndProjects}
+              upgradeTeamLink={undefined}
             />
           )}
         </div>
@@ -122,12 +122,12 @@ export function AccountHeaderMobileUI(props: AccountHeaderCompProps) {
         <NotificationsButton accountId={props.account.id} />
 
         <MobileBurgerMenuButton
-          type="loggedIn"
-          email={props.account?.email}
+          accountAddress={props.accountAddress}
           client={props.client}
-          logout={props.logout}
           connectButton={props.connectButton}
-          accountAddress={props.accountAddress}
+          email={props.account?.email}
+          logout={props.logout}
+          type="loggedIn"
         />
       </div>
     </header>
diff --git a/apps/dashboard/src/app/(app)/account/components/SearchInput.tsx b/apps/dashboard/src/app/(app)/account/components/SearchInput.tsx
index d44bbac3d5c..d189e30cbc0 100644
--- a/apps/dashboard/src/app/(app)/account/components/SearchInput.tsx
+++ b/apps/dashboard/src/app/(app)/account/components/SearchInput.tsx
@@ -1,5 +1,5 @@
-import { Input } from "@/components/ui/input";
 import { SearchIcon } from "lucide-react";
+import { Input } from "@/components/ui/input";
 
 export function SearchInput(props: {
   placeholder: string;
@@ -9,10 +9,10 @@ export function SearchInput(props: {
   return (
     <div className="relative">
       <Input
+        className="bg-card pl-9"
+        onChange={(e) => props.onValueChange(e.target.value)}
         placeholder={props.placeholder}
         value={props.value}
-        onChange={(e) => props.onValueChange(e.target.value)}
-        className="bg-card pl-9"
       />
       <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
     </div>
diff --git a/apps/dashboard/src/app/(app)/account/contracts/DeployedContractsPageHeader.tsx b/apps/dashboard/src/app/(app)/account/contracts/DeployedContractsPageHeader.tsx
index 426efa6e74b..c2ad310d83c 100644
--- a/apps/dashboard/src/app/(app)/account/contracts/DeployedContractsPageHeader.tsx
+++ b/apps/dashboard/src/app/(app)/account/contracts/DeployedContractsPageHeader.tsx
@@ -1,12 +1,11 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import { ImportModal } from "components/contract-components/import-contract/modal";
-
 import { DownloadIcon, PlusIcon } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { Button } from "@/components/ui/button";
 
 export function DeployedContractsPageHeader(props: {
   teamId: string;
@@ -23,8 +22,8 @@ export function DeployedContractsPageHeader(props: {
         onClose={() => {
           setImportModalOpen(false);
         }}
-        teamId={props.teamId}
         projectId={props.projectId}
+        teamId={props.teamId}
         type="contract"
       />
 
@@ -37,10 +36,10 @@ export function DeployedContractsPageHeader(props: {
         <div className="flex gap-3 [&>*]:grow">
           <Button
             className="gap-2 bg-card"
-            variant="outline"
             onClick={() => {
               setImportModalOpen(true);
             }}
+            variant="outline"
           >
             <DownloadIcon className="size-4" />
             Import contract
diff --git a/apps/dashboard/src/app/(app)/account/contracts/_components/DeployViaCLIOrImportCard.tsx b/apps/dashboard/src/app/(app)/account/contracts/_components/DeployViaCLIOrImportCard.tsx
index b59d2c7d9aa..c24a591556d 100644
--- a/apps/dashboard/src/app/(app)/account/contracts/_components/DeployViaCLIOrImportCard.tsx
+++ b/apps/dashboard/src/app/(app)/account/contracts/_components/DeployViaCLIOrImportCard.tsx
@@ -1,12 +1,11 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import { ImportModal } from "components/contract-components/import-contract/modal";
-
 import { ArrowUpRightIcon, DownloadIcon } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { Button } from "@/components/ui/button";
 
 export function DeployViaCLIOrImportCard(props: {
   teamId: string;
@@ -18,14 +17,14 @@ export function DeployViaCLIOrImportCard(props: {
   return (
     <div className="rounded-lg border bg-card p-4 lg:p-6">
       <ImportModal
-        type="contract"
         client={props.client}
         isOpen={importModalOpen}
         onClose={() => {
           setImportModalOpen(false);
         }}
-        teamId={props.teamId}
         projectId={props.projectId}
+        teamId={props.teamId}
+        type="contract"
       />
 
       <h2 className="mb-0.5 font-semibold text-lg">
@@ -39,25 +38,25 @@ export function DeployViaCLIOrImportCard(props: {
 
       <div className="mt-6 flex flex-col gap-3 lg:flex-row">
         <Button
-          variant="outline"
-          className="gap-2 bg-background lg:px-10"
           asChild
+          className="gap-2 bg-background lg:px-10"
+          variant="outline"
         >
           <Link
             href="https://portal.thirdweb.com/contracts/deploy/overview"
-            target="_blank"
             rel="noopener noreferrer"
+            target="_blank"
           >
             Deploy via CLI
             <ArrowUpRightIcon className="size-4" />
           </Link>
         </Button>
         <Button
-          variant="outline"
           className="gap-2 bg-background"
           onClick={() => {
             setImportModalOpen(true);
           }}
+          variant="outline"
         >
           <DownloadIcon className="size-4" />
           Import Contract
diff --git a/apps/dashboard/src/app/(app)/account/contracts/_components/DeployedContractsPage.tsx b/apps/dashboard/src/app/(app)/account/contracts/_components/DeployedContractsPage.tsx
index 8c344a524e3..3a1bdc6e02c 100644
--- a/apps/dashboard/src/app/(app)/account/contracts/_components/DeployedContractsPage.tsx
+++ b/apps/dashboard/src/app/(app)/account/contracts/_components/DeployedContractsPage.tsx
@@ -1,8 +1,8 @@
-import { ClientOnly } from "@/components/blocks/client-only";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { ContractTable } from "components/contract-components/tables/contract-table";
 import { Suspense } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { ClientOnly } from "@/components/blocks/client-only";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { DeployedContractsPageHeader } from "../DeployedContractsPageHeader";
 import { DeployViaCLIOrImportCard } from "./DeployViaCLIOrImportCard";
 import { getSortedDeployedContracts } from "./getSortedDeployedContracts";
@@ -18,9 +18,9 @@ export function DeployedContractsPage(props: {
   return (
     <div className="flex grow flex-col">
       <DeployedContractsPageHeader
-        teamId={props.teamId}
-        projectId={props.projectId}
         client={props.client}
+        projectId={props.projectId}
+        teamId={props.teamId}
       />
       <div className="h-6" />
       <div className="container flex max-w-7xl grow flex-col">
@@ -30,8 +30,8 @@ export function DeployedContractsPage(props: {
         <div className="h-8" />
         <DeployViaCLIOrImportCard
           client={props.client}
-          teamId={props.teamId}
           projectId={props.projectId}
+          teamId={props.teamId}
         />
       </div>
     </div>
@@ -47,23 +47,23 @@ async function DeployedContractsPageAsync(props: {
   projectSlug: string;
 }) {
   const deployedContracts = await getSortedDeployedContracts({
-    teamId: props.teamId,
-    projectId: props.projectId,
     authToken: props.authToken,
     deploymentType: undefined,
+    projectId: props.projectId,
+    teamId: props.teamId,
   });
 
   return (
     <ClientOnly ssr={<Loading />}>
       <ContractTable
-        variant="contract"
+        client={props.client}
         contracts={deployedContracts}
         pageSize={10}
-        teamId={props.teamId}
         projectId={props.projectId}
-        client={props.client}
-        teamSlug={props.teamSlug}
         projectSlug={props.projectSlug}
+        teamId={props.teamId}
+        teamSlug={props.teamSlug}
+        variant="contract"
       />
     </ClientOnly>
   );
diff --git a/apps/dashboard/src/app/(app)/account/contracts/_components/getSortedDeployedContracts.tsx b/apps/dashboard/src/app/(app)/account/contracts/_components/getSortedDeployedContracts.tsx
index b5a36073026..b7d5d45ce1a 100644
--- a/apps/dashboard/src/app/(app)/account/contracts/_components/getSortedDeployedContracts.tsx
+++ b/apps/dashboard/src/app/(app)/account/contracts/_components/getSortedDeployedContracts.tsx
@@ -1,7 +1,7 @@
 import { fetchChainWithLocalOverrides } from "../../../../../utils/fetchChainWithLocalOverrides";
 import {
-  type ProjectContract,
   getProjectContracts,
+  type ProjectContract,
 } from "./getProjectContracts";
 
 export async function getSortedDeployedContracts(params: {
@@ -12,10 +12,10 @@ export async function getSortedDeployedContracts(params: {
   deploymentType: string | undefined;
 }) {
   const contracts = await getProjectContracts({
-    teamId: params.teamId,
-    projectId: params.projectId,
     authToken: params.authToken,
     deploymentType: params.deploymentType,
+    projectId: params.projectId,
+    teamId: params.teamId,
   });
 
   const chainIds = Array.from(new Set(contracts.map((c) => c.chainId)));
diff --git a/apps/dashboard/src/app/(app)/account/devices/AccountDevicesPage.tsx b/apps/dashboard/src/app/(app)/account/devices/AccountDevicesPage.tsx
index fa2fa535bf9..75e2902d825 100644
--- a/apps/dashboard/src/app/(app)/account/devices/AccountDevicesPage.tsx
+++ b/apps/dashboard/src/app/(app)/account/devices/AccountDevicesPage.tsx
@@ -11,8 +11,8 @@ export function AccountDevicesPage() {
   return (
     <AuthorizedWalletsTable
       authorizedWallets={authorizedWalletsQuery.data || []}
-      isPending={authorizedWalletsQuery.isPending}
       isFetched={authorizedWalletsQuery.isFetched}
+      isPending={authorizedWalletsQuery.isPending}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/account/layout.tsx b/apps/dashboard/src/app/(app)/account/layout.tsx
index e499dda12a3..fff3ec2990f 100644
--- a/apps/dashboard/src/app/(app)/account/layout.tsx
+++ b/apps/dashboard/src/app/(app)/account/layout.tsx
@@ -1,12 +1,12 @@
-import { getProjects } from "@/api/projects";
-import { type Team, getTeams } from "@/api/team";
-import { AppFooter } from "@/components/blocks/app-footer";
-import { TabPathLinks } from "@/components/ui/tabs";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { AnnouncementBanner } from "components/notices/AnnouncementBanner";
 import type React from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { getProjects } from "@/api/projects";
+import { getTeams, type Team } from "@/api/team";
+import { AppFooter } from "@/components/blocks/app-footer";
+import { TabPathLinks } from "@/components/ui/tabs";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import {
   getAuthToken,
   getAuthTokenWalletAddress,
@@ -39,10 +39,10 @@ export default async function AccountLayout(props: {
     <div className="flex min-h-dvh flex-col bg-background">
       <div className="flex grow flex-col">
         <HeaderAndNav
-          teams={teams}
-          twAccount={account}
           accountAddress={accountAddress}
           client={client}
+          teams={teams}
+          twAccount={account}
         />
         {props.children}
       </div>
@@ -60,8 +60,8 @@ async function HeaderAndNav(props: {
 }) {
   const teamsAndProjects = await Promise.all(
     props.teams.map(async (team) => ({
-      team,
       projects: await getProjects(team.slug),
+      team,
     })),
   );
 
@@ -69,32 +69,32 @@ async function HeaderAndNav(props: {
     <div className="bg-card">
       <AnnouncementBanner />
       <AccountHeader
-        teamsAndProjects={teamsAndProjects}
         account={props.twAccount}
         accountAddress={props.accountAddress}
         client={props.client}
+        teamsAndProjects={teamsAndProjects}
       />
       <TabPathLinks
-        tabContainerClassName="px-4 lg:px-6"
         links={[
           {
-            path: "/account",
-            name: "Overview",
             exactMatch: true,
+            name: "Overview",
+            path: "/account",
           },
           {
-            path: "/account/settings",
             name: "Settings",
+            path: "/account/settings",
           },
           {
-            path: "/account/wallets",
             name: "Linked Wallets",
+            path: "/account/wallets",
           },
           {
-            path: "/account/devices",
             name: "Devices",
+            path: "/account/devices",
           },
         ]}
+        tabContainerClassName="px-4 lg:px-6"
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.stories.tsx b/apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.stories.tsx
index 0d3130d86e8..200ab9677bf 100644
--- a/apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.stories.tsx
+++ b/apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.stories.tsx
@@ -8,13 +8,13 @@ import {
 import { AccountTeamsUI } from "./AccountTeamsUI";
 
 const meta = {
-  title: "Account/Pages/Teams",
   component: Variants,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Account/Pages/Teams",
 } satisfies Meta<typeof Variants>;
 
 export default meta;
@@ -43,20 +43,20 @@ function Variants() {
           client={storybookThirdwebClient}
           teamsWithRole={[
             {
-              team: teamStub("1", "free"),
               role: "MEMBER",
+              team: teamStub("1", "free"),
             },
             {
-              team: teamStub("2", "pro"),
               role: "OWNER",
+              team: teamStub("2", "pro"),
             },
             {
-              team: teamStub("3", "growth"),
               role: "MEMBER",
+              team: teamStub("3", "growth"),
             },
             {
-              team: teamStub("4", "growth"),
               role: "MEMBER",
+              team: teamStub("4", "growth"),
             },
           ]}
         />
@@ -67,8 +67,8 @@ function Variants() {
           client={storybookThirdwebClient}
           teamsWithRole={[
             {
-              team: teamStub("1", "free"),
               role: "MEMBER",
+              team: teamStub("1", "free"),
             },
           ]}
         />
diff --git a/apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.tsx b/apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.tsx
index 30090f14bc6..4da989e8890 100644
--- a/apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.tsx
+++ b/apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.tsx
@@ -1,5 +1,10 @@
 "use client";
 
+import { EllipsisIcon, PlusIcon } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
 import { createTeam } from "@/actions/createTeam";
 import type { Team } from "@/api/team";
 import type { TeamAccountRole } from "@/api/team-members";
@@ -12,11 +17,6 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { EllipsisIcon, PlusIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
 import { TeamPlanBadge } from "../../components/TeamPlanBadge";
 import { getValidTeamPlan } from "../../team/components/TeamHeader/getValidTeamPlan";
 import { SearchInput } from "../components/SearchInput";
@@ -47,9 +47,9 @@ export function AccountTeamsUI(props: {
         router.push(`/team/${res.data.slug}`);
       }),
       {
+        error: "Failed to create team",
         loading: "Creating team",
         success: "Team created",
-        error: "Failed to create team",
       },
     );
   };
@@ -73,9 +73,9 @@ export function AccountTeamsUI(props: {
       <div className="h-4" />
 
       <SearchInput
+        onValueChange={setTeamSearchValue}
         placeholder="Search Teams"
         value={teamSearchValue}
-        onValueChange={setTeamSearchValue}
       />
 
       <div className="h-4" />
@@ -85,10 +85,10 @@ export function AccountTeamsUI(props: {
         {teamsToShow.map((v) => {
           return (
             <li
-              key={v.team.id}
               className="border-border border-b p-4 last:border-b-0"
+              key={v.team.id}
             >
-              <TeamRow team={v.team} role={v.role} client={props.client} />
+              <TeamRow client={props.client} role={v.role} team={v.team} />
             </li>
           );
         })}
@@ -125,9 +125,9 @@ function TeamRow(props: {
       <div className="flex items-center gap-4">
         <GradientAvatar
           className="size-8"
-          src={props.team.image || ""}
-          id={props.team.id}
           client={props.client}
+          id={props.team.id}
+          src={props.team.image || ""}
         />
 
         <div>
@@ -145,22 +145,22 @@ function TeamRow(props: {
 
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
-          <Button size="icon" variant="ghost" className="!h-auto !w-auto p-1.5">
+          <Button className="!h-auto !w-auto p-1.5" size="icon" variant="ghost">
             <EllipsisIcon className="size-4 text-muted-foreground" />
           </Button>
         </DropdownMenuTrigger>
 
         <DropdownMenuContent className="w-[180px]">
           <DropdownMenuItem>
-            <Link href={`/team/${props.team.slug}`} className="w-full p-1 ">
+            <Link className="w-full p-1 " href={`/team/${props.team.slug}`}>
               View
             </Link>
           </DropdownMenuItem>
 
           <DropdownMenuItem>
             <Link
-              href={`/team/${props.team.slug}/~/settings`}
               className="w-full p-1 "
+              href={`/team/${props.team.slug}/~/settings`}
             >
               Manage
             </Link>
diff --git a/apps/dashboard/src/app/(app)/account/page.tsx b/apps/dashboard/src/app/(app)/account/page.tsx
index dcf91adaa6c..29f0fe814ea 100644
--- a/apps/dashboard/src/app/(app)/account/page.tsx
+++ b/apps/dashboard/src/app/(app)/account/page.tsx
@@ -1,7 +1,7 @@
+import { notFound } from "next/navigation";
 import { getTeams } from "@/api/team";
 import { getMemberByAccountId } from "@/api/team-members";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound } from "next/navigation";
 import { getAuthToken } from "../api/lib/getAuthToken";
 import { loginRedirect } from "../login/loginRedirect";
 import { AccountTeamsUI } from "./overview/AccountTeamsUI";
@@ -32,8 +32,8 @@ export default async function Page() {
       }
 
       return {
-        team,
         role: member.role,
+        team,
       };
     }),
   );
@@ -47,7 +47,7 @@ export default async function Page() {
       </header>
 
       <div className="container flex max-w-[950px] grow flex-col py-8">
-        <AccountTeamsUI teamsWithRole={teamsWithRole} client={client} />
+        <AccountTeamsUI client={client} teamsWithRole={teamsWithRole} />
       </div>
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPage.tsx b/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPage.tsx
index 027903d2fde..5e42e11a3ae 100644
--- a/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPage.tsx
+++ b/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPage.tsx
@@ -1,13 +1,13 @@
 "use client";
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import type { ThirdwebClient } from "thirdweb";
+import { useActiveWallet, useDisconnect } from "thirdweb/react";
+import { upload } from "thirdweb/storage";
 import { confirmEmailWithOTP } from "@/actions/confirmEmail";
 import { apiServerProxy } from "@/actions/proxies";
 import { updateAccount } from "@/actions/updateAccount";
 import { resetAnalytics } from "@/analytics/reset";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import type { ThirdwebClient } from "thirdweb";
-import { useActiveWallet, useDisconnect } from "thirdweb/react";
-import { upload } from "thirdweb/storage";
 import { doLogout } from "../../login/auth-actions";
 import { AccountSettingsPageUI } from "./AccountSettingsPageUI";
 
@@ -32,9 +32,7 @@ export function AccountSettingsPage(props: {
 
       <div className="container max-w-[950px] grow pt-8 pb-20">
         <AccountSettingsPageUI
-          client={props.client}
-          defaultTeamSlug={props.defaultTeamSlug}
-          defaultTeamName={props.defaultTeamName}
+          account={props.account}
           cancelSubscriptions={async () => {
             const res = await apiServerProxy({
               method: "DELETE",
@@ -45,14 +43,9 @@ export function AccountSettingsPage(props: {
               throw new Error(res.error);
             }
           }}
-          onAccountDeleted={async () => {
-            await doLogout();
-            resetAnalytics();
-            if (activeWallet) {
-              disconnect(activeWallet);
-            }
-            router.replace("/login");
-          }}
+          client={props.client}
+          defaultTeamName={props.defaultTeamName}
+          defaultTeamSlug={props.defaultTeamSlug}
           deleteAccount={async () => {
             try {
               const res = await apiServerProxy({
@@ -68,8 +61,22 @@ export function AccountSettingsPage(props: {
               return { status: 500 };
             }
           }}
+          onAccountDeleted={async () => {
+            await doLogout();
+            resetAnalytics();
+            if (activeWallet) {
+              disconnect(activeWallet);
+            }
+            router.replace("/login");
+          }}
+          sendEmail={async (email) => {
+            const res = await updateAccount({ email });
+            if (res?.errorMessage) {
+              throw new Error(res.errorMessage);
+            }
+          }}
           updateAccountAvatar={async (file) => {
-            let uri: string | undefined = undefined;
+            let uri: string | undefined;
 
             if (file) {
               // upload to IPFS
@@ -85,7 +92,6 @@ export function AccountSettingsPage(props: {
 
             router.refresh();
           }}
-          account={props.account}
           updateEmailWithOTP={async (otp) => {
             const res = await confirmEmailWithOTP(otp);
             if (res?.errorMessage) {
@@ -93,6 +99,8 @@ export function AccountSettingsPage(props: {
             }
             router.refresh();
           }}
+          // yes, this is weird -
+          // to send OTP to email, we use updateAccount
           updateName={async (name) => {
             const res = await updateAccount({ name });
             if (res?.errorMessage) {
@@ -100,14 +108,6 @@ export function AccountSettingsPage(props: {
             }
             router.refresh();
           }}
-          // yes, this is weird -
-          // to send OTP to email, we use updateAccount
-          sendEmail={async (email) => {
-            const res = await updateAccount({ email });
-            if (res?.errorMessage) {
-              throw new Error(res.errorMessage);
-            }
-          }}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPageUI.stories.tsx b/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPageUI.stories.tsx
index 9e82ea2ef23..80e538ccdcb 100644
--- a/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPageUI.stories.tsx
+++ b/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPageUI.stories.tsx
@@ -1,3 +1,6 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useState } from "react";
+import { mobileViewport, storybookThirdwebClient } from "stories/utils";
 import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
 import { Label } from "@/components/ui/label";
 import {
@@ -7,19 +10,16 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useState } from "react";
-import { mobileViewport, storybookThirdwebClient } from "stories/utils";
 import { AccountSettingsPageUI } from "./AccountSettingsPageUI";
 
 const meta = {
-  title: "Account/Pages/Settings",
   component: Variants,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Account/Pages/Settings",
 } satisfies Meta<typeof Variants>;
 
 export default meta;
@@ -82,12 +82,12 @@ function Variants() {
         <div className="mt-3 flex flex-col gap-2">
           <Label>Delete Account Response</Label>
           <Select
-            value={String(deleteAccountStatusResponse)}
             onValueChange={(value) =>
               setDeleteAccountStatusResponse(
                 Number(value) as 400 | 402 | 500 | 200,
               )
             }
+            value={String(deleteAccountStatusResponse)}
           >
             <SelectTrigger className="min-w-[320px]">
               <SelectValue placeholder="Select status" />
@@ -103,16 +103,29 @@ function Variants() {
       </div>
 
       <AccountSettingsPageUI
-        defaultTeamSlug="foo"
-        defaultTeamName="Foo"
         account={{
-          name: "John Doe",
           email: "johndoe@gmail.com",
           emailConfirmedAt: isVerifiedEmail
             ? new Date().toISOString()
             : undefined,
+          name: "John Doe",
+        }}
+        cancelSubscriptions={async () => {
+          await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
         client={storybookThirdwebClient}
+        defaultTeamName="Foo"
+        defaultTeamSlug="foo"
+        deleteAccount={deleteAccountStub}
+        onAccountDeleted={() => {
+          console.log("Account deleted");
+        }}
+        sendEmail={async () => {
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+          if (sendEmailFails) {
+            throw new Error("Email already exists");
+          }
+        }}
         updateAccountAvatar={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
@@ -125,19 +138,6 @@ function Variants() {
         updateName={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
-        sendEmail={async () => {
-          await new Promise((resolve) => setTimeout(resolve, 1000));
-          if (sendEmailFails) {
-            throw new Error("Email already exists");
-          }
-        }}
-        deleteAccount={deleteAccountStub}
-        onAccountDeleted={() => {
-          console.log("Account deleted");
-        }}
-        cancelSubscriptions={async () => {
-          await new Promise((resolve) => setTimeout(resolve, 1000));
-        }}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPageUI.tsx b/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPageUI.tsx
index b5ea0379e2d..10b9b1e605e 100644
--- a/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPageUI.tsx
+++ b/apps/dashboard/src/app/(app)/account/settings/AccountSettingsPageUI.tsx
@@ -1,9 +1,20 @@
 "use client";
 
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import { FileInput } from "components/shared/FileInput";
+import { REGEXP_ONLY_DIGITS_AND_CHARS } from "input-otp";
+import { CircleXIcon, EllipsisIcon, ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import { z } from "zod";
 import { BillingPortalButton } from "@/components/billing";
 import { DangerSettingCard } from "@/components/blocks/DangerSettingCard";
 import { SettingsCard } from "@/components/blocks/SettingsCard";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -31,20 +42,9 @@ import {
   InputOTPGroup,
   InputOTPSlot,
 } from "@/components/ui/input-otp";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { cn } from "@/lib/utils";
-import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { FileInput } from "components/shared/FileInput";
-import { REGEXP_ONLY_DIGITS_AND_CHARS } from "input-otp";
-import { CircleXIcon, EllipsisIcon, ExternalLinkIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
-import { z } from "zod";
 
 type MinimalAccount = Pick<
   Account,
@@ -71,23 +71,23 @@ export function AccountSettingsPageUI(props: {
         updateName={(name) => props.updateName(name)}
       />
       <AccountAvatarFormControl
-        updateAccountAvatar={props.updateAccountAvatar}
         avatar={props.account.image || undefined}
         client={props.client}
+        updateAccountAvatar={props.updateAccountAvatar}
       />
       <AccountEmailFormControl
         email={props.account.email || ""}
-        status={props.account.emailConfirmedAt ? "verified" : "unverified"}
         sendEmail={props.sendEmail}
+        status={props.account.emailConfirmedAt ? "verified" : "unverified"}
         updateEmailWithOTP={props.updateEmailWithOTP}
       />
 
       <DeleteAccountCard
+        cancelSubscriptions={props.cancelSubscriptions}
+        defaultTeamName={props.defaultTeamName}
+        defaultTeamSlug={props.defaultTeamSlug}
         deleteAccount={props.deleteAccount}
         onAccountDeleted={props.onAccountDeleted}
-        defaultTeamSlug={props.defaultTeamSlug}
-        defaultTeamName={props.defaultTeamName}
-        cancelSubscriptions={props.cancelSubscriptions}
       />
     </div>
   );
@@ -112,21 +112,21 @@ function AccountAvatarFormControl(props: {
   function handleSave() {
     const promises = updateAvatarMutation.mutateAsync(avatar);
     toast.promise(promises, {
-      success: "Account avatar updated successfully",
       error: "Failed to update account avatar",
+      success: "Account avatar updated successfully",
     });
   }
 
   return (
     <SettingsCard
       bottomText="An avatar is optional but strongly recommended."
+      errorText={undefined}
+      noPermissionText={undefined}
       saveButton={{
-        onClick: handleSave,
         disabled: false,
         isPending: updateAvatarMutation.isPending,
+        onClick: handleSave,
       }}
-      noPermissionText={undefined}
-      errorText={undefined}
     >
       <div className="flex flex-row gap-4 md:justify-between">
         <div>
@@ -137,12 +137,12 @@ function AccountAvatarFormControl(props: {
           </p>
         </div>
         <FileInput
-          client={props.client}
           accept={{ "image/*": [] }}
-          value={avatar || accountAvatarUrl}
-          setValue={setAvatar}
           className="w-20 rounded-full lg:w-28"
+          client={props.client}
           disableHelperText
+          setValue={setAvatar}
+          value={avatar || accountAvatarUrl}
         />
       </div>
     </SettingsCard>
@@ -163,32 +163,32 @@ function AccountNameFormControl(props: {
   function handleSave() {
     const promises = updateAccountNameMutation.mutateAsync(accountName);
     toast.promise(promises, {
-      success: "Account name updated successfully",
       error: "Failed to update account name",
+      success: "Account name updated successfully",
     });
   }
 
   return (
     <SettingsCard
+      bottomText={`Please use ${maxAccountNameLength} characters at maximum.`}
+      errorText={undefined}
       header={{
-        title: "Display Name",
         description: "This is your account's name displayed on thirdweb",
+        title: "Display Name",
       }}
-      bottomText={`Please use ${maxAccountNameLength} characters at maximum.`}
+      noPermissionText={undefined}
       saveButton={{
-        onClick: handleSave,
         disabled: accountName.length === 0,
         isPending: updateAccountNameMutation.isPending,
-      }}
-      errorText={undefined}
-      noPermissionText={undefined} // TODO
+        onClick: handleSave,
+      }} // TODO
     >
       <Input
-        value={accountName}
+        className="md:w-[400px]"
         onChange={(e) => {
           setAccountName(e.target.value.slice(0, maxAccountNameLength));
         }}
-        className="md:w-[400px]"
+        value={accountName}
       />
     </SettingsCard>
   );
@@ -239,27 +239,9 @@ function DeleteAccountCard(props: {
 
   return (
     <DangerSettingCard
-      title={title}
-      description={description}
       buttonLabel={title}
       buttonOnClick={handleDelete}
-      isPending={deleteAccount.isPending}
       confirmationDialog={{
-        title: "Delete Account",
-        description: (
-          <span className="block space-y-2">
-            <span className="block">
-              Permanently delete your thirdweb account, the default team "
-              {props.defaultTeamName}" and all associated data
-            </span>
-            <span className="block font-medium">
-              This action is not reversible
-            </span>
-          </span>
-        ),
-        onClose: () => {
-          deleteAccount.reset();
-        },
         children: (
           <>
             {deleteAccount.data?.status === 400 && (
@@ -277,16 +259,16 @@ function DeleteAccountCard(props: {
 
                     <div className="flex flex-col gap-3 lg:flex-row">
                       <Button
-                        variant="default"
-                        size="sm"
                         className="gap-2"
                         onClick={() => {
                           const promise = cancelSubscriptions.mutateAsync();
                           toast.promise(promise, {
-                            success: "Subscriptions cancelled successfully",
                             error: "Failed to cancel subscriptions",
+                            success: "Subscriptions cancelled successfully",
                           });
                         }}
+                        size="sm"
+                        variant="default"
                       >
                         {cancelSubscriptions.isPending ? (
                           <Spinner className="size-4" />
@@ -297,15 +279,15 @@ function DeleteAccountCard(props: {
                       </Button>
 
                       <Button
-                        variant="outline"
                         asChild
-                        size="sm"
                         className="gap-2"
+                        size="sm"
+                        variant="outline"
                       >
                         <Link
                           href="/support/create-ticket"
-                          target="_blank"
                           rel="noopener noreferrer"
+                          target="_blank"
                         >
                           Contact Support
                           <ExternalLinkIcon className="size-4" />
@@ -342,7 +324,25 @@ function DeleteAccountCard(props: {
             )}
           </>
         ),
+        description: (
+          <span className="block space-y-2">
+            <span className="block">
+              Permanently delete your thirdweb account, the default team "
+              {props.defaultTeamName}" and all associated data
+            </span>
+            <span className="block font-medium">
+              This action is not reversible
+            </span>
+          </span>
+        ),
+        onClose: () => {
+          deleteAccount.reset();
+        },
+        title: "Delete Account",
       }}
+      description={description}
+      isPending={deleteAccount.isPending}
+      title={title}
     />
   );
 }
@@ -356,13 +356,13 @@ function AccountEmailFormControl(props: {
   const [isEmailModalOpen, setIsEmailModalOpen] = useState(false);
   return (
     <SettingsCard
+      bottomText="Emails must be verified to be able to login with them or be used as primary email"
+      errorText={undefined}
       header={{
-        title: "Email",
         description:
           "Enter the email address you want to use to log in with thirdweb. This email will be used for account related notifications",
+        title: "Email",
       }}
-      bottomText="Emails must be verified to be able to login with them or be used as primary email"
-      errorText={undefined}
       noPermissionText={undefined}
     >
       <div className="flex items-center justify-between gap-4 rounded-lg border bg-background p-4">
@@ -378,12 +378,12 @@ function AccountEmailFormControl(props: {
         </div>
 
         {/* End */}
-        <Dialog open={isEmailModalOpen} onOpenChange={setIsEmailModalOpen}>
+        <Dialog onOpenChange={setIsEmailModalOpen} open={isEmailModalOpen}>
           <DialogTrigger asChild>
             <Button
+              className="!h-auto !w-auto p-1.5"
               size="icon"
               variant="ghost"
-              className="!h-auto !w-auto p-1.5"
             >
               <EllipsisIcon className="size-5 text-muted-foreground" />
             </Button>
@@ -391,11 +391,11 @@ function AccountEmailFormControl(props: {
           <DialogContent className="p-0">
             <EmailUpdateDialogContent
               currentEmail={props.email}
-              sendEmail={props.sendEmail}
-              updateEmailWithOTP={props.updateEmailWithOTP}
               onSuccess={() => {
                 setIsEmailModalOpen(false);
               }}
+              sendEmail={props.sendEmail}
+              updateEmailWithOTP={props.updateEmailWithOTP}
             />
           </DialogContent>
         </Dialog>
@@ -419,16 +419,16 @@ function EmailUpdateDialogContent(props: {
   if (isEmailSent) {
     return (
       <EnterEmailOTP
-        updateEmailWithOTP={props.updateEmailWithOTP}
         onSuccess={props.onSuccess}
+        updateEmailWithOTP={props.updateEmailWithOTP}
       />
     );
   }
 
   return (
     <SendEmailOTP
-      onEmailSent={() => setIsEmailSent(true)}
       currentEmail={props.currentEmail}
+      onEmailSent={() => setIsEmailSent(true)}
       sendEmail={props.sendEmail}
     />
   );
@@ -453,13 +453,13 @@ function SendEmailOTP(props: {
 
   function onSubmit(values: z.infer<typeof emailUpdateFormSchema>) {
     sendEmail.mutateAsync(values.email, {
-      onSuccess: () => {
-        props.onEmailSent();
-      },
       onError: (e) => {
         console.error(e);
         setShowSendError(true);
       },
+      onSuccess: () => {
+        props.onEmailSent();
+      },
     });
   }
 
@@ -507,8 +507,8 @@ function SendEmailOTP(props: {
           </DialogClose>
           <Button
             className="min-w-24 gap-2"
-            type="submit"
             disabled={!form.formState.isDirty}
+            type="submit"
           >
             {sendEmail.isPending && <Spinner className="size-4" />}
             Update
@@ -527,13 +527,13 @@ function EnterEmailOTP(props: {
   const [showOTPError, setShowOTPError] = useState(false);
   const updateEmail = useMutation({
     mutationFn: props.updateEmailWithOTP,
+    onError: () => {
+      setShowOTPError(true);
+    },
     onSuccess: () => {
       props.onSuccess();
       toast.success("Email updated successfully");
     },
-    onError: () => {
-      setShowOTPError(true);
-    },
   });
 
   return (
@@ -549,25 +549,25 @@ function EnterEmailOTP(props: {
         <div className="h-6" />
 
         <InputOTP
-          maxLength={6}
-          pattern={REGEXP_ONLY_DIGITS_AND_CHARS}
+          disabled={updateEmail.isPending}
           inputMode="text"
-          value={otp}
+          maxLength={6}
           onChange={(v) => {
             setOtp(v);
             setShowOTPError(false);
           }}
-          disabled={updateEmail.isPending}
+          pattern={REGEXP_ONLY_DIGITS_AND_CHARS}
+          value={otp}
         >
           <InputOTPGroup className="w-full">
             {new Array(6).fill(0).map((_, idx) => (
               <InputOTPSlot
-                // biome-ignore lint/suspicious/noArrayIndexKey: static list
-                key={idx}
-                index={idx}
                 className={cn("h-12 grow text-lg", {
                   "border-red-500": showOTPError,
                 })}
+                index={idx}
+                // biome-ignore lint/suspicious/noArrayIndexKey: static list
+                key={idx}
               />
             ))}
           </InputOTPGroup>
diff --git a/apps/dashboard/src/app/(app)/account/settings/getAccount.ts b/apps/dashboard/src/app/(app)/account/settings/getAccount.ts
index 695c5b83600..86334e8b390 100644
--- a/apps/dashboard/src/app/(app)/account/settings/getAccount.ts
+++ b/apps/dashboard/src/app/(app)/account/settings/getAccount.ts
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { getAuthToken } from "../../api/lib/getAuthToken";
 import { loginRedirect } from "../../login/loginRedirect";
 import { isAccountOnboardingComplete } from "../../login/onboarding/isOnboardingRequired";
@@ -16,10 +16,10 @@ export async function getRawAccount() {
   }
 
   const res = await fetch(`${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/account/me`, {
-    method: "GET",
     headers: {
       Authorization: `Bearer ${authToken}`,
     },
+    method: "GET",
   });
 
   if (!res.ok) {
diff --git a/apps/dashboard/src/app/(app)/account/settings/page.tsx b/apps/dashboard/src/app/(app)/account/settings/page.tsx
index 7b28398f7e7..cabdbce105d 100644
--- a/apps/dashboard/src/app/(app)/account/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/account/settings/page.tsx
@@ -27,8 +27,8 @@ export default async function Page() {
     <AccountSettingsPage
       account={account}
       client={client}
-      defaultTeamSlug={defaultTeam.slug}
       defaultTeamName={defaultTeam.name}
+      defaultTeamSlug={defaultTeam.slug}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/account/wallets/LinkWalletUI.tsx b/apps/dashboard/src/app/(app)/account/wallets/LinkWalletUI.tsx
index 244694902ab..da30d70cc8d 100644
--- a/apps/dashboard/src/app/(app)/account/wallets/LinkWalletUI.tsx
+++ b/apps/dashboard/src/app/(app)/account/wallets/LinkWalletUI.tsx
@@ -1,9 +1,14 @@
 "use client";
 
+import { useMutation } from "@tanstack/react-query";
+import { format } from "date-fns";
+import { MinusIcon } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
 import { apiServerProxy } from "@/actions/proxies";
 import type { LinkedWallet } from "@/api/linked-wallets";
 import { WalletAddress } from "@/components/blocks/wallet-address";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -13,6 +18,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Table,
   TableBody,
@@ -22,12 +28,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useMutation } from "@tanstack/react-query";
-import { format } from "date-fns";
-import { MinusIcon } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
 import { SearchInput } from "../components/SearchInput";
 
 export function LinkWallet(props: {
@@ -38,13 +38,12 @@ export function LinkWallet(props: {
   const router = useDashboardRouter();
   return (
     <LinkWalletUI
-      client={props.client}
-      wallets={props.wallets}
       accountEmail={props.accountEmail}
+      client={props.client}
       unlinkWallet={async (walletId) => {
         const res = await apiServerProxy({
-          pathname: `/v1/account/wallets/${walletId}`,
           method: "DELETE",
+          pathname: `/v1/account/wallets/${walletId}`,
         });
 
         if (!res.ok) {
@@ -54,6 +53,7 @@ export function LinkWallet(props: {
 
         router.refresh();
       }}
+      wallets={props.wallets}
     />
   );
 }
@@ -79,9 +79,9 @@ export function LinkWalletUI(props: {
   return (
     <div>
       <SearchInput
+        onValueChange={setSearchValue}
         placeholder="Search wallet address"
         value={searchValue}
-        onValueChange={setSearchValue}
       />
 
       <div className="h-4" />
@@ -110,13 +110,13 @@ export function LinkWalletUI(props: {
                 </TableCell>
                 <TableCell>
                   <UnlinkButton
-                    client={props.client}
-                    wallet={wallet}
-                    unlinkWallet={props.unlinkWallet}
                     accountEmail={props.accountEmail}
+                    client={props.client}
                     onUnlinkSuccess={() => {
                       setDeletedWalletIds([...deletedWalletIds, wallet.id]);
                     }}
+                    unlinkWallet={props.unlinkWallet}
+                    wallet={wallet}
                   />
                 </TableCell>
               </TableRow>
@@ -124,7 +124,7 @@ export function LinkWalletUI(props: {
 
             {walletsToShow.length === 0 && (
               <TableRow>
-                <TableCell colSpan={3} className="h-[200px] text-center">
+                <TableCell className="h-[200px] text-center" colSpan={3}>
                   <div className="flex flex-col gap-3">
                     <p className="text-sm">No Wallets Found</p>
                     {searchValue && (
@@ -154,20 +154,20 @@ function UnlinkButton(props: {
   const [open, setOpen] = useState(false);
   const unlinkWallet = useMutation({
     mutationFn: props.unlinkWallet,
+    onError: () => {
+      toast.error("Failed to unlink wallet");
+    },
     onSuccess: () => {
       props.onUnlinkSuccess();
       setOpen(false);
       toast.success("Wallet unlinked successfully");
     },
-    onError: () => {
-      toast.error("Failed to unlink wallet");
-    },
   });
 
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
+    <Dialog onOpenChange={setOpen} open={open}>
       <DialogTrigger asChild>
-        <Button size="sm" variant="outline" className="gap-2">
+        <Button className="gap-2" size="sm" variant="outline">
           <MinusIcon className="size-4" />
           Unlink
         </Button>
@@ -203,18 +203,18 @@ function UnlinkButton(props: {
 
         <div className="flex justify-end gap-4 rounded-b-lg border-t bg-card p-6">
           <Button
-            variant="outline"
-            onClick={() => setOpen(false)}
             disabled={unlinkWallet.isPending}
+            onClick={() => setOpen(false)}
+            variant="outline"
           >
             Cancel
           </Button>
           <Button
-            variant="destructive"
+            disabled={unlinkWallet.isPending}
             onClick={() => {
               unlinkWallet.mutate(props.wallet.id);
             }}
-            disabled={unlinkWallet.isPending}
+            variant="destructive"
           >
             {unlinkWallet.isPending ? (
               <Spinner className="mr-2 size-4" />
diff --git a/apps/dashboard/src/app/(app)/account/wallets/LinkWalletsUI.stories.tsx b/apps/dashboard/src/app/(app)/account/wallets/LinkWalletsUI.stories.tsx
index 6ca7cb6e703..bbea4864ec2 100644
--- a/apps/dashboard/src/app/(app)/account/wallets/LinkWalletsUI.stories.tsx
+++ b/apps/dashboard/src/app/(app)/account/wallets/LinkWalletsUI.stories.tsx
@@ -1,4 +1,3 @@
-import type { LinkedWallet } from "@/api/linked-wallets";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import {
   BadgeContainer,
@@ -6,16 +5,17 @@ import {
   storybookThirdwebClient,
 } from "stories/utils";
 import { ThirdwebProvider } from "thirdweb/react";
+import type { LinkedWallet } from "@/api/linked-wallets";
 import { LinkWalletUI } from "./LinkWalletUI";
 
 const meta = {
-  title: "Account/Pages/Link Wallets",
   component: Variants,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Account/Pages/Link Wallets",
 } satisfies Meta<typeof Variants>;
 
 export default meta;
@@ -49,21 +49,21 @@ const unlinkWalletFailureStub = async (walletId: string) => {
 
 const accountWalletsStub: LinkedWallet[] = [
   {
-    walletAddress: "0x51696930092b42243dee1077c8dd237074fb28d4", // jns.eth
-    createdAt: new Date().toISOString(),
+    createdAt: new Date().toISOString(), // jns.eth
     id: "1",
+    walletAddress: "0x51696930092b42243dee1077c8dd237074fb28d4",
   },
   {
-    walletAddress: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37", // no ens
     createdAt: new Date(
       Date.now() - 1000 * 60 * 60 * 24 * 365 * 2,
-    ).toISOString(),
+    ).toISOString(), // no ens
     id: "2",
+    walletAddress: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
   },
   {
-    walletAddress: "0xd8da6bf26964af9d7eed9e03e53415d37aa96045", // vitalik.eth
-    createdAt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 2).toISOString(),
+    createdAt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 2).toISOString(), // vitalik.eth
     id: "3",
+    walletAddress: "0xd8da6bf26964af9d7eed9e03e53415d37aa96045",
   },
 ];
 
@@ -74,27 +74,27 @@ function Variants() {
         <BadgeContainer label="Unlink wallet success">
           <LinkWalletUI
             accountEmail="team@example.com"
+            client={storybookThirdwebClient}
             unlinkWallet={unlinkWalletSuccessStub}
             wallets={accountWalletsStub}
-            client={storybookThirdwebClient}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Unlink wallet failure">
           <LinkWalletUI
             accountEmail="team@example.com"
+            client={storybookThirdwebClient}
             unlinkWallet={unlinkWalletFailureStub}
             wallets={accountWalletsStub}
-            client={storybookThirdwebClient}
           />
         </BadgeContainer>
 
         <BadgeContainer label="0 wallets">
           <LinkWalletUI
-            wallets={[]}
-            unlinkWallet={unlinkWalletSuccessStub}
             accountEmail="team@example.com"
             client={storybookThirdwebClient}
+            unlinkWallet={unlinkWalletSuccessStub}
+            wallets={[]}
           />
         </BadgeContainer>
       </div>
diff --git a/apps/dashboard/src/app/(app)/account/wallets/page.tsx b/apps/dashboard/src/app/(app)/account/wallets/page.tsx
index 71e5df01e8b..478d80611ac 100644
--- a/apps/dashboard/src/app/(app)/account/wallets/page.tsx
+++ b/apps/dashboard/src/app/(app)/account/wallets/page.tsx
@@ -33,9 +33,9 @@ export default async function Page() {
 
       <div className="container max-w-[950px] py-8">
         <LinkWallet
-          wallets={wallets || []}
           accountEmail={account.email || ""}
           client={client}
+          wallets={wallets || []}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/api/auth/ensure-login/route.ts b/apps/dashboard/src/app/(app)/api/auth/ensure-login/route.ts
index 72efd8d1e57..066855a8ed5 100644
--- a/apps/dashboard/src/app/(app)/api/auth/ensure-login/route.ts
+++ b/apps/dashboard/src/app/(app)/api/auth/ensure-login/route.ts
@@ -1,8 +1,8 @@
-import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { cookies } from "next/headers";
 import { type NextRequest, NextResponse } from "next/server";
 import { getAddress } from "thirdweb/utils";
+import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 
 export type EnsureLoginResponse = {
   isLoggedIn: boolean;
@@ -48,10 +48,10 @@ export const GET = async (req: NextRequest) => {
   const accountRes = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/account/me`,
     {
-      method: "GET",
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      method: "GET",
     },
   );
   if (accountRes.status !== 200) {
@@ -70,10 +70,10 @@ export const GET = async (req: NextRequest) => {
   ) {
     cookieStore.set(COOKIE_ACTIVE_ACCOUNT, getAddress(address), {
       httpOnly: true,
-      secure: true,
-      sameSite: "strict",
       // 3 days
       maxAge: 3 * 24 * 60 * 60,
+      sameSite: "strict",
+      secure: true,
     });
   }
 
diff --git a/apps/dashboard/src/app/(app)/api/lib/getAuthToken.ts b/apps/dashboard/src/app/(app)/api/lib/getAuthToken.ts
index 40f9ad01aae..cd5b41a4830 100644
--- a/apps/dashboard/src/app/(app)/api/lib/getAuthToken.ts
+++ b/apps/dashboard/src/app/(app)/api/lib/getAuthToken.ts
@@ -1,7 +1,7 @@
-import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { LAST_USED_TEAM_ID } from "constants/cookies";
 import { cookies } from "next/headers";
+import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 
 export async function getAuthToken() {
   const cookiesManager = await cookies();
diff --git a/apps/dashboard/src/app/(app)/api/testnet-faucet/can-claim/route.ts b/apps/dashboard/src/app/(app)/api/testnet-faucet/can-claim/route.ts
index a0c9b12bf24..e2bbbaec411 100644
--- a/apps/dashboard/src/app/(app)/api/testnet-faucet/can-claim/route.ts
+++ b/apps/dashboard/src/app/(app)/api/testnet-faucet/can-claim/route.ts
@@ -1,3 +1,7 @@
+import { ipAddress } from "@vercel/functions";
+import { cacheTtl } from "lib/redis";
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
 import { getTeams } from "@/api/team";
 import { NEXT_PUBLIC_THIRDWEB_ENGINE_FAUCET_WALLET } from "@/constants/public-envs";
 import {
@@ -5,10 +9,6 @@ import {
   THIRDWEB_ACCESS_TOKEN,
   THIRDWEB_ENGINE_URL,
 } from "@/constants/server-envs";
-import { ipAddress } from "@vercel/functions";
-import { cacheTtl } from "lib/redis";
-import { NextResponse } from "next/server";
-import type { NextRequest } from "next/server";
 import type { CanClaimResponseType } from "./CanClaimResponseType";
 
 // Note: This handler cannot use "edge" runtime because of Redis usage.
diff --git a/apps/dashboard/src/app/(app)/api/testnet-faucet/claim/claim-amount.ts b/apps/dashboard/src/app/(app)/api/testnet-faucet/claim/claim-amount.ts
index a2fc8e70e5a..45675851046 100644
--- a/apps/dashboard/src/app/(app)/api/testnet-faucet/claim/claim-amount.ts
+++ b/apps/dashboard/src/app/(app)/api/testnet-faucet/claim/claim-amount.ts
@@ -1,8 +1,8 @@
 const customClaimAmounts: Record<number, number> = {
-  // Aavegotchi Polter
-  631571: 0.1,
   // Aleph Zero
   2039: 0.1,
+  // Aavegotchi Polter
+  631571: 0.1,
   // Sophon testnet
   531050104: 5,
 };
diff --git a/apps/dashboard/src/app/(app)/api/testnet-faucet/claim/route.ts b/apps/dashboard/src/app/(app)/api/testnet-faucet/claim/route.ts
index d5477703947..078d8fb2a39 100644
--- a/apps/dashboard/src/app/(app)/api/testnet-faucet/claim/route.ts
+++ b/apps/dashboard/src/app/(app)/api/testnet-faucet/claim/route.ts
@@ -1,3 +1,9 @@
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import { ipAddress } from "@vercel/functions";
+import { startOfToday } from "date-fns";
+import { cacheGet, cacheSet } from "lib/redis";
+import { type NextRequest, NextResponse } from "next/server";
+import { getAddress, ZERO_ADDRESS } from "thirdweb";
 import { getTeams } from "@/api/team";
 import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
 import {
@@ -9,12 +15,6 @@ import {
   THIRDWEB_ENGINE_URL,
   TURNSTILE_SECRET_KEY,
 } from "@/constants/server-envs";
-import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import { ipAddress } from "@vercel/functions";
-import { startOfToday } from "date-fns";
-import { cacheGet, cacheSet } from "lib/redis";
-import { type NextRequest, NextResponse } from "next/server";
-import { ZERO_ADDRESS, getAddress } from "thirdweb";
 import { getFaucetClaimAmount } from "./claim-amount";
 
 interface RequestTestnetFundsPayload {
@@ -103,14 +103,14 @@ export const POST = async (req: NextRequest) => {
     "https://challenges.cloudflare.com/turnstile/v0/siteverify",
     {
       body: JSON.stringify({
-        secret: TURNSTILE_SECRET_KEY,
-        response: turnstileToken,
         remoteip: ip,
+        response: turnstileToken,
+        secret: TURNSTILE_SECRET_KEY,
       }),
-      method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
 
@@ -128,10 +128,10 @@ export const POST = async (req: NextRequest) => {
   const accountRes = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/account/me`,
     {
-      method: "GET",
       headers: {
         Authorization: `Bearer ${authCookie.value}`,
       },
+      method: "GET",
     },
   );
 
@@ -226,18 +226,18 @@ export const POST = async (req: NextRequest) => {
     // then actually transfer the funds
     const url = `${THIRDWEB_ENGINE_URL}/backend-wallet/${chainId}/transfer`;
     const response = await fetch(url, {
-      method: "POST",
+      body: JSON.stringify({
+        amount: amountToClaim,
+        currencyAddress: ZERO_ADDRESS,
+        to: toAddress,
+      }),
       headers: {
+        Authorization: `Bearer ${THIRDWEB_ACCESS_TOKEN}`,
         "Content-Type": "application/json",
-        "x-idempotency-key": idempotencyKey,
         "x-backend-wallet-address": NEXT_PUBLIC_THIRDWEB_ENGINE_FAUCET_WALLET,
-        Authorization: `Bearer ${THIRDWEB_ACCESS_TOKEN}`,
+        "x-idempotency-key": idempotencyKey,
       },
-      body: JSON.stringify({
-        to: toAddress,
-        currencyAddress: ZERO_ADDRESS,
-        amount: amountToClaim,
-      }),
+      method: "POST",
     });
 
     if (!response.ok) {
diff --git a/apps/dashboard/src/app/(app)/components/EnsureValidConnectedWalletLogin/EnsureValidConnectedWalletLoginClient.tsx b/apps/dashboard/src/app/(app)/components/EnsureValidConnectedWalletLogin/EnsureValidConnectedWalletLoginClient.tsx
index 4e2af147634..b46437b63f8 100644
--- a/apps/dashboard/src/app/(app)/components/EnsureValidConnectedWalletLogin/EnsureValidConnectedWalletLoginClient.tsx
+++ b/apps/dashboard/src/app/(app)/components/EnsureValidConnectedWalletLogin/EnsureValidConnectedWalletLoginClient.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { useEffect } from "react";
 import { useActiveAccount } from "thirdweb/react";
 import { checksumAddress } from "thirdweb/utils";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 export function EnsureValidConnectedWalletLoginClient(props: {
   loggedInAddress: string;
diff --git a/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/ResourcesDropdownButton.tsx b/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/ResourcesDropdownButton.tsx
index f5fa8180b63..6207396f309 100644
--- a/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/ResourcesDropdownButton.tsx
+++ b/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/ResourcesDropdownButton.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { ChevronDownIcon } from "lucide-react";
+import Link from "next/link";
 import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -7,8 +9,6 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { ChevronDownIcon } from "lucide-react";
-import Link from "next/link";
 
 export function ResourcesDropdownButton() {
   // const [isCMDSearchModalOpen, setIsCMDSearchModalOpen] = useState(false);
@@ -21,8 +21,8 @@ export function ResourcesDropdownButton() {
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
           <Button
-            variant="link"
             className="!p-0 !h-auto hover:!no-underline gap-1 font-normal text-muted-foreground text-sm hover:text-foreground"
+            variant="link"
           >
             Resources
             <ChevronDownIcon className="size-4" />
@@ -30,24 +30,24 @@ export function ResourcesDropdownButton() {
         </DropdownMenuTrigger>
         <DropdownMenuContent className="min-w-[230px]" sideOffset={14}>
           <DropdownMenuItem>
-            <Link href="/chainlist" className="w-full p-1">
+            <Link className="w-full p-1" href="/chainlist">
               Chainlist
             </Link>
           </DropdownMenuItem>
 
           <DropdownMenuItem>
             <Link
+              className="w-full p-1"
               href="https://playground.thirdweb.com/"
-              target="_blank"
               rel="noopener noreferrer"
-              className="w-full p-1"
+              target="_blank"
             >
               Playground
             </Link>
           </DropdownMenuItem>
 
           <DropdownMenuItem>
-            <Link href="/explore" className="w-full p-1">
+            <Link className="w-full p-1" href="/explore">
               Explore Contracts
             </Link>
           </DropdownMenuItem>
diff --git a/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/SecondaryNav.tsx b/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/SecondaryNav.tsx
index 1759f8a3ac4..e31e7b93063 100644
--- a/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/SecondaryNav.tsx
+++ b/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/SecondaryNav.tsx
@@ -3,8 +3,8 @@ import Link from "next/link";
 import type React from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { NotificationsButton } from "../../../../../@/components/blocks/notifications/notification-button";
-import { ResourcesDropdownButton } from "./ResourcesDropdownButton";
 import { AccountButton } from "./account-button.client";
+import { ResourcesDropdownButton } from "./ResourcesDropdownButton";
 
 export function SecondaryNav(props: {
   account: Pick<Account, "email" | "id">;
@@ -19,11 +19,11 @@ export function SecondaryNav(props: {
       <div className="flex items-center gap-3">
         <NotificationsButton accountId={props.account.id} />
         <AccountButton
-          logout={props.logout}
-          connectButton={props.connectButton}
           account={props.account}
-          client={props.client}
           accountAddress={props.accountAddress}
+          client={props.client}
+          connectButton={props.connectButton}
+          logout={props.logout}
         />
       </div>
     </div>
@@ -36,28 +36,28 @@ export function SecondaryNavLinks() {
       <ResourcesDropdownButton />
 
       <Link
-        href="https://portal.thirdweb.com"
         className="text-muted-foreground text-sm hover:text-foreground"
-        target="_blank"
+        href="https://portal.thirdweb.com"
         rel="noopener noreferrer"
+        target="_blank"
       >
         Docs
       </Link>
 
       <Link
-        target="_blank"
-        href="/support"
         className="text-muted-foreground text-sm hover:text-foreground"
+        href="/support"
         rel="noopener noreferrer"
+        target="_blank"
       >
         Support
       </Link>
 
       <Link
-        target="_blank"
-        href="https://feedback.thirdweb.com"
         className="text-muted-foreground text-sm hover:text-foreground"
+        href="https://feedback.thirdweb.com"
         rel="noopener noreferrer"
+        target="_blank"
       >
         Feedback
       </Link>
diff --git a/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/account-button.client.tsx b/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/account-button.client.tsx
index bf63fc901d7..695d36cd575 100644
--- a/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/account-button.client.tsx
+++ b/apps/dashboard/src/app/(app)/components/Header/SecondaryNav/account-button.client.tsx
@@ -1,5 +1,12 @@
 "use client";
 
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import { useEns } from "components/contract-components/hooks";
+import { LogOutIcon, MoonIcon, SunIcon } from "lucide-react";
+import Link from "next/link";
+import { useTheme } from "next-themes";
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
 import { Button } from "@/components/ui/button";
 import {
@@ -8,13 +15,6 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { cn } from "@/lib/utils";
-import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import { useEns } from "components/contract-components/hooks";
-import { LogOutIcon, MoonIcon, SunIcon } from "lucide-react";
-import { useTheme } from "next-themes";
-import Link from "next/link";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 
 export function AccountButton(props: {
   logout: () => void;
@@ -31,28 +31,28 @@ export function AccountButton(props: {
   const [isOpen, setIsOpen] = useState(false);
 
   return (
-    <DropdownMenu open={isOpen} onOpenChange={setIsOpen}>
+    <DropdownMenu onOpenChange={setIsOpen} open={isOpen}>
       <DropdownMenuTrigger asChild>
         <Button
-          size="icon"
           asChild
           className="size-10 cursor-pointer rounded-full hover:ring-2 hover:ring-ring hover:ring-offset-1"
+          size="icon"
           variant="ghost"
         >
           {/* Don't remove the div */}
           <div>
             <GradientAvatar
-              id={props.account?.id || "default"}
-              src={props.account?.image || ""}
               className="size-9 border"
               client={props.client}
+              id={props.account?.id || "default"}
+              src={props.account?.image || ""}
             />
           </div>
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent
-        className="w-[300px] rounded-lg p-0"
         align="end"
+        className="w-[300px] rounded-lg p-0"
         onClick={(e) => {
           if (e.target instanceof HTMLAnchorElement) {
             setIsOpen(false);
@@ -73,40 +73,40 @@ export function AccountButton(props: {
         <div className="flex flex-col gap-1 p-2">
           <Button
             asChild
-            variant="ghost"
             className="justify-start px-3 text-muted-foreground text-sm hover:text-foreground"
+            variant="ghost"
           >
             <Link href="/team/~/~/settings/billing">Manage Billing</Link>
           </Button>
 
           <Button
             asChild
-            variant="ghost"
             className="justify-start px-3 text-muted-foreground text-sm hover:text-foreground"
+            variant="ghost"
           >
             <Link href="/account">My Account</Link>
           </Button>
 
           <Button
             asChild
-            variant="ghost"
             className="justify-start px-3 text-muted-foreground text-sm hover:text-foreground"
+            variant="ghost"
           >
             <Link
               href={`/${ensQuery.data?.ensName || props.accountAddress}`}
-              target="_blank"
               rel="noopener noreferrer"
+              target="_blank"
             >
               My Wallet
             </Link>
           </Button>
 
           <Button
-            variant="ghost"
             className="flex items-center justify-between gap-2 px-3 text-muted-foreground text-sm hover:text-foreground"
             onClick={() => {
               setTheme(theme === "light" ? "dark" : "light");
             }}
+            variant="ghost"
           >
             <p className="text-sm">Theme</p>
 
@@ -128,20 +128,20 @@ export function AccountButton(props: {
 
           <Button
             asChild
-            variant="ghost"
             className="justify-start px-3 text-muted-foreground text-sm hover:text-foreground"
+            variant="ghost"
           >
             <Link href="/home">Home Page</Link>
           </Button>
 
           {props.account && (
             <Button
-              variant="ghost"
+              className="justify-between gap-2 px-3 text-muted-foreground hover:text-foreground"
               onClick={() => {
                 props.logout();
                 setIsOpen(false);
               }}
-              className="justify-between gap-2 px-3 text-muted-foreground hover:text-foreground"
+              variant="ghost"
             >
               Log Out
               <LogOutIcon className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/components/MobileBurgerMenuButton.tsx b/apps/dashboard/src/app/(app)/components/MobileBurgerMenuButton.tsx
index 7d718d83970..9e2942ba2b5 100644
--- a/apps/dashboard/src/app/(app)/components/MobileBurgerMenuButton.tsx
+++ b/apps/dashboard/src/app/(app)/components/MobileBurgerMenuButton.tsx
@@ -1,9 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
-import { SkeletonContainer } from "@/components/ui/skeleton";
-import { cn } from "@/lib/utils";
 import { useEns } from "components/contract-components/hooks";
 import {
   LogOutIcon,
@@ -14,10 +10,14 @@ import {
   WalletIcon,
   XIcon,
 } from "lucide-react";
-import { useTheme } from "next-themes";
 import Link from "next/link";
+import { useTheme } from "next-themes";
 import { useLayoutEffect, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { Button } from "@/components/ui/button";
+import { Separator } from "@/components/ui/separator";
+import { SkeletonContainer } from "@/components/ui/skeleton";
+import { cn } from "@/lib/utils";
 import { ThirdwebMiniLogo } from "./ThirdwebMiniLogo";
 
 export function MobileBurgerMenuButton(
@@ -38,9 +38,9 @@ export function MobileBurgerMenuButton(
   const [isMenuOpen, setIsMenuOpen] = useState(false);
   const { setTheme, theme } = useTheme();
   const ensQuery = useEns({
-    client: props.client,
     addressOrEnsName:
       props.type === "loggedIn" ? props.accountAddress : undefined,
+    client: props.client,
   });
   // const [isCMDSearchModalOpen, setIsCMDSearchModalOpen] = useState(false);
 
@@ -63,9 +63,9 @@ export function MobileBurgerMenuButton(
         setOpen={setIsCMDSearchModalOpen}
       /> */}
       <Button
-        variant="outline"
         className="flex size-10 items-center justify-center rounded-full bg-background p-0"
         onClick={() => setIsMenuOpen(true)}
+        variant="outline"
       >
         <MenuIcon className="size-4 text-muted-foreground" />
       </Button>
@@ -73,9 +73,9 @@ export function MobileBurgerMenuButton(
       {isMenuOpen && (
         <div className="fade-in-0 fixed inset-0 z-50 flex animate-in flex-col bg-background p-6 duration-200">
           <Button
-            variant="ghost"
             className="!h-auto absolute top-4 right-4 p-1"
             onClick={() => setIsMenuOpen(false)}
+            variant="ghost"
           >
             <XIcon className="size-7 text-muted-foreground" />
           </Button>
@@ -89,10 +89,10 @@ export function MobileBurgerMenuButton(
           {props.type === "loggedIn" && (
             <>
               <SkeletonContainer
-                skeletonData="someone@example.com"
-                loadedData={props.email}
                 className="inline-block self-start"
+                loadedData={props.email}
                 render={(email) => <p className="text-foreground">{email}</p>}
+                skeletonData="someone@example.com"
               />
 
               <div className="h-3" />
@@ -103,27 +103,27 @@ export function MobileBurgerMenuButton(
 
               <div className="flex flex-col gap-3">
                 <Link
-                  href="/account"
                   className="flex items-center gap-2 py-1 text-base text-muted-foreground hover:text-foreground"
+                  href="/account"
                 >
                   <UserRoundIcon className="size-4" />
                   My Account
                 </Link>
 
                 <Link
+                  className="flex items-center gap-2 py-1 text-base text-muted-foreground hover:text-foreground"
                   href={`/${ensQuery.data?.ensName || props.accountAddress}`}
-                  target="_blank"
                   rel="noopener noreferrer"
-                  className="flex items-center gap-2 py-1 text-base text-muted-foreground hover:text-foreground"
+                  target="_blank"
                 >
                   <WalletIcon className="size-4" />
                   My Wallet
                 </Link>
 
                 <Button
-                  variant="link"
                   className="!h-auto hover:!no-underline justify-start gap-2 px-0 py-1 text-start text-base text-muted-foreground hover:text-foreground"
                   onClick={props.logout}
+                  variant="link"
                 >
                   <LogOutIcon className="size-4" />
                   Log Out
@@ -150,31 +150,31 @@ export function MobileBurgerMenuButton(
             </Button> */}
 
             <Link
-              href="/chainlist"
               className="text-muted-foreground hover:text-foreground "
+              href="/chainlist"
             >
               Chainlist
             </Link>
 
             <Link
+              className="text-muted-foreground hover:text-foreground "
               href="https://playground.thirdweb.com/"
-              target="_blank"
               rel="noopener noreferrer"
-              className="text-muted-foreground hover:text-foreground "
+              target="_blank"
             >
               Playground
             </Link>
 
             <Link
-              href="/explore"
               className="text-muted-foreground hover:text-foreground "
+              href="/explore"
             >
               Explore Contracts
             </Link>
 
             <Link
-              href="/home"
               className="text-base text-muted-foreground hover:text-foreground"
+              href="/home"
             >
               Home Page
             </Link>
@@ -183,28 +183,28 @@ export function MobileBurgerMenuButton(
           <div className="mt-auto">
             <div className="flex flex-col gap-5">
               <Link
-                target="_blank"
+                className="text-muted-foreground hover:text-foreground "
                 href="https://portal.thirdweb.com"
                 rel="noopener noreferrer"
-                className="text-muted-foreground hover:text-foreground "
+                target="_blank"
               >
                 Docs
               </Link>
 
               <Link
-                target="_blank"
-                rel="noopener noreferrer"
-                href="/support"
                 className="text-muted-foreground hover:text-foreground "
+                href="/support"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 Support
               </Link>
 
               <Link
-                target="_blank"
-                rel="noopener noreferrer"
-                href="https://feedback.thirdweb.com"
                 className="text-muted-foreground hover:text-foreground"
+                href="https://feedback.thirdweb.com"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 Feedback
               </Link>
@@ -217,9 +217,9 @@ export function MobileBurgerMenuButton(
 
             {/* Theme */}
             <Button
-              variant="ghost"
               className="flex w-full items-center justify-between gap-2 px-0"
               onClick={() => setTheme(theme === "light" ? "dark" : "light")}
+              variant="ghost"
             >
               <span className="text-base text-muted-foreground">Theme</span>
               <div className="ml-auto flex items-center gap-2 rounded-lg border px-2 py-1">
diff --git a/apps/dashboard/src/app/(app)/components/TeamPlanBadge.tsx b/apps/dashboard/src/app/(app)/components/TeamPlanBadge.tsx
index 2f7b5674528..679966821cc 100644
--- a/apps/dashboard/src/app/(app)/components/TeamPlanBadge.tsx
+++ b/apps/dashboard/src/app/(app)/components/TeamPlanBadge.tsx
@@ -9,18 +9,18 @@ const teamPlanToBadgeVariant: Record<
   Team["billingPlan"],
   BadgeProps["variant"]
 > = {
+  // green
+  accelerate: "success",
   // gray
   free: "secondary",
-  // yellow
-  starter: "warning",
+  growth: "success",
 
   growth_legacy: "warning",
-  // green
-  accelerate: "success",
-  growth: "success",
-  scale: "success",
   // blue
   pro: "default",
+  scale: "success",
+  // yellow
+  starter: "warning",
 };
 
 export function getTeamPlanBadgeLabel(plan: Team["billingPlan"]) {
@@ -50,16 +50,16 @@ export function TeamPlanBadge(props: {
 
   return (
     <Badge
-      variant={teamPlanToBadgeVariant[props.plan]}
       className={cn("px-1.5 capitalize", props.className)}
-      role={props.plan === "free" ? "button" : undefined}
-      tabIndex={props.plan === "free" ? 0 : undefined}
       onClick={handleNavigateToBilling}
       onKeyDown={(e) => {
         if (e.key === "Enter" || e.key === " ") {
           handleNavigateToBilling(e);
         }
       }}
+      role={props.plan === "free" ? "button" : undefined}
+      tabIndex={props.plan === "free" ? 0 : undefined}
+      variant={teamPlanToBadgeVariant[props.plan]}
     >
       {`${getTeamPlanBadgeLabel(props.plan)}${props.postfix || ""}`}
     </Badge>
diff --git a/apps/dashboard/src/app/(app)/components/ThirdwebMiniLogo.tsx b/apps/dashboard/src/app/(app)/components/ThirdwebMiniLogo.tsx
index 14657f1974a..32983d15004 100644
--- a/apps/dashboard/src/app/(app)/components/ThirdwebMiniLogo.tsx
+++ b/apps/dashboard/src/app/(app)/components/ThirdwebMiniLogo.tsx
@@ -4,12 +4,10 @@ function prefixId(id: string, prefix?: string) {
   return prefix ? `${prefix}_${id}` : id;
 }
 
-export function ThirdwebMiniLogo(props: {
-  className?: string;
-}) {
+export function ThirdwebMiniLogo(props: { className?: string }) {
   const id = useId();
   return (
-    <svg viewBox="0 0 516 321" fill="none" className={props.className}>
+    <svg className={props.className} fill="none" viewBox="0 0 516 321">
       <title>thirdweb</title>
       <g clipPath={`url(#${prefixId("clip0_3:35)", id)}`}>
         <path
@@ -27,12 +25,12 @@ export function ThirdwebMiniLogo(props: {
       </g>
       <defs>
         <linearGradient
+          gradientUnits="userSpaceOnUse"
           id={prefixId("paint0_linear_3:35", id)}
           x1="7.40492"
-          y1="55.24"
           x2="260.485"
+          y1="55.24"
           y2="164.437"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -41,12 +39,12 @@ export function ThirdwebMiniLogo(props: {
           <stop offset="1" stopColor="#5204BF" />
         </linearGradient>
         <linearGradient
+          gradientUnits="userSpaceOnUse"
           id={prefixId("paint1_linear_3:35", id)}
           x1="175.093"
-          y1="54.447"
           x2="410.968"
+          y1="54.447"
           y2="148.471"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -55,12 +53,12 @@ export function ThirdwebMiniLogo(props: {
           <stop offset="1" stopColor="#5204BF" />
         </linearGradient>
         <linearGradient
+          gradientUnits="userSpaceOnUse"
           id={prefixId("paint2_linear_3:35", id)}
           x1="327.331"
-          y1="55.24"
           x2="580.411"
+          y1="55.24"
           y2="164.437"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -69,7 +67,7 @@ export function ThirdwebMiniLogo(props: {
           <stop offset="1" stopColor="#5204BF" />
         </linearGradient>
         <clipPath id={prefixId("clip0_3:35", id)}>
-          <rect width="516" height="321" fill="white" />
+          <rect fill="white" height="321" width="516" />
         </clipPath>
       </defs>
     </svg>
diff --git a/apps/dashboard/src/app/(app)/components/autoconnect.tsx b/apps/dashboard/src/app/(app)/components/autoconnect.tsx
index fa86400d5ed..55907421824 100644
--- a/apps/dashboard/src/app/(app)/components/autoconnect.tsx
+++ b/apps/dashboard/src/app/(app)/components/autoconnect.tsx
@@ -9,8 +9,8 @@ export function TWAutoConnect(props: {
 }) {
   return (
     <AutoConnect
-      client={props.client}
       accountAbstraction={props.accountAbstraction}
+      client={props.client}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/components/sdk-component-theme.ts b/apps/dashboard/src/app/(app)/components/sdk-component-theme.ts
index 179c58dbab1..005818d2ac6 100644
--- a/apps/dashboard/src/app/(app)/components/sdk-component-theme.ts
+++ b/apps/dashboard/src/app/(app)/components/sdk-component-theme.ts
@@ -1,41 +1,41 @@
 import {
-  type Theme,
-  type ThemeOverrides,
   darkTheme,
   lightTheme,
+  type Theme,
+  type ThemeOverrides,
 } from "thirdweb/react";
 
 export function getSDKTheme(theme: "light" | "dark"): Theme {
   const overrides: ThemeOverrides = {
     colors: {
-      modalBg: "hsl(var(--card))",
+      accentButtonBg: "hsl(var(--primary))",
+      accentButtonText: "hsl(var(--primary-foreground))",
+      accentText: "hsl(var(--link-foreground))",
       borderColor: "hsl(var(--border))",
       connectedButtonBg: "hsl(var(--card))",
       connectedButtonBgHover: "hsl(var(--accent))",
-      tertiaryBg: "hsl(var(--muted)/50%)",
-      secondaryButtonBg: "hsl(var(--secondary))",
-      secondaryButtonHoverBg: "hsl(var(--secondary)/80%)",
+      danger: "hsl(var(--destructive-text))",
       inputAutofillBg: "hsl(var(--muted))",
-      secondaryIconHoverBg: "hsl(var(--accent))",
-      separatorLine: "hsl(var(--border))",
-      skeletonBg: "hsl(var(--muted))",
-      scrollbarBg: "hsl(var(--muted))",
-      secondaryText: "hsl(var(--muted-foreground))",
-      primaryText: "hsl(var(--foreground))",
-      accentText: "hsl(var(--link-foreground))",
-      accentButtonBg: "hsl(var(--primary))",
-      accentButtonText: "hsl(var(--primary-foreground))",
+      modalBg: "hsl(var(--card))",
       primaryButtonBg: "hsl(var(--inverted))",
       primaryButtonText: "hsl(var(--inverted-foreground))",
+      primaryText: "hsl(var(--foreground))",
+      scrollbarBg: "hsl(var(--muted))",
+      secondaryButtonBg: "hsl(var(--secondary))",
+      secondaryButtonHoverBg: "hsl(var(--secondary)/80%)",
       secondaryButtonText: "hsl(var(--secondary-foreground))",
-      tooltipBg: "hsl(var(--popover))",
-      tooltipText: "hsl(var(--popover-foreground))",
       secondaryIconColor: "hsl(var(--secondary-foreground))",
+      secondaryIconHoverBg: "hsl(var(--accent))",
       secondaryIconHoverColor: "hsl(var(--foreground))",
+      secondaryText: "hsl(var(--muted-foreground))",
       selectedTextBg: "hsl(var(--inverted))",
       selectedTextColor: "hsl(var(--inverted-foreground))",
-      danger: "hsl(var(--destructive-text))",
+      separatorLine: "hsl(var(--border))",
+      skeletonBg: "hsl(var(--muted))",
       success: "hsl(var(--success-text))",
+      tertiaryBg: "hsl(var(--muted)/50%)",
+      tooltipBg: "hsl(var(--popover))",
+      tooltipText: "hsl(var(--popover-foreground))",
     },
   };
 
diff --git a/apps/dashboard/src/app/(app)/drops/[slug]/data.ts b/apps/dashboard/src/app/(app)/drops/[slug]/data.ts
index 079ef6fcb9c..6e8d25d74e3 100644
--- a/apps/dashboard/src/app/(app)/drops/[slug]/data.ts
+++ b/apps/dashboard/src/app/(app)/drops/[slug]/data.ts
@@ -13,38 +13,38 @@ type DropPageData = {
 
 export const DROP_PAGES: DropPageData[] = [
   {
-    slug: "test",
-    type: "erc1155",
-    contractAddress: "0xBD9d7f15f3C850B35c30b8F9F698B511c20b7263",
-    tokenId: 0n,
     chainId: 11155111,
-    hideQuantitySelector: true,
+    contractAddress: "0xBD9d7f15f3C850B35c30b8F9F698B511c20b7263",
     hideMintToCustomAddress: true,
-    thumbnail: "/drops/zerion.mp4",
+    hideQuantitySelector: true,
     metadata: {
-      title: "Test mint page",
       description: "none",
+      title: "Test mint page",
     },
+    slug: "test",
+    thumbnail: "/drops/zerion.mp4",
+    tokenId: 0n,
+    type: "erc1155",
   },
   {
-    slug: "zero-chain-announcement",
-    type: "erc1155",
-    contractAddress: "0x78264a0af02d894f2d9ae3e11E4a503b352CC437",
-    tokenId: 0n,
     chainId: 543210,
+    contractAddress: "0x78264a0af02d894f2d9ae3e11E4a503b352CC437",
     hideMintToCustomAddress: true,
     hideQuantitySelector: true,
-    thumbnail: "/drops/zerion.mp4",
     metadata: {
-      title: "ZERO x thirdweb",
       description:
         "This exclusive commemorative NFT marks the official launch of ZERϴ's mainnet and our exciting partnership with thirdweb. Own a piece of this milestone in blockchain history as we make onchain transactions free with zero.network",
       openGraph: {
-        title: "ZERO x thirdweb",
         description:
           "This exclusive commemorative NFT marks the official launch of ZERϴ's mainnet and our exciting partnership with thirdweb. Own a piece of this milestone in blockchain history as we make onchain transactions free with zero.network",
+        title: "ZERO x thirdweb",
       },
+      title: "ZERO x thirdweb",
     },
+    slug: "zero-chain-announcement",
+    thumbnail: "/drops/zerion.mp4",
+    tokenId: 0n,
+    type: "erc1155",
   },
 
   // Add more chains here
diff --git a/apps/dashboard/src/app/(app)/drops/[slug]/layout.tsx b/apps/dashboard/src/app/(app)/drops/[slug]/layout.tsx
index 79ba14e87d0..15e438a8790 100644
--- a/apps/dashboard/src/app/(app)/drops/[slug]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/drops/[slug]/layout.tsx
@@ -1,5 +1,5 @@
-import { AppFooter } from "@/components/blocks/app-footer";
 import { ErrorProvider } from "contexts/error-handler";
+import { AppFooter } from "@/components/blocks/app-footer";
 
 export default function DashboardLayout(props: { children: React.ReactNode }) {
   return (
diff --git a/apps/dashboard/src/app/(app)/drops/[slug]/mint-ui.tsx b/apps/dashboard/src/app/(app)/drops/[slug]/mint-ui.tsx
index 3ff3500983a..ecb47264644 100644
--- a/apps/dashboard/src/app/(app)/drops/[slug]/mint-ui.tsx
+++ b/apps/dashboard/src/app/(app)/drops/[slug]/mint-ui.tsx
@@ -1,16 +1,10 @@
 "use client";
 
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardFooter } from "@/components/ui/card";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
 import { CustomConnectWallet } from "@3rdweb-sdk/react/components/connect-wallet";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { MinusIcon, PlusIcon } from "lucide-react";
-import { useState } from "react";
 import type React from "react";
+import { useId, useState } from "react";
 import type { ThirdwebContract } from "thirdweb";
 import { balanceOf as balanceOfERC721 } from "thirdweb/extensions/erc721";
 import { balanceOf as balanceOfERC1155 } from "thirdweb/extensions/erc1155";
@@ -20,6 +14,12 @@ import {
   useActiveAccount,
   useReadContract,
 } from "thirdweb/react";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardFooter } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
 
 type Props = {
   contract: ThirdwebContract;
@@ -45,7 +45,7 @@ export function NftMint(props: Props) {
   const [useCustomAddress, setUseCustomAddress] = useState(false);
   const [customAddress, setCustomAddress] = useState("");
   const account = useActiveAccount();
-
+  const customAddressId = useId();
   const decreaseQuantity = () => {
     setQuantity((prev) => Math.max(1, prev - 1));
   };
@@ -72,10 +72,10 @@ export function NftMint(props: Props) {
   const balance1155Query = useReadContract(balanceOfERC1155, {
     contract: props.contract,
     owner: account?.address || "",
-    tokenId: props.type === "erc1155" ? props.tokenId : 0n,
     queryOptions: {
       enabled: props.type === "erc1155" && !!account?.address,
     },
+    tokenId: props.type === "erc1155" ? props.tokenId : 0n,
   });
 
   const ownedAmount =
@@ -98,9 +98,9 @@ export function NftMint(props: Props) {
         <CardContent className="pt-6">
           <div className="relative mb-4 aspect-square overflow-hidden rounded-lg">
             <MediaRenderer
-              client={props.contract.client}
-              className="h-full w-full object-cover"
               alt=""
+              className="h-full w-full object-cover"
+              client={props.contract.client}
               src={props.thumbnail}
             />
             {!props.noActiveClaimCondition && (
@@ -117,28 +117,28 @@ export function NftMint(props: Props) {
             <div className="mb-4 flex items-center justify-between">
               <div className="flex items-center">
                 <Button
-                  variant="outline"
-                  size="icon"
-                  onClick={decreaseQuantity}
-                  disabled={quantity <= 1}
                   aria-label="Decrease quantity"
                   className="rounded-r-none"
+                  disabled={quantity <= 1}
+                  onClick={decreaseQuantity}
+                  size="icon"
+                  variant="outline"
                 >
                   <MinusIcon className="h-4 w-4" />
                 </Button>
                 <Input
-                  type="number"
-                  value={quantity}
-                  onChange={handleQuantityChange}
                   className="w-28 rounded-none border-x-0 pl-6 text-center"
                   min="1"
+                  onChange={handleQuantityChange}
+                  type="number"
+                  value={quantity}
                 />
                 <Button
-                  variant="outline"
-                  size="icon"
-                  onClick={increaseQuantity}
                   aria-label="Increase quantity"
                   className="rounded-l-none"
+                  onClick={increaseQuantity}
+                  size="icon"
+                  variant="outline"
                 >
                   <PlusIcon className="h-4 w-4" />
                 </Button>
@@ -152,13 +152,13 @@ export function NftMint(props: Props) {
           {!props.hideMintToCustomAddress && (
             <div className="mb-4 flex items-center space-x-2">
               <Switch
-                id="custom-address"
                 checked={useCustomAddress}
+                id={customAddressId}
                 onCheckedChange={setUseCustomAddress}
               />
               <Label
-                htmlFor="custom-address"
                 className={`${useCustomAddress ? "" : "text-gray-400"} cursor-pointer`}
+                htmlFor="custom-address"
               >
                 Mint to a custom address
               </Label>
@@ -167,12 +167,11 @@ export function NftMint(props: Props) {
           {useCustomAddress && (
             <div className="mb-4">
               <Input
-                id="address-input"
-                type="text"
+                className="w-full"
+                onChange={(e) => setCustomAddress(e.target.value)}
                 placeholder="Enter recipient address"
+                type="text"
                 value={customAddress}
-                onChange={(e) => setCustomAddress(e.target.value)}
-                className="w-full"
               />
             </div>
           )}
@@ -180,40 +179,40 @@ export function NftMint(props: Props) {
         <CardFooter>
           {account ? (
             <ClaimButton
-              style={{ width: "100%" }}
-              contractAddress={props.contract.address}
               chain={props.contract.chain}
-              client={props.contract.client}
               claimParams={
                 props.type === "erc1155"
                   ? {
-                      type: "ERC1155",
-                      tokenId: props.tokenId,
+                      from: account.address,
                       quantity: BigInt(quantity),
                       to: customAddress || account.address,
-                      from: account.address,
+                      tokenId: props.tokenId,
+                      type: "ERC1155",
                     }
                   : {
-                      type: "ERC721",
+                      from: account.address,
                       quantity: BigInt(quantity),
                       to: customAddress || account.address,
-                      from: account.address,
+                      type: "ERC721",
                     }
               }
+              client={props.contract.client}
+              contractAddress={props.contract.address}
               disabled={
                 isMinting || props.noActiveClaimCondition || fullyMinted
               }
-              onTransactionSent={() => {
-                setIsMinting(true);
+              onError={(err) => {
+                mintNotifications.onError(err);
+                setIsMinting(false);
               }}
               onTransactionConfirmed={() => {
                 mintNotifications.onSuccess();
                 setIsMinting(false);
               }}
-              onError={(err) => {
-                mintNotifications.onError(err);
-                setIsMinting(false);
+              onTransactionSent={() => {
+                setIsMinting(true);
               }}
+              style={{ width: "100%" }}
             >
               {fullyMinted
                 ? "Minted"
@@ -223,11 +222,11 @@ export function NftMint(props: Props) {
             </ClaimButton>
           ) : (
             <CustomConnectWallet
+              chain={props.contract.chain}
               client={props.contract.client}
-              loginRequired={false}
-              isLoggedIn={true}
               connectButtonClassName="!w-full !rounded !bg-primary !text-primary-foreground !px-4 !py-2 !text-sm"
-              chain={props.contract.chain}
+              isLoggedIn={true}
+              loginRequired={false}
             />
           )}
         </CardFooter>
diff --git a/apps/dashboard/src/app/(app)/drops/[slug]/opengraph-image.tsx b/apps/dashboard/src/app/(app)/drops/[slug]/opengraph-image.tsx
index e1620d065af..0e39744bb4b 100644
--- a/apps/dashboard/src/app/(app)/drops/[slug]/opengraph-image.tsx
+++ b/apps/dashboard/src/app/(app)/drops/[slug]/opengraph-image.tsx
@@ -1,7 +1,8 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { ImageResponse } from "next/og";
+import { useId } from "react";
 import { download } from "thirdweb/storage";
 import { fetchChain } from "utils/fetchChain";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { DROP_PAGES } from "./data";
 
 // Route segment config
@@ -10,53 +11,58 @@ export const runtime = "edge";
 // Image metadata
 export const alt = "thirdweb chain og image";
 export const size = {
-  width: 1200,
   height: 630,
+  width: 1200,
 };
 
 export const contentType = "image/png";
 
-const TWLogo: React.FC = () => (
-  // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
-  <svg
-    width="255"
-    height="37"
-    viewBox="0 0 255 37"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <g clip-path="url(#clip0_4_1228)">
+const TWLogo: React.FC = () => {
+  const cipId = useId();
+  const linearGradientId = useId();
+
+  return (
+    // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
+    <svg
+      fill="none"
+      height="37"
+      viewBox="0 0 255 37"
+      width="255"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g clip-path={`url(#${cipId})`}>
+        <path
+          clip-rule="evenodd"
+          d="M0.162424 3.11312C-0.434663 1.61668 0.67809 0 2.30651 0H12.4163C13.3662 0 14.2075 0.561163 14.5604 1.42963L22.6075 21.3643C22.8246 21.8987 22.8246 22.5 22.6075 23.0478L17.5458 35.567C16.7723 37.4777 14.0311 37.4777 13.2576 35.567L0.162424 3.11312ZM19.6905 3.04631C19.1477 1.56324 20.2604 0 21.8617 0H30.6687C31.6458 0 32.5143 0.601246 32.84 1.49643L40.1543 21.4311C40.3307 21.9254 40.3307 22.4732 40.1543 22.981L35.7575 34.9658C35.0248 36.9699 32.1479 36.9699 31.4151 34.9658L19.6905 3.04631ZM39.4623 0C37.8339 0 36.7211 1.61668 37.3182 3.11312L50.4134 35.567C51.1869 37.4777 53.9281 37.4777 54.7015 35.567L59.7632 23.0478C59.9803 22.5 59.9803 21.8987 59.7632 21.3643L51.7161 1.42963C51.3633 0.561163 50.5219 0 49.572 0H39.4623Z"
+          fill={`url(#${linearGradientId})`}
+          fill-rule="evenodd"
+        />
+      </g>
       <path
-        fill-rule="evenodd"
         clip-rule="evenodd"
-        d="M0.162424 3.11312C-0.434663 1.61668 0.67809 0 2.30651 0H12.4163C13.3662 0 14.2075 0.561163 14.5604 1.42963L22.6075 21.3643C22.8246 21.8987 22.8246 22.5 22.6075 23.0478L17.5458 35.567C16.7723 37.4777 14.0311 37.4777 13.2576 35.567L0.162424 3.11312ZM19.6905 3.04631C19.1477 1.56324 20.2604 0 21.8617 0H30.6687C31.6458 0 32.5143 0.601246 32.84 1.49643L40.1543 21.4311C40.3307 21.9254 40.3307 22.4732 40.1543 22.981L35.7575 34.9658C35.0248 36.9699 32.1479 36.9699 31.4151 34.9658L19.6905 3.04631ZM39.4623 0C37.8339 0 36.7211 1.61668 37.3182 3.11312L50.4134 35.567C51.1869 37.4777 53.9281 37.4777 54.7015 35.567L59.7632 23.0478C59.9803 22.5 59.9803 21.8987 59.7632 21.3643L51.7161 1.42963C51.3633 0.561163 50.5219 0 49.572 0H39.4623Z"
-        fill="url(#paint0_linear_4_1228)"
+        d="M119.093 0.839844C116.933 0.839844 115.163 2.59497 115.163 4.83275C115.163 7.02665 116.933 8.78177 119.093 8.78177C121.252 8.78177 123.023 7.02665 123.023 4.83275C123.023 2.59497 121.252 0.839844 119.093 0.839844ZM122.548 10.8001H115.681V34.4504H122.548V10.8001ZM75.6036 1.71743H82.2975V10.8002H87.4367V17.1186H82.2975V25.4555C82.2975 26.684 83.2476 27.6494 84.4136 27.6494H87.3935V34.3627H84.4136C79.5767 34.3627 75.6036 30.3698 75.6036 25.4116V17.0747H72.4941V10.7563H75.6036V1.71743ZM103.805 10.2736C100.695 10.2736 98.2338 11.59 97.2837 13.6523V1.71743H90.4171V34.4066H97.2837V21.1554C97.2837 18.3911 99.0543 16.4605 101.559 16.4605C104.107 16.4605 105.532 18.1278 105.532 20.936V34.4505H112.399V20.0585C112.399 13.9155 109.29 10.2736 103.805 10.2736ZM132.35 10.7563V14.0033C133.387 11.6339 135.891 10.2736 139.044 10.2298C139.519 10.2298 140.124 10.2736 140.858 10.3614V16.9431C140.167 16.8115 139.39 16.7237 138.569 16.7237C134.639 16.7237 132.35 18.9615 132.35 22.8666V34.4066H125.484V10.7563H132.35ZM160.162 13.8717C159.471 11.8094 156.751 10.3614 153.253 10.3614C149.97 10.3614 147.207 11.5461 145.004 13.9155C142.845 16.2411 141.722 19.1809 141.722 22.6034C141.722 26.0259 142.845 28.9218 145.004 31.3351C147.207 33.6607 149.97 34.8454 153.253 34.8454C156.751 34.8454 159.471 33.3974 160.162 31.3351V34.4505H167.029V1.71743H160.162V13.8717ZM158.78 26.8157C157.614 27.9565 156.189 28.483 154.505 28.483C152.864 28.483 151.439 27.9126 150.316 26.8157C149.15 25.631 148.588 24.2269 148.588 22.6034C148.588 20.9799 149.15 19.5758 150.316 18.435C151.482 17.2503 152.864 16.6798 154.505 16.6798C156.232 16.6798 157.658 17.2503 158.78 18.435C159.99 19.5758 160.594 20.9799 160.594 22.6034C160.594 24.2269 159.99 25.631 158.78 26.8157ZM186.852 10.8879L193.07 22.1207L197.259 10.8001H203.997L194.409 35.8106L186.852 22.2084L179.294 35.8106L169.75 10.8001H176.487L180.633 22.1207L186.852 10.8879ZM215.311 10.2298C211.769 10.2298 208.79 11.3706 206.457 13.6523C204.169 15.89 203.003 18.8737 203.003 22.5595V22.7789C203.003 26.4646 204.169 29.4483 206.457 31.6861C208.833 33.88 211.856 35.0209 215.656 35.0209C219.197 35.0209 222.091 34.3188 224.293 32.8708V26.7718C222.134 28.3075 219.37 29.0534 216.045 29.0534C212.417 29.0534 210.042 27.2544 209.912 24.4463H226.971C227.057 23.7442 227.101 22.9544 227.101 22.1646C227.101 18.786 225.978 15.9778 223.818 13.6961C221.659 11.3706 218.766 10.2298 215.311 10.2298ZM209.912 19.9268C209.956 18.8299 210.517 17.9084 211.553 17.1625C212.633 16.4166 213.842 16.0217 215.311 16.0217C218.031 16.0217 220.148 17.8207 220.148 19.9268H209.912ZM243.469 10.3614C246.752 10.3614 249.516 11.5461 251.675 13.9155C253.877 16.2849 255 19.137 255 22.5595C255 25.982 253.877 28.8779 251.675 31.2912C249.516 33.6168 246.752 34.8015 243.469 34.8015C239.971 34.8015 237.251 33.3535 236.56 31.2912V34.4066H229.693V1.71743H236.56V13.8716C237.251 11.8094 239.971 10.3614 243.469 10.3614ZM242.217 28.483C243.858 28.483 245.24 27.9565 246.406 26.8157C247.572 25.631 248.134 24.2269 248.134 22.6034C248.134 20.9799 247.572 19.5758 246.406 18.435C245.283 17.2503 243.858 16.6798 242.217 16.6798C240.533 16.6798 239.108 17.2503 237.898 18.435C236.732 19.5758 236.128 20.9799 236.128 22.6034C236.128 24.2269 236.732 25.631 237.898 26.8157C239.064 27.9126 240.49 28.483 242.217 28.483Z"
+        fill="#F1F1F1"
+        fill-rule="evenodd"
       />
-    </g>
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M119.093 0.839844C116.933 0.839844 115.163 2.59497 115.163 4.83275C115.163 7.02665 116.933 8.78177 119.093 8.78177C121.252 8.78177 123.023 7.02665 123.023 4.83275C123.023 2.59497 121.252 0.839844 119.093 0.839844ZM122.548 10.8001H115.681V34.4504H122.548V10.8001ZM75.6036 1.71743H82.2975V10.8002H87.4367V17.1186H82.2975V25.4555C82.2975 26.684 83.2476 27.6494 84.4136 27.6494H87.3935V34.3627H84.4136C79.5767 34.3627 75.6036 30.3698 75.6036 25.4116V17.0747H72.4941V10.7563H75.6036V1.71743ZM103.805 10.2736C100.695 10.2736 98.2338 11.59 97.2837 13.6523V1.71743H90.4171V34.4066H97.2837V21.1554C97.2837 18.3911 99.0543 16.4605 101.559 16.4605C104.107 16.4605 105.532 18.1278 105.532 20.936V34.4505H112.399V20.0585C112.399 13.9155 109.29 10.2736 103.805 10.2736ZM132.35 10.7563V14.0033C133.387 11.6339 135.891 10.2736 139.044 10.2298C139.519 10.2298 140.124 10.2736 140.858 10.3614V16.9431C140.167 16.8115 139.39 16.7237 138.569 16.7237C134.639 16.7237 132.35 18.9615 132.35 22.8666V34.4066H125.484V10.7563H132.35ZM160.162 13.8717C159.471 11.8094 156.751 10.3614 153.253 10.3614C149.97 10.3614 147.207 11.5461 145.004 13.9155C142.845 16.2411 141.722 19.1809 141.722 22.6034C141.722 26.0259 142.845 28.9218 145.004 31.3351C147.207 33.6607 149.97 34.8454 153.253 34.8454C156.751 34.8454 159.471 33.3974 160.162 31.3351V34.4505H167.029V1.71743H160.162V13.8717ZM158.78 26.8157C157.614 27.9565 156.189 28.483 154.505 28.483C152.864 28.483 151.439 27.9126 150.316 26.8157C149.15 25.631 148.588 24.2269 148.588 22.6034C148.588 20.9799 149.15 19.5758 150.316 18.435C151.482 17.2503 152.864 16.6798 154.505 16.6798C156.232 16.6798 157.658 17.2503 158.78 18.435C159.99 19.5758 160.594 20.9799 160.594 22.6034C160.594 24.2269 159.99 25.631 158.78 26.8157ZM186.852 10.8879L193.07 22.1207L197.259 10.8001H203.997L194.409 35.8106L186.852 22.2084L179.294 35.8106L169.75 10.8001H176.487L180.633 22.1207L186.852 10.8879ZM215.311 10.2298C211.769 10.2298 208.79 11.3706 206.457 13.6523C204.169 15.89 203.003 18.8737 203.003 22.5595V22.7789C203.003 26.4646 204.169 29.4483 206.457 31.6861C208.833 33.88 211.856 35.0209 215.656 35.0209C219.197 35.0209 222.091 34.3188 224.293 32.8708V26.7718C222.134 28.3075 219.37 29.0534 216.045 29.0534C212.417 29.0534 210.042 27.2544 209.912 24.4463H226.971C227.057 23.7442 227.101 22.9544 227.101 22.1646C227.101 18.786 225.978 15.9778 223.818 13.6961C221.659 11.3706 218.766 10.2298 215.311 10.2298ZM209.912 19.9268C209.956 18.8299 210.517 17.9084 211.553 17.1625C212.633 16.4166 213.842 16.0217 215.311 16.0217C218.031 16.0217 220.148 17.8207 220.148 19.9268H209.912ZM243.469 10.3614C246.752 10.3614 249.516 11.5461 251.675 13.9155C253.877 16.2849 255 19.137 255 22.5595C255 25.982 253.877 28.8779 251.675 31.2912C249.516 33.6168 246.752 34.8015 243.469 34.8015C239.971 34.8015 237.251 33.3535 236.56 31.2912V34.4066H229.693V1.71743H236.56V13.8716C237.251 11.8094 239.971 10.3614 243.469 10.3614ZM242.217 28.483C243.858 28.483 245.24 27.9565 246.406 26.8157C247.572 25.631 248.134 24.2269 248.134 22.6034C248.134 20.9799 247.572 19.5758 246.406 18.435C245.283 17.2503 243.858 16.6798 242.217 16.6798C240.533 16.6798 239.108 17.2503 237.898 18.435C236.732 19.5758 236.128 20.9799 236.128 22.6034C236.128 24.2269 236.732 25.631 237.898 26.8157C239.064 27.9126 240.49 28.483 242.217 28.483Z"
-      fill="#F1F1F1"
-    />
-    <defs>
-      <linearGradient
-        id="paint0_linear_4_1228"
-        x1="30.0033"
-        y1="-8.73611"
-        x2="71.0412"
-        y2="46.872"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#F213A4" />
-        <stop offset="1" stop-color="#5204BF" />
-      </linearGradient>
-      <clipPath id="clip0_4_1228">
-        <rect width="59.9096" height="37" fill="white" />
-      </clipPath>
-    </defs>
-  </svg>
-);
+      <defs>
+        <linearGradient
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
+          x1="30.0033"
+          x2="71.0412"
+          y1="-8.73611"
+          y2="46.872"
+        >
+          <stop stop-color="#F213A4" />
+          <stop offset="1" stop-color="#5204BF" />
+        </linearGradient>
+        <clipPath id={cipId}>
+          <rect fill="white" height="37" width="59.9096" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+};
 
 // Image generation
 export default async function Image({ params }: { params: { slug: string } }) {
@@ -81,8 +87,8 @@ export default async function Image({ params }: { params: { slug: string } }) {
     // download the chain icon if there is one
     chain.icon?.url && hasWorkingChainIcon
       ? download({
-          uri: chain.icon.url,
           client: serverThirdwebClient,
+          uri: chain.icon.url,
         }).then((res) => res.arrayBuffer())
       : undefined,
     // download the background image (based on chain)
@@ -99,19 +105,19 @@ export default async function Image({ params }: { params: { slug: string } }) {
 
   return new ImageResponse(
     <div
-      tw="w-full h-full flex justify-center py-20 px-16"
       style={{
         background: "#0D0D12",
         fontFamily: "Inter",
       }}
+      tw="w-full h-full flex justify-center py-20 px-16"
     >
       <img
+        alt=""
+        height="630px"
         // @ts-expect-error - TS doesn't know about the ImageResponse component
         src={imageData}
-        width="1200px"
-        height="630px"
         tw="absolute"
-        alt=""
+        width="1200px"
       />
       {/* the actual component starts here */}
 
@@ -120,14 +126,14 @@ export default async function Image({ params }: { params: { slug: string } }) {
           alt=""
           // @ts-expect-error - TS doesn't know about the ImageResponse component
           src={chainIcon}
-          tw="absolute rounded-full"
           style={{
-            top: 240,
-            right: -2,
             height: 150,
-            width: 150,
             objectFit: "contain",
+            right: -2,
+            top: 240,
+            width: 150,
           }}
+          tw="absolute rounded-full"
         />
       )}
 
@@ -150,8 +156,8 @@ export default async function Image({ params }: { params: { slug: string } }) {
       ...size,
       fonts: [
         {
-          name: "Inter",
           data: interBold,
+          name: "Inter",
           style: "normal",
           weight: 700,
         },
diff --git a/apps/dashboard/src/app/(app)/drops/[slug]/page.tsx b/apps/dashboard/src/app/(app)/drops/[slug]/page.tsx
index 214301315e2..74daabe387b 100644
--- a/apps/dashboard/src/app/(app)/drops/[slug]/page.tsx
+++ b/apps/dashboard/src/app/(app)/drops/[slug]/page.tsx
@@ -1,4 +1,3 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { defineDashboardChain } from "lib/defineDashboardChain";
 import type { Metadata } from "next";
 import { notFound } from "next/navigation";
@@ -13,12 +12,15 @@ import {
   getActiveClaimCondition as getActiveClaimCondition1155,
   getNFT as getNFT1155,
 } from "thirdweb/extensions/erc1155";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { DROP_PAGES } from "./data";
 import { NftMint } from "./mint-ui";
 
 export async function generateMetadata({
   params,
-}: { params: Promise<{ slug: string }> }): Promise<Metadata> {
+}: {
+  params: Promise<{ slug: string }>;
+}): Promise<Metadata> {
   const { slug } = await params;
   const project = DROP_PAGES.find((p) => p.slug === slug);
   if (!project) {
@@ -29,7 +31,9 @@ export async function generateMetadata({
 
 export default async function DropPage({
   params,
-}: { params: Promise<{ slug: string }> }) {
+}: {
+  params: Promise<{ slug: string }>;
+}) {
   const { slug } = await params;
 
   const project = DROP_PAGES.find((p) => p.slug === slug);
@@ -74,9 +78,9 @@ export default async function DropPage({
     return (
       <NftMint
         contract={contract}
+        description={description}
         displayName={displayName}
         thumbnail={thumbnail}
-        description={description}
         {...project}
         noActiveClaimCondition
       />
@@ -104,13 +108,13 @@ export default async function DropPage({
   return (
     <NftMint
       contract={contract}
-      displayName={displayName || ""}
-      thumbnail={thumbnail}
-      description={description || ""}
       currencySymbol={currencyMetadata.symbol}
-      pricePerToken={pricePerToken}
+      description={description || ""}
+      displayName={displayName || ""}
       noActiveClaimCondition={false}
+      pricePerToken={pricePerToken}
       quantityLimitPerWallet={claimCondition.quantityLimitPerWallet}
+      thumbnail={thumbnail}
       {...project}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/add-members/page.tsx b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/add-members/page.tsx
index 2bc7960ce25..735dbd3de06 100644
--- a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/add-members/page.tsx
+++ b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/add-members/page.tsx
@@ -1,6 +1,6 @@
+import { notFound } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound } from "next/navigation";
 import { getAuthToken } from "../../../../api/lib/getAuthToken";
 import { TeamOnboardingLayout } from "../../../../login/onboarding/onboarding-layout";
 import { InviteTeamMembers } from "../../../../login/onboarding/team-onboarding/team-onboarding";
@@ -25,7 +25,7 @@ export default async function Page(props: {
 
   return (
     <TeamOnboardingLayout currentStep={3}>
-      <InviteTeamMembers team={team} client={client} />
+      <InviteTeamMembers client={client} team={team} />
     </TeamOnboardingLayout>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/layout.tsx b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/layout.tsx
index 0dcd2af9874..6615954f278 100644
--- a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/layout.tsx
@@ -1,11 +1,11 @@
+import { differenceInDays } from "date-fns";
+import { InfoIcon } from "lucide-react";
+import { notFound } from "next/navigation";
 import { getProjects } from "@/api/projects";
 import { getTeamBySlug, getTeams } from "@/api/team";
 import { AppFooter } from "@/components/blocks/app-footer";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { differenceInDays } from "date-fns";
-import { InfoIcon } from "lucide-react";
-import { notFound } from "next/navigation";
 import { getValidAccount } from "../../../account/settings/getAccount";
 import {
   getAuthToken,
@@ -45,8 +45,8 @@ export default async function Layout(props: {
 
   const teamsAndProjects = await Promise.all(
     teams.map(async (team) => ({
-      team,
       projects: await getProjects(team.slug),
+      team,
     })),
   );
 
@@ -59,9 +59,9 @@ export default async function Layout(props: {
     <div className="flex min-h-dvh grow flex-col">
       <div className="border-b bg-card">
         <TeamHeaderLoggedIn
-          client={client}
           account={account}
           accountAddress={accountAddress}
+          client={client}
           currentProject={undefined}
           currentTeam={team}
           teamsAndProjects={teamsAndProjects}
diff --git a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/page.tsx b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/page.tsx
index 8522cbfcd33..a51507c3d41 100644
--- a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/page.tsx
+++ b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/page.tsx
@@ -1,6 +1,6 @@
+import { notFound } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound } from "next/navigation";
 import { getAuthToken } from "../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../login/loginRedirect";
 import { TeamOnboardingLayout } from "../../../login/onboarding/onboarding-layout";
diff --git a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/select-plan/_components/plan-selector.tsx b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/select-plan/_components/plan-selector.tsx
index d179a873c6b..92e95d773cc 100644
--- a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/select-plan/_components/plan-selector.tsx
+++ b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/select-plan/_components/plan-selector.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import Link from "next/link";
+import { pollWithTimeout } from "utils/pollWithTimeout";
 import {
   reportOnboardingPlanSelected,
   reportOnboardingPlanSelectionSkipped,
@@ -9,8 +11,6 @@ import { PricingCard } from "@/components/blocks/pricing-card";
 import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import Link from "next/link";
-import { pollWithTimeout } from "utils/pollWithTimeout";
 import { useStripeRedirectEvent } from "../../../../../(stripe)/stripe-redirect/stripeRedirectChannel";
 
 export function PlanSelector(props: {
@@ -40,18 +40,18 @@ export function PlanSelector(props: {
     <PricingCard
       billingPlan="starter"
       billingStatus={props.team.billingStatus}
-      teamSlug={props.team.slug}
       cta={{
         label: "Get Started",
-        type: "checkout",
         onClick() {
           reportOnboardingPlanSelected({
             plan: "starter",
           });
         },
+        type: "checkout",
       }}
       getTeam={props.getTeam}
       teamId={props.team.id}
+      teamSlug={props.team.slug}
     />
   );
 
@@ -59,19 +59,19 @@ export function PlanSelector(props: {
     <PricingCard
       billingPlan="growth"
       billingStatus={props.team.billingStatus}
-      teamSlug={props.team.slug}
       cta={{
         label: "Get Started",
-        type: "checkout",
         onClick() {
           reportOnboardingPlanSelected({
             plan: "growth",
           });
         },
+        type: "checkout",
       }}
-      highlighted
       getTeam={props.getTeam}
+      highlighted
       teamId={props.team.id}
+      teamSlug={props.team.slug}
     />
   );
 
@@ -79,18 +79,18 @@ export function PlanSelector(props: {
     <PricingCard
       billingPlan="scale"
       billingStatus={props.team.billingStatus}
-      teamSlug={props.team.slug}
       cta={{
         label: "Get started",
-        type: "checkout",
         onClick() {
           reportOnboardingPlanSelected({
             plan: "scale",
           });
         },
+        type: "checkout",
       }}
       getTeam={props.getTeam}
       teamId={props.team.id}
+      teamSlug={props.team.slug}
     />
   );
 
@@ -98,18 +98,18 @@ export function PlanSelector(props: {
     <PricingCard
       billingPlan="pro"
       billingStatus={props.team.billingStatus}
-      teamSlug={props.team.slug}
       cta={{
         label: "Get started",
-        type: "checkout",
         onClick() {
           reportOnboardingPlanSelected({
             plan: "pro",
           });
         },
+        type: "checkout",
       }}
       getTeam={props.getTeam}
       teamId={props.team.id}
+      teamSlug={props.team.slug}
     />
   );
 
@@ -127,16 +127,16 @@ export function PlanSelector(props: {
           </div>
         </div>
         <Button
-          variant="link"
-          className="self-center text-muted-foreground"
           asChild
+          className="self-center text-muted-foreground"
+          variant="link"
         >
           <Link
-            replace
             href={`/get-started/team/${props.team.slug}/add-members`}
             onClick={() => {
               reportOnboardingPlanSelectionSkipped();
             }}
+            replace
           >
             Skip picking a plan for now and upgrade later
           </Link>
diff --git a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/select-plan/page.tsx b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/select-plan/page.tsx
index fbd5edb5869..35d3b82b2a0 100644
--- a/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/select-plan/page.tsx
+++ b/apps/dashboard/src/app/(app)/get-started/team/[team_slug]/select-plan/page.tsx
@@ -1,5 +1,5 @@
-import { type Team, getTeamBySlug } from "@/api/team";
 import { notFound } from "next/navigation";
+import { getTeamBySlug, type Team } from "@/api/team";
 import { getAuthToken } from "../../../../api/lib/getAuthToken";
 import { TeamOnboardingLayout } from "../../../../login/onboarding/onboarding-layout";
 import { PlanSelector } from "./_components/plan-selector";
@@ -28,7 +28,7 @@ export default async function Page(props: {
 
   return (
     <TeamOnboardingLayout currentStep={2}>
-      <PlanSelector team={team} getTeam={getTeam} />
+      <PlanSelector getTeam={getTeam} team={team} />
     </TeamOnboardingLayout>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/JoinTeamPage.stories.tsx b/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/JoinTeamPage.stories.tsx
index 952be4f429a..fc27e1afda2 100644
--- a/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/JoinTeamPage.stories.tsx
+++ b/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/JoinTeamPage.stories.tsx
@@ -2,13 +2,13 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { JoinTeamPageUI } from "./JoinTeamPage";
 
 const meta = {
-  title: "Team/Join Team",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Team/Join Team",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -22,10 +22,10 @@ function Story() {
   return (
     <div>
       <JoinTeamPageUI
-        teamName="XYZ Inc"
         invite={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
+        teamName="XYZ Inc"
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/JoinTeamPage.tsx b/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/JoinTeamPage.tsx
index 3dcaf500dd4..86e3c994064 100644
--- a/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/JoinTeamPage.tsx
+++ b/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/JoinTeamPage.tsx
@@ -1,26 +1,22 @@
 "use client";
 
+import { useMutation } from "@tanstack/react-query";
+import { CheckIcon, UsersIcon } from "lucide-react";
+import Link from "next/link";
+import { toast } from "sonner";
 import { acceptInvite } from "@/actions/acceptInvite";
 import type { Team } from "@/api/team";
 import { ToggleThemeButton } from "@/components/color-mode-toggle";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { DotsBackgroundPattern } from "@/components/ui/background-patterns";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useMutation } from "@tanstack/react-query";
-import { CheckIcon, UsersIcon } from "lucide-react";
-import Link from "next/link";
-import { toast } from "sonner";
 import { ThirdwebMiniLogo } from "../../../../components/ThirdwebMiniLogo";
 
-export function JoinTeamPage(props: {
-  team: Team;
-  inviteId: string;
-}) {
+export function JoinTeamPage(props: { team: Team; inviteId: string }) {
   const router = useDashboardRouter();
   return (
     <JoinTeamPageUI
-      teamName={props.team.name}
       invite={async () => {
         const res = await acceptInvite({
           inviteId: props.inviteId,
@@ -34,6 +30,7 @@ export function JoinTeamPage(props: {
 
         router.replace(`/team/${props.team.slug}`);
       }}
+      teamName={props.team.name}
     />
   );
 }
@@ -48,7 +45,7 @@ export function JoinTeamPageUI(props: {
 
       <div className="container flex grow flex-col items-center justify-center ">
         <div className="z-10">
-          <AcceptInviteCardUI teamName={props.teamName} invite={props.invite} />
+          <AcceptInviteCardUI invite={props.invite} teamName={props.teamName} />
         </div>
       </div>
 
@@ -71,10 +68,10 @@ function Header() {
         <div className="flex items-center gap-4">
           <div className="flex items-center gap-2">
             <Link
+              className="px-2 text-muted-foreground text-sm hover:text-foreground"
               href="/support"
-              target="_blank"
               rel="noopener noreferrer"
-              className="px-2 text-muted-foreground text-sm hover:text-foreground"
+              target="_blank"
             >
               Support
             </Link>
@@ -115,18 +112,18 @@ function AcceptInviteCardUI(props: {
       </div>
       <div className="flex justify-end border-t p-4 lg:p-6">
         <Button
-          disabled={invite.isPending}
           className="gap-2"
+          disabled={invite.isPending}
           onClick={() => {
             const promise = invite.mutateAsync();
             toast.promise(promise, {
-              success: "Invite accepted",
               error: (e) => {
                 if (e instanceof Error && e.message) {
                   return e.message;
                 }
                 return "Failed to accept invite";
               },
+              success: "Invite accepted",
             });
           }}
         >
diff --git a/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/page.tsx b/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/page.tsx
index 012a5d0fb99..add88569ec9 100644
--- a/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/page.tsx
+++ b/apps/dashboard/src/app/(app)/join/team/[team_slug]/[invite_id]/page.tsx
@@ -1,5 +1,5 @@
-import { getTeamBySlug, service_getTeamBySlug } from "@/api/team";
 import { notFound, redirect } from "next/navigation";
+import { getTeamBySlug, service_getTeamBySlug } from "@/api/team";
 import { getValidAccount } from "../../../../account/settings/getAccount";
 import { JoinTeamPage } from "./JoinTeamPage";
 
@@ -25,5 +25,5 @@ export default async function Page(props: {
     notFound();
   }
 
-  return <JoinTeamPage team={inviteTeam} inviteId={invite_id} />;
+  return <JoinTeamPage inviteId={invite_id} team={inviteTeam} />;
 }
diff --git a/apps/dashboard/src/app/(app)/layout.tsx b/apps/dashboard/src/app/(app)/layout.tsx
index 5382bf4fc9d..409f064f229 100644
--- a/apps/dashboard/src/app/(app)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/layout.tsx
@@ -1,47 +1,47 @@
 import "../../global.css";
-import { DashboardRouterTopProgressBar } from "@/lib/DashboardRouter";
-import { cn } from "@/lib/utils";
 import type { Metadata } from "next";
-import PlausibleProvider from "next-plausible";
 import { Inter } from "next/font/google";
+import PlausibleProvider from "next-plausible";
 import NextTopLoader from "nextjs-toploader";
+import { DashboardRouterTopProgressBar } from "@/lib/DashboardRouter";
+import { cn } from "@/lib/utils";
 import { AppRouterProviders } from "./providers";
 
 const fontSans = Inter({
+  display: "swap",
   subsets: ["latin"],
   variable: "--font-sans",
-  display: "swap",
 });
 
 export const metadata: Metadata = {
-  metadataBase: new URL("https://thirdweb.com"),
   alternates: {
     canonical: "./",
   },
-  title: "thirdweb: The complete web3 development platform",
   description:
     "Build web3 apps easily with thirdweb's powerful SDKs, audited smart contracts, and developer tools—for Ethereum & 700+ EVM chains. Try now.",
+  metadataBase: new URL("https://thirdweb.com"),
   openGraph: {
-    title: "thirdweb: The complete web3 development platform",
     description:
       "Build web3 apps easily with thirdweb's powerful SDKs, audited smart contracts, and developer tools—for Ethereum & 700+ EVM chains. Try now.",
-    type: "website",
-    locale: "en_US",
-    url: "https://thirdweb.com",
-    siteName: "thirdweb",
     images: [
       {
+        alt: "thirdweb",
+        height: 630,
         url: "https://thirdweb.com/assets/og-image/thirdweb.png",
         width: 1200,
-        height: 630,
-        alt: "thirdweb",
       },
     ],
+    locale: "en_US",
+    siteName: "thirdweb",
+    title: "thirdweb: The complete web3 development platform",
+    type: "website",
+    url: "https://thirdweb.com",
   },
+  title: "thirdweb: The complete web3 development platform",
   twitter: {
+    card: "summary_large_image",
     creator: "@thirdweb",
     site: "@thirdweb",
-    card: "summary_large_image",
   },
 };
 
@@ -54,8 +54,8 @@ export default function RootLayout({
     <html lang="en" suppressHydrationWarning>
       <head>
         <PlausibleProvider
-          domain="thirdweb.com"
           customDomain="https://pl.thirdweb.com"
+          domain="thirdweb.com"
           selfHosted
         />
       </head>
diff --git a/apps/dashboard/src/app/(app)/login/LoginPage.tsx b/apps/dashboard/src/app/(app)/login/LoginPage.tsx
index ce34df05c53..09f82e9fa7a 100644
--- a/apps/dashboard/src/app/(app)/login/LoginPage.tsx
+++ b/apps/dashboard/src/app/(app)/login/LoginPage.tsx
@@ -1,22 +1,12 @@
 "use client";
 
-import { getRawAccountAction } from "@/actions/getAccount";
-import { resetAnalytics } from "@/analytics/reset";
-import { ClientOnly } from "@/components/blocks/client-only";
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
-import { ToggleThemeButton } from "@/components/color-mode-toggle";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { NEXT_PUBLIC_TURNSTILE_SITE_KEY } from "@/constants/public-envs";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { Turnstile } from "@marsidev/react-turnstile";
 import { isVercel } from "lib/vercel-utils";
 import { PhoneIcon } from "lucide-react";
-import { useTheme } from "next-themes";
 import Link from "next/link";
-import { Suspense, lazy, useEffect, useState } from "react";
+import { useTheme } from "next-themes";
+import { lazy, Suspense, useEffect, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import {
   ConnectEmbed,
@@ -24,13 +14,23 @@ import {
   useActiveWalletConnectionStatus,
 } from "thirdweb/react";
 import { createWallet, inAppWallet } from "thirdweb/wallets";
+import { getRawAccountAction } from "@/actions/getAccount";
+import { resetAnalytics } from "@/analytics/reset";
+import { ClientOnly } from "@/components/blocks/client-only";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
+import { ToggleThemeButton } from "@/components/color-mode-toggle";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
+import { NEXT_PUBLIC_TURNSTILE_SITE_KEY } from "@/constants/public-envs";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import {
   LAST_USED_PROJECT_ID,
   LAST_USED_TEAM_ID,
 } from "../../../constants/cookies";
 import { deleteCookie } from "../../../lib/cookie";
-import { ThirdwebMiniLogo } from "../components/ThirdwebMiniLogo";
 import { getSDKTheme } from "../components/sdk-component-theme";
+import { ThirdwebMiniLogo } from "../components/ThirdwebMiniLogo";
 import { LAST_VISITED_TEAM_PAGE_PATH } from "../team/components/last-visited-page/consts";
 import { doLogin, doLogout, getLoginPayload, isLoggedIn } from "./auth-actions";
 import { isAccountOnboardingComplete } from "./onboarding/isOnboardingRequired";
@@ -85,28 +85,28 @@ export function LoginAndOnboardingPage(props: {
           <div className="flex items-center gap-4">
             <div className="flex items-center gap-2">
               <Link
-                href="https://portal.thirdweb.com/"
                 className="px-2 text-muted-foreground text-sm hover:text-foreground"
-                target="_blank"
+                href="https://portal.thirdweb.com/"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 Docs
               </Link>
 
               <Link
-                href="/support"
-                target="_blank"
                 className="px-2 text-muted-foreground text-sm hover:text-foreground"
+                href="/support"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 Support
               </Link>
 
               <Link
-                target="_blank"
-                href="https://feedback.thirdweb.com"
                 className="px-2 text-muted-foreground text-sm hover:text-foreground"
+                href="https://feedback.thirdweb.com"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 Feedback
               </Link>
@@ -117,10 +117,10 @@ export function LoginAndOnboardingPage(props: {
       </div>
 
       <LoginAndOnboardingPageContent
-        client={props.client}
         account={props.account}
-        redirectPath={props.redirectPath}
+        client={props.client}
         loginWithInAppWallet={props.loginWithInAppWallet}
+        redirectPath={props.redirectPath}
       />
 
       <ResetLastUsedCookies />
@@ -128,9 +128,7 @@ export function LoginAndOnboardingPage(props: {
   );
 }
 
-function LoginPageContainer(props: {
-  children: React.ReactNode;
-}) {
+function LoginPageContainer(props: { children: React.ReactNode }) {
   return (
     <>
       <main className="container z-10 flex grow flex-col items-center justify-center gap-6 py-12">
@@ -140,8 +138,8 @@ function LoginPageContainer(props: {
       {/* eslint-disable-next-line @next/next/no-img-element */}
       <img
         alt=""
-        src="/assets/login/background.svg"
         className="-bottom-12 -right-12 pointer-events-none fixed lg:right-0 lg:bottom-0"
+        src="/assets/login/background.svg"
       />
     </>
   );
@@ -193,8 +191,8 @@ function LoginAndOnboardingPageContent(props: {
 
     if (!isAccountOnboardingComplete(account)) {
       setScreen({
-        id: "onboarding",
         account,
+        id: "onboarding",
       });
     } else {
       onComplete();
@@ -230,8 +228,8 @@ function LoginAndOnboardingPageContent(props: {
       <LoginPageContainer>
         <CustomConnectEmbed
           client={props.client}
-          onLogin={onLogin}
           loginWithInAppWallet={props.loginWithInAppWallet}
+          onLogin={onLogin}
         />
       </LoginPageContainer>
     );
@@ -241,11 +239,11 @@ function LoginAndOnboardingPageContent(props: {
     return (
       <Suspense fallback={<GenericLoadingPage className="border-none" />}>
         <LazyAccountOnboarding
+          accountAddress={accountAddress}
           onComplete={onComplete}
           onLogout={() => {
             setScreen({ id: "login" });
           }}
-          accountAddress={accountAddress}
         />
       </Suspense>
     );
@@ -254,9 +252,9 @@ function LoginAndOnboardingPageContent(props: {
   return (
     <LoginPageContainer>
       <CustomConnectEmbed
-        onLogin={onLogin}
-        loginWithInAppWallet={props.loginWithInAppWallet}
         client={props.client}
+        loginWithInAppWallet={props.loginWithInAppWallet}
+        onLogin={onLogin}
       />
     </LoginPageContainer>
   );
@@ -276,6 +274,7 @@ function CustomConnectEmbed(props: {
   return (
     <div className="flex flex-col items-center gap-4">
       <Turnstile
+        onSuccess={(token) => setTurnstileToken(token)}
         options={{
           // only show if interaction is required
           appearance: alwaysShowTurnstile ? "always" : "interaction-only",
@@ -283,12 +282,10 @@ function CustomConnectEmbed(props: {
           theme: theme === "light" ? "light" : "dark",
         }}
         siteKey={NEXT_PUBLIC_TURNSTILE_SITE_KEY}
-        onSuccess={(token) => setTurnstileToken(token)}
       />
       <ClientOnly ssr={<ConnectEmbedSizedLoadingCard />}>
         <ConnectEmbed
           auth={{
-            getLoginPayload,
             doLogin: async (params) => {
               if (isVercel() && !turnstileToken) {
                 setAlwaysShowTurnstile(true);
@@ -315,6 +312,7 @@ function CustomConnectEmbed(props: {
               await doLogout();
               resetAnalytics();
             },
+            getLoginPayload,
             isLoggedIn: async (x) => {
               const isLoggedInResult = await isLoggedIn(x);
               if (isLoggedInResult) {
@@ -323,18 +321,18 @@ function CustomConnectEmbed(props: {
               return isLoggedInResult;
             },
           }}
-          wallets={
-            props.loginWithInAppWallet ? inAppWalletLoginOptions : loginOptions
-          }
+          className="shadow-lg"
           client={props.client}
           modalSize="wide"
-          theme={getSDKTheme(theme === "light" ? "light" : "dark")}
-          className="shadow-lg"
           privacyPolicyUrl="/privacy-policy"
           termsOfServiceUrl="/terms"
+          theme={getSDKTheme(theme === "light" ? "light" : "dark")}
+          wallets={
+            props.loginWithInAppWallet ? inAppWalletLoginOptions : loginOptions
+          }
         />
         {/* alert people who used to log in with phone to instead log in with their account email */}
-        <Alert variant="info" className="mt-8">
+        <Alert className="mt-8" variant="info">
           <PhoneIcon className="size-4" />
           <AlertTitle>
             <span>Phone login is no longer supported</span>
@@ -358,9 +356,7 @@ function CustomConnectEmbed(props: {
   );
 }
 
-function ConnectEmbedSizedCard(props: {
-  children: React.ReactNode;
-}) {
+function ConnectEmbedSizedCard(props: { children: React.ReactNode }) {
   return (
     <div className="flex min-h-[522px] w-full items-center justify-center rounded-xl border border-border bg-card shadow-lg max-sm:max-w-[358px] lg:min-h-[568px] lg:w-[728px]">
       {props.children}
diff --git a/apps/dashboard/src/app/(app)/login/auth-actions.ts b/apps/dashboard/src/app/(app)/login/auth-actions.ts
index 18978b56404..6a0586af946 100644
--- a/apps/dashboard/src/app/(app)/login/auth-actions.ts
+++ b/apps/dashboard/src/app/(app)/login/auth-actions.ts
@@ -1,9 +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";
@@ -12,6 +9,9 @@ import type {
   LoginPayload,
   VerifyLoginPayloadParams,
 } from "thirdweb/auth";
+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 { verifyTurnstileToken } from "./verifyTurnstileToken";
 
 export async function getLoginPayload(
@@ -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;
 }
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/LinkWalletPrompt/LinkWalletPrompt.stories.tsx b/apps/dashboard/src/app/(app)/login/onboarding/LinkWalletPrompt/LinkWalletPrompt.stories.tsx
index d17c254ecb2..e7b5ef7927b 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/LinkWalletPrompt/LinkWalletPrompt.stories.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/LinkWalletPrompt/LinkWalletPrompt.stories.tsx
@@ -4,13 +4,13 @@ import { AccountOnboardingLayout } from "../onboarding-layout";
 import { LinkWalletPrompt } from "./LinkWalletPrompt";
 
 const meta = {
-  title: "Onboarding/AccountOnboarding/LinkWalletPrompt",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Onboarding/AccountOnboarding/LinkWalletPrompt",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -28,9 +28,7 @@ export const SendError: Story = {
   },
 };
 
-function Story(props: {
-  type: "success" | "error";
-}) {
+function Story(props: { type: "success" | "error" }) {
   return (
     <AccountOnboardingLayout
       currentStep={1}
@@ -40,10 +38,14 @@ function Story(props: {
       }}
     >
       <LinkWalletPrompt
+        accountAddress="0x1234567890123456789012345678901234567890"
+        email="user@example.com"
+        onBack={() => {
+          storybookLog("onBack");
+        }}
         onLinkWalletRequestSent={() => {
           storybookLog("onLinkWalletRequestSent");
         }}
-        email="user@example.com"
         requestLinkWallet={async (email) => {
           storybookLog("requestLinkWallet", email);
           await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -51,10 +53,6 @@ function Story(props: {
             throw new Error("Example error");
           }
         }}
-        onBack={() => {
-          storybookLog("onBack");
-        }}
-        accountAddress="0x1234567890123456789012345678901234567890"
       />
     </AccountOnboardingLayout>
   );
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/LinkWalletPrompt/LinkWalletPrompt.tsx b/apps/dashboard/src/app/(app)/login/onboarding/LinkWalletPrompt/LinkWalletPrompt.tsx
index 37df64b86d8..089806ec457 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/LinkWalletPrompt/LinkWalletPrompt.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/LinkWalletPrompt/LinkWalletPrompt.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Button } from "@/components/ui/button";
 import { useMutation } from "@tanstack/react-query";
 import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react";
 import { toast } from "sonner";
 import { shortenString } from "utils/usedapp-external";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
 export function LinkWalletPrompt(props: {
   email: string;
@@ -21,14 +21,14 @@ export function LinkWalletPrompt(props: {
 
   function handleLinkWalletRequest() {
     requestLinkWallet.mutate(props.email, {
-      onSuccess: () => {
-        props.onLinkWalletRequestSent();
-      },
       onError: (err) => {
         const error = err as Error;
         console.error(error);
         toast.error("Failed to send link wallet request");
       },
+      onSuccess: () => {
+        props.onLinkWalletRequestSent();
+      },
     });
   }
 
@@ -51,8 +51,8 @@ export function LinkWalletPrompt(props: {
             Multiple wallets can be linked to the same account.{" "}
             <UnderlineLink
               href="https://portal.thirdweb.com/account/billing/account-info"
-              target="_blank"
               rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more about wallet linking
             </UnderlineLink>
@@ -70,20 +70,20 @@ export function LinkWalletPrompt(props: {
 
       <div className="flex flex-col-reverse gap-4 border-t px-4 py-6 md:flex-row lg:justify-between lg:p-6">
         <Button
-          variant="outline"
           className="gap-2 bg-card"
-          onClick={props.onBack}
           disabled={requestLinkWallet.isPending}
+          onClick={props.onBack}
+          variant="outline"
         >
           <ArrowLeftIcon className="size-4" />
           Change Email
         </Button>
 
         <Button
-          type="button"
-          onClick={handleLinkWalletRequest}
-          disabled={requestLinkWallet.isPending}
           className="gap-2"
+          disabled={requestLinkWallet.isPending}
+          onClick={handleLinkWalletRequest}
+          type="button"
         >
           Link wallet and continue
           {requestLinkWallet.isPending ? (
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/LoginOrSignup/LoginOrSignup.stories.tsx b/apps/dashboard/src/app/(app)/login/onboarding/LoginOrSignup/LoginOrSignup.stories.tsx
index 938dc9b06aa..c78ebda858f 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/LoginOrSignup/LoginOrSignup.stories.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/LoginOrSignup/LoginOrSignup.stories.tsx
@@ -4,13 +4,13 @@ import { AccountOnboardingLayout } from "../onboarding-layout";
 import { LoginOrSignup } from "./LoginOrSignup";
 
 const meta = {
-  title: "Onboarding/AccountOnboarding/LoginOrSignup",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Onboarding/AccountOnboarding/LoginOrSignup",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -34,9 +34,7 @@ export const OtherError: Story = {
   },
 };
 
-function Story(props: {
-  type: "success" | "error" | "email-exists";
-}) {
+function Story(props: { type: "success" | "error" | "email-exists" }) {
   return (
     <AccountOnboardingLayout
       currentStep={1}
@@ -46,9 +44,6 @@ function Story(props: {
       }}
     >
       <LoginOrSignup
-        onRequestSent={(params) => {
-          storybookLog("onRequestSent", params);
-        }}
         loginOrSignup={async (data) => {
           storybookLog("loginOrSignup", data);
 
@@ -62,6 +57,9 @@ function Story(props: {
             throw new Error("email address already exists");
           }
         }}
+        onRequestSent={(params) => {
+          storybookLog("onRequestSent", params);
+        }}
       />
     </AccountOnboardingLayout>
   );
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/LoginOrSignup/LoginOrSignup.tsx b/apps/dashboard/src/app/(app)/login/onboarding/LoginOrSignup/LoginOrSignup.tsx
index 1aa5e6b8362..153d6a10a3b 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/LoginOrSignup/LoginOrSignup.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/LoginOrSignup/LoginOrSignup.tsx
@@ -1,18 +1,18 @@
 "use client";
 
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
-import { Input } from "@/components/ui/input";
-import { TabButtons } from "@/components/ui/tabs";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
 import { ArrowRightIcon } from "lucide-react";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Button } from "@/components/ui/button";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { TabButtons } from "@/components/ui/tabs";
 import {
   type AccountValidationSchema,
   accountValidationSchema,
@@ -20,10 +20,7 @@ import {
 } from "../validations";
 
 export function LoginOrSignup(props: {
-  onRequestSent: (options: {
-    email: string;
-    isExistingEmail: boolean;
-  }) => void;
+  onRequestSent: (options: { email: string; isExistingEmail: boolean }) => void;
   loginOrSignup: (input: {
     email: string;
     subscribeToUpdates?: true;
@@ -41,12 +38,6 @@ export function LoginOrSignup(props: {
     name?: string;
   }) {
     loginOrSignup.mutate(values, {
-      onSuccess: () => {
-        props.onRequestSent({
-          email: values.email,
-          isExistingEmail: false,
-        });
-      },
       onError: (error) => {
         if (error?.message.match(/email address already exists/)) {
           props.onRequestSent({
@@ -62,6 +53,12 @@ export function LoginOrSignup(props: {
 
         console.error(error);
       },
+      onSuccess: () => {
+        props.onRequestSent({
+          email: values.email,
+          isExistingEmail: false,
+        });
+      },
     });
   }
 
@@ -71,31 +68,31 @@ export function LoginOrSignup(props: {
         tabContainerClassName="px-4 lg:px-6 pt-3 pb-0.5"
         tabs={[
           {
+            isActive: tab === "signup",
             name: "Create account",
             onClick: () => setTab("signup"),
-            isActive: tab === "signup",
           },
           {
+            isActive: tab === "login",
             name: "I already have an account",
             onClick: () => setTab("login"),
-            isActive: tab === "login",
           },
         ]}
       />
 
       {tab === "signup" && (
         <SignupForm
+          isSubmitting={loginOrSignup.isPending}
           key="signup"
           onSubmit={handleSubmit}
-          isSubmitting={loginOrSignup.isPending}
         />
       )}
 
       {tab === "login" && (
         <LoginForm
+          isSubmitting={loginOrSignup.isPending}
           key="login"
           onSubmit={handleSubmit}
-          isSubmitting={loginOrSignup.isPending}
         />
       )}
     </div>
@@ -114,8 +111,8 @@ function SignupForm(props: {
   const form = useForm<AccountValidationSchema>({
     resolver: zodResolver(accountValidationSchema),
     values: {
-      name: "",
       email: "",
+      name: "",
     },
   });
 
@@ -129,41 +126,42 @@ function SignupForm(props: {
         : {}),
     });
   });
-
+  const nameId = useId();
+  const emailId = useId();
   return (
-    <form onSubmit={handleSubmit} className="flex w-full grow flex-col">
+    <form className="flex w-full grow flex-col" onSubmit={handleSubmit}>
       <div className="flex w-full flex-col gap-4 px-4 py-6 lg:p-6">
         <FormFieldSetup
           errorMessage={
             form.getFieldState("name", form.formState).error?.message
           }
-          label="Name"
-          htmlFor="name"
+          htmlFor={nameId}
           isRequired={false}
+          label="Name"
         >
           <Input
-            placeholder="Company Inc."
             className="bg-background"
+            placeholder="Company Inc."
             type="text"
             {...form.register("name")}
-            id="name"
+            id={nameId}
           />
         </FormFieldSetup>
 
         <FormFieldSetup
-          isRequired
-          htmlFor="email"
           errorMessage={
             form.getFieldState("email", form.formState).error?.message
           }
+          htmlFor={emailId}
+          isRequired
           label="Email"
         >
           <Input
-            placeholder="you@company.com"
             className="bg-background"
+            placeholder="you@company.com"
             type="email"
             {...form.register("email")}
-            id="email"
+            id={emailId}
           />
         </FormFieldSetup>
 
@@ -178,10 +176,10 @@ function SignupForm(props: {
 
       <div className="mt-8 flex justify-end border-t px-4 py-6 lg:p-6">
         <Button
-          type="button"
-          onClick={handleSubmit}
-          disabled={props.isSubmitting}
           className="gap-2 px-6"
+          disabled={props.isSubmitting}
+          onClick={handleSubmit}
+          type="button"
         >
           Get Started
           {props.isSubmitting ? (
@@ -202,9 +200,7 @@ const loginFormSchema = z.object({
 type LoginFormSchema = z.infer<typeof loginFormSchema>;
 
 function LoginForm(props: {
-  onSubmit: (values: {
-    email: string;
-  }) => void;
+  onSubmit: (values: { email: string }) => void;
   isSubmitting: boolean;
 }) {
   const form = useForm<LoginFormSchema>({
@@ -218,33 +214,34 @@ function LoginForm(props: {
     props.onSubmit(values);
   });
 
+  const emailId = useId();
   return (
-    <form onSubmit={handleSubmit} className="flex w-full grow flex-col">
+    <form className="flex w-full grow flex-col" onSubmit={handleSubmit}>
       <div className="flex w-full flex-col gap-4 px-4 py-6 lg:p-6">
         <FormFieldSetup
-          isRequired
-          htmlFor="email"
           errorMessage={
             form.getFieldState("email", form.formState).error?.message
           }
+          htmlFor={emailId}
+          isRequired
           label="Email"
         >
           <Input
+            className="bg-background"
             placeholder="you@company.com"
             type="email"
-            className="bg-background"
             {...form.register("email")}
-            id="email"
+            id={emailId}
           />
         </FormFieldSetup>
       </div>
 
       <div className="mt-6 flex justify-end border-t px-4 py-6 lg:p-6">
         <Button
-          type="button"
-          onClick={handleSubmit}
-          disabled={props.isSubmitting}
           className="gap-2 px-6"
+          disabled={props.isSubmitting}
+          onClick={handleSubmit}
+          type="button"
         >
           Login
           {props.isSubmitting ? (
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/VerifyEmail/VerifyEmail.stories.tsx b/apps/dashboard/src/app/(app)/login/onboarding/VerifyEmail/VerifyEmail.stories.tsx
index 2b685ad0eaa..b400650e2c0 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/VerifyEmail/VerifyEmail.stories.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/VerifyEmail/VerifyEmail.stories.tsx
@@ -5,13 +5,13 @@ import { AccountOnboardingLayout } from "../onboarding-layout";
 import { VerifyEmail } from "./VerifyEmail";
 
 const meta = {
-  title: "Onboarding/AccountOnboarding/VerifyEmail",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Onboarding/AccountOnboarding/VerifyEmail",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -19,22 +19,22 @@ type Story = StoryObj<typeof meta>;
 
 export const VerifyEmailSuccess: Story = {
   args: {
-    verifyEmailType: "success",
     resendConfirmationEmailType: "success",
+    verifyEmailType: "success",
   },
 };
 
 export const VerifyEmailError: Story = {
   args: {
-    verifyEmailType: "error",
     resendConfirmationEmailType: "success",
+    verifyEmailType: "error",
   },
 };
 
 export const ResendCodeError: Story = {
   args: {
-    verifyEmailType: "success",
     resendConfirmationEmailType: "error",
+    verifyEmailType: "success",
   },
 };
 
@@ -51,8 +51,21 @@ function Story(props: {
       }}
     >
       <VerifyEmail
-        title="Custom Title"
         accountAddress="0x1234567890123456789012345678901234567890"
+        email="user@example.com"
+        onBack={() => {
+          storybookLog("onBack");
+        }}
+        onEmailConfirmed={(params) => {
+          storybookLog("onEmailConfirmed", params);
+        }}
+        resendConfirmationEmail={async () => {
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+          if (props.resendConfirmationEmailType === "error") {
+            throw new Error("Example error");
+          }
+        }}
+        title="Custom Title"
         verifyEmail={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           if (props.verifyEmailType === "error") {
@@ -62,19 +75,6 @@ function Story(props: {
             account: newAccountStub(),
           };
         }}
-        resendConfirmationEmail={async () => {
-          await new Promise((resolve) => setTimeout(resolve, 1000));
-          if (props.resendConfirmationEmailType === "error") {
-            throw new Error("Example error");
-          }
-        }}
-        email="user@example.com"
-        onEmailConfirmed={(params) => {
-          storybookLog("onEmailConfirmed", params);
-        }}
-        onBack={() => {
-          storybookLog("onBack");
-        }}
       />
     </AccountOnboardingLayout>
   );
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/VerifyEmail/VerifyEmail.tsx b/apps/dashboard/src/app/(app)/login/onboarding/VerifyEmail/VerifyEmail.tsx
index 1076691574a..5dee09d77fd 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/VerifyEmail/VerifyEmail.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/VerifyEmail/VerifyEmail.tsx
@@ -1,12 +1,4 @@
 "use client";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  InputOTP,
-  InputOTPGroup,
-  InputOTPSlot,
-} from "@/components/ui/input-otp";
-import { cn } from "@/lib/utils";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
@@ -14,6 +6,14 @@ import { REGEXP_ONLY_DIGITS_AND_CHARS } from "input-otp";
 import { ArrowLeftIcon, RotateCcwIcon } from "lucide-react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
+import {
+  InputOTP,
+  InputOTPGroup,
+  InputOTPSlot,
+} from "@/components/ui/input-otp";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { cn } from "@/lib/utils";
 import {
   type EmailConfirmationValidationSchema,
   emailConfirmationValidationSchema,
@@ -49,13 +49,13 @@ export function VerifyEmail(props: VerifyEmailProps) {
 
   const handleSubmit = form.handleSubmit((values) => {
     verifyEmail.mutate(values, {
-      onSuccess: (response) => {
-        props.onEmailConfirmed(response);
-      },
       onError: (error) => {
         console.error(error);
         toast.error("Invalid confirmation code");
       },
+      onSuccess: (response) => {
+        props.onEmailConfirmed(response);
+      },
     });
   });
 
@@ -64,13 +64,13 @@ export function VerifyEmail(props: VerifyEmailProps) {
     verifyEmail.reset();
 
     resendConfirmationEmail.mutate(undefined, {
-      onSuccess: () => {
-        toast.success("Verification code sent");
-      },
       onError: (error) => {
         console.error(error);
         toast.error("Failed to send verification code");
       },
+      onSuccess: () => {
+        toast.success("Verification code sent");
+      },
     });
   }
 
@@ -88,26 +88,26 @@ export function VerifyEmail(props: VerifyEmailProps) {
 
           <div className="md:flex md:justify-start">
             <InputOTP
-              maxLength={6}
-              pattern={REGEXP_ONLY_DIGITS_AND_CHARS}
+              disabled={verifyEmail.isPending}
               inputMode="text"
-              value={form.watch("confirmationToken")}
+              maxLength={6}
               onChange={(otp) => {
                 form.setValue("confirmationToken", otp);
               }}
-              disabled={verifyEmail.isPending}
+              pattern={REGEXP_ONLY_DIGITS_AND_CHARS}
+              value={form.watch("confirmationToken")}
             >
               <InputOTPGroup className="w-full grow bg-background lg:w-[300px]">
                 {new Array(6).fill(0).map((_, idx) => (
                   <InputOTPSlot
-                    // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-                    key={idx}
-                    index={idx}
                     className={cn("h-12 grow border-foreground/25 text-lg", {
                       "border-red-500":
                         form.getFieldState("confirmationToken", form.formState)
                           .error || verifyEmail.isError,
                     })}
+                    index={idx}
+                    // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
+                    key={idx}
                   />
                 ))}
               </InputOTPGroup>
@@ -117,9 +117,9 @@ export function VerifyEmail(props: VerifyEmailProps) {
 
         <div className="mt-4 flex flex-col-reverse gap-4 border-t px-4 py-6 lg:flex-row lg:justify-between lg:px-6">
           <Button
+            className="gap-2 bg-card"
             onClick={props.onBack}
             variant="outline"
-            className="gap-2 bg-card"
           >
             <ArrowLeftIcon className="size-4 text-muted-foreground" />
             Change Email
@@ -127,10 +127,10 @@ export function VerifyEmail(props: VerifyEmailProps) {
 
           <div className="flex justify-end gap-4">
             <Button
-              variant="outline"
               className="gap-2 bg-background"
-              onClick={handleResend}
               disabled={resendConfirmationEmail.isPending}
+              onClick={handleResend}
+              variant="outline"
             >
               {resendConfirmationEmail.isPending ? (
                 <Spinner className="size-4" />
@@ -141,10 +141,10 @@ export function VerifyEmail(props: VerifyEmailProps) {
             </Button>
 
             <Button
-              type="submit"
-              onClick={handleSubmit}
-              disabled={verifyEmail.isPending}
               className="grow gap-2 px-6"
+              disabled={verifyEmail.isPending}
+              onClick={handleSubmit}
+              type="submit"
             >
               {verifyEmail.isPending && <Spinner className="size-4" />}
               Verify
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding-ui.tsx b/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding-ui.tsx
index 1b3e0dccba5..63246eee360 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding-ui.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding-ui.tsx
@@ -4,11 +4,11 @@ import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { useState } from "react";
 import { LinkWalletPrompt } from "./LinkWalletPrompt/LinkWalletPrompt";
 import { LoginOrSignup } from "./LoginOrSignup/LoginOrSignup";
+import { AccountOnboardingLayout } from "./onboarding-layout";
 import {
   LinkWalletVerifyEmail,
   SignupVerifyEmail,
 } from "./VerifyEmail/VerifyEmail";
-import { AccountOnboardingLayout } from "./onboarding-layout";
 
 type AccountOnboardingScreen =
   | { id: "login-or-signup" }
@@ -47,10 +47,10 @@ export function AccountOnboardingUI(props: AccountOnboardingProps) {
 
   return (
     <AccountOnboardingLayout
-      logout={props.logout}
       currentStep={
         screen.id === "login-or-signup" || screen.id === "link-wallet" ? 1 : 2
       }
+      logout={props.logout}
     >
       {screen.id === "login-or-signup" && (
         <LoginOrSignup
@@ -58,15 +58,15 @@ export function AccountOnboardingUI(props: AccountOnboardingProps) {
           onRequestSent={(params) => {
             if (params.isExistingEmail) {
               setScreen({
-                id: "link-wallet",
-                email: params.email,
                 backScreen: screen,
+                email: params.email,
+                id: "link-wallet",
               });
             } else {
               setScreen({
-                id: "signup-verify-email",
-                email: params.email,
                 backScreen: screen,
+                email: params.email,
+                id: "signup-verify-email",
               });
             }
           }}
@@ -76,38 +76,38 @@ export function AccountOnboardingUI(props: AccountOnboardingProps) {
       {screen.id === "link-wallet" && (
         <LinkWalletPrompt
           accountAddress={props.accountAddress}
-          requestLinkWallet={props.requestLinkWallet}
+          email={screen.email}
+          onBack={() => setScreen(screen.backScreen)}
           onLinkWalletRequestSent={() => {
             setScreen({
-              id: "link-wallet-verify-email",
-              email: screen.email,
               backScreen: screen,
+              email: screen.email,
+              id: "link-wallet-verify-email",
             });
           }}
-          onBack={() => setScreen(screen.backScreen)}
-          email={screen.email}
+          requestLinkWallet={props.requestLinkWallet}
         />
       )}
 
       {screen.id === "signup-verify-email" && (
         <SignupVerifyEmail
           accountAddress={props.accountAddress}
-          verifyEmail={props.verifyEmail}
-          resendConfirmationEmail={props.resendEmailConfirmation}
-          onEmailConfirmed={props.onComplete}
-          onBack={() => setScreen(screen.backScreen)}
           email={screen.email}
+          onBack={() => setScreen(screen.backScreen)}
+          onEmailConfirmed={props.onComplete}
+          resendConfirmationEmail={props.resendEmailConfirmation}
+          verifyEmail={props.verifyEmail}
         />
       )}
 
       {screen.id === "link-wallet-verify-email" && (
         <LinkWalletVerifyEmail
           accountAddress={props.accountAddress}
-          verifyEmail={props.verifyEmail}
-          resendConfirmationEmail={props.resendEmailConfirmation}
-          onEmailConfirmed={props.onComplete}
-          onBack={() => setScreen(screen.backScreen)}
           email={screen.email}
+          onBack={() => setScreen(screen.backScreen)}
+          onEmailConfirmed={props.onComplete}
+          resendConfirmationEmail={props.resendEmailConfirmation}
+          verifyEmail={props.verifyEmail}
         />
       )}
     </AccountOnboardingLayout>
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding.stories.tsx b/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding.stories.tsx
index 7dd68707f99..57482bc44e4 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding.stories.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding.stories.tsx
@@ -4,13 +4,13 @@ import { storybookLog } from "../../../../stories/utils";
 import { AccountOnboardingUI } from "./account-onboarding-ui";
 
 const meta = {
-  title: "Onboarding/AccountOnboarding/Flow",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Onboarding/AccountOnboarding/Flow",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -39,13 +39,6 @@ function Story(props: {
 }) {
   return (
     <AccountOnboardingUI
-      logout={async () => {
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-        storybookLog("logout");
-      }}
-      onComplete={() => {
-        storybookLog("onComplete");
-      }}
       accountAddress=""
       loginOrSignup={async () => {
         await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -57,12 +50,22 @@ function Story(props: {
           throw new Error("generic error");
         }
       }}
+      logout={async () => {
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+        storybookLog("logout");
+      }}
+      onComplete={() => {
+        storybookLog("onComplete");
+      }}
       requestLinkWallet={async () => {
         await new Promise((resolve) => setTimeout(resolve, 1000));
         if (props.requestLinkWalletType === "error") {
           throw new Error("generic error");
         }
       }}
+      resendEmailConfirmation={async () => {
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+      }}
       verifyEmail={async () => {
         await new Promise((resolve) => setTimeout(resolve, 1000));
         if (props.verifyEmailType === "error") {
@@ -70,13 +73,10 @@ function Story(props: {
         }
 
         return {
-          team: teamStub("foo", "free"),
           account: newAccountStub(),
+          team: teamStub("foo", "free"),
         };
       }}
-      resendEmailConfirmation={async () => {
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-      }}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding.tsx b/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding.tsx
index 41e1b69aac6..eae0a5bf612 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/account-onboarding.tsx
@@ -5,8 +5,7 @@ import {
   updateAccountClient,
   verifyEmailClient,
 } from "@3rdweb-sdk/react/hooks/useApi";
-import { useActiveWallet } from "thirdweb/react";
-import { useDisconnect } from "thirdweb/react";
+import { useActiveWallet, useDisconnect } from "thirdweb/react";
 import { doLogout } from "../auth-actions";
 import { AccountOnboardingUI } from "./account-onboarding-ui";
 
@@ -19,7 +18,10 @@ function AccountOnboarding(props: {
   const { disconnect } = useDisconnect();
   return (
     <AccountOnboardingUI
-      onComplete={props.onComplete}
+      accountAddress={props.accountAddress}
+      loginOrSignup={async (params) => {
+        await updateAccountClient(params);
+      }}
       logout={async () => {
         if (activeWallet) {
           disconnect(activeWallet);
@@ -27,20 +29,17 @@ function AccountOnboarding(props: {
         await doLogout();
         props.onLogout();
       }}
-      accountAddress={props.accountAddress}
-      loginOrSignup={async (params) => {
-        await updateAccountClient(params);
-      }}
-      verifyEmail={verifyEmailClient}
-      resendEmailConfirmation={async () => {
-        await resendEmailClient();
-      }}
+      onComplete={props.onComplete}
       requestLinkWallet={async (email) => {
         await updateAccountClient({
           email,
           linkWallet: true,
         });
       }}
+      resendEmailConfirmation={async () => {
+        await resendEmailClient();
+      }}
+      verifyEmail={verifyEmailClient}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/onboarding-layout.tsx b/apps/dashboard/src/app/(app)/login/onboarding/onboarding-layout.tsx
index ca3a4b94e85..966577c5c83 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/onboarding-layout.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/onboarding-layout.tsx
@@ -1,6 +1,3 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import { useMutation } from "@tanstack/react-query";
 import {
   BoxIcon,
@@ -10,6 +7,9 @@ import {
   UserIcon,
   UsersIcon,
 } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { cn } from "@/lib/utils";
 
 type OnboardingStep = {
   icon: React.FC<{ className?: string }>;
@@ -20,16 +20,16 @@ type OnboardingStep = {
 
 const accountOnboardingSteps: OnboardingStep[] = [
   {
-    icon: UserIcon,
-    title: "Account Details",
     description: "Provide email address",
+    icon: UserIcon,
     number: 1,
+    title: "Account Details",
   },
   {
-    icon: MailIcon,
-    title: "Verify Email",
     description: "Enter your verification code",
+    icon: MailIcon,
     number: 2,
+    title: "Verify Email",
   },
 ];
 
@@ -44,17 +44,14 @@ export function AccountOnboardingLayout(props: {
 
   return (
     <OnboardingLayout
-      steps={accountOnboardingSteps}
-      currentStep={props.currentStep}
-      title="Get started with thirdweb"
       cta={
         <Button
-          variant="outline"
-          size="sm"
           className="gap-2 bg-card px-4"
           onClick={() => {
             logout.mutate();
           }}
+          size="sm"
+          variant="outline"
         >
           {logout.isPending ? (
             <Spinner className="size-3 text-muted-foreground" />
@@ -64,6 +61,9 @@ export function AccountOnboardingLayout(props: {
           Logout
         </Button>
       }
+      currentStep={props.currentStep}
+      steps={accountOnboardingSteps}
+      title="Get started with thirdweb"
     >
       {props.children}
     </OnboardingLayout>
@@ -72,22 +72,22 @@ export function AccountOnboardingLayout(props: {
 
 const teamOnboardingSteps: OnboardingStep[] = [
   {
-    icon: BoxIcon,
-    title: "Team Details",
     description: "Provide team details",
+    icon: BoxIcon,
     number: 1,
+    title: "Team Details",
   },
   {
-    icon: RocketIcon,
-    title: "Plan Selection",
     description: "Choose a plan that fits your needs",
+    icon: RocketIcon,
     number: 2,
+    title: "Plan Selection",
   },
   {
-    icon: UsersIcon,
-    title: "Team Members",
     description: "Invite members to your team",
+    icon: UsersIcon,
     number: 3,
+    title: "Team Members",
   },
 ];
 
@@ -97,8 +97,8 @@ export function TeamOnboardingLayout(props: {
 }) {
   return (
     <OnboardingLayout
-      steps={teamOnboardingSteps}
       currentStep={props.currentStep}
+      steps={teamOnboardingSteps}
       title="Setup your team"
     >
       {props.children}
@@ -138,8 +138,8 @@ function OnboardingLayout(props: {
               const isInactive = step.number !== props.currentStep;
               return (
                 <div
-                  key={step.number}
                   className={cn("flex items-center gap-4")}
+                  key={step.number}
                 >
                   <div className="relative z-10 flex size-10 items-center justify-center rounded-full border bg-card">
                     <step.icon
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.stories.tsx b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.stories.tsx
index 9e195e93716..ae9b095162f 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.stories.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.stories.tsx
@@ -1,18 +1,18 @@
-import type { Team } from "@/api/team";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { teamStub } from "stories/stubs";
 import { storybookLog, storybookThirdwebClient } from "stories/utils";
+import type { Team } from "@/api/team";
 import { TeamOnboardingLayout } from "../onboarding-layout";
 import { InviteTeamMembersUI } from "./InviteTeamMembers";
 
 const meta = {
-  title: "Onboarding/TeamOnboarding/InviteTeamMembers",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Onboarding/TeamOnboarding/InviteTeamMembers",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -55,9 +55,7 @@ export const ProPlan: Story = {
   },
 };
 
-function Story(props: {
-  plan: Team["billingPlan"];
-}) {
+function Story(props: { plan: Team["billingPlan"] }) {
   return (
     <TeamOnboardingLayout currentStep={2}>
       <InviteTeamMembersUI
@@ -65,13 +63,13 @@ function Story(props: {
         getTeam={async () => {
           return teamStub("foo", props.plan);
         }}
-        team={teamStub("foo", props.plan)}
         inviteTeamMembers={async (params) => {
           return { results: params.map(() => "fulfilled") };
         }}
         onComplete={() => {
           storybookLog("onComplete");
         }}
+        team={teamStub("foo", props.plan)}
       />
     </TeamOnboardingLayout>
   );
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.tsx b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.tsx
index aaf3fb6be73..48bb2591161 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.tsx
@@ -1,5 +1,9 @@
 "use client";
 
+import { ArrowRightIcon, CircleArrowUpIcon } from "lucide-react";
+import { useState, useTransition } from "react";
+import type { ThirdwebClient } from "thirdweb";
+import { pollWithTimeout } from "utils/pollWithTimeout";
 import {
   reportOnboardingMembersInvited,
   reportOnboardingMembersSkipped,
@@ -8,9 +12,8 @@ import {
 } from "@/analytics/report";
 import type { Team } from "@/api/team";
 import { PricingCard } from "@/components/blocks/pricing-card";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Sheet,
   SheetContent,
@@ -19,11 +22,8 @@ import {
   SheetTitle,
 } from "@/components/ui/sheet";
 import { TabButtons } from "@/components/ui/tabs";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { ArrowRightIcon, CircleArrowUpIcon } from "lucide-react";
-import { useState, useTransition } from "react";
-import type { ThirdwebClient } from "thirdweb";
-import { pollWithTimeout } from "utils/pollWithTimeout";
 import { useStripeRedirectEvent } from "../../../(stripe)/stripe-redirect/stripeRedirectChannel";
 import {
   InviteSection,
@@ -72,40 +72,31 @@ export function InviteTeamMembersUI(props: {
 
   return (
     <div className="relative flex grow flex-col">
-      <Sheet open={showPlanModal} onOpenChange={setShowPlanModal}>
+      <Sheet onOpenChange={setShowPlanModal} open={showPlanModal}>
         <SheetContent className="!max-w-[1300px] w-full overflow-auto">
           <InviteModalContent
             billingStatus={props.team.billingStatus}
-            teamSlug={props.team.slug}
             getTeam={props.getTeam}
             teamId={props.team.id}
+            teamSlug={props.team.slug}
           />
         </SheetContent>
       </Sheet>
 
       <InviteSection
-        inviteTeamMembers={props.inviteTeamMembers}
-        team={props.team}
-        userHasEditPermission={true}
-        onInviteSuccess={(count) =>
-          setSuccessCount((prevCount) => prevCount + count)
-        }
-        shouldHideInviteButton={hasSentInvites}
         client={props.client}
-        // its a new team, there's no recommended members
-        recommendedMembers={[]}
         customCTASection={
           <div className="flex gap-3">
             {(props.team.billingPlan === "free" ||
               props.team.billingPlan === "starter") && (
               <Button
-                size="sm"
-                variant="default"
                 className="gap-2"
                 onClick={() => {
                   setShowPlanModal(true);
                   reportOnboardingMembersUpsellButtonClicked();
                 }}
+                size="sm"
+                variant="default"
               >
                 <CircleArrowUpIcon className="size-4" />
                 Upgrade
@@ -113,6 +104,7 @@ export function InviteTeamMembersUI(props: {
             )}
 
             <Button
+              className="gap-2"
               onClick={() => {
                 props.onComplete();
                 if (successCount === 0) {
@@ -123,7 +115,6 @@ export function InviteTeamMembersUI(props: {
                   });
                 }
               }}
-              className="gap-2"
               size="sm"
               variant={hasSentInvites ? "default" : "outline"}
             >
@@ -132,6 +123,15 @@ export function InviteTeamMembersUI(props: {
             </Button>
           </div>
         }
+        inviteTeamMembers={props.inviteTeamMembers}
+        onInviteSuccess={(count) =>
+          setSuccessCount((prevCount) => prevCount + count)
+        }
+        recommendedMembers={[]}
+        shouldHideInviteButton={hasSentInvites}
+        // its a new team, there's no recommended members
+        team={props.team}
+        userHasEditPermission={true}
       />
 
       {showSpinner && (
@@ -157,19 +157,19 @@ function InviteModalContent(props: {
     <PricingCard
       billingPlan="growth"
       billingStatus={props.billingStatus}
-      teamSlug={props.teamSlug}
       cta={{
         label: "Get Started",
-        type: "checkout",
         onClick() {
           reportOnboardingMembersUpsellPlanSelected({
             plan: "growth",
           });
         },
+        type: "checkout",
       }}
-      highlighted
       getTeam={props.getTeam}
+      highlighted
       teamId={props.teamId}
+      teamSlug={props.teamSlug}
     />
   );
 
@@ -177,18 +177,18 @@ function InviteModalContent(props: {
     <PricingCard
       billingPlan="scale"
       billingStatus={props.billingStatus}
-      teamSlug={props.teamSlug}
       cta={{
         label: "Get started",
-        type: "checkout",
         onClick() {
           reportOnboardingMembersUpsellPlanSelected({
             plan: "scale",
           });
         },
+        type: "checkout",
       }}
       getTeam={props.getTeam}
       teamId={props.teamId}
+      teamSlug={props.teamSlug}
     />
   );
 
@@ -196,18 +196,18 @@ function InviteModalContent(props: {
     <PricingCard
       billingPlan="pro"
       billingStatus={props.billingStatus}
-      teamSlug={props.teamSlug}
       cta={{
         label: "Get started",
-        type: "checkout",
         onClick() {
           reportOnboardingMembersUpsellPlanSelected({
             plan: "pro",
           });
         },
+        type: "checkout",
       }}
       getTeam={props.getTeam}
       teamId={props.teamId}
+      teamSlug={props.teamSlug}
     />
   );
 
@@ -222,8 +222,8 @@ function InviteModalContent(props: {
           features.{" "}
           <UnderlineLink
             href="https://thirdweb.com/pricing"
-            target="_blank"
             rel="noopener noreferrer"
+            target="_blank"
           >
             Learn more about pricing
           </UnderlineLink>
@@ -244,19 +244,19 @@ function InviteModalContent(props: {
         <TabButtons
           tabs={[
             {
+              isActive: planToShow === "growth",
               name: "Growth",
               onClick: () => setPlanToShow("growth"),
-              isActive: planToShow === "growth",
             },
             {
+              isActive: planToShow === "scale",
               name: "Scale",
               onClick: () => setPlanToShow("scale"),
-              isActive: planToShow === "scale",
             },
             {
+              isActive: planToShow === "pro",
               name: "Pro",
               onClick: () => setPlanToShow("pro"),
-              isActive: planToShow === "pro",
             },
           ]}
         />
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/TeamInfoForm.stories.tsx b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/TeamInfoForm.stories.tsx
index 2c39911ecee..a800483f6df 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/TeamInfoForm.stories.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/TeamInfoForm.stories.tsx
@@ -5,13 +5,13 @@ import { TeamOnboardingLayout } from "../onboarding-layout";
 import { TeamInfoFormUI } from "./TeamInfoForm";
 
 const meta = {
-  title: "Onboarding/TeamOnboarding/TeamInfo",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Onboarding/TeamOnboarding/TeamInfo",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -29,17 +29,11 @@ export const SendError: Story = {
   },
 };
 
-function Story(props: {
-  sendType: "success" | "error";
-}) {
+function Story(props: { sendType: "success" | "error" }) {
   return (
     <TeamOnboardingLayout currentStep={1}>
       <TeamInfoFormUI
         client={storybookThirdwebClient}
-        onComplete={() => {
-          storybookLog("onComplete");
-        }}
-        teamSlug="foo"
         isTeamSlugAvailable={async (slug) => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           // taken slugs stub
@@ -49,6 +43,10 @@ function Story(props: {
 
           return true;
         }}
+        onComplete={() => {
+          storybookLog("onComplete");
+        }}
+        teamSlug="foo"
         updateTeam={async (formData) => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           storybookLog("updateTeam", formData);
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/TeamInfoForm.tsx b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/TeamInfoForm.tsx
index c5fa09e6093..26bb46253b1 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/TeamInfoForm.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/TeamInfoForm.tsx
@@ -1,5 +1,14 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { FileInput } from "components/shared/FileInput";
+import { ArrowRightIcon } from "lucide-react";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import { useDebounce } from "use-debounce";
+import { z } from "zod";
 import type { Team } from "@/api/team";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -11,16 +20,7 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation, useQuery } from "@tanstack/react-query";
-import { FileInput } from "components/shared/FileInput";
-import { ArrowRightIcon } from "lucide-react";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
-import { useDebounce } from "use-debounce";
-import { z } from "zod";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   maxTeamNameLength,
   maxTeamSlugLength,
@@ -35,9 +35,9 @@ type TeamData = {
 };
 
 const formSchema = z.object({
+  image: z.instanceof(File).optional(),
   name: teamNameSchema,
   slug: teamSlugSchema,
-  image: z.instanceof(File).optional(),
 });
 
 type FormValues = z.infer<typeof formSchema>;
@@ -50,12 +50,12 @@ export function TeamInfoFormUI(props: {
   client: ThirdwebClient;
 }) {
   const form = useForm<FormValues>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
+      image: undefined,
       name: "",
       slug: "",
-      image: undefined,
     },
+    resolver: zodResolver(formSchema),
   });
 
   const [disableSlugSuggestion, setDisableSlugSuggestion] = useState(false);
@@ -65,7 +65,7 @@ export function TeamInfoFormUI(props: {
   const [debouncedName] = useDebounce(name, 500);
 
   const { data: suggestedSlug, isFetching: isCalculatingSlug } = useQuery({
-    queryKey: ["suggest-team-slug", debouncedName],
+    enabled: !!debouncedName && !disableSlugSuggestion,
     queryFn: async () => {
       for (let attempt = 0; attempt < 3; attempt++) {
         const computedSlug = computeSlug(name, attempt);
@@ -81,7 +81,7 @@ export function TeamInfoFormUI(props: {
 
       return null;
     },
-    enabled: !!debouncedName && !disableSlugSuggestion,
+    queryKey: ["suggest-team-slug", debouncedName],
     retry: false,
   });
 
@@ -101,11 +101,11 @@ export function TeamInfoFormUI(props: {
     suggestedSlug !== debouncedSlug;
 
   const { data: isSlugAvailable, isFetching: isCheckingSlug } = useQuery({
-    queryKey: ["checkTeamSlug", debouncedSlug],
+    enabled: shouldValidateSlug,
     queryFn: () => {
       return props.isTeamSlugAvailable(debouncedSlug);
     },
-    enabled: shouldValidateSlug,
+    queryKey: ["checkTeamSlug", debouncedSlug],
     retry: false,
   });
 
@@ -116,8 +116,8 @@ export function TeamInfoFormUI(props: {
     }
     if (!isSlugAvailable) {
       form.setError("slug", {
-        type: "manual",
         message: "This URL is already taken",
+        type: "manual",
       });
     } else {
       const isValidSlugError = form.formState.errors.slug?.type === "manual";
@@ -161,12 +161,12 @@ export function TeamInfoFormUI(props: {
                   <div className="h-3" />
                   <FormControl>
                     <FileInput
-                      client={props.client}
                       accept={{ "image/*": [] }}
-                      value={value}
-                      setValue={(file) => onChange(file)}
                       className="w-28 rounded-full bg-background"
+                      client={props.client}
                       disableHelperText
+                      setValue={(file) => onChange(file)}
+                      value={value}
                     />
                   </FormControl>
                   <div className="h-3" />
@@ -185,8 +185,8 @@ export function TeamInfoFormUI(props: {
                   </FormLabel>
                   <FormControl>
                     <Input
-                      placeholder="Company Inc."
                       autoComplete="off"
+                      placeholder="Company Inc."
                       {...field}
                       maxLength={maxTeamNameLength}
                     />
@@ -215,13 +215,13 @@ export function TeamInfoFormUI(props: {
                       </div>
                       <Input
                         {...field}
+                        className="truncate border-0 font-mono"
+                        maxLength={maxTeamSlugLength}
                         onChange={(e) => {
                           setDisableSlugSuggestion(true);
                           field.onChange(e);
                         }}
-                        className="truncate border-0 font-mono"
                         placeholder="my-team"
-                        maxLength={maxTeamSlugLength}
                       />
                       {(isCheckingSlug || isCalculatingSlug) && (
                         <div className="-translate-y-1/2 fade-in-0 absolute top-1/2 right-3 duration-300">
@@ -240,7 +240,7 @@ export function TeamInfoFormUI(props: {
           </div>
 
           <div className="flex justify-end border-t p-4 lg:px-6">
-            <Button type="submit" className="gap-2" size="sm">
+            <Button className="gap-2" size="sm" type="submit">
               Continue
               {submit.isPending ? (
                 <Spinner className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/team-onboarding.tsx b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/team-onboarding.tsx
index 49e95a77658..65ba5b8eccb 100644
--- a/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/team-onboarding.tsx
+++ b/apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/team-onboarding.tsx
@@ -1,4 +1,8 @@
 "use client";
+import { useEffect } from "react";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import { upload } from "thirdweb/storage";
 import { apiServerProxy } from "@/actions/proxies";
 import { sendTeamInvites } from "@/actions/sendTeamInvite";
 import {
@@ -7,10 +11,6 @@ import {
 } from "@/analytics/report";
 import type { Team } from "@/api/team";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useEffect } from "react";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
-import { upload } from "thirdweb/storage";
 import { updateTeam } from "../../../team/[team_slug]/(team)/~/settings/general/updateTeam";
 import { InviteTeamMembersUI } from "./InviteTeamMembers";
 import { TeamInfoFormUI } from "./TeamInfoForm";
@@ -29,15 +29,16 @@ export function TeamInfoForm(props: {
 
   return (
     <TeamInfoFormUI
+      client={props.client}
       isTeamSlugAvailable={async (slug) => {
         const res = await apiServerProxy<{
           result: boolean;
         }>({
+          method: "GET",
           pathname: "/v1/teams/check-slug",
           searchParams: {
             slug,
           },
-          method: "GET",
         });
 
         if (!res.ok) {
@@ -46,11 +47,10 @@ export function TeamInfoForm(props: {
 
         return res.data.result;
       }}
-      teamSlug={props.teamSlug}
-      client={props.client}
       onComplete={(updatedTeam) => {
         router.replace(`/get-started/team/${updatedTeam.slug}/select-plan`);
       }}
+      teamSlug={props.teamSlug}
       updateTeam={async (data) => {
         const teamValue: Partial<Team> = {
           name: data.name,
@@ -93,17 +93,12 @@ export function InviteTeamMembers(props: {
   return (
     <InviteTeamMembersUI
       client={props.client}
-      onComplete={() => {
-        // at this point the team onboarding is complete
-        reportOnboardingCompleted();
-        router.replace(`/team/${props.team.slug}`);
-      }}
       getTeam={async () => {
         const res = await apiServerProxy<{
           result: Team;
         }>({
-          pathname: `/v1/teams/${props.team.slug}`,
           method: "GET",
+          pathname: `/v1/teams/${props.team.slug}`,
         });
 
         if (!res.ok) {
@@ -112,11 +107,10 @@ export function InviteTeamMembers(props: {
 
         return res.data.result;
       }}
-      team={props.team}
       inviteTeamMembers={async (params) => {
         const res = await sendTeamInvites({
-          teamId: props.team.id,
           invites: params,
+          teamId: props.team.id,
         });
 
         if (!res.ok) {
@@ -127,6 +121,12 @@ export function InviteTeamMembers(props: {
           results: res.results,
         };
       }}
+      onComplete={() => {
+        // at this point the team onboarding is complete
+        reportOnboardingCompleted();
+        router.replace(`/team/${props.team.slug}`);
+      }}
+      team={props.team}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/login/page.tsx b/apps/dashboard/src/app/(app)/login/page.tsx
index b23768ea7d0..7161a09c74a 100644
--- a/apps/dashboard/src/app/(app)/login/page.tsx
+++ b/apps/dashboard/src/app/(app)/login/page.tsx
@@ -1,7 +1,7 @@
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { getRawAccount } from "../account/settings/getAccount";
-import { LoginAndOnboardingPage } from "./LoginPage";
 import { isValidEncodedRedirectPath } from "./isValidEncodedRedirectPath";
+import { LoginAndOnboardingPage } from "./LoginPage";
 
 export default async function Page(props: {
   searchParams: Promise<{
@@ -26,9 +26,9 @@ export default async function Page(props: {
   return (
     <LoginAndOnboardingPage
       account={account}
-      redirectPath={redirectPath}
-      loginWithInAppWallet={searchParams["in-app-wallet"] === "true"}
       client={getClientThirdwebClient()}
+      loginWithInAppWallet={searchParams["in-app-wallet"] === "true"}
+      redirectPath={redirectPath}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/login/verifyTurnstileToken.ts b/apps/dashboard/src/app/(app)/login/verifyTurnstileToken.ts
index 01f59fb31e5..06fa4ddd447 100644
--- a/apps/dashboard/src/app/(app)/login/verifyTurnstileToken.ts
+++ b/apps/dashboard/src/app/(app)/login/verifyTurnstileToken.ts
@@ -1,7 +1,7 @@
 import "server-only";
-import { TURNSTILE_SECRET_KEY } from "@/constants/server-envs";
 import { ipAddress } from "@vercel/functions";
 import { headers } from "next/headers";
+import { TURNSTILE_SECRET_KEY } from "@/constants/server-envs";
 
 export async function verifyTurnstileToken(turnstileToken: string) {
   // get the request headers
@@ -41,8 +41,8 @@ export async function verifyTurnstileToken(turnstileToken: string) {
 
   if (!ip) {
     return {
-      error: "Could not get IP address. Please try again.",
       context: errors,
+      error: "Could not get IP address. Please try again.",
     };
   }
 
@@ -52,14 +52,14 @@ export async function verifyTurnstileToken(turnstileToken: string) {
     "https://challenges.cloudflare.com/turnstile/v0/siteverify",
     {
       body: JSON.stringify({
-        secret: TURNSTILE_SECRET_KEY,
-        response: turnstileToken,
         remoteip: ip,
+        response: turnstileToken,
+        secret: TURNSTILE_SECRET_KEY,
       }),
-      method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
 
diff --git a/apps/dashboard/src/app/(app)/project-showcase/[slug]/page.tsx b/apps/dashboard/src/app/(app)/project-showcase/[slug]/page.tsx
index b8b9f40d20e..c835b68a528 100644
--- a/apps/dashboard/src/app/(app)/project-showcase/[slug]/page.tsx
+++ b/apps/dashboard/src/app/(app)/project-showcase/[slug]/page.tsx
@@ -1,3 +1,6 @@
+import { PROJECT_SHOWCASE_DATA } from "lib/project-showcase-constants";
+import { ExternalLinkIcon, FileTextIcon } from "lucide-react";
+import Link from "next/link";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -9,9 +12,6 @@ import {
 } from "@/components/ui/card";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { PROJECT_SHOWCASE_DATA } from "lib/project-showcase-constants";
-import { ExternalLinkIcon, FileTextIcon } from "lucide-react";
-import Link from "next/link";
 
 export default async function DetailPage(props: {
   params: Promise<{ slug: string }>;
@@ -49,19 +49,19 @@ export default async function DetailPage(props: {
               <Button asChild className="w-full sm:w-auto">
                 <Link
                   href={project.link}
-                  target="_blank"
                   rel="noopener noreferrer"
+                  target="_blank"
                 >
                   <ExternalLinkIcon className="mr-2 h-4 w-4" />
                   Visit Project Website
                 </Link>
               </Button>
               {project.case_study && (
-                <Button asChild variant="outline" className="w-full sm:w-auto">
+                <Button asChild className="w-full sm:w-auto" variant="outline">
                   <Link
                     href={project.case_study}
-                    target="_blank"
                     rel="noopener noreferrer"
+                    target="_blank"
                   >
                     <FileTextIcon className="mr-2 h-4 w-4" />
                     Link to Case Study
@@ -74,6 +74,9 @@ export default async function DetailPage(props: {
             <div className="relative aspect-video h-full w-full md:aspect-square">
               {/* eslint-disable @next/next/no-img-element */}
               <img
+                alt={`${project.title} Thumbnail`}
+                className="rounded-b-lg object-cover md:rounded-r-lg md:rounded-bl-none"
+                height={500}
                 src={
                   project.image?.startsWith("ipfs://")
                     ? (resolveSchemeWithErrorHandler({
@@ -82,10 +85,7 @@ export default async function DetailPage(props: {
                       }) ?? "")
                     : (project.image ?? "/assets/showcase/default_image.png")
                 }
-                alt={`${project.title} Thumbnail`}
                 width={500}
-                height={500}
-                className="rounded-b-lg object-cover md:rounded-r-lg md:rounded-bl-none"
               />
             </div>
           </div>
diff --git a/apps/dashboard/src/app/(app)/project-showcase/page.tsx b/apps/dashboard/src/app/(app)/project-showcase/page.tsx
index 3ab15aa68a0..8a6e8d6ec7f 100644
--- a/apps/dashboard/src/app/(app)/project-showcase/page.tsx
+++ b/apps/dashboard/src/app/(app)/project-showcase/page.tsx
@@ -1,3 +1,13 @@
+import {
+  PROJECT_SHOWCASE_DATA,
+  PROJECT_SHOWCASE_INDUSTRIES,
+  PROJECT_SHOWCASE_ITEMS_PER_PAGE,
+} from "lib/project-showcase-constants";
+import { getAbsoluteUrl } from "lib/vercel-utils";
+import { FileTextIcon } from "lucide-react";
+import type { Metadata } from "next";
+import Image from "next/image";
+import Link from "next/link";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -17,31 +27,21 @@ import {
 } from "@/components/ui/pagination";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import {
-  PROJECT_SHOWCASE_DATA,
-  PROJECT_SHOWCASE_INDUSTRIES,
-  PROJECT_SHOWCASE_ITEMS_PER_PAGE,
-} from "lib/project-showcase-constants";
-import { getAbsoluteUrl } from "lib/vercel-utils";
-import { FileTextIcon } from "lucide-react";
-import type { Metadata } from "next";
-import Image from "next/image";
-import Link from "next/link";
 
 export const metadata: Metadata = {
-  title: "Project Showcase | Built on thirdweb",
   description: "Discover the latest web3 apps and games built on thirdweb",
   openGraph: {
-    title: "Project Showcase | Built on thirdweb",
     description: "Discover the latest web3 apps and games built on thirdweb",
     images: [
       {
+        height: 630,
         url: `${getAbsoluteUrl()}/assets/showcase/og_image.png`,
         width: 1200,
-        height: 630,
       },
     ],
+    title: "Project Showcase | Built on thirdweb",
   },
+  title: "Project Showcase | Built on thirdweb",
 };
 
 export default async function ProjectShowcasePage(props: {
@@ -82,14 +82,14 @@ export default async function ProjectShowcasePage(props: {
               </div>
               <div className="flex flex-col gap-2 min-[400px]:flex-row">
                 <Link
-                  href="https://thirdweb.com/login"
                   className="inline-flex h-10 items-center justify-center rounded-md bg-gray-900 px-8 font-medium text-gray-50 text-sm shadow transition-colors hover:bg-gray-900/90 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-950 disabled:pointer-events-none disabled:opacity-50 dark:bg-gray-50 dark:text-gray-900 dark:focus-visible:ring-gray-300 dark:hover:bg-gray-50/90"
+                  href="https://thirdweb.com/login"
                 >
                   Get Started
                 </Link>
                 <Link
-                  href="https://blog.thirdweb.com/case-studies/"
                   className="inline-flex h-10 items-center justify-center rounded-md border border-gray-200 bg-white px-8 font-medium text-sm shadow-sm transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-950 disabled:pointer-events-none disabled:opacity-50 dark:border-gray-800 dark:bg-gray-950 dark:focus-visible:ring-gray-300 dark:hover:bg-gray-800 dark:hover:text-gray-50"
+                  href="https://blog.thirdweb.com/case-studies/"
                 >
                   View all case studies
                 </Link>
@@ -111,13 +111,13 @@ export default async function ProjectShowcasePage(props: {
             <div className="mb-8 flex flex-wrap justify-center gap-2">
               {PROJECT_SHOWCASE_INDUSTRIES.map((industry) => (
                 <Link
-                  key={industry}
-                  href={`/project-showcase?industry=${industry}&page=1`}
                   className={`inline-flex h-10 items-center justify-center rounded-md px-4 py-2 font-medium text-sm transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring ${
                     selectedIndustry === industry
                       ? "bg-primary text-primary-foreground shadow hover:bg-primary/90"
                       : "border border-input bg-background hover:bg-accent hover:text-accent-foreground"
                   }`}
+                  href={`/project-showcase?industry=${industry}&page=1`}
+                  key={industry}
                 >
                   {industry}
                 </Link>
@@ -126,14 +126,17 @@ export default async function ProjectShowcasePage(props: {
           </div>
           <div className="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
             {paginatedProjects.map((project) => (
-              <div key={project.id} className="block">
+              <div className="block" key={project.id}>
                 <Card className="flex h-full cursor-pointer flex-col overflow-hidden transition-shadow hover:shadow-lg">
                   <Link
-                    href={`/project-showcase/${project.slug}`}
                     className="flex-grow"
+                    href={`/project-showcase/${project.slug}`}
                   >
                     {/* eslint-disable @next/next/no-img-element */}
                     <img
+                      alt={project.title}
+                      className="h-48 w-full object-cover"
+                      height={200}
                       src={
                         project.image?.startsWith("ipfs://")
                           ? (resolveSchemeWithErrorHandler({
@@ -143,10 +146,7 @@ export default async function ProjectShowcasePage(props: {
                           : (project.image ??
                             "/assets/showcase/default_image.png")
                       }
-                      alt={project.title}
                       width={300}
-                      height={200}
-                      className="h-48 w-full object-cover"
                     />
                     <CardHeader>
                       <CardTitle className="mb-3">{project.title}</CardTitle>
@@ -165,10 +165,10 @@ export default async function ProjectShowcasePage(props: {
                       {project.case_study && (
                         <Link
                           href={project.case_study}
-                          target="_blank"
                           rel="noopener noreferrer"
+                          target="_blank"
                         >
-                          <Button variant="outline" size="sm">
+                          <Button size="sm" variant="outline">
                             <FileTextIcon className="mr-2 h-4 w-4" /> Case Study
                           </Button>
                         </Link>
@@ -192,8 +192,8 @@ export default async function ProjectShowcasePage(props: {
                     href={`/project-showcase?industry=${selectedIndustry}&page=${
                       currentPage > 1 ? currentPage - 1 : 1
                     }`}
-                    passHref
                     legacyBehavior
+                    passHref
                   >
                     <PaginationPrevious
                       className={
@@ -207,8 +207,8 @@ export default async function ProjectShowcasePage(props: {
                     <PaginationItem key={`page-${pageNumber}`}>
                       <Link
                         href={`/project-showcase?industry=${selectedIndustry}&page=${pageNumber}`}
-                        passHref
                         legacyBehavior
+                        passHref
                       >
                         <PaginationLink isActive={currentPage === pageNumber}>
                           {pageNumber}
@@ -222,8 +222,8 @@ export default async function ProjectShowcasePage(props: {
                     href={`/project-showcase?industry=${selectedIndustry}&page=${
                       currentPage < totalPages ? currentPage + 1 : totalPages
                     }`}
-                    passHref
                     legacyBehavior
+                    passHref
                   >
                     <PaginationNext
                       className={
diff --git a/apps/dashboard/src/app/(app)/providers.tsx b/apps/dashboard/src/app/(app)/providers.tsx
index e7b9cba9328..e39a4c4973b 100644
--- a/apps/dashboard/src/app/(app)/providers.tsx
+++ b/apps/dashboard/src/app/(app)/providers.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { CustomConnectWallet } from "@3rdweb-sdk/react/components/connect-wallet";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { isSanctionedAddress } from "data/eth-sanctioned-addresses";
@@ -15,6 +14,7 @@ import {
   useActiveAccount,
   useConnectionManager,
 } from "thirdweb/react";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { TWAutoConnect } from "./components/autoconnect";
 
 const queryClient = new QueryClient();
@@ -30,9 +30,9 @@ export function AppRouterProviders(props: { children: React.ReactNode }) {
           <TWAutoConnect client={thirdwebClient} />
           <ThemeProvider
             attribute="class"
+            defaultTheme="dark"
             disableTransitionOnChange
             enableSystem={false}
-            defaultTheme="dark"
           >
             <ToasterSetup />
             <SanctionedAddressesChecker>
@@ -85,9 +85,9 @@ const SanctionedAddressesChecker = ({
         <div className="flex flex-col items-center gap-4">
           <p> Your wallet address is blocked </p>
           <CustomConnectWallet
-            loginRequired={false}
-            isLoggedIn={true}
             client={client}
+            isLoggedIn={true}
+            loginRequired={false}
           />
         </div>
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/BillingAlertBanner.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/BillingAlertBanner.stories.tsx
index 1bf3519e954..a09c3db6ee8 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/BillingAlertBanner.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/BillingAlertBanner.stories.tsx
@@ -5,12 +5,12 @@ import {
 } from "./BillingAlertBannersUI";
 
 const meta = {
-  title: "Banners/Billing Alerts",
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Banners/Billing Alerts",
 } satisfies Meta;
 
 export default meta;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/BillingAlertBannersUI.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/BillingAlertBannersUI.tsx
index 148de2c96a1..be38422f43f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/BillingAlertBannersUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/BillingAlertBannersUI.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import Link from "next/link";
+import { useTransition } from "react";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { cn } from "@/lib/utils";
-import Link from "next/link";
-import { useTransition } from "react";
 import { useStripeRedirectEvent } from "../../../../(stripe)/stripe-redirect/stripeRedirectChannel";
 
 function BillingAlertBanner(props: {
@@ -62,14 +62,10 @@ function BillingAlertBanner(props: {
   );
 }
 
-export function PastDueBannerUI(props: {
-  teamSlug: string;
-}) {
+export function PastDueBannerUI(props: { teamSlug: string }) {
   return (
     <BillingAlertBanner
       ctaLabel="View Invoices"
-      variant="warning"
-      title="Unpaid Invoices"
       description={
         <>
           You have unpaid invoices. Service may be suspended if not paid
@@ -77,18 +73,16 @@ export function PastDueBannerUI(props: {
         </>
       }
       teamSlug={props.teamSlug}
+      title="Unpaid Invoices"
+      variant="warning"
     />
   );
 }
 
-export function ServiceCutOffBannerUI(props: {
-  teamSlug: string;
-}) {
+export function ServiceCutOffBannerUI(props: { teamSlug: string }) {
   return (
     <BillingAlertBanner
       ctaLabel="Pay Now"
-      variant="error"
-      title="Service Suspended"
       description={
         <>
           Your service has been suspended due to unpaid invoices. Pay now to
@@ -96,6 +90,8 @@ export function ServiceCutOffBannerUI(props: {
         </>
       }
       teamSlug={props.teamSlug}
+      title="Service Suspended"
+      variant="error"
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/Changelog.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/Changelog.tsx
index 04f3e85f650..baac7e5bde7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/Changelog.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/Changelog.tsx
@@ -20,10 +20,9 @@ export async function Changelog() {
 
           <div className="flex flex-col">
             <Link
-              target="_blank"
-              href={`${item.url}?utm_source=thirdweb&utm_campaign=changelog`}
-              role="group"
               className="line-clamp-2 text-foreground text-sm hover:underline"
+              href={`${item.url}?utm_source=thirdweb&utm_campaign=changelog`}
+              target="_blank"
             >
               {item.title}
             </Link>
@@ -36,10 +35,10 @@ export async function Changelog() {
         </div>
       ))}
       <Link
+        className="flex items-center gap-2 pl-5 text-foreground text-sm hover:underline"
         href="https://blog.thirdweb.com/changelog?utm_source=thirdweb&utm_campaign=changelog"
-        target="_blank"
         rel="noopener noreferrer"
-        className="flex items-center gap-2 pl-5 text-foreground text-sm hover:underline"
+        target="_blank"
       >
         View More <ArrowRightIcon className="size-4" />
       </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/FreePlanUpsellBannerUI.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/FreePlanUpsellBannerUI.tsx
index 857bd8e7036..48437219b4f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/FreePlanUpsellBannerUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/FreePlanUpsellBannerUI.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import { ArrowRightIcon, RocketIcon } from "lucide-react";
 import type { Team } from "@/api/team";
 import { UpsellBannerCard } from "@/components/blocks/UpsellBannerCard";
-import { ArrowRightIcon, RocketIcon } from "lucide-react";
 
 /**
  * Banner shown to teams on the free plan encouraging them to upgrade.
@@ -15,19 +15,19 @@ export function FreePlanUpsellBannerUI(props: {
 }) {
   return (
     <UpsellBannerCard
-      title="Unlock more with thirdweb"
-      description="Upgrade to increase limits and access advanced features."
+      accentColor="green"
       cta={{
-        text: "View plans",
         icon: <ArrowRightIcon className="size-4" />,
         link: `/team/${props.teamSlug}/~/settings/billing?showPlans=true&highlight=${
           props.highlightPlan || "growth"
         }`,
+        text: "View plans",
       }}
+      description="Upgrade to increase limits and access advanced features."
+      icon={<RocketIcon className="size-5" />}
+      title="Unlock more with thirdweb"
       trackingCategory="billingBanner"
       trackingLabel="freePlan_viewPlans"
-      icon={<RocketIcon className="size-5" />}
-      accentColor="green"
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/TotalSponsoredCard.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/TotalSponsoredCard.tsx
index a93280a2066..6d84342df41 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/TotalSponsoredCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/TotalSponsoredCard.tsx
@@ -1,8 +1,8 @@
-import { cn } from "@/lib/utils";
 import { EmptyAccountAbstractionChartContent } from "components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard";
 import { defineChain } from "thirdweb";
 import { type ChainMetadata, getChainMetadata } from "thirdweb/chains";
 import type { UserOpStats } from "types/analytics";
+import { cn } from "@/lib/utils";
 import { BarChart } from "../../../components/Analytics/BarChart";
 import { CombinedBarChartCard } from "../../../components/Analytics/CombinedBarChartCard";
 
@@ -71,16 +71,16 @@ export async function TotalSponsoredChartCardUI({
 
   const chartConfig = {
     mainnet: {
-      label: "Mainnet Chains",
       color: "hsl(var(--chart-1))",
+      label: "Mainnet Chains",
     },
     testnet: {
-      label: "Testnet Chains",
       color: "hsl(var(--chart-2))",
+      label: "Testnet Chains",
     },
     total: {
-      label: "All Chains",
       color: "hsl(var(--chart-3))",
+      label: "All Chains",
     },
   };
 
@@ -93,11 +93,11 @@ export async function TotalSponsoredChartCardUI({
         </h3>
         <p className="text-muted-foreground text-sm"> {description}</p>
         <BarChart
-          isCurrency
+          activeKey="mainnet"
           chartConfig={chartConfig}
           data={filteredData}
-          activeKey="mainnet"
           emptyChartContent={<EmptyAccountAbstractionChartContent />}
+          isCurrency
         />
       </div>
     );
@@ -105,17 +105,17 @@ export async function TotalSponsoredChartCardUI({
 
   return (
     <CombinedBarChartCard
-      isCurrency
-      title={title || "Gas Sponsored"}
-      chartConfig={chartConfig}
-      data={timeSeriesData}
       activeChart={
         (searchParams?.totalSponsored as keyof typeof chartConfig) ?? "mainnet"
       }
-      queryKey="totalSponsored"
-      existingQueryParams={searchParams}
       aggregateFn={(_data, key) => processedAggregatedData[key]}
+      chartConfig={chartConfig}
       className={className}
+      data={timeSeriesData}
+      existingQueryParams={searchParams}
+      isCurrency
+      queryKey="totalSponsored"
+      title={title || "Gas Sponsored"}
       // Get the trend from the last two COMPLETE periods
       trendFn={(data, key) =>
         data.filter((d) => (d[key] as number) > 0).length >= 2
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/TransactionsCard.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/TransactionsCard.tsx
index 9eccf19ba6e..46fa303b914 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/TransactionsCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/TransactionsCard.tsx
@@ -1,8 +1,8 @@
-import { cn } from "@/lib/utils";
 import { EmptyAccountAbstractionChartContent } from "components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard";
 import { defineChain } from "thirdweb";
 import { type ChainMetadata, getChainMetadata } from "thirdweb/chains";
 import type { TransactionStats } from "types/analytics";
+import { cn } from "@/lib/utils";
 import { BarChart } from "../../../components/Analytics/BarChart";
 import { CombinedBarChartCard } from "../../../components/Analytics/CombinedBarChartCard";
 
@@ -73,16 +73,16 @@ export async function TransactionsChartCardUI({
 
   const chartConfig = {
     mainnet: {
-      label: "Mainnet Chains",
       color: "hsl(var(--chart-1))",
+      label: "Mainnet Chains",
     },
     testnet: {
-      label: "Testnet Chains",
       color: "hsl(var(--chart-2))",
+      label: "Testnet Chains",
     },
     total: {
-      label: "All Chains",
       color: "hsl(var(--chart-3))",
+      label: "All Chains",
     },
   };
 
@@ -95,9 +95,9 @@ export async function TransactionsChartCardUI({
         </h3>
         <p className="text-muted-foreground"> {description}</p>
         <BarChart
+          activeKey="mainnet"
           chartConfig={chartConfig}
           data={filteredData}
-          activeKey="mainnet"
           emptyChartContent={<EmptyAccountAbstractionChartContent />}
         />
       </div>
@@ -106,17 +106,17 @@ export async function TransactionsChartCardUI({
 
   return (
     <CombinedBarChartCard
-      title={title || "Transactions"}
-      chartConfig={chartConfig}
-      data={timeSeriesData}
       activeChart={
         (searchParams?.client_transactions as keyof typeof chartConfig) ??
         "mainnet"
       }
-      queryKey="client_transactions"
-      existingQueryParams={searchParams}
       aggregateFn={(_data, key) => processedAggregatedData[key]}
+      chartConfig={chartConfig}
       className={className}
+      data={timeSeriesData}
+      existingQueryParams={searchParams}
+      queryKey="client_transactions"
+      title={title || "Transactions"}
       // Get the trend from the last two COMPLETE periods
       trendFn={(data, key) =>
         data.filter((d) => (d[key] as number) > 0).length >= 2
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/invite-team-members-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/invite-team-members-button.tsx
index 5e450b57652..a9d9c777526 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/invite-team-members-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/invite-team-members-button.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import { UserPlusIcon } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
 export function InviteTeamMembersButton(props: { teamSlug: string }) {
   return (
-    <Button asChild variant="outline" className="gap-2">
+    <Button asChild className="gap-2" variant="outline">
       <Link href={`/team/${props.teamSlug}/~/settings/members`}>
         <UserPlusIcon className="size-4" />
         <span>Invite Team Members</span>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/usage-category-details.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/usage-category-details.tsx
index 408ce4844ce..b55328398a5 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/usage-category-details.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/_components/usage-category-details.tsx
@@ -49,8 +49,8 @@ export function UsageCategoryDetails({ category }: UsageCategoryDetailsProps) {
             {filteredLineItems.length > 0 ? (
               filteredLineItems.map((item, index) => (
                 <TableRow
-                  key={`${item.description}_${index}`}
                   className="hover:bg-accent"
+                  key={`${item.description}_${index}`}
                 >
                   <TableCell className="py-3 pl-6 font-medium">
                     {item.description}
@@ -60,8 +60,8 @@ export function UsageCategoryDetails({ category }: UsageCategoryDetailsProps) {
                   </TableCell>
                   <TableCell className="py-3 text-right">
                     {formatPrice(item.unitAmountUsdCents, {
-                      isUnitPrice: true,
                       inCents: true,
+                      isUnitPrice: true,
                     })}
                   </TableCell>
                   <TableCell className="py-3 pr-6 text-right">
@@ -76,8 +76,8 @@ export function UsageCategoryDetails({ category }: UsageCategoryDetailsProps) {
             ) : (
               <TableRow>
                 <TableCell
-                  colSpan={4}
                   className="h-24 pl-6 text-center text-muted-foreground"
+                  colSpan={4}
                 >
                   No usage during this period.
                 </TableCell>
@@ -113,9 +113,9 @@ export function formatPrice(
   const amountInDollars = inCents ? numericValue / 100 : numericValue;
 
   return amountInDollars.toLocaleString("en-US", {
-    style: "currency",
     currency: "USD",
+    maximumFractionDigits: isUnitPrice ? 10 : 2,
     minimumFractionDigits: 2,
-    maximumFractionDigits: isUnitPrice ? 10 : 2, // Allow more precision for unit prices
+    style: "currency", // Allow more precision for unit prices
   });
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/layout.tsx
index 482c29c3af7..3becb1503c0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/layout.tsx
@@ -1,14 +1,14 @@
+import { AnnouncementBanner } from "components/notices/AnnouncementBanner";
+import Link from "next/link";
+import { redirect } from "next/navigation";
 import { getProjects } from "@/api/projects";
 import { getTeamBySlug, getTeams } from "@/api/team";
 import { AppFooter } from "@/components/blocks/app-footer";
 import { Button } from "@/components/ui/button";
 import { TabPathLinks } from "@/components/ui/tabs";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { AnnouncementBanner } from "components/notices/AnnouncementBanner";
-import Link from "next/link";
-import { redirect } from "next/navigation";
-import { siwaExamplePrompts } from "../../../(dashboard)/support/definitions";
 import { CustomChatButton } from "../../../../../components/CustomChat/CustomChatButton";
+import { siwaExamplePrompts } from "../../../(dashboard)/support/definitions";
 import { getValidAccount } from "../../../account/settings/getAccount";
 import {
   getAuthToken,
@@ -36,8 +36,8 @@ export default async function TeamLayout(props: {
 
   const teamsAndProjects = await Promise.all(
     teams.map(async (team) => ({
-      team,
       projects: await getProjects(team.slug),
+      team,
     })),
   );
 
@@ -57,7 +57,7 @@ export default async function TeamLayout(props: {
                 You can only view this team, not take any actions.
               </p>
             </div>
-            <Button variant="default" asChild>
+            <Button asChild variant="default">
               <Link href="/team/~">Leave Staff Mode</Link>
             </Button>
           </div>
@@ -66,58 +66,58 @@ export default async function TeamLayout(props: {
       <AnnouncementBanner />
       <div className="bg-card">
         <TeamHeaderLoggedIn
-          currentTeam={team}
-          teamsAndProjects={teamsAndProjects}
-          currentProject={undefined}
           account={account}
           accountAddress={accountAddress}
           client={client}
+          currentProject={undefined}
+          currentTeam={team}
+          teamsAndProjects={teamsAndProjects}
         />
 
         <TabPathLinks
-          tabContainerClassName="px-4 lg:px-6"
           links={[
             {
-              path: `/team/${params.team_slug}`,
-              name: "Overview",
               exactMatch: true,
+              name: "Overview",
+              path: `/team/${params.team_slug}`,
             },
             {
-              path: `/team/${params.team_slug}/~/analytics`,
               name: "Analytics",
+              path: `/team/${params.team_slug}/~/analytics`,
             },
             {
-              path: `/team/${params.team_slug}/~/ecosystem`,
               name: "Ecosystems",
+              path: `/team/${params.team_slug}/~/ecosystem`,
             },
             {
-              path: `/team/${params.team_slug}/~/usage`,
               name: "Usage",
+              path: `/team/${params.team_slug}/~/usage`,
             },
             {
-              path: `/team/${params.team_slug}/~/audit-log`,
               name: "Audit Log",
+              path: `/team/${params.team_slug}/~/audit-log`,
             },
             {
-              path: `/team/${params.team_slug}/~/settings`,
               name: "Settings",
+              path: `/team/${params.team_slug}/~/settings`,
             },
           ]}
+          tabContainerClassName="px-4 lg:px-6"
         />
       </div>
 
       <main className="flex grow flex-col">{props.children}</main>
       <div className="fixed right-6 bottom-6 z-50">
         <CustomChatButton
+          authToken={authToken}
           clientId={undefined}
+          examplePrompts={siwaExamplePrompts}
+          isFloating={true}
           isLoggedIn={true}
+          label="Ask AI Assistant"
           networks="all"
-          isFloating={true}
           pageType="support"
-          label="Ask AI Assistant"
-          examplePrompts={siwaExamplePrompts}
           teamId={team.id}
-          authToken={authToken}
         />
       </div>
       <AppFooter />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/page.tsx
index 1d7afe40978..3befed42873 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/page.tsx
@@ -1,10 +1,10 @@
+import { subDays } from "date-fns";
+import { redirect } from "next/navigation";
 import { getWalletConnections } from "@/api/analytics";
-import { type Project, getProjects } from "@/api/projects";
+import { getProjects, type Project } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
 import { DismissibleAlert } from "@/components/blocks/dismissible-alert";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { subDays } from "date-fns";
-import { redirect } from "next/navigation";
 import { getAuthToken } from "../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../login/loginRedirect";
 import { Changelog } from "./_components/Changelog";
@@ -58,21 +58,21 @@ export default async function Page(props: {
         <div className="flex grow flex-col gap-6 pt-8 lg:pb-20">
           {team.billingPlan === "free" ? (
             <FreePlanUpsellBannerUI
-              teamSlug={team.slug}
               highlightPlan="growth"
+              teamSlug={team.slug}
             />
           ) : (
             <DismissibleAlert
-              title="Looking for Engines?"
               description="Engines, contracts, project settings, and more are now managed within projects. Open or create a project to access them."
               localStorageId={`${team.id}-engines-alert`}
+              title="Looking for Engines?"
             />
           )}
 
           <TeamProjectsPage
+            client={client}
             projects={projectsWithTotalWallets}
             team={team}
-            client={client}
           />
         </div>
 
@@ -99,10 +99,10 @@ async function getProjectsWithAnalytics(
         const thirtyDaysAgo = subDays(today, 30);
 
         const data = await getWalletConnections({
-          teamId: project.teamId,
-          projectId: project.id,
-          period: "all",
           from: thirtyDaysAgo,
+          period: "all",
+          projectId: project.id,
+          teamId: project.teamId,
           to: today,
         });
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/analytics/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/analytics/page.tsx
index b0c675b15bb..426dd8886f1 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/analytics/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/analytics/page.tsx
@@ -1,35 +1,35 @@
 import {
-  getClientTransactions,
-  getInAppWalletUsage,
-  getUniversalBridgeUsage,
-  getUserOpUsage,
-  getWalletConnections,
-  getWalletUsers,
-} from "@/api/analytics";
+  EmptyStateCard,
+  EmptyStateContent,
+} from "app/(app)/team/components/Analytics/EmptyStateCard";
 import {
   type DurationId,
-  type Range,
   getLastNDaysRange,
+  type Range,
 } from "components/analytics/date-range-selector";
+import { LoadingChartState } from "components/analytics/empty-chart-state";
 import { redirect } from "next/navigation";
-import { type WalletId, getWalletInfo } from "thirdweb/wallets";
+import { Suspense } from "react";
+import { getWalletInfo, type WalletId } from "thirdweb/wallets";
 import type {
   InAppWalletStats,
   UniversalBridgeStats,
   WalletStats,
   WalletUserStats,
 } from "types/analytics";
+import {
+  getClientTransactions,
+  getInAppWalletUsage,
+  getUniversalBridgeUsage,
+  getUserOpUsage,
+  getWalletConnections,
+  getWalletUsers,
+} from "@/api/analytics";
+
+import { getTeamBySlug } from "@/api/team";
 import { AnalyticsHeader } from "../../../../components/Analytics/AnalyticsHeader";
 import { CombinedBarChartCard } from "../../../../components/Analytics/CombinedBarChartCard";
 import { PieChartCard } from "../../../../components/Analytics/PieChartCard";
-
-import { getTeamBySlug } from "@/api/team";
-import {
-  EmptyStateCard,
-  EmptyStateContent,
-} from "app/(app)/team/components/Analytics/EmptyStateCard";
-import { LoadingChartState } from "components/analytics/empty-chart-state";
-import { Suspense } from "react";
 import { TotalSponsoredChartCardUI } from "../../_components/TotalSponsoredCard";
 import { TransactionsChartCardUI } from "../../_components/TransactionsCard";
 
@@ -68,10 +68,10 @@ export default async function TeamOverviewPage(props: {
     <div className="flex grow flex-col">
       <div className="border-b">
         <AnalyticsHeader
-          title="Analytics"
           interval={interval}
           range={range}
           showRangeSelector={true}
+          title="Analytics"
         />
       </div>
       <div className="flex grow flex-col justify-between gap-10 md:container md:pt-8 md:pb-16">
@@ -80,10 +80,10 @@ export default async function TeamOverviewPage(props: {
             fallback={<LoadingChartState className="h-[458px] border" />}
           >
             <AsyncAppHighlightsCard
-              teamId={team.id}
-              range={range}
               interval={interval}
+              range={range}
               searchParams={searchParams}
+              teamId={team.id}
             />
           </Suspense>
 
@@ -91,13 +91,13 @@ export default async function TeamOverviewPage(props: {
             <Suspense
               fallback={<LoadingChartState className="h-[431px] border" />}
             >
-              <AsyncWalletDistributionCard teamId={team.id} range={range} />
+              <AsyncWalletDistributionCard range={range} teamId={team.id} />
             </Suspense>
 
             <Suspense
               fallback={<LoadingChartState className="h-[431px] border" />}
             >
-              <AsyncAuthMethodDistributionCard teamId={team.id} range={range} />
+              <AsyncAuthMethodDistributionCard range={range} teamId={team.id} />
             </Suspense>
           </div>
 
@@ -105,10 +105,10 @@ export default async function TeamOverviewPage(props: {
             fallback={<LoadingChartState className="h-[458px] border" />}
           >
             <AsyncTransactionsChartCard
-              teamId={team.id}
-              range={range}
               interval={interval}
+              range={range}
               searchParams={searchParams}
+              teamId={team.id}
             />
           </Suspense>
 
@@ -116,10 +116,10 @@ export default async function TeamOverviewPage(props: {
             fallback={<LoadingChartState className="h-[458px] border" />}
           >
             <AsyncTotalSponsoredCard
-              teamId={team.id}
-              range={range}
               interval={interval}
+              range={range}
               searchParams={searchParams}
+              teamId={team.id}
             />
           </Suspense>
         </div>
@@ -137,16 +137,16 @@ async function AsyncAppHighlightsCard(props: {
   const [walletUserStatsTimeSeries, universalBridgeUsage] =
     await Promise.allSettled([
       getWalletUsers({
-        teamId: props.teamId,
         from: props.range.from,
-        to: props.range.to,
         period: props.interval,
+        teamId: props.teamId,
+        to: props.range.to,
       }),
       getUniversalBridgeUsage({
-        teamId: props.teamId,
         from: props.range.from,
-        to: props.range.to,
         period: props.interval,
+        teamId: props.teamId,
+        to: props.range.to,
       }),
     ]);
 
@@ -158,9 +158,9 @@ async function AsyncAppHighlightsCard(props: {
     return (
       <div className="">
         <AppHighlightsCard
+          searchParams={props.searchParams}
           userStats={walletUserStatsTimeSeries.value}
           volumeStats={universalBridgeUsage.value}
-          searchParams={props.searchParams}
         />
       </div>
     );
@@ -168,8 +168,8 @@ async function AsyncAppHighlightsCard(props: {
 
   return (
     <EmptyStateCard
-      metric="Connect"
       link="https://portal.thirdweb.com/connect/quickstart"
+      metric="Connect"
     />
   );
 }
@@ -179,18 +179,18 @@ async function AsyncWalletDistributionCard(props: {
   range: Range;
 }) {
   const walletConnections = await getWalletConnections({
-    teamId: props.teamId,
     from: props.range.from,
-    to: props.range.to,
     period: "all",
+    teamId: props.teamId,
+    to: props.range.to,
   }).catch(() => undefined);
 
   return walletConnections && walletConnections.length > 0 ? (
     <WalletDistributionCard data={walletConnections} />
   ) : (
     <EmptyStateCard
-      metric="Connect"
       link="https://portal.thirdweb.com/connect/quickstart"
+      metric="Connect"
     />
   );
 }
@@ -200,18 +200,18 @@ async function AsyncAuthMethodDistributionCard(props: {
   range: Range;
 }) {
   const inAppWalletUsage = await getInAppWalletUsage({
-    teamId: props.teamId,
     from: props.range.from,
-    to: props.range.to,
     period: "all",
+    teamId: props.teamId,
+    to: props.range.to,
   }).catch(() => undefined);
 
   return inAppWalletUsage && inAppWalletUsage.length > 0 ? (
     <AuthMethodDistributionCard data={inAppWalletUsage} />
   ) : (
     <EmptyStateCard
-      metric="In-App Wallets"
       link="https://portal.thirdweb.com/typescript/v5/inAppWallet"
+      metric="In-App Wallets"
     />
   );
 }
@@ -225,16 +225,16 @@ async function AsyncTransactionsChartCard(props: {
   const [clientTransactionsTimeSeries, clientTransactions] =
     await Promise.allSettled([
       getClientTransactions({
-        teamId: props.teamId,
         from: props.range.from,
-        to: props.range.to,
         period: props.interval,
+        teamId: props.teamId,
+        to: props.range.to,
       }),
       getClientTransactions({
-        teamId: props.teamId,
         from: props.range.from,
-        to: props.range.to,
         period: "all",
+        teamId: props.teamId,
+        to: props.range.to,
       }),
     ]);
 
@@ -242,15 +242,15 @@ async function AsyncTransactionsChartCard(props: {
     clientTransactions.status === "fulfilled" &&
     clientTransactions.value.length > 0 ? (
     <TransactionsChartCardUI
-      searchParams={props.searchParams}
-      data={clientTransactionsTimeSeries.value}
       aggregatedData={clientTransactions.value}
       className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
+      data={clientTransactionsTimeSeries.value}
+      searchParams={props.searchParams}
     />
   ) : (
     <EmptyStateCard
-      metric="Transactions"
       link="https://portal.thirdweb.com/connect/quickstart"
+      metric="Transactions"
     />
   );
 }
@@ -263,16 +263,16 @@ async function AsyncTotalSponsoredCard(props: {
 }) {
   const [userOpUsageTimeSeries, userOpUsage] = await Promise.allSettled([
     getUserOpUsage({
-      teamId: props.teamId,
       from: props.range.from,
-      to: props.range.to,
       period: props.interval,
+      teamId: props.teamId,
+      to: props.range.to,
     }),
     getUserOpUsage({
-      teamId: props.teamId,
       from: props.range.from,
-      to: props.range.to,
       period: "all",
+      teamId: props.teamId,
+      to: props.range.to,
     }),
   ]);
 
@@ -280,15 +280,15 @@ async function AsyncTotalSponsoredCard(props: {
     userOpUsage.status === "fulfilled" &&
     userOpUsage.value.length > 0 ? (
     <TotalSponsoredChartCardUI
-      searchParams={props.searchParams}
-      data={userOpUsageTimeSeries.value}
       aggregatedData={userOpUsage.value}
       className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
+      data={userOpUsageTimeSeries.value}
+      searchParams={props.searchParams}
     />
   ) : (
     <EmptyStateCard
-      metric="Gas Sponsored"
       link="https://portal.thirdweb.com/typescript/v5/account-abstraction/get-started"
+      metric="Gas Sponsored"
     />
   );
 }
@@ -328,11 +328,11 @@ function processTimeSeriesData(
       .reduce((acc, curr) => acc + curr.developerFeeUsdCents / 100, 0);
 
     metrics.push({
-      date: stat.date,
       activeUsers: stat.totalUsers ?? 0,
+      date: stat.date,
+      feesCollected: fees,
       newUsers: stat.newUsers ?? 0,
       totalVolume: volume,
-      feesCollected: fees,
     });
   }
 
@@ -351,50 +351,52 @@ function AppHighlightsCard({
   const timeSeriesData = processTimeSeriesData(userStats, volumeStats);
 
   const chartConfig = {
-    totalVolume: {
-      label: "Total Volume",
-      color: "hsl(var(--chart-2))",
-      isCurrency: true,
+    activeUsers: { color: "hsl(var(--chart-1))", label: "Active Users" },
+    feesCollected: {
+      color: "hsl(var(--chart-4))",
       emptyContent: (
         <EmptyStateContent
-          metric="Payments"
-          description="Onramp, swap, and bridge with thirdweb's Universal Bridge."
-          link="https://portal.thirdweb.com/connect/pay/overview"
+          description="Your apps haven't collected any fees yet."
+          link={"https://portal.thirdweb.com/connect/pay/fees"}
+          metric="Fees"
         />
       ),
-    },
-    feesCollected: {
-      label: "Fee Revenue",
-      color: "hsl(var(--chart-4))",
       isCurrency: true,
+      label: "Fee Revenue",
+    },
+    newUsers: { color: "hsl(var(--chart-3))", label: "New Users" },
+    totalVolume: {
+      color: "hsl(var(--chart-2))",
       emptyContent: (
         <EmptyStateContent
-          metric="Fees"
-          description="Your apps haven't collected any fees yet."
-          link={"https://portal.thirdweb.com/connect/pay/fees"}
+          description="Onramp, swap, and bridge with thirdweb's Universal Bridge."
+          link="https://portal.thirdweb.com/connect/pay/overview"
+          metric="Payments"
         />
       ),
+      isCurrency: true,
+      label: "Total Volume",
     },
-    activeUsers: { label: "Active Users", color: "hsl(var(--chart-1))" },
-    newUsers: { label: "New Users", color: "hsl(var(--chart-3))" },
   } as const;
 
   return (
     <CombinedBarChartCard
-      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
-      title="App Highlights"
-      chartConfig={chartConfig}
       activeChart={
         (searchParams?.appHighlights as keyof AggregatedMetrics) ??
         "totalVolume"
       }
-      data={timeSeriesData}
       aggregateFn={(_data, key) => {
         if (key === "activeUsers") {
           return Math.max(...timeSeriesData.map((d) => d[key]));
         }
         return timeSeriesData.reduce((acc, curr) => acc + curr[key], 0);
       }}
+      chartConfig={chartConfig}
+      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
+      data={timeSeriesData}
+      existingQueryParams={searchParams}
+      queryKey="appHighlights"
+      title="App Highlights"
       trendFn={(data, key) =>
         data.filter((d) => (d[key] as number) > 0).length >= 2
           ? ((data[data.length - 2]?.[key] as number) ?? 0) /
@@ -402,8 +404,6 @@ function AppHighlightsCard({
             1
           : undefined
       }
-      queryKey="appHighlights"
-      existingQueryParams={searchParams}
     />
   );
 }
@@ -417,23 +417,23 @@ async function WalletDistributionCard({ data }: { data: WalletStats[] }) {
           () => ({ name: w.walletType }),
         );
         return {
-          walletType: w.walletType,
-          uniqueWalletsConnected: w.uniqueWalletsConnected,
           totalConnections: w.totalConnections,
+          uniqueWalletsConnected: w.uniqueWalletsConnected,
           walletName: wallet.name,
+          walletType: w.walletType,
         };
       }),
   );
 
   return (
     <PieChartCard
-      title="Wallets Connected"
       data={formattedData.map(({ walletName, uniqueWalletsConnected }) => {
         return {
-          value: uniqueWalletsConnected,
           label: walletName,
+          value: uniqueWalletsConnected,
         };
       })}
+      title="Wallets Connected"
     />
   );
 }
@@ -441,11 +441,11 @@ async function WalletDistributionCard({ data }: { data: WalletStats[] }) {
 function AuthMethodDistributionCard({ data }: { data: InAppWalletStats[] }) {
   return (
     <PieChartCard
-      title="Social Authentication"
       data={data.map(({ authenticationMethod, uniqueWalletsConnected }) => ({
-        value: uniqueWalletsConnected,
         label: authenticationMethod,
+        value: uniqueWalletsConnected,
       }))}
+      title="Social Authentication"
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/_components/entry.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/_components/entry.tsx
index 02bac873901..634896b9571 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/_components/entry.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/_components/entry.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import type { AuditLogEntry } from "@/api/audit-log";
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { formatDistanceToNow } from "date-fns";
 import { KeyIcon, SettingsIcon, UserIcon } from "lucide-react";
 import Link from "next/link";
+import type { AuditLogEntry } from "@/api/audit-log";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 
 interface AuditLogEntryProps {
   entry: AuditLogEntry;
@@ -31,8 +31,8 @@ export function AuditLogEntryComponent({ entry }: AuditLogEntryProps) {
               </span>
               {entry.what.path ? (
                 <Link
-                  href={entry.what.path}
                   className="font-medium text-sm hover:underline"
+                  href={entry.what.path}
                 >
                   {entry.what.text}
                 </Link>
@@ -46,8 +46,8 @@ export function AuditLogEntryComponent({ entry }: AuditLogEntryProps) {
                   <span className="text-muted-foreground text-sm">in</span>
                   {entry.what.in.path ? (
                     <Link
-                      href={entry.what.in.path}
                       className="font-medium text-sm hover:underline"
+                      href={entry.what.in.path}
                     >
                       {entry.what.in.text}
                     </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/_components/list.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/_components/list.tsx
index bbf5608e98b..bf92a5f70db 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/_components/list.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/_components/list.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import type { AuditLogEntry } from "@/api/audit-log";
-import { Button } from "@/components/ui/button";
 import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
 import { useQueryState } from "nuqs";
 import { useTransition } from "react";
+import type { AuditLogEntry } from "@/api/audit-log";
+import { Button } from "@/components/ui/button";
 import { searchParams } from "../search-params";
 import { AuditLogEntryComponent } from "./entry";
 
@@ -24,9 +24,9 @@ export function AuditLogList({
   const [after, setAfter] = useQueryState(
     "after",
     searchParams.after.withOptions({
-      startTransition,
       history: "push",
       shallow: false,
+      startTransition,
     }),
   );
 
@@ -37,8 +37,8 @@ export function AuditLogList({
       <div>
         {entries.map((log) => (
           <AuditLogEntryComponent
-            key={buildAuditLogEntryKey(log)}
             entry={log}
+            key={buildAuditLogEntryKey(log)}
           />
         ))}
       </div>
@@ -46,12 +46,12 @@ export function AuditLogList({
       {showPagination && (
         <div className="flex items-center justify-between border-t p-6">
           <Button
-            variant="outline"
-            size="sm"
+            disabled={isPending || !after}
             onClick={() => {
               window.history.back();
             }}
-            disabled={isPending || !after}
+            size="sm"
+            variant="outline"
           >
             {isPending ? (
               <div className="mr-2 h-4 w-4 animate-spin rounded-full border-2 border-current border-t-transparent" />
@@ -62,14 +62,14 @@ export function AuditLogList({
           </Button>
 
           <Button
-            variant="outline"
-            size="sm"
+            disabled={!hasMore || isPending}
             onClick={() => {
               if (hasMore && nextCursor) {
                 setAfter(nextCursor);
               }
             }}
-            disabled={!hasMore || isPending}
+            size="sm"
+            variant="outline"
           >
             Next
             {isPending && hasMore ? (
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/layout.tsx
index 38570d4a6bf..b3295bf6114 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/layout.tsx
@@ -15,12 +15,12 @@ export default async function Layout(props: {
   }
   return (
     <UpsellWrapper
+      currentPlan={team.billingPlan}
+      featureDescription="Monitor and review every action performed in your team with detailed audit logs."
+      featureName="Audit Log"
       isLocked={team.billingPlan !== "scale" && team.billingPlan !== "pro"}
       requiredPlan="scale"
-      featureName="Audit Log"
-      featureDescription="Monitor and review every action performed in your team with detailed audit logs."
       teamSlug={params.team_slug}
-      currentPlan={team.billingPlan}
     >
       <div className="flex grow flex-col">
         <div className="border-border border-b py-10">
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/page.tsx
index 02e83b4954f..a7b514dffee 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/page.tsx
@@ -1,6 +1,6 @@
+import { redirect } from "next/navigation";
 import { getAuditLogs } from "@/api/audit-log";
 import { getTeamBySlug } from "@/api/team";
-import { redirect } from "next/navigation";
 import { getValidAccount } from "../../../../../account/settings/getAccount";
 import { AuditLogList } from "./_components/list";
 import { searchParamLoader } from "./search-params";
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemAnalyticsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemAnalyticsPage.tsx
index c31430079bc..98546e841eb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemAnalyticsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemAnalyticsPage.tsx
@@ -1,9 +1,9 @@
-import { getEcosystemWalletUsage } from "@/api/analytics";
 import {
-  type Range,
   getLastNDaysRange,
+  type Range,
 } from "components/analytics/date-range-selector";
 import { RangeSelector } from "components/analytics/range-selector";
+import { getEcosystemWalletUsage } from "@/api/analytics";
 import type { Partner } from "../../../../types";
 import { EcosystemWalletUsersChartCard } from "./EcosystemWalletUsersChartCard";
 import { EcosystemWalletsSummary } from "./Summary";
@@ -27,26 +27,26 @@ export async function EcosystemAnalyticsPage({
 
   const allTimeStatsPromise = getEcosystemWalletUsage({
     ecosystemSlug,
-    teamId,
     from: new Date(2022, 0, 1),
-    to: new Date(),
     period: "all",
+    teamId,
+    to: new Date(),
   });
 
   const monthlyStatsPromise = getEcosystemWalletUsage({
     ecosystemSlug,
-    teamId,
     from: new Date(new Date().getFullYear(), new Date().getMonth(), 1),
-    to: new Date(),
     period: "month",
+    teamId,
+    to: new Date(),
   });
 
   const statsPromise = getEcosystemWalletUsage({
     ecosystemSlug,
-    teamId,
     from: range.from,
-    to: range.to,
     period: interval,
+    teamId,
+    to: range.to,
   }).catch(() => null);
 
   const [allTimeStats, monthlyStats, stats] = await Promise.all([
@@ -64,21 +64,21 @@ export async function EcosystemAnalyticsPage({
 
       <div className="h-6" />
 
-      <RangeSelector range={range} interval={interval} />
+      <RangeSelector interval={interval} range={range} />
 
       <div className="h-6" />
 
       <div className="flex flex-col gap-4 lg:gap-6">
         <EcosystemWalletUsersChartCard
           ecosystemWalletStats={stats || []}
-          isPending={false}
           groupBy="authenticationMethod"
+          isPending={false}
           partners={partners}
         />
         <EcosystemWalletUsersChartCard
           ecosystemWalletStats={stats || []}
-          isPending={false}
           groupBy="ecosystemPartnerId"
+          isPending={false}
           partners={partners}
         />
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.stories.tsx
index 49d01863632..a1bb5ebbd9e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.stories.tsx
@@ -3,7 +3,6 @@ import type { EcosystemWalletStats } from "types/analytics";
 import { EcosystemWalletUsersChartCard } from "./EcosystemWalletUsersChartCard";
 
 const meta = {
-  title: "Ecosystem/Analytics/EcosystemWalletUsersChartCard",
   component: EcosystemWalletUsersChartCard,
   decorators: [
     (Story) => (
@@ -12,6 +11,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Ecosystem/Analytics/EcosystemWalletUsersChartCard",
 } satisfies Meta<typeof EcosystemWalletUsersChartCard>;
 
 export default meta;
@@ -50,10 +50,10 @@ function ecosystemWalletStatsStub(
       const authMethod =
         authMethods[Math.floor(Math.random() * authMethods.length)];
       stats.push({
-        date: formattedDate,
         authenticationMethod: authMethod || "MetaMask",
-        uniqueWalletsConnected: Math.floor(Math.random() * 1000) + 1,
+        date: formattedDate,
         ecosystemPartnerId: "123",
+        uniqueWalletsConnected: Math.floor(Math.random() * 1000) + 1,
       });
     }
   }
@@ -65,8 +65,8 @@ function ecosystemWalletStatsStub(
 export const EmptyData: Story = {
   args: {
     ecosystemWalletStats: [],
-    isPending: false,
     groupBy: "authenticationMethod",
+    isPending: false,
   },
 };
 
@@ -74,8 +74,8 @@ export const EmptyData: Story = {
 export const Loading: Story = {
   args: {
     ecosystemWalletStats: [],
-    isPending: true,
     groupBy: "authenticationMethod",
+    isPending: true,
   },
 };
 
@@ -83,8 +83,8 @@ export const Loading: Story = {
 export const ThirtyDaysData: Story = {
   args: {
     ecosystemWalletStats: ecosystemWalletStatsStub(30),
-    isPending: false,
     groupBy: "authenticationMethod",
+    isPending: false,
   },
 };
 
@@ -92,8 +92,8 @@ export const ThirtyDaysData: Story = {
 export const SixtyDaysData: Story = {
   args: {
     ecosystemWalletStats: ecosystemWalletStatsStub(60),
-    isPending: false,
     groupBy: "authenticationMethod",
+    isPending: false,
   },
 };
 
@@ -101,8 +101,8 @@ export const SixtyDaysData: Story = {
 export const OneHundredTwentyDaysData: Story = {
   args: {
     ecosystemWalletStats: ecosystemWalletStatsStub(120),
-    isPending: false,
     groupBy: "authenticationMethod",
+    isPending: false,
   },
 };
 
@@ -119,8 +119,8 @@ export const ManyAuthMethods: Story = {
           authMethods[index % authMethods.length] || "MetaMask",
       }));
     })(),
-    isPending: false,
     groupBy: "authenticationMethod",
+    isPending: false,
   },
 };
 
@@ -131,7 +131,7 @@ export const ZeroValues: Story = {
       ...stat,
       uniqueWalletsConnected: 0,
     })),
-    isPending: false,
     groupBy: "authenticationMethod",
+    isPending: false,
   },
 };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.tsx
index 21c4d022639..91c842d6082 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.tsx
@@ -1,7 +1,4 @@
 "use client";
-import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
-import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
-import type { ChartConfig } from "@/components/ui/chart";
 import { ReactIcon } from "components/icons/brand-icons/ReactIcon";
 import { TypeScriptIcon } from "components/icons/brand-icons/TypeScriptIcon";
 import { UnityIcon } from "components/icons/brand-icons/UnityIcon";
@@ -10,6 +7,9 @@ import { format } from "date-fns";
 import { formatTickerNumber } from "lib/format-utils";
 import { useMemo } from "react";
 import type { EcosystemWalletStats } from "types/analytics";
+import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
+import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
+import type { ChartConfig } from "@/components/ui/chart";
 import type { Partner } from "../../../../types";
 
 type ChartData = Record<string, number> & {
@@ -90,13 +90,13 @@ export function EcosystemWalletUsersChartCard(props: {
 
     authMethodsToShow.forEach((walletType, i) => {
       _chartConfig[walletType] = {
+        color: `hsl(var(--chart-${(i % 10) + 1}))`,
         label:
           groupBy === "ecosystemPartnerId"
             ? partners?.find((p) => p.id === walletType)?.name ||
               authMethodsToShow[i] ||
               "none"
             : authMethodsToShow[i],
-        color: `hsl(var(--chart-${(i % 10) + 1}))`,
       };
     });
 
@@ -104,16 +104,16 @@ export function EcosystemWalletUsersChartCard(props: {
       // Add Other
       authMethodsToShow.push("others");
       _chartConfig.others = {
-        label: "Others",
         color: "hsl(var(--muted-foreground))",
+        label: "Others",
       };
     }
 
     return {
+      chartConfig: _chartConfig,
       chartData: Array.from(_chartDataMap.values()).sort(
         (a, b) => new Date(a.time).getTime() - new Date(b.time).getTime(),
       ),
-      chartConfig: _chartConfig,
     };
   }, [ecosystemWalletStats, groupBy, partners]);
 
@@ -128,6 +128,7 @@ export function EcosystemWalletUsersChartCard(props: {
   return (
     <ThirdwebBarChart
       chartClassName="aspect-[1.5] lg:aspect-[3.5]"
+      config={chartConfig}
       customHeader={
         <div className="relative px-6 pt-6">
           <h3 className="mb-1 font-semibold text-xl tracking-tight md:text-2xl">
@@ -141,8 +142,8 @@ export function EcosystemWalletUsersChartCard(props: {
           <div className="top-6 right-6 mb-4 grid grid-cols-2 items-center gap-2 md:absolute md:mb-0 md:flex">
             <ExportToCSVButton
               className="bg-background"
-              fileName="Connect Wallets"
               disabled={disableActions}
+              fileName="Connect Wallets"
               getData={async () => {
                 // Shows the number of each type of wallet connected on all dates
                 const header = ["Date", ...uniqueAuthMethods];
@@ -159,13 +160,11 @@ export function EcosystemWalletUsersChartCard(props: {
           </div>
         </div>
       }
-      config={chartConfig}
       data={chartData}
-      isPending={props.isPending}
       emptyChartState={<EcosystemWalletUsersEmptyChartState />}
-      showLegend
       hideLabel={false}
-      variant="stacked"
+      isPending={props.isPending}
+      showLegend
       toolTipLabelFormatter={(_v, item) => {
         if (Array.isArray(item)) {
           const time = item[0].payload.time as number;
@@ -174,6 +173,7 @@ export function EcosystemWalletUsersChartCard(props: {
         return undefined;
       }}
       toolTipValueFormatter={(value) => formatTickerNumber(Number(value))}
+      variant="stacked"
     />
   );
 }
@@ -186,24 +186,24 @@ function EcosystemWalletUsersEmptyChartState() {
       </span>
       <div className="flex max-w-md flex-wrap items-center justify-center gap-x-6 gap-y-4">
         <DocLink
-          link="https://portal.thirdweb.com/typescript/v5/ecosystemWallet"
-          label="TypeScript"
           icon={TypeScriptIcon}
+          label="TypeScript"
+          link="https://portal.thirdweb.com/typescript/v5/ecosystemWallet"
         />
         <DocLink
-          link="https://portal.thirdweb.com/react/v5/ecosystem-wallet/get-started"
-          label="React"
           icon={ReactIcon}
+          label="React"
+          link="https://portal.thirdweb.com/react/v5/ecosystem-wallet/get-started"
         />
         <DocLink
-          link="https://portal.thirdweb.com/react/v5/ecosystem-wallet/get-started"
-          label="React Native"
           icon={ReactIcon}
+          label="React Native"
+          link="https://portal.thirdweb.com/react/v5/ecosystem-wallet/get-started"
         />
         <DocLink
-          link="https://portal.thirdweb.com/unity/v5/wallets/ecosystem-wallet"
-          label="Unity"
           icon={UnityIcon}
+          label="Unity"
+          link="https://portal.thirdweb.com/unity/v5/wallets/ecosystem-wallet"
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/Summary.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/Summary.tsx
index 8b08969fa17..62f8868c788 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/Summary.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/Summary.tsx
@@ -29,16 +29,16 @@ export function EcosystemWalletsSummary(props: {
   return (
     <div className="grid grid-cols-2 gap-4 lg:gap-6">
       <StatCard
-        label="Total Users"
-        value={allTimeStats?.uniqueWalletsConnected || 0}
         icon={ActivityIcon}
         isPending={false}
+        label="Total Users"
+        value={allTimeStats?.uniqueWalletsConnected || 0}
       />
       <StatCard
-        label="Monthly Active Users"
-        value={monthlyStats?.uniqueWalletsConnected || 0}
         icon={UserIcon}
         isPending={false}
+        label="Monthly Active Users"
+        value={monthlyStats?.uniqueWalletsConnected || 0}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/page.tsx
index 2c2743e682f..9e9990cbff1 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/page.tsx
@@ -1,5 +1,5 @@
-import { getTeamBySlug } from "@/api/team";
 import { redirect } from "next/navigation";
+import { getTeamBySlug } from "@/api/team";
 import { getAuthToken } from "../../../../../../../../api/lib/getAuthToken";
 import { fetchEcosystem } from "../../../utils/fetchEcosystem";
 import { fetchPartners } from "../configuration/hooks/fetchPartners";
@@ -42,15 +42,14 @@ export default async function Page(props: {
   }
 
   const partners = await fetchPartners({
-    ecosystem,
     authToken,
+    ecosystem,
     teamId: team.id,
   });
 
   return (
     <EcosystemAnalyticsPage
       ecosystemSlug={ecosystem.slug}
-      teamId={team.id}
       interval={searchParams.interval || "week"}
       partners={partners}
       range={
@@ -62,6 +61,7 @@ export default async function Page(props: {
             }
           : undefined
       }
+      teamId={team.id}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/EcosystemSlugLayout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/EcosystemSlugLayout.tsx
index 0a71a2c9271..e9cf76e40eb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/EcosystemSlugLayout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/EcosystemSlugLayout.tsx
@@ -1,7 +1,7 @@
+import { redirect } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { SidebarLayout } from "@/components/blocks/SidebarLayout";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
 import { getAuthToken } from "../../../../../../../../api/lib/getAuthToken";
 import { fetchEcosystem } from "../../../utils/fetchEcosystem";
 import { EcosystemHeader } from "./ecosystem-header.client";
@@ -39,35 +39,35 @@ export async function EcosystemLayoutSlug({
   }
 
   const client = getClientThirdwebClient({
-    teamId: team.id,
     jwt: authToken,
+    teamId: team.id,
   });
 
   return (
     <div className="flex grow flex-col">
       <EcosystemHeader
+        authToken={authToken}
         client={client}
         ecosystem={ecosystem}
         ecosystemLayoutPath={ecosystemLayoutPath}
-        teamIdOrSlug={params.team_slug}
-        authToken={authToken}
         teamId={team.id}
+        teamIdOrSlug={params.team_slug}
       />
 
       <SidebarLayout
         sidebarLinks={[
           {
-            label: "Overview",
-            href: `${ecosystemLayoutPath}/${ecosystem.slug}`,
             exactMatch: true,
+            href: `${ecosystemLayoutPath}/${ecosystem.slug}`,
+            label: "Overview",
           },
           {
-            label: "Analytics",
             href: `${ecosystemLayoutPath}/${ecosystem.slug}/analytics`,
+            label: "Analytics",
           },
           {
-            label: "Design (coming soon)",
             href: `${ecosystemLayoutPath}/${ecosystem.slug}#`,
+            label: "Design (coming soon)",
           },
         ]}
       >
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/ecosystem-header.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/ecosystem-header.client.tsx
index b05af6e3f1a..dcfe1d418d4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/ecosystem-header.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/ecosystem-header.client.tsx
@@ -1,10 +1,22 @@
 "use client";
+import { useDashboardStorageUpload } from "@3rdweb-sdk/react/hooks/useDashboardStorageUpload";
+import {
+  AlertTriangleIcon,
+  CheckIcon,
+  ChevronsUpDownIcon,
+  ExternalLinkIcon,
+  PencilIcon,
+  PlusCircleIcon,
+} from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
 /* eslint-disable */
 import { Img } from "@/components/blocks/Img";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import {
   Dialog,
   DialogClose,
@@ -24,23 +36,11 @@ import {
 } from "@/components/ui/dropdown-menu";
 import { ImageUpload } from "@/components/ui/image-upload";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { cn } from "@/lib/utils";
-import { useDashboardStorageUpload } from "@3rdweb-sdk/react/hooks/useDashboardStorageUpload";
-import {
-  AlertTriangleIcon,
-  CheckIcon,
-  ChevronsUpDownIcon,
-  ExternalLinkIcon,
-  PencilIcon,
-  PlusCircleIcon,
-} from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
 import { useEcosystemList } from "../../../hooks/use-ecosystem-list";
 import type { Ecosystem } from "../../../types";
 import { useUpdateEcosystem } from "../configuration/hooks/use-update-ecosystem";
@@ -93,8 +93,8 @@ function EcosystemSelect(props: {
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
         <Button
-          variant="outline"
           className="relative flex w-full justify-start truncate pr-8 pl-3 md:w-48"
+          variant="outline"
         >
           <div className="truncate">{props.ecosystem?.name}</div>
           <ChevronsUpDownIcon className="absolute right-2 h-4 w-4 text-muted-foreground" />
@@ -103,10 +103,10 @@ function EcosystemSelect(props: {
       <DropdownMenuContent className="w-full md:w-48">
         <DropdownMenuGroup>
           {ecosystems?.map((ecosystem) => (
-            <DropdownMenuItem key={ecosystem.id} asChild>
+            <DropdownMenuItem asChild key={ecosystem.id}>
               <Link
-                href={`${props.ecosystemLayoutPath}/${ecosystem.slug}`}
                 className="relative flex cursor-pointer items-center pr-3 pl-8"
+                href={`${props.ecosystemLayoutPath}/${ecosystem.slug}`}
               >
                 {ecosystem.slug === props.ecosystem.slug && (
                   <CheckIcon className="absolute left-2 h-4 w-4 text-foreground" />
@@ -117,7 +117,7 @@ function EcosystemSelect(props: {
           ))}
         </DropdownMenuGroup>
         <DropdownMenuSeparator />
-        <Link href={`${props.ecosystemLayoutPath}/create`} className="">
+        <Link className="" href={`${props.ecosystemLayoutPath}/create`}>
           <DropdownMenuItem className="relative flex cursor-pointer items-center pr-3 pl-8">
             <PlusCircleIcon className="absolute left-2 h-4 w-4" />
             <div className="truncate">New Ecosystem</div>
@@ -137,8 +137,7 @@ export function EcosystemHeader(props: {
   client: ThirdwebClient;
 }) {
   const { data: fetchedEcosystem } = useEcosystem({
-    teamIdOrSlug: props.teamIdOrSlug,
-    slug: props.ecosystem.slug,
+    initialData: props.ecosystem,
     refetchInterval:
       props.ecosystem.status === "requested"
         ? 3000
@@ -146,14 +145,15 @@ export function EcosystemHeader(props: {
           ? 60000
           : undefined,
     refetchOnWindowFocus: false,
-    initialData: props.ecosystem,
+    slug: props.ecosystem.slug,
+    teamIdOrSlug: props.teamIdOrSlug,
   });
 
   const ecosystem = fetchedEcosystem ?? props.ecosystem;
 
   const ecosystemImageLink = resolveSchemeWithErrorHandler({
-    uri: ecosystem.imageUrl,
     client: props.client,
+    uri: ecosystem.imageUrl,
   });
 
   // ------------------- Image Upload Logic -------------------
@@ -176,16 +176,16 @@ export function EcosystemHeader(props: {
         teamId: props.teamId,
       },
       {
-        onSuccess: () => {
-          toast.success("Ecosystem updated");
-          setIsDialogOpen(false);
-          router.refresh();
-        },
         onError: (error) => {
           const message =
             error instanceof Error ? error.message : "Failed to update image";
           toast.error(message);
         },
+        onSuccess: () => {
+          toast.success("Ecosystem updated");
+          setIsDialogOpen(false);
+          router.refresh();
+        },
       },
     );
 
@@ -248,7 +248,6 @@ export function EcosystemHeader(props: {
                 ecosystemImageLink && (
                   <div className="relative">
                     <Img
-                      src={ecosystemImageLink}
                       alt={ecosystem.name}
                       className={cn(
                         "size-24",
@@ -256,14 +255,14 @@ export function EcosystemHeader(props: {
                         "rounded-full",
                         "object-contain object-center",
                       )}
+                      src={ecosystemImageLink}
                     />
 
                     {/* Upload Dialog */}
-                    <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
+                    <Dialog onOpenChange={setIsDialogOpen} open={isDialogOpen}>
                       <DialogTrigger asChild>
                         <Button
-                          variant="ghost"
-                          size="icon"
+                          aria-label="Change logo"
                           className={cn(
                             "absolute",
                             "right-0 bottom-0",
@@ -273,7 +272,8 @@ export function EcosystemHeader(props: {
                             "bg-background",
                             "hover:bg-accent",
                           )}
-                          aria-label="Change logo"
+                          size="icon"
+                          variant="ghost"
                         >
                           <PencilIcon className="h-4 w-4" />
                         </Button>
@@ -285,24 +285,24 @@ export function EcosystemHeader(props: {
 
                         <div className="flex flex-col gap-4 py-2">
                           <ImageUpload
+                            accept="image/png,image/jpeg,image/webp"
                             onUpload={(files) => {
                               if (files?.[0]) {
                                 setSelectedFile(files[0]);
                               }
                             }}
-                            accept="image/png,image/jpeg,image/webp"
                           />
                         </div>
 
                         <DialogFooter className="mt-4">
                           <DialogClose asChild>
-                            <Button variant="outline" disabled={isUploading}>
+                            <Button disabled={isUploading} variant="outline">
                               Cancel
                             </Button>
                           </DialogClose>
                           <Button
-                            onClick={handleUpload}
                             disabled={isUploading || !selectedFile}
+                            onClick={handleUpload}
                           >
                             {isUploading ? (
                               <Spinner className="h-4 w-4" />
@@ -323,15 +323,15 @@ export function EcosystemHeader(props: {
                   <h2 className="font-semibold text-3xl text-foreground tracking-tight">
                     {ecosystem.name}
                     <Dialog
-                      open={isNameDialogOpen}
                       onOpenChange={setIsNameDialogOpen}
+                      open={isNameDialogOpen}
                     >
                       <DialogTrigger asChild>
                         <Button
-                          variant="ghost"
-                          size="icon"
-                          className="ml-2 h-5 w-5 rounded-full p-1 hover:bg-accent"
                           aria-label="Edit name"
+                          className="ml-2 h-5 w-5 rounded-full p-1 hover:bg-accent"
+                          size="icon"
+                          variant="ghost"
                         >
                           <PencilIcon className="h-4 w-4" />
                         </Button>
@@ -344,20 +344,20 @@ export function EcosystemHeader(props: {
 
                         <div className="flex flex-col gap-4 py-2">
                           <Input
-                            value={tempName}
                             onChange={(e) => setTempName(e.target.value)}
+                            value={tempName}
                           />
                         </div>
 
                         <DialogFooter className="mt-4">
                           <DialogClose asChild>
-                            <Button variant="outline" disabled={isUpdating}>
+                            <Button disabled={isUpdating} variant="outline">
                               Cancel
                             </Button>
                           </DialogClose>
                           <Button
-                            onClick={handleNameSave}
                             disabled={isUpdating || !tempName.trim()}
+                            onClick={handleNameSave}
                           >
                             {isUpdating ? (
                               <Spinner className="h-4 w-4" />
@@ -375,24 +375,24 @@ export function EcosystemHeader(props: {
                 ) : (
                   <div>
                     <CopyTextButton
+                      className="-translate-x-2 px-2 py-0.5 text-muted-foreground"
+                      copyIconPosition="right"
                       textToCopy={`ecosystem.${ecosystem.slug}`}
                       textToShow={`ecosystem.${ecosystem.slug}`}
-                      copyIconPosition="right"
                       tooltip="Copy Ecosystem slug"
                       variant="ghost"
-                      className="-translate-x-2 px-2 py-0.5 text-muted-foreground"
                     />
 
                     <Button
                       asChild
+                      className="-translate-x-2 h-auto w-auto gap-2 rounded-xl px-2 py-0.5 text-muted-foreground"
                       size="sm"
                       variant="ghost"
-                      className="-translate-x-2 h-auto w-auto gap-2 rounded-xl px-2 py-0.5 text-muted-foreground"
                     >
                       <Link
                         href={`https://${ecosystem.slug}.ecosystem.thirdweb.com`}
-                        target="_blank"
                         rel="noopener noreferrer"
+                        target="_blank"
                       >
                         {`${ecosystem.slug}.ecosystem.thirdweb.com`}
                         <ExternalLinkIcon className="size-3" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/add-partner/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/add-partner/page.tsx
index 83cba19471e..656c360dbee 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/add-partner/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/add-partner/page.tsx
@@ -1,6 +1,6 @@
+import { notFound } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound } from "next/navigation";
 import { getAuthToken } from "../../../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../../../login/loginRedirect";
 import { AddPartnerForm } from "../components/client/add-partner-form.client";
@@ -35,9 +35,9 @@ export default async function AddPartnerPage({
 
   try {
     const ecosystem = await fetchEcosystem({
-      teamIdOrSlug: teamSlug,
-      slug: ecosystemSlug,
       authToken,
+      slug: ecosystemSlug,
+      teamIdOrSlug: teamSlug,
     });
 
     return (
@@ -47,10 +47,10 @@ export default async function AddPartnerPage({
             Add New Partner
           </h1>
           <AddPartnerForm
-            ecosystem={ecosystem}
             authToken={authToken}
-            teamId={team.id}
             client={client}
+            ecosystem={ecosystem}
+            teamId={team.id}
           />
         </div>
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/AddPartnerDialogButton.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/AddPartnerDialogButton.tsx
index 9eb504ca171..921de8d3a61 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/AddPartnerDialogButton.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/AddPartnerDialogButton.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import { PlusIcon } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 import type { Ecosystem } from "../../../../../types";
 
 export function AddPartnerDialogButton(props: {
@@ -14,7 +14,7 @@ export function AddPartnerDialogButton(props: {
 
   return (
     <Link href={addPartnerUrl} passHref>
-      <Button className="gap-2 max-sm:w-full" variant="outline" size="sm">
+      <Button className="gap-2 max-sm:w-full" size="sm" variant="outline">
         <PlusIcon className="size-4" />
         Add Partner
       </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/EcosystemPermissionsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/EcosystemPermissionsPage.tsx
index cfd9566b951..a33314884b2 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/EcosystemPermissionsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/EcosystemPermissionsPage.tsx
@@ -24,22 +24,22 @@ export function EcosystemPermissionsPage({
   return (
     <div className="flex flex-col gap-8">
       <IntegrationPermissionsSection
-        ecosystem={ecosystem}
         authToken={authToken}
+        ecosystem={ecosystem}
         teamId={teamId}
       />
       <AuthOptionsSection
-        ecosystem={ecosystem}
         authToken={authToken}
-        teamId={teamId}
         client={client}
+        ecosystem={ecosystem}
+        teamId={teamId}
       />
       {ecosystem?.permission === "PARTNER_WHITELIST" && (
         <EcosystemPartnersSection
-          teamSlug={params.team_slug}
-          ecosystem={ecosystem}
           authToken={authToken}
+          ecosystem={ecosystem}
           teamId={teamId}
+          teamSlug={params.team_slug}
         />
       )}
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/add-partner-form.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/add-partner-form.client.tsx
index 37ac59fee0b..c839ffb4628 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/add-partner-form.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/add-partner-form.client.tsx
@@ -1,8 +1,8 @@
 "use client";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { useParams } from "next/navigation";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import type { Ecosystem, Partner } from "../../../../../types";
 import { useAddPartner } from "../../hooks/use-add-partner";
 import { PartnerForm, type PartnerFormValues } from "./partner-form.client";
@@ -29,6 +29,13 @@ export function AddPartnerForm({
       teamId,
     },
     {
+      onError: (error) => {
+        const message =
+          error instanceof Error
+            ? error.message
+            : "Failed to add ecosystem partner";
+        toast.error(message);
+      },
       onSuccess: () => {
         toast.success("Partner added successfully", {
           description: "The partner has been added to your ecosystem.",
@@ -38,13 +45,6 @@ export function AddPartnerForm({
         const redirectPath = `/team/${teamSlug}/~/ecosystem/${ecosystemSlug}`;
         router.push(redirectPath);
       },
-      onError: (error) => {
-        const message =
-          error instanceof Error
-            ? error.message
-            : "Failed to add ecosystem partner";
-        toast.error(message);
-      },
     },
   );
 
@@ -53,23 +53,23 @@ export function AddPartnerForm({
     finalAccessControl: Partner["accessControl"] | null,
   ) => {
     addPartner({
-      ecosystem,
-      name: values.name,
-      allowlistedDomains: values.domains
+      accessControl: finalAccessControl,
+      allowlistedBundleIds: values.bundleIds
         .split(/,| /)
         .filter((d) => d.length > 0),
-      allowlistedBundleIds: values.bundleIds
+      allowlistedDomains: values.domains
         .split(/,| /)
         .filter((d) => d.length > 0),
-      accessControl: finalAccessControl,
+      ecosystem,
+      name: values.name,
     });
   };
 
   return (
     <PartnerForm
       client={client}
-      onSubmit={handleSubmit}
       isSubmitting={isPending}
+      onSubmit={handleSubmit}
       submitLabel="Add"
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/allowed-operations-section.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/allowed-operations-section.tsx
index 332474adb36..8c64dab4a30 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/allowed-operations-section.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/allowed-operations-section.tsx
@@ -1,5 +1,9 @@
 "use client";
 
+import { PlusIcon, Trash2Icon } from "lucide-react";
+import { useId } from "react";
+import { type Control, useFieldArray } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { Button } from "@/components/ui/button";
 import {
@@ -20,9 +24,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
-import { PlusIcon, Trash2Icon } from "lucide-react";
-import { type Control, useFieldArray } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import type { PartnerFormValues } from "./partner-form.client";
 
 type AllowedOperationsSectionProps = {
@@ -44,11 +45,12 @@ export function AllowedOperationsSection({
     name: "accessControl.allowedOperations",
   });
 
+  const allowedOperationsId = useId();
   return (
     <div className="rounded-lg border border-border p-4">
       <div className="mb-4 flex items-center justify-between gap-6 ">
         <div>
-          <Label htmlFor="allowed-operations-switch" className="text-base">
+          <Label className="text-base" htmlFor={allowedOperationsId}>
             Allowed Operations
           </Label>
           <p className="mt-0.5 text-muted-foreground text-xs">
@@ -56,8 +58,8 @@ export function AllowedOperationsSection({
           </p>
         </div>
         <Switch
-          id="allowed-operations-switch"
           checked={enabled}
+          id={allowedOperationsId}
           onCheckedChange={onToggle}
         />
       </div>
@@ -67,8 +69,8 @@ export function AllowedOperationsSection({
           <div className="flex flex-col gap-6">
             {allowedOperationsFields.fields.map((field, index) => (
               <div
-                key={field.id}
                 className="rounded-md border border-border p-4"
+                key={field.id}
               >
                 <div className="mb-4 flex items-center justify-between">
                   <FormField
@@ -82,6 +84,7 @@ export function AllowedOperationsSection({
                           this partner
                         </FormDescription>
                         <Select
+                          defaultValue={field.value}
                           onValueChange={(value) => {
                             // Update the signature method
                             field.onChange(value);
@@ -90,22 +93,21 @@ export function AllowedOperationsSection({
                             if (value === "eth_signTransaction") {
                               // Remove any existing fields for other methods
                               allowedOperationsFields.update(index, {
-                                signMethod: value,
                                 allowedTransactions: [],
+                                signMethod: value,
                               });
                             } else if (value === "eth_signTypedData_v4") {
                               allowedOperationsFields.update(index, {
-                                signMethod: value,
                                 allowedTypedData: [],
+                                signMethod: value,
                               });
                             } else if (value === "personal_sign") {
                               allowedOperationsFields.update(index, {
-                                signMethod: value,
                                 allowedPersonalSigns: [],
+                                signMethod: value,
                               });
                             }
                           }}
-                          defaultValue={field.value}
                         >
                           <FormControl>
                             <SelectTrigger>
@@ -129,13 +131,13 @@ export function AllowedOperationsSection({
                     )}
                   />
                   <Button
-                    variant="outline"
                     aria-label="Remove operation"
+                    className="!w-auto ml-4 h-10 px-3"
                     onClick={() => {
                       allowedOperationsFields.remove(index);
                     }}
-                    className="!w-auto ml-4 h-10 px-3"
                     type="button"
+                    variant="outline"
                   >
                     <Trash2Icon className="size-4 shrink-0 text-destructive-text" />
                   </Button>
@@ -145,42 +147,42 @@ export function AllowedOperationsSection({
                 {allowedOperationsFields.fields[index]?.signMethod ===
                   "eth_signTransaction" && (
                   <TransactionRestrictions
+                    client={client}
                     control={control}
                     index={index}
-                    client={client}
                   />
                 )}
 
                 {allowedOperationsFields.fields[index]?.signMethod ===
                   "eth_signTypedData_v4" && (
                   <TypedDataRestrictions
+                    client={client}
                     control={control}
                     index={index}
-                    client={client}
                   />
                 )}
 
                 {allowedOperationsFields.fields[index]?.signMethod ===
                   "personal_sign" && (
                   <PersonalSignRestrictions
+                    client={client}
                     control={control}
                     index={index}
-                    client={client}
                   />
                 )}
               </div>
             ))}
 
             <Button
-              variant="outline"
               className="w-full gap-2 bg-background"
               onClick={() => {
                 allowedOperationsFields.append({
-                  signMethod: "eth_signTransaction",
                   allowedTransactions: [],
+                  signMethod: "eth_signTransaction",
                 });
               }}
               type="button"
+              variant="outline"
             >
               <PlusIcon className="size-4" />
               Add operation
@@ -223,8 +225,8 @@ function TransactionRestrictions({
       <div className="flex flex-col gap-4">
         {transactionsArray.fields.map((field, txIndex) => (
           <div
-            key={field.id}
             className="flex flex-row gap-4 rounded-md border border-border p-4"
+            key={field.id}
           >
             <div className="flex flex-1 flex-col gap-2">
               <FormField
@@ -236,8 +238,8 @@ function TransactionRestrictions({
                     <FormControl>
                       <SingleNetworkSelector
                         chainId={field.value}
-                        onChange={(chainId) => field.onChange(chainId)}
                         client={client}
+                        onChange={(chainId) => field.onChange(chainId)}
                       />
                     </FormControl>
                     <FormMessage />
@@ -289,13 +291,13 @@ function TransactionRestrictions({
               </div>
             </div>
             <Button
-              variant="outline"
               aria-label="Remove transaction"
+              className="!w-auto ml-2 px-3"
               onClick={() => {
                 transactionsArray.remove(txIndex);
               }}
-              className="!w-auto ml-2 px-3"
               type="button"
+              variant="outline"
             >
               <Trash2Icon className="size-4 shrink-0 text-destructive-text" />
             </Button>
@@ -303,17 +305,17 @@ function TransactionRestrictions({
         ))}
 
         <Button
-          variant="outline"
           className="w-full gap-2 bg-background"
           onClick={() => {
             transactionsArray.append({
               chainId: 1,
               contractAddress: "",
-              selector: "",
               maxValue: "",
+              selector: "",
             });
           }}
           type="button"
+          variant="outline"
         >
           <PlusIcon className="size-4" />
           Add transaction
@@ -348,8 +350,8 @@ function TypedDataRestrictions({
       <div className="flex flex-col gap-4">
         {typedDataArray.fields.map((field, dataIndex) => (
           <div
-            key={field.id}
             className="flex flex-row gap-4 rounded-md border border-border p-4"
+            key={field.id}
           >
             <div className="flex flex-1 flex-col gap-2">
               <FormField
@@ -387,8 +389,8 @@ function TypedDataRestrictions({
                     <FormControl>
                       <SingleNetworkSelector
                         chainId={field.value}
-                        onChange={(chainId) => field.onChange(chainId)}
                         client={client}
+                        onChange={(chainId) => field.onChange(chainId)}
                       />
                     </FormControl>
                     <FormMessage />
@@ -414,13 +416,13 @@ function TypedDataRestrictions({
               </div>
             </div>
             <Button
-              variant="outline"
               aria-label="Remove typed data"
+              className="!w-auto ml-2 px-3"
               onClick={() => {
                 typedDataArray.remove(dataIndex);
               }}
-              className="!w-auto ml-2 px-3"
               type="button"
+              variant="outline"
             >
               <Trash2Icon className="size-4 shrink-0 text-destructive-text" />
             </Button>
@@ -428,17 +430,17 @@ function TypedDataRestrictions({
         ))}
 
         <Button
-          variant="outline"
           className="w-full gap-2 bg-background"
           onClick={() => {
             typedDataArray.append({
-              domain: "",
-              verifyingContract: undefined,
               chainId: undefined,
+              domain: "",
               primaryType: undefined,
+              verifyingContract: undefined,
             });
           }}
           type="button"
+          variant="outline"
         >
           <PlusIcon className="size-4" />
           Add typed data
@@ -472,7 +474,7 @@ function PersonalSignRestrictions({
       </FormDescription>
       <div className="flex flex-col gap-4">
         {personalSignArray.fields.map((field, signIndex) => (
-          <div key={field.id} className="rounded-md border border-border p-3">
+          <div className="rounded-md border border-border p-3" key={field.id}>
             <div className="mb-4 flex items-center justify-between">
               <FormField
                 control={control}
@@ -481,6 +483,7 @@ function PersonalSignRestrictions({
                   <FormItem className="flex-1">
                     <FormLabel>Message Type</FormLabel>
                     <Select
+                      defaultValue={field.value}
                       onValueChange={(value) => {
                         // Update the message type
                         field.onChange(value);
@@ -488,17 +491,16 @@ function PersonalSignRestrictions({
                         // Reset the message data based on the selected type
                         if (value === "userOp") {
                           personalSignArray.update(signIndex, {
-                            messageType: value,
                             allowedTransactions: [],
+                            messageType: value,
                           });
                         } else if (value === "other") {
                           personalSignArray.update(signIndex, {
-                            messageType: value,
                             message: "",
+                            messageType: value,
                           });
                         }
                       }}
-                      defaultValue={field.value}
                     >
                       <FormControl>
                         <SelectTrigger>
@@ -515,13 +517,13 @@ function PersonalSignRestrictions({
                 )}
               />
               <Button
-                variant="outline"
                 aria-label="Remove personal sign"
+                className="!w-auto ml-4 h-10 px-3"
                 onClick={() => {
                   personalSignArray.remove(signIndex);
                 }}
-                className="!w-auto ml-4 h-10 px-3"
                 type="button"
+                variant="outline"
               >
                 <Trash2Icon className="size-4 shrink-0 text-destructive-text" />
               </Button>
@@ -529,10 +531,10 @@ function PersonalSignRestrictions({
 
             {personalSignArray.fields[signIndex]?.messageType === "userOp" ? (
               <UserOpTransactions
+                client={client}
                 control={control}
                 opIndex={index}
                 signIndex={signIndex}
-                client={client}
               />
             ) : (
               <FormField
@@ -556,15 +558,15 @@ function PersonalSignRestrictions({
         ))}
 
         <Button
-          variant="outline"
           className="w-full gap-2 bg-background"
           onClick={() => {
             personalSignArray.append({
-              messageType: "other",
               message: "",
+              messageType: "other",
             });
           }}
           type="button"
+          variant="outline"
         >
           <PlusIcon className="size-4" />
           Add personal sign
@@ -603,8 +605,8 @@ function UserOpTransactions({
       <div className="flex flex-col gap-4">
         {userOpTransactionsArray.fields.map((field, txIndex) => (
           <div
-            key={field.id}
             className="flex flex-row gap-4 rounded-md border border-border p-4"
+            key={field.id}
           >
             <div className="flex flex-1 flex-col gap-2">
               <FormField
@@ -616,8 +618,8 @@ function UserOpTransactions({
                     <FormControl>
                       <SingleNetworkSelector
                         chainId={field.value}
-                        onChange={(chainId) => field.onChange(chainId)}
                         client={client}
+                        onChange={(chainId) => field.onChange(chainId)}
                       />
                     </FormControl>
                     <FormMessage />
@@ -669,13 +671,13 @@ function UserOpTransactions({
               </div>
             </div>
             <Button
-              variant="outline"
               aria-label="Remove transaction"
+              className="!w-auto ml-2 px-3"
               onClick={() => {
                 userOpTransactionsArray.remove(txIndex);
               }}
-              className="!w-auto ml-2 px-3"
               type="button"
+              variant="outline"
             >
               <Trash2Icon className="size-4 shrink-0 text-destructive-text" />
             </Button>
@@ -683,17 +685,17 @@ function UserOpTransactions({
         ))}
 
         <Button
-          variant="outline"
           className="w-full gap-2 bg-background"
           onClick={() => {
             userOpTransactionsArray.append({
               chainId: 1,
               contractAddress: "",
-              selector: "",
               maxValue: "",
+              selector: "",
             });
           }}
           type="button"
+          variant="outline"
         >
           <PlusIcon className="size-4" />
           Add transaction
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/auth-options-form.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/auth-options-form.client.tsx
index 2bcfc364b5b..3a0e2fa4d04 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/auth-options-form.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/auth-options-form.client.tsx
@@ -1,4 +1,17 @@
 "use client";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { PlusIcon } from "lucide-react";
+import { useFieldArray, useForm } from "react-hook-form";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import { isAddress } from "thirdweb";
+import { getSocialIcon } from "thirdweb/wallets/in-app";
+import {
+  DEFAULT_ACCOUNT_FACTORY_V0_6,
+  DEFAULT_ACCOUNT_FACTORY_V0_7,
+} from "thirdweb/wallets/smart";
+import invariant from "tiny-invariant";
+import { z } from "zod";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { SettingsCard } from "@/components/blocks/SettingsCard";
 import { Button } from "@/components/ui/button";
@@ -6,12 +19,12 @@ import { Checkbox } from "@/components/ui/checkbox";
 import {
   Form,
   FormControl,
+  FormDescription,
   FormField,
   FormItem,
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { FormDescription } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import {
   Select,
@@ -23,20 +36,7 @@ import {
 import { Skeleton } from "@/components/ui/skeleton";
 import { Switch } from "@/components/ui/switch";
 import { cn } from "@/lib/utils";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { PlusIcon } from "lucide-react";
-import { useFieldArray, useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { isAddress } from "thirdweb";
-import type { ThirdwebClient } from "thirdweb";
-import { getSocialIcon } from "thirdweb/wallets/in-app";
-import {
-  DEFAULT_ACCOUNT_FACTORY_V0_6,
-  DEFAULT_ACCOUNT_FACTORY_V0_7,
-} from "thirdweb/wallets/smart";
-import invariant from "tiny-invariant";
-import { z } from "zod";
-import { type Ecosystem, authOptions } from "../../../../../types";
+import { authOptions, type Ecosystem } from "../../../../../types";
 import { useUpdateEcosystem } from "../../hooks/use-update-ecosystem";
 
 type AuthOptionsFormData = {
@@ -65,13 +65,6 @@ export function AuthOptionsForm({
 }) {
   const form = useForm<AuthOptionsFormData>({
     defaultValues: {
-      authOptions: ecosystem.authOptions || [],
-      useCustomAuth: !!ecosystem.customAuthOptions,
-      customAuthEndpoint: ecosystem.customAuthOptions?.authEndpoint?.url || "",
-      customHeaders: ecosystem.customAuthOptions?.authEndpoint?.headers || [],
-      useSmartAccount: !!ecosystem.smartAccountOptions,
-      sponsorGas: ecosystem.smartAccountOptions?.sponsorGas || false,
-      defaultChainId: ecosystem.smartAccountOptions?.defaultChainId,
       accountFactoryType:
         ecosystem.smartAccountOptions?.accountFactoryAddress ===
         DEFAULT_ACCOUNT_FACTORY_V0_7
@@ -80,15 +73,23 @@ export function AuthOptionsForm({
               DEFAULT_ACCOUNT_FACTORY_V0_6
             ? "v0.6"
             : "custom",
-      executionMode: ecosystem.smartAccountOptions?.executionMode || "EIP4337",
+      authOptions: ecosystem.authOptions || [],
       customAccountFactoryAddress:
         ecosystem.smartAccountOptions?.accountFactoryAddress || "",
+      customAuthEndpoint: ecosystem.customAuthOptions?.authEndpoint?.url || "",
+      customHeaders: ecosystem.customAuthOptions?.authEndpoint?.headers || [],
+      defaultChainId: ecosystem.smartAccountOptions?.defaultChainId,
+      executionMode: ecosystem.smartAccountOptions?.executionMode || "EIP4337",
+      sponsorGas: ecosystem.smartAccountOptions?.sponsorGas || false,
+      useCustomAuth: !!ecosystem.customAuthOptions,
+      useSmartAccount: !!ecosystem.smartAccountOptions,
     },
     resolver: zodResolver(
       z
         .object({
+          accountFactoryType: z.enum(["v0.6", "v0.7", "custom"]),
           authOptions: z.array(z.string()),
-          useCustomAuth: z.boolean(),
+          customAccountFactoryAddress: z.string().optional(),
           customAuthEndpoint: z.string().optional(),
           customHeaders: z
             .array(
@@ -98,16 +99,15 @@ export function AuthOptionsForm({
               }),
             )
             .optional(),
-          useSmartAccount: z.boolean(),
-          sponsorGas: z.boolean(),
           defaultChainId: z.coerce
             .number({
               invalid_type_error: "Please enter a valid chain ID",
             })
             .optional(),
-          accountFactoryType: z.enum(["v0.6", "v0.7", "custom"]),
-          customAccountFactoryAddress: z.string().optional(),
           executionMode: z.enum(["EIP4337", "EIP7702"]),
+          sponsorGas: z.boolean(),
+          useCustomAuth: z.boolean(),
+          useSmartAccount: z.boolean(),
         })
         .refine(
           (data) => {
@@ -181,8 +181,8 @@ export function AuthOptionsForm({
         invariant(url.hostname, "Invalid URL");
         customAuthOptions = {
           authEndpoint: {
-            url: data.customAuthEndpoint,
             headers: data.customHeaders,
+            url: data.customAuthEndpoint,
           },
         };
       } catch {
@@ -211,10 +211,10 @@ export function AuthOptionsForm({
       }
 
       smartAccountOptions = {
-        defaultChainId: data.defaultChainId,
-        sponsorGas: data.sponsorGas,
         accountFactoryAddress,
+        defaultChainId: data.defaultChainId,
         executionMode: data.executionMode,
+        sponsorGas: data.sponsorGas,
       };
     }
 
@@ -229,31 +229,31 @@ export function AuthOptionsForm({
   return (
     <Form {...form}>
       <form
+        className="flex flex-col gap-8"
         onSubmit={form.handleSubmit(onSubmit, (errors) => {
           console.error(errors);
         })}
-        className="flex flex-col gap-8"
       >
         <SettingsCard
           bottomText=""
           errorText=""
-          noPermissionText=""
           header={{
-            title: "Auth Options",
             description:
               "Configure the authentication options your ecosystem supports",
+            title: "Auth Options",
           }}
+          noPermissionText=""
           saveButton={{
-            onClick: form.handleSubmit(onSubmit),
             disabled: !form.formState.isValid,
             isPending: isPending,
+            onClick: form.handleSubmit(onSubmit),
           }}
         >
           <div className="grid grid-cols-2 gap-3 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5">
             {authOptions.map((option) => (
               <FormField
-                key={option}
                 control={form.control}
+                key={option}
                 name="authOptions"
                 render={({ field }) => {
                   const isChecked = field.value?.includes(option);
@@ -268,9 +268,9 @@ export function AuthOptionsForm({
                         >
                           {/* eslint-disable-next-line @next/next/no-img-element */}
                           <img
-                            src={getSocialIcon(option)}
                             alt={option}
                             className="h-6 w-6"
+                            src={getSocialIcon(option)}
                           />
                           <p className="text-center font-normal">
                             {option === "siwe"
@@ -304,17 +304,17 @@ export function AuthOptionsForm({
         </SettingsCard>
 
         <SettingsCard
+          bottomText=""
+          errorText=""
           header={{
-            title: "Custom Auth",
             description: "Authenticate with a custom endpoint",
+            title: "Custom Auth",
           }}
-          bottomText=""
-          errorText=""
           noPermissionText=""
           saveButton={{
-            onClick: form.handleSubmit(onSubmit),
             disabled: !form.formState.isValid,
             isPending: isPending,
+            onClick: form.handleSubmit(onSubmit),
           }}
         >
           <FormField
@@ -324,14 +324,14 @@ export function AuthOptionsForm({
               <FormItem className="flex flex-row items-center justify-between">
                 <FormControl>
                   <Switch
-                    checked={field.value}
-                    onCheckedChange={field.onChange}
-                    className="absolute top-6 right-6"
                     aria-label={
                       field.value
                         ? "Custom Auth Enabled"
                         : "Custom Auth Disabled"
                     }
+                    checked={field.value}
+                    className="absolute top-6 right-6"
+                    onCheckedChange={field.onChange}
                   />
                 </FormControl>
               </FormItem>
@@ -358,8 +358,8 @@ export function AuthOptionsForm({
                     <FormControl>
                       <Input
                         {...field}
-                        type="url"
                         placeholder="https://your-custom-auth-endpoint.com"
+                        type="url"
                       />
                     </FormControl>
                     <FormMessage />
@@ -378,7 +378,7 @@ export function AuthOptionsForm({
                     <FormControl>
                       <div className="flex flex-col gap-3">
                         {fields.map((item, index) => (
-                          <div key={item.id} className="flex gap-3">
+                          <div className="flex gap-3" key={item.id}>
                             <Input
                               placeholder="Header Key"
                               {...form.register(`customHeaders.${index}.key`)}
@@ -388,19 +388,19 @@ export function AuthOptionsForm({
                               {...form.register(`customHeaders.${index}.value`)}
                             />
                             <Button
+                              onClick={() => remove(index)}
                               type="button"
                               variant="destructive"
-                              onClick={() => remove(index)}
                             >
                               Remove
                             </Button>
                           </div>
                         ))}
                         <Button
+                          className="gap-2 self-start"
+                          onClick={() => append({ key: "", value: "" })}
                           type="button"
                           variant="outline"
-                          onClick={() => append({ key: "", value: "" })}
-                          className="gap-2 self-start"
                         >
                           <PlusIcon className="size-4" />
                           Add Header
@@ -418,15 +418,15 @@ export function AuthOptionsForm({
         <SettingsCard
           bottomText=""
           errorText=""
-          noPermissionText=""
           header={{
-            title: "Account Abstraction",
             description: "Enable smart accounts for your ecosystem",
+            title: "Account Abstraction",
           }}
+          noPermissionText=""
           saveButton={{
-            onClick: form.handleSubmit(onSubmit),
             disabled: !form.formState.isValid,
             isPending: isPending,
+            onClick: form.handleSubmit(onSubmit),
           }}
         >
           <FormField
@@ -436,12 +436,12 @@ export function AuthOptionsForm({
               <FormItem className="flex flex-row items-center justify-between">
                 <FormControl>
                   <Switch
-                    checked={field.value}
-                    onCheckedChange={field.onChange}
-                    className="absolute top-6 right-6"
                     aria-label={
                       field.value ? "Smart Accounts Enabled" : "Smart Accounts"
                     }
+                    checked={field.value}
+                    className="absolute top-6 right-6"
+                    onCheckedChange={field.onChange}
                   />
                 </FormControl>
               </FormItem>
@@ -457,8 +457,8 @@ export function AuthOptionsForm({
                     <FormItem className="flex-1">
                       <FormLabel>Execution Mode</FormLabel>
                       <Select
-                        onValueChange={field.onChange}
                         defaultValue={field.value}
+                        onValueChange={field.onChange}
                       >
                         <FormControl>
                           <SelectTrigger>
@@ -522,8 +522,8 @@ export function AuthOptionsForm({
                     <FormLabel>Default Chain ID</FormLabel>
                     <FormControl>
                       <SingleNetworkSelector
-                        client={client}
                         chainId={field.value}
+                        client={client}
                         onChange={field.onChange}
                       />
                     </FormControl>
@@ -531,10 +531,10 @@ export function AuthOptionsForm({
                       This will be the chain ID the smart account will be
                       initialized to on your{" "}
                       <a
-                        href={`https://${ecosystem.slug}.ecosystem.thirdweb.com`}
                         className="text-link-foreground"
-                        target="_blank"
+                        href={`https://${ecosystem.slug}.ecosystem.thirdweb.com`}
                         rel="noopener noreferrer"
+                        target="_blank"
                       >
                         ecosystem page
                       </a>
@@ -554,8 +554,8 @@ export function AuthOptionsForm({
                       <FormItem>
                         <FormLabel>Account Factory</FormLabel>
                         <Select
-                          onValueChange={field.onChange}
                           defaultValue={field.value}
+                          onValueChange={field.onChange}
                         >
                           <FormControl>
                             <SelectTrigger>
@@ -615,7 +615,7 @@ export function AuthOptionsFormSkeleton() {
   return (
     <div className="flex flex-col gap-2 py-2 md:flex-row md:gap-4">
       {authOptions.map((option) => (
-        <Skeleton key={option} className="h-14 w-full md:w-32" />
+        <Skeleton className="h-14 w-full md:w-32" key={option} />
       ))}
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/integration-permissions-toggle.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/integration-permissions-toggle.client.tsx
index 4c4d39f9ec4..4a626708e09 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/integration-permissions-toggle.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/integration-permissions-toggle.client.tsx
@@ -1,11 +1,11 @@
 "use client";
+import { useState } from "react";
+import { toast } from "sonner";
+import invariant from "tiny-invariant";
 import { ConfirmationDialog } from "@/components/ui/ConfirmationDialog";
 import { RadioGroup, RadioGroupItemButton } from "@/components/ui/radio-group";
 import { Skeleton } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
-import { useState } from "react";
-import { toast } from "sonner";
-import invariant from "tiny-invariant";
 import type { Ecosystem } from "../../../../../types";
 import { useUpdateEcosystem } from "../../hooks/use-update-ecosystem";
 
@@ -13,7 +13,11 @@ export function IntegrationPermissionsToggle({
   ecosystem,
   authToken,
   teamId,
-}: { ecosystem: Ecosystem; authToken: string; teamId: string }) {
+}: {
+  ecosystem: Ecosystem;
+  authToken: string;
+  teamId: string;
+}) {
   const [messageToConfirm, setMessageToConfirm] = useState<
     | {
         title: string;
@@ -42,13 +46,11 @@ export function IntegrationPermissionsToggle({
 
   return (
     <RadioGroup
+      className="flex flex-col gap-2 py-2 md:flex-row md:gap-4"
       defaultValue={ecosystem.permission}
       value={isPending ? variables?.permission : ecosystem.permission}
-      className="flex flex-col gap-2 py-2 md:flex-row md:gap-4"
     >
       <RadioGroupItemButton
-        value="PARTNER_WHITELIST"
-        id="PARTNER_WHITELIST"
         className={cn(
           isPending &&
             variables?.permission === "PARTNER_WHITELIST" &&
@@ -57,43 +59,41 @@ export function IntegrationPermissionsToggle({
         onClick={() => {
           if (ecosystem.permission === "PARTNER_WHITELIST") return;
           setMessageToConfirm({
-            title:
-              "Are you sure you want to set an allowlist for this ecosystem?",
             description:
               "Existing apps without a partner ID will no longer be able to connect to your ecosystem. You will need to create partner IDs and distribute them to developers using your ecosystem wallet.",
             permission: "PARTNER_WHITELIST",
+            title:
+              "Are you sure you want to set an allowlist for this ecosystem?",
           });
         }}
+        value="PARTNER_WHITELIST"
       >
         Allowlist
       </RadioGroupItemButton>
       <RadioGroupItemButton
-        value="ANYONE"
-        id="ANYONE"
         className={cn(
           isPending && variables?.permission === "ANYONE" && "animate-pulse",
         )}
         onClick={() => {
           if (ecosystem.permission === "ANYONE") return;
           setMessageToConfirm({
-            title: "Are you sure you want to make this ecosystem public?",
             description:
               "Anyone will be able to add your ecosystem wallet as a connection option.",
             permission: "ANYONE",
+            title: "Are you sure you want to make this ecosystem public?",
           });
         }}
+        value="ANYONE"
       >
         Public
       </RadioGroupItemButton>
       <ConfirmationDialog
-        open={!!messageToConfirm}
+        description={messageToConfirm?.description}
         onOpenChange={(open) => {
           if (!open) {
             setMessageToConfirm(undefined);
           }
         }}
-        title={messageToConfirm?.title}
-        description={messageToConfirm?.description}
         onSubmit={() => {
           invariant(messageToConfirm, "Must have message for modal to be open");
           updateEcosystem({
@@ -101,6 +101,8 @@ export function IntegrationPermissionsToggle({
             permission: messageToConfirm.permission,
           });
         }}
+        open={!!messageToConfirm}
+        title={messageToConfirm?.title}
         variant="destructive"
       />
     </RadioGroup>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/partner-form.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/partner-form.client.tsx
index 59e25166c8b..23e8a914761 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/partner-form.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/partner-form.client.tsx
@@ -1,5 +1,11 @@
 "use client";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { PlusIcon, Trash2Icon } from "lucide-react";
+import { useId } from "react";
+import { useFieldArray, useForm } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
+import type { z } from "zod";
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -12,13 +18,9 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Switch } from "@/components/ui/switch";
 import { cn } from "@/lib/utils";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { PlusIcon, Trash2Icon } from "lucide-react";
-import { useFieldArray, useForm } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
-import type { z } from "zod";
 import type { Partner } from "../../../../../types";
 import { partnerFormSchema } from "../../constants";
 import { AllowedOperationsSection } from "./allowed-operations-section";
@@ -51,19 +53,19 @@ export function PartnerForm({
     hasAccessControl && !!partner?.accessControl?.allowedOperations?.length;
 
   const form = useForm<PartnerFormValues>({
-    resolver: zodResolver(partnerFormSchema),
     defaultValues: {
-      name: partner?.name || "",
-      domains: partner?.allowlistedDomains.join(",") || "",
-      bundleIds: partner?.allowlistedBundleIds.join(",") || "",
       // Set the actual accessControl data if it exists
       accessControl: partner?.accessControl,
       // Set the UI control properties based on existing data
       accessControlEnabled: hasAccessControl,
-      serverVerifierEnabled: hasServerVerifier,
       allowedOperationsEnabled: hasAllowedOperations,
+      bundleIds: partner?.allowlistedBundleIds.join(",") || "",
+      domains: partner?.allowlistedDomains.join(",") || "",
+      name: partner?.name || "",
+      serverVerifierEnabled: hasServerVerifier,
     },
-    mode: "onChange", // Validate on change for better user experience
+    mode: "onChange",
+    resolver: zodResolver(partnerFormSchema), // Validate on change for better user experience
   });
 
   // Watch the boolean flags for UI state
@@ -87,8 +89,8 @@ export function PartnerForm({
 
         if (finalAccessControl && values.serverVerifierEnabled) {
           finalAccessControl.serverVerifier = {
-            url: values.accessControl?.serverVerifier?.url || "",
             headers: values.accessControl?.serverVerifier?.headers || [],
+            url: values.accessControl?.serverVerifier?.url || "",
           };
         }
 
@@ -114,14 +116,17 @@ export function PartnerForm({
     },
   );
 
+  const accessControlId = useId();
+  const serverVerifierId = useId();
+
   return (
     <Form {...form}>
-      <form onSubmit={handleSubmit} className="flex flex-col gap-4">
+      <form className="flex flex-col gap-4" onSubmit={handleSubmit}>
         <div className="flex grow flex-col gap-5">
           <FormField
             control={form.control}
-            name="name"
             defaultValue=""
+            name="name"
             render={({ field }) => (
               <FormItem className="col-span-4">
                 <FormLabel> Name </FormLabel>
@@ -147,13 +152,13 @@ export function PartnerForm({
           />
           <FormField
             control={form.control}
-            name="domains"
             defaultValue=""
+            name="domains"
             render={({ field }) => (
               <FormItem className="col-span-4 lg:col-span-4">
                 <FormLabel> Domains </FormLabel>
                 <FormControl>
-                  <Input placeholder="Domains" className="peer" {...field} />
+                  <Input className="peer" placeholder="Domains" {...field} />
                 </FormControl>
                 <FormDescription
                   className={cn(
@@ -170,13 +175,13 @@ export function PartnerForm({
           />
           <FormField
             control={form.control}
-            name="bundleIds"
             defaultValue=""
+            name="bundleIds"
             render={({ field }) => (
               <FormItem className="col-span-4">
                 <FormLabel> Bundle ID </FormLabel>
                 <FormControl>
-                  <Input placeholder="Bundle ID" className="peer" {...field} />
+                  <Input className="peer" placeholder="Bundle ID" {...field} />
                 </FormControl>
                 <FormDescription
                   className={cn(
@@ -196,7 +201,7 @@ export function PartnerForm({
           {/* Access Control Section */}
           <div className="mb-4 flex items-center justify-between gap-6">
             <div>
-              <Label htmlFor="access-control-switch" className="text-base">
+              <Label className="text-base" htmlFor={accessControlId}>
                 Access Control
               </Label>
               <p className="mt-0.5 text-muted-foreground text-xs">
@@ -204,8 +209,8 @@ export function PartnerForm({
               </p>
             </div>
             <Switch
-              id="access-control-switch"
               checked={accessControlEnabled}
+              id={accessControlId}
               onCheckedChange={(checked) => {
                 form.setValue("accessControlEnabled", checked);
                 // If disabling access control, also disable server verifier and allowed operations
@@ -222,10 +227,7 @@ export function PartnerForm({
               <div className="rounded-lg border border-border p-4">
                 <div className="mb-4 flex items-center justify-between gap-6">
                   <div>
-                    <Label
-                      htmlFor="server-verifier-switch"
-                      className="text-base"
-                    >
+                    <Label className="text-base" htmlFor={serverVerifierId}>
                       Server Verifier
                     </Label>
                     <p className="mt-0.5 text-muted-foreground text-xs">
@@ -233,8 +235,8 @@ export function PartnerForm({
                     </p>
                   </div>
                   <Switch
-                    id="server-verifier-switch"
                     checked={serverVerifierEnabled}
+                    id={serverVerifierId}
                     onCheckedChange={(checked) => {
                       form.setValue("serverVerifierEnabled", checked);
 
@@ -244,8 +246,8 @@ export function PartnerForm({
                         !form.getValues("accessControl.serverVerifier")
                       ) {
                         form.setValue("accessControl.serverVerifier", {
-                          url: "",
                           headers: [],
+                          url: "",
                         });
                       }
                     }}
@@ -304,13 +306,13 @@ export function PartnerForm({
                                 )}
                               />
                               <Button
-                                variant="outline"
                                 aria-label="Remove header"
+                                className="!w-auto px-3"
                                 onClick={() => {
                                   customHeaderFields.remove(headerIdx);
                                 }}
-                                className="!w-auto px-3"
                                 type="button"
+                                variant="outline"
                               >
                                 <Trash2Icon className="size-4 shrink-0 text-destructive-text" />
                               </Button>
@@ -319,7 +321,6 @@ export function PartnerForm({
                         })}
 
                         <Button
-                          variant="outline"
                           className="w-full gap-2 bg-background"
                           onClick={() => {
                             customHeaderFields.append({
@@ -328,6 +329,7 @@ export function PartnerForm({
                             });
                           }}
                           type="button"
+                          variant="outline"
                         >
                           <PlusIcon className="size-4" />
                           Add header
@@ -365,9 +367,9 @@ export function PartnerForm({
         </div>
 
         <Button
+          className="mt-4 w-full gap-2"
           disabled={isSubmitting}
           type="submit"
-          className="mt-4 w-full gap-2"
         >
           {isSubmitting && <Spinner className="size-4" />}
           {submitLabel}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/update-partner-form.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/update-partner-form.client.tsx
index 27cab617241..f49a92b5f0b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/update-partner-form.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/update-partner-form.client.tsx
@@ -1,8 +1,8 @@
 "use client";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { useParams } from "next/navigation";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import type { Ecosystem, Partner } from "../../../../../types";
 import { useUpdatePartner } from "../../hooks/use-update-partner";
 import { PartnerForm, type PartnerFormValues } from "./partner-form.client";
@@ -31,6 +31,13 @@ export function UpdatePartnerForm({
       teamId,
     },
     {
+      onError: (error) => {
+        const message =
+          error instanceof Error
+            ? error.message
+            : "Failed to update ecosystem partner";
+        toast.error(message);
+      },
       onSuccess: () => {
         toast.success("Partner updated successfully", {
           description: "The partner details have been updated.",
@@ -40,13 +47,6 @@ export function UpdatePartnerForm({
         const redirectPath = `/team/${teamSlug}/~/ecosystem/${ecosystemSlug}`;
         router.push(redirectPath);
       },
-      onError: (error) => {
-        const message =
-          error instanceof Error
-            ? error.message
-            : "Failed to update ecosystem partner";
-        toast.error(message);
-      },
     },
   );
 
@@ -55,25 +55,25 @@ export function UpdatePartnerForm({
     finalAccessControl: Partner["accessControl"] | null,
   ) => {
     updatePartner({
-      ecosystem,
-      partnerId: partner.id,
-      name: values.name,
-      allowlistedDomains: values.domains
+      accessControl: finalAccessControl,
+      allowlistedBundleIds: values.bundleIds
         .split(/,| /)
         .filter((d) => d.length > 0),
-      allowlistedBundleIds: values.bundleIds
+      allowlistedDomains: values.domains
         .split(/,| /)
         .filter((d) => d.length > 0),
-      accessControl: finalAccessControl,
+      ecosystem,
+      name: values.name,
+      partnerId: partner.id,
     });
   };
 
   return (
     <PartnerForm
-      partner={partner}
       client={client}
-      onSubmit={handleSubmit}
       isSubmitting={isPending}
+      onSubmit={handleSubmit}
+      partner={partner}
       submitLabel="Update"
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/auth-options-section.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/auth-options-section.tsx
index 672790a78d2..09ebd3196ec 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/auth-options-section.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/auth-options-section.tsx
@@ -20,10 +20,10 @@ export function AuthOptionsSection({
     <section className="flex flex-col gap-4 md:gap-8">
       {ecosystem ? (
         <AuthOptionsForm
-          ecosystem={ecosystem}
           authToken={authToken}
-          teamId={teamId}
           client={client}
+          ecosystem={ecosystem}
+          teamId={teamId}
         />
       ) : (
         <AuthOptionsFormSkeleton />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/ecosystem-partners-section.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/ecosystem-partners-section.tsx
index bc950fc22b6..6407febcb5e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/ecosystem-partners-section.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/ecosystem-partners-section.tsx
@@ -29,17 +29,17 @@ export function EcosystemPartnersSection({
           </p>
         </div>
         <AddPartnerDialogButton
-          teamSlug={teamSlug}
-          ecosystem={ecosystem}
           authToken={authToken}
+          ecosystem={ecosystem}
+          teamSlug={teamSlug}
         />
       </div>
 
       <PartnersTable
-        ecosystem={ecosystem}
         authToken={authToken}
-        teamSlug={teamSlug}
+        ecosystem={ecosystem}
         teamId={teamId}
+        teamSlug={teamSlug}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/integration-permissions-section.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/integration-permissions-section.tsx
index e7869f4f7a3..adf12a72f89 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/integration-permissions-section.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/integration-permissions-section.tsx
@@ -8,7 +8,11 @@ export function IntegrationPermissionsSection({
   ecosystem,
   authToken,
   teamId,
-}: { ecosystem?: Ecosystem; authToken: string; teamId: string }) {
+}: {
+  ecosystem?: Ecosystem;
+  authToken: string;
+  teamId: string;
+}) {
   return (
     <div className="relative rounded-lg border border-border bg-card px-4 py-6 lg:px-6">
       <h3 className="font-semibold text-xl tracking-tight">
@@ -26,8 +30,8 @@ export function IntegrationPermissionsSection({
       <section className="flex flex-col gap-4 md:gap-8">
         {ecosystem ? (
           <IntegrationPermissionsToggle
-            ecosystem={ecosystem}
             authToken={authToken}
+            ecosystem={ecosystem}
             teamId={teamId}
           />
         ) : (
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/partners-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/partners-table.tsx
index dd955381830..1483549c0f8 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/partners-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/server/partners-table.tsx
@@ -1,6 +1,9 @@
+import { PencilIcon, Trash2Icon } from "lucide-react";
+import { toast } from "sonner";
+import { Link } from "tw-components/link";
+import { Button } from "@/components/ui/button";
 import { ConfirmationDialog } from "@/components/ui/ConfirmationDialog";
 import { CopyButton } from "@/components/ui/CopyButton";
-import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
   Table,
@@ -14,9 +17,6 @@ import {
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { cn } from "@/lib/utils";
-import { PencilIcon, Trash2Icon } from "lucide-react";
-import { toast } from "sonner";
-import { Link } from "tw-components/link";
 import type { Ecosystem, Partner } from "../../../../../types";
 import { usePartners } from "../../../hooks/use-partners";
 import { useDeletePartner } from "../../hooks/use-delete-partner";
@@ -33,8 +33,8 @@ export function PartnersTable({
   teamId: string;
 }) {
   const { partners, isPending } = usePartners({
-    ecosystem,
     authToken,
+    ecosystem,
     teamId,
   });
 
@@ -43,7 +43,7 @@ export function PartnersTable({
       <div className="flex flex-col gap-2">
         {Array.from({ length: 3 }).map((_, i) => (
           // biome-ignore lint/suspicious/noArrayIndexKey: static list with index as key
-          <Skeleton key={i} className="h-10 w-full rounded-md" />
+          <Skeleton className="h-10 w-full rounded-md" key={i} />
         ))}
       </div>
     );
@@ -66,12 +66,12 @@ export function PartnersTable({
         <TableBody>
           {[...partners].reverse().map((partner: Partner) => (
             <PartnerRow
+              authToken={authToken}
+              ecosystem={ecosystem}
               key={partner.id}
               partner={partner}
-              ecosystem={ecosystem}
-              authToken={authToken}
-              teamSlug={teamSlug}
               teamId={teamId}
+              teamSlug={teamSlug}
             />
           ))}
         </TableBody>
@@ -105,8 +105,8 @@ function PartnerRow(props: {
 
   return (
     <TableRow
-      linkBox
       className={cn("hover:bg-card", isDeleting && "animate-pulse")}
+      linkBox
     >
       <TableCell className="max-w-32 truncate align-center">
         {props.partner.name}
@@ -118,7 +118,7 @@ function PartnerRow(props: {
       </TableCell>
       <TableCell className="hidden max-w-32 align-center md:table-cell">
         {props.partner.allowlistedBundleIds.map((domain) => (
-          <div key={domain} className="truncate">
+          <div className="truncate" key={domain}>
             {domain}
           </div>
         ))}
@@ -126,7 +126,7 @@ function PartnerRow(props: {
       <TableCell className="hidden max-w-32 align-center sm:table-cell">
         <ToolTipLabel label={props.partner.id}>
           <div className="flex items-center ">
-            <CopyButton text={props.partner.id} className="mr-1" />
+            <CopyButton className="mr-1" text={props.partner.id} />
             <span className="truncate">{props.partner.id}</span>
           </div>
         </ToolTipLabel>
@@ -135,9 +135,6 @@ function PartnerRow(props: {
       <td className="table-cell py-3 align-middle">
         <div className="flex justify-end gap-3 pr-3">
           <Button
-            type="button"
-            variant="outline"
-            size="icon"
             className="text-accent-foreground/50 hover:bg-accent hover:text-accent-foreground"
             disabled={isDeleting}
             onClick={() => {
@@ -145,21 +142,23 @@ function PartnerRow(props: {
                 `/team/${props.teamSlug}/~/ecosystem/${props.ecosystem.slug}/configuration/partners/${props.partner.id}/edit`,
               );
             }}
+            size="icon"
+            type="button"
+            variant="outline"
           >
             <PencilIcon className="size-4" />
             <span className="sr-only">Edit</span>
           </Button>
           <ConfirmationDialog
-            title={`Are you sure you want to delete the partner ${props.partner.name}?`}
             description={
               <span>
                 Their partner key will no longer be able to use your ecosystem
                 wallet. Their users will still have access to their assets at{" "}
                 <Link
+                  className="text-primary"
                   href={`https://${props.ecosystem.slug}.ecosystem.thirdweb.com`}
-                  target="_blank"
                   rel="noopener noreferrer"
-                  className="text-primary"
+                  target="_blank"
                 >
                   {props.ecosystem.slug.split(".")[1]}.ecosystem.thirdweb.com
                 </Link>
@@ -171,14 +170,15 @@ function PartnerRow(props: {
                 partnerId: props.partner.id,
               });
             }}
+            title={`Are you sure you want to delete the partner ${props.partner.name}?`}
             variant="destructive"
           >
             <Button
-              type="button"
-              variant="outline"
-              size="icon"
               className="text-destructive hover:bg-destructive hover:text-destructive-foreground"
               disabled={isDeleting}
+              size="icon"
+              type="button"
+              variant="outline"
             >
               <Trash2Icon className="size-4" />
               <span className="sr-only">Delete</span>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/constants.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/constants.ts
index 8a043fb5b80..edb97071a5c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/constants.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/constants.ts
@@ -32,162 +32,136 @@ const allowedTransactionSchema = z.object({
         message: "Invalid contract address",
       },
     ),
-  selector: z
+  maxValue: z
     .string()
     .optional()
     .transform((data) => (data?.length === 0 ? undefined : data))
     .refine(
       (data) => {
         if (data) {
-          return isHex(data) && data.length === 10; // 0x + 4 bytes for the selector (8 chars)
+          return BigInt(data) >= 0;
         }
         return true;
       },
       {
-        message: "Invalid function selector",
+        message: "Invalid max value",
       },
     ),
-  maxValue: z
+  selector: z
     .string()
     .optional()
     .transform((data) => (data?.length === 0 ? undefined : data))
     .refine(
       (data) => {
         if (data) {
-          return BigInt(data) >= 0;
+          return isHex(data) && data.length === 10; // 0x + 4 bytes for the selector (8 chars)
         }
         return true;
       },
       {
-        message: "Invalid max value",
+        message: "Invalid function selector",
       },
     ),
 });
 
 const allowedTypedDataSchema = z
   .object({
-    domain: z.string().refine((data) => data.length > 0, {
-      message: "Domain is required",
-    }),
-    verifyingContract: z
-      .string()
+    chainId: z
+      .number()
       .optional()
-      .transform((data) => (data?.length === 0 ? undefined : data))
       .refine(
         (data) => {
-          if (data) {
-            return isAddress(data);
+          if (data !== undefined) {
+            return data > 0;
           }
           return true;
         },
         {
-          message: "Invalid verifying contract address",
+          message: "Invalid chain ID",
         },
       ),
-    chainId: z
-      .number()
+    domain: z.string().refine((data) => data.length > 0, {
+      message: "Domain is required",
+    }),
+    primaryType: z.string().optional(),
+    verifyingContract: z
+      .string()
       .optional()
+      .transform((data) => (data?.length === 0 ? undefined : data))
       .refine(
         (data) => {
-          if (data !== undefined) {
-            return data > 0;
+          if (data) {
+            return isAddress(data);
           }
           return true;
         },
         {
-          message: "Invalid chain ID",
+          message: "Invalid verifying contract address",
         },
       ),
-    primaryType: z.string().optional(),
   })
   .transform((data) => {
     return {
       ...data,
-      verifyingContract:
-        data.verifyingContract && data.verifyingContract.length > 0
-          ? data.verifyingContract
-          : undefined,
       primaryType:
         data.primaryType && data.primaryType.length > 0
           ? data.primaryType
           : undefined,
+      verifyingContract:
+        data.verifyingContract && data.verifyingContract.length > 0
+          ? data.verifyingContract
+          : undefined,
     };
   });
 
 const personalSignRestrictionSchema = z.discriminatedUnion("messageType", [
   z.object({
-    messageType: z.literal("userOp"),
     allowedTransactions: z
       .array(allowedTransactionSchema)
       .optional()
       .transform((data) => (data?.length === 0 ? undefined : data)),
+    messageType: z.literal("userOp"),
   }),
   z.object({
-    messageType: z.literal("other"),
     message: z.string().optional(),
+    messageType: z.literal("other"),
   }),
 ]);
 
 const allowedOperationsSchema = z.discriminatedUnion("signMethod", [
   z.object({
-    signMethod: z.literal("eth_signTransaction"),
     allowedTransactions: z
       .array(allowedTransactionSchema)
       .optional()
       .transform((data) => (data?.length === 0 ? undefined : data)),
+    signMethod: z.literal("eth_signTransaction"),
   }),
   z.object({
-    signMethod: z.literal("eth_signTypedData_v4"),
     allowedTypedData: z
       .array(allowedTypedDataSchema)
       .optional()
       .transform((data) => (data?.length === 0 ? undefined : data)),
+    signMethod: z.literal("eth_signTypedData_v4"),
   }),
   z.object({
-    signMethod: z.literal("personal_sign"),
     allowedPersonalSigns: z
       .array(personalSignRestrictionSchema)
       .optional()
       .transform((data) => (data?.length === 0 ? undefined : data)),
+    signMethod: z.literal("personal_sign"),
   }),
 ]);
 
 export const partnerFormSchema = z
   .object({
-    name: z
-      .string()
-      .trim()
-      .min(3, {
-        message: "Name must be at least 3 characters",
-      })
-      .refine((name) => /^[a-zA-Z0-9 ]*$/.test(name), {
-        message: "Name can only contain letters, numbers and spaces",
-      }),
-    domains: z
-      .string()
-      .trim()
-      .transform((s) => s.split(/,| /).filter((d) => d.length > 0))
-      .refine((domains) => domains.every((d) => isDomainRegex.test(d)), {
-        message: "Invalid domain format", // This error message CANNOT be within the array iteration, or the FormMessage won't be able to find it in the form state
-      })
-      .transform((s) => s.join(",")), // This is rejoined to return a string (and later split again) since react-hook-form's typings can't handle different input vs output types
-    bundleIds: z
-      .string()
-      .trim()
-      .transform((s) =>
-        s
-          .split(/,| /)
-          .filter((d) => d.length > 0)
-          .join(","),
-      ),
-    accessControlEnabled: z.boolean().default(false),
-    serverVerifierEnabled: z.boolean().default(false),
-    allowedOperationsEnabled: z.boolean().default(false),
     accessControl: z
       .object({
+        allowedOperations: z
+          .array(allowedOperationsSchema)
+          .optional()
+          .transform((data) => (data?.length === 0 ? undefined : data)),
         serverVerifier: z
           .object({
-            url: z.string().optional(),
             headers: z
               .array(
                 z.object({
@@ -196,14 +170,40 @@ export const partnerFormSchema = z
                 }),
               )
               .optional(),
+            url: z.string().optional(),
           })
           .optional(),
-        allowedOperations: z
-          .array(allowedOperationsSchema)
-          .optional()
-          .transform((data) => (data?.length === 0 ? undefined : data)),
       })
       .optional(),
+    accessControlEnabled: z.boolean().default(false), // This is rejoined to return a string (and later split again) since react-hook-form's typings can't handle different input vs output types
+    allowedOperationsEnabled: z.boolean().default(false),
+    bundleIds: z
+      .string()
+      .trim()
+      .transform((s) =>
+        s
+          .split(/,| /)
+          .filter((d) => d.length > 0)
+          .join(","),
+      ),
+    domains: z
+      .string()
+      .trim()
+      .transform((s) => s.split(/,| /).filter((d) => d.length > 0))
+      .refine((domains) => domains.every((d) => isDomainRegex.test(d)), {
+        message: "Invalid domain format", // This error message CANNOT be within the array iteration, or the FormMessage won't be able to find it in the form state
+      })
+      .transform((s) => s.join(",")),
+    name: z
+      .string()
+      .trim()
+      .min(3, {
+        message: "Name must be at least 3 characters",
+      })
+      .refine((name) => /^[a-zA-Z0-9 ]*$/.test(name), {
+        message: "Name can only contain letters, numbers and spaces",
+      }),
+    serverVerifierEnabled: z.boolean().default(false),
   })
   .refine(
     (data) => {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/fetchPartnerDetails.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/fetchPartnerDetails.ts
index f9d38c1f5d6..aa91df3eadb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/fetchPartnerDetails.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/fetchPartnerDetails.ts
@@ -12,11 +12,11 @@ export async function fetchPartnerDetails(args: {
     const response = await fetch(
       `${ecosystem.url}/${ecosystem.id}/partner/${partnerId}`,
       {
-        method: "GET",
         headers: {
           Authorization: `Bearer ${authToken}`,
           "x-thirdweb-team-id": teamId,
         },
+        method: "GET",
       },
     );
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-add-partner.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-add-partner.ts
index 85d25956e20..27bc0e0d739 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-add-partner.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-add-partner.ts
@@ -33,21 +33,21 @@ export function useAddPartner(
       const res = await fetch(
         `${params.ecosystem.url}/${params.ecosystem.id}/partner`,
         {
-          method: "POST",
-
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${authToken}`,
-            "x-thirdweb-team-id": teamId,
-          },
           body: JSON.stringify({
-            name: params.name,
-            allowlistedDomains: params.allowlistedDomains,
-            allowlistedBundleIds: params.allowlistedBundleIds,
             accessControl: params.accessControl ?? undefined,
+            allowlistedBundleIds: params.allowlistedBundleIds,
+            allowlistedDomains: params.allowlistedDomains,
+            name: params.name,
             // TODO - remove the requirement for permissions in API endpoint
             permissions: ["FULL_CONTROL_V1"],
           }),
+
+          headers: {
+            Authorization: `Bearer ${authToken}`,
+            "Content-Type": "application/json",
+            "x-thirdweb-team-id": teamId,
+          },
+          method: "POST",
         },
       );
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-delete-partner.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-delete-partner.ts
index cfe76646419..019934a7c11 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-delete-partner.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-delete-partner.ts
@@ -32,11 +32,11 @@ export function useDeletePartner(
       const res = await fetch(
         `${params.ecosystem.url}/${params.ecosystem.id}/partner/${params.partnerId}`,
         {
-          method: "DELETE",
           headers: {
-            "x-thirdweb-team-id": teamId,
             Authorization: `Bearer ${authToken}`,
+            "x-thirdweb-team-id": teamId,
           },
+          method: "DELETE",
         },
       );
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-update-ecosystem.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-update-ecosystem.ts
index e639dc9fd0e..2878eb42d6b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-update-ecosystem.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-update-ecosystem.ts
@@ -20,13 +20,13 @@ export function useUpdateEcosystem(
     // Returns true if the update was successful
     mutationFn: async (params: Ecosystem): Promise<boolean> => {
       const res = await fetch(`${params.url}/${params.id}`, {
-        method: "PATCH",
+        body: JSON.stringify(params),
         headers: {
+          Authorization: `Bearer ${authToken}`,
           "Content-Type": "application/json",
           "x-thirdweb-team-id": teamId,
-          Authorization: `Bearer ${authToken}`,
         },
-        body: JSON.stringify(params),
+        method: "PATCH",
       });
 
       if (!res.ok) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-update-partner.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-update-partner.ts
index 94135cffa57..1e78500af1f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-update-partner.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/hooks/use-update-partner.ts
@@ -39,19 +39,19 @@ export function useUpdatePartner(
       const res = await fetch(
         `${params.ecosystem.url}/${params.ecosystem.id}/partner/${params.partnerId}`,
         {
-          method: "PATCH",
+          body: JSON.stringify({
+            accessControl: params.accessControl,
+            allowlistedBundleIds: params.allowlistedBundleIds,
+            allowlistedDomains: params.allowlistedDomains,
+            name: params.name,
+          }),
 
           headers: {
-            "Content-Type": "application/json",
             Authorization: `Bearer ${authToken}`,
+            "Content-Type": "application/json",
             "x-thirdweb-team-id": teamId,
           },
-          body: JSON.stringify({
-            name: params.name,
-            allowlistedDomains: params.allowlistedDomains,
-            allowlistedBundleIds: params.allowlistedBundleIds,
-            accessControl: params.accessControl,
-          }),
+          method: "PATCH",
         },
       );
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/partners/[partner_id]/edit/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/partners/[partner_id]/edit/page.tsx
index e848cb8f5c7..1b33c1af0ad 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/partners/[partner_id]/edit/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/partners/[partner_id]/edit/page.tsx
@@ -1,6 +1,6 @@
+import { notFound } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound } from "next/navigation";
 import { getAuthToken } from "../../../../../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../../../../../login/loginRedirect";
 import { UpdatePartnerForm } from "../../../components/client/update-partner-form.client";
@@ -37,16 +37,16 @@ export default async function EditPartnerPage({
 
   try {
     const ecosystem = await fetchEcosystem({
-      teamIdOrSlug: teamSlug,
-      slug: ecosystemSlug,
       authToken,
+      slug: ecosystemSlug,
+      teamIdOrSlug: teamSlug,
     });
 
     try {
       const partner = await fetchPartnerDetails({
+        authToken,
         ecosystem,
         partnerId,
-        authToken,
         teamId: team.id,
       });
 
@@ -70,11 +70,11 @@ export default async function EditPartnerPage({
               Edit Partner: {partner.name}
             </h1>
             <UpdatePartnerForm
+              authToken={authToken}
+              client={client}
               ecosystem={ecosystem}
               partner={partner}
-              authToken={authToken}
               teamId={team.id}
-              client={client}
             />
           </div>
         </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-ecosystem.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-ecosystem.ts
index 638fac92dfc..f4f21bc3aa1 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-ecosystem.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-ecosystem.ts
@@ -1,5 +1,5 @@
-import { apiServerProxy } from "@/actions/proxies";
 import { useQuery } from "@tanstack/react-query";
+import { apiServerProxy } from "@/actions/proxies";
 import type { Ecosystem } from "../../../types";
 
 export function useEcosystem({
@@ -16,11 +16,11 @@ export function useEcosystem({
   initialData?: Ecosystem;
 }) {
   return useQuery({
-    queryKey: ["ecosystems", teamIdOrSlug, slug],
+    initialData,
     queryFn: async () => {
       const res = await apiServerProxy({
-        pathname: `/v1/teams/${teamIdOrSlug}/ecosystem-wallet/${slug}`,
         method: "GET",
+        pathname: `/v1/teams/${teamIdOrSlug}/ecosystem-wallet/${slug}`,
       });
 
       if (!res.ok) {
@@ -30,9 +30,9 @@ export function useEcosystem({
       const data = res.data as { result: Ecosystem };
       return data.result;
     },
-    retry: false,
+    queryKey: ["ecosystems", teamIdOrSlug, slug],
     refetchInterval,
     refetchOnWindowFocus,
-    initialData,
+    retry: false,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-partners.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-partners.ts
index 545a093ba75..d75b9721062 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-partners.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-partners.ts
@@ -6,12 +6,16 @@ export function usePartners({
   ecosystem,
   authToken,
   teamId,
-}: { ecosystem: Ecosystem; authToken: string; teamId: string }) {
+}: {
+  ecosystem: Ecosystem;
+  authToken: string;
+  teamId: string;
+}) {
   const partnersQuery = useQuery({
-    queryKey: ["ecosystem", ecosystem.id, "partners"],
     queryFn: async () => {
-      return fetchPartners({ ecosystem, authToken, teamId });
+      return fetchPartners({ authToken, ecosystem, teamId });
     },
+    queryKey: ["ecosystem", ecosystem.id, "partners"],
     retry: false,
   });
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/layout.tsx
index 1947747134c..ea7d4a53b17 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/layout.tsx
@@ -7,8 +7,8 @@ export default async function Layout(props: {
   const { team_slug } = await props.params;
   return (
     <EcosystemLayoutSlug
-      params={await props.params}
       ecosystemLayoutPath={`/team/${team_slug}/~/ecosystem`}
+      params={await props.params}
     >
       {props.children}
     </EcosystemLayoutSlug>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/page.tsx
index 0396af3b64c..ad27d82b18e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/page.tsx
@@ -1,5 +1,5 @@
-import { getTeamBySlug } from "@/api/team";
 import { notFound } from "next/navigation";
+import { getTeamBySlug } from "@/api/team";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../login/loginRedirect";
 import { EcosystemPermissionsPage } from "./configuration/components/client/EcosystemPermissionsPage";
@@ -23,8 +23,8 @@ export default async function Page(props: {
 
   return (
     <EcosystemPermissionsPage
-      params={params}
       authToken={authToken}
+      params={params}
       teamId={team.id}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/EcosystemCreatePage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/EcosystemCreatePage.tsx
index 55353817b9f..e6b9026b6c4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/EcosystemCreatePage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/EcosystemCreatePage.tsx
@@ -10,8 +10,8 @@ export async function EcosystemCreatePage(props: {
       <main className="container max-w-5xl py-20">
         <div className="flex flex-col rounded-lg border bg-card lg:flex-row">
           <CreateEcosystemForm
-            teamSlug={props.teamSlug}
             teamId={props.teamId}
+            teamSlug={props.teamSlug}
           />
           <EcosystemWalletPricingCard />
         </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/actions/create-ecosystem.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/actions/create-ecosystem.ts
index a89d079f3ce..7309dc29516 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/actions/create-ecosystem.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/actions/create-ecosystem.ts
@@ -1,10 +1,10 @@
 "use server";
 import "server-only";
+import { redirect } from "next/navigation";
+import { upload } from "thirdweb/storage";
 import { BASE_URL } from "@/constants/env-utils";
 import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
-import { upload } from "thirdweb/storage";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 
 export async function createEcosystem(options: {
@@ -34,21 +34,21 @@ export async function createEcosystem(options: {
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${teamSlug}/checkout/create-link`,
     {
-      method: "POST",
       body: JSON.stringify({
         baseUrl: BASE_URL,
-        sku: "product:ecosystem_wallets",
         metadata: {
           ...data,
-          imageUrl,
           // not something we pass in today during creation, but required to be there
           authOptions: [],
+          imageUrl,
         },
+        sku: "product:ecosystem_wallets",
       }),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
   if (!res.ok) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/components/client/create-ecosystem-form.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/components/client/create-ecosystem-form.client.tsx
index 27782d55085..49b0dbcfe61 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/components/client/create-ecosystem-form.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/components/client/create-ecosystem-form.client.tsx
@@ -1,5 +1,10 @@
 "use client";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { ArrowRightIcon } from "lucide-react";
+import Link from "next/link";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -14,15 +19,17 @@ import {
 import { ImageUpload } from "@/components/ui/image-upload";
 import { Input } from "@/components/ui/input";
 import { RadioGroup, RadioGroupItemButton } from "@/components/ui/radio-group";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { ArrowRightIcon } from "lucide-react";
-import Link from "next/link";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { createEcosystem } from "../../actions/create-ecosystem";
 
 const formSchema = z.object({
+  logo: z
+    .instanceof(File, {
+      message: "Logo is required",
+    })
+    .refine((file) => file.size <= 500 * 1024, {
+      message: "Logo size must be less than 500KB",
+    }),
   name: z
     .string()
     .min(3, {
@@ -31,13 +38,6 @@ const formSchema = z.object({
     .refine((name) => /^[a-zA-Z0-9 ]*$/.test(name), {
       message: "Name can only contain letters, numbers and spaces",
     }),
-  logo: z
-    .instanceof(File, {
-      message: "Logo is required",
-    })
-    .refine((file) => file.size <= 500 * 1024, {
-      message: "Logo size must be less than 500KB",
-    }),
   permission: z.union([z.literal("PARTNER_WHITELIST"), z.literal("ANYONE")]),
 });
 
@@ -46,10 +46,10 @@ export function CreateEcosystemForm(props: {
   teamId: string;
 }) {
   const form = useForm<z.infer<typeof formSchema>>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
       permission: "PARTNER_WHITELIST",
     },
+    resolver: zodResolver(formSchema),
   });
 
   return (
@@ -58,8 +58,8 @@ export function CreateEcosystemForm(props: {
         className="flex grow flex-col"
         onSubmit={form.handleSubmit(async (values) => {
           const res = await createEcosystem({
-            teamSlug: props.teamSlug,
             teamId: props.teamId,
+            teamSlug: props.teamSlug,
             ...values,
           });
           switch (res.status) {
@@ -122,8 +122,8 @@ export function CreateEcosystemForm(props: {
                 <RequiredFormLabel>Ecosystem Logo</RequiredFormLabel>
                 <FormControl>
                   <ImageUpload
-                    className="bg-background"
                     accept="image/png, image/jpeg"
+                    className="bg-background"
                     onUpload={(files) => {
                       if (files[0]) {
                         form.setValue("logo", files[0], {
@@ -148,16 +148,15 @@ export function CreateEcosystemForm(props: {
                 <FormLabel>Integration permissions</FormLabel>
                 <FormControl>
                   <RadioGroup
-                    onValueChange={field.onChange}
-                    defaultValue="PARTNER_WHITELIST"
                     className="flex flex-wrap gap-4 py-2"
+                    defaultValue="PARTNER_WHITELIST"
+                    onValueChange={field.onChange}
                   >
                     <FormItem>
                       <FormControl>
                         <RadioGroupItemButton
-                          value="PARTNER_WHITELIST"
-                          id="PARTNER_WHITELIST"
                           className="bg-background"
+                          value="PARTNER_WHITELIST"
                         >
                           Allowlist
                         </RadioGroupItemButton>
@@ -166,9 +165,8 @@ export function CreateEcosystemForm(props: {
                     <FormItem>
                       <FormControl>
                         <RadioGroupItemButton
-                          value="ANYONE"
-                          id="ANYONE"
                           className="bg-background"
+                          value="ANYONE"
                         >
                           Public
                         </RadioGroupItemButton>
@@ -179,9 +177,9 @@ export function CreateEcosystemForm(props: {
                 <FormDescription>
                   <Link
                     className="text-primary"
-                    target="_blank"
-                    rel="noopener noreferrer"
                     href="https://portal.thirdweb.com/connect/ecosystems/ecosystem-permissions"
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
                     Learn more about ecosystem permissions
                   </Link>
@@ -196,9 +194,9 @@ export function CreateEcosystemForm(props: {
 
         <div className="mt-auto flex justify-end border-t p-4 lg:p-6">
           <Button
-            type="submit"
             className="gap-2"
             disabled={form.formState.isSubmitting}
+            type="submit"
           >
             Create Ecosystem
             {form.formState.isSubmitting ? (
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/components/pricing-card.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/components/pricing-card.tsx
index 2bd6115198d..1db08d7710a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/components/pricing-card.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/components/pricing-card.tsx
@@ -1,6 +1,6 @@
-import { cn } from "@/lib/utils";
 import { CheckIcon } from "lucide-react";
 import Image from "next/image";
+import { cn } from "@/lib/utils";
 import headerImage from "../../assets/header.png";
 
 export function EcosystemWalletPricingCard(props: { className?: string }) {
@@ -11,7 +11,7 @@ export function EcosystemWalletPricingCard(props: { className?: string }) {
         props.className,
       )}
     >
-      <Image src={headerImage} alt="" sizes="50vw" className="w-full" />
+      <Image alt="" className="w-full" sizes="50vw" src={headerImage} />
 
       <div className="relative flex grow flex-col border-border border-t p-4 lg:p-6">
         <h4 className="flex items-center gap-2 font-semibold text-4xl text-foreground tracking-tight">
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/page.tsx
index 0c52e6b8082..23abcbd9382 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/create/page.tsx
@@ -1,5 +1,5 @@
-import { getTeamBySlug } from "@/api/team";
 import { notFound } from "next/navigation";
+import { getTeamBySlug } from "@/api/team";
 import { EcosystemCreatePage } from "./EcosystemCreatePage";
 
 export default async function Page(props: {
@@ -12,5 +12,5 @@ export default async function Page(props: {
     return notFound();
   }
 
-  return <EcosystemCreatePage teamSlug={team_slug} teamId={team.id} />;
+  return <EcosystemCreatePage teamId={team.id} teamSlug={team_slug} />;
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/hooks/use-ecosystem-list.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/hooks/use-ecosystem-list.ts
index 4479c3dd43e..b33dbaf0db7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/hooks/use-ecosystem-list.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/hooks/use-ecosystem-list.ts
@@ -1,20 +1,15 @@
-import { apiServerProxy } from "@/actions/proxies";
 import { useQuery } from "@tanstack/react-query";
 import { useActiveAccount } from "thirdweb/react";
+import { apiServerProxy } from "@/actions/proxies";
 import type { Ecosystem } from "../types";
 
-export function useEcosystemList({
-  teamIdOrSlug,
-}: {
-  teamIdOrSlug: string;
-}) {
+export function useEcosystemList({ teamIdOrSlug }: { teamIdOrSlug: string }) {
   const address = useActiveAccount()?.address;
   return useQuery({
-    queryKey: ["ecosystems", teamIdOrSlug, address],
     queryFn: async () => {
       const res = await apiServerProxy({
-        pathname: `/v1/teams/${teamIdOrSlug}/ecosystem-wallet`,
         method: "GET",
+        pathname: `/v1/teams/${teamIdOrSlug}/ecosystem-wallet`,
       });
 
       if (!res.ok) {
@@ -24,6 +19,7 @@ export function useEcosystemList({
       const data = res.data as { result: Ecosystem[] };
       return data.result;
     },
+    queryKey: ["ecosystems", teamIdOrSlug, address],
     retry: false,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/page.tsx
index fd883447e5a..744311e5c44 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/page.tsx
@@ -1,8 +1,8 @@
-import { Button } from "@/components/ui/button";
 import { ArrowRightIcon, ExternalLinkIcon } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
 import { redirect } from "next/navigation";
+import { Button } from "@/components/ui/button";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../login/loginRedirect";
 import headerImage from "./assets/header.png";
@@ -33,18 +33,16 @@ export default async function Page(props: {
   return <EcosystemLandingPage ecosystemLayoutPath={ecosystemLayoutPath} />;
 }
 
-async function EcosystemLandingPage(props: {
-  ecosystemLayoutPath: string;
-}) {
+async function EcosystemLandingPage(props: { ecosystemLayoutPath: string }) {
   return (
     <div className="container flex grow flex-col items-center justify-center py-20">
       {/* Card */}
       <div className="flex max-w-lg flex-col rounded-lg border bg-card">
         <Image
-          src={headerImage}
           alt="Ecosystems"
-          sizes="100vw"
           className="w-full border-b"
+          sizes="100vw"
+          src={headerImage}
         />
 
         {/* body */}
@@ -63,12 +61,12 @@ async function EcosystemLandingPage(props: {
 
         {/* Footer */}
         <div className="mt-6 flex flex-col justify-end gap-4 border-t px-4 py-6 lg:flex-row lg:px-6">
-          <Button variant="outline" asChild>
+          <Button asChild variant="outline">
             <Link
+              className="flex flex-row gap-2"
               href="https://portal.thirdweb.com/connect/ecosystems/overview"
-              target="_blank"
               rel="noopener noreferrer"
-              className="flex flex-row gap-2"
+              target="_blank"
             >
               Documentation
               <ExternalLinkIcon className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/projects/TeamProjectsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/projects/TeamProjectsPage.tsx
index acad52f0104..36d0d696d0f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/projects/TeamProjectsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/projects/TeamProjectsPage.tsx
@@ -1,11 +1,17 @@
 "use client";
 
+import { LazyCreateProjectDialog } from "components/settings/ApiKeys/Create/LazyCreateAPIKeyDialog";
+import { format } from "date-fns";
+import { ArrowDownNarrowWideIcon, PlusIcon, SearchIcon } from "lucide-react";
+import Link from "next/link";
+import { useMemo, useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import type { Team } from "@/api/team";
 import { ProjectAvatar } from "@/components/blocks/Avatars/ProjectAvatar";
 import { PaginationButtons } from "@/components/pagination-buttons";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Input } from "@/components/ui/input";
 import {
   Select,
@@ -24,12 +30,6 @@ import {
 } from "@/components/ui/table";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { cn } from "@/lib/utils";
-import { LazyCreateProjectDialog } from "components/settings/ApiKeys/Create/LazyCreateAPIKeyDialog";
-import { format } from "date-fns";
-import { ArrowDownNarrowWideIcon, PlusIcon, SearchIcon } from "lucide-react";
-import Link from "next/link";
-import { useMemo, useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 
 type SortById = "name" | "createdAt" | "monthlyActiveUsers";
 
@@ -101,19 +101,19 @@ export function TeamProjectsPage(props: {
         {/* Filters + Add New */}
         <div className="flex flex-col gap-3 md:flex-row md:items-center">
           <SearchInput
-            value={searchTerm}
             onValueChange={(v) => {
               setSearchTerm(v);
               setPage(1);
             }}
+            value={searchTerm}
           />
           <div className="flex gap-3">
             <SelectBy
-              value={sortBy}
               onChange={(v) => {
                 setSortBy(v);
                 setPage(1);
               }}
+              value={sortBy}
             />
             <AddNewButton
               createProject={() => setIsCreateProjectDialogOpen(true)}
@@ -125,31 +125,29 @@ export function TeamProjectsPage(props: {
 
       {/* Projects Table */}
       {paginatedProjects.length === 0 ? (
-        <>
-          {searchTerm !== "" ? (
-            <div className="flex min-h-[450px] grow items-center justify-center border border-border bg-card">
-              <div className="flex flex-col items-center">
-                <p className="mb-5 text-center">No projects found</p>
-              </div>
+        searchTerm !== "" ? (
+          <div className="flex min-h-[450px] grow items-center justify-center border border-border bg-card">
+            <div className="flex flex-col items-center">
+              <p className="mb-5 text-center">No projects found</p>
             </div>
-          ) : (
-            <div className="flex min-h-[450px] grow items-center justify-center rounded-b-lg border border-border bg-card">
-              <div className="flex flex-col items-center">
-                <p className="mb-5 text-center font-semibold text-lg">
-                  No projects created
-                </p>
-                <Button
-                  className="gap-2 bg-background"
-                  onClick={() => setIsCreateProjectDialogOpen(true)}
-                  variant="outline"
-                >
-                  <PlusIcon className="size-4" />
-                  Create Project
-                </Button>
-              </div>
+          </div>
+        ) : (
+          <div className="flex min-h-[450px] grow items-center justify-center rounded-b-lg border border-border bg-card">
+            <div className="flex flex-col items-center">
+              <p className="mb-5 text-center font-semibold text-lg">
+                No projects created
+              </p>
+              <Button
+                className="gap-2 bg-background"
+                onClick={() => setIsCreateProjectDialogOpen(true)}
+                variant="outline"
+              >
+                <PlusIcon className="size-4" />
+                Create Project
+              </Button>
             </div>
-          )}
-        </>
+          </div>
+        )
       ) : (
         <div>
           <TableContainer
@@ -170,9 +168,9 @@ export function TeamProjectsPage(props: {
               <TableBody>
                 {paginatedProjects.map((project) => (
                   <TableRow
+                    className="hover:bg-accent/50"
                     key={project.id}
                     linkBox
-                    className="hover:bg-accent/50"
                   >
                     <TableCell>
                       <Link
@@ -181,8 +179,8 @@ export function TeamProjectsPage(props: {
                       >
                         <ProjectAvatar
                           className="size-8 rounded-full"
-                          src={project.image || ""}
                           client={props.client}
+                          src={project.image || ""}
                         />
                         <span className="font-medium text-sm">
                           {project.name}
@@ -198,12 +196,12 @@ export function TeamProjectsPage(props: {
                     </TableCell>
                     <TableCell>
                       <CopyTextButton
+                        className="-translate-x-2 z-10 font-mono text-muted-foreground"
+                        copyIconPosition="right"
                         textToCopy={project.publishableKey}
                         textToShow={`${project.publishableKey.slice(0, 4)}...${project.publishableKey.slice(-4)}`}
-                        copyIconPosition="right"
                         tooltip={undefined}
                         variant="ghost"
-                        className="-translate-x-2 z-10 font-mono text-muted-foreground"
                       />
                     </TableCell>
                     <TableCell className="text-muted-foreground">
@@ -228,17 +226,17 @@ export function TeamProjectsPage(props: {
       )}
 
       <LazyCreateProjectDialog
-        open={isCreateProjectDialogOpen}
-        onOpenChange={setIsCreateProjectDialogOpen}
-        teamSlug={props.team.slug}
-        teamId={props.team.id}
+        enableNebulaServiceByDefault={props.team.enabledScopes.includes(
+          "nebula",
+        )}
         onCreateAndComplete={() => {
           // refresh projects
           router.refresh();
         }}
-        enableNebulaServiceByDefault={props.team.enabledScopes.includes(
-          "nebula",
-        )}
+        onOpenChange={setIsCreateProjectDialogOpen}
+        open={isCreateProjectDialogOpen}
+        teamId={props.team.id}
+        teamSlug={props.team.slug}
       />
     </div>
   );
@@ -251,10 +249,10 @@ function SearchInput(props: {
   return (
     <div className="relative grow">
       <Input
+        className="bg-background pl-9 lg:w-[320px]"
+        onChange={(e) => props.onValueChange(e.target.value)}
         placeholder="Project name or Client ID"
         value={props.value}
-        onChange={(e) => props.onValueChange(e.target.value)}
-        className="bg-background pl-9 lg:w-[320px]"
       />
       <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
     </div>
@@ -267,9 +265,9 @@ function AddNewButton(props: {
 }) {
   return (
     <Button
-      variant="default"
       className="absolute top-0 right-0 gap-2 lg:static"
       onClick={props.createProject}
+      variant="default"
     >
       <PlusIcon className="size-4" />
       <span>
@@ -285,17 +283,17 @@ function SelectBy(props: {
 }) {
   const values: SortById[] = ["name", "createdAt", "monthlyActiveUsers"];
   const valueToLabel: Record<SortById, string> = {
-    name: "Name",
     createdAt: "Creation Date",
     monthlyActiveUsers: "Monthly Active Users",
+    name: "Name",
   };
 
   return (
     <Select
-      value={props.value}
       onValueChange={(v) => {
         props.onChange(v as SortById);
       }}
+      value={props.value}
     >
       <SelectTrigger className="min-w-[200px] bg-background capitalize">
         <div className="flex items-center gap-2">
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/SettingsLayout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/SettingsLayout.tsx
index a4ebaa98f49..3afce640318 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/SettingsLayout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/SettingsLayout.tsx
@@ -1,14 +1,14 @@
 "use client";
 
-import type { Team } from "@/api/team";
-import { cn } from "@/lib/utils";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { usePathname } from "next/navigation";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import type { Team } from "@/api/team";
+import { cn } from "@/lib/utils";
+import { getTeamSettingsLinks } from "./_components/sidebar/getTeamSettingsLinks";
 import { TeamSettingsSidebar } from "./_components/sidebar/TeamSettingsSidebar";
 import { TeamSettingsMobileNav } from "./_components/sidebar/TeamsMobileNav";
-import { getTeamSettingsLinks } from "./_components/sidebar/getTeamSettingsLinks";
 
 // on the /~/settings page
 // - On desktop: show the general settings as usual
@@ -40,18 +40,18 @@ export function SettingsLayout(props: {
 
       <div className="md:hidden">
         <TeamSettingsMobileNav
-          teamSlug={props.team.slug}
-          showFull={showFullNavOnMobile}
-          setShowFull={setShowFullNavOnMobile}
           activeLink={activeLink}
+          setShowFull={setShowFullNavOnMobile}
+          showFull={showFullNavOnMobile}
+          teamSlug={props.team.slug}
         />
       </div>
 
       <div className="container flex grow gap-8 lg:min-h-[900px] [&>*]:py-8 lg:[&>*]:py-10">
         <TeamSettingsSidebar
-          team={props.team}
           account={props.account}
           client={props.client}
+          team={props.team}
         />
         <div
           className={cn(
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/settings-cards/domain-verification.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/settings-cards/domain-verification.tsx
index 883dca94562..9f5c5b85439 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/settings-cards/domain-verification.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/settings-cards/domain-verification.tsx
@@ -1,19 +1,19 @@
 "use client";
 
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { AlertCircleIcon, CheckCircleIcon } from "lucide-react";
+import { useState } from "react";
 import {
-  type VerifiedDomainResponse,
   checkDomainVerification,
   createDomainVerification,
+  type VerifiedDomainResponse,
 } from "@/api/verified-domain";
 import { SettingsCard } from "@/components/blocks/SettingsCard";
-import { CopyButton } from "@/components/ui/CopyButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/CopyButton";
 import { Input } from "@/components/ui/input";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { AlertCircleIcon, CheckCircleIcon } from "lucide-react";
-import { useState } from "react";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 
 interface DomainVerificationFormProps {
   teamId: string;
@@ -30,9 +30,9 @@ export function TeamDomainVerificationCard({
   const queryClient = useQueryClient();
 
   const domainQuery = useQuery({
-    queryKey: ["domain-verification", teamId],
-    queryFn: () => checkDomainVerification(teamId),
     initialData: initialVerification,
+    queryFn: () => checkDomainVerification(teamId),
+    queryKey: ["domain-verification", teamId],
     refetchInterval: (query) => {
       // if the data is pending, refetch every 10 seconds
       if (query.state.data?.status === "pending") {
@@ -76,14 +76,13 @@ export function TeamDomainVerificationCard({
       return (
         <div>
           <Input
-            id="domain"
-            placeholder="example.com"
-            value={domain}
-            onChange={(e) => setDomain(e.target.value)}
+            className="md:w-[450px]"
             disabled={!isOwnerAccount || verificationMutation.isPending}
-            // is the max length for a domain
             maxLength={253}
-            className="md:w-[450px]"
+            onChange={(e) => setDomain(e.target.value)}
+            // is the max length for a domain
+            placeholder="example.com"
+            value={domain}
           />
           <p className="mt-2 text-muted-foreground text-sm">
             Enter the domain you want to verify. Do not include http(s):// or
@@ -153,11 +152,11 @@ export function TeamDomainVerificationCard({
             </Alert>
 
             <Button
-              onClick={() => domainQuery.refetch()}
+              className="flex items-center gap-2"
               disabled={domainQuery.isFetching}
-              variant="outline"
+              onClick={() => domainQuery.refetch()}
               size="sm"
-              className="flex items-center gap-2"
+              variant="outline"
             >
               {domainQuery.isFetching && <Spinner className="size-4" />}
               {domainQuery.isFetching
@@ -193,13 +192,14 @@ export function TeamDomainVerificationCard({
 
   return (
     <SettingsCard
-      header={{
-        title: "Domain Verification",
-        description: "Verify your domain to enable advanced features.",
-      }}
+      bottomText={getBottomText()}
       errorText={
         verificationMutation.error?.message || domainQuery.error?.message
       }
+      header={{
+        description: "Verify your domain to enable advanced features.",
+        title: "Domain Verification",
+      }}
       noPermissionText={
         domainQuery.data?.status === "pending"
           ? !isOwnerAccount
@@ -207,18 +207,17 @@ export function TeamDomainVerificationCard({
             : undefined
           : undefined
       }
-      bottomText={getBottomText()}
       saveButton={
         !domainQuery.data
           ? {
+              disabled: !domain || verificationMutation.isPending,
+              isPending: verificationMutation.isPending,
+              label: "Verify Domain",
               onClick: () =>
                 verificationMutation.mutate({
-                  teamId,
                   domain,
+                  teamId,
                 }),
-              disabled: !domain || verificationMutation.isPending,
-              isPending: verificationMutation.isPending,
-              label: "Verify Domain",
             }
           : undefined
       }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/SidebarLink.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/SidebarLink.tsx
index c8d31d254bd..98af3da4f70 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/SidebarLink.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/SidebarLink.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 
 export function SidebarLink(props: {
   href: string;
@@ -15,12 +15,12 @@ export function SidebarLink(props: {
   return (
     <Button asChild variant="ghost">
       <Link
-        href={props.href}
-        onClick={props.onClick}
         className={cn(
           "!justify-start w-full text-left font-normal text-muted-foreground",
           pathname === props.href && "text-foreground",
         )}
+        href={props.href}
+        onClick={props.onClick}
       >
         {props.label}
       </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/TeamSettingsSidebar.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/TeamSettingsSidebar.tsx
index 21c2a1ddfaa..3639a1fd936 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/TeamSettingsSidebar.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/TeamSettingsSidebar.tsx
@@ -1,9 +1,9 @@
-import type { Team } from "@/api/team";
-import { Badge } from "@/components/ui/badge";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import type { ThirdwebClient } from "thirdweb";
-import { SidebarLink } from "./SidebarLink";
+import type { Team } from "@/api/team";
+import { Badge } from "@/components/ui/badge";
 import { getTeamSettingsLinks } from "./getTeamSettingsLinks";
+import { SidebarLink } from "./SidebarLink";
 
 export function TeamSettingsSidebar(props: {
   team: Team;
@@ -19,24 +19,24 @@ export function TeamSettingsSidebar(props: {
   return (
     <aside className="lg:-ml-2 sticky top-0 hidden w-[250px] shrink-0 grow-0 flex-col gap-4 self-start lg:flex">
       <RenderLinkGroup
+        client={props.client}
         links={teamGroupLinks}
-        title="Team"
         team={props.team}
+        title="Team"
         titleAvatarIcon={{
           id: props.team.id,
           src: props.team.image || "",
         }}
-        client={props.client}
       />
       <RenderLinkGroup
+        client={props.client}
         links={accountGroupLinks}
-        title="Account"
         team={props.team}
+        title="Account"
         titleAvatarIcon={{
           id: props.account?.id,
           src: props.account?.image || "",
         }}
-        client={props.client}
       />
     </aside>
   );
@@ -59,8 +59,8 @@ function RenderLinkGroup(props: {
     <>
       <div className="px-2">
         <Badge
-          variant="outline"
           className="bg-card font-normal text-muted-foreground"
+          variant="outline"
         >
           {props.title}
         </Badge>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/TeamsMobileNav.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/TeamsMobileNav.tsx
index 3e564e5307a..caeeea0fd79 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/TeamsMobileNav.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/TeamsMobileNav.tsx
@@ -15,8 +15,8 @@ export function TeamSettingsMobileNav(props: {
     return (
       <div className="flex items-center gap-2 border-border border-b px-4 py-4 text-muted-foreground">
         <Link
-          href={teamLinks[0]?.href || "#"}
           className="inline-flex items-center gap-1"
+          href={teamLinks[0]?.href || "#"}
           onClick={() => {
             setShowFull(true);
           }}
@@ -42,8 +42,8 @@ export function TeamSettingsMobileNav(props: {
         {teamLinks.map((link) => (
           <li key={link.href}>
             <Link
-              href={link.href}
               className="flex border-border border-b p-4"
+              href={link.href}
               onClick={() => {
                 if (link === teamLinks[0]) {
                   setShowFull(false);
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/getTeamSettingsLinks.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/getTeamSettingsLinks.tsx
index 1f750684f25..e143890ced6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/getTeamSettingsLinks.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/_components/sidebar/getTeamSettingsLinks.tsx
@@ -7,34 +7,34 @@ export function getTeamSettingsLinks(teamSlug: string) {
     group: "team" | "account";
   }> = [
     {
-      name: "General",
-      href: `${prefix}`,
       group: "team",
+      href: `${prefix}`,
+      name: "General",
     },
     {
-      name: "Billing",
-      href: `${prefix}/billing`,
       group: "team",
+      href: `${prefix}/billing`,
+      name: "Billing",
     },
     {
-      name: "Invoices",
-      href: `${prefix}/invoices`,
       group: "team",
+      href: `${prefix}/invoices`,
+      name: "Invoices",
     },
     {
-      name: "Members",
-      href: `${prefix}/members`,
       group: "team",
+      href: `${prefix}/members`,
+      name: "Members",
     },
     {
-      name: "Credits",
-      href: `${prefix}/credits`,
       group: "team",
+      href: `${prefix}/credits`,
+      name: "Credits",
     },
     {
-      name: "My Notifications",
-      href: `${prefix}/notifications`,
       group: "account",
+      href: `${prefix}/notifications`,
+      name: "My Notifications",
     },
   ];
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.client.tsx
index ea38deb8a61..0b8d4c0b64e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.client.tsx
@@ -13,16 +13,12 @@ export function PlanInfoCardClient(props: {
 }) {
   return (
     <PlanInfoCardUI
-      openPlanSheetButtonByDefault={props.openPlanSheetButtonByDefault}
-      team={props.team}
-      subscriptions={props.subscriptions}
-      isOwnerAccount={props.isOwnerAccount}
       getTeam={async () => {
         const res = await apiServerProxy<{
           result: Team;
         }>({
-          pathname: `/v1/teams/${props.team.slug}`,
           method: "GET",
+          pathname: `/v1/teams/${props.team.slug}`,
         });
 
         if (!res.ok) {
@@ -32,6 +28,10 @@ export function PlanInfoCardClient(props: {
         return res.data.result;
       }}
       highlightPlan={props.highlightPlan}
+      isOwnerAccount={props.isOwnerAccount}
+      openPlanSheetButtonByDefault={props.openPlanSheetButtonByDefault}
+      subscriptions={props.subscriptions}
+      team={props.team}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.stories.tsx
index ae53f7c9478..6f451e7d125 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.stories.tsx
@@ -1,18 +1,18 @@
-import type { Team } from "@/api/team";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { addDays } from "date-fns";
 import { teamStub, teamSubscriptionsStub } from "stories/stubs";
 import { BadgeContainer } from "stories/utils";
+import type { Team } from "@/api/team";
 import { PlanInfoCardUI } from "./PlanInfoCard";
 
 const meta = {
-  title: "Billing/PlanInfoCard",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Billing/PlanInfoCard",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -60,9 +60,7 @@ export const Pro: Story = {
   },
 };
 
-function Story(props: {
-  plan: Team["billingPlan"];
-}) {
+function Story(props: { plan: Team["billingPlan"] }) {
   const team = teamStub("foo", props.plan);
   const zeroUsageOnDemandSubs = teamSubscriptionsStub("plan:growth");
   const trialPlanZeroUsageOnDemandSubs = teamSubscriptionsStub("plan:growth", {
@@ -80,10 +78,6 @@ function Story(props: {
 
   const subsWith4Usage = teamSubscriptionsStub("plan:growth", {
     usage: {
-      storage: {
-        amount: 10000,
-        quantity: 4,
-      },
       aaSponsorshipAmount: {
         amount: 7500,
         quantity: 4,
@@ -96,6 +90,10 @@ function Story(props: {
         amount: 40000,
         quantity: 100,
       },
+      storage: {
+        amount: 10000,
+        quantity: 4,
+      },
     },
   });
 
@@ -109,59 +107,59 @@ function Story(props: {
     <div className="container flex max-w-6xl flex-col gap-12 py-10">
       <BadgeContainer label="On-demand Subscriptions with 0 usage">
         <PlanInfoCardUI
-          team={team}
-          subscriptions={zeroUsageOnDemandSubs}
           getTeam={teamTeamStub}
           highlightPlan={undefined}
-          openPlanSheetButtonByDefault={false}
           isOwnerAccount={true}
+          openPlanSheetButtonByDefault={false}
+          subscriptions={zeroUsageOnDemandSubs}
+          team={team}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Scheduled to cancel in 10 days">
         <PlanInfoCardUI
+          getTeam={teamTeamStub}
+          highlightPlan={undefined}
+          isOwnerAccount={true}
+          openPlanSheetButtonByDefault={false}
+          subscriptions={zeroUsageOnDemandSubs}
           team={{
             ...team,
             planCancellationDate: addDays(new Date(), 10).toISOString(),
           }}
-          subscriptions={zeroUsageOnDemandSubs}
-          getTeam={teamTeamStub}
-          highlightPlan={undefined}
-          openPlanSheetButtonByDefault={false}
-          isOwnerAccount={true}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Trial Plan - On-demand Subscriptions with 0 usage">
         <PlanInfoCardUI
-          team={team}
-          subscriptions={trialPlanZeroUsageOnDemandSubs}
           getTeam={teamTeamStub}
           highlightPlan={undefined}
-          openPlanSheetButtonByDefault={false}
           isOwnerAccount={true}
+          openPlanSheetButtonByDefault={false}
+          subscriptions={trialPlanZeroUsageOnDemandSubs}
+          team={team}
         />
       </BadgeContainer>
 
       <BadgeContainer label="On-demand Subscriptions with 1 usage">
         <PlanInfoCardUI
-          team={team}
-          subscriptions={subsWith1Usage}
           getTeam={teamTeamStub}
           highlightPlan={undefined}
-          openPlanSheetButtonByDefault={false}
           isOwnerAccount={true}
+          openPlanSheetButtonByDefault={false}
+          subscriptions={subsWith1Usage}
+          team={team}
         />
       </BadgeContainer>
 
       <BadgeContainer label="On-demand Subscriptions with 4 usage">
         <PlanInfoCardUI
-          team={team}
-          subscriptions={subsWith4Usage}
           getTeam={teamTeamStub}
           highlightPlan={undefined}
-          openPlanSheetButtonByDefault={false}
           isOwnerAccount={true}
+          openPlanSheetButtonByDefault={false}
+          subscriptions={subsWith4Usage}
+          team={team}
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.tsx
index 6a4a32a0f67..bb461a7eb97 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.tsx
@@ -1,9 +1,19 @@
 "use client";
 
+import { CancelPlanButton } from "components/settings/Account/Billing/CancelPlanModal/CancelPlanModal";
+import { BillingPricing } from "components/settings/Account/Billing/Pricing";
+import { differenceInDays, format, isAfter } from "date-fns";
+import {
+  CircleAlertIcon,
+  CreditCardIcon,
+  FileTextIcon,
+  SquarePenIcon,
+} from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
 import type { Team } from "@/api/team";
 import type { TeamSubscription } from "@/api/team-subscription";
 import { BillingPortalButton } from "@/components/billing";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
@@ -14,13 +24,7 @@ import {
   SheetTitle,
 } from "@/components/ui/sheet";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import { CancelPlanButton } from "components/settings/Account/Billing/CancelPlanModal/CancelPlanModal";
-import { BillingPricing } from "components/settings/Account/Billing/Pricing";
-import { differenceInDays, format, isAfter } from "date-fns";
-import { CreditCardIcon, FileTextIcon, SquarePenIcon } from "lucide-react";
-import { CircleAlertIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { RenewSubscriptionButton } from "../../../../../../../../../components/settings/Account/Billing/renew-subscription/renew-subscription-button";
 import { getValidTeamPlan } from "../../../../../../components/TeamHeader/getValidTeamPlan";
 
@@ -54,12 +58,12 @@ export function PlanInfoCardUI(props: {
   return (
     <div className="rounded-lg border border-border bg-card">
       <ViewPlansSheet
-        team={team}
-        trialPeriodEndedAt={planSub?.trialEnd ?? undefined}
-        isOpen={isPlanSheetOpen}
-        onOpenChange={setIsPlanSheetOpen}
         getTeam={props.getTeam}
         highlightPlan={props.highlightPlan}
+        isOpen={isPlanSheetOpen}
+        onOpenChange={setIsPlanSheetOpen}
+        team={team}
+        trialPeriodEndedAt={planSub?.trialEnd ?? undefined}
       />
 
       <div className="flex flex-col gap-4 p-4 lg:flex-row lg:items-center lg:justify-between lg:p-6">
@@ -80,8 +84,8 @@ export function PlanInfoCardUI(props: {
                 You are on the legacy plan. You may save by upgrading to new
                 plan.{" "}
                 <UnderlineLink
-                  href="/pricing"
                   className="decoration-yellow-600/50"
+                  href="/pricing"
                 >
                   Learn More
                 </UnderlineLink>
@@ -117,13 +121,13 @@ export function PlanInfoCardUI(props: {
             >
               <div>
                 <Button
-                  variant="outline"
-                  size="sm"
                   className="gap-2 bg-background"
+                  disabled={!props.isOwnerAccount}
                   onClick={() => {
                     setIsPlanSheetOpen(true);
                   }}
-                  disabled={!props.isOwnerAccount}
+                  size="sm"
+                  variant="outline"
                 >
                   <SquarePenIcon className="size-4 text-muted-foreground" />
                   Change Plan
@@ -143,18 +147,18 @@ export function PlanInfoCardUI(props: {
               <div>
                 {props.team.planCancellationDate ? (
                   <RenewSubscriptionButton
-                    teamId={props.team.id}
-                    getTeam={props.getTeam}
                     disabled={!props.isOwnerAccount}
+                    getTeam={props.getTeam}
+                    teamId={props.team.id}
                   />
                 ) : (
                   <CancelPlanButton
-                    teamId={props.team.id}
-                    teamSlug={props.team.slug}
                     billingStatus={props.team.billingStatus}
                     currentPlan={props.team.billingPlan}
-                    getTeam={props.getTeam}
                     disabled={!props.isOwnerAccount}
+                    getTeam={props.getTeam}
+                    teamId={props.team.id}
+                    teamSlug={props.team.slug}
                   />
                 )}
               </div>
@@ -186,11 +190,11 @@ export function PlanInfoCardUI(props: {
                 <div>
                   <Button
                     disabled={!props.isOwnerAccount}
-                    variant="default"
-                    size="sm"
                     onClick={() => {
                       setIsPlanSheetOpen(true);
                     }}
+                    size="sm"
+                    variant="default"
                   >
                     Select a plan
                   </Button>
@@ -215,10 +219,10 @@ export function PlanInfoCardUI(props: {
             </span>
             <span>
               <UnderlineLink
+                className="underline underline-offset-2 hover:text-foreground"
                 href="https://portal.thirdweb.com/account/billing/manage-billing"
-                target="_blank"
                 rel="noopener noreferrer"
-                className="underline underline-offset-2 hover:text-foreground"
+                target="_blank"
               >
                 {" "}
                 how to manage billing
@@ -229,9 +233,9 @@ export function PlanInfoCardUI(props: {
           <div className="flex items-center gap-3">
             <Button
               asChild
-              variant="outline"
-              size="sm"
               className="gap-2 bg-background"
+              size="sm"
+              variant="outline"
             >
               <Link href={`/team/${team.slug}/~/settings/invoices`}>
                 <FileTextIcon className="size-4 text-muted-foreground" />
@@ -249,13 +253,13 @@ export function PlanInfoCardUI(props: {
             >
               <div>
                 <BillingPortalButton
-                  teamSlug={team.slug}
                   buttonProps={{
-                    variant: "outline",
-                    size: "sm",
                     className: "bg-background gap-2",
                     disabled: !props.isOwnerAccount,
+                    size: "sm",
+                    variant: "outline",
                   }}
+                  teamSlug={team.slug}
                 >
                   <CreditCardIcon className="size-4 text-muted-foreground" />
                   Manage Billing
@@ -287,7 +291,7 @@ function BillingInfo({
   return (
     <div>
       {planSubscription && (
-        <SubscriptionOverview title="Plan" subscription={planSubscription} />
+        <SubscriptionOverview subscription={planSubscription} title="Plan" />
       )}
 
       {usageSubscription && (
@@ -354,8 +358,8 @@ function SubscriptionOverview(props: {
 
 function formatCurrencyAmount(centsAmount: number, currency: string) {
   return new Intl.NumberFormat(undefined, {
-    style: "currency",
     currency: currency,
+    style: "currency",
   }).format(centsAmount / 100);
 }
 
@@ -368,16 +372,16 @@ function ViewPlansSheet(props: {
   highlightPlan: Team["billingPlan"] | undefined;
 }) {
   return (
-    <Sheet open={props.isOpen} onOpenChange={props.onOpenChange}>
+    <Sheet onOpenChange={props.onOpenChange} open={props.isOpen}>
       <SheetContent className="!max-w-[1300px] w-full overflow-auto">
         <SheetHeader className="sr-only">
           <SheetTitle>Manage plans</SheetTitle>
         </SheetHeader>
         <BillingPricing
-          team={props.team}
-          trialPeriodEndedAt={props.trialPeriodEndedAt}
           getTeam={props.getTeam}
           highlightPlan={props.highlightPlan}
+          team={props.team}
+          trialPeriodEndedAt={props.trialPeriodEndedAt}
         />
       </SheetContent>
     </Sheet>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/credit-balance-section.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/credit-balance-section.client.tsx
index a969d3ba98a..2ff5f403932 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/credit-balance-section.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/components/credit-balance-section.client.tsx
@@ -1,5 +1,8 @@
 "use client";
 
+import { ArrowRightIcon, DollarSignIcon } from "lucide-react";
+import { Suspense, use, useState } from "react";
+import { ErrorBoundary } from "react-error-boundary";
 import { Button } from "@/components/ui/button";
 import {
   Card,
@@ -13,16 +16,13 @@ import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import { ArrowRightIcon, DollarSignIcon } from "lucide-react";
-import { Suspense, use, useState } from "react";
-import { ErrorBoundary } from "react-error-boundary";
 import { ThirdwebMiniLogo } from "../../../../../../../components/ThirdwebMiniLogo";
 
 const predefinedAmounts = [
-  { value: "25", label: "$25" },
-  { value: "100", label: "$100" },
-  { value: "500", label: "$500" },
-  { value: "1000", label: "$1,000" },
+  { label: "$25", value: "25" },
+  { label: "$100", value: "100" },
+  { label: "$500", value: "500" },
+  { label: "$1,000", value: "1000" },
 ] as const;
 
 interface CreditBalanceSectionProps {
@@ -73,20 +73,20 @@ export function CreditBalanceSection({
           <div className="space-y-4 lg:col-span-2">
             <Label className="font-medium text-base">Select Amount</Label>
             <RadioGroup
-              value={selectedAmount}
-              onValueChange={setSelectedAmount}
               className="grid grid-cols-4 gap-3"
+              onValueChange={setSelectedAmount}
+              value={selectedAmount}
             >
               {predefinedAmounts.map((amount) => (
                 <div key={amount.value}>
                   <RadioGroupItem
-                    value={amount.value}
-                    id={amount.value}
                     className="peer sr-only"
+                    id={amount.value}
+                    value={amount.value}
                   />
                   <Label
-                    htmlFor={amount.value}
                     className="flex cursor-pointer flex-col items-center justify-center rounded-md border-2 border-muted bg-popover p-4 transition-colors hover:bg-accent hover:text-accent-foreground peer-data-[state=checked]:border-primary [&:has([data-state=checked])]:border-primary"
+                    htmlFor={amount.value}
                   >
                     <span className="font-semibold text-lg">
                       {amount.label}
@@ -110,8 +110,8 @@ export function CreditBalanceSection({
                 }
               >
                 <TopUpSummary
-                  selectedAmount={selectedAmount}
                   currentBalancePromise={balancePromise}
+                  selectedAmount={selectedAmount}
                 />
               </Suspense>
             </ErrorBoundary>
@@ -125,13 +125,13 @@ export function CreditBalanceSection({
                 <Button
                   asChild
                   className="w-full"
-                  size="lg"
                   disabled={!isOwnerAccount}
+                  size="lg"
                 >
                   <a
                     href={`/checkout/${teamSlug}/topup?amount=${selectedAmount}`}
-                    target="_blank"
                     rel="noopener noreferrer"
+                    target="_blank"
                   >
                     <ThirdwebMiniLogo className="mr-2 h-4 w-4" />
                     Top Up With Crypto
@@ -149,7 +149,9 @@ export function CreditBalanceSection({
 
 function CurrentBalance({
   balancePromise,
-}: { balancePromise: Promise<number> }) {
+}: {
+  balancePromise: Promise<number>;
+}) {
   const currentBalance = use(balancePromise);
 
   return (
@@ -214,11 +216,7 @@ function TopUpSummary({
   );
 }
 
-function TopUpSummarySkeleton({
-  selectedAmount,
-}: {
-  selectedAmount: string;
-}) {
+function TopUpSummarySkeleton({ selectedAmount }: { selectedAmount: string }) {
   return (
     <div className="space-y-3 rounded-lg bg-muted/30 p-4">
       <h3 className="font-medium text-sm">Summary</h3>
@@ -259,7 +257,7 @@ function TopUpSummaryErrorBoundary({
 // utils
 function formatUsd(amount: number) {
   return amount.toLocaleString("en-US", {
-    style: "currency",
     currency: "USD",
+    style: "currency",
   });
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/page.tsx
index ea5579bcb4d..ee56b41c642 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/billing/page.tsx
@@ -1,15 +1,15 @@
+import { redirect } from "next/navigation";
 import { getStripeBalance } from "@/actions/stripe-actions";
-import { type Team, getTeamBySlug } from "@/api/team";
+import { getTeamBySlug, type Team } from "@/api/team";
 import { getMemberByAccountId } from "@/api/team-members";
 import { getTeamSubscriptions } from "@/api/team-subscription";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
 import { CreditsInfoCard } from "../../../../../../../../components/settings/Account/Billing/PlanCard";
 import { Coupons } from "../../../../../../../../components/settings/Account/Billing/SubscriptionCoupons/Coupons";
 import { getValidAccount } from "../../../../../../account/settings/getAccount";
 import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
-import { PlanInfoCardClient } from "./components/PlanInfoCard.client";
 import { CreditBalanceSection } from "./components/credit-balance-section.client";
+import { PlanInfoCardClient } from "./components/PlanInfoCard.client";
 
 export default async function Page(props: {
   params: Promise<{
@@ -67,29 +67,29 @@ export default async function Page(props: {
     <div className="flex flex-col gap-12">
       <div>
         <PlanInfoCardClient
-          team={team}
-          subscriptions={subscriptions}
-          openPlanSheetButtonByDefault={searchParams.showPlans === "true"}
           highlightPlan={highlightPlan}
           isOwnerAccount={isOwnerAccount}
+          openPlanSheetButtonByDefault={searchParams.showPlans === "true"}
+          subscriptions={subscriptions}
+          team={team}
         />
       </div>
 
       {/* Credit Balance Section */}
       {team.stripeCustomerId && (
         <CreditBalanceSection
-          teamSlug={team.slug}
           balancePromise={getStripeBalance(team.stripeCustomerId)}
           isOwnerAccount={isOwnerAccount}
+          teamSlug={team.slug}
         />
       )}
 
       <CreditsInfoCard
-        twAccount={account}
         client={client}
         teamSlug={team.slug}
+        twAccount={account}
       />
-      <Coupons teamId={team.id} isPaymentSetup={validPayment} />
+      <Coupons isPaymentSetup={validPayment} teamId={team.id} />
     </div>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/credits/SettingsCreditsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/credits/SettingsCreditsPage.tsx
index ca85ba701d0..ec9c1baf40c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/credits/SettingsCreditsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/credits/SettingsCreditsPage.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import type { Team } from "@/api/team";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { ApplyForOpCredits } from "components/onboarding/ApplyForOpCreditsModal";
+import type { Team } from "@/api/team";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
 export const SettingsGasCreditsPage = (props: {
   team: Team;
@@ -19,9 +19,9 @@ export const SettingsGasCreditsPage = (props: {
           <p className="text-muted-foreground text-sm">
             Apply to the Optimism Superchain App Accelerator.{" "}
             <UnderlineLink
-              target="_blank"
-              rel="noopener noreferrer"
               href="https://blog.thirdweb.com/accelerating-the-superchain-with-optimism/"
+              rel="noopener noreferrer"
+              target="_blank"
             >
               Learn More
             </UnderlineLink>
@@ -29,7 +29,7 @@ export const SettingsGasCreditsPage = (props: {
         </div>
       </div>
       <div className="h-6" />
-      <ApplyForOpCredits team={props.team} account={props.account} />
+      <ApplyForOpCredits account={props.account} team={props.team} />
     </div>
   );
 };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/credits/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/credits/page.tsx
index 7c092fa46cc..9c540516118 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/credits/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/credits/page.tsx
@@ -1,6 +1,6 @@
+import { redirect } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
-import { redirect } from "next/navigation";
 import { getValidAccount } from "../../../../../../account/settings/getAccount";
 import { SettingsGasCreditsPage } from "./SettingsCreditsPage";
 
@@ -21,7 +21,7 @@ export default async function Page(props: {
 
   return (
     <ChakraProviderSetup>
-      <SettingsGasCreditsPage team={team} account={account} />
+      <SettingsGasCreditsPage account={account} team={team} />
     </ChakraProviderSetup>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/GeneralSettingsPage.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/GeneralSettingsPage.stories.tsx
index 312cd1c2e7f..15e597ef5d7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/GeneralSettingsPage.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/GeneralSettingsPage.stories.tsx
@@ -8,13 +8,13 @@ import {
 } from "./TeamGeneralSettingsPageUI";
 
 const meta = {
-  title: "Team/Settings/General",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Team/Settings/General",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -30,20 +30,20 @@ function Story() {
   return (
     <div className="container max-w-6xl py-10">
       <TeamGeneralSettingsPageUI
-        team={testTeam}
-        updateTeamImage={async () => {
+        client={storybookThirdwebClient}
+        initialVerification={null}
+        isOwnerAccount={true}
+        leaveTeam={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
+        team={testTeam}
         updateTeamField={async (value) => {
           console.log(value);
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
-        client={storybookThirdwebClient}
-        leaveTeam={async () => {
+        updateTeamImage={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
-        initialVerification={null}
-        isOwnerAccount={true}
       />
       <ComponentVariants />
     </div>
@@ -57,10 +57,10 @@ function ComponentVariants() {
         <h2 className="mb-5 text-3xl"> Component variations </h2>
         <div className="flex flex-col gap-6">
           <LeaveTeamCard
-            teamName="foo"
             leaveTeam={async () => {
               await new Promise((resolve) => setTimeout(resolve, 1000));
             }}
+            teamName="foo"
           />
           <DeleteTeamCard canDelete={true} teamId="1" teamName="foo" />
           <DeleteTeamCard canDelete={false} teamId="2" teamName="foo" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/Sidebar.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/Sidebar.stories.tsx
index f53c605e4b4..63fe5f69b16 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/Sidebar.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/Sidebar.stories.tsx
@@ -9,13 +9,13 @@ import { TeamSettingsSidebar } from "../_components/sidebar/TeamSettingsSidebar"
 import { TeamSettingsMobileNav } from "../_components/sidebar/TeamsMobileNav";
 
 const meta = {
-  title: "Team/Settings/components/Sidebar",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Team/Settings/components/Sidebar",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -36,28 +36,26 @@ export const Mobile: Story = {
   },
 };
 
-function Story(props: {
-  type: "mobile" | "desktop";
-}) {
+function Story(props: { type: "mobile" | "desktop" }) {
   return (
     <div className="container min-h-dvh py-6 text-foreground">
       {props.type === "desktop" && (
         <div className="flex flex-col gap-10">
           <BadgeContainer label="account loaded">
             <TeamSettingsSidebar
-              team={teamStub("foo", "free")}
               account={{
                 id: "x",
               }}
               client={storybookThirdwebClient}
+              team={teamStub("foo", "free")}
             />
           </BadgeContainer>
 
           <BadgeContainer label="account loading">
             <TeamSettingsSidebar
-              team={teamStub("foo", "free")}
               account={undefined}
               client={storybookThirdwebClient}
+              team={teamStub("foo", "free")}
             />
           </BadgeContainer>
         </div>
@@ -71,9 +69,9 @@ function Story(props: {
                 href: "/team/foo/settings",
                 name: "Foo",
               }}
-              teamSlug="foo"
               setShowFull={() => {}}
               showFull={true}
+              teamSlug="foo"
             />
           </BadgeContainer>
 
@@ -83,9 +81,9 @@ function Story(props: {
                 href: "/team/foo/billing",
                 name: "Billing",
               }}
-              teamSlug="foo"
               setShowFull={() => {}}
               showFull={false}
+              teamSlug="foo"
             />
           </BadgeContainer>
         </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/TeamGeneralSettingsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/TeamGeneralSettingsPage.tsx
index 17c8fcb825b..26d23773ad4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/TeamGeneralSettingsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/TeamGeneralSettingsPage.tsx
@@ -1,11 +1,11 @@
 "use client";
 
+import type { ThirdwebClient } from "thirdweb";
+import { upload } from "thirdweb/storage";
 import { apiServerProxy } from "@/actions/proxies";
 import type { Team } from "@/api/team";
 import type { VerifiedDomainResponse } from "@/api/verified-domain";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import type { ThirdwebClient } from "thirdweb";
-import { upload } from "thirdweb/storage";
 import { TeamGeneralSettingsPageUI } from "./TeamGeneralSettingsPageUI";
 import { updateTeam } from "./updateTeam";
 
@@ -20,8 +20,22 @@ export function TeamGeneralSettingsPage(props: {
 
   return (
     <TeamGeneralSettingsPageUI
-      team={props.team}
       client={props.client}
+      initialVerification={props.initialVerification}
+      isOwnerAccount={props.isOwnerAccount}
+      leaveTeam={async () => {
+        const res = await apiServerProxy({
+          method: "DELETE",
+          pathname: `/v1/teams/${props.team.id}/members/${props.accountId}`,
+        });
+
+        if (!res.ok) {
+          throw new Error(res.error);
+        }
+
+        router.replace("/team");
+      }}
+      team={props.team}
       updateTeamField={async (teamValue) => {
         const res = await updateTeam({
           teamId: props.team.id,
@@ -39,20 +53,8 @@ export function TeamGeneralSettingsPage(props: {
           router.refresh();
         }
       }}
-      leaveTeam={async () => {
-        const res = await apiServerProxy({
-          pathname: `/v1/teams/${props.team.id}/members/${props.accountId}`,
-          method: "DELETE",
-        });
-
-        if (!res.ok) {
-          throw new Error(res.error);
-        }
-
-        router.replace("/team");
-      }}
       updateTeamImage={async (file) => {
-        let uri: string | undefined = undefined;
+        let uri: string | undefined;
 
         if (file) {
           // upload to IPFS
@@ -75,8 +77,6 @@ export function TeamGeneralSettingsPage(props: {
 
         router.refresh();
       }}
-      initialVerification={props.initialVerification}
-      isOwnerAccount={props.isOwnerAccount}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/TeamGeneralSettingsPageUI.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/TeamGeneralSettingsPageUI.tsx
index 198dba545d5..23e99525eb3 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/TeamGeneralSettingsPageUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/TeamGeneralSettingsPageUI.tsx
@@ -1,5 +1,13 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import { FileInput } from "components/shared/FileInput";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import { z } from "zod";
 import { deleteTeam } from "@/actions/deleteTeam";
 import type { Team } from "@/api/team";
 import type { VerifiedDomainResponse } from "@/api/verified-domain";
@@ -9,14 +17,6 @@ import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Input } from "@/components/ui/input";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { FileInput } from "components/shared/FileInput";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
-import { z } from "zod";
 import { TeamDomainVerificationCard } from "../_components/settings-cards/domain-verification";
 import {
   maxTeamNameLength,
@@ -47,22 +47,22 @@ export function TeamGeneralSettingsPageUI(props: {
         updateTeamField={props.updateTeamField}
       />
       <TeamAvatarFormControl
-        updateTeamImage={props.updateTeamImage}
         avatar={props.team.image}
         client={props.client}
+        updateTeamImage={props.updateTeamImage}
       />
       <TeamIdCard team={props.team} />
       <TeamDomainVerificationCard
-        teamId={props.team.id}
         initialVerification={props.initialVerification}
         isOwnerAccount={props.isOwnerAccount}
+        teamId={props.team.id}
       />
 
-      <LeaveTeamCard teamName={props.team.name} leaveTeam={props.leaveTeam} />
+      <LeaveTeamCard leaveTeam={props.leaveTeam} teamName={props.team.name} />
       <DeleteTeamCard
+        canDelete={props.isOwnerAccount}
         teamId={props.team.id}
         teamName={props.team.name}
-        canDelete={props.isOwnerAccount}
       />
     </div>
   );
@@ -77,8 +77,8 @@ function TeamNameFormControl(props: {
   updateTeamField: UpdateTeamField;
 }) {
   const form = useForm<{ name: string }>({
-    values: { name: props.team.name },
     resolver: zodResolver(teamNameFormSchema),
+    values: { name: props.team.name },
   });
   const updateTeamMutation = useMutation({
     mutationFn: (name: string) => props.updateTeamField({ name }),
@@ -89,29 +89,29 @@ function TeamNameFormControl(props: {
       onSubmit={form.handleSubmit((values) => {
         const promise = updateTeamMutation.mutateAsync(values.name);
         toast.promise(promise, {
-          success: "Team name updated successfully",
           error: "Failed to update team name",
+          success: "Team name updated successfully",
         });
       })}
     >
       <SettingsCard
+        bottomText={`Please use ${maxTeamNameLength} characters at maximum.`}
+        errorText={form.formState.errors.name?.message}
         header={{
-          title: "Team Name",
           description: "This is your team's name on thirdweb",
+          title: "Team Name",
         }}
-        bottomText={`Please use ${maxTeamNameLength} characters at maximum.`}
+        noPermissionText={undefined}
         saveButton={{
-          type: "submit",
           disabled: !form.formState.isDirty,
           isPending: updateTeamMutation.isPending,
+          type: "submit",
         }}
-        errorText={form.formState.errors.name?.message}
-        noPermissionText={undefined}
       >
         <Input
           {...form.register("name")}
-          maxLength={maxTeamNameLength}
           className="md:w-[450px]"
+          maxLength={maxTeamNameLength}
         />
       </SettingsCard>
     </form>
@@ -139,25 +139,25 @@ function TeamSlugFormControl(props: {
       onSubmit={form.handleSubmit((values) => {
         const promise = updateTeamMutation.mutateAsync(values.slug);
         toast.promise(promise, {
-          success: "Team URL updated successfully",
           error: "Failed to update team URL",
+          success: "Team URL updated successfully",
         });
       })}
     >
       <SettingsCard
+        bottomText={`Please use ${maxTeamSlugLength} characters at maximum.`}
+        errorText={form.formState.errors.slug?.message}
         header={{
-          title: "Team URL",
           description:
             "This is your team's URL namespace on thirdweb. All your team's projects and settings can be accessed using this URL",
+          title: "Team URL",
         }}
-        bottomText={`Please use ${maxTeamSlugLength} characters at maximum.`}
-        errorText={form.formState.errors.slug?.message}
+        noPermissionText={undefined}
         saveButton={{
-          type: "submit",
           disabled: !form.formState.isDirty,
           isPending: updateTeamMutation.isPending,
+          type: "submit",
         }}
-        noPermissionText={undefined}
       >
         <div className="relative flex rounded-lg border border-border md:w-[450px]">
           <div className="flex items-center self-stretch rounded-l-lg border-border border-r bg-card px-3 font-mono text-muted-foreground/80 text-sm">
@@ -165,8 +165,8 @@ function TeamSlugFormControl(props: {
           </div>
           <Input
             {...form.register("slug")}
-            maxLength={maxTeamSlugLength}
             className="truncate border-0 font-mono"
+            maxLength={maxTeamSlugLength}
           />
         </div>
       </SettingsCard>
@@ -195,21 +195,21 @@ function TeamAvatarFormControl(props: {
   function handleSave() {
     const promise = updateTeamAvatarMutation.mutateAsync(teamAvatar);
     toast.promise(promise, {
-      success: "Team avatar updated successfully",
       error: "Failed to update team avatar",
+      success: "Team avatar updated successfully",
     });
   }
 
   return (
     <SettingsCard
       bottomText="An avatar is optional but strongly recommended."
+      errorText={undefined}
+      noPermissionText={undefined}
       saveButton={{
-        onClick: handleSave,
         disabled: false,
         isPending: updateTeamAvatarMutation.isPending,
+        onClick: handleSave,
       }}
-      noPermissionText={undefined}
-      errorText={undefined}
     >
       <div className="flex flex-row gap-4 md:justify-between">
         <div>
@@ -221,37 +221,35 @@ function TeamAvatarFormControl(props: {
         </div>
         <FileInput
           accept={{ "image/*": [] }}
-          value={teamAvatar || teamAvatarUrl}
-          setValue={setTeamAvatar}
           className="w-20 rounded-full lg:w-28"
-          disableHelperText
           client={props.client}
+          disableHelperText
+          setValue={setTeamAvatar}
+          value={teamAvatar || teamAvatarUrl}
         />
       </div>
     </SettingsCard>
   );
 }
 
-function TeamIdCard(props: {
-  team: Team;
-}) {
+function TeamIdCard(props: { team: Team }) {
   return (
     <SettingsCard
-      header={{
-        title: "Team ID",
-        description: "This is your team's ID on thirdweb",
-      }}
       bottomText="Used when interacting with the thirdweb API"
-      noPermissionText={undefined} // TODO
       errorText={undefined}
+      header={{
+        description: "This is your team's ID on thirdweb",
+        title: "Team ID",
+      }} // TODO
+      noPermissionText={undefined}
     >
       <CopyTextButton
+        className="w-full justify-between truncate bg-background px-3 py-2 font-mono text-muted-foreground lg:w-[450px]"
+        copyIconPosition="right"
         textToCopy={props.team.id}
         textToShow={props.team.id}
-        variant="outline"
-        className="w-full justify-between truncate bg-background px-3 py-2 font-mono text-muted-foreground lg:w-[450px]"
         tooltip="Copy Team ID"
-        copyIconPosition="right"
+        variant="outline"
       />
     </SettingsCard>
   );
@@ -272,23 +270,23 @@ export function LeaveTeamCard(props: {
   function handleLeave() {
     const promise = leaveTeam.mutateAsync();
     toast.promise(promise, {
-      success: "Left team successfully",
       error: "Failed to leave team",
+      success: "Left team successfully",
     });
   }
 
   return (
     <DangerSettingCard
-      title={title}
-      description={description}
       buttonLabel={title}
       buttonOnClick={handleLeave}
-      isPending={leaveTeam.isPending}
       confirmationDialog={{
-        title: `Are you sure you want to leave team "${props.teamName}" ?`,
         description:
           "This will revoke your access to this Team. Any resources you've added to the Team will remain.",
+        title: `Are you sure you want to leave team "${props.teamName}" ?`,
       }}
+      description={description}
+      isPending={leaveTeam.isPending}
+      title={title}
     />
   );
 }
@@ -318,35 +316,35 @@ export function DeleteTeamCard(props: {
   function handleDelete() {
     const promise = deleteTeamAndRedirect.mutateAsync();
     toast.promise(promise, {
-      success: "Team deleted",
       error: "Failed to delete team",
+      success: "Team deleted",
     });
   }
 
   if (props.canDelete) {
     return (
       <DangerSettingCard
-        title={title}
-        description={description}
         buttonLabel={title}
         buttonOnClick={handleDelete}
-        isPending={deleteTeamAndRedirect.isPending}
         confirmationDialog={{
-          title: `Are you sure you want to delete team "${props.teamName}" ?`,
           description: description,
+          title: `Are you sure you want to delete team "${props.teamName}" ?`,
         }}
+        description={description}
+        isPending={deleteTeamAndRedirect.isPending}
+        title={title}
       />
     );
   }
 
   return (
     <SettingsCard
+      bottomText=""
+      errorText={undefined}
       header={{
-        title,
         description,
+        title,
       }}
-      bottomText=""
-      errorText={undefined}
       noPermissionText="You need additional permissions to delete your team."
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/updateTeam.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/updateTeam.ts
index 0ca42ebf99c..29424e5b482 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/updateTeam.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/general/updateTeam.ts
@@ -17,19 +17,19 @@ export async function updateTeam(params: {
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${params.teamId}`,
     {
-      method: "PUT",
+      body: JSON.stringify(params.value),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${authToken}`,
+        "Content-Type": "application/json",
       },
-      body: JSON.stringify(params.value),
+      method: "PUT",
     },
   );
 
   if (!res.ok) {
     return {
-      ok: false as const,
       error: await res.text(),
+      ok: false as const,
     };
   }
 
@@ -38,7 +38,7 @@ export async function updateTeam(params: {
   };
 
   return {
-    ok: true as const,
     data: data.result,
+    ok: true as const,
   };
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/components/billing-filter.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/components/billing-filter.tsx
index eb9f7c71db2..cbc8266d64e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/components/billing-filter.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/components/billing-filter.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { useQueryStates } from "nuqs";
+import { startTransition } from "react";
 import {
   Select,
   SelectContent,
@@ -7,8 +9,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { useQueryStates } from "nuqs";
-import { startTransition } from "react";
 import { searchParams } from "../search-params";
 
 export function BillingFilter() {
@@ -25,7 +25,6 @@ export function BillingFilter() {
   );
   return (
     <Select
-      value={status ?? "all"}
       onValueChange={(v) => {
         setStates({
           cursor: null,
@@ -33,6 +32,7 @@ export function BillingFilter() {
           status: v === "open" ? "open" : null,
         });
       }}
+      value={status ?? "all"}
     >
       <SelectTrigger className="w-48">
         <SelectValue placeholder="Filter by status" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/components/billing-history.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/components/billing-history.tsx
index c4dd2eec107..044b8a17cea 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/components/billing-history.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/components/billing-history.tsx
@@ -1,5 +1,15 @@
 "use client";
 
+import {
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  CreditCardIcon,
+  DownloadIcon,
+  ReceiptIcon,
+} from "lucide-react";
+import { useQueryState } from "nuqs";
+import { useTransition } from "react";
+import type Stripe from "stripe";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -12,16 +22,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import {
-  ChevronLeftIcon,
-  ChevronRightIcon,
-  CreditCardIcon,
-  DownloadIcon,
-  ReceiptIcon,
-} from "lucide-react";
-import { useQueryState } from "nuqs";
-import { useTransition } from "react";
-import type Stripe from "stripe";
 import { ThirdwebMiniLogo } from "../../../../../../../components/ThirdwebMiniLogo";
 import { searchParams } from "../search-params";
 
@@ -36,24 +36,24 @@ export function BillingHistory(props: {
   const [cursor, setCursor] = useQueryState(
     "cursor",
     searchParams.cursor.withOptions({
-      startTransition,
       history: "push",
       shallow: false,
+      startTransition,
     }),
   );
 
   const formatCurrency = (amount: number, currency: string) => {
     return new Intl.NumberFormat("en-US", {
-      style: "currency",
       currency: currency.toUpperCase(),
+      style: "currency",
     }).format(amount / 100);
   };
 
   const formatDate = (timestamp: number) => {
     return new Date(timestamp * 1000).toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "long",
       day: "numeric",
+      month: "long",
+      year: "numeric",
     });
   };
 
@@ -138,15 +138,15 @@ export function BillingHistory(props: {
                         >
                           <div>
                             <Button
-                              variant="default"
-                              size="sm"
                               asChild
                               disabled={!props.isOwnerAccount}
+                              size="sm"
+                              variant="default"
                             >
                               <a
-                                target="_blank"
                                 href={`/checkout/${props.teamSlug}/invoice?invoice_id=${invoice.id}`}
                                 rel="noopener noreferrer"
+                                target="_blank"
                               >
                                 <ThirdwebMiniLogo className="mr-2 h-4 w-4" />
                                 Pay with crypto
@@ -165,15 +165,15 @@ export function BillingHistory(props: {
                           >
                             <div>
                               <Button
-                                variant="outline"
-                                size="sm"
                                 asChild
                                 disabled={!props.isOwnerAccount}
+                                size="sm"
+                                variant="outline"
                               >
                                 <a
                                   href={invoice.hosted_invoice_url}
-                                  target="_blank"
                                   rel="noopener noreferrer"
+                                  target="_blank"
                                 >
                                   <CreditCardIcon className="mr-2 h-4 w-4" />
                                   Pay with Card
@@ -186,11 +186,11 @@ export function BillingHistory(props: {
                     )}
 
                     {invoice.invoice_pdf && (
-                      <Button variant="ghost" size="sm" asChild>
+                      <Button asChild size="sm" variant="ghost">
                         <a
                           href={invoice.invoice_pdf}
-                          target="_blank"
                           rel="noopener noreferrer"
+                          target="_blank"
                         >
                           <DownloadIcon className="mr-2 h-4 w-4 " />
                           PDF
@@ -208,14 +208,14 @@ export function BillingHistory(props: {
       {showPagination && (
         <div className="flex items-center justify-between border-t p-6">
           <Button
-            variant="outline"
-            size="sm"
+            disabled={isLoading || !cursor}
             onClick={() => {
               // use browser history to go back
               // this is KINDA hacky but it works (as long as the user doesn't send the URL to someone else...)
               window.history.back();
             }}
-            disabled={isLoading || !cursor}
+            size="sm"
+            variant="outline"
           >
             {isLoading ? (
               <div className="mr-2 h-4 w-4 animate-spin rounded-full border-2 border-current border-t-transparent" />
@@ -225,15 +225,15 @@ export function BillingHistory(props: {
             Previous
           </Button>
           <Button
-            variant="outline"
-            size="sm"
+            disabled={!props.hasMore || isLoading}
             onClick={() => {
               const lastInvoice = props.invoices[props.invoices.length - 1];
               if (lastInvoice && props.hasMore) {
                 setCursor(lastInvoice.id);
               }
             }}
-            disabled={!props.hasMore || isLoading}
+            size="sm"
+            variant="outline"
           >
             Next
             {isLoading && props.hasMore ? (
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/page.tsx
index 72dc4b7de90..baee48e1592 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/invoices/page.tsx
@@ -1,8 +1,8 @@
+import { redirect } from "next/navigation";
+import type { SearchParams } from "nuqs/server";
 import { getTeamInvoices } from "@/actions/stripe-actions";
 import { getTeamBySlug } from "@/api/team";
 import { getMemberByAccountId } from "@/api/team-members";
-import { redirect } from "next/navigation";
-import type { SearchParams } from "nuqs/server";
 import { getValidAccount } from "../../../../../../account/settings/getAccount";
 import { BillingFilter } from "./components/billing-filter";
 import { BillingHistory } from "./components/billing-history";
@@ -53,12 +53,12 @@ export default async function Page(props: {
         <BillingFilter />
       </div>
       <BillingHistory
-        teamSlug={params.team_slug}
-        invoices={invoices.data}
         hasMore={invoices.has_more}
+        invoices={invoices.data}
+        isOwnerAccount={isOwnerAccount}
         // fall back to "all" if the status is not set
         status={searchParams.status ?? "all"}
-        isOwnerAccount={isOwnerAccount}
+        teamSlug={params.team_slug}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/layout.tsx
index 10c4cfcf299..384bd0a57e4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/layout.tsx
@@ -1,6 +1,6 @@
+import { redirect } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
 import { getValidAccount } from "../../../../../account/settings/getAccount";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../login/loginRedirect";
@@ -34,7 +34,7 @@ export default async function Layout(props: {
   });
 
   return (
-    <SettingsLayout team={team} account={account} client={client}>
+    <SettingsLayout account={account} client={client} team={team}>
       {props.children}
     </SettingsLayout>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/InviteSection.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/InviteSection.stories.tsx
index bd690e75e24..a43ff4f10ff 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/InviteSection.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/InviteSection.stories.tsx
@@ -1,20 +1,20 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useId, useState } from "react";
+import { teamStub } from "stories/stubs";
 import type { TeamAccountRole } from "@/api/team-members";
 import { Label } from "@/components/ui/label";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useState } from "react";
-import { teamStub } from "stories/stubs";
 import { storybookThirdwebClient } from "../../../../../../../../stories/utils";
 import { InviteSection } from "./InviteSection";
 
 const meta = {
-  title: "Team/Settings/Members/InviteSection",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Team/Settings/Members/InviteSection",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -49,10 +49,6 @@ const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 type InviteParams = Array<{ email: string; role: TeamAccountRole }>;
 
 const INVITE_HANDLERS = {
-  success: async (params: InviteParams) => {
-    await sleep(500);
-    return { results: params.map(() => "fulfilled" as const) };
-  },
   failure: async (params: InviteParams) => {
     await sleep(500);
     return { results: params.map(() => "rejected" as const) };
@@ -65,16 +61,17 @@ const INVITE_HANDLERS = {
       ),
     };
   },
+  success: async (params: InviteParams) => {
+    await sleep(500);
+    return { results: params.map(() => "fulfilled" as const) };
+  },
 } as const;
 
-function RadioOption({
-  id,
-  label,
-  value,
-}: { id: string; label: string; value: string }) {
+function RadioOption({ label, value }: { label: string; value: string }) {
+  const id = useId();
   return (
     <div className="flex items-center space-x-2">
-      <RadioGroupItem value={value} id={id} />
+      <RadioGroupItem id={id} value={value} />
       <Label htmlFor={id}>{label}</Label>
     </div>
   );
@@ -100,11 +97,11 @@ function Story() {
     { length: recommendedMembersCount },
     (_, i) => ({
       email: `user${i + 1}@example.com`,
-      name: i % 2 === 0 ? `User ${i + 1}` : null,
       image:
         i % 3 === 0
           ? `https://api.dicebear.com/7.x/avataaars/svg?seed=${i + 1}`
           : null,
+      name: i % 2 === 0 ? `User ${i + 1}` : null,
     }),
   );
 
@@ -114,15 +111,15 @@ function Story() {
         <div>
           <h3 className="mb-3 font-medium">Team Type</h3>
           <RadioGroup
-            value={selectedTeam.id}
+            className="flex gap-4"
             onValueChange={(value: typeof selectedTeam.id) => {
               const config = TEAM_CONFIGS.find(({ id }) => id === value);
               if (config) setSelectedTeam({ id: value, team: config.team });
             }}
-            className="flex gap-4"
+            value={selectedTeam.id}
           >
             {TEAM_CONFIGS.map(({ id, label }) => (
-              <RadioOption key={id} id={id} label={label} value={id} />
+              <RadioOption key={id} label={label} value={id} />
             ))}
           </RadioGroup>
         </div>
@@ -131,20 +128,12 @@ function Story() {
           <div>
             <h3 className="mb-3 font-medium">Edit Permission</h3>
             <RadioGroup
-              value={hasEditPermission}
-              onValueChange={setHasEditPermission}
               className="flex gap-4"
+              onValueChange={setHasEditPermission}
+              value={hasEditPermission}
             >
-              <RadioOption
-                id="permission-true"
-                label="Has Permission"
-                value="true"
-              />
-              <RadioOption
-                id="permission-false"
-                label="No Permission"
-                value="false"
-              />
+              <RadioOption label="Has Permission" value="true" />
+              <RadioOption label="No Permission" value="false" />
             </RadioGroup>
           </div>
         )}
@@ -153,27 +142,15 @@ function Story() {
           <div>
             <h3 className="mb-3 font-medium">Invite Result</h3>
             <RadioGroup
-              value={inviteResult}
+              className="flex gap-4"
               onValueChange={(value: typeof inviteResult) => {
                 setInviteResult(value as keyof typeof INVITE_HANDLERS);
               }}
-              className="flex gap-4"
+              value={inviteResult}
             >
-              <RadioOption
-                id="result-success"
-                label="All Success"
-                value="success"
-              />
-              <RadioOption
-                id="result-failure"
-                label="All Failure"
-                value="failure"
-              />
-              <RadioOption
-                id="result-mixed"
-                label="Mixed Results"
-                value="mixed"
-              />
+              <RadioOption label="All Success" value="success" />
+              <RadioOption label="All Failure" value="failure" />
+              <RadioOption label="Mixed Results" value="mixed" />
             </RadioGroup>
           </div>
         )}
@@ -181,19 +158,14 @@ function Story() {
         <div>
           <h3 className="mb-3 font-medium">Recommended Members</h3>
           <RadioGroup
-            value={recommendedMembersCount.toString()}
+            className="flex gap-4"
             onValueChange={(value) => {
               setRecommendedMembersCount(Number.parseInt(value));
             }}
-            className="flex gap-4"
+            value={recommendedMembersCount.toString()}
           >
             {RECOMMENDED_MEMBERS_COUNTS.map(({ id, label, value }) => (
-              <RadioOption
-                key={id}
-                id={id}
-                label={label}
-                value={value.toString()}
-              />
+              <RadioOption key={id} label={label} value={value.toString()} />
             ))}
           </RadioGroup>
         </div>
@@ -201,11 +173,11 @@ function Story() {
 
       <div className="flex flex-col gap-10">
         <InviteSection
-          team={selectedTeam.team}
-          userHasEditPermission={hasEditPermission === "true"}
+          client={storybookThirdwebClient}
           inviteTeamMembers={INVITE_HANDLERS[inviteResult]}
           recommendedMembers={recommendedMembers}
-          client={storybookThirdwebClient}
+          team={selectedTeam.team}
+          userHasEditPermission={hasEditPermission === "true"}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/InviteSection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/InviteSection.tsx
index da6ee4f3450..ffc576f6f28 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/InviteSection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/InviteSection.tsx
@@ -1,8 +1,23 @@
 "use client";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import {
+  CheckIcon,
+  ExternalLinkIcon,
+  PlusIcon,
+  SearchIcon,
+  Trash2Icon,
+  UserPlusIcon,
+} from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import { z } from "zod";
 import type { Team } from "@/api/team";
 import type { TeamAccountRole } from "@/api/team-members";
 import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -13,6 +28,7 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Select,
   SelectContent,
@@ -22,22 +38,6 @@ import {
 } from "@/components/ui/select";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { cn } from "@/lib/utils";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import {
-  CheckIcon,
-  ExternalLinkIcon,
-  PlusIcon,
-  SearchIcon,
-  Trash2Icon,
-  UserPlusIcon,
-} from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
-import { z } from "zod";
 import { getValidTeamPlan } from "../../../../../components/TeamHeader/getValidTeamPlan";
 
 const inviteFormSchema = z.object({
@@ -91,7 +91,6 @@ export function InviteSection(props: {
     props.userHasEditPermission;
 
   const form = useForm<InviteFormValues>({
-    resolver: zodResolver(inviteFormSchema),
     defaultValues: {
       invites: [
         {
@@ -100,6 +99,7 @@ export function InviteSection(props: {
         },
       ],
     },
+    resolver: zodResolver(inviteFormSchema),
   });
 
   const sendInvites = useMutation({
@@ -117,10 +117,10 @@ export function InviteSection(props: {
         <p className="text-muted-foreground text-sm">
           This feature is not available on the {teamPlan} plan.{" "}
           <Link
+            className="text-link-foreground hover:text-foreground"
             href="https://thirdweb.com/pricing"
-            target="_blank"
             rel="noopener noreferrer"
-            className="text-link-foreground hover:text-foreground"
+            target="_blank"
           >
             View plans <ExternalLinkIcon className="inline size-3" />
           </Link>
@@ -129,10 +129,10 @@ export function InviteSection(props: {
         {props.customCTASection ? (
           props.customCTASection
         ) : (
-          <Button variant="outline" size="sm" asChild>
+          <Button asChild size="sm" variant="outline">
             <Link
-              href={`/team/${props.team.slug}/~/settings/billing?showPlans=true&highlight=growth`}
               className="gap-2"
+              href={`/team/${props.team.slug}/~/settings/billing?showPlans=true&highlight=growth`}
             >
               Upgrade
             </Link>
@@ -154,10 +154,10 @@ export function InviteSection(props: {
         <p className="text-muted-foreground text-sm">
           Team members are billed according to your plan.{" "}
           <Link
+            className="text-link-foreground hover:text-foreground"
             href="https://thirdweb.com/pricing"
-            target="_blank"
             rel="noopener noreferrer"
-            className="text-link-foreground hover:text-foreground"
+            target="_blank"
           >
             View pricing <ExternalLinkIcon className="inline size-3" />
           </Link>
@@ -166,11 +166,11 @@ export function InviteSection(props: {
         <div className="flex gap-3">
           {!props.shouldHideInviteButton && (
             <Button
-              variant="default"
-              size="sm"
               className="gap-2 max-sm:w-full"
-              type="submit"
               disabled={sendInvites.isPending}
+              size="sm"
+              type="submit"
+              variant="default"
             >
               {sendInvites.isPending ? (
                 <Spinner className="size-4" />
@@ -231,13 +231,13 @@ export function InviteSection(props: {
   return (
     <Form {...form}>
       <form
-        onSubmit={form.handleSubmit(onSubmit)}
         onChange={() => {
           // when form updates - reset mutation result
           if (sendInvites.data) {
             sendInvites.reset();
           }
         }}
+        onSubmit={form.handleSubmit(onSubmit)}
       >
         <section>
           <div
@@ -258,10 +258,6 @@ export function InviteSection(props: {
               <RecommendedMembersSection
                 client={props.client}
                 isDisabled={!inviteEnabled}
-                recommendedMembers={props.recommendedMembers}
-                selectedMembers={form
-                  .watch("invites")
-                  .map((invite) => invite.email)}
                 onToggleMember={(email) => {
                   const currentInvites = form
                     .getValues("invites")
@@ -286,14 +282,18 @@ export function InviteSection(props: {
                     shouldTouch: true,
                   });
                 }}
+                recommendedMembers={props.recommendedMembers}
+                selectedMembers={form
+                  .watch("invites")
+                  .map((invite) => invite.email)}
               />
             )}
 
             <div className="px-4 py-6 lg:px-6">
               <div className="flex flex-col gap-5">
                 {form.watch("invites").map((_, index) => (
-                  // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-                  <div key={index} className="flex items-start gap-4">
+                  // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
+                  <div className="flex items-start gap-4" key={index}>
                     <div className="grid flex-1 grid-cols-1 gap-4 md:grid-cols-2">
                       <FormField
                         control={form.control}
@@ -310,10 +310,10 @@ export function InviteSection(props: {
                             <FormControl>
                               <Input
                                 {...field}
-                                type="email"
-                                placeholder="user@example.com"
-                                disabled={!inviteEnabled}
                                 className="disabled:bg-muted"
+                                disabled={!inviteEnabled}
+                                placeholder="user@example.com"
+                                type="email"
                               />
                             </FormControl>
                             {sendInvites.data && (
@@ -353,8 +353,8 @@ export function InviteSection(props: {
                             <FormControl>
                               <RoleSelector
                                 disabled={!inviteEnabled}
-                                value={field.value}
                                 onChange={field.onChange}
+                                value={field.value}
                               />
                             </FormControl>
                             <FormMessage />
@@ -365,8 +365,6 @@ export function InviteSection(props: {
 
                     {form.watch("invites").length > 1 && (
                       <Button
-                        type="button"
-                        variant="outline"
                         className="mt-8 bg-background text-destructive-text disabled:cursor-not-allowed disabled:opacity-100"
                         onClick={() => {
                           const currentInvites = form.getValues("invites");
@@ -375,6 +373,8 @@ export function InviteSection(props: {
                             currentInvites.filter((_, i) => i !== index),
                           );
                         }}
+                        type="button"
+                        variant="outline"
                       >
                         <Trash2Icon className="size-4" />
                       </Button>
@@ -385,9 +385,6 @@ export function InviteSection(props: {
 
               <div className="mt-6 flex gap-3">
                 <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
                   className="gap-2"
                   disabled={
                     !inviteEnabled ||
@@ -400,21 +397,24 @@ export function InviteSection(props: {
                       { email: "", role: "MEMBER" },
                     ]);
                   }}
+                  size="sm"
+                  type="button"
+                  variant="outline"
                 >
                   <PlusIcon className="size-4" />
                   Add Another
                 </Button>
 
                 <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  disabled={!form.formState.isDirty}
                   className="gap-2"
+                  disabled={!form.formState.isDirty}
                   onClick={() => {
                     form.reset();
                     sendInvites.reset();
                   }}
+                  size="sm"
+                  type="button"
+                  variant="outline"
                 >
                   Reset
                 </Button>
@@ -438,10 +438,10 @@ function RoleSelector(props: {
 
   return (
     <Select
-      value={props.value}
       onValueChange={(v) => {
         props.onChange(v as TeamAccountRole);
       }}
+      value={props.value}
     >
       <SelectTrigger
         className="capitalize disabled:bg-muted"
@@ -451,7 +451,7 @@ function RoleSelector(props: {
       </SelectTrigger>
       <SelectContent>
         {roles.map((role) => (
-          <SelectItem key={role} value={role} className="capitalize">
+          <SelectItem className="capitalize" key={role} value={role}>
             {role.toLowerCase()}
           </SelectItem>
         ))}
@@ -491,12 +491,12 @@ function RecommendedMembersSection(props: {
         <div className="relative flex items-center gap-2">
           <SearchIcon className="absolute left-3 size-4 text-muted-foreground" />
           <Input
-            placeholder="Search Email"
             className="w-full bg-card pl-9 lg:w-72"
-            value={searchQuery}
             onChange={(e) => {
               setSearchQuery(e.target.value);
             }}
+            placeholder="Search Email"
+            value={searchQuery}
           />
         </div>
       </div>
@@ -515,31 +515,31 @@ function RecommendedMembersSection(props: {
             const isSelected = props.selectedMembers.includes(member.email);
             return (
               <Button
-                key={member.email}
-                variant="outline"
                 className={cn(
                   "relative flex h-auto w-auto items-center justify-between gap-2 rounded-lg border-dashed p-2.5 text-start hover:border-active-border hover:border-solid hover:bg-accent/50 disabled:opacity-100",
                   isSelected &&
                     "border-active-border border-solid bg-accent/50",
                 )}
+                disabled={props.isDisabled}
+                key={member.email}
                 onClick={() => {
                   props.onToggleMember(member.email);
                 }}
-                disabled={props.isDisabled}
+                variant="outline"
               >
                 <div className="flex items-center gap-2.5 overflow-hidden">
                   <GradientAvatar
-                    id={member.email}
+                    className="size-8 rounded-full border"
                     client={props.client}
+                    id={member.email}
                     src={
                       member.image
                         ? resolveSchemeWithErrorHandler({
-                            uri: member.image,
                             client: props.client,
+                            uri: member.image,
                           })
                         : ""
                     }
-                    className="size-8 rounded-full border"
                   />
 
                   <div className="truncate text-foreground text-sm">
@@ -558,12 +558,12 @@ function RecommendedMembersSection(props: {
 
           {filteredMembers.length > membersToShow.length && (
             <Button
-              variant="outline"
-              size="sm"
               className="h-full rounded-lg border-dashed hover:border-active-border hover:border-solid hover:bg-accent/50"
               onClick={() => {
                 setIsExpanded(true);
               }}
+              size="sm"
+              variant="outline"
             >
               + {filteredMembers.length - membersToShow.length} more
             </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageInvitesSection.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageInvitesSection.stories.tsx
index 03bdce92eed..42d614a415b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageInvitesSection.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageInvitesSection.stories.tsx
@@ -1,18 +1,18 @@
-import type { TeamInvite } from "@/api/team-invites";
-import type { TeamAccountRole } from "@/api/team-members";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { teamStub } from "stories/stubs";
 import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
+import type { TeamInvite } from "@/api/team-invites";
+import type { TeamAccountRole } from "@/api/team-members";
 import { ManageInvitesSection } from "./ManageInvitesSection";
 
 const meta = {
-  title: "Team/Settings/Members/Invites",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Team/Settings/Members/Invites",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -37,13 +37,13 @@ function createInviteStub(
   expiresAt.setDate(expiresAt.getDate() + 10);
 
   const invite: TeamInvite = {
-    id: `invite-id-${email}`,
+    createdAt: createdAt.toISOString(),
     email,
+    expiresAt: expiresAt.toISOString(),
+    id: `invite-id-${email}`,
     role,
-    createdAt: createdAt.toISOString(),
     status,
     teamId: "team-id-foo",
-    expiresAt: expiresAt.toISOString(),
   };
 
   return invite;
@@ -66,21 +66,21 @@ function Story() {
       <div className="flex flex-col gap-10">
         <BadgeContainer label="Has permission">
           <ManageInvitesSection
-            team={freeTeam}
-            userHasEditPermission={true}
-            teamInvites={invitesStub}
             client={storybookThirdwebClient}
             deleteInvite={deleteInviteStub}
+            team={freeTeam}
+            teamInvites={invitesStub}
+            userHasEditPermission={true}
           />
         </BadgeContainer>
 
         <BadgeContainer label="No permission">
           <ManageInvitesSection
-            team={freeTeam}
-            userHasEditPermission={false}
-            teamInvites={invitesStub}
             client={storybookThirdwebClient}
             deleteInvite={deleteInviteStub}
+            team={freeTeam}
+            teamInvites={invitesStub}
+            userHasEditPermission={false}
           />
         </BadgeContainer>
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageInvitesSection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageInvitesSection.tsx
index c122e6e313a..4393053e067 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageInvitesSection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageInvitesSection.tsx
@@ -1,8 +1,13 @@
 "use client";
 
+import { useMutation } from "@tanstack/react-query";
+import { format } from "date-fns";
+import { EllipsisIcon, MailIcon } from "lucide-react";
+import { useMemo, useState } from "react";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
 import type { Team } from "@/api/team";
 import type { TeamInvite } from "@/api/team-invites";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -18,13 +23,8 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { BASE_URL } from "@/constants/env-utils";
-import { useMutation } from "@tanstack/react-query";
-import { format } from "date-fns";
-import { EllipsisIcon, MailIcon } from "lucide-react";
-import { useMemo, useState } from "react";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
 import {
   FiltersSection,
   type MemberSortId,
@@ -94,12 +94,12 @@ export function ManageInvitesSection(props: {
         // don't use invitesToShow here
         disabled={props.teamInvites.length === 0}
         role={role}
+        searchPlaceholder="Search Email"
+        searchTerm={searchTerm}
         setRole={setRole}
+        setSearchTerm={setSearchTerm}
         setSortBy={setSortBy}
         sortBy={sortBy}
-        searchTerm={searchTerm}
-        setSearchTerm={setSearchTerm}
-        searchPlaceholder="Search Email"
       />
 
       <div className="h-3" />
@@ -114,18 +114,18 @@ export function ManageInvitesSection(props: {
             {invitesToShow.map((invite) => {
               return (
                 <li
-                  key={invite.id}
                   className="border-border border-b last:border-b-0"
+                  key={invite.id}
                 >
                   <InviteRow
-                    teamSlug={props.team.slug}
-                    invite={invite}
                     client={props.client}
-                    userHasEditPermission={props.userHasEditPermission}
                     deleteInvite={props.deleteInvite}
+                    invite={invite}
                     onInviteDeleted={() => {
                       setDeletedInviteIds([...deletedInviteIds, invite.id]);
                     }}
+                    teamSlug={props.team.slug}
+                    userHasEditPermission={props.userHasEditPermission}
                   />
                 </li>
               );
@@ -201,11 +201,11 @@ function InviteRow(props: {
         {/* Options */}
         {props.userHasEditPermission && (
           <ManageInviteButton
-            teamSlug={props.teamSlug}
-            invite={props.invite}
-            userHasEditPermission={props.userHasEditPermission}
             deleteInvite={props.deleteInvite}
+            invite={props.invite}
             onInviteDeleted={props.onInviteDeleted}
+            teamSlug={props.teamSlug}
+            userHasEditPermission={props.userHasEditPermission}
           />
         )}
       </div>
@@ -231,10 +231,10 @@ function ManageInviteButton(props: {
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
           <Button
-            size="icon"
-            variant="ghost"
             className="!h-auto !w-auto p-1.5"
             disabled={!props.userHasEditPermission}
+            size="icon"
+            variant="ghost"
           >
             <EllipsisIcon className="size-4 text-muted-foreground" />
           </Button>
@@ -261,7 +261,7 @@ function ManageInviteButton(props: {
         </DropdownMenuContent>
       </DropdownMenu>
 
-      <Dialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+      <Dialog onOpenChange={setShowDeleteDialog} open={showDeleteDialog}>
         <DialogContent className="overflow-hidden p-0">
           <DialogHeader className="p-6">
             <DialogTitle className="text-xl">Delete Invite</DialogTitle>
@@ -274,26 +274,26 @@ function ManageInviteButton(props: {
           </DialogHeader>
           <div className="flex justify-end gap-3 border-t bg-card p-6">
             <Button
-              variant="outline"
               onClick={() => setShowDeleteDialog(false)}
+              variant="outline"
             >
               Cancel
             </Button>
             <Button
-              type="button"
               className="gap-2 bg-destructive text-destructive-foreground hover:bg-destructive/90"
               disabled={deleteMutation.isPending}
               onClick={() => {
                 const promise = deleteMutation.mutateAsync();
                 toast.promise(promise, {
-                  success: "Invite deleted successfully",
                   error: "Failed to delete invite",
+                  success: "Invite deleted successfully",
                 });
                 promise.then(() => {
                   setShowDeleteDialog(false);
                   props.onInviteDeleted();
                 });
               }}
+              type="button"
             >
               {deleteMutation.isPending && <Spinner className="size-4" />}
               Delete Invite
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageMembersSection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageMembersSection.tsx
index 340c5da340a..d8060e257ec 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageMembersSection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/ManageMembersSection.tsx
@@ -1,9 +1,14 @@
 "use client";
 
+import { useMutation } from "@tanstack/react-query";
+import Fuse from "fuse.js";
+import { EllipsisIcon } from "lucide-react";
+import { useMemo, useState } from "react";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
 import type { Team } from "@/api/team";
 import type { TeamAccountRole, TeamMember } from "@/api/team-members";
 import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -18,12 +23,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { useMutation } from "@tanstack/react-query";
-import Fuse from "fuse.js";
-import { EllipsisIcon } from "lucide-react";
-import { useMemo, useState } from "react";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { FiltersSection, type MemberSortId } from "./_common";
 
 type RoleFilterValue = "ALL ROLES" | TeamAccountRole;
@@ -110,12 +110,12 @@ export function ManageMembersSection(props: {
         // don't use membersToShow here
         disabled={props.members.length === 0}
         role={role}
+        searchPlaceholder="Search Team Members"
+        searchTerm={searchTerm}
         setRole={setRole}
+        setSearchTerm={setSearchTerm}
         setSortBy={setSortBy}
         sortBy={sortBy}
-        searchTerm={searchTerm}
-        setSearchTerm={setSearchTerm}
-        searchPlaceholder="Search Team Members"
       />
 
       <div className="h-3" />
@@ -130,20 +130,20 @@ export function ManageMembersSection(props: {
             {membersToShow.map((member) => {
               return (
                 <li
-                  key={member.accountId}
                   className="border-border border-b last:border-b-0"
+                  key={member.accountId}
                 >
                   <MemberRow
-                    member={member}
-                    userHasEditPermission={props.userHasEditPermission}
                     client={props.client}
                     deleteMember={props.deleteMember}
+                    member={member}
                     onMemberDeleted={() => {
                       setDeletedMembersIds([
                         ...deletedMembersIds,
                         member.accountId,
                       ]);
                     }}
+                    userHasEditPermission={props.userHasEditPermission}
                   />
                 </li>
               );
@@ -174,9 +174,9 @@ function MemberRow(props: {
       <div className="flex items-center gap-3 lg:gap-4">
         <GradientAvatar
           className="size-6 border lg:size-9"
-          src={props.member.account.image || ""}
-          id={props.member.account.creatorWalletAddress}
           client={props.client}
+          id={props.member.account.creatorWalletAddress}
+          src={props.member.account.image || ""}
         />
 
         <div className="flex flex-col gap-0.5">
@@ -199,10 +199,10 @@ function MemberRow(props: {
 
         {props.userHasEditPermission && (
           <ManageMemberButton
-            member={props.member}
-            userHasEditPermission={props.userHasEditPermission}
             deleteMember={props.deleteMember}
+            member={props.member}
             onMemberDeleted={props.onMemberDeleted}
+            userHasEditPermission={props.userHasEditPermission}
           />
         )}
       </div>
@@ -227,10 +227,10 @@ function ManageMemberButton(props: {
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
           <Button
-            size="icon"
-            variant="ghost"
             className="!h-auto !w-auto p-1.5"
             disabled={!props.userHasEditPermission}
+            size="icon"
+            variant="ghost"
           >
             <EllipsisIcon className="size-4 text-muted-foreground" />
           </Button>
@@ -245,7 +245,7 @@ function ManageMemberButton(props: {
         </DropdownMenuContent>
       </DropdownMenu>
 
-      <Dialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+      <Dialog onOpenChange={setShowDeleteDialog} open={showDeleteDialog}>
         <DialogContent className="overflow-hidden p-0">
           <DialogHeader className="p-6">
             <DialogTitle className="text-xl">Remove Member</DialogTitle>
@@ -265,26 +265,26 @@ function ManageMemberButton(props: {
           </DialogHeader>
           <div className="flex justify-end gap-3 border-t bg-card p-6">
             <Button
-              variant="outline"
               onClick={() => setShowDeleteDialog(false)}
+              variant="outline"
             >
               Cancel
             </Button>
             <Button
-              type="button"
               className="gap-2 bg-destructive text-destructive-foreground hover:bg-destructive/90"
               disabled={deleteMutation.isPending}
               onClick={() => {
                 const promise = deleteMutation.mutateAsync();
                 toast.promise(promise, {
-                  success: "Member deleted successfully",
                   error: "Failed to delete member",
+                  success: "Member deleted successfully",
                 });
                 promise.then(() => {
                   setShowDeleteDialog(false);
                   props.onMemberDeleted();
                 });
               }}
+              type="button"
             >
               {deleteMutation.isPending && <Spinner className="size-4" />}
               Remove Member
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.stories.tsx
index 343038fd782..aa12afa9e80 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.stories.tsx
@@ -1,17 +1,17 @@
-import type { TeamAccountRole, TeamMember } from "@/api/team-members";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { teamStub } from "stories/stubs";
 import { BadgeContainer, storybookThirdwebClient } from "stories/utils";
+import type { TeamAccountRole, TeamMember } from "@/api/team-members";
 import { ManageMembersSection } from "./ManageMembersSection";
 
 const meta = {
-  title: "Team/Settings/Members/Manage",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Team/Settings/Members/Manage",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -34,10 +34,10 @@ function createMemberStub(
 
   const member: TeamMember = {
     account: {
-      email: `user-${id}@foo.com`,
-      name: name,
       creatorWalletAddress: "0x1234567890123456789012345678901234567890",
+      email: `user-${id}@foo.com`,
       image: null,
+      name: name,
     },
     accountId: `account-id-${id}`,
     createdAt: date.toISOString(),
@@ -73,31 +73,31 @@ function Story() {
       <div className="flex flex-col gap-10">
         <BadgeContainer label="Has permission">
           <ManageMembersSection
-            team={freeTeam}
-            userHasEditPermission={true}
-            members={membersStub}
             client={storybookThirdwebClient}
             deleteMember={deleteMemberStub}
+            members={membersStub}
+            team={freeTeam}
+            userHasEditPermission={true}
           />
         </BadgeContainer>
 
         <BadgeContainer label="No permission">
           <ManageMembersSection
-            team={freeTeam}
-            userHasEditPermission={false}
-            members={membersStub}
             client={storybookThirdwebClient}
             deleteMember={deleteMemberStub}
+            members={membersStub}
+            team={freeTeam}
+            userHasEditPermission={false}
           />
         </BadgeContainer>
 
         <BadgeContainer label="Has permission, Members dont have names">
           <ManageMembersSection
-            team={freeTeam}
-            userHasEditPermission={true}
-            members={membersStubNoName}
             client={storybookThirdwebClient}
             deleteMember={deleteMemberStub}
+            members={membersStubNoName}
+            team={freeTeam}
+            userHasEditPermission={true}
           />
         </BadgeContainer>
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.tsx
index 4b2e8f16a7a..ec27da5ca3e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import { apiServerProxy } from "@/actions/proxies";
 import { sendTeamInvites } from "@/actions/sendTeamInvite";
 import type { Team } from "@/api/team";
@@ -7,8 +9,6 @@ import type { TeamInvite } from "@/api/team-invites";
 import type { TeamMember } from "@/api/team-members";
 import { TabButtons } from "@/components/ui/tabs";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import { InviteSection, type RecommendedMember } from "./InviteSection";
 import { ManageInvitesSection } from "./ManageInvitesSection";
 import { ManageMembersSection } from "./ManageMembersSection";
@@ -34,13 +34,11 @@ export function TeamMembersSettingsPage(props: {
       <div className="h-5" />
 
       <InviteSection
-        team={props.team}
         client={props.client}
-        userHasEditPermission={props.userHasEditPermission}
         inviteTeamMembers={async (params) => {
           const res = await sendTeamInvites({
-            teamId: props.team.id,
             invites: params,
+            teamId: props.team.id,
           });
 
           if (!res.ok) {
@@ -53,8 +51,10 @@ export function TeamMembersSettingsPage(props: {
             results: res.results,
           };
         }}
-        // TODO
         recommendedMembers={props.recommendedMembers}
+        team={props.team}
+        // TODO
+        userHasEditPermission={props.userHasEditPermission}
       />
 
       <div className="h-10" />
@@ -79,14 +79,11 @@ export function TeamMembersSettingsPage(props: {
 
       {manageTab === "members" && (
         <ManageMembersSection
-          team={props.team}
-          userHasEditPermission={props.userHasEditPermission}
-          members={props.members}
           client={props.client}
           deleteMember={async (memberAccountId) => {
             const res = await apiServerProxy({
-              pathname: `/v1/teams/${props.team.id}/members/${memberAccountId}`,
               method: "DELETE",
+              pathname: `/v1/teams/${props.team.id}/members/${memberAccountId}`,
             });
 
             router.refresh();
@@ -95,18 +92,19 @@ export function TeamMembersSettingsPage(props: {
               throw new Error(res.error);
             }
           }}
+          members={props.members}
+          team={props.team}
+          userHasEditPermission={props.userHasEditPermission}
         />
       )}
 
       {manageTab === "invites" && (
         <ManageInvitesSection
-          team={props.team}
-          userHasEditPermission={props.userHasEditPermission}
           client={props.client}
           deleteInvite={async (inviteId) => {
             const res = await apiServerProxy({
-              pathname: `/v1/teams/${props.team.id}/invites/${inviteId}`,
               method: "DELETE",
+              pathname: `/v1/teams/${props.team.id}/invites/${inviteId}`,
             });
 
             router.refresh();
@@ -115,7 +113,9 @@ export function TeamMembersSettingsPage(props: {
               throw new Error(res.error);
             }
           }}
+          team={props.team}
           teamInvites={props.teamInvites}
+          userHasEditPermission={props.userHasEditPermission}
         />
       )}
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/_common.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/_common.tsx
index f75b044d182..9fd0adaba0d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/_common.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/_common.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { SearchIcon } from "lucide-react";
 import type { TeamAccountRole } from "@/api/team-members";
 import { Input } from "@/components/ui/input";
 import {
@@ -9,7 +10,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { SearchIcon } from "lucide-react";
 
 export type RoleFilterValue = "ALL ROLES" | TeamAccountRole;
 export type MemberSortId = "date" | "a-z" | "z-a";
@@ -31,11 +31,11 @@ export function FiltersSection(props: {
       <div className="relative grow">
         <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 transform text-muted-foreground" />
         <Input
-          placeholder={props.searchPlaceholder}
           className="bg-card pl-9"
           disabled={props.disabled}
-          value={searchTerm}
           onChange={(e) => setSearchTerm(e.target.value)}
+          placeholder={props.searchPlaceholder}
+          value={searchTerm}
         />
       </div>
 
@@ -58,8 +58,8 @@ function SortMembersBy(props: {
 }) {
   const { sortBy, setSortBy } = props;
   const valueToLabel: Record<MemberSortId, string> = {
-    date: "Date",
     "a-z": "Name (A-Z)",
+    date: "Date",
     "z-a": "Name (Z-A)",
   };
 
@@ -67,10 +67,10 @@ function SortMembersBy(props: {
 
   return (
     <Select
-      value={sortBy}
       onValueChange={(v) => {
         setSortBy(v as "date" | "a-z" | "z-a");
       }}
+      value={sortBy}
     >
       <SelectTrigger
         className="bg-card capitalize disabled:bg-muted lg:w-[150px]"
@@ -80,7 +80,7 @@ function SortMembersBy(props: {
       </SelectTrigger>
       <SelectContent>
         {sortByIds.map((id) => (
-          <SelectItem key={id} value={id} className="capitalize">
+          <SelectItem className="capitalize" key={id} value={id}>
             {valueToLabel[id]}
           </SelectItem>
         ))}
@@ -99,10 +99,10 @@ function RoleSelector(props: {
 
   return (
     <Select
-      value={role}
       onValueChange={(v) => {
         setRole(v as RoleFilterValue);
       }}
+      value={role}
     >
       <SelectTrigger
         className="bg-card capitalize disabled:bg-muted lg:w-[150px]"
@@ -112,7 +112,7 @@ function RoleSelector(props: {
       </SelectTrigger>
       <SelectContent>
         {roles.map((role) => (
-          <SelectItem key={role} value={role} className="capitalize">
+          <SelectItem className="capitalize" key={role} value={role}>
             {role.toLowerCase()}
           </SelectItem>
         ))}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/getRecommendedMembers.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/getRecommendedMembers.ts
index 62a7a353d84..f4cc2ab424c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/getRecommendedMembers.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/getRecommendedMembers.ts
@@ -8,8 +8,8 @@ export async function getRecommendedMembers(params: {
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${params.teamId}/members/recommended`,
     {
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${params.authToken}`,
+        "Content-Type": "application/json",
       },
     },
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/page.tsx
index 3041a41cc4b..b03ca87c947 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/page.tsx
@@ -1,12 +1,12 @@
+import { notFound, redirect } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getTeamInvites } from "@/api/team-invites";
 import { getMembers } from "@/api/team-members";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound, redirect } from "next/navigation";
 import { getValidAccount } from "../../../../../../account/settings/getAccount";
 import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
-import { TeamMembersSettingsPage } from "./TeamMembersSettingsPage";
 import { getRecommendedMembers } from "./getRecommendedMembers";
+import { TeamMembersSettingsPage } from "./TeamMembersSettingsPage";
 
 export default async function Page(props: {
   params: Promise<{
@@ -58,19 +58,19 @@ export default async function Page(props: {
 
   const recommendedMembers = team.verifiedDomain
     ? await getRecommendedMembers({
-        teamId: team.id,
         authToken,
+        teamId: team.id,
       })
     : [];
 
   return (
     <TeamMembersSettingsPage
-      team={team}
-      members={members}
-      userHasEditPermission={accountMemberInfo.role === "OWNER"}
       client={client}
-      teamInvites={pendingOrExpiredInvites}
+      members={members}
       recommendedMembers={recommendedMembers}
+      team={team}
+      teamInvites={pendingOrExpiredInvites}
+      userHasEditPermission={accountMemberInfo.role === "OWNER"}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/notifications/NotificationsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/notifications/NotificationsPage.tsx
index 79eac6b1f81..de9726ddcf2 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/notifications/NotificationsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/notifications/NotificationsPage.tsx
@@ -1,10 +1,8 @@
-import { Separator } from "@/components/ui/separator";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { Notifications } from "components/settings/Account/Notifications";
+import { Separator } from "@/components/ui/separator";
 
-export const SettingsNotificationsPage = (props: {
-  account: Account;
-}) => {
+export const SettingsNotificationsPage = (props: { account: Account }) => {
   return (
     <div>
       <h1 className="mb-0.5 font-semibold text-2xl tracking-tight">
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/page.tsx
index 524353ae17e..3250c95d347 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/page.tsx
@@ -1,8 +1,8 @@
+import { notFound } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getMemberByAccountId } from "@/api/team-members";
 import { checkDomainVerification } from "@/api/verified-domain";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound } from "next/navigation";
 import { getValidAccount } from "../../../../../account/settings/getAccount";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { TeamGeneralSettingsPage } from "./general/TeamGeneralSettingsPage";
@@ -37,11 +37,11 @@ export default async function Page(props: {
 
   return (
     <TeamGeneralSettingsPage
-      team={team}
-      client={client}
       accountId={account.id}
+      client={client}
       initialVerification={initialVerification}
       isOwnerAccount={isOwnerAccount}
+      team={team}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/account-abstraction/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/account-abstraction/page.tsx
index 4c5aad76489..cebee6b8d74 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/account-abstraction/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/account-abstraction/page.tsx
@@ -1,6 +1,6 @@
+import { redirect } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
 import { getProjects } from "../../../../../../../../@/api/projects";
 import { getTeamSubscriptions } from "../../../../../../../../@/api/team-subscription";
 import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
@@ -53,11 +53,11 @@ export default async function Page(props: {
     <div className="flex flex-col gap-14">
       <SponsoredTransactionsTable
         client={client}
-        teamSlug={team.slug}
-        teamId={team.id}
         from={usageSubscription.currentPeriodStart}
-        to={usageSubscription.currentPeriodEnd}
         projects={projects}
+        teamId={team.id}
+        teamSlug={team.slug}
+        to={usageSubscription.currentPeriodEnd}
         variant="team"
       />
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/layout.tsx
index e92c94071ce..d8700949d9b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/layout.tsx
@@ -1,6 +1,6 @@
+import Link from "next/link";
 import { SidebarLayout } from "@/components/blocks/SidebarLayout";
 import { Button } from "@/components/ui/button";
-import Link from "next/link";
 
 export default async function Layout(props: {
   children: React.ReactNode;
@@ -17,12 +17,12 @@ export default async function Layout(props: {
             Usage
           </h1>
           <div className="flex items-center gap-2">
-            <Button variant="outline" asChild>
+            <Button asChild variant="outline">
               <Link href={`/team/${params.team_slug}/~/settings/billing`}>
                 Billing Settings
               </Link>
             </Button>
-            <Button variant="outline" asChild>
+            <Button asChild variant="outline">
               <Link href={`/team/${params.team_slug}/~/settings/invoices`}>
                 Invoice History
               </Link>
@@ -33,23 +33,23 @@ export default async function Layout(props: {
       <SidebarLayout
         sidebarLinks={[
           {
-            href: `/team/${params.team_slug}/~/usage`,
             exactMatch: true,
+            href: `/team/${params.team_slug}/~/usage`,
             label: "Overview",
           },
           {
-            href: `/team/${params.team_slug}/~/usage/rpc`,
             exactMatch: true,
+            href: `/team/${params.team_slug}/~/usage/rpc`,
             label: "RPC",
           },
           {
-            href: `/team/${params.team_slug}/~/usage/storage`,
             exactMatch: true,
+            href: `/team/${params.team_slug}/~/usage/storage`,
             label: "Storage",
           },
           {
-            href: `/team/${params.team_slug}/~/usage/account-abstraction`,
             exactMatch: true,
+            href: `/team/${params.team_slug}/~/usage/account-abstraction`,
             label: "Account Abstraction",
           },
         ]}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTable.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTable.tsx
index 2f7a92dcabf..5dd626d11d5 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTable.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTable.tsx
@@ -1,8 +1,8 @@
 "use client";
-import { analyticsServerProxy } from "@/actions/proxies";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb/dist/types/client/client";
+import { analyticsServerProxy } from "@/actions/proxies";
 import {
   type SponsoredTransaction,
   SponsoredTransactionsTableUI,
@@ -28,15 +28,15 @@ const getSponsoredTransactions = async (
       total: number;
     };
   }>({
-    pathname: "/v2/bundler/sponsored-transactions",
     method: "GET",
+    pathname: "/v2/bundler/sponsored-transactions",
     searchParams: {
-      teamId: params.teamId,
+      chainId: params.chainId,
+      from: params.from,
       limit: params.limit.toString(),
       offset: params.offset.toString(),
       projectId: params.projectId,
-      chainId: params.chainId,
-      from: params.from,
+      teamId: params.teamId,
       to: params.to,
     },
   });
@@ -55,11 +55,11 @@ async function getSponsoredTransactionsCSV(params: {
 }) {
   const res = await analyticsServerProxy<string>({
     method: "GET",
-    pathname: "/v2/bundler/sponsored-transactions/export",
     parseAsText: true,
+    pathname: "/v2/bundler/sponsored-transactions/export",
     searchParams: {
-      teamId: params.teamId,
       from: params.from,
+      teamId: params.teamId,
       to: params.to,
     },
   });
@@ -105,21 +105,21 @@ export function SponsoredTransactionsTable(
   });
 
   const params = {
-    teamId: props.teamId,
+    chainId: filters.chainId,
+    from: props.from,
     limit: pageSize,
     offset: (page - 1) * pageSize,
-    from: props.from,
-    to: props.to,
-    chainId: filters.chainId,
     projectId: filters.projectId,
+    teamId: props.teamId,
+    to: props.to,
   };
 
   const sponsoredTransactionsQuery = useQuery({
-    queryKey: ["sponsored-transactions", params],
+    placeholderData: keepPreviousData,
     queryFn: () => {
       return getSponsoredTransactions(params);
     },
-    placeholderData: keepPreviousData,
+    queryKey: ["sponsored-transactions", params],
     refetchOnWindowFocus: false,
   });
 
@@ -129,29 +129,29 @@ export function SponsoredTransactionsTable(
 
   return (
     <SponsoredTransactionsTableUI
-      filters={filters}
-      variant={props.variant}
-      projects={props.variant === "team" ? props.projects : []}
-      setFilters={(v) => {
-        setFilters(v);
-        setPage(1);
-      }}
       client={props.client}
-      isError={sponsoredTransactionsQuery.isError}
+      filters={filters}
       getCSV={() => {
         return getSponsoredTransactionsCSV({
-          teamId: props.teamId,
           from: props.from,
+          teamId: props.teamId,
           to: props.to,
         });
       }}
+      isError={sponsoredTransactionsQuery.isError}
       isPending={sponsoredTransactionsQuery.isFetching}
-      sponsoredTransactions={sponsoredTransactionsQuery.data?.data ?? []}
       pageNumber={page}
-      setPageNumber={setPage}
       pageSize={pageSize}
+      projects={props.variant === "team" ? props.projects : []}
+      setFilters={(v) => {
+        setFilters(v);
+        setPage(1);
+      }}
+      setPageNumber={setPage}
+      sponsoredTransactions={sponsoredTransactionsQuery.data?.data ?? []}
       teamSlug={props.teamSlug}
       totalPages={totalPages}
+      variant={props.variant}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTableUI.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTableUI.stories.tsx
index a398428fd11..e1a8eaee76f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTableUI.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTableUI.stories.tsx
@@ -1,17 +1,16 @@
-import { Label } from "@/components/ui/label";
-import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { projectStub } from "stories/stubs";
 import { storybookThirdwebClient } from "stories/utils";
 import { ThirdwebProvider } from "thirdweb/react";
+import { Label } from "@/components/ui/label";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import {
   type SponsoredTransaction,
   SponsoredTransactionsTableUI,
 } from "./SponsoredTransactionsTableUI";
 
 const meta = {
-  title: "Usage/SponsoredTransactionsTable",
   component: Variant,
   decorators: [
     (Story) => (
@@ -22,6 +21,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Usage/SponsoredTransactionsTable",
 } satisfies Meta<typeof Variant>;
 
 export default meta;
@@ -45,76 +45,76 @@ function createSponsoredTransactionStub() {
         : Math.random();
 
   return {
-    timestamp: new Date(
-      Date.now() - Math.random() * 1000 * 60 * 60 * 24 * 30,
-    ).toISOString(),
-    teamId: crypto.randomUUID(),
-    projectId:
-      mockProjects[Math.floor(Math.random() * mockProjects.length)]?.id || "",
     chainId: chainIdsToPick[
       Math.floor(Math.random() * chainIdsToPick.length)
     ] as string,
+    projectId:
+      mockProjects[Math.floor(Math.random() * mockProjects.length)]?.id || "",
+    teamId: crypto.randomUUID(),
+    timestamp: new Date(
+      Date.now() - Math.random() * 1000 * 60 * 60 * 24 * 30,
+    ).toISOString(),
     transactionFee: randomVal,
     transactionFeeUsd: feeUsd,
-    walletAddress: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
     transactionHash:
       "0xfedcba0987654321fedcba0987654321fedcba0987654321fedcba0987654321",
     userOpHash:
       "0x0987654321fedcba0987654321fedcba0987654321fedcba0987654321fedcba",
+    walletAddress: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
   } satisfies SponsoredTransaction;
 }
 
 export const Default: Story = {
   args: {
-    totalPages: 4,
+    isError: false,
+    isPending: false,
+    projectLoadingFails: false,
     sponsoredTransactions: new Array(10)
       .fill(null)
       .map(createSponsoredTransactionStub),
-    isPending: false,
-    projectLoadingFails: false,
-    isError: false,
+    totalPages: 4,
   },
 };
 
 export const Loading: Story = {
   args: {
-    totalPages: 4,
-    sponsoredTransactions: [],
+    isError: false,
     isPending: true,
     projectLoadingFails: false,
-    isError: false,
+    sponsoredTransactions: [],
+    totalPages: 4,
   },
 };
 
 export const NoTransactions: Story = {
   args: {
-    totalPages: 1,
-    sponsoredTransactions: [],
+    isError: false,
     isPending: false,
     projectLoadingFails: false,
-    isError: false,
+    sponsoredTransactions: [],
+    totalPages: 1,
   },
 };
 
 export const NoPagination: Story = {
   args: {
-    totalPages: 1,
+    isError: false,
+    isPending: false,
+    projectLoadingFails: false,
     sponsoredTransactions: new Array(5)
       .fill(null)
       .map(createSponsoredTransactionStub),
-    isPending: false,
-    projectLoadingFails: false,
-    isError: false,
+    totalPages: 1,
   },
 };
 
 export const ErrorLoadingTransactions: Story = {
   args: {
-    totalPages: 1,
-    sponsoredTransactions: [],
+    isError: true,
     isPending: false,
     projectLoadingFails: false,
-    isError: true,
+    sponsoredTransactions: [],
+    totalPages: 1,
   },
 };
 
@@ -127,42 +127,44 @@ function Variant(props: {
 }) {
   const [variant, setVariant] = useState<"team" | "project">("team");
   const [pageNumber, setPageNumber] = useState(1);
+  const teamId = useId();
+  const projectId = useId();
   return (
     <div className="space-y-6">
       <div className="flex items-center gap-4">
         <RadioGroup
-          value={variant}
-          onValueChange={(value) => setVariant(value as "team" | "project")}
           className="flex items-center gap-4"
+          onValueChange={(value) => setVariant(value as "team" | "project")}
+          value={variant}
         >
           <div className="flex items-center space-x-2">
-            <RadioGroupItem value="team" id="team" />
-            <Label htmlFor="team">Team</Label>
+            <RadioGroupItem id={teamId} value="team" />
+            <Label htmlFor={teamId}>Team</Label>
           </div>
           <div className="flex items-center space-x-2">
-            <RadioGroupItem value="project" id="project" />
-            <Label htmlFor="project">Project</Label>
+            <RadioGroupItem id={projectId} value="project" />
+            <Label htmlFor={projectId}>Project</Label>
           </div>
         </RadioGroup>
       </div>
 
       <SponsoredTransactionsTableUI
-        projects={mockProjects}
+        client={storybookThirdwebClient}
+        filters={{}}
         getCSV={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           return "foo,bar\n1,2\n3,4";
         }}
-        filters={{}}
-        setFilters={() => {}}
         isError={props.isError}
-        client={storybookThirdwebClient}
-        totalPages={props.totalPages}
         isPending={props.isPending}
         pageNumber={pageNumber}
         pageSize={10}
+        projects={mockProjects}
+        setFilters={() => {}}
         setPageNumber={setPageNumber}
         sponsoredTransactions={props.sponsoredTransactions}
         teamSlug="foo"
+        totalPages={props.totalPages}
         variant={variant}
       />
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTableUI.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTableUI.tsx
index 9e37dd2ed9c..55cfde35684 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTableUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/overview/components/SponsoredTransactionsTableUI.tsx
@@ -1,12 +1,18 @@
 "use client";
+import { ChainIconClient } from "components/icons/ChainIcon";
+import { format, formatDistance } from "date-fns";
+import { useAllChainsData } from "hooks/chains/allChains";
+import { ExternalLinkIcon, XIcon } from "lucide-react";
+import Link from "next/link";
+import type { ThirdwebClient } from "thirdweb";
 import { ProjectAvatar } from "@/components/blocks/Avatars/ProjectAvatar";
 import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { SelectWithSearch } from "@/components/blocks/select-with-search";
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { PaginationButtons } from "@/components/pagination-buttons";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
   Table,
@@ -19,12 +25,6 @@ import {
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { ChainIconClient } from "components/icons/ChainIcon";
-import { format, formatDistance } from "date-fns";
-import { useAllChainsData } from "hooks/chains/allChains";
-import { ExternalLinkIcon, XIcon } from "lucide-react";
-import Link from "next/link";
-import type { ThirdwebClient } from "thirdweb";
 
 export type SponsoredTransaction = {
   timestamp: string;
@@ -79,18 +79,18 @@ export function SponsoredTransactionsTableUI(
           <div className="flex gap-2">
             {props.variant === "team" && (
               <ProjectFilter
+                client={props.client}
                 projectId={props.filters.projectId}
+                projects={props.projects}
                 setProjectId={(projectId) =>
                   props.setFilters({ ...props.filters, projectId })
                 }
-                projects={props.projects}
-                client={props.client}
               />
             )}
 
             <ChainFilter
-              client={props.client}
               chainId={props.filters.chainId}
+              client={props.client}
               setChainId={(chainId) =>
                 props.setFilters({ ...props.filters, chainId })
               }
@@ -102,8 +102,8 @@ export function SponsoredTransactionsTableUI(
               <div className="hidden h-4 w-[1px] border bg-border lg:block" />
               <ExportToCSVButton
                 className="bg-background"
-                getData={props.getCSV}
                 fileName="sponsored-transactions"
+                getData={props.getCSV}
               />
             </>
           )}
@@ -134,8 +134,8 @@ export function SponsoredTransactionsTableUI(
                       {/* Tx Hash */}
                       <TableCell>
                         <TransactionHashCell
-                          hash={transaction.transactionHash}
                           chainId={transaction.chainId}
+                          hash={transaction.transactionHash}
                         />
                       </TableCell>
 
@@ -143,11 +143,11 @@ export function SponsoredTransactionsTableUI(
                       {props.variant === "team" && (
                         <TableCell>
                           <ProjectCell
-                            teamSlug={props.teamSlug}
+                            client={props.client}
                             project={props.projects.find(
                               (p) => p.id === transaction.projectId,
                             )}
-                            client={props.client}
+                            teamSlug={props.teamSlug}
                           />
                         </TableCell>
                       )}
@@ -197,7 +197,7 @@ export function SponsoredTransactionsTableUI(
                 })
               : Array.from({ length: props.pageSize }).map((_, index) => (
                   <SkeletonRow
-                    // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+                    // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
                     key={`skeleton-${index}`}
                     variant={props.variant}
                   />
@@ -239,8 +239,8 @@ export function SponsoredTransactionsTableUI(
         <div className="flex justify-end gap-3 rounded-b-lg border-t p-4">
           <PaginationButtons
             activePage={props.pageNumber}
-            totalPages={props.totalPages}
             onPageClick={(page) => props.setPageNumber(page)}
+            totalPages={props.totalPages}
           />
         </div>
       )}
@@ -295,12 +295,12 @@ function TransactionHashCell(props: { hash: string; chainId: string }) {
 
   if (explorerUrl) {
     return (
-      <Button size="sm" variant="ghost" asChild>
+      <Button asChild size="sm" variant="ghost">
         <Link
+          className="-translate-x-2 gap-2 font-mono"
           href={`${explorerUrl}/tx/${props.hash}`}
-          target="_blank"
           rel="noopener noreferrer"
-          className="-translate-x-2 gap-2 font-mono"
+          target="_blank"
         >
           {txHashToShow}
           <ExternalLinkIcon className="size-3.5 text-muted-foreground" />
@@ -311,11 +311,11 @@ function TransactionHashCell(props: { hash: string; chainId: string }) {
 
   return (
     <CopyTextButton
+      className="-translate-x-2 font-mono"
+      copyIconPosition="right"
       textToCopy={props.hash}
       textToShow={txHashToShow}
       tooltip="Transaction Hash"
-      copyIconPosition="right"
-      className="-translate-x-2 font-mono"
       variant="ghost"
     />
   );
@@ -332,15 +332,15 @@ function ChainCell(props: { chainId: string; client: ThirdwebClient }) {
   return (
     <div className="relative flex w-max items-center gap-2">
       <ChainIconClient
-        src={chain?.icon?.url}
         className="size-6"
         client={props.client}
+        src={chain?.icon?.url}
       />
       <Link
-        target="_blank"
-        rel="noopener noreferrer"
-        href={`/${chain ? chain.slug : props.chainId}`}
         className="before:absolute before:inset-0 hover:underline hover:underline-offset-4"
+        href={`/${chain ? chain.slug : props.chainId}`}
+        rel="noopener noreferrer"
+        target="_blank"
       >
         {chain ? chain.name : `Chain #${props.chainId}`}
       </Link>
@@ -368,15 +368,15 @@ function ProjectCell(props: {
   return (
     <div className="relative flex w-max items-center gap-2">
       <ProjectAvatar
-        src={props.project.image || ""}
         className="size-6 shrink-0"
         client={props.client}
+        src={props.project.image || ""}
       />
       <Link
-        href={`/team/${props.teamSlug}/${props.project.slug}`}
         className="before:absolute before:inset-0 hover:underline hover:underline-offset-4"
-        target="_blank"
+        href={`/team/${props.teamSlug}/${props.project.slug}`}
         rel="noopener noreferrer"
+        target="_blank"
       >
         {props.project.name}
       </Link>
@@ -396,10 +396,10 @@ function ChainFilter(props: {
       {isChainFilterActive && (
         <ToolTipLabel label="Remove chain filter">
           <Button
-            variant="outline"
-            size="icon"
             className="rounded-r-none border-r-0 px-3 text-muted-foreground"
             onClick={() => props.setChainId(undefined)}
+            size="icon"
+            variant="outline"
           >
             <XIcon className="size-4" />
           </Button>
@@ -407,14 +407,14 @@ function ChainFilter(props: {
       )}
 
       <SingleNetworkSelector
-        client={props.client}
-        className={cn(isChainFilterActive && "rounded-l-none")}
+        align="end"
         chainId={props.chainId ? Number(props.chainId) : undefined}
+        className={cn(isChainFilterActive && "rounded-l-none")}
+        client={props.client}
+        disableChainId
         onChange={(chainId) => props.setChainId(chainId.toString())}
-        popoverContentClassName="!w-[80vw] md:!w-[350px]"
-        align="end"
         placeholder="All Chains"
-        disableChainId
+        popoverContentClassName="!w-[80vw] md:!w-[350px]"
       />
     </div>
   );
@@ -433,10 +433,10 @@ function ProjectFilter(props: {
       {isProjectFilterActive && (
         <ToolTipLabel label="Remove project filter">
           <Button
-            variant="outline"
-            size="icon"
             className="rounded-r-none border-r-0 px-3 text-muted-foreground"
             onClick={() => props.setProjectId(undefined)}
+            size="icon"
+            variant="outline"
           >
             <XIcon className="size-4" />
           </Button>
@@ -444,19 +444,18 @@ function ProjectFilter(props: {
       )}
 
       <SelectWithSearch
+        align="end"
+        className={cn(
+          "min-w-[160px]",
+          isProjectFilterActive && "rounded-l-none",
+        )}
         onValueChange={(value) => props.setProjectId(value)}
         options={props.projects.map((project) => ({
           label: project.name,
           value: project.id,
         }))}
-        value={props.projectId}
         placeholder="All Projects"
         popoverContentClassName="!w-[80vw] md:!w-[350px]"
-        align="end"
-        className={cn(
-          "min-w-[160px]",
-          isProjectFilterActive && "rounded-l-none",
-        )}
         renderOption={(option) => {
           const project = props.projects.find((p) => p.id === option.value);
           if (!project) {
@@ -465,14 +464,15 @@ function ProjectFilter(props: {
           return (
             <div className="flex items-center gap-2">
               <ProjectAvatar
-                src={project.image || ""}
                 className="size-6 shrink-0"
                 client={props.client}
+                src={project.image || ""}
               />
               <span>{project.name}</span>
             </div>
           );
         }}
+        value={props.projectId}
       />
     </div>
   );
@@ -480,10 +480,10 @@ function ProjectFilter(props: {
 
 // for values >= 0.01, show 2 decimal places
 const normalValueUSDFormatter = new Intl.NumberFormat("en-US", {
-  style: "currency",
   currency: "USD",
-  notation: "standard",
   maximumFractionDigits: 2,
+  notation: "standard",
+  style: "currency",
 });
 
 function formatTransactionFee(usdValue: number) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/page.tsx
index 7e9e00fbdc6..99bcdb3d59a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/page.tsx
@@ -1,3 +1,6 @@
+import { format, parseISO } from "date-fns";
+import { InfoIcon } from "lucide-react";
+import { redirect } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getBilledUsage } from "@/api/usage/billing-preview";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
@@ -9,13 +12,10 @@ import {
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
-import { format, parseISO } from "date-fns";
-import { InfoIcon } from "lucide-react";
-import { redirect } from "next/navigation";
 import { getValidAccount } from "../../../../../account/settings/getAccount";
 import {
-  UsageCategoryDetails,
   formatPrice,
+  UsageCategoryDetails,
 } from "../../_components/usage-category-details";
 
 export default async function Page(props: {
@@ -127,8 +127,8 @@ export default async function Page(props: {
       <div className="space-y-6">
         {sortedCategories.map((category, index) => (
           <UsageCategoryDetails
-            key={`${category.category}_${index}`}
             category={category}
+            key={`${category.category}_${index}`}
           />
         ))}
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/count-graph.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/count-graph.tsx
index e720cfb4c8f..ff9c399fd89 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/count-graph.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/count-graph.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
 import { format } from "date-fns";
+import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
 
 export function CountGraph(props: {
   peakPercentage: number;
@@ -19,47 +19,47 @@ export function CountGraph(props: {
   return (
     <ThirdwebAreaChart
       chartClassName="aspect-[1.5] lg:aspect-[4]"
-      header={{
-        title: "Requests Over Time",
-        description: "Requests over the last 24 hours.",
-      }}
       config={
         hasAnyRateLimited
           ? {
               includedCount: {
-                label: "Successful Requests",
                 color: "hsl(var(--chart-1))",
+                label: "Successful Requests",
               },
               rateLimitedCount: {
-                label: "Rate Limited Requests",
                 color: "hsl(var(--chart-4))",
+                label: "Rate Limited Requests",
               },
             }
           : {
               includedCount: {
-                label: "Successful Requests",
                 color: "hsl(var(--chart-1))",
+                label: "Successful Requests",
               },
             }
       }
-      showLegend={hasAnyRateLimited}
-      yAxis
-      xAxis={{
-        sameDay: true,
-      }}
-      hideLabel={false}
-      toolTipLabelFormatter={(label) => {
-        return format(label, "MMM dd, HH:mm");
-      }}
       // @ts-expect-error - sending MORE data than expected is ok
       data={props.data
         .sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime())
         .map((v) => ({
-          time: v.date,
           includedCount: Number(v.includedCount) + Number(v.overageCount),
           rateLimitedCount: Number(v.rateLimitedCount),
+          time: v.date,
         }))}
+      header={{
+        description: "Requests over the last 24 hours.",
+        title: "Requests Over Time",
+      }}
+      hideLabel={false}
       isPending={false}
+      showLegend={hasAnyRateLimited}
+      toolTipLabelFormatter={(label) => {
+        return format(label, "MMM dd, HH:mm");
+      }}
+      xAxis={{
+        sameDay: true,
+      }}
+      yAxis
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/rate-graph.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/rate-graph.tsx
index 6a2fb0be2c3..57a0a38a7cd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/rate-graph.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/rate-graph.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
 import { format } from "date-fns";
+import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
 
 export function RateGraph(props: {
   peakPercentage: number;
@@ -11,33 +11,29 @@ export function RateGraph(props: {
   return (
     <ThirdwebAreaChart
       chartClassName="aspect-[1.5] lg:aspect-[4]"
-      header={{
-        title: "Request Rate Over Time",
-        description: "Request rate over the last 24 hours.",
-      }}
       config={
         props.peakPercentage > 80
           ? {
               averageRate: {
-                label: "Average RPS",
                 color: "hsl(var(--chart-1))",
-              },
-              peakRPS: {
-                label: "Peak RPS",
-                color: "hsl(var(--chart-2))",
+                label: "Average RPS",
               },
               maxLine: {
                 label: "Plan Rate Limit",
               },
+              peakRPS: {
+                color: "hsl(var(--chart-2))",
+                label: "Peak RPS",
+              },
             }
           : {
               averageRate: {
-                label: "Average RPS",
                 color: "hsl(var(--chart-1))",
+                label: "Average RPS",
               },
               peakRPS: {
-                label: "Peak RPS",
                 color: "hsl(var(--chart-2))",
+                label: "Peak RPS",
               },
             }
       }
@@ -45,21 +41,25 @@ export function RateGraph(props: {
       data={props.data
         .sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime())
         .map((v) => ({
-          time: v.date,
           averageRate: Number(Number(v.averageRate).toFixed(2)),
-          peakRPS: Number(v.peakRPS),
           maxLine: props.currentRateLimit,
+          peakRPS: Number(v.peakRPS),
+          time: v.date,
         }))}
-      yAxis
-      xAxis={{
-        sameDay: true,
+      header={{
+        description: "Request rate over the last 24 hours.",
+        title: "Request Rate Over Time",
       }}
-      showLegend
       hideLabel={false}
+      isPending={false}
+      showLegend
       toolTipLabelFormatter={(label) => {
         return format(label, "MMM dd, HH:mm");
       }}
-      isPending={false}
+      xAxis={{
+        sameDay: true,
+      }}
+      yAxis
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/page.tsx
index ab0d7032fa8..81bf5ef42ac 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/page.tsx
@@ -1,7 +1,3 @@
-import { getTeamBySlug } from "@/api/team";
-import { getLast24HoursRPCUsage } from "@/api/usage/rpc";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { format, parseISO } from "date-fns";
 import {
   AlertTriangleIcon,
@@ -10,6 +6,10 @@ import {
   XCircleIcon,
 } from "lucide-react";
 import { redirect } from "next/navigation";
+import { getTeamBySlug } from "@/api/team";
+import { getLast24HoursRPCUsage } from "@/api/usage/rpc";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
 import { TeamPlanBadge } from "../../../../../../components/TeamPlanBadge";
 import { loginRedirect } from "../../../../../../login/loginRedirect";
@@ -37,8 +37,8 @@ export default async function RPCUsage(props: {
   const currentRateLimit = team.capabilities.rpc.rateLimit;
 
   const apiData = await getLast24HoursRPCUsage({
-    teamId: team.id,
     authToken,
+    teamId: team.id,
   });
 
   if (!apiData.ok) {
@@ -202,7 +202,7 @@ export default async function RPCUsage(props: {
       )}
 
       {peakPercentage > 80 && peakPercentage <= 100 && (
-        <Alert variant="warning" className="border-yellow-500 text-yellow-700">
+        <Alert className="border-yellow-500 text-yellow-700" variant="warning">
           <AlertTriangleIcon className="h-4 w-4" />
           <AlertTitle>Approaching Rate Limit</AlertTitle>
           <AlertDescription>
@@ -213,15 +213,15 @@ export default async function RPCUsage(props: {
       )}
 
       <RateGraph
-        peakPercentage={peakPercentage}
         currentRateLimit={currentRateLimit}
         data={averageRate}
+        peakPercentage={peakPercentage}
       />
 
       <CountGraph
-        peakPercentage={peakPercentage}
         currentRateLimit={currentRateLimit}
         data={averageRate}
+        peakPercentage={peakPercentage}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/components/GuideSection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/components/GuideSection.tsx
index b4f3b6620e2..3c2971064b6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/components/GuideSection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/components/GuideSection.tsx
@@ -25,8 +25,8 @@ const videos = [
 export function GuidesSection() {
   return (
     <div className="grid grid-cols-1 gap-6 md:grid-cols-2">
-      <LinkSectionCard title="Guides" links={links} />
-      <LinkSectionCard title="Videos" links={videos} />
+      <LinkSectionCard links={links} title="Guides" />
+      <LinkSectionCard links={videos} title="Videos" />
     </div>
   );
 }
@@ -45,10 +45,10 @@ function LinkSectionCard(props: {
           return (
             <li key={link.url}>
               <Link
+                className="inline-block text-muted-foreground hover:text-foreground"
                 href={link.url}
-                target="_blank"
                 rel="noopener noreferrer"
-                className="inline-block text-muted-foreground hover:text-foreground"
+                target="_blank"
               >
                 {link.title}
               </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/components/SDKSection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/components/SDKSection.tsx
index 68a86b0e93b..d88511deefb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/components/SDKSection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/components/SDKSection.tsx
@@ -1,10 +1,10 @@
 "use client";
 
+import { useState } from "react";
 import {
   type CodeEnvironment,
   CodeSegment,
 } from "@/components/blocks/code-segment.client";
-import { useState } from "react";
 
 export function SDKSection() {
   const [codeEnvironment, setCodeEnvironment] =
@@ -17,15 +17,38 @@ export function SDKSection() {
       </h2>
 
       <CodeSegment
-        snippet={storageSnippets}
         environment={codeEnvironment}
         setEnvironment={setCodeEnvironment}
+        snippet={storageSnippets}
       />
     </div>
   );
 }
 
 const storageSnippets = {
+  javascript: `// Check out the latest docs here: https://portal.thirdweb.com/typescript/v5/storage
+
+import { upload } from "thirdweb/storage";
+
+// Here we get the IPFS URI of where our metadata has been uploaded
+const uri = await upload({
+  client,
+  files: [
+    new File(["hello world"], "hello.txt"),
+  ],
+});
+
+// This will log a URL like ipfs://QmWgbcjKWCXhaLzMz4gNBxQpAHktQK6MkLvBkKXbsoWEEy/0
+console.info(uri);
+
+// Here we a URL with a gateway that we can look at in the browser
+const url = await download({
+  client,
+  uri,
+}).url;
+
+// This will log a URL like https://ipfs.thirdwebstorage.com/ipfs/QmWgbcjKWCXhaLzMz4gNBxQpAHktQK6MkLvBkKXbsoWEEy/0
+console.info(url);`,
   react: `// Check out the latest docs here: https://portal.thirdweb.com/typescript/v5/storage
 
 import { ThirdwebProvider } from "thirdweb/react";
@@ -61,29 +84,6 @@ function ShowFiles() {
     <MediaRenderer src="ipfs://QmamvVM5kvsYjQJYs7x8LXKYGFkwtGvuRvqZsuzvpHmQq9/0" />
   );
 }`,
-  javascript: `// Check out the latest docs here: https://portal.thirdweb.com/typescript/v5/storage
-
-import { upload } from "thirdweb/storage";
-
-// Here we get the IPFS URI of where our metadata has been uploaded
-const uri = await upload({
-  client,
-  files: [
-    new File(["hello world"], "hello.txt"),
-  ],
-});
-
-// This will log a URL like ipfs://QmWgbcjKWCXhaLzMz4gNBxQpAHktQK6MkLvBkKXbsoWEEy/0
-console.info(uri);
-
-// Here we a URL with a gateway that we can look at in the browser
-const url = await download({
-  client,
-  uri,
-}).url;
-
-// This will log a URL like https://ipfs.thirdwebstorage.com/ipfs/QmWgbcjKWCXhaLzMz4gNBxQpAHktQK6MkLvBkKXbsoWEEy/0
-console.info(url);`,
 
   unity: `using Thirdweb;
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/page.tsx
index d038439a56a..cd21f7c3ae6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/page.tsx
@@ -1,5 +1,5 @@
-import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 import Link from "next/link";
+import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../login/loginRedirect";
 import { GuidesSection } from "./components/GuideSection";
@@ -41,8 +41,8 @@ function GatewaySection() {
       </p>
 
       <PlainTextCodeBlock
-        code="https://<your-client-id>.ipfscdn.io/ipfs/"
         className="my-2"
+        code="https://<your-client-id>.ipfscdn.io/ipfs/"
       />
 
       <p className="text-muted-foreground">
@@ -66,18 +66,18 @@ function CLISection() {
       </p>
 
       <PlainTextCodeBlock
-        code="npx thirdweb upload ./path/to/file-or-folder/"
         className="my-2"
+        code="npx thirdweb upload ./path/to/file-or-folder/"
       />
 
       <p className="text-muted-foreground">
         If this is the first time that you are running this command, you may
         have to first login using your secret key.{" "}
         <Link
+          className="text-foreground hover:underline"
           href="https://portal.thirdweb.com/cli/upload"
-          target="_blank"
           rel="noopener noreferrer"
-          className="text-foreground hover:underline"
+          target="_blank"
         >
           Learn more about thirdweb CLI
         </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/your-files.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/your-files.tsx
index 936872b3efb..05b5650deeb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/your-files.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/storage/your-files.tsx
@@ -1,9 +1,15 @@
 "use client";
 
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { format, formatDistance } from "date-fns";
+import { PinOffIcon } from "lucide-react";
+import { useState } from "react";
+import { useActiveAccount } from "thirdweb/react";
+import { toSize } from "utils/number";
 import { PaginationButtons } from "@/components/pagination-buttons";
+import { Button } from "@/components/ui/button";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
 import {
   Table,
   TableBody,
@@ -15,12 +21,6 @@ import {
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { NEXT_PUBLIC_DASHBOARD_UPLOAD_SERVER } from "@/constants/public-envs";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { format, formatDistance } from "date-fns";
-import { PinOffIcon } from "lucide-react";
-import { useState } from "react";
-import { useActiveAccount } from "thirdweb/react";
-import { toSize } from "utils/number";
 
 interface PinnedFilesResponse {
   result: PinnedFilesResult;
@@ -55,14 +55,7 @@ function usePinnedFilesQuery({
   const offset = page * pageSize;
 
   return useQuery({
-    queryKey: [
-      PINNED_FILES_QUERY_KEY_ROOT,
-      {
-        userAddress: address,
-        __page_size__: pageSize,
-        __offset__: offset,
-      },
-    ],
+    enabled: !!address,
     queryFn: async () => {
       const res = await fetch(
         `${NEXT_PUBLIC_DASHBOARD_UPLOAD_SERVER}/ipfs/pinned?limit=${pageSize}${
@@ -76,13 +69,18 @@ function usePinnedFilesQuery({
       );
       return (await res.json()) as PinnedFilesResponse;
     },
-    enabled: !!address,
+    queryKey: [
+      PINNED_FILES_QUERY_KEY_ROOT,
+      {
+        __offset__: offset,
+        __page_size__: pageSize,
+        userAddress: address,
+      },
+    ],
   });
 }
 
-function useUnpinFileMutation(params: {
-  authToken: string;
-}) {
+function useUnpinFileMutation(params: { authToken: string }) {
   const { authToken } = params;
   const queryClient = useQueryClient();
   return useMutation({
@@ -90,10 +88,10 @@ function useUnpinFileMutation(params: {
       const res = await fetch(
         `${NEXT_PUBLIC_DASHBOARD_UPLOAD_SERVER}/ipfs/pinned/${cid}`,
         {
-          method: "DELETE",
           headers: {
             Authorization: `Bearer ${authToken}`,
           },
+          method: "DELETE",
         },
       );
       return res.json();
@@ -117,9 +115,9 @@ const UnpinButton: React.FC<{ cid: string; authToken: string }> = ({
   return (
     <ToolTipLabel label="Unpin File">
       <Button
-        variant="outline"
         onClick={() => unpinMutation.mutateAsync({ cid })}
         size="icon"
+        variant="outline"
       >
         {unpinMutation.isPending ? (
           <Spinner className="size-4" />
@@ -131,14 +129,12 @@ const UnpinButton: React.FC<{ cid: string; authToken: string }> = ({
   );
 };
 
-export const YourFilesSection = (props: {
-  authToken: string;
-}) => {
+export const YourFilesSection = (props: { authToken: string }) => {
   const [page, setPage] = useState(1);
   const pinnedFilesQuery = usePinnedFilesQuery({
+    authToken: props.authToken,
     page: page - 1,
     pageSize: pageSize,
-    authToken: props.authToken,
   });
 
   const showPagination = pinnedFilesQuery.data
@@ -176,10 +172,10 @@ export const YourFilesSection = (props: {
               <TableRow key={pinnedFile.ipfsHash + pinnedFile.pinnedAt}>
                 <TableCell>
                   <CopyTextButton
-                    textToCopy={pinnedFile.ipfsHash}
-                    textToShow={pinnedFile.ipfsHash}
                     className="-translate-x-2 max-w-[200px] truncate font-mono md:max-w-[350px]"
                     copyIconPosition="left"
+                    textToCopy={pinnedFile.ipfsHash}
+                    textToShow={pinnedFile.ipfsHash}
                     tooltip="Copy IPFS hash (CID)"
                     variant="ghost"
                   />
@@ -201,8 +197,8 @@ export const YourFilesSection = (props: {
                 </TableCell>
                 <TableCell>
                   <UnpinButton
-                    cid={pinnedFile.ipfsHash}
                     authToken={props.authToken}
+                    cid={pinnedFile.ipfsHash}
                   />
                 </TableCell>
               </TableRow>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/cards.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/cards.tsx
index e9fe1a4649d..9eb126cb5bb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/cards.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/cards.tsx
@@ -1,16 +1,16 @@
 "use client";
 
+import { ImportModal } from "components/contract-components/import-contract/modal";
+import { ArrowDownToLineIcon, CoinsIcon, ImagesIcon } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import {
   reportAssetCreationStarted,
   reportAssetImportStarted,
   reportAssetImportSuccessful,
 } from "@/analytics/report";
 import { cn } from "@/lib/utils";
-import { ImportModal } from "components/contract-components/import-contract/modal";
-import { ArrowDownToLineIcon, CoinsIcon, ImagesIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 
 export function Cards(props: {
   teamSlug: string;
@@ -29,16 +29,15 @@ export function Cards(props: {
         onClose={() => {
           setImportModalOpen(false);
         }}
-        teamId={props.teamId}
-        projectId={props.projectId}
-        type="asset"
         onSuccess={() => {
           reportAssetImportSuccessful();
         }}
+        projectId={props.projectId}
+        teamId={props.teamId}
+        type="asset"
       />
 
       <CardLink
-        title="Create Coin"
         description="Launch your own ERC-20 coin"
         href={`/team/${props.teamSlug}/${props.projectSlug}/assets/create/token`}
         icon={CoinsIcon}
@@ -47,10 +46,10 @@ export function Cards(props: {
             assetType: "coin",
           });
         }}
+        title="Create Coin"
       />
 
       <CardLink
-        title="Create NFT Collection"
         description="Launch your own NFT collection"
         href={`/team/${props.teamSlug}/${props.projectSlug}/assets/create/nft`}
         icon={ImagesIcon}
@@ -59,10 +58,10 @@ export function Cards(props: {
             assetType: "nft",
           });
         }}
+        title="Create NFT Collection"
       />
 
       <CardLink
-        title="Import Existing Asset"
         description="Import tokens or NFTs you own to the project"
         href={undefined}
         icon={ArrowDownToLineIcon}
@@ -70,6 +69,7 @@ export function Cards(props: {
           reportAssetImportStarted();
           setImportModalOpen(true);
         }}
+        title="Import Existing Asset"
       />
     </div>
   );
@@ -86,19 +86,20 @@ function CardLink(props: {
   const isClickable = !!onClick || !!props.href;
 
   return (
+    // biome-ignore lint/a11y/noStaticElementInteractions: FIXME
     <div
       className={cn(
         "relative flex flex-col rounded-lg border bg-card p-4",
         isClickable && "cursor-pointer hover:border-active-border ",
       )}
       onClick={onClick}
-      role={onClick ? "button" : undefined}
-      tabIndex={onClick ? 0 : undefined}
       onKeyDown={(e) => {
         if (e.key === "Enter" || e.key === " ") {
           onClick?.();
         }
       }}
+      role={onClick ? "button" : undefined}
+      tabIndex={onClick ? 0 : undefined}
     >
       <div className="mb-4 flex">
         <div className="flex items-center justify-center rounded-full border p-2.5">
@@ -108,7 +109,7 @@ function CardLink(props: {
 
       <h3 className="mb-0.5 font-semibold text-lg tracking-tight">
         {props.href ? (
-          <Link href={props.href} className="before:absolute before:inset-0">
+          <Link className="before:absolute before:inset-0" href={props.href}>
             {props.title}
           </Link>
         ) : (
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/PageHeader.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/PageHeader.tsx
index 4bd5121591f..8a360dd866b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/PageHeader.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/PageHeader.tsx
@@ -1,3 +1,4 @@
+import Link from "next/link";
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -7,7 +8,6 @@ import {
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
 import { cn } from "@/lib/utils";
-import Link from "next/link";
 
 export function CreateAssetPageHeader(props: {
   teamSlug: string;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/SocialUrls.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/SocialUrls.tsx
index 0b3fcab5579..c709b30bf4d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/SocialUrls.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/SocialUrls.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { PlusIcon, Trash2Icon } from "lucide-react";
+import { type UseFormReturn, useFieldArray } from "react-hook-form";
 import { Button } from "@/components/ui/button";
 import {
   FormControl,
@@ -8,8 +10,6 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { PlusIcon, Trash2Icon } from "lucide-react";
-import { type UseFormReturn, useFieldArray } from "react-hook-form";
 
 type WithSocialUrls = {
   socialUrls: {
@@ -25,8 +25,8 @@ export function SocialUrlsFieldset<T extends WithSocialUrls>(props: {
   const form = props.form as unknown as UseFormReturn<WithSocialUrls>;
 
   const { fields, append, remove } = useFieldArray({
-    name: "socialUrls",
     control: form.control,
+    name: "socialUrls",
   });
 
   return (
@@ -37,8 +37,8 @@ export function SocialUrlsFieldset<T extends WithSocialUrls>(props: {
         <div className="mb-5 space-y-4">
           {fields.map((field, index) => (
             <div
-              key={field.id}
               className="flex gap-3 max-sm:mb-6 max-sm:border-b max-sm:border-dashed max-sm:pb-6"
+              key={field.id}
             >
               <div className="flex flex-1 flex-col gap-3 lg:flex-row">
                 <FormField
@@ -49,8 +49,8 @@ export function SocialUrlsFieldset<T extends WithSocialUrls>(props: {
                       <FormControl>
                         <Input
                           {...field}
-                          placeholder="Platform"
                           aria-label="Platform"
+                          placeholder="Platform"
                         />
                       </FormControl>
                       <FormMessage />
@@ -66,8 +66,8 @@ export function SocialUrlsFieldset<T extends WithSocialUrls>(props: {
                       <FormControl>
                         <Input
                           {...field}
-                          placeholder="https://..."
                           aria-label="Platform URL"
+                          placeholder="https://..."
                         />
                       </FormControl>
                       <FormMessage />
@@ -77,11 +77,11 @@ export function SocialUrlsFieldset<T extends WithSocialUrls>(props: {
               </div>
 
               <Button
+                className="rounded-full"
+                onClick={() => remove(index)}
+                size="icon"
                 type="button"
                 variant="outline"
-                size="icon"
-                onClick={() => remove(index)}
-                className="rounded-full"
               >
                 <Trash2Icon className="h-4 w-4" />
                 <span className="sr-only">Remove</span>
@@ -92,11 +92,11 @@ export function SocialUrlsFieldset<T extends WithSocialUrls>(props: {
       )}
 
       <Button
-        type="button"
+        className="h-auto gap-1.5 rounded-full px-3 py-1.5 text-xs"
+        onClick={() => append({ platform: "", url: "" })}
         size="sm"
+        type="button"
         variant="outline"
-        onClick={() => append({ platform: "", url: "" })}
-        className="h-auto gap-1.5 rounded-full px-3 py-1.5 text-xs"
       >
         <PlusIcon className="size-3.5" />
         Add Social URL
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/download-file-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/download-file-button.tsx
index 5c7b765e0cd..9ba01a49a86 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/download-file-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/download-file-button.tsx
@@ -1,5 +1,5 @@
-import { Button } from "@/components/ui/button";
 import { ArrowDownToLineIcon } from "lucide-react";
+import { Button } from "@/components/ui/button";
 
 export function handleDownload(params: {
   fileContent: string;
@@ -25,15 +25,15 @@ export function DownloadFileButton(props: {
 }) {
   return (
     <Button
-      size="sm"
       className="gap-2"
       onClick={() => {
         handleDownload({
           fileContent: props.fileContent,
-          fileNameWithExtension: props.fileNameWithExtension,
           fileFormat: props.fileFormat,
+          fileNameWithExtension: props.fileNameWithExtension,
         });
       }}
+      size="sm"
     >
       <ArrowDownToLineIcon className="size-4" />
       {props.label}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/file-preview.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/file-preview.tsx
index 2e001efef17..6cc05691eaa 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/file-preview.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/file-preview.tsx
@@ -1,10 +1,10 @@
-import { Img } from "@/components/blocks/Img";
-import { fileToBlobUrl } from "@/lib/file-to-url";
-import { cn } from "@/lib/utils";
 import { ImageOffIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { MediaRenderer } from "thirdweb/react";
+import { Img } from "@/components/blocks/Img";
+import { fileToBlobUrl } from "@/lib/file-to-url";
+import { cn } from "@/lib/utils";
 
 export function FilePreview(props: {
   srcOrFile: File | string | undefined;
@@ -46,19 +46,19 @@ export function FilePreview(props: {
   if (isImage) {
     return (
       <Img
-        src={objectUrl}
         className={props.className}
-        fallback={props.fallback}
         containerClassName={props.imgContainerClassName}
+        fallback={props.fallback}
+        src={objectUrl}
       />
     );
   }
 
   return (
     <MediaRenderer
-      src={objectUrl}
-      client={props.client}
       className={cn(props.className, "[&>div]:!bg-muted")}
+      client={props.client}
+      src={objectUrl}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/step-card.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/step-card.tsx
index 89f8ef833ca..fa14752c80f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/step-card.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/step-card.tsx
@@ -1,5 +1,5 @@
-import { Button } from "@/components/ui/button";
 import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react";
+import { Button } from "@/components/ui/button";
 
 export function StepCard(props: {
   title: string;
@@ -38,11 +38,11 @@ export function StepCard(props: {
         <div className="flex justify-end gap-3 border-t p-6">
           {props.prevButton && (
             <Button
-              variant="outline"
               className="gap-2"
               onClick={() => {
                 props.prevButton?.onClick();
               }}
+              variant="outline"
             >
               <ArrowLeftIcon className="size-4" />
               Back
@@ -51,15 +51,15 @@ export function StepCard(props: {
 
           {nextButton && nextButton.type !== "custom" && (
             <Button
-              variant="default"
               className="gap-2"
-              type="submit"
               disabled={nextButton.disabled}
               onClick={() => {
                 if (nextButton.type === "click") {
                   nextButton.onClick();
                 }
               }}
+              type="submit"
+              variant="default"
             >
               Next
               <ArrowRightIcon className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/form.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/form.ts
index 03cac30d6f4..2414f069442 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/form.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/form.ts
@@ -4,12 +4,12 @@ import { socialUrlsSchema } from "../../_common/schema";
 import type { NFTMetadataWithPrice } from "../upload-nfts/batch-upload/process-files";
 
 export const nftCollectionInfoFormSchema = z.object({
-  name: z.string().min(1, "Name is required"),
-  symbol: z.string(),
   chain: z.string().min(1, "Chain is required"),
   description: z.string().optional(),
   image: z.instanceof(File).optional(),
+  name: z.string().min(1, "Name is required"),
   socialUrls: socialUrlsSchema,
+  symbol: z.string(),
 });
 
 const addressSchema = z.string().refine((value) => {
@@ -21,9 +21,9 @@ const addressSchema = z.string().refine((value) => {
 });
 
 export const nftSalesSettingsFormSchema = z.object({
-  royaltyRecipient: addressSchema,
   primarySaleRecipient: addressSchema,
   royaltyBps: z.coerce.number().min(0).max(10000),
+  royaltyRecipient: addressSchema,
 });
 
 export type NFTCollectionInfoFormValues = z.infer<
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/pages.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/pages.ts
index f86b3dec638..4fdfde14399 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/pages.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/pages.ts
@@ -1,6 +1,6 @@
 export const nftCreationPages = {
   "collection-info": "collection-info",
-  "upload-assets": "upload-assets",
-  "sales-settings": "sales-settings",
   "launch-nft": "launch-nft",
+  "sales-settings": "sales-settings",
+  "upload-assets": "upload-assets",
 } as const;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/collection-info/nft-collection-info-fieldset.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/collection-info/nft-collection-info-fieldset.tsx
index 86c5545399d..972abd256fd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/collection-info/nft-collection-info-fieldset.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/collection-info/nft-collection-info-fieldset.tsx
@@ -1,14 +1,15 @@
 "use client";
 
+import { FileInput } from "components/shared/FileInput";
+import { useId } from "react";
+import type { UseFormReturn } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
+import { ClientOnly } from "@/components/blocks/client-only";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { ClientOnly } from "@/components/blocks/client-only";
 import { Form } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { FileInput } from "components/shared/FileInput";
-import type { UseFormReturn } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import { SocialUrlsFieldset } from "../../_common/SocialUrls";
 import { StepCard } from "../../_common/step-card";
 import type { NFTCollectionInfoFormValues } from "../_common/form";
@@ -20,33 +21,37 @@ export function NFTCollectionInfoFieldset(props: {
   onChainUpdated: () => void;
 }) {
   const { form } = props;
+  const nameId = useId();
+  const symbolId = useId();
+  const descriptionId = useId();
+
   return (
     <Form {...form}>
       <form onSubmit={form.handleSubmit(props.onNext)}>
         <StepCard
-          title="Collection Info"
-          prevButton={undefined}
           nextButton={{
             type: "submit",
           }}
+          prevButton={undefined}
+          title="Collection Info"
         >
           <div className="flex flex-col gap-6 px-4 py-6 md:grid md:grid-cols-[280px_1fr] md:px-6">
             {/* left */}
             <FormFieldSetup
               errorMessage={form.formState.errors.image?.message as string}
-              label="Image"
               isRequired={false}
+              label="Image"
             >
               <FileInput
                 accept={{ "image/*": [] }}
+                className="rounded-lg border-border bg-background transition-all duration-200 hover:border-active-border hover:bg-background"
                 client={props.client}
-                value={form.watch("image")}
                 setValue={(file) =>
                   form.setValue("image", file, {
                     shouldTouch: true,
                   })
                 }
-                className="rounded-lg border-border bg-background transition-all duration-200 hover:border-active-border hover:bg-background"
+                value={form.watch("image")}
               />
             </FormFieldSetup>
 
@@ -56,13 +61,13 @@ export function NFTCollectionInfoFieldset(props: {
               <div className="flex flex-col gap-6 lg:flex-row lg:gap-4">
                 <FormFieldSetup
                   className="grow"
-                  label="Name"
-                  isRequired
-                  htmlFor="name"
                   errorMessage={form.formState.errors.name?.message}
+                  htmlFor={nameId}
+                  isRequired
+                  label="Name"
                 >
                   <Input
-                    id="name"
+                    id={nameId}
                     placeholder="My NFT Collection"
                     {...form.register("name")}
                   />
@@ -70,13 +75,13 @@ export function NFTCollectionInfoFieldset(props: {
 
                 <FormFieldSetup
                   className="lg:max-w-[200px]"
-                  label="Symbol"
-                  isRequired={false}
-                  htmlFor="symbol"
                   errorMessage={form.formState.errors.symbol?.message}
+                  htmlFor={symbolId}
+                  isRequired={false}
+                  label="Symbol"
                 >
                   <Input
-                    id="symbol"
+                    id={symbolId}
                     placeholder="XYZ"
                     {...form.register("symbol")}
                   />
@@ -85,36 +90,35 @@ export function NFTCollectionInfoFieldset(props: {
 
               {/* chain */}
               <FormFieldSetup
-                label="Chain"
-                isRequired
-                htmlFor="chain"
                 errorMessage={form.formState.errors.chain?.message}
+                isRequired
+                label="Chain"
               >
                 <ClientOnly ssr={null}>
                   <SingleNetworkSelector
+                    chainId={Number(form.watch("chain"))}
                     className="bg-background"
                     client={props.client}
-                    chainId={Number(form.watch("chain"))}
+                    disableChainId
                     onChange={(chain) => {
                       form.setValue("chain", chain.toString());
                       props.onChainUpdated();
                     }}
-                    disableChainId
                   />
                 </ClientOnly>
               </FormFieldSetup>
 
               <FormFieldSetup
-                label="Description"
-                isRequired={false}
-                htmlFor="description"
                 className="flex grow flex-col"
                 errorMessage={form.formState.errors.description?.message}
+                htmlFor={descriptionId}
+                isRequired={false}
+                label="Description"
               >
                 <Textarea
-                  id="description"
-                  placeholder="Describe your NFT collection"
                   className="grow"
+                  id={descriptionId}
+                  placeholder="Describe your NFT collection"
                   {...form.register("description")}
                 />
               </FormFieldSetup>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page-ui.tsx
index 5a7364e832d..a4cf72010b9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page-ui.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page-ui.tsx
@@ -1,15 +1,15 @@
 "use client";
 
-import { reportAssetCreationStepConfigured } from "@/analytics/report";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
 import {
+  getAddress,
   NATIVE_TOKEN_ADDRESS,
   type ThirdwebClient,
-  getAddress,
 } from "thirdweb";
 import { useActiveAccount } from "thirdweb/react";
+import { reportAssetCreationStepConfigured } from "@/analytics/report";
 import {
   type CreateNFTCollectionFunctions,
   type NFTCollectionInfoFormValues,
@@ -21,7 +21,6 @@ import { nftCreationPages } from "./_common/pages";
 import { NFTCollectionInfoFieldset } from "./collection-info/nft-collection-info-fieldset";
 import { LaunchNFT } from "./launch/launch-nft";
 import { SalesSettings } from "./sales/sales-settings";
-import type {} from "./upload-nfts/batch-upload/process-files";
 import { type NFTData, UploadNFTsFieldset } from "./upload-nfts/upload-nfts";
 
 export function CreateNFTPageUI(props: {
@@ -38,17 +37,17 @@ export function CreateNFTPageUI(props: {
   const activeAccount = useActiveAccount();
 
   const [nftData, setNFTData] = useState<NFTData>({
-    type: "single",
     nft: null,
+    type: "single",
   });
 
   const nftSalesSettingsForm = useForm<NFTSalesSettingsFormValues>({
-    resolver: zodResolver(nftSalesSettingsFormSchema),
     defaultValues: {
-      royaltyRecipient: activeAccount?.address || "",
       primarySaleRecipient: activeAccount?.address || "",
       royaltyBps: 0,
+      royaltyRecipient: activeAccount?.address || "",
     },
+    resolver: zodResolver(nftSalesSettingsFormSchema),
   });
 
   const nftCollectionInfoForm = useNFTCollectionInfoForm();
@@ -57,35 +56,35 @@ export function CreateNFTPageUI(props: {
     <div>
       {step === nftCreationPages["collection-info"] && (
         <NFTCollectionInfoFieldset
+          client={props.client}
+          form={nftCollectionInfoForm}
           onChainUpdated={() => {
             // reset price currency to native token when chain is updated
             if (nftData.type === "single" && nftData.nft) {
               setNFTData({
-                type: "single",
                 nft: {
                   ...nftData.nft,
                   price_currency: getAddress(NATIVE_TOKEN_ADDRESS),
                 },
+                type: "single",
               });
             }
 
             if (nftData.type === "multiple" && nftData.nfts?.type === "data") {
               setNFTData({
-                type: "multiple",
                 nfts: {
-                  type: "data",
                   data: nftData.nfts.data.map((x) => {
                     return {
                       ...x,
                       price_currency: getAddress(NATIVE_TOKEN_ADDRESS),
                     };
                   }),
+                  type: "data",
                 },
+                type: "multiple",
               });
             }
           }}
-          client={props.client}
-          form={nftCollectionInfoForm}
           onNext={() => {
             reportAssetCreationStepConfigured({
               assetType: "nft",
@@ -98,8 +97,9 @@ export function CreateNFTPageUI(props: {
 
       {step === nftCreationPages["upload-assets"] && (
         <UploadNFTsFieldset
+          chainId={Number(nftCollectionInfoForm.watch("chain"))}
+          client={props.client}
           nftData={nftData}
-          setNFTData={setNFTData}
           onNext={() => {
             reportAssetCreationStepConfigured({
               assetType: "nft",
@@ -110,15 +110,14 @@ export function CreateNFTPageUI(props: {
           onPrev={() => {
             setStep(nftCreationPages["collection-info"]);
           }}
-          client={props.client}
-          chainId={Number(nftCollectionInfoForm.watch("chain"))}
+          setNFTData={setNFTData}
         />
       )}
 
       {step === nftCreationPages["sales-settings"] && (
         <SalesSettings
-          form={nftSalesSettingsForm}
           client={props.client}
+          form={nftSalesSettingsForm}
           onNext={() => {
             reportAssetCreationStepConfigured({
               assetType: "nft",
@@ -134,9 +133,16 @@ export function CreateNFTPageUI(props: {
 
       {step === nftCreationPages["launch-nft"] && (
         <LaunchNFT
+          client={props.client}
+          createNFTFunctions={props.createNFTFunctions}
+          onLaunchSuccess={props.onLaunchSuccess}
+          onPrevious={() => {
+            setStep(nftCreationPages["sales-settings"]);
+          }}
+          projectSlug={props.projectSlug}
+          teamSlug={props.teamSlug}
           values={{
             collectionInfo: nftCollectionInfoForm.watch(),
-            sales: nftSalesSettingsForm.watch(),
             nfts:
               nftData.type === "multiple"
                 ? nftData.nfts?.type === "data"
@@ -145,15 +151,8 @@ export function CreateNFTPageUI(props: {
                 : nftData.nft
                   ? [nftData.nft]
                   : [],
+            sales: nftSalesSettingsForm.watch(),
           }}
-          onPrevious={() => {
-            setStep(nftCreationPages["sales-settings"]);
-          }}
-          projectSlug={props.projectSlug}
-          client={props.client}
-          onLaunchSuccess={props.onLaunchSuccess}
-          teamSlug={props.teamSlug}
-          createNFTFunctions={props.createNFTFunctions}
         />
       )}
     </div>
@@ -163,12 +162,12 @@ export function CreateNFTPageUI(props: {
 function useNFTCollectionInfoForm() {
   return useForm<NFTCollectionInfoFormValues>({
     resolver: zodResolver(nftCollectionInfoFormSchema),
+    reValidateMode: "onChange",
     values: {
-      name: "",
+      chain: "1",
       description: "",
-      symbol: "",
       image: undefined,
-      chain: "1",
+      name: "",
       socialUrls: [
         {
           platform: "Website",
@@ -179,7 +178,7 @@ function useNFTCollectionInfoForm() {
           url: "",
         },
       ],
+      symbol: "",
     },
-    reValidateMode: "onChange",
   });
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page.tsx
index c292e88416f..ce23253e178 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page.tsx
@@ -1,16 +1,11 @@
 "use client";
-import { revalidatePathAction } from "@/actions/revalidate";
-import {
-  reportAssetCreationFailed,
-  reportContractDeployed,
-} from "@/analytics/report";
 import { useRef } from "react";
 import {
-  type ThirdwebClient,
   defineChain,
   encode,
   getContract,
   sendAndConfirmTransaction,
+  type ThirdwebClient,
 } from "thirdweb";
 import { deployERC721Contract, deployERC1155Contract } from "thirdweb/deploys";
 import { multicall } from "thirdweb/extensions/common";
@@ -26,6 +21,11 @@ import {
 import { useActiveAccount } from "thirdweb/react";
 import { maxUint256 } from "thirdweb/utils";
 import { parseError } from "utils/errorParser";
+import { revalidatePathAction } from "@/actions/revalidate";
+import {
+  reportAssetCreationFailed,
+  reportContractDeployed,
+} from "@/analytics/report";
 import { useAddContractToProject } from "../../../hooks/project-contracts";
 import type { CreateNFTCollectionAllValues } from "./_common/form";
 import { CreateNFTPageUI } from "./create-nft-page-ui";
@@ -43,9 +43,7 @@ export function CreateNFTPage(props: {
   const addContractToProject = useAddContractToProject();
   const contractAddressRef = useRef<string | undefined>(undefined);
 
-  function getContractAndAccount(params: {
-    chain: string;
-  }) {
+  function getContractAndAccount(params: { chain: string }) {
     if (!activeAccount) {
       throw new Error("Wallet is not connected");
     }
@@ -93,57 +91,57 @@ export function CreateNFTPage(props: {
       if (ercType === "erc721") {
         contractAddress = await deployERC721Contract({
           account: activeAccount,
-          client: props.client,
           chain: chain,
-          type: "DropERC721",
+          client: props.client,
           params: {
-            name: collectionInfo.name,
-            symbol: collectionInfo.symbol,
             description: collectionInfo.description,
             image: collectionInfo.image,
-            social_urls: transformSocialUrls(collectionInfo.socialUrls),
-            saleRecipient: sales.primarySaleRecipient,
-            royaltyRecipient: sales.royaltyRecipient,
+            name: collectionInfo.name,
             royaltyBps: BigInt(sales.royaltyBps),
+            royaltyRecipient: sales.royaltyRecipient,
+            saleRecipient: sales.primarySaleRecipient,
+            social_urls: transformSocialUrls(collectionInfo.socialUrls),
+            symbol: collectionInfo.symbol,
           },
+          type: "DropERC721",
         });
       } else {
         contractAddress = await deployERC1155Contract({
           account: activeAccount,
-          client: props.client,
           chain: chain,
-          type: "DropERC1155",
+          client: props.client,
           params: {
-            name: collectionInfo.name,
-            symbol: collectionInfo.symbol,
             description: collectionInfo.description,
             image: collectionInfo.image,
-            social_urls: transformSocialUrls(collectionInfo.socialUrls),
-            saleRecipient: sales.primarySaleRecipient,
-            royaltyRecipient: sales.royaltyRecipient,
+            name: collectionInfo.name,
             royaltyBps: BigInt(sales.royaltyBps),
+            royaltyRecipient: sales.royaltyRecipient,
+            saleRecipient: sales.primarySaleRecipient,
+            social_urls: transformSocialUrls(collectionInfo.socialUrls),
+            symbol: collectionInfo.symbol,
           },
+          type: "DropERC1155",
         });
       }
 
       reportContractDeployed({
         address: contractAddress,
         chainId: Number(collectionInfo.chain),
-        publisher: "deployer.thirdweb.eth",
         contractName: contractType,
         deploymentType: "asset",
+        publisher: "deployer.thirdweb.eth",
       });
 
       contractAddressRef.current = contractAddress;
 
       // add contract to project in background
       addContractToProject.mutateAsync({
-        teamId: props.teamId,
-        projectId: props.projectId,
-        contractAddress: contractAddress,
         chainId: collectionInfo.chain,
-        deploymentType: "asset",
+        contractAddress: contractAddress,
         contractType: ercType === "erc721" ? "DropERC721" : "DropERC1155",
+        deploymentType: "asset",
+        projectId: props.projectId,
+        teamId: props.teamId,
       });
 
       return {
@@ -220,14 +218,14 @@ export function CreateNFTPage(props: {
       contract,
       phases: [
         {
-          startTime: new Date(),
           currencyAddress: firstNFT.price_currency,
-          maxClaimablePerWallet: maxUint256, // unlimited
-          price: firstNFT.price_amount,
+          maxClaimablePerWallet: maxUint256,
           maxClaimableSupply: maxUint256, // unlimited
           metadata: {
             name: "Public phase",
           },
+          price: firstNFT.price_amount, // unlimited
+          startTime: new Date(),
         },
       ],
     });
@@ -270,8 +268,8 @@ export function CreateNFTPage(props: {
     // fetch nfts
     const fetchedNFTs = await getNFTs1155({
       contract,
-      start: batch.startIndex,
       count: batch.count,
+      start: batch.startIndex,
     });
 
     const transactions = nfts.map((uploadedNFT, i) => {
@@ -287,19 +285,19 @@ export function CreateNFTPage(props: {
 
       return setClaimConditions1155({
         contract,
-        tokenId: fetchedNFT.id,
         phases: [
           {
-            startTime: new Date(),
             currencyAddress: uploadedNFT.price_currency,
-            maxClaimablePerWallet: maxUint256, // unlimited
-            price: uploadedNFT.price_amount,
-            maxClaimableSupply: BigInt(uploadedNFT.supply),
+            maxClaimablePerWallet: maxUint256,
+            maxClaimableSupply: BigInt(uploadedNFT.supply), // unlimited
             metadata: {
               name: "Public phase",
             },
+            price: uploadedNFT.price_amount,
+            startTime: new Date(),
           },
         ],
+        tokenId: fetchedNFT.id,
       });
     });
 
@@ -314,8 +312,8 @@ export function CreateNFTPage(props: {
 
     try {
       await sendAndConfirmTransaction({
-        transaction: tx,
         account: activeAccount,
+        transaction: tx,
       });
     } catch (error) {
       const errorMessage = parseError(error);
@@ -335,51 +333,51 @@ export function CreateNFTPage(props: {
   return (
     <CreateNFTPageUI
       {...props}
-      onLaunchSuccess={() => {
-        revalidatePathAction(
-          `/team/${props.teamSlug}/project/${props.projectSlug}/assets`,
-          "page",
-        );
-      }}
       createNFTFunctions={{
-        erc1155: {
+        erc721: {
+          deployContract: (formValues) => {
+            return handleContractDeploy({
+              ercType: "erc721",
+              values: formValues,
+            });
+          },
           lazyMintNFTs: (formValues) => {
             return handleLazyMintNFTs({
+              ercType: "erc721",
               formValues,
-              ercType: "erc1155",
             });
           },
-          deployContract: (formValues) => {
-            return handleContractDeploy({
-              values: formValues,
-              ercType: "erc1155",
+
+          setClaimConditions: async (formValues) => {
+            return handleSetClaimConditionsERC721({
+              formValues,
             });
           },
-          setClaimConditions: async (params) => {
-            return handleSetClaimConditionsERC1155(params);
-          },
         },
-        erc721: {
+        erc1155: {
           deployContract: (formValues) => {
             return handleContractDeploy({
+              ercType: "erc1155",
               values: formValues,
-              ercType: "erc721",
             });
           },
           lazyMintNFTs: (formValues) => {
             return handleLazyMintNFTs({
+              ercType: "erc1155",
               formValues,
-              ercType: "erc721",
             });
           },
-
-          setClaimConditions: async (formValues) => {
-            return handleSetClaimConditionsERC721({
-              formValues,
-            });
+          setClaimConditions: async (params) => {
+            return handleSetClaimConditionsERC1155(params);
           },
         },
       }}
+      onLaunchSuccess={() => {
+        revalidatePathAction(
+          `/team/${props.teamSlug}/project/${props.projectSlug}/assets`,
+          "page",
+        );
+      }}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/launch/launch-nft.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/launch/launch-nft.tsx
index 69e76c8dcf6..eb29022b01e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/launch/launch-nft.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/launch/launch-nft.tsx
@@ -1,8 +1,19 @@
 "use client";
 
+import { TransactionButton } from "components/buttons/TransactionButton";
+import {
+  ArrowRightIcon,
+  ArrowUpFromLineIcon,
+  ImageOffIcon,
+} from "lucide-react";
+import Link from "next/link";
+import { useMemo, useRef, useState } from "react";
+import { defineChain, type ThirdwebClient } from "thirdweb";
+import { TokenProvider, TokenSymbol, useActiveWallet } from "thirdweb/react";
+import { parseError } from "utils/errorParser";
 import { reportAssetCreationFailed } from "@/analytics/report";
-import { MultiStepStatus } from "@/components/blocks/multi-step-status/multi-step-status";
 import type { MultiStepState } from "@/components/blocks/multi-step-status/multi-step-status";
+import { MultiStepStatus } from "@/components/blocks/multi-step-status/multi-step-status";
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -14,17 +25,6 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Skeleton } from "@/components/ui/skeleton";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import {
-  ArrowRightIcon,
-  ArrowUpFromLineIcon,
-  ImageOffIcon,
-} from "lucide-react";
-import Link from "next/link";
-import { useMemo, useRef, useState } from "react";
-import { type ThirdwebClient, defineChain } from "thirdweb";
-import { TokenProvider, TokenSymbol, useActiveWallet } from "thirdweb/react";
-import { parseError } from "utils/errorParser";
 import { ChainOverview } from "../../_common/chain-overview";
 import { FilePreview } from "../../_common/file-preview";
 import { StepCard } from "../../_common/step-card";
@@ -35,8 +35,8 @@ import type {
 
 const stepIds = {
   "deploy-contract": "deploy-contract",
-  "set-claim-conditions": "set-claim-conditions",
   "mint-nfts": "mint-nfts",
+  "set-claim-conditions": "set-claim-conditions",
 } as const;
 
 type StepId = keyof typeof stepIds;
@@ -83,21 +83,21 @@ export function LaunchNFT(props: {
   async function handleSubmitClick() {
     const initialSteps: MultiStepState<StepId>[] = [
       {
-        label: "Deploy contract",
         id: stepIds["deploy-contract"],
+        label: "Deploy contract",
         status: { type: "idle" },
       },
       {
-        label: formValues.nfts.length > 1 ? "Mint NFTs" : "Mint NFT",
         id: stepIds["mint-nfts"],
+        label: formValues.nfts.length > 1 ? "Mint NFTs" : "Mint NFT",
         status: { type: "idle" },
       },
       {
+        id: stepIds["set-claim-conditions"],
         label:
           formValues.nfts.length > 1
             ? "Set claim conditions"
             : "Set claim condition",
-        id: stepIds["set-claim-conditions"],
         status: { type: "idle" },
       },
     ];
@@ -158,22 +158,22 @@ export function LaunchNFT(props: {
             }
 
             await props.createNFTFunctions.erc1155.setClaimConditions({
-              values: formValues,
               batch: {
-                startIndex: batchIndex * batchSize,
                 count: batchSize,
+                startIndex: batchIndex * batchSize,
               },
+              values: formValues,
             });
 
             batchesProcessedRef.current += 1;
           }
         } else {
           await props.createNFTFunctions.erc1155.setClaimConditions({
-            values: formValues,
             batch: {
-              startIndex: 0,
               count: formValues.nfts.length,
+              startIndex: 0,
             },
+            values: formValues,
           });
         }
       }
@@ -207,8 +207,8 @@ export function LaunchNFT(props: {
         const errorMessage = parseError(error);
 
         updateStatus(i, {
-          type: "error",
           message: errorMessage,
+          type: "error",
         });
 
         reportAssetCreationFailed({
@@ -262,27 +262,27 @@ export function LaunchNFT(props: {
 
   return (
     <StepCard
-      title="Launch NFT"
-      prevButton={{
-        onClick: props.onPrevious,
-      }}
       nextButton={{
-        type: "custom",
         custom: (
           <TransactionButton
             client={props.client}
-            variant="default"
-            txChainID={Number(formValues.collectionInfo.chain)}
             isLoggedIn={true}
             isPending={false}
-            transactionCount={undefined}
             onClick={handleSubmitClick}
+            transactionCount={undefined}
+            txChainID={Number(formValues.collectionInfo.chain)}
+            variant="default"
           >
             <ArrowUpFromLineIcon className="size-4" />
             Launch NFT
           </TransactionButton>
         ),
+        type: "custom",
       }}
+      prevButton={{
+        onClick: props.onPrevious,
+      }}
+      title="Launch NFT"
     >
       <Dialog
         open={isModalOpen}
@@ -304,7 +304,7 @@ export function LaunchNFT(props: {
               )}
             </DialogHeader>
 
-            <MultiStepStatus steps={steps} onRetry={handleRetry} />
+            <MultiStepStatus onRetry={handleRetry} steps={steps} />
           </div>
 
           <div className="mt-2 flex justify-between gap-4 border-border border-t bg-card p-6">
@@ -321,13 +321,13 @@ export function LaunchNFT(props: {
             )}
 
             <Button
-              variant="outline"
               disabled={isPending}
               onClick={() => {
                 setIsModalOpen(false);
                 // reset steps
                 setSteps([]);
               }}
+              variant="outline"
             >
               {isComplete ? "Close" : "Cancel"}
             </Button>
@@ -340,16 +340,16 @@ export function LaunchNFT(props: {
         <h2 className="mb-3 font-semibold text-base">Collection Info</h2>
 
         <div className="flex flex-col gap-6 lg:flex-row">
-          <OverviewField name="Image" className="shrink-0">
+          <OverviewField className="shrink-0" name="Image">
             <FilePreview
-              client={props.client}
-              srcOrFile={formValues.collectionInfo.image}
               className="size-24 rounded-lg border object-cover"
+              client={props.client}
               fallback={
                 <div className="flex items-center justify-center bg-muted/50">
                   <ImageOffIcon className="size-5 text-muted-foreground" />
                 </div>
               }
+              srcOrFile={formValues.collectionInfo.image}
             />
           </OverviewField>
 
@@ -369,8 +369,8 @@ export function LaunchNFT(props: {
 
               <OverviewField name="Chain">
                 <ChainOverview
-                  client={props.client}
                   chainId={formValues.collectionInfo.chain}
+                  client={props.client}
                 />
               </OverviewField>
             </div>
@@ -398,10 +398,10 @@ export function LaunchNFT(props: {
               <p className="flex items-center gap-1 text-foreground text-sm">
                 {formValues.nfts[0].price_amount}{" "}
                 <TokenProvider
-                  client={props.client}
                   address={formValues.nfts[0].price_currency}
                   // eslint-disable-next-line no-restricted-syntax
                   chain={defineChain(Number(formValues.collectionInfo.chain))}
+                  client={props.client}
                 >
                   <TokenSymbol
                     loadingComponent={<Skeleton className="size-5 w-20" />}
@@ -416,7 +416,7 @@ export function LaunchNFT(props: {
               <div className="flex flex-wrap gap-1">
                 {uniqueAttributes.map((attr) => {
                   return (
-                    <Badge variant="secondary" key={attr}>
+                    <Badge key={attr} variant="secondary">
                       {attr}
                     </Badge>
                   );
@@ -433,8 +433,8 @@ export function LaunchNFT(props: {
           <OverviewField name="Primary Sales Recipient">
             <WalletAddress
               address={formValues.sales.primarySaleRecipient}
-              client={props.client}
               className="h-auto py-1"
+              client={props.client}
               iconClassName="size-3.5"
             />
           </OverviewField>
@@ -442,9 +442,9 @@ export function LaunchNFT(props: {
           <OverviewField name="Royalties Recipient">
             <WalletAddress
               address={formValues.sales.royaltyRecipient}
+              className="h-auto py-1"
               client={props.client}
               iconClassName="size-3.5"
-              className="h-auto py-1"
             />
           </OverviewField>
 
@@ -472,8 +472,6 @@ function OverviewField(props: {
   );
 }
 
-function OverviewFieldValue(props: {
-  value: string;
-}) {
+function OverviewFieldValue(props: { value: string }) {
   return <p className="text-foreground text-sm">{props.value}</p>;
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/page.tsx
index 62f830b7f6c..ea98b963ada 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/page.tsx
@@ -1,13 +1,12 @@
-import { getProject } from "@/api/projects";
-import { getTeamBySlug } from "@/api/team";
-
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import {
   getAuthToken,
   getAuthTokenWalletAddress,
 } from "@app/api/lib/getAuthToken";
 import { loginRedirect } from "@app/login/loginRedirect";
 import { redirect } from "next/navigation";
+import { getProject } from "@/api/projects";
+import { getTeamBySlug } from "@/api/team";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { CreateAssetPageHeader } from "../_common/PageHeader";
 import { CreateNFTPage } from "./create-nft-page";
 
@@ -45,20 +44,20 @@ export default async function Page(props: {
   return (
     <div className="flex grow flex-col">
       <CreateAssetPageHeader
-        title="Create NFT Collection"
+        containerClassName="container max-w-5xl"
         description="Launch an NFT collection for your project"
-        teamSlug={params.team_slug}
         projectSlug={params.project_slug}
-        containerClassName="container max-w-5xl"
+        teamSlug={params.team_slug}
+        title="Create NFT Collection"
       />
       <div className="container max-w-5xl pt-8 pb-32">
         <CreateNFTPage
           accountAddress={accountAddress}
           client={client}
-          teamSlug={params.team_slug}
+          projectId={project.id}
           projectSlug={params.project_slug}
           teamId={team.id}
-          projectId={project.id}
+          teamSlug={params.team_slug}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/sales/sales-settings.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/sales/sales-settings.tsx
index c5505bdf544..98733109378 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/sales/sales-settings.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/sales/sales-settings.tsx
@@ -1,8 +1,8 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Form } from "@/components/ui/form";
 import { BasisPointsInput } from "components/inputs/BasisPointsInput";
 import type { UseFormReturn } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Form } from "@/components/ui/form";
 import { SolidityInput } from "../../../../../../../../../../contract-ui/components/solidity-inputs";
 import { StepCard } from "../../_common/step-card";
 import type { NFTSalesSettingsFormValues } from "../_common/form";
@@ -24,13 +24,13 @@ export function SalesSettings(props: {
         })}
       >
         <StepCard
-          title="Sales and Fees"
-          prevButton={{
-            onClick: props.onPrev,
-          }}
           nextButton={{
             type: "submit",
           }}
+          prevButton={{
+            onClick: props.onPrev,
+          }}
+          title="Sales and Fees"
         >
           <div className="px-4 py-6 md:px-6">
             <div className="mb-4 space-y-1">
@@ -42,13 +42,13 @@ export function SalesSettings(props: {
             </div>
             <FormFieldSetup
               className="grow"
+              errorMessage={errors.primarySaleRecipient?.message}
               isRequired
               label="Primary Sales Recipient"
-              errorMessage={errors.primarySaleRecipient?.message}
             >
               <SolidityInput
-                solidityType="address"
                 className="bg-background"
+                solidityType="address"
                 {...props.form.register("primarySaleRecipient")}
                 client={props.client}
               />
@@ -66,8 +66,6 @@ export function SalesSettings(props: {
             <div className="flex flex-col gap-4 md:flex-row">
               <FormFieldSetup
                 className="grow"
-                isRequired
-                label="Recipient Address"
                 errorMessage={errors.royaltyRecipient?.message}
                 helperText={
                   <>
@@ -75,26 +73,28 @@ export function SalesSettings(props: {
                     royalties earned from secondary sales of the assets.
                   </>
                 }
+                isRequired
+                label="Recipient Address"
               >
                 <SolidityInput
-                  solidityType="address"
                   className="bg-background"
+                  solidityType="address"
                   {...props.form.register("royaltyRecipient")}
                   client={props.client}
                 />
               </FormFieldSetup>
 
               <FormFieldSetup
-                isRequired
-                label="Percentage"
                 className="shrink-0 md:max-w-[150px]"
                 errorMessage={errors.royaltyBps?.message}
+                isRequired
+                label="Percentage"
               >
                 <BasisPointsInput
                   className="bg-background"
-                  value={bpsNumValue}
-                  onChange={(value) => props.form.setValue("royaltyBps", value)}
                   defaultValue={0}
+                  onChange={(value) => props.form.setValue("royaltyBps", value)}
+                  value={bpsNumValue}
                 />
               </FormFieldSetup>
             </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/batch-upload-instructions.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/batch-upload-instructions.tsx
index 83df8c496e2..87abd977c2a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/batch-upload-instructions.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/batch-upload-instructions.tsx
@@ -1,9 +1,9 @@
+import { ArrowDownToLineIcon } from "lucide-react";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import { CodeClient } from "@/components/ui/code/code.client";
 import { InlineCode } from "@/components/ui/inline-code";
 import { TabButtons } from "@/components/ui/tabs";
-import { ArrowDownToLineIcon } from "lucide-react";
-import { useState } from "react";
 import { handleDownload } from "../../../_common/download-file-button";
 
 export function BatchUploadInstructions() {
@@ -13,14 +13,14 @@ export function BatchUploadInstructions() {
       <TabButtons
         tabs={[
           {
+            isActive: tab === "csv",
             name: "CSV",
             onClick: () => setTab("csv"),
-            isActive: tab === "csv",
           },
           {
+            isActive: tab === "json",
             name: "JSON",
             onClick: () => setTab("json"),
-            isActive: tab === "json",
           },
         ]}
       />
@@ -77,10 +77,10 @@ export function BatchUploadInstructions() {
 
           <ExampleCode
             code={tab === "csv" ? csv_example_basic : json_example_basic}
-            lang={tab === "csv" ? "csv" : "json"}
             fileNameWithExtension={
               tab === "csv" ? "example.csv" : "example.json"
             }
+            lang={tab === "csv" ? "csv" : "json"}
           />
         </Section>
 
@@ -96,12 +96,12 @@ export function BatchUploadInstructions() {
                   ? csv_with_image_number_example
                   : json_with_image_number_example
               }
-              lang={tab === "csv" ? "csv" : "json"}
               fileNameWithExtension={
                 tab === "csv"
                   ? "example-with-maps.csv"
                   : "example-with-maps.json"
               }
+              lang={tab === "csv" ? "csv" : "json"}
             />
           </p>
         </Section>
@@ -122,12 +122,12 @@ export function BatchUploadInstructions() {
                   ? csv_with_image_link_example
                   : json_with_image_link_example
               }
-              lang={tab === "csv" ? "csv" : "json"}
               fileNameWithExtension={
                 tab === "csv"
                   ? "example-with-ipfs.csv"
                   : "example-with-ipfs.json"
               }
+              lang={tab === "csv" ? "csv" : "json"}
             />
           </p>
         </Section>
@@ -151,12 +151,12 @@ export function BatchUploadInstructions() {
                   ? csv_example_price_supply
                   : json_example_price_supply
               }
-              lang={tab === "csv" ? "csv" : "json"}
               fileNameWithExtension={
                 tab === "csv"
                   ? "example-with-price-supply.csv"
                   : "example-with-price-supply.json"
               }
+              lang={tab === "csv" ? "csv" : "json"}
             />
           </p>
         </Section>
@@ -165,10 +165,7 @@ export function BatchUploadInstructions() {
   );
 }
 
-function Section(props: {
-  title: string;
-  children: React.ReactNode;
-}) {
+function Section(props: { title: string; children: React.ReactNode }) {
   return (
     <section>
       <h2 className="mb-1 font-medium text-base text-foreground">
@@ -399,16 +396,16 @@ function ExampleCode(props: {
       />
 
       <Button
-        variant="outline"
-        size="sm"
         className="absolute top-3.5 right-14 mt-[1px] h-auto bg-background p-2"
         onClick={() => {
           handleDownload({
             fileContent: props.code,
-            fileNameWithExtension: props.fileNameWithExtension,
             fileFormat: props.lang === "csv" ? "text/csv" : "application/json",
+            fileNameWithExtension: props.fileNameWithExtension,
           });
         }}
+        size="sm"
+        variant="outline"
       >
         <ArrowDownToLineIcon className="size-3" />
       </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/batch-upload-nfts.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/batch-upload-nfts.tsx
index 59f4332d8ce..4de31adaec5 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/batch-upload-nfts.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/batch-upload-nfts.tsx
@@ -1,9 +1,24 @@
-import { TokenSelector } from "@/components/blocks/TokenSelector";
+import {
+  ArrowLeftIcon,
+  ArrowRightIcon,
+  ImageOffIcon,
+  RotateCcwIcon,
+  TagIcon,
+} from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
+import {
+  getAddress,
+  NATIVE_TOKEN_ADDRESS,
+  type ThirdwebClient,
+} from "thirdweb";
+import { MediaRenderer } from "thirdweb/react";
 import { DropZone } from "@/components/blocks/drop-zone/drop-zone";
+import { TokenSelector } from "@/components/blocks/TokenSelector";
 import { PaginationButtons } from "@/components/pagination-buttons";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { DecimalInput } from "@/components/ui/decimal-input";
 import { Label } from "@/components/ui/label";
 import { Switch } from "@/components/ui/switch";
@@ -17,21 +32,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import {
-  ArrowLeftIcon,
-  ArrowRightIcon,
-  ImageOffIcon,
-  RotateCcwIcon,
-  TagIcon,
-} from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
-import {
-  NATIVE_TOKEN_ADDRESS,
-  type ThirdwebClient,
-  getAddress,
-} from "thirdweb";
-import { MediaRenderer } from "thirdweb/react";
 import { FilePreview } from "../../../_common/file-preview";
 import { nftWithPriceSchema } from "../schema";
 import { BatchUploadInstructions } from "./batch-upload-instructions";
@@ -55,6 +55,13 @@ export function BatchUploadNFTs(props: {
         <div>
           <div className="p-4 md:p-6">
             <DropZone
+              accept={undefined}
+              className="bg-background py-20"
+              description={
+                props.results?.type === "error"
+                  ? props.results.error
+                  : "Drag and drop the files or folder"
+              }
               isError={props.results?.type === "error"}
               onDrop={async (files) => {
                 try {
@@ -63,41 +70,34 @@ export function BatchUploadNFTs(props: {
                 } catch (e) {
                   console.error(e);
                   props.setResults({
-                    type: "error",
                     error: e instanceof Error ? e.message : "Unknown error",
+                    type: "error",
                   });
                 }
               }}
-              accept={undefined}
-              title={
-                props.results?.type === "error"
-                  ? "Invalid files"
-                  : "Upload Files"
-              }
-              description={
-                props.results?.type === "error"
-                  ? props.results.error
-                  : "Drag and drop the files or folder"
-              }
               resetButton={{
                 label: "Remove files",
                 onClick: () => {
                   props.setResults(null);
                 },
               }}
-              className="bg-background py-20"
+              title={
+                props.results?.type === "error"
+                  ? "Invalid files"
+                  : "Upload Files"
+              }
             />
             <div className="h-6" />
             <BatchUploadInstructions />
           </div>
 
           <div className="flex justify-end gap-3 border-t px-6 py-4">
-            <Button variant="outline" onClick={props.onPrev} className="gap-2">
+            <Button className="gap-2" onClick={props.onPrev} variant="outline">
               <ArrowLeftIcon className="size-4" />
               Back
             </Button>
 
-            <Button disabled className="gap-2">
+            <Button className="gap-2" disabled>
               Next
               <ArrowRightIcon className="size-4" />
             </Button>
@@ -105,10 +105,14 @@ export function BatchUploadNFTs(props: {
         </div>
       ) : (
         <BatchUploadResultsTable
-          onPrev={props.onPrev}
-          onNext={props.onNext}
           chainId={props.chainId}
+          client={props.client}
           data={props.results.data}
+          onNext={props.onNext}
+          onPrev={props.onPrev}
+          onReset={() => {
+            props.setResults(null);
+          }}
           setData={(dataOrFn) => {
             const data =
               typeof dataOrFn === "function"
@@ -118,14 +122,10 @@ export function BatchUploadNFTs(props: {
                 : dataOrFn;
 
             props.setResults({
-              type: "data",
               data,
+              type: "data",
             });
           }}
-          onReset={() => {
-            props.setResults(null);
-          }}
-          client={props.client}
         />
       )}
     </div>
@@ -168,19 +168,15 @@ function BatchUploadResultsTable(props: {
               </p>
             </div>
 
-            <Switch
-              id="batch-mode"
-              checked={batchMode}
-              onCheckedChange={setBatchMode}
-            />
+            <Switch checked={batchMode} onCheckedChange={setBatchMode} />
           </div>
 
           {batchMode && (
             <BatchUpdateFieldset
+              chainId={props.chainId}
+              client={client}
               data={data}
               setData={setData}
-              client={client}
-              chainId={props.chainId}
             />
           )}
         </div>
@@ -207,22 +203,22 @@ function BatchUploadResultsTable(props: {
                       <div className="flex shrink-0 flex-col gap-4">
                         {item.image instanceof File ? (
                           <FilePreview
-                            srcOrFile={item.image}
                             className="size-20 rounded-lg border object-cover"
                             client={client}
+                            srcOrFile={item.image}
                           />
                         ) : typeof item.image === "string" ? (
                           <MediaRenderer
+                            className="size-20 rounded-lg border object-cover"
+                            client={client}
                             src={
                               item.image
                                 ? resolveSchemeWithErrorHandler({
-                                    uri: item.image,
                                     client,
+                                    uri: item.image,
                                   })
                                 : ""
                             }
-                            className="size-20 rounded-lg border object-cover"
-                            client={client}
                           />
                         ) : (
                           imageFallback
@@ -232,15 +228,15 @@ function BatchUploadResultsTable(props: {
                           <div>
                             {typeof item.animation_url === "string" ? (
                               <MediaRenderer
+                                className="size-20 rounded-lg border object-cover"
                                 client={client}
                                 src={item.animation_url}
-                                className="size-20 rounded-lg border object-cover"
                               />
                             ) : item.animation_url instanceof File ? (
                               <FilePreview
-                                srcOrFile={item.animation_url}
                                 className="size-20 rounded-lg border object-cover"
                                 client={client}
+                                srcOrFile={item.animation_url}
                               />
                             ) : (
                               imageFallback
@@ -287,9 +283,9 @@ function BatchUploadResultsTable(props: {
                               ) {
                                 return (
                                   <Badge
+                                    className="gap-2 text-sm"
                                     key={`${property.trait_type}-${property.value}`}
                                     variant="secondary"
-                                    className="gap-2 text-sm"
                                   >
                                     <TagIcon className="size-3 text-muted-foreground" />
                                     <span className="text-foreground">
@@ -309,10 +305,10 @@ function BatchUploadResultsTable(props: {
                           typeof item.external_url === "string" && (
                             <div>
                               <a
+                                className="inline whitespace-pre-wrap break-all text-muted-foreground underline decoration-muted-foreground/50 decoration-dotted underline-offset-4 hover:text-foreground"
                                 href={item.external_url}
-                                target="_blank"
                                 rel="noopener noreferrer"
-                                className="inline whitespace-pre-wrap break-all text-muted-foreground underline decoration-muted-foreground/50 decoration-dotted underline-offset-4 hover:text-foreground"
+                                target="_blank"
                               >
                                 {item.external_url}
                               </a>
@@ -326,7 +322,6 @@ function BatchUploadResultsTable(props: {
                   <TableCell className="whitespace-normal">
                     <div className="flex items-center">
                       <DecimalInput
-                        value={item.price_amount}
                         className="w-24 rounded-r-none border-r-0 disabled:opacity-100"
                         onChange={(value) => {
                           setData((v) => {
@@ -340,32 +335,33 @@ function BatchUploadResultsTable(props: {
                             return newData;
                           });
                         }}
+                        value={item.price_amount}
                       />
 
                       <TokenSelector
-                        className="w-36 rounded-l-none bg-background disabled:opacity-100"
                         addNativeTokenIfMissing={true}
-                        showCheck={true}
+                        chainId={props.chainId}
+                        className="w-36 rounded-l-none bg-background disabled:opacity-100"
+                        client={props.client}
                         disableAddress={true}
-                        selectedToken={{
-                          address: item.price_currency || nativeTokenAddress,
-                          chainId: props.chainId,
-                        }}
-                        popoverContentClassName="!w-64"
                         onChange={(token) => {
                           setData((v) => {
                             const newData = [...v];
                             newData[itemIndex] = {
                               ...newData[itemIndex],
-                              price_currency: token.address,
                               price_amount: item.price_amount,
+                              price_currency: token.address,
                               supply: item.supply,
                             };
                             return newData;
                           });
                         }}
-                        client={props.client}
-                        chainId={props.chainId}
+                        popoverContentClassName="!w-64"
+                        selectedToken={{
+                          address: item.price_currency || nativeTokenAddress,
+                          chainId: props.chainId,
+                        }}
+                        showCheck={true}
                       />
                     </div>
                   </TableCell>
@@ -374,21 +370,21 @@ function BatchUploadResultsTable(props: {
                   <TableCell className="whitespace-normal">
                     <div className="space-y-2">
                       <DecimalInput
-                        value={item.supply}
                         className="w-32 disabled:opacity-100"
-                        // disabled={batchMode}
                         onChange={(value) => {
                           setData((v) => {
                             const newData = [...v];
                             newData[itemIndex] = {
                               ...newData[itemIndex],
-                              supply: value,
-                              price_currency: item.price_currency,
                               price_amount: item.price_amount,
+                              price_currency: item.price_currency,
+                              supply: value,
                             };
                             return newData;
                           });
                         }}
+                        // disabled={batchMode}
+                        value={item.supply}
                       />
 
                       {item.supply === "0" && (
@@ -407,20 +403,20 @@ function BatchUploadResultsTable(props: {
         <div className="border-t px-4 py-6">
           <PaginationButtons
             activePage={page}
-            totalPages={totalPages}
             onPageClick={setPage}
+            totalPages={totalPages}
           />
         </div>
       )}
 
       <div className="flex flex-col items-center justify-between gap-3 border-t px-6 py-6 lg:flex-row">
-        <Button variant="outline" className="gap-2" onClick={onReset}>
+        <Button className="gap-2" onClick={onReset} variant="outline">
           <RotateCcwIcon className="size-4 text-muted-foreground" />
           Reset
         </Button>
         <div className="flex gap-3">
           {/* back */}
-          <Button variant="outline" className="gap-2" onClick={onPrev}>
+          <Button className="gap-2" onClick={onPrev} variant="outline">
             <ArrowLeftIcon className="size-4" />
             Back
           </Button>
@@ -477,8 +473,6 @@ function BatchUpdateFieldset(props: {
           <Label>Price</Label>
           <div className="flex w-full">
             <DecimalInput
-              value={globalPriceAmount}
-              placeholder="Custom"
               className="!text-xl h-12 w-32 rounded-r-none border-r-0 bg-card font-bold placeholder:font-semibold placeholder:text-xl"
               onChange={(value) => {
                 setData((v) => {
@@ -488,22 +482,16 @@ function BatchUpdateFieldset(props: {
                   }));
                 });
               }}
+              placeholder="Custom"
+              value={globalPriceAmount}
             />
 
             <TokenSelector
-              className="h-12 w-48 rounded-l-none bg-card"
-              popoverContentClassName="!w-64"
               addNativeTokenIfMissing={true}
-              showCheck={true}
+              chainId={chainId}
+              className="h-12 w-48 rounded-l-none bg-card"
+              client={client}
               disableAddress={true}
-              selectedToken={
-                globalPriceCurrency
-                  ? {
-                      address: globalPriceCurrency,
-                      chainId: chainId,
-                    }
-                  : undefined
-              }
               onChange={(token) => {
                 setData((v) => {
                   return v.map((item) => ({
@@ -512,8 +500,16 @@ function BatchUpdateFieldset(props: {
                   }));
                 });
               }}
-              client={client}
-              chainId={chainId}
+              popoverContentClassName="!w-64"
+              selectedToken={
+                globalPriceCurrency
+                  ? {
+                      address: globalPriceCurrency,
+                      chainId: chainId,
+                    }
+                  : undefined
+              }
+              showCheck={true}
             />
           </div>
         </div>
@@ -522,8 +518,6 @@ function BatchUpdateFieldset(props: {
           <Label>Supply</Label>
           <DecimalInput
             className="!text-xl h-12 bg-card font-bold placeholder:font-semibold placeholder:text-xl lg:w-40"
-            value={globalSupply}
-            placeholder="Custom"
             onChange={(value) => {
               setData((v) => {
                 return v.map((item) => ({
@@ -532,6 +526,8 @@ function BatchUpdateFieldset(props: {
                 }));
               });
             }}
+            placeholder="Custom"
+            value={globalSupply}
           />
 
           {globalSupply === "0" && (
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/process-files.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/process-files.ts
index 7b9269cc328..f157a85d814 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/process-files.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/batch-upload/process-files.ts
@@ -1,5 +1,5 @@
 import Papa from "papaparse";
-import { NATIVE_TOKEN_ADDRESS, getAddress, isAddress } from "thirdweb";
+import { getAddress, isAddress, NATIVE_TOKEN_ADDRESS } from "thirdweb";
 import type { NFTInput } from "thirdweb/utils";
 import z from "zod";
 import {
@@ -34,8 +34,8 @@ const getAcceptedFiles = async (acceptedFiles: File[]) => {
     otherAssets: File[];
   } = {
     csv: undefined,
-    json: undefined,
     images: [],
+    json: undefined,
     otherAssets: [],
   };
 
@@ -109,20 +109,20 @@ const handleCSV = (params: {
     }
 
     const nft: NFTMetadataWithPrice = {
-      name: name,
+      animation_url:
+        otherAssets.find((asset) => asset?.name === animation_url) ||
+        (!isAnimationUrlMapped && otherAssets[index]) ||
+        animation_url,
+      attributes: getAttributes(),
+      background_color,
       description: description,
       external_url,
-      background_color,
-      attributes: getAttributes(),
       image:
         imageFiles.find((img) => img?.name === image) ||
         (!isImageMapped && imageFiles[index]) ||
         image ||
         undefined,
-      animation_url:
-        otherAssets.find((asset) => asset?.name === animation_url) ||
-        (!isAnimationUrlMapped && otherAssets[index]) ||
-        animation_url,
+      name: name,
       price_amount: price_amount || "1",
       price_currency: price_currency || getAddress(NATIVE_TOKEN_ADDRESS),
       supply: supply || "1",
@@ -151,16 +151,16 @@ function handleJson(params: {
 
     const nftWithPrice = {
       ...nft,
-      image:
-        imageFiles.find((img) => img?.name === nft?.image) ||
-        (!isImageMapped && imageFiles[index]) ||
-        nft.image ||
-        undefined,
       animation_url:
         otherAssets.find((x) => x.name === nft?.animation_url) ||
         (!isAnimationUrlMapped && otherAssets[index]) ||
         nft.animation_url ||
         undefined,
+      image:
+        imageFiles.find((img) => img?.name === nft?.image) ||
+        (!isImageMapped && imageFiles[index]) ||
+        nft.image ||
+        undefined,
       price_amount: nft.price_amount || "1",
       price_currency: nft.price_currency || getAddress(NATIVE_TOKEN_ADDRESS),
       supply: nft.supply || "1",
@@ -220,12 +220,15 @@ const supplySchema = z
   );
 
 const nftWithPriceInputJsonSchema = z.object({
-  name: z.string(),
-  description: z.string().optional(),
-  image: z.string().or(z.instanceof(File)).optional(),
   animation_url: z.string().or(z.instanceof(File)).optional(),
-  external_url: z.string().optional(),
+  attributes: z
+    .array(z.object({ trait_type: z.string(), value: z.string() }))
+    .optional(),
   background_color: z.string().optional(),
+  description: z.string().optional(),
+  external_url: z.string().optional(),
+  image: z.string().or(z.instanceof(File)).optional(),
+  name: z.string(),
   price_amount: priceAmountSchema,
   price_currency: z
     .string()
@@ -237,18 +240,15 @@ const nftWithPriceInputJsonSchema = z.object({
     })
     .optional(),
   supply: supplySchema,
-  attributes: z
-    .array(z.object({ trait_type: z.string(), value: z.string() }))
-    .optional(),
 });
 
 const nftWithPriceInputCsvSchema = z.object({
-  name: z.string(),
-  description: z.string().optional(),
-  image: z.string().or(z.instanceof(File)).optional(),
   animation_url: z.string().or(z.instanceof(File)).optional(),
-  external_url: z.string().optional(),
   background_color: z.string().optional(),
+  description: z.string().optional(),
+  external_url: z.string().optional(),
+  image: z.string().or(z.instanceof(File)).optional(),
+  name: z.string(),
   price_amount: priceAmountSchema,
   price_currency: z.string().optional(),
   supply: supplySchema,
@@ -266,20 +266,18 @@ export async function processBatchUploadFiles(
     const jsonData = JSON.parse(await json.text());
     if (Array.isArray(jsonData)) {
       return {
+        data: handleJson({ imageFiles: images, jsonData, otherAssets }),
         type: "data",
-        data: handleJson({ jsonData, imageFiles: images, otherAssets }),
       };
     } else {
       return {
-        type: "error",
         error: "Invalid JSON format",
+        type: "error",
       };
     }
   } else if (csv) {
     return new Promise<ProcessBatchUploadFilesResult>((res, rej) => {
       Papa.parse(csv, {
-        header: true,
-        transformHeader,
         complete: (results) => {
           try {
             const validRows: CSVRowData[] = [];
@@ -299,29 +297,31 @@ export async function processBatchUploadFiles(
 
             if (validRows.length > 0) {
               res({
-                type: "data",
                 data: handleCSV({
                   csvData: validRows,
                   imageFiles: images,
                   otherAssets,
                 }),
+                type: "data",
               });
             } else {
               res({
-                type: "error",
                 error: "No valid CSV data found",
+                type: "error",
               });
             }
           } catch (e) {
             rej(e);
           }
         },
+        header: true,
+        transformHeader,
       });
     });
   } else {
     return {
-      type: "error",
       error: "No valid files found. Please upload a '.csv' or '.json' file.",
+      type: "error",
     };
   }
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/schema.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/schema.ts
index 7d6868c6bb4..7eb9234cf74 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/schema.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/schema.ts
@@ -29,17 +29,29 @@ const supplySchema = z.string().refine(
 );
 
 export const nftWithPriceSchema = z.object({
-  name: z.string().min(1, { message: "Name is required" }),
-  description: z.string().optional(),
-  image: z.string().or(z.instanceof(File)).optional(),
   animation_url: z.string().or(z.instanceof(File)).optional(),
-  external_url: z.string().or(z.instanceof(File)).optional(),
+  attributes: z
+    .array(z.object({ trait_type: z.string(), value: z.string() }))
+    .transform((value) => {
+      if (!value) {
+        return value;
+      }
+
+      return value.filter((item) => {
+        return item.trait_type && item.value;
+      });
+    })
+    .optional(),
   background_color: z
     .string()
     .optional()
     .refine((val) => !val || /^#[0-9A-Fa-f]{6}$/.test(val), {
       message: "Must be a valid hex color (e.g., #FF0000)",
     }),
+  description: z.string().optional(),
+  external_url: z.string().or(z.instanceof(File)).optional(),
+  image: z.string().or(z.instanceof(File)).optional(),
+  name: z.string().min(1, { message: "Name is required" }),
   price_amount: priceAmountSchema,
   price_currency: z.string().refine(
     (value) => {
@@ -53,16 +65,4 @@ export const nftWithPriceSchema = z.object({
     },
   ),
   supply: supplySchema,
-  attributes: z
-    .array(z.object({ trait_type: z.string(), value: z.string() }))
-    .transform((value) => {
-      if (!value) {
-        return value;
-      }
-
-      return value.filter((item) => {
-        return item.trait_type && item.value;
-      });
-    })
-    .optional(),
 });
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/attributes.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/attributes.tsx
index e1cb7c24711..e960f680326 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/attributes.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/attributes.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { PlusIcon, Trash2Icon } from "lucide-react";
+import { type UseFormReturn, useFieldArray } from "react-hook-form";
 import { Button } from "@/components/ui/button";
 import {
   FormControl,
@@ -8,8 +10,6 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { PlusIcon, Trash2Icon } from "lucide-react";
-import { type UseFormReturn, useFieldArray } from "react-hook-form";
 
 type WithAttributes = {
   attributes?: {
@@ -25,8 +25,8 @@ export function AttributesFieldset<T extends WithAttributes>(props: {
   const form = props.form as unknown as UseFormReturn<WithAttributes>;
 
   const { fields, append, remove } = useFieldArray({
-    name: "attributes",
     control: form.control,
+    name: "attributes",
   });
 
   return (
@@ -37,8 +37,8 @@ export function AttributesFieldset<T extends WithAttributes>(props: {
         <div className="mb-3 space-y-4">
           {fields.map((field, index) => (
             <div
-              key={field.id}
               className="flex gap-4 max-sm:mb-6 max-sm:border-b max-sm:border-dashed max-sm:pb-6"
+              key={field.id}
             >
               <div className="flex flex-1 flex-col gap-3 lg:flex-row">
                 <FormField
@@ -49,8 +49,8 @@ export function AttributesFieldset<T extends WithAttributes>(props: {
                       <FormControl>
                         <Input
                           {...field}
-                          placeholder="Name"
                           aria-label="Name"
+                          placeholder="Name"
                         />
                       </FormControl>
                       <FormMessage />
@@ -66,8 +66,8 @@ export function AttributesFieldset<T extends WithAttributes>(props: {
                       <FormControl>
                         <Input
                           {...field}
-                          placeholder="Value"
                           aria-label="Value"
+                          placeholder="Value"
                         />
                       </FormControl>
                       <FormMessage />
@@ -77,11 +77,11 @@ export function AttributesFieldset<T extends WithAttributes>(props: {
               </div>
 
               <Button
-                type="button"
-                variant="outline"
                 className="rounded-full text-muted-foreground"
-                size="icon"
                 onClick={() => remove(index)}
+                size="icon"
+                type="button"
+                variant="outline"
               >
                 <Trash2Icon className="h-4 w-4" />
                 <span className="sr-only">Remove</span>
@@ -92,11 +92,11 @@ export function AttributesFieldset<T extends WithAttributes>(props: {
       )}
 
       <Button
-        type="button"
+        className="h-auto gap-1.5 rounded-full px-3 py-1.5 text-xs"
+        onClick={() => append({ trait_type: "", value: "" })}
         size="sm"
+        type="button"
         variant="outline"
-        onClick={() => append({ trait_type: "", value: "" })}
-        className="h-auto gap-1.5 rounded-full px-3 py-1.5 text-xs"
       >
         <PlusIcon className="size-3.5" />
         Add Attribute
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/single-upload-nft.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/single-upload-nft.tsx
index b9b1894990b..acb2032e0cd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/single-upload-nft.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/single-upload-nft.tsx
@@ -1,5 +1,11 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { FileInput } from "components/shared/FileInput";
+import { ArrowLeftIcon, ArrowRightIcon, AsteriskIcon } from "lucide-react";
+import { useId } from "react";
+import { useForm } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { TokenSelector } from "@/components/blocks/TokenSelector";
 import { Badge } from "@/components/ui/badge";
@@ -18,11 +24,6 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
 import { cn } from "@/lib/utils";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { FileInput } from "components/shared/FileInput";
-import { ArrowLeftIcon, ArrowRightIcon, AsteriskIcon } from "lucide-react";
-import { useForm } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import {
   getUploadedNFTMediaMeta,
   handleNFTMediaUpload,
@@ -40,17 +41,23 @@ export function SingleUploadNFT(props: {
   setNFTData: (nftData: NFTMetadataWithPrice) => void;
 }) {
   const form = useForm<NFTMetadataWithPrice>({
-    resolver: zodResolver(nftWithPriceSchema),
-    values: props.nftData || undefined,
     defaultValues: {
+      attributes: [{ trait_type: "", value: "" }],
+      description: "",
       image: undefined,
       name: "",
-      description: "",
-      attributes: [{ trait_type: "", value: "" }],
     },
+    resolver: zodResolver(nftWithPriceSchema),
     reValidateMode: "onChange",
+    values: props.nftData || undefined,
   });
 
+  const nameId = useId();
+  const descriptionId = useId();
+
+  const priceAmountId = useId();
+  const supplyId = useId();
+
   function handlePrev() {
     props.setNFTData(form.getValues()); // save before going back
     props.onPrev();
@@ -86,21 +93,21 @@ export function SingleUploadNFT(props: {
             <FormFieldSetup
               errorMessage={mediaFileError?.message}
               htmlFor="media"
-              label="Media"
               isRequired={false}
+              label="Media"
             >
               <p className="mb-2 text-muted-foreground text-sm">
                 You can upload image, audio, video, html, text, pdf, or 3d model
                 file
               </p>
               <FileInput
-                value={media}
-                showPreview={true}
-                setValue={setFile}
                 className="rounded-lg bg-background"
-                selectOrUpload="Upload"
                 client={props.client}
                 helperText="Media"
+                selectOrUpload="Upload"
+                setValue={setFile}
+                showPreview={true}
+                value={media}
               />
             </FormFieldSetup>
 
@@ -108,21 +115,21 @@ export function SingleUploadNFT(props: {
               <FormFieldSetup
                 errorMessage={form.formState.errors?.image?.message}
                 htmlFor="cover-image"
-                label="Cover Image"
                 isRequired={false}
+                label="Cover Image"
               >
                 <p className="mb-2 text-muted-foreground text-sm">
                   You can optionally upload an image as the cover of your NFT
                 </p>
                 <FileInput
-                  client={props.client}
                   accept={{ "image/*": [] }}
+                  className="rounded-lg bg-background"
+                  client={props.client}
                   helperText="Cover Image"
-                  value={image}
                   setValue={(file) => {
                     form.setValue("image", file);
                   }}
-                  className="rounded-lg bg-background"
+                  value={image}
                 />
               </FormFieldSetup>
             )}
@@ -132,29 +139,29 @@ export function SingleUploadNFT(props: {
           <div className="flex flex-col gap-6">
             {/* name  */}
             <FormFieldSetup
-              label="Name"
-              isRequired
-              htmlFor="name"
               errorMessage={form.formState.errors.name?.message}
+              htmlFor="name"
+              isRequired
+              label="Name"
             >
               <Input
-                id="name"
+                id={nameId}
                 placeholder="My NFT"
                 {...form.register("name")}
               />
             </FormFieldSetup>
 
             <FormFieldSetup
-              label="Description"
-              isRequired={false}
-              htmlFor="description"
               className="flex grow flex-col"
               errorMessage={form.formState.errors.description?.message}
+              htmlFor="description"
+              isRequired={false}
+              label="Description"
             >
               <Textarea
-                id="description"
-                placeholder="Describe your NFT"
                 className="grow"
+                id={descriptionId}
+                placeholder="Describe your NFT"
                 {...form.register("description")}
               />
             </FormFieldSetup>
@@ -177,15 +184,15 @@ export function SingleUploadNFT(props: {
               {/* Price Amount */}
               <div className="space-y-1">
                 <DecimalInput
-                  id="price_amount"
-                  value={form.watch("price_amount")}
-                  placeholder="0.00"
                   className="w-40 rounded-r-none border-r-0 bg-background"
+                  id={priceAmountId}
                   onChange={(value) => {
                     form.setValue("price_amount", value, {
                       shouldValidate: true,
                     });
                   }}
+                  placeholder="0.00"
+                  value={form.watch("price_amount")}
                 />
                 {form.formState.errors.price_amount?.message && (
                   <p className="text-destructive-text text-sm">
@@ -197,10 +204,16 @@ export function SingleUploadNFT(props: {
               {/* Price Currency */}
               <div className="flex-1 space-y-1">
                 <TokenSelector
-                  className="rounded-l-none bg-background"
                   addNativeTokenIfMissing={true}
-                  showCheck={true}
+                  chainId={props.chainId}
+                  className="rounded-l-none bg-background"
+                  client={props.client}
                   disableAddress={true}
+                  onChange={(token) => {
+                    form.setValue("price_currency", token.address, {
+                      shouldValidate: true,
+                    });
+                  }}
                   selectedToken={
                     form.watch("price_currency")
                       ? {
@@ -209,13 +222,7 @@ export function SingleUploadNFT(props: {
                         }
                       : undefined
                   }
-                  onChange={(token) => {
-                    form.setValue("price_currency", token.address, {
-                      shouldValidate: true,
-                    });
-                  }}
-                  client={props.client}
-                  chainId={props.chainId}
+                  showCheck={true}
                 />
                 {form.formState.errors.price_currency?.message && (
                   <p className="text-destructive-text text-sm">
@@ -228,21 +235,21 @@ export function SingleUploadNFT(props: {
 
           {/* Supply */}
           <FormFieldSetup
-            label="Supply"
-            isRequired
-            htmlFor="supply"
             errorMessage={form.formState.errors.supply?.message}
+            htmlFor="supply"
+            isRequired
+            label="Supply"
           >
             <DecimalInput
-              id="supply"
-              placeholder="Custom"
-              value={form.watch("supply")}
               className="bg-background"
+              id={supplyId}
               onChange={(value) => {
                 form.setValue("supply", value, {
                   shouldValidate: true,
                 });
               }}
+              placeholder="Custom"
+              value={form.watch("supply")}
             />
           </FormFieldSetup>
         </div>
@@ -319,15 +326,15 @@ export function SingleUploadNFT(props: {
         <div className="border-t border-dashed px-4 py-6 md:px-6">
           <div className="flex justify-end gap-3">
             <Button
+              className="gap-2"
+              onClick={handlePrev}
               type="button"
               variant="outline"
-              onClick={handlePrev}
-              className="gap-2"
             >
               <ArrowLeftIcon className="size-4" />
               Back
             </Button>
-            <Button type="submit" className="gap-2">
+            <Button className="gap-2" type="submit">
               Next
               <ArrowRightIcon className="size-4" />
             </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/upload-nfts.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/upload-nfts.stories.tsx
index a28e2904b3d..3434451e573 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/upload-nfts.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/upload-nfts.stories.tsx
@@ -1,13 +1,12 @@
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useState } from "react";
 import { storybookThirdwebClient } from "stories/utils";
-import { NATIVE_TOKEN_ADDRESS, getAddress } from "thirdweb";
+import { getAddress, NATIVE_TOKEN_ADDRESS } from "thirdweb";
 import { ThirdwebProvider } from "thirdweb/react";
 import type { NFTMetadataWithPrice } from "./batch-upload/process-files";
 import { type NFTData, UploadNFTsFieldset } from "./upload-nfts";
 
 const meta = {
-  title: "Asset/CreateNFT/UploadNFTsFieldset",
   component: Variant,
   decorators: [
     (Story) => (
@@ -18,6 +17,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Asset/CreateNFT/UploadNFTsFieldset",
 } satisfies Meta<typeof Variant>;
 
 export default meta;
@@ -25,18 +25,18 @@ type Story = StoryObj<typeof meta>;
 
 function getMockNFTData(params?: Partial<NFTMetadataWithPrice>) {
   const mockNFTData: NFTMetadataWithPrice = {
-    name: "Test NFT",
-    description: "Test Description",
-    image: "https://picsum.photos/500/500",
-    price_amount: "0.1",
-    price_currency: getAddress(NATIVE_TOKEN_ADDRESS),
-    supply: "1",
     attributes: [
       {
         trait_type: "test",
         value: "value",
       },
     ],
+    description: "Test Description",
+    image: "https://picsum.photos/500/500",
+    name: "Test NFT",
+    price_amount: "0.1",
+    price_currency: getAddress(NATIVE_TOKEN_ADDRESS),
+    supply: "1",
     ...params,
   };
 
@@ -46,8 +46,8 @@ function getMockNFTData(params?: Partial<NFTMetadataWithPrice>) {
 export const MultipleNFTsNull: Story = {
   args: {
     nftData: {
-      type: "multiple",
       nfts: null,
+      type: "multiple",
     },
   },
 };
@@ -55,8 +55,8 @@ export const MultipleNFTsNull: Story = {
 export const SingleNFTNull: Story = {
   args: {
     nftData: {
-      type: "single",
       nft: null,
+      type: "single",
     },
   },
 };
@@ -64,9 +64,7 @@ export const SingleNFTNull: Story = {
 export const MultipleNFTsSet: Story = {
   args: {
     nftData: {
-      type: "multiple",
       nfts: {
-        type: "data",
         data: Array(5)
           .fill(null)
           .map((_, i) =>
@@ -75,7 +73,9 @@ export const MultipleNFTsSet: Story = {
               price_amount: Math.random().toFixed(2),
             }),
           ),
+        type: "data",
       },
+      type: "multiple",
     },
   },
 };
@@ -83,11 +83,11 @@ export const MultipleNFTsSet: Story = {
 export const MultipleNFTsError: Story = {
   args: {
     nftData: {
-      type: "multiple",
       nfts: {
-        type: "error",
         error: "This is some error message",
+        type: "error",
       },
+      type: "multiple",
     },
   },
 };
@@ -95,24 +95,22 @@ export const MultipleNFTsError: Story = {
 export const SingleNFTSet: Story = {
   args: {
     nftData: {
-      type: "single",
       nft: getMockNFTData(),
+      type: "single",
     },
   },
 };
 
-function Variant(props: {
-  nftData: NFTData;
-}) {
+function Variant(props: { nftData: NFTData }) {
   const [nftData, setNFTData] = useState<NFTData>(props.nftData);
 
   return (
     <UploadNFTsFieldset
-      client={storybookThirdwebClient}
       chainId={1}
+      client={storybookThirdwebClient}
+      nftData={nftData}
       onNext={() => console.log("next")}
       onPrev={() => console.log("prev")}
-      nftData={nftData}
       setNFTData={setNFTData}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/upload-nfts.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/upload-nfts.tsx
index 583e3a5151a..7b29ad4539b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/upload-nfts.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/upload-nfts.tsx
@@ -1,5 +1,5 @@
-import { TabButtons } from "@/components/ui/tabs";
 import type { ThirdwebClient } from "thirdweb";
+import { TabButtons } from "@/components/ui/tabs";
 import { StepCard } from "../../_common/step-card";
 import { BatchUploadNFTs } from "./batch-upload/batch-upload-nfts";
 import type {
@@ -27,55 +27,55 @@ export function UploadNFTsFieldset(props: {
   setNFTData: (nftData: NFTData) => void;
 }) {
   return (
-    <StepCard title="Upload NFTs" prevButton={undefined} nextButton={undefined}>
+    <StepCard nextButton={undefined} prevButton={undefined} title="Upload NFTs">
       <TabButtons
         containerClassName="pt-2 px-4 md:px-6"
         tabClassName="!text-sm"
         tabs={[
           {
+            isActive: props.nftData.type === "single",
             name: "Create Single",
             onClick: () =>
               props.setNFTData({
-                type: "single",
                 nft: null,
+                type: "single",
               }),
-            isActive: props.nftData.type === "single",
           },
           {
-            name: "Create Multiple",
-            onClick: () => props.setNFTData({ type: "multiple", nfts: null }),
             isActive: props.nftData.type === "multiple",
+            name: "Create Multiple",
+            onClick: () => props.setNFTData({ nfts: null, type: "multiple" }),
           },
         ]}
       />
 
       {props.nftData.type === "multiple" && (
         <BatchUploadNFTs
+          chainId={props.chainId}
+          client={props.client}
           onNext={props.onNext}
           onPrev={props.onPrev}
-          client={props.client}
           results={props.nftData.nfts}
           setResults={(results) =>
             props.setNFTData({
-              type: "multiple",
               nfts: results,
+              type: "multiple",
             })
           }
-          chainId={props.chainId}
         />
       )}
 
       {props.nftData.type === "single" && (
         <SingleUploadNFT
+          chainId={props.chainId}
           client={props.client}
+          nftData={props.nftData.nft}
           onNext={props.onNext}
           onPrev={props.onPrev}
-          chainId={props.chainId}
-          nftData={props.nftData.nft}
           setNFTData={(nft) =>
             props.setNFTData({
-              type: "single",
               nft,
+              type: "single",
             })
           }
         />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/_common/form.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/_common/form.ts
index 74ee17abc25..4463b991ab8 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/_common/form.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/_common/form.ts
@@ -3,20 +3,27 @@ import * as z from "zod";
 import { addressSchema, socialUrlsSchema } from "../../_common/schema";
 
 export const tokenInfoFormSchema = z.object({
+  chain: z.string().min(1, "Chain is required"),
+  description: z.string().optional(),
+  image: z.instanceof(File).optional(),
   // info fieldset
   name: z.string().min(1, "Name is required"),
+  socialUrls: socialUrlsSchema,
   symbol: z
     .string()
     .min(1, "Symbol is required")
     .max(10, "Symbol must be 10 characters or less"),
-  chain: z.string().min(1, "Chain is required"),
-  description: z.string().optional(),
-  image: z.instanceof(File).optional(),
-  socialUrls: socialUrlsSchema,
 });
 
 export const tokenDistributionFormSchema = z.object({
-  supply: z.string().min(1, "Supply is required"),
+  airdropAddresses: z.array(
+    z.object({
+      address: addressSchema,
+      quantity: z.string(),
+    }),
+  ),
+  // UI states
+  airdropEnabled: z.boolean(),
   saleAllocationPercentage: z.string().refine(
     (value) => {
       const number = Number(value);
@@ -29,7 +36,7 @@ export const tokenDistributionFormSchema = z.object({
       message: "Must be a number between 0 and 100",
     },
   ),
-  saleTokenAddress: z.string(),
+  saleEnabled: z.boolean(),
   salePrice: z.string().refine(
     (value) => {
       const number = Number(value);
@@ -39,15 +46,8 @@ export const tokenDistributionFormSchema = z.object({
       message: "Must be number larger than or equal to 0",
     },
   ),
-  airdropAddresses: z.array(
-    z.object({
-      address: addressSchema,
-      quantity: z.string(),
-    }),
-  ),
-  // UI states
-  airdropEnabled: z.boolean(),
-  saleEnabled: z.boolean(),
+  saleTokenAddress: z.string(),
+  supply: z.string().min(1, "Supply is required"),
 });
 
 export type TokenDistributionForm = UseFormReturn<
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page-impl.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page-impl.tsx
index 6bd10a355f4..4c86b81ddae 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page-impl.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page-impl.tsx
@@ -1,9 +1,4 @@
 "use client";
-import { revalidatePathAction } from "@/actions/revalidate";
-import {
-  reportAssetCreationFailed,
-  reportContractDeployed,
-} from "@/analytics/report";
 import {
   DEFAULT_FEE_BPS_NEW,
   DEFAULT_FEE_RECIPIENT,
@@ -13,11 +8,11 @@ import { defineDashboardChain } from "lib/defineDashboardChain";
 import { useRef } from "react";
 import { toast } from "sonner";
 import {
-  NATIVE_TOKEN_ADDRESS,
-  type ThirdwebClient,
   getAddress,
   getContract,
+  NATIVE_TOKEN_ADDRESS,
   sendAndConfirmTransaction,
+  type ThirdwebClient,
   toUnits,
 } from "thirdweb";
 import { deployERC20Contract } from "thirdweb/deploys";
@@ -31,6 +26,11 @@ import {
 import { useActiveAccount } from "thirdweb/react";
 import { parseError } from "utils/errorParser";
 import { pollWithTimeout } from "utils/pollWithTimeout";
+import { revalidatePathAction } from "@/actions/revalidate";
+import {
+  reportAssetCreationFailed,
+  reportContractDeployed,
+} from "@/analytics/report";
 import { useAddContractToProject } from "../../../hooks/project-contracts";
 import type { CreateAssetFormValues } from "./_common/form";
 import { CreateTokenAssetPageUI } from "./create-token-page.client";
@@ -73,38 +73,38 @@ export function CreateTokenAssetPage(props: {
           idToChain.get(Number(formValues.chain)),
         ),
         client: props.client,
-        type: "DropERC20",
         params: {
-          // metadata
-          name: formValues.name,
           description: formValues.description,
-          symbol: formValues.symbol,
           image: formValues.image,
+          // metadata
+          name: formValues.name,
           // platform fees
           platformFeeBps: BigInt(DEFAULT_FEE_BPS_NEW),
           platformFeeRecipient: DEFAULT_FEE_RECIPIENT,
           // primary sale
           saleRecipient: account.address,
           social_urls: socialUrls,
+          symbol: formValues.symbol,
         },
+        type: "DropERC20",
       });
 
       // add contract to project in background
       addContractToProject.mutateAsync({
-        teamId: props.teamId,
-        projectId: props.projectId,
-        contractAddress: contractAddress,
         chainId: formValues.chain,
-        deploymentType: "asset",
+        contractAddress: contractAddress,
         contractType: "DropERC20",
+        deploymentType: "asset",
+        projectId: props.projectId,
+        teamId: props.teamId,
       });
 
       reportContractDeployed({
         address: contractAddress,
         chainId: Number(formValues.chain),
-        publisher: "deployer.thirdweb.eth",
         contractName: "DropERC20",
         deploymentType: "asset",
+        publisher: "deployer.thirdweb.eth",
       });
 
       contractAddressRef.current = contractAddress;
@@ -147,23 +147,23 @@ export function CreateTokenAssetPage(props: {
     );
 
     const contract = getContract({
-      client: props.client,
       address: contractAddress,
       chain,
+      client: props.client,
     });
 
     try {
       const airdropTx = transferBatch({
-        contract,
         batch: formValues.airdropAddresses.map((recipient) => ({
-          to: recipient.address,
           amount: recipient.quantity,
+          to: recipient.address,
         })),
+        contract,
       });
 
       await sendAndConfirmTransaction({
-        transaction: airdropTx,
         account,
+        transaction: airdropTx,
       });
     } catch (e) {
       console.error(e);
@@ -196,9 +196,9 @@ export function CreateTokenAssetPage(props: {
     );
 
     const contract = getContract({
-      client: props.client,
       address: contractAddress,
       chain,
+      client: props.client,
     });
 
     // poll until claim conditions are set before moving on to minting
@@ -223,13 +223,13 @@ export function CreateTokenAssetPage(props: {
     try {
       const claimTx = claimTo({
         contract,
-        to: account.address,
         quantity: ownerSupplyTokens.toString(),
+        to: account.address,
       });
 
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account,
+        transaction: claimTx,
       });
     } catch (e) {
       const errorMessage = parseError(e);
@@ -264,9 +264,9 @@ export function CreateTokenAssetPage(props: {
     );
 
     const contract = getContract({
-      client: props.client,
       address: contractAddress,
       chain,
+      client: props.client,
     });
 
     const salePercent = formValues.saleEnabled
@@ -278,18 +278,13 @@ export function CreateTokenAssetPage(props: {
 
     const phases: ClaimConditionsInput[] = [
       {
-        maxClaimablePerWallet: formValues.saleEnabled ? undefined : 0n,
-        maxClaimableSupply: totalSupplyWei,
-        price:
-          formValues.saleEnabled && salePercent > 0
-            ? formValues.salePrice
-            : "0",
         currencyAddress:
           getAddress(formValues.saleTokenAddress) ===
           getAddress(NATIVE_TOKEN_ADDRESS)
             ? undefined
             : formValues.saleTokenAddress,
-        startTime: new Date(),
+        maxClaimablePerWallet: formValues.saleEnabled ? undefined : 0n,
+        maxClaimableSupply: totalSupplyWei,
         metadata: {
           name:
             formValues.saleEnabled && salePercent > 0
@@ -303,6 +298,11 @@ export function CreateTokenAssetPage(props: {
             price: "0",
           },
         ],
+        price:
+          formValues.saleEnabled && salePercent > 0
+            ? formValues.salePrice
+            : "0",
+        startTime: new Date(),
       },
     ];
 
@@ -313,8 +313,8 @@ export function CreateTokenAssetPage(props: {
 
     try {
       await sendAndConfirmTransaction({
-        transaction: preparedTx,
         account,
+        transaction: preparedTx,
       });
     } catch (e) {
       const errorMessage = parseError(e);
@@ -334,20 +334,20 @@ export function CreateTokenAssetPage(props: {
     <CreateTokenAssetPageUI
       accountAddress={props.accountAddress}
       client={props.client}
-      teamSlug={props.teamSlug}
-      projectSlug={props.projectSlug}
+      createTokenFunctions={{
+        airdropTokens,
+        deployContract,
+        mintTokens,
+        setClaimConditions,
+      }}
       onLaunchSuccess={() => {
         revalidatePathAction(
           `/team/${props.teamSlug}/project/${props.projectId}/assets`,
           "page",
         );
       }}
-      createTokenFunctions={{
-        deployContract,
-        airdropTokens,
-        mintTokens,
-        setClaimConditions,
-      }}
+      projectSlug={props.projectSlug}
+      teamSlug={props.teamSlug}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.client.tsx
index fb83082856d..10699b2dfb6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.client.tsx
@@ -1,14 +1,14 @@
 "use client";
 
-import { reportAssetCreationStepConfigured } from "@/analytics/report";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
 import {
+  getAddress,
   NATIVE_TOKEN_ADDRESS,
   type ThirdwebClient,
-  getAddress,
 } from "thirdweb";
+import { reportAssetCreationStepConfigured } from "@/analytics/report";
 import {
   type CreateAssetFormValues,
   type TokenDistributionFormValues,
@@ -45,12 +45,12 @@ export function CreateTokenAssetPageUI(props: {
 
   const tokenInfoForm = useForm<TokenInfoFormValues>({
     resolver: zodResolver(tokenInfoFormSchema),
+    reValidateMode: "onChange",
     values: {
-      name: "",
+      chain: "1",
       description: "",
-      symbol: "",
       image: undefined,
-      chain: "1",
+      name: "",
       socialUrls: [
         {
           platform: "Website",
@@ -61,30 +61,32 @@ export function CreateTokenAssetPageUI(props: {
           url: "",
         },
       ],
+      symbol: "",
     },
-    reValidateMode: "onChange",
   });
 
   const tokenDistributionForm = useForm<TokenDistributionFormValues>({
     resolver: zodResolver(tokenDistributionFormSchema),
+    reValidateMode: "onChange",
     values: {
+      airdropAddresses: [],
+      // airdrop
+      airdropEnabled: false,
       // sale fieldset
       saleAllocationPercentage: "0",
-      saleTokenAddress: checksummedNativeTokenAddress,
+      saleEnabled: false,
       salePrice: "0.1",
+      saleTokenAddress: checksummedNativeTokenAddress,
       supply: "1000000",
-      saleEnabled: false,
-      // airdrop
-      airdropEnabled: false,
-      airdropAddresses: [],
     },
-    reValidateMode: "onChange",
   });
 
   return (
     <div>
       {step === "token-info" && (
         <TokenInfoFieldset
+          client={props.client}
+          form={tokenInfoForm}
           onChainUpdated={() => {
             // if the chain is updated, set the sale token address to the native token address
             tokenDistributionForm.setValue(
@@ -92,8 +94,6 @@ export function CreateTokenAssetPageUI(props: {
               checksummedNativeTokenAddress,
             );
           }}
-          client={props.client}
-          form={tokenInfoForm}
           onNext={() => {
             reportAssetCreationStepConfigured({
               assetType: "coin",
@@ -106,14 +106,10 @@ export function CreateTokenAssetPageUI(props: {
 
       {step === "distribution" && (
         <TokenDistributionFieldset
-          tokenSymbol={tokenInfoForm.watch("symbol")}
-          client={props.client}
-          form={tokenDistributionForm}
           accountAddress={props.accountAddress}
           chainId={tokenInfoForm.watch("chain")}
-          onPrevious={() => {
-            setStep("token-info");
-          }}
+          client={props.client}
+          form={tokenDistributionForm}
           onNext={() => {
             reportAssetCreationStepConfigured({
               assetType: "coin",
@@ -121,19 +117,23 @@ export function CreateTokenAssetPageUI(props: {
             });
             setStep("launch");
           }}
+          onPrevious={() => {
+            setStep("token-info");
+          }}
+          tokenSymbol={tokenInfoForm.watch("symbol")}
         />
       )}
 
       {step === "launch" && (
         <LaunchTokenStatus
-          teamSlug={props.teamSlug}
-          projectSlug={props.projectSlug}
           client={props.client}
+          createTokenFunctions={props.createTokenFunctions}
           onLaunchSuccess={props.onLaunchSuccess}
           onPrevious={() => {
             setStep("distribution");
           }}
-          createTokenFunctions={props.createTokenFunctions}
+          projectSlug={props.projectSlug}
+          teamSlug={props.teamSlug}
           values={{
             ...tokenInfoForm.getValues(),
             ...tokenDistributionForm.getValues(),
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.stories.tsx
index d0ced9ce661..5e50ad4e542 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.stories.tsx
@@ -4,7 +4,6 @@ import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { CreateTokenAssetPageUI } from "./create-token-page.client";
 
 const meta = {
-  title: "Assets/CreateTokenPage",
   component: CreateTokenAssetPageUI,
   decorators: [
     (Story) => (
@@ -17,23 +16,24 @@ const meta = {
       </ThirdwebProvider>
     ),
   ],
+  title: "Assets/CreateTokenPage",
 } satisfies Meta<typeof CreateTokenAssetPageUI>;
 
 export default meta;
 type Story = StoryObj<typeof meta>;
 
 const mockCreateTokenFunctions = {
-  deployContract: async () => {
+  airdropTokens: async () => {
     await new Promise((resolve) => setTimeout(resolve, 1000));
-    return { contractAddress: "0x123" };
   },
-  setClaimConditions: async () => {
+  deployContract: async () => {
     await new Promise((resolve) => setTimeout(resolve, 1000));
+    return { contractAddress: "0x123" };
   },
   mintTokens: async () => {
     await new Promise((resolve) => setTimeout(resolve, 1000));
   },
-  airdropTokens: async () => {
+  setClaimConditions: async () => {
     await new Promise((resolve) => setTimeout(resolve, 1000));
   },
 };
@@ -41,21 +41,18 @@ const mockCreateTokenFunctions = {
 export const Default: Story = {
   args: {
     accountAddress: "0x1234567890123456789012345678901234567890",
-    teamSlug: "test-team",
-    projectSlug: "test-project",
     client: storybookThirdwebClient,
     createTokenFunctions: mockCreateTokenFunctions,
     onLaunchSuccess: () => {},
+    projectSlug: "test-project",
+    teamSlug: "test-team",
   },
 };
 
 export const ErrorOnDeploy: Story = {
   args: {
     accountAddress: "0x1234567890123456789012345678901234567890",
-    teamSlug: "test-team",
-    projectSlug: "test-project",
     client: storybookThirdwebClient,
-    onLaunchSuccess: () => {},
     createTokenFunctions: {
       ...mockCreateTokenFunctions,
       deployContract: async () => {
@@ -63,5 +60,8 @@ export const ErrorOnDeploy: Story = {
         throw new Error("Failed to deploy contract");
       },
     },
+    onLaunchSuccess: () => {},
+    projectSlug: "test-project",
+    teamSlug: "test-team",
   },
 };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-airdrop.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-airdrop.tsx
index 59102c6ef42..86d77ba4c77 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-airdrop.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-airdrop.tsx
@@ -1,11 +1,22 @@
 /* eslint-disable @next/next/no-img-element */
 "use client";
 
+import { useCsvUpload } from "hooks/useCsvUpload";
+import {
+  ArrowRightIcon,
+  ArrowUpFromLineIcon,
+  CircleAlertIcon,
+  FileTextIcon,
+  RotateCcwIcon,
+  XIcon,
+} from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import { DropZone } from "@/components/blocks/drop-zone/drop-zone";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { InlineCode } from "@/components/ui/inline-code";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Sheet,
   SheetContent,
@@ -26,17 +37,6 @@ import {
 } from "@/components/ui/table";
 import { Textarea } from "@/components/ui/textarea";
 import { cn } from "@/lib/utils";
-import { useCsvUpload } from "hooks/useCsvUpload";
-import {
-  ArrowRightIcon,
-  ArrowUpFromLineIcon,
-  CircleAlertIcon,
-  FileTextIcon,
-  RotateCcwIcon,
-  XIcon,
-} from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import { DownloadFileButton } from "../../_common/download-file-button";
 import type { TokenDistributionForm } from "../_common/form";
 
@@ -121,13 +121,13 @@ export function TokenAirdropSection(props: {
                         </SheetTitle>
                       </SheetHeader>
                       <AirdropTable
-                        data={airdropAddresses}
                         className="rounded-b-none"
+                        data={airdropAddresses}
                       />
                       <div className="flex justify-end gap-3 rounded-b-lg border border-t-0 bg-card p-6">
                         <Button
-                          variant="outline"
                           onClick={removeAirdropAddresses}
+                          variant="outline"
                         >
                           <XIcon className="mr-2 size-4" />
                           Remove
@@ -137,10 +137,10 @@ export function TokenAirdropSection(props: {
                   </Sheet>
 
                   <Button
+                    className="gap-2"
+                    onClick={removeAirdropAddresses}
                     size="sm"
                     variant="outline"
-                    onClick={removeAirdropAddresses}
-                    className="gap-2"
                   >
                     <XIcon className="size-4" />
                     Remove
@@ -149,7 +149,7 @@ export function TokenAirdropSection(props: {
               </div>
             ) : (
               <div>
-                <Sheet open={showUploadSheet} onOpenChange={setShowUploadSheet}>
+                <Sheet onOpenChange={setShowUploadSheet} open={showUploadSheet}>
                   <SheetContent className="flex h-dvh w-full flex-col gap-0 overflow-hidden lg:max-w-2xl">
                     <SheetHeader className="mb-3">
                       <SheetTitle className="text-left font-semibold text-lg">
@@ -162,19 +162,19 @@ export function TokenAirdropSection(props: {
                     </SheetHeader>
                     <AirdropUpload
                       client={props.client}
+                      onClose={() => setShowUploadSheet(false)}
                       setAirdrop={(addresses) => {
                         props.form.setValue("airdropAddresses", addresses);
                         setShowUploadSheet(false);
                       }}
-                      onClose={() => setShowUploadSheet(false)}
                     />
                   </SheetContent>
                 </Sheet>
 
                 <Button
-                  variant="outline"
-                  onClick={() => setShowUploadSheet(true)}
                   className="min-w-44 gap-2 bg-background"
+                  onClick={() => setShowUploadSheet(true)}
+                  variant="outline"
                 >
                   <ArrowUpFromLineIcon className="size-4 text-muted-foreground" />
                   Set up Airdrop
@@ -241,6 +241,7 @@ const AirdropUpload: React.FC<AirdropUploadProps> = ({
   const [textInput, setTextInput] = useState("");
 
   const csvUpload = useCsvUpload<AirdropAddressInput>({
+    client,
     csvParser: (items: AirdropAddressInput[]) => {
       return items
         .map(({ address, quantity }) => ({
@@ -249,7 +250,6 @@ const AirdropUpload: React.FC<AirdropUploadProps> = ({
         }))
         .filter(({ address }) => address !== "");
     },
-    client,
   });
 
   const normalizeData = csvUpload.normalizeQuery.data;
@@ -274,8 +274,8 @@ const AirdropUpload: React.FC<AirdropUploadProps> = ({
     setAirdrop(
       normalizeData.result.map((o) => ({
         address: o.resolvedAddress || o.address,
-        quantity: o.quantity,
         isValid: o.isValid,
+        quantity: o.quantity,
       })),
     );
     onClose();
@@ -298,11 +298,11 @@ const AirdropUpload: React.FC<AirdropUploadProps> = ({
             </p>
           )}
           <AirdropTable
-            data={normalizeData.result}
             className="rounded-b-none"
+            data={normalizeData.result}
           />
           <div className="flex justify-between gap-3 rounded-b-lg border border-t-0 bg-card p-6">
-            <Button variant="outline" onClick={handleReset}>
+            <Button onClick={handleReset} variant="outline">
               <RotateCcwIcon className="mr-2 size-4" />
               Reset
             </Button>
@@ -330,18 +330,18 @@ const AirdropUpload: React.FC<AirdropUploadProps> = ({
 
             <DropZone
               accept=".csv"
-              isError={csvUpload.noCsv}
-              title={csvUpload.noCsv ? "Invalid CSV" : "Upload CSV File"}
               description={
                 csvUpload.noCsv
                   ? "Your CSV does not contain the 'address' & 'quantity' columns"
                   : "Drag and drop your file or click here to upload"
               }
+              isError={csvUpload.noCsv}
               onDrop={csvUpload.setFiles}
               resetButton={{
                 label: "Remove Invalid CSV",
                 onClick: handleReset,
               }}
+              title={csvUpload.noCsv ? "Invalid CSV" : "Upload CSV File"}
             />
           </div>
 
@@ -369,24 +369,24 @@ const AirdropUpload: React.FC<AirdropUploadProps> = ({
               </p>
               <div className="space-y-3">
                 <Textarea
-                  placeholder={`\
-0x314ab97b76e39d63c78d5c86c2daf8eaa306b182 3.141592
-thirdweb.eth,2.7182
-0x141ca95b6177615fb1417cf70e930e102bf8f384=1.41421`}
-                  value={textInput}
-                  onChange={(e) => setTextInput(e.target.value)}
                   className="min-h-[120px] font-mono text-sm"
+                  onChange={(e) => setTextInput(e.target.value)}
                   onKeyDown={(e) => {
                     if (e.key === "Enter" && e.ctrlKey) {
                       e.preventDefault();
                       handleTextSubmit();
                     }
                   }}
+                  placeholder={`\
+0x314ab97b76e39d63c78d5c86c2daf8eaa306b182 3.141592
+thirdweb.eth,2.7182
+0x141ca95b6177615fb1417cf70e930e102bf8f384=1.41421`}
+                  value={textInput}
                 />
                 <Button
-                  onClick={handleTextSubmit}
-                  disabled={!textInput.trim()}
                   className="w-full"
+                  disabled={!textInput.trim()}
+                  onClick={handleTextSubmit}
                 >
                   Enter
                 </Button>
@@ -421,9 +421,9 @@ function CSVFormatDetails() {
 
       <DownloadFileButton
         fileContent={exampleCSV}
+        fileFormat="text/csv"
         fileNameWithExtension="airdrop.csv"
         label="Download Example CSV"
-        fileFormat="text/csv"
       />
     </div>
   );
@@ -451,8 +451,8 @@ function AirdropTable(props: {
         </TableHeader>
         <TableBody>
           {props.data.map((item, index) => (
-            // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-            <TableRow key={index} className="!border-b">
+            // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
+            <TableRow className="!border-b" key={index}>
               <TableCell>
                 {item.isValid ? (
                   item.address
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-distribution.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-distribution.tsx
index d1fd1b229c3..b15dba1adb1 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-distribution.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-distribution.tsx
@@ -1,13 +1,14 @@
 "use client";
 
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { useId } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import {
   DistributionBarChart,
   type Segment,
 } from "@/components/blocks/distribution-chart";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Form } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import type { ThirdwebClient } from "thirdweb";
 import { StepCard } from "../../_common/step-card";
 import type {
   TokenDistributionForm,
@@ -28,29 +29,31 @@ export function TokenDistributionFieldset(props: {
   const { form } = props;
   const distributionError = getDistributionError(form);
 
+  const supplyId = useId();
+
   return (
     <Form {...form}>
       <form onSubmit={form.handleSubmit(props.onNext)}>
         <StepCard
-          title="Coin Distribution"
-          prevButton={{
-            onClick: props.onPrevious,
-          }}
           nextButton={{
-            type: "submit",
             disabled: !!distributionError,
+            type: "submit",
+          }}
+          prevButton={{
+            onClick: props.onPrevious,
           }}
+          title="Coin Distribution"
         >
           <div>
             <div className="space-y-6 p-4 md:px-6 md:py-6">
               <FormFieldSetup
-                label="Total Supply"
-                isRequired
-                htmlFor="supply"
                 errorMessage={form.formState.errors.supply?.message}
+                htmlFor={supplyId}
+                isRequired
+                label="Total Supply"
               >
                 <div className="relative">
-                  <Input id="supply" {...form.register("supply")} />
+                  <Input id={supplyId} {...form.register("supply")} />
                   <span className="-translate-y-1/2 absolute top-1/2 right-3 text-muted-foreground text-sm">
                     {props.tokenSymbol || "Tokens"}
                   </span>
@@ -70,11 +73,11 @@ export function TokenDistributionFieldset(props: {
               </div>
             </div>
 
-            <TokenAirdropSection form={form} client={props.client} />
+            <TokenAirdropSection client={props.client} form={form} />
             <TokenSaleSection
-              form={form}
               chainId={props.chainId}
               client={props.client}
+              form={form}
             />
           </div>
         </StepCard>
@@ -131,19 +134,19 @@ export function TokenDistributionBarChart(props: {
 
   const tokenAllocations: Segment[] = [
     {
+      color: "hsl(var(--chart-1))",
       label: "Owner",
       percent: ownerPercentage,
-      color: "hsl(var(--chart-1))",
     },
     {
+      color: "hsl(var(--chart-3))",
       label: "Airdrop",
       percent: airdropPercentage,
-      color: "hsl(var(--chart-3))",
     },
     {
+      color: "hsl(var(--chart-4))",
       label: "Sale",
       percent: salePercentage,
-      color: "hsl(var(--chart-4))",
     },
   ];
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-sale.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-sale.tsx
index 4240d8a5fc9..67a4c9938d6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-sale.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-sale.tsx
@@ -1,11 +1,11 @@
 "use client";
 
+import type { ThirdwebClient } from "thirdweb";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { TokenSelector } from "@/components/blocks/TokenSelector";
 import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { DecimalInput } from "@/components/ui/decimal-input";
 import { Switch } from "@/components/ui/switch";
-import type { ThirdwebClient } from "thirdweb";
 import type { TokenDistributionForm } from "../_common/form";
 
 export function TokenSaleSection(props: {
@@ -45,20 +45,20 @@ export function TokenSaleSection(props: {
         {isEnabled && (
           <div className="mt-4 flex flex-col gap-6">
             <FormFieldSetup
-              label="Sell % of Total Supply"
-              isRequired
-              helperText={`${sellSupply} tokens`}
               errorMessage={
                 props.form.formState.errors.saleAllocationPercentage?.message
               }
+              helperText={`${sellSupply} tokens`}
+              isRequired
+              label="Sell % of Total Supply"
             >
               <div className="relative">
                 <DecimalInput
                   maxValue={100}
-                  value={props.form.watch("saleAllocationPercentage")}
                   onChange={(value) => {
                     props.form.setValue("saleAllocationPercentage", value);
                   }}
+                  value={props.form.watch("saleAllocationPercentage")}
                 />
                 <span className="-translate-y-1/2 absolute top-1/2 right-3 text-muted-foreground text-sm">
                   %
@@ -68,41 +68,41 @@ export function TokenSaleSection(props: {
 
             <div className="grid grid-cols-1 gap-4 lg:grid-cols-2">
               <FormFieldSetup
-                label="Price per Token"
-                isRequired
                 errorMessage={props.form.formState.errors.salePrice?.message}
+                isRequired
+                label="Price per Token"
               >
                 <div className="relative">
                   <DecimalInput
-                    value={props.form.watch("salePrice")}
                     onChange={(value) => {
                       props.form.setValue("salePrice", value);
                     }}
+                    value={props.form.watch("salePrice")}
                   />
                 </div>
               </FormFieldSetup>
 
               <FormFieldSetup
-                label="Currency"
-                isRequired
                 errorMessage={
                   props.form.formState.errors.saleTokenAddress?.message
                 }
+                isRequired
+                label="Currency"
               >
                 <TokenSelector
-                  className="bg-background"
                   addNativeTokenIfMissing={true}
-                  showCheck={true}
+                  chainId={Number(props.chainId)}
+                  className="bg-background"
+                  client={props.client}
                   disableAddress={true}
+                  onChange={(value) => {
+                    props.form.setValue("saleTokenAddress", value.address);
+                  }}
                   selectedToken={{
                     address: props.form.watch("saleTokenAddress"),
                     chainId: Number(props.chainId),
                   }}
-                  onChange={(value) => {
-                    props.form.setValue("saleTokenAddress", value.address);
-                  }}
-                  client={props.client}
-                  chainId={Number(props.chainId)}
+                  showCheck={true}
                 />
               </FormFieldSetup>
             </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/launch/launch-token.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/launch/launch-token.tsx
index efeaf0183b4..703713fd0ef 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/launch/launch-token.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/launch/launch-token.tsx
@@ -1,4 +1,15 @@
 "use client";
+import { TransactionButton } from "components/buttons/TransactionButton";
+import {
+  ArrowRightIcon,
+  ArrowUpFromLineIcon,
+  ImageOffIcon,
+} from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
+import { useActiveWallet } from "thirdweb/react";
+import { parseError } from "utils/errorParser";
 import {
   reportAssetCreationFailed,
   reportAssetCreationSuccessful,
@@ -15,17 +26,6 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import {
-  ArrowRightIcon,
-  ArrowUpFromLineIcon,
-  ImageOffIcon,
-} from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
-import { useActiveWallet } from "thirdweb/react";
-import { parseError } from "utils/errorParser";
 import { ChainOverview } from "../../_common/chain-overview";
 import { FilePreview } from "../../_common/file-preview";
 import { StepCard } from "../../_common/step-card";
@@ -34,10 +34,10 @@ import type { CreateTokenFunctions } from "../create-token-page.client";
 import { TokenDistributionBarChart } from "../distribution/token-distribution";
 
 const stepIds = {
+  "airdrop-tokens": "airdrop-tokens",
   "deploy-contract": "deploy-contract",
-  "set-claim-conditions": "set-claim-conditions",
   "mint-tokens": "mint-tokens",
-  "airdrop-tokens": "airdrop-tokens",
+  "set-claim-conditions": "set-claim-conditions",
 } as const;
 
 type StepId = keyof typeof stepIds;
@@ -75,26 +75,26 @@ export function LaunchTokenStatus(props: {
   async function handleSubmitClick() {
     const initialSteps: MultiStepState<StepId>[] = [
       {
-        label: "Deploy contract",
         id: stepIds["deploy-contract"],
+        label: "Deploy contract",
         status: { type: "idle" },
       },
       {
-        label: "Set claim conditions",
         id: stepIds["set-claim-conditions"],
+        label: "Set claim conditions",
         status: { type: "idle" },
       },
       {
-        label: "Mint tokens",
         id: stepIds["mint-tokens"],
+        label: "Mint tokens",
         status: { type: "idle" },
       },
     ];
 
     if (formValues.airdropEnabled && formValues.airdropAddresses.length > 0) {
       initialSteps.push({
-        label: "Airdrop tokens",
         id: stepIds["airdrop-tokens"],
+        label: "Airdrop tokens",
         status: { type: "idle" },
       });
     }
@@ -153,8 +153,8 @@ export function LaunchTokenStatus(props: {
         });
 
         updateStatus(i, {
-          type: "error",
           message: errorMessage,
+          type: "error",
         });
 
         throw error;
@@ -180,40 +180,40 @@ export function LaunchTokenStatus(props: {
 
   return (
     <StepCard
-      title="Launch Coin"
-      prevButton={{
-        onClick: props.onPrevious,
-      }}
       nextButton={{
-        type: "custom",
         custom: (
           <TransactionButton
             client={props.client}
-            variant="default"
-            txChainID={Number(formValues.chain)}
             isLoggedIn={true}
             isPending={false}
-            transactionCount={undefined}
             onClick={handleSubmitClick}
+            transactionCount={undefined}
+            txChainID={Number(formValues.chain)}
+            variant="default"
           >
             <ArrowUpFromLineIcon className="size-4" />
             Launch Coin
           </TransactionButton>
         ),
+        type: "custom",
+      }}
+      prevButton={{
+        onClick: props.onPrevious,
       }}
+      title="Launch Coin"
     >
       {/* Token info */}
       <div className="flex flex-col gap-6 border-b border-dashed px-4 py-6 pb-6 md:px-6 lg:flex-row">
-        <OverviewField name="Image" className="shrink-0">
+        <OverviewField className="shrink-0" name="Image">
           <FilePreview
-            client={props.client}
-            srcOrFile={formValues.image}
             className="size-24 rounded-lg border object-cover"
+            client={props.client}
             fallback={
               <div className="flex items-center justify-center bg-muted/50">
                 <ImageOffIcon className="size-5 text-muted-foreground" />
               </div>
             }
+            srcOrFile={formValues.image}
           />
         </OverviewField>
 
@@ -228,7 +228,7 @@ export function LaunchTokenStatus(props: {
             </OverviewField>
 
             <OverviewField name="Chain">
-              <ChainOverview client={props.client} chainId={formValues.chain} />
+              <ChainOverview chainId={formValues.chain} client={props.client} />
             </OverviewField>
           </div>
 
@@ -271,7 +271,7 @@ export function LaunchTokenStatus(props: {
               )}
             </DialogHeader>
 
-            <MultiStepStatus steps={steps} onRetry={handleRetry} />
+            <MultiStepStatus onRetry={handleRetry} steps={steps} />
           </div>
 
           <div className="mt-2 flex justify-between gap-4 border-border border-t bg-card p-6">
@@ -288,13 +288,13 @@ export function LaunchTokenStatus(props: {
             )}
 
             <Button
-              variant="outline"
               disabled={isPending}
               onClick={() => {
                 setIsModalOpen(false);
                 // reset steps
                 setSteps([]);
               }}
+              variant="outline"
             >
               {isComplete ? "Close" : "Cancel"}
             </Button>
@@ -306,8 +306,8 @@ export function LaunchTokenStatus(props: {
 }
 
 const compactNumberFormatter = new Intl.NumberFormat("en-US", {
-  notation: "compact",
   maximumFractionDigits: 10,
+  notation: "compact",
 });
 
 function OverviewField(props: {
@@ -323,8 +323,6 @@ function OverviewField(props: {
   );
 }
 
-function OverviewFieldValue(props: {
-  value: string;
-}) {
+function OverviewFieldValue(props: { value: string }) {
   return <p className="text-foreground text-sm">{props.value}</p>;
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/page.tsx
index 60244217977..2b5a0a94b3a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/page.tsx
@@ -1,7 +1,7 @@
+import { redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
 import {
   getAuthToken,
   getAuthTokenWalletAddress,
@@ -44,20 +44,20 @@ export default async function Page(props: {
   return (
     <div className="flex grow flex-col">
       <CreateAssetPageHeader
-        teamSlug={params.team_slug}
+        containerClassName="container max-w-5xl"
+        description="Launch an ERC-20 coin for your project"
         projectSlug={params.project_slug}
+        teamSlug={params.team_slug}
         title="Create Coin"
-        description="Launch an ERC-20 coin for your project"
-        containerClassName="container max-w-5xl"
       />
       <div className="container max-w-5xl pt-8 pb-32">
         <CreateTokenAssetPage
-          teamSlug={params.team_slug}
-          projectSlug={params.project_slug}
           accountAddress={accountAddress}
           client={client}
-          teamId={team.id}
           projectId={project.id}
+          projectSlug={params.project_slug}
+          teamId={team.id}
+          teamSlug={params.team_slug}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/token-info/token-info-fieldset.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/token-info/token-info-fieldset.tsx
index a831bae2a71..a9caea446c5 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/token-info/token-info-fieldset.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/token-info/token-info-fieldset.tsx
@@ -1,13 +1,14 @@
 "use client";
 
+import { FileInput } from "components/shared/FileInput";
+import { useId } from "react";
+import type { ThirdwebClient } from "thirdweb";
+import { ClientOnly } from "@/components/blocks/client-only";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { ClientOnly } from "@/components/blocks/client-only";
 import { Form } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { FileInput } from "components/shared/FileInput";
-import type { ThirdwebClient } from "thirdweb";
 import { SocialUrlsFieldset } from "../../_common/SocialUrls";
 import { StepCard } from "../../_common/step-card";
 import type { TokenInfoForm } from "../_common/form";
@@ -19,33 +20,37 @@ export function TokenInfoFieldset(props: {
   onChainUpdated: () => void;
 }) {
   const { form } = props;
+  const nameId = useId();
+  const symbolId = useId();
+  const descriptionId = useId();
+
   return (
     <Form {...form}>
       <form onSubmit={form.handleSubmit(props.onNext)}>
         <StepCard
-          title="Coin Information"
-          prevButton={undefined}
           nextButton={{
             type: "submit",
           }}
+          prevButton={undefined}
+          title="Coin Information"
         >
           <div className="flex flex-col gap-6 px-4 py-6 md:grid md:grid-cols-[280px_1fr] md:px-6">
             {/* left */}
             <FormFieldSetup
               errorMessage={form.formState.errors.image?.message as string}
-              label="Image"
               isRequired={false}
+              label="Image"
             >
               <FileInput
                 accept={{ "image/*": [] }}
+                className="rounded-lg border-border bg-background transition-all duration-200 hover:border-active-border hover:bg-background"
                 client={props.client}
-                value={form.watch("image")}
                 setValue={(file) =>
                   form.setValue("image", file, {
                     shouldTouch: true,
                   })
                 }
-                className="rounded-lg border-border bg-background transition-all duration-200 hover:border-active-border hover:bg-background"
+                value={form.watch("image")}
               />
             </FormFieldSetup>
 
@@ -55,13 +60,13 @@ export function TokenInfoFieldset(props: {
               <div className="flex flex-col gap-6 lg:flex-row lg:gap-4">
                 <FormFieldSetup
                   className="grow"
-                  label="Name"
-                  isRequired
-                  htmlFor="name"
                   errorMessage={form.formState.errors.name?.message}
+                  htmlFor={nameId}
+                  isRequired
+                  label="Name"
                 >
                   <Input
-                    id="name"
+                    id={nameId}
                     placeholder="My Coin"
                     {...form.register("name")}
                   />
@@ -69,13 +74,13 @@ export function TokenInfoFieldset(props: {
 
                 <FormFieldSetup
                   className="lg:max-w-[200px]"
-                  label="Symbol"
-                  isRequired
-                  htmlFor="symbol"
                   errorMessage={form.formState.errors.symbol?.message}
+                  htmlFor={symbolId}
+                  isRequired
+                  label="Symbol"
                 >
                   <Input
-                    id="symbol"
+                    id={symbolId}
                     placeholder="XYZ"
                     {...form.register("symbol")}
                   />
@@ -84,36 +89,36 @@ export function TokenInfoFieldset(props: {
 
               {/* chain */}
               <FormFieldSetup
-                label="Chain"
-                isRequired
-                htmlFor="chain"
                 errorMessage={form.formState.errors.chain?.message}
+                htmlFor="chain"
+                isRequired
+                label="Chain"
               >
                 <ClientOnly ssr={null}>
                   <SingleNetworkSelector
+                    chainId={Number(form.watch("chain"))}
                     className="bg-background"
                     client={props.client}
-                    chainId={Number(form.watch("chain"))}
+                    disableChainId
                     onChange={(chain) => {
                       form.setValue("chain", chain.toString());
                       props.onChainUpdated();
                     }}
-                    disableChainId
                   />
                 </ClientOnly>
               </FormFieldSetup>
 
               <FormFieldSetup
-                label="Description"
-                isRequired={false}
-                htmlFor="description"
                 className="flex grow flex-col"
                 errorMessage={form.formState.errors.description?.message}
+                htmlFor={descriptionId}
+                isRequired={false}
+                label="Description"
               >
                 <Textarea
-                  id="description"
-                  placeholder="Describe your coin"
                   className="grow"
+                  id={descriptionId}
+                  placeholder="Describe your coin"
                   {...form.register("description")}
                 />
               </FormFieldSetup>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/page.tsx
index f32490c1062..9d1208d1f18 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/page.tsx
@@ -1,11 +1,11 @@
+import { redirect } from "next/navigation";
+import { Suspense } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
 import { ClientOnly } from "@/components/blocks/client-only";
 import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
-import { Suspense } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import { ContractTable } from "../../../../../../../components/contract-components/tables/contract-table";
 import { getSortedDeployedContracts } from "../../../../../account/contracts/_components/getSortedDeployedContracts";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
@@ -45,11 +45,11 @@ export default async function Page(props: {
       <AssetsHeader />
       <div className="container max-w-7xl pt-8 pb-20">
         <Cards
-          teamSlug={params.team_slug}
-          projectSlug={params.project_slug}
           client={client}
-          teamId={team.id}
           projectId={project.id}
+          projectSlug={params.project_slug}
+          teamId={team.id}
+          teamSlug={params.team_slug}
         />
 
         <div className="mt-10 mb-3">
@@ -61,12 +61,12 @@ export default async function Page(props: {
 
         <Suspense fallback={<GenericLoadingPage />}>
           <AssetsPageAsync
-            teamId={team.id}
-            projectId={project.id}
             authToken={authToken}
             client={client}
-            teamSlug={params.team_slug}
+            projectId={project.id}
             projectSlug={params.project_slug}
+            teamId={team.id}
+            teamSlug={params.team_slug}
           />
         </Suspense>
       </div>
@@ -98,23 +98,23 @@ async function AssetsPageAsync(props: {
   projectSlug: string;
 }) {
   const deployedContracts = await getSortedDeployedContracts({
-    teamId: props.teamId,
-    projectId: props.projectId,
     authToken: props.authToken,
     deploymentType: "asset",
+    projectId: props.projectId,
+    teamId: props.teamId,
   });
 
   return (
     <ClientOnly ssr={<GenericLoadingPage />}>
       <ContractTable
-        variant="asset"
+        client={props.client}
         contracts={deployedContracts}
         pageSize={10}
-        teamId={props.teamId}
         projectId={props.projectId}
-        client={props.client}
-        teamSlug={props.teamSlug}
         projectSlug={props.projectSlug}
+        teamId={props.teamId}
+        teamSlug={props.teamSlug}
+        variant="asset"
       />
     </ClientOnly>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/EngineCloudBarChartCard.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/EngineCloudBarChartCard.stories.tsx
index db9654c18fa..fa63a483718 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/EngineCloudBarChartCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/EngineCloudBarChartCard.stories.tsx
@@ -4,8 +4,8 @@ import type { EngineCloudStats } from "types/analytics";
 import { EngineCloudBarChartCardUI } from "./EngineCloudBarChartCardUI";
 
 const meta = {
-  title: "Analytics/EngineCloudBarChartCard",
   component: Component,
+  title: "Analytics/EngineCloudBarChartCard",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -27,9 +27,9 @@ const generateTimeSeriesData = (days: number, pathnames: string[]) => {
     const dateStr = date.toISOString().split("T")[0];
     for (const pathname of pathnames) {
       data.push({
+        chainId: "84532",
         // biome-ignore lint/style/noNonNullAssertion: we know this is not null
         date: dateStr!,
-        chainId: "84532",
         pathname,
         totalRequests: Math.floor(Math.random() * 1000) + 100,
       });
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/EngineCloudBarChartCardUI.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/EngineCloudBarChartCardUI.tsx
index 95a7d58ecf1..48dc0f2325f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/EngineCloudBarChartCardUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/EngineCloudBarChartCardUI.tsx
@@ -1,11 +1,4 @@
 "use client";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import {
-  type ChartConfig,
-  ChartContainer,
-  ChartTooltip,
-  ChartTooltipContent,
-} from "@/components/ui/chart";
 import { format } from "date-fns";
 import { useMemo } from "react";
 import {
@@ -15,11 +8,20 @@ import {
   XAxis,
 } from "recharts";
 import type { EngineCloudStats } from "types/analytics";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import {
+  type ChartConfig,
+  ChartContainer,
+  ChartTooltip,
+  ChartTooltipContent,
+} from "@/components/ui/chart";
 import { EmptyStateCard } from "../../../../../components/Analytics/EmptyStateCard";
 
 export function EngineCloudBarChartCardUI({
   rawData,
-}: { rawData: EngineCloudStats[] }) {
+}: {
+  rawData: EngineCloudStats[];
+}) {
   const { data, pathnames, chartConfig, isAllEmpty } = useMemo(() => {
     // Dynamically collect all unique pathnames
     const pathnameSet = new Set<string>();
@@ -56,15 +58,15 @@ export function EngineCloudBarChartCardUI({
     }
 
     return {
-      data,
-      pathnames,
       chartConfig,
+      data,
       isAllEmpty: data.every((d) => d.total === 0),
+      pathnames,
     };
   }, [rawData]);
 
   if (data.length === 0 || isAllEmpty) {
-    return <EmptyStateCard metric="RPC" link="https://portal.thirdweb.com/" />;
+    return <EmptyStateCard link="https://portal.thirdweb.com/" metric="RPC" />;
   }
 
   return (
@@ -78,8 +80,8 @@ export function EngineCloudBarChartCardUI({
       </CardHeader>
       <CardContent className="px-2 sm:p-6 sm:pl-0">
         <ChartContainer
-          config={chartConfig}
           className="aspect-auto h-[250px] w-full pt-6"
+          config={chartConfig}
         >
           <RechartsBarChart
             accessibilityLayer
@@ -91,18 +93,18 @@ export function EngineCloudBarChartCardUI({
           >
             <CartesianGrid vertical={false} />
             <XAxis
-              dataKey="date"
-              tickLine={false}
               axisLine={false}
-              tickMargin={8}
+              dataKey="date"
               minTickGap={32}
               tickFormatter={(value: string) => {
                 const date = new Date(value);
                 return date.toLocaleDateString("en-US", {
-                  month: "short",
                   day: "numeric",
+                  month: "short",
                 });
               }}
+              tickLine={false}
+              tickMargin={8}
             />
             <ChartTooltip
               content={
@@ -117,18 +119,18 @@ export function EngineCloudBarChartCardUI({
             />
             {pathnames.map((pathname, idx) => (
               <Bar
-                key={pathname}
-                stackId="a"
+                className="stroke-background"
                 dataKey={pathname}
+                fill={`hsl(var(--chart-${idx + 1}))`}
+                key={pathname}
                 radius={[
                   idx === pathnames.length - 1 ? 4 : 0,
                   idx === pathnames.length - 1 ? 4 : 0,
                   idx === 0 ? 4 : 0,
                   idx === 0 ? 4 : 0,
                 ]}
-                fill={`hsl(var(--chart-${idx + 1}))`}
+                stackId="a"
                 strokeWidth={1}
-                className="stroke-background"
               />
             ))}
           </RechartsBarChart>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/index.tsx
index 4b18147f63e..3df548228a8 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/index.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/EngineCloudChartCard/index.tsx
@@ -1,7 +1,7 @@
-import { getEngineCloudMethodUsage } from "@/api/analytics";
 import { LoadingChartState } from "components/analytics/empty-chart-state";
 import { Suspense } from "react";
 import type { AnalyticsQueryParams } from "types/analytics";
+import { getEngineCloudMethodUsage } from "@/api/analytics";
 import { EngineCloudBarChartCardUI } from "./EngineCloudBarChartCardUI";
 
 export function EngineCloudChartCard(props: AnalyticsQueryParams) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ClientIDSection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ClientIDSection.tsx
index cd28c9c5236..0dd8e8119f4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ClientIDSection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ClientIDSection.tsx
@@ -1,8 +1,6 @@
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 
-export function ClientIDSection(props: {
-  clientId: string;
-}) {
+export function ClientIDSection(props: { clientId: string }) {
   return (
     <div>
       <h3>Client ID</h3>
@@ -11,10 +9,10 @@ export function ClientIDSection(props: {
       </p>
 
       <CopyTextButton
-        textToCopy={props.clientId}
         className="!h-auto w-full max-w-[400px] justify-between truncate bg-background px-3 py-3 font-mono"
-        textToShow={props.clientId}
         copyIconPosition="right"
+        textToCopy={props.clientId}
+        textToShow={props.clientId}
         tooltip="Copy Client ID"
       />
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/IntegrateAPIKeyCodeTabs.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/IntegrateAPIKeyCodeTabs.tsx
index 9d971063ad9..80f35934d75 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/IntegrateAPIKeyCodeTabs.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/IntegrateAPIKeyCodeTabs.tsx
@@ -1,15 +1,15 @@
 "use client";
 
-import { TabButtons } from "@/components/ui/tabs";
 import { useState } from "react";
+import { TabButtons } from "@/components/ui/tabs";
 
 type TabKey = "ts" | "react" | "react-native" | "dotnet" | "unity" | "unreal";
 
 const tabNames: Record<TabKey, string> = {
-  ts: "TypeScript",
+  dotnet: ".NET",
   react: "React",
   "react-native": "React Native",
-  dotnet: ".NET",
+  ts: "TypeScript",
   unity: "Unity",
   unreal: "Unreal Engine",
 };
@@ -24,9 +24,9 @@ export function IntegrateAPIKeyCodeTabs(props: {
       <TabButtons
         tabClassName="!text-sm"
         tabs={Object.entries(tabNames).map(([key, name]) => ({
+          isActive: tab === key,
           name,
           onClick: () => setTab(key as TabKey),
-          isActive: tab === key,
         }))}
       />
       <div className="h-2" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ProjectFTUX.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ProjectFTUX.stories.tsx
index 9608fe8ec26..aec7630c91e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ProjectFTUX.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ProjectFTUX.stories.tsx
@@ -3,7 +3,6 @@ import { projectStub } from "stories/stubs";
 import { ProjectFTUX } from "./ProjectFTUX";
 
 const meta = {
-  title: "Project/ProjectFTUX",
   component: ProjectFTUX,
   decorators: [
     (Story) => (
@@ -12,6 +11,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Project/ProjectFTUX",
 } satisfies Meta<typeof ProjectFTUX>;
 
 export default meta;
@@ -24,9 +24,9 @@ export const Default: Story = {
       secretKeys: [
         {
           createdAt: new Date().toISOString(),
-          updatedAt: new Date().toISOString(),
           hash: "1234567890",
           masked: "1234567890",
+          updatedAt: new Date().toISOString(),
         },
       ],
     },
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ProjectFTUX.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ProjectFTUX.tsx
index 1b70b3fd1e8..a3345a72ad4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ProjectFTUX.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/ProjectFTUX.tsx
@@ -1,7 +1,3 @@
-import type { Project } from "@/api/projects";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { CodeServer } from "@/components/ui/code/code.server";
 import { DotNetIcon } from "components/icons/brand-icons/DotNetIcon";
 import { GithubIcon } from "components/icons/brand-icons/GithubIcon";
 import { ReactIcon } from "components/icons/brand-icons/ReactIcon";
@@ -14,6 +10,10 @@ import {
   ExternalLinkIcon,
 } from "lucide-react";
 import Link from "next/link";
+import type { Project } from "@/api/projects";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { CodeServer } from "@/components/ui/code/code.server";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { ContractIcon } from "../../../../../../(dashboard)/(chain)/components/server/icons/ContractIcon";
 import { EngineIcon } from "../../../../../../(dashboard)/(chain)/components/server/icons/EngineIcon";
 import { InsightIcon } from "../../../../../../(dashboard)/(chain)/components/server/icons/InsightIcon";
@@ -30,8 +30,8 @@ export function ProjectFTUX(props: { project: Project; teamSlug: string }) {
         teamSlug={props.teamSlug}
       />
       <ProductsSection
-        teamSlug={props.teamSlug}
         projectSlug={props.project.slug}
+        teamSlug={props.teamSlug}
       />
       <SDKSection />
       <StarterKitsSection />
@@ -62,9 +62,9 @@ function IntegrateAPIKeySection({
           <ClientIDSection clientId={clientId} />
           {secretKeyMasked && (
             <SecretKeySection
+              projectId={project.id}
               secretKeyMasked={secretKeyMasked}
               teamId={project.teamId}
-              projectId={project.id}
             />
           )}
         </div>
@@ -83,29 +83,55 @@ function IntegrationCodeExamples(props: {
   return (
     <IntegrateAPIKeyCodeTabs
       tabs={{
-        ts: (
-          <CodeServer
-            code={typescriptCodeExample(props.project)}
-            lang="ts"
-            className="bg-background"
-          />
+        dotnet: (
+          <div className="flex flex-col gap-3">
+            <CodeServer
+              className="bg-background"
+              code={dotNotCodeExample(props.project)}
+              lang="csharp"
+            />
+            <Alert className="bg-background" variant="info">
+              <CircleAlertIcon className="size-5" />
+              <AlertTitle>
+                Configure your app's bundle ID in "Allowed Bundle IDs" in
+                Project
+              </AlertTitle>
+              <AlertDescription className="leading-loose">
+                Go to{" "}
+                <UnderlineLink
+                  href={`/team/${props.teamSlug}/${props.project.slug}/settings`}
+                  target="_blank"
+                >
+                  Project settings
+                </UnderlineLink>{" "}
+                and add your app's bundle ID to the "Allowed Bundle IDs" list.
+              </AlertDescription>
+            </Alert>
+          </div>
         ),
         react: (
           <CodeServer
+            className="bg-background"
             code={reactCodeExample(props.project)}
             lang="ts"
-            className="bg-background"
           />
         ),
         "react-native": (
           <CodeServer
+            className="bg-background"
             code={reactCodeExample(props.project)}
             lang="ts"
+          />
+        ),
+        ts: (
+          <CodeServer
             className="bg-background"
+            code={typescriptCodeExample(props.project)}
+            lang="ts"
           />
         ),
         unity: (
-          <Alert variant="info" className="bg-background">
+          <Alert className="bg-background" variant="info">
             <CircleAlertIcon className="size-5" />
             <AlertTitle>
               Configure Client ID in Thirdweb Manager prefab
@@ -114,8 +140,8 @@ function IntegrationCodeExamples(props: {
               Configure "Client ID" and "Bundle ID" in{" "}
               <UnderlineLink
                 href="https://portal.thirdweb.com/unity/v5/thirdwebmanager"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 Thirdweb Manager prefab
               </UnderlineLink>
@@ -123,9 +149,9 @@ function IntegrationCodeExamples(props: {
                 Make sure to configure your app's bundle ID in "Allowed Bundle
                 IDs" in{" "}
                 <UnderlineLink
-                  target="_blank"
                   href={`/team/${props.teamSlug}/${props.project.slug}/settings`}
                   rel="noopener noreferrer"
+                  target="_blank"
                 >
                   Project settings
                 </UnderlineLink>
@@ -133,34 +159,8 @@ function IntegrationCodeExamples(props: {
             </AlertDescription>
           </Alert>
         ),
-        dotnet: (
-          <div className="flex flex-col gap-3">
-            <CodeServer
-              code={dotNotCodeExample(props.project)}
-              lang="csharp"
-              className="bg-background"
-            />
-            <Alert variant="info" className="bg-background">
-              <CircleAlertIcon className="size-5" />
-              <AlertTitle>
-                Configure your app's bundle ID in "Allowed Bundle IDs" in
-                Project
-              </AlertTitle>
-              <AlertDescription className="leading-loose">
-                Go to{" "}
-                <UnderlineLink
-                  target="_blank"
-                  href={`/team/${props.teamSlug}/${props.project.slug}/settings`}
-                >
-                  Project settings
-                </UnderlineLink>{" "}
-                and add your app's bundle ID to the "Allowed Bundle IDs" list.
-              </AlertDescription>
-            </Alert>
-          </div>
-        ),
         unreal: (
-          <Alert variant="info" className="bg-background">
+          <Alert className="bg-background" variant="info">
             <CircleAlertIcon className="size-5" />
             <AlertTitle>
               Configure Client ID in Thirdweb Unreal Plugin{" "}
@@ -169,8 +169,8 @@ function IntegrationCodeExamples(props: {
               Configure "Client ID" and "Bundle ID" in{" "}
               <UnderlineLink
                 href="https://portal.thirdweb.com/unreal-engine/getting-started"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 thirdweb plugin settings
               </UnderlineLink>
@@ -178,9 +178,9 @@ function IntegrationCodeExamples(props: {
                 Make sure to configure your app's bundle ID in "Allowed Bundle
                 IDs" in{" "}
                 <UnderlineLink
-                  target="_blank"
                   href={`/team/${props.teamSlug}/${props.project.slug}/settings`}
                   rel="noopener noreferrer"
+                  target="_blank"
                 >
                   Project settings
                 </UnderlineLink>
@@ -224,10 +224,7 @@ var client = ThirdwebClient.Create(secretKey: "${project.secretKeys[0]?.masked}"
 
 // products section ------------------------------------------------------------
 
-function ProductsSection(props: {
-  teamSlug: string;
-  projectSlug: string;
-}) {
+function ProductsSection(props: { teamSlug: string; projectSlug: string }) {
   const products: Array<{
     title: string;
     description: string;
@@ -236,35 +233,35 @@ function ProductsSection(props: {
     trackingLabel: string;
   }> = [
     {
-      title: "Engine",
       description:
         "Scale your application with a backend server to read, write, and deploy contracts at production-grade.",
       href: `/team/${props.teamSlug}/${props.projectSlug}/engine`,
       icon: EngineIcon,
+      title: "Engine",
       trackingLabel: "engine",
     },
     {
-      title: "Contracts",
       description:
         "Deploy your own contracts or leverage existing solutions for onchain implementation",
       href: `/team/${props.teamSlug}/${props.projectSlug}/contracts`,
       icon: ContractIcon,
+      title: "Contracts",
       trackingLabel: "contracts",
     },
     {
-      title: "Insight",
       description:
         "Add indexing capabilities to retrieve real-time onchain data",
       href: `/team/${props.teamSlug}/${props.projectSlug}/insight`,
       icon: InsightIcon,
+      title: "Insight",
       trackingLabel: "insight",
     },
     {
-      title: "Nebula",
       description:
         "Integrate a blockchain AI model to improve your users insight into your application and the blockchain",
       href: `/team/${props.teamSlug}/${props.projectSlug}/nebula`,
       icon: NebulaIcon,
+      title: "Nebula",
       trackingLabel: "nebula",
     },
   ];
@@ -285,11 +282,11 @@ function ProductsSection(props: {
       <section className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-4">
         {products.map((product) => (
           <ProductCard
-            key={product.title}
-            title={product.title}
             description={product.description}
             href={product.href}
             icon={product.icon}
+            key={product.title}
+            title={product.title}
             trackingLabel={product.trackingLabel}
           />
         ))}
@@ -311,7 +308,7 @@ function ProductCard(props: {
         <props.icon className="size-5 text-muted-foreground" />
       </div>
       <h3 className="mb-0.5 font-semibold text-lg tracking-tight">
-        <Link href={props.href} className="before:absolute before:inset-0">
+        <Link className="before:absolute before:inset-0" href={props.href}>
           {props.title}
         </Link>
       </h3>
@@ -331,39 +328,39 @@ type SDKCardProps = {
 
 const sdks: SDKCardProps[] = [
   {
-    name: "TypeScript",
     href: "https://portal.thirdweb.com/sdk/typescript",
     icon: TypeScriptIcon,
+    name: "TypeScript",
     trackingLabel: "typescript",
   },
   {
-    name: "React",
     href: "https://portal.thirdweb.com/react/v5",
     icon: ReactIcon,
+    name: "React",
     trackingLabel: "react",
   },
   {
-    name: "React Native",
     href: "https://portal.thirdweb.com/react-native/v5",
     icon: ReactIcon,
+    name: "React Native",
     trackingLabel: "react_native",
   },
   {
-    name: "Unity",
     href: "https://portal.thirdweb.com/unity/v5",
     icon: UnityIcon,
+    name: "Unity",
     trackingLabel: "unity",
   },
   {
-    name: "Unreal Engine",
     href: "https://portal.thirdweb.com/unreal-engine",
     icon: UnrealIcon,
+    name: "Unreal Engine",
     trackingLabel: "unreal",
   },
   {
-    name: ".NET",
     href: "https://portal.thirdweb.com/dotnet",
     icon: DotNetIcon,
+    name: ".NET",
     trackingLabel: "dotnet",
   },
 ];
@@ -375,10 +372,10 @@ function SDKSection() {
       <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
         {sdks.map((sdk) => (
           <SDKCard
-            key={sdk.name}
-            name={sdk.name}
             href={sdk.href}
             icon={sdk.icon}
+            key={sdk.name}
+            name={sdk.name}
             trackingLabel={sdk.trackingLabel}
           />
         ))}
@@ -396,10 +393,10 @@ function SDKCard(props: SDKCardProps) {
       <div className="flex flex-col gap-0.5">
         <p className="font-medium text-base">
           <Link
-            href={props.href}
             className="before:absolute before:inset-0"
-            target="_blank"
+            href={props.href}
             rel="noopener noreferrer"
+            target="_blank"
           >
             {props.name}
           </Link>
@@ -423,23 +420,23 @@ type StartedKitCardProps = {
 
 const startedKits: StartedKitCardProps[] = [
   {
-    name: "Next Starter",
     href: "https://github.com/thirdweb-example/next-starter",
+    name: "Next Starter",
     trackingLabel: "next_starter",
   },
   {
-    name: "Vite Starter",
     href: "https://github.com/thirdweb-example/vite-starter",
+    name: "Vite Starter",
     trackingLabel: "vite_starter",
   },
   {
-    name: "Expo Starter",
     href: "https://github.com/thirdweb-example/expo-starter",
+    name: "Expo Starter",
     trackingLabel: "expo_starter",
   },
   {
-    name: "Node Starter",
     href: "https://github.com/thirdweb-example/node-starter",
+    name: "Node Starter",
     trackingLabel: "node_starter",
   },
 ];
@@ -450,10 +447,10 @@ function StarterKitsSection() {
       <div className="mb-3 flex items-center justify-between gap-2">
         <h2 className="font-semibold text-xl tracking-tight">Starter Kits</h2>
         <Link
+          className="inline-flex items-center gap-1 text-muted-foreground text-sm hover:text-foreground"
           href="https://github.com/thirdweb-example"
-          target="_blank"
           rel="noopener noreferrer"
-          className="inline-flex items-center gap-1 text-muted-foreground text-sm hover:text-foreground"
+          target="_blank"
         >
           View all <ChevronRightIcon className="size-3" />
         </Link>
@@ -462,9 +459,9 @@ function StarterKitsSection() {
       <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
         {startedKits.map((kit) => (
           <StarterKitCard
+            href={kit.href}
             key={kit.name}
             name={kit.name}
-            href={kit.href}
             trackingLabel={kit.trackingLabel}
           />
         ))}
@@ -482,10 +479,10 @@ function StarterKitCard(props: StartedKitCardProps) {
 
       <div className="flex flex-col gap-0.5">
         <Link
+          className="before:absolute before:inset-0"
           href={props.href}
-          target="_blank"
           rel="noopener noreferrer"
-          className="before:absolute before:inset-0"
+          target="_blank"
         >
           {props.name}
         </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/SecretKeySection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/SecretKeySection.tsx
index 87ac4a3af4d..4b080a6a185 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/SecretKeySection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectFTUX/SecretKeySection.tsx
@@ -26,15 +26,15 @@ export function SecretKeySection(props: {
         </div>
 
         <RotateSecretKeyButton
+          onSuccess={(data) => {
+            setSecretKeyMasked(data.data.secretMasked);
+          }}
           rotateSecretKey={async () => {
             return rotateSecretKeyClient({
-              teamId: props.teamId,
               projectId: props.projectId,
+              teamId: props.teamId,
             });
           }}
-          onSuccess={(data) => {
-            setSecretKeyMasked(data.data.secretMasked);
-          }}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx
index 5d996d59355..1f606631a71 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx
@@ -1,6 +1,4 @@
 "use client";
-import { FullWidthSidebarLayout } from "@/components/blocks/SidebarLayout";
-import { Badge } from "@/components/ui/badge";
 import {
   BellIcon,
   BookTextIcon,
@@ -10,6 +8,8 @@ import {
   SettingsIcon,
   WalletIcon,
 } from "lucide-react";
+import { FullWidthSidebarLayout } from "@/components/blocks/SidebarLayout";
+import { Badge } from "@/components/ui/badge";
 import { ContractIcon } from "../../../../../(dashboard)/(chain)/components/server/icons/ContractIcon";
 import { EngineIcon } from "../../../../../(dashboard)/(chain)/components/server/icons/EngineIcon";
 import { InsightIcon } from "../../../../../(dashboard)/(chain)/components/server/icons/InsightIcon";
@@ -27,20 +27,20 @@ export function ProjectSidebarLayout(props: {
     <FullWidthSidebarLayout
       contentSidebarLinks={[
         {
-          href: layoutPath,
           exactMatch: true,
-          label: "Overview",
+          href: layoutPath,
           icon: HomeIcon,
+          label: "Overview",
         },
         {
-          label: "In-App Wallets",
           href: `${layoutPath}/connect/in-app-wallets`,
           icon: WalletIcon,
+          label: "In-App Wallets",
         },
         {
-          label: "Account Abstraction",
           href: `${layoutPath}/connect/account-abstraction`,
           icon: SmartAccountIcon,
+          label: "Account Abstraction",
         },
         {
           href: `${layoutPath}/connect/universal-bridge`,
@@ -49,61 +49,61 @@ export function ProjectSidebarLayout(props: {
         },
         {
           href: `${layoutPath}/contracts`,
-          label: "Contracts",
           icon: ContractIcon,
+          label: "Contracts",
         },
         {
           href: `${layoutPath}/assets`,
+          icon: CoinsIcon,
           label: (
             <span className="flex items-center gap-2">
               Assets <Badge>New</Badge>
             </span>
           ),
-          icon: CoinsIcon,
         },
         {
           href: `${layoutPath}/engine`,
-          label: "Engine",
           icon: EngineIcon,
+          label: "Engine",
         },
         {
           href: `${layoutPath}/insight`,
-          label: "Insight",
           icon: InsightIcon,
+          label: "Insight",
         },
         {
           href: `${layoutPath}/nebula`,
-          label: "Nebula",
           icon: NebulaIcon,
+          label: "Nebula",
         },
         {
           href: `${layoutPath}/webhooks`,
+          icon: BellIcon,
           label: (
             <span className="flex items-center gap-2">
               Webhooks <Badge>New</Badge>
             </span>
           ),
-          icon: BellIcon,
         },
       ]}
       footerSidebarLinks={[
         {
           href: `${layoutPath}/settings`,
-          label: "Project Settings",
           icon: SettingsIcon,
+          label: "Project Settings",
         },
         {
           separator: true,
         },
         {
           href: "https://portal.thirdweb.com",
-          label: "Documentation",
           icon: BookTextIcon,
+          label: "Documentation",
         },
         {
           href: "https://playground.thirdweb.com/connect/sign-in/button",
-          label: "Playground",
           icon: BoxIcon,
+          label: "Playground",
         },
       ]}
     >
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/RpcMethodBarChartCard.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/RpcMethodBarChartCard.stories.tsx
index d4b2d7161e6..1b8c5f24c5f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/RpcMethodBarChartCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/RpcMethodBarChartCard.stories.tsx
@@ -4,8 +4,8 @@ import type { RpcMethodStats } from "types/analytics";
 import { RpcMethodBarChartCardUI } from "./RpcMethodBarChartCardUI";
 
 const meta = {
-  title: "Analytics/RpcMethodBarChartCard",
   component: Component,
+  title: "Analytics/RpcMethodBarChartCard",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -34,12 +34,12 @@ const generateTimeSeriesData = (
 
     for (const method of methods) {
       data.push({
-        date: date.toISOString(),
-        evmMethod: method,
         count:
           shouldMakeEmpty || emptyData
             ? 0
             : Math.floor(Math.random() * 1000) + 100,
+        date: date.toISOString(),
+        evmMethod: method,
       });
     }
   }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/RpcMethodBarChartCardUI.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/RpcMethodBarChartCardUI.tsx
index d517f8cab0a..fda28a3b9ae 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/RpcMethodBarChartCardUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/RpcMethodBarChartCardUI.tsx
@@ -1,11 +1,4 @@
 "use client";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import {
-  type ChartConfig,
-  ChartContainer,
-  ChartTooltip,
-  ChartTooltipContent,
-} from "@/components/ui/chart";
 import { format } from "date-fns";
 import { useMemo } from "react";
 import {
@@ -15,11 +8,20 @@ import {
   XAxis,
 } from "recharts";
 import type { RpcMethodStats } from "types/analytics";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import {
+  type ChartConfig,
+  ChartContainer,
+  ChartTooltip,
+  ChartTooltipContent,
+} from "@/components/ui/chart";
 import { EmptyStateCard } from "../../../../../components/Analytics/EmptyStateCard";
 
 export function RpcMethodBarChartCardUI({
   rawData,
-}: { rawData: RpcMethodStats[] }) {
+}: {
+  rawData: RpcMethodStats[];
+}) {
   const maxMethodsToDisplay = 10;
 
   const { data, methodsToDisplay, chartConfig, isAllEmpty } = useMemo(() => {
@@ -94,15 +96,15 @@ export function RpcMethodBarChartCardUI({
     }
 
     return {
-      data: returnValue,
-      methodsToDisplay: methodsToDisplayArray,
       chartConfig,
+      data: returnValue,
       isAllEmpty: returnValue.every((d) => d.total === 0),
+      methodsToDisplay: methodsToDisplayArray,
     };
   }, [rawData]);
 
   if (data.length === 0 || isAllEmpty) {
-    return <EmptyStateCard metric="RPC" link="https://portal.thirdweb.com/" />;
+    return <EmptyStateCard link="https://portal.thirdweb.com/" metric="RPC" />;
   }
 
   return (
@@ -114,8 +116,8 @@ export function RpcMethodBarChartCardUI({
       </CardHeader>
       <CardContent className="px-2 sm:p-6 sm:pl-0">
         <ChartContainer
-          config={chartConfig}
           className="aspect-auto h-[250px] w-full pt-6"
+          config={chartConfig}
         >
           <RechartsBarChart
             accessibilityLayer
@@ -128,18 +130,18 @@ export function RpcMethodBarChartCardUI({
             <CartesianGrid vertical={false} />
 
             <XAxis
-              dataKey="date"
-              tickLine={false}
               axisLine={false}
-              tickMargin={8}
+              dataKey="date"
               minTickGap={32}
               tickFormatter={(value: string) => {
                 const date = new Date(value);
                 return date.toLocaleDateString("en-US", {
-                  month: "short",
                   day: "numeric",
+                  month: "short",
                 });
               }}
+              tickLine={false}
+              tickMargin={8}
             />
 
             <ChartTooltip
@@ -167,18 +169,18 @@ export function RpcMethodBarChartCardUI({
             />
             {methodsToDisplay.map((method, idx) => (
               <Bar
-                key={method}
-                stackId="a"
+                className="stroke-background"
                 dataKey={method}
+                fill={`hsl(var(--chart-${idx + 1}))`}
+                key={method}
                 radius={[
                   idx === methodsToDisplay.length - 1 ? 4 : 0,
                   idx === methodsToDisplay.length - 1 ? 4 : 0,
                   idx === 0 ? 4 : 0,
                   idx === 0 ? 4 : 0,
                 ]}
-                fill={`hsl(var(--chart-${idx + 1}))`}
+                stackId="a"
                 strokeWidth={1}
-                className="stroke-background"
               />
             ))}
           </RechartsBarChart>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/index.tsx
index 950408cc60d..a61d286582f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/index.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/RpcMethodBarChartCard/index.tsx
@@ -1,7 +1,7 @@
-import { getRpcMethodUsage } from "@/api/analytics";
 import { LoadingChartState } from "components/analytics/empty-chart-state";
 import { Suspense } from "react";
 import type { AnalyticsQueryParams } from "types/analytics";
+import { getRpcMethodUsage } from "@/api/analytics";
 import { RpcMethodBarChartCardUI } from "./RpcMethodBarChartCardUI";
 
 export function RpcMethodBarChartCard(props: AnalyticsQueryParams) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/Transactions/TransactionCharts.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/Transactions/TransactionCharts.tsx
index 8e24bcef345..f9aef8bc4ab 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/Transactions/TransactionCharts.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/Transactions/TransactionCharts.tsx
@@ -1,9 +1,9 @@
 import { fetchDashboardContractMetadata } from "@3rdweb-sdk/react/hooks/useDashboardContractMetadata";
-import { type ThirdwebClient, defineChain, getContract } from "thirdweb";
+import { defineChain, getContract, type ThirdwebClient } from "thirdweb";
 import { getChainMetadata } from "thirdweb/chains";
 import type { TransactionStats } from "types/analytics";
-import { TransactionsChartCardUI } from "../../../../(team)/_components/TransactionsCard";
 import { PieChartCard } from "../../../../../components/Analytics/PieChartCard";
+import { TransactionsChartCardUI } from "../../../../(team)/_components/TransactionsCard";
 
 export function TransactionsChartsUI({
   data,
@@ -19,14 +19,14 @@ export function TransactionsChartsUI({
   return (
     <>
       <TransactionsChartCardUI
-        searchParams={searchParams}
-        data={data}
         aggregatedData={aggregatedData}
         className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
+        data={data}
+        searchParams={searchParams}
       />
       <div className="grid gap-6 max-md:px-6 md:grid-cols-2">
         <ChainDistributionCard data={aggregatedData} />
-        <ContractDistributionCard data={aggregatedData} client={client} />
+        <ContractDistributionCard client={client} data={aggregatedData} />
       </div>
     </>
   );
@@ -51,8 +51,8 @@ async function ChainDistributionCard({ data }: { data: TransactionStats[] }) {
         const chainMeta = await getChainMetadata(chain).catch(() => undefined);
         return {
           label: chainMeta?.slug || chain.id.toString(),
-          value,
           link: `/${chain.id}`,
+          value,
         };
       }),
   );
@@ -60,14 +60,17 @@ async function ChainDistributionCard({ data }: { data: TransactionStats[] }) {
   const aggregateFn = () => new Set(data.map((d) => `${d.chainId}`)).size;
 
   return (
-    <PieChartCard title="Chains" data={reducedData} aggregateFn={aggregateFn} />
+    <PieChartCard aggregateFn={aggregateFn} data={reducedData} title="Chains" />
   );
 }
 
 async function ContractDistributionCard({
   data,
   client,
-}: { data: TransactionStats[]; client: ThirdwebClient }) {
+}: {
+  data: TransactionStats[];
+  client: ThirdwebClient;
+}) {
   const _reducedData = await Promise.all(
     Object.entries(
       data
@@ -97,8 +100,8 @@ async function ContractDistributionCard({
           );
           const contractData = await fetchDashboardContractMetadata(
             getContract({
-              chain,
-              address: contractAddress as string, // we filter above
+              address: contractAddress as string,
+              chain, // we filter above
               client,
             }),
           ).catch(() => undefined);
@@ -124,9 +127,9 @@ async function ContractDistributionCard({
 
   return (
     <PieChartCard
-      title="Contracts"
-      data={reducedData}
       aggregateFn={aggregateFn}
+      data={reducedData}
+      title="Contracts"
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/Transactions/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/Transactions/index.tsx
index e575881f099..b85f2814125 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/Transactions/index.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/Transactions/index.tsx
@@ -1,8 +1,8 @@
-import { getClientTransactions } from "@/api/analytics";
 import { LoadingChartState } from "components/analytics/empty-chart-state";
 import { Suspense } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import type { AnalyticsQueryParams } from "types/analytics";
+import { getClientTransactions } from "@/api/analytics";
 import { TransactionsChartsUI } from "./TransactionCharts";
 
 export function TransactionsCharts(
@@ -39,10 +39,10 @@ async function TransactionsChartCardAsync(
 
   return (
     <TransactionsChartsUI
-      data={data}
       aggregatedData={aggregatedData}
-      searchParams={props.searchParams}
       client={props.client}
+      data={data}
+      searchParams={props.searchParams}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/WaitingForIntegrationCard/WaitingForIntegrationCard.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/WaitingForIntegrationCard/WaitingForIntegrationCard.tsx
index 1739df259a8..67c7f76f3c9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/WaitingForIntegrationCard/WaitingForIntegrationCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/WaitingForIntegrationCard/WaitingForIntegrationCard.tsx
@@ -1,9 +1,9 @@
 "use client";
-import { Button } from "@/components/ui/button";
-import { TabButtons } from "@/components/ui/tabs";
 import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { TabButtons } from "@/components/ui/tabs";
 
 export function WaitingForIntegrationCard(props: {
   title: string;
@@ -31,9 +31,9 @@ export function WaitingForIntegrationCard(props: {
           <TabButtons
             tabClassName="!text-sm"
             tabs={props.codeTabs.map((tab) => ({
+              isActive: tab.label === selectedTab,
               name: tab.label,
               onClick: () => setSelectedTab(tab.label),
-              isActive: tab.label === selectedTab,
             }))}
           />
           <div className="h-2" />
@@ -44,13 +44,13 @@ export function WaitingForIntegrationCard(props: {
       <div className="flex flex-col gap-3 border-t p-4 lg:flex-row lg:items-center lg:justify-between lg:p-6">
         <div className="flex gap-3">
           {props.ctas.map((cta) => (
-            <Button asChild key={cta.label} variant="outline" size="sm">
+            <Button asChild key={cta.label} size="sm" variant="outline">
               <Link
+                className="gap-2"
                 href={cta.href}
                 key={cta.label}
-                target="_blank"
                 rel="noopener noreferrer"
-                className="gap-2"
+                target="_blank"
               >
                 {cta.label}
                 <ExternalLinkIcon className="size-4 text-muted-foreground" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/footer/FooterLinksSection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/footer/FooterLinksSection.tsx
index 89e118b0822..26d51a43068 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/footer/FooterLinksSection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/footer/FooterLinksSection.tsx
@@ -41,26 +41,20 @@ function FooterSection(props: FooterSectionProps) {
       <h3 className="mb-2.5 font-medium">{props.title}</h3>
       <div className="flex flex-col gap-2.5">
         {props.links.map((link) => (
-          <FooterLink key={link.label} href={link.href} label={link.label} />
+          <FooterLink href={link.href} key={link.label} label={link.label} />
         ))}
       </div>
     </div>
   );
 }
 
-function FooterLink({
-  href,
-  label,
-}: {
-  href: string;
-  label: string;
-}) {
+function FooterLink({ href, label }: { href: string; label: string }) {
   return (
     <Link
+      className="flex items-start gap-2 text-balance text-muted-foreground text-sm hover:text-foreground"
       href={href}
-      target="_blank"
       rel="noopener noreferrer"
-      className="flex items-start gap-2 text-balance text-muted-foreground text-sm hover:text-foreground"
+      target="_blank"
     >
       <LinkIcon className="mt-1 size-3 shrink-0 opacity-70" />
       {label}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/AAFooterSection.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/AAFooterSection.tsx
index f9271329092..f48c036045c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/AAFooterSection.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/AAFooterSection.tsx
@@ -3,8 +3,24 @@ import { FooterLinksSection } from "../../components/footer/FooterLinksSection";
 export function AAFooter() {
   return (
     <FooterLinksSection
+      center={{
+        links: [
+          {
+            href: "https://playground.thirdweb.com/connect/account-abstraction/connect",
+            label: "Connect Smart Accounts",
+          },
+          {
+            href: "https://playground.thirdweb.com/connect/account-abstraction/sponsor",
+            label: "Sponsor Gas Fees",
+          },
+          {
+            href: "https://playground.thirdweb.com/connect/account-abstraction/native-aa",
+            label: "Native Account Abstraction",
+          },
+        ],
+        title: "Demos",
+      }}
       left={{
-        title: "Documentation",
         links: [
           {
             href: "https://portal.thirdweb.com/connect/account-abstraction/overview",
@@ -35,40 +51,24 @@ export function AAFooter() {
             label: "Unreal Engine",
           },
         ],
+        title: "Documentation",
       }}
       right={{
-        title: "Tutorials",
         links: [
           {
-            label: "Web3 onboarding with in-app wallets and AA",
             href: "https://www.youtube.com/watch?v=HP8wSH7gnQA",
+            label: "Web3 onboarding with in-app wallets and AA",
           },
           {
-            label: "Multi-chain experience with account abstraction",
             href: "https://www.youtube.com/watch?v=2wUtq-drxAk",
+            label: "Multi-chain experience with account abstraction",
           },
           {
-            label: "Add AA to a web3 unity game",
             href: "https://www.youtube.com/watch?v=04G4DLhqwgI",
+            label: "Add AA to a web3 unity game",
           },
         ],
-      }}
-      center={{
-        title: "Demos",
-        links: [
-          {
-            label: "Connect Smart Accounts",
-            href: "https://playground.thirdweb.com/connect/account-abstraction/connect",
-          },
-          {
-            label: "Sponsor Gas Fees",
-            href: "https://playground.thirdweb.com/connect/account-abstraction/sponsor",
-          },
-          {
-            label: "Native Account Abstraction",
-            href: "https://playground.thirdweb.com/connect/account-abstraction/native-aa",
-          },
-        ],
+        title: "Tutorials",
       }}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/AccountAbstractionPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/AccountAbstractionPage.tsx
index 268379c9cf5..8208eb86185 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/AccountAbstractionPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/AccountAbstractionPage.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { DismissibleAlert } from "@/components/blocks/dismissible-alert";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Button } from "@/components/ui/button";
-import { TabPathLinks } from "@/components/ui/tabs";
 import { SmartWalletsBillingAlert } from "components/settings/ApiKeys/Alerts";
 import { ArrowRightIcon } from "lucide-react";
 import Link from "next/link";
+import { DismissibleAlert } from "@/components/blocks/dismissible-alert";
+import { Button } from "@/components/ui/button";
+import { TabPathLinks } from "@/components/ui/tabs";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { AAFooter } from "./AAFooterSection";
 
 export function AccountAbstractionLayout(props: {
@@ -33,9 +33,9 @@ export function AccountAbstractionLayout(props: {
               Integrate ERC-4337 compliant smart accounts for gasless
               sponsorships and more. <br className="lg:hidden" />
               <UnderlineLink
-                target="_blank"
-                rel="noopener noreferrer"
                 href="https://portal.thirdweb.com/wallets/smart-wallet"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 Learn more about Account Abstraction
               </UnderlineLink>
@@ -45,8 +45,8 @@ export function AccountAbstractionLayout(props: {
             <SmartWalletsBillingAlert teamSlug={props.teamSlug} />
           )}
           <GasCreditAlert
-            teamSlug={props.teamSlug}
             projectId={props.projectId}
+            teamSlug={props.teamSlug}
           />
         </div>
 
@@ -54,12 +54,11 @@ export function AccountAbstractionLayout(props: {
 
         {/* Nav */}
         <TabPathLinks
-          scrollableClassName="container max-w-7xl"
           links={[
             {
+              exactMatch: true,
               name: "Analytics",
               path: `${smartWalletsLayoutSlug}`,
-              exactMatch: true,
             },
             {
               name: "Account Factories",
@@ -70,6 +69,7 @@ export function AccountAbstractionLayout(props: {
               path: `${smartWalletsLayoutSlug}/settings`,
             },
           ]}
+          scrollableClassName="container max-w-7xl"
         />
       </div>
 
@@ -90,35 +90,30 @@ export function AccountAbstractionLayout(props: {
   );
 }
 
-function GasCreditAlert(props: {
-  teamSlug: string;
-  projectId: string;
-}) {
+function GasCreditAlert(props: { teamSlug: string; projectId: string }) {
   return (
     <DismissibleAlert
-      localStorageId={`${props.projectId}-gas-credit-alert`}
-      title="OP Gas Credit Program"
       description={
         <>
           Redeem credits towards gas Sponsorship. <br className="lg:hidden" />
           <UnderlineLink
-            target="_blank"
             href="https://thirdweb.com/superchain"
             rel="noopener noreferrer"
+            target="_blank"
           >
             Learn More
           </UnderlineLink>
           <div className="mt-4 flex items-center gap-4">
             <Button
               asChild
-              variant="outline"
-              size="sm"
               className="bg-background"
+              size="sm"
+              variant="outline"
             >
               <Link
+                className="gap-2"
                 href={`/team/${props.teamSlug}/~/settings/credits`}
                 target="_blank"
-                className="gap-2"
               >
                 Claim your credits <ArrowRightIcon className="size-4" />
               </Link>
@@ -126,6 +121,8 @@ function GasCreditAlert(props: {
           </div>
         </>
       }
+      localStorageId={`${props.projectId}-gas-credit-alert`}
+      title="OP Gas Credit Program"
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/factories/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/factories/page.tsx
index 2cf196c0017..13c757ae6b5 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/factories/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/factories/page.tsx
@@ -1,19 +1,19 @@
-import { getProject } from "@/api/projects";
-import { getTeamBySlug } from "@/api/team";
-import { ClientOnly } from "@/components/blocks/client-only";
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Button } from "@/components/ui/button";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { DefaultFactoriesSection } from "components/smart-wallets/AccountFactories";
 import { FactoryContracts } from "components/smart-wallets/AccountFactories/factory-contracts";
 import { PlusIcon } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { Suspense } from "react";
-import { type ThirdwebClient, defineChain, getContract } from "thirdweb";
+import { defineChain, getContract, type ThirdwebClient } from "thirdweb";
 import { getCompilerMetadata } from "thirdweb/contract";
+import { getProject } from "@/api/projects";
+import { getTeamBySlug } from "@/api/team";
+import { ClientOnly } from "@/components/blocks/client-only";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
+import { Button } from "@/components/ui/button";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { getSortedDeployedContracts } from "../../../../../../../account/contracts/_components/getSortedDeployedContracts";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../login/loginRedirect";
@@ -52,12 +52,12 @@ export default async function Page(props: {
     <div className="flex flex-col gap-6">
       <DefaultFactoriesSection />
       <YourFactoriesSection
-        teamId={team.id}
-        projectId={project.id}
-        teamSlug={team.slug}
-        projectSlug={project.slug}
         authToken={authToken}
         clientThirdwebClient={client}
+        projectId={project.id}
+        projectSlug={project.slug}
+        teamId={team.id}
+        teamSlug={team.slug}
       />
     </div>
   );
@@ -82,16 +82,16 @@ function YourFactoriesSection(props: {
             Deploy your own account factories to create smart wallets.{" "}
             <UnderlineLink
               href="https://portal.thirdweb.com/connect/account-abstraction/factories"
-              target="_blank"
               rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more{" "}
             </UnderlineLink>
           </p>
         </div>
 
-        <Button variant="default" asChild size="sm">
-          <Link href="/explore/smart-wallet" className="gap-2 text-sm">
+        <Button asChild size="sm" variant="default">
+          <Link className="gap-2 text-sm" href="/explore/smart-wallet">
             <PlusIcon className="size-3" />
             Deploy Account Factory
           </Link>
@@ -100,12 +100,12 @@ function YourFactoriesSection(props: {
 
       <Suspense fallback={<GenericLoadingPage />}>
         <AsyncYourFactories
-          teamId={props.teamId}
-          projectId={props.projectId}
           authToken={props.authToken}
-          teamSlug={props.teamSlug}
-          projectSlug={props.projectSlug}
           clientThirdwebClient={props.clientThirdwebClient}
+          projectId={props.projectId}
+          projectSlug={props.projectSlug}
+          teamId={props.teamId}
+          teamSlug={props.teamSlug}
         />
       </Suspense>
     </div>
@@ -121,10 +121,10 @@ async function AsyncYourFactories(props: {
   clientThirdwebClient: ThirdwebClient;
 }) {
   const deployedContracts = await getSortedDeployedContracts({
-    teamId: props.teamId,
-    projectId: props.projectId,
     authToken: props.authToken,
     deploymentType: undefined,
+    projectId: props.projectId,
+    teamId: props.teamId,
   });
 
   const factories = (
@@ -132,9 +132,9 @@ async function AsyncYourFactories(props: {
       deployedContracts.map(async (c) => {
         try {
           const contract = getContract({
+            address: c.contractAddress,
             // eslint-disable-next-line no-restricted-syntax
             chain: defineChain(Number(c.chainId)),
-            address: c.contractAddress,
             client: serverThirdwebClient,
           });
           const m = await getCompilerMetadata(contract);
@@ -149,12 +149,12 @@ async function AsyncYourFactories(props: {
   return (
     <ClientOnly ssr={<GenericLoadingPage />}>
       <FactoryContracts
+        client={props.clientThirdwebClient}
         contracts={factories}
+        isFetched={true}
         isPending={false}
-        teamSlug={props.teamSlug}
         projectSlug={props.projectSlug}
-        isFetched={true}
-        client={props.clientThirdwebClient}
+        teamSlug={props.teamSlug}
       />
     </ClientOnly>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/layout.tsx
index a95a181fbe5..63f69d949c5 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/layout.tsx
@@ -1,8 +1,8 @@
-import { getProject } from "@/api/projects";
-import { getTeamBySlug } from "@/api/team";
 import { getAbsoluteUrl } from "lib/vercel-utils";
 import type { Metadata } from "next";
 import { redirect } from "next/navigation";
+import { getProject } from "@/api/projects";
+import { getTeamBySlug } from "@/api/team";
 import { AccountAbstractionLayout } from "./AccountAbstractionPage";
 
 export default async function Page(props: {
@@ -35,11 +35,11 @@ export default async function Page(props: {
 
   return (
     <AccountAbstractionLayout
-      projectSlug={project.slug}
-      teamSlug={team_slug}
-      projectKey={project.publishableKey}
       hasSmartWalletsWithoutBilling={hasSmartWalletsWithoutBilling}
       projectId={project.id}
+      projectKey={project.publishableKey}
+      projectSlug={project.slug}
+      teamSlug={team_slug}
     >
       {props.children}
     </AccountAbstractionLayout>
@@ -47,23 +47,23 @@ export default async function Page(props: {
 }
 
 const seo = {
-  title: "The Complete Account Abstraction Toolkit | thirdweb",
   desc: "Add account abstraction to your web3 app & unlock powerful features for seamless onboarding, customizable transactions, & maximum security. Get started.",
+  title: "The Complete Account Abstraction Toolkit | thirdweb",
 };
 
 export const metadata: Metadata = {
-  title: seo.title,
   description: seo.desc,
   openGraph: {
-    title: seo.title,
     description: seo.desc,
     images: [
       {
+        alt: seo.title,
+        height: 630,
         url: `${getAbsoluteUrl()}/assets/og-image/dashboard-wallets-smart-wallet.png`,
         width: 1200,
-        height: 630,
-        alt: seo.title,
       },
     ],
+    title: seo.title,
   },
+  title: seo.title,
 };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/page.tsx
index b254c611986..eabcccce6d4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/page.tsx
@@ -1,15 +1,15 @@
-import { getUserOpUsage } from "@/api/analytics";
-import { getProject } from "@/api/projects";
-import { getTeamBySlug } from "@/api/team";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import {
-  type Range,
   getLastNDaysRange,
+  type Range,
 } from "components/analytics/date-range-selector";
 import { AccountAbstractionAnalytics } from "components/smart-wallets/AccountAbstractionAnalytics";
 import { AccountAbstractionSummary } from "components/smart-wallets/AccountAbstractionAnalytics/AccountAbstractionSummary";
 import { notFound, redirect } from "next/navigation";
 import type { SearchParams } from "nuqs/server";
+import { getUserOpUsage } from "@/api/analytics";
+import { getProject } from "@/api/projects";
+import { getTeamBySlug } from "@/api/team";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
 import { searchParamLoader } from "./search-params";
 
@@ -62,11 +62,11 @@ export default async function Page(props: {
   };
 
   const userOpStats = await getUserOpUsage({
-    teamId: project.teamId,
-    projectId: project.id,
     from: range.from,
-    to: range.to,
     period: interval,
+    projectId: project.id,
+    teamId: project.teamId,
+    to: range.to,
   });
 
   const client = getClientThirdwebClient({
@@ -77,17 +77,17 @@ export default async function Page(props: {
   return (
     <div className="flex grow flex-col">
       <AccountAbstractionSummary
-        teamId={project.teamId}
         projectId={project.id}
+        teamId={project.teamId}
       />
 
       <div className="h-10" />
       <AccountAbstractionAnalytics
-        userOpStats={userOpStats}
         client={client}
-        teamId={project.teamId}
         projectId={project.id}
+        teamId={project.teamId}
         teamSlug={params.team_slug}
+        userOpStats={userOpStats}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/search-params.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/search-params.ts
index 3e11282f10c..f4b571e3594 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/search-params.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/search-params.ts
@@ -2,6 +2,8 @@ import { getLastNDaysRange } from "components/analytics/date-range-selector";
 import { createLoader, parseAsIsoDate, parseAsStringEnum } from "nuqs/server";
 
 export const searchParams = {
+  from: parseAsIsoDate.withDefault(getLastNDaysRange("last-120").from),
+  interval: parseAsStringEnum(["day", "week"]).withDefault("week"),
   range: parseAsStringEnum([
     "last-120",
     "last-60",
@@ -9,9 +11,7 @@ export const searchParams = {
     "last-7",
     "custom",
   ]).withDefault("last-120"),
-  from: parseAsIsoDate.withDefault(getLastNDaysRange("last-120").from),
   to: parseAsIsoDate.withDefault(getLastNDaysRange("last-120").to),
-  interval: parseAsStringEnum(["day", "week"]).withDefault("week"),
 };
 
 export const searchParamLoader = createLoader(searchParams);
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/settings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/settings/page.tsx
index 7e9fc393c70..398ef3c0b57 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/account-abstraction/settings/page.tsx
@@ -1,12 +1,12 @@
+import { AccountAbstractionSettingsPage } from "components/smart-wallets/SponsorshipPolicies";
+import { CircleAlertIcon } from "lucide-react";
+import { redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
 import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { AccountAbstractionSettingsPage } from "components/smart-wallets/SponsorshipPolicies";
-import { CircleAlertIcon } from "lucide-react";
-import { redirect } from "next/navigation";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { getValidTeamPlan } from "../../../../../../components/TeamHeader/getValidTeamPlan";
 
@@ -55,8 +55,8 @@ export default async function Page(props: {
   return (
     <ChakraProviderSetup>
       <AccountAbstractionSettingsPage
-        client={client}
         bundlerService={bundlerService}
+        client={client}
         project={project}
         teamId={team.id}
         teamSlug={team.slug}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/_components/footer.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/_components/footer.tsx
index 06d76402f42..ecec0a930b3 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/_components/footer.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/_components/footer.tsx
@@ -3,8 +3,28 @@ import { FooterLinksSection } from "../../../components/footer/FooterLinksSectio
 export function InAppWalletsFooter() {
   return (
     <FooterLinksSection
+      center={{
+        links: [
+          {
+            href: "https://www.youtube.com/watch?v=9s3Z-MvPv2I",
+            label: "Build your own custom connect component",
+          },
+          {
+            href: "https://www.youtube.com/watch?v=oUouNueoVFU",
+            label: "Learn to create wallets inside a Unity game",
+          },
+          {
+            href: "https://www.youtube.com/watch?v=xEp-fKba_cI",
+            label: "Pre-generate wallets for users",
+          },
+          {
+            href: "https://portal.thirdweb.com/connect/wallet/sign-in-methods/guest",
+            label: "Sign-in with guest mode",
+          },
+        ],
+        title: "Tutorials",
+      }}
       left={{
-        title: "Documentation",
         links: [
           {
             href: "https://portal.thirdweb.com/connect/wallet/overview",
@@ -35,30 +55,9 @@ export function InAppWalletsFooter() {
             label: "Unreal Engine",
           },
         ],
-      }}
-      center={{
-        title: "Tutorials",
-        links: [
-          {
-            href: "https://www.youtube.com/watch?v=9s3Z-MvPv2I",
-            label: "Build your own custom connect component",
-          },
-          {
-            label: "Learn to create wallets inside a Unity game",
-            href: "https://www.youtube.com/watch?v=oUouNueoVFU",
-          },
-          {
-            href: "https://www.youtube.com/watch?v=xEp-fKba_cI",
-            label: "Pre-generate wallets for users",
-          },
-          {
-            label: "Sign-in with guest mode",
-            href: "https://portal.thirdweb.com/connect/wallet/sign-in-methods/guest",
-          },
-        ],
+        title: "Documentation",
       }}
       right={{
-        title: "Demos",
         links: [
           {
             href: "https://playground.thirdweb.com/connect/in-app-wallet/ecosystem",
@@ -73,6 +72,7 @@ export function InAppWalletsFooter() {
             label: "Customized UI",
           },
         ],
+        title: "Demos",
       }}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/_components/header.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/_components/header.tsx
index 30e106dd9fa..f4914afabab 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/_components/header.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/_components/header.tsx
@@ -11,9 +11,9 @@ export async function InAppWalletsHeader() {
         their users wallets. <br /> Email login, social login, and
         bring-your-own auth supported.{" "}
         <UnderlineLink
-          target="_blank"
           href="https://portal.thirdweb.com/connect/in-app-wallet/overview"
           rel="noopener noreferrer"
+          target="_blank"
         >
           Learn more
         </UnderlineLink>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/layout.tsx
index ea7cb0d9449..db919afcfca 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/layout.tsx
@@ -1,6 +1,6 @@
+import { redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { TabPathLinks } from "@/components/ui/tabs";
-import { redirect } from "next/navigation";
 import { InAppWalletsFooter } from "./_components/footer";
 import { InAppWalletsHeader } from "./_components/header";
 
@@ -29,24 +29,24 @@ export default async function Layout(props: {
         </div>
         <div className="h-3" />
         <TabPathLinks
-          scrollableClassName="container max-w-7xl"
           links={[
             {
+              exactMatch: true,
               name: "Analytics",
               path: `/team/${team_slug}/${project_slug}/connect/in-app-wallets`,
-              exactMatch: true,
             },
             {
+              exactMatch: true,
               name: "Users",
               path: `/team/${team_slug}/${project_slug}/connect/in-app-wallets/users`,
-              exactMatch: true,
             },
             {
+              exactMatch: true,
               name: "Settings",
               path: `/team/${team_slug}/${project_slug}/connect/in-app-wallets/settings`,
-              exactMatch: true,
             },
           ]}
+          scrollableClassName="container max-w-7xl"
         />
       </div>
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/page.tsx
index 4ae1a06d378..b3194470ae6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/page.tsx
@@ -1,8 +1,8 @@
-import { getProject } from "@/api/projects";
 import type { Range } from "components/analytics/date-range-selector";
 import { InAppWalletAnalytics } from "components/embedded-wallets/Analytics";
 import { InAppWalletsSummary } from "components/embedded-wallets/Analytics/Summary";
 import { redirect } from "next/navigation";
+import { getProject } from "@/api/projects";
 
 export default async function Page(props: {
   params: Promise<{ team_slug: string; project_slug: string }>;
@@ -21,9 +21,9 @@ export default async function Page(props: {
   const range =
     searchParams.from && searchParams.to
       ? {
-          type: searchParams.type ?? "last-120",
           from: new Date(searchParams.from),
           to: new Date(searchParams.to),
+          type: searchParams.type ?? "last-120",
         }
       : undefined;
 
@@ -41,13 +41,13 @@ export default async function Page(props: {
 
   return (
     <div>
-      <InAppWalletsSummary teamId={project.teamId} projectId={project.id} />
+      <InAppWalletsSummary projectId={project.id} teamId={project.teamId} />
       <div className="h-10" />
       <InAppWalletAnalytics
-        teamId={project.teamId}
-        projectId={project.id}
         interval={interval}
+        projectId={project.id}
         range={range as Range}
+        teamId={project.teamId}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/settings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/settings/page.tsx
index 3f7482a91fb..5bbbbf3cfba 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/settings/page.tsx
@@ -1,9 +1,9 @@
+import { InAppWalletSettingsPage } from "components/embedded-wallets/Configure";
+import { redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { getSMSCountryTiers } from "@/api/sms";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { InAppWalletSettingsPage } from "components/embedded-wallets/Configure";
-import { redirect } from "next/navigation";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../login/loginRedirect";
 import { getValidTeamPlan } from "../../../../../../components/TeamHeader/getValidTeamPlan";
@@ -39,12 +39,12 @@ export default async function Page(props: {
 
   return (
     <InAppWalletSettingsPage
+      client={client}
       project={project}
+      smsCountryTiers={smsCountryTiers}
       teamId={team.id}
-      teamSlug={team_slug}
       teamPlan={getValidTeamPlan(team)}
-      client={client}
-      smsCountryTiers={smsCountryTiers}
+      teamSlug={team_slug}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/users/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/users/page.tsx
index 093558b4a71..daac9753981 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/users/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/in-app-wallets/users/page.tsx
@@ -1,7 +1,7 @@
-import { getProject } from "@/api/projects";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { InAppWalletUsersPageContent } from "components/embedded-wallets/Users";
 import { redirect } from "next/navigation";
+import { getProject } from "@/api/projects";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../login/loginRedirect";
 import { TRACKING_CATEGORY } from "../_constants";
@@ -32,10 +32,10 @@ export default async function Page(props: {
 
   return (
     <InAppWalletUsersPageContent
-      projectClientId={project.publishableKey}
-      trackingCategory={TRACKING_CATEGORY}
       authToken={authToken}
       client={client}
+      projectClientId={project.publishableKey}
+      trackingCategory={TRACKING_CATEGORY}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/layout.tsx
index b8a5c2f577e..62c6b0ac555 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/layout.tsx
@@ -1,7 +1,7 @@
+import { redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { TabPathLinks } from "@/components/ui/tabs";
-import { redirect } from "next/navigation";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { FooterLinksSection } from "../../components/footer/FooterLinksSection";
 
 export default async function Layout(props: {
@@ -32,9 +32,9 @@ export default async function Layout(props: {
             cryptocurrencies and execute transactions with any fiat options or
             tokens via cross-chain routing.{" "}
             <UnderlineLink
-              target="_blank"
-              rel="noopener noreferrer"
               href="https://portal.thirdweb.com/pay"
+              rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more
             </UnderlineLink>
@@ -43,13 +43,12 @@ export default async function Layout(props: {
 
         <div className="h-4" />
         <TabPathLinks
-          scrollableClassName="container max-w-7xl"
           className="w-full"
           links={[
             {
+              exactMatch: true,
               name: "Analytics",
               path: payLayoutPath,
-              exactMatch: true,
             },
             {
               name: "Webhooks",
@@ -60,6 +59,7 @@ export default async function Layout(props: {
               path: `${payLayoutPath}/settings`,
             },
           ]}
+          scrollableClassName="container max-w-7xl"
         />
       </div>
 
@@ -81,8 +81,28 @@ export default async function Layout(props: {
 function UBFooter() {
   return (
     <FooterLinksSection
+      center={{
+        links: [
+          {
+            href: "https://playground.thirdweb.com/connect/pay",
+            label: "UI Component",
+          },
+          {
+            href: "https://playground.thirdweb.com/connect/pay/fund-wallet",
+            label: "Buy Crypto",
+          },
+          {
+            href: "https://playground.thirdweb.com/connect/pay/commerce",
+            label: "Checkout",
+          },
+          {
+            href: "https://playground.thirdweb.com/connect/pay/transactions",
+            label: "Transactions",
+          },
+        ],
+        title: "Demos",
+      }}
       left={{
-        title: "Documentation",
         links: [
           {
             href: "https://portal.thirdweb.com/connect/pay/overview",
@@ -101,36 +121,16 @@ function UBFooter() {
             label: ".NET",
           },
         ],
+        title: "Documentation",
       }}
       right={{
-        title: "Tutorials",
         links: [
           {
-            label: "Implement cross-chain payments in any app",
             href: "https://www.youtube.com/watch?v=aBu175-VsNY",
+            label: "Implement cross-chain payments in any app",
           },
         ],
-      }}
-      center={{
-        title: "Demos",
-        links: [
-          {
-            label: "UI Component",
-            href: "https://playground.thirdweb.com/connect/pay",
-          },
-          {
-            label: "Buy Crypto",
-            href: "https://playground.thirdweb.com/connect/pay/fund-wallet",
-          },
-          {
-            label: "Checkout",
-            href: "https://playground.thirdweb.com/connect/pay/commerce",
-          },
-          {
-            label: "Transactions",
-            href: "https://playground.thirdweb.com/connect/pay/transactions",
-          },
-        ],
+        title: "Tutorials",
       }}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/page.tsx
index 6aa0c1ab0ab..e300789a929 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/page.tsx
@@ -1,8 +1,5 @@
-import { getProject } from "@/api/projects";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { PayAnalytics } from "components/pay/PayAnalytics/PayAnalytics";
 import { PayAnalyticsFilter } from "components/pay/PayAnalytics/components/PayAnalyticsFilter";
+import { PayAnalytics } from "components/pay/PayAnalytics/PayAnalytics";
 import { getUniversalBridgeFiltersFromSearchParams } from "lib/time";
 import { ArrowUpRightIcon } from "lucide-react";
 import { redirect } from "next/navigation";
@@ -10,6 +7,9 @@ import {
   ResponsiveSearchParamsProvider,
   ResponsiveSuspense,
 } from "responsive-rsc";
+import { getProject } from "@/api/projects";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../login/loginRedirect";
 
@@ -40,10 +40,10 @@ export default async function Page(props: {
 
   const searchParams = await props.searchParams;
   const { range, interval } = getUniversalBridgeFiltersFromSearchParams({
+    defaultRange: "last-30",
     from: searchParams.from,
-    to: searchParams.to,
     interval: searchParams.interval,
-    defaultRange: "last-30",
+    to: searchParams.to,
   });
 
   const client = getClientThirdwebClient({
@@ -58,20 +58,20 @@ export default async function Page(props: {
           <PayAnalyticsFilter />
         </div>
         <ResponsiveSuspense
-          searchParamsUsed={["from", "to", "interval"]}
           fallback={
             <div className="flex w-full items-center justify-center py-24">
               <Spinner className="size-8" />
             </div>
           }
+          searchParamsUsed={["from", "to", "interval"]}
         >
           <PayAnalytics
-            projectClientId={project.publishableKey}
             client={client}
+            interval={interval}
+            projectClientId={project.publishableKey}
             projectId={project.id}
-            teamId={project.teamId}
             range={range}
-            interval={interval}
+            teamId={project.teamId}
           />
         </ResponsiveSuspense>
 
@@ -88,10 +88,10 @@ export default async function Page(props: {
               </p>
             </div>
             <a
+              className="inline-flex items-center gap-2 rounded-md bg-green-600 px-4 py-2 font-medium text-sm text-white transition-all hover:bg-green-600/90 hover:shadow-sm"
               href="https://portal.thirdweb.com/pay"
-              target="_blank"
               rel="noopener noreferrer"
-              className="inline-flex items-center gap-2 rounded-md bg-green-600 px-4 py-2 font-medium text-sm text-white transition-all hover:bg-green-600/90 hover:shadow-sm"
+              target="_blank"
             >
               Learn More
               <ArrowUpRightIcon className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/settings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/settings/page.tsx
index 7c018619616..9a006e4ee59 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/settings/page.tsx
@@ -1,10 +1,10 @@
+import { PayConfig } from "components/pay/PayConfig";
+import { RouteDiscovery } from "components/pay/RouteDiscovery";
+import { redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
 import { getFees } from "@/api/universal-bridge/developer";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { PayConfig } from "components/pay/PayConfig";
-import { RouteDiscovery } from "components/pay/RouteDiscovery";
-import { redirect } from "next/navigation";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../login/loginRedirect";
 
@@ -41,18 +41,18 @@ export default async function Page(props: {
     teamId: team.id,
   }).catch(() => {
     return {
-      feeRecipient: "",
-      feeBps: 0,
       createdAt: "",
+      feeBps: 0,
+      feeRecipient: "",
       updatedAt: "",
     };
   });
 
   if (!fees) {
     fees = {
-      feeRecipient: "",
-      feeBps: 0,
       createdAt: "",
+      feeBps: 0,
+      feeRecipient: "",
       updatedAt: "",
     };
   }
@@ -65,14 +65,14 @@ export default async function Page(props: {
   return (
     <div className="flex flex-col p-5">
       <PayConfig
+        fees={fees}
         project={project}
         teamId={team.id}
         teamSlug={team_slug}
-        fees={fees}
       />
 
       <div className="flex pt-5">
-        <RouteDiscovery project={project} client={client} />
+        <RouteDiscovery client={client} project={project} />
       </div>
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/webhooks/components/webhooks.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/webhooks/components/webhooks.client.tsx
index 378460f3e8e..2d2a4075cf0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/webhooks/components/webhooks.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/webhooks/components/webhooks.client.tsx
@@ -1,14 +1,23 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { formatDistanceToNow } from "date-fns";
+import { PlusIcon, TrashIcon } from "lucide-react";
+import { type PropsWithChildren, useMemo, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { randomPrivateKey } from "thirdweb/wallets";
+import { shortenString } from "utils/usedapp-external";
+import { z } from "zod";
 import {
   createWebhook,
   deleteWebhook,
   getWebhooks,
 } from "@/api/universal-bridge/developer";
 import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
 import {
   Dialog,
@@ -29,6 +38,7 @@ import {
   RequiredFormLabel,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Select,
   SelectContent,
@@ -45,16 +55,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { formatDistanceToNow } from "date-fns";
-import { PlusIcon, TrashIcon } from "lucide-react";
-import { type PropsWithChildren, useMemo, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { randomPrivateKey } from "thirdweb/wallets";
-import { shortenString } from "utils/usedapp-external";
-import { z } from "zod";
 
 type PayWebhooksPageProps = {
   clientId: string;
@@ -63,13 +63,13 @@ type PayWebhooksPageProps = {
 
 export function PayWebhooksPage(props: PayWebhooksPageProps) {
   const webhooksQuery = useQuery({
-    queryKey: ["webhooks", props.clientId, props.teamId],
     queryFn: async () => {
       return await getWebhooks({
         clientId: props.clientId,
         teamId: props.teamId,
       });
     },
+    queryKey: ["webhooks", props.clientId, props.teamId],
   });
 
   if (webhooksQuery.isPending) {
@@ -81,7 +81,7 @@ export function PayWebhooksPage(props: PayWebhooksPageProps) {
       <div className="flex flex-col items-center gap-8 rounded-lg border border-border p-8 text-center">
         <h2 className="font-semibold text-xl">No webhooks configured yet.</h2>
         <CreateWebhookButton clientId={props.clientId} teamId={props.teamId}>
-          <Button variant="primary" className="gap-1">
+          <Button className="gap-1" variant="primary">
             <PlusIcon className="size-4" />
             <span>Create Webhook</span>
           </Button>
@@ -95,7 +95,7 @@ export function PayWebhooksPage(props: PayWebhooksPageProps) {
       <div className="flex items-center justify-between">
         <h2 className="font-semibold text-xl tracking-tight">Webhooks</h2>
         <CreateWebhookButton clientId={props.clientId} teamId={props.teamId}>
-          <Button size="sm" variant="default" className="gap-1">
+          <Button className="gap-1" size="sm" variant="default">
             <PlusIcon className="size-4" />
             <span>Create Webhook</span>
           </Button>
@@ -132,7 +132,7 @@ export function PayWebhooksPage(props: PayWebhooksPageProps) {
                     teamId={props.teamId}
                     webhookId={webhook.id}
                   >
-                    <Button variant="ghost" size="icon">
+                    <Button size="icon" variant="ghost">
                       <TrashIcon className="size-5" strokeWidth={1} />
                     </Button>
                   </DeleteWebhookButton>
@@ -147,10 +147,10 @@ export function PayWebhooksPage(props: PayWebhooksPageProps) {
 }
 
 const formSchema = z.object({
-  url: z.string().url("Please enter a valid URL."),
   label: z.string().min(3, "Label must be at least 3 characters long"),
-  version: z.string(),
   secret: z.string().optional(),
+  url: z.string().url("Please enter a valid URL."),
+  version: z.string(),
 });
 
 function CreateWebhookButton(props: PropsWithChildren<PayWebhooksPageProps>) {
@@ -162,23 +162,23 @@ function CreateWebhookButton(props: PropsWithChildren<PayWebhooksPageProps>) {
   }, [open]);
 
   const form = useForm<z.infer<typeof formSchema>>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
-      url: "",
       label: "",
+      url: "",
       version: "2",
     },
+    resolver: zodResolver(formSchema),
   });
   const queryClient = useQueryClient();
   const createMutation = useMutation({
     mutationFn: async (values: z.infer<typeof formSchema>) => {
       await createWebhook({
         clientId: props.clientId,
+        label: values.label,
+        secret,
         teamId: props.teamId,
         url: values.url,
-        label: values.label,
         version: Number(values.version),
-        secret,
       });
       return null;
     },
@@ -189,11 +189,12 @@ function CreateWebhookButton(props: PropsWithChildren<PayWebhooksPageProps>) {
     },
   });
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
+    <Dialog onOpenChange={setOpen} open={open}>
       <DialogTrigger asChild>{props.children}</DialogTrigger>
       <DialogContent>
         <Form {...form}>
           <form
+            className="flex flex-col gap-4"
             onSubmit={form.handleSubmit((values) =>
               createMutation.mutateAsync(values, {
                 onError: (err) => {
@@ -214,7 +215,6 @@ function CreateWebhookButton(props: PropsWithChildren<PayWebhooksPageProps>) {
                 },
               }),
             )}
-            className="flex flex-col gap-4"
           >
             <DialogHeader>
               <DialogTitle>Create Webhook</DialogTitle>
@@ -278,10 +278,10 @@ function CreateWebhookButton(props: PropsWithChildren<PayWebhooksPageProps>) {
               <FormLabel>Webhook Secret</FormLabel>
 
               <CopyTextButton
-                textToCopy={secret}
                 className="!h-auto my-1 w-full justify-between truncate bg-card px-3 py-3 font-mono"
-                textToShow={shortenString(secret)}
                 copyIconPosition="right"
+                textToCopy={secret}
+                textToShow={shortenString(secret)}
                 tooltip="Copy Webhook Secret"
               />
               <FormDescription>
@@ -301,9 +301,9 @@ function CreateWebhookButton(props: PropsWithChildren<PayWebhooksPageProps>) {
 
             <DialogFooter>
               <Button
-                type="submit"
-                disabled={createMutation.isPending || !secretStored}
                 className="gap-2"
+                disabled={createMutation.isPending || !secretStored}
+                type="submit"
               >
                 Create Webhook
                 {createMutation.isPending && <Spinner className="size-4" />}
@@ -337,7 +337,7 @@ function DeleteWebhookButton(
     },
   });
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
+    <Dialog onOpenChange={setOpen} open={open}>
       <DialogTrigger asChild>{props.children}</DialogTrigger>
       <DialogContent>
         <DialogHeader>
@@ -351,7 +351,7 @@ function DeleteWebhookButton(
         <DialogFooter>
           <Button
             className="gap-2"
-            variant="destructive"
+            disabled={deleteMutation.isPending}
             onClick={() => {
               deleteMutation.mutateAsync(props.webhookId, {
                 onError(err) {
@@ -368,7 +368,7 @@ function DeleteWebhookButton(
                 },
               });
             }}
-            disabled={deleteMutation.isPending}
+            variant="destructive"
           >
             Delete Webhook
             {deleteMutation.isPending && <Spinner className="size-4" />}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/webhooks/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/webhooks/page.tsx
index d973ec50b63..c326164e83c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/webhooks/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/connect/universal-bridge/webhooks/page.tsx
@@ -1,6 +1,6 @@
+import { redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
-import { redirect } from "next/navigation";
 import { PayWebhooksPage } from "./components/webhooks.client";
 
 export default async function Page(props: {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/page.tsx
index 7be3f69ec33..a47a3d60783 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/page.tsx
@@ -1,7 +1,7 @@
+import { redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
 import { DeployedContractsPage } from "../../../../../account/contracts/_components/DeployedContractsPage";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../login/loginRedirect";
@@ -38,12 +38,12 @@ export default async function Page(props: {
   return (
     <div className="flex grow flex-col">
       <DeployedContractsPage
-        teamId={team.id}
-        projectId={project.id}
         authToken={authToken}
         client={client}
-        teamSlug={params.team_slug}
+        projectId={project.id}
         projectSlug={params.project_slug}
+        teamId={team.id}
+        teamSlug={params.team_slug}
       />
       <div className="h-20" />
       <ContractsFooter />
@@ -56,50 +56,50 @@ function ContractsFooter() {
     <div className="border-t">
       <div className="container max-w-7xl">
         <FooterLinksSection
-          left={{
-            title: "Documentation",
+          center={{
             links: [
               {
-                label: "Deployment Tools",
-                href: "https://portal.thirdweb.com/contracts/deploy/overview",
-              },
-              {
-                label: "Modular Contracts",
-                href: "https://portal.thirdweb.com/contracts/modular-contracts/overview",
+                href: "https://thirdweb.com/templates/hardhat-starter",
+                label: "Hardhat Starter",
               },
               {
-                label: "Pre-built Contracts",
-                href: "https://portal.thirdweb.com/contracts/explore/overview",
+                href: "https://thirdweb.com/templates/forge-starter",
+                label: "Forge Starter",
               },
             ],
-          }}
-          center={{
             title: "Templates",
+          }}
+          left={{
             links: [
               {
-                label: "Hardhat Starter",
-                href: "https://thirdweb.com/templates/hardhat-starter",
+                href: "https://portal.thirdweb.com/contracts/deploy/overview",
+                label: "Deployment Tools",
               },
               {
-                href: "https://thirdweb.com/templates/forge-starter",
-                label: "Forge Starter",
+                href: "https://portal.thirdweb.com/contracts/modular-contracts/overview",
+                label: "Modular Contracts",
+              },
+              {
+                href: "https://portal.thirdweb.com/contracts/explore/overview",
+                label: "Pre-built Contracts",
               },
             ],
+            title: "Documentation",
           }}
           right={{
-            title: "Tutorials",
             links: [
               {
+                href: "https://www.youtube.com/watch?v=cZt-CkzxrNM",
                 label:
                   "Everything you need to know about upgradeable smart contracts",
-                href: "https://www.youtube.com/watch?v=cZt-CkzxrNM",
               },
               {
+                href: "https://www.youtube.com/watch?v=ZoOk41y4f_k",
                 label:
                   "Modular Contracts SDK: Build Core & Modules from Scratch (Advanced Guide)",
-                href: "https://www.youtube.com/watch?v=ZoOk41y4f_k",
               },
             ],
+            title: "Tutorials",
           }}
         />
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/analytics-page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/analytics-page.tsx
index 68bf72ae949..133bcc524cd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/analytics-page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/analytics-page.tsx
@@ -1,6 +1,6 @@
-import type { Project } from "@/api/projects";
 import { ResponsiveSearchParamsProvider } from "responsive-rsc";
 import type { ThirdwebClient } from "thirdweb";
+import type { Project } from "@/api/projects";
 import type { Wallet } from "../server-wallets/wallet-table/types";
 import { TransactionAnalyticsFilter } from "./filter";
 import { TransactionsChartCard } from "./tx-chart/tx-chart";
@@ -27,18 +27,18 @@ export function TransactionsAnalyticsPageContent(props: {
               <TransactionAnalyticsFilter />
             </div>
             <TransactionsChartCard
-              searchParams={props.searchParams}
               project={props.project}
-              wallets={props.wallets ?? []}
+              searchParams={props.searchParams}
               teamSlug={props.teamSlug}
+              wallets={props.wallets ?? []}
             />
           </>
         )}
         <TransactionsTable
+          client={props.client}
           project={props.project}
-          wallets={props.wallets}
           teamSlug={props.teamSlug}
-          client={props.client}
+          wallets={props.wallets}
         />
       </div>
     </ResponsiveSearchParamsProvider>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/filter.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/filter.tsx
index 417ec2aa93b..f99b79930bf 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/filter.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/filter.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { normalizeTimeISOString } from "@/lib/time";
 import { DateRangeSelector } from "components/analytics/date-range-selector";
 import { IntervalSelector } from "components/analytics/interval-selector";
 import {
   useResponsiveSearchParams,
   useSetResponsiveSearchParams,
 } from "responsive-rsc";
+import { normalizeTimeISOString } from "@/lib/time";
 import { getTxAnalyticsFiltersFromSearchParams } from "../lib/utils";
 
 export function TransactionAnalyticsFilter() {
@@ -15,15 +15,15 @@ export function TransactionAnalyticsFilter() {
 
   const { range, interval } = getTxAnalyticsFiltersFromSearchParams({
     from: responsiveSearchParams.from,
-    to: responsiveSearchParams.to,
     interval: responsiveSearchParams.interval,
+    to: responsiveSearchParams.to,
   });
 
   return (
     <div className="no-scrollbar flex items-center gap-3 max-sm:overflow-auto">
       <DateRangeSelector
-        range={range}
         popoverAlign="end"
+        range={range}
         setRange={(newRange) => {
           setResponsiveSearchParams((v) => {
             return {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/ftux.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/ftux.client.tsx
index 345b95f6a1c..3e6c949181c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/ftux.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/ftux.client.tsx
@@ -1,10 +1,10 @@
 "use client";
-import type { Project } from "@/api/projects";
-import { Button } from "@/components/ui/button";
 import { type Step, StepsCard } from "components/dashboard/StepsCard";
 import Link from "next/link";
 import { useMemo, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import type { Project } from "@/api/projects";
+import { Button } from "@/components/ui/button";
 import CreateServerWallet from "../server-wallets/components/create-server-wallet.client";
 import type { Wallet } from "../server-wallets/wallet-table/types";
 import CreateVaultAccountButton from "../vault/components/create-vault-account.client";
@@ -27,50 +27,50 @@ export const EngineChecklist: React.FC<Props> = (props) => {
   const finalSteps = useMemo(() => {
     const steps: Step[] = [];
     steps.push({
-      title: "Create a Vault Admin Account",
-      description:
-        "Vault is thirdweb's key management system. It allows you to create secure server wallets and manage access tokens.",
       children: (
         <CreateVaultAccountStep
+          onUserAccessTokenCreated={(token) => setUserAccessToken(token)}
           project={props.project}
           teamSlug={props.teamSlug}
-          onUserAccessTokenCreated={(token) => setUserAccessToken(token)}
         />
       ),
       completed: !!props.managementAccessToken,
+      description:
+        "Vault is thirdweb's key management system. It allows you to create secure server wallets and manage access tokens.",
       showCompletedChildren: false,
+      title: "Create a Vault Admin Account",
     });
     steps.push({
-      title: "Create a Server Wallet",
-      description:
-        "Server wallets are smart wallets, they don't require any gas funds to send transactions.",
       children: (
         <CreateServerWalletStep
+          managementAccessToken={props.managementAccessToken}
           project={props.project}
           teamSlug={props.teamSlug}
-          managementAccessToken={props.managementAccessToken}
         />
       ),
       completed: props.wallets.length > 0,
-      showIncompleteChildren: false,
+      description:
+        "Server wallets are smart wallets, they don't require any gas funds to send transactions.",
       showCompletedChildren: false,
+      showIncompleteChildren: false,
+      title: "Create a Server Wallet",
     });
     steps.push({
-      title: "Send a Test Transaction",
-      description:
-        "Engine handles gas fees, and is designed for scale, speed and security. Send a test transaction to see it in action",
       children: (
         <SendTestTransaction
-          wallets={props.wallets}
-          project={props.project}
           client={props.client}
-          userAccessToken={userAccessToken}
+          project={props.project}
           teamSlug={props.teamSlug}
+          userAccessToken={userAccessToken}
+          wallets={props.wallets}
         />
       ),
       completed: props.hasTransactions,
-      showIncompleteChildren: false,
+      description:
+        "Engine handles gas fees, and is designed for scale, speed and security. Send a test transaction to see it in action",
       showCompletedChildren: false,
+      showIncompleteChildren: false,
+      title: "Send a Test Transaction",
     });
     return steps;
   }, [
@@ -91,12 +91,12 @@ export const EngineChecklist: React.FC<Props> = (props) => {
   if (props.testTxWithWallet) {
     return (
       <SendTestTransaction
-        wallets={props.wallets}
-        project={props.project}
         client={props.client}
+        project={props.project}
+        teamSlug={props.teamSlug}
         userAccessToken={userAccessToken}
         walletId={props.testTxWithWallet}
-        teamSlug={props.teamSlug}
+        wallets={props.wallets}
       />
     );
   }
@@ -107,7 +107,7 @@ export const EngineChecklist: React.FC<Props> = (props) => {
     return null;
   }
   return (
-    <StepsCard title="Setup Your Engine" steps={finalSteps} delay={1000} />
+    <StepsCard delay={1000} steps={finalSteps} title="Setup Your Engine" />
   );
 };
 
@@ -119,13 +119,13 @@ function CreateVaultAccountStep(props: {
   return (
     <div className="mt-4 flex flex-row gap-4">
       <CreateVaultAccountButton
-        project={props.project}
         onUserAccessTokenCreated={props.onUserAccessTokenCreated}
+        project={props.project}
       />
       <Link
         href="https://portal.thirdweb.com/engine/vault"
-        target="_blank"
         rel="noopener noreferrer"
+        target="_blank"
       >
         <Button variant="outline">Learn more about Vault</Button>
       </Link>
@@ -141,9 +141,9 @@ function CreateServerWalletStep(props: {
   return (
     <div className="mt-4 flex flex-row gap-4">
       <CreateServerWallet
+        managementAccessToken={props.managementAccessToken}
         project={props.project}
         teamSlug={props.teamSlug}
-        managementAccessToken={props.managementAccessToken}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/send-test-tx.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/send-test-tx.client.tsx
index b45ae04d337..ca78c4f2b04 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/send-test-tx.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/send-test-tx.client.tsx
@@ -1,9 +1,18 @@
 "use client";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useAllChainsData } from "hooks/chains/allChains";
+import { Loader2Icon, LockIcon } from "lucide-react";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import * as z from "zod";
 import { engineCloudProxy } from "@/actions/proxies";
 import type { Project } from "@/api/projects";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Input } from "@/components/ui/input";
 import {
   Select,
@@ -13,23 +22,14 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useAllChainsData } from "hooks/chains/allChains";
-import { Loader2Icon, LockIcon } from "lucide-react";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
-import * as z from "zod";
 import type { Wallet } from "../server-wallets/wallet-table/types";
 import { SmartAccountCell } from "../server-wallets/wallet-table/wallet-table-ui.client";
 import { deleteUserAccessToken, getUserAccessToken } from "./utils";
 
 const formSchema = z.object({
   accessToken: z.string().min(1, "Access token is required"),
-  walletIndex: z.string(),
   chainId: z.number(),
+  walletIndex: z.string(),
 });
 
 type FormValues = z.infer<typeof formSchema>;
@@ -53,9 +53,9 @@ export function SendTestTransaction(props: {
     props.userAccessToken ?? getUserAccessToken(props.project.id) ?? "";
 
   const form = useForm<FormValues>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
       accessToken: userAccessToken,
+      chainId: 84532,
       walletIndex:
         props.wallets && props.walletId
           ? props.wallets
@@ -63,8 +63,8 @@ export function SendTestTransaction(props: {
               ?.toString()
               .replace("-1", "0")
           : "0",
-      chainId: 84532,
     },
+    resolver: zodResolver(formSchema),
   });
 
   const selectedWalletIndex = Number(form.watch("walletIndex"));
@@ -77,18 +77,10 @@ export function SendTestTransaction(props: {
       chainId: number;
     }) => {
       const response = await engineCloudProxy({
-        pathname: "/v1/write/transaction",
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          "x-team-id": props.project.teamId,
-          "x-client-id": props.project.publishableKey,
-          "x-vault-access-token": args.accessToken,
-        },
         body: JSON.stringify({
           executionOptions: {
-            from: args.walletAddress,
             chainId: args.chainId.toString(),
+            from: args.walletAddress,
           },
           params: [
             {
@@ -97,6 +89,14 @@ export function SendTestTransaction(props: {
             },
           ],
         }),
+        headers: {
+          "Content-Type": "application/json",
+          "x-client-id": props.project.publishableKey,
+          "x-team-id": props.project.teamId,
+          "x-vault-access-token": args.accessToken,
+        },
+        method: "POST",
+        pathname: "/v1/write/transaction",
       });
 
       if (!response.ok) {
@@ -106,12 +106,12 @@ export function SendTestTransaction(props: {
 
       return response.data;
     },
-    onSuccess: () => {
-      toast.success("Test transaction sent successfully!");
-    },
     onError: (error) => {
       toast.error(error.message);
     },
+    onSuccess: () => {
+      toast.success("Test transaction sent successfully!");
+    },
   });
 
   const isLoading = sendDummyTxMutation.isPending;
@@ -123,9 +123,9 @@ export function SendTestTransaction(props: {
 
   const onSubmit = async (data: FormValues) => {
     await sendDummyTxMutation.mutateAsync({
-      walletAddress: selectedWallet.address,
       accessToken: data.accessToken,
       chainId: data.chainId,
+      walletAddress: selectedWallet.address,
     });
     queryClient.invalidateQueries({
       queryKey: ["transactions", props.project.id],
@@ -154,11 +154,11 @@ export function SendTestTransaction(props: {
               {userAccessToken ? (
                 <div className="flex flex-col gap-2 ">
                   <CopyTextButton
+                    className="!h-auto w-full justify-between bg-background px-3 py-3 font-mono text-xs"
                     copyIconPosition="right"
                     textToCopy={userAccessToken}
                     textToShow={userAccessToken}
                     tooltip="Copy Vault Access Token"
-                    className="!h-auto w-full justify-between bg-background px-3 py-3 font-mono text-xs"
                   />
                   <p className="text-muted-foreground text-xs">
                     This is a project-wide access token to access your server
@@ -168,12 +168,11 @@ export function SendTestTransaction(props: {
                 </div>
               ) : (
                 <Input
-                  id="access-token"
-                  type={userAccessToken ? "text" : "password"}
                   placeholder="vt_act_1234....ABCD"
+                  type={userAccessToken ? "text" : "password"}
                   {...form.register("accessToken")}
-                  disabled={isLoading}
                   className="text-xs"
+                  disabled={isLoading}
                 />
               )}
             </div>
@@ -186,15 +185,15 @@ export function SendTestTransaction(props: {
             <div className="flex flex-1 flex-col gap-2">
               <p className="text-sm">Server Wallet</p>
               <Select
-                value={form.watch("walletIndex")}
                 onValueChange={(value) => form.setValue("walletIndex", value)}
+                value={form.watch("walletIndex")}
               >
                 <SelectTrigger className="w-full">
                   <SelectValue>
                     <div className="flex items-center gap-2">
                       <SmartAccountCell
-                        wallet={selectedWallet}
                         client={props.client}
+                        wallet={selectedWallet}
                       />
                       <span className="text-muted-foreground text-sm">
                         {selectedWallet.metadata.label}
@@ -207,8 +206,8 @@ export function SendTestTransaction(props: {
                     <SelectItem key={wallet.address} value={index.toString()}>
                       <div className="flex items-center gap-2">
                         <SmartAccountCell
-                          wallet={wallet}
                           client={props.client}
+                          wallet={wallet}
                         />
                         <span className="text-muted-foreground text-sm">
                           {wallet.metadata.label}
@@ -222,7 +221,7 @@ export function SendTestTransaction(props: {
             <div className="flex flex-1 flex-col gap-2">
               <p className="text-sm">Select Testnet</p>
               <SingleNetworkSelector
-                className="bg-background"
+                chainId={form.watch("chainId")}
                 chainIds={chainsQuery.allChains
                   .filter(
                     (chain) =>
@@ -230,8 +229,8 @@ export function SendTestTransaction(props: {
                       chain.stackType !== "zksync_stack",
                   )
                   .map((chain) => chain.chainId)}
+                className="bg-background"
                 client={props.client}
-                chainId={form.watch("chainId")}
                 onChange={(chainId) => {
                   form.setValue("chainId", chainId);
                 }}
@@ -242,23 +241,24 @@ export function SendTestTransaction(props: {
         <div className="h-6" />
         <div className="flex flex-col gap-2 md:flex-row md:justify-end md:gap-2">
           <Button
+            className="w-full min-w-[200px] md:w-auto"
+            disabled={isLoading || !form.formState.isValid}
             type="submit"
             variant={hasSentTx ? "secondary" : "primary"}
-            disabled={isLoading || !form.formState.isValid}
-            className="w-full min-w-[200px] md:w-auto"
           >
             {isLoading ? (
               <>
                 <Loader2Icon className="mr-2 h-4 w-4 animate-spin" />
                 Sending...
               </>
+            ) : hasSentTx ? (
+              "Send More Transactions"
             ) : (
-              <>{hasSentTx ? "Send More Transactions" : "Send Transaction"}</>
+              "Send Transaction"
             )}
           </Button>
           {hasSentTx && (
             <Button
-              variant="primary"
               className="w-full md:w-auto"
               onClick={() => {
                 if (props.walletId) {
@@ -271,6 +271,7 @@ export function SendTestTransaction(props: {
                 // clear token from local storage after FTUX is complete
                 deleteUserAccessToken(props.project.id);
               }}
+              variant="primary"
             >
               {props.walletId ? "Close" : "Complete Setup"}
             </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/summary.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/summary.tsx
index 145f432f94b..725c6119cf2 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/summary.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/summary.tsx
@@ -42,26 +42,26 @@ function TransactionAnalyticsSummaryUI(props: {
   return (
     <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
       <StatCard
-        label="Total Transactions"
-        // Value is a number, standard formatter works
-        value={props.data?.totalCount}
         icon={ActivityIcon}
+        // Value is a number, standard formatter works
         isPending={props.isPending}
+        label="Total Transactions"
+        value={props.data?.totalCount}
       />
       <StatCard
-        label="Total Gas Spent (includes testnet)"
+        formatter={(v: number) => `${v.toFixed(10)} ETH`}
         // If pending, value doesn't matter much.
         // If not pending, pass the wei string `as any` if data exists, otherwise pass 0.
         // Passing 0 ensures StatCard receives a number if data is missing post-loading.
+        icon={CoinsIcon}
+        isPending={props.isPending}
+        label="Total Gas Spent (includes testnet)"
+        // Pass the formatter that handles the type juggling
         value={
           props.isPending
             ? undefined
             : parseTotalGasCost(props.data?.totalGasCostWei ?? "0")
         }
-        formatter={(v: number) => `${v.toFixed(10)} ETH`}
-        icon={CoinsIcon}
-        // Pass the formatter that handles the type juggling
-        isPending={props.isPending}
       />
       {/*
       // Example of how totalGasUnitsUsed could be added later:
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart-ui.tsx
index b97c3f44382..9db43392fde 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart-ui.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart-ui.tsx
@@ -1,17 +1,17 @@
 "use client";
 
-import type { Project } from "@/api/projects";
-import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
-import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
-import { Button } from "@/components/ui/button";
-import type { ChartConfig } from "@/components/ui/chart";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { format } from "date-fns";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { formatTickerNumber } from "lib/format-utils";
 import Link from "next/link";
 import { useMemo } from "react";
 import type { TransactionStats } from "types/analytics";
+import type { Project } from "@/api/projects";
+import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
+import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
+import { Button } from "@/components/ui/button";
+import type { ChartConfig } from "@/components/ui/chart";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import type { Wallet } from "../../server-wallets/wallet-table/types";
 
 type ChartData = Record<string, number> & {
@@ -77,21 +77,21 @@ export function TransactionsChartCardUI(props: {
 
     chainsToShow.forEach((chainName, i) => {
       _chartConfig[chainName] = {
-        label: chainName,
         color: `hsl(var(--chart-${(i % 10) + 1}))`,
+        label: chainName,
       };
     });
 
     // Add Other
     chainsToShow.push("others");
     _chartConfig.others = {
-      label: "Others",
       color: "hsl(var(--muted-foreground))",
+      label: "Others",
     };
 
     return {
-      chartData: Array.from(_chartDataMap.values()),
       chartConfig: _chartConfig,
+      chartData: Array.from(_chartDataMap.values()),
     };
   }, [userOpStats, chainsStore]);
 
@@ -103,6 +103,8 @@ export function TransactionsChartCardUI(props: {
 
   return (
     <ThirdwebBarChart
+      chartClassName="aspect-[1.5] lg:aspect-[3.5]"
+      config={chartConfig}
       customHeader={
         <div className="relative px-6 pt-6">
           <h3 className="mb-0.5 font-semibold text-xl tracking-tight">
@@ -115,8 +117,8 @@ export function TransactionsChartCardUI(props: {
           <div className="top-6 right-6 mb-8 grid grid-cols-2 items-center gap-2 md:absolute md:mb-0 md:flex">
             <ExportToCSVButton
               className="bg-background"
-              fileName="Sponsored Transactions"
               disabled={disableActions}
+              fileName="Sponsored Transactions"
               getData={async () => {
                 const header = ["Date", ...uniqueChainIds];
                 const rows = chartData.map((data) => {
@@ -132,12 +134,17 @@ export function TransactionsChartCardUI(props: {
           </div>
         </div>
       }
-      config={chartConfig}
       data={chartData}
+      emptyChartState={
+        <EmptyChartContent
+          project={props.project}
+          teamSlug={props.teamSlug}
+          wallets={props.wallets}
+        />
+      }
+      hideLabel={false}
       isPending={props.isPending}
-      chartClassName="aspect-[1.5] lg:aspect-[3.5]"
       showLegend
-      hideLabel={false}
       toolTipLabelFormatter={(_v, item) => {
         if (Array.isArray(item)) {
           const time = item[0].payload.time as number;
@@ -146,13 +153,6 @@ export function TransactionsChartCardUI(props: {
         return undefined;
       }}
       toolTipValueFormatter={(value) => formatTickerNumber(Number(value))}
-      emptyChartState={
-        <EmptyChartContent
-          teamSlug={props.teamSlug}
-          project={props.project}
-          wallets={props.wallets}
-        />
-      }
     />
   );
 }
@@ -171,10 +171,10 @@ function EmptyChartContent(props: {
           <span className="mb-6 text-center text-lg">
             Engine requires a{" "}
             <Link
-              href="https://portal.thirdweb.com/vault"
-              target="_blank"
               className="underline"
+              href="https://portal.thirdweb.com/vault"
               rel="noopener noreferrer"
+              target="_blank"
             >
               Vault admin account
             </Link>
@@ -182,12 +182,12 @@ function EmptyChartContent(props: {
           </span>
           <div className="flex max-w-md flex-wrap items-center justify-center gap-x-6 gap-y-4">
             <Button
-              variant="primary"
               onClick={() => {
                 router.push(
                   `/team/${props.teamSlug}/${props.project.slug}/engine/cloud/vault`,
                 );
               }}
+              variant="primary"
             >
               Create Vault Admin Account
             </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart.tsx
index fe78f41c005..6574283bd9d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart.tsx
@@ -1,5 +1,5 @@
-import type { Project } from "@/api/projects";
 import { ResponsiveSuspense } from "responsive-rsc";
+import type { Project } from "@/api/projects";
 import { getTransactionsChart } from "../../lib/analytics";
 import { getTxAnalyticsFiltersFromSearchParams } from "../../lib/utils";
 import type { Wallet } from "../../server-wallets/wallet-table/types";
@@ -15,19 +15,19 @@ async function AsyncTransactionsChartCard(props: {
 }) {
   const data = await getTransactionsChart({
     clientId: props.project.publishableKey,
-    teamId: props.project.teamId,
     from: props.from,
-    to: props.to,
     interval: props.interval,
+    teamId: props.project.teamId,
+    to: props.to,
   });
 
   return (
     <TransactionsChartCardUI
       isPending={false}
-      userOpStats={data}
       project={props.project}
-      wallets={props.wallets}
       teamSlug={props.teamSlug}
+      userOpStats={data}
+      wallets={props.wallets}
     />
   );
 }
@@ -49,24 +49,24 @@ export function TransactionsChartCard(props: {
   return (
     <ResponsiveSuspense
       // TODO - change this if this component does not end up using these params
-      searchParamsUsed={["from", "to", "interval"]}
       fallback={
         <TransactionsChartCardUI
           isPending={true}
-          userOpStats={[]}
           project={props.project}
-          wallets={[]}
           teamSlug={props.teamSlug}
+          userOpStats={[]}
+          wallets={[]}
         />
       }
+      searchParamsUsed={["from", "to", "interval"]}
     >
       <AsyncTransactionsChartCard
         from={range.from.toISOString()}
-        to={range.to.toISOString()}
         interval={interval}
         project={props.project}
-        wallets={props.wallets}
         teamSlug={props.teamSlug}
+        to={range.to.toISOString()}
+        wallets={props.wallets}
       />
     </ResponsiveSuspense>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table-ui.tsx
index ad5333d358c..5b1928652b6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table-ui.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table-ui.tsx
@@ -1,12 +1,20 @@
 "use client";
 
+import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import { ChainIconClient } from "components/icons/ChainIcon";
+import { format, formatDistanceToNowStrict } from "date-fns";
+import { useAllChainsData } from "hooks/chains/allChains";
+import { ExternalLinkIcon, InfoIcon } from "lucide-react";
+import Link from "next/link";
+import { useId, useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { PaginationButtons } from "@/components/pagination-buttons";
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Label } from "@/components/ui/label";
 import {
   Select,
@@ -29,14 +37,6 @@ import {
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { keepPreviousData, useQuery } from "@tanstack/react-query";
-import { ChainIconClient } from "components/icons/ChainIcon";
-import { format, formatDistanceToNowStrict } from "date-fns";
-import { useAllChainsData } from "hooks/chains/allChains";
-import { ExternalLinkIcon, InfoIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import type { Wallet } from "../../server-wallets/wallet-table/types";
 import type {
   Transaction,
@@ -61,11 +61,11 @@ export function TransactionsTableUI(props: {
 
   const pageSize = 10;
   const transactionsQuery = useQuery({
-    queryKey: ["transactions", props.project.id, page],
+    enabled: !!props.wallets && props.wallets.length > 0,
+    placeholderData: keepPreviousData,
     queryFn: () => props.getData({ page }),
+    queryKey: ["transactions", props.project.id, page],
     refetchInterval: autoUpdate ? 4_000 : false,
-    placeholderData: keepPreviousData,
-    enabled: !!props.wallets && props.wallets.length > 0,
   });
 
   const transactions = transactionsQuery.data?.transactions ?? [];
@@ -78,6 +78,8 @@ export function TransactionsTableUI(props: {
     (transactionsQuery.isPlaceholderData && transactionsQuery.isFetching) ||
     (transactionsQuery.isLoading && !transactionsQuery.isPlaceholderData);
 
+  const autoUpdateId = useId();
+
   return (
     <div className="overflow-hidden rounded-lg border border-border bg-card">
       <div className="flex flex-col gap-4 rounded-lg rounded-b-none px-6 py-6 lg:flex-row lg:justify-between">
@@ -92,20 +94,20 @@ export function TransactionsTableUI(props: {
 
         <div className="flex items-center justify-end gap-5 border-border border-t pt-4 lg:border-none lg:pt-0">
           <div className="flex shrink-0 items-center gap-2">
-            <Label htmlFor="auto-update">Auto Update</Label>
+            <Label htmlFor={autoUpdateId}>Auto Update</Label>
             <Switch
               checked={autoUpdate}
+              id={autoUpdateId}
               onCheckedChange={(v) => setAutoUpdate(!!v)}
-              id="auto-update"
             />
           </div>
           <StatusSelector
-            status={status}
             setStatus={(v) => {
               setStatus(v);
               // reset page
               setPage(1);
             }}
+            status={status}
           />
         </div>
       </div>
@@ -123,19 +125,15 @@ export function TransactionsTableUI(props: {
             </TableRow>
           </TableHeader>
           <TableBody>
-            {showSkeleton ? (
-              <>
-                {new Array(pageSize).fill(0).map((_, i) => (
-                  // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+            {showSkeleton
+              ? new Array(pageSize).fill(0).map((_, i) => (
+                  // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
                   <SkeletonRow key={i} />
-                ))}
-              </>
-            ) : (
-              <>
-                {transactions.map((tx) => (
+                ))
+              : transactions.map((tx) => (
                   <TableRow
-                    key={`${tx.id}${tx.chainId}`}
                     className="cursor-pointer hover:bg-accent/50"
+                    key={`${tx.id}${tx.chainId}`}
                     onClick={() => {
                       router.push(
                         `/team/${props.teamSlug}/${props.project.slug}/engine/cloud/tx/${tx.id}`,
@@ -146,9 +144,9 @@ export function TransactionsTableUI(props: {
                     <TableCell className="font-medium">
                       <CopyAddressButton
                         address={tx.id ? tx.id : ""}
+                        className="text-muted-foreground"
                         copyIconPosition="left"
                         variant="ghost"
-                        className="text-muted-foreground"
                       />
                     </TableCell>
 
@@ -188,8 +186,6 @@ export function TransactionsTableUI(props: {
                     </TableCell>
                   </TableRow>
                 ))}
-              </>
-            )}
           </TableBody>
         </Table>
 
@@ -214,25 +210,25 @@ export function TransactionsTableUI(props: {
 }
 
 export const statusDetails = {
-  QUEUED: {
-    name: "Queued",
-    type: "warning",
-  },
-  SUBMITTED: {
-    name: "Submitted",
-    type: "warning",
-  },
   CONFIRMED: {
     name: "Confirmed",
     type: "success",
   },
+  FAILED: {
+    name: "Failed",
+    type: "destructive",
+  },
+  QUEUED: {
+    name: "Queued",
+    type: "warning",
+  },
   REVERTED: {
     name: "Reverted",
     type: "destructive",
   },
-  FAILED: {
-    name: "Failed",
-    type: "destructive",
+  SUBMITTED: {
+    name: "Submitted",
+    type: "warning",
   },
 } as const;
 
@@ -244,7 +240,6 @@ function StatusSelector(props: {
 
   return (
     <Select
-      value={props.status || "all"}
       onValueChange={(v) => {
         if (v === "all") {
           props.setStatus(undefined);
@@ -252,6 +247,7 @@ function StatusSelector(props: {
           props.setStatus(v as TransactionStatus);
         }
       }}
+      value={props.status || "all"}
     >
       <SelectTrigger className="min-w-[160px]">
         <SelectValue placeholder="All" />
@@ -358,7 +354,7 @@ function TxStatusCell(props: { transaction: Transaction }) {
 
   return (
     <ToolTipLabel hoverable label={tooltip}>
-      <Badge variant={statusDetails[status].type} className="gap-2">
+      <Badge className="gap-2" variant={statusDetails[status].type}>
         {statusDetails[status].name}
         {errorMessage && <InfoIcon className="size-3" />}
       </Badge>
@@ -380,30 +376,30 @@ function TxHashCell(props: { transaction: Transaction }) {
   if (!explorer) {
     return (
       <CopyTextButton
-        textToCopy={transactionHash}
+        className="font-mono text-muted-foreground text-sm"
         copyIconPosition="left"
+        textToCopy={transactionHash}
         textToShow={shortHash}
-        variant="ghost"
         tooltip="Copy transaction hash"
-        className="font-mono text-muted-foreground text-sm"
+        variant="ghost"
       />
     );
   }
 
   return (
     <Button
-      variant="ghost"
       asChild
       className="-translate-x-2 gap-2 font-mono"
       size="sm"
+      variant="ghost"
     >
       <Link
         href={`${explorer.url}/tx/${transactionHash}`}
-        target="_blank"
-        rel="noopener noreferrer"
         onClick={(e) => {
           e.stopPropagation();
         }}
+        rel="noopener noreferrer"
+        target="_blank"
       >
         {shortHash}{" "}
         <ExternalLinkIcon className="size-4 text-muted-foreground" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table.tsx
index cc3ede7eecc..3f4dfc3e0b6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import type { ThirdwebClient } from "thirdweb";
 import { engineCloudProxy } from "@/actions/proxies";
 import type { Project } from "@/api/projects";
-import type { ThirdwebClient } from "thirdweb";
 import type { Wallet } from "../../server-wallets/wallet-table/types";
 import { TransactionsTableUI } from "./tx-table-ui";
 import type { TransactionsResponse } from "./types";
@@ -15,16 +15,16 @@ export function TransactionsTable(props: {
 }) {
   return (
     <TransactionsTableUI
+      client={props.client}
       getData={async ({ page }) => {
         return await getTransactions({
-          project: props.project,
           page,
+          project: props.project,
         });
       }}
       project={props.project}
-      wallets={props.wallets}
       teamSlug={props.teamSlug}
-      client={props.client}
+      wallets={props.wallets}
     />
   );
 }
@@ -38,17 +38,17 @@ async function getTransactions({
 }) {
   const transactions = await engineCloudProxy<{ result: TransactionsResponse }>(
     {
-      pathname: "/v1/transactions/search",
-      method: "POST",
+      body: JSON.stringify({
+        limit: 20,
+        page,
+      }),
       headers: {
         "Content-Type": "application/json",
-        "x-team-id": project.teamId,
         "x-client-id": project.publishableKey,
+        "x-team-id": project.teamId,
       },
-      body: JSON.stringify({
-        page,
-        limit: 20,
-      }),
+      method: "POST",
+      pathname: "/v1/transactions/search",
     },
   );
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/explorer/components/scalar.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/explorer/components/scalar.tsx
index e4ec0dd710a..3575646e063 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/explorer/components/scalar.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/explorer/components/scalar.tsx
@@ -9,14 +9,14 @@ export function Scalar() {
       <h2 className="font-bold text-2xl tracking-tight">Full API Reference</h2>
       <ApiReferenceReact
         configuration={{
-          url: `${NEXT_PUBLIC_ENGINE_CLOUD_URL}/openapi`,
           hideModels: true,
           servers: [
             {
-              url: NEXT_PUBLIC_ENGINE_CLOUD_URL,
               description: "Engine Cloud",
+              url: NEXT_PUBLIC_ENGINE_CLOUD_URL,
             },
           ],
+          url: `${NEXT_PUBLIC_ENGINE_CLOUD_URL}/openapi`,
         }}
       />
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/layout.tsx
index 8246256d7a9..aef337efdba 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/layout.tsx
@@ -1,8 +1,8 @@
+import Link from "next/link";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { TabPathLinks } from "@/components/ui/tabs";
 import { NEXT_PUBLIC_ENGINE_CLOUD_URL } from "@/constants/public-envs";
-import Link from "next/link";
 import { EngineIcon } from "../../../../../../(dashboard)/(chain)/components/server/icons/EngineIcon";
 
 export default async function Page(props: {
@@ -37,24 +37,24 @@ function TransactionsLayout(props: {
               <h1 className="mb-0.5 flex items-center gap-2 font-semibold text-3xl tracking-tight">
                 Engine{" "}
                 <Badge
-                  variant="success"
                   className="mt-0.5 flex items-center gap-2 text-sm"
+                  variant="success"
                 >
                   <EngineIcon className="size-4" /> Cloud
                 </Badge>
                 <Badge
-                  variant="outline"
                   className="mt-0.5 flex items-center gap-2 text-sm"
+                  variant="outline"
                 >
                   Beta
                 </Badge>
               </h1>
               <div className="flex items-center gap-2">
                 <Link
-                  href={`${NEXT_PUBLIC_ENGINE_CLOUD_URL}/reference`} // TODO: change this
-                  target="_blank"
+                  className="max-w-full truncate py-1 text-muted-foreground" // TODO: change this
+                  href={`${NEXT_PUBLIC_ENGINE_CLOUD_URL}/reference`}
                   rel="noopener noreferrer"
-                  className="max-w-full truncate py-1 text-muted-foreground"
+                  target="_blank"
                 >
                   {NEXT_PUBLIC_ENGINE_CLOUD_URL}
                 </Link>
@@ -70,12 +70,11 @@ function TransactionsLayout(props: {
 
         {/* Nav */}
         <TabPathLinks
-          scrollableClassName="container max-w-7xl"
           links={[
             {
+              exactMatch: true,
               name: "Transactions",
               path: `${engineLayoutSlug}`,
-              exactMatch: true,
             },
             {
               name: "API Explorer",
@@ -90,6 +89,7 @@ function TransactionsLayout(props: {
               path: `${engineLayoutSlug}/vault`,
             },
           ]}
+          scrollableClassName="container max-w-7xl"
         />
       </div>
       <div className="h-6" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/analytics.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/analytics.ts
index 4bd8057bf2e..9462f5c1567 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/analytics.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/analytics.ts
@@ -45,14 +45,14 @@ export async function getTransactionAnalyticsSummary(props: {
     const response = await fetch(
       `${NEXT_PUBLIC_ENGINE_CLOUD_URL}/v1/transactions/analytics-summary`,
       {
-        method: "POST",
+        body: JSON.stringify(body),
         headers: {
+          Authorization: `Bearer ${authToken}`,
           "Content-Type": "application/json",
-          "x-team-id": props.teamId,
           "x-client-id": props.clientId,
-          Authorization: `Bearer ${authToken}`,
+          "x-team-id": props.teamId,
         },
-        body: JSON.stringify(body),
+        method: "POST",
       },
     );
 
@@ -96,22 +96,22 @@ export async function getTransactionsChart({
   const authToken = await getAuthToken();
 
   const filters = {
-    startDate: from,
     endDate: to,
     resolution: interval,
+    startDate: from,
   };
 
   const response = await fetch(
     `${NEXT_PUBLIC_ENGINE_CLOUD_URL}/v1/transactions/analytics`,
     {
-      method: "POST",
+      body: JSON.stringify(filters),
       headers: {
+        Authorization: `Bearer ${authToken}`,
         "Content-Type": "application/json",
-        "x-team-id": teamId,
         "x-client-id": clientId,
-        Authorization: `Bearer ${authToken}`,
+        "x-team-id": teamId,
       },
-      body: JSON.stringify(filters),
+      method: "POST",
     },
   );
 
@@ -144,9 +144,9 @@ export async function getTransactionsChart({
   const data = (await response.json()) as TransactionsChartResponse;
 
   return data.result.analytics.map((stat) => ({
-    date: stat.timeBucket,
     chainId: Number(stat.chainId),
     count: stat.count,
+    date: stat.timeBucket,
   }));
 }
 
@@ -165,8 +165,8 @@ export async function getSingleTransaction({
     filters: [
       {
         field: "id",
-        values: [transactionId],
         operation: "OR",
+        values: [transactionId],
       },
     ],
   };
@@ -174,14 +174,14 @@ export async function getSingleTransaction({
   const response = await fetch(
     `${NEXT_PUBLIC_ENGINE_CLOUD_URL}/v1/transactions/search`,
     {
-      method: "POST",
+      body: JSON.stringify(filters),
       headers: {
+        Authorization: `Bearer ${authToken}`,
         "Content-Type": "application/json",
-        "x-team-id": teamId,
         "x-client-id": clientId,
-        Authorization: `Bearer ${authToken}`,
+        "x-team-id": teamId,
       },
-      body: JSON.stringify(filters),
+      method: "POST",
     },
   );
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/utils.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/utils.ts
index 6b6d9c0adb2..5cdf97d7f4a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/utils.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/utils.ts
@@ -6,9 +6,9 @@ export function getTxAnalyticsFiltersFromSearchParams(params: {
   interval?: string | undefined | string[];
 }) {
   return getFiltersFromSearchParams({
+    defaultRange: "last-30",
     from: params.from,
-    to: params.to,
     interval: params.interval,
-    defaultRange: "last-30",
+    to: params.to,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/vault.client.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/vault.client.ts
index 1a7024566e7..0769cfb8df9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/vault.client.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/vault.client.ts
@@ -1,13 +1,13 @@
 "use client";
 
-import type { Project } from "@/api/projects";
-import { NEXT_PUBLIC_THIRDWEB_VAULT_URL } from "@/constants/public-envs";
 import { updateProjectClient } from "@3rdweb-sdk/react/hooks/useApi";
 import {
-  type VaultClient,
   createAccessToken,
   createVaultClient,
+  type VaultClient,
 } from "@thirdweb-dev/vault-sdk";
+import type { Project } from "@/api/projects";
+import { NEXT_PUBLIC_THIRDWEB_VAULT_URL } from "@/constants/public-envs";
 
 const SERVER_WALLET_ACCESS_TOKEN_PURPOSE =
   "Access Token for All Server Wallets";
@@ -35,13 +35,20 @@ export async function createWalletAccessToken(props: {
   return createAccessToken({
     client: props.vaultClient,
     request: {
+      auth: {
+        adminKey: props.adminKey,
+      },
       options: {
         expiresAt: new Date(
           Date.now() + 60 * 60 * 1000 * 24 * 365 * 1000,
         ).toISOString(), // 100 years from now
+        metadata: {
+          projectId: props.project.id,
+          purpose: SERVER_WALLET_ACCESS_TOKEN_PURPOSE,
+          teamId: props.project.teamId,
+        },
         policies: [
           {
-            type: "eoa:read",
             metadataPatterns: [
               {
                 key: "projectId",
@@ -62,9 +69,9 @@ export async function createWalletAccessToken(props: {
                 },
               },
             ],
+            type: "eoa:read",
           },
           {
-            type: "eoa:create",
             requiredMetadataPatterns: [
               {
                 key: "projectId",
@@ -85,9 +92,9 @@ export async function createWalletAccessToken(props: {
                 },
               },
             ],
+            type: "eoa:create",
           },
           {
-            type: "eoa:signMessage",
             metadataPatterns: [
               {
                 key: "projectId",
@@ -108,10 +115,9 @@ export async function createWalletAccessToken(props: {
                 },
               },
             ],
+            type: "eoa:signMessage",
           },
           {
-            type: "eoa:signTransaction",
-            payloadPatterns: {},
             metadataPatterns: [
               {
                 key: "projectId",
@@ -132,9 +138,10 @@ export async function createWalletAccessToken(props: {
                 },
               },
             ],
+            payloadPatterns: {},
+            type: "eoa:signTransaction",
           },
           {
-            type: "eoa:signTypedData",
             metadataPatterns: [
               {
                 key: "projectId",
@@ -155,13 +162,9 @@ export async function createWalletAccessToken(props: {
                 },
               },
             ],
+            type: "eoa:signTypedData",
           },
           {
-            type: "eoa:signStructuredMessage",
-            structuredPatterns: {
-              useropV06: {},
-              useropV07: {},
-            },
             metadataPatterns: [
               {
                 key: "projectId",
@@ -182,9 +185,13 @@ export async function createWalletAccessToken(props: {
                 },
               },
             ],
+            structuredPatterns: {
+              useropV06: {},
+              useropV07: {},
+            },
+            type: "eoa:signStructuredMessage",
           },
           {
-            type: "eoa:read",
             metadataPatterns: [
               {
                 key: "projectId",
@@ -205,9 +212,9 @@ export async function createWalletAccessToken(props: {
                 },
               },
             ],
+            type: "eoa:read",
           },
           {
-            type: "eoa:create",
             requiredMetadataPatterns: [
               {
                 key: "projectId",
@@ -228,16 +235,9 @@ export async function createWalletAccessToken(props: {
                 },
               },
             ],
+            type: "eoa:create",
           },
         ],
-        metadata: {
-          projectId: props.project.id,
-          teamId: props.project.teamId,
-          purpose: SERVER_WALLET_ACCESS_TOKEN_PURPOSE,
-        },
-      },
-      auth: {
-        adminKey: props.adminKey,
       },
     },
   });
@@ -252,13 +252,20 @@ export async function createManagementAccessToken(props: {
   const res = await createAccessToken({
     client: props.vaultClient,
     request: {
+      auth: {
+        adminKey: props.adminKey,
+      },
       options: {
         expiresAt: new Date(
           Date.now() + 60 * 60 * 1000 * 24 * 365 * 1000,
         ).toISOString(), // 100 years from now
+        metadata: {
+          projectId: props.project.id,
+          purpose: SERVER_WALLET_MANAGEMENT_ACCESS_TOKEN_PURPOSE,
+          teamId: props.project.teamId,
+        },
         policies: [
           {
-            type: "eoa:read",
             metadataPatterns: [
               {
                 key: "projectId",
@@ -279,9 +286,9 @@ export async function createManagementAccessToken(props: {
                 },
               },
             ],
+            type: "eoa:read",
           },
           {
-            type: "eoa:create",
             requiredMetadataPatterns: [
               {
                 key: "projectId",
@@ -302,9 +309,9 @@ export async function createManagementAccessToken(props: {
                 },
               },
             ],
+            type: "eoa:create",
           },
           {
-            type: "accessToken:read",
             metadataPatterns: [
               {
                 key: "projectId",
@@ -320,16 +327,9 @@ export async function createManagementAccessToken(props: {
               },
             ],
             revealSensitive: false,
+            type: "accessToken:read",
           },
         ],
-        metadata: {
-          projectId: props.project.id,
-          teamId: props.project.teamId,
-          purpose: SERVER_WALLET_MANAGEMENT_ACCESS_TOKEN_PURPOSE,
-        },
-      },
-      auth: {
-        adminKey: props.adminKey,
       },
     },
   });
@@ -344,11 +344,11 @@ export async function createManagementAccessToken(props: {
         services: [
           ...props.project.services,
           {
-            name: "engineCloud",
+            actions: [],
             managementAccessToken: data.accessToken,
             maskedAdminKey: maskSecret(props.adminKey),
+            name: "engineCloud",
             rotationCode: props.rotationCode,
-            actions: [],
           },
         ],
       },
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/page.tsx
index 8e6575b3807..73080e14d80 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/page.tsx
@@ -1,15 +1,15 @@
+import { createVaultClient, listEoas } from "@thirdweb-dev/vault-sdk";
+import { notFound, redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { NEXT_PUBLIC_THIRDWEB_VAULT_URL } from "@/constants/public-envs";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { createVaultClient, listEoas } from "@thirdweb-dev/vault-sdk";
-import { notFound, redirect } from "next/navigation";
 import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
 import { TransactionsAnalyticsPageContent } from "./analytics/analytics-page";
 import { EngineChecklist } from "./analytics/ftux.client";
 import { TransactionAnalyticsSummary } from "./analytics/summary";
 import {
-  type TransactionSummaryData,
   getTransactionAnalyticsSummary,
+  type TransactionSummaryData,
 } from "./lib/analytics";
 import type { Wallet } from "./server-wallets/wallet-table/types";
 
@@ -71,8 +71,8 @@ export default async function TransactionsAnalyticsPage(props: {
   let initialData: TransactionSummaryData | undefined;
   if (wallets && wallets.length > 0) {
     const summary = await getTransactionAnalyticsSummary({
-      teamId: project.teamId,
       clientId: project.publishableKey,
+      teamId: project.teamId,
     }).catch(() => undefined);
     initialData = summary;
   }
@@ -86,29 +86,29 @@ export default async function TransactionsAnalyticsPage(props: {
   return (
     <div className="flex grow flex-col">
       <EngineChecklist
-        teamSlug={params.team_slug}
-        managementAccessToken={managementAccessToken ?? undefined}
+        client={client}
         hasTransactions={hasTransactions}
+        managementAccessToken={managementAccessToken ?? undefined}
         project={project}
-        wallets={wallets ?? []}
+        teamSlug={params.team_slug}
         testTxWithWallet={searchParams.testTxWithWallet as string | undefined}
-        client={client}
+        wallets={wallets ?? []}
       />
       {hasTransactions && !searchParams.testTxWithWallet && (
         <TransactionAnalyticsSummary
+          clientId={project.publishableKey}
           initialData={initialData}
           teamId={project.teamId}
-          clientId={project.publishableKey}
         />
       )}
       <div className="h-10" />
       <TransactionsAnalyticsPageContent
-        teamSlug={params.team_slug}
-        searchParams={searchParams}
+        client={client}
         project={project}
+        searchParams={searchParams}
         showAnalytics={hasTransactions && !searchParams.testTxWithWallet}
+        teamSlug={params.team_slug}
         wallets={wallets}
-        client={client}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/create-server-wallet.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/create-server-wallet.client.tsx
index 2ec6fd295a3..21fb201f045 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/create-server-wallet.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/create-server-wallet.client.tsx
@@ -1,4 +1,9 @@
 "use client";
+import { useMutation } from "@tanstack/react-query";
+import { createEoa } from "@thirdweb-dev/vault-sdk";
+import { Loader2Icon, WalletIcon } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
 import { engineCloudProxy } from "@/actions/proxies";
 import type { Project } from "@/api/projects";
 import { Button } from "@/components/ui/button";
@@ -11,11 +16,6 @@ import {
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useMutation } from "@tanstack/react-query";
-import { createEoa } from "@thirdweb-dev/vault-sdk";
-import { Loader2Icon, WalletIcon } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
 import { initVaultClient } from "../../lib/vault.client";
 
 export default function CreateServerWallet(props: {
@@ -38,20 +38,20 @@ export default function CreateServerWallet(props: {
       const vaultClient = await initVaultClient();
 
       const eoa = await createEoa({
+        client: vaultClient,
         request: {
+          auth: {
+            accessToken: managementAccessToken,
+          },
           options: {
             metadata: {
+              label,
               projectId: props.project.id,
               teamId: props.project.teamId,
               type: "server-wallet",
-              label,
             },
           },
-          auth: {
-            accessToken: managementAccessToken,
-          },
         },
-        client: vaultClient,
       });
 
       if (!eoa.success) {
@@ -60,16 +60,16 @@ export default function CreateServerWallet(props: {
 
       // no need to await this, it's not blocking
       engineCloudProxy({
-        pathname: "/cache/smart-account",
-        method: "POST",
+        body: JSON.stringify({
+          signerAddress: eoa.data.address,
+        }),
         headers: {
           "Content-Type": "application/json",
-          "x-team-id": props.project.teamId,
           "x-client-id": props.project.publishableKey,
+          "x-team-id": props.project.teamId,
         },
-        body: JSON.stringify({
-          signerAddress: eoa.data.address,
-        }),
+        method: "POST",
+        pathname: "/cache/smart-account",
       }).catch((err) => {
         console.warn("failed to cache server wallet", err);
       });
@@ -91,8 +91,8 @@ export default function CreateServerWallet(props: {
       );
     } else {
       await createEoaMutation.mutateAsync({
-        managementAccessToken: props.managementAccessToken,
         label,
+        managementAccessToken: props.managementAccessToken,
       });
     }
   };
@@ -102,7 +102,7 @@ export default function CreateServerWallet(props: {
   return (
     <>
       <Button
-        variant={"primary"}
+        className="flex flex-row items-center gap-2"
         onClick={() =>
           props.managementAccessToken
             ? setModalOpen(true)
@@ -110,7 +110,7 @@ export default function CreateServerWallet(props: {
                 `/team/${props.teamSlug}/${props.project.slug}/engine/cloud/vault`,
               )
         }
-        className="flex flex-row items-center gap-2"
+        variant={"primary"}
       >
         {isLoading ? (
           <Loader2Icon className="size-4 animate-spin" />
@@ -124,7 +124,7 @@ export default function CreateServerWallet(props: {
           : "Get Started"}
       </Button>
 
-      <Dialog open={modalOpen} onOpenChange={setModalOpen}>
+      <Dialog onOpenChange={setModalOpen} open={modalOpen}>
         <DialogContent className="p-0">
           <DialogHeader className="px-6 pt-6">
             <DialogTitle>Create server wallet</DialogTitle>
@@ -135,25 +135,25 @@ export default function CreateServerWallet(props: {
           <div className="flex flex-col gap-4 px-6">
             <div>
               <Input
+                className="w-full"
+                onChange={(e) => setLabel(e.target.value)}
                 placeholder="Wallet label (optional)"
                 value={label}
-                onChange={(e) => setLabel(e.target.value)}
-                className="w-full"
               />
             </div>
           </div>
           <div className="flex justify-end gap-3 border-t bg-card px-6 py-4">
             <Button
-              variant="outline"
-              onClick={() => setModalOpen(false)}
               disabled={isLoading}
+              onClick={() => setModalOpen(false)}
+              variant="outline"
             >
               Cancel
             </Button>
             <Button
-              variant="primary"
-              onClick={handleCreateServerWallet}
               disabled={isLoading}
+              onClick={handleCreateServerWallet}
+              variant="primary"
             >
               {isLoading ? (
                 <>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/try-it-out.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/try-it-out.tsx
index 7c45fca4cbd..d0e94a89090 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/try-it-out.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/try-it-out.tsx
@@ -1,11 +1,11 @@
 "use client";
+import { CircleAlertIcon } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { CodeClient } from "@/components/ui/code/code.client";
 import { TabButtons } from "@/components/ui/tabs";
 import { NEXT_PUBLIC_ENGINE_CLOUD_URL } from "@/constants/public-envs";
-import { CircleAlertIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
 
 export function TryItOut() {
   const [activeTab, setActiveTab] = useState<string>("sdk");
@@ -29,34 +29,34 @@ export function TryItOut() {
         <TabButtons
           tabs={[
             {
+              isActive: activeTab === "sdk",
               name: "thirdweb SDK",
               onClick: () => setActiveTab("sdk"),
-              isActive: activeTab === "sdk",
             },
             {
+              isActive: activeTab === "curl",
               name: "Curl",
               onClick: () => setActiveTab("curl"),
-              isActive: activeTab === "curl",
             },
             {
+              isActive: activeTab === "js",
               name: "JavaScript",
               onClick: () => setActiveTab("js"),
-              isActive: activeTab === "js",
             },
             {
+              isActive: activeTab === "python",
               name: "Python",
               onClick: () => setActiveTab("python"),
-              isActive: activeTab === "python",
             },
             {
+              isActive: activeTab === "go",
               name: "Go",
               onClick: () => setActiveTab("go"),
-              isActive: activeTab === "go",
             },
             {
+              isActive: activeTab === "csharp",
               name: "C#",
               onClick: () => setActiveTab("csharp"),
-              isActive: activeTab === "csharp",
             },
           ]}
         />
@@ -65,7 +65,7 @@ export function TryItOut() {
 
         {activeTab === "sdk" && (
           <div className="flex flex-col gap-4">
-            <Alert variant="info" className="bg-background">
+            <Alert className="bg-background" variant="info">
               <CircleAlertIcon className="size-5" />
               <AlertTitle>Using the thirdweb SDK on the backend</AlertTitle>
               <AlertDescription className="leading-loose">
@@ -76,10 +76,10 @@ export function TryItOut() {
                     <li>
                       The full catalog of{" "}
                       <Link
-                        href="https://portal.thirdweb.com/references/typescript/v5/functions#extensions"
                         className="text-blue-500"
-                        target="_blank"
+                        href="https://portal.thirdweb.com/references/typescript/v5/functions#extensions"
                         rel="noopener noreferrer"
+                        target="_blank"
                       >
                         extension functions
                       </Link>
@@ -87,10 +87,10 @@ export function TryItOut() {
                     <li>
                       The{" "}
                       <Link
-                        href="https://portal.thirdweb.com/references/typescript/v5/prepareContractCall"
                         className="text-blue-500"
-                        target="_blank"
+                        href="https://portal.thirdweb.com/references/typescript/v5/prepareContractCall"
                         rel="noopener noreferrer"
+                        target="_blank"
                       >
                         prepareContractCall
                       </Link>{" "}
@@ -99,10 +99,10 @@ export function TryItOut() {
                     <li>
                       The full{" "}
                       <Link
-                        href="https://portal.thirdweb.com/references/typescript/v5/Account"
                         className="text-blue-500"
-                        target="_blank"
+                        href="https://portal.thirdweb.com/references/typescript/v5/Account"
                         rel="noopener noreferrer"
+                        target="_blank"
                       >
                         account
                       </Link>{" "}
@@ -118,25 +118,25 @@ export function TryItOut() {
               Installation
             </h3>
             <CodeClient
-              lang="shell"
-              code={"npm install thirdweb"}
               className="bg-background"
+              code={"npm install thirdweb"}
+              lang="shell"
             />
             <h3 className="font-semibold text-lg tracking-tight">
               Usage example: Minting a ERC1155 NFT to a user
             </h3>
             <CodeClient
-              lang="ts"
-              code={sdkExample()}
               className="bg-background"
+              code={sdkExample()}
+              lang="ts"
             />
           </div>
         )}
         {activeTab === "curl" && (
           <CodeClient
-            lang="bash"
-            code={curlExample()}
             className="bg-background"
+            code={curlExample()}
+            lang="bash"
           />
         )}
         {activeTab === "js" && (
@@ -145,37 +145,37 @@ export function TryItOut() {
               A lightweight, type safe wrapper package of the Engine HTTP API is
               available on{" "}
               <Link
-                href="https://www.npmjs.com/package/@thirdweb-dev/engine"
                 className="text-blue-500"
-                target="_blank"
+                href="https://www.npmjs.com/package/@thirdweb-dev/engine"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 NPM
               </Link>
               .
             </p>
             <CodeClient
-              lang="js"
-              code={jsExample()}
               className="bg-background"
+              code={jsExample()}
+              lang="js"
             />
           </div>
         )}
         {activeTab === "python" && (
           <CodeClient
-            lang="python"
-            code={pythonExample()}
             className="bg-background"
+            code={pythonExample()}
+            lang="python"
           />
         )}
         {activeTab === "go" && (
-          <CodeClient lang="go" code={goExample()} className="bg-background" />
+          <CodeClient className="bg-background" code={goExample()} lang="go" />
         )}
         {activeTab === "csharp" && (
           <CodeClient
-            lang="csharp"
-            code={csharpExample()}
             className="bg-background"
+            code={csharpExample()}
+            lang="csharp"
           />
         )}
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/page.tsx
index 592794fc9f5..ea2ed01fcc1 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/page.tsx
@@ -1,8 +1,8 @@
+import { createVaultClient, listEoas } from "@thirdweb-dev/vault-sdk";
+import { notFound } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { NEXT_PUBLIC_THIRDWEB_VAULT_URL } from "@/constants/public-envs";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { createVaultClient, listEoas } from "@thirdweb-dev/vault-sdk";
-import { notFound } from "next/navigation";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import type { Wallet } from "./wallet-table/types";
 import { ServerWalletsTable } from "./wallet-table/wallet-table";
@@ -64,13 +64,13 @@ export default async function TransactionsServerWalletsPage(props: {
         <div className="flex flex-col gap-8">
           <ServerWalletsTable
             client={client}
-            wallets={eoas.data.items as Wallet[]}
-            totalRecords={eoas.data.totalRecords}
             currentPage={currentPage}
-            totalPages={Math.ceil(eoas.data.totalRecords / pageSize)}
+            managementAccessToken={managementAccessToken ?? undefined}
             project={project}
             teamSlug={team_slug}
-            managementAccessToken={managementAccessToken ?? undefined}
+            totalPages={Math.ceil(eoas.data.totalRecords / pageSize)}
+            totalRecords={eoas.data.totalRecords}
+            wallets={eoas.data.items as Wallet[]}
           />
         </div>
       )}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx
index ad2b0320436..1069313b6ec 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx
@@ -1,5 +1,16 @@
 "use client";
 
+import { useQuery } from "@tanstack/react-query";
+import { format, formatDistanceToNowStrict } from "date-fns";
+import { useV5DashboardChain } from "lib/v5-adapter";
+import { SendIcon } from "lucide-react";
+import Link from "next/link";
+import { useId, useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
+import {
+  DEFAULT_ACCOUNT_FACTORY_V0_7,
+  predictSmartAccountAddress,
+} from "thirdweb/wallets/smart";
 import type { Project } from "@/api/projects";
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { Badge } from "@/components/ui/badge";
@@ -25,17 +36,6 @@ import {
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useQuery } from "@tanstack/react-query";
-import { format, formatDistanceToNowStrict } from "date-fns";
-import { useV5DashboardChain } from "lib/v5-adapter";
-import { SendIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
-import {
-  DEFAULT_ACCOUNT_FACTORY_V0_7,
-  predictSmartAccountAddress,
-} from "thirdweb/wallets/smart";
 import CreateServerWallet from "../components/create-server-wallet.client";
 import type { Wallet } from "./types";
 
@@ -59,6 +59,7 @@ export function ServerWalletsTableUI({
   client: ThirdwebClient;
 }) {
   const [showSigners, setShowSigners] = useState(false);
+  const showSignersId = useId();
   return (
     <div className="overflow-hidden rounded-lg border border-border bg-card">
       <div className="flex flex-row items-center gap-4 px-6 py-6">
@@ -73,19 +74,19 @@ export function ServerWalletsTableUI({
           </div>
         </div>
         <div className="flex items-center justify-end gap-2">
-          <label htmlFor="show-signers" className="cursor-pointer text-sm">
+          <label className="cursor-pointer text-sm" htmlFor={showSignersId}>
             Show Signer Addresses
           </label>
           <Switch
-            id="show-signers"
             checked={showSigners}
+            id={showSignersId}
             onCheckedChange={() => setShowSigners(!showSigners)}
           />
         </div>
         <CreateServerWallet
+          managementAccessToken={managementAccessToken}
           project={project}
           teamSlug={teamSlug}
-          managementAccessToken={managementAccessToken}
         />
       </div>
 
@@ -103,18 +104,18 @@ export function ServerWalletsTableUI({
           <TableBody>
             {wallets.length === 0 ? (
               <TableRow>
-                <TableCell colSpan={3} className="text-center">
+                <TableCell className="text-center" colSpan={3}>
                   No server wallets found
                 </TableCell>
               </TableRow>
             ) : (
               wallets.map((wallet) => (
-                <TableRow key={wallet.id} className="hover:bg-accent/50">
+                <TableRow className="hover:bg-accent/50" key={wallet.id}>
                   <TableCell>
                     {showSigners ? (
                       <WalletAddress address={wallet.address} client={client} />
                     ) : (
-                      <SmartAccountCell wallet={wallet} client={client} />
+                      <SmartAccountCell client={client} wallet={wallet} />
                     )}
                   </TableCell>
                   <TableCell>{wallet.metadata.label || "none"}</TableCell>
@@ -126,9 +127,9 @@ export function ServerWalletsTableUI({
                   </TableCell>
                   <TableCell className="flex justify-end">
                     <SendTestTransaction
-                      wallet={wallet}
                       project={project}
                       teamSlug={teamSlug}
+                      wallet={wallet}
                     />
                   </TableCell>
                 </TableRow>
@@ -148,8 +149,8 @@ export function ServerWalletsTableUI({
                 href={`/team/${teamSlug}/${project.slug}/engine/cloud/server-wallets?page=${
                   currentPage > 1 ? currentPage - 1 : 1
                 }`}
-                passHref
                 legacyBehavior
+                passHref
               >
                 <PaginationPrevious
                   className={
@@ -206,16 +207,16 @@ export function SmartAccountCell({
   const chain = useV5DashboardChain(chainId);
 
   const smartAccountAddressQuery = useQuery({
-    queryKey: ["smart-account-address", wallet.address],
     queryFn: async () => {
       const smartAccountAddress = await predictSmartAccountAddress({
-        client: client,
         adminAddress: wallet.address,
         chain,
+        client: client,
         factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
       });
       return smartAccountAddress;
     },
+    queryKey: ["smart-account-address", wallet.address],
   });
 
   return (
@@ -256,13 +257,13 @@ function SendTestTransaction(props: {
   const router = useDashboardRouter();
   return (
     <Button
-      variant="secondary"
-      size="sm"
       onClick={() => {
         router.push(
           `/team/${props.teamSlug}/${props.project.slug}/engine/cloud?testTxWithWallet=${props.wallet.id}`,
         );
       }}
+      size="sm"
+      variant="secondary"
     >
       <SendIcon className="size-4" />
     </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table.tsx
index bd2bc6194be..85a75ef6dcc 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table.tsx
@@ -1,5 +1,5 @@
-import type { Project } from "@/api/projects";
 import type { ThirdwebClient } from "thirdweb";
+import type { Project } from "@/api/projects";
 import type { Wallet } from "./types";
 import { ServerWalletsTableUI } from "./wallet-table-ui.client";
 
@@ -24,14 +24,14 @@ export function ServerWalletsTable({
 }) {
   return (
     <ServerWalletsTableUI
-      wallets={wallets}
-      totalRecords={totalRecords}
+      client={client}
       currentPage={currentPage}
-      totalPages={totalPages}
+      managementAccessToken={managementAccessToken}
       project={project}
       teamSlug={teamSlug}
-      managementAccessToken={managementAccessToken}
-      client={client}
+      totalPages={totalPages}
+      totalRecords={totalRecords}
+      wallets={wallets}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/layout.tsx
index 849b1af7bb7..81e3f6e7790 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/layout.tsx
@@ -12,8 +12,8 @@ export default function TransactionLayout({
     <div className="flex flex-col gap-4">
       <div className="flex items-center gap-2">
         <Link
-          href={`/team/${params.team_slug}/${params.project_slug}/engine/cloud`}
           className="flex items-center gap-1 text-muted-foreground text-sm hover:text-foreground"
+          href={`/team/${params.team_slug}/${params.project_slug}/engine/cloud`}
         >
           <ChevronLeftIcon className="size-4" />
           Back to Transactions
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/page.tsx
index 85d5001fd0c..ce7f91c7bd7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/page.tsx
@@ -1,6 +1,6 @@
+import { notFound, redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound, redirect } from "next/navigation";
 import { getAuthToken } from "../../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../../login/loginRedirect";
 import { getSingleTransaction } from "../../lib/analytics";
@@ -27,8 +27,8 @@ export default async function TransactionPage({
   }
 
   const transactionData = await getSingleTransaction({
-    teamId: project.teamId,
     clientId: project.publishableKey,
+    teamId: project.teamId,
     transactionId: id,
   });
 
@@ -44,10 +44,10 @@ export default async function TransactionPage({
   return (
     <div className="space-y-6 p-2">
       <TransactionDetailsUI
-        transaction={transactionData}
-        teamSlug={team_slug}
         client={client}
         project={project}
+        teamSlug={team_slug}
+        transaction={transactionData}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/transaction-details-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/transaction-details-ui.tsx
index 40c2b1ffee8..be6060bf732 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/transaction-details-ui.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/transaction-details-ui.tsx
@@ -1,19 +1,19 @@
 "use client";
 
+import { ChainIconClient } from "components/icons/ChainIcon";
+import { format, formatDistanceToNowStrict } from "date-fns";
+import { useAllChainsData } from "hooks/chains/allChains";
+import { ExternalLinkIcon, InfoIcon } from "lucide-react";
+import Link from "next/link";
+import { type ThirdwebClient, toEther } from "thirdweb";
 import type { Project } from "@/api/projects";
 import { WalletAddress } from "@/components/blocks/wallet-address";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { CodeClient } from "@/components/ui/code/code.client";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import { ChainIconClient } from "components/icons/ChainIcon";
-import { format, formatDistanceToNowStrict } from "date-fns";
-import { useAllChainsData } from "hooks/chains/allChains";
-import { ExternalLinkIcon, InfoIcon } from "lucide-react";
-import Link from "next/link";
-import { type ThirdwebClient, toEther } from "thirdweb";
 import { statusDetails } from "../../analytics/tx-table/tx-table-ui";
 import type { Transaction } from "../../analytics/tx-table/types";
 
@@ -103,8 +103,8 @@ export function TransactionDetailsUI({
                     }
                   >
                     <Badge
-                      variant={statusDetails[status].type}
                       className="gap-2"
+                      variant={statusDetails[status].type}
                     >
                       {statusDetails[status].name}
                       {errorMessage && <InfoIcon className="size-3" />}
@@ -120,12 +120,12 @@ export function TransactionDetailsUI({
               </div>
               <div className="md:w-2/3">
                 <CopyTextButton
-                  textToCopy={id}
+                  className="font-mono text-muted-foreground text-sm"
                   copyIconPosition="left"
+                  textToCopy={id}
                   textToShow={`${id.slice(0, 8)}...${id.slice(-6)}`}
-                  variant="ghost"
                   tooltip="Copy transaction ID"
-                  className="font-mono text-muted-foreground text-sm"
+                  variant="ghost"
                 />
               </div>
             </div>
@@ -139,18 +139,18 @@ export function TransactionDetailsUI({
                   <div>
                     {explorer ? (
                       <Button
-                        variant="ghost"
                         asChild
                         className="-translate-x-2 gap-2 font-mono"
                         size="sm"
+                        variant="ghost"
                       >
                         <Link
                           href={`${explorer.url}/tx/${transactionHash}`}
-                          target="_blank"
-                          rel="noopener noreferrer"
                           onClick={(e) => {
                             e.stopPropagation();
                           }}
+                          rel="noopener noreferrer"
+                          target="_blank"
                         >
                           {`${transactionHash.slice(0, 8)}...${transactionHash.slice(-6)}`}{" "}
                           <ExternalLinkIcon className="size-4 text-muted-foreground" />
@@ -158,12 +158,12 @@ export function TransactionDetailsUI({
                       </Button>
                     ) : (
                       <CopyTextButton
-                        textToCopy={transactionHash}
+                        className="font-mono text-muted-foreground text-sm"
                         copyIconPosition="left"
+                        textToCopy={transactionHash}
                         textToShow={`${transactionHash.slice(0, 6)}...${transactionHash.slice(-4)}`}
-                        variant="ghost"
                         tooltip="Copy transaction hash"
-                        className="font-mono text-muted-foreground text-sm"
+                        variant="ghost"
                       />
                     )}
                   </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/create-vault-account.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/create-vault-account.client.tsx
index b129944158c..b7f68abc3d8 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/create-vault-account.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/create-vault-account.client.tsx
@@ -1,9 +1,13 @@
 "use client";
+import { useMutation } from "@tanstack/react-query";
+import { createServiceAccount } from "@thirdweb-dev/vault-sdk";
+import { CheckIcon, DownloadIcon, Loader2Icon, LockIcon } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
 import type { Project } from "@/api/projects";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
 import {
   Dialog,
@@ -11,13 +15,9 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { cn } from "@/lib/utils";
-import { useMutation } from "@tanstack/react-query";
-import { createServiceAccount } from "@thirdweb-dev/vault-sdk";
-import { CheckIcon, DownloadIcon, Loader2Icon, LockIcon } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
 import { storeUserAccessToken } from "../../analytics/utils";
 import {
   createManagementAccessToken,
@@ -47,8 +47,8 @@ export default function CreateVaultAccountButton(props: {
           options: {
             metadata: {
               projectId: props.project.id,
-              teamId: props.project.teamId,
               purpose: "Thirdweb Project Server Wallet Service Account",
+              teamId: props.project.teamId,
             },
           },
         },
@@ -59,15 +59,15 @@ export default function CreateVaultAccountButton(props: {
       }
 
       const managementAccessTokenPromise = createManagementAccessToken({
-        project: props.project,
         adminKey: serviceAccount.data.adminKey,
+        project: props.project,
         rotationCode: serviceAccount.data.rotationCode,
         vaultClient,
       });
 
       const userAccesTokenPromise = createWalletAccessToken({
-        project: props.project,
         adminKey: serviceAccount.data.adminKey,
+        project: props.project,
         vaultClient,
       });
 
@@ -143,10 +143,10 @@ export default function CreateVaultAccountButton(props: {
   return (
     <>
       <Button
-        variant={"primary"}
-        onClick={handleCreateServerWallet}
-        disabled={isLoading}
         className="flex flex-row items-center gap-2"
+        disabled={isLoading}
+        onClick={handleCreateServerWallet}
+        variant={"primary"}
       >
         {isLoading ? (
           <Loader2Icon className="size-4 animate-spin" />
@@ -156,7 +156,7 @@ export default function CreateVaultAccountButton(props: {
         {"Create Vault Admin Account"}
       </Button>
 
-      <Dialog open={modalOpen} onOpenChange={handleCloseModal} modal={true}>
+      <Dialog modal={true} onOpenChange={handleCloseModal} open={modalOpen}>
         <DialogContent
           className="overflow-hidden p-0"
           dialogCloseClassName={cn(!keysConfirmed && "hidden")}
@@ -188,16 +188,16 @@ export default function CreateVaultAccountButton(props: {
                   <div>
                     <div className="flex flex-col gap-2">
                       <CopyTextButton
+                        className="!h-auto w-full justify-between bg-background px-3 py-3 font-mono text-xs"
+                        copyIconPosition="right"
                         textToCopy={
                           initialiseProjectWithVaultMutation.data.serviceAccount
                             .adminKey
                         }
-                        className="!h-auto w-full justify-between bg-background px-3 py-3 font-mono text-xs"
                         textToShow={maskSecret(
                           initialiseProjectWithVaultMutation.data.serviceAccount
                             .adminKey,
                         )}
-                        copyIconPosition="right"
                         tooltip="Copy Admin Key"
                       />
                       <p className="text-muted-foreground text-xs">
@@ -242,9 +242,9 @@ export default function CreateVaultAccountButton(props: {
                   <div className="h-4" />
                   <div className="flex items-center gap-2">
                     <Button
-                      variant="link"
-                      onClick={handleDownloadKeys}
                       className="flex h-auto items-center gap-2 p-0 text-sm text-success-text"
+                      onClick={handleDownloadKeys}
+                      variant="link"
                     >
                       <DownloadIcon className="size-4" />
                       {keysDownloaded ? "Key Downloaded" : "Download Admin Key"}
@@ -268,8 +268,8 @@ export default function CreateVaultAccountButton(props: {
 
               <div className="flex justify-end gap-3 border-t bg-card px-6 py-4">
                 <Button
-                  onClick={handleCloseModal}
                   disabled={!keysConfirmed}
+                  onClick={handleCloseModal}
                   variant={"primary"}
                 >
                   Close
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/key-management.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/key-management.tsx
index 7f05b0a3da3..3a95f91e23d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/key-management.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/key-management.tsx
@@ -1,7 +1,7 @@
-import type { Project } from "@/api/projects";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { InfoIcon } from "lucide-react";
 import Link from "next/link";
+import type { Project } from "@/api/projects";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import CreateVaultAccountButton from "./create-vault-account.client";
 import ListAccessTokens from "./list-access-tokens.client";
 import RotateAdminKeyButton from "./rotate-admin-key.client";
@@ -9,7 +9,10 @@ import RotateAdminKeyButton from "./rotate-admin-key.client";
 export function KeyManagement({
   maskedAdminKey,
   project,
-}: { maskedAdminKey?: string; project: Project }) {
+}: {
+  maskedAdminKey?: string;
+  project: Project;
+}) {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-6 overflow-hidden rounded-lg border border-border bg-card">
@@ -18,8 +21,8 @@ export function KeyManagement({
           <p className="text-muted-foreground text-sm">
             Secure, non-custodial key management system for your server wallets.{" "}
             <Link
-              href="https://portal.thirdweb.com/vault"
               className="underline"
+              href="https://portal.thirdweb.com/vault"
             >
               Learn more.
             </Link>
@@ -62,13 +65,11 @@ export function KeyManagement({
   );
 }
 
-async function CreateVaultAccountAlert(props: {
-  project: Project;
-}) {
+async function CreateVaultAccountAlert(props: { project: Project }) {
   return (
     <div className="flex flex-col gap-6">
       <div className="px-6">
-        <Alert variant="info" className="bg-background">
+        <Alert className="bg-background" variant="info">
           <AlertTitle className="flex items-center gap-2">
             <InfoIcon className="h-4 w-4" />
             What is Vault?
@@ -84,8 +85,8 @@ async function CreateVaultAccountAlert(props: {
             Your keys are stored in a hardware enclave, and all requests are
             end-to-end encrypted.{" "}
             <Link
-              href="https://portal.thirdweb.com/vault"
               className="underline"
+              href="https://portal.thirdweb.com/vault"
             >
               Learn more about Vault security model.
             </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/list-access-tokens.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/list-access-tokens.client.tsx
index d551f3ecb9b..8ba79bd1ca9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/list-access-tokens.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/list-access-tokens.client.tsx
@@ -1,7 +1,13 @@
 "use client";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { listAccessTokens, revokeAccessToken } from "@thirdweb-dev/vault-sdk";
+import { Loader2Icon, LockIcon, Trash2Icon } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
+import { toDateTimeLocal } from "utils/date-utils";
 import type { Project } from "@/api/projects";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import {
   Dialog,
   DialogContent,
@@ -10,21 +16,13 @@ import {
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { listAccessTokens, revokeAccessToken } from "@thirdweb-dev/vault-sdk";
-import { Loader2Icon, LockIcon, Trash2Icon } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
-import { toDateTimeLocal } from "utils/date-utils";
 import {
-  SERVER_WALLET_MANAGEMENT_ACCESS_TOKEN_PURPOSE,
   createWalletAccessToken,
   initVaultClient,
+  SERVER_WALLET_MANAGEMENT_ACCESS_TOKEN_PURPOSE,
 } from "../../lib/vault.client";
 
-export default function ListAccessTokens(props: {
-  project: Project;
-}) {
+export default function ListAccessTokens(props: { project: Project }) {
   const [modalOpen, setModalOpen] = useState(false);
   const [typedAdminKey, setTypedAdminKey] = useState("");
   const [adminKey, setAdminKey] = useState("");
@@ -37,8 +35,8 @@ export default function ListAccessTokens(props: {
       const vaultClient = await initVaultClient();
 
       const userAccessTokenRes = await createWalletAccessToken({
-        project: props.project,
         adminKey: args.adminKey,
+        project: props.project,
         vaultClient,
       });
 
@@ -70,12 +68,12 @@ export default function ListAccessTokens(props: {
       const revokeAccessTokenRes = await revokeAccessToken({
         client: vaultClient,
         request: {
-          options: {
-            id: args.accessTokenId,
-          },
           auth: {
             adminKey: args.adminKey,
           },
+          options: {
+            id: args.accessTokenId,
+          },
         },
       });
 
@@ -106,11 +104,7 @@ export default function ListAccessTokens(props: {
   )?.managementAccessToken;
 
   const listAccessTokensQuery = useQuery({
-    queryKey: [
-      "list-access-tokens",
-      maskSecret(managementAccessToken || ""),
-      maskSecret(adminKey),
-    ],
+    enabled: !!managementAccessToken,
     queryFn: async () => {
       if (!managementAccessToken) {
         throw new Error("Management access token not found");
@@ -146,7 +140,11 @@ export default function ListAccessTokens(props: {
       };
       // Return stub data for now
     },
-    enabled: !!managementAccessToken,
+    queryKey: [
+      "list-access-tokens",
+      maskSecret(managementAccessToken || ""),
+      maskSecret(adminKey),
+    ],
   });
 
   const handleCloseModal = () => {
@@ -167,6 +165,7 @@ export default function ListAccessTokens(props: {
             </p>
           </div>
           <Button
+            className="flex flex-row items-center gap-2"
             onClick={() => {
               if (!adminKey) {
                 setModalOpen(true);
@@ -179,7 +178,6 @@ export default function ListAccessTokens(props: {
               }
             }}
             variant={"primary"}
-            className="flex flex-row items-center gap-2"
           >
             <LockIcon className="h-4 w-4" />{" "}
             {adminKey ? "Lock Vault" : "Unlock Vault"}
@@ -205,7 +203,7 @@ export default function ListAccessTokens(props: {
                 <div>
                   <div className="flex flex-col gap-2">
                     {listAccessTokensQuery.data.accessTokens.map((token) => (
-                      <div key={token.id} className="flex gap-2">
+                      <div className="flex gap-2" key={token.id}>
                         <div className="flex max-w-full flex-1 flex-col justify-between gap-4 rounded-lg border border-border bg-background p-4 text-xs">
                           <h4 className="font-bold">
                             {token.metadata?.purpose || "Unnamed Access Token"}
@@ -222,28 +220,28 @@ export default function ListAccessTokens(props: {
                               </div>
                             ) : (
                               <CopyTextButton
-                                textToCopy={token.accessToken}
                                 className="!h-auto min-w-0 flex-grow justify-between bg-background px-3 py-3 font-mono text-xs"
-                                textToShow={token.accessToken}
                                 copyIconPosition="right"
+                                textToCopy={token.accessToken}
+                                textToShow={token.accessToken}
                                 tooltip="Copy Vault Access Token"
                               />
                             )}
                             <Button
-                              variant="destructive"
-                              size="sm"
                               className="px-3 py-3"
-                              onClick={() =>
-                                revokeAccessTokenMutation.mutate({
-                                  adminKey,
-                                  accessTokenId: token.id,
-                                })
-                              }
                               disabled={
                                 deletingTokenId !== null ||
                                 revokeAccessTokenMutation.isPending ||
                                 !adminKey
                               }
+                              onClick={() =>
+                                revokeAccessTokenMutation.mutate({
+                                  accessTokenId: token.id,
+                                  adminKey,
+                                })
+                              }
+                              size="sm"
+                              variant="destructive"
                             >
                               {deletingTokenId === token.id ? (
                                 <Loader2Icon className="size-4 animate-spin" />
@@ -275,8 +273,8 @@ export default function ListAccessTokens(props: {
 
         <div className="flex justify-end gap-3 bg-card py-4">
           <Button
-            onClick={() => createAccessTokenMutation.mutate({ adminKey })}
             disabled={createAccessTokenMutation.isPending || !adminKey}
+            onClick={() => createAccessTokenMutation.mutate({ adminKey })}
             variant={"primary"}
           >
             {createAccessTokenMutation.isPending ? (
@@ -290,7 +288,7 @@ export default function ListAccessTokens(props: {
           </Button>
         </div>
 
-        <Dialog open={modalOpen} onOpenChange={handleCloseModal} modal={true}>
+        <Dialog modal={true} onOpenChange={handleCloseModal} open={modalOpen}>
           <DialogContent className="overflow-hidden p-0">
             <DialogHeader className="px-6 pt-6">
               <DialogTitle>Unlock Vault</DialogTitle>
@@ -302,35 +300,35 @@ export default function ListAccessTokens(props: {
                   Vault admin key.
                 </p>
                 <Input
-                  type="password"
-                  placeholder="sa_adm_ABCD_1234..."
-                  value={typedAdminKey}
                   onChange={(e) => setTypedAdminKey(e.target.value)}
                   onKeyDown={(e) => {
                     if (e.key === "Enter") {
                       setAdminKey(typedAdminKey);
                     }
                   }}
+                  placeholder="sa_adm_ABCD_1234..."
+                  type="password"
+                  value={typedAdminKey}
                 />
               </div>
               <div className="flex justify-end gap-3 border-t bg-card px-6 py-4">
                 <Button
-                  variant={"outline"}
                   onClick={() => {
                     setAdminKey("");
                     setTypedAdminKey("");
                     setModalOpen(false);
                   }}
+                  variant={"outline"}
                 >
                   Cancel
                 </Button>
                 <Button
-                  variant={"primary"}
+                  disabled={!typedAdminKey || listAccessTokensQuery.isLoading}
                   onClick={() => {
                     setAdminKey(typedAdminKey);
                     handleCloseModal();
                   }}
-                  disabled={!typedAdminKey || listAccessTokensQuery.isLoading}
+                  variant={"primary"}
                 >
                   Unlock Vault
                 </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/rotate-admin-key.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/rotate-admin-key.client.tsx
index 6c3d62473b2..92e8c5f227a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/rotate-admin-key.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/components/rotate-admin-key.client.tsx
@@ -1,10 +1,20 @@
 "use client";
 
+import { useMutation } from "@tanstack/react-query";
+import { rotateServiceAccount } from "@thirdweb-dev/vault-sdk";
+import {
+  CheckIcon,
+  CircleAlertIcon,
+  DownloadIcon,
+  Loader2Icon,
+  RefreshCcwIcon,
+} from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
 import type { Project } from "@/api/projects";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
 import {
   Dialog,
@@ -13,19 +23,9 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { cn } from "@/lib/utils";
-import { useMutation } from "@tanstack/react-query";
-import { rotateServiceAccount } from "@thirdweb-dev/vault-sdk";
-import {
-  CheckIcon,
-  CircleAlertIcon,
-  DownloadIcon,
-  Loader2Icon,
-  RefreshCcwIcon,
-} from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
 import {
   createManagementAccessToken,
   createWalletAccessToken,
@@ -65,15 +65,15 @@ export default function RotateAdminKeyButton(props: { project: Project }) {
 
       // need to recreate the management access token with the new admin key
       const managementAccessTokenPromise = createManagementAccessToken({
-        project: props.project,
         adminKey: rotateServiceAccountRes.data.newAdminKey,
+        project: props.project,
         rotationCode: rotateServiceAccountRes.data.newRotationCode,
         vaultClient,
       });
 
       const userAccesTokenPromise = createWalletAccessToken({
-        project: props.project,
         adminKey: rotateServiceAccountRes.data.newAdminKey,
+        project: props.project,
         vaultClient,
       });
 
@@ -87,8 +87,8 @@ export default function RotateAdminKeyButton(props: { project: Project }) {
       }
 
       return {
-        success: true,
         adminKey: rotateServiceAccountRes.data.newAdminKey,
+        success: true,
         userAccessToken: userAccessTokenRes.data,
       };
     },
@@ -138,17 +138,17 @@ export default function RotateAdminKeyButton(props: { project: Project }) {
   return (
     <>
       <Button
-        variant="outline"
-        onClick={() => setModalOpen(true)}
-        disabled={isLoading}
         className="h-auto gap-2 rounded-lg bg-background px-4 py-3"
+        disabled={isLoading}
+        onClick={() => setModalOpen(true)}
+        variant="outline"
       >
         {isLoading && <Loader2Icon className="size-4 animate-spin" />}
         {!isLoading && <RefreshCcwIcon className="size-4" />}
         Rotate Admin Key
       </Button>
 
-      <Dialog open={modalOpen} onOpenChange={handleCloseModal} modal={true}>
+      <Dialog modal={true} onOpenChange={handleCloseModal} open={modalOpen}>
         <DialogContent
           className="overflow-hidden p-0"
           dialogCloseClassName={cn(!keysConfirmed && "hidden")}
@@ -179,12 +179,12 @@ export default function RotateAdminKeyButton(props: { project: Project }) {
                     </h3>
                     <div className="flex flex-col gap-2">
                       <CopyTextButton
-                        textToCopy={rotateAdminKeyMutation.data.adminKey}
                         className="!h-auto w-full justify-between bg-background px-3 py-3 font-mono text-xs"
+                        copyIconPosition="right"
+                        textToCopy={rotateAdminKeyMutation.data.adminKey}
                         textToShow={maskSecret(
                           rotateAdminKeyMutation.data.adminKey,
                         )}
-                        copyIconPosition="right"
                         tooltip="Copy Admin Key"
                       />
                       <p className="text-muted-foreground text-xs">
@@ -199,16 +199,16 @@ export default function RotateAdminKeyButton(props: { project: Project }) {
                     </h3>
                     <div className="flex flex-col gap-2 ">
                       <CopyTextButton
+                        className="!h-auto w-full justify-between bg-background px-3 py-3 font-mono text-xs"
+                        copyIconPosition="right"
                         textToCopy={
                           rotateAdminKeyMutation.data.userAccessToken
                             .accessToken
                         }
-                        className="!h-auto w-full justify-between bg-background px-3 py-3 font-mono text-xs"
                         textToShow={maskSecret(
                           rotateAdminKeyMutation.data.userAccessToken
                             .accessToken,
                         )}
-                        copyIconPosition="right"
                         tooltip="Copy Vault Access Token"
                       />
                       <p className="text-muted-foreground text-xs">
@@ -228,9 +228,9 @@ export default function RotateAdminKeyButton(props: { project: Project }) {
                   <div className="h-4" />
                   <div className="flex items-center gap-2">
                     <Button
-                      variant="link"
-                      onClick={handleDownloadKeys}
                       className="flex h-auto items-center gap-2 p-0 text-sm text-success-text"
+                      onClick={handleDownloadKeys}
+                      variant="link"
                     >
                       <DownloadIcon className="size-4" />
                       {keysDownloaded ? "Keys Downloaded" : "Download Keys"}
@@ -254,8 +254,8 @@ export default function RotateAdminKeyButton(props: { project: Project }) {
 
               <div className="flex justify-end gap-3 border-t bg-card px-6 py-4">
                 <Button
-                  onClick={handleCloseModal}
                   disabled={!keysConfirmed}
+                  onClick={handleCloseModal}
                   variant="primary"
                 >
                   Close
@@ -288,17 +288,17 @@ export default function RotateAdminKeyButton(props: { project: Project }) {
                 </div>
                 <div className="flex justify-end gap-3 border-t bg-card px-6 py-4">
                   <Button
-                    variant="outline"
                     onClick={() => {
                       setModalOpen(false);
                     }}
+                    variant="outline"
                   >
                     Cancel
                   </Button>
                   <Button
-                    variant="destructive"
-                    onClick={() => rotateAdminKeyMutation.mutate()}
                     disabled={rotateAdminKeyMutation.isPending}
+                    onClick={() => rotateAdminKeyMutation.mutate()}
+                    variant="destructive"
                   >
                     {rotateAdminKeyMutation.isPending ? (
                       <>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/page.tsx
index f3c3d783165..5651b521e2e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/vault/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { KeyManagement } from "./components/key-management";
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/EngineFooterCard.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/EngineFooterCard.stories.tsx
index 1674b6e102c..85fe8522fa0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/EngineFooterCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/EngineFooterCard.stories.tsx
@@ -2,12 +2,11 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { EngineFooterCard } from "./_components";
 
 const meta = {
-  title: "Engine/EngineFooterCard",
-  component: EngineFooterCard,
   args: {
-    teamSlug: "demo-team",
     projectSlug: "demo-project",
+    teamSlug: "demo-team",
   },
+  component: EngineFooterCard,
   decorators: [
     (Story) => (
       <div className="container max-w-6xl py-10">
@@ -15,6 +14,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Engine/EngineFooterCard",
 } satisfies Meta<typeof EngineFooterCard>;
 
 export default meta;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/_components.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/_components.tsx
index fe585447491..a8043daa7f9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/_components.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/_components.tsx
@@ -1,13 +1,13 @@
-import { Button } from "@/components/ui/button";
 import { ArrowRightIcon, DownloadIcon, ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
 export function ImportEngineLink(props: {
   label: string;
   engineLinkPrefix: string;
 }) {
   return (
-    <Button asChild variant="outline" size="sm" className="gap-2 bg-card">
+    <Button asChild className="gap-2 bg-card" size="sm" variant="outline">
       <Link href={`${props.engineLinkPrefix}/import`}>
         <DownloadIcon className="size-3" />
         {props.label}
@@ -36,20 +36,20 @@ function EngineInfoSection(props: { team_slug: string; project_slug: string }) {
       </ul>
 
       <div className="mt-4 flex justify-start gap-3">
-        <Button asChild variant="outline" size="sm">
+        <Button asChild size="sm" variant="outline">
           <Link
-            href="https://portal.thirdweb.com/engine"
             className="gap-2"
-            target="_blank"
+            href="https://portal.thirdweb.com/engine"
             rel="noopener noreferrer"
+            target="_blank"
           >
             Learn More
             <ExternalLinkIcon className="size-3 text-muted-foreground" />
           </Link>
         </Button>
 
-        <Button size="sm" asChild variant="outline">
-          <Link href={`${engineLinkPrefix}/sandbox`} className="gap-2">
+        <Button asChild size="sm" variant="outline">
+          <Link className="gap-2" href={`${engineLinkPrefix}/sandbox`}>
             Try Demo Engine
             <ArrowRightIcon className="size-3 text-muted-foreground" />
           </Link>
@@ -66,8 +66,8 @@ export function EngineFooterCard(props: {
   return (
     <div className="relative rounded-lg border p-6">
       <EngineInfoSection
-        team_slug={props.teamSlug}
         project_slug={props.projectSlug}
+        team_slug={props.teamSlug}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/EngineImportPage.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/EngineImportPage.stories.tsx
index 40a75f59a69..84410bec5ca 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/EngineImportPage.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/EngineImportPage.stories.tsx
@@ -2,7 +2,6 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { EngineImportCardUI } from "./EngineImportPage";
 
 const meta: Meta<typeof EngineImportCardUI> = {
-  title: "Engine/general/import",
   component: EngineImportCardUI,
   decorators: [
     (Story) => (
@@ -11,6 +10,7 @@ const meta: Meta<typeof EngineImportCardUI> = {
       </div>
     ),
   ],
+  title: "Engine/general/import",
 };
 
 export default meta;
@@ -18,20 +18,20 @@ type Story = StoryObj<typeof EngineImportCardUI>;
 
 export const Default: Story = {
   args: {
-    prefillImportUrl: undefined,
     importEngine: async (params) => {
       await new Promise((resolve) => setTimeout(resolve, 1000));
       console.log("importEngine", params);
     },
+    prefillImportUrl: undefined,
   },
 };
 
 export const WithPrefillUrl: Story = {
   args: {
-    prefillImportUrl: "https://engine.example.com",
     importEngine: async (params) => {
       await new Promise((resolve) => setTimeout(resolve, 1000));
       console.log("importEngine", params);
     },
+    prefillImportUrl: "https://engine.example.com",
   },
 };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/EngineImportPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/EngineImportPage.tsx
index 23d7c4e2a5b..478e773efd6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/EngineImportPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/EngineImportPage.tsx
@@ -1,7 +1,14 @@
 "use client";
 
+import { FormControl } from "@chakra-ui/react";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import { CircleAlertIcon, DownloadIcon, ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
 import { apiServerProxy } from "@/actions/proxies";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -11,15 +18,8 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { FormControl } from "@chakra-ui/react";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { CircleAlertIcon, DownloadIcon, ExternalLinkIcon } from "lucide-react";
-import Link from "next/link";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
 
 const formSchema = z.object({
   name: z.string().min(1, "Name is required"),
@@ -36,15 +36,15 @@ async function importEngine({
   const url = data.url.endsWith("/") ? data.url : `${data.url}/`;
 
   const res = await apiServerProxy({
-    pathname: `/v1/teams/${teamIdOrSlug}/engine`,
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: JSON.stringify({
       name: data.name,
       url,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
+    pathname: `/v1/teams/${teamIdOrSlug}/engine`,
   });
 
   if (!res.ok) {
@@ -61,13 +61,13 @@ export function EngineImportCard(props: {
 
   return (
     <EngineImportCardUI
-      prefillImportUrl={props.prefillImportUrl}
       importEngine={async (params) => {
         await importEngine({ ...params, teamIdOrSlug: props.teamSlug });
         router.push(
           `/team/${props.teamSlug}/${props.projectSlug}/engine/dedicated`,
         );
       }}
+      prefillImportUrl={props.prefillImportUrl}
     />
   );
 }
@@ -123,8 +123,8 @@ export function EngineImportCardUI(props: {
               <Link
                 className="flex items-center justify-between gap-2 rounded-lg border border-border bg-card p-3 text-sm hover:bg-accent"
                 href="https://portal.thirdweb.com/infrastructure/engine/get-started"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 Get help setting up Engine for free
                 <ExternalLinkIcon className="size-4 text-muted-foreground" />
@@ -140,8 +140,8 @@ export function EngineImportCardUI(props: {
                     <FormLabel>Name</FormLabel>
                     <FormControl>
                       <Input
-                        placeholder="Enter a descriptive label"
                         autoFocus
+                        placeholder="Enter a descriptive label"
                         {...field}
                       />
                     </FormControl>
@@ -158,8 +158,8 @@ export function EngineImportCardUI(props: {
                     <FormLabel>URL</FormLabel>
                     <FormControl>
                       <Input
-                        type="url"
                         placeholder="Enter your Engine URL"
+                        type="url"
                         {...field}
                       />
                     </FormControl>
@@ -179,7 +179,7 @@ export function EngineImportCardUI(props: {
           <div className="h-8" />
 
           <div className="flex justify-end border-border border-t p-6">
-            <Button type="submit" className="min-w-28 gap-2">
+            <Button className="min-w-28 gap-2" type="submit">
               {importMutation.isPending ? (
                 <Spinner className="size-4" />
               ) : (
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/page.tsx
index bc9b371bdde..8fb8361c756 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/import/page.tsx
@@ -20,8 +20,8 @@ export default async function Page(props: {
     <div className="flex grow flex-col justify-center pt-8 pb-20">
       <EngineImportCard
         prefillImportUrl={importUrl ? decodeURIComponent(importUrl) : undefined}
-        teamSlug={params.team_slug}
         projectSlug={params.project_slug}
+        teamSlug={params.team_slug}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/layout.tsx
index b8c10047be1..0c604863b94 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/layout.tsx
@@ -1,9 +1,9 @@
+import { DatabaseIcon, ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { TabPathLinks } from "@/components/ui/tabs";
-import { DatabaseIcon, ExternalLinkIcon } from "lucide-react";
-import Link from "next/link";
 import { EngineIcon } from "../../../../../../../(dashboard)/(chain)/components/server/icons/EngineIcon";
 import { ImportEngineLink } from "./_components";
 
@@ -27,8 +27,8 @@ export default async function Layout(props: {
               <h1 className="flex items-center gap-2 font-semibold text-3xl tracking-tight">
                 Engine{" "}
                 <Badge
-                  variant="warning"
                   className="flex items-center gap-2 text-sm"
+                  variant="warning"
                 >
                   <DatabaseIcon className="size-4" /> Dedicated
                 </Badge>
@@ -39,15 +39,15 @@ export default async function Layout(props: {
             </div>
             <div className="flex items-center gap-3">
               <ImportEngineLink
-                label="Import Engine"
                 engineLinkPrefix={linkPrefix}
+                label="Import Engine"
               />
             </div>
           </div>
           <div className="h-6" />
           <EngineLegacyBannerUI
-            teamSlug={params.team_slug}
             projectSlug={params.project_slug}
+            teamSlug={params.team_slug}
           />
         </div>
       </header>
@@ -56,13 +56,13 @@ export default async function Layout(props: {
         <div className="absolute right-0 bottom-0 left-0 h-[1px] bg-border" />
         <div className="container max-w-7xl">
           <TabPathLinks
-            className="pt-2"
             bottomLineClassName="hidden"
+            className="pt-2"
             links={[
               {
+                exactMatch: true,
                 name: "Engine Instances",
                 path: `${linkPrefix}`,
-                exactMatch: true,
               },
               {
                 name: "Import Engine",
@@ -98,7 +98,7 @@ function EngineLegacyBannerUI(props: {
         </ul>
         <div className="h-6" />
         <div className="flex justify-start gap-3">
-          <Button className="flex items-center gap-2" asChild size="sm">
+          <Button asChild className="flex items-center gap-2" size="sm">
             <Link
               href={`/team/${props.teamSlug}/${props.projectSlug}/engine/cloud`}
             >
@@ -106,12 +106,12 @@ function EngineLegacyBannerUI(props: {
             </Link>
           </Button>
 
-          <Button variant="outline" asChild size="sm">
+          <Button asChild size="sm" variant="outline">
             <Link
+              className="gap-2 bg-background"
               href="https://portal.thirdweb.com/engine/v3"
-              target="_blank"
               rel="noopener noreferrer"
-              className="gap-2 bg-background"
+              target="_blank"
             >
               Learn More <ExternalLinkIcon className="size-4" />
             </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-instances-table.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-instances-table.stories.tsx
index 8aac2865870..e4451011f20 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-instances-table.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-instances-table.stories.tsx
@@ -4,13 +4,7 @@ import { teamStub } from "../../../../../../../../../../stories/stubs";
 import { EngineInstancesTableUI } from "./engine-instances-table";
 
 const meta: Meta<typeof Story> = {
-  title: "Engine/general/instances",
   component: Story,
-  parameters: {
-    nextjs: {
-      appDirectory: true,
-    },
-  },
   decorators: [
     (StoryInstance) => (
       <div className="container max-w-[1154px] py-10">
@@ -18,6 +12,12 @@ const meta: Meta<typeof Story> = {
       </div>
     ),
   ],
+  parameters: {
+    nextjs: {
+      appDirectory: true,
+    },
+  },
+  title: "Engine/general/instances",
 };
 
 export default meta;
@@ -31,15 +31,15 @@ function createEngineInstanceStub(
 ): EngineInstance {
   const engineId = `${name.toLowerCase().replace(/\s+/g, "-")}-engine`;
   return {
-    id: engineId,
-    name,
-    url: `https://${engineId}.example.com`,
-    status,
-    deploymentId: status === "active" ? "dep-123" : undefined,
     accountId: "acc-123",
-    lastAccessedAt: new Date().toISOString(),
+    deploymentId: status === "active" ? "dep-123" : undefined,
+    id: engineId,
     isCloudHosted,
     isPlanEngine,
+    lastAccessedAt: new Date().toISOString(),
+    name,
+    status,
+    url: `https://${engineId}.example.com`,
   };
 }
 
@@ -91,6 +91,7 @@ const deploymentFailedEngineInstance = createEngineInstanceStub(
 
 export const MultipleInstances: Story = {
   args: {
+    engineLinkPrefix: "/team/test/engine",
     instances: [
       // active
       cloudHostedEngineInstance,
@@ -102,22 +103,21 @@ export const MultipleInstances: Story = {
       paymentFailedEngineInstance,
       deploymentFailedEngineInstance,
     ],
-    engineLinkPrefix: "/team/test/engine",
   },
 };
 
 export const NoInstancesProPlan: Story = {
   args: {
-    instances: [],
     engineLinkPrefix: "/team/test/engine",
+    instances: [],
     team: teamStub("1", "pro"),
   },
 };
 
 export const NoInstancesGrowthPlan: Story = {
   args: {
-    instances: [],
     engineLinkPrefix: "/team/test/engine",
+    instances: [],
     team: teamStub("2", "growth"),
   },
 };
@@ -126,16 +126,16 @@ export const NoInstancesGrowthPlan: Story = {
 // the section that prompts user to either choose a cloud-hosted engine or import an engine is hidden in this case
 export const NoInstancesAcceleratePlan: Story = {
   args: {
-    instances: [],
     engineLinkPrefix: "/team/test/engine",
+    instances: [],
     team: teamStub("3", "accelerate"),
   },
 };
 
 export const OneInstance: Story = {
   args: {
-    instances: [cloudHostedEngineInstance],
     engineLinkPrefix: "/team/test/engine",
+    instances: [cloudHostedEngineInstance],
   },
 };
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-instances-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-instances-table.tsx
index 6103ce20e89..628d80bc83d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-instances-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-instances-table.tsx
@@ -1,8 +1,36 @@
 "use client";
 
+import {
+  type DeleteCloudHostedEngineParams,
+  deleteCloudHostedEngine,
+  type EditEngineInstanceParams,
+  type EngineInstance,
+  editEngineInstance,
+  type RemoveEngineFromDashboardIParams,
+  removeEngineFromDashboard,
+} from "@3rdweb-sdk/react/hooks/useEngine";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import {
+  ArrowRightIcon,
+  CheckIcon,
+  CircleAlertIcon,
+  DatabaseIcon,
+  InfinityIcon,
+  InfoIcon,
+  MoreHorizontalIcon,
+  PencilIcon,
+  ShieldCheckIcon,
+  Trash2Icon,
+  WalletIcon,
+} from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
 import type { Team } from "@/api/team";
 import { CheckoutButton } from "@/components/billing";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Badge, type BadgeProps } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -40,8 +68,8 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import {} from "@/components/ui/popover";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Table,
   TableBody,
@@ -55,35 +83,6 @@ import { Textarea } from "@/components/ui/textarea";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { cn } from "@/lib/utils";
-import {
-  type DeleteCloudHostedEngineParams,
-  type EditEngineInstanceParams,
-  type EngineInstance,
-  type RemoveEngineFromDashboardIParams,
-  deleteCloudHostedEngine,
-  editEngineInstance,
-  removeEngineFromDashboard,
-} from "@3rdweb-sdk/react/hooks/useEngine";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import {
-  CheckIcon,
-  CircleAlertIcon,
-  DatabaseIcon,
-  InfinityIcon,
-  InfoIcon,
-  PencilIcon,
-  ShieldCheckIcon,
-  Trash2Icon,
-  WalletIcon,
-} from "lucide-react";
-import { MoreHorizontalIcon } from "lucide-react";
-import { ArrowRightIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
 import { EngineIcon } from "../../../../../../../../(dashboard)/(chain)/components/server/icons/EngineIcon";
 
 type DeletedCloudHostedEngine = (
@@ -106,10 +105,6 @@ export function EngineInstancesTable(props: {
 
   return (
     <EngineInstancesTableUI
-      team={props.team}
-      instances={props.instances}
-      engineLinkPrefix={props.engineLinkPrefix}
-      projectSlug={props.projectSlug}
       deleteCloudHostedEngine={async (params) => {
         await deleteCloudHostedEngine(params);
         router.refresh();
@@ -118,10 +113,14 @@ export function EngineInstancesTable(props: {
         await editEngineInstance(params);
         router.refresh();
       }}
+      engineLinkPrefix={props.engineLinkPrefix}
+      instances={props.instances}
+      projectSlug={props.projectSlug}
       removeEngineFromDashboard={async (params) => {
         await removeEngineFromDashboard(params);
         router.refresh();
       }}
+      team={props.team}
     />
   );
 }
@@ -167,7 +166,7 @@ function DedicatedEngineSubscriptionButton(props: { team: Team }) {
 
   if (isMobile) {
     return (
-      <Drawer open={open} onOpenChange={setOpen}>
+      <Drawer onOpenChange={setOpen} open={open}>
         <DrawerTrigger asChild>{trigger}</DrawerTrigger>
         <DrawerContent className="max-h-[90vh]">
           <DrawerHeader>
@@ -180,8 +179,8 @@ function DedicatedEngineSubscriptionButton(props: { team: Team }) {
           <DrawerFooter>
             <CheckoutButton
               billingStatus={props.team.billingStatus}
-              teamSlug={props.team.slug}
               sku="product:engine_standard"
+              teamSlug={props.team.slug}
             >
               Deploy Now · $299 / month
             </CheckoutButton>
@@ -192,7 +191,7 @@ function DedicatedEngineSubscriptionButton(props: { team: Team }) {
   }
 
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
+    <Dialog onOpenChange={setOpen} open={open}>
       <DialogTrigger asChild>{trigger}</DialogTrigger>
       <DialogContent>
         <DialogHeader>
@@ -205,8 +204,8 @@ function DedicatedEngineSubscriptionButton(props: { team: Team }) {
         <DialogFooter>
           <CheckoutButton
             billingStatus={props.team.billingStatus}
-            teamSlug={props.team.slug}
             sku="product:engine_standard"
+            teamSlug={props.team.slug}
           >
             Deploy Now · $299 / month
           </CheckoutButton>
@@ -235,7 +234,7 @@ export function EngineInstancesTableUI(props: {
       </div>
 
       {props.instances.length === 0 ? (
-        <EmptyEngineState team={props.team} projectSlug={props.projectSlug} />
+        <EmptyEngineState projectSlug={props.projectSlug} team={props.team} />
       ) : (
         <TableContainer>
           <Table>
@@ -249,13 +248,13 @@ export function EngineInstancesTableUI(props: {
             <TableBody>
               {props.instances.map((instance) => (
                 <EngineInstanceRow
-                  key={instance.id}
-                  teamIdOrSlug={props.team.slug}
-                  instance={instance}
-                  engineLinkPrefix={props.engineLinkPrefix}
                   deleteCloudHostedEngine={props.deleteCloudHostedEngine}
                   editEngineInstance={props.editEngineInstance}
+                  engineLinkPrefix={props.engineLinkPrefix}
+                  instance={instance}
+                  key={instance.id}
                   removeEngineFromDashboard={props.removeEngineFromDashboard}
+                  teamIdOrSlug={props.team.slug}
                 />
               ))}
             </TableBody>
@@ -288,8 +287,8 @@ function EngineInstanceRow(props: {
           <div className="flex items-center justify-between">
             <div className="flex-grow space-y-0.5">
               <InstanceNameLink
-                instance={instance}
                 engineLinkPrefix={engineLinkPrefix}
+                instance={instance}
               />
               <EngineURL url={instance.url} />
             </div>
@@ -313,20 +312,20 @@ function EngineInstanceRow(props: {
       </TableRow>
 
       <EditModal
-        teamIdOrSlug={props.teamIdOrSlug}
+        editEngineInstance={props.editEngineInstance}
         instance={instance}
-        open={isEditModalOpen}
         onOpenChange={setIsEditModalOpen}
-        editEngineInstance={props.editEngineInstance}
+        open={isEditModalOpen}
+        teamIdOrSlug={props.teamIdOrSlug}
       />
 
       <RemoveModal
-        teamIdOrSlug={props.teamIdOrSlug}
+        deleteCloudHostedEngine={props.deleteCloudHostedEngine}
         instance={instance}
         onOpenChange={setIsRemoveModalOpen}
         open={isRemoveModalOpen}
-        deleteCloudHostedEngine={props.deleteCloudHostedEngine}
         removeEngineFromDashboard={props.removeEngineFromDashboard}
+        teamIdOrSlug={props.teamIdOrSlug}
       />
     </>
   );
@@ -350,8 +349,8 @@ function InstanceNameLink(props: {
         <span>{name}</span>
       ) : (
         <Link
-          href={`${props.engineLinkPrefix}/${props.instance.id}`}
           className="flex items-center text-foreground before:absolute before:inset-0 before:bg-transparent"
+          href={`${props.engineLinkPrefix}/${props.instance.id}`}
         >
           {name}
         </Link>
@@ -376,44 +375,42 @@ const engineStatusMeta: Record<
     icon: React.FC<{ className?: string }>;
   }
 > = {
-  requested: {
-    label: "Pending",
-    variant: "outline",
-    icon: Spinner,
-  },
-  deploying: {
-    label: "Deploying",
-    variant: "default",
-    icon: Spinner,
-  },
   active: {
+    icon: CheckIcon,
     label: "Active",
     variant: "default",
-    icon: CheckIcon,
   },
-  pending: {
-    label: "Pending",
-    variant: "outline",
+  deploying: {
     icon: Spinner,
-  },
-  paymentFailed: {
-    label: "Payment Failed",
-    variant: "destructive",
-    icon: CircleAlertIcon,
+    label: "Deploying",
+    variant: "default",
   },
   deploymentFailed: {
+    icon: CircleAlertIcon,
     label: "Deployment Failed",
     variant: "destructive",
+  },
+  paymentFailed: {
     icon: CircleAlertIcon,
+    label: "Payment Failed",
+    variant: "destructive",
+  },
+  pending: {
+    icon: Spinner,
+    label: "Pending",
+    variant: "outline",
+  },
+  requested: {
+    icon: Spinner,
+    label: "Pending",
+    variant: "outline",
   },
 };
 
-function EngineStatusBadge(props: {
-  status: EngineInstance["status"];
-}) {
+function EngineStatusBadge(props: { status: EngineInstance["status"] }) {
   const statusMeta = engineStatusMeta[props.status];
   return (
-    <Badge variant={statusMeta.variant} className="gap-2 px-3 py-2">
+    <Badge className="gap-2 px-3 py-2" variant={statusMeta.variant}>
       <statusMeta.icon className="size-3" />
       {statusMeta.label}
     </Badge>
@@ -434,7 +431,7 @@ function EngineActionsDropdown(props: {
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
-        <Button variant="ghost" className="size-10 p-1">
+        <Button className="size-10 p-1" variant="ghost">
           <MoreHorizontalIcon className="size-5" />
         </Button>
       </DropdownMenuTrigger>
@@ -475,13 +472,13 @@ function EditModal(props: {
   editEngineInstance: EditedEngineInstance;
 }) {
   return (
-    <Dialog open={props.open} onOpenChange={props.onOpenChange}>
+    <Dialog onOpenChange={props.onOpenChange} open={props.open}>
       <DialogContent className="overflow-hidden p-0">
         <EditModalContent
-          teamIdOrSlug={props.teamIdOrSlug}
-          instance={props.instance}
-          editEngineInstance={props.editEngineInstance}
           closeModal={() => props.onOpenChange(false)}
+          editEngineInstance={props.editEngineInstance}
+          instance={props.instance}
+          teamIdOrSlug={props.teamIdOrSlug}
         />
       </DialogContent>
     </Dialog>
@@ -506,11 +503,11 @@ function EditModalContent(props: {
 
   const form = useForm<z.infer<typeof editEngineFormSchema>>({
     resolver: zodResolver(editEngineFormSchema),
+    reValidateMode: "onChange",
     values: {
       name: instance.name,
       url: instance.url,
     },
-    reValidateMode: "onChange",
   });
 
   return (
@@ -519,19 +516,19 @@ function EditModalContent(props: {
         onSubmit={form.handleSubmit((data) =>
           editInstance.mutate(
             {
-              teamIdOrSlug: props.teamIdOrSlug,
               instanceId: props.instance.id,
               name: data.name,
+              teamIdOrSlug: props.teamIdOrSlug,
               url: data.url,
             },
             {
+              onError: () => {
+                toast.error("Failed to update Engine");
+              },
               onSuccess: () => {
                 toast.success("Engine updated successfully");
                 props.closeModal();
               },
-              onError: () => {
-                toast.error("Failed to update Engine");
-              },
             },
           ),
         )}
@@ -550,9 +547,9 @@ function EditModalContent(props: {
                 <FormControl>
                   <Input
                     {...field}
-                    type="text"
-                    placeholder="Enter a descriptive label"
                     className="bg-card"
+                    placeholder="Enter a descriptive label"
+                    type="text"
                   />
                 </FormControl>
                 <FormMessage />
@@ -571,9 +568,9 @@ function EditModalContent(props: {
                   <FormControl>
                     <Input
                       {...field}
-                      type="url"
-                      placeholder="Enter your Engine URL"
                       className="bg-card"
+                      placeholder="Enter your Engine URL"
+                      type="url"
                     />
                   </FormControl>
                   <FormMessage />
@@ -588,9 +585,9 @@ function EditModalContent(props: {
             Close
           </Button>
           <Button
-            type="submit"
             className="gap-2"
             disabled={!form.formState.isDirty}
+            type="submit"
           >
             {editInstance.isPending && <Spinner className="size-4" />}
             Update
@@ -612,22 +609,22 @@ function RemoveModal(props: {
   const { instance, open, onOpenChange } = props;
 
   return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
+    <Dialog onOpenChange={onOpenChange} open={open}>
       <DialogContent className="overflow-hidden p-0">
         {instance.status === "paymentFailed" ||
         instance.status === "deploymentFailed" ||
         (instance.status === "active" && !instance.deploymentId) ? (
           <RemoveEngineFromDashboardModalContent
-            instance={instance}
-            teamIdOrSlug={props.teamIdOrSlug}
             close={() => onOpenChange(false)}
+            instance={instance}
             removeEngineFromDashboard={props.removeEngineFromDashboard}
+            teamIdOrSlug={props.teamIdOrSlug}
           />
         ) : instance.deploymentId ? (
           <DeleteEngineSubscriptionModalContent
-            instance={instance}
             close={() => onOpenChange(false)}
             deleteCloudHostedEngine={props.deleteCloudHostedEngine}
+            instance={instance}
           />
         ) : null}
       </DialogContent>
@@ -678,6 +675,7 @@ function RemoveEngineFromDashboardModalContent(props: {
           Close
         </Button>
         <Button
+          className="gap-2"
           onClick={() => {
             removeFromDashboard.mutate(
               {
@@ -685,22 +683,21 @@ function RemoveEngineFromDashboardModalContent(props: {
                 teamIdOrSlug: props.teamIdOrSlug,
               },
               {
+                onError: () => {
+                  toast.error(
+                    "Error removing an Engine instance from your dashboard",
+                  );
+                },
                 onSuccess: () => {
                   toast.success(
                     "Removed an Engine instance from your dashboard",
                   );
                   close();
                 },
-                onError: () => {
-                  toast.error(
-                    "Error removing an Engine instance from your dashboard",
-                  );
-                },
               },
             );
           }}
           variant="destructive"
-          className="gap-2"
         >
           {removeFromDashboard.isPending ? (
             <Spinner className="size-4" />
@@ -718,21 +715,21 @@ const deleteEngineReasons: Array<{
   value: DeleteCloudHostedEngineParams["reason"];
   label: string;
 }> = [
-  { value: "USING_SELF_HOSTED", label: "Migrating to self-hosted" },
-  { value: "TOO_EXPENSIVE", label: "Too expensive" },
-  { value: "MISSING_FEATURES", label: "Missing features" },
-  { value: "OTHER", label: "Other" },
+  { label: "Migrating to self-hosted", value: "USING_SELF_HOSTED" },
+  { label: "Too expensive", value: "TOO_EXPENSIVE" },
+  { label: "Missing features", value: "MISSING_FEATURES" },
+  { label: "Other", value: "OTHER" },
 ];
 
 const deleteEngineFormSchema = z.object({
+  confirmDeletion: z.boolean(),
+  feedback: z.string(),
   reason: z.enum([
     "USING_SELF_HOSTED",
     "TOO_EXPENSIVE",
     "MISSING_FEATURES",
     "OTHER",
   ]),
-  feedback: z.string(),
-  confirmDeletion: z.boolean(),
 });
 
 function DeleteEngineSubscriptionModalContent(props: {
@@ -746,11 +743,11 @@ function DeleteEngineSubscriptionModalContent(props: {
   });
 
   const form = useForm<z.infer<typeof deleteEngineFormSchema>>({
-    resolver: zodResolver(deleteEngineFormSchema),
     defaultValues: {
-      feedback: "",
       confirmDeletion: false,
+      feedback: "",
     },
+    resolver: zodResolver(deleteEngineFormSchema),
     reValidateMode: "onChange",
   });
 
@@ -766,10 +763,15 @@ function DeleteEngineSubscriptionModalContent(props: {
     deleteCloudHostedEngine.mutate(
       {
         deploymentId: instance.deploymentId,
-        reason: data.reason,
         feedback: data.feedback,
+        reason: data.reason,
       },
       {
+        onError: () => {
+          toast.error(
+            "Error deleting Engine. Please visit https://thirdweb.com/support.",
+          );
+        },
         onSuccess: () => {
           toast.success(
             "Deleting Engine. Please check again in a few minutes.",
@@ -781,11 +783,6 @@ function DeleteEngineSubscriptionModalContent(props: {
 
           close();
         },
-        onError: () => {
-          toast.error(
-            "Error deleting Engine. Please visit https://thirdweb.com/support.",
-          );
-        },
       },
     );
   };
@@ -815,14 +812,14 @@ function DeleteEngineSubscriptionModalContent(props: {
                   </FormLabel>
                   <FormControl>
                     <RadioGroup
-                      onValueChange={field.onChange}
-                      defaultValue={field.value}
                       className="flex flex-col gap-1"
+                      defaultValue={field.value}
+                      onValueChange={field.onChange}
                     >
                       {deleteEngineReasons.map((reason) => (
                         <FormItem
-                          key={reason.value}
                           className="flex items-center space-x-3 space-y-0"
+                          key={reason.value}
                         >
                           <FormControl>
                             <RadioGroupItem value={reason.value} />
@@ -884,13 +881,13 @@ function DeleteEngineSubscriptionModalContent(props: {
               Close
             </Button>
             <Button
-              type="submit"
-              variant="destructive"
+              className="gap-2"
               disabled={
                 !form.watch("confirmDeletion") ||
                 deleteCloudHostedEngine.isPending
               }
-              className="gap-2"
+              type="submit"
+              variant="destructive"
             >
               {deleteCloudHostedEngine.isPending && (
                 <Spinner className="size-4" />
@@ -904,10 +901,7 @@ function DeleteEngineSubscriptionModalContent(props: {
   );
 }
 
-function EmptyEngineState(props: {
-  team: Team;
-  projectSlug: string;
-}) {
+function EmptyEngineState(props: { team: Team; projectSlug: string }) {
   const [selectedTab, setSelectedTab] = useState<
     "self-hosted" | "cloud-hosted"
   >("cloud-hosted");
@@ -924,86 +918,84 @@ function EmptyEngineState(props: {
         instance.
       </p>
 
-      <>
-        <div className="w-full max-w-md">
-          <div className="mx-auto max-w-sm">
-            <div className="grid grid-cols-2 gap-1 rounded-lg border p-1">
-              <Button
-                variant="ghost"
-                size="sm"
-                className={cn(selectedTab === "cloud-hosted" && "bg-accent")}
-                onClick={() => setSelectedTab("cloud-hosted")}
-              >
-                Managed
-              </Button>
+      <div className="w-full max-w-md">
+        <div className="mx-auto max-w-sm">
+          <div className="grid grid-cols-2 gap-1 rounded-lg border p-1">
+            <Button
+              className={cn(selectedTab === "cloud-hosted" && "bg-accent")}
+              onClick={() => setSelectedTab("cloud-hosted")}
+              size="sm"
+              variant="ghost"
+            >
+              Managed
+            </Button>
 
+            <Button
+              className={cn(selectedTab === "self-hosted" && "bg-accent")}
+              onClick={() => setSelectedTab("self-hosted")}
+              size="sm"
+              variant="ghost"
+            >
+              Self-hosted
+            </Button>
+          </div>
+        </div>
+
+        <div className="h-5" />
+
+        {selectedTab === "self-hosted" && (
+          <div className="flex flex-col text-center">
+            <h3 className="mb-0.5 font-semibold text-base">
+              Self-Hosted Engine
+            </h3>
+            <p className="text-muted-foreground text-sm">
+              Add engine instance running on your own infrastructure.
+            </p>
+            <div className="h-4" />
+            <div className="mt-auto">
               <Button
-                variant="ghost"
+                asChild
+                className="w-full gap-2"
                 size="sm"
-                className={cn(selectedTab === "self-hosted" && "bg-accent")}
-                onClick={() => setSelectedTab("self-hosted")}
+                variant="default"
               >
-                Self-hosted
+                <Link
+                  href={`/team/${props.team.slug}/${props.projectSlug}/engine/dedicated/import`}
+                >
+                  Import self-hosted Engine
+                  <ArrowRightIcon size={16} />
+                </Link>
               </Button>
             </div>
           </div>
+        )}
 
-          <div className="h-5" />
-
-          {selectedTab === "self-hosted" && (
-            <div className="flex flex-col text-center">
-              <h3 className="mb-0.5 font-semibold text-base">
-                Self-Hosted Engine
-              </h3>
-              <p className="text-muted-foreground text-sm">
-                Add engine instance running on your own infrastructure.
-              </p>
-              <div className="h-4" />
-              <div className="mt-auto">
-                <Button
-                  className="w-full gap-2"
-                  variant="default"
-                  size="sm"
-                  asChild
-                >
-                  <Link
-                    href={`/team/${props.team.slug}/${props.projectSlug}/engine/dedicated/import`}
-                  >
-                    Import self-hosted Engine
-                    <ArrowRightIcon size={16} />
-                  </Link>
-                </Button>
-              </div>
-            </div>
-          )}
-
-          {selectedTab === "cloud-hosted" && (
-            <div className="flex flex-col text-center">
-              <h3 className="mb-0.5 font-semibold text-base">Managed Engine</h3>
-              <p className="text-muted-foreground text-sm">
-                Deploy a managed engine instance to your team. <br /> We
-                recommend using Engine Cloud in most cases.
-              </p>
-              <div className="h-4" />
-              <div className="mt-auto">
-                <DedicatedEngineSubscriptionButton team={props.team} />
-              </div>
+        {selectedTab === "cloud-hosted" && (
+          <div className="flex flex-col text-center">
+            <h3 className="mb-0.5 font-semibold text-base">Managed Engine</h3>
+            <p className="text-muted-foreground text-sm">
+              Deploy a managed engine instance to your team. <br /> We recommend
+              using Engine Cloud in most cases.
+            </p>
+            <div className="h-4" />
+            <div className="mt-auto">
+              <DedicatedEngineSubscriptionButton team={props.team} />
             </div>
-          )}
-        </div>
+          </div>
+        )}
+      </div>
 
-        <div className="mt-4 text-center text-muted-foreground text-sm">
-          Need help getting started? <br className="lg:hidden" />
-          <Link
-            href="https://portal.thirdweb.com/engine"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="text-foreground hover:underline"
-          >
-            View documentation
-          </Link>
-        </div>
-      </>
+      <div className="mt-4 text-center text-muted-foreground text-sm">
+        Need help getting started? <br className="lg:hidden" />
+        <Link
+          className="text-foreground hover:underline"
+          href="https://portal.thirdweb.com/engine"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          View documentation
+        </Link>
+      </div>
     </div>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-list.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-list.tsx
index a60621b5b35..332d5d3883e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-list.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/overview/engine-list.tsx
@@ -1,5 +1,5 @@
-import type { Team } from "@/api/team";
 import type { EngineInstance } from "@3rdweb-sdk/react/hooks/useEngine";
+import type { Team } from "@/api/team";
 import { EngineFooterCard } from "../_components";
 import { EngineInstancesTable } from "./engine-instances-table";
 
@@ -13,16 +13,16 @@ export const EngineInstancesList = (props: {
   return (
     <div className="flex grow flex-col">
       <EngineInstancesTable
-        team={props.team}
-        projectSlug={props.projectSlug}
-        instances={props.instances}
         engineLinkPrefix={engineLinkPrefix}
+        instances={props.instances}
+        projectSlug={props.projectSlug}
+        team={props.team}
       />
 
       <div className="h-40" />
       <EngineFooterCard
-        teamSlug={props.team.slug}
         projectSlug={props.projectSlug}
+        teamSlug={props.team.slug}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/page.tsx
index 2834e6a3485..ec46db560d3 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/page.tsx
@@ -1,5 +1,5 @@
-import { getTeamBySlug } from "@/api/team";
 import { redirect } from "next/navigation";
+import { getTeamBySlug } from "@/api/team";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../login/loginRedirect";
 import { getEngineInstances } from "../_utils/getEngineInstances";
@@ -47,9 +47,9 @@ export default async function Page(props: {
 
   return (
     <EngineInstancesList
-      team={team}
-      projectSlug={params.project_slug}
       instances={res.data || []}
+      projectSlug={params.project_slug}
+      team={team}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EngineErrorPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EngineErrorPage.tsx
index 6fccdb6982f..e4e2e6fa0db 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EngineErrorPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EngineErrorPage.tsx
@@ -8,8 +8,8 @@ export function EngineErrorPage(props: {
   return (
     <div className="flex grow flex-col">
       <Link
-        href={props.rootPath}
         className="flex items-center gap-2 text-muted-foreground hover:text-foreground"
+        href={props.rootPath}
       >
         <ArrowLeftIcon className="size-5" />
         Back
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EnginePageLayout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EnginePageLayout.tsx
index 53c85d51209..15602b27364 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EnginePageLayout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EnginePageLayout.tsx
@@ -3,48 +3,48 @@ import { SidebarLayout } from "@/components/blocks/SidebarLayout";
 
 const sidebarLinkMeta: Array<{ pathId: string; label: string }> = [
   {
-    pathId: "",
     label: "Overview",
+    pathId: "",
   },
   {
-    pathId: "explorer",
     label: "Explorer",
+    pathId: "explorer",
   },
   {
-    pathId: "relayers",
     label: "Relayers",
+    pathId: "relayers",
   },
   {
-    pathId: "contract-subscriptions",
     label: "Contract Subscriptions",
+    pathId: "contract-subscriptions",
   },
   {
-    pathId: "admins",
     label: "Admins",
+    pathId: "admins",
   },
   {
-    pathId: "access-tokens",
     label: "Access Tokens",
+    pathId: "access-tokens",
   },
   {
-    pathId: "webhooks",
     label: "Webhooks",
+    pathId: "webhooks",
   },
   {
-    pathId: "metrics",
     label: "Metrics",
+    pathId: "metrics",
   },
   {
-    pathId: "alerts",
     label: "Alerts",
+    pathId: "alerts",
   },
   {
-    pathId: "wallet-credentials",
     label: "Wallet Credentials",
+    pathId: "wallet-credentials",
   },
   {
-    pathId: "configuration",
     label: "Configuration",
+    pathId: "configuration",
   },
 ];
 
@@ -58,12 +58,12 @@ export function EngineSidebarLayout(props: {
 
   const links: SidebarLink[] = sidebarLinkMeta.map((linkMeta) => {
     return {
+      exactMatch: true,
       href: `${rootPath}/${props.engineId}${linkMeta.pathId === "" ? "" : `/${linkMeta.pathId}`}`,
       label: linkMeta.label,
-      exactMatch: true,
       tracking: {
-        category: "engine",
         action: "navigate-tab",
+        category: "engine",
         label: linkMeta.label,
       },
     };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EnsureEnginePermission.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EnsureEnginePermission.tsx
index 674f7afb817..79385f4b1ee 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EnsureEnginePermission.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/EnsureEnginePermission.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import type { EngineInstance } from "@3rdweb-sdk/react/hooks/useEngine";
 import { useQuery } from "@tanstack/react-query";
 import type React from "react";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import { getEngineAccessPermission } from "../../../_utils/getEngineAccessPermission";
 import { EngineErrorPage } from "./EngineErrorPage";
 
@@ -20,13 +20,6 @@ export function EnsureEnginePermission(props: {
   const rootPath = `/team/${props.teamSlug}/${props.projectSlug}/engine/dedicated`;
 
   const permissionQuery = useQuery({
-    queryKey: [
-      "engine-permission",
-      {
-        instanceUrl: instance.url,
-        authToken: props.authToken,
-      },
-    ],
     queryFn: () => {
       const url = instance.url;
       if (!url) {
@@ -38,6 +31,13 @@ export function EnsureEnginePermission(props: {
         instanceUrl: url,
       });
     },
+    queryKey: [
+      "engine-permission",
+      {
+        authToken: props.authToken,
+        instanceUrl: instance.url,
+      },
+    ],
     retry: false,
   });
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/version.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/version.tsx
index ff1e9eb82d7..b980a11c521 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/version.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/_components/version.tsx
@@ -1,6 +1,17 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  type EngineInstance,
+  useEngineGetDeploymentPublicConfiguration,
+  useEngineSystemHealth,
+  useEngineUpdateDeployment,
+} from "@3rdweb-sdk/react/hooks/useEngine";
+import { formatDistanceToNow } from "date-fns";
+import { CircleArrowUpIcon, TriangleAlertIcon } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import { toast } from "sonner";
+import invariant from "tiny-invariant";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -12,6 +23,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Select,
   SelectContent,
@@ -21,18 +33,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import {
-  type EngineInstance,
-  useEngineGetDeploymentPublicConfiguration,
-  useEngineSystemHealth,
-  useEngineUpdateDeployment,
-} from "@3rdweb-sdk/react/hooks/useEngine";
-import { formatDistanceToNow } from "date-fns";
-import { CircleArrowUpIcon, TriangleAlertIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { toast } from "sonner";
-import invariant from "tiny-invariant";
 
 export const EngineVersionBadge = ({
   instance,
@@ -63,7 +63,7 @@ export const EngineVersionBadge = ({
   // Hide the change version modal unless owner.
   if (!instance.deploymentId) {
     return (
-      <Button variant="outline" asChild className="hover:bg-transparent">
+      <Button asChild className="hover:bg-transparent" variant="outline">
         <div>{currentVersion}</div>
       </Button>
     );
@@ -80,9 +80,9 @@ export const EngineVersionBadge = ({
         leftIcon={<CircleArrowUpIcon className="size-4 text-link-foreground" />}
       >
         <Button
-          variant="outline"
           className="relative"
           onClick={() => setModalOpen(true)}
+          variant="outline"
         >
           {currentVersion}
 
@@ -96,10 +96,10 @@ export const EngineVersionBadge = ({
       </ToolTipLabel>
 
       <ChangeVersionModal
-        open={isModalOpen}
-        onOpenChange={setModalOpen}
-        instance={instance}
         currentVersion={currentVersion}
+        instance={instance}
+        onOpenChange={setModalOpen}
+        open={isModalOpen}
         serverVersions={serverVersions}
         teamSlug={teamSlug}
       />
@@ -131,7 +131,7 @@ const ChangeVersionModal = (props: {
   if (!instance.deploymentId) {
     // Self-hosted modal: prompt to update manually.
     return (
-      <Dialog open={open} onOpenChange={onOpenChange}>
+      <Dialog onOpenChange={onOpenChange} open={open}>
         <DialogContent className="max-w-[400px]">
           <DialogHeader>
             <DialogTitle className="mb-6 pr-4 font-semibold text-2xl tracking-tight">
@@ -140,10 +140,10 @@ const ChangeVersionModal = (props: {
             <DialogDescription>
               View the{" "}
               <Link
+                className="text-link-foreground hover:text-foreground"
                 href="https://github.com/thirdweb-dev/engine/releases"
-                target="_blank"
                 rel="noopener noreferrer"
-                className="text-link-foreground hover:text-foreground"
+                target="_blank"
               >
                 latest changelog
               </Link>
@@ -161,13 +161,13 @@ const ChangeVersionModal = (props: {
 
     try {
       const promise = updateDeploymentMutation.mutateAsync({
-        teamSlug,
         deploymentId: instance.deploymentId,
         serverVersion: selectedVersion,
+        teamSlug,
       });
       toast.promise(promise, {
-        success: `Updating your Engine to ${selectedVersion}.`,
         error: "Unexpected error updating Engine.",
+        success: `Updating your Engine to ${selectedVersion}.`,
       });
       await promise;
     } finally {
@@ -177,7 +177,7 @@ const ChangeVersionModal = (props: {
 
   // For cloud-hosted, prompt the user to select a version to update to.
   return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
+    <Dialog onOpenChange={onOpenChange} open={open}>
       <DialogContent className="max-w-[400px]">
         <DialogHeader>
           <DialogTitle>Update Engine version</DialogTitle>
@@ -198,10 +198,10 @@ const ChangeVersionModal = (props: {
                   const isLatestVersion = idx === 0;
                   return (
                     <SelectItem
+                      disabled={isCurrentVersion}
+                      id={name}
                       key={name}
                       value={name}
-                      id={name}
-                      disabled={isCurrentVersion}
                     >
                       <span>{name}</span>
                       <span className="ml-4 text-muted-foreground">
@@ -226,10 +226,10 @@ const ChangeVersionModal = (props: {
           {currentVersion.startsWith("v") && (
             <div>
               <Link
+                className="text-link-foreground hover:text-foreground"
                 href={`https://github.com/thirdweb-dev/engine/compare/${currentVersion}...${selectedVersion}`}
-                target="_blank"
                 rel="noopener noreferrer"
-                className="text-link-foreground hover:text-foreground"
+                target="_blank"
               >
                 View changes: {currentVersion} &rarr; {selectedVersion}
               </Link>
@@ -251,18 +251,18 @@ const ChangeVersionModal = (props: {
 
         <DialogFooter className="mt-5">
           <Button
-            type="button"
             onClick={() => onOpenChange(false)}
+            type="button"
             variant="outline"
           >
             Close
           </Button>
           <Button
-            type="submit"
-            onClick={onClickUpdate}
-            variant="primary"
             className="gap-2"
             disabled={selectedVersion === currentVersion}
+            onClick={onClickUpdate}
+            type="submit"
+            variant="primary"
           >
             {updateDeploymentMutation.isPending ? (
               <Spinner className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/access-tokens-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/access-tokens-table.tsx
index 1b7d5976aec..ad6db6039d6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/access-tokens-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/access-tokens-table.tsx
@@ -1,4 +1,3 @@
-import { WalletAddress } from "@/components/blocks/wallet-address";
 import {
   type AccessToken,
   useEngineRevokeAccessToken,
@@ -26,6 +25,7 @@ import { useMemo, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { Button, FormLabel, Text } from "tw-components";
 import { toDateTimeLocal } from "utils/date-utils";
+import { WalletAddress } from "@/components/blocks/wallet-address";
 
 interface AccessTokensTableProps {
   instanceUrl: string;
@@ -53,15 +53,14 @@ export const AccessTokensTable: React.FC<AccessTokensTableProps> = ({
   const columns = useMemo(() => {
     return [
       columnHelper.accessor("tokenMask", {
-        header: "Access Token",
         cell: (cell) => {
           return (
             <p className="py-3 font-mono text-foreground">{cell.getValue()}</p>
           );
         },
+        header: "Access Token",
       }),
       columnHelper.accessor("label", {
-        header: "Label",
         cell: (cell) => {
           return (
             <Text isTruncated maxW={300}>
@@ -69,16 +68,16 @@ export const AccessTokensTable: React.FC<AccessTokensTableProps> = ({
             </Text>
           );
         },
+        header: "Label",
       }),
       columnHelper.accessor("walletAddress", {
-        header: "Created By",
         cell: (cell) => {
           const address = cell.getValue();
           return <WalletAddress address={address} client={client} />;
         },
+        header: "Created By",
       }),
       columnHelper.accessor("createdAt", {
-        header: "Created At",
         cell: (cell) => {
           const value = cell.getValue();
 
@@ -87,6 +86,7 @@ export const AccessTokensTable: React.FC<AccessTokensTableProps> = ({
           }
           return <Text>{toDateTimeLocal(value)}</Text>;
         },
+        header: "Created At",
       }),
     ];
   }, [client]);
@@ -94,46 +94,46 @@ export const AccessTokensTable: React.FC<AccessTokensTableProps> = ({
   return (
     <>
       <TWTable
-        title="access tokens"
-        data={accessTokens}
         columns={columns}
-        isPending={isPending}
+        data={accessTokens}
         isFetched={isFetched}
+        isPending={isPending}
         onMenuClick={[
           {
             icon: <PencilIcon className="size-4" />,
-            text: "Edit",
             onClick: (accessToken) => {
               setSelectedAccessToken(accessToken);
               editDisclosure.onOpen();
             },
+            text: "Edit",
           },
           {
             icon: <Trash2Icon className="size-4" />,
-            text: "Delete",
+            isDestructive: true,
             onClick: (accessToken) => {
               setSelectedAccessToken(accessToken);
               removeDisclosure.onOpen();
             },
-            isDestructive: true,
+            text: "Delete",
           },
         ]}
+        title="access tokens"
       />
 
       {selectedAccessToken && editDisclosure.isOpen && (
         <EditModal
           accessToken={selectedAccessToken}
+          authToken={authToken}
           disclosure={editDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
         />
       )}
       {selectedAccessToken && removeDisclosure.isOpen && (
         <RemoveModal
           accessToken={selectedAccessToken}
+          authToken={authToken}
           disclosure={removeDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
         />
       )}
     </>
@@ -152,8 +152,8 @@ const EditModal = ({
   authToken: string;
 }) => {
   const { mutate: updateAccessToken } = useEngineUpdateAccessToken({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -170,20 +170,20 @@ const EditModal = ({
         label,
       },
       {
-        onSuccess: () => {
-          onSuccess();
-          disclosure.onClose();
-        },
         onError: (error) => {
           onError(error);
           console.error(error);
         },
+        onSuccess: () => {
+          onSuccess();
+          disclosure.onClose();
+        },
       },
     );
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Update Access Token</ModalHeader>
@@ -197,20 +197,20 @@ const EditModal = ({
             <FormControl>
               <FormLabel>Label</FormLabel>
               <Input
-                type="text"
-                value={label}
                 onChange={(e) => setLabel(e.target.value)}
                 placeholder="Enter a description for this access token"
+                type="text"
+                value={label}
               />
             </FormControl>
           </div>
         </ModalBody>
 
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
-          <Button type="submit" colorScheme="blue" onClick={onClick}>
+          <Button colorScheme="blue" onClick={onClick} type="submit">
             Save
           </Button>
         </ModalFooter>
@@ -231,8 +231,8 @@ const RemoveModal = ({
   authToken: string;
 }) => {
   const { mutate: deleteAccessToken } = useEngineRevokeAccessToken({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -246,20 +246,20 @@ const RemoveModal = ({
         id: accessToken.id,
       },
       {
-        onSuccess: () => {
-          onSuccess();
-          disclosure.onClose();
-        },
         onError: (error) => {
           onError(error);
           console.error(error);
         },
+        onSuccess: () => {
+          onSuccess();
+          disclosure.onClose();
+        },
       },
     );
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Delete Access Token</ModalHeader>
@@ -279,10 +279,10 @@ const RemoveModal = ({
         </ModalBody>
 
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
-          <Button type="submit" colorScheme="red" onClick={onClick}>
+          <Button colorScheme="red" onClick={onClick} type="submit">
             Delete
           </Button>
         </ModalFooter>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/add-access-token-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/add-access-token-button.tsx
index f65e79ae9d7..010645e3be9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/add-access-token-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/add-access-token-button.tsx
@@ -1,5 +1,3 @@
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
-import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 import { useEngineCreateAccessToken } from "@3rdweb-sdk/react/hooks/useEngine";
 import {
   Flex,
@@ -15,6 +13,8 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { CirclePlusIcon } from "lucide-react";
 import { useState } from "react";
 import { Button, Text } from "tw-components";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 
 interface AddAccessTokenButtonProps {
   instanceUrl: string;
@@ -28,8 +28,8 @@ export const AddAccessTokenButton: React.FC<AddAccessTokenButtonProps> = ({
   const [accessToken, setAccessToken] = useState<string>("");
   const { isOpen, onOpen, onClose } = useDisclosure();
   const { mutate: createAccessToken } = useEngineCreateAccessToken({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const [hasStoredToken, setHasStoredToken] = useState<boolean>(false);
@@ -42,34 +42,34 @@ export const AddAccessTokenButton: React.FC<AddAccessTokenButtonProps> = ({
   return (
     <>
       <Button
+        colorScheme="primary"
+        leftIcon={<CirclePlusIcon className="size-6" />}
         onClick={() => {
           createAccessToken(undefined, {
+            onError: (error) => {
+              onError(error);
+              console.error(error);
+            },
             onSuccess: (response) => {
               onSuccess();
               setAccessToken(response.accessToken);
               onOpen();
             },
-            onError: (error) => {
-              onError(error);
-              console.error(error);
-            },
           });
         }}
-        variant="ghost"
         size="sm"
-        leftIcon={<CirclePlusIcon className="size-6" />}
-        colorScheme="primary"
+        variant="ghost"
         w="fit-content"
       >
         Create Access Token
       </Button>
 
       <Modal
-        isOpen={isOpen}
-        onClose={onClose}
-        closeOnOverlayClick={false}
         closeOnEsc={false}
+        closeOnOverlayClick={false}
         isCentered
+        isOpen={isOpen}
+        onClose={onClose}
       >
         <ModalOverlay />
         <ModalContent className="!bg-background rounded-lg border border-border">
@@ -92,13 +92,13 @@ export const AddAccessTokenButton: React.FC<AddAccessTokenButtonProps> = ({
 
           <ModalFooter as={Flex} gap={3}>
             <Button
-              type="submit"
               colorScheme="primary"
               isDisabled={!hasStoredToken}
               onClick={() => {
                 onClose();
                 setAccessToken("");
               }}
+              type="submit"
             >
               Done
             </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/add-keypair-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/add-keypair-button.tsx
index fa4283fa9c3..c1962ea6e26 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/add-keypair-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/add-keypair-button.tsx
@@ -1,4 +1,3 @@
-import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 import {
   type KeypairAlgorithm,
   useEngineAddKeypair,
@@ -22,6 +21,7 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { CirclePlusIcon } from "lucide-react";
 import { useState } from "react";
 import { Button, FormLabel, Text } from "tw-components";
+import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 
 const KEYPAIR_ALGORITHM_DETAILS: Record<
   KeypairAlgorithm,
@@ -37,17 +37,17 @@ const KEYPAIR_ALGORITHM_DETAILS: Record<
       "openssl ecparam -name prime256v1 -genkey -noout -out private.key",
     publicKeyInstructions: "openssl ec -in private.key -pubout -out public.key",
   },
-  RS256: {
-    name: "RSASSA-PKCS1-v1_5",
+  PS256: {
+    name: "RSASSA-PSS",
     privateKeyInstructions:
-      "openssl genpkey -algorithm RSA -out private.key -pkeyopt rsa_keygen_bits:2048",
+      "openssl genpkey -algorithm RSA-PSS -out private.key -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_pss_keygen_md:sha256",
     publicKeyInstructions:
       "openssl rsa -pubout -in private.key -out public.key",
   },
-  PS256: {
-    name: "RSASSA-PSS",
+  RS256: {
+    name: "RSASSA-PKCS1-v1_5",
     privateKeyInstructions:
-      "openssl genpkey -algorithm RSA-PSS -out private.key -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_pss_keygen_md:sha256",
+      "openssl genpkey -algorithm RSA -out private.key -pkeyopt rsa_keygen_bits:2048",
     publicKeyInstructions:
       "openssl rsa -pubout -in private.key -out public.key",
   },
@@ -67,8 +67,8 @@ export const AddKeypairButton: React.FC<AddKeypairButtonProps> = ({
   const [label, setLabel] = useState<string>("");
   const { isOpen, onOpen, onClose } = useDisclosure();
   const { mutateAsync: importKeypair } = useEngineAddKeypair({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -79,9 +79,9 @@ export const AddKeypairButton: React.FC<AddKeypairButtonProps> = ({
   const onClick = async () => {
     try {
       await importKeypair({
-        publicKey,
         algorithm,
         label,
+        publicKey,
       });
 
       onSuccess();
@@ -97,22 +97,22 @@ export const AddKeypairButton: React.FC<AddKeypairButtonProps> = ({
   return (
     <>
       <Button
+        colorScheme="primary"
+        leftIcon={<CirclePlusIcon className="size-6" />}
         onClick={onOpen}
-        variant="ghost"
         size="sm"
-        leftIcon={<CirclePlusIcon className="size-6" />}
-        colorScheme="primary"
+        variant="ghost"
         w="fit-content"
       >
         Add Public Key
       </Button>
 
       <Modal
-        isOpen={isOpen}
-        onClose={onClose}
-        closeOnOverlayClick={false}
         closeOnEsc={false}
+        closeOnOverlayClick={false}
         isCentered
+        isOpen={isOpen}
+        onClose={onClose}
         size="2xl"
       >
         <ModalOverlay />
@@ -124,18 +124,18 @@ export const AddKeypairButton: React.FC<AddKeypairButtonProps> = ({
                 <div className="flex flex-row gap-2">
                   <Text>Create a private key using:</Text>
                   <Select
-                    w="fit-content"
-                    value={algorithm}
+                    color="primary.500"
+                    fontFamily="mono"
+                    fontSize="small"
+                    mt="-1px"
                     onChange={(e) =>
                       setAlgorithm(e.target.value as KeypairAlgorithm)
                     }
-                    fontSize="small"
                     size="sm"
-                    variant="unstyled"
                     // fontWeight="bold"
-                    fontFamily="mono"
-                    color="primary.500"
-                    mt="-1px"
+                    value={algorithm}
+                    variant="unstyled"
+                    w="fit-content"
                   >
                     {(
                       Object.keys(
@@ -171,20 +171,20 @@ export const AddKeypairButton: React.FC<AddKeypairButtonProps> = ({
               </FormLabel>
               <Textarea
                 fontFamily="mono"
-                value={publicKey}
+                fontSize="small"
                 onChange={(e) => setPublicKey(e.target.value)}
                 placeholder="-----BEGIN PUBLIC KEY-----\n...\n...\n...\n...\n-----END PUBLIC KEY-----"
                 rows={6}
-                fontSize="small"
+                value={publicKey}
               />
             </FormControl>
 
             <FormControl>
               <FormLabel>Label</FormLabel>
               <Input
-                value={label}
                 onChange={(e) => setLabel(e.target.value)}
                 placeholder="Enter a description for this keypair"
+                value={label}
               />
             </FormControl>
 
@@ -201,14 +201,14 @@ export const AddKeypairButton: React.FC<AddKeypairButtonProps> = ({
           </ModalBody>
 
           <ModalFooter as={Flex} gap={3}>
-            <Button variant="ghost" onClick={onClose}>
+            <Button onClick={onClose} variant="ghost">
               Cancel
             </Button>
             <Button
-              type="submit"
               colorScheme="primary"
-              onClick={onClick}
               isDisabled={!publicKey}
+              onClick={onClick}
+              type="submit"
             >
               Add Public Key
             </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/engine-access-tokens.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/engine-access-tokens.tsx
index 7d36f362551..94c9fbc4000 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/engine-access-tokens.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/engine-access-tokens.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { CodeClient } from "@/components/ui/code/code.client";
-import { InlineCode } from "@/components/ui/inline-code";
 import {
   useEngineAccessTokens,
   useEngineKeypairs,
@@ -11,6 +9,8 @@ import { ButtonGroup, Flex } from "@chakra-ui/react";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { Button, Heading, Link, Text } from "tw-components";
+import { CodeClient } from "@/components/ui/code/code.client";
+import { InlineCode } from "@/components/ui/inline-code";
 import { AccessTokensTable } from "./access-tokens-table";
 import { AddAccessTokenButton } from "./add-access-token-button";
 import { AddKeypairButton } from "./add-keypair-button";
@@ -42,28 +42,28 @@ export const EngineAccessTokens: React.FC<EngineAccessTokensProps> = ({
       </Flex>
 
       {supportsKeyPairAuth && (
-        <ButtonGroup size="sm" variant="ghost" spacing={2}>
+        <ButtonGroup size="sm" spacing={2} variant="ghost">
           <Button
-            type="button"
-            isActive={selected === "standard"}
             _active={{
               bg: "bgBlack",
               color: "bgWhite",
             }}
-            rounded="lg"
+            isActive={selected === "standard"}
             onClick={() => setSelected("standard")}
+            rounded="lg"
+            type="button"
           >
             Standard
           </Button>
           <Button
-            type="button"
-            isActive={selected === "keypair"}
             _active={{
               bg: "bgBlack",
               color: "bgWhite",
             }}
-            rounded="lg"
+            isActive={selected === "keypair"}
             onClick={() => setSelected("keypair")}
+            rounded="lg"
+            type="button"
           >
             Keypair Authentication
           </Button>
@@ -72,14 +72,14 @@ export const EngineAccessTokens: React.FC<EngineAccessTokensProps> = ({
 
       {selected === "standard" ? (
         <StandardAccessTokensPanel
-          instanceUrl={instanceUrl}
           authToken={authToken}
           client={client}
+          instanceUrl={instanceUrl}
         />
       ) : selected === "keypair" ? (
         <KeypairAuthenticationPanel
-          instanceUrl={instanceUrl}
           authToken={authToken}
+          instanceUrl={instanceUrl}
         />
       ) : null}
     </Flex>
@@ -96,8 +96,8 @@ const StandardAccessTokensPanel = ({
   authToken: string;
 }) => {
   const accessTokens = useEngineAccessTokens({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   return (
@@ -105,8 +105,8 @@ const StandardAccessTokensPanel = ({
       <Text>
         Access tokens allow API access to Engine.{" "}
         <Link
-          href="https://portal.thirdweb.com/engine/features/access-tokens"
           color="primary.500"
+          href="https://portal.thirdweb.com/engine/features/access-tokens"
           isExternal
         >
           Learn more about access tokens
@@ -115,14 +115,14 @@ const StandardAccessTokensPanel = ({
       </Text>
 
       <AccessTokensTable
+        accessTokens={accessTokens.data ?? []}
+        authToken={authToken}
         client={client}
         instanceUrl={instanceUrl}
-        accessTokens={accessTokens.data ?? []}
-        isPending={accessTokens.isPending}
         isFetched={accessTokens.isFetched}
-        authToken={authToken}
+        isPending={accessTokens.isPending}
       />
-      <AddAccessTokenButton instanceUrl={instanceUrl} authToken={authToken} />
+      <AddAccessTokenButton authToken={authToken} instanceUrl={instanceUrl} />
 
       <Flex direction="column" gap={2} mt={16}>
         <Heading size="title.md">Authenticate with your access token</Heading>
@@ -130,12 +130,12 @@ const StandardAccessTokensPanel = ({
           Set the <InlineCode code="authorization" /> header.
         </Text>
         <CodeClient
-          lang="ts"
           code={`const resp = fetch("<engine_url>/backend-wallet/get-all", {
   headers: {
     authorization: "Bearer <access_token>",
   },
 });`}
+          lang="ts"
         />
       </Flex>
     </>
@@ -150,8 +150,8 @@ const KeypairAuthenticationPanel = ({
   authToken: string;
 }) => {
   const keypairs = useEngineKeypairs({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   return (
@@ -162,8 +162,8 @@ const KeypairAuthenticationPanel = ({
         <br />
         They are securely signed by your backend and verified with a public key.{" "}
         <Link
-          href="https://portal.thirdweb.com/engine/features/keypair-authentication"
           color="primary.500"
+          href="https://portal.thirdweb.com/engine/features/keypair-authentication"
           isExternal
         >
           Learn more about keypair authentication
@@ -172,13 +172,13 @@ const KeypairAuthenticationPanel = ({
       </Text>
 
       <KeypairsTable
+        authToken={authToken}
         instanceUrl={instanceUrl}
-        keypairs={keypairs.data || []}
-        isPending={keypairs.isPending}
         isFetched={keypairs.isFetched}
-        authToken={authToken}
+        isPending={keypairs.isPending}
+        keypairs={keypairs.data || []}
       />
-      <AddKeypairButton instanceUrl={instanceUrl} authToken={authToken} />
+      <AddKeypairButton authToken={authToken} instanceUrl={instanceUrl} />
 
       <Flex direction="column" gap={2} mt={16}>
         <Heading size="title.md">Authenticate with your access token</Heading>
@@ -187,7 +187,6 @@ const KeypairAuthenticationPanel = ({
           Set the <InlineCode code="authorization" /> header.
         </Text>
         <CodeClient
-          lang="ts"
           code={`import jsonwebtoken from "jsonwebtoken";
 
 // Generate an access token.
@@ -205,6 +204,7 @@ const resp = fetch("<engine_url>/backend-wallet/get-all", {
     authorization: \`Bearer \${restrictedAccessToken}\`,
   },
 });`}
+          lang="ts"
         />
       </Flex>
     </>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/keypairs-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/keypairs-table.tsx
index 5f5d767b5b4..3c7ee527c32 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/keypairs-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/components/keypairs-table.tsx
@@ -1,5 +1,3 @@
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 import {
   type Keypair,
   useEngineRemoveKeypair,
@@ -24,6 +22,8 @@ import { Trash2Icon } from "lucide-react";
 import { useState } from "react";
 import { Button, FormLabel, Text } from "tw-components";
 import { toDateTimeLocal } from "utils/date-utils";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
+import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 
 interface KeypairsTableProps {
   instanceUrl: string;
@@ -37,42 +37,42 @@ const columnHelper = createColumnHelper<Keypair>();
 
 const columns = [
   columnHelper.accessor("label", {
-    header: "Label",
     cell: (cell) => {
       return <Text>{cell.getValue()}</Text>;
     },
+    header: "Label",
   }),
   columnHelper.accessor("hash", {
-    header: "Key ID",
     cell: (cell) => {
       return (
         <CopyAddressButton address={cell.getValue()} copyIconPosition="right" />
       );
     },
+    header: "Key ID",
   }),
   columnHelper.accessor("publicKey", {
-    header: "Public Key",
     cell: (cell) => {
       return (
         <PlainTextCodeBlock
-          code={cell.getValue()}
           className="max-w-[350px]"
+          code={cell.getValue()}
           codeClassName="text-xs"
         />
       );
     },
+    header: "Public Key",
   }),
   columnHelper.accessor("algorithm", {
-    header: "Type",
     cell: (cell) => {
       return <Text>{cell.getValue()}</Text>;
     },
+    header: "Type",
   }),
   columnHelper.accessor("createdAt", {
-    header: "Added At",
     cell: (cell) => {
       return <Text>{toDateTimeLocal(cell.getValue())}</Text>;
     },
+    header: "Added At",
   }),
 ];
 
@@ -89,30 +89,30 @@ export const KeypairsTable: React.FC<KeypairsTableProps> = ({
   return (
     <>
       <TWTable
-        title="public keys"
-        data={keypairs}
         columns={columns}
-        isPending={isPending}
+        data={keypairs}
         isFetched={isFetched}
+        isPending={isPending}
         onMenuClick={[
           {
             icon: <Trash2Icon className="size-4" />,
-            text: "Remove",
+            isDestructive: true,
             onClick: (keypair) => {
               setSelectedKeypair(keypair);
               removeDisclosure.onOpen();
             },
-            isDestructive: true,
+            text: "Remove",
           },
         ]}
+        title="public keys"
       />
 
       {selectedKeypair && removeDisclosure.isOpen && (
         <RemoveModal
-          keypair={selectedKeypair}
+          authToken={authToken}
           disclosure={removeDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
+          keypair={selectedKeypair}
         />
       )}
     </>
@@ -131,8 +131,8 @@ const RemoveModal = ({
   authToken: string;
 }) => {
   const { mutate: revokeKeypair } = useEngineRemoveKeypair({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -144,20 +144,20 @@ const RemoveModal = ({
     revokeKeypair(
       { hash: keypair.hash },
       {
-        onSuccess: () => {
-          onSuccess();
-          disclosure.onClose();
-        },
         onError: (error) => {
           onError(error);
           console.error(error);
         },
+        onSuccess: () => {
+          onSuccess();
+          disclosure.onClose();
+        },
       },
     );
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Remove Keypair</ModalHeader>
@@ -192,10 +192,10 @@ const RemoveModal = ({
         </ModalBody>
 
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
-          <Button type="submit" colorScheme="red" onClick={onClick}>
+          <Button colorScheme="red" onClick={onClick} type="submit">
             Remove
           </Button>
         </ModalFooter>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/page.tsx
index 42c121ce9cf..9cd164a88e0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/access-tokens/page.tsx
@@ -6,15 +6,15 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken, client } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
     <EngineAccessTokens
-      instanceUrl={instance.url}
       authToken={authToken}
       client={client}
+      instanceUrl={instance.url}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/add-admin-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/add-admin-button.tsx
index b576bea91a4..789d3d9812d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/add-admin-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/add-admin-button.tsx
@@ -32,8 +32,8 @@ export const AddAdminButton: React.FC<AddAdminButtonProps> = ({
 }) => {
   const { isOpen, onOpen, onClose } = useDisclosure();
   const { mutate: grantPermissions } = useEngineGrantPermissions({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const form = useForm<EngineAdmin>({
@@ -50,33 +50,33 @@ export const AddAdminButton: React.FC<AddAdminButtonProps> = ({
   return (
     <>
       <Button
+        colorScheme="primary"
+        leftIcon={<CirclePlusIcon className="size-6" />}
         onClick={onOpen}
-        variant="ghost"
         size="sm"
-        leftIcon={<CirclePlusIcon className="size-6" />}
-        colorScheme="primary"
+        variant="ghost"
         w="fit-content"
       >
         Add Admin
       </Button>
-      <Modal isOpen={isOpen} onClose={onClose} isCentered>
+      <Modal isCentered isOpen={isOpen} onClose={onClose}>
         <ModalOverlay />
         <ModalContent
-          className="!bg-background rounded-lg border border-border"
           as="form"
+          className="!bg-background rounded-lg border border-border"
           onSubmit={form.handleSubmit((data) => {
             if (!isAddress(data.walletAddress)) {
               onError(new Error("Invalid wallet address"));
             }
             grantPermissions(data, {
-              onSuccess: () => {
-                onSuccess();
-                onClose();
-              },
               onError: (error) => {
                 onError(error);
                 console.error(error);
               },
+              onSuccess: () => {
+                onSuccess();
+                onClose();
+              },
             });
           })}
         >
@@ -87,16 +87,16 @@ export const AddAdminButton: React.FC<AddAdminButtonProps> = ({
               <FormControl isRequired>
                 <FormLabel>Wallet Address</FormLabel>
                 <Input
-                  type="text"
                   placeholder="The wallet address for this admin"
+                  type="text"
                   {...form.register("walletAddress", { required: true })}
                 />
               </FormControl>
               <FormControl>
                 <FormLabel>Label</FormLabel>
                 <Input
-                  type="text"
                   placeholder="Enter a description for this admin"
+                  type="text"
                   {...form.register("label")}
                 />
               </FormControl>
@@ -104,10 +104,10 @@ export const AddAdminButton: React.FC<AddAdminButtonProps> = ({
           </ModalBody>
 
           <ModalFooter as={Flex} gap={3}>
-            <Button type="button" onClick={onClose} variant="ghost">
+            <Button onClick={onClose} type="button" variant="ghost">
               Cancel
             </Button>
-            <Button type="submit" colorScheme="primary">
+            <Button colorScheme="primary" type="submit">
               Add
             </Button>
           </ModalFooter>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/admins-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/admins-table.tsx
index ec651d7c350..df1129272d5 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/admins-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/admins-table.tsx
@@ -1,5 +1,3 @@
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { Badge } from "@/components/ui/badge";
 import {
   type EngineAdmin,
   useEngineGrantPermissions,
@@ -26,6 +24,8 @@ import { PencilIcon, Trash2Icon } from "lucide-react";
 import { useMemo, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { Button, FormLabel, Text } from "tw-components";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Badge } from "@/components/ui/badge";
 
 interface AdminsTableProps {
   instanceUrl: string;
@@ -53,14 +53,13 @@ export const AdminsTable: React.FC<AdminsTableProps> = ({
   const columns = useMemo(() => {
     return [
       columnHelper.accessor("walletAddress", {
-        header: "Address",
         cell: (cell) => {
           const address = cell.getValue();
           return <WalletAddress address={address} client={client} />;
         },
+        header: "Address",
       }),
       columnHelper.accessor("label", {
-        header: "Label",
         cell: (cell) => {
           return (
             <Text isTruncated maxW={300}>
@@ -68,12 +67,13 @@ export const AdminsTable: React.FC<AdminsTableProps> = ({
             </Text>
           );
         },
+        header: "Label",
       }),
       columnHelper.accessor("permissions", {
-        header: "Role",
         cell: (cell) => {
           return <Badge variant="default">{cell.getValue()}</Badge>;
         },
+        header: "Role",
       }),
     ];
   }, [client]);
@@ -81,46 +81,46 @@ export const AdminsTable: React.FC<AdminsTableProps> = ({
   return (
     <>
       <TWTable
-        title="admins"
-        data={admins}
         columns={columns}
-        isPending={isPending}
+        data={admins}
         isFetched={isFetched}
+        isPending={isPending}
         onMenuClick={[
           {
             icon: <PencilIcon className="size-4" />,
-            text: "Edit",
             onClick: (admin) => {
               setSelectedAdmin(admin);
               editDisclosure.onOpen();
             },
+            text: "Edit",
           },
           {
             icon: <Trash2Icon className="size-4" />,
-            text: "Remove",
+            isDestructive: true,
             onClick: (admin) => {
               setSelectedAdmin(admin);
               removeDisclosure.onOpen();
             },
-            isDestructive: true,
+            text: "Remove",
           },
         ]}
+        title="admins"
       />
 
       {selectedAdmin && editDisclosure.isOpen && (
         <EditModal
           admin={selectedAdmin}
+          authToken={authToken}
           disclosure={editDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
         />
       )}
       {selectedAdmin && removeDisclosure.isOpen && (
         <RemoveModal
           admin={selectedAdmin}
+          authToken={authToken}
           disclosure={removeDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
         />
       )}
     </>
@@ -139,8 +139,8 @@ const EditModal = ({
   authToken: string;
 }) => {
   const { mutate: updatePermissions } = useEngineGrantPermissions({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -153,25 +153,25 @@ const EditModal = ({
   const onClick = () => {
     updatePermissions(
       {
-        walletAddress: admin.walletAddress,
-        permissions: admin.permissions,
         label,
+        permissions: admin.permissions,
+        walletAddress: admin.walletAddress,
       },
       {
-        onSuccess: () => {
-          onSuccess();
-          disclosure.onClose();
-        },
         onError: (error) => {
           onError(error);
           console.error(error);
         },
+        onSuccess: () => {
+          onSuccess();
+          disclosure.onClose();
+        },
       },
     );
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Update Admin</ModalHeader>
@@ -185,20 +185,20 @@ const EditModal = ({
             <FormControl>
               <FormLabel>Label</FormLabel>
               <Input
-                type="text"
-                value={label}
                 onChange={(e) => setLabel(e.target.value)}
                 placeholder="Enter a description for this admin"
+                type="text"
+                value={label}
               />
             </FormControl>
           </div>
         </ModalBody>
 
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
-          <Button type="submit" colorScheme="blue" onClick={onClick}>
+          <Button colorScheme="blue" onClick={onClick} type="submit">
             Save
           </Button>
         </ModalFooter>
@@ -219,8 +219,8 @@ const RemoveModal = ({
   authToken: string;
 }) => {
   const { mutate: revokePermissions } = useEngineRevokePermissions({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -234,20 +234,20 @@ const RemoveModal = ({
         walletAddress: admin.walletAddress,
       },
       {
-        onSuccess: () => {
-          onSuccess();
-          disclosure.onClose();
-        },
         onError: (error) => {
           onError(error);
           console.error(error);
         },
+        onSuccess: () => {
+          onSuccess();
+          disclosure.onClose();
+        },
       },
     );
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Remove Admin</ModalHeader>
@@ -267,10 +267,10 @@ const RemoveModal = ({
         </ModalBody>
 
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
-          <Button type="submit" colorScheme="red" onClick={onClick}>
+          <Button colorScheme="red" onClick={onClick} type="submit">
             Remove
           </Button>
         </ModalFooter>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/engine-admins.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/engine-admins.tsx
index bff359ee260..2a5efae9440 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/engine-admins.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/components/engine-admins.tsx
@@ -18,8 +18,8 @@ export const EngineAdmins: React.FC<EngineAdminsProps> = ({
   client,
 }) => {
   const admins = useEnginePermissions({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   return (
@@ -29,8 +29,8 @@ export const EngineAdmins: React.FC<EngineAdminsProps> = ({
         <Text>
           Admins are allowed to manage your Engine instance from the dashboard.{" "}
           <Link
-            href="https://portal.thirdweb.com/engine/features/admins"
             color="primary.500"
+            href="https://portal.thirdweb.com/engine/features/admins"
             isExternal
           >
             Learn more about admins
@@ -39,14 +39,14 @@ export const EngineAdmins: React.FC<EngineAdminsProps> = ({
         </Text>
       </div>
       <AdminsTable
-        instanceUrl={instanceUrl}
         admins={admins.data || []}
-        isPending={admins.isPending}
-        isFetched={admins.isFetched}
         authToken={authToken}
         client={client}
+        instanceUrl={instanceUrl}
+        isFetched={admins.isFetched}
+        isPending={admins.isPending}
       />
-      <AddAdminButton instanceUrl={instanceUrl} authToken={authToken} />
+      <AddAdminButton authToken={authToken} instanceUrl={instanceUrl} />
     </div>
   );
 };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/page.tsx
index 6ae7cc1b30a..168ed80cc5d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/admins/page.tsx
@@ -6,15 +6,15 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken, client } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
     <EngineAdmins
-      instanceUrl={instance.url}
       authToken={authToken}
       client={client}
+      instanceUrl={instance.url}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineAlertDialogForm.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineAlertDialogForm.tsx
index f42acc39b62..394ff8a6e36 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineAlertDialogForm.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineAlertDialogForm.tsx
@@ -1,6 +1,12 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  type EngineAlertRule,
+  EngineNotificationChannelTypeConfig,
+} from "@3rdweb-sdk/react/hooks/useEngine";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -19,6 +25,7 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Select,
   SelectContent,
@@ -27,13 +34,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import {
-  type EngineAlertRule,
-  EngineNotificationChannelTypeConfig,
-} from "@3rdweb-sdk/react/hooks/useEngine";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
 
 const alertFormSchema = z.object({
   subscriptionRoutes: z.array(z.string()),
@@ -60,11 +60,11 @@ export function EngineAlertDialogForm(props: {
   };
 }) {
   const form = useForm<z.infer<typeof alertFormSchema>>({
-    resolver: zodResolver(alertFormSchema),
     defaultValues: {
       subscriptionRoutes: ["alert.*"],
       type: "slack",
     },
+    resolver: zodResolver(alertFormSchema),
     values: props.values ?? undefined,
   });
 
@@ -74,12 +74,12 @@ export function EngineAlertDialogForm(props: {
 
   const alertRuleOptions: EngineAlertRule[] = [
     {
+      createdAt: new Date(),
+      description: "Get notified of all alerts.",
       id: "_all_alerts",
+      pausedAt: null,
       routingKey: "alert.*",
       title: "All alerts",
-      description: "Get notified of all alerts.",
-      createdAt: new Date(),
-      pausedAt: null,
     },
     ...props.alertRules,
   ];
@@ -90,7 +90,7 @@ export function EngineAlertDialogForm(props: {
   );
 
   return (
-    <Dialog open={props.open} onOpenChange={props.onOpenChange}>
+    <Dialog onOpenChange={props.onOpenChange} open={props.open}>
       <DialogContent className="p-0">
         <Form {...form}>
           <form onSubmit={form.handleSubmit(onSubmit)}>
@@ -207,17 +207,17 @@ export function EngineAlertDialogForm(props: {
 
             <DialogFooter className="mt-4 gap-4 border-border border-t bg-card p-6 lg:gap-2 ">
               <Button
-                variant="outline"
                 onClick={() => {
                   props.onOpenChange(false);
                 }}
+                variant="outline"
               >
                 Cancel
               </Button>
               <Button
-                type="submit"
                 className="min-w-28 gap-2"
                 disabled={props.submitButton.isLoading}
+                type="submit"
               >
                 {props.submitButton.isLoading && <Spinner className="size-4" />}
                 {props.submitButton.label}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineAlertsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineAlertsPage.tsx
index b3f15d3f669..557828c596b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineAlertsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineAlertsPage.tsx
@@ -21,15 +21,15 @@ export function EngineAlertsPage(props: {
     <div>
       <ManageEngineAlertsSection
         alertRules={alertRules}
-        engineId={props.instance.id}
         alertRulesIsLoading={alertRulesQuery.isLoading}
+        engineId={props.instance.id}
         teamIdOrSlug={props.teamIdOrSlug}
       />
       <div className="h-8" />
       <RecentEngineAlertsSection
         alertRules={alertRules}
-        engineId={props.instance.id}
         alertRulesIsLoading={alertRulesQuery.isLoading}
+        engineId={props.instance.id}
         teamIdOrSlug={props.teamIdOrSlug}
       />
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineDeleteAlertModal.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineDeleteAlertModal.tsx
index 3d44b4baa37..de015710867 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineDeleteAlertModal.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/EngineDeleteAlertModal.tsx
@@ -1,4 +1,4 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { DialogDescription } from "@radix-ui/react-dialog";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -7,7 +7,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
-import { DialogDescription } from "@radix-ui/react-dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 
 export function EngineDeleteAlertModal(props: {
   onConfirm: () => void;
@@ -16,7 +16,7 @@ export function EngineDeleteAlertModal(props: {
   onOpenChange: (open: boolean) => void;
 }) {
   return (
-    <Dialog open={props.open} onOpenChange={props.onOpenChange}>
+    <Dialog onOpenChange={props.onOpenChange} open={props.open}>
       <DialogContent className="p-0">
         <DialogHeader className="mb-4 p-6">
           <DialogTitle className="font-semibold text-2xl tracking-tight">
@@ -30,17 +30,17 @@ export function EngineDeleteAlertModal(props: {
 
         <DialogFooter className="gap-4 border-border border-t bg-card p-6 lg:gap-2">
           <Button
-            variant="outline"
             onClick={() => {
               props.onOpenChange(false);
             }}
+            variant="outline"
           >
             Cancel
           </Button>
           <Button
             className="min-w-28 gap-2"
-            variant="destructive"
             onClick={props.onConfirm}
+            variant="destructive"
           >
             {props.isPending && <Spinner className="size-4" />}
             Delete Webhook
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/ManageEngineAlerts.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/ManageEngineAlerts.stories.tsx
index 6e316a57f29..057e9db5142 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/ManageEngineAlerts.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/ManageEngineAlerts.stories.tsx
@@ -12,13 +12,13 @@ import { BadgeContainer } from "stories/utils";
 import { ManageEngineAlertsSectionUI } from "./ManageEngineAlerts";
 
 const meta = {
-  title: "Engine/Alerts/ManageAlerts",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Engine/Alerts/ManageAlerts",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -40,8 +40,8 @@ function Story() {
         id: "new-channel",
         pausedAt: null,
         subscriptionRoutes: values.subscriptionRoutes,
-        value: values.value,
         type: values.type,
+        value: values.value,
       };
 
       console.log("created channel:", channelStub);
@@ -58,21 +58,21 @@ function Story() {
     <div className="container flex max-w-6xl flex-col gap-14 py-6">
       <BadgeContainer label="2 Alerts">
         <ManageEngineAlertsSectionUI
-          isLoading={false}
-          onAlertsUpdated={() => {}}
-          engineId="test-engine-id"
-          createAlertMutation={createEngineAlertMutation}
-          deleteAlert={deleteAlert}
           alertRules={[
             createEngineAlertRuleStub("foo"),
             createEngineAlertRuleStub("bar"),
           ]}
+          createAlertMutation={createEngineAlertMutation}
+          deleteAlert={deleteAlert}
+          engineId="test-engine-id"
+          isLoading={false}
           notificationChannels={[
             createEngineNotificationChannelStub("foo"),
             createEngineNotificationChannelStub("foo", {
               pausedAt: null,
             }),
           ]}
+          onAlertsUpdated={() => {}}
         />
       </BadgeContainer>
 
@@ -82,12 +82,12 @@ function Story() {
             createEngineAlertRuleStub("foo"),
             createEngineAlertRuleStub("bar"),
           ]}
+          createAlertMutation={createEngineAlertMutation}
+          deleteAlert={deleteAlert}
           engineId="test-engine-id"
-          notificationChannels={[]}
           isLoading={false}
+          notificationChannels={[]}
           onAlertsUpdated={() => {}}
-          createAlertMutation={createEngineAlertMutation}
-          deleteAlert={deleteAlert}
         />
       </BadgeContainer>
 
@@ -97,24 +97,24 @@ function Story() {
             createEngineAlertRuleStub("foo"),
             createEngineAlertRuleStub("bar"),
           ]}
+          createAlertMutation={createEngineAlertMutation}
+          deleteAlert={deleteAlert}
           engineId="test-engine-id"
-          notificationChannels={[]}
           isLoading={true}
+          notificationChannels={[]}
           onAlertsUpdated={() => {}}
-          createAlertMutation={createEngineAlertMutation}
-          deleteAlert={deleteAlert}
         />
       </BadgeContainer>
 
       <BadgeContainer label="No Alert Rules">
         <ManageEngineAlertsSectionUI
           alertRules={[]}
+          createAlertMutation={createEngineAlertMutation}
+          deleteAlert={deleteAlert}
           engineId="test-engine-id"
-          notificationChannels={[]}
           isLoading={false}
+          notificationChannels={[]}
           onAlertsUpdated={() => {}}
-          createAlertMutation={createEngineAlertMutation}
-          deleteAlert={deleteAlert}
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/ManageEngineAlerts.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/ManageEngineAlerts.tsx
index cb79333a27a..a8eeda9fe0a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/ManageEngineAlerts.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/ManageEngineAlerts.tsx
@@ -1,14 +1,27 @@
 "use client";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  type CreateNotificationChannelInput,
+  type EngineAlertRule,
+  type EngineNotificationChannel,
+  useEngineCreateNotificationChannel,
+  useEngineDeleteNotificationChannel,
+  useEngineNotificationChannels,
+} from "@3rdweb-sdk/react/hooks/useEngine";
+import { type UseMutationResult, useMutation } from "@tanstack/react-query";
+import { format } from "date-fns";
+import { EllipsisVerticalIcon, PlusIcon } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Table,
   TableBody,
@@ -19,19 +32,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import {
-  type CreateNotificationChannelInput,
-  type EngineAlertRule,
-  type EngineNotificationChannel,
-  useEngineCreateNotificationChannel,
-  useEngineDeleteNotificationChannel,
-  useEngineNotificationChannels,
-} from "@3rdweb-sdk/react/hooks/useEngine";
-import { type UseMutationResult, useMutation } from "@tanstack/react-query";
-import { format } from "date-fns";
-import { EllipsisVerticalIcon, PlusIcon } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
 import { EngineAlertDialogForm } from "./EngineAlertDialogForm";
 import { EngineDeleteAlertModal } from "./EngineDeleteAlertModal";
 
@@ -70,16 +70,16 @@ export function ManageEngineAlertsSection(props: {
   return (
     <ManageEngineAlertsSectionUI
       alertRules={props.alertRules}
+      createAlertMutation={createAlertMutation}
+      deleteAlert={deleteAlert}
       engineId={props.engineId}
-      notificationChannels={notificationChannelsQuery.data ?? []}
       isLoading={
         notificationChannelsQuery.isLoading || props.alertRulesIsLoading
       }
+      notificationChannels={notificationChannelsQuery.data ?? []}
       onAlertsUpdated={() => {
         notificationChannelsQuery.refetch();
       }}
-      createAlertMutation={createAlertMutation}
-      deleteAlert={deleteAlert}
     />
   );
 }
@@ -115,10 +115,10 @@ export function ManageEngineAlertsSectionUI(props: {
         </div>
 
         <CreateAlertButton
-          engineId={engineId}
           alertRules={props.alertRules}
-          onSuccess={onAlertsUpdated}
           createAlertMutation={createAlertMutation}
+          engineId={engineId}
+          onSuccess={onAlertsUpdated}
         />
       </div>
 
@@ -130,11 +130,11 @@ export function ManageEngineAlertsSectionUI(props: {
         </div>
       ) : (
         <EngineAlertsTableUI
-          engineId={engineId}
           alertRules={props.alertRules}
+          deleteAlert={deleteAlert}
+          engineId={engineId}
           notificationChannels={notificationChannels}
           onAlertsUpdated={props.onAlertsUpdated}
-          deleteAlert={deleteAlert}
         />
       )}
     </section>
@@ -168,8 +168,8 @@ function EngineAlertsTableUI(props: {
               <TableRow key={notificationChannel.id}>
                 <TableCell>
                   <Badge
-                    variant={isPaused ? "warning" : "default"}
                     className="text-sm"
+                    variant={isPaused ? "warning" : "default"}
                   >
                     {isPaused ? "Paused" : "Active"}
                   </Badge>
@@ -185,18 +185,18 @@ function EngineAlertsTableUI(props: {
                 </TableCell>
 
                 <TableCell>
-                  <Badge variant="outline" className="text-sm capitalize">
+                  <Badge className="text-sm capitalize" variant="outline">
                     {notificationChannel.type}
                   </Badge>
 
                   <CopyTextButton
+                    className="-translate-x-2 max-w-[250px] text-muted-foreground"
+                    copyIconPosition="left"
+                    iconClassName="size-3"
                     textToCopy={notificationChannel.value}
                     textToShow={truncateValue(notificationChannel.value)}
-                    copyIconPosition="left"
                     tooltip="Copy"
                     variant="ghost"
-                    iconClassName="size-3"
-                    className="-translate-x-2 max-w-[250px] text-muted-foreground"
                   />
                 </TableCell>
 
@@ -210,10 +210,10 @@ function EngineAlertsTableUI(props: {
                 <TableCell className="text-muted-foreground">
                   <AlertOptionsButton
                     alertRules={props.alertRules}
+                    deleteAlert={props.deleteAlert}
                     engineId={props.engineId}
                     notificationChannel={notificationChannel}
                     onDeleteSuccess={props.onAlertsUpdated}
-                    deleteAlert={props.deleteAlert}
                   />
                 </TableCell>
               </TableRow>
@@ -244,11 +244,11 @@ function CreateAlertButton(props: {
         }
       >
         <Button
+          className="gap-2"
+          disabled={props.alertRules.length === 0}
           onClick={() => {
             setIsModalOpen(true);
           }}
-          className="gap-2"
-          disabled={props.alertRules.length === 0}
         >
           <PlusIcon className="size-4" />
           Add Alert
@@ -257,18 +257,17 @@ function CreateAlertButton(props: {
 
       <EngineAlertDialogForm
         alertRules={props.alertRules}
-        open={isModalOpen}
         onOpenChange={setIsModalOpen}
-        title="Add Alert"
+        open={isModalOpen}
         submitButton={{
-          label: "Add Alert",
           isLoading: createAlertMutation.isPending,
+          label: "Add Alert",
           onSubmit: (values) => {
             const addPromise = createAlertMutation.mutateAsync(values);
 
             toast.promise(addPromise, {
-              success: "Alert added successfully",
               error: "Failed to add alert",
+              success: "Alert added successfully",
             });
 
             addPromise.then(() => {
@@ -277,6 +276,7 @@ function CreateAlertButton(props: {
             });
           },
         }}
+        title="Add Alert"
         values={null}
       />
     </>
@@ -323,16 +323,16 @@ function AlertOptionsButton(props: {
           );
 
           toast.promise(deletePromise, {
-            success: "Alert Deleted Successfully",
             error: "Failed To Delete Alert",
+            success: "Alert Deleted Successfully",
           });
           deletePromise.then(() => {
             setIsDeleteModalOpen(false);
             props.onDeleteSuccess();
           });
         }}
-        open={isDeleteModalOpen}
         onOpenChange={setIsDeleteModalOpen}
+        open={isDeleteModalOpen}
       />
     </>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/RecentEngineAlerts.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/RecentEngineAlerts.stories.tsx
index 6e7f45ddfd3..c8fb497d577 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/RecentEngineAlerts.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/RecentEngineAlerts.stories.tsx
@@ -7,13 +7,13 @@ import { BadgeContainer } from "stories/utils";
 import { RecentEngineAlertsSectionUI } from "./RecentEngineAlerts";
 
 const meta = {
-  title: "Engine/Alerts/Recent Alerts",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Engine/Alerts/Recent Alerts",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -28,8 +28,6 @@ function Story() {
     <div className="container flex max-w-6xl flex-col gap-14 py-10">
       <BadgeContainer label="3 Alerts">
         <RecentEngineAlertsSectionUI
-          isLoading={false}
-          onAlertsUpdated={() => {}}
           alertRules={[createEngineAlertRuleStub("foo")]}
           alerts={[
             createEngineAlertStub("foo"),
@@ -40,23 +38,25 @@ function Story() {
               status: "resolved",
             }),
           ]}
+          isLoading={false}
+          onAlertsUpdated={() => {}}
         />
       </BadgeContainer>
 
       <BadgeContainer label="No Alerts">
         <RecentEngineAlertsSectionUI
-          isLoading={false}
           alertRules={[]}
           alerts={[]}
+          isLoading={false}
           onAlertsUpdated={() => {}}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Loading">
         <RecentEngineAlertsSectionUI
-          isLoading={true}
           alertRules={[]}
           alerts={[]}
+          isLoading={true}
           onAlertsUpdated={() => {}}
         />
       </BadgeContainer>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/RecentEngineAlerts.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/RecentEngineAlerts.tsx
index 30a9d0495c1..0ad9210d92b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/RecentEngineAlerts.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/components/RecentEngineAlerts.tsx
@@ -1,7 +1,14 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  type EngineAlert,
+  type EngineAlertRule,
+  useEngineAlerts,
+} from "@3rdweb-sdk/react/hooks/useEngine";
+import { formatDistance } from "date-fns";
+import { useMemo } from "react";
 import { Badge, type BadgeProps } from "@/components/ui/badge";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Table,
   TableBody,
@@ -11,13 +18,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import {
-  type EngineAlert,
-  type EngineAlertRule,
-  useEngineAlerts,
-} from "@3rdweb-sdk/react/hooks/useEngine";
-import { formatDistance } from "date-fns";
-import { useMemo } from "react";
 
 export function RecentEngineAlertsSection(props: {
   alertRules: EngineAlertRule[];
@@ -122,7 +122,7 @@ function RecentEngineAlertsTableUI(props: {
                 <TableCell>{alertRulesMap[alert.alertRuleId]?.title}</TableCell>
 
                 <TableCell>
-                  <Badge variant={variant} className="text-sm">
+                  <Badge className="text-sm" variant={variant}>
                     {status}
                   </Badge>
                 </TableCell>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/page.tsx
index f5465a0614e..63312b68d1a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/alerts/page.tsx
@@ -6,8 +6,8 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/circle-config.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/circle-config.tsx
index 8e86dc974ec..fee6876b533 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/circle-config.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/circle-config.tsx
@@ -1,16 +1,17 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { Form } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
 import {
   type EngineInstance,
   type SetWalletConfigInput,
   useEngineSetWalletConfig,
 } from "@3rdweb-sdk/react/hooks/useEngine";
 import Link from "next/link";
+import { useId } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Button } from "@/components/ui/button";
+import { Form } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 
 interface CircleConfigProps {
   instance: EngineInstance;
@@ -22,38 +23,40 @@ export const CircleConfig: React.FC<CircleConfigProps> = ({
   authToken,
 }) => {
   const { mutate: setCircleConfig, isPending } = useEngineSetWalletConfig({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
   });
 
   const defaultValues: SetWalletConfigInput = {
-    type: "circle" as const,
     circleApiKey: "",
+    type: "circle" as const,
   };
 
   const form = useForm<SetWalletConfigInput>({
     defaultValues,
-    values: defaultValues,
     resetOptions: {
       keepDirty: true,
       keepDirtyValues: true,
     },
+    values: defaultValues,
   });
 
   const onSubmit = (data: SetWalletConfigInput) => {
     setCircleConfig(data, {
-      onSuccess: () => {
-        toast.success("Configuration set successfully");
-      },
       onError: (error) => {
         toast.error("Failed to set configuration", {
           description: error.message,
         });
         console.error(error);
       },
+      onSuccess: () => {
+        toast.success("Configuration set successfully");
+      },
     });
   };
 
+  const circleApiKeyId = useId();
+
   return (
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-2">
@@ -63,10 +66,10 @@ export const CircleConfig: React.FC<CircleConfigProps> = ({
           account. Configure your Circle API Key to use Circle wallets. Learn
           more about{" "}
           <Link
+            className="text-link-foreground hover:text-foreground"
             href="https://portal.thirdweb.com/engine/features/backend-wallets#circle-wallet"
-            target="_blank"
             rel="noopener noreferrer"
-            className="text-link-foreground hover:text-foreground"
+            target="_blank"
           >
             how to get an API Key
           </Link>
@@ -80,18 +83,18 @@ export const CircleConfig: React.FC<CircleConfigProps> = ({
           onSubmit={form.handleSubmit(onSubmit)}
         >
           <FormFieldSetup
-            label="Circle API Key"
             errorMessage={
               form.getFieldState("circleApiKey", form.formState).error?.message
             }
-            htmlFor="circle-api-key"
+            htmlFor={circleApiKeyId}
             isRequired
+            label="Circle API Key"
             tooltip={null}
           >
             <Input
-              id="circle-api-key"
-              placeholder="TEST_API_KEY:..."
               autoComplete="off"
+              id={circleApiKeyId}
+              placeholder="TEST_API_KEY:..."
               type="password"
               {...form.register("circleApiKey")}
             />
@@ -99,9 +102,9 @@ export const CircleConfig: React.FC<CircleConfigProps> = ({
 
           <div className="flex items-center justify-end gap-4">
             <Button
-              type="submit"
               className="min-w-28 gap-2"
               disabled={isPending}
+              type="submit"
             >
               {isPending && <Spinner className="size-4" />}
               Save
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/cors.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/cors.tsx
index 8aa3e324240..580c8f15f64 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/cors.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/cors.tsx
@@ -1,4 +1,3 @@
-import { InlineCode } from "@/components/ui/inline-code";
 import {
   useEngineCorsConfiguration,
   useEngineSetCorsConfiguration,
@@ -7,6 +6,7 @@ import { Flex, Textarea } from "@chakra-ui/react";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { useForm } from "react-hook-form";
 import { Button, Heading, Text } from "tw-components";
+import { InlineCode } from "@/components/ui/inline-code";
 
 interface EngineCorsConfigProps {
   instanceUrl: string;
@@ -22,12 +22,12 @@ export const EngineCorsConfig: React.FC<EngineCorsConfigProps> = ({
   authToken,
 }) => {
   const { data: existingUrls } = useEngineCorsConfiguration({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
   const { mutateAsync: setCorsConfig } = useEngineSetCorsConfiguration({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -77,13 +77,13 @@ export const EngineCorsConfig: React.FC<EngineCorsConfigProps> = ({
         {...form.register("raw")}
       />
 
-      <Flex justifyContent="end" gap={4} alignItems="center">
+      <Flex alignItems="center" gap={4} justifyContent="end">
         <Button
-          isDisabled={!form.formState.isDirty}
           colorScheme="primary"
-          w={{ base: "full", md: "inherit" }}
+          isDisabled={!form.formState.isDirty}
           px={12}
           type="submit"
+          w={{ base: "full", md: "inherit" }}
         >
           {form.formState.isSubmitting ? "Saving..." : "Save"}
         </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/engine-configuration.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/engine-configuration.tsx
index 66c846fbc2e..0a1e5d385bb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/engine-configuration.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/engine-configuration.tsx
@@ -22,20 +22,20 @@ export const EngineConfiguration: React.FC<EngineConfigurationProps> = ({
   return (
     <div className="flex flex-col gap-12">
       <EngineWalletConfig
+        authToken={authToken}
         instance={instance}
-        teamSlug={teamSlug}
         projectSlug={projectSlug}
-        authToken={authToken}
+        teamSlug={teamSlug}
       />
-      <EngineCorsConfig instanceUrl={instance.url} authToken={authToken} />
+      <EngineCorsConfig authToken={authToken} instanceUrl={instance.url} />
       <EngineIpAllowlistConfig
-        instanceUrl={instance.url}
         authToken={authToken}
+        instanceUrl={instance.url}
       />
       <EngineSystem
         instance={instance}
-        teamIdOrSlug={teamSlug}
         projectSlug={projectSlug}
+        teamIdOrSlug={teamSlug}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/engine-wallet-config.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/engine-wallet-config.tsx
index 3ec13885927..a2a3b60750b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/engine-wallet-config.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/engine-wallet-config.tsx
@@ -1,7 +1,3 @@
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { TabButtons } from "@/components/ui/tabs";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import {
   type EngineInstance,
   useEngineWalletConfig,
@@ -15,6 +11,10 @@ import { CircleAlertIcon } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
 import { Heading } from "tw-components";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { TabButtons } from "@/components/ui/tabs";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
 import { CircleConfig } from "./circle-config";
 import { KmsAwsConfig } from "./kms-aws-config";
 import { KmsGcpConfig } from "./kms-gcp-config";
@@ -34,8 +34,8 @@ export const EngineWalletConfig: React.FC<EngineWalletConfigProps> = ({
   authToken,
 }) => {
   const { data: walletConfig } = useEngineWalletConfig({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
   });
 
   const { isSupported: isWalletCredentialsSupported } = useHasEngineFeature(
@@ -53,12 +53,12 @@ export const EngineWalletConfig: React.FC<EngineWalletConfigProps> = ({
 
   const tabContent: Partial<Record<EngineBackendWalletType, React.ReactNode>> =
     {
+      "aws-kms": <KmsAwsConfig authToken={authToken} instance={instance} />,
+      "gcp-kms": <KmsGcpConfig authToken={authToken} instance={instance} />,
       local: <LocalConfig />,
-      "aws-kms": <KmsAwsConfig instance={instance} authToken={authToken} />,
-      "gcp-kms": <KmsGcpConfig instance={instance} authToken={authToken} />,
       // circle wallets were only added with the WALLET_CREDENTIALS feature flag
       ...(isWalletCredentialsSupported && {
-        circle: <CircleConfig instance={instance} authToken={authToken} />,
+        circle: <CircleConfig authToken={authToken} instance={instance} />,
       }),
     } as const;
 
@@ -74,8 +74,8 @@ export const EngineWalletConfig: React.FC<EngineWalletConfigProps> = ({
         <p className="text-muted-foreground">
           Create backend wallets on the{" "}
           <Link
-            href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/${instance.id}`}
             className="text-link-foreground hover:text-foreground"
+            href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/${instance.id}`}
           >
             Overview
           </Link>{" "}
@@ -84,11 +84,8 @@ export const EngineWalletConfig: React.FC<EngineWalletConfigProps> = ({
       </div>
 
       <TabButtons
+        tabClassName="font-medium !text-sm"
         tabs={filteredWalletOptions.map(({ key, name }) => ({
-          key,
-          name,
-          isActive: activeTab === key,
-          onClick: () => setActiveTab(key),
           icon:
             (key === "aws-kms" && !isAwsKmsConfigured) ||
             (key === "gcp-kms" && !isGcpKmsConfigured)
@@ -98,12 +95,15 @@ export const EngineWalletConfig: React.FC<EngineWalletConfigProps> = ({
                   </ToolTipLabel>
                 )
               : undefined,
+          isActive: activeTab === key,
+          key,
+          name,
+          onClick: () => setActiveTab(key),
         }))}
-        tabClassName="font-medium !text-sm"
       />
 
       {!isWalletCredentialsSupported && activeTab === "circle" && (
-        <Alert variant="warning" className="mt-4">
+        <Alert className="mt-4" variant="warning">
           <CircleAlertIcon className="size-4" />
           <AlertTitle>Update Required</AlertTitle>
           <AlertDescription>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/ip-allowlist.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/ip-allowlist.tsx
index 33b6086ea54..c358c713341 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/ip-allowlist.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/ip-allowlist.tsx
@@ -1,4 +1,3 @@
-import { InlineCode } from "@/components/ui/inline-code";
 import {
   useEngineIpAllowlistConfiguration,
   useEngineSetIpAllowlistConfiguration,
@@ -9,6 +8,7 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { isValid } from "ipaddr.js";
 import { useForm } from "react-hook-form";
 import { Button, Heading, Text } from "tw-components";
+import { InlineCode } from "@/components/ui/inline-code";
 
 interface EngineIpAllowlistConfigProps {
   instanceUrl: string;
@@ -23,12 +23,12 @@ export const EngineIpAllowlistConfig: React.FC<
   EngineIpAllowlistConfigProps
 > = ({ instanceUrl, authToken }) => {
   const { data: existingIpAllowlist } = useEngineIpAllowlistConfiguration({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
   const { mutateAsync: setIpAllowlist } = useEngineSetIpAllowlistConfiguration({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -96,13 +96,13 @@ export const EngineIpAllowlistConfig: React.FC<
         {...form.register("raw")}
       />
 
-      <Flex justifyContent="end" gap={4} alignItems="center">
+      <Flex alignItems="center" gap={4} justifyContent="end">
         <Button
-          isDisabled={!form.formState.isDirty}
           colorScheme="primary"
-          w={{ base: "full", md: "inherit" }}
+          isDisabled={!form.formState.isDirty}
           px={12}
           type="submit"
+          w={{ base: "full", md: "inherit" }}
         >
           {form.formState.isSubmitting ? "Saving..." : "Save"}
         </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/kms-aws-config.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/kms-aws-config.tsx
index d9f27ab7757..60b2e2332f2 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/kms-aws-config.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/kms-aws-config.tsx
@@ -1,8 +1,3 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { Form, FormDescription } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
 import {
   type EngineInstance,
   type SetWalletConfigInput,
@@ -12,7 +7,13 @@ import {
 } from "@3rdweb-sdk/react/hooks/useEngine";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import Link from "next/link";
+import { useId } from "react";
 import { useForm } from "react-hook-form";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Button } from "@/components/ui/button";
+import { Form, FormDescription } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 
 interface KmsAwsConfigProps {
   instance: EngineInstance;
@@ -24,12 +25,12 @@ export const KmsAwsConfig: React.FC<KmsAwsConfigProps> = ({
   authToken,
 }) => {
   const { mutate: setAwsKmsConfig, isPending } = useEngineSetWalletConfig({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
   });
   const { data: awsConfig } = useEngineWalletConfig({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
   });
   const { isSupported: supportsMultipleWalletTypes } = useHasEngineFeature(
     instance.url,
@@ -42,32 +43,36 @@ export const KmsAwsConfig: React.FC<KmsAwsConfigProps> = ({
   );
 
   const defaultValues: SetWalletConfigInput = {
-    type: "aws-kms" as const,
     awsAccessKeyId: awsConfig?.awsAccessKeyId ?? "",
-    awsSecretAccessKey: "",
     awsRegion: awsConfig?.awsRegion ?? "",
+    awsSecretAccessKey: "",
+    type: "aws-kms" as const,
   };
 
   const form = useForm<SetWalletConfigInput>({
     defaultValues,
-    values: defaultValues,
     resetOptions: {
       keepDirty: true,
       keepDirtyValues: true,
     },
+    values: defaultValues,
   });
 
   const onSubmit = (data: SetWalletConfigInput) => {
     setAwsKmsConfig(data, {
-      onSuccess: () => {
-        onSuccess();
-      },
       onError: (error) => {
         onError(error);
       },
+      onSuccess: () => {
+        onSuccess();
+      },
     });
   };
 
+  const awsRegionId = useId();
+  const awsAccessKeyId = useId();
+  const awsSecretKeyId = useId();
+
   return (
     <Form {...form}>
       <form
@@ -82,10 +87,10 @@ export const KmsAwsConfig: React.FC<KmsAwsConfigProps> = ({
         <p className="text-muted-foreground">
           For help and more advanced use cases,{" "}
           <Link
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://portal.thirdweb.com/infrastructure/engine/features/backend-wallets"
             className="text-link-foreground hover:text-foreground"
+            href="https://portal.thirdweb.com/infrastructure/engine/features/backend-wallets"
+            rel="noopener noreferrer"
+            target="_blank"
           >
             learn more about using AWS KMS wallets
           </Link>
@@ -94,56 +99,56 @@ export const KmsAwsConfig: React.FC<KmsAwsConfigProps> = ({
 
         <div className="grid gap-4 md:grid-cols-2">
           <FormFieldSetup
-            label="Region"
             errorMessage={
               form.getFieldState("awsRegion", form.formState).error?.message
             }
             htmlFor="aws-region"
             isRequired
+            label="Region"
             tooltip={null}
           >
             <Input
-              id="aws-region"
-              placeholder="us-west-2"
               autoComplete="off"
+              id={awsRegionId}
+              placeholder="us-west-2"
               type="text"
               {...form.register("awsRegion")}
             />
           </FormFieldSetup>
 
           <FormFieldSetup
-            label="Access Key"
             errorMessage={
               form.getFieldState("awsAccessKeyId", form.formState).error
                 ?.message
             }
-            htmlFor="aws-access-key"
+            htmlFor={awsAccessKeyId}
             isRequired
+            label="Access Key"
             tooltip={null}
           >
             <Input
-              id="aws-access-key"
-              placeholder="AKIA..."
               autoComplete="off"
+              id={awsAccessKeyId}
+              placeholder="AKIA..."
               type="text"
               {...form.register("awsAccessKeyId")}
             />
           </FormFieldSetup>
 
           <FormFieldSetup
-            label="Secret Key"
             errorMessage={
               form.getFieldState("awsSecretAccessKey", form.formState).error
                 ?.message
             }
-            htmlFor="aws-secret-key"
+            htmlFor={awsSecretKeyId}
             isRequired
+            label="Secret Key"
             tooltip={null}
           >
             <Input
-              id="aws-secret-key"
-              placeholder="UW7A..."
               autoComplete="off"
+              id={awsSecretKeyId}
+              placeholder="UW7A..."
               type="text"
               {...form.register("awsSecretAccessKey")}
             />
@@ -159,7 +164,7 @@ export const KmsAwsConfig: React.FC<KmsAwsConfigProps> = ({
               This will clear other credentials.
             </p>
           )}
-          <Button type="submit" className="min-w-28 gap-2" disabled={isPending}>
+          <Button className="min-w-28 gap-2" disabled={isPending} type="submit">
             {isPending && <Spinner className="size-4" />}
             Save
           </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/kms-gcp-config.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/kms-gcp-config.tsx
index 7f045d7707a..49627895480 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/kms-gcp-config.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/components/kms-gcp-config.tsx
@@ -1,9 +1,3 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { Form, FormDescription } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { Textarea } from "@/components/ui/textarea";
 import {
   type EngineInstance,
   type SetWalletConfigInput,
@@ -13,7 +7,14 @@ import {
 } from "@3rdweb-sdk/react/hooks/useEngine";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import Link from "next/link";
+import { useId } from "react";
 import { useForm } from "react-hook-form";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Button } from "@/components/ui/button";
+import { Form, FormDescription } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Textarea } from "@/components/ui/textarea";
 
 interface KmsGcpConfigProps {
   instance: EngineInstance;
@@ -25,12 +26,12 @@ export const KmsGcpConfig: React.FC<KmsGcpConfigProps> = ({
   authToken,
 }) => {
   const { mutate: setGcpKmsConfig, isPending } = useEngineSetWalletConfig({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
   });
   const { data: gcpConfig } = useEngineWalletConfig({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
   });
   const { isSupported: supportsMultipleWalletTypes } = useHasEngineFeature(
     instance.url,
@@ -43,36 +44,42 @@ export const KmsGcpConfig: React.FC<KmsGcpConfigProps> = ({
   );
 
   const defaultValues: SetWalletConfigInput = {
-    type: "gcp-kms" as const,
-    gcpApplicationProjectId: gcpConfig?.gcpApplicationProjectId ?? "",
-    gcpKmsLocationId: gcpConfig?.gcpKmsLocationId ?? "",
-    gcpKmsKeyRingId: gcpConfig?.gcpKmsKeyRingId ?? "",
     gcpApplicationCredentialEmail:
       gcpConfig?.gcpApplicationCredentialEmail ?? "",
     gcpApplicationCredentialPrivateKey: "",
+    gcpApplicationProjectId: gcpConfig?.gcpApplicationProjectId ?? "",
+    gcpKmsKeyRingId: gcpConfig?.gcpKmsKeyRingId ?? "",
+    gcpKmsLocationId: gcpConfig?.gcpKmsLocationId ?? "",
+    type: "gcp-kms" as const,
   };
 
   const form = useForm<SetWalletConfigInput>({
     defaultValues,
-    values: defaultValues,
     resetOptions: {
       keepDirty: true,
       keepDirtyValues: true,
     },
+    values: defaultValues,
   });
 
   const onSubmit = (data: SetWalletConfigInput) => {
     setGcpKmsConfig(data, {
-      onSuccess: () => {
-        onSuccess();
-      },
       onError: (error) => {
         onError(error);
         console.error(error);
       },
+      onSuccess: () => {
+        onSuccess();
+      },
     });
   };
 
+  const gcpLocationId = useId();
+  const gcpKeyRingId = useId();
+  const gcpProjectId = useId();
+  const gcpCredentialEmailId = useId();
+  const gcpPrivateKeyId = useId();
+
   return (
     <Form {...form}>
       <form
@@ -87,10 +94,10 @@ export const KmsGcpConfig: React.FC<KmsGcpConfigProps> = ({
         <p className="text-muted-foreground">
           For help and more advanced use cases,{" "}
           <Link
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://portal.thirdweb.com/infrastructure/engine/features/backend-wallets"
             className="text-link-foreground hover:text-foreground"
+            href="https://portal.thirdweb.com/infrastructure/engine/features/backend-wallets"
+            rel="noopener noreferrer"
+            target="_blank"
           >
             learn more about using Google Cloud KMS wallets
           </Link>
@@ -99,17 +106,17 @@ export const KmsGcpConfig: React.FC<KmsGcpConfigProps> = ({
 
         <div className="grid gap-4 md:grid-cols-2">
           <FormFieldSetup
-            label="Location ID"
             errorMessage={
               form.getFieldState("gcpKmsLocationId", form.formState).error
                 ?.message
             }
-            htmlFor="gcp-location-id"
+            htmlFor={gcpLocationId}
             isRequired
+            label="Location ID"
             tooltip={null}
           >
             <Input
-              id="gcp-location-id"
+              id={gcpLocationId}
               placeholder="us-west2"
               type="text"
               {...form.register("gcpKmsLocationId")}
@@ -117,83 +124,83 @@ export const KmsGcpConfig: React.FC<KmsGcpConfigProps> = ({
           </FormFieldSetup>
 
           <FormFieldSetup
-            label="Key Ring ID"
             errorMessage={
               form.getFieldState("gcpKmsKeyRingId", form.formState).error
                 ?.message
             }
-            htmlFor="gcp-key-ring-id"
+            htmlFor={gcpKeyRingId}
             isRequired
+            label="Key Ring ID"
             tooltip={null}
           >
             <Input
-              id="gcp-key-ring-id"
-              placeholder="my-key-ring"
               autoComplete="off"
+              id={gcpKeyRingId}
+              placeholder="my-key-ring"
               type="text"
               {...form.register("gcpKmsKeyRingId")}
             />
           </FormFieldSetup>
 
           <FormFieldSetup
-            label="Project ID"
             errorMessage={
               form.getFieldState("gcpApplicationProjectId", form.formState)
                 .error?.message
             }
-            htmlFor="gcp-project-id"
+            htmlFor={gcpProjectId}
             isRequired
+            label="Project ID"
             tooltip={null}
           >
             <Input
-              id="gcp-project-id"
-              type="text"
-              placeholder="my-gcp-project-id-123"
               autoComplete="off"
+              id={gcpProjectId}
+              placeholder="my-gcp-project-id-123"
+              type="text"
               {...form.register("gcpApplicationProjectId")}
             />
           </FormFieldSetup>
 
           <FormFieldSetup
-            label="Credential Email"
             errorMessage={
               form.getFieldState(
                 "gcpApplicationCredentialEmail",
                 form.formState,
               ).error?.message
             }
-            htmlFor="gcp-credential-email"
+            htmlFor={gcpCredentialEmailId}
             isRequired
+            label="Credential Email"
             tooltip={null}
           >
             <Input
-              id="gcp-credential-email"
-              type="text"
-              placeholder="service-account@my-gcp-project.iam.gserviceaccount.com"
               autoComplete="off"
+              id={gcpCredentialEmailId}
+              placeholder="service-account@my-gcp-project.iam.gserviceaccount.com"
+              type="text"
               {...form.register("gcpApplicationCredentialEmail")}
             />
           </FormFieldSetup>
         </div>
 
         <FormFieldSetup
-          label="Private Key"
           errorMessage={
             form.getFieldState(
               "gcpApplicationCredentialPrivateKey",
               form.formState,
             ).error?.message
           }
-          htmlFor="gcp-private-key"
+          htmlFor={gcpPrivateKeyId}
           isRequired
+          label="Private Key"
           tooltip={null}
         >
           <Textarea
-            id="gcp-private-key"
+            autoComplete="off"
+            id={gcpPrivateKeyId}
             placeholder={
               "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----"
             }
-            autoComplete="off"
             {...form.register("gcpApplicationCredentialPrivateKey")}
           />
           <FormDescription className="pt-2">
@@ -207,7 +214,7 @@ export const KmsGcpConfig: React.FC<KmsGcpConfigProps> = ({
               This will clear other credentials.
             </p>
           )}
-          <Button type="submit" className="min-w-28 gap-2" disabled={isPending}>
+          <Button className="min-w-28 gap-2" disabled={isPending} type="submit">
             {isPending && <Spinner className="size-4" />}
             Save
           </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/page.tsx
index 5d36e68e08b..6ea141fcd62 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/configuration/page.tsx
@@ -6,16 +6,16 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
     <EngineConfiguration
+      authToken={authToken}
       instance={instance}
-      teamSlug={params.team_slug}
       projectSlug={params.project_slug}
-      authToken={authToken}
+      teamSlug={params.team_slug}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx
index a0e1911c365..6ffc09084cd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
 import {
   type AddContractSubscriptionInput,
   useEngineAddContractSubscription,
@@ -30,7 +28,7 @@ import { useV5DashboardChain } from "lib/v5-adapter";
 import { CirclePlusIcon } from "lucide-react";
 import { type Dispatch, type SetStateAction, useMemo, useState } from "react";
 import { type UseFormReturn, useForm } from "react-hook-form";
-import { type ThirdwebClient, getContract, isAddress } from "thirdweb";
+import { getContract, isAddress, type ThirdwebClient } from "thirdweb";
 import {
   Button,
   Card,
@@ -39,6 +37,8 @@ import {
   FormLabel,
   Text,
 } from "tw-components";
+import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
 
 interface AddContractSubscriptionButtonProps {
   instanceUrl: string;
@@ -54,11 +54,11 @@ export const AddContractSubscriptionButton: React.FC<
   return (
     <>
       <Button
+        colorScheme="primary"
+        leftIcon={<CirclePlusIcon className="size-6" />}
         onClick={disclosure.onOpen}
-        variant="ghost"
         size="sm"
-        leftIcon={<CirclePlusIcon className="size-6" />}
-        colorScheme="primary"
+        variant="ghost"
         w="fit-content"
       >
         Add Contract Subscription
@@ -66,10 +66,10 @@ export const AddContractSubscriptionButton: React.FC<
 
       {disclosure.isOpen && (
         <AddModal
-          instanceUrl={instanceUrl}
-          disclosure={disclosure}
           authToken={authToken}
           client={client}
+          disclosure={disclosure}
+          instanceUrl={instanceUrl}
         />
       )}
     </>
@@ -98,8 +98,8 @@ const AddModal = ({
   client: ThirdwebClient;
 }) => {
   const { mutate: addContractSubscription } = useEngineAddContractSubscription({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -113,10 +113,10 @@ const AddModal = ({
   const form = useForm<AddContractSubscriptionForm>({
     defaultValues: {
       chainId: 84532,
-      processEventLogs: true,
       filterEvents: [],
-      processTransactionReceipts: false,
       filterFunctions: [],
+      processEventLogs: true,
+      processTransactionReceipts: false,
     },
     mode: "onChange",
   });
@@ -125,36 +125,36 @@ const AddModal = ({
     const input: AddContractSubscriptionInput = {
       chain: data.chainId.toString(),
       contractAddress: data.contractAddress,
-      webhookUrl: data.webhookUrl.trim(),
-      processEventLogs: data.processEventLogs,
       filterEvents: data.filterEvents,
-      processTransactionReceipts: data.processTransactionReceipts,
       filterFunctions: data.filterFunctions,
+      processEventLogs: data.processEventLogs,
+      processTransactionReceipts: data.processTransactionReceipts,
+      webhookUrl: data.webhookUrl.trim(),
     };
 
     addContractSubscription(input, {
-      onSuccess: () => {
-        onSuccess();
-        disclosure.onClose();
-      },
       onError: (error) => {
         onError(error);
         console.error(error);
       },
+      onSuccess: () => {
+        onSuccess();
+        disclosure.onClose();
+      },
     });
   };
 
   return (
     <Modal
+      isCentered
       isOpen={disclosure.isOpen}
       onClose={disclosure.onClose}
-      isCentered
       size="lg"
     >
       <ModalOverlay />
       <ModalContent
-        className="!bg-background rounded-lg border border-border"
         as="form"
+        className="!bg-background rounded-lg border border-border"
         onSubmit={form.handleSubmit(onSubmit)}
       >
         <ModalHeader>Add Contract Subscription</ModalHeader>
@@ -162,15 +162,15 @@ const AddModal = ({
 
         {modalState === "inputContract" ? (
           <ModalBodyInputContract
+            client={client}
             form={form}
             setModalState={setModalState}
-            client={client}
           />
         ) : modalState === "inputData" ? (
           <ModalBodyInputData
+            client={client}
             form={form}
             setModalState={setModalState}
-            client={client}
           />
         ) : null}
       </ModalContent>
@@ -199,21 +199,21 @@ const ModalBodyInputContract = ({
             <FormLabel>Chain</FormLabel>
             <SingleNetworkSelector
               chainId={form.watch("chainId")}
-              onChange={(val) => form.setValue("chainId", val)}
               client={client}
+              onChange={(val) => form.setValue("chainId", val)}
             />
           </FormControl>
 
           <FormControl
-            isRequired
             isInvalid={
               !!form.getFieldState("contractAddress", form.formState).error
             }
+            isRequired
           >
             <FormLabel>Contract Address</FormLabel>
             <Input
-              type="text"
               placeholder="0x..."
+              type="text"
               {...form.register("contractAddress", {
                 required: true,
                 validate: (v) => {
@@ -231,13 +231,13 @@ const ModalBodyInputContract = ({
           </FormControl>
 
           <FormControl
-            isRequired
             isInvalid={!!form.getFieldState("webhookUrl", form.formState).error}
+            isRequired
           >
             <FormLabel>Webhook URL</FormLabel>
             <Input
-              type="url"
               placeholder="https://"
+              type="url"
               {...form.register("webhookUrl", {
                 required: true,
                 validate: (v) => {
@@ -263,9 +263,9 @@ const ModalBodyInputContract = ({
 
       <ModalFooter>
         <Button
-          onClick={() => setModalState("inputData")}
           colorScheme="primary"
           isDisabled={!form.formState.isValid}
+          onClick={() => setModalState("inputData")}
         >
           Next
         </Button>
@@ -368,12 +368,12 @@ const ModalBodyInputData = ({
                       <Collapse in={shouldFilterEvents}>
                         <FilterSelector
                           abiItemType="event"
-                          form={form}
+                          client={client}
                           filter={filterEvents}
+                          form={form}
                           setFilter={(value) =>
                             form.setValue("filterEvents", value)
                           }
-                          client={client}
                         />
                       </Collapse>
                     </div>
@@ -425,12 +425,12 @@ const ModalBodyInputData = ({
                       <Collapse in={shouldFilterFunctions}>
                         <FilterSelector
                           abiItemType="function"
-                          form={form}
+                          client={client}
                           filter={filterFunctions}
+                          form={form}
                           setFilter={(value) =>
                             form.setValue("filterFunctions", value)
                           }
-                          client={client}
                         />
                       </Collapse>
                     </div>
@@ -444,16 +444,16 @@ const ModalBodyInputData = ({
 
       <ModalFooter as={Flex} gap={3}>
         <Button
-          type="button"
           onClick={() => setModalState("inputContract")}
+          type="button"
           variant="ghost"
         >
           Back
         </Button>
         <Button
-          type="submit"
           colorScheme="primary"
           isDisabled={isInputDataFormInvalid}
+          type="submit"
         >
           Add
         </Button>
@@ -495,9 +495,9 @@ const FilterSelector = ({
   const abiItems = useMemo(() => {
     if (!abiQuery.data) {
       return {
+        events: [],
         readFunctions: [],
         writeFunctions: [],
-        events: [],
       };
     }
     const readFunctions: string[] = [];
@@ -518,9 +518,9 @@ const FilterSelector = ({
       }
     }
     return {
+      events: [...new Set(events)].sort(),
       readFunctions: [...new Set(readFunctions)].sort(),
       writeFunctions: [...new Set(writeFunctions)].sort(),
-      events: [...new Set(events)].sort(),
     };
   }, [abiQuery.data]);
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx
index 655c375ab21..2e3c4eac8f7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
 import {
   type EngineContractSubscription,
   useEngineRemoveContractSubscription,
@@ -34,6 +33,7 @@ import type { ThirdwebClient } from "thirdweb";
 import { eth_getBlockByNumber, getRpcClient } from "thirdweb";
 import { shortenAddress as shortenAddressThrows } from "thirdweb/utils";
 import { Button, Card, FormLabel, LinkButton, Text } from "tw-components";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
 
 function shortenAddress(address: string) {
   if (!address) {
@@ -77,23 +77,22 @@ export const ContractSubscriptionTable: React.FC<
 
   const columns = [
     columnHelper.accessor("chainId", {
-      header: "Chain",
       cell: (cell) => {
         const chain = idToChain.get(cell.getValue());
         return (
           <Flex align="center" gap={2}>
             <ChainIconClient
               className="size-3"
-              src={chain?.icon?.url}
               client={client}
+              src={chain?.icon?.url}
             />
             <Text>{chain?.name ?? "N/A"}</Text>
           </Flex>
         );
       },
+      header: "Chain",
     }),
     columnHelper.accessor("contractAddress", {
-      header: "Contract Address",
       cell: (cell) => {
         const { chainId } = cell.row.original;
         const chain = idToChain.get(chainId);
@@ -108,32 +107,32 @@ export const ContractSubscriptionTable: React.FC<
         }
         return (
           <LinkButton
-            variant="ghost"
+            fontFamily="mono"
+            href={explorer ? `${explorer.url}/address/${cell.getValue()}` : "#"}
             isExternal
             size="xs"
-            href={explorer ? `${explorer.url}/address/${cell.getValue()}` : "#"}
-            fontFamily="mono"
+            variant="ghost"
           >
             {shortenAddress(cell.getValue())}
           </LinkButton>
         );
       },
+      header: "Contract Address",
     }),
     columnHelper.accessor("webhook", {
-      header: "Webhook URL",
       cell: (cell) => {
         const webhook = cell.getValue();
         const url = webhook?.url ?? "";
 
         return (
-          <Text maxW={200} whiteSpace="normal" noOfLines={3}>
+          <Text maxW={200} noOfLines={3} whiteSpace="normal">
             {url}
           </Text>
         );
       },
+      header: "Webhook URL",
     }),
     columnHelper.accessor("processEventLogs", {
-      header: "Filters",
       cell: (cell) => {
         const {
           processEventLogs,
@@ -152,7 +151,8 @@ export const ContractSubscriptionTable: React.FC<
                   <Text>All</Text>
                 ) : (
                   <Tooltip
-                    p={0}
+                    bgColor="backgroundCardHighlight"
+                    borderRadius="lg"
                     label={
                       <div className="flex flex-col gap-2 p-2 text-sm">
                         {filterEvents.map((name) => (
@@ -160,8 +160,7 @@ export const ContractSubscriptionTable: React.FC<
                         ))}
                       </div>
                     }
-                    bgColor="backgroundCardHighlight"
-                    borderRadius="lg"
+                    p={0}
                     shouldWrapChildren
                   >
                     <Text textDecoration="underline dotted">
@@ -180,7 +179,8 @@ export const ContractSubscriptionTable: React.FC<
                   <Text>All</Text>
                 ) : (
                   <Tooltip
-                    p={0}
+                    bgColor="backgroundCardHighlight"
+                    borderRadius="lg"
                     label={
                       <div className="flex flex-col gap-2 p-2 text-sm">
                         {filterFunctions.map((name) => (
@@ -188,8 +188,7 @@ export const ContractSubscriptionTable: React.FC<
                         ))}
                       </div>
                     }
-                    bgColor="backgroundCardHighlight"
-                    borderRadius="lg"
+                    p={0}
                     shouldWrapChildren
                   >
                     <Text textDecoration="underline dotted">
@@ -202,52 +201,53 @@ export const ContractSubscriptionTable: React.FC<
           </Flex>
         );
       },
+      header: "Filters",
     }),
     columnHelper.accessor("lastIndexedBlock", {
-      header: "Latest Block",
       cell: (cell) => {
         const { chainId } = cell.row.original;
         return (
           <ChainLastBlock
-            instanceUrl={instanceUrl}
-            chainId={chainId}
-            autoUpdate={autoUpdate}
             authToken={authToken}
+            autoUpdate={autoUpdate}
+            chainId={chainId}
             client={client}
+            instanceUrl={instanceUrl}
           />
         );
       },
+      header: "Latest Block",
     }),
   ];
 
   return (
     <>
       <TWTable
-        title="contract subscriptions"
-        data={contractSubscriptions}
         columns={columns}
-        isPending={isPending}
+        data={contractSubscriptions}
         isFetched={isFetched}
+        isPending={isPending}
         onMenuClick={[
           {
             icon: <Trash2Icon className="size-4" />,
-            text: "Remove",
+            isDestructive: true,
             onClick: (contractSub) => {
               setSelectedContractSub(contractSub);
               removeDisclosure.onOpen();
             },
-            isDestructive: true,
+            text: "Remove",
           },
         ]}
+        title="contract subscriptions"
       />
 
       {selectedContractSub && removeDisclosure.isOpen && (
         <RemoveModal
+          authToken={authToken}
+          client={client}
           contractSubscription={selectedContractSub}
           disclosure={removeDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
-          client={client}
         />
       )}
     </>
@@ -266,13 +266,12 @@ const ChainLastBlockTimestamp = ({
   const chain = useV5DashboardChain(chainId);
   // Get the block timestamp to display how delayed the last processed block is.
   const ethBlockQuery = useQuery({
-    queryKey: ["block_timestamp", chainId, Number(blockNumber)],
     // keep the previous data while fetching new data
     placeholderData: keepPreviousData,
     queryFn: async () => {
       const rpcRequest = getRpcClient({
-        client,
         chain,
+        client,
       });
       const block = await eth_getBlockByNumber(rpcRequest, {
         blockNumber,
@@ -280,6 +279,7 @@ const ChainLastBlockTimestamp = ({
       });
       return new Date(Number(block.timestamp) * 1000);
     },
+    queryKey: ["block_timestamp", chainId, Number(blockNumber)],
   });
 
   if (!ethBlockQuery.data) {
@@ -307,31 +307,31 @@ const ChainLastBlock = ({
   client: ThirdwebClient;
 }) => {
   const lastBlockQuery = useEngineSubscriptionsLastBlock({
-    instanceUrl,
-    chainId,
-    autoUpdate,
     authToken,
+    autoUpdate,
+    chainId,
+    instanceUrl,
   });
   if (!lastBlockQuery.data) {
     return null;
   }
 
   return (
-    <Flex gap={2} align="center">
+    <Flex align="center" gap={2}>
       <Text>{lastBlockQuery.data}</Text>
       <Tooltip
-        borderRadius="md"
         bg="transparent"
+        borderRadius="md"
         boxShadow="none"
         label={
           <ChainLastBlockTimestamp
-            chainId={chainId}
             blockNumber={BigInt(lastBlockQuery.data)}
+            chainId={chainId}
             client={client}
           />
         }
-        shouldWrapChildren
         placement="auto"
+        shouldWrapChildren
       >
         <InfoIcon className="size-4" />
       </Tooltip>
@@ -354,8 +354,8 @@ const RemoveModal = ({
 }) => {
   const { mutate: removeContractSubscription } =
     useEngineRemoveContractSubscription({
-      instanceUrl,
       authToken,
+      instanceUrl,
     });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -371,20 +371,20 @@ const RemoveModal = ({
         contractSubscriptionId: contractSubscription.id,
       },
       {
-        onSuccess: () => {
-          onSuccess();
-          disclosure.onClose();
-        },
         onError: (error) => {
           onError(error);
           console.error(error);
         },
+        onSuccess: () => {
+          onSuccess();
+          disclosure.onClose();
+        },
       },
     );
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Remove Contract Subscription</ModalHeader>
@@ -402,8 +402,8 @@ const RemoveModal = ({
                 <Flex align="center" gap={2}>
                   <ChainIconClient
                     className="size-3"
-                    src={chain?.icon?.url}
                     client={client}
+                    src={chain?.icon?.url}
                   />
                   <Text>{chain?.name ?? "N/A"}</Text>
                 </Flex>
@@ -448,10 +448,10 @@ const RemoveModal = ({
           </div>
         </ModalBody>
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
-          <Button type="submit" colorScheme="red" onClick={onClick}>
+          <Button colorScheme="red" onClick={onClick} type="submit">
             Remove
           </Button>
         </ModalFooter>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx
index e183297de9e..2e6b7c16f26 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx
@@ -1,13 +1,14 @@
 "use client";
 
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { useEngineContractSubscription } from "@3rdweb-sdk/react/hooks/useEngine";
 import { Flex, FormControl, Switch } from "@chakra-ui/react";
-import { useState } from "react";
+import { useId, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { FormLabel, Heading, Text } from "tw-components";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { AddContractSubscriptionButton } from "./add-contract-subscription-button";
 import { ContractSubscriptionTable } from "./contract-subscriptions-table";
+
 interface EngineContractSubscriptionsProps {
   instanceUrl: string;
   authToken: string;
@@ -19,10 +20,12 @@ export const EngineContractSubscriptions: React.FC<
 > = ({ instanceUrl, authToken, client }) => {
   const [autoUpdate, setAutoUpdate] = useState<boolean>(true);
   const contractSubscriptionsQuery = useEngineContractSubscription({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
+  const autoUpdateId = useId();
+
   return (
     <Flex flexDir="column" gap={4}>
       <Flex flexDir="row" gap={2} justify="space-between">
@@ -31,10 +34,10 @@ export const EngineContractSubscriptions: React.FC<
           <Text>
             Subscribe to event logs and transaction receipts on any contract.{" "}
             <UnderlineLink
-              href="https://portal.thirdweb.com/engine/features/contract-subscriptions"
               color="primary.500"
-              target="_blank"
+              href="https://portal.thirdweb.com/engine/features/contract-subscriptions"
               rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more about contract subscriptions
             </UnderlineLink>
@@ -42,31 +45,31 @@ export const EngineContractSubscriptions: React.FC<
           </Text>
         </Flex>
         <div className="flex flex-row">
-          <FormControl display="flex" alignItems="center">
-            <FormLabel htmlFor="auto-update" mb="0">
+          <FormControl alignItems="center" display="flex">
+            <FormLabel htmlFor={autoUpdateId} mb="0">
               Auto-Update
             </FormLabel>
             <Switch
+              id={autoUpdateId}
               isChecked={autoUpdate}
               onChange={() => setAutoUpdate((val) => !val)}
-              id="auto-update"
             />
           </FormControl>
         </div>
       </Flex>
       <ContractSubscriptionTable
-        instanceUrl={instanceUrl}
-        contractSubscriptions={contractSubscriptionsQuery.data ?? []}
-        isPending={contractSubscriptionsQuery.isPending}
-        isFetched={contractSubscriptionsQuery.isFetched}
-        autoUpdate={autoUpdate}
         authToken={authToken}
+        autoUpdate={autoUpdate}
         client={client}
+        contractSubscriptions={contractSubscriptionsQuery.data ?? []}
+        instanceUrl={instanceUrl}
+        isFetched={contractSubscriptionsQuery.isFetched}
+        isPending={contractSubscriptionsQuery.isPending}
       />
       <AddContractSubscriptionButton
-        instanceUrl={instanceUrl}
         authToken={authToken}
         client={client}
+        instanceUrl={instanceUrl}
       />
     </Flex>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/page.tsx
index bf2cdf1cff6..04fbdf33c19 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/page.tsx
@@ -6,15 +6,15 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken, client } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
     <EngineContractSubscriptions
-      instanceUrl={instance.url}
       authToken={authToken}
       client={client}
+      instanceUrl={instance.url}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/components/engine-explorer.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/components/engine-explorer.tsx
index 699736498cf..f172050af12 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/components/engine-explorer.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/components/engine-explorer.tsx
@@ -2,8 +2,8 @@
 
 import "./swagger-ui.css";
 import "swagger-ui-react/swagger-ui.css";
-import { ClientOnly } from "@/components/blocks/client-only";
 import dynamic from "next/dynamic";
+import { ClientOnly } from "@/components/blocks/client-only";
 
 const SwaggerUI = dynamic(() => import("swagger-ui-react"), { ssr: false });
 
@@ -20,7 +20,6 @@ export const EngineExplorer: React.FC<EngineExplorerProps> = ({
     <ClientOnly ssr={null}>
       <div className="dark rounded-lg border border-border bg-background py-10 pt-4">
         <SwaggerUI
-          url={`${instanceUrl}${instanceUrl.endsWith("/") ? "" : "/"}json`}
           docExpansion="none"
           persistAuthorization={true}
           requestInterceptor={(req) => {
@@ -31,6 +30,7 @@ export const EngineExplorer: React.FC<EngineExplorerProps> = ({
             req.headers["ngrok-skip-browser-warning"] = "true";
             return req;
           }}
+          url={`${instanceUrl}${instanceUrl.endsWith("/") ? "" : "/"}json`}
         />
       </div>
     </ClientOnly>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/components/swagger-ui.css b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/components/swagger-ui.css
index 7056aa50e6b..b946131c785 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/components/swagger-ui.css
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/components/swagger-ui.css
@@ -1,3 +1,5 @@
+/** biome-ignore-all lint/style/noDescendingSpecificity: EXPECTED */
+/** biome-ignore-all lint/suspicious/noDuplicateProperties: EXPECTED */
 .swagger-ui html {
   box-sizing: border-box !important;
 }
@@ -55,7 +57,9 @@
 .swagger-ui .opblock-tag {
   font-size: 24px !important;
   margin: 0 0 5px !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #5189f8 !important;
 }
 
@@ -77,14 +81,18 @@
   -webkit-box-flex: 1 !important;
   -ms-flex: 1 !important;
   flex: 1 !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
 .swagger-ui .parаmeter__type {
   font-size: 12px !important;
   padding: 5px 0 !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -131,7 +139,9 @@
   font-size: 12px !important;
   font-weight: 700 !important;
   margin: 0 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -145,7 +155,9 @@
   -webkit-box-flex: 1 !important;
   -ms-flex: 1 !important;
   flex: 1 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -158,7 +170,9 @@
   border-radius: 3px !important;
   background: #0e0e10 !important;
   text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -169,7 +183,9 @@
   display: -ms-flexbox !important;
   display: flex !important;
   padding: 0 10px !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fafbfc !important;
   -webkit-box-align: center !important;
@@ -203,7 +219,9 @@
   -webkit-box-flex: 1 !important;
   -ms-flex: 1 !important;
   flex: 1 !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -338,7 +356,9 @@
   min-width: 90px !important;
   padding: 0 !important;
   cursor: pointer !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -372,7 +392,9 @@
 .swagger-ui .opblock-title_normal h4 {
   font-size: 12px !important;
   margin: 0 0 5px !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -380,7 +402,9 @@
 .swagger-ui .opblock-title_normal p {
   font-size: 14px !important;
   margin: 0 !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -424,19 +448,25 @@
 .swagger-ui .responses-inner h5 {
   font-size: 12px !important;
   margin: 10px 0 5px !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
 .swagger-ui .response-col_status {
   font-size: 14px !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
 .swagger-ui .response-col_status .response-undocumented {
   font-size: 11px !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #999 !important;
 }
@@ -449,7 +479,9 @@
   padding: 10px !important;
   border-radius: 4px !important;
   background: #41444e !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -465,7 +497,9 @@
   white-space: pre-wrap !important;
   border-radius: 4px !important;
   background: #41444e !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -498,7 +532,9 @@
   -webkit-transform: translate(-50%, -50%) !important;
   transform: translate(-50%, -50%) !important;
   text-transform: uppercase !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -511,8 +547,12 @@
   height: 60px !important;
   margin: -30px !important;
   content: "" !important;
-  -webkit-animation: rotation 1s infinite linear, opacity 0.5s !important;
-  animation: rotation 1s infinite linear, opacity 0.5s !important;
+  -webkit-animation:
+    rotation 1s infinite linear,
+    opacity 0.5s !important;
+  animation:
+    rotation 1s infinite linear,
+    opacity 0.5s !important;
   opacity: 1 !important;
   border: 2px solid #fff !important;
   border-top-color: rgba(0, 0, 0, 0.6) !important;
@@ -559,7 +599,9 @@
   border-radius: 4px !important;
   background: transparent !important;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -574,7 +616,9 @@
 
 .swagger-ui .btn.cancel {
   border-color: #ff6060 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #ff6060 !important;
 }
 
@@ -717,7 +761,9 @@
     right 10px center no-repeat !important;
   background-size: 20px !important;
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.25) !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #0e0e10 !important;
   -webkit-appearance: none !important;
   -moz-appearance: none !important;
@@ -738,7 +784,9 @@
   font-size: 12px !important;
   font-weight: 700 !important;
   margin: 0 0 5px !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -820,7 +868,9 @@
   border-radius: 4px !important;
   outline: none !important;
   background: hsla(220, 50%, 65%, 0.8) !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -837,7 +887,9 @@
   resize: none !important;
   border-radius: 4px !important;
   background: #41444e !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -859,7 +911,9 @@
   font-weight: 400 !important;
   font-style: italic !important;
   margin: 0 !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -940,7 +994,9 @@
   font-size: 12px !important;
   margin: 0 0 5px !important;
   color: #41444e !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #0e0e10 !important;
 }
 
@@ -948,7 +1004,9 @@
   font-size: 18px !important;
   font-weight: 600 !important;
   margin: 15px 0 0 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #0e0e10 !important;
 }
 
@@ -978,7 +1036,9 @@
   -webkit-box-flex: 1 !important;
   -ms-flex: 1 !important;
   flex: 1 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -989,7 +1049,9 @@
 .swagger-ui .model {
   font-size: 12px !important;
   font-weight: 300 !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -1004,7 +1066,9 @@
   -webkit-transition: -webkit-transform 0.15s ease-in !important;
   transition: -webkit-transform 0.15s ease-in !important;
   transition: transform 0.15s ease-in !important;
-  transition: transform 0.15s ease-in, -webkit-transform 0.15s ease-in !important;
+  transition:
+    transform 0.15s ease-in,
+    -webkit-transform 0.15s ease-in !important;
   -webkit-transform: rotate(90deg) !important;
   transform: rotate(90deg) !important;
   -webkit-transform-origin: 50% 50% !important;
@@ -1087,7 +1151,9 @@
   cursor: pointer !important;
   -webkit-transition: all 0.2s !important;
   transition: all 0.2s !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #777 !important;
   -webkit-box-align: center !important;
   -ms-flex-align: center !important;
@@ -1112,7 +1178,9 @@
 .swagger-ui section.models h5 {
   font-size: 16px !important;
   margin: 0 0 10px !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #777 !important;
 }
 
@@ -1158,7 +1226,9 @@
 
 .swagger-ui .model-title {
   font-size: 16px !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #555 !important;
 }
 
@@ -1199,7 +1269,9 @@
   font-size: 12px !important;
   font-weight: 300 !important;
   vertical-align: middle !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -1221,14 +1293,18 @@
   padding: 12px 0 !important;
   text-align: left !important;
   border-bottom: 1px solid rgba(59, 65, 81, 0.2) !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
 .swagger-ui .parameters-col_description p {
   font-size: 14px !important;
   margin: 0 !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1240,7 +1316,9 @@
 .swagger-ui .parameter__name {
   font-size: 16px !important;
   font-weight: 400 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1260,7 +1338,9 @@
 .swagger-ui .parameter__in {
   font-size: 12px !important;
   font-style: italic !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #888 !important;
 }
@@ -1295,7 +1375,9 @@
   -ms-flex: 1 !important;
   flex: 1 !important;
   -ms-flex-align: center !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1325,7 +1407,9 @@
   border: none !important;
   border-radius: 0 4px 4px 0 !important;
   background: #547f00 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1343,7 +1427,9 @@
 
 .swagger-ui .info p {
   font-size: 14px !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1351,7 +1437,9 @@
   padding: 3px 5px !important;
   border-radius: 4px !important;
   background: rgba(0, 0, 0, 0.05) !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #9012fe !important;
 }
@@ -1360,7 +1448,9 @@
   font-size: 14px !important;
   -webkit-transition: all 0.4s !important;
   transition: all 0.4s !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #4990e2 !important;
 }
 
@@ -1376,7 +1466,9 @@
   font-size: 12px !important;
   font-weight: 300 !important;
   margin: 0 !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -1384,7 +1476,9 @@
 .swagger-ui .info .title {
   font-size: 36px !important;
   margin: 0 !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1402,7 +1496,9 @@
 
 .swagger-ui .info .title small pre {
   margin: 0 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1463,14 +1559,18 @@
   font-size: 12px !important;
   padding: 10px !important;
   border-radius: 4px !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
 
 .swagger-ui .scopes h2 {
   font-size: 14px !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1495,7 +1595,9 @@
 .swagger-ui .errors-wrapper .errors h4 {
   font-size: 14px !important;
   margin: 0 !important;
-  font-family: Source Code Pro, monospace !important;
+  font-family:
+    Source Code Pro,
+    monospace !important;
   font-weight: 600 !important;
   color: #fff !important;
 }
@@ -1515,7 +1617,9 @@
   -webkit-box-flex: 1 !important;
   -ms-flex: 1 !important;
   flex: 1 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1669,7 +1773,9 @@
   border: none !important;
   border-radius: 0 4px 4px 0 !important;
   background: #272b30 !important;
-  font-family: Titillium Web, sans-serif !important;
+  font-family:
+    Titillium Web,
+    sans-serif !important;
   color: #fff !important;
 }
 
@@ -1677,7 +1783,9 @@
   font-size: 14px !important;
   -webkit-transition: all 0.4s !important;
   transition: all 0.4s !important;
-  font-family: Open Sans, sans-serif !important;
+  font-family:
+    Open Sans,
+    sans-serif !important;
   color: #fff !important;
 }
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/page.tsx
index 4f265324ab9..9975c8fe03e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/explorer/page.tsx
@@ -6,9 +6,9 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
-  return <EngineExplorer instanceUrl={instance.url} authToken={authToken} />;
+  return <EngineExplorer authToken={authToken} instanceUrl={instance.url} />;
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/layout.tsx
index 8c11a91cd87..0bca4c4c233 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/layout.tsx
@@ -1,5 +1,5 @@
+import type { EngineInstance } from "@3rdweb-sdk/react/hooks/useEngine";
 import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -7,7 +7,7 @@ import {
   BreadcrumbList,
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
-import type { EngineInstance } from "@3rdweb-sdk/react/hooks/useEngine";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { getValidAccount } from "../../../../../../../../account/settings/getAccount";
 import { getAuthToken } from "../../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../../login/loginRedirect";
@@ -36,10 +36,10 @@ export default async function Layout(props: {
   }
 
   const instance = await getEngineInstance({
-    teamIdOrSlug: params.team_slug,
+    accountId: account.id,
     authToken,
     engineId: params.engineId,
-    accountId: account.id,
+    teamIdOrSlug: params.team_slug,
   });
 
   const engineRootLayoutPath = `/team/${params.team_slug}/${params.project_slug}/engine/dedicated`;
@@ -48,8 +48,8 @@ export default async function Layout(props: {
     return (
       <EngineSidebarLayout
         engineId={params.engineId}
-        teamSlug={params.team_slug}
         projectSlug={params.project_slug}
+        teamSlug={params.team_slug}
       >
         <EngineErrorPage rootPath={engineRootLayoutPath}>
           Engine Instance Not Found
@@ -69,16 +69,16 @@ export default async function Layout(props: {
 
         <EngineSidebarLayout
           engineId={params.engineId}
-          teamSlug={params.team_slug}
           projectSlug={params.project_slug}
+          teamSlug={params.team_slug}
         >
           <EnsureEnginePermission
-            teamSlug={params.team_slug}
-            projectSlug={params.project_slug}
             accountId={account.id}
             authToken={authToken}
             engineId={params.engineId}
             instance={instance}
+            projectSlug={params.project_slug}
+            teamSlug={params.team_slug}
           >
             <div>{props.children}</div>
           </EnsureEnginePermission>
@@ -120,13 +120,13 @@ function EngineInstanceHeader(props: {
             </h1>
             {!instance.name.startsWith("https://") && (
               <CopyTextButton
+                className="-translate-x-2 h-auto px-2 py-1 text-muted-foreground"
                 copyIconPosition="right"
                 iconClassName="size-2.5"
-                textToShow={cleanEngineURL}
                 textToCopy={cleanEngineURL}
+                textToShow={cleanEngineURL}
                 tooltip="Copy Engine URL"
                 variant="ghost"
-                className="-translate-x-2 h-auto px-2 py-1 text-muted-foreground"
               />
             )}
           </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/EngineSystemMetrics.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/EngineSystemMetrics.tsx
index ddb7d027dee..9851f29165c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/EngineSystemMetrics.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/EngineSystemMetrics.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import {
   type EngineInstance,
   useEngineQueueMetrics,
@@ -9,6 +7,8 @@ import {
 } from "@3rdweb-sdk/react/hooks/useEngine";
 import { ChartAreaIcon, InfoIcon } from "lucide-react";
 import { Card, Heading, Text } from "tw-components";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { ErrorRate } from "./ErrorRate";
 import { Healthcheck } from "./Healthcheck";
 import { StatusCodes } from "./StatusCodes";
@@ -51,10 +51,10 @@ export const EngineSystemMetrics: React.FC<EngineStatusProps> = ({
           <Text>
             Upgrade to a{" "}
             <UnderlineLink
+              color="blue.500"
               href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/create`}
-              target="_blank"
               rel="noopener noreferrer"
-              color="blue.500"
+              target="_blank"
             >
               Engine instance managed by thirdweb
             </UnderlineLink>{" "}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/ErrorRate.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/ErrorRate.tsx
index da8bbc42f8a..9b3fc76b8c7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/ErrorRate.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/ErrorRate.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { type JSX, useMemo } from "react";
+import { Bar, BarChart, CartesianGrid, XAxis, YAxis } from "recharts";
 import {
   Card,
   CardContent,
@@ -14,8 +15,7 @@ import {
   ChartTooltip,
   ChartTooltipContent,
 } from "@/components/ui/chart";
-import { type JSX, useMemo } from "react";
-import { Bar, BarChart, CartesianGrid, XAxis, YAxis } from "recharts";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import type { ResultItem } from "./StatusCodes";
 
 function transformPrometheusData(timeseriesDatapoints: ResultItem[]) {
@@ -40,8 +40,8 @@ export function ErrorRate({ datapoints }: { datapoints: ResultItem[] }) {
 
   const chartConfig: { [key: string]: { label: string; color: string } } = {
     value: {
-      label: "Errors",
       color: "hsl(var(--chart-5))",
+      label: "Errors",
     },
   } satisfies ChartConfig;
 
@@ -53,13 +53,13 @@ export function ErrorRate({ datapoints }: { datapoints: ResultItem[] }) {
     for (const tag of monitorData.tags) {
       charts.push(
         <Bar
-          key={tag}
           dataKey={tag}
-          type="natural"
           fill={`var(--color-${tag})`}
           fillOpacity={0.3}
-          stroke={`var(--color-${tag})`}
+          key={tag}
           stackId="a"
+          stroke={`var(--color-${tag})`}
+          type="natural"
         />,
       );
     }
@@ -74,33 +74,33 @@ export function ErrorRate({ datapoints }: { datapoints: ResultItem[] }) {
       </CardHeader>
       <CardContent>
         <ChartContainer
-          config={chartConfig}
           className="aspect-auto h-[250px] w-full"
+          config={chartConfig}
         >
           <BarChart accessibilityLayer data={monitorData.data}>
             <CartesianGrid vertical={false} />
             <XAxis
-              dataKey="time"
-              tickLine={false}
               axisLine={false}
-              tickMargin={8}
+              dataKey="time"
               tickFormatter={(value) => {
                 const date = new Date(value);
                 return date.toLocaleTimeString("en-US", {
                   hour: "numeric",
+                  localeMatcher: "lookup",
                   minute: "numeric",
                   second: undefined,
-                  localeMatcher: "lookup",
                 });
               }}
+              tickLine={false}
+              tickMargin={8}
             />
             <YAxis
-              tickLine={false}
               axisLine={false}
-              tickMargin={8}
               tickCount={3}
+              tickLine={false}
+              tickMargin={8}
             />
-            <ChartTooltip cursor={false} content={<ChartTooltipContent />} />
+            <ChartTooltip content={<ChartTooltipContent />} cursor={false} />
             {areaCharts}
           </BarChart>
         </ChartContainer>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/Healthcheck.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/Healthcheck.tsx
index 24e8b3ca65f..c8cc905f875 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/Healthcheck.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/Healthcheck.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Skeleton } from "@/components/ui/skeleton";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import {
   type EngineInstance,
   useEngineSystemHealth,
 } from "@3rdweb-sdk/react/hooks/useEngine";
 import { PrimaryInfoItem } from "app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/primary-info-item";
+import { Skeleton } from "@/components/ui/skeleton";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 export function Healthcheck({ instance }: { instance: EngineInstance }) {
   const query = useEngineSystemHealth(instance.url, 5_000);
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/StatusCodes.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/StatusCodes.tsx
index 676379ae624..c4abce0ad82 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/StatusCodes.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/components/StatusCodes.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { type JSX, useMemo } from "react";
+import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";
 import {
   Card,
   CardContent,
@@ -15,8 +16,7 @@ import {
   ChartTooltip,
   ChartTooltipContent,
 } from "@/components/ui/chart";
-import { type JSX, useMemo } from "react";
-import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 
 export interface ResultItem {
   metric: {
@@ -70,13 +70,13 @@ export function StatusCodes({ datapoints }: { datapoints: ResultItem[] }) {
     const config: { [key: string]: { label: string; color: string } } = {};
     for (const tag of monitorData.tags) {
       config[tag] = {
-        label: tag,
         color:
           Number.parseInt(tag) < 400
             ? "hsl(var(--chart-2))"
             : Number.parseInt(tag) < 500
               ? "hsl(var(--chart-3))"
               : "hsl(var(--chart-5))",
+        label: tag,
       };
     }
 
@@ -92,13 +92,13 @@ export function StatusCodes({ datapoints }: { datapoints: ResultItem[] }) {
     for (const tag of monitorData.tags) {
       charts.push(
         <Area
-          key={tag}
           dataKey={tag}
-          type="step"
           fill={`var(--color-${tag})`}
           fillOpacity={0.3}
-          stroke={`var(--color-${tag})`}
+          key={tag}
           stackId="a"
+          stroke={`var(--color-${tag})`}
+          type="step"
         />,
       );
     }
@@ -115,33 +115,33 @@ export function StatusCodes({ datapoints }: { datapoints: ResultItem[] }) {
       </CardHeader>
       <CardContent>
         <ChartContainer
-          config={chartConfig}
           className="aspect-auto h-[250px] w-full"
+          config={chartConfig}
         >
           <AreaChart accessibilityLayer data={monitorData.data}>
             <CartesianGrid vertical={false} />
             <XAxis
-              dataKey="time"
-              tickLine={false}
               axisLine={false}
-              tickMargin={8}
+              dataKey="time"
               tickFormatter={(value) => {
                 const date = new Date(value);
                 return date.toLocaleTimeString("en-US", {
                   hour: "numeric",
+                  localeMatcher: "lookup",
                   minute: "numeric",
                   second: undefined,
-                  localeMatcher: "lookup",
                 });
               }}
+              tickLine={false}
+              tickMargin={8}
             />
             <YAxis
-              tickLine={false}
               axisLine={false}
-              tickMargin={8}
               tickCount={3}
+              tickLine={false}
+              tickMargin={8}
             />
-            <ChartTooltip cursor={false} content={<ChartTooltipContent />} />
+            <ChartTooltip content={<ChartTooltipContent />} cursor={false} />
             {areaCharts}
             <ChartLegend content={<ChartLegendContent />} />
           </AreaChart>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/page.tsx
index d33f685df53..b7a718323e8 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/metrics/page.tsx
@@ -6,16 +6,16 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
     <EngineSystemMetrics
+      authToken={authToken}
       instance={instance}
-      teamSlug={params.team_slug}
       projectSlug={params.project_slug}
-      authToken={authToken}
+      teamSlug={params.team_slug}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/backend-wallets-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/backend-wallets-table.tsx
index 3d80bb0cbcd..8bcc7fcce72 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/backend-wallets-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/backend-wallets-table.tsx
@@ -1,12 +1,3 @@
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
-import { FormItem } from "@/components/ui/form";
-import { Skeleton } from "@/components/ui/skeleton";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { engineKeys } from "@3rdweb-sdk/react";
 import {
   type BackendWallet,
@@ -53,9 +44,18 @@ import QRCode from "qrcode";
 import { useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
-import { type ThirdwebClient, getAddress } from "thirdweb";
+import { getAddress, type ThirdwebClient } from "thirdweb";
 import { shortenAddress } from "thirdweb/utils";
 import { FormHelperText, FormLabel, Text } from "tw-components";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { FormItem } from "@/components/ui/form";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Skeleton } from "@/components/ui/skeleton";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import { prettyPrintCurrency } from "./utils";
 
 interface BackendWalletsTableProps {
@@ -91,10 +91,10 @@ const BackendWalletBalanceCell: React.FC<BackendWalletBalanceCellProps> = ({
 }) => {
   const { data: backendWalletBalance, isFetching } =
     useEngineBackendWalletBalance({
-      instanceUrl: instanceUrl,
       address,
       authToken,
       chainId,
+      instanceUrl: instanceUrl,
     });
   const chain = useV5DashboardChain(chainId);
 
@@ -116,10 +116,10 @@ const BackendWalletBalanceCell: React.FC<BackendWalletBalanceCellProps> = ({
 
   return (
     <Link
-      target="_blank"
-      rel="noopener noreferrer"
-      href={`${explorer.url}/address/${address}`}
       className="inline-flex items-center gap-2.5 rounded-lg px-2 py-1 text-muted-foreground hover:bg-muted hover:text-foreground"
+      href={`${explorer.url}/address/${address}`}
+      rel="noopener noreferrer"
+      target="_blank"
     >
       {balanceComponent}
       <ExternalLinkIcon className="size-4" />
@@ -145,16 +145,15 @@ export const BackendWalletsTable: React.FC<BackendWalletsTableProps> = ({
   const columns = useMemo(() => {
     return [
       columnHelper.accessor("address", {
-        header: "Address",
         cell: (cell) => {
           const address = cell.getValue();
           return (
             <WalletAddress address={getAddress(address)} client={client} />
           );
         },
+        header: "Address",
       }),
       columnHelper.accessor("label", {
-        header: "Label",
         cell: (cell) => {
           return (
             <Text isTruncated maxW={300}>
@@ -162,25 +161,36 @@ export const BackendWalletsTable: React.FC<BackendWalletsTableProps> = ({
             </Text>
           );
         },
+        header: "Label",
       }),
       columnHelper.accessor("type", {
-        header: "Type",
         cell: (cell) => {
           return <Badge variant="outline">{cell.getValue()}</Badge>;
         },
+        header: "Type",
       }),
       columnHelper.accessor("address", {
+        cell: (cell) => {
+          const address = cell.getValue();
+          return (
+            <BackendWalletBalanceCell
+              address={address}
+              authToken={authToken}
+              chainId={chainId}
+              client={client}
+              instanceUrl={instanceUrl}
+            />
+          );
+        },
         header: () => (
           <div className="flex w-[180px] items-center gap-1.5">
             Balance
             <ToolTipLabel
-              label="Refresh Balance"
               contentClassName="capitalize font-normal tracking-normal leading-normal"
+              label="Refresh Balance"
             >
               <Button
                 className="z-20 h-auto p-1.5 [&[data-pending='true']_svg]:animate-spin"
-                variant="ghost"
-                size="sm"
                 onClick={async (e) => {
                   const buttonEl = e.currentTarget;
                   buttonEl.setAttribute("data-pending", "true");
@@ -189,24 +199,14 @@ export const BackendWalletsTable: React.FC<BackendWalletsTableProps> = ({
                   });
                   buttonEl.setAttribute("data-pending", "false");
                 }}
+                size="sm"
+                variant="ghost"
               >
                 <RefreshCcwIcon className="size-4" />
               </Button>
             </ToolTipLabel>
           </div>
         ),
-        cell: (cell) => {
-          const address = cell.getValue();
-          return (
-            <BackendWalletBalanceCell
-              instanceUrl={instanceUrl}
-              address={address}
-              authToken={authToken}
-              chainId={chainId}
-              client={client}
-            />
-          );
-        },
         id: "balance",
       }),
     ];
@@ -218,84 +218,84 @@ export const BackendWalletsTable: React.FC<BackendWalletsTableProps> = ({
   return (
     <>
       <TWTable
-        title="backend wallets"
-        data={wallets}
         columns={columns as ColumnDef<BackendWallet, string>[]}
-        isPending={isPending}
+        data={wallets}
         isFetched={isFetched}
-        tableScrollableClassName="max-h-[1000px]"
-        tableContainerClassName="border-x-0 rounded-t-none border-b-0"
+        isPending={isPending}
         onMenuClick={[
           {
             icon: <PencilIcon className="size-4" />,
-            text: "Edit",
             onClick: (wallet) => {
               setSelectedBackendWallet(wallet);
               editDisclosure.onOpen();
             },
+            text: "Edit",
           },
           {
             icon: <DownloadIcon className="size-4" />,
-            text: "Receive funds",
             onClick: (wallet) => {
               setSelectedBackendWallet(wallet);
               receiveDisclosure.onOpen();
             },
+            text: "Receive funds",
           },
           {
             icon: <UploadIcon className="size-4" />,
-            text: "Send funds",
             onClick: (wallet) => {
               setSelectedBackendWallet(wallet);
               sendDisclosure.onOpen();
             },
+            text: "Send funds",
           },
           {
             icon: <TrashIcon className="size-4" />,
-            text: "Delete",
+            isDestructive: true,
             onClick: (wallet) => {
               setSelectedBackendWallet(wallet);
               deleteDisclosure.onOpen();
             },
-            isDestructive: true,
+            text: "Delete",
           },
         ]}
+        tableContainerClassName="border-x-0 rounded-t-none border-b-0"
+        tableScrollableClassName="max-h-[1000px]"
+        title="backend wallets"
       />
 
       {selectedBackendWallet && editDisclosure.isOpen && (
         <EditModal
+          authToken={authToken}
           backendWallet={selectedBackendWallet}
+          client={client}
           disclosure={editDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
-          client={client}
         />
       )}
       {selectedBackendWallet && receiveDisclosure.isOpen && (
         <ReceiveFundsModal
           backendWallet={selectedBackendWallet}
-          disclosure={receiveDisclosure}
           client={client}
+          disclosure={receiveDisclosure}
         />
       )}
       {selectedBackendWallet && sendDisclosure.isOpen && (
         <SendFundsModal
-          fromWallet={selectedBackendWallet}
-          backendWallets={wallets}
-          disclosure={sendDisclosure}
-          instanceUrl={instanceUrl}
           authToken={authToken}
+          backendWallets={wallets}
           chainId={chainId}
           client={client}
+          disclosure={sendDisclosure}
+          fromWallet={selectedBackendWallet}
+          instanceUrl={instanceUrl}
         />
       )}
       {selectedBackendWallet && deleteDisclosure.isOpen && (
         <DeleteModal
+          authToken={authToken}
           backendWallet={selectedBackendWallet}
+          client={client}
           disclosure={deleteDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
-          client={client}
         />
       )}
     </>
@@ -316,8 +316,8 @@ const EditModal = ({
   client: ThirdwebClient;
 }) => {
   const updateBackendWallet = useEngineUpdateBackendWallet({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const [label, setLabel] = useState(backendWallet.label ?? "");
@@ -325,27 +325,27 @@ const EditModal = ({
   const onClick = async () => {
     const promise = updateBackendWallet.mutateAsync(
       {
-        walletAddress: backendWallet.address,
         label,
+        walletAddress: backendWallet.address,
       },
       {
-        onSuccess: () => {
-          disclosure.onClose();
-        },
         onError: (error) => {
           console.error(error);
         },
+        onSuccess: () => {
+          disclosure.onClose();
+        },
       },
     );
 
     toast.promise(promise, {
-      success: "Successfully updated backend wallet.",
       error: "Failed to update backend wallet.",
+      success: "Successfully updated backend wallet.",
     });
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Update Backend Wallet</ModalHeader>
@@ -356,17 +356,17 @@ const EditModal = ({
               <FormLabel>Wallet Address</FormLabel>
               <WalletAddress
                 address={backendWallet.address}
-                shortenAddress={false}
                 client={client}
+                shortenAddress={false}
               />
             </FormControl>
             <FormControl>
               <FormLabel>Label</FormLabel>
               <Input
-                type="text"
-                value={label}
                 onChange={(e) => setLabel(e.target.value)}
                 placeholder="Enter a description for this backend wallet"
+                type="text"
+                value={label}
               />
             </FormControl>
           </div>
@@ -376,7 +376,7 @@ const EditModal = ({
           <Button onClick={disclosure.onClose} variant="outline">
             Cancel
           </Button>
-          <Button type="submit" onClick={onClick}>
+          <Button onClick={onClick} type="submit">
             Save
           </Button>
         </ModalFooter>
@@ -395,7 +395,6 @@ const ReceiveFundsModal = ({
   client: ThirdwebClient;
 }) => {
   const qrCodeBase64Query = useQuery({
-    queryKey: ["engine", "receive-funds-qr-code", backendWallet.address],
     // only run this if we have a backendWallet address
     enabled: !!backendWallet.address,
     // start out with empty string
@@ -415,29 +414,30 @@ const ReceiveFundsModal = ({
         );
       });
     },
+    queryKey: ["engine", "receive-funds-qr-code", backendWallet.address],
   });
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Receive Funds</ModalHeader>
         <ModalCloseButton />
         <ModalBody>
           <div className="flex flex-col gap-4 pb-8">
-            <Text w="full" textAlign="left">
+            <Text textAlign="left" w="full">
               Fund this address or QR code:
             </Text>
             <WalletAddress
               address={backendWallet.address}
-              shortenAddress={false}
               client={client}
+              shortenAddress={false}
             />
             {/* eslint-disable-next-line @next/next/no-img-element */}
             <img
-              src={qrCodeBase64Query.data}
               alt="QR code for receiving funds"
               className="mx-auto flex w-[200px] rounded-lg"
+              src={qrCodeBase64Query.data}
             />
           </div>
         </ModalBody>
@@ -469,15 +469,15 @@ const SendFundsModal = ({
 }) => {
   const form = useForm<SendFundsInput>();
   const sendTokens = useEngineSendTokens({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
   const { idToChain } = useAllChainsData();
   const { data: backendWalletBalance } = useEngineBackendWalletBalance({
-    instanceUrl,
     address: fromWallet.address,
     authToken,
     chainId: chainId,
+    instanceUrl,
   });
   const chain = idToChain.get(chainId);
   const toWalletDisclosure = useDisclosure();
@@ -489,10 +489,10 @@ const SendFundsModal = ({
   const onSubmit = async (data: SendFundsInput) => {
     const promise = sendTokens.mutateAsync(
       {
+        amount: data.amount,
         chainId: chainId,
         fromAddress: fromWallet.address,
         toAddress: data.toAddress,
-        amount: data.amount,
       },
       {
         onSuccess: () => {
@@ -502,18 +502,18 @@ const SendFundsModal = ({
     );
 
     toast.promise(promise, {
-      success: "Successfully sent a request to send funds.",
       error: "Failed to send tokens.",
+      success: "Successfully sent a request to send funds.",
     });
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent
         as="form"
-        onSubmit={form.handleSubmit(onSubmit)}
         className="!bg-background rounded-lg border border-border"
+        onSubmit={form.handleSubmit(onSubmit)}
       >
         <ModalHeader>Send Funds</ModalHeader>
         <ModalCloseButton />
@@ -523,8 +523,8 @@ const SendFundsModal = ({
               <FormLabel>From</FormLabel>
               <WalletAddress
                 address={fromWallet.address}
-                shortenAddress={false}
                 client={client}
+                shortenAddress={false}
               />
             </FormControl>
             <FormControl isRequired>
@@ -536,7 +536,7 @@ const SendFundsModal = ({
                 />
               ) : (
                 <Select {...form.register("toAddress", { required: true })}>
-                  <option value="" disabled selected hidden>
+                  <option disabled hidden selected value="">
                     Select a backend wallet
                   </option>
                   {backendWallets
@@ -567,10 +567,10 @@ const SendFundsModal = ({
               <FormLabel>Amount</FormLabel>
               <InputGroup>
                 <Input
-                  type="number"
+                  max={backendWalletBalance.displayValue}
                   placeholder="Enter the amount to send"
                   step="any"
-                  max={backendWalletBalance.displayValue}
+                  type="number"
                   {...form.register("amount", { required: true })}
                 />
                 <InputRightAddon>
@@ -590,8 +590,8 @@ const SendFundsModal = ({
               <Flex align="center" gap={2}>
                 <ChainIconClient
                   className="size-3"
-                  src={chain?.icon?.url}
                   client={client}
+                  src={chain?.icon?.url}
                 />
                 <Text>{chain?.name}</Text>
               </Flex>
@@ -603,7 +603,7 @@ const SendFundsModal = ({
           <Button onClick={disclosure.onClose} variant="outline">
             Cancel
           </Button>
-          <Button type="submit" disabled={!form.formState.isValid}>
+          <Button disabled={!form.formState.isValid} type="submit">
             Send
           </Button>
         </ModalFooter>
@@ -626,8 +626,8 @@ function DeleteModal({
   client: ThirdwebClient;
 }) {
   const deleteBackendWallet = useEngineDeleteBackendWallet({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const isLocalWallet =
@@ -638,23 +638,23 @@ function DeleteModal({
     const promise = deleteBackendWallet.mutateAsync(
       { walletAddress: backendWallet.address },
       {
-        onSuccess: () => {
-          disclosure.onClose();
-        },
         onError: (error) => {
           console.error(error);
         },
+        onSuccess: () => {
+          disclosure.onClose();
+        },
       },
     );
 
     toast.promise(promise, {
-      success: "Successfully deleted backend wallet.",
       error: "Failed to delete backend wallet.",
+      success: "Successfully deleted backend wallet.",
     });
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Delete Backend Wallet</ModalHeader>
@@ -675,14 +675,14 @@ function DeleteModal({
               <FormLabel>Wallet Address</FormLabel>
               <WalletAddress
                 address={backendWallet.address}
-                shortenAddress={false}
                 client={client}
+                shortenAddress={false}
               />
             </FormItem>
           </div>
 
           {isLocalWallet && (
-            <Alert variant="warning" className="mt-4">
+            <Alert className="mt-4" variant="warning">
               <TriangleAlertIcon className="!text-warning-text size-4" />
               <AlertTitle>This action is irreversible.</AlertTitle>
 
@@ -705,11 +705,11 @@ function DeleteModal({
             Close
           </Button>
           <Button
+            className="gap-2"
+            disabled={isLocalWallet && !ackDeletion}
+            onClick={onClick}
             type="submit"
             variant="destructive"
-            onClick={onClick}
-            disabled={isLocalWallet && !ackDeletion}
-            className="gap-2"
           >
             {deleteBackendWallet.isPending && <Spinner className="size-4" />}
             Delete
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/create-backend-wallet-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/create-backend-wallet-button.tsx
index f056805f617..2fcfff49e6d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/create-backend-wallet-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/create-backend-wallet-button.tsx
@@ -1,5 +1,22 @@
+import {
+  type CreateBackendWalletInput,
+  type EngineInstance,
+  useEngineCreateBackendWallet,
+  useHasEngineFeature,
+  type WalletConfigResponse,
+} from "@3rdweb-sdk/react/hooks/useEngine";
+import { Dialog } from "@radix-ui/react-dialog";
+import {
+  EngineBackendWalletOptions,
+  type EngineBackendWalletType,
+} from "lib/engine";
+import { CircleAlertIcon, PlusIcon } from "lucide-react";
+import Link from "next/link";
+import { useId, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import invariant from "tiny-invariant";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
@@ -11,6 +28,7 @@ import {
 } from "@/components/ui/dialog";
 import { Form, FormDescription } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Select,
   SelectContent,
@@ -19,24 +37,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import {
-  type CreateBackendWalletInput,
-  type EngineInstance,
-  type WalletConfigResponse,
-  useEngineCreateBackendWallet,
-  useHasEngineFeature,
-} from "@3rdweb-sdk/react/hooks/useEngine";
-import { Dialog } from "@radix-ui/react-dialog";
-import {
-  EngineBackendWalletOptions,
-  type EngineBackendWalletType,
-} from "lib/engine";
-import { CircleAlertIcon, PlusIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import invariant from "tiny-invariant";
 
 interface CreateBackendWalletButtonProps {
   instance: EngineInstance;
@@ -60,8 +60,8 @@ export const CreateBackendWalletButton: React.FC<
 
   const [isOpen, setIsOpen] = useState(false);
   const createWallet = useEngineCreateBackendWallet({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
   });
 
   const form = useForm<CreateBackendWalletInput>({
@@ -70,17 +70,17 @@ export const CreateBackendWalletButton: React.FC<
 
   const onSubmit = async (data: CreateBackendWalletInput) => {
     const promise = createWallet.mutateAsync(data, {
-      onSuccess: () => {
-        setIsOpen(false);
-      },
       onError: (error) => {
         console.error(error);
       },
+      onSuccess: () => {
+        setIsOpen(false);
+      },
     });
 
     toast.promise(promise, {
-      success: "Wallet created successfully",
       error: "Failed to create wallet",
+      success: "Wallet created successfully",
     });
   };
 
@@ -109,13 +109,17 @@ export const CreateBackendWalletButton: React.FC<
     (["gcp-kms", "smart:gcp-kms"].includes(walletType) &&
       !walletConfig.gcpKmsKeyRingId);
 
+  const walletLabelId = useId();
+  const credentialIdId = useId();
+  const isTestnetId = useId();
+
   return (
     <>
-      <Button onClick={() => setIsOpen(true)} className="gap-2" size="sm">
+      <Button className="gap-2" onClick={() => setIsOpen(true)} size="sm">
         <PlusIcon className="size-4" />
         Create
       </Button>
-      <Dialog open={isOpen} onOpenChange={setIsOpen}>
+      <Dialog onOpenChange={setIsOpen} open={isOpen}>
         <DialogContent className="overflow-hidden p-0">
           <Form {...form}>
             <form onSubmit={form.handleSubmit(onSubmit)}>
@@ -129,12 +133,12 @@ export const CreateBackendWalletButton: React.FC<
                 <div className="flex flex-col gap-3">
                   {/* Wallet type */}
                   <FormFieldSetup
-                    label="Wallet Type"
                     errorMessage={
                       form.getFieldState("type", form.formState).error?.message
                     }
                     htmlFor="wallet-label"
                     isRequired
+                    label="Wallet Type"
                     tooltip={null}
                   >
                     <Select
@@ -160,8 +164,8 @@ export const CreateBackendWalletButton: React.FC<
                     <FormDescription className="py-2">
                       Learn more about{" "}
                       <Link
-                        href="https://portal.thirdweb.com/engine/features/backend-wallets"
                         className="text-link-foreground hover:text-foreground"
+                        href="https://portal.thirdweb.com/engine/features/backend-wallets"
                       >
                         backend wallet types
                       </Link>
@@ -179,8 +183,8 @@ export const CreateBackendWalletButton: React.FC<
                       <AlertDescription>
                         Provide your credentials on the{" "}
                         <Link
-                          href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/${instance.id}/configuration`}
                           className="text-link-foreground hover:text-foreground"
+                          href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/${instance.id}/configuration`}
                         >
                           Configuration
                         </Link>{" "}
@@ -192,20 +196,20 @@ export const CreateBackendWalletButton: React.FC<
                     <>
                       {/* Label */}
                       <FormFieldSetup
-                        key="label"
-                        label="Label"
                         errorMessage={
                           form.getFieldState("label", form.formState).error
                             ?.message
                         }
-                        htmlFor="wallet-label"
+                        htmlFor={walletLabelId}
                         isRequired
+                        key="label"
+                        label="Label"
                         tooltip={null}
                       >
                         <Input
-                          id="wallet-label"
-                          type="text"
+                          id={walletLabelId}
                           placeholder="A description to identify this backend wallet"
+                          type="text"
                           {...form.register("label", { required: true })}
                         />
                       </FormFieldSetup>
@@ -214,20 +218,20 @@ export const CreateBackendWalletButton: React.FC<
                       {isCircleWallet && (
                         <>
                           <FormFieldSetup
-                            key="credentialId"
-                            label="Credential ID"
                             errorMessage={
                               form.getFieldState("credentialId", form.formState)
                                 .error?.message
                             }
-                            htmlFor="credential-id"
+                            htmlFor={credentialIdId}
                             isRequired
+                            key="credentialId"
+                            label="Credential ID"
                             tooltip={null}
                           >
                             <Input
-                              id="credential-id"
-                              type="text"
+                              id={credentialIdId}
                               placeholder="Enter the Circle credential ID"
+                              type="text"
                               {...form.register("credentialId", {
                                 required: isCircleWallet,
                               })}
@@ -236,8 +240,8 @@ export const CreateBackendWalletButton: React.FC<
                               The ID of the Circle credential to use for this
                               wallet. You can find this in the{" "}
                               <Link
-                                href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/${instance.id}/wallet-credentials`}
                                 className="text-link-foreground hover:text-foreground"
+                                href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/${instance.id}/wallet-credentials`}
                               >
                                 Wallet Credentials
                               </Link>{" "}
@@ -246,28 +250,28 @@ export const CreateBackendWalletButton: React.FC<
                           </FormFieldSetup>
 
                           <FormFieldSetup
-                            key="isTestnet"
-                            label="Testnet"
                             errorMessage={
                               form.getFieldState("isTestnet", form.formState)
                                 .error?.message
                             }
-                            htmlFor="is-testnet"
-                            tooltip={null}
+                            htmlFor={isTestnetId}
                             isRequired={false}
+                            key="isTestnet"
+                            label="Testnet"
+                            tooltip={null}
                           >
                             <div className="flex flex-col gap-2">
                               <div className="flex items-center space-x-2">
                                 <Checkbox
-                                  id="is-testnet"
                                   checked={form.watch("isTestnet")}
+                                  id={isTestnetId}
                                   onCheckedChange={(checked) =>
                                     form.setValue("isTestnet", !!checked)
                                   }
                                 />
                                 <label
-                                  htmlFor="is-testnet"
                                   className="text-sm leading-none opacity-70 peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                                  htmlFor="is-testnet"
                                 >
                                   Use testnet mode for creating backend wallet
                                 </label>
@@ -278,10 +282,10 @@ export const CreateBackendWalletButton: React.FC<
                                 wallets. A production API Key cannot be used for
                                 testnet transactions, and vice versa.{" "}
                                 <Link
+                                  className="text-link-foreground hover:text-foreground"
                                   href="https://developers.circle.com/w3s/sandbox-vs-production"
-                                  target="_blank"
                                   rel="noopener noreferrer"
-                                  className="text-link-foreground hover:text-foreground"
+                                  target="_blank"
                                 >
                                   Learn more
                                 </Link>
@@ -296,17 +300,17 @@ export const CreateBackendWalletButton: React.FC<
               </div>
 
               <DialogFooter className="mt-4 gap-4 border-border border-t bg-card p-6 lg:gap-2 ">
-                <Button variant="outline" onClick={() => setIsOpen(false)}>
+                <Button onClick={() => setIsOpen(false)} variant="outline">
                   Cancel
                 </Button>
                 <Button
-                  type="submit"
                   className="min-w-28 gap-2"
                   disabled={
                     !form.formState.isValid ||
                     isNotConfigured ||
                     createWallet.isPending
                   }
+                  type="submit"
                 >
                   {createWallet.isPending && <Spinner className="size-4" />}
                   Create
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
index 62b92329d9a..5d99cd6f674 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
@@ -1,7 +1,4 @@
 "use client";
-import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Button } from "@/components/ui/button";
 import {
   type EngineInstance,
   useEngineBackendWallets,
@@ -11,6 +8,9 @@ import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { useActiveWalletChain } from "thirdweb/react";
+import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
+import { Button } from "@/components/ui/button";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { BackendWalletsTable } from "./backend-wallets-table";
 import { CreateBackendWalletButton } from "./create-backend-wallet-button";
 import { ImportBackendWalletButton } from "./import-backend-wallet-button";
@@ -34,19 +34,19 @@ export const EngineOverview: React.FC<EngineOverviewProps> = ({
   return (
     <div>
       <BackendWalletsSection
-        instance={instance}
-        teamSlug={teamSlug}
-        projectSlug={projectSlug}
         authToken={authToken}
         client={client}
+        instance={instance}
+        projectSlug={projectSlug}
+        teamSlug={teamSlug}
       />
       <div className="h-10" />
-      <TransactionCharts instanceUrl={instance.url} authToken={authToken} />
+      <TransactionCharts authToken={authToken} instanceUrl={instance.url} />
       <div className="h-10" />
       <TransactionsTable
-        instanceUrl={instance.url}
         authToken={authToken}
         client={client}
+        instanceUrl={instance.url}
       />
     </div>
   );
@@ -67,15 +67,15 @@ function BackendWalletsSection(props: {
   const [page, setPage] = useState(1);
 
   const backendWallets = useEngineBackendWallets({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
     limit: pageSize,
     page,
   });
 
   const { data: walletConfig } = useEngineWalletConfig({
-    instanceUrl: instance.url,
     authToken,
+    instanceUrl: instance.url,
   });
 
   const disableNextButton = (backendWallets.data?.length || 0) < pageSize;
@@ -105,8 +105,8 @@ function BackendWalletsSection(props: {
             tab, or{" "}
             <UnderlineLink
               href="https://portal.thirdweb.com/engine/v2/configure-wallets/server-wallet"
-              target="_blank"
               rel="noopener noreferrer"
+              target="_blank"
             >
               learn more about server wallets.
             </UnderlineLink>
@@ -117,18 +117,18 @@ function BackendWalletsSection(props: {
           {walletConfig && (
             <div className="flex flex-row justify-end gap-3 max-md:w-full">
               <ImportBackendWalletButton
+                authToken={authToken}
                 instance={instance}
-                walletConfig={walletConfig}
-                teamSlug={teamSlug}
                 projectSlug={projectSlug}
-                authToken={authToken}
+                teamSlug={teamSlug}
+                walletConfig={walletConfig}
               />
               <CreateBackendWalletButton
+                authToken={authToken}
                 instance={instance}
-                walletConfig={walletConfig}
-                teamSlug={teamSlug}
                 projectSlug={projectSlug}
-                authToken={authToken}
+                teamSlug={teamSlug}
+                walletConfig={walletConfig}
               />
             </div>
           )}
@@ -138,12 +138,12 @@ function BackendWalletsSection(props: {
               <span className="text-sm">Show balance for</span>
               <div className="flex flex-row">
                 <SingleNetworkSelector
+                  align="end"
                   chainId={chainId}
-                  onChange={setChainId}
                   className="min-w-40 max-w-52 lg:max-w-60"
-                  popoverContentClassName="!w-[80vw] md:!w-[500px]"
-                  align="end"
                   client={props.client}
+                  onChange={setChainId}
+                  popoverContentClassName="!w-[80vw] md:!w-[500px]"
                 />
               </div>
             </div>
@@ -152,32 +152,32 @@ function BackendWalletsSection(props: {
       </div>
 
       <BackendWalletsTable
-        instanceUrl={instance.url}
-        wallets={backendWallets.data ?? []}
-        isPending={backendWallets.isPending}
-        isFetched={backendWallets.isFetched}
         authToken={authToken}
         chainId={chainId}
         client={props.client}
+        instanceUrl={instance.url}
+        isFetched={backendWallets.isFetched}
+        isPending={backendWallets.isPending}
+        wallets={backendWallets.data ?? []}
       />
 
       {showPagination && (
         <div className="flex justify-end gap-3 border-t px-4 py-5">
           <Button
-            variant="outline"
-            disabled={disablePreviousButton || backendWallets.isPending}
             className="gap-2"
+            disabled={disablePreviousButton || backendWallets.isPending}
             onClick={() => setPage(page - 1)}
+            variant="outline"
           >
             <ArrowLeftIcon className="h-4 w-4" />
             Previous
           </Button>
 
           <Button
-            variant="outline"
-            disabled={disableNextButton || backendWallets.isPending}
             className="gap-2"
+            disabled={disableNextButton || backendWallets.isPending}
             onClick={() => setPage(page + 1)}
+            variant="outline"
           >
             Next
             <ArrowRightIcon className="h-4 w-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/import-backend-wallet-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/import-backend-wallet-button.tsx
index 791f6ece8d7..6e5f527ad58 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/import-backend-wallet-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/import-backend-wallet-button.tsx
@@ -1,5 +1,21 @@
+import {
+  type EngineInstance,
+  type ImportBackendWalletInput,
+  useEngineImportBackendWallet,
+  useHasEngineFeature,
+  type WalletConfigResponse,
+} from "@3rdweb-sdk/react/hooks/useEngine";
+import { useTxNotifications } from "hooks/useTxNotifications";
+import {
+  EngineBackendWalletOptions,
+  type EngineBackendWalletType,
+} from "lib/engine";
+import { CircleAlertIcon, CloudDownloadIcon } from "lucide-react";
+import Link from "next/link";
+import { useId, useState } from "react";
+import { useForm } from "react-hook-form";
+import invariant from "tiny-invariant";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import {
@@ -9,9 +25,15 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
-import { FormControl } from "@/components/ui/form";
-import { Form, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
+import {
+  Form,
+  FormControl,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Select,
   SelectContent,
@@ -20,23 +42,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import {
-  type EngineInstance,
-  type ImportBackendWalletInput,
-  type WalletConfigResponse,
-  useEngineImportBackendWallet,
-  useHasEngineFeature,
-} from "@3rdweb-sdk/react/hooks/useEngine";
-import { useTxNotifications } from "hooks/useTxNotifications";
-import {
-  EngineBackendWalletOptions,
-  type EngineBackendWalletType,
-} from "lib/engine";
-import { CircleAlertIcon, CloudDownloadIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import invariant from "tiny-invariant";
 
 interface ImportBackendWalletButtonProps {
   instance: EngineInstance;
@@ -55,8 +60,8 @@ export const ImportBackendWalletButton: React.FC<
   );
   const { mutate: importBackendWallet, isPending } =
     useEngineImportBackendWallet({
-      instanceUrl: instance.url,
       authToken,
+      instanceUrl: instance.url,
     });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -85,15 +90,15 @@ export const ImportBackendWalletButton: React.FC<
     }
 
     importBackendWallet(data, {
+      onError: (error) => {
+        onError(error);
+        console.error(error);
+      },
       onSuccess: () => {
         onSuccess();
         setIsModalOpen(false);
         form.reset();
       },
-      onError: (error) => {
-        onError(error);
-        console.error(error);
-      },
     });
   };
 
@@ -120,19 +125,25 @@ export const ImportBackendWalletButton: React.FC<
       values.gcpKmsKeyId &&
       values.gcpKmsKeyVersionId);
 
+  const walletLabelId = useId();
+  const privateKeyId = useId();
+  const awsKmsArnId = useId();
+  const gcpKmsKeyIdId = useId();
+  const gcpKmsKeyVersionIdId = useId();
+
   return (
     <>
       <Button
-        onClick={() => setIsModalOpen(true)}
-        variant="outline"
         className="gap-2"
+        onClick={() => setIsModalOpen(true)}
         size="sm"
+        variant="outline"
       >
         <CloudDownloadIcon className="size-4" />
         Import
       </Button>
 
-      <Dialog open={isModalOpen} onOpenChange={setIsModalOpen}>
+      <Dialog onOpenChange={setIsModalOpen} open={isModalOpen}>
         <DialogContent className="p-0">
           <Form {...form}>
             <form onSubmit={form.handleSubmit(onSubmit)}>
@@ -182,8 +193,8 @@ export const ImportBackendWalletButton: React.FC<
                       <AlertDescription>
                         Provide your credentials on the{" "}
                         <Link
-                          href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/${instance.id}/configuration`}
                           className="text-link-foreground hover:text-foreground"
+                          href={`/team/${teamSlug}/${projectSlug}/engine/dedicated/${instance.id}/configuration`}
                         >
                           Configuration
                         </Link>{" "}
@@ -195,20 +206,20 @@ export const ImportBackendWalletButton: React.FC<
                     <>
                       {/* Label */}
                       <FormFieldSetup
-                        key="label"
-                        label="Label"
                         errorMessage={
                           form.getFieldState("label", form.formState).error
                             ?.message
                         }
-                        htmlFor="wallet-label"
+                        htmlFor={walletLabelId}
                         isRequired={false}
+                        key="label"
+                        label="Label"
                         tooltip={null}
                       >
                         <Input
-                          id="wallet-label"
-                          type="text"
+                          id={walletLabelId}
                           placeholder="A description to identify this backend wallet"
+                          type="text"
                           {...form.register("label")}
                         />
                       </FormFieldSetup>
@@ -216,20 +227,20 @@ export const ImportBackendWalletButton: React.FC<
                       {/* Local */}
                       {walletType === "local" ? (
                         <FormFieldSetup
-                          key="privateKey"
-                          htmlFor="privateKey"
-                          label="Private key"
                           errorMessage={
                             form.getFieldState("privateKey", form.formState)
                               .error?.message
                           }
+                          htmlFor={privateKeyId}
                           isRequired
+                          key="privateKey"
+                          label="Private key"
                           tooltip={null}
                         >
                           <Input
-                            id="privateKey"
-                            placeholder="Your wallet private key"
                             autoComplete="off"
+                            id={privateKeyId}
+                            placeholder="Your wallet private key"
                             type="text"
                             {...form.register("privateKey", {
                               required: true,
@@ -239,20 +250,20 @@ export const ImportBackendWalletButton: React.FC<
                         </FormFieldSetup>
                       ) : walletType === "aws-kms" ? (
                         <FormFieldSetup
-                          key="awsKmsArn"
-                          label="AWS KMS ARN"
                           errorMessage={
                             form.getFieldState("awsKmsArn", form.formState)
                               .error?.message
                           }
-                          htmlFor="awsKmsArn"
+                          htmlFor={awsKmsArnId}
                           isRequired
+                          key="awsKmsArn"
+                          label="AWS KMS ARN"
                           tooltip={null}
                         >
                           <Input
-                            id="awsKmsArn"
-                            placeholder="arn:aws:kms:us-west-2:123456789012:key/2b7d8e0c-..."
                             autoComplete="off"
+                            id={awsKmsArnId}
+                            placeholder="arn:aws:kms:us-west-2:123456789012:key/2b7d8e0c-..."
                             type="text"
                             {...form.register("awsKmsArn", { required: true })}
                           />
@@ -260,20 +271,20 @@ export const ImportBackendWalletButton: React.FC<
                       ) : walletType === "gcp-kms" ? (
                         <>
                           <FormFieldSetup
-                            key="gcpKmsKeyId"
-                            htmlFor="gcpKmsKeyId"
                             errorMessage={
                               form.getFieldState("gcpKmsKeyId", form.formState)
                                 .error?.message
                             }
-                            label="GCP KMS Key ID"
+                            htmlFor={gcpKmsKeyIdId}
                             isRequired
+                            key="gcpKmsKeyId"
+                            label="GCP KMS Key ID"
                             tooltip={null}
                           >
                             <Input
-                              id="gcpKmsKeyId"
-                              placeholder="projects/my-project/locations/us-central1/keyRings/my-key-ring/cryptoKeys/my-key"
                               autoComplete="off"
+                              id={gcpKmsKeyIdId}
+                              placeholder="projects/my-project/locations/us-central1/keyRings/my-key-ring/cryptoKeys/my-key"
                               type="text"
                               {...form.register("gcpKmsKeyId", {
                                 required: true,
@@ -282,22 +293,22 @@ export const ImportBackendWalletButton: React.FC<
                           </FormFieldSetup>
 
                           <FormFieldSetup
-                            key="gcpKmsKeyVersionId"
-                            label="GCP KMS Version ID"
                             errorMessage={
                               form.getFieldState(
                                 "gcpKmsKeyVersionId",
                                 form.formState,
                               ).error?.message
                             }
-                            htmlFor="gcpKmsKeyVersionId"
+                            htmlFor={gcpKmsKeyVersionIdId}
                             isRequired
+                            key="gcpKmsKeyVersionId"
+                            label="GCP KMS Version ID"
                             tooltip={null}
                           >
                             <Input
-                              id="gcpKmsKeyVersionId"
-                              placeholder="1"
                               autoComplete="off"
+                              id={gcpKmsKeyVersionIdId}
+                              placeholder="1"
                               type="text"
                               {...form.register("gcpKmsKeyVersionId", {
                                 required: true,
@@ -312,13 +323,13 @@ export const ImportBackendWalletButton: React.FC<
               </div>
 
               <DialogFooter className="mt-4 gap-4 border-border border-t bg-card p-6 lg:gap-2 ">
-                <Button variant="outline" onClick={() => setIsModalOpen(false)}>
+                <Button onClick={() => setIsModalOpen(false)} variant="outline">
                   Cancel
                 </Button>
                 <Button
-                  type="submit"
                   className="min-w-28 gap-2"
                   disabled={!isFormValid || isPending}
+                  type="submit"
                 >
                   {isPending && <Spinner className="size-4" />}
                   Import
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transaction-timeline.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transaction-timeline.tsx
index d19541ab4f5..a219182e642 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transaction-timeline.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transaction-timeline.tsx
@@ -1,5 +1,3 @@
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
 import type { Transaction } from "@3rdweb-sdk/react/hooks/useEngine";
 import {
   Flex,
@@ -12,9 +10,9 @@ import {
   ModalOverlay,
   Step,
   StepIndicator,
+  Stepper,
   StepSeparator,
   StepStatus,
-  Stepper,
   useDisclosure,
 } from "@chakra-ui/react";
 import { useMutation } from "@tanstack/react-query";
@@ -24,6 +22,8 @@ import { useRef } from "react";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
 import { Button, FormLabel, Text } from "tw-components";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
 
 interface TimelineStep {
   step: string;
@@ -50,17 +50,17 @@ export const TransactionTimeline = ({
       // Queued: [ queued, _sent, _mined ]
       timeline = [
         {
-          isLatest: true,
-          step: "Queued",
-          date: transaction.queuedAt,
           cta: (
             <CancelTransactionButton
-              transaction={transaction}
-              instanceUrl={instanceUrl}
               authToken={authToken}
               client={client}
+              instanceUrl={instanceUrl}
+              transaction={transaction}
             />
           ),
+          date: transaction.queuedAt,
+          isLatest: true,
+          step: "Queued",
         },
         { step: "Sent" },
         { step: "Mined" },
@@ -69,19 +69,19 @@ export const TransactionTimeline = ({
     case "sent":
       // Sent: [ queued, sent, _mined ]
       timeline = [
-        { step: "Queued", date: transaction.queuedAt },
+        { date: transaction.queuedAt, step: "Queued" },
         {
-          isLatest: true,
-          step: "Sent",
-          date: transaction.sentAt,
           cta: (
             <CancelTransactionButton
-              transaction={transaction}
-              instanceUrl={instanceUrl}
               authToken={authToken}
               client={client}
+              instanceUrl={instanceUrl}
+              transaction={transaction}
             />
           ),
+          date: transaction.sentAt,
+          isLatest: true,
+          step: "Sent",
         },
         { step: "Mined" },
       ];
@@ -89,17 +89,17 @@ export const TransactionTimeline = ({
     case "mined":
       // Mined: [ queued, sent, mined ]
       timeline = [
-        { step: "Queued", date: transaction.queuedAt },
-        { step: "Sent", date: transaction.sentAt },
-        { isLatest: true, step: "Mined", date: transaction.minedAt },
+        { date: transaction.queuedAt, step: "Queued" },
+        { date: transaction.sentAt, step: "Sent" },
+        { date: transaction.minedAt, isLatest: true, step: "Mined" },
       ];
       break;
     case "cancelled":
       // Mined: [ queued, sent, cancelled, _mined ]
       timeline = [
-        { step: "Queued", date: transaction.queuedAt },
-        { step: "Sent", date: transaction.sentAt },
-        { isLatest: true, step: "Cancelled", date: transaction.cancelledAt },
+        { date: transaction.queuedAt, step: "Queued" },
+        { date: transaction.sentAt, step: "Sent" },
+        { date: transaction.cancelledAt, isLatest: true, step: "Cancelled" },
         { step: "Mined" },
       ];
       break;
@@ -107,15 +107,15 @@ export const TransactionTimeline = ({
       if (transaction.sentAt) {
         // Errored with sentAt: [ queued, sent, errored, _mined ]
         timeline = [
-          { step: "Queued", date: transaction.queuedAt },
-          { step: "Sent", date: transaction.sentAt },
+          { date: transaction.queuedAt, step: "Queued" },
+          { date: transaction.sentAt, step: "Sent" },
           { isLatest: true, step: "Failed" },
           { step: "Mined" },
         ];
       } else {
         // Errored without sentAt: [ queued, errored, _sent, _mined ]
         timeline = [
-          { step: "Queued", date: transaction.queuedAt },
+          { date: transaction.queuedAt, step: "Queued" },
           { isLatest: true, step: "Failed" },
           { step: "Sent" },
           { step: "Mined" },
@@ -130,24 +130,24 @@ export const TransactionTimeline = ({
 
   return (
     <Stepper
+      gap="0"
+      height={12 * timeline.length}
       index={activeIdx}
       orientation="vertical"
-      height={12 * timeline.length}
-      gap="0"
       size="xs"
     >
       {timeline.map((step, index) => {
         const isFilled = index <= activeIdx;
         return (
           // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
-          <Step key={index} as={Flex} w="full">
+          <Step as={Flex} key={index} w="full">
             <StepIndicator>
               <StepStatus
-                complete={<CheckIcon className="size-4" />}
                 active={<CheckIcon className="size-4" />}
+                complete={<CheckIcon className="size-4" />}
               />
             </StepIndicator>
-            <Flex justify="space-between" w="full" mt={-1}>
+            <Flex justify="space-between" mt={-1} w="full">
               <div className="flex flex-col gap-2">
                 {isFilled ? (
                   <Text>{step.step}</Text>
@@ -200,13 +200,13 @@ const CancelTransactionButton = ({
   const cancelTransactionMutation = useMutation({
     mutationFn: async () => {
       const resp = await fetch(`${instanceUrl}transaction/cancel`, {
-        method: "POST",
+        body: JSON.stringify({ queueId: transaction.queueId }),
         headers: {
-          "Content-Type": "application/json",
           Authorization: `Bearer ${authToken}`,
+          "Content-Type": "application/json",
           "x-backend-wallet-address": transaction.fromAddress ?? "",
         },
-        body: JSON.stringify({ queueId: transaction.queueId }),
+        method: "POST",
       });
 
       if (!resp.ok) {
@@ -219,8 +219,8 @@ const CancelTransactionButton = ({
   const cancelTransactions = async () => {
     const promise = cancelTransactionMutation.mutateAsync();
     toast.promise(promise, {
-      success: "Transaction cancelled successfully",
       error: "Failed to cancel transaction",
+      success: "Transaction cancelled successfully",
     });
 
     promise.then(() => {
@@ -231,7 +231,7 @@ const CancelTransactionButton = ({
   return (
     <>
       {/* @ts-expect-error - this works fine */}
-      <Modal isOpen={isOpen} onClose={onClose} initialFocusRef={closeButtonRef}>
+      <Modal initialFocusRef={closeButtonRef} isOpen={isOpen} onClose={onClose}>
         <ModalOverlay />
         <ModalContent className="!bg-background rounded-lg border border-border">
           <ModalHeader>Cancel Transaction</ModalHeader>
@@ -252,8 +252,8 @@ const CancelTransactionButton = ({
                 <FormLabel>From</FormLabel>
                 <WalletAddress
                   address={transaction.fromAddress ?? ""}
-                  shortenAddress={false}
                   client={client}
+                  shortenAddress={false}
                 />
               </FormControl>
               <FormControl>
@@ -277,17 +277,17 @@ const CancelTransactionButton = ({
 
           <ModalFooter as={Flex} gap={3}>
             <Button
+              onClick={onClose}
               ref={closeButtonRef}
               type="button"
-              onClick={onClose}
               variant="ghost"
             >
               Close
             </Button>
             <Button
               colorScheme="red"
-              onClick={cancelTransactions}
               isLoading={cancelTransactionMutation.isPending}
+              onClick={cancelTransactions}
             >
               Cancel transaction
             </Button>
@@ -295,7 +295,7 @@ const CancelTransactionButton = ({
         </ModalContent>
       </Modal>
 
-      <Button onClick={onOpen} variant="outline" size="xs" colorScheme="red">
+      <Button colorScheme="red" onClick={onOpen} size="xs" variant="outline">
         Cancel transaction
       </Button>
     </>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transactions-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transactions-table.tsx
index e49d52a0e43..c1ae6c537bb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transactions-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/transactions-table.tsx
@@ -1,10 +1,34 @@
+import {
+  type Transaction,
+  useEngineTransactions,
+} from "@3rdweb-sdk/react/hooks/useEngine";
+import { Collapse, Divider, useDisclosure } from "@chakra-ui/react";
+import { ChainIconClient } from "components/icons/ChainIcon";
+import { format, formatDistanceToNowStrict } from "date-fns";
+import { useAllChainsData } from "hooks/chains/allChains";
+import {
+  ExternalLinkIcon,
+  InfoIcon,
+  MoveLeftIcon,
+  MoveRightIcon,
+} from "lucide-react";
+import Link from "next/link";
+import {
+  type Dispatch,
+  type SetStateAction,
+  useId,
+  useMemo,
+  useState,
+} from "react";
+import { type ThirdwebClient, toTokens } from "thirdweb";
+import { FormLabel, LinkButton, Text } from "tw-components";
 import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { PaginationButtons } from "@/components/pagination-buttons";
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import type { ChartConfig } from "@/components/ui/chart";
 import { Label } from "@/components/ui/label";
 import {
@@ -34,24 +58,6 @@ import {
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { normalizeTime } from "@/lib/time";
-import {
-  type Transaction,
-  useEngineTransactions,
-} from "@3rdweb-sdk/react/hooks/useEngine";
-import { Collapse, Divider, useDisclosure } from "@chakra-ui/react";
-import { ChainIconClient } from "components/icons/ChainIcon";
-import { format, formatDistanceToNowStrict } from "date-fns";
-import { useAllChainsData } from "hooks/chains/allChains";
-import {
-  ExternalLinkIcon,
-  InfoIcon,
-  MoveLeftIcon,
-  MoveRightIcon,
-} from "lucide-react";
-import Link from "next/link";
-import { type Dispatch, type SetStateAction, useMemo, useState } from "react";
-import { type ThirdwebClient, toTokens } from "thirdweb";
-import { FormLabel, LinkButton, Text } from "tw-components";
 import { TransactionTimeline } from "./transaction-timeline";
 
 export type EngineStatus =
@@ -71,25 +77,29 @@ const statusDetails: Record<
     type: "success" | "destructive" | "warning";
   }
 > = {
-  mined: {
-    name: "Mined",
-    type: "success",
+  cancelled: {
+    name: "Cancelled",
+    type: "destructive",
   },
   errored: {
     name: "Failed",
     type: "destructive",
   },
-  cancelled: {
-    name: "Cancelled",
-    type: "destructive",
+  mined: {
+    name: "Mined",
+    type: "success",
+  },
+  processed: {
+    name: "Processed",
+    type: "warning",
   },
   queued: {
     name: "Queued",
     type: "warning",
   },
-  processed: {
-    name: "Processed",
-    type: "warning",
+  retried: {
+    name: "Retried",
+    type: "success",
   },
   sent: {
     name: "Sent",
@@ -99,10 +109,6 @@ const statusDetails: Record<
     name: "User Op Sent",
     type: "warning",
   },
-  retried: {
-    name: "Retried",
-    type: "success",
-  },
 };
 
 // TODO - add Status selector dropdown here
@@ -117,12 +123,12 @@ export function TransactionsTable(props: {
   const [autoUpdate, setAutoUpdate] = useState(true);
   const [page, setPage] = useState(1);
   const [status, setStatus] = useState<EngineStatus | undefined>(undefined);
-
+  const autoUpdateId = useId();
   const pageSize = 10;
   const transactionsQuery = useEngineTransactions({
-    instanceUrl: props.instanceUrl,
-    autoUpdate,
     authToken: props.authToken,
+    autoUpdate,
+    instanceUrl: props.instanceUrl,
     queryParams: {
       limit: pageSize,
       page: page,
@@ -158,20 +164,20 @@ export function TransactionsTable(props: {
 
         <div className="flex items-center justify-end gap-5 border-border border-t pt-4 lg:border-none lg:pt-0">
           <div className="flex shrink-0 items-center gap-2">
-            <Label htmlFor="auto-update">Auto Update</Label>
+            <Label htmlFor={autoUpdateId}>Auto Update</Label>
             <Switch
               checked={autoUpdate}
+              id={autoUpdateId}
               onCheckedChange={(v) => setAutoUpdate(!!v)}
-              id="auto-update"
             />
           </div>
           <StatusSelector
-            status={status}
             setStatus={(v) => {
               setStatus(v);
               // reset page
               setPage(1);
             }}
+            status={status}
           />
         </div>
       </div>
@@ -189,31 +195,27 @@ export function TransactionsTable(props: {
             </TableRow>
           </TableHeader>
           <TableBody>
-            {showSkeleton ? (
-              <>
-                {new Array(pageSize).fill(0).map((_, i) => (
-                  // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+            {showSkeleton
+              ? new Array(pageSize).fill(0).map((_, i) => (
+                  // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
                   <SkeletonRow key={i} />
-                ))}
-              </>
-            ) : (
-              <>
-                {transactions.map((tx) => (
+                ))
+              : transactions.map((tx) => (
                   <TableRow
+                    className="cursor-pointer hover:bg-accent/50"
+                    key={`${tx.queueId}${tx.chainId}${tx.blockNumber}`}
                     onClick={() => {
                       setSelectedTransaction(tx);
                       transactionDisclosure.onOpen();
                     }}
-                    key={`${tx.queueId}${tx.chainId}${tx.blockNumber}`}
-                    className="cursor-pointer hover:bg-accent/50"
                   >
                     {/* Queue ID */}
                     <TableCell className="font-medium">
                       <CopyAddressButton
                         address={tx.queueId ? tx.queueId : ""}
+                        className="text-muted-foreground"
                         copyIconPosition="left"
                         variant="ghost"
-                        className="text-muted-foreground"
                       />
                     </TableCell>
 
@@ -253,8 +255,6 @@ export function TransactionsTable(props: {
                     </TableCell>
                   </TableRow>
                 ))}
-              </>
-            )}
           </TableBody>
         </Table>
 
@@ -277,21 +277,21 @@ export function TransactionsTable(props: {
 
       {transactionDisclosure.isOpen && selectedTransaction && (
         <TransactionDetailsDrawer
-          transaction={selectedTransaction}
-          instanceUrl={props.instanceUrl}
           authToken={props.authToken}
-          onClickPrevious={
-            idx > 0
-              ? () => setSelectedTransaction(transactions[idx - 1] || null)
-              : undefined
-          }
+          client={props.client}
+          instanceUrl={props.instanceUrl}
           onClickNext={
             idx < transactions.length - 1
               ? () => setSelectedTransaction(transactions[idx + 1] || null)
               : undefined
           }
+          onClickPrevious={
+            idx > 0
+              ? () => setSelectedTransaction(transactions[idx - 1] || null)
+              : undefined
+          }
           setSelectedTransaction={setSelectedTransaction}
-          client={props.client}
+          transaction={selectedTransaction}
         />
       )}
     </div>
@@ -306,7 +306,6 @@ function StatusSelector(props: {
 
   return (
     <Select
-      value={props.status || "all"}
       onValueChange={(v) => {
         if (v === "all") {
           props.setStatus(undefined);
@@ -314,6 +313,7 @@ function StatusSelector(props: {
           props.setStatus(v as EngineStatus);
         }
       }}
+      value={props.status || "all"}
     >
       <SelectTrigger className="min-w-[160px]">
         <SelectValue placeholder="All" />
@@ -385,8 +385,8 @@ function TxChainCell(props: {
     <div className="flex items-center gap-2">
       <ChainIconClient
         className="size-5"
-        src={chain.icon?.url}
         client={client}
+        src={chain.icon?.url}
       />
       <div className="max-w-[150px] truncate">
         {chain.name ?? `Chain ID: ${chainId}`}
@@ -395,9 +395,7 @@ function TxChainCell(props: {
   );
 }
 
-function TxStatusCell(props: {
-  transaction: Transaction;
-}) {
+function TxStatusCell(props: { transaction: Transaction }) {
   const { transaction } = props;
   const { errorMessage, minedAt } = transaction;
   const status = (transaction.status as EngineStatus) ?? null;
@@ -414,7 +412,7 @@ function TxStatusCell(props: {
 
   return (
     <ToolTipLabel hoverable label={tooltip}>
-      <Badge variant={statusDetails[status].type} className="gap-2">
+      <Badge className="gap-2" variant={statusDetails[status].type}>
         {statusDetails[status].name}
         {errorMessage && <InfoIcon className="size-3" />}
       </Badge>
@@ -436,30 +434,30 @@ function TxHashCell(props: { transaction: Transaction }) {
   if (!explorer) {
     return (
       <CopyTextButton
-        textToCopy={transactionHash}
+        className="font-mono text-muted-foreground text-sm"
         copyIconPosition="left"
+        textToCopy={transactionHash}
         textToShow={shortHash}
-        variant="ghost"
         tooltip="Copy transaction hash"
-        className="font-mono text-muted-foreground text-sm"
+        variant="ghost"
       />
     );
   }
 
   return (
     <Button
-      variant="ghost"
       asChild
       className="-translate-x-2 gap-2 font-mono"
       size="sm"
+      variant="ghost"
     >
       <Link
         href={`${explorer.url}/tx/${transactionHash}`}
-        target="_blank"
-        rel="noopener noreferrer"
         onClick={(e) => {
           e.stopPropagation();
         }}
+        rel="noopener noreferrer"
+        target="_blank"
       >
         {shortHash}{" "}
         <ExternalLinkIcon className="size-4 text-muted-foreground" />
@@ -487,9 +485,9 @@ export function TransactionCharts(props: {
   instanceUrl: string;
 }) {
   const transactionsQuery = useEngineTransactions({
-    instanceUrl: props.instanceUrl,
-    autoUpdate: false,
     authToken: props.authToken,
+    autoUpdate: false,
+    instanceUrl: props.instanceUrl,
     queryParams: {
       limit: 10000,
       page: 1,
@@ -529,13 +527,13 @@ export function TransactionCharts(props: {
     const chartConfig: ChartConfig = {};
     Array.from(uniqueStatuses).forEach((status, i) => {
       chartConfig[status] = {
-        label: status.charAt(0).toUpperCase() + status.slice(1), // first letter uppercase
         color:
           status === "errored"
             ? "hsl(var(--destructive-text))"
             : status === "mined"
               ? "hsl(var(--success-text))"
-              : `hsl(var(--chart-${(i % 15) + 3}))`,
+              : `hsl(var(--chart-${(i % 15) + 3}))`, // first letter uppercase
+        label: status.charAt(0).toUpperCase() + status.slice(1),
       };
     });
 
@@ -547,17 +545,16 @@ export function TransactionCharts(props: {
 
   return (
     <ThirdwebBarChart
+      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
+      config={chartConfig}
+      data={analyticsData}
       header={{
-        title: "Transactions Breakdown",
         description: "Transactions sent from your backend wallets per day",
+        title: "Transactions Breakdown",
         titleClassName: "text-xl mb-0",
       }}
-      config={chartConfig}
-      data={analyticsData}
-      isPending={transactionsQuery.isPending}
-      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
       hideLabel={false}
-      variant="stacked"
+      isPending={transactionsQuery.isPending}
       showLegend
       toolTipLabelFormatter={(_v, item) => {
         if (Array.isArray(item)) {
@@ -566,6 +563,7 @@ export function TransactionCharts(props: {
         }
         return undefined;
       }}
+      variant="stacked"
     />
   );
 }
@@ -623,7 +621,7 @@ const TransactionDetailsDrawer = ({
   };
 
   return (
-    <Sheet open={!!transaction} onOpenChange={handleOpenChange}>
+    <Sheet onOpenChange={handleOpenChange} open={!!transaction}>
       <SheetContent className="w-full overflow-y-auto sm:min-w-[500px] lg:min-w-[500px]">
         <SheetHeader>
           <SheetTitle className="mb-3 flex flex-row items-center gap-3 border-border border-b pb-3 text-left">
@@ -641,8 +639,8 @@ const TransactionDetailsDrawer = ({
             <div className="flex items-center gap-2">
               <ChainIconClient
                 className="size-5"
-                src={chain?.icon?.url}
                 client={client}
+                src={chain?.icon?.url}
               />
               <span>{chain?.name}</span>
             </div>
@@ -660,14 +658,14 @@ const TransactionDetailsDrawer = ({
               {transaction.accountAddress ? "Signer Address" : "From Address"}
             </FormLabel>
             <LinkButton
-              variant="ghost"
-              isExternal
-              size="xs"
               href={
                 explorer
                   ? `${explorer.url}/address/${transaction.fromAddress}`
                   : "#"
               }
+              isExternal
+              size="xs"
+              variant="ghost"
             >
               <Text fontFamily="mono">{transaction.fromAddress}</Text>
             </LinkButton>
@@ -677,14 +675,14 @@ const TransactionDetailsDrawer = ({
             <div>
               <FormLabel>Account Address</FormLabel>
               <LinkButton
-                variant="ghost"
-                isExternal
-                size="xs"
                 href={
                   explorer
                     ? `${explorer.url}/address/${transaction.accountAddress}`
                     : "#"
                 }
+                isExternal
+                size="xs"
+                variant="ghost"
               >
                 <Text fontFamily="mono">{transaction.accountAddress}</Text>
               </LinkButton>
@@ -699,14 +697,14 @@ const TransactionDetailsDrawer = ({
                 : "Contract Address"}
             </FormLabel>
             <LinkButton
-              variant="ghost"
-              isExternal
-              size="xs"
               href={
                 explorer
                   ? `${explorer.url}/address/${transaction.toAddress}`
                   : "#"
               }
+              isExternal
+              size="xs"
+              variant="ghost"
             >
               <Text fontFamily="mono">{transaction.toAddress}</Text>
             </LinkButton>
@@ -727,10 +725,10 @@ const TransactionDetailsDrawer = ({
           <Divider />
 
           <TransactionTimeline
-            transaction={transaction}
+            authToken={authToken}
             client={client}
             instanceUrl={instanceUrl}
-            authToken={authToken}
+            transaction={transaction}
           />
 
           <Divider />
@@ -759,15 +757,15 @@ const TransactionDetailsDrawer = ({
               <div>
                 <FormLabel>Transaction Hash</FormLabel>
                 <LinkButton
-                  variant="ghost"
-                  isExternal
-                  size="xs"
                   href={
                     explorer
                       ? `${explorer.url}/tx/${transaction.transactionHash}`
                       : "#"
                   }
+                  isExternal
                   maxW="100%"
+                  size="xs"
+                  variant="ghost"
                 >
                   <Text fontFamily="mono" isTruncated>
                     {transaction.transactionHash}
@@ -826,15 +824,15 @@ const TransactionDetailsDrawer = ({
                     <div>
                       <FormLabel>Block</FormLabel>
                       <LinkButton
-                        variant="ghost"
-                        isExternal
-                        size="xs"
                         href={
                           explorer
                             ? `${explorer.url}/block/${transaction.blockNumber}`
                             : "#"
                         }
+                        isExternal
                         maxW="100%"
+                        size="xs"
+                        variant="ghost"
                       >
                         <Text>{transaction.blockNumber}</Text>
                       </LinkButton>
@@ -844,10 +842,10 @@ const TransactionDetailsDrawer = ({
               </Collapse>
 
               <Button
+                className="w-fit"
                 onClick={advancedTxDetailsDisclosure.onToggle}
-                variant="link"
                 size="sm"
-                className="w-fit"
+                variant="link"
               >
                 {advancedTxDetailsDisclosure.isOpen
                   ? "Hide transaction details"
@@ -858,19 +856,19 @@ const TransactionDetailsDrawer = ({
         </div>
         <div className="mt-4 flex flex-row justify-end gap-3 border-border border-t pt-4">
           <Button
+            className="gap-2"
             disabled={!onClickPrevious}
             onClick={onClickPrevious}
             variant="outline"
-            className="gap-2"
           >
             <MoveLeftIcon className="size-4" />
             Previous
           </Button>
           <Button
+            className="gap-2"
             disabled={!onClickNext}
             onClick={onClickNext}
             variant="outline"
-            className="gap-2"
           >
             Next
             <MoveRightIcon className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/page.tsx
index eacd6f3a0ae..7281723c749 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/page.tsx
@@ -6,17 +6,17 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken, client } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
     <EngineOverview
-      instance={instance}
-      teamSlug={params.team_slug}
-      projectSlug={params.project_slug}
       authToken={authToken}
       client={client}
+      instance={instance}
+      projectSlug={params.project_slug}
+      teamSlug={params.team_slug}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/add-relayer-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/add-relayer-button.tsx
index 7d185863111..ff13390baab 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/add-relayer-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/add-relayer-button.tsx
@@ -1,4 +1,3 @@
-import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import {
   type CreateRelayerInput,
   useEngineBackendWallets,
@@ -27,6 +26,7 @@ import { useForm } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
 import { isAddress, shortenAddress } from "thirdweb/utils";
 import { Button, FormHelperText, FormLabel } from "tw-components";
+import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 
 interface AddRelayerButtonProps {
   instanceUrl: string;
@@ -44,11 +44,11 @@ export const AddRelayerButton: React.FC<AddRelayerButtonProps> = ({
   return (
     <>
       <Button
+        colorScheme="primary"
+        leftIcon={<CirclePlusIcon className="size-6" />}
         onClick={disclosure.onOpen}
-        variant="ghost"
         size="sm"
-        leftIcon={<CirclePlusIcon className="size-6" />}
-        colorScheme="primary"
+        variant="ghost"
         w="fit-content"
       >
         Add Relayer
@@ -56,10 +56,10 @@ export const AddRelayerButton: React.FC<AddRelayerButtonProps> = ({
 
       {disclosure.isOpen && (
         <AddModal
-          instanceUrl={instanceUrl}
-          disclosure={disclosure}
           authToken={authToken}
           client={client}
+          disclosure={disclosure}
+          instanceUrl={instanceUrl}
         />
       )}
     </>
@@ -86,12 +86,12 @@ const AddModal = ({
   client: ThirdwebClient;
 }) => {
   const { mutate: createRelayer } = useEngineCreateRelayer({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
   const { data: backendWallets } = useEngineBackendWallets({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
   const { idToChain } = useAllChainsData();
   const { onSuccess, onError } = useTxNotifications(
@@ -107,31 +107,31 @@ const AddModal = ({
 
   const onSubmit = (data: AddModalInput) => {
     const createRelayerData: CreateRelayerInput = {
-      chain: idToChain.get(data.chainId)?.slug ?? "unknown",
-      backendWalletAddress: data.backendWalletAddress,
-      name: data.name,
       allowedContracts: parseAddressListRaw(data.allowedContractsRaw),
       allowedForwarders: parseAddressListRaw(data.allowedForwardersRaw),
+      backendWalletAddress: data.backendWalletAddress,
+      chain: idToChain.get(data.chainId)?.slug ?? "unknown",
+      name: data.name,
     };
 
     createRelayer(createRelayerData, {
-      onSuccess: () => {
-        onSuccess();
-        disclosure.onClose();
-      },
       onError: (error) => {
         onError(error);
         console.error(error);
       },
+      onSuccess: () => {
+        onSuccess();
+        disclosure.onClose();
+      },
     });
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent
-        className="!bg-background rounded-lg border border-border"
         as="form"
+        className="!bg-background rounded-lg border border-border"
         onSubmit={form.handleSubmit(onSubmit)}
       >
         <ModalHeader>Add Relayer</ModalHeader>
@@ -143,8 +143,8 @@ const AddModal = ({
               <FormLabel>Chain</FormLabel>
               <SingleNetworkSelector
                 chainId={form.watch("chainId")}
-                onChange={(val) => form.setValue("chainId", val)}
                 client={client}
+                onChange={(val) => form.setValue("chainId", val)}
               />
             </FormControl>
             <FormControl isRequired>
@@ -152,7 +152,7 @@ const AddModal = ({
               <Select
                 {...form.register("backendWalletAddress", { required: true })}
               >
-                <option value="" disabled selected hidden>
+                <option disabled hidden selected value="">
                   Select a backend wallet to use as a relayer
                 </option>
                 {backendWallets?.map((wallet) => (
@@ -166,8 +166,8 @@ const AddModal = ({
             <FormControl>
               <FormLabel>Label</FormLabel>
               <Input
-                type="text"
                 placeholder="Enter a description for this relayer"
+                type="text"
                 {...form.register("name")}
               />
             </FormControl>
@@ -193,13 +193,13 @@ const AddModal = ({
         </ModalBody>
 
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
           <Button
-            type="submit"
             colorScheme="primary"
             isDisabled={!form.formState.isValid}
+            type="submit"
           >
             Add
           </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/engine-relayer.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/engine-relayer.tsx
index f60712b2a0d..ce428cc79a6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/engine-relayer.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/engine-relayer.tsx
@@ -18,8 +18,8 @@ export const EngineRelayer: React.FC<EngineRelayerProps> = ({
   client,
 }) => {
   const relayers = useEngineRelayer({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   return (
@@ -30,8 +30,8 @@ export const EngineRelayer: React.FC<EngineRelayerProps> = ({
           Use relayers to submit transactions from your backend wallets on
           behalf of your users.{" "}
           <Link
-            href="https://portal.thirdweb.com/engine/features/relayers"
             color="primary.500"
+            href="https://portal.thirdweb.com/engine/features/relayers"
             isExternal
           >
             Learn more about relayers
@@ -41,17 +41,17 @@ export const EngineRelayer: React.FC<EngineRelayerProps> = ({
       </div>
 
       <RelayersTable
-        instanceUrl={instanceUrl}
-        relayers={relayers.data || []}
-        isPending={relayers.isPending}
-        isFetched={relayers.isFetched}
         authToken={authToken}
         client={client}
+        instanceUrl={instanceUrl}
+        isFetched={relayers.isFetched}
+        isPending={relayers.isPending}
+        relayers={relayers.data || []}
       />
       <AddRelayerButton
-        instanceUrl={instanceUrl}
         authToken={authToken}
         client={client}
+        instanceUrl={instanceUrl}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/relayers-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/relayers-table.tsx
index ef6bd782ba5..766e19af6ea 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/relayers-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/relayers-table.tsx
@@ -1,4 +1,3 @@
-import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import {
   type EngineRelayer,
   type UpdateRelayerInput,
@@ -40,6 +39,7 @@ import {
   LinkButton,
   Text,
 } from "tw-components";
+import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { type AddModalInput, parseAddressListRaw } from "./add-relayer-button";
 
 interface RelayersTableProps {
@@ -68,23 +68,22 @@ export const RelayersTable: React.FC<RelayersTableProps> = ({
 
   const columns = [
     columnHelper.accessor("chainId", {
-      header: "Chain",
       cell: (cell) => {
         const chain = idToChain.get(Number.parseInt(cell.getValue()));
         return (
           <Flex align="center" gap={2}>
             <ChainIconClient
               className="size-3"
-              src={chain?.icon?.url}
               client={client}
+              src={chain?.icon?.url}
             />
             <Text>{chain?.name ?? "N/A"}</Text>
           </Flex>
         );
       },
+      header: "Chain",
     }),
     columnHelper.accessor("backendWalletAddress", {
-      header: "Backend Wallet",
       cell: (cell) => {
         const { chainId, backendWalletAddress } = cell.row.original;
         const chain = idToChain.get(Number.parseInt(chainId));
@@ -96,26 +95,26 @@ export const RelayersTable: React.FC<RelayersTableProps> = ({
 
         return (
           <LinkButton
-            key={explorer.name}
-            variant="ghost"
+            fontFamily="mono"
+            href={`${explorer.url}/address/${backendWalletAddress}`}
             isExternal
+            key={explorer.name}
             size="xs"
-            href={`${explorer.url}/address/${backendWalletAddress}`}
-            fontFamily="mono"
+            variant="ghost"
           >
             {backendWalletAddress}
           </LinkButton>
         );
       },
+      header: "Backend Wallet",
     }),
     columnHelper.accessor("name", {
-      header: "Label",
       cell: (cell) => {
         return <Text>{cell.getValue()}</Text>;
       },
+      header: "Label",
     }),
     columnHelper.accessor("allowedContracts", {
-      header: "Allowed Contracts",
       cell: (cell) => {
         const allowedContracts = cell.getValue() ?? [];
         const value =
@@ -126,9 +125,9 @@ export const RelayersTable: React.FC<RelayersTableProps> = ({
               : `${allowedContracts.length} addresses`;
         return <Text>{value}</Text>;
       },
+      header: "Allowed Contracts",
     }),
     columnHelper.accessor("allowedForwarders", {
-      header: "Allowed Forwarders",
       cell: (cell) => {
         const allowedForwarders = cell.getValue() ?? [];
         const value =
@@ -139,62 +138,63 @@ export const RelayersTable: React.FC<RelayersTableProps> = ({
               : `${allowedForwarders.length} addresses`;
         return <Text>{value}</Text>;
       },
+      header: "Allowed Forwarders",
     }),
     columnHelper.accessor("id", {
-      header: "URL",
       cell: (cell) => {
         const id = cell.getValue();
         const url = `${instanceUrl}relayer/${id}`;
-        return <Legacy_CopyButton value={url} aria-label="Copy to clipboard" />;
+        return <Legacy_CopyButton aria-label="Copy to clipboard" value={url} />;
       },
+      header: "URL",
     }),
   ];
 
   return (
     <>
       <TWTable
-        title="relayers"
-        data={relayers}
         columns={columns}
-        isPending={isPending}
+        data={relayers}
         isFetched={isFetched}
+        isPending={isPending}
         onMenuClick={[
           {
             icon: <PencilIcon className="size-4" />,
-            text: "Edit",
             onClick: (relayer) => {
               setSelectedRelayer(relayer);
               editDisclosure.onOpen();
             },
+            text: "Edit",
           },
           {
             icon: <Trash2Icon className="size-4" />,
-            text: "Remove",
+            isDestructive: true,
             onClick: (relayer) => {
               setSelectedRelayer(relayer);
               removeDisclosure.onOpen();
             },
-            isDestructive: true,
+            text: "Remove",
           },
         ]}
+        title="relayers"
       />
 
       {selectedRelayer && editDisclosure.isOpen && (
         <EditModal
-          relayer={selectedRelayer}
-          disclosure={editDisclosure}
-          instanceUrl={instanceUrl}
           authToken={authToken}
           client={client}
+          disclosure={editDisclosure}
+          instanceUrl={instanceUrl}
+          relayer={selectedRelayer}
         />
       )}
       {selectedRelayer && removeDisclosure.isOpen && (
         <RemoveModal
-          relayer={selectedRelayer}
-          disclosure={removeDisclosure}
-          instanceUrl={instanceUrl}
           authToken={authToken}
           client={client}
+          disclosure={removeDisclosure}
+          instanceUrl={instanceUrl}
+          relayer={selectedRelayer}
         />
       )}
     </>
@@ -215,12 +215,12 @@ const EditModal = ({
   client: ThirdwebClient;
 }) => {
   const { mutate: updateRelayer } = useEngineUpdateRelayer({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
   const { data: backendWallets } = useEngineBackendWallets({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
   const { idToChain } = useAllChainsData();
 
@@ -232,40 +232,40 @@ const EditModal = ({
   const form = useForm<AddModalInput>({
     defaultValues: {
       ...relayer,
-      chainId: Number.parseInt(relayer.chainId),
       allowedContractsRaw: (relayer.allowedContracts ?? []).join("\n"),
       allowedForwardersRaw: (relayer.allowedForwarders ?? []).join("\n"),
+      chainId: Number.parseInt(relayer.chainId),
     },
   });
 
   const onSubmit = (data: AddModalInput) => {
     const updateRelayerData: UpdateRelayerInput = {
-      id: relayer.id,
-      chain: idToChain.get(data.chainId)?.slug ?? "unknown",
-      backendWalletAddress: data.backendWalletAddress,
-      name: data.name,
       allowedContracts: parseAddressListRaw(data.allowedContractsRaw),
       allowedForwarders: parseAddressListRaw(data.allowedForwardersRaw),
+      backendWalletAddress: data.backendWalletAddress,
+      chain: idToChain.get(data.chainId)?.slug ?? "unknown",
+      id: relayer.id,
+      name: data.name,
     };
 
     updateRelayer(updateRelayerData, {
-      onSuccess: () => {
-        onSuccess();
-        disclosure.onClose();
-      },
       onError: (error) => {
         onError(error);
         console.error(error);
       },
+      onSuccess: () => {
+        onSuccess();
+        disclosure.onClose();
+      },
     });
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent
-        className="!bg-background rounded-lg border border-border"
         as="form"
+        className="!bg-background rounded-lg border border-border"
         onSubmit={form.handleSubmit(onSubmit)}
       >
         <ModalHeader>Update Relayer</ModalHeader>
@@ -276,8 +276,8 @@ const EditModal = ({
               <FormLabel>Chain</FormLabel>
               <SingleNetworkSelector
                 chainId={form.watch("chainId")}
-                onChange={(val) => form.setValue("chainId", val)}
                 client={client}
+                onChange={(val) => form.setValue("chainId", val)}
               />
             </FormControl>
             <FormControl>
@@ -296,8 +296,8 @@ const EditModal = ({
             <FormControl>
               <FormLabel>Label</FormLabel>
               <Input
-                type="text"
                 placeholder="Enter a description for this relayer"
+                type="text"
                 {...form.register("name")}
               />
             </FormControl>
@@ -323,10 +323,10 @@ const EditModal = ({
         </ModalBody>
 
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
-          <Button type="submit" colorScheme="blue">
+          <Button colorScheme="blue" type="submit">
             Save
           </Button>
         </ModalFooter>
@@ -349,8 +349,8 @@ const RemoveModal = ({
   client: ThirdwebClient;
 }) => {
   const { mutate: revokeRelayer } = useEngineRevokeRelayer({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const { onSuccess, onError } = useTxNotifications(
@@ -363,20 +363,20 @@ const RemoveModal = ({
     revokeRelayer(
       { id: relayer.id },
       {
-        onSuccess: () => {
-          onSuccess();
-          disclosure.onClose();
-        },
         onError: (error) => {
           onError(error);
           console.error(error);
         },
+        onSuccess: () => {
+          onSuccess();
+          disclosure.onClose();
+        },
       },
     );
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Remove Relayer</ModalHeader>
@@ -389,10 +389,10 @@ const RemoveModal = ({
               <Flex align="center" gap={2}>
                 <ChainIconClient
                   className="size-3"
+                  client={client}
                   src={
                     idToChain.get(Number.parseInt(relayer.chainId))?.icon?.url
                   }
-                  client={client}
                 />
                 <Text>
                   {idToChain.get(Number.parseInt(relayer.chainId))?.name}
@@ -410,10 +410,10 @@ const RemoveModal = ({
           </div>
         </ModalBody>
         <ModalFooter as={Flex} gap={3}>
-          <Button type="button" onClick={disclosure.onClose} variant="ghost">
+          <Button onClick={disclosure.onClose} type="button" variant="ghost">
             Cancel
           </Button>
-          <Button type="submit" colorScheme="red" onClick={onClick}>
+          <Button colorScheme="red" onClick={onClick} type="submit">
             Remove
           </Button>
         </ModalFooter>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/page.tsx
index b8a10ccba06..5d08b3c4313 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/page.tsx
@@ -6,15 +6,15 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken, client } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
     <EngineRelayer
-      instanceUrl={instance.url}
       authToken={authToken}
       client={client}
+      instanceUrl={instance.url}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/create-wallet-credential-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/create-wallet-credential-button.tsx
index 9f4580c8d97..58ad1b7144f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/create-wallet-credential-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/create-wallet-credential-button.tsx
@@ -1,8 +1,8 @@
-import { Button } from "@/components/ui/button";
 import { useEngineCreateWalletCredential } from "@3rdweb-sdk/react/hooks/useEngine";
 import { PlusIcon } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
 import { CredentialForm } from "./credential-form";
 import type { CredentialFormData } from "./types";
 
@@ -17,22 +17,22 @@ export const CreateWalletCredentialButton: React.FC<
   const [isOpen, setIsOpen] = useState(false);
 
   const createCredential = useEngineCreateWalletCredential({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const handleSubmit = async (data: CredentialFormData) => {
     const promise = createCredential.mutateAsync(data);
 
     toast.promise(promise, {
-      success: () => {
-        setIsOpen(false);
-        return "Wallet credential created successfully";
-      },
       error: (error) => {
         console.error(error);
         return "Failed to create wallet credential";
       },
+      success: () => {
+        setIsOpen(false);
+        return "Wallet credential created successfully";
+      },
     });
   };
 
@@ -49,11 +49,11 @@ export const CreateWalletCredentialButton: React.FC<
 
       <CredentialForm
         isOpen={isOpen}
+        isPending={createCredential.isPending}
         onOpenChange={setIsOpen}
         onSubmit={async (data) => handleSubmit(data as CredentialFormData)}
-        title="Create Wallet Credential"
         submitButtonText="Create"
-        isPending={createCredential.isPending}
+        title="Create Wallet Credential"
       />
     </>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/credential-form.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/credential-form.tsx
index 684d4abc2fc..ff3594e16bd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/credential-form.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/credential-form.tsx
@@ -1,5 +1,8 @@
+import { Dialog } from "@radix-ui/react-dialog";
+import Link from "next/link";
+import { useId } from "react";
+import { useForm } from "react-hook-form";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import {
   DialogContent,
@@ -10,6 +13,7 @@ import {
 } from "@/components/ui/dialog";
 import { Form } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Select,
   SelectContent,
@@ -18,9 +22,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { Dialog } from "@radix-ui/react-dialog";
-import Link from "next/link";
-import { useForm } from "react-hook-form";
 import { CircleCredentialFields } from "./credential-type-fields/circle";
 import {
   CREDENTIAL_TYPE_OPTIONS,
@@ -56,17 +57,17 @@ export const CredentialForm = ({
 }: CredentialFormProps) => {
   const form = useForm<CredentialFormData | CredentialUpdateFormData>({
     defaultValues: {
-      type: "circle" as CredentialType,
       label: "",
+      type: "circle" as CredentialType,
       ...defaultValues,
     },
     mode: "onChange",
   });
 
   const selectedType = form.watch("type");
-
+  const credentialLabelId = useId();
   return (
-    <Dialog open={isOpen} onOpenChange={onOpenChange}>
+    <Dialog onOpenChange={onOpenChange} open={isOpen}>
       <DialogContent className="overflow-hidden p-0">
         <Form {...form}>
           <form
@@ -79,10 +80,10 @@ export const CredentialForm = ({
                 <DialogTitle>{title}</DialogTitle>
                 <DialogDescription>
                   <Link
+                    className="text-link-foreground hover:text-foreground"
                     href="https://portal.thirdweb.com/engine/features/wallet-credentials"
-                    target="_blank"
                     rel="noopener noreferrer"
-                    className="text-link-foreground hover:text-foreground"
+                    target="_blank"
                   >
                     Learn more about wallet credentials
                   </Link>
@@ -93,12 +94,12 @@ export const CredentialForm = ({
                 {/* Type */}
                 {!hideTypeSelect && (
                   <FormFieldSetup
-                    label="Type"
                     errorMessage={
                       form.getFieldState("type", form.formState).error?.message
                     }
                     htmlFor="credential-type"
                     isRequired
+                    label="Type"
                     tooltip={null}
                   >
                     <Select
@@ -125,19 +126,19 @@ export const CredentialForm = ({
 
                 {/* Label */}
                 <FormFieldSetup
-                  label="Label"
                   errorMessage={
                     form.getFieldState("label", form.formState).error?.message
                   }
-                  htmlFor="credential-label"
+                  htmlFor={credentialLabelId}
                   isRequired
+                  label="Label"
                   tooltip={null}
                 >
                   <Input
-                    id="credential-label"
-                    type="text"
-                    placeholder="A description to identify this credential"
                     className="bg-card"
+                    id={credentialLabelId}
+                    placeholder="A description to identify this credential"
+                    type="text"
                     {...form.register("label", { required: true })}
                   />
                 </FormFieldSetup>
@@ -150,13 +151,13 @@ export const CredentialForm = ({
             </div>
 
             <DialogFooter className="mt-4 gap-4 border-border border-t bg-card p-6 lg:gap-2">
-              <Button variant="outline" onClick={() => onOpenChange(false)}>
+              <Button onClick={() => onOpenChange(false)} variant="outline">
                 Cancel
               </Button>
               <Button
-                type="submit"
                 className="min-w-28 gap-2"
                 disabled={!form.formState.isValid || isPending}
+                type="submit"
               >
                 {isPending && <Spinner className="size-4" />}
                 {submitButtonText}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/credential-type-fields/circle.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/credential-type-fields/circle.tsx
index 8eb6f0e3d1f..149dd46e4a4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/credential-type-fields/circle.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/credential-type-fields/circle.tsx
@@ -1,7 +1,8 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Input } from "@/components/ui/input";
 import Link from "next/link";
+import { useId } from "react";
 import type { UseFormReturn } from "react-hook-form";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Input } from "@/components/ui/input";
 import type { CredentialFormData, CredentialUpdateFormData } from "../types";
 
 interface CircleCredentialFieldsProps {
@@ -13,47 +14,49 @@ export const CircleCredentialFields: React.FC<CircleCredentialFieldsProps> = ({
   form,
   isUpdate = false,
 }) => {
+  const entitySecretId = useId();
+
   return (
     <>
       <FormFieldSetup
-        label="Entity Secret"
         errorMessage={
           form.getFieldState("entitySecret", form.formState).error?.message
         }
-        htmlFor="entity-secret"
-        isRequired={!isUpdate}
-        tooltip={null}
         helperText={
           <>
             Entity Secret is a 32-byte private key designed to secure your
             Developer-Controlled wallets{" "}
             <Link
+              className="text-link-foreground hover:text-foreground"
               href="https://developers.circle.com/w3s/entity-secret-management"
-              target="_blank"
               rel="noopener noreferrer"
-              className="text-link-foreground hover:text-foreground"
+              target="_blank"
             >
               Learn more about entity secret management
             </Link>
           </>
         }
+        htmlFor={entitySecretId}
+        isRequired={!isUpdate}
+        label="Entity Secret"
+        tooltip={null}
       >
         <Input
-          id="entity-secret"
-          type="password"
           className="bg-card"
+          id={entitySecretId}
           placeholder={
             isUpdate
               ? "Leave empty to keep existing secret"
               : "Your Circle entity secret"
           }
+          type="password"
           {...form.register("entitySecret", {
-            required: !isUpdate,
             pattern: {
-              value: /^([0-9a-fA-F]{64})?$/,
               message:
                 "Entity secret must be a 32-byte hex string (64 characters)",
+              value: /^([0-9a-fA-F]{64})?$/,
             },
+            required: !isUpdate,
             setValueAs: (value: string) => (value === "" ? undefined : value),
           })}
         />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/edit-wallet-credential-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/edit-wallet-credential-button.tsx
index 365e9fb3839..56ca40425b6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/edit-wallet-credential-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/edit-wallet-credential-button.tsx
@@ -1,11 +1,11 @@
-import { Button } from "@/components/ui/button";
 import {
-  type WalletCredential,
   useEngineUpdateWalletCredential,
+  type WalletCredential,
 } from "@3rdweb-sdk/react/hooks/useEngine";
 import { PencilIcon } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
 import { CredentialForm } from "./credential-form";
 import type { CredentialUpdateFormData } from "./types";
 
@@ -21,8 +21,8 @@ export const EditWalletCredentialButton: React.FC<
   const [isOpen, setIsOpen] = useState(false);
 
   const updateCredential = useEngineUpdateWalletCredential({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const handleSubmit = async (data: CredentialUpdateFormData) => {
@@ -32,49 +32,49 @@ export const EditWalletCredentialButton: React.FC<
     });
 
     toast.promise(promise, {
-      success: () => {
-        setIsOpen(false);
-
-        return "Wallet credential updated successfully";
-      },
       error: (error) => {
         console.log(error);
         console.error(error);
         return "Failed to update wallet credential";
       },
+      success: () => {
+        setIsOpen(false);
+
+        return "Wallet credential updated successfully";
+      },
     });
   };
 
   return (
     <>
       <Button
-        variant="ghost"
-        size="icon"
+        className="size-8"
         onClick={() => {
           setIsOpen(true);
         }}
-        className="size-8"
+        size="icon"
+        variant="ghost"
       >
         <PencilIcon className="size-4" />
       </Button>
 
       <CredentialForm
+        defaultValues={{
+          label: credential.label || "",
+          type: credential.type as "circle",
+        }}
+        hideTypeSelect
         isOpen={isOpen}
+        isPending={updateCredential.isPending}
+        isUpdate
         onOpenChange={setIsOpen}
         onSubmit={async (data) => {
           return new Promise<void>((resolve) => {
             handleSubmit(data as CredentialUpdateFormData).then(resolve);
           });
         }}
-        title="Edit Wallet Credential"
         submitButtonText="Save Changes"
-        isPending={updateCredential.isPending}
-        defaultValues={{
-          type: credential.type as "circle",
-          label: credential.label || "",
-        }}
-        hideTypeSelect
-        isUpdate
+        title="Edit Wallet Credential"
       />
     </>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/types.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/types.ts
index f2fb624acd0..79fde878217 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/types.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/types.ts
@@ -17,7 +17,7 @@ export type CredentialFormData = CircleCredentialFormData;
 export type CredentialUpdateFormData = CircleCredentialUpdateFormData;
 
 export const CREDENTIAL_TYPE_OPTIONS = [
-  { value: "circle", label: "Circle" },
+  { label: "Circle", value: "circle" },
 ] as const;
 
 export type CredentialType = (typeof CREDENTIAL_TYPE_OPTIONS)[number]["value"];
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/wallet-credentials-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/wallet-credentials-table.tsx
index 1e140c0d71d..040d4331f5d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/wallet-credentials-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/wallet-credentials-table.tsx
@@ -1,6 +1,8 @@
+import type { WalletCredential } from "@3rdweb-sdk/react/hooks/useEngine";
+import { format } from "date-fns";
+import { Badge } from "@/components/ui/badge";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Badge } from "@/components/ui/badge";
 import {
   Table,
   TableBody,
@@ -10,8 +12,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import type { WalletCredential } from "@3rdweb-sdk/react/hooks/useEngine";
-import { format } from "date-fns";
 import { EditWalletCredentialButton } from "./edit-wallet-credential-button";
 
 interface WalletCredentialsTableProps {
@@ -64,12 +64,12 @@ export const WalletCredentialsTable: React.FC<WalletCredentialsTableProps> = ({
             <TableRow key={credential.id}>
               <TableCell>
                 <CopyTextButton
+                  className="font-mono text-xs"
+                  copyIconPosition="right"
                   textToCopy={credential.id}
                   textToShow={`${credential.id.slice(0, 8)}...`}
-                  variant="secondary"
-                  className="font-mono text-xs"
                   tooltip="Copy credential ID"
-                  copyIconPosition="right"
+                  variant="secondary"
                 />
               </TableCell>
               <TableCell>{credential.label || "-"}</TableCell>
@@ -91,9 +91,9 @@ export const WalletCredentialsTable: React.FC<WalletCredentialsTableProps> = ({
               </TableCell>
               <TableCell>
                 <EditWalletCredentialButton
+                  authToken={authToken}
                   credential={credential}
                   instanceUrl={instanceUrl}
-                  authToken={authToken}
                 />
               </TableCell>
             </TableRow>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/wallet-credentials.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/wallet-credentials.tsx
index 73c1c20ca2b..577c9040b8a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/wallet-credentials.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/components/wallet-credentials.tsx
@@ -1,13 +1,13 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import {
   useEngineWalletCredentials,
   useHasEngineFeature,
 } from "@3rdweb-sdk/react/hooks/useEngine";
 import { CircleAlertIcon } from "lucide-react";
 import Link from "next/link";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { CreateWalletCredentialButton } from "./create-wallet-credential-button";
 import { WalletCredentialsTable } from "./wallet-credentials-table";
 
@@ -25,8 +25,8 @@ export const WalletCredentialsSection: React.FC<WalletCredentialsProps> = ({
     isPending,
     isFetched,
   } = useEngineWalletCredentials({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const {
@@ -66,8 +66,8 @@ export const WalletCredentialsSection: React.FC<WalletCredentialsProps> = ({
             Manage your wallet credentials for different providers.{" "}
             <Link
               href="https://portal.thirdweb.com/engine/features/wallet-credentials"
-              target="_blank"
               rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more about wallet credentials.
             </Link>
@@ -76,18 +76,18 @@ export const WalletCredentialsSection: React.FC<WalletCredentialsProps> = ({
 
         <div className="flex flex-col items-end gap-4 border-border max-md:w-full max-md:border-t max-md:pt-6">
           <CreateWalletCredentialButton
-            instanceUrl={instanceUrl}
             authToken={authToken}
+            instanceUrl={instanceUrl}
           />
         </div>
       </div>
 
       <WalletCredentialsTable
+        authToken={authToken}
         credentials={credentials}
-        isPending={isPending}
-        isFetched={isFetched}
         instanceUrl={instanceUrl}
-        authToken={authToken}
+        isFetched={isFetched}
+        isPending={isPending}
       />
     </section>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/page.tsx
index 6b27e92d629..baca35f3cb6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/wallet-credentials/page.tsx
@@ -6,14 +6,14 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
   return (
     <WalletCredentialsSection
-      instanceUrl={instance.url}
       authToken={authToken}
+      instanceUrl={instance.url}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/add-webhook-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/add-webhook-button.tsx
index 3f03d29f4f8..49c82024a2c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/add-webhook-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/add-webhook-button.tsx
@@ -43,8 +43,8 @@ export const AddWebhookButton: React.FC<AddWebhookButtonProps> = ({
 }) => {
   const { isOpen, onOpen, onClose } = useDisclosure();
   const { mutate: createWebhook } = useEngineCreateWebhook({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const form = useForm<CreateWebhookInput>();
@@ -57,31 +57,31 @@ export const AddWebhookButton: React.FC<AddWebhookButtonProps> = ({
   return (
     <>
       <Button
+        colorScheme="primary"
+        leftIcon={<CirclePlusIcon className="size-6" />}
         onClick={onOpen}
-        variant="ghost"
         size="sm"
-        leftIcon={<CirclePlusIcon className="size-6" />}
-        colorScheme="primary"
+        variant="ghost"
         w="fit-content"
       >
         Create Webhook
       </Button>
 
-      <Modal isOpen={isOpen} onClose={onClose} isCentered>
+      <Modal isCentered isOpen={isOpen} onClose={onClose}>
         <ModalOverlay />
         <ModalContent
-          className="!bg-background rounded-lg border border-border"
           as="form"
+          className="!bg-background rounded-lg border border-border"
           onSubmit={form.handleSubmit((data) => {
             createWebhook(data, {
-              onSuccess: () => {
-                onSuccess();
-                onClose();
-              },
               onError: (error) => {
                 onError(error);
                 console.error(error);
               },
+              onSuccess: () => {
+                onSuccess();
+                onClose();
+              },
             });
           })}
         >
@@ -102,16 +102,16 @@ export const AddWebhookButton: React.FC<AddWebhookButtonProps> = ({
               <FormControl isRequired>
                 <FormLabel>Name</FormLabel>
                 <Input
-                  type="text"
                   placeholder="My webhook"
+                  type="text"
                   {...form.register("name", { required: true })}
                 />
               </FormControl>
               <FormControl isRequired>
                 <FormLabel>URL</FormLabel>
                 <Input
-                  type="url"
                   placeholder="https://"
+                  type="url"
                   {...form.register("url", { required: true })}
                 />
               </FormControl>
@@ -119,10 +119,10 @@ export const AddWebhookButton: React.FC<AddWebhookButtonProps> = ({
           </ModalBody>
 
           <ModalFooter as={Flex} gap={3}>
-            <Button type="button" onClick={onClose} variant="ghost">
+            <Button onClick={onClose} type="button" variant="ghost">
               Cancel
             </Button>
-            <Button type="submit" colorScheme="primary">
+            <Button colorScheme="primary" type="submit">
               Create
             </Button>
           </ModalFooter>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/engine-webhooks.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/engine-webhooks.tsx
index 26bc2c9176a..406e014c802 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/engine-webhooks.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/engine-webhooks.tsx
@@ -27,8 +27,8 @@ export const EngineWebhooks: React.FC<EngineWebhooksProps> = ({
           Notify your app backend when transaction and backend wallet events
           occur.{" "}
           <Link
-            href="https://portal.thirdweb.com/infrastructure/engine/features/webhooks"
             color="primary.500"
+            href="https://portal.thirdweb.com/infrastructure/engine/features/webhooks"
             isExternal
           >
             Learn more about webhooks
@@ -37,13 +37,13 @@ export const EngineWebhooks: React.FC<EngineWebhooksProps> = ({
         </Text>
       </div>
       <WebhooksTable
+        authToken={authToken}
         instanceUrl={instanceUrl}
-        webhooks={webhooks.data || []}
-        isPending={webhooks.isPending}
         isFetched={webhooks.isFetched}
-        authToken={authToken}
+        isPending={webhooks.isPending}
+        webhooks={webhooks.data || []}
       />
-      <AddWebhookButton instanceUrl={instanceUrl} authToken={authToken} />
+      <AddWebhookButton authToken={authToken} instanceUrl={instanceUrl} />
     </div>
   );
 };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/webhooks-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/webhooks-table.tsx
index d53c35d0289..b8f0243ebd0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/webhooks-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/components/webhooks-table.tsx
@@ -1,8 +1,3 @@
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { FormItem } from "@/components/ui/form";
 import {
   type EngineWebhook,
   useEngineDeleteWebhook,
@@ -30,6 +25,11 @@ import { useState } from "react";
 import { toast } from "sonner";
 import { Card, FormLabel, Text } from "tw-components";
 import { shortenString } from "utils/usedapp-external";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { FormItem } from "@/components/ui/form";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 
 export function beautifyString(str: string): string {
   return str
@@ -50,43 +50,42 @@ const columnHelper = createColumnHelper<EngineWebhook>();
 
 const columns = [
   columnHelper.accessor("name", {
-    header: "Name",
     cell: (cell) => {
       return <Text>{cell.getValue()}</Text>;
     },
+    header: "Name",
   }),
   columnHelper.accessor("eventType", {
-    header: "Event Type",
     cell: (cell) => {
       return <Text>{beautifyString(cell.getValue())}</Text>;
     },
+    header: "Event Type",
   }),
   columnHelper.accessor("secret", {
-    header: "Secret",
     cell: (cell) => {
       return (
         <CopyTextButton
+          copyIconPosition="right"
           textToCopy={cell.getValue() || ""}
           textToShow={shortenString(cell.getValue() || "")}
           tooltip="Secret"
-          copyIconPosition="right"
         />
       );
     },
+    header: "Secret",
   }),
   columnHelper.accessor("url", {
-    header: "URL",
     cell: (cell) => {
       const url = cell.getValue();
       return (
-        <Text maxW={300} isTruncated>
+        <Text isTruncated maxW={300}>
           {url}
         </Text>
       );
     },
+    header: "URL",
   }),
   columnHelper.accessor("createdAt", {
-    header: "Created At",
     cell: (cell) => {
       const value = cell.getValue();
       if (!value) {
@@ -96,8 +95,8 @@ const columns = [
       const date = new Date(value);
       return (
         <Tooltip
-          borderRadius="md"
           bg="transparent"
+          borderRadius="md"
           boxShadow="none"
           label={
             <Card bgColor="backgroundHighlight">
@@ -110,6 +109,7 @@ const columns = [
         </Tooltip>
       );
     },
+    header: "Created At",
   }),
 ];
 
@@ -129,46 +129,46 @@ export const WebhooksTable: React.FC<WebhooksTableProps> = ({
   return (
     <>
       <TWTable
-        title="webhooks"
-        data={activeWebhooks}
         columns={columns}
-        isPending={isPending}
+        data={activeWebhooks}
         isFetched={isFetched}
+        isPending={isPending}
         onMenuClick={[
           {
             icon: <MailQuestionIcon className="size-4" />,
-            text: "Test webhook",
             onClick: (row) => {
               setSelectedWebhook(row);
               testDisclosure.onOpen();
             },
+            text: "Test webhook",
           },
           {
             icon: <TrashIcon className="size-4" />,
-            text: "Delete",
+            isDestructive: true,
             onClick: (row) => {
               setSelectedWebhook(row);
               deleteDisclosure.onOpen();
             },
-            isDestructive: true,
+            text: "Delete",
           },
         ]}
+        title="webhooks"
       />
 
       {selectedWebhook && deleteDisclosure.isOpen && (
         <DeleteWebhookModal
-          webhook={selectedWebhook}
+          authToken={authToken}
           disclosure={deleteDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
+          webhook={selectedWebhook}
         />
       )}
       {selectedWebhook && testDisclosure.isOpen && (
         <TestWebhookModal
-          webhook={selectedWebhook}
+          authToken={authToken}
           disclosure={testDisclosure}
           instanceUrl={instanceUrl}
-          authToken={authToken}
+          webhook={selectedWebhook}
         />
       )}
     </>
@@ -196,23 +196,23 @@ function DeleteWebhookModal({
     const promise = deleteWebhook.mutateAsync(
       { id: webhook.id },
       {
-        onSuccess: () => {
-          disclosure.onClose();
-        },
         onError: (error) => {
           console.error(error);
         },
+        onSuccess: () => {
+          disclosure.onClose();
+        },
       },
     );
 
     toast.promise(promise, {
-      success: "Successfully deleted webhook.",
       error: "Failed to delete webhook.",
+      success: "Successfully deleted webhook.",
     });
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Delete Webhook</ModalHeader>
@@ -241,7 +241,7 @@ function DeleteWebhookModal({
           <Button onClick={disclosure.onClose} variant="outline">
             Cancel
           </Button>
-          <Button type="submit" variant="destructive" onClick={onDelete}>
+          <Button onClick={onDelete} type="submit" variant="destructive">
             Delete
           </Button>
         </ModalFooter>
@@ -263,8 +263,8 @@ function TestWebhookModal({
   authToken,
 }: TestWebhookModalProps) {
   const { mutate: testWebhook, isPending } = useEngineTestWebhook({
-    instanceUrl,
     authToken,
+    instanceUrl,
   });
 
   const [status, setStatus] = useState<number | undefined>();
@@ -283,7 +283,7 @@ function TestWebhookModal({
   };
 
   return (
-    <Modal isOpen={disclosure.isOpen} onClose={disclosure.onClose} isCentered>
+    <Modal isCentered isOpen={disclosure.isOpen} onClose={disclosure.onClose}>
       <ModalOverlay />
       <ModalContent className="!bg-background rounded-lg border border-border">
         <ModalHeader>Test Webhook</ModalHeader>
@@ -295,7 +295,7 @@ function TestWebhookModal({
               <span className="font-mono">{webhook.url}</span>
             </FormItem>
 
-            <Button type="submit" onClick={onTest} disabled={isPending}>
+            <Button disabled={isPending} onClick={onTest} type="submit">
               {isPending && <Spinner className="mr-2 size-4" />}
               Send Request
             </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/page.tsx
index d7afe756224..6511ddc0a51 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/webhooks/page.tsx
@@ -6,9 +6,9 @@ export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
   const { instance, authToken } = await engineInstancePageHandler({
     engineId: params.engineId,
-    teamSlug: params.team_slug,
     projectSlug: params.project_slug,
+    teamSlug: params.team_slug,
   });
 
-  return <EngineWebhooks instanceUrl={instance.url} authToken={authToken} />;
+  return <EngineWebhooks authToken={authToken} instanceUrl={instance.url} />;
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineAccessPermission.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineAccessPermission.ts
index 2c88348fa30..000b27a31ec 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineAccessPermission.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineAccessPermission.ts
@@ -12,11 +12,11 @@ export async function getEngineAccessPermission(params: {
       : `${params.instanceUrl}/`;
 
     const res = await fetch(`${instanceUrl}auth/permissions/get-all`, {
-      method: "GET",
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${params.authToken}`,
+        "Content-Type": "application/json",
       },
+      method: "GET",
     });
 
     return {
@@ -25,9 +25,9 @@ export async function getEngineAccessPermission(params: {
     };
   } catch {
     return {
+      fetchFailed: true,
       ok: false,
       status: 500,
-      fetchFailed: true,
     };
   }
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstance.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstance.ts
index 11cdcbdb944..4f1197e4365 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstance.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstance.ts
@@ -1,8 +1,8 @@
+import type { EngineInstance } from "@3rdweb-sdk/react/hooks/useEngine";
 import {
   NEXT_PUBLIC_DEMO_ENGINE_URL,
   NEXT_PUBLIC_THIRDWEB_API_HOST,
 } from "@/constants/public-envs";
-import type { EngineInstance } from "@3rdweb-sdk/react/hooks/useEngine";
 
 export async function getEngineInstance(params: {
   teamIdOrSlug: string;
@@ -12,14 +12,14 @@ export async function getEngineInstance(params: {
 }) {
   if (params.engineId === "sandbox") {
     const sandboxEngine: EngineInstance = {
-      id: "sandbox",
-      url: NEXT_PUBLIC_DEMO_ENGINE_URL,
-      name: "Demo Engine",
-      status: "active",
-      lastAccessedAt: new Date().toISOString(),
       accountId: params.accountId,
+      id: "sandbox",
       isCloudHosted: false,
       isPlanEngine: false,
+      lastAccessedAt: new Date().toISOString(),
+      name: "Demo Engine",
+      status: "active",
+      url: NEXT_PUBLIC_DEMO_ENGINE_URL,
     };
 
     return sandboxEngine;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstancePageMeta.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstancePageMeta.ts
index c3bb89bee27..607e4176168 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstancePageMeta.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstancePageMeta.ts
@@ -1,6 +1,6 @@
+import { notFound } from "next/navigation";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound } from "next/navigation";
 import { getValidAccount } from "../../../../../../../account/settings/getAccount";
 import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../../../login/loginRedirect";
@@ -24,10 +24,10 @@ export async function engineInstancePageHandler(params: {
   }
 
   const instance = await getEngineInstance({
-    teamIdOrSlug: params.teamSlug,
+    accountId: account.id,
     authToken,
     engineId: params.engineId,
-    accountId: account.id,
+    teamIdOrSlug: params.teamSlug,
   });
 
   if (!instance || !team) {
@@ -40,5 +40,5 @@ export async function engineInstancePageHandler(params: {
     teamId: team.id,
   });
 
-  return { instance, authToken, account, client };
+  return { account, authToken, client, instance };
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstances.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstances.ts
index 833e2be70da..8258e289b6a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstances.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/_utils/getEngineInstances.ts
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import type { EngineInstance } from "@3rdweb-sdk/react/hooks/useEngine";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 
 export async function getEngineInstances(params: {
   authToken: string;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/page.tsx
index 9e4757b2f77..b0b5e8bab33 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { redirect } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { getEngineInstances } from "./dedicated/_utils/getEngineInstances";
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/hooks/project-contracts.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/hooks/project-contracts.ts
index 2e8e2dc42b9..bebcda01a5e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/hooks/project-contracts.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/hooks/project-contracts.ts
@@ -1,7 +1,7 @@
 "use client";
 
-import { apiServerProxy } from "@/actions/proxies";
 import { useMutation } from "@tanstack/react-query";
+import { apiServerProxy } from "@/actions/proxies";
 
 export function useAddContractToProject() {
   return useMutation({
@@ -14,17 +14,17 @@ export function useAddContractToProject() {
       contractType: "DropERC20" | "DropERC721" | "DropERC1155" | undefined;
     }) => {
       const res = await apiServerProxy({
-        pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}/contracts`,
-        method: "POST",
         body: JSON.stringify({
-          contractAddress: params.contractAddress,
           chainId: params.chainId,
-          deploymentType: params.deploymentType,
+          contractAddress: params.contractAddress,
           contractType: params.contractType,
+          deploymentType: params.deploymentType,
         }),
         headers: {
           "Content-Type": "application/json",
         },
+        method: "POST",
+        pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}/contracts`,
       });
 
       if (!res.ok) {
@@ -52,8 +52,8 @@ export async function removeContractFromProject(params: {
   contractId: string;
 }) {
   const res = await apiServerProxy({
-    pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}/contracts/${params.contractId}`,
     method: "DELETE",
+    pathname: `/v1/teams/${params.teamId}/projects/${params.projectId}/contracts/${params.contractId}`,
   });
 
   if (!res.ok) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/blueprint-card.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/blueprint-card.tsx
index 8acabd95a11..79d750da614 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/blueprint-card.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/blueprint-card.tsx
@@ -1,4 +1,3 @@
-import { Button } from "@/components/ui/button";
 import {
   Code2Icon,
   DatabaseIcon,
@@ -6,24 +5,25 @@ import {
   ZapIcon,
 } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
 export function BlueprintCard() {
   const features = [
     {
+      description: "RESTful endpoints for any application",
       icon: Code2Icon,
       title: "Easy-to-Use API",
-      description: "RESTful endpoints for any application",
     },
     {
-      icon: DatabaseIcon,
-      title: "Managed Infrastructure",
       description:
         "No need to index blockchains yourself or manage infrastructure and RPC costs.",
+      icon: DatabaseIcon,
+      title: "Managed Infrastructure",
     },
     {
+      description: "Access any transaction, event or token API data",
       icon: ZapIcon,
       title: "Lightning-Fast Queries",
-      description: "Access any transaction, event or token API data",
     },
   ];
 
@@ -35,11 +35,11 @@ export function BlueprintCard() {
           <h2 className="font-semibold text-2xl tracking-tight">Blueprints</h2>
 
           <div className="flex items-center gap-2">
-            <Button asChild variant="outline" className="gap-2 bg-background">
+            <Button asChild className="gap-2 bg-background" variant="outline">
               <Link
                 href="https://portal.thirdweb.com/insight/blueprints"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 Docs <ExternalLinkIcon className="size-4" />
               </Link>
@@ -64,7 +64,7 @@ export function BlueprintCard() {
         {/* Features */}
         <div className="flex flex-col gap-6">
           {features.map((feature) => (
-            <div key={feature.title} className="flex items-start gap-3">
+            <div className="flex items-start gap-3" key={feature.title}>
               <div className="rounded-full border p-2">
                 <feature.icon className="size-4 text-muted-foreground" />
               </div>
@@ -81,11 +81,11 @@ export function BlueprintCard() {
 
       {/* Playground link */}
       <div className="border-t p-4 lg:p-6">
-        <Button className="w-full gap-2" asChild>
+        <Button asChild className="w-full gap-2">
           <Link
             href="https://playground.thirdweb.com/insight"
-            target="_blank"
             rel="noopener noreferrer"
+            target="_blank"
           >
             Try Insight blueprints in the playground
             <ExternalLinkIcon className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/insight-ftux.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/insight-ftux.tsx
index a43ea474d24..12fc1cd34ce 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/insight-ftux.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/insight-ftux.tsx
@@ -3,54 +3,52 @@ import { isProd } from "@/constants/env-utils";
 import { ClientIDSection } from "../components/ProjectFTUX/ClientIDSection";
 import { WaitingForIntegrationCard } from "../components/WaitingForIntegrationCard/WaitingForIntegrationCard";
 
-export function InsightFTUX(props: {
-  clientId: string;
-}) {
+export function InsightFTUX(props: { clientId: string }) {
   return (
     <WaitingForIntegrationCard
-      title="Integrate Insight"
       codeTabs={[
         {
-          label: "JavaScript",
           code: (
             <CodeServer
-              code={jsCode(props.clientId)}
               className="bg-background"
+              code={jsCode(props.clientId)}
               lang="ts"
             />
           ),
+          label: "JavaScript",
         },
         {
-          label: "Python",
           code: (
             <CodeServer
-              code={pythonCode(props.clientId)}
               className="bg-background"
+              code={pythonCode(props.clientId)}
               lang="python"
             />
           ),
+          label: "Python",
         },
         {
-          label: "Curl",
           code: (
             <CodeServer
-              code={curlCode(props.clientId)}
               className="bg-background"
+              code={curlCode(props.clientId)}
               lang="bash"
             />
           ),
+          label: "Curl",
         },
       ]}
       ctas={[
         {
-          label: "Try on Playground",
           href: "https://playground.thirdweb.com/insight",
+          label: "Try on Playground",
         },
         {
-          label: "View Docs",
           href: "https://portal.thirdweb.com/insight",
+          label: "View Docs",
         },
       ]}
+      title="Integrate Insight"
     >
       <ClientIDSection clientId={props.clientId} />
       <div className="h-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/page.tsx
index 276b67d0adb..3c55930a3d0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/insight/page.tsx
@@ -1,7 +1,7 @@
+import { notFound } from "next/navigation";
 import { isProjectActive } from "@/api/analytics";
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
-import { notFound } from "next/navigation";
 import { FooterLinksSection } from "../components/footer/FooterLinksSection";
 import { BlueprintCard } from "./blueprint-card";
 import { InsightFTUX } from "./insight-ftux";
@@ -24,8 +24,8 @@ export default async function Page(props: {
   }
 
   const activeResponse = await isProjectActive({
-    teamId: team.id,
     projectId: project.id,
+    teamId: team.id,
   });
 
   const showFTUX = !activeResponse.insight;
@@ -68,41 +68,41 @@ export default async function Page(props: {
 function InsightFooter() {
   return (
     <FooterLinksSection
-      left={{
-        title: "Documentation",
+      center={{
         links: [
           {
-            label: "Overview",
-            href: "https://portal.thirdweb.com/insight",
+            href: "https://www.youtube.com/watch?v=U2aW7YIUJVw",
+            label:
+              "Blockchain Data on Any EVM - Quick and Easy REST APIs for Onchain Data",
           },
           {
-            label: "API Reference",
-            href: "https://insight-api.thirdweb.com/reference",
+            href: "https://www.youtube.com/watch?v=HvqewXLVRig",
+            label: "Build a Whale Alerts Telegram Bot with Insight",
           },
         ],
-      }}
-      center={{
         title: "Tutorials",
+      }}
+      left={{
         links: [
           {
-            label:
-              "Blockchain Data on Any EVM - Quick and Easy REST APIs for Onchain Data",
-            href: "https://www.youtube.com/watch?v=U2aW7YIUJVw",
+            href: "https://portal.thirdweb.com/insight",
+            label: "Overview",
           },
           {
-            label: "Build a Whale Alerts Telegram Bot with Insight",
-            href: "https://www.youtube.com/watch?v=HvqewXLVRig",
+            href: "https://insight-api.thirdweb.com/reference",
+            label: "API Reference",
           },
         ],
+        title: "Documentation",
       }}
       right={{
-        title: "Demos",
         links: [
           {
-            label: "API Playground",
             href: "https://playground.thirdweb.com/insight",
+            label: "API Playground",
           },
         ],
+        title: "Demos",
       }}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/layout.tsx
index 7a7e3cdbf57..8a5638a65c0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/layout.tsx
@@ -1,13 +1,13 @@
+import { AnnouncementBanner } from "components/notices/AnnouncementBanner";
+import Link from "next/link";
+import { redirect } from "next/navigation";
 import { getProject, getProjects } from "@/api/projects";
 import { getTeamBySlug, getTeams } from "@/api/team";
 import { Button } from "@/components/ui/button";
 import { SidebarProvider } from "@/components/ui/sidebar";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { AnnouncementBanner } from "components/notices/AnnouncementBanner";
-import Link from "next/link";
-import { redirect } from "next/navigation";
-import { siwaExamplePrompts } from "../../../../(dashboard)/support/definitions";
 import { CustomChatButton } from "../../../../../../components/CustomChat/CustomChatButton";
+import { siwaExamplePrompts } from "../../../../(dashboard)/support/definitions";
 import { getValidAccount } from "../../../../account/settings/getAccount";
 import {
   getAuthToken,
@@ -43,8 +43,8 @@ export default async function ProjectLayout(props: {
 
   const teamsAndProjects = await Promise.all(
     teams.map(async (team) => ({
-      team,
       projects: await getProjects(team.slug),
+      team,
     })),
   );
 
@@ -71,7 +71,7 @@ export default async function ProjectLayout(props: {
                   You can only view this team, not take any actions.
                 </p>
               </div>
-              <Button variant="default" asChild>
+              <Button asChild variant="default">
                 <Link href="/team/~">Leave Staff Mode</Link>
               </Button>
             </div>
@@ -80,12 +80,12 @@ export default async function ProjectLayout(props: {
         <div className="sticky top-0 z-10 border-border border-b bg-card">
           <AnnouncementBanner />
           <TeamHeaderLoggedIn
-            currentProject={project}
-            currentTeam={team}
-            teamsAndProjects={teamsAndProjects}
             account={account}
             accountAddress={accountAddress}
             client={client}
+            currentProject={project}
+            currentTeam={team}
+            teamsAndProjects={teamsAndProjects}
           />
         </div>
         <ProjectSidebarLayout layoutPath={layoutPath}>
@@ -94,15 +94,15 @@ export default async function ProjectLayout(props: {
       </div>
       <div className="fixed right-6 bottom-6 z-50">
         <CustomChatButton
+          authToken={authToken}
+          clientId={project.publishableKey}
+          examplePrompts={siwaExamplePrompts}
+          isFloating={true}
           isLoggedIn={true}
+          label="Ask AI Assistant"
           networks="all"
-          isFloating={true}
           pageType="support"
-          label="Ask AI Assistant"
-          examplePrompts={siwaExamplePrompts}
           teamId={team.id}
-          clientId={project.publishableKey}
-          authToken={authToken}
         />
       </div>
       <SaveLastUsedProject projectId={project.id} teamId={team.id} />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/fetch-nebula-analytics.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/fetch-nebula-analytics.tsx
index 2b5f5c34b2f..8a25dfaf227 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/fetch-nebula-analytics.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/fetch-nebula-analytics.tsx
@@ -1,6 +1,6 @@
 import "server-only";
-import { ANALYTICS_SERVICE_URL } from "@/constants/server-envs";
 import { unstable_cache } from "next/cache";
+import { ANALYTICS_SERVICE_URL } from "@/constants/server-envs";
 
 export type NebulaAnalyticsDataItem = {
   date: string;
@@ -36,16 +36,16 @@ export const fetchNebulaAnalytics = 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 NebulaAnalyticsDataItem[],
+      ok: true as const,
     };
   },
   ["nebula-analytics"],
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-filter.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-filter.tsx
index 76a2d83ad8f..020e15a3fbb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-filter.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-filter.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { normalizeTimeISOString } from "@/lib/time";
 import { DateRangeSelector } from "components/analytics/date-range-selector";
 import { IntervalSelector } from "components/analytics/interval-selector";
 import { getNebulaFiltersFromSearchParams } from "lib/time";
@@ -8,6 +7,7 @@ import {
   useResponsiveSearchParams,
   useSetResponsiveSearchParams,
 } from "responsive-rsc";
+import { normalizeTimeISOString } from "@/lib/time";
 
 export function NebulaAnalyticsFilter() {
   const responsiveSearchParams = useResponsiveSearchParams();
@@ -15,15 +15,15 @@ export function NebulaAnalyticsFilter() {
 
   const { range, interval } = getNebulaFiltersFromSearchParams({
     from: responsiveSearchParams.from,
-    to: responsiveSearchParams.to,
     interval: responsiveSearchParams.interval,
+    to: responsiveSearchParams.to,
   });
 
   return (
     <div className="no-scrollbar flex items-center gap-3 max-sm:overflow-auto">
       <DateRangeSelector
-        range={range}
         popoverAlign="end"
+        range={range}
         setRange={(newRange) => {
           setResponsiveSearchParams((v) => {
             return {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-page.tsx
index 6c3e69f3c59..898a3792edf 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-page.tsx
@@ -1,11 +1,11 @@
-import { Button } from "@/components/ui/button";
-import { normalizeTimeISOString } from "@/lib/time";
 import { FileCode2Icon, MessageSquareQuoteIcon } from "lucide-react";
 import Link from "next/link";
 import {
   ResponsiveSearchParamsProvider,
   ResponsiveSuspense,
 } from "responsive-rsc";
+import { Button } from "@/components/ui/button";
+import { normalizeTimeISOString } from "@/lib/time";
 import { fetchNebulaAnalytics } from "./fetch-nebula-analytics";
 import { NebulaAnalyticsFilter } from "./nebula-analytics-filter";
 import { NebulaAnalyticsDashboardUI } from "./nebula-analytics-ui";
@@ -28,22 +28,22 @@ export function NebulaAnalyticsPage(props: {
           <h1 className="font-semibold text-3xl tracking-tight">Nebula</h1>
 
           <div className="flex gap-3">
-            <Button variant="outline" className="gap-2 bg-card" asChild>
+            <Button asChild className="gap-2 bg-card" variant="outline">
               <Link
                 href="https://nebula.thirdweb.com"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 <MessageSquareQuoteIcon className="size-4 text-muted-foreground" />
                 Playground
               </Link>
             </Button>
 
-            <Button variant="outline" className="gap-2 bg-card" asChild>
+            <Button asChild className="gap-2 bg-card" variant="outline">
               <Link
                 href="https://portal.thirdweb.com/nebula"
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 <FileCode2Icon className="size-4 text-muted-foreground" />
                 API Reference
@@ -59,14 +59,14 @@ export function NebulaAnalyticsPage(props: {
           <NebulaAnalyticsFilter />
         </div>
         <ResponsiveSuspense
-          searchParamsUsed={["from", "to", "interval"]}
           fallback={<NebulaAnalyticsDashboardUI data={[]} isPending={true} />}
+          searchParamsUsed={["from", "to", "interval"]}
         >
           <NebulaAnalyticDashboard
+            authToken={props.authToken}
+            projectId={props.projectId}
             searchParams={props.searchParams}
             teamId={props.teamId}
-            projectId={props.projectId}
-            authToken={props.authToken}
           />
         </ResponsiveSuspense>
       </div>
@@ -89,13 +89,13 @@ async function NebulaAnalyticDashboard(props: {
   );
 
   const res = await fetchNebulaAnalytics({
-    teamId: props.teamId,
     authToken: props.authToken,
-    projectId: props.projectId,
     from: normalizeTimeISOString(range.from),
-    to: normalizeTimeISOString(range.to),
     // internally renamed
     period: interval,
+    projectId: props.projectId,
+    teamId: props.teamId,
+    to: normalizeTimeISOString(range.to),
   });
 
   if (!res.ok) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-ui.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-ui.stories.tsx
index 45902917035..df9cc2aeed7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-ui.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-ui.stories.tsx
@@ -4,13 +4,7 @@ import type { NebulaAnalyticsDataItem } from "./fetch-nebula-analytics";
 import { NebulaAnalyticsDashboardUI } from "./nebula-analytics-ui";
 
 const meta = {
-  title: "Nebula/Analytics",
   component: NebulaAnalyticsDashboardUI,
-  parameters: {
-    nextjs: {
-      appDirectory: true,
-    },
-  },
   decorators: [
     (Story) => (
       <div className="container max-w-6xl py-10">
@@ -18,6 +12,12 @@ const meta = {
       </div>
     ),
   ],
+  parameters: {
+    nextjs: {
+      appDirectory: true,
+    },
+  },
+  title: "Nebula/Analytics",
 } satisfies Meta<typeof NebulaAnalyticsDashboardUI>;
 
 export default meta;
@@ -56,10 +56,10 @@ function generateRandomNebulaAnalyticsData(
 ): NebulaAnalyticsDataItem[] {
   return Array.from({ length: days }, (_, i) => ({
     date: subDays(new Date(), i).toISOString(),
-    totalPromptTokens: randomInt(500, 700 + i * 100),
     totalCompletionTokens: randomInt(1000, 2000 + i * 100),
-    totalSessions: randomInt(400, 1000 + i * 100),
+    totalPromptTokens: randomInt(500, 700 + i * 100),
     totalRequests: randomInt(4000, 5000 + i * 100),
+    totalSessions: randomInt(400, 1000 + i * 100),
   }));
 }
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-ui.tsx
index 24120f9165f..15a556e1444 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-ui.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/nebula-analytics-ui.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
-import { SkeletonContainer } from "@/components/ui/skeleton";
 import { format } from "date-fns";
 import {
   ActivityIcon,
@@ -10,6 +8,8 @@ import {
   MessageSquareQuoteIcon,
 } from "lucide-react";
 import { useMemo } from "react";
+import { ThirdwebAreaChart } from "@/components/blocks/charts/area-chart";
+import { SkeletonContainer } from "@/components/ui/skeleton";
 import type { NebulaAnalyticsDataItem } from "./fetch-nebula-analytics";
 
 type ChartData = {
@@ -39,25 +39,25 @@ function AnalyticsChart({
 }: AnalyticsChartProps) {
   return (
     <ThirdwebAreaChart
+      chartClassName="aspect-[1.5] lg:aspect-[2.5]"
+      config={{
+        [dataKey]: {
+          color,
+          label: title,
+        },
+      }}
       data={data.map((item) => ({
         ...item,
         time: item.time.getTime(),
       }))}
-      isPending={isPending}
       header={{
-        title,
         description,
+        title,
         titleClassName: "text-xl mb-1",
       }}
-      chartClassName="aspect-[1.5] lg:aspect-[2.5]"
       hideLabel={false}
+      isPending={isPending}
       toolTipLabelFormatter={toolTipLabelFormatter}
-      config={{
-        [dataKey]: {
-          label: title,
-          color,
-        },
-      }}
     />
   );
 }
@@ -74,11 +74,11 @@ export function NebulaAnalyticsDashboardUI(props: {
       totalRequests: number;
       chartData: ChartData[];
     } = {
-      totalPromptTokens: 0,
+      chartData: [],
       totalCompletionTokens: 0,
-      totalSessions: 0,
+      totalPromptTokens: 0,
       totalRequests: 0,
-      chartData: [],
+      totalSessions: 0,
     };
 
     for (const item of props.data) {
@@ -87,11 +87,11 @@ export function NebulaAnalyticsDashboardUI(props: {
       val.totalSessions += item.totalSessions;
       val.totalRequests += item.totalRequests;
       val.chartData.push({
-        totalPromptTokens: item.totalPromptTokens,
+        time: new Date(item.date),
         totalCompletionTokens: item.totalCompletionTokens,
-        totalSessions: item.totalSessions,
+        totalPromptTokens: item.totalPromptTokens,
         totalRequests: item.totalRequests,
-        time: new Date(item.date),
+        totalSessions: item.totalSessions,
       });
     }
 
@@ -102,28 +102,28 @@ export function NebulaAnalyticsDashboardUI(props: {
     <div>
       <div className="grid grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-4">
         <StatCard
-          title="User Prompts"
-          value={data.totalRequests}
           icon={ActivityIcon}
           isPending={props.isPending}
+          title="User Prompts"
+          value={data.totalRequests}
         />
         <StatCard
-          title="Sessions Created"
-          value={data.totalSessions}
           icon={MessageSquareIcon}
           isPending={props.isPending}
+          title="Sessions Created"
+          value={data.totalSessions}
         />
         <StatCard
-          title="Prompt Tokens"
-          value={data.totalPromptTokens}
           icon={MessageCircleQuestionIcon}
           isPending={props.isPending}
+          title="Prompt Tokens"
+          value={data.totalPromptTokens}
         />
         <StatCard
-          title="Response Tokens"
-          value={data.totalCompletionTokens}
           icon={MessageSquareQuoteIcon}
           isPending={props.isPending}
+          title="Response Tokens"
+          value={data.totalCompletionTokens}
         />
       </div>
 
@@ -131,39 +131,39 @@ export function NebulaAnalyticsDashboardUI(props: {
 
       <div className="grid grid-cols-1 gap-4 xl:grid-cols-2">
         <AnalyticsChart
+          color="hsl(var(--chart-1))"
           data={data.chartData}
+          dataKey="totalRequests"
+          description="Total user-generated prompts"
           isPending={props.isPending}
           title="Prompts"
-          description="Total user-generated prompts"
-          dataKey="totalRequests"
-          color="hsl(var(--chart-1))"
         />
 
         <AnalyticsChart
+          color="hsl(var(--chart-3))"
           data={data.chartData}
+          dataKey="totalSessions"
+          description="Total chat sessions created by users"
           isPending={props.isPending}
           title="Sessions Created"
-          description="Total chat sessions created by users"
-          dataKey="totalSessions"
-          color="hsl(var(--chart-3))"
         />
 
         <AnalyticsChart
+          color="hsl(var(--chart-2))"
           data={data.chartData}
+          dataKey="totalPromptTokens"
+          description="Total tokens sent in prompts"
           isPending={props.isPending}
           title="Prompt Tokens"
-          description="Total tokens sent in prompts"
-          dataKey="totalPromptTokens"
-          color="hsl(var(--chart-2))"
         />
 
         <AnalyticsChart
+          color="hsl(var(--chart-5))"
           data={data.chartData}
+          dataKey="totalCompletionTokens"
+          description="Total tokens sent in responses"
           isPending={props.isPending}
           title="Response Tokens"
-          description="Total tokens sent in responses"
-          dataKey="totalCompletionTokens"
-          color="hsl(var(--chart-5))"
         />
       </div>
     </div>
@@ -192,11 +192,11 @@ function StatCard(props: {
       </div>
       <SkeletonContainer
         className="inline-block"
-        skeletonData={10000}
         loadedData={props.isPending ? undefined : props.value}
         render={(v) => (
           <p className="font-semibold text-2xl tracking-tight">{v}</p>
         )}
+        skeletonData={10000}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/utils.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/utils.ts
index a361b20ae65..a96c4d4216c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/utils.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/components/analytics/utils.ts
@@ -7,7 +7,7 @@ export function getNebulaAnalyticsRangeFromSearchParams(searchParams: {
 }) {
   return getNebulaFiltersFromSearchParams({
     from: searchParams.from,
-    to: searchParams.to,
     interval: searchParams.interval,
+    to: searchParams.to,
   });
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/layout.tsx
index f7d5c5aff05..a5bc9dd34f0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/layout.tsx
@@ -1,8 +1,6 @@
 import { FooterLinksSection } from "../components/footer/FooterLinksSection";
 
-export default function Layout(props: {
-  children: React.ReactNode;
-}) {
+export default function Layout(props: { children: React.ReactNode }) {
   return (
     <div className="flex grow flex-col">
       <div className="flex grow flex-col">{props.children}</div>
@@ -19,52 +17,52 @@ export default function Layout(props: {
 function NebulaFooter() {
   return (
     <FooterLinksSection
-      left={{
-        title: "Documentation",
+      center={{
         links: [
           {
-            label: "API Reference",
-            href: "https://portal.thirdweb.com/nebula/get-started",
-          },
-          {
-            label: "Python SDK",
-            href: "https://portal.thirdweb.com/nebula/tools/python-sdk/installation",
+            href: "https://www.youtube.com/watch?v=xrm0emiRGMk",
+            label: "Build a Telegram Mini App ERC20 deployer, powered by AI",
           },
           {
-            label: "MCP Server",
-            href: "https://portal.thirdweb.com/nebula/mcp-server/get-started",
+            href: "https://www.youtube.com/watch?v=vBooJytkXa4",
+            label: "Build an AI Powered Blockchain Explorer",
           },
         ],
-      }}
-      center={{
         title: "Tutorials",
+      }}
+      left={{
         links: [
           {
-            href: "https://www.youtube.com/watch?v=xrm0emiRGMk",
-            label: "Build a Telegram Mini App ERC20 deployer, powered by AI",
+            href: "https://portal.thirdweb.com/nebula/get-started",
+            label: "API Reference",
           },
           {
-            label: "Build an AI Powered Blockchain Explorer",
-            href: "https://www.youtube.com/watch?v=vBooJytkXa4",
+            href: "https://portal.thirdweb.com/nebula/tools/python-sdk/installation",
+            label: "Python SDK",
+          },
+          {
+            href: "https://portal.thirdweb.com/nebula/mcp-server/get-started",
+            label: "MCP Server",
           },
         ],
+        title: "Documentation",
       }}
       right={{
-        title: "Templates",
         links: [
           {
-            label: "Bouncer Eliza Agent",
             href: "https://github.com/thirdweb-example/bouncer-eliza-agent",
+            label: "Bouncer Eliza Agent",
           },
           {
-            label: "Block Explorer",
             href: "https://github.com/thirdweb-example/nebula-block-explorer",
+            label: "Block Explorer",
           },
           {
-            label: "ERC20 Telegram Mini-app Token Deployer",
             href: "https://github.com/thirdweb-example/erc20-token-deployer",
+            label: "ERC20 Telegram Mini-app Token Deployer",
           },
         ],
+        title: "Templates",
       }}
     />
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/nebula-ftux.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/nebula-ftux.tsx
index 7eb8b8e2efe..10e9d94264c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/nebula-ftux.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/nebula-ftux.tsx
@@ -9,46 +9,46 @@ export function NebulaFTUX(props: {
 }) {
   return (
     <WaitingForIntegrationCard
-      title="Integrate Nebula"
       codeTabs={[
         {
-          label: "JavaScript",
           code: (
-            <CodeServer code={jsCode} className="bg-background" lang="ts" />
+            <CodeServer className="bg-background" code={jsCode} lang="ts" />
           ),
+          label: "JavaScript",
         },
         {
-          label: "Python",
           code: (
             <CodeServer
-              code={pythonCode}
               className="bg-background"
+              code={pythonCode}
               lang="python"
             />
           ),
+          label: "Python",
         },
         {
-          label: "Curl",
           code: (
-            <CodeServer code={curlCode} className="bg-background" lang="bash" />
+            <CodeServer className="bg-background" code={curlCode} lang="bash" />
           ),
+          label: "Curl",
         },
       ]}
       ctas={[
         {
-          label: "Try on Playground",
           href: "https://nebula.thirdweb.com/",
+          label: "Try on Playground",
         },
         {
-          label: "View Docs",
           href: "https://portal.thirdweb.com/nebula",
+          label: "View Docs",
         },
       ]}
+      title="Integrate Nebula"
     >
       <SecretKeySection
+        projectId={props.projectId}
         secretKeyMasked={props.secretKeyMasked}
         teamId={props.teamId}
-        projectId={props.projectId}
       />
       <div className="h-4" />
     </WaitingForIntegrationCard>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/page.tsx
index 05643837434..0cd59a39315 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/nebula/page.tsx
@@ -1,7 +1,7 @@
+import { redirect } from "next/navigation";
 import { isProjectActive } from "@/api/analytics";
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
-import { redirect } from "next/navigation";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../login/loginRedirect";
 import { NebulaAnalyticsPage } from "./components/analytics/nebula-analytics-page";
@@ -42,8 +42,8 @@ export default async function Page(props: {
   }
 
   const activeResponse = await isProjectActive({
-    teamId: team.id,
     projectId: project.id,
+    teamId: team.id,
   });
 
   const showFTUX = !activeResponse.nebula;
@@ -59,9 +59,9 @@ export default async function Page(props: {
 
         <div className="container mt-6 max-w-7xl">
           <NebulaFTUX
+            projectId={project.id}
             secretKeyMasked={project.secretKeys[0]?.masked || ""}
             teamId={team.id}
-            projectId={project.id}
           />
         </div>
       </div>
@@ -70,10 +70,10 @@ export default async function Page(props: {
 
   return (
     <NebulaAnalyticsPage
-      teamId={team.id}
       authToken={authToken}
-      searchParams={searchParams}
       projectId={project.id}
+      searchParams={searchParams}
+      teamId={team.id}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/page.tsx
index 75854523105..a6b8a44b8ae 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/page.tsx
@@ -1,12 +1,22 @@
-import { type Project, getProject } from "@/api/projects";
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
-import { redirect } from "next/navigation";
-
+import {
+  EmptyStateCard,
+  EmptyStateContent,
+} from "app/(app)/team/components/Analytics/EmptyStateCard";
 import {
   type DurationId,
-  type Range,
   getLastNDaysRange,
+  type Range,
 } from "components/analytics/date-range-selector";
+import { RangeSelector } from "components/analytics/range-selector";
+import { redirect } from "next/navigation";
+import { Suspense } from "react";
+import type { ThirdwebClient } from "thirdweb";
+import {
+  type ChainMetadata,
+  defineChain,
+  getChainMetadata,
+} from "thirdweb/chains";
+import { getWalletInfo, type WalletId } from "thirdweb/wallets";
 import type {
   InAppWalletStats,
   UniversalBridgeStats,
@@ -14,7 +24,6 @@ import type {
   WalletStats,
   WalletUserStats,
 } from "types/analytics";
-
 import {
   getInAppWalletUsage,
   getUniversalBridgeUsage,
@@ -23,20 +32,9 @@ import {
   getWalletUsers,
   isProjectActive,
 } from "@/api/analytics";
+import { getProject, type Project } from "@/api/projects";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import {
-  EmptyStateCard,
-  EmptyStateContent,
-} from "app/(app)/team/components/Analytics/EmptyStateCard";
-import { RangeSelector } from "components/analytics/range-selector";
-import { Suspense } from "react";
-import type { ThirdwebClient } from "thirdweb";
-import {
-  type ChainMetadata,
-  defineChain,
-  getChainMetadata,
-} from "thirdweb/chains";
-import { type WalletId, getWalletInfo } from "thirdweb/wallets";
 import { LoadingChartState } from "../../../../../../components/analytics/empty-chart-state";
 import { getAuthToken } from "../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../login/loginRedirect";
@@ -89,8 +87,8 @@ export default async function ProjectOverviewPage(props: PageProps) {
   };
 
   const activeStatus = await isProjectActive({
-    teamId: project.teamId,
     projectId: project.id,
+    teamId: project.teamId,
   });
 
   const isActive = Object.values(activeStatus).some((v) => !!v);
@@ -105,10 +103,10 @@ export default async function ProjectOverviewPage(props: PageProps) {
       <div className="w-full border-b py-10">
         <div className="container max-w-7xl">
           <Header
-            title={project.name}
             interval={interval}
             range={range}
             showRangeSelector={isActive}
+            title={project.name}
           />
         </div>
       </div>
@@ -123,12 +121,12 @@ export default async function ProjectOverviewPage(props: PageProps) {
         <div className="container flex max-w-7xl grow flex-col">
           <Suspense fallback={<GenericLoadingPage />}>
             <ProjectAnalytics
+              client={client}
+              interval={interval}
               params={params}
               project={project}
               range={range}
-              interval={interval}
               searchParams={searchParams}
-              client={client}
             />
           </Suspense>
         </div>
@@ -153,12 +151,12 @@ async function ProjectAnalytics(props: {
     <div className="flex grow flex-col gap-6">
       <Suspense fallback={<LoadingChartState className="h-[458px] border" />}>
         <AsyncAppHighlightsCard
+          client={client}
+          interval={interval}
+          params={params}
           project={project}
           range={range}
-          interval={interval}
           searchParams={searchParams}
-          client={client}
-          params={params}
         />
       </Suspense>
 
@@ -173,36 +171,36 @@ async function ProjectAnalytics(props: {
       </div>
 
       <TransactionsCharts
-        searchParams={searchParams}
+        client={client}
         from={range.from}
-        to={range.to}
         period={interval}
+        searchParams={searchParams}
         teamId={project.teamId}
-        client={client}
+        to={range.to}
       />
 
       <Suspense fallback={<LoadingChartState className="h-[458px] border" />}>
         <AsyncTotalSponsoredCard
+          interval={interval}
           project={project}
           range={range}
-          interval={interval}
           searchParams={searchParams}
         />
       </Suspense>
 
       <RpcMethodBarChartCard
         from={range.from}
-        to={range.to}
         period={interval}
-        teamId={project.teamId}
         projectId={project.id}
+        teamId={project.teamId}
+        to={range.to}
       />
       <EngineCloudChartCard
         from={range.from}
-        to={range.to}
         period={interval}
-        teamId={project.teamId}
         projectId={project.id}
+        teamId={project.teamId}
+        to={range.to}
       />
     </div>
   );
@@ -246,11 +244,11 @@ function processTimeSeriesData(
       .reduce((acc, curr) => acc + curr.developerFeeUsdCents / 100, 0);
 
     metrics.push({
-      date: stat.date,
       activeUsers: stat.totalUsers ?? 0,
+      date: stat.date,
+      feesCollected: fees,
       newUsers: stat.newUsers ?? 0,
       totalVolume: volume,
-      feesCollected: fees,
     });
   }
 
@@ -265,18 +263,18 @@ export async function AsyncTotalSponsoredCard(props: {
 }) {
   const [userOpUsageTimeSeries, userOpUsage] = await Promise.allSettled([
     getUserOpUsage({
-      teamId: props.project.teamId,
-      projectId: props.project.id,
       from: props.range.from,
-      to: props.range.to,
       period: props.interval,
+      projectId: props.project.id,
+      teamId: props.project.teamId,
+      to: props.range.to,
     }),
     getUserOpUsage({
-      teamId: props.project.teamId,
-      projectId: props.project.id,
       from: props.range.from,
-      to: props.range.to,
       period: "all",
+      projectId: props.project.id,
+      teamId: props.project.teamId,
+      to: props.range.to,
     }),
   ]);
 
@@ -285,15 +283,15 @@ export async function AsyncTotalSponsoredCard(props: {
     userOpUsage.value.length > 0 ? (
     <div className="">
       <TotalSponsoredCard
-        searchParams={props.searchParams}
-        data={userOpUsageTimeSeries.value}
         aggregatedData={userOpUsage.value}
+        data={userOpUsageTimeSeries.value}
+        searchParams={props.searchParams}
       />
     </div>
   ) : (
     <EmptyStateCard
-      metric="Sponsored Transactions"
       link="https://portal.thirdweb.com/typescript/v5/account-abstraction/get-started"
+      metric="Sponsored Transactions"
     />
   );
 }
@@ -303,19 +301,19 @@ async function AsyncAuthMethodDistributionCard(props: {
   range: Range;
 }) {
   const inAppWalletUsage = await getInAppWalletUsage({
-    teamId: props.project.teamId,
-    projectId: props.project.id,
     from: props.range.from,
-    to: props.range.to,
     period: "all",
+    projectId: props.project.id,
+    teamId: props.project.teamId,
+    to: props.range.to,
   }).catch(() => undefined);
 
   return inAppWalletUsage && inAppWalletUsage.length > 0 ? (
     <AuthMethodDistributionCard data={inAppWalletUsage} />
   ) : (
     <EmptyStateCard
-      metric="In-App Wallets"
       link="https://portal.thirdweb.com/typescript/v5/inAppWallet"
+      metric="In-App Wallets"
     />
   );
 }
@@ -331,18 +329,18 @@ async function AsyncAppHighlightsCard(props: {
   const [walletUserStatsTimeSeries, universalBridgeUsage] =
     await Promise.allSettled([
       getWalletUsers({
-        teamId: props.project.teamId,
-        projectId: props.project.id,
         from: props.range.from,
-        to: props.range.to,
         period: props.interval,
+        projectId: props.project.id,
+        teamId: props.project.teamId,
+        to: props.range.to,
       }),
       getUniversalBridgeUsage({
-        teamId: props.project.teamId,
-        projectId: props.project.id,
         from: props.range.from,
-        to: props.range.to,
         period: props.interval,
+        projectId: props.project.id,
+        teamId: props.project.teamId,
+        to: props.range.to,
       }),
     ]);
 
@@ -358,6 +356,7 @@ async function AsyncAppHighlightsCard(props: {
             "totalVolume"
           }
           params={props.params}
+          searchParams={props.searchParams}
           userStats={
             walletUserStatsTimeSeries.status === "fulfilled"
               ? walletUserStatsTimeSeries.value
@@ -368,15 +367,14 @@ async function AsyncAppHighlightsCard(props: {
               ? universalBridgeUsage.value
               : []
           }
-          searchParams={props.searchParams}
         />
       </div>
     );
 
   return (
     <EmptyStateCard
-      metric="Connect"
       link="https://portal.thirdweb.com/connect/quickstart"
+      metric="Connect"
     />
   );
 }
@@ -386,19 +384,19 @@ async function AsyncWalletDistributionCard(props: {
   range: Range;
 }) {
   const walletConnections = await getWalletConnections({
-    teamId: props.project.teamId,
-    projectId: props.project.id,
     from: props.range.from,
-    to: props.range.to,
     period: "all",
+    projectId: props.project.id,
+    teamId: props.project.teamId,
+    to: props.range.to,
   }).catch(() => undefined);
 
   return walletConnections && walletConnections.length > 0 ? (
     <WalletDistributionCard data={walletConnections} />
   ) : (
     <EmptyStateCard
-      metric="Connect"
       link="https://portal.thirdweb.com/connect/quickstart"
+      metric="Connect"
     />
   );
 }
@@ -419,48 +417,49 @@ function AppHighlightsCard({
   const timeSeriesData = processTimeSeriesData(userStats, volumeStats);
 
   const chartConfig = {
-    totalVolume: {
-      label: "Total Volume",
-      color: "hsl(var(--chart-2))",
-      isCurrency: true,
+    activeUsers: { color: "hsl(var(--chart-1))", label: "Active Users" },
+    feesCollected: {
+      color: "hsl(var(--chart-4))",
       emptyContent: (
         <EmptyStateContent
-          metric="Payments"
-          description="Onramp, swap, and bridge with thirdweb's Universal Bridge."
-          link="https://portal.thirdweb.com/connect/pay/overview"
+          description="Your app hasn't collected any fees yet."
+          link={`/team/${params.team_slug}/${params.project_slug}/connect/universal-bridge/settings`}
+          metric="Fees"
         />
       ),
-    },
-    feesCollected: {
-      label: "Fee Revenue",
-      color: "hsl(var(--chart-4))",
       isCurrency: true,
+      label: "Fee Revenue",
+    },
+    newUsers: { color: "hsl(var(--chart-3))", label: "New Users" },
+    totalVolume: {
+      color: "hsl(var(--chart-2))",
       emptyContent: (
         <EmptyStateContent
-          metric="Fees"
-          description="Your app hasn't collected any fees yet."
-          link={`/team/${params.team_slug}/${params.project_slug}/connect/universal-bridge/settings`}
+          description="Onramp, swap, and bridge with thirdweb's Universal Bridge."
+          link="https://portal.thirdweb.com/connect/pay/overview"
+          metric="Payments"
         />
       ),
+      isCurrency: true,
+      label: "Total Volume",
     },
-    activeUsers: { label: "Active Users", color: "hsl(var(--chart-1))" },
-    newUsers: { label: "New Users", color: "hsl(var(--chart-3))" },
   } as const;
 
   return (
     <CombinedBarChartCard
-      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
-      title="App Highlights"
-      chartConfig={chartConfig}
       activeChart={chartKey}
-      queryKey="appHighlights"
-      data={timeSeriesData}
       aggregateFn={(_data, key) => {
         if (key === "activeUsers") {
           return Math.max(...timeSeriesData.map((d) => d[key]));
         }
         return timeSeriesData.reduce((acc, curr) => acc + curr[key], 0);
       }}
+      chartConfig={chartConfig}
+      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
+      data={timeSeriesData}
+      existingQueryParams={searchParams}
+      queryKey="appHighlights"
+      title="App Highlights"
       trendFn={(data, key) =>
         data.filter((d) => (d[key] as number) > 0).length >= 2
           ? ((data[data.length - 2]?.[key] as number) ?? 0) /
@@ -468,7 +467,6 @@ function AppHighlightsCard({
             1
           : undefined
       }
-      existingQueryParams={searchParams}
     />
   );
 }
@@ -482,23 +480,23 @@ async function WalletDistributionCard({ data }: { data: WalletStats[] }) {
           () => ({ name: w.walletType }),
         );
         return {
-          walletType: w.walletType,
-          uniqueWalletsConnected: w.uniqueWalletsConnected,
           totalConnections: w.totalConnections,
+          uniqueWalletsConnected: w.uniqueWalletsConnected,
           walletName: wallet.name,
+          walletType: w.walletType,
         };
       }),
   );
 
   return (
     <PieChartCard
-      title="Wallets Connected"
       data={formattedData.map(({ walletName, uniqueWalletsConnected }) => {
         return {
-          value: uniqueWalletsConnected,
           label: walletName,
+          value: uniqueWalletsConnected,
         };
       })}
+      title="Wallets Connected"
     />
   );
 }
@@ -506,11 +504,11 @@ async function WalletDistributionCard({ data }: { data: WalletStats[] }) {
 function AuthMethodDistributionCard({ data }: { data: InAppWalletStats[] }) {
   return (
     <PieChartCard
-      title="Social Authentication"
       data={data.map(({ authenticationMethod, uniqueWalletsConnected }) => ({
-        value: uniqueWalletsConnected,
         label: authenticationMethod,
+        value: uniqueWalletsConnected,
       }))}
+      title="Social Authentication"
     />
   );
 }
@@ -572,32 +570,32 @@ async function TotalSponsoredCard({
 
   const chartConfig = {
     mainnet: {
-      label: "Mainnet Chains",
       color: "hsl(var(--chart-1))",
+      label: "Mainnet Chains",
     },
     testnet: {
-      label: "Testnet Chains",
       color: "hsl(var(--chart-2))",
+      label: "Testnet Chains",
     },
     total: {
-      label: "All Chains",
       color: "hsl(var(--chart-3))",
+      label: "All Chains",
     },
   };
 
   return (
     <CombinedBarChartCard
-      isCurrency
-      title="Gas Sponsored"
-      chartConfig={chartConfig}
-      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
-      data={timeSeriesData}
       activeChart={
         (searchParams?.totalSponsored as keyof typeof chartConfig) ?? "mainnet"
       }
-      queryKey="totalSponsored"
-      existingQueryParams={searchParams}
       aggregateFn={(_data, key) => processedAggregatedData[key]}
+      chartConfig={chartConfig}
+      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
+      data={timeSeriesData}
+      existingQueryParams={searchParams}
+      isCurrency
+      queryKey="totalSponsored"
+      title="Gas Sponsored"
       // Get the trend from the last two COMPLETE periods
       trendFn={(data, key) =>
         data.filter((d) => (d[key] as number) > 0).length >= 3
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/ProjectGeneralSettingsPage.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/ProjectGeneralSettingsPage.stories.tsx
index f52cc2ef55c..26ff6e747ab 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/ProjectGeneralSettingsPage.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/ProjectGeneralSettingsPage.stories.tsx
@@ -4,13 +4,13 @@ import { storybookThirdwebClient } from "stories/utils";
 import { ProjectGeneralSettingsPageUI } from "./ProjectGeneralSettingsPage";
 
 const meta = {
-  title: "Project/Settings",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Project/Settings",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -28,23 +28,30 @@ export const MemberAccount: Story = {
   },
 };
 
-function Story(props: {
-  isOwnerAccount: boolean;
-}) {
+function Story(props: { isOwnerAccount: boolean }) {
   const currentTeam = teamStub("currentTeam", "free");
   return (
     <div className="mx-auto w-full max-w-[1100px] px-4 py-6">
       <ProjectGeneralSettingsPageUI
-        updateProjectImage={async (file) => {
+        client={storybookThirdwebClient}
+        deleteProject={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
-          console.log("updateProjectImage", file);
+          console.log("deleteProject");
         }}
         isOwnerAccount={props.isOwnerAccount}
-        transferProject={async (newTeam) => {
+        onKeyUpdated={undefined}
+        project={projectStub("foo", currentTeam.id)}
+        rotateSecretKey={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
-          console.log("transferProject", newTeam);
+          return {
+            data: {
+              secret: `sk_${new Array(86).fill("x").join("")}`,
+              secretMasked: "sk_123...4567",
+            },
+          };
         }}
-        client={storybookThirdwebClient}
+        showNebulaSettings={false}
+        teamSlug={currentTeam.slug}
         teamsWithRole={[
           {
             role: props.isOwnerAccount ? "OWNER" : "MEMBER",
@@ -59,28 +66,19 @@ function Story(props: {
             team: teamStub("baz", "starter"),
           },
         ]}
+        transferProject={async (newTeam) => {
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+          console.log("transferProject", newTeam);
+        }}
         updateProject={async (params) => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           console.log("updateProject", params);
           return projectStub("foo", "currentTeam");
         }}
-        deleteProject={async () => {
-          await new Promise((resolve) => setTimeout(resolve, 1000));
-          console.log("deleteProject");
-        }}
-        project={projectStub("foo", currentTeam.id)}
-        teamSlug={currentTeam.slug}
-        onKeyUpdated={undefined}
-        rotateSecretKey={async () => {
+        updateProjectImage={async (file) => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
-          return {
-            data: {
-              secret: `sk_${new Array(86).fill("x").join("")}`,
-              secretMasked: "sk_123...4567",
-            },
-          };
+          console.log("updateProjectImage", file);
         }}
-        showNebulaSettings={false}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/ProjectGeneralSettingsPage.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/ProjectGeneralSettingsPage.tsx
index a18c8253202..5617962bb6f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/ProjectGeneralSettingsPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/ProjectGeneralSettingsPage.tsx
@@ -1,39 +1,4 @@
 "use client";
-import { apiServerProxy } from "@/actions/proxies";
-import type { Project } from "@/api/projects";
-import type { Team } from "@/api/team";
-import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
-import { DangerSettingCard } from "@/components/blocks/DangerSettingCard";
-import { SettingsCard } from "@/components/blocks/SettingsCard";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import { Form } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
-import { Textarea } from "@/components/ui/textarea";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { cn } from "@/lib/utils";
 import type { RotateSecretKeyAPIReturnType } from "@3rdweb-sdk/react/hooks/useApi";
 import {
   deleteProjectClient,
@@ -43,10 +8,10 @@ import {
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
 import type { ProjectService } from "@thirdweb-dev/service-utils";
-import { SERVICES } from "@thirdweb-dev/service-utils";
 import {
-  type ServiceName,
   getServiceByName,
+  SERVICES,
+  type ServiceName,
 } from "@thirdweb-dev/service-utils";
 import {
   HIDDEN_SERVICES,
@@ -63,8 +28,12 @@ import {
 } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
-import { type UseFormReturn, useForm } from "react-hook-form";
-import { type FieldArrayWithId, useFieldArray } from "react-hook-form";
+import {
+  type FieldArrayWithId,
+  type UseFormReturn,
+  useFieldArray,
+  useForm,
+} from "react-hook-form";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
 import { upload } from "thirdweb/storage";
@@ -72,22 +41,57 @@ import { RE_BUNDLE_ID } from "utils/regex";
 import { joinWithComma, toArrFromList } from "utils/string";
 import { validStrList } from "utils/validations";
 import { z } from "zod";
+import { apiServerProxy } from "@/actions/proxies";
+import type { Project } from "@/api/projects";
+import type { Team } from "@/api/team";
+import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
+import { DangerSettingCard } from "@/components/blocks/DangerSettingCard";
+import { SettingsCard } from "@/components/blocks/SettingsCard";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import { Form } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { Switch } from "@/components/ui/switch";
+import { Textarea } from "@/components/ui/textarea";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
+import { cn } from "@/lib/utils";
 
 // TODO: instead of single submit handler, move the submit to each section
 
 const projectSettingsFormSchema = z.object({
-  name: projectNameSchema,
+  bundleIds: z.string().refine((str) => validStrList(str, RE_BUNDLE_ID), {
+    message: "Some of the bundle ids are invalid",
+  }),
   domains: projectDomainsSchema,
+  name: projectNameSchema,
   servicesMeta: z.array(
     z.object({
-      name: z.string(),
-      enabled: z.boolean(),
       actions: z.array(z.string()),
+      enabled: z.boolean(),
+      name: z.string(),
     }),
   ),
-  bundleIds: z.string().refine((str) => validStrList(str, RE_BUNDLE_ID), {
-    message: "Some of the bundle ids are invalid",
-  }),
 });
 
 type ProjectSettingsPageFormSchema = z.infer<typeof projectSettingsFormSchema>;
@@ -117,69 +121,37 @@ export function ProjectGeneralSettingsPage(props: {
 
   return (
     <ProjectGeneralSettingsPageUI
-      isOwnerAccount={props.isOwnerAccount}
       client={props.client}
-      teamSlug={props.teamSlug}
-      project={props.project}
-      updateProjectImage={async (file) => {
-        let uri: string | undefined = undefined;
-
-        if (file) {
-          // upload to IPFS
-          uri = await upload({
-            client: props.client,
-            files: [file],
-          });
-        }
-
-        await updateProjectClient(
-          {
-            projectId: props.project.id,
-            teamId: props.project.teamId,
-          },
-          {
-            image: uri,
-          },
-        );
-
-        router.refresh();
-      }}
-      updateProject={async (projectValues) => {
-        return updateProjectClient(
-          {
-            projectId: props.project.id,
-            teamId: props.project.teamId,
-          },
-          projectValues,
-        );
-      }}
       deleteProject={async () => {
         await deleteProjectClient({
           projectId: props.project.id,
           teamId: props.project.teamId,
         });
       }}
+      isOwnerAccount={props.isOwnerAccount}
       onKeyUpdated={() => {
         router.refresh();
       }}
-      showNebulaSettings={props.showNebulaSettings}
+      project={props.project}
       rotateSecretKey={async () => {
         return rotateSecretKeyClient({
-          teamId: props.project.teamId,
           projectId: props.project.id,
+          teamId: props.project.teamId,
         });
       }}
+      showNebulaSettings={props.showNebulaSettings}
+      teamSlug={props.teamSlug}
       teamsWithRole={props.teamsWithRole}
       transferProject={async (newTeam) => {
         const res = await apiServerProxy({
-          pathname: `/v1/teams/${props.teamId}/projects/${props.project.id}/transfer`,
-          method: "POST",
           body: JSON.stringify({
             destinationTeamId: newTeam.id,
           }),
           headers: {
             "Content-Type": "application/json",
           },
+          method: "POST",
+          pathname: `/v1/teams/${props.teamId}/projects/${props.project.id}/transfer`,
         });
 
         if (!res.ok) {
@@ -191,6 +163,38 @@ export function ProjectGeneralSettingsPage(props: {
         // so the safe option is to just redirect to the current team landing page
         router.replace(`/team/${props.teamSlug}`);
       }}
+      updateProject={async (projectValues) => {
+        return updateProjectClient(
+          {
+            projectId: props.project.id,
+            teamId: props.project.teamId,
+          },
+          projectValues,
+        );
+      }}
+      updateProjectImage={async (file) => {
+        let uri: string | undefined;
+
+        if (file) {
+          // upload to IPFS
+          uri = await upload({
+            client: props.client,
+            files: [file],
+          });
+        }
+
+        await updateProjectClient(
+          {
+            projectId: props.project.id,
+            teamId: props.project.teamId,
+          },
+          {
+            image: uri,
+          },
+        );
+
+        router.refresh();
+      }}
     />
   );
 }
@@ -218,9 +222,9 @@ export function ProjectGeneralSettingsPageUI(props: {
 
   const paths = {
     aaConfig: `${projectLayout}/connect/account-abstraction/settings`,
+    afterDeleteRedirectTo: `/team/${props.teamSlug}`,
     inAppConfig: `${projectLayout}/connect/in-app-wallets/settings`,
     payConfig: `${projectLayout}/connect/universal-bridge/settings`,
-    afterDeleteRedirectTo: `/team/${props.teamSlug}`,
   };
 
   const { project } = props;
@@ -231,23 +235,23 @@ export function ProjectGeneralSettingsPageUI(props: {
   });
 
   const form = useForm<ProjectSettingsPageFormSchema>({
-    resolver: zodResolver(projectSettingsFormSchema),
     defaultValues: {
-      name: project.name,
-      domains: joinWithComma(project.domains),
       bundleIds: joinWithComma(project.bundleIds),
+      domains: joinWithComma(project.domains),
+      name: project.name,
       servicesMeta: SERVICES.map((service) => {
         const projectService = project.services.find(
           (projectService) => projectService.name === service.name,
         );
 
         return {
-          name: service.name as ServiceName,
-          enabled: !!projectService,
           actions: projectService?.actions || [],
+          enabled: !!projectService,
+          name: service.name as ServiceName,
         };
       }),
     },
+    resolver: zodResolver(projectSettingsFormSchema),
   });
 
   const handleSubmit = form.handleSubmit((values) => {
@@ -266,15 +270,15 @@ export function ProjectGeneralSettingsPageUI(props: {
 
           if (serviceMeta.name === "pay") {
             return {
+              actions: [],
               name: "pay",
               payoutAddress: null,
-              actions: [],
             };
           }
 
           return {
-            name: serviceMeta.name as Exclude<ProjectService["name"], "pay">,
             actions: [],
+            name: serviceMeta.name as Exclude<ProjectService["name"], "pay">,
           };
         }
 
@@ -297,45 +301,45 @@ export function ProjectGeneralSettingsPageUI(props: {
     }
 
     const projectValues: Partial<Project> = {
+      bundleIds: toArrFromList(values.bundleIds),
+      domains: toArrFromList(values.domains),
       id: project.id,
       name: values.name,
-      domains: toArrFromList(values.domains),
-      bundleIds: toArrFromList(values.bundleIds),
       services,
     };
 
     updateProject.mutate(projectValues, {
+      onError: (err) => {
+        toast.error("Failed to update project");
+        console.error(err);
+      },
       onSuccess: () => {
         toast.success("Project updated successfully");
 
         props.onKeyUpdated?.();
       },
-      onError: (err) => {
-        toast.error("Failed to update project");
-        console.error(err);
-      },
     });
   });
 
   return (
     <Form {...form}>
       <form
+        autoComplete="off"
         onSubmit={(e) => {
           e.preventDefault();
           handleSubmit();
         }}
-        autoComplete="off"
       >
         <div className="flex flex-col gap-8">
           <ProjectNameSetting
             form={form}
-            isUpdatingProject={updateProject.isPending}
             handleSubmit={handleSubmit}
+            isUpdatingProject={updateProject.isPending}
           />
           <ProjectImageSetting
-            updateProjectImage={props.updateProjectImage}
             avatar={project.image || null}
             client={props.client}
+            updateProjectImage={props.updateProjectImage}
           />
           <ProjectKeyDetails
             project={project}
@@ -344,35 +348,35 @@ export function ProjectGeneralSettingsPageUI(props: {
           <ProjectIdCard project={project} />
           <AllowedDomainsSetting
             form={form}
-            isUpdatingProject={updateProject.isPending}
             handleSubmit={handleSubmit}
+            isUpdatingProject={updateProject.isPending}
           />
           <AllowedBundleIDsSetting
             form={form}
-            isUpdatingProject={updateProject.isPending}
             handleSubmit={handleSubmit}
+            isUpdatingProject={updateProject.isPending}
           />
           <EnabledServicesSetting
             form={form}
-            isUpdatingProject={updateProject.isPending}
             handleSubmit={handleSubmit}
+            isUpdatingProject={updateProject.isPending}
             paths={paths}
             showNebulaSettings={props.showNebulaSettings}
           />
           <TransferProject
-            isOwnerAccount={props.isOwnerAccount}
             client={props.client}
+            currentTeamId={project.teamId}
+            isOwnerAccount={props.isOwnerAccount}
             projectName={project.name}
             teamsWithRole={props.teamsWithRole}
-            currentTeamId={project.teamId}
             transferProject={props.transferProject}
           />
           <DeleteProject
-            projectName={project.name}
             deleteProject={props.deleteProject}
             onDeleteSuccessful={() => {
               router.replace(paths.afterDeleteRedirectTo);
             }}
+            projectName={project.name}
           />
         </div>
       </form>
@@ -389,19 +393,19 @@ function ProjectNameSetting(props: {
 
   return (
     <SettingsCard
+      bottomText="Please use 64 characters at maximum"
+      errorText={form.getFieldState("name").error?.message}
       header={{
-        title: "Project Name",
         description:
           "Assign a name to identify your project on thirdweb dashboard",
+        title: "Project Name",
       }}
       noPermissionText={undefined}
-      errorText={form.getFieldState("name").error?.message}
       saveButton={{
-        onClick: handleSubmit,
         disabled: false,
         isPending: props.isUpdatingProject,
+        onClick: handleSubmit,
       }}
-      bottomText="Please use 64 characters at maximum"
     >
       <Input
         autoFocus
@@ -414,26 +418,24 @@ function ProjectNameSetting(props: {
   );
 }
 
-function ProjectIdCard(props: {
-  project: Project;
-}) {
+function ProjectIdCard(props: { project: Project }) {
   return (
     <SettingsCard
+      bottomText="Used when interacting with the thirdweb API"
+      errorText={undefined}
       header={{
-        title: "Project ID",
         description: "This is your project's ID on thirdweb",
+        title: "Project ID",
       }}
-      bottomText="Used when interacting with the thirdweb API"
       noPermissionText={undefined}
-      errorText={undefined}
     >
       <CopyTextButton
+        className="w-full justify-between truncate bg-background px-3 py-2 font-mono text-muted-foreground lg:w-[450px]"
+        copyIconPosition="right"
         textToCopy={props.project.id}
         textToShow={props.project.id}
-        variant="outline"
-        className="w-full justify-between truncate bg-background px-3 py-2 font-mono text-muted-foreground lg:w-[450px]"
         tooltip="Copy Project ID"
-        copyIconPosition="right"
+        variant="outline"
       />
     </SettingsCard>
   );
@@ -460,21 +462,21 @@ function ProjectImageSetting(props: {
   function handleSave() {
     const promise = updateProjectAvatarMutation.mutateAsync(projectAvatar);
     toast.promise(promise, {
-      success: "Project avatar updated successfully",
       error: "Failed to update project avatar",
+      success: "Project avatar updated successfully",
     });
   }
 
   return (
     <SettingsCard
       bottomText="An avatar is optional but strongly recommended."
+      errorText={undefined}
+      noPermissionText={undefined}
       saveButton={{
-        onClick: handleSave,
         disabled: false,
         isPending: updateProjectAvatarMutation.isPending,
+        onClick: handleSave,
       }}
-      noPermissionText={undefined}
-      errorText={undefined}
     >
       <div className="flex flex-row gap-4 md:justify-between">
         <div>
@@ -488,11 +490,11 @@ function ProjectImageSetting(props: {
         </div>
         <FileInput
           accept={{ "image/*": [] }}
-          value={projectAvatar || projectAvatarUrl}
-          setValue={setProjectAvatar}
-          client={props.client}
           className="w-20 rounded-full lg:w-28"
+          client={props.client}
           disableHelperText
+          setValue={setProjectAvatar}
+          value={projectAvatar || projectAvatarUrl}
         />
       </div>
     </SettingsCard>
@@ -538,23 +540,23 @@ function AllowedDomainsSetting(props: {
 
   return (
     <SettingsCard
+      bottomText="This is only applicable for web applications"
+      errorText={form.getFieldState("domains", form.formState).error?.message}
       header={{
-        title: "Domain Restrictions",
         description:
           "Only allow Client ID to be used on specific domains to prevent unauthorized use",
+        title: "Domain Restrictions",
       }}
       noPermissionText={undefined}
-      errorText={form.getFieldState("domains", form.formState).error?.message}
       saveButton={{
-        onClick: handleSubmit,
         disabled: false,
         isPending: props.isUpdatingProject,
+        onClick: handleSubmit,
       }}
-      bottomText="This is only applicable for web applications"
     >
       <div className="flex flex-col gap-6">
         <div className="relative">
-          <Label htmlFor="domains" className="mb-2 inline-block">
+          <Label className="mb-2 inline-block" htmlFor="domains">
             Allowed Domains
           </Label>
 
@@ -611,19 +613,19 @@ function AllowedBundleIDsSetting(props: {
   const { form, handleSubmit } = props;
   return (
     <SettingsCard
-      saveButton={{
-        onClick: handleSubmit,
-        disabled: false,
-        isPending: props.isUpdatingProject,
-      }}
-      noPermissionText={undefined}
+      bottomText="This is only applicable for Native games or Native applications"
+      errorText={form.getFieldState("bundleIds", form.formState).error?.message}
       header={{
-        title: "Bundle ID Restrictions",
         description:
           "Only allow Client ID to be used on specific Bundle IDs to prevent unauthorized use",
+        title: "Bundle ID Restrictions",
+      }}
+      noPermissionText={undefined}
+      saveButton={{
+        disabled: false,
+        isPending: props.isUpdatingProject,
+        onClick: handleSubmit,
       }}
-      bottomText="This is only applicable for Native games or Native applications"
-      errorText={form.getFieldState("bundleIds", form.formState).error?.message}
     >
       <div className="flex flex-col gap-4">
         <div className="relative ">
@@ -709,18 +711,18 @@ function EnabledServicesSetting(props: {
 
   return (
     <SettingsCard
+      bottomText=""
+      errorText={undefined}
       header={{
-        title: "Enabled Services",
         description: "thirdweb services enabled for this project",
+        title: "Enabled Services",
       }}
       noPermissionText={undefined}
-      errorText={undefined}
       saveButton={{
-        onClick: handleSubmit,
         disabled: false,
         isPending: props.isUpdatingProject,
+        onClick: handleSubmit,
       }}
-      bottomText=""
     >
       <DynamicHeight>
         <div className="flex flex-col">
@@ -760,8 +762,8 @@ function EnabledServicesSetting(props: {
 
             return (
               <div
-                key={service.name}
                 className="flex items-start justify-between gap-6 border-border border-t py-5"
+                key={service.name}
               >
                 {/* Left */}
                 <div className="flex flex-col gap-4">
@@ -778,9 +780,9 @@ function EnabledServicesSetting(props: {
                     <div>
                       <Button
                         asChild
+                        className="min-w-32 justify-between gap-2"
                         size="sm"
                         variant="outline"
-                        className="min-w-32 justify-between gap-2"
                       >
                         <Link href={configurationLink}>
                           Configure
@@ -860,10 +862,10 @@ function ProjectKeyDetails({
         </p>
 
         <CopyTextButton
-          textToCopy={clientId}
           className="!h-auto w-full max-w-[350px] justify-between truncate bg-background px-3 py-3 font-mono"
-          textToShow={clientId}
           copyIconPosition="right"
+          textToCopy={clientId}
+          textToShow={clientId}
           tooltip="Copy Client ID"
         />
       </div>
@@ -884,26 +886,26 @@ function ProjectKeyDetails({
             </div>
 
             <RotateSecretKeyButton
-              rotateSecretKey={rotateSecretKey}
               onSuccess={(data) => {
                 setSecretKeyMasked(data.data.secretMasked);
               }}
+              rotateSecretKey={rotateSecretKey}
             />
           </div>
         </div>
       )}
 
       <div className="grid grid-cols-1 gap-4 lg:grid-cols-3">
-        <TimeInfo label="Created" date={createdAt} fallbackText="" />
+        <TimeInfo date={createdAt} fallbackText="" label="Created" />
         <TimeInfo
-          label="Last Updated"
           date={updatedAt}
           fallbackText="Not updated"
+          label="Last Updated"
         />
         <TimeInfo
-          label="Last Accessed"
           date={lastAccessedAt}
           fallbackText="Not accessed in 30 days"
+          label="Last Accessed"
         />
       </div>
     </div>
@@ -938,14 +940,14 @@ function DeleteProject(props: {
 
   const handleRevoke = () => {
     deleteProject.mutate(undefined, {
-      onSuccess: () => {
-        toast.success("Project deleted successfully");
-        props.onDeleteSuccessful();
-      },
       onError: (err) => {
         toast.error("Failed to delete project");
         console.error(err);
       },
+      onSuccess: () => {
+        toast.success("Project deleted successfully");
+        props.onDeleteSuccessful();
+      },
     });
   };
 
@@ -954,11 +956,11 @@ function DeleteProject(props: {
 
   return (
     <DangerSettingCard
-      buttonOnClick={() => handleRevoke()}
       buttonLabel="Delete project"
+      buttonOnClick={() => handleRevoke()}
       confirmationDialog={{
-        title: `Delete project "${props.projectName}"?`,
         description: description,
+        title: `Delete project "${props.projectName}"?`,
       }}
       description={description}
       isPending={deleteProject.isPending}
@@ -975,19 +977,19 @@ export function RotateSecretKeyButton(props: {
   const [isModalCloseAllowed, setIsModalCloseAllowed] = useState(true);
   return (
     <Dialog
-      open={isOpen}
       onOpenChange={(v) => {
         if (!isModalCloseAllowed) {
           return;
         }
         setIsOpen(v);
       }}
+      open={isOpen}
     >
       <DialogTrigger asChild>
         <Button
-          variant="outline"
           className="h-auto gap-2 rounded-lg bg-background px-4 py-3"
           onClick={() => setIsOpen(true)}
+          variant="outline"
         >
           <RefreshCcwIcon className="size-4" />
           Rotate Secret Key
@@ -999,13 +1001,13 @@ export function RotateSecretKeyButton(props: {
         dialogCloseClassName={cn(!isModalCloseAllowed && "hidden")}
       >
         <RotateSecretKeyModalContent
-          rotateSecretKey={props.rotateSecretKey}
           closeModal={() => {
             setIsOpen(false);
             setIsModalCloseAllowed(true);
           }}
           disableModalClose={() => setIsModalCloseAllowed(false)}
           onSuccess={props.onSuccess}
+          rotateSecretKey={props.rotateSecretKey}
         />
       </DialogContent>
     </Dialog>
@@ -1029,8 +1031,8 @@ function RotateSecretKeyModalContent(props: {
   if (screen.id === "save-newkey") {
     return (
       <SaveNewKeyScreen
-        secretKey={screen.secretKey}
         closeModal={props.closeModal}
+        secretKey={screen.secretKey}
       />
     );
   }
@@ -1038,13 +1040,13 @@ function RotateSecretKeyModalContent(props: {
   if (screen.id === "initial") {
     return (
       <RotateSecretKeyInitialScreen
-        rotateSecretKey={props.rotateSecretKey}
+        closeModal={props.closeModal}
         onSuccess={(data) => {
           props.disableModalClose();
           props.onSuccess(data);
           setScreen({ id: "save-newkey", secretKey: data.data.secret });
         }}
-        closeModal={props.closeModal}
+        rotateSecretKey={props.rotateSecretKey}
       />
     );
   }
@@ -1060,13 +1062,13 @@ function RotateSecretKeyInitialScreen(props: {
   const [isConfirmed, setIsConfirmed] = useState(false);
   const rotateKeyMutation = useMutation({
     mutationFn: props.rotateSecretKey,
-    onSuccess: (data) => {
-      props.onSuccess(data);
-    },
     onError: (err) => {
       console.error(err);
       toast.error("Failed to rotate secret key");
     },
+    onSuccess: (data) => {
+      props.onSuccess(data);
+    },
   });
   return (
     <div>
@@ -1098,16 +1100,16 @@ function RotateSecretKeyInitialScreen(props: {
       </div>
 
       <div className="flex justify-end gap-3 border-t bg-card p-6">
-        <Button variant="outline" onClick={props.closeModal}>
+        <Button onClick={props.closeModal} variant="outline">
           Close
         </Button>
         <Button
-          variant="destructive"
           className="gap-2"
           disabled={!isConfirmed || rotateKeyMutation.isPending}
           onClick={() => {
             rotateKeyMutation.mutate();
           }}
+          variant="destructive"
         >
           {rotateKeyMutation.isPending ? (
             <Spinner className="size-4" />
@@ -1136,10 +1138,10 @@ function SaveNewKeyScreen(props: {
         <div className="h-6" />
 
         <CopyTextButton
-          textToCopy={props.secretKey}
           className="!h-auto w-full justify-between bg-card px-3 py-3 font-mono"
-          textToShow={props.secretKey}
           copyIconPosition="right"
+          textToCopy={props.secretKey}
+          textToShow={props.secretKey}
           tooltip="Copy Secret Key"
         />
         <div className="h-4" />
@@ -1166,10 +1168,10 @@ function SaveNewKeyScreen(props: {
 
       <div className="flex justify-end gap-3 border-t bg-card p-6">
         <Button
-          variant="outline"
           className="gap-2"
           disabled={!isSecretStored}
           onClick={props.closeModal}
+          variant="outline"
         >
           Close
         </Button>
@@ -1209,18 +1211,16 @@ function TransferProject(props: {
 
     const promise = transferProject.mutateAsync(selectedTeamWithRole.team);
     toast.promise(promise, {
-      success: "Project transferred successfully",
       error: "Failed to transfer project",
+      success: "Project transferred successfully",
     });
   };
 
   return (
     <DangerSettingCard
-      buttonOnClick={handleTransfer}
-      isDisabled={isDisabled}
       buttonLabel="Transfer project"
+      buttonOnClick={handleTransfer}
       confirmationDialog={{
-        title: "Transfer project",
         description: (
           <>
             <span className="mb-5 block">
@@ -1244,17 +1244,19 @@ function TransferProject(props: {
             </span>
           </>
         ),
+        title: "Transfer project",
       }}
       description={<>Transfer this project to another team</>}
+      isDisabled={isDisabled}
       isPending={transferProject.isPending}
       title="Transfer Project"
     >
       <div className="flex flex-col gap-4">
         <div>
           <Select
-            value={selectedTeamId}
-            onValueChange={setSelectedTeamId}
             disabled={transferProject.isPending || !props.isOwnerAccount}
+            onValueChange={setSelectedTeamId}
+            value={selectedTeamId}
           >
             <SelectTrigger className="w-auto min-w-[320px]">
               <SelectValue placeholder="Select a team" />
@@ -1266,10 +1268,10 @@ function TransferProject(props: {
                   <SelectItem key={team.id} value={team.id}>
                     <div className="flex items-center gap-2 py-1">
                       <GradientAvatar
-                        src={team.image || ""}
-                        id={team.id}
                         className="size-5"
                         client={props.client}
+                        id={team.id}
+                        src={team.image || ""}
                       />
                       {team.name}
                     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/page.tsx
index 97b2a9701fa..73972ab3d6c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/settings/page.tsx
@@ -1,8 +1,8 @@
+import { notFound, redirect } from "next/navigation";
 import { getProject } from "@/api/projects";
 import { getTeams } from "@/api/team";
 import { getMemberByAccountId } from "@/api/team-members";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound, redirect } from "next/navigation";
 import { getValidAccount } from "../../../../../account/settings/getAccount";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { loginRedirect } from "../../../../../login/loginRedirect";
@@ -44,8 +44,8 @@ export default async function Page(props: {
       }
 
       return {
-        team,
         role: member.role,
+        team,
       };
     }),
   );
@@ -63,13 +63,13 @@ export default async function Page(props: {
 
   return (
     <ProjectGeneralSettingsPage
+      client={client}
+      isOwnerAccount={isOwnerAccount}
       project={project}
-      teamSlug={team_slug}
       showNebulaSettings={currentTeam.enabledScopes.includes("nebula")}
-      client={client}
       teamId={currentTeam.id}
+      teamSlug={team_slug}
       teamsWithRole={teamsWithRole}
-      isOwnerAccount={isOwnerAccount}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/BasicInfoStep.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/BasicInfoStep.tsx
index 4d1a6de38e8..872c8802c68 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/BasicInfoStep.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/BasicInfoStep.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { useId } from "react";
+import type { UseFormReturn } from "react-hook-form";
 import { Button } from "@/components/ui/button";
 import {
   FormControl,
@@ -11,7 +13,6 @@ import {
 import { Input } from "@/components/ui/input";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { cn } from "@/lib/utils";
-import type { UseFormReturn } from "react-hook-form";
 import type { WebhookFormValues } from "../utils/webhookTypes";
 
 interface BasicInfoStepProps {
@@ -25,6 +26,8 @@ export default function BasicInfoStep({
   goToNextStep,
   isLoading,
 }: BasicInfoStepProps) {
+  const filterEventId = useId();
+  const filterTransactionId = useId();
   return (
     <>
       <div className="mb-4">
@@ -44,9 +47,9 @@ export default function BasicInfoStep({
             </FormLabel>
             <FormControl>
               <Input
+                onChange={field.onChange}
                 placeholder="Webhook name"
                 value={field.value}
-                onChange={field.onChange}
               />
             </FormControl>
             <FormMessage />
@@ -64,10 +67,10 @@ export default function BasicInfoStep({
             </FormLabel>
             <FormControl>
               <Input
+                onChange={field.onChange}
                 placeholder="https://your-server.com/webhook"
                 type="url"
                 value={field.value}
-                onChange={field.onChange}
               />
             </FormControl>
             <FormMessage />
@@ -85,6 +88,7 @@ export default function BasicInfoStep({
             </FormLabel>
             <FormControl>
               <RadioGroup
+                className="grid grid-cols-1 gap-4 md:grid-cols-2"
                 onValueChange={(value: string) => {
                   if (value !== "event" && value !== "transaction") {
                     return;
@@ -92,27 +96,26 @@ export default function BasicInfoStep({
                   field.onChange(value);
                   // Ensure the form state is updated immediately
                   form.setValue("filterType", value, {
-                    shouldValidate: true,
                     shouldDirty: true,
+                    shouldValidate: true,
                   });
                 }}
                 value={field.value || undefined}
-                className="grid grid-cols-1 gap-4 md:grid-cols-2"
               >
                 <div className="col-span-1">
                   <label
-                    htmlFor="filter-event"
                     className={cn(
                       "flex cursor-pointer flex-col rounded-lg border-2 p-4 hover:border-primary/50",
                       field.value === "event"
                         ? "border-primary bg-primary/5"
                         : "",
                     )}
+                    htmlFor={filterEventId}
                   >
                     <RadioGroupItem
-                      value="event"
-                      id="filter-event"
                       className="sr-only"
+                      id={filterEventId}
+                      value="event"
                     />
                     <div className="mb-2 flex items-center justify-between">
                       <span className="font-medium text-base">Event</span>
@@ -138,18 +141,18 @@ export default function BasicInfoStep({
 
                 <div className="col-span-1">
                   <label
-                    htmlFor="filter-transaction"
                     className={cn(
                       "flex cursor-pointer flex-col rounded-lg border-2 p-4 hover:border-primary/50",
                       field.value === "transaction"
                         ? "border-primary bg-primary/5"
                         : "",
                     )}
+                    htmlFor={filterTransactionId}
                   >
                     <RadioGroupItem
-                      value="transaction"
-                      id="filter-transaction"
                       className="sr-only"
+                      id={filterTransactionId}
+                      value="transaction"
                     />
                     <div className="mb-2 flex items-center justify-between">
                       <span className="font-medium text-base">Transaction</span>
@@ -180,7 +183,7 @@ export default function BasicInfoStep({
       />
 
       <div className="mt-6 flex justify-end">
-        <Button type="button" onClick={goToNextStep} disabled={isLoading}>
+        <Button disabled={isLoading} onClick={goToNextStep} type="button">
           Next
         </Button>
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
index e776ff1f282..0c341cd591c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
@@ -1,5 +1,12 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { XIcon } from "lucide-react";
+import { useState } from "react";
+import { useForm, useWatch } from "react-hook-form";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import { createWebhook } from "@/api/insight/webhooks";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -9,35 +16,26 @@ import {
 } from "@/components/ui/dialog";
 import { Form } from "@/components/ui/form";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useState } from "react";
-import { useForm, useWatch } from "react-hook-form";
-import { toast } from "sonner";
-
-import BasicInfoStep from "./BasicInfoStep";
-import { FilterDetailsStep } from "./FilterDetailsStep";
-import ReviewStep from "./ReviewStep";
-
-import { createWebhook } from "@/api/insight/webhooks";
-import { XIcon } from "lucide-react";
-import type { ThirdwebClient } from "thirdweb";
 import { useAbiMultiFetch } from "../hooks/useAbiProcessing";
 import { useTestWebhook } from "../hooks/useTestWebhook";
 import {
   extractEventSignatures,
   extractFunctionSignatures,
 } from "../utils/abiUtils";
+import type { WebhookPayload } from "../utils/webhookPayloadUtils";
 import {
   buildEventWebhookPayload,
   buildTransactionWebhookPayload,
 } from "../utils/webhookPayloadUtils";
-import type { WebhookPayload } from "../utils/webhookPayloadUtils";
 import {
   type WebhookFormStep,
   WebhookFormSteps,
   type WebhookFormValues,
   webhookFormSchema,
 } from "../utils/webhookTypes";
+import BasicInfoStep from "./BasicInfoStep";
+import { FilterDetailsStep } from "./FilterDetailsStep";
+import ReviewStep from "./ReviewStep";
 
 interface CreateWebhookModalProps {
   projectClientId: string;
@@ -57,22 +55,22 @@ export function CreateWebhookModal({
   );
 
   const formHook = useForm<WebhookFormValues>({
-    resolver: zodResolver(webhookFormSchema),
     defaultValues: {
-      name: "",
-      webhookUrl: "",
-      filterType: "event",
-      chainIds: [],
+      abi: "",
       addresses: "",
+      chainIds: [],
+      eventTypes: [],
+      filterType: "event",
       fromAddresses: "",
-      toAddresses: "",
-      sigHash: "",
-      sigHashAbi: "",
-      abi: "",
       inputAbi: [],
+      name: "",
       secret: "",
-      eventTypes: [],
+      sigHash: "",
+      sigHashAbi: "",
+      toAddresses: "",
+      webhookUrl: "",
     },
+    resolver: zodResolver(webhookFormSchema),
   });
 
   const chainIds = useWatch({ control: formHook.control, name: "chainIds" });
@@ -83,20 +81,20 @@ export function CreateWebhookModal({
   });
 
   const eventAbi = useAbiMultiFetch({
-    isOpen,
-    thirdwebClient: client,
-    chainIds,
     addresses: addresses || "",
+    chainIds,
     extractSignatures: extractEventSignatures,
+    isOpen,
+    thirdwebClient: client,
     type: "event",
   });
 
   const txAbi = useAbiMultiFetch({
-    isOpen,
-    thirdwebClient: client,
-    chainIds,
     addresses: toAddresses || "",
+    chainIds,
     extractSignatures: extractFunctionSignatures,
+    isOpen,
+    thirdwebClient: client,
     type: "transaction",
   });
 
@@ -228,18 +226,18 @@ export function CreateWebhookModal({
       </DialogTrigger>
 
       <DialogContent
-        dialogCloseClassName="hidden"
         className="max-h-[85vh] max-w-5xl overflow-y-auto"
+        dialogCloseClassName="hidden"
       >
         <div className="flex items-center justify-between">
           <DialogTitle className="font-medium text-lg">
             Create New Webhook
           </DialogTitle>
           <Button
-            variant="ghost"
-            size="icon"
-            onClick={handleCloseModal}
             className="h-6 w-6"
+            onClick={handleCloseModal}
+            size="icon"
+            variant="ghost"
           >
             <XIcon className="h-4 w-4" />
             <span className="sr-only">Close</span>
@@ -248,8 +246,8 @@ export function CreateWebhookModal({
 
         <Form {...formHook}>
           <form
-            onSubmit={formHook.handleSubmit(handleSubmit)}
             className="space-y-4"
+            onSubmit={formHook.handleSubmit(handleSubmit)}
           >
             {/* Step Content */}
             <div className="min-h-[300px]">
@@ -263,33 +261,33 @@ export function CreateWebhookModal({
 
               {currentStep === WebhookFormSteps.FilterDetails && (
                 <FilterDetailsStep
+                  abiErrors={eventAbi.errors}
                   client={client}
-                  form={formHook}
                   eventSignatures={eventAbi.signatures}
-                  functionSignatures={txAbi.signatures}
                   fetchedAbis={eventAbi.fetchedAbis}
-                  abiErrors={eventAbi.errors}
                   fetchedTxAbis={txAbi.fetchedAbis}
-                  txAbiErrors={txAbi.errors}
-                  isFetchingEventAbi={eventAbi.isFetching}
-                  isFetchingTxAbi={txAbi.isFetching}
+                  form={formHook}
+                  functionSignatures={txAbi.signatures}
                   goToNextStep={goToNextStep}
                   goToPreviousStep={goToPreviousStep}
+                  isFetchingEventAbi={eventAbi.isFetching}
+                  isFetchingTxAbi={txAbi.isFetching}
                   isLoading={isLoading}
                   supportedChainIds={supportedChainIds}
+                  txAbiErrors={txAbi.errors}
                 />
               )}
 
               {currentStep === WebhookFormSteps.Review && (
                 <ReviewStep
                   form={formHook}
+                  goToPreviousStep={goToPreviousStep}
+                  handleCreateButtonClick={handleCreateButtonClick}
+                  isLoading={isLoading}
+                  isRecentResult={isRecentResult}
                   isTestingMap={isTestingMap}
                   testResults={testResults}
-                  isRecentResult={isRecentResult}
                   testWebhookEndpoint={handleTestWebhook}
-                  goToPreviousStep={goToPreviousStep}
-                  isLoading={isLoading}
-                  handleCreateButtonClick={handleCreateButtonClick}
                 />
               )}
             </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
index 707c41518df..ba5da7a8e60 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
@@ -1,8 +1,10 @@
 "use client";
 
+import { useQueryClient } from "@tanstack/react-query";
+import type { UseFormReturn } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { SignatureSelector } from "@/components/blocks/SignatureSelector";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -13,11 +15,8 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import {} from "@/components/ui/popover";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Textarea } from "@/components/ui/textarea";
-import { useQueryClient } from "@tanstack/react-query";
-import type { UseFormReturn } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import { truncateMiddle } from "../utils/abiUtils";
 import type {
   AbiData,
@@ -112,12 +111,12 @@ export function FilterDetailsStep({
               </div>
               <FormControl>
                 <MultiNetworkSelector
+                  chainIds={supportedChainIds}
+                  client={client}
+                  onChange={(chainIds) => field.onChange(chainIds.map(String))}
                   selectedChainIds={
                     Array.isArray(field.value) ? field.value.map(Number) : []
                   }
-                  onChange={(chainIds) => field.onChange(chainIds.map(String))}
-                  client={client}
-                  chainIds={supportedChainIds}
                 />
               </FormControl>
               <FormMessage />
@@ -158,8 +157,8 @@ export function FilterDetailsStep({
                         {Object.keys(fetchedAbis).length > 0 && (
                           <div className="flex items-center gap-2">
                             <Badge
-                              variant="outline"
                               className="border-green-200 bg-green-50 text-green-700"
+                              variant="outline"
                             >
                               ✓ {Object.keys(fetchedAbis).length} ABI
                               {Object.keys(fetchedAbis).length !== 1 ? "s" : ""}{" "}
@@ -171,8 +170,8 @@ export function FilterDetailsStep({
                         {Object.keys(abiErrors).length > 0 && (
                           <div className="flex items-center gap-2">
                             <Badge
-                              variant="outline"
                               className="border-red-200 bg-red-50 text-red-700"
+                              variant="outline"
                             >
                               ✗ {Object.keys(abiErrors).length} error
                               {Object.keys(abiErrors).length !== 1 ? "s" : ""}
@@ -204,9 +203,9 @@ export function FilterDetailsStep({
                   </div>
                   <FormControl>
                     <Input
+                      onChange={field.onChange}
                       placeholder="0x1234..."
                       value={field.value ?? ""}
-                      onChange={field.onChange}
                     />
                   </FormControl>
                   <FormMessage />
@@ -226,9 +225,9 @@ export function FilterDetailsStep({
                   <FormControl>
                     <div className="space-y-2">
                       <Input
+                        onChange={field.onChange}
                         placeholder="0x1234..."
                         value={field.value || ""}
-                        onChange={field.onChange}
                       />
 
                       {/* ABI fetch status */}
@@ -249,8 +248,8 @@ export function FilterDetailsStep({
                           {Object.keys(fetchedTxAbis).length > 0 && (
                             <div className="flex items-center gap-2">
                               <Badge
-                                variant="outline"
                                 className="border-green-200 bg-green-50 text-green-700"
+                                variant="outline"
                               >
                                 ✓ {Object.keys(fetchedTxAbis).length} ABI
                                 {Object.keys(fetchedTxAbis).length !== 1
@@ -264,8 +263,8 @@ export function FilterDetailsStep({
                           {Object.keys(txAbiErrors).length > 0 && (
                             <div className="flex items-center gap-2">
                               <Badge
-                                variant="outline"
                                 className="border-red-200 bg-red-50 text-red-700"
+                                variant="outline"
                               >
                                 ⚠️ {Object.keys(txAbiErrors).length} error
                                 {Object.keys(txAbiErrors).length !== 1
@@ -311,12 +310,7 @@ export function FilterDetailsStep({
                 Object.keys(fetchedAbis).length > 0 &&
                 eventSignatures.length > 0 ? (
                   <SignatureSelector
-                    options={eventSignatures.map((sig) => ({
-                      label: truncateMiddle(sig.name, 30, 15),
-                      value: sig.signature,
-                      abi: sig.abi,
-                    }))}
-                    value={field.value || ""}
+                    className="block w-full max-w-90 overflow-hidden text-ellipsis"
                     onChange={(val) => {
                       field.onChange(val);
                       // If custom signature, clear ABI field
@@ -325,20 +319,19 @@ export function FilterDetailsStep({
                         form.setValue("abi", "");
                       }
                     }}
-                    setAbi={(abi) => form.setValue("sigHashAbi", abi)}
+                    options={eventSignatures.map((sig) => ({
+                      abi: sig.abi,
+                      label: truncateMiddle(sig.name, 30, 15),
+                      value: sig.signature,
+                    }))}
                     placeholder="Select or enter an event signature"
-                    className="block w-full max-w-90 overflow-hidden text-ellipsis"
+                    setAbi={(abi) => form.setValue("sigHashAbi", abi)}
+                    value={field.value || ""}
                   />
                 ) : watchFilterType === "transaction" &&
                   Object.keys(fetchedTxAbis).length > 0 &&
                   functionSignatures.length > 0 ? (
                   <SignatureSelector
-                    options={functionSignatures.map((sig) => ({
-                      label: sig.name,
-                      value: sig.signature,
-                      abi: sig.abi,
-                    }))}
-                    value={field.value || ""}
                     onChange={(val) => {
                       field.onChange(val);
                       // If custom signature, clear ABI field
@@ -349,22 +342,28 @@ export function FilterDetailsStep({
                         form.setValue("abi", "");
                       }
                     }}
-                    setAbi={(abi) => form.setValue("sigHashAbi", abi)}
+                    options={functionSignatures.map((sig) => ({
+                      abi: sig.abi,
+                      label: sig.name,
+                      value: sig.signature,
+                    }))}
                     placeholder="Select or enter a function signature"
+                    setAbi={(abi) => form.setValue("sigHashAbi", abi)}
+                    value={field.value || ""}
                   />
                 ) : (
                   <Input
+                    disabled={
+                      (watchFilterType === "event" && isFetchingEventAbi) ||
+                      (watchFilterType === "transaction" && isFetchingTxAbi)
+                    }
+                    onChange={field.onChange}
                     placeholder={
                       watchFilterType === "event"
                         ? "Fetching event signatures..."
                         : "Fetching function signatures..."
                     }
                     value={field.value}
-                    onChange={field.onChange}
-                    disabled={
-                      (watchFilterType === "event" && isFetchingEventAbi) ||
-                      (watchFilterType === "transaction" && isFetchingTxAbi)
-                    }
                   />
                 )}
               </FormControl>
@@ -402,11 +401,11 @@ export function FilterDetailsStep({
                 <FormControl>
                   {!showFetchedAbi ? (
                     <Textarea
-                      placeholder={"[{...}]"}
                       className="font-mono"
+                      onChange={field.onChange}
+                      placeholder={"[{...}]"}
                       rows={2}
                       value={field.value}
-                      onChange={field.onChange}
                     />
                   ) : (
                     <div className="space-y-2 rounded-md border bg-primary/5 p-3">
@@ -415,9 +414,6 @@ export function FilterDetailsStep({
                           ✓ ABI Automatically Fetched
                         </Badge>
                         <Button
-                          type="button"
-                          variant="ghost"
-                          size="sm"
                           className="ml-auto h-7 text-xs"
                           onClick={async () => {
                             try {
@@ -430,13 +426,13 @@ export function FilterDetailsStep({
                                       .filter(Boolean)
                                       .map((address) =>
                                         queryClient.resetQueries({
+                                          exact: true,
                                           queryKey: [
                                             "abis",
                                             String(chainId),
                                             address,
                                             watchFilterType,
                                           ],
-                                          exact: true,
                                         }),
                                       ),
                                   ),
@@ -461,13 +457,13 @@ export function FilterDetailsStep({
                                       (async () => {
                                         try {
                                           await queryClient.resetQueries({
+                                            exact: true,
                                             queryKey: [
                                               "abis",
                                               String(chainId),
                                               address,
                                               watchFilterType,
                                             ],
-                                            exact: true,
                                           });
                                         } catch (err) {
                                           console.error(
@@ -493,6 +489,9 @@ export function FilterDetailsStep({
                               console.error("Error during ABI reset:", err);
                             }
                           }}
+                          size="sm"
+                          type="button"
+                          variant="ghost"
                         >
                           Reset
                         </Button>
@@ -513,14 +512,14 @@ export function FilterDetailsStep({
 
       <div className="flex justify-between pt-4">
         <Button
+          disabled={isLoading}
+          onClick={goToPreviousStep}
           type="button"
           variant="outline"
-          onClick={goToPreviousStep}
-          disabled={isLoading}
         >
           Back
         </Button>
-        <Button type="button" onClick={goToNextStep} disabled={isLoading}>
+        <Button disabled={isLoading} onClick={goToNextStep} type="button">
           Next
         </Button>
       </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/RelativeTime.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/RelativeTime.tsx
index a5a5deea137..705003ef60e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/RelativeTime.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/RelativeTime.tsx
@@ -5,7 +5,10 @@ import { useEffect, useState } from "react";
 export function RelativeTime({
   date,
   className,
-}: { date: string; className?: string }) {
+}: {
+  date: string;
+  className?: string;
+}) {
   const [content, setContent] = useState(() => {
     const parsedDate = new Date(date);
     if (Number.isNaN(parsedDate.getTime())) return "-";
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/ReviewStep.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/ReviewStep.tsx
index 77a17feb82f..4d961b8a5cd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/ReviewStep.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/ReviewStep.tsx
@@ -1,8 +1,8 @@
 "use client";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
 import { CheckIcon, PlayIcon, XIcon } from "lucide-react";
 import type { UseFormReturn } from "react-hook-form";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 
 import { truncateMiddle } from "../utils/abiUtils";
 import type { WebhookFormValues } from "../utils/webhookTypes";
@@ -172,9 +172,7 @@ export default function ReviewStep({
             </span>
           </li>
 
-          {form.watch("filterType") === "event" ? (
-            <></>
-          ) : (
+          {form.watch("filterType") === "event" ? null : (
             <>
               <li className="flex justify-between">
                 <span className="text-muted-foreground text-sm">
@@ -229,17 +227,17 @@ export default function ReviewStep({
 
       <div className="flex justify-between pt-4">
         <Button
+          disabled={isLoading}
+          onClick={goToPreviousStep}
           type="button"
           variant="outline"
-          onClick={goToPreviousStep}
-          disabled={isLoading}
         >
           Back
         </Button>
         <Button
-          type="submit"
           disabled={isLoading}
           onClick={handleCreateButtonClick}
+          type="submit"
         >
           {isLoading ? "Creating..." : "Create Webhook"}
         </Button>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
index 3bee109778a..acae9aacebe 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
@@ -1,15 +1,5 @@
 "use client";
 
-import {
-  type WebhookFilters,
-  type WebhookResponse,
-  deleteWebhook,
-} from "@/api/insight/webhooks";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import type { ColumnDef } from "@tanstack/react-table";
 import { TWTable } from "components/shared/TWTable";
 import { format } from "date-fns";
@@ -17,6 +7,16 @@ import { PlayIcon, TrashIcon } from "lucide-react";
 import { useMemo, useState } from "react";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
+import {
+  deleteWebhook,
+  type WebhookFilters,
+  type WebhookResponse,
+} from "@/api/insight/webhooks";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { useTestWebhook } from "../hooks/useTestWebhook";
 import { CreateWebhookModal } from "./CreateWebhookModal";
 import { RelativeTime } from "./RelativeTime";
@@ -87,7 +87,6 @@ export function WebhooksTable({
   const columns: ColumnDef<WebhookResponse>[] = [
     {
       accessorKey: "name",
-      header: "Name",
       cell: ({ row }) => (
         <div className="flex items-center gap-2">
           <span className="max-w-40 truncate" title={row.original.name}>
@@ -95,41 +94,41 @@ export function WebhooksTable({
           </span>
         </div>
       ),
+      header: "Name",
     },
     {
       accessorKey: "filters",
-      header: "Event Type",
       cell: ({ getValue }) => {
         const filters = getValue() as WebhookFilters;
         if (!filters) return <span>-</span>;
         const eventType = getEventType(filters);
         return <span>{eventType}</span>;
       },
+      header: "Event Type",
     },
     {
       accessorKey: "webhook_url",
-      header: "Webhook URL",
       cell: ({ getValue }) => {
         const url = getValue() as string;
         return (
           <div className="flex items-center gap-2">
             <span className="max-w-60 truncate">{url}</span>
             <CopyTextButton
+              className="flex h-6 w-6 items-center justify-center"
+              copyIconPosition="right"
+              iconClassName="h-3 w-3"
               textToCopy={url}
               textToShow=""
               tooltip="Copy URL"
               variant="ghost"
-              copyIconPosition="right"
-              className="flex h-6 w-6 items-center justify-center"
-              iconClassName="h-3 w-3"
             />
           </div>
         );
       },
+      header: "Webhook URL",
     },
     {
       accessorKey: "created_at",
-      header: "Created",
       cell: ({ getValue }) => {
         const date = getValue() as string;
         const dateObj = new Date(date);
@@ -145,11 +144,10 @@ export function WebhooksTable({
           </div>
         );
       },
+      header: "Created",
     },
     {
-      id: "status",
       accessorKey: "suspended_at",
-      header: "Status",
       cell: ({ row }) => {
         const webhook = row.original;
         const isSuspended = Boolean(webhook.suspended_at);
@@ -159,22 +157,22 @@ export function WebhooksTable({
           </Badge>
         );
       },
+      header: "Status",
+      id: "status",
     },
     {
-      id: "actions",
-      header: () => <div className="flex w-full justify-end pr-2">Actions</div>,
       cell: ({ row }) => {
         const webhook = row.original;
 
         return (
           <div className="flex items-center justify-end gap-2">
             <Button
-              variant="outline"
-              size="icon"
+              aria-label={`Test webhook ${webhook.name}`}
               className="h-8 w-8"
               disabled={isTestingMap[webhook.id] || isDeleting[webhook.id]}
               onClick={() => handleTestWebhook(webhook)}
-              aria-label={`Test webhook ${webhook.name}`}
+              size="icon"
+              variant="outline"
             >
               {isTestingMap[webhook.id] ? (
                 <Spinner className="h-4 w-4" />
@@ -183,12 +181,12 @@ export function WebhooksTable({
               )}
             </Button>
             <Button
-              size="icon"
-              variant="outline"
+              aria-label={`Delete webhook ${webhook.name}`}
               className="h-8 w-8 text-red-500 hover:border-red-700 hover:text-red-700"
-              onClick={() => handleDeleteWebhook(webhook.id)}
               disabled={isDeleting[webhook.id]}
-              aria-label={`Delete webhook ${webhook.name}`}
+              onClick={() => handleDeleteWebhook(webhook.id)}
+              size="icon"
+              variant="outline"
             >
               {isDeleting[webhook.id] ? (
                 <Spinner className="h-4 w-4" />
@@ -199,6 +197,8 @@ export function WebhooksTable({
           </div>
         );
       },
+      header: () => <div className="flex w-full justify-end pr-2">Actions</div>,
+      id: "actions",
     },
   ];
 
@@ -219,18 +219,18 @@ export function WebhooksTable({
     <div className="w-full">
       <div className="mb-4 flex items-center justify-end">
         <CreateWebhookModal
+          client={client}
           projectClientId={projectClientId}
           supportedChainIds={supportedChainIds}
-          client={client}
         />
       </div>
       <TWTable
-        data={sortedWebhooks}
         columns={columns}
-        isPending={false}
+        data={sortedWebhooks}
         isFetched={true}
-        title="Webhooks"
+        isPending={false}
         tableContainerClassName="mt-4"
+        title="Webhooks"
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useAbiProcessing.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useAbiProcessing.ts
index 8815e7c2cff..b83a0a8a585 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useAbiProcessing.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useAbiProcessing.ts
@@ -5,14 +5,13 @@ import { useMemo } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { defineChain } from "thirdweb/chains";
 import { getContract, resolveAbiFromContractApi } from "thirdweb/contract";
+import { parseAddresses } from "../utils/webhookPayloadUtils";
 import type {
   AbiData,
   EventSignature,
   FunctionSignature,
 } from "../utils/webhookTypes";
 
-import { parseAddresses } from "../utils/webhookPayloadUtils";
-
 export function useAbiMultiFetch({
   isOpen,
   thirdwebClient,
@@ -38,7 +37,7 @@ export function useAbiMultiFetch({
         const key = `${chainId}:${address.toLowerCase()}`;
         if (!seen.has(key)) {
           seen.add(key);
-          result.push({ chainId, address });
+          result.push({ address, chainId });
         }
       }
     }
@@ -46,7 +45,7 @@ export function useAbiMultiFetch({
   }, [chainIds, addresses]);
 
   const queryResult = useQuery({
-    queryKey: ["abis", chainIds, addresses, type],
+    enabled: isOpen && !!addresses.trim() && chainIds.length > 0,
     queryFn: async () => {
       return Promise.all(
         pairs.map(async ({ chainId, address }) => {
@@ -54,19 +53,19 @@ export function useAbiMultiFetch({
             // eslint-disable-next-line no-restricted-syntax
             const chainObj = defineChain(Number(chainId));
             const contract = getContract({
-              client: thirdwebClient,
               address,
               chain: chainObj,
+              client: thirdwebClient,
             });
             const abi = await resolveAbiFromContractApi(contract);
-            return { chainId, address, data: abi, status: "success" as const };
+            return { address, chainId, data: abi, status: "success" as const };
           } catch (error) {
-            return { chainId, address, error, status: "error" as const };
+            return { address, chainId, error, status: "error" as const };
           }
         }),
       );
     },
-    enabled: isOpen && !!addresses.trim() && chainIds.length > 0,
+    queryKey: ["abis", chainIds, addresses, type],
     staleTime: Number.POSITIVE_INFINITY,
   });
 
@@ -107,9 +106,9 @@ export function useAbiMultiFetch({
             .map((abiItem) => abiItem.name);
         }
         abis[item.address] = {
+          abi: abi,
           fetchedAt: new Date().toISOString(),
           status: "success",
-          abi: abi,
           ...(type === "event" ? { events: items } : { functions: items }),
         };
       }
@@ -135,5 +134,5 @@ export function useAbiMultiFetch({
     return errs;
   }, [queryResult.data]);
 
-  return { signatures, fetchedAbis, errors, isFetching, abisByAddress };
+  return { abisByAddress, errors, fetchedAbis, isFetching, signatures };
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useTestWebhook.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useTestWebhook.ts
index 22709ffe884..fe986358ad6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useTestWebhook.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useTestWebhook.ts
@@ -1,6 +1,6 @@
-import { testWebhook } from "@/api/insight/webhooks";
 import { useState } from "react";
 import { toast } from "sonner";
+import { testWebhook } from "@/api/insight/webhooks";
 
 type TestResult = {
   status: "success" | "error";
@@ -41,7 +41,7 @@ export function useTestWebhook(clientId: string) {
       });
 
       const result = await testWebhook(
-        { webhook_url: webhookUrl, type },
+        { type, webhook_url: webhookUrl },
         clientId,
       );
 
@@ -114,9 +114,9 @@ export function useTestWebhook(clientId: string) {
   };
 
   return {
-    testWebhookEndpoint,
+    isRecentResult,
     isTestingMap,
     testResults,
-    isRecentResult,
+    testWebhookEndpoint,
   };
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
index 9d254d2c52c..6d413a75938 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
@@ -1,19 +1,21 @@
+import { notFound } from "next/navigation";
 import {
-  type WebhookResponse,
   getSupportedWebhookChains,
   getWebhooks,
+  type WebhookResponse,
 } from "@/api/insight/webhooks";
 import { getProject } from "@/api/projects";
 import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { notFound } from "next/navigation";
 import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { CreateWebhookModal } from "./components/CreateWebhookModal";
 import { WebhooksTable } from "./components/WebhooksTable";
 
 export default async function WebhooksPage({
   params,
-}: { params: Promise<{ team_slug: string; project_slug: string }> }) {
+}: {
+  params: Promise<{ team_slug: string; project_slug: string }>;
+}) {
   let webhooks: WebhookResponse[] = [];
   let errorMessage = "";
   let supportedChainIds: number[] = [];
@@ -69,9 +71,9 @@ export default async function WebhooksPage({
             Create and manage webhooks to get notified about blockchain events,
             transactions and more.{" "}
             <UnderlineLink
-              target="_blank"
-              rel="noopener noreferrer"
               href="https://portal.thirdweb.com/insight/webhooks"
+              rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more about webhooks.
             </UnderlineLink>
@@ -91,10 +93,10 @@ export default async function WebhooksPage({
           </div>
         ) : webhooks.length > 0 ? (
           <WebhooksTable
-            webhooks={webhooks}
-            projectClientId={projectClientId}
             client={client}
+            projectClientId={projectClientId}
             supportedChainIds={supportedChainIds}
+            webhooks={webhooks}
           />
         ) : (
           <div className="flex flex-col items-center justify-center gap-4 rounded-lg border border-border p-12 text-center">
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/abiUtils.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/abiUtils.ts
index c02a897b66b..268ccf72c54 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/abiUtils.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/abiUtils.ts
@@ -96,9 +96,9 @@ export const extractEventSignatures = (
               const eventAbi = JSON.stringify(event);
 
               signatures.push({
-                name: readableSignature,
-                signature: hash, // Use the full hash, not a substring
-                abi: eventAbi, // Include the ABI for the selected event
+                abi: eventAbi,
+                name: readableSignature, // Use the full hash, not a substring
+                signature: hash, // Include the ABI for the selected event
               });
             }
           }
@@ -175,9 +175,9 @@ export const extractFunctionSignatures = (
               const funcAbi = JSON.stringify(func);
 
               signatures.push({
+                abi: funcAbi,
                 name: readableSignature,
-                signature: hash,
-                abi: funcAbi, // Include the ABI for the selected function
+                signature: hash, // Include the ABI for the selected function
               });
             }
           }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookPayloadUtils.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookPayloadUtils.ts
index fc243731448..ec322eb7805 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookPayloadUtils.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookPayloadUtils.ts
@@ -4,7 +4,7 @@ import type { WebhookFormValues } from "./webhookTypes";
 export function parseAddresses(addresses: string | undefined): string[] {
   if (!addresses) return [];
   return addresses
-    .split(/[\,\s]+/)
+    .split(/[,\s]+/)
     .map((addr) => addr.trim())
     .filter(Boolean);
 }
@@ -34,22 +34,22 @@ export function buildEventWebhookPayload(
   const eventSignatures = [];
   if (data.sigHash) {
     eventSignatures.push({
+      abi: data.sigHashAbi || data.abi,
+      params: {},
       sig_hash: data.sigHash.startsWith("0x")
         ? data.sigHash
         : keccak256(new TextEncoder().encode(data.sigHash)),
-      abi: data.sigHashAbi || data.abi,
-      params: {},
     });
   }
   return {
-    name: data.name ?? "",
     filters: {
       "v1.events": {
-        chain_ids: data.chainIds?.map(String),
         addresses: parseAddresses(data.addresses),
+        chain_ids: data.chainIds?.map(String),
         signatures: eventSignatures.length > 0 ? eventSignatures : undefined,
       },
     },
+    name: data.name ?? "",
     webhook_url: data.webhookUrl,
   };
 }
@@ -60,25 +60,25 @@ export function buildTransactionWebhookPayload(
   const txSignatures = [];
   if (data.sigHash) {
     txSignatures.push({
+      abi: data.sigHashAbi || data.abi,
+      params: {},
       sig_hash: data.sigHash.startsWith("0x")
         ? data.sigHash
         : toFunctionSelector(data.sigHash),
-      abi: data.sigHashAbi || data.abi,
-      params: {},
     });
   }
   return {
-    name: data.name ?? "",
     filters: {
       "v1.transactions": {
         chain_ids: data.chainIds?.map(String),
         from_addresses: parseAddresses(data.fromAddresses),
+        signatures: txSignatures.length > 0 ? txSignatures : undefined,
         to_addresses: data.toAddresses
           ? parseAddresses(data.toAddresses)
           : undefined,
-        signatures: txSignatures.length > 0 ? txSignatures : undefined,
       },
     },
+    name: data.name ?? "",
     webhook_url: data.webhookUrl,
   };
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts
index 52c93042c3d..79d8c4c3ff8 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts
@@ -1,19 +1,18 @@
-import { isAddress } from "thirdweb/utils";
 import type { Abi } from "thirdweb/utils";
+import { isAddress } from "thirdweb/utils";
 import { z } from "zod";
 
 const inputAbi = z.object({
-  type: z.string(),
-  name: z.string().optional(),
   inputs: z
     .array(
       z.object({
+        indexed: z.boolean().optional(),
         name: z.string(),
         type: z.string(),
-        indexed: z.boolean().optional(),
       }),
     )
     .optional(),
+  name: z.string().optional(),
   outputs: z
     .array(
       z.object({
@@ -22,18 +21,11 @@ const inputAbi = z.object({
       }),
     )
     .optional(),
+  type: z.string(),
 });
 
 export const webhookFormSchema = z.object({
-  name: z
-    .string()
-    .min(3, { message: "Name must be at least 3 characters long" })
-    .max(100, { message: "Name must be at most 100 characters long" }),
-  webhookUrl: z.string().url({ message: "Must be a valid URL" }),
-  filterType: z.enum(["event", "transaction"]),
-  chainIds: z
-    .array(z.string())
-    .min(1, { message: "Select at least one chain" }),
+  abi: z.string().optional(),
   addresses: z
     .string()
     .optional()
@@ -43,7 +35,7 @@ export const webhookFormSchema = z.object({
           return true;
         }
         return val
-          .split(/[\,\s]+/)
+          .split(/[,\s]+/)
           .filter(Boolean)
           .every((a) => isAddress(a.trim()));
       },
@@ -51,6 +43,11 @@ export const webhookFormSchema = z.object({
         message: "Enter valid addresses (comma-separated) or leave empty",
       },
     ),
+  chainIds: z
+    .array(z.string())
+    .min(1, { message: "Select at least one chain" }),
+  eventTypes: z.array(z.string()).optional(),
+  filterType: z.enum(["event", "transaction"]),
   fromAddresses: z
     .string()
     .optional()
@@ -60,7 +57,7 @@ export const webhookFormSchema = z.object({
           return true;
         }
         return val
-          .split(/[\,\s]+/)
+          .split(/[,\s]+/)
           .filter(Boolean)
           .every((a) => isAddress(a.trim()));
       },
@@ -68,6 +65,15 @@ export const webhookFormSchema = z.object({
         message: "Enter valid addresses (comma-separated) or leave empty",
       },
     ),
+  inputAbi: z.array(inputAbi).optional(),
+  name: z
+    .string()
+    .min(3, { message: "Name must be at least 3 characters long" })
+    .max(100, { message: "Name must be at most 100 characters long" }),
+  params: z.record(z.unknown()).optional(),
+  secret: z.string().optional(),
+  sigHash: z.string().optional(),
+  sigHashAbi: z.string().optional(),
   toAddresses: z
     .string()
     .optional()
@@ -77,7 +83,7 @@ export const webhookFormSchema = z.object({
           return true;
         }
         return val
-          .split(/[\,\s]+/)
+          .split(/[,\s]+/)
           .filter(Boolean)
           .every((a) => isAddress(a.trim()));
       },
@@ -85,13 +91,7 @@ export const webhookFormSchema = z.object({
         message: "Enter valid addresses (comma-separated) or leave empty",
       },
     ),
-  sigHash: z.string().optional(),
-  sigHashAbi: z.string().optional(),
-  abi: z.string().optional(),
-  inputAbi: z.array(inputAbi).optional(),
-  secret: z.string().optional(),
-  eventTypes: z.array(z.string()).optional(),
-  params: z.record(z.unknown()).optional(),
+  webhookUrl: z.string().url({ message: "Must be a valid URL" }),
 });
 
 export type WebhookFormValues = z.infer<typeof webhookFormSchema>;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/(marketplace)/direct-listings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/(marketplace)/direct-listings/page.tsx
index 1f8fdf7ae9a..7de5ae551b2 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/(marketplace)/direct-listings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/(marketplace)/direct-listings/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedDirectListingsPage } from "../../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/direct-listings/shared-direct-listings-page";
 import type { ProjectContractPageParams } from "../../types";
 
@@ -15,14 +15,14 @@ export default async function Page(props: {
 
   return (
     <SharedDirectListingsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
-      isLoggedIn={true}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/(marketplace)/english-auctions/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/(marketplace)/english-auctions/page.tsx
index 7278e32244c..c0ec408d19b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/(marketplace)/english-auctions/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/(marketplace)/english-auctions/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedEnglishAuctionsPage } from "../../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/english-auctions/shared-english-auctions-page";
 import type { ProjectContractPageParams } from "../../types";
 
@@ -15,14 +15,14 @@ export default async function Page(props: {
 
   return (
     <SharedEnglishAuctionsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: params.project_slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
-      isLoggedIn={true}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/account-permissions/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/account-permissions/page.tsx
index f9becec8ecb..1636dfb3323 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/account-permissions/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/account-permissions/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedContractAccountPermissionsPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/shared-account-permissions-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,11 +15,11 @@ export default async function Page(props: {
 
   return (
     <SharedContractAccountPermissionsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
     />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/account/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/account/page.tsx
index eca3ef1194a..b62bf01eda9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/account/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/account/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedContractAccountPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/account/shared-account-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,14 +15,14 @@ export default async function Page(props: {
 
   return (
     <SharedContractAccountPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
-      isLoggedIn={true}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/accounts/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/accounts/page.tsx
index c34234ead38..5fc0503aee1 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/accounts/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/accounts/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedAccountsPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/shared-accounts-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,14 +15,14 @@ export default async function Page(props: {
 
   return (
     <SharedAccountsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
-      isLoggedIn={true}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/analytics/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/analytics/page.tsx
index b4b597e8186..5c3cd1df05e 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/analytics/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/analytics/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedAnalyticsPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/analytics/shared-analytics-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,8 +15,8 @@ export default async function Page(props: {
 
   return (
     <SharedAnalyticsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/claim-conditions/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/claim-conditions/page.tsx
index e2205c298c8..ecf88194478 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/claim-conditions/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/claim-conditions/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedClaimConditionsPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/claim-conditions/shared-claim-conditions-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,14 +15,14 @@ export default async function Page(props: {
 
   return (
     <SharedClaimConditionsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
-      isLoggedIn={true}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/code/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/code/page.tsx
index 395456737df..d281dcd1b9f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/code/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/code/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedCodePage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/code/shared-code-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,8 +15,8 @@ export default async function Page(props: {
 
   return (
     <SharedCodePage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/cross-chain/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/cross-chain/page.tsx
index 0212eff4a42..39d96bc6b04 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/cross-chain/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/cross-chain/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedCrossChainPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/shared-cross-chain-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,8 +15,8 @@ export default async function Page(props: {
 
   return (
     <SharedCrossChainPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/events/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/events/page.tsx
index 067a0590021..9cc2e3c3d3d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/events/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/events/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedEventsPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/events/shared-events-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,8 +15,8 @@ export default async function Page(props: {
 
   return (
     <SharedEventsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/explorer/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/explorer/page.tsx
index ac7f11cb67d..37f0e8e7386 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/explorer/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/explorer/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedExplorerPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/explorer/shared-explorer-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,9 +15,9 @@ export default async function Page(props: {
 
   return (
     <SharedExplorerPage
+      chainIdOrSlug={params.chainIdOrSlug}
       contractAddress={params.contractAddress}
       isLoggedIn={true}
-      chainIdOrSlug={params.chainIdOrSlug}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/layout.tsx
index 070ef5bf3ae..e419dbe5955 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/layout.tsx
@@ -1,17 +1,17 @@
+import { redirect } from "next/navigation";
 import { getProjects } from "@/api/projects";
 import { getTeams } from "@/api/team";
 import { AppFooter } from "@/components/blocks/app-footer";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { redirect } from "next/navigation";
-import { SaveLastUsedProject } from "../../../(sidebar)/components/SaveLastUsedProject";
-import { SharedContractLayout } from "../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-layout";
 import { ErrorProvider } from "../../../../../../../../contexts/error-handler";
+import { SharedContractLayout } from "../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-layout";
 import { getValidAccount } from "../../../../../../account/settings/getAccount";
 import {
   getAuthToken,
   getAuthTokenWalletAddress,
 } from "../../../../../../api/lib/getAuthToken";
 import { TeamHeaderLoggedIn } from "../../../../../components/TeamHeader/team-header-logged-in.client";
+import { SaveLastUsedProject } from "../../../(sidebar)/components/SaveLastUsedProject";
 import type { ProjectContractPageParams } from "./types";
 
 export default async function ContractLayout(props: {
@@ -40,8 +40,8 @@ export default async function ContractLayout(props: {
 
   const teamsAndProjects = await Promise.all(
     teams.map(async (team) => ({
-      team,
       projects: await getProjects(team.slug),
+      team,
     })),
   );
 
@@ -64,21 +64,21 @@ export default async function ContractLayout(props: {
       <div className="flex min-h-dvh flex-col bg-background">
         <div className="border-border border-b bg-card">
           <TeamHeaderLoggedIn
-            currentProject={project}
-            currentTeam={team}
-            teamsAndProjects={teamsAndProjects}
             account={account}
             accountAddress={accountAddress}
             client={client}
+            currentProject={project}
+            currentTeam={team}
+            teamsAndProjects={teamsAndProjects}
           />
         </div>
         <SharedContractLayout
-          contractAddress={params.contractAddress}
-          chainIdOrSlug={params.chainIdOrSlug}
           authToken={authToken}
+          chainIdOrSlug={params.chainIdOrSlug}
+          contractAddress={params.contractAddress}
           projectMeta={{
-            teamId: team.id,
             projectSlug: params.project_slug,
+            teamId: team.id,
             teamSlug: params.team_slug,
           }}
         >
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/modules/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/modules/page.tsx
index 67de4909d5a..b8191a5a2da 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/modules/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/modules/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedModulesPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/shared-modules-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,9 +15,9 @@ export default async function Page(props: {
 
   return (
     <SharedModulesPage
+      chainIdOrSlug={params.chainIdOrSlug}
       contractAddress={params.contractAddress}
       isLoggedIn={true}
-      chainIdOrSlug={params.chainIdOrSlug}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/nfts/[tokenId]/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/nfts/[tokenId]/page.tsx
index d42f31d0fb7..f47f10876c9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/nfts/[tokenId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/nfts/[tokenId]/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedNFTTokenPage } from "../../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/shared-nfts-token-page";
 import type { ProjectContractPageParams } from "../../types";
 
@@ -19,15 +19,15 @@ export default async function Page(props: {
 
   return (
     <SharedNFTTokenPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       isLoggedIn={true}
-      tokenId={params.tokenId}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
+      tokenId={params.tokenId}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/nfts/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/nfts/page.tsx
index b87daeaaf40..c9609f9b579 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/nfts/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/nfts/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedNFTPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/shared-nfts-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,8 +15,8 @@ export default async function Page(props: {
 
   return (
     <SharedNFTPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       isLoggedIn={true}
       projectMeta={{
         projectSlug: project.slug,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/page.tsx
index 9795c61dd78..3165e695e60 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedContractOverviewPage } from "../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-overview-page";
 import type { ProjectContractPageParams } from "./types";
 
@@ -15,11 +15,11 @@ export default async function Page(props: {
 
   return (
     <SharedContractOverviewPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
     />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/permissions/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/permissions/page.tsx
index 3146e2074d8..91c16f4d3fa 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/permissions/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/permissions/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedPermissionsPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/shared-permissions-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,9 +15,9 @@ export default async function Page(props: {
 
   return (
     <SharedPermissionsPage
-      isLoggedIn={true}
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
         projectSlug: project.slug,
         teamId: project.teamId,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/proposals/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/proposals/page.tsx
index 6398577eefa..3f90f91a86c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/proposals/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/proposals/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedContractProposalsPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/shared-proposals-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,12 +15,12 @@ export default async function Page(props: {
 
   return (
     <SharedContractProposalsPage
+      chainIdOrSlug={params.chainIdOrSlug}
       contractAddress={params.contractAddress}
       isLoggedIn={true}
-      chainIdOrSlug={params.chainIdOrSlug}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
     />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/settings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/settings/page.tsx
index aff5902f2e0..51000443f8a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/settings/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedContractSettingsPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/shared-settings-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,14 +15,14 @@ export default async function Page(props: {
 
   return (
     <SharedContractSettingsPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
-      isLoggedIn={true}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/sources/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/sources/page.tsx
index c30c3d10f27..5904373f392 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/sources/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/sources/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedContractSourcesPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/shared-sources-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,11 +15,11 @@ export default async function Page(props: {
 
   return (
     <SharedContractSourcesPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
     />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/split/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/split/page.tsx
index 4c9fc53dfe1..e7c0383c8ae 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/split/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/split/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedContractSplitPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/split/shared-split-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,14 +15,14 @@ export default async function Page(props: {
 
   return (
     <SharedContractSplitPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
-      isLoggedIn={true}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/tokens/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/tokens/page.tsx
index ba7250b7e9f..0a19efed229 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/tokens/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/tokens/page.tsx
@@ -1,5 +1,5 @@
-import { getProject } from "@/api/projects";
 import { notFound } from "next/navigation";
+import { getProject } from "@/api/projects";
 import { SharedContractTokensPage } from "../../../../../../../(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/shared-page";
 import type { ProjectContractPageParams } from "../types";
 
@@ -15,14 +15,14 @@ export default async function Page(props: {
 
   return (
     <SharedContractTokensPage
-      contractAddress={params.contractAddress}
       chainIdOrSlug={params.chainIdOrSlug}
+      contractAddress={params.contractAddress}
+      isLoggedIn={true}
       projectMeta={{
-        teamId: project.teamId,
         projectSlug: project.slug,
+        teamId: project.teamId,
         teamSlug: params.team_slug,
       }}
-      isLoggedIn={true}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/utils.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/utils.ts
index 7b35cf4d838..2336146c280 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/utils.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/utils.ts
@@ -10,9 +10,9 @@ export function redirectToContractLandingPage(params: {
 }): never {
   redirect(
     buildContractPagePath({
-      projectMeta: params.projectMeta,
       chainIdOrSlug: params.chainIdOrSlug,
       contractAddress: params.contractAddress,
+      projectMeta: params.projectMeta,
     }),
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/layout.tsx
index 1f7e29ca9b0..8e2f9965153 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/layout.tsx
@@ -1,6 +1,6 @@
-import { getTeamBySlug, hasToCompleteTeamOnboarding } from "@/api/team";
 import { redirect } from "next/navigation";
 import { Suspense } from "react";
+import { getTeamBySlug, hasToCompleteTeamOnboarding } from "@/api/team";
 import { getAuthToken } from "../../api/lib/getAuthToken";
 import { EnsureValidConnectedWalletLoginServer } from "../../components/EnsureValidConnectedWalletLogin/EnsureValidConnectedWalletLoginServer";
 import { SaveLastVisitedTeamPage } from "../components/last-visited-page/SaveLastVisitedPage";
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/BarChart.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/BarChart.stories.tsx
index e97b5ac927e..c3032c71de0 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/BarChart.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/BarChart.stories.tsx
@@ -3,8 +3,8 @@ import { BadgeContainer } from "stories/utils";
 import { BarChart } from "./BarChart";
 
 const meta = {
-  title: "Analytics/BarChart",
   component: Component,
+  title: "Analytics/BarChart",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -19,13 +19,13 @@ export const Basic: Story = {
 };
 
 const chartConfig = {
-  views: {
-    label: "Daily Views",
-    color: "hsl(var(--chart-1))",
-  },
   users: {
-    label: "Active Users",
     color: "hsl(var(--chart-2))",
+    label: "Active Users",
+  },
+  views: {
+    color: "hsl(var(--chart-1))",
+    label: "Daily Views",
   },
 };
 
@@ -39,8 +39,8 @@ const generateDailyData = (days: number) => {
 
     data.push({
       date: date.toISOString(),
-      views: Math.floor(Math.random() * 1000) + 500,
       users: Math.floor(Math.random() * 800) + 200,
+      views: Math.floor(Math.random() * 1000) + 500,
     });
   }
 
@@ -52,19 +52,19 @@ function Component() {
     <div className="container max-w-[800px] space-y-8 py-8">
       <BadgeContainer label="Views Data">
         <BarChart
-          tooltipLabel="Daily Views"
+          activeKey="views"
           chartConfig={chartConfig}
           data={generateDailyData(14)}
-          activeKey="views"
+          tooltipLabel="Daily Views"
         />
       </BadgeContainer>
 
       <BadgeContainer label="Users Data">
         <BarChart
-          tooltipLabel="Active Users"
+          activeKey="users"
           chartConfig={chartConfig}
           data={generateDailyData(14)}
-          activeKey="users"
+          tooltipLabel="Active Users"
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/BarChart.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/BarChart.tsx
index 80149b12cfc..8e7394af21b 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/BarChart.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/BarChart.tsx
@@ -1,10 +1,4 @@
 "use client";
-import {
-  type ChartConfig,
-  ChartContainer,
-  ChartTooltip,
-  ChartTooltipContent,
-} from "@/components/ui/chart";
 import { EmptyChartState } from "components/analytics/empty-chart-state";
 import { formatTickerNumber } from "lib/format-utils";
 import {
@@ -15,6 +9,12 @@ import {
   YAxis,
 } from "recharts";
 import { toUSD } from "utils/number";
+import {
+  type ChartConfig,
+  ChartContainer,
+  ChartTooltip,
+  ChartTooltipContent,
+} from "@/components/ui/chart";
 
 export function BarChart({
   chartConfig,
@@ -33,13 +33,13 @@ export function BarChart({
 }) {
   return (
     <ChartContainer
+      className="aspect-auto h-[250px] w-full pt-6"
       config={{
         [activeKey]: {
           label: tooltipLabel ?? chartConfig[activeKey]?.label,
         },
         ...chartConfig,
       }}
-      className="aspect-auto h-[250px] w-full pt-6"
     >
       {data.length === 0 || data.every((d) => d[activeKey] === 0) ? (
         <EmptyChartState type="bar"> {emptyChartContent} </EmptyChartState>
@@ -54,38 +54,38 @@ export function BarChart({
         >
           <CartesianGrid vertical={false} />
           <XAxis
-            dataKey="date"
-            tickLine={false}
             axisLine={false}
-            tickMargin={8}
+            dataKey="date"
             minTickGap={32}
             tickFormatter={(value: string) => {
               const date = new Date(value);
               return date.toLocaleDateString("en-US", {
-                month: "short",
                 day: "numeric",
+                month: "short",
               });
             }}
+            tickLine={false}
+            tickMargin={8}
           />
           <YAxis
-            width={48}
-            dataKey={activeKey}
-            tickLine={false}
             axisLine={false}
+            dataKey={activeKey}
             tickFormatter={(value: number) => formatTickerNumber(value)}
+            tickLine={false}
+            width={48}
           />
           <ChartTooltip
             content={
               <ChartTooltipContent
                 className="w-[200px]"
-                nameKey={activeKey}
                 labelFormatter={(value) => {
                   return new Date(value).toLocaleDateString("en-US", {
-                    month: "short",
                     day: "numeric",
+                    month: "short",
                     year: "numeric",
                   });
                 }}
+                nameKey={activeKey}
                 valueFormatter={(v: unknown) =>
                   isCurrency || chartConfig[activeKey]?.isCurrency
                     ? toUSD(v as number)
@@ -95,11 +95,11 @@ export function BarChart({
             }
           />
           <Bar
+            className="stroke-background"
             dataKey={activeKey}
-            radius={4}
             fill={chartConfig[activeKey]?.color ?? "hsl(var(--chart-1))"}
+            radius={4}
             strokeWidth={1}
-            className="stroke-background"
           />
         </RechartsBarChart>
       )}
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedBarChartCard.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedBarChartCard.stories.tsx
index 8eeaa39b0b2..ed32c72ee76 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedBarChartCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedBarChartCard.stories.tsx
@@ -2,7 +2,6 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { CombinedBarChartCard } from "./CombinedBarChartCard";
 
 const meta = {
-  title: "Analytics/CombinedBarChartCard",
   component: CombinedBarChartCard,
   decorators: [
     (Story) => (
@@ -11,23 +10,24 @@ const meta = {
       </div>
     ),
   ],
+  title: "Analytics/CombinedBarChartCard",
 } satisfies Meta<typeof CombinedBarChartCard>;
 
 export default meta;
 type Story = StoryObj<typeof meta>;
 
 const chartConfig = {
+  annualUsers: {
+    color: "hsl(var(--chart-3))",
+    label: "Annual Active Users",
+  },
   dailyUsers: {
-    label: "Daily Active Users",
     color: "hsl(var(--chart-1))",
+    label: "Daily Active Users",
   },
   monthlyUsers: {
-    label: "Monthly Active Users",
     color: "hsl(var(--chart-2))",
-  },
-  annualUsers: {
-    label: "Annual Active Users",
-    color: "hsl(var(--chart-3))",
+    label: "Monthly Active Users",
   },
 };
 
@@ -54,10 +54,10 @@ function generateTimeSeriesData(days: number) {
     annualBase += 50;
 
     data.push({
-      date: date.toISOString(),
+      annualUsers: Math.max(0, Math.round(annualBase + annualVariation)),
       dailyUsers: Math.max(0, Math.round(dailyBase + dailyVariation)),
+      date: date.toISOString(),
       monthlyUsers: Math.max(0, Math.round(monthlyBase + monthlyVariation)),
-      annualUsers: Math.max(0, Math.round(annualBase + annualVariation)),
     });
   }
 
@@ -66,30 +66,30 @@ function generateTimeSeriesData(days: number) {
 
 export const UserActivity: Story = {
   args: {
-    title: "User Activity",
+    activeChart: "dailyUsers",
     chartConfig,
     data: generateTimeSeriesData(30),
-    activeChart: "dailyUsers",
     queryKey: "dailyUsers",
+    title: "User Activity",
   },
 };
 
 export const MonthlyUsers: Story = {
   args: {
-    title: "Monthly Users",
+    activeChart: "monthlyUsers",
     chartConfig,
     data: generateTimeSeriesData(30),
-    activeChart: "monthlyUsers",
     queryKey: "monthlyUsers",
+    title: "Monthly Users",
   },
 };
 
 export const AnnualUsers: Story = {
   args: {
-    title: "Annual Users",
+    activeChart: "annualUsers",
     chartConfig,
     data: generateTimeSeriesData(30),
-    activeChart: "annualUsers",
     queryKey: "annualUsers",
+    title: "Annual Users",
   },
 };
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedBarChartCard.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedBarChartCard.tsx
index 6fb93d8c3e7..ccb82c4214a 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedBarChartCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedBarChartCard.tsx
@@ -1,6 +1,6 @@
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import Link from "next/link";
 import { toUSD } from "utils/number";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { BarChart } from "./BarChart";
 import { Stat } from "./Stat";
 
@@ -62,26 +62,26 @@ export function CombinedBarChartCard<
               const key = chart as K;
               return (
                 <Link
+                  className="relative z-30 flex min-w-[200px] flex-1 flex-col justify-center gap-1 border-l first:border-l-0 hover:bg-card"
+                  data-active={activeChart === chart}
                   href={{
                     query: {
                       ...existingQueryParams,
                       [queryKey]: key,
                     },
                   }}
+                  key={chart}
                   prefetch
                   scroll={false}
-                  key={chart}
-                  data-active={activeChart === chart}
-                  className="relative z-30 flex min-w-[200px] flex-1 flex-col justify-center gap-1 border-l first:border-l-0 hover:bg-card"
                 >
                   <Stat
                     label={chartConfig[key].label}
+                    trend={trendFn(data, key) || undefined}
                     value={
                       isCurrency || chartConfig[key].isCurrency
                         ? toUSD(aggregateFn(data, key) ?? 0)
                         : (aggregateFn(data, key) ?? 0)
                     }
-                    trend={trendFn(data, key) || undefined}
                   />
                   <div
                     className="absolute right-0 bottom-0 left-0 h-0 bg-foreground transition-all duration-300 ease-out data-[active=true]:h-[3px]"
@@ -95,12 +95,12 @@ export function CombinedBarChartCard<
       </CardHeader>
       <CardContent className="px-2 sm:p-6 sm:pl-0">
         <BarChart
-          isCurrency={isCurrency}
-          tooltipLabel={title}
+          activeKey={activeChart}
           chartConfig={chartConfig}
           data={data}
-          activeKey={activeChart}
           emptyChartContent={chartConfig[activeChart].emptyContent}
+          isCurrency={isCurrency}
+          tooltipLabel={title}
         />
       </CardContent>
     </Card>
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedStatBreakdownCard.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedStatBreakdownCard.stories.tsx
index 7b330a290cf..6204f6726e5 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedStatBreakdownCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedStatBreakdownCard.stories.tsx
@@ -2,7 +2,6 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { CombinedStatBreakdownCard } from "./CombinedStatBreakdownCard";
 
 const meta = {
-  title: "Analytics/CombinedStatBreakdownCard",
   component: CombinedStatBreakdownCard,
   decorators: [
     (Story) => (
@@ -11,41 +10,30 @@ const meta = {
       </div>
     ),
   ],
+  title: "Analytics/CombinedStatBreakdownCard",
 } satisfies Meta<typeof CombinedStatBreakdownCard>;
 
 export default meta;
 type Story = StoryObj<typeof meta>;
 
 const breakdownConfig = {
-  chains: {
-    label: "Chain Distribution",
-    data: [
-      { value: 3753420.21, fill: "hsl(var(--chart-1))", label: "Base" },
-      { value: 2134521, fill: "hsl(var(--chart-2))", label: "Xai" },
-      { value: 423455.32, fill: "hsl(var(--chart-3))", label: "Ethereum" },
-      { value: 134234.1, fill: "hsl(var(--chart-4))", label: "Polygon" },
-    ],
-  },
   browsers: {
-    label: "Browser Distribution",
     data: [
       {
-        value: 3753420.21,
         fill: "hsl(var(--chart-1))",
-        label: "Chrome",
         icon: (
           // biome-ignore lint/a11y/noSvgWithoutTitle: This is a test icon
           <svg
-            xmlns="http://www.w3.org/2000/svg"
-            width="16"
-            height="16"
-            viewBox="0 0 24 24"
+            className="size-4"
             fill="none"
+            height="16"
             stroke="currentColor"
-            strokeWidth="2"
             strokeLinecap="round"
             strokeLinejoin="round"
-            className="size-4"
+            strokeWidth="2"
+            viewBox="0 0 24 24"
+            width="16"
+            xmlns="http://www.w3.org/2000/svg"
           >
             <circle cx="12" cy="12" r="10" />
             <circle cx="12" cy="12" r="4" />
@@ -54,58 +42,70 @@ const breakdownConfig = {
             <line x1="10.88" x2="15.46" y1="21.94" y2="14" />
           </svg>
         ),
+        label: "Chrome",
+        value: 3753420.21,
       },
       {
-        value: 2134521,
         fill: "hsl(var(--chart-2))",
-        label: "Firefox",
         icon: (
           // biome-ignore lint/a11y/noSvgWithoutTitle: This is a test icon
           <svg
-            xmlns="http://www.w3.org/2000/svg"
-            width="16"
-            height="16"
-            viewBox="0 0 24 24"
+            className="size-4"
             fill="none"
+            height="16"
             stroke="currentColor"
-            strokeWidth="2"
             strokeLinecap="round"
             strokeLinejoin="round"
-            className="size-4"
+            strokeWidth="2"
+            viewBox="0 0 24 24"
+            width="16"
+            xmlns="http://www.w3.org/2000/svg"
           >
             <circle cx="12" cy="12" r="10" />
             <circle cx="12" cy="12" r="4" />
           </svg>
         ),
+        label: "Firefox",
+        value: 2134521,
       },
     ],
+    label: "Browser Distribution",
+  },
+  chains: {
+    data: [
+      { fill: "hsl(var(--chart-1))", label: "Base", value: 3753420.21 },
+      { fill: "hsl(var(--chart-2))", label: "Xai", value: 2134521 },
+      { fill: "hsl(var(--chart-3))", label: "Ethereum", value: 423455.32 },
+      { fill: "hsl(var(--chart-4))", label: "Polygon", value: 134234.1 },
+    ],
+    label: "Chain Distribution",
   },
 };
 
 export const ChainsView: Story = {
   args: {
-    title: "Network Activity",
-    config: breakdownConfig,
     activeKey: "chains",
+    config: breakdownConfig,
     queryKey: "chart",
+    title: "Network Activity",
   },
 };
 
 export const BrowsersView: Story = {
   args: {
-    title: "Network Activity",
-    config: breakdownConfig,
     activeKey: "browsers",
+    config: breakdownConfig,
     queryKey: "chart",
+    title: "Network Activity",
   },
 };
 
 export const ChainsViewIsCurrency: Story = {
   args: {
-    title: "Network Activity",
-    config: breakdownConfig,
     activeKey: "chains",
-    queryKey: "chart",
+    config: breakdownConfig,
     isCurrency: true,
+    queryKey: "chart",
+    title: "Network Activity",
   },
 };
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedStatBreakdownCard.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedStatBreakdownCard.tsx
index 836ef501869..4c05a5cbfea 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedStatBreakdownCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/CombinedStatBreakdownCard.tsx
@@ -1,6 +1,6 @@
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import Link from "next/link";
 import { toUSD } from "utils/number";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Stat } from "./Stat";
 import { StatBreakdown } from "./StatBreakdown";
 
@@ -48,17 +48,17 @@ export function CombinedStatBreakdownCard<T extends string>({
               const { data, label } = config[key];
               return (
                 <Link
+                  className="relative z-30 flex min-w-[200px] flex-1 flex-col justify-center gap-1 border-l first:border-l-0 hover:bg-card"
+                  data-active={activeKey === breakdown}
                   href={{
                     query: {
                       ...existingQueryParams,
                       [queryKey]: key,
                     },
                   }}
+                  key={breakdown}
                   prefetch
                   scroll={false}
-                  key={breakdown}
-                  data-active={activeKey === breakdown}
-                  className="relative z-30 flex min-w-[200px] flex-1 flex-col justify-center gap-1 border-l first:border-l-0 hover:bg-card"
                 >
                   <Stat
                     label={label}
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyState.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyState.stories.tsx
index e6e72f4d26e..d5c33b9ce00 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyState.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyState.stories.tsx
@@ -2,8 +2,8 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { EmptyState } from "./EmptyState";
 
 const meta = {
-  title: "Analytics/EmptyState",
   component: Component,
+  title: "Analytics/EmptyState",
 } satisfies Meta<typeof Component>;
 
 export default meta;
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyState.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyState.tsx
index d6b5ce02f43..15cc1dd2bc0 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyState.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyState.tsx
@@ -1,5 +1,3 @@
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import { DotNetIcon } from "components/icons/brand-icons/DotNetIcon";
 import { ReactIcon } from "components/icons/brand-icons/ReactIcon";
 import { TypeScriptIcon } from "components/icons/brand-icons/TypeScriptIcon";
@@ -9,6 +7,8 @@ import { DocLink } from "components/shared/DocLink";
 import { ArrowRightIcon } from "lucide-react";
 import Image, { type StaticImageData } from "next/image";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 import accountAbstractionIcon from "../../../../../../public/assets/tw-icons/account-abstraction.svg";
 import authIcon from "../../../../../../public/assets/tw-icons/auth.svg";
 import payIcon from "../../../../../../public/assets/tw-icons/pay.svg";
@@ -30,43 +30,43 @@ export function EmptyState() {
         </div>
         <div className="flex flex-wrap items-center justify-center gap-2">
           <SDKBadge
+            href="https://portal.thirdweb.com/typescript/v5"
             icon={TypeScriptIcon}
             label="TypeScript"
-            href="https://portal.thirdweb.com/typescript/v5"
           />
           <SDKBadge
+            href="https://portal.thirdweb.com/react/v5"
             icon={ReactIcon}
             label="React"
-            href="https://portal.thirdweb.com/react/v5"
           />
           <SDKBadge
+            href="https://portal.thirdweb.com/react-native/v5"
             icon={ReactIcon}
             label="React Native"
-            href="https://portal.thirdweb.com/react-native/v5"
           />
           <SDKBadge
+            href="https://portal.thirdweb.com/unity/v5"
             icon={UnityIcon}
             label="Unity"
-            href="https://portal.thirdweb.com/unity/v5"
           />
           <SDKBadge
+            href="https://portal.thirdweb.com/unreal-engine"
             icon={UnrealIcon}
             label="Unreal"
-            href="https://portal.thirdweb.com/unreal-engine"
           />
           <SDKBadge
+            href="https://portal.thirdweb.com/dotnet"
             icon={DotNetIcon}
             label=".NET"
-            href="https://portal.thirdweb.com/dotnet"
           />
         </div>
       </div>
       <div className="flex gap-2">
-        <Button variant="primary" asChild className="min-w-36">
+        <Button asChild className="min-w-36" variant="primary">
           <Link
             href="https://portal.thirdweb.com/connect"
-            target="_blank"
             rel="noopener noreferrer"
+            target="_blank"
           >
             View Docs <ArrowRightIcon className="ml-2 h-4 w-auto" />
           </Link>
@@ -80,24 +80,24 @@ function AnimatedIcons() {
   return (
     <div className="-space-x-2 flex">
       <Icon
-        icon={walletsIcon}
         className="-rotate-[16deg] group-hover:-rotate-[32deg] group-hover:-translate-x-[44px] group-hover:-translate-y-[12px] z-[0] translate-x-[0px] translate-y-[0px] scale-1 group-hover:scale-[1.2]"
+        icon={walletsIcon}
       />
       <Icon
-        icon={payIcon}
         className="-rotate-[12deg] group-hover:-rotate-[24deg] group-hover:-translate-x-[28px] -translate-y-[12px] group-hover:-translate-y-[40px] z-[1] translate-x-[0px] scale-1 group-hover:scale-[1.2]"
+        icon={payIcon}
       />
       <Icon
-        icon={authIcon}
         className="-translate-y-[16px] group-hover:-translate-y-[52px] z-[2] scale-1 group-hover:scale-[1.2]"
+        icon={authIcon}
       />
       <Icon
-        icon={accountAbstractionIcon}
         className="-translate-y-[12px] group-hover:-translate-y-[40px] z-[1] translate-x-[0px] rotate-[12deg] scale-1 group-hover:translate-x-[28px] group-hover:rotate-[24deg] group-hover:scale-[1.2]"
+        icon={accountAbstractionIcon}
       />
       <Icon
-        icon={socialAuthIcon}
         className="group-hover:-translate-y-[12px] z-[0] translate-x-[0px] translate-y-[0px] rotate-[16deg] scale-1 group-hover:translate-x-[44px] group-hover:rotate-[32deg] group-hover:scale-[1.2]"
+        icon={socialAuthIcon}
       />
     </div>
   );
@@ -118,11 +118,11 @@ function Icon({
       )}
     >
       <Image
-        src={icon}
         alt=""
-        width={24}
-        height={24}
         className="rounded-full"
+        height={24}
+        src={icon}
+        width={24}
       />
     </div>
   );
@@ -132,10 +132,14 @@ function SDKBadge({
   icon,
   label,
   href,
-}: { icon: React.FC<{ className?: string }>; label: string; href: string }) {
+}: {
+  icon: React.FC<{ className?: string }>;
+  label: string;
+  href: string;
+}) {
   return (
     <div className="rounded-full bg-muted px-2.5 py-1">
-      <DocLink link={href} label={label} icon={icon} />
+      <DocLink icon={icon} label={label} link={href} />
     </div>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyStateCard.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyStateCard.stories.tsx
index 5300b9bec90..953721e0d35 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyStateCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyStateCard.stories.tsx
@@ -3,8 +3,8 @@ import { BadgeContainer } from "stories/utils";
 import { EmptyStateCard } from "./EmptyStateCard";
 
 const meta = {
-  title: "Analytics/EmptyStateCard",
   component: Component,
+  title: "Analytics/EmptyStateCard",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -27,8 +27,8 @@ function Component() {
 
       <BadgeContainer label="With Link">
         <EmptyStateCard
-          metric="revenue"
           link="https://docs.example.com/analytics"
+          metric="revenue"
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyStateCard.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyStateCard.tsx
index 6b3650b1166..1bf01b4cc1d 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyStateCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/EmptyStateCard.tsx
@@ -1,20 +1,24 @@
-import { Button } from "@/components/ui/button";
-import { Card } from "@/components/ui/card";
 import { PlugIcon } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
+import { Card } from "@/components/ui/card";
 
 export function EmptyStateCard({
   metric,
   link,
   description,
-}: { metric: string; link?: string; description?: string }) {
+}: {
+  metric: string;
+  link?: string;
+  description?: string;
+}) {
   return (
     <Card className="container h-[300px] p-2 md:h-[400px]">
       <div className="flex h-full flex-col items-center justify-center gap-2 rounded-md border text-center">
         <EmptyStateContent
-          metric={metric}
-          link={link}
           description={description}
+          link={link}
+          metric={metric}
         />
       </div>
     </Card>
@@ -40,12 +44,12 @@ export function EmptyStateContent({
         {description ?? `Your app may not be configured to use ${metric}.`}
       </div>
       {link && (
-        <Button asChild variant="primary" size="sm" className="mt-4">
+        <Button asChild className="mt-4" size="sm" variant="primary">
           <Link
-            href={link}
-            target="_blank"
             className="text-sm"
+            href={link}
             rel="noopener noreferrer"
+            target="_blank"
           >
             Configure {metric}
           </Link>
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/PieChart.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/PieChart.stories.tsx
index 94076dcce17..2028b3587a5 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/PieChart.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/PieChart.stories.tsx
@@ -3,8 +3,8 @@ import { BadgeContainer } from "stories/utils";
 import { PieChart } from "./PieChart";
 
 const meta = {
-  title: "Analytics/PieChart",
   component: Component,
+  title: "Analytics/PieChart",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -13,17 +13,17 @@ type Story = StoryObj<typeof meta>;
 export const Basic: Story = {};
 
 const chartData = [
-  { label: "Chrome", value: 275, fill: "hsl(var(--chart-1))" },
-  { label: "Safari", value: 200, fill: "hsl(var(--chart-2))" },
-  { label: "Firefox", value: 187, fill: "hsl(var(--chart-3))" },
-  { label: "Edge", value: 173, fill: "hsl(var(--chart-4))" },
+  { fill: "hsl(var(--chart-1))", label: "Chrome", value: 275 },
+  { fill: "hsl(var(--chart-2))", label: "Safari", value: 200 },
+  { fill: "hsl(var(--chart-3))", label: "Firefox", value: 187 },
+  { fill: "hsl(var(--chart-4))", label: "Edge", value: 173 },
 ];
 
 function Component() {
   return (
     <div className="container max-w-[400px] space-y-8 py-8">
       <BadgeContainer label="Base">
-        <PieChart title="Browser Usage" data={chartData} />
+        <PieChart data={chartData} title="Browser Usage" />
       </BadgeContainer>
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/PieChart.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/PieChart.tsx
index 8d24142fe6d..faeffe84080 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/PieChart.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/PieChart.tsx
@@ -1,13 +1,13 @@
 "use client";
 
+import { formatTickerNumber } from "lib/format-utils";
+import { Pie, PieChart as RechartsPieChart } from "recharts";
 import {
   type ChartConfig,
   ChartContainer,
   ChartTooltip,
   ChartTooltipContent,
 } from "@/components/ui/chart";
-import { formatTickerNumber } from "lib/format-utils";
-import { Pie, PieChart as RechartsPieChart } from "recharts";
 
 export function PieChart({
   title,
@@ -20,8 +20,8 @@ export function PieChart({
     Object.entries(data).map(([name, value]) => [
       value.label,
       {
-        label: value.label,
         color: value.fill,
+        label: value.label,
         name,
       },
     ]),
@@ -29,31 +29,31 @@ export function PieChart({
 
   return (
     <ChartContainer
+      className="mx-auto aspect-square max-h-[250px]"
       config={{
         tooltip: {
           label: title,
         },
         ...chartConfig,
       }}
-      className="mx-auto aspect-square max-h-[250px]"
     >
       <RechartsPieChart>
         <ChartTooltip
-          cursor={false}
           content={
             <ChartTooltipContent
               hideLabel
               valueFormatter={(v: unknown) => formatTickerNumber(v as number)}
             />
           }
+          cursor={false}
         />
         <Pie
           data={data}
           dataKey="value"
-          nameKey="label"
           innerRadius={60}
-          strokeWidth={1}
+          nameKey="label"
           stroke="hsl(var(--background))"
+          strokeWidth={1}
         />
       </RechartsPieChart>
     </ChartContainer>
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/PieChartCard.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/PieChartCard.stories.tsx
index ecc3c056cec..6495b0e6aab 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/PieChartCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/PieChartCard.stories.tsx
@@ -3,8 +3,8 @@ import { BadgeContainer } from "stories/utils";
 import { PieChartCard } from "./PieChartCard";
 
 const meta = {
-  title: "Analytics/PieChartCard",
   component: Component,
+  title: "Analytics/PieChartCard",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -17,38 +17,38 @@ export const Variants: Story = {
 };
 
 const baseChartData = [
-  { value: 275, fill: "hsl(var(--chart-1))", label: "Chrome" },
-  { value: 200, fill: "hsl(var(--chart-2))", label: "Safari" },
-  { value: 187, fill: "hsl(var(--chart-3))", label: "Firefox" },
-  { value: 173, fill: "hsl(var(--chart-4))", label: "Edge" },
+  { fill: "hsl(var(--chart-1))", label: "Chrome", value: 275 },
+  { fill: "hsl(var(--chart-2))", label: "Safari", value: 200 },
+  { fill: "hsl(var(--chart-3))", label: "Firefox", value: 187 },
+  { fill: "hsl(var(--chart-4))", label: "Edge", value: 173 },
 ];
 
 const manyItemsChartData = [
-  { value: 275, fill: "hsl(var(--chart-1))", label: "Chrome" },
-  { value: 200, fill: "hsl(var(--chart-2))", label: "Safari" },
-  { value: 187, fill: "hsl(var(--chart-3))", label: "Firefox" },
-  { value: 173, fill: "hsl(var(--chart-4))", label: "Edge" },
-  { value: 150, fill: "hsl(var(--chart-5))", label: "Opera" },
-  { value: 125, fill: "hsl(var(--chart-6))", label: "Brave" },
-  { value: 100, fill: "hsl(var(--chart-7))", label: "Samsung Internet" },
-  { value: 75, fill: "hsl(var(--chart-8))", label: "UC Browser" },
-  { value: 50, fill: "hsl(var(--chart-9))", label: "QQ Browser" },
-  { value: 40, fill: "hsl(var(--chart-10))", label: "Yandex" },
-  { value: 30, fill: "hsl(var(--chart-1))", label: "Maxthon" },
-  { value: 25, fill: "hsl(var(--chart-2))", label: "Vivaldi" },
-  { value: 20, fill: "hsl(var(--chart-3))", label: "Tor Browser" },
-  { value: 15, fill: "hsl(var(--chart-4))", label: "Pale Moon" },
+  { fill: "hsl(var(--chart-1))", label: "Chrome", value: 275 },
+  { fill: "hsl(var(--chart-2))", label: "Safari", value: 200 },
+  { fill: "hsl(var(--chart-3))", label: "Firefox", value: 187 },
+  { fill: "hsl(var(--chart-4))", label: "Edge", value: 173 },
+  { fill: "hsl(var(--chart-5))", label: "Opera", value: 150 },
+  { fill: "hsl(var(--chart-6))", label: "Brave", value: 125 },
+  { fill: "hsl(var(--chart-7))", label: "Samsung Internet", value: 100 },
+  { fill: "hsl(var(--chart-8))", label: "UC Browser", value: 75 },
+  { fill: "hsl(var(--chart-9))", label: "QQ Browser", value: 50 },
+  { fill: "hsl(var(--chart-10))", label: "Yandex", value: 40 },
+  { fill: "hsl(var(--chart-1))", label: "Maxthon", value: 30 },
+  { fill: "hsl(var(--chart-2))", label: "Vivaldi", value: 25 },
+  { fill: "hsl(var(--chart-3))", label: "Tor Browser", value: 20 },
+  { fill: "hsl(var(--chart-4))", label: "Pale Moon", value: 15 },
 ];
 
 function Component() {
   return (
     <div className="container max-w-lg space-y-8 py-10">
       <BadgeContainer label="Few Items">
-        <PieChartCard title="Browser Distribution" data={baseChartData} />
+        <PieChartCard data={baseChartData} title="Browser Distribution" />
       </BadgeContainer>
 
       <BadgeContainer label="Many Items (Shows Top 10 + Other)">
-        <PieChartCard title="Browser Distribution" data={manyItemsChartData} />
+        <PieChartCard data={manyItemsChartData} title="Browser Distribution" />
       </BadgeContainer>
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/PieChartCard.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/PieChartCard.tsx
index 3e6e9aa1b5c..9f8c6e582d5 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/PieChartCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/PieChartCard.tsx
@@ -1,10 +1,10 @@
+import Link from "next/link";
 import {
   Card,
   CardContent,
   CardFooter,
   CardHeader,
 } from "@/components/ui/card";
-import Link from "next/link";
 import { PieChart } from "./PieChart";
 import { Stat } from "./Stat";
 
@@ -41,9 +41,9 @@ export function PieChartCard({
 
     if (otherValue > 0) {
       top10.push({
+        fill: "orange",
         label: "Other",
         value: otherValue,
-        fill: "orange",
       });
     }
 
@@ -56,10 +56,10 @@ export function PieChartCard({
   return (
     <Card className="flex flex-col">
       <CardHeader className="border-border border-b p-0">
-        <Stat value={aggregateFn(data)} label={title} />
+        <Stat label={title} value={aggregateFn(data)} />
       </CardHeader>
       <CardContent className="flex-1 p-4">
-        <PieChart title={title} data={processedData} />
+        <PieChart data={processedData} title={title} />
       </CardContent>
       <CardFooter className="no-scrollbar flex max-w-full justify-center p-6 pt-0 max-md:overflow-x-auto">
         <div className="flex flex-wrap justify-center gap-x-4 gap-y-2.5">
@@ -68,18 +68,22 @@ export function PieChartCard({
               label,
               fill,
               link,
-            }: { label: string; fill?: string; link?: string }) => (
-              <div key={fill} className="flex items-center gap-2">
+            }: {
+              label: string;
+              fill?: string;
+              link?: string;
+            }) => (
+              <div className="flex items-center gap-2" key={fill}>
                 <div
                   className="size-2 rounded-full"
                   style={{ background: fill }}
                 />
                 {link ? (
                   <Link
+                    className="text-muted-foreground text-xs hover:text-link-foreground"
                     href={link}
-                    target="_blank"
                     rel="noopener noreferrer"
-                    className="text-muted-foreground text-xs hover:text-link-foreground"
+                    target="_blank"
                   >
                     {label}
                   </Link>
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/Stat.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/Stat.stories.tsx
index aee9c8ab6e9..277030005d2 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/Stat.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/Stat.stories.tsx
@@ -3,13 +3,13 @@ import { BadgeContainer } from "stories/utils";
 import { Stat } from "./Stat";
 
 const meta = {
-  title: "Analytics/Stat",
   component: Component,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Analytics/Stat",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -25,11 +25,11 @@ function Component() {
       </BadgeContainer>
 
       <BadgeContainer label="With Positive Trend">
-        <Stat label="Active Users" value={5678} trend={0.258707} />
+        <Stat label="Active Users" trend={0.258707} value={5678} />
       </BadgeContainer>
 
       <BadgeContainer label="With Negative Trend">
-        <Stat label="Daily Revenue" value={9876} trend={-0.1507} />
+        <Stat label="Daily Revenue" trend={-0.1507} value={9876} />
       </BadgeContainer>
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/Stat.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/Stat.tsx
index 1efbdcea39a..79d54a2f67c 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/Stat.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/Stat.tsx
@@ -4,7 +4,11 @@ export function Stat({
   label,
   value,
   trend,
-}: { label: string; value: string | number; trend?: number }) {
+}: {
+  label: string;
+  value: string | number;
+  trend?: number;
+}) {
   return (
     <div className="flex flex-col gap-1 p-4 text-left">
       <span className="text-muted-foreground text-sm">{label}</span>
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdown.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdown.stories.tsx
index c0c75db81c3..63701161bbf 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdown.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdown.stories.tsx
@@ -3,8 +3,8 @@ import { BadgeContainer } from "stories/utils";
 import { StatBreakdown } from "./StatBreakdown";
 
 const meta = {
-  title: "Analytics/StatBreakdown",
   component: Component,
+  title: "Analytics/StatBreakdown",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -17,30 +17,28 @@ export const Variants: Story = {
 };
 
 const baseData = [
-  { value: 3753420.21, fill: "hsl(var(--chart-1))", label: "Base" },
-  { value: 2134521, fill: "hsl(var(--chart-2))", label: "Xai" },
-  { value: 423455.32, fill: "hsl(var(--chart-3))", label: "Ethereum" },
-  { value: 134234.1, fill: "hsl(var(--chart-4))", label: "Polygon" },
+  { fill: "hsl(var(--chart-1))", label: "Base", value: 3753420.21 },
+  { fill: "hsl(var(--chart-2))", label: "Xai", value: 2134521 },
+  { fill: "hsl(var(--chart-3))", label: "Ethereum", value: 423455.32 },
+  { fill: "hsl(var(--chart-4))", label: "Polygon", value: 134234.1 },
 ];
 
 const withIconsData = [
   {
-    value: 3753420.21,
     fill: "hsl(var(--chart-1))",
-    label: "Chrome",
     icon: (
       // biome-ignore lint/a11y/noSvgWithoutTitle: This is a test icon
       <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="16"
-        height="16"
-        viewBox="0 0 24 24"
+        className="size-4"
         fill="none"
+        height="16"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
-        className="size-4"
+        strokeWidth="2"
+        viewBox="0 0 24 24"
+        width="16"
+        xmlns="http://www.w3.org/2000/svg"
       >
         <circle cx="12" cy="12" r="10" />
         <circle cx="12" cy="12" r="4" />
@@ -49,29 +47,31 @@ const withIconsData = [
         <line x1="10.88" x2="15.46" y1="21.94" y2="14" />
       </svg>
     ),
+    label: "Chrome",
+    value: 3753420.21,
   },
   {
-    value: 2134521,
     fill: "hsl(var(--chart-2))",
-    label: "Firefox",
     icon: (
       // biome-ignore lint/a11y/noSvgWithoutTitle: This is a test icon
       <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="16"
-        height="16"
-        viewBox="0 0 24 24"
+        className="size-4"
         fill="none"
+        height="16"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
-        className="size-4"
+        strokeWidth="2"
+        viewBox="0 0 24 24"
+        width="16"
+        xmlns="http://www.w3.org/2000/svg"
       >
         <circle cx="12" cy="12" r="10" />
         <circle cx="12" cy="12" r="4" />
       </svg>
     ),
+    label: "Firefox",
+    value: 2134521,
   },
 ];
 
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdown.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdown.tsx
index c90087faa84..b93c044c637 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdown.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdown.tsx
@@ -1,7 +1,7 @@
 "use client";
-import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
 import { useId, useMemo } from "react";
 import { toUSD } from "utils/number";
+import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
 
 type Data = {
   label: string;
@@ -13,7 +13,10 @@ type Data = {
 export function StatBreakdown({
   data,
   isCurrency = false,
-}: { data: Data[]; isCurrency?: boolean }) {
+}: {
+  data: Data[];
+  isCurrency?: boolean;
+}) {
   const cardId = useId();
   const sum = useMemo(
     () => data.reduce((acc, curr) => acc + curr.value, 0),
@@ -24,14 +27,11 @@ export function StatBreakdown({
     <div className="flex flex-col gap-2">
       <div className="flex h-6 w-full overflow-hidden rounded-sm">
         {data.map((item, index) => (
+          // biome-ignore lint/a11y/noStaticElementInteractions: FIXME
           <div
-            key={item.label}
-            data-index={`${cardId}-${index}`}
             className="transition-opacity duration-200"
-            style={{
-              background: item.fill,
-              width: `${(item.value / sum) * 100}%`,
-            }}
+            data-index={`${cardId}-${index}`}
+            key={item.label}
             onMouseEnter={() => {
               const bars = document.querySelectorAll(
                 `[data-index^="${cardId}"]`,
@@ -55,6 +55,10 @@ export function StatBreakdown({
                 bar.classList.remove("opacity-40");
               }
             }}
+            style={{
+              background: item.fill,
+              width: `${(item.value / sum) * 100}%`,
+            }}
           />
         ))}
       </div>
@@ -62,9 +66,9 @@ export function StatBreakdown({
         <TableBody className="">
           {data.map((item, index) => (
             <TableRow
-              key={item.label}
-              data-index={`${cardId}-${index}`}
               className="px-2 text-sm hover:bg-card"
+              data-index={`${cardId}-${index}`}
+              key={item.label}
               onMouseEnter={() => {
                 const bars = document.querySelectorAll(
                   `[data-index^="${cardId}"]`,
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdownCard.stories.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdownCard.stories.tsx
index 2ebd24bff54..4eccf494171 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdownCard.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdownCard.stories.tsx
@@ -3,8 +3,8 @@ import { BadgeContainer } from "stories/utils";
 import { StatBreakdownCard } from "./StatBreakdownCard";
 
 const meta = {
-  title: "Analytics/StatBreakdownCard",
   component: Component,
+  title: "Analytics/StatBreakdownCard",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -17,45 +17,43 @@ export const Variants: Story = {
 };
 
 const baseChartData = [
-  { value: 3753420.21, fill: "hsl(var(--chart-1))", label: "Base" },
-  { value: 2134521, fill: "hsl(var(--chart-2))", label: "Xai" },
-  { value: 423455.32, fill: "hsl(var(--chart-3))", label: "Ethereum" },
-  { value: 134234.1, fill: "hsl(var(--chart-4))", label: "Polygon" },
+  { fill: "hsl(var(--chart-1))", label: "Base", value: 3753420.21 },
+  { fill: "hsl(var(--chart-2))", label: "Xai", value: 2134521 },
+  { fill: "hsl(var(--chart-3))", label: "Ethereum", value: 423455.32 },
+  { fill: "hsl(var(--chart-4))", label: "Polygon", value: 134234.1 },
 ];
 
 const manyRowsData = [
-  { value: 5000000, fill: "hsl(var(--chart-1))", label: "Bitcoin" },
-  { value: 4500000, fill: "hsl(var(--chart-2))", label: "Ethereum" },
-  { value: 4000000, fill: "hsl(var(--chart-3))", label: "Polygon" },
-  { value: 3500000, fill: "hsl(var(--chart-4))", label: "Arbitrum" },
-  { value: 3000000, fill: "hsl(var(--chart-5))", label: "Optimism" },
-  { value: 2500000, fill: "hsl(var(--chart-6))", label: "Avalanche" },
-  { value: 2000000, fill: "hsl(var(--chart-7))", label: "Binance" },
-  { value: 1500000, fill: "hsl(var(--chart-8))", label: "Solana" },
-  { value: 1000000, fill: "hsl(var(--chart-9))", label: "Cardano" },
-  { value: 750000, fill: "hsl(var(--chart-10))", label: "Polkadot" },
-  { value: 500000, fill: "hsl(var(--chart-1))", label: "Cosmos" },
-  { value: 250000, fill: "hsl(var(--chart-2))", label: "Near" },
+  { fill: "hsl(var(--chart-1))", label: "Bitcoin", value: 5000000 },
+  { fill: "hsl(var(--chart-2))", label: "Ethereum", value: 4500000 },
+  { fill: "hsl(var(--chart-3))", label: "Polygon", value: 4000000 },
+  { fill: "hsl(var(--chart-4))", label: "Arbitrum", value: 3500000 },
+  { fill: "hsl(var(--chart-5))", label: "Optimism", value: 3000000 },
+  { fill: "hsl(var(--chart-6))", label: "Avalanche", value: 2500000 },
+  { fill: "hsl(var(--chart-7))", label: "Binance", value: 2000000 },
+  { fill: "hsl(var(--chart-8))", label: "Solana", value: 1500000 },
+  { fill: "hsl(var(--chart-9))", label: "Cardano", value: 1000000 },
+  { fill: "hsl(var(--chart-10))", label: "Polkadot", value: 750000 },
+  { fill: "hsl(var(--chart-1))", label: "Cosmos", value: 500000 },
+  { fill: "hsl(var(--chart-2))", label: "Near", value: 250000 },
 ];
 
 const withIconsData = [
   {
-    value: 3753420.21,
     fill: "hsl(var(--chart-1))",
-    label: "Chrome",
     icon: (
       // biome-ignore lint/a11y/noSvgWithoutTitle: This is a test icon
       <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="16"
-        height="16"
-        viewBox="0 0 24 24"
+        className="size-4"
         fill="none"
+        height="16"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
-        className="size-4"
+        strokeWidth="2"
+        viewBox="0 0 24 24"
+        width="16"
+        xmlns="http://www.w3.org/2000/svg"
       >
         <circle cx="12" cy="12" r="10" />
         <circle cx="12" cy="12" r="4" />
@@ -64,54 +62,56 @@ const withIconsData = [
         <line x1="10.88" x2="15.46" y1="21.94" y2="14" />
       </svg>
     ),
+    label: "Chrome",
+    value: 3753420.21,
   },
   {
-    value: 2134521,
     fill: "hsl(var(--chart-2))",
-    label: "Safari",
     icon: (
       // biome-ignore lint/a11y/noSvgWithoutTitle: This is a test icon
       <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="16"
-        height="16"
-        viewBox="0 0 24 24"
+        className="size-4"
         fill="none"
+        height="16"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
-        className="size-4"
+        strokeWidth="2"
+        viewBox="0 0 24 24"
+        width="16"
+        xmlns="http://www.w3.org/2000/svg"
       >
         <circle cx="12" cy="12" r="10" />
         <line x1="2" x2="22" y1="12" y2="12" />
-        <line x1="12" x2="12" y1="2" y2="22" transform="rotate(45 12 12)" />
-        <line x1="12" x2="12" y1="2" y2="22" transform="rotate(-45 12 12)" />
+        <line transform="rotate(45 12 12)" x1="12" x2="12" y1="2" y2="22" />
+        <line transform="rotate(-45 12 12)" x1="12" x2="12" y1="2" y2="22" />
       </svg>
     ),
+    label: "Safari",
+    value: 2134521,
   },
   {
-    value: 423455.32,
     fill: "hsl(var(--chart-3))",
-    label: "Firefox",
     icon: (
       // biome-ignore lint/a11y/noSvgWithoutTitle: This is a test icon
       <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="16"
-        height="16"
-        viewBox="0 0 24 24"
+        className="size-4"
         fill="none"
+        height="16"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
-        className="size-4"
+        strokeWidth="2"
+        viewBox="0 0 24 24"
+        width="16"
+        xmlns="http://www.w3.org/2000/svg"
       >
         <circle cx="12" cy="12" r="10" />
         <circle cx="12" cy="12" r="4" />
       </svg>
     ),
+    label: "Firefox",
+    value: 423455.32,
   },
 ];
 
@@ -120,22 +120,22 @@ function Component() {
     <div className="container max-w-[600px] space-y-10 py-10">
       <BadgeContainer label="Basic">
         <StatBreakdownCard
-          title="Sponsored Gas"
           data={baseChartData}
           isCurrency
+          title="Sponsored Gas"
         />
       </BadgeContainer>
 
       <BadgeContainer label="Many Rows (Shows Top 9 + Other)">
         <StatBreakdownCard
-          title="Network Distribution"
           data={manyRowsData}
           isCurrency
+          title="Network Distribution"
         />
       </BadgeContainer>
 
       <BadgeContainer label="With Icons">
-        <StatBreakdownCard title="Browser Distribution" data={withIconsData} />
+        <StatBreakdownCard data={withIconsData} title="Browser Distribution" />
       </BadgeContainer>
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdownCard.tsx b/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdownCard.tsx
index b19c9ad2f60..0d203283748 100644
--- a/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdownCard.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/Analytics/StatBreakdownCard.tsx
@@ -1,5 +1,5 @@
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { toUSD } from "utils/number";
+import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { Stat } from "./Stat";
 import { StatBreakdown } from "./StatBreakdown";
 
@@ -34,9 +34,9 @@ export function StatBreakdownCard({
 
     if (otherValue > 0) {
       top4.push({
+        fill: "hsl(var(--muted-foreground))",
         label: "Other",
         value: otherValue,
-        fill: "hsl(var(--muted-foreground))",
       });
     }
 
@@ -49,8 +49,8 @@ export function StatBreakdownCard({
     <Card className="flex flex-col">
       <CardHeader className="border-border border-b p-0">
         <Stat
-          value={isCurrency ? toUSD(sum) : sum.toLocaleString()}
           label={title}
+          value={isCurrency ? toUSD(sum) : sum.toLocaleString()}
         />
       </CardHeader>
       <CardContent className="flex-1 space-y-4 p-6">
diff --git a/apps/dashboard/src/app/(app)/team/components/HeaderLoggedOut/HeaderLoggedOut.stories.tsx b/apps/dashboard/src/app/(app)/team/components/HeaderLoggedOut/HeaderLoggedOut.stories.tsx
index 706bae0ec05..29109e63302 100644
--- a/apps/dashboard/src/app/(app)/team/components/HeaderLoggedOut/HeaderLoggedOut.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/HeaderLoggedOut/HeaderLoggedOut.stories.tsx
@@ -6,13 +6,13 @@ import {
 import { HeaderLoggedOut } from "./HeaderLoggedOut";
 
 const meta = {
-  title: "Headers/LoggedOut",
   component: Variants,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Headers/LoggedOut",
 } satisfies Meta<typeof Variants>;
 
 export default meta;
diff --git a/apps/dashboard/src/app/(app)/team/components/HeaderLoggedOut/HeaderLoggedOut.tsx b/apps/dashboard/src/app/(app)/team/components/HeaderLoggedOut/HeaderLoggedOut.tsx
index 7f2ef61d045..a86b0e6cb21 100644
--- a/apps/dashboard/src/app/(app)/team/components/HeaderLoggedOut/HeaderLoggedOut.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/HeaderLoggedOut/HeaderLoggedOut.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { ToggleThemeButton } from "@/components/color-mode-toggle";
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import type { ThirdwebClient } from "thirdweb";
+import { ToggleThemeButton } from "@/components/color-mode-toggle";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 import { SecondaryNavLinks } from "../../../components/Header/SecondaryNav/SecondaryNav";
 import { MobileBurgerMenuButton } from "../../../components/MobileBurgerMenuButton";
 import { ThirdwebMiniLogo } from "../../../components/ThirdwebMiniLogo";
@@ -35,7 +35,7 @@ function HeaderLoggedOutDesktopUI(props: {
         <SecondaryNavLinks />
 
         <div className="flex items-center gap-4">
-          <Button size="sm" className="rounded-lg" asChild>
+          <Button asChild className="rounded-lg" size="sm">
             <Link
               href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
             >
@@ -68,14 +68,14 @@ function HeaderLoggedOutMobileUI(props: {
       </Link>
 
       <div className="flex items-center gap-3">
-        <Button size="sm" className="rounded-lg" asChild>
+        <Button asChild className="rounded-lg" size="sm">
           <Link
             href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
           >
             Connect Wallet
           </Link>
         </Button>
-        <MobileBurgerMenuButton type="loggedOut" client={props.client} />
+        <MobileBurgerMenuButton client={props.client} type="loggedOut" />
       </div>
     </header>
   );
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/ProjectSelectorMobileMenuButton.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/ProjectSelectorMobileMenuButton.tsx
index 0e7ffe25aa5..7a2459346ae 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/ProjectSelectorMobileMenuButton.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/ProjectSelectorMobileMenuButton.tsx
@@ -1,13 +1,13 @@
 "use client";
 
+import { ChevronsUpDownIcon } from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import type { Team } from "@/api/team";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
-import { ChevronsUpDownIcon } from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import { ProjectSelectorUI } from "./ProjectSelectorUI";
 
 type ProjectSelectorMobileMenuButtonProps = {
@@ -23,22 +23,22 @@ export function ProjectSelectorMobileMenuButton(
 ) {
   const [open, setOpen] = useState(false);
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
+    <Dialog onOpenChange={setOpen} open={open}>
       {/* Trigger */}
       <DialogTrigger asChild>
         <Button
-          size="icon"
+          aria-label="Select Project"
           className="!h-auto w-auto rounded-xl px-1 py-2"
+          size="icon"
           variant="ghost"
-          aria-label="Select Project"
         >
           <ChevronsUpDownIcon className="size-5 shrink-0 text-muted-foreground hover:text-foreground" />
         </Button>
       </DialogTrigger>
 
       <DialogContent
-        dialogCloseClassName="hidden"
         className="p-0"
+        dialogCloseClassName="hidden"
         onClick={(e) => {
           if (e.target instanceof HTMLAnchorElement) {
             setOpen(false);
@@ -47,14 +47,14 @@ export function ProjectSelectorMobileMenuButton(
       >
         <DynamicHeight>
           <ProjectSelectorUI
-            currentProject={props.currentProject}
             client={props.client}
-            projects={props.projects}
-            team={props.team}
             createProject={() => {
               props.createProject(props.team);
               setOpen(false);
             }}
+            currentProject={props.currentProject}
+            projects={props.projects}
+            team={props.team}
           />
         </DynamicHeight>
       </DialogContent>
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/ProjectSelectorUI.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/ProjectSelectorUI.tsx
index 42532fcc9c6..d83ff9bf566 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/ProjectSelectorUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/ProjectSelectorUI.tsx
@@ -1,16 +1,16 @@
 "use client";
 
+import { CheckIcon, CirclePlusIcon } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import type { Team } from "@/api/team";
 import { ProjectAvatar } from "@/components/blocks/Avatars/ProjectAvatar";
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
 import { Button } from "@/components/ui/button";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
 import { Separator } from "@/components/ui/separator";
 import { cn } from "@/lib/utils";
-import { CheckIcon, CirclePlusIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import { SearchInput } from "./SearchInput";
 
 export function ProjectSelectorUI(props: {
@@ -31,16 +31,16 @@ export function ProjectSelectorUI(props: {
   return (
     <div className="fade-in-0 flex animate-in flex-col border-border border-l duration-300">
       <SearchInput
+        onValueChange={setSearchProjectTerm}
         placeholder="Search Projects"
         value={searchProjectTerm}
-        onValueChange={setSearchProjectTerm}
       />
 
       <Separator />
 
       <ScrollShadow
-        scrollableClassName="max-h-[400px] lg:max-h-[600px]"
         className="grow"
+        scrollableClassName="max-h-[400px] lg:max-h-[600px]"
       >
         <div className="flex flex-col p-2">
           <h2 className="mx-2 mt-2 mb-2 font-medium text-muted-foreground text-xs">
@@ -53,19 +53,19 @@ export function ProjectSelectorUI(props: {
               return (
                 <li key={project.slug}>
                   <Button
+                    asChild
                     className={cn(
                       "!opacity-100 w-full justify-between gap-2 pl-2 disabled:pointer-events-auto disabled:cursor-not-allowed disabled:opacity-100",
                       isSelected && "bg-accent",
                     )}
                     variant="ghost"
-                    asChild
                   >
                     <Link href={`/team/${team.slug}/${project.slug}`}>
                       <div className="flex items-center gap-2">
                         <ProjectAvatar
-                          src={project.image || ""}
                           className="size-6"
                           client={props.client}
+                          src={project.image || ""}
                         />
                         <span className="truncate"> {project.name}</span>
                       </div>
@@ -84,8 +84,8 @@ export function ProjectSelectorUI(props: {
       <div className="border-border border-t p-2">
         <Button
           className="w-full justify-start gap-2 px-2 disabled:pointer-events-auto disabled:cursor-not-allowed disabled:opacity-100"
-          variant="ghost"
           onClick={props.createProject}
+          variant="ghost"
         >
           <CirclePlusIcon className="size-4 text-link-foreground" />
           Create Project
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/SearchInput.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/SearchInput.tsx
index da1338a4e8a..a0c00370789 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/SearchInput.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/SearchInput.tsx
@@ -1,5 +1,5 @@
-import { Input } from "@/components/ui/input";
 import { SearchIcon } from "lucide-react";
+import { Input } from "@/components/ui/input";
 
 export function SearchInput(props: {
   placeholder: string;
@@ -9,10 +9,10 @@ export function SearchInput(props: {
   return (
     <div className="relative">
       <Input
+        className="!ring-offset-transparent rounded-none border-0 bg-transparent py-6 pl-9 focus:shadow-none focus-visible:ring-0 focus-visible:ring-transparent"
+        onChange={(e) => props.onValueChange(e.target.value)}
         placeholder={props.placeholder}
         value={props.value}
-        onChange={(e) => props.onValueChange(e.target.value)}
-        className="!ring-offset-transparent rounded-none border-0 bg-transparent py-6 pl-9 focus:shadow-none focus-visible:ring-0 focus-visible:ring-transparent"
       />
       <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamAndProjectSelectorPopoverButton.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamAndProjectSelectorPopoverButton.tsx
index 345e85b559d..48a21628d99 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamAndProjectSelectorPopoverButton.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamAndProjectSelectorPopoverButton.tsx
@@ -1,18 +1,18 @@
 "use client";
 
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import { ChevronsUpDownIcon } from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import type { Team } from "@/api/team";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
-import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import { ChevronsUpDownIcon } from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import { ProjectSelectorUI } from "./ProjectSelectorUI";
 import { TeamSelectionUI } from "./TeamSelectionUI";
 
@@ -50,23 +50,24 @@ export function TeamAndProjectSelectorPopoverButton(props: TeamSwitcherProps) {
 
   return (
     <Popover
-      open={open}
       onOpenChange={(_open) => {
         setOpen(_open);
         if (!_open) {
           setHoveredTeam(undefined);
         }
       }}
+      open={open}
     >
       {/* Trigger */}
       <PopoverTrigger asChild>
         <Button
-          size="icon"
-          className="!h-auto w-auto rounded-xl px-1 py-2"
-          variant="ghost"
-          role="combobox"
           aria-expanded={open}
           aria-label={`Select a ${props.focus === "project-selection" ? "project" : "team"}`}
+          className="!h-auto w-auto rounded-xl px-1 py-2"
+          // biome-ignore lint/a11y/useSemanticElements: EXPECTED
+          role="combobox"
+          size="icon"
+          variant="ghost"
         >
           <ChevronsUpDownIcon
             className="size-5 shrink-0 text-muted-foreground hover:text-foreground"
@@ -77,21 +78,27 @@ export function TeamAndProjectSelectorPopoverButton(props: TeamSwitcherProps) {
 
       {/* Dropdown */}
       <PopoverContent
-        sideOffset={5}
-        className="w-auto rounded-xl p-0 shadow-xl"
         align={props.focus === "project-selection" ? "center" : "start"}
+        className="w-auto rounded-xl p-0 shadow-xl"
         onClick={(e) => {
           if (e.target instanceof HTMLAnchorElement) {
             setOpen(false);
           }
         }}
+        sideOffset={5}
       >
         <DynamicHeight>
           <div className="no-scrollbar flex [&>div]:min-w-[280px]">
             {/* Left */}
             <TeamSelectionUI
-              isOnProjectPage={!!props.currentProject}
+              account={props.account}
+              client={props.client}
+              createTeam={() => {
+                setOpen(false);
+                props.createTeam();
+              }}
               currentTeam={currentTeam}
+              isOnProjectPage={!!props.currentProject}
               setHoveredTeam={setHoveredTeam}
               teamsAndProjects={teamsAndProjects}
               upgradeTeamLink={
@@ -99,25 +106,19 @@ export function TeamAndProjectSelectorPopoverButton(props: TeamSwitcherProps) {
                   ? `/team/${currentTeam.slug}/~/settings/billing`
                   : undefined
               }
-              account={props.account}
-              client={props.client}
-              createTeam={() => {
-                setOpen(false);
-                props.createTeam();
-              }}
             />
 
             {/* Right */}
             {projectsToShow && (
               <ProjectSelectorUI
-                currentProject={props.currentProject}
-                projects={projectsToShow}
-                team={projectsToShowOfTeam}
                 client={props.client}
                 createProject={() => {
                   setOpen(false);
                   props.createProject(projectsToShowOfTeam);
                 }}
+                currentProject={props.currentProject}
+                projects={projectsToShow}
+                team={projectsToShowOfTeam}
               />
             )}
           </div>
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamHeaderUI.stories.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamHeaderUI.stories.tsx
index 0878e6cd400..842d7ad65e2 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamHeaderUI.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamHeaderUI.stories.tsx
@@ -1,6 +1,3 @@
-import type { Project } from "@/api/projects";
-import type { Team } from "@/api/team";
-import { Button } from "@/components/ui/button";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { teamsAndProjectsStub } from "stories/stubs";
 import {
@@ -9,16 +6,19 @@ import {
   storybookThirdwebClient,
 } from "stories/utils";
 import { ThirdwebProvider } from "thirdweb/react";
+import type { Project } from "@/api/projects";
+import type { Team } from "@/api/team";
+import { Button } from "@/components/ui/button";
 import { TeamHeaderDesktopUI, TeamHeaderMobileUI } from "./TeamHeaderUI";
 
 const meta = {
-  title: "Headers/TeamHeader",
   component: Variants,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Headers/TeamHeader",
 } satisfies Meta<typeof Variants>;
 
 export default meta;
@@ -39,9 +39,7 @@ export const Mobile: Story = {
   },
 };
 
-function Variants(props: {
-  type: "mobile" | "desktop";
-}) {
+function Variants(props: { type: "mobile" | "desktop" }) {
   const freeTeam = teamsAndProjectsStub.find(
     (t) => t.team.billingPlan === "free",
   );
@@ -116,9 +114,9 @@ function Variants(props: {
 
         <BadgeContainer label="Pro Plan - project selected">
           <Variant
+            currentProject={proTeam.projects[0]}
             team={proTeam.team}
             type={props.type}
-            currentProject={proTeam.projects[0]}
           />
         </BadgeContainer>
       </div>
@@ -141,19 +139,19 @@ function Variant(props: {
   return (
     <div className="border-y bg-card">
       <Comp
-        teamsAndProjects={teamsAndProjectsStub}
-        currentTeam={props.team}
-        currentProject={undefined}
-        accountAddress={"0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37"}
         account={{
           email: "foo@example.com",
           id: "foo",
         }}
-        logout={() => {}}
+        accountAddress={"0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37"}
+        client={storybookThirdwebClient}
         connectButton={<ConnectButtonStub />}
         createProject={() => {}}
         createTeam={() => {}}
-        client={storybookThirdwebClient}
+        currentProject={undefined}
+        currentTeam={props.team}
+        logout={() => {}}
+        teamsAndProjects={teamsAndProjectsStub}
       />
     </div>
   );
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamHeaderUI.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamHeaderUI.tsx
index 45d2a9c4597..30f43b92397 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamHeaderUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamHeaderUI.tsx
@@ -1,20 +1,20 @@
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import Link from "next/link";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import type { Team } from "@/api/team";
 import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
 import { ProjectAvatar } from "@/components/blocks/Avatars/ProjectAvatar";
 import { cn } from "@/lib/utils";
-import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import Link from "next/link";
-import type { ThirdwebClient } from "thirdweb";
 import { NotificationsButton } from "../../../../../@/components/blocks/notifications/notification-button";
 import { SecondaryNav } from "../../../components/Header/SecondaryNav/SecondaryNav";
 import { MobileBurgerMenuButton } from "../../../components/MobileBurgerMenuButton";
 import { TeamPlanBadge } from "../../../components/TeamPlanBadge";
 import { ThirdwebMiniLogo } from "../../../components/ThirdwebMiniLogo";
+import { getValidTeamPlan } from "./getValidTeamPlan";
 import { ProjectSelectorMobileMenuButton } from "./ProjectSelectorMobileMenuButton";
 import { TeamAndProjectSelectorPopoverButton } from "./TeamAndProjectSelectorPopoverButton";
 import { TeamSelectorMobileMenuButton } from "./TeamSelectorMobileMenuButton";
-import { getValidTeamPlan } from "./getValidTeamPlan";
 import { TeamVerifiedIcon } from "./team-verified-icon";
 
 export type TeamHeaderCompProps = {
@@ -52,14 +52,14 @@ export function TeamHeaderDesktopUI(props: TeamHeaderCompProps) {
         <div className="flex items-center gap-1">
           <span className="flex flex-row items-center gap-2 font-normal text-sm">
             <Link
-              href={`/team/${currentTeam.slug}`}
               className="flex flex-row items-center gap-2 font-normal text-sm"
+              href={`/team/${currentTeam.slug}`}
             >
               <GradientAvatar
-                id={currentTeam.id}
-                src={currentTeam.image || ""}
                 className="size-6"
                 client={props.client}
+                id={currentTeam.id}
+                src={currentTeam.image || ""}
               />
               <span> {currentTeam.name} </span>
               <TeamVerifiedIcon domain={currentTeam.verifiedDomain} />
@@ -69,14 +69,14 @@ export function TeamHeaderDesktopUI(props: TeamHeaderCompProps) {
           </span>
 
           <TeamAndProjectSelectorPopoverButton
+            account={props.account}
+            client={props.client}
+            createProject={props.createProject}
+            createTeam={props.createTeam}
             currentProject={props.currentProject}
             currentTeam={props.currentTeam}
-            teamsAndProjects={props.teamsAndProjects}
             focus="team-selection"
-            createProject={props.createProject}
-            createTeam={props.createTeam}
-            account={props.account}
-            client={props.client}
+            teamsAndProjects={props.teamsAndProjects}
           />
         </div>
 
@@ -85,26 +85,26 @@ export function TeamHeaderDesktopUI(props: TeamHeaderCompProps) {
             <SlashSeparator />
             <div className="flex items-center gap-1">
               <Link
-                href={`/team/${props.currentTeam.slug}/${props.currentProject.slug}`}
                 className="flex flex-row items-center gap-2 font-semibold text-sm"
+                href={`/team/${props.currentTeam.slug}/${props.currentProject.slug}`}
               >
                 <ProjectAvatar
-                  src={props.currentProject.image || ""}
                   className="size-6"
                   client={props.client}
+                  src={props.currentProject.image || ""}
                 />
                 {props.currentProject.name}
               </Link>
 
               <TeamAndProjectSelectorPopoverButton
+                account={props.account}
+                client={props.client}
+                createProject={props.createProject}
+                createTeam={props.createTeam}
                 currentProject={props.currentProject}
                 currentTeam={props.currentTeam}
-                teamsAndProjects={props.teamsAndProjects}
                 focus="project-selection"
-                createProject={props.createProject}
-                createTeam={props.createTeam}
-                account={props.account}
-                client={props.client}
+                teamsAndProjects={props.teamsAndProjects}
               />
             </div>
           </>
@@ -113,10 +113,10 @@ export function TeamHeaderDesktopUI(props: TeamHeaderCompProps) {
 
       <SecondaryNav
         account={props.account}
-        logout={props.logout}
-        connectButton={props.connectButton}
-        client={props.client}
         accountAddress={props.accountAddress}
+        client={props.client}
+        connectButton={props.connectButton}
+        logout={props.logout}
       />
     </header>
   );
@@ -142,16 +142,16 @@ export function TeamHeaderMobileUI(props: TeamHeaderCompProps) {
       <div className="flex items-center gap-1.5">
         <div className="flex items-center gap-1">
           <Link
-            href={`/team/${currentTeam.slug}`}
             className={cn(
               "flex flex-row items-center gap-2 font-normal text-foreground text-sm",
             )}
+            href={`/team/${currentTeam.slug}`}
           >
             <GradientAvatar
-              id={currentTeam.id}
-              src={currentTeam.image || ""}
               className="size-6"
               client={props.client}
+              id={currentTeam.id}
+              src={currentTeam.image || ""}
             />
 
             {!props.currentProject && (
@@ -163,13 +163,13 @@ export function TeamHeaderMobileUI(props: TeamHeaderCompProps) {
           </Link>
 
           <TeamSelectorMobileMenuButton
-            isOnProjectPage={!!props.currentProject}
-            currentTeam={props.currentTeam}
-            teamsAndProjects={props.teamsAndProjects}
-            upgradeTeamLink={`/team/${currentTeam.slug}/settings`}
             account={props.account}
             client={props.client}
             createTeam={props.createTeam}
+            currentTeam={props.currentTeam}
+            isOnProjectPage={!!props.currentProject}
+            teamsAndProjects={props.teamsAndProjects}
+            upgradeTeamLink={`/team/${currentTeam.slug}/settings`}
           />
         </div>
 
@@ -178,8 +178,8 @@ export function TeamHeaderMobileUI(props: TeamHeaderCompProps) {
             <SlashSeparator />
             <div className="flex items-center gap-1">
               <Link
-                href={`/team/${props.currentTeam.slug}/${props.currentProject.slug}`}
                 className="flex items-center gap-2 font-semibold text-sm"
+                href={`/team/${props.currentTeam.slug}/${props.currentProject.slug}`}
               >
                 <span className="truncate max-sm:max-w-[130px]">
                   {props.currentProject.name}
@@ -187,11 +187,11 @@ export function TeamHeaderMobileUI(props: TeamHeaderCompProps) {
               </Link>
 
               <ProjectSelectorMobileMenuButton
+                client={props.client}
+                createProject={props.createProject}
                 currentProject={props.currentProject}
                 projects={projects}
                 team={props.currentTeam}
-                createProject={props.createProject}
-                client={props.client}
               />
             </div>
           </>
@@ -202,12 +202,12 @@ export function TeamHeaderMobileUI(props: TeamHeaderCompProps) {
         <NotificationsButton accountId={props.account.id} />
 
         <MobileBurgerMenuButton
-          type="loggedIn"
-          email={props.account.email}
-          logout={props.logout}
-          connectButton={props.connectButton}
           accountAddress={props.accountAddress}
           client={props.client}
+          connectButton={props.connectButton}
+          email={props.account.email}
+          logout={props.logout}
+          type="loggedIn"
         />
       </div>
     </header>
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamSelectionUI.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamSelectionUI.tsx
index 7173e6e2a50..6ed002682b1 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamSelectionUI.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamSelectionUI.tsx
@@ -1,19 +1,19 @@
-import type { Project } from "@/api/projects";
-import type { Team } from "@/api/team";
-import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
-import { cn } from "@/lib/utils";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { CirclePlusIcon } from "lucide-react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import type { Project } from "@/api/projects";
+import type { Team } from "@/api/team";
+import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
+import { Button } from "@/components/ui/button";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
+import { Separator } from "@/components/ui/separator";
+import { cn } from "@/lib/utils";
 import { TeamPlanBadge } from "../../../components/TeamPlanBadge";
-import { SearchInput } from "./SearchInput";
 import { getValidTeamPlan } from "./getValidTeamPlan";
+import { SearchInput } from "./SearchInput";
 import { TeamVerifiedIcon } from "./team-verified-icon";
 
 export function TeamSelectionUI(props: {
@@ -40,28 +40,28 @@ export function TeamSelectionUI(props: {
   return (
     <div className="flex flex-col">
       <SearchInput
+        onValueChange={setSearchTeamTerm}
         placeholder="Search Teams"
         value={searchTeamTerm}
-        onValueChange={setSearchTeamTerm}
       />
       <Separator />
       <ScrollShadow
-        scrollableClassName="max-h-[400px] lg:max-h-[600px]"
         className="grow"
+        scrollableClassName="max-h-[400px] lg:max-h-[600px]"
       >
         <div className="flex flex-col p-2">
           <Button
+            asChild
             className={cn("w-full justify-start gap-2 px-2")}
-            variant="ghost"
             onMouseEnter={() => setHoveredTeam(undefined)}
-            asChild
+            variant="ghost"
           >
             <Link href="/account">
               <GradientAvatar
-                src={props.account?.image || ""}
                 className="size-4"
-                id={props.account?.id}
                 client={props.client}
+                id={props.account?.id}
+                src={props.account?.image || ""}
               />
               My Account
             </Link>
@@ -75,21 +75,21 @@ export function TeamSelectionUI(props: {
             {filteredTeams.map((team) => {
               const isSelected = team.id === currentTeam?.id;
               return (
-                // biome-ignore lint/a11y/useKeyWithMouseEvents: <explanation>
+                // biome-ignore lint/a11y/useKeyWithMouseEvents: FIXME
                 <li
-                  key={team.id}
                   className="py-0.5"
+                  key={team.id}
                   onMouseOver={() => {
                     setHoveredTeam(team);
                   }}
                 >
                   <Button
+                    asChild
                     className={cn(
                       "!opacity-100 w-full justify-between gap-2 pl-2",
                       isSelected && "bg-accent",
                     )}
                     variant="ghost"
-                    asChild
                   >
                     <Link
                       href={
@@ -105,10 +105,10 @@ export function TeamSelectionUI(props: {
                     >
                       <div className="flex items-center gap-2">
                         <GradientAvatar
-                          src={team.image || ""}
                           className="size-4"
-                          id={team.id}
                           client={props.client}
+                          id={team.id}
+                          src={team.image || ""}
                         />
 
                         <span className="truncate"> {team.name} </span>
@@ -128,8 +128,8 @@ export function TeamSelectionUI(props: {
             <li className="py-0.5">
               <Button
                 className="w-full justify-start gap-2 px-2"
-                variant="ghost"
                 onClick={props.createTeam}
+                variant="ghost"
               >
                 <CirclePlusIcon className="size-4 text-link-foreground" />
                 Create Team
@@ -143,9 +143,9 @@ export function TeamSelectionUI(props: {
         <div className="border-border border-t p-2">
           <Button
             asChild
-            variant="primary"
             className="w-full"
             onMouseEnter={() => setHoveredTeam(undefined)}
+            variant="primary"
           >
             <Link href={props.upgradeTeamLink}>Upgrade Team</Link>
           </Button>
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamSelectorMobileMenuButton.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamSelectorMobileMenuButton.tsx
index 001e8af9e58..1eefa0714f4 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamSelectorMobileMenuButton.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/TeamSelectorMobileMenuButton.tsx
@@ -1,13 +1,13 @@
 "use client";
 
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import { ChevronsUpDownIcon } from "lucide-react";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import type { Team } from "@/api/team";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
-import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import { ChevronsUpDownIcon } from "lucide-react";
-import type { ThirdwebClient } from "thirdweb";
 import { TeamSelectionUI } from "./TeamSelectionUI";
 
 type TeamSelectorMobileMenuButtonProps = {
@@ -30,10 +30,10 @@ export function TeamSelectorMobileMenuButton(
       {/* Trigger */}
       <DialogTrigger asChild>
         <Button
-          size="icon"
+          aria-label="Select Project"
           className="!h-auto w-auto rounded-xl px-0.5 py-2"
+          size="icon"
           variant="ghost"
-          aria-label="Select Project"
         >
           <ChevronsUpDownIcon
             className="size-5 shrink-0 text-muted-foreground hover:text-foreground"
@@ -42,17 +42,17 @@ export function TeamSelectorMobileMenuButton(
         </Button>
       </DialogTrigger>
 
-      <DialogContent dialogCloseClassName="hidden" className="p-0">
+      <DialogContent className="p-0" dialogCloseClassName="hidden">
         <DynamicHeight>
           <TeamSelectionUI
-            isOnProjectPage={props.isOnProjectPage}
+            account={props.account}
+            client={props.client}
+            createTeam={props.createTeam} // don't care on mobile
             currentTeam={currentTeam}
-            setHoveredTeam={() => {}} // don't care on mobile
+            isOnProjectPage={props.isOnProjectPage}
+            setHoveredTeam={() => {}}
             teamsAndProjects={teamsAndProjects}
             upgradeTeamLink={props.upgradeTeamLink}
-            account={props.account}
-            client={props.client}
-            createTeam={props.createTeam}
           />
         </DynamicHeight>
       </DialogContent>
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-header-logged-in.client.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-header-logged-in.client.tsx
index b1f18dc7c72..51ba973b47b 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-header-logged-in.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-header-logged-in.client.tsx
@@ -1,12 +1,5 @@
 "use client";
 
-import { createTeam } from "@/actions/createTeam";
-import { useIdentifyAccount } from "@/analytics/hooks/identify-account";
-import { useIdentifyTeam } from "@/analytics/hooks/identify-team";
-import { resetAnalytics } from "@/analytics/reset";
-import type { Project } from "@/api/projects";
-import type { Team } from "@/api/team";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { CustomConnectWallet } from "@3rdweb-sdk/react/components/connect-wallet";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { LazyCreateProjectDialog } from "components/settings/ApiKeys/Create/LazyCreateAPIKeyDialog";
@@ -14,6 +7,13 @@ import { useCallback, useState } from "react";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
 import { useActiveWallet, useDisconnect } from "thirdweb/react";
+import { createTeam } from "@/actions/createTeam";
+import { useIdentifyAccount } from "@/analytics/hooks/identify-account";
+import { useIdentifyTeam } from "@/analytics/hooks/identify-team";
+import { resetAnalytics } from "@/analytics/reset";
+import type { Project } from "@/api/projects";
+import type { Team } from "@/api/team";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { doLogout } from "../../../login/auth-actions";
 import {
   type TeamHeaderCompProps,
@@ -61,13 +61,11 @@ export function TeamHeaderLoggedIn(props: {
   }, [router, activeWallet, disconnect]);
 
   const headerProps: TeamHeaderCompProps = {
-    currentProject: props.currentProject,
-    currentTeam: props.currentTeam,
-    teamsAndProjects: props.teamsAndProjects,
     account: props.account,
-    logout: logout,
+    accountAddress: props.accountAddress,
+    client: props.client,
     connectButton: (
-      <CustomConnectWallet isLoggedIn={true} client={props.client} />
+      <CustomConnectWallet client={props.client} isLoggedIn={true} />
     ),
     createProject: (team: Team) => {
       setCreateProjectDialogState({
@@ -84,14 +82,16 @@ export function TeamHeaderLoggedIn(props: {
           router.push(`/team/${res.data.slug}`);
         }),
         {
+          error: "Failed to create team",
           loading: "Creating team",
           success: "Team created",
-          error: "Failed to create team",
         },
       );
     },
-    client: props.client,
-    accountAddress: props.accountAddress,
+    currentProject: props.currentProject,
+    currentTeam: props.currentTeam,
+    logout: logout,
+    teamsAndProjects: props.teamsAndProjects,
   };
 
   return (
@@ -101,22 +101,22 @@ export function TeamHeaderLoggedIn(props: {
 
       {createProjectDialogState.isOpen && (
         <LazyCreateProjectDialog
-          open={true}
-          teamSlug={createProjectDialogState.team.slug}
-          teamId={createProjectDialogState.team.id}
-          onOpenChange={() =>
-            setCreateProjectDialogState({
-              isOpen: false,
-            })
+          enableNebulaServiceByDefault={
+            createProjectDialogState.isOpen &&
+            createProjectDialogState.team.enabledScopes.includes("nebula")
           }
           onCreateAndComplete={() => {
             // refresh projects
             router.refresh();
           }}
-          enableNebulaServiceByDefault={
-            createProjectDialogState.isOpen &&
-            createProjectDialogState.team.enabledScopes.includes("nebula")
+          onOpenChange={() =>
+            setCreateProjectDialogState({
+              isOpen: false,
+            })
           }
+          open={true}
+          teamId={createProjectDialogState.team.id}
+          teamSlug={createProjectDialogState.team.slug}
         />
       )}
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-header.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-header.tsx
index d8d61a02a3e..99ea9575c7b 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-header.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-header.tsx
@@ -1,8 +1,8 @@
+import { LAST_USED_TEAM_ID } from "constants/cookies";
+import { cookies } from "next/headers";
 import { getProjects } from "@/api/projects";
 import { getTeams } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { LAST_USED_TEAM_ID } from "constants/cookies";
-import { cookies } from "next/headers";
 import { getRawAccount } from "../../../account/settings/getAccount";
 import {
   getAuthToken,
@@ -34,8 +34,8 @@ export async function TeamHeader() {
 
   const teamsAndProjects = await Promise.all(
     teams.map(async (team) => ({
-      team,
       projects: await getProjects(team.slug),
+      team,
     })),
   );
 
@@ -53,12 +53,12 @@ export async function TeamHeader() {
 
   return (
     <TeamHeaderLoggedIn
+      account={account}
+      accountAddress={accountAddress}
       client={lastUsedTeamClient}
+      currentProject={undefined}
       currentTeam={selectedTeam}
       teamsAndProjects={teamsAndProjects}
-      currentProject={undefined}
-      account={account}
-      accountAddress={accountAddress}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-verified-icon.tsx b/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-verified-icon.tsx
index fb88b3faf92..753ce52366d 100644
--- a/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-verified-icon.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/TeamHeader/team-verified-icon.tsx
@@ -1,9 +1,7 @@
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { VerifiedIcon } from "lucide-react";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
-export function TeamVerifiedIcon(props: {
-  domain: string | null;
-}) {
+export function TeamVerifiedIcon(props: { domain: string | null }) {
   if (!props.domain) {
     return null;
   }
diff --git a/apps/dashboard/src/app/(app)/team/components/last-visited-page/SaveLastVisitedPage.tsx b/apps/dashboard/src/app/(app)/team/components/last-visited-page/SaveLastVisitedPage.tsx
index b950586f3fd..b3af948866e 100644
--- a/apps/dashboard/src/app/(app)/team/components/last-visited-page/SaveLastVisitedPage.tsx
+++ b/apps/dashboard/src/app/(app)/team/components/last-visited-page/SaveLastVisitedPage.tsx
@@ -6,9 +6,7 @@ import { LAST_USED_TEAM_ID } from "../../../../../constants/cookies";
 import { setCookie } from "../../../../../lib/cookie";
 import { LAST_VISITED_TEAM_PAGE_PATH } from "./consts";
 
-export function SaveLastVisitedTeamPage(props: {
-  teamId: string;
-}) {
+export function SaveLastVisitedTeamPage(props: { teamId: string }) {
   const pathname = usePathname();
 
   // eslint-disable-next-line no-restricted-syntax
diff --git a/apps/dashboard/src/app/(app)/team/page.tsx b/apps/dashboard/src/app/(app)/team/page.tsx
index e3d8f8ceb9b..dc5379b2150 100644
--- a/apps/dashboard/src/app/(app)/team/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/page.tsx
@@ -1,5 +1,5 @@
-import { getLastVisitedTeam } from "@/api/team";
 import { redirect } from "next/navigation";
+import { getLastVisitedTeam } from "@/api/team";
 
 export default async function TeamRootPage() {
   const team = await getLastVisitedTeam();
diff --git a/apps/dashboard/src/app/(app)/team/~/[[...paths]]/page.tsx b/apps/dashboard/src/app/(app)/team/~/[[...paths]]/page.tsx
index 167fc8fb12a..0f9b707f6ce 100644
--- a/apps/dashboard/src/app/(app)/team/~/[[...paths]]/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/~/[[...paths]]/page.tsx
@@ -1,11 +1,11 @@
-import { type Team, getTeams } from "@/api/team";
+import { ChevronRightIcon, UsersIcon } from "lucide-react";
+import Link from "next/link";
+import { notFound, redirect } from "next/navigation";
+import { getTeams, type Team } from "@/api/team";
 import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
 import { AppFooter } from "@/components/blocks/app-footer";
 import { DotsBackgroundPattern } from "@/components/ui/background-patterns";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { ChevronRightIcon, UsersIcon } from "lucide-react";
-import Link from "next/link";
-import { notFound, redirect } from "next/navigation";
 import { getAuthToken } from "../../../api/lib/getAuthToken";
 import { TeamPlanBadge } from "../../../components/TeamPlanBadge";
 import { TeamHeader } from "../../components/TeamHeader/team-header";
@@ -48,9 +48,9 @@ export default async function Page(props: {
   if (teams.length === 1 && teams[0]) {
     redirect(
       createTeamLink({
-        team: teams[0],
         paths: params.paths,
         searchParams: searchParamsString,
+        team: teams[0],
       }),
     );
   }
@@ -88,22 +88,22 @@ export default async function Page(props: {
               {teams.map((team) => {
                 return (
                   <div
-                    key={team.id}
                     className="group relative flex items-center gap-3 px-4 py-4 hover:bg-accent/50 lg:px-6"
+                    key={team.id}
                   >
                     <GradientAvatar
-                      src={team.image || ""}
-                      id={team.id}
                       className="size-8 rounded-full border"
                       client={client}
+                      id={team.id}
+                      src={team.image || ""}
                     />
                     <Link
+                      className="before:absolute before:inset-0"
                       href={createTeamLink({
-                        team,
                         paths: params.paths,
                         searchParams: searchParamsString,
+                        team,
                       })}
-                      className="before:absolute before:inset-0"
                     >
                       {team.name}
                     </Link>
diff --git a/apps/dashboard/src/app/bridge/components/client/Providers.client.tsx b/apps/dashboard/src/app/bridge/components/client/Providers.client.tsx
index 8afb600ba23..a3752fcce46 100644
--- a/apps/dashboard/src/app/bridge/components/client/Providers.client.tsx
+++ b/apps/dashboard/src/app/bridge/components/client/Providers.client.tsx
@@ -8,9 +8,9 @@ export function BridgeProviders({ children }: { children: React.ReactNode }) {
     <ThirdwebProvider>
       <ThemeProvider
         attribute="class"
+        defaultTheme="dark"
         disableTransitionOnChange
         enableSystem={false}
-        defaultTheme="dark"
       >
         {children}
         <Toaster richColors theme="dark" />
diff --git a/apps/dashboard/src/app/bridge/components/client/UniversalBridgeEmbed.tsx b/apps/dashboard/src/app/bridge/components/client/UniversalBridgeEmbed.tsx
index 0f05434db52..75793768bfb 100644
--- a/apps/dashboard/src/app/bridge/components/client/UniversalBridgeEmbed.tsx
+++ b/apps/dashboard/src/app/bridge/components/client/UniversalBridgeEmbed.tsx
@@ -2,15 +2,19 @@
 
 import { useTheme } from "next-themes";
 import { PayEmbed, type TokenInfo } from "thirdweb/react";
-import { getSDKTheme } from "../../../(app)/components/sdk-component-theme";
 import { useV5DashboardChain } from "../../../../lib/v5-adapter";
+import { getSDKTheme } from "../../../(app)/components/sdk-component-theme";
 import { bridgeAppThirdwebClient } from "../../constants";
 
 export function UniversalBridgeEmbed({
   chainId,
   token,
   amount,
-}: { chainId?: number; token: TokenInfo | undefined; amount?: string }) {
+}: {
+  chainId?: number;
+  token: TokenInfo | undefined;
+  amount?: string;
+}) {
   const { theme } = useTheme();
   const chain = useV5DashboardChain(chainId || 1);
 
@@ -22,9 +26,9 @@ export function UniversalBridgeEmbed({
         prefillBuy:
           chainId && token
             ? {
+                amount,
                 chain,
                 token,
-                amount,
               }
             : undefined,
       }}
diff --git a/apps/dashboard/src/app/bridge/constants.ts b/apps/dashboard/src/app/bridge/constants.ts
index a21ca079c9c..80eb639b635 100644
--- a/apps/dashboard/src/app/bridge/constants.ts
+++ b/apps/dashboard/src/app/bridge/constants.ts
@@ -1,7 +1,3 @@
-import {
-  NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
-  NEXT_PUBLIC_IPFS_GATEWAY_URL,
-} from "@/constants/public-envs";
 import {
   THIRDWEB_BRIDGE_URL,
   THIRDWEB_BUNDLER_DOMAIN,
@@ -15,30 +11,34 @@ import {
 import { getVercelEnv } from "lib/vercel-utils";
 import { createThirdwebClient } from "thirdweb";
 import { setThirdwebDomains } from "thirdweb/utils";
+import {
+  NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
+  NEXT_PUBLIC_IPFS_GATEWAY_URL,
+} from "@/constants/public-envs";
 
 function getBridgeThirdwebClient() {
   if (getVercelEnv() !== "production") {
     // if not on production: run this when creating a client to set the domains
     setThirdwebDomains({
-      rpc: THIRDWEB_RPC_DOMAIN,
+      bridge: THIRDWEB_BRIDGE_URL,
+      bundler: THIRDWEB_BUNDLER_DOMAIN,
       inAppWallet: THIRDWEB_INAPP_WALLET_DOMAIN,
+      insight: THIRDWEB_INSIGHT_API_DOMAIN,
       pay: THIRDWEB_PAY_DOMAIN,
-      storage: THIRDWEB_STORAGE_DOMAIN,
+      rpc: THIRDWEB_RPC_DOMAIN,
       social: THIRDWEB_SOCIAL_API_DOMAIN,
-      bundler: THIRDWEB_BUNDLER_DOMAIN,
-      insight: THIRDWEB_INSIGHT_API_DOMAIN,
-      bridge: THIRDWEB_BRIDGE_URL,
+      storage: THIRDWEB_STORAGE_DOMAIN,
     });
   }
 
   return createThirdwebClient({
-    secretKey: undefined,
     clientId: NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
     config: {
       storage: {
         gatewayUrl: NEXT_PUBLIC_IPFS_GATEWAY_URL,
       },
     },
+    secretKey: undefined,
   });
 }
 
diff --git a/apps/dashboard/src/app/bridge/layout.tsx b/apps/dashboard/src/app/bridge/layout.tsx
index 3e49b785598..74495433229 100644
--- a/apps/dashboard/src/app/bridge/layout.tsx
+++ b/apps/dashboard/src/app/bridge/layout.tsx
@@ -1,12 +1,12 @@
-import { cn } from "@/lib/utils";
 import { Inter } from "next/font/google";
+import { cn } from "@/lib/utils";
 import "../../global.css";
 import { BridgeProviders } from "./components/client/Providers.client";
 
 const fontSans = Inter({
+  display: "swap",
   subsets: ["latin"],
   variable: "--font-sans",
-  display: "swap",
 });
 
 export default function BridgeLayout({
diff --git a/apps/dashboard/src/app/bridge/page.tsx b/apps/dashboard/src/app/bridge/page.tsx
index 0be287f42f6..609ef9a3d6a 100644
--- a/apps/dashboard/src/app/bridge/page.tsx
+++ b/apps/dashboard/src/app/bridge/page.tsx
@@ -12,17 +12,19 @@ const description =
   "Swap, bridge, and on-ramp to any EVM chain with thirdweb's Universal Bridge.";
 
 export const metadata: Metadata = {
-  title,
   description,
   openGraph: {
-    title,
     description,
+    title,
   },
+  title,
 };
 
 export default async function BridgePage({
   searchParams,
-}: { searchParams: Promise<Record<string, string | string[]>> }) {
+}: {
+  searchParams: Promise<Record<string, string | string[]>>;
+}) {
   const { chainId, tokenAddress, amount } = await searchParams;
 
   let symbol: string | undefined;
@@ -33,10 +35,10 @@ export default async function BridgePage({
     try {
       const metadata = await getCurrencyMetadata({
         contract: getContract({
-          client: bridgeAppThirdwebClient,
+          address: tokenAddress as Address,
           // eslint-disable-next-line no-restricted-syntax
           chain: defineChain(Number(chainId)),
-          address: tokenAddress as Address,
+          client: bridgeAppThirdwebClient,
         }),
       });
       ({ symbol, decimals, name: tokenName } = metadata);
@@ -50,6 +52,7 @@ export default async function BridgePage({
     <div className="relative mx-auto flex h-screen w-full flex-col items-center justify-center overflow-hidden border py-10">
       <main className="container z-10 flex justify-center">
         <UniversalBridgeEmbed
+          amount={amount as string}
           chainId={chainId ? Number(chainId) : undefined}
           token={
             symbol && decimals && tokenName
@@ -60,15 +63,14 @@ export default async function BridgePage({
                 }
               : undefined
           }
-          amount={amount as string}
         />
       </main>
 
       {/* eslint-disable-next-line @next/next/no-img-element */}
       <img
         alt=""
-        src="/assets/login/background.svg"
         className="-bottom-12 -right-12 pointer-events-none absolute lg:right-0 lg:bottom-0"
+        src="/assets/login/background.svg"
       />
 
       <div className="absolute inset-x-0 bottom-8 z-20">
@@ -86,10 +88,10 @@ export default async function BridgePage({
                 </p>
               </div>
               <a
+                className="inline-flex items-center gap-2 rounded-md bg-green-600 px-4 py-2 font-medium text-sm text-white transition-all hover:bg-green-600/90 hover:shadow-sm"
                 href="https://portal.thirdweb.com/pay"
-                target="_blank"
                 rel="noopener noreferrer"
-                className="inline-flex items-center gap-2 rounded-md bg-green-600 px-4 py-2 font-medium text-sm text-white transition-all hover:bg-green-600/90 hover:shadow-sm"
+                target="_blank"
               >
                 Learn More
                 <ArrowUpRightIcon className="size-4" />
diff --git a/apps/dashboard/src/app/global-error.tsx b/apps/dashboard/src/app/global-error.tsx
index bc88f2cbcf1..989ec7f7dba 100644
--- a/apps/dashboard/src/app/global-error.tsx
+++ b/apps/dashboard/src/app/global-error.tsx
@@ -18,8 +18,8 @@ export default function GlobalError({
       scope.setLevel("fatal");
       Sentry.captureException(error, {
         extra: {
-          crashedPage: true,
           boundary: "global",
+          crashedPage: true,
           router: "app",
         },
       });
@@ -30,7 +30,7 @@ export default function GlobalError({
     <html lang="en" suppressHydrationWarning>
       <body>
         <h2>Something went wrong!</h2>
-        <button type="button" onClick={() => reset()}>
+        <button onClick={() => reset()} type="button">
           Try again
         </button>
       </body>
diff --git a/apps/dashboard/src/app/pay/[id]/page.tsx b/apps/dashboard/src/app/pay/[id]/page.tsx
index 0f86ecd1216..378d2a5cf7a 100644
--- a/apps/dashboard/src/app/pay/[id]/page.tsx
+++ b/apps/dashboard/src/app/pay/[id]/page.tsx
@@ -1,21 +1,21 @@
-import { getPaymentLink } from "@/api/universal-bridge/links";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import type { Metadata } from "next";
 import { defineChain, getContract } from "thirdweb";
 import { getCurrencyMetadata } from "thirdweb/extensions/erc20";
 import { checksumAddress } from "thirdweb/utils";
+import { getPaymentLink } from "@/api/universal-bridge/links";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { PayPageEmbed } from "../components/client/PayPageEmbed.client";
 
 const title = "thirdweb Pay";
 const description = "Fast, secure, and simple payments.";
 
 export const metadata: Metadata = {
-  title,
   description,
   openGraph: {
-    title,
     description,
+    title,
   },
+  title,
 };
 
 export default async function PayPage({
@@ -33,10 +33,10 @@ export default async function PayPage({
   });
 
   const tokenContract = getContract({
-    client: getClientThirdwebClient(undefined), // for this RPC call, use the dashboard client
+    address: paymentLink.destinationToken.address, // for this RPC call, use the dashboard client
     // eslint-disable-next-line no-restricted-syntax
     chain: defineChain(Number(paymentLink.destinationToken.chainId)),
-    address: paymentLink.destinationToken.address,
+    client: getClientThirdwebClient(undefined),
   });
   const {
     symbol,
@@ -46,26 +46,26 @@ export default async function PayPage({
     contract: tokenContract,
   });
   const token = {
-    symbol,
-    decimals,
-    name: tokenName,
     address: checksumAddress(paymentLink.destinationToken.address),
     chainId: Number(paymentLink.destinationToken.chainId),
+    decimals,
+    name: tokenName,
+    symbol,
   };
 
   return (
     <PayPageEmbed
-      redirectUri={redirectUri}
-      paymentLinkId={id}
-      chainId={Number(paymentLink.destinationToken.chainId)}
-      recipientAddress={paymentLink.receiver}
       amount={paymentLink.amount ? BigInt(paymentLink.amount) : undefined}
-      token={token}
+      chainId={Number(paymentLink.destinationToken.chainId)}
       clientId={paymentLink.clientId}
-      name={paymentLink.title}
       image={paymentLink.imageUrl}
-      theme={theme}
+      name={paymentLink.title}
+      paymentLinkId={id}
       purchaseData={paymentLink.purchaseData}
+      recipientAddress={paymentLink.receiver}
+      redirectUri={redirectUri}
+      theme={theme}
+      token={token}
     />
   );
 }
diff --git a/apps/dashboard/src/app/pay/components/client/PayPageEmbed.client.tsx b/apps/dashboard/src/app/pay/components/client/PayPageEmbed.client.tsx
index d785867f375..04348c2bf8e 100644
--- a/apps/dashboard/src/app/pay/components/client/PayPageEmbed.client.tsx
+++ b/apps/dashboard/src/app/pay/components/client/PayPageEmbed.client.tsx
@@ -45,21 +45,13 @@ export function PayPageEmbed({
       <AutoConnect client={payAppThirdwebClient} />
       <PayEmbed
         client={payAppThirdwebClient}
-        theme={theme ?? (browserTheme === "light" ? "light" : "dark")}
         paymentLinkId={paymentLinkId}
         payOptions={{
           metadata: {
-            name,
             image,
+            name,
           },
           mode: "direct_payment",
-          purchaseData,
-          paymentInfo: {
-            chain,
-            sellerAddress: recipientAddress,
-            amount: amount ? toTokens(amount, token.decimals) : "0.01",
-            token: token.address === NATIVE_TOKEN_ADDRESS ? undefined : token,
-          },
           onPurchaseSuccess: (result) => {
             if (!redirectUri) return;
             const url = new URL(redirectUri);
@@ -91,7 +83,15 @@ export function PayPageEmbed({
             }
             return window.open(url.toString());
           },
+          paymentInfo: {
+            amount: amount ? toTokens(amount, token.decimals) : "0.01",
+            chain,
+            sellerAddress: recipientAddress,
+            token: token.address === NATIVE_TOKEN_ADDRESS ? undefined : token,
+          },
+          purchaseData,
         }}
+        theme={theme ?? (browserTheme === "light" ? "light" : "dark")}
       />
     </>
   );
diff --git a/apps/dashboard/src/app/pay/components/client/PaymentLinkForm.client.tsx b/apps/dashboard/src/app/pay/components/client/PaymentLinkForm.client.tsx
index 772d05d935f..26aea3660e3 100644
--- a/apps/dashboard/src/app/pay/components/client/PaymentLinkForm.client.tsx
+++ b/apps/dashboard/src/app/pay/components/client/PaymentLinkForm.client.tsx
@@ -1,26 +1,26 @@
 "use client";
 
-import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { TokenSelector } from "@/components/blocks/TokenSelector";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { cn } from "@/lib/utils";
 import { payAppThirdwebClient } from "app/pay/constants";
 import { ChevronDownIcon, CreditCardIcon } from "lucide-react";
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useId, useMemo, useState } from "react";
 import { toast } from "sonner";
 import {
-  type ThirdwebClient,
   createThirdwebClient,
   defineChain,
   getContract,
+  type ThirdwebClient,
   toUnits,
 } from "thirdweb";
 import { getCurrencyMetadata } from "thirdweb/extensions/erc20";
 import { resolveScheme, upload } from "thirdweb/storage";
+import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
+import { TokenSelector } from "@/components/blocks/TokenSelector";
+import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { cn } from "@/lib/utils";
 import { FileInput } from "../../../../components/shared/FileInput";
 import { resolveEns } from "../../../../lib/ens";
 
@@ -57,8 +57,8 @@ export function PaymentLinkForm() {
 
       // eslint-disable-next-line no-restricted-syntax
       const resolvedUrl = resolveScheme({
-        uri,
         client: uploadClient,
+        uri,
       });
 
       setImageUri(resolvedUrl);
@@ -97,11 +97,11 @@ export function PaymentLinkForm() {
 
         // Build payment URL
         const params = new URLSearchParams({
+          amount: inputs.amount.toString(),
           chainId: inputs.chainId.toString(),
+          clientId: payAppThirdwebClient.clientId,
           recipientAddress: inputs.recipientAddress,
           tokenAddress: inputs.tokenAddress,
-          amount: inputs.amount.toString(),
-          clientId: payAppThirdwebClient.clientId,
         });
 
         // Add title as name parameter if provided
@@ -142,11 +142,11 @@ export function PaymentLinkForm() {
       );
 
       const params = new URLSearchParams({
+        amount: inputs.amount.toString(),
         chainId: inputs.chainId.toString(),
+        clientId: payAppThirdwebClient.clientId,
         recipientAddress: inputs.recipientAddress,
         tokenAddress: inputs.tokenAddress,
-        amount: inputs.amount.toString(),
-        clientId: payAppThirdwebClient.clientId,
       });
 
       // Add title as name parameter if provided
@@ -176,6 +176,10 @@ export function PaymentLinkForm() {
     ? tokenAddressWithChain.split(":")
     : [];
 
+  const recipientId = useId();
+  const amountId = useId();
+  const titleId = useId();
+
   return (
     <Card className="mx-auto w-full max-w-[500px]">
       <CardHeader>
@@ -189,84 +193,80 @@ export function PaymentLinkForm() {
         </div>
       </CardHeader>
       <CardContent>
-        <form onSubmit={handleSubmit} className="space-y-6">
+        <form className="space-y-6" onSubmit={handleSubmit}>
           <div className="space-y-2">
-            <Label htmlFor="network" className="font-medium text-sm">
-              Network
-            </Label>
+            <Label className="font-medium text-sm">Network</Label>
             <SingleNetworkSelector
               chainId={chainId}
-              onChange={setChainId}
-              disableTestnets
-              client={payAppThirdwebClient}
               className="w-full"
+              client={payAppThirdwebClient}
+              disableTestnets
+              onChange={setChainId}
             />
           </div>
 
           <div className="space-y-2">
-            <Label htmlFor="token" className="font-medium text-sm">
-              Token
-            </Label>
+            <Label className="font-medium text-sm">Token</Label>
             <TokenSelector
-              showCheck={false}
               addNativeTokenIfMissing={false}
+              chainId={chainId ?? undefined}
+              className="w-full"
+              client={payAppThirdwebClient}
+              disabled={!chainId}
+              enabled={!!chainId}
+              onChange={(value) => {
+                setTokenAddressWithChain(`${value.chainId}:${value.address}`);
+              }}
               selectedToken={
                 selectedChainId && selectedTokenAddress
                   ? {
-                      chainId: Number(selectedChainId),
                       address: selectedTokenAddress,
+                      chainId: Number(selectedChainId),
                     }
                   : undefined
               }
-              chainId={chainId ?? undefined}
-              onChange={(value) => {
-                setTokenAddressWithChain(`${value.chainId}:${value.address}`);
-              }}
-              className="w-full"
-              client={payAppThirdwebClient}
-              disabled={!chainId}
-              enabled={!!chainId}
+              showCheck={false}
             />
           </div>
 
           <div className="space-y-2">
-            <Label htmlFor="recipient" className="font-medium text-sm">
+            <Label className="font-medium text-sm" htmlFor={recipientId}>
               Recipient Address
             </Label>
             <Input
-              id="recipient"
-              value={recipientAddress}
+              className="w-full"
+              id={recipientId}
               onChange={(e) => setRecipientAddress(e.target.value)}
               placeholder="Address or ENS"
               required
-              className="w-full"
+              value={recipientAddress}
             />
           </div>
 
           <div className="space-y-2">
-            <Label htmlFor="amount" className="font-medium text-sm">
+            <Label className="font-medium text-sm" htmlFor={amountId}>
               Amount
             </Label>
             <Input
-              id="amount"
-              type="number"
-              step="any"
-              value={amount}
+              className="w-full"
+              id={amountId}
               onChange={(e) => setAmount(e.target.value)}
               placeholder="0.0"
               required
-              className="w-full"
+              step="any"
+              type="number"
+              value={amount}
             />
           </div>
 
           <div className="space-y-2">
             <Button
-              type="button"
-              variant="ghost"
               className={cn(
                 "flex w-full items-center justify-between px-0 text-muted-foreground hover:bg-transparent",
               )}
               onClick={() => setShowAdvanced(!showAdvanced)}
+              type="button"
+              variant="ghost"
             >
               <span>Advanced Options</span>
               <ChevronDownIcon
@@ -287,33 +287,31 @@ export function PaymentLinkForm() {
               <div className={cn(showAdvanced ? "" : "overflow-hidden")}>
                 <div className="space-y-3">
                   <div className="space-y-2">
-                    <Label htmlFor="title" className="font-medium text-sm">
+                    <Label className="font-medium text-sm" htmlFor={titleId}>
                       Title
                     </Label>
                     <Input
-                      id="title"
-                      value={title}
+                      className="w-full"
+                      id={titleId}
                       onChange={(e) => setTitle(e.target.value)}
                       placeholder="Payment for..."
-                      className="w-full"
+                      value={title}
                     />
                   </div>
 
                   <div className="space-y-2">
-                    <Label htmlFor="image" className="font-medium text-sm">
-                      Image
-                    </Label>
+                    <Label className="font-medium text-sm">Image</Label>
                     <div className="w-full">
                       <FileInput
-                        client={payAppThirdwebClient}
                         accept={{ "image/*": [] }}
-                        setValue={handleImageUpload}
-                        value={image || imageUri}
                         className="!rounded-md aspect-square h-24 w-full"
+                        client={payAppThirdwebClient}
+                        helperText="image"
                         isDisabled={uploadingImage}
                         isDisabledText="Uploading..."
                         selectOrUpload="Upload"
-                        helperText="image"
+                        setValue={handleImageUpload}
+                        value={image || imageUri}
                       />
                     </div>
                   </div>
@@ -325,28 +323,28 @@ export function PaymentLinkForm() {
           <div className="flex flex-col space-y-4">
             {paymentUrl && (
               <CopyTextButton
+                className="w-full justify-between truncate bg-background px-3 py-2"
+                copyIconPosition="right"
                 textToCopy={paymentUrl}
                 textToShow={paymentUrl}
                 tooltip="Copy Payment Link"
-                className="w-full justify-between truncate bg-background px-3 py-2"
-                copyIconPosition="right"
               />
             )}
 
             <div className="flex gap-2">
               <Button
-                type="button"
-                variant="outline"
                 className="flex-1"
                 disabled={isLoading || !isFormComplete}
                 onClick={handlePreview}
+                type="button"
+                variant="outline"
               >
                 Preview
               </Button>
               <Button
-                type="submit"
                 className="flex-1"
                 disabled={isLoading || !isFormComplete}
+                type="submit"
               >
                 {isLoading ? "Creating..." : "Create"}
               </Button>
@@ -376,10 +374,10 @@ async function parseInputs(
   const ensPromise = resolveEns(recipientAddressOrEns, client);
   const currencyPromise = getCurrencyMetadata({
     contract: getContract({
-      client,
+      address: tokenAddress,
       // eslint-disable-next-line no-restricted-syntax
       chain: defineChain(chainId),
-      address: tokenAddress,
+      client,
     }),
   });
   const [ens, currencyMetadata] = await Promise.all([
@@ -393,9 +391,9 @@ async function parseInputs(
   const amountInWei = toUnits(decimalAmount, currencyMetadata.decimals);
 
   return {
+    amount: amountInWei,
     chainId,
-    tokenAddress,
     recipientAddress: ens.address,
-    amount: amountInWei,
+    tokenAddress,
   };
 }
diff --git a/apps/dashboard/src/app/pay/constants.ts b/apps/dashboard/src/app/pay/constants.ts
index 1471051ef90..2638bf1deba 100644
--- a/apps/dashboard/src/app/pay/constants.ts
+++ b/apps/dashboard/src/app/pay/constants.ts
@@ -1,7 +1,3 @@
-import {
-  NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
-  NEXT_PUBLIC_IPFS_GATEWAY_URL,
-} from "@/constants/public-envs";
 import {
   THIRDWEB_BRIDGE_URL,
   THIRDWEB_BUNDLER_DOMAIN,
@@ -15,30 +11,34 @@ import {
 import { getVercelEnv } from "lib/vercel-utils";
 import { createThirdwebClient } from "thirdweb";
 import { setThirdwebDomains } from "thirdweb/utils";
+import {
+  NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
+  NEXT_PUBLIC_IPFS_GATEWAY_URL,
+} from "@/constants/public-envs";
 
 function getPayThirdwebClient() {
   if (getVercelEnv() !== "production") {
     // if not on production: run this when creating a client to set the domains
     setThirdwebDomains({
-      rpc: THIRDWEB_RPC_DOMAIN,
+      bridge: THIRDWEB_BRIDGE_URL,
+      bundler: THIRDWEB_BUNDLER_DOMAIN,
       inAppWallet: THIRDWEB_INAPP_WALLET_DOMAIN,
+      insight: THIRDWEB_INSIGHT_API_DOMAIN,
       pay: THIRDWEB_PAY_DOMAIN,
-      storage: THIRDWEB_STORAGE_DOMAIN,
+      rpc: THIRDWEB_RPC_DOMAIN,
       social: THIRDWEB_SOCIAL_API_DOMAIN,
-      bundler: THIRDWEB_BUNDLER_DOMAIN,
-      insight: THIRDWEB_INSIGHT_API_DOMAIN,
-      bridge: THIRDWEB_BRIDGE_URL,
+      storage: THIRDWEB_STORAGE_DOMAIN,
     });
   }
 
   return createThirdwebClient({
-    secretKey: undefined,
     clientId: NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
     config: {
       storage: {
         gatewayUrl: NEXT_PUBLIC_IPFS_GATEWAY_URL,
       },
     },
+    secretKey: undefined,
   });
 }
 
diff --git a/apps/dashboard/src/app/pay/layout.tsx b/apps/dashboard/src/app/pay/layout.tsx
index f78e2a8c1e0..70a18849d42 100644
--- a/apps/dashboard/src/app/pay/layout.tsx
+++ b/apps/dashboard/src/app/pay/layout.tsx
@@ -1,13 +1,13 @@
 import "../../global.css";
-import { cn } from "@/lib/utils";
-import { ThemeProvider } from "next-themes";
 import { Inter } from "next/font/google";
+import { ThemeProvider } from "next-themes";
+import { cn } from "@/lib/utils";
 import { PayProviders } from "./components/client/Providers.client";
 
 const fontSans = Inter({
+  display: "swap",
   subsets: ["latin"],
   variable: "--font-sans",
-  display: "swap",
 });
 
 export default async function PayLayout({
@@ -26,9 +26,9 @@ export default async function PayLayout({
         <PayProviders>
           <ThemeProvider
             attribute="class"
+            defaultTheme="dark"
             disableTransitionOnChange
             enableSystem={false}
-            defaultTheme="dark"
           >
             <div className="relative mx-auto flex h-full w-full flex-col items-center justify-center overflow-x-hidden overflow-y-scroll py-10">
               <main className="container z-10 flex justify-center">
@@ -38,8 +38,8 @@ export default async function PayLayout({
               {/* eslint-disable-next-line @next/next/no-img-element */}
               <img
                 alt=""
-                src="/assets/login/background.svg"
                 className="-bottom-12 -right-12 pointer-events-none absolute lg:right-0 lg:bottom-0"
+                src="/assets/login/background.svg"
               />
             </div>
           </ThemeProvider>
diff --git a/apps/dashboard/src/app/pay/page.tsx b/apps/dashboard/src/app/pay/page.tsx
index 0d15715801a..08c9cbf0163 100644
--- a/apps/dashboard/src/app/pay/page.tsx
+++ b/apps/dashboard/src/app/pay/page.tsx
@@ -2,8 +2,8 @@ import type { Metadata } from "next";
 import { createThirdwebClient, defineChain, getContract } from "thirdweb";
 import { getCurrencyMetadata } from "thirdweb/extensions/erc20";
 import { checksumAddress } from "thirdweb/utils";
-import { PayPageEmbed } from "./components/client/PayPageEmbed.client";
 import { PaymentLinkForm } from "./components/client/PaymentLinkForm.client";
+import { PayPageEmbed } from "./components/client/PayPageEmbed.client";
 import type { PayParams } from "./components/types";
 import { payAppThirdwebClient } from "./constants";
 
@@ -11,17 +11,19 @@ const title = "thirdweb Pay";
 const description = "Fast, secure, and simple payments.";
 
 export const metadata: Metadata = {
-  title,
   description,
   openGraph: {
-    title,
     description,
+    title,
   },
+  title,
 };
 
 export default async function PayPage({
   searchParams,
-}: { searchParams: Promise<PayParams> }) {
+}: {
+  searchParams: Promise<PayParams>;
+}) {
   const params = await searchParams;
 
   // If no query parameters are provided, show the form
@@ -61,10 +63,10 @@ export default async function PayPage({
       : payAppThirdwebClient;
 
   const tokenContract = getContract({
-    client: payAppThirdwebClient,
+    address: params.tokenAddress,
     // eslint-disable-next-line no-restricted-syntax
     chain: defineChain(Number(params.chainId)),
-    address: params.tokenAddress,
+    client: payAppThirdwebClient,
   });
   const {
     symbol,
@@ -74,25 +76,25 @@ export default async function PayPage({
     contract: tokenContract,
   });
   const token = {
-    symbol,
-    decimals,
-    name: tokenName,
     address: checksumAddress(params.tokenAddress),
     chainId: Number(params.chainId),
+    decimals,
+    name: tokenName,
+    symbol,
   };
 
   return (
     <PayPageEmbed
-      redirectUri={params.redirectUri}
-      chainId={Number(params.chainId)}
-      recipientAddress={params.recipientAddress}
       amount={BigInt(params.amount)}
-      token={token}
+      chainId={Number(params.chainId)}
       clientId={client.clientId}
-      name={params.name}
       image={params.image}
-      theme={params.theme}
+      name={params.name}
       purchaseData={undefined}
+      recipientAddress={params.recipientAddress}
+      redirectUri={params.redirectUri}
+      theme={params.theme}
+      token={token}
     />
   );
 }
diff --git a/apps/dashboard/src/components/CustomChat/ChatBar.tsx b/apps/dashboard/src/components/CustomChat/ChatBar.tsx
index e41d6ff875c..9339a0ef70d 100644
--- a/apps/dashboard/src/components/CustomChat/ChatBar.tsx
+++ b/apps/dashboard/src/components/CustomChat/ChatBar.tsx
@@ -1,6 +1,9 @@
 "use client";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import { ArrowUpIcon, CircleStopIcon, PaperclipIcon } from "lucide-react";
+import { useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import {
   Popover,
   PopoverContent,
@@ -9,9 +12,6 @@ import {
 import { AutoResizeTextarea } from "@/components/ui/textarea";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { ArrowUpIcon, CircleStopIcon, PaperclipIcon } from "lucide-react";
-import { useState } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import type { NebulaUserMessage } from "./types";
 
 export function ChatBar(props: {
@@ -29,8 +29,8 @@ export function ChatBar(props: {
 
   function handleSubmit(message: string) {
     const userMessage: NebulaUserMessage = {
+      content: [{ text: message, type: "text" }],
       role: "user",
-      content: [{ type: "text", text: message }],
     };
 
     props.sendMessage(userMessage);
@@ -48,8 +48,8 @@ export function ChatBar(props: {
         <div className="p-2">
           <div className="max-h-[200px] overflow-y-auto">
             <AutoResizeTextarea
-              placeholder={props.placeholder}
-              value={message}
+              className="min-h-[60px] resize-none border-none bg-transparent pt-2 leading-relaxed focus-visible:ring-0 focus-visible:ring-offset-0"
+              disabled={props.isChatStreaming}
               onChange={(e) => setMessage(e.target.value)}
               onKeyDown={(e) => {
                 // ignore if shift key is pressed to allow entering new lines
@@ -61,8 +61,8 @@ export function ChatBar(props: {
                   handleSubmit(message);
                 }
               }}
-              className="min-h-[60px] resize-none border-none bg-transparent pt-2 leading-relaxed focus-visible:ring-0 focus-visible:ring-offset-0"
-              disabled={props.isChatStreaming}
+              placeholder={props.placeholder}
+              value={message}
             />
           </div>
 
@@ -76,8 +76,8 @@ export function ChatBar(props: {
                 <Popover>
                   <PopoverTrigger asChild>
                     <Button
-                      variant="ghost"
                       className="!h-auto w-auto shrink-0 gap-2 p-2"
+                      variant="ghost"
                     >
                       <ToolTipLabel label="Attach Image">
                         <PaperclipIcon className="size-4" />
@@ -90,9 +90,9 @@ export function ChatBar(props: {
                         Get access to image uploads by signing in to Nebula
                       </p>
                       <Button
-                        variant="default"
-                        onClick={props.onLoginClick}
                         className="w-full"
+                        onClick={props.onLoginClick}
+                        variant="default"
                       >
                         Sign in
                       </Button>
@@ -104,11 +104,11 @@ export function ChatBar(props: {
               {/* Send / Stop */}
               {props.isChatStreaming ? (
                 <Button
-                  variant="default"
                   className="!h-auto w-auto shrink-0 gap-2 p-2"
                   onClick={() => {
                     props.abortChatStream();
                   }}
+                  variant="default"
                 >
                   <CircleStopIcon className="size-4" />
                   Stop
@@ -116,13 +116,13 @@ export function ChatBar(props: {
               ) : (
                 <Button
                   aria-label="Send"
-                  disabled={message.trim() === "" || props.isConnectingWallet}
                   className="!h-auto w-auto border border-nebula-pink-foreground p-2 disabled:opacity-100"
-                  variant="pink"
+                  disabled={message.trim() === "" || props.isConnectingWallet}
                   onClick={() => {
                     if (message.trim() === "") return;
                     handleSubmit(message);
                   }}
+                  variant="pink"
                 >
                   <ArrowUpIcon className="size-4" />
                 </Button>
diff --git a/apps/dashboard/src/components/CustomChat/CustomChatButton.tsx b/apps/dashboard/src/components/CustomChat/CustomChatButton.tsx
index 8048cd00281..c6ebb0bf673 100644
--- a/apps/dashboard/src/components/CustomChat/CustomChatButton.tsx
+++ b/apps/dashboard/src/components/CustomChat/CustomChatButton.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
-import { cn } from "@/lib/utils";
 import { MessageCircleIcon, XIcon } from "lucide-react";
 import { useCallback, useRef, useState } from "react";
 import { createThirdwebClient } from "thirdweb";
+import { Button } from "@/components/ui/button";
+import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
+import { cn } from "@/lib/utils";
 import CustomChatContent from "./CustomChatContent";
 
 // Create a thirdweb client for the chat functionality
@@ -34,12 +34,12 @@ export function CustomChatButton(props: {
     <>
       {/* Inline Button (not floating) */}
       <Button
+        className="gap-2 rounded-full shadow-lg"
         onClick={() => {
           setIsOpen(true);
           setHasBeenOpened(true);
         }}
         variant="default"
-        className="gap-2 rounded-full shadow-lg"
       >
         <MessageCircleIcon className="size-4" />
         {props.label}
@@ -60,11 +60,11 @@ export function CustomChatButton(props: {
             {props.label}
           </div>
           <Button
-            variant="ghost"
-            size="icon"
-            onClick={closeModal}
-            className="h-auto w-auto p-1 text-muted-foreground"
             aria-label="Close chat"
+            className="h-auto w-auto p-1 text-muted-foreground"
+            onClick={closeModal}
+            size="icon"
+            variant="ghost"
           >
             <XIcon className="size-5" />
           </Button>
@@ -74,7 +74,6 @@ export function CustomChatButton(props: {
           {hasBeenOpened && isOpen && (
             <CustomChatContent
               authToken={props.authToken}
-              teamId={props.teamId}
               client={client}
               clientId={props.clientId}
               examplePrompts={props.examplePrompts.map((prompt) => ({
@@ -83,6 +82,7 @@ export function CustomChatButton(props: {
               }))}
               networks={props.networks}
               requireLogin={props.requireLogin}
+              teamId={props.teamId}
             />
           )}
         </div>
diff --git a/apps/dashboard/src/components/CustomChat/CustomChatContent.tsx b/apps/dashboard/src/components/CustomChat/CustomChatContent.tsx
index d89c466247c..2df0463fda3 100644
--- a/apps/dashboard/src/components/CustomChat/CustomChatContent.tsx
+++ b/apps/dashboard/src/components/CustomChat/CustomChatContent.tsx
@@ -1,15 +1,15 @@
 "use client";
-import { Button } from "@/components/ui/button";
 import { ArrowRightIcon } from "lucide-react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useCallback, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { useActiveWalletConnectionStatus } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
 import { NebulaIcon } from "../../app/(app)/(dashboard)/(chain)/components/server/icons/NebulaIcon";
 import { ChatBar } from "./ChatBar";
-import { type CustomChatMessage, CustomChats } from "./CustomChats";
 import type { UserMessage, UserMessageContent } from "./CustomChats";
+import { type CustomChatMessage, CustomChats } from "./CustomChats";
 import type { ExamplePrompt, NebulaContext } from "./types";
 
 export default function CustomChatContent(props: {
@@ -27,11 +27,11 @@ export default function CustomChatContent(props: {
 
   return (
     <CustomChatContentLoggedIn
-      teamId={props.teamId}
-      clientId={props.clientId}
       authToken={props.authToken || ""}
       client={props.client}
+      clientId={props.clientId}
       examplePrompts={props.examplePrompts}
+      teamId={props.teamId}
     />
   );
 }
@@ -65,13 +65,13 @@ function CustomChatContentLoggedIn(props: {
       setMessages((prev) => [
         ...prev,
         {
-          type: "user",
           content: userMessage.content as UserMessageContent[],
+          type: "user",
         },
         // instant loading indicator feedback to user
         {
-          type: "presence",
           texts: [],
+          type: "presence",
         },
       ]);
 
@@ -85,21 +85,21 @@ function CustomChatContentLoggedIn(props: {
         setChatAbortController(abortController);
         // --- Custom API call ---
         const payload = {
+          conversationId: sessionId,
           message:
             messageToSend.content.find((x) => x.type === "text")?.text ?? "",
-          conversationId: sessionId,
           source: "dashboard-support",
         };
         const apiUrl = process.env.NEXT_PUBLIC_SIWA_URL;
         const response = await fetch(`${apiUrl}/v1/chat`, {
-          method: "POST",
+          body: JSON.stringify(payload),
           headers: {
-            "Content-Type": "application/json",
             Authorization: `Bearer ${props.authToken}`,
+            "Content-Type": "application/json",
             ...(props.teamId ? { "x-team-id": props.teamId } : {}),
             ...(props.clientId ? { "x-client-id": props.clientId } : {}),
           },
-          body: JSON.stringify(payload),
+          method: "POST",
           signal: abortController.signal,
         });
         const data = await response.json();
@@ -110,9 +110,9 @@ function CustomChatContentLoggedIn(props: {
         setMessages((prev) => [
           ...prev.slice(0, -1), // remove presence indicator
           {
-            type: "assistant",
             request_id: undefined,
             text: data.data,
+            type: "assistant",
           },
         ]);
       } catch (error) {
@@ -122,9 +122,9 @@ function CustomChatContentLoggedIn(props: {
         setMessages((prev) => [
           ...prev.slice(0, -1),
           {
-            type: "assistant",
             request_id: undefined,
             text: `Sorry, something went wrong. ${error instanceof Error ? error.message : "Unknown error"}`,
+            type: "assistant",
           },
         ]);
       } finally {
@@ -158,16 +158,16 @@ function CustomChatContentLoggedIn(props: {
       try {
         const apiUrl = process.env.NEXT_PUBLIC_SIWA_URL;
         const response = await fetch(`${apiUrl}/v1/chat/feedback`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${props.authToken}`,
-            ...(props.teamId ? { "x-team-id": props.teamId } : {}),
-          },
           body: JSON.stringify({
             conversationId: sessionId,
             feedbackRating: feedback,
           }),
+          headers: {
+            Authorization: `Bearer ${props.authToken}`,
+            "Content-Type": "application/json",
+            ...(props.teamId ? { "x-team-id": props.teamId } : {}),
+          },
+          method: "POST",
         });
 
         if (!response.ok) {
@@ -196,29 +196,25 @@ function CustomChatContentLoggedIn(props: {
     <div className="flex grow flex-col overflow-hidden">
       {showEmptyState ? (
         <EmptyStateChatPageContent
-          sendMessage={handleSendMessage}
           examplePrompts={props.examplePrompts}
+          sendMessage={handleSendMessage}
         />
       ) : (
         <CustomChats
-          messages={messages}
-          isChatStreaming={isChatStreaming}
           authToken={props.authToken}
-          sessionId={sessionId}
           className="min-w-0 pb-10"
           client={props.client}
           enableAutoScroll={enableAutoScroll}
+          isChatStreaming={isChatStreaming}
+          messages={messages}
+          onFeedback={handleFeedback}
+          sendMessage={handleSendMessage}
+          sessionId={sessionId}
           setEnableAutoScroll={setEnableAutoScroll}
           useSmallText
-          sendMessage={handleSendMessage}
-          onFeedback={handleFeedback}
         />
       )}
       <ChatBar
-        placeholder={"Ask AI Assistant"}
-        onLoginClick={undefined}
-        client={props.client}
-        isConnectingWallet={connectionStatus === "connecting"}
         abortChatStream={() => {
           chatAbortController?.abort();
           setChatAbortController(undefined);
@@ -228,18 +224,22 @@ function CustomChatContentLoggedIn(props: {
             setMessages((prev) => prev.slice(0, -1));
           }
         }}
+        className="rounded-none border-x-0 border-b-0"
+        client={props.client}
         isChatStreaming={isChatStreaming}
+        isConnectingWallet={connectionStatus === "connecting"}
+        onLoginClick={undefined}
+        placeholder={"Ask AI Assistant"}
         prefillMessage={undefined}
         sendMessage={(siwaUserMessage) => {
           const userMessage: UserMessage = {
-            type: "user",
             content: siwaUserMessage.content
               .filter((c) => c.type === "text")
-              .map((c) => ({ type: "text", text: c.text })),
+              .map((c) => ({ text: c.text, type: "text" })),
+            type: "user",
           };
           handleSendMessage(userMessage);
         }}
-        className="rounded-none border-x-0 border-b-0"
       />
     </div>
   );
@@ -270,8 +270,8 @@ function LoggedOutStateChatContent() {
 
       <Button asChild>
         <Link
-          href={`/login?next=${encodeURIComponent(pathname)}`}
           className="w-full max-w-96 gap-2"
+          href={`/login?next=${encodeURIComponent(pathname)}`}
         >
           Sign in
           <ArrowRightIcon className="size-4" />
@@ -304,21 +304,21 @@ function EmptyStateChatPageContent(props: {
       <div className="flex max-w-lg flex-col flex-wrap justify-center gap-2.5">
         {props.examplePrompts.map((prompt) => (
           <Button
+            disabled={false}
             key={prompt.title}
-            variant="outline"
-            size="sm"
             onClick={() =>
               props.sendMessage({
-                type: "user",
                 content: [
                   {
-                    type: "text",
                     text: prompt.message,
+                    type: "text",
                   },
                 ],
+                type: "user",
               })
             }
-            disabled={false}
+            size="sm"
+            variant="outline"
           >
             {prompt.title}
           </Button>
diff --git a/apps/dashboard/src/components/CustomChat/CustomChats.tsx b/apps/dashboard/src/components/CustomChat/CustomChats.tsx
index 0d84b01e0ef..16ac0b67049 100644
--- a/apps/dashboard/src/components/CustomChat/CustomChats.tsx
+++ b/apps/dashboard/src/components/CustomChat/CustomChats.tsx
@@ -1,5 +1,3 @@
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { cn } from "@/lib/utils";
 import { MarkdownRenderer } from "components/contract-components/published-contract/markdown-renderer";
 import {
   AlertCircleIcon,
@@ -9,6 +7,8 @@ import {
 } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
+import { cn } from "@/lib/utils";
 import { Reasoning } from "./Reasoning";
 
 // Define local types
@@ -94,8 +94,8 @@ export function CustomChats(props: {
       <ScrollShadow
         className="flex-1"
         scrollableClassName="max-h-full overscroll-contain"
-        shadowColor="hsl(var(--background))"
         shadowClassName="z-[1]"
+        shadowColor="hsl(var(--background))"
       >
         <div className="container max-w-[800px]">
           <div className={cn("flex flex-col gap-5 py-4", props.className)}>
@@ -113,15 +113,15 @@ export function CustomChats(props: {
                   key={index}
                 >
                   <RenderMessage
+                    authToken={props.authToken}
+                    client={props.client}
+                    isMessagePending={isMessagePending}
                     message={message}
                     messageIndex={index}
-                    isMessagePending={isMessagePending}
-                    client={props.client}
-                    sendMessage={props.sendMessage}
                     nextMessage={props.messages[index + 1]}
-                    authToken={props.authToken}
-                    sessionId={props.sessionId}
                     onFeedback={props.onFeedback}
+                    sendMessage={props.sendMessage}
+                    sessionId={props.sessionId}
                   />
                 </div>
               );
@@ -153,12 +153,12 @@ function RenderMessage(props: {
         {props.message.content.map((msg, index) => {
           if (msg.type === "text") {
             return (
-              // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+              // biome-ignore lint/suspicious/noArrayIndexKey: EXPECTED
               <div className="flex justify-end" key={index}>
                 <div className="max-w-[80%] overflow-auto rounded-xl border bg-card px-4 py-2">
                   <StyledMarkdownRenderer
-                    text={msg.text}
                     isMessagePending={props.isMessagePending}
+                    text={msg.text}
                     type="user"
                   />
                 </div>
@@ -198,13 +198,13 @@ function RenderMessage(props: {
       <div className="min-w-0 grow">
         <ScrollShadow className="rounded-lg">
           <RenderResponse
-            message={message}
-            isMessagePending={props.isMessagePending}
+            authToken={props.authToken}
             client={props.client}
-            sendMessage={props.sendMessage}
+            isMessagePending={props.isMessagePending}
+            message={message}
             nextMessage={props.nextMessage}
+            sendMessage={props.sendMessage}
             sessionId={props.sessionId}
-            authToken={props.authToken}
           />
         </ScrollShadow>
 
@@ -213,10 +213,10 @@ function RenderMessage(props: {
           !props.isMessagePending &&
           props.onFeedback && (
             <CustomFeedbackButtons
+              className="mt-4"
               message={message}
               messageIndex={props.messageIndex}
               onFeedback={props.onFeedback}
-              className="mt-4"
             />
           )}
       </div>
@@ -253,20 +253,20 @@ function CustomFeedbackButtons(props: {
   return (
     <div className={cn("flex gap-2", props.className)}>
       <button
-        type="button"
         aria-label="Thumbs up"
         className="text-muted-foreground transition-colors hover:text-green-500 disabled:opacity-50"
-        onClick={() => handleFeedback(1)}
         disabled={isSubmitting}
+        onClick={() => handleFeedback(1)}
+        type="button"
       >
         <ThumbsUpIcon className="size-5" />
       </button>
       <button
-        type="button"
         aria-label="Thumbs down"
         className="text-muted-foreground transition-colors hover:text-red-500 disabled:opacity-50"
-        onClick={() => handleFeedback(-1)}
         disabled={isSubmitting}
+        onClick={() => handleFeedback(-1)}
+        type="button"
       >
         <ThumbsDownIcon className="size-5" />
       </button>
@@ -289,8 +289,8 @@ function RenderResponse(props: {
     case "assistant":
       return (
         <StyledMarkdownRenderer
-          text={message.text}
           isMessagePending={isMessagePending}
+          text={message.text}
           type="assistant"
         />
       );
@@ -325,21 +325,21 @@ function StyledMarkdownRenderer(props: {
 }) {
   return (
     <MarkdownRenderer
-      skipHtml
-      markdownText={props.text}
       className="text-foreground [&>*:first-child]:mt-0 [&>*:first-child]:border-none [&>*:first-child]:pb-0 [&>*:last-child]:mb-0"
       code={{
-        ignoreFormattingErrors: true,
         className: "bg-transparent",
+        ignoreFormattingErrors: true,
       }}
+      inlineCode={{ className: "border-none" }}
+      li={{ className: "text-foreground" }}
+      markdownText={props.text}
       p={{
         className:
           props.type === "assistant"
             ? "text-foreground"
             : "text-foreground leading-normal",
       }}
-      li={{ className: "text-foreground" }}
-      inlineCode={{ className: "border-none" }}
+      skipHtml
     />
   );
 }
diff --git a/apps/dashboard/src/components/CustomChat/Reasoning.tsx b/apps/dashboard/src/components/CustomChat/Reasoning.tsx
index 2ce50e01590..be0bf2e90f6 100644
--- a/apps/dashboard/src/components/CustomChat/Reasoning.tsx
+++ b/apps/dashboard/src/components/CustomChat/Reasoning.tsx
@@ -1,14 +1,11 @@
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import { ChevronDownIcon } from "lucide-react";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { TextShimmer } from "@/components/ui/text-shimmer";
 import { cn } from "@/lib/utils";
-import { ChevronDownIcon } from "lucide-react";
-import { useState } from "react";
 
-export function Reasoning(props: {
-  isPending: boolean;
-  texts: string[];
-}) {
+export function Reasoning(props: { isPending: boolean; texts: string[] }) {
   const [_isOpen, setIsOpen] = useState(false);
   const isOpen = props.isPending ? true : _isOpen;
   const showAll = !props.isPending;
@@ -17,10 +14,10 @@ export function Reasoning(props: {
   return (
     <DynamicHeight>
       <Button
-        variant="link"
-        size="sm"
-        onClick={() => setIsOpen(!isOpen)}
         className="h-auto w-auto items-center gap-1 px-0 py-1 pb-2 font-normal text-base text-muted-foreground hover:text-foreground hover:no-underline"
+        onClick={() => setIsOpen(!isOpen)}
+        size="sm"
+        variant="link"
       >
         {props.isPending ? (
           <TextShimmer text="Reasoning..." />
@@ -44,8 +41,8 @@ export function Reasoning(props: {
             <ul className="list-none space-y-1.5">
               {props.texts.map((text) => (
                 <li
-                  key={text}
                   className="fade-in-0 animate-in text-muted-foreground text-sm leading-relaxed duration-300"
+                  key={text}
                 >
                   {text.trim()}
                 </li>
diff --git a/apps/dashboard/src/components/analytics/date-range-selector.tsx b/apps/dashboard/src/components/analytics/date-range-selector.tsx
index 03389d12f55..e7ff878c346 100644
--- a/apps/dashboard/src/components/analytics/date-range-selector.tsx
+++ b/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,7 +8,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { normalizeTime } from "@/lib/time";
-import { differenceInCalendarDays, format, subDays } from "date-fns";
 
 export function DateRangeSelector(props: {
   range: Range;
@@ -26,30 +26,15 @@ export function DateRangeSelector(props: {
 
   return (
     <DatePickerWithRange
+      className="w-auto bg-card"
       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 +57,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 +86,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 +97,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;
 
diff --git a/apps/dashboard/src/components/analytics/empty-chart-state.tsx b/apps/dashboard/src/components/analytics/empty-chart-state.tsx
index 4c42f7ad954..70382246a77 100644
--- a/apps/dashboard/src/components/analytics/empty-chart-state.tsx
+++ b/apps/dashboard/src/components/analytics/empty-chart-state.tsx
@@ -1,9 +1,9 @@
 "use client";
-import { LoadingDots } from "@/components/ui/LoadingDots";
+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";
-import { useMemo } from "react";
-import { Area, AreaChart, Bar, BarChart } from "recharts";
 
 type FakeCartData = {
   value: number;
@@ -17,15 +17,18 @@ function generateRandomData(): FakeCartData[] {
 
 const skeletonChartConfig = {
   value: {
-    label: "Value",
     color: "hsl(var(--muted)/90%)",
+    label: "Value",
   },
 } satisfies ChartConfig;
 
 export function EmptyChartState({
   children,
   type,
-}: { children?: React.ReactNode; type: "bar" | "area" }) {
+}: {
+  children?: React.ReactNode;
+  type: "bar" | "area";
+}) {
   const barChartData = useMemo(() => generateRandomData(), []);
 
   return (
@@ -55,10 +58,11 @@ function SkeletonBarChart(props: {
   data: FakeCartData[];
   type: "bar" | "area";
 }) {
+  const fillAreaSkeletonId = useId();
   return (
     <ChartContainer
-      config={skeletonChartConfig}
       className="pointer-events-none h-full w-full blur-[5px]"
+      config={skeletonChartConfig}
     >
       {props.type === "bar" ? (
         <BarChart
@@ -77,7 +81,7 @@ function SkeletonBarChart(props: {
           }}
         >
           <defs>
-            <linearGradient id="fill_area_skeleton" x1="0" y1="0" x2="0" y2="1">
+            <linearGradient id={fillAreaSkeletonId} x1="0" x2="0" y1="0" y2="1">
               <stop
                 offset="5%"
                 stopColor={"hsl(var(--muted-foreground)/0.5)"}
@@ -87,11 +91,11 @@ function SkeletonBarChart(props: {
             </linearGradient>
           </defs>
           <Area
-            type="natural"
             dataKey="value"
-            stroke="hsl(var(--muted-foreground))"
-            fill="url(#fill_area_skeleton)"
+            fill={`url(#${fillAreaSkeletonId})`}
             radius={8}
+            stroke="hsl(var(--muted-foreground))"
+            type="natural"
           />
         </AreaChart>
       )}
diff --git a/apps/dashboard/src/components/analytics/interval-selector.tsx b/apps/dashboard/src/components/analytics/interval-selector.tsx
index 003b0658320..99151768788 100644
--- a/apps/dashboard/src/components/analytics/interval-selector.tsx
+++ b/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)}
diff --git a/apps/dashboard/src/components/analytics/range-selector.tsx b/apps/dashboard/src/components/analytics/range-selector.tsx
index f04b185b37f..b4d240c6f40 100644
--- a/apps/dashboard/src/components/analytics/range-selector.tsx
+++ b/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 type {
   DurationId,
   Range,
 } from "components/analytics/date-range-selector";
+import {
+  DateRangeSelector,
+  getLastNDaysRange,
+} from "components/analytics/date-range-selector";
 import { IntervalSelector } from "components/analytics/interval-selector";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useState } from "react";
+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,6 +72,7 @@ export function RangeSelector({
       }
       return true;
     },
+    queryKey: ["analytics-range", searchParams?.toString()],
   });
 
   return (
diff --git a/apps/dashboard/src/components/buttons/MismatchButton.tsx b/apps/dashboard/src/components/buttons/MismatchButton.tsx
index 771755f0f3c..fa0c0b7bdce 100644
--- a/apps/dashboard/src/components/buttons/MismatchButton.tsx
+++ b/apps/dashboard/src/components/buttons/MismatchButton.tsx
@@ -1,22 +1,5 @@
 "use client";
 
-import { apiServerProxy } from "@/actions/proxies";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import { cn } from "@/lib/utils";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { FaucetButton } from "app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/FaucetButton";
 import { GiftIcon } from "app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/icons/GiftIcon";
@@ -28,16 +11,16 @@ import { getSDKTheme } from "app/(app)/components/sdk-component-theme";
 import { LOCAL_NODE_PKEY } from "constants/misc";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { ExternalLinkIcon, UnplugIcon } from "lucide-react";
-import { useTheme } from "next-themes";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { useTheme } from "next-themes";
 import type React from "react";
 import { forwardRef, useCallback, useRef, useState } from "react";
 import { toast } from "sonner";
 import {
-  type ThirdwebClient,
   prepareTransaction,
   sendTransaction,
+  type ThirdwebClient,
   toWei,
 } from "thirdweb";
 import { type Chain, type ChainMetadata, localhost } from "thirdweb/chains";
@@ -50,7 +33,24 @@ import {
   useSwitchActiveWalletChain,
   useWalletBalance,
 } from "thirdweb/react";
-import { type Wallet, privateKeyToAccount } from "thirdweb/wallets";
+import { privateKeyToAccount, type Wallet } from "thirdweb/wallets";
+import { apiServerProxy } from "@/actions/proxies";
+import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { cn } from "@/lib/utils";
 import { getFaucetClaimAmount } from "../../app/(app)/api/testnet-faucet/claim/claim-amount";
 import { useV5DashboardChain } from "../../lib/v5-adapter";
 
@@ -136,9 +136,9 @@ export const MismatchButton = forwardRef<
   if (connectionStatus === "connecting") {
     return (
       <Button
+        asChild
         className={props.className}
         size={props.size}
-        asChild
         variant="outline"
       >
         <div>
@@ -151,7 +151,7 @@ export const MismatchButton = forwardRef<
 
   if (!wallet || !chainId || !isLoggedIn) {
     return (
-      <Button className={props.className} size={props.size} asChild>
+      <Button asChild className={props.className} size={props.size}>
         <Link
           href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
         >
@@ -181,7 +181,6 @@ export const MismatchButton = forwardRef<
   return (
     <>
       <Popover
-        open={isMismatchPopoverOpen}
         onOpenChange={(v) => {
           if (v) {
             if (showSwitchChainPopover) {
@@ -191,17 +190,13 @@ export const MismatchButton = forwardRef<
             setIsMismatchPopoverOpen(false);
           }
         }}
+        open={isMismatchPopoverOpen}
       >
         <PopoverTrigger asChild>
           <Button
             {...buttonProps}
             className={cn("gap-2 disabled:opacity-100", buttonProps.className)}
             disabled={disabled}
-            type={
-              showSwitchChainPopover || showNoFundsPopup
-                ? "button"
-                : buttonProps.type
-            }
             onClick={async (e) => {
               e.stopPropagation();
 
@@ -226,6 +221,11 @@ export const MismatchButton = forwardRef<
               }
             }}
             ref={ref}
+            type={
+              showSwitchChainPopover || showNoFundsPopup
+                ? "button"
+                : buttonProps.type
+            }
           >
             {buttonProps.children}
             {showSpinner && <Spinner className="size-4 shrink-0" />}
@@ -233,24 +233,24 @@ export const MismatchButton = forwardRef<
         </PopoverTrigger>
         <PopoverContent className="min-w-[350px]" side="top" sideOffset={10}>
           <MismatchNotice
-            txChainId={txChainId}
             onClose={(hasSwitched) => {
               if (hasSwitched) {
                 setIsMismatchPopoverOpen(false);
               }
             }}
+            txChainId={txChainId}
           />
         </PopoverContent>
       </Popover>
 
       {/* Not Enough Funds */}
       <Dialog
-        open={!!dialog}
         onOpenChange={(v) => {
           if (!v) {
             setDialog(undefined);
           }
         }}
+        open={!!dialog}
       >
         <DialogContent
           className={cn(
@@ -264,26 +264,26 @@ export const MismatchButton = forwardRef<
             {dialog === "no-funds" && (
               <NoFundsDialogContent
                 chain={txChain}
+                client={props.client}
+                isLoggedIn={props.isLoggedIn}
+                onCloseModal={() => setDialog(undefined)}
                 openPayModal={() => {
                   setDialog("pay");
                 }}
-                onCloseModal={() => setDialog(undefined)}
-                isLoggedIn={props.isLoggedIn}
-                client={props.client}
               />
             )}
 
             {dialog === "pay" && (
               <PayEmbed
-                client={props.client}
-                theme={getSDKTheme(theme === "dark" ? "dark" : "light")}
                 className="!w-auto"
+                client={props.client}
                 payOptions={{
                   prefillBuy: {
                     amount: "0.01",
                     chain: txChain,
                   },
                 }}
+                theme={getSDKTheme(theme === "dark" ? "dark" : "light")}
               />
             )}
           </DynamicHeight>
@@ -303,16 +303,16 @@ function NoFundsDialogContent(props: {
   client: ThirdwebClient;
 }) {
   const chainWithServiceInfoQuery = useQuery({
-    queryKey: ["chain-with-services", props.chain.id],
+    enabled: !!props.chain.id,
     queryFn: async () => {
       const [chainRes, chainServicesRes] = await Promise.all([
         apiServerProxy<{ data: ChainMetadata }>({
-          pathname: `/v1/chains/${props.chain.id}`,
           method: "GET",
+          pathname: `/v1/chains/${props.chain.id}`,
         }),
         apiServerProxy<{ data: ChainServices }>({
-          pathname: `/v1/chains/${props.chain.id}/services`,
           method: "GET",
+          pathname: `/v1/chains/${props.chain.id}/services`,
         }),
       ]);
 
@@ -325,7 +325,7 @@ function NoFundsDialogContent(props: {
         services: chainServicesRes.data.data.services,
       } satisfies ChainMetadataWithServices;
     },
-    enabled: !!props.chain.id,
+    queryKey: ["chain-with-services", props.chain.id],
   });
 
   return (
@@ -357,18 +357,18 @@ function NoFundsDialogContent(props: {
             ) : chainWithServiceInfoQuery.data.testnet ? (
               // faucet case
               <GetFundsFromFaucet
-                isLoggedIn={props.isLoggedIn}
                 chain={chainWithServiceInfoQuery.data}
                 client={props.client}
+                isLoggedIn={props.isLoggedIn}
               />
             ) : chainWithServiceInfoQuery.data.services.find(
                 (x) => x.enabled && x.service === "pay",
               ) ? (
               // pay case
               <Button
-                variant="primary"
                 className="w-full"
                 onClick={props.openPayModal}
+                variant="primary"
               >
                 Buy Funds
               </Button>
@@ -379,16 +379,16 @@ function NoFundsDialogContent(props: {
       </div>
       {/* Footer */}
       <div className="flex justify-between gap-4 border-border border-t p-6">
-        <Button variant="outline" onClick={props.onCloseModal}>
+        <Button onClick={props.onCloseModal} variant="outline">
           Close
         </Button>
 
-        <Button variant="outline" asChild>
+        <Button asChild variant="outline">
           <Link
+            className="gap-2"
             href="https://portal.thirdweb.com/glossary/gas"
-            target="_blank"
             rel="noopener noreferrer"
-            className="gap-2"
+            target="_blank"
           >
             Learn about Gas <ExternalLinkIcon className="size-4" />
           </Link>
@@ -431,9 +431,9 @@ function GetFundsFromFaucet(props: {
         <div className="h-6" />
 
         <FaucetButton
+          amount={amountToGive}
           chain={props.chain}
           client={props.client}
-          amount={amountToGive}
           isLoggedIn={props.isLoggedIn}
         />
       </div>
@@ -505,11 +505,11 @@ const MismatchNotice: React.FC<{
       </div>
 
       <Button
-        size="sm"
-        onClick={onSwitchWallet}
+        className="gap-2 capitalize disabled:opacity-100"
         disabled={!actuallyCanAttemptSwitch || switchNetworkMutation.isPending}
+        onClick={onSwitchWallet}
+        size="sm"
         variant="default"
-        className="gap-2 capitalize disabled:opacity-100"
       >
         {switchNetworkMutation.isPending ? (
           <Spinner className="size-4 shrink-0" />
@@ -540,13 +540,13 @@ const GetLocalHostTestnetFunds = (props: { client: ThirdwebClient }) => {
       return toast.error("No active account detected");
     }
     const faucet = privateKeyToAccount({
-      privateKey: LOCAL_NODE_PKEY,
       client: props.client,
+      privateKey: LOCAL_NODE_PKEY,
     });
     const transaction = prepareTransaction({
-      to: address,
       chain: localhost,
       client: props.client,
+      to: address,
       value: toWei("10"),
     });
     const promise = sendTransaction({
@@ -555,13 +555,13 @@ const GetLocalHostTestnetFunds = (props: { client: ThirdwebClient }) => {
     });
     toast.promise(promise, {
       error: "Failed to get funds from localhost",
-      success: "Successfully got funds from localhost",
       loading: "Requesting funds",
+      success: "Successfully got funds from localhost",
     });
   };
 
   return (
-    <Button variant="primary" onClick={requestFunds} className="w-full">
+    <Button className="w-full" onClick={requestFunds} variant="primary">
       Get Funds from Localhost
     </Button>
   );
diff --git a/apps/dashboard/src/components/buttons/TransactionButton.stories.tsx b/apps/dashboard/src/components/buttons/TransactionButton.stories.tsx
index fa22439fb24..12b4d1a45a4 100644
--- a/apps/dashboard/src/components/buttons/TransactionButton.stories.tsx
+++ b/apps/dashboard/src/components/buttons/TransactionButton.stories.tsx
@@ -1,3 +1,8 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useMutation } from "@tanstack/react-query";
+import { StarIcon } from "lucide-react";
+import { useId, useState } from "react";
+import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import {
   Select,
@@ -8,22 +13,17 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useMutation } from "@tanstack/react-query";
-import { StarIcon } from "lucide-react";
-import { useState } from "react";
-import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { BadgeContainer, storybookThirdwebClient } from "../../stories/utils";
 import { TransactionButton } from "./TransactionButton";
 
 const meta = {
-  title: "blocks/TransactionButton",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/TransactionButton",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -37,22 +37,24 @@ function Story() {
   const [chainId, setChainId] = useState(137);
   const [isLoggedIn, setIsLoggedIn] = useState(false);
 
+  const elementId = useId();
+
   return (
     <ThirdwebProvider>
       <div className="container flex max-w-6xl flex-col gap-10 py-10">
         <FormFieldSetup
-          htmlFor="chain-id"
-          label="Transaction Chain Id"
-          isRequired={false}
           errorMessage={undefined}
+          htmlFor={elementId}
+          isRequired={false}
+          label="Transaction Chain Id"
         >
           <Select
-            value={`${chainId}`}
             onValueChange={(v) => {
               setChainId(Number.parseInt(v));
             }}
+            value={`${chainId}`}
           >
-            <SelectTrigger className="w-[180px]" id="chain-id">
+            <SelectTrigger className="w-[180px]" id={elementId}>
               <SelectValue />
             </SelectTrigger>
             <SelectContent>
@@ -82,24 +84,24 @@ function Story() {
         </div>
 
         <Variant
-          label="No Transactions"
-          transactionCount={undefined}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="No Transactions"
+          transactionCount={undefined}
         />
 
         <Variant
-          label="1 Transaction"
-          transactionCount={1}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="1 Transaction"
+          transactionCount={1}
         />
 
         <Variant
-          label="1 Transaction + children"
-          transactionCount={1}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="1 Transaction + children"
+          transactionCount={1}
         >
           <div className="flex items-center gap-2">
             <StarIcon className="size-4" />
@@ -108,10 +110,10 @@ function Story() {
         </Variant>
 
         <Variant
-          label="No Transaction count + children"
-          transactionCount={undefined}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="No Transaction count + children"
+          transactionCount={undefined}
         >
           <div className="flex items-center gap-2">
             <StarIcon className="size-4" />
@@ -120,50 +122,50 @@ function Story() {
         </Variant>
 
         <Variant
-          label="10 Transaction"
-          transactionCount={10}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="10 Transaction"
+          transactionCount={10}
         />
 
         <Variant
+          chainId={chainId}
+          isLoggedIn={isLoggedIn}
           label="Destructive Variant"
           transactionCount={1}
-          chainId={chainId}
           variant="destructive"
-          isLoggedIn={isLoggedIn}
         />
 
         <Variant
+          chainId={chainId}
+          isLoggedIn={isLoggedIn}
           label="Destructive Variant, No Tx count"
           transactionCount={undefined}
-          chainId={chainId}
           variant="destructive"
-          isLoggedIn={isLoggedIn}
         />
 
         <Variant
-          label="class applied"
-          transactionCount={undefined}
           chainId={chainId}
           className="min-w-[300px]"
           isLoggedIn={isLoggedIn}
+          label="class applied"
+          transactionCount={undefined}
         />
 
         <Variant
-          label="size - sm"
-          transactionCount={undefined}
           chainId={chainId}
-          size="sm"
           isLoggedIn={isLoggedIn}
+          label="size - sm"
+          size="sm"
+          transactionCount={undefined}
         />
 
         <Variant
-          label="disabled"
-          transactionCount={undefined}
           chainId={chainId}
           disabled
           isLoggedIn={isLoggedIn}
+          label="disabled"
+          transactionCount={undefined}
         />
       </div>
     </ThirdwebProvider>
@@ -190,18 +192,18 @@ function Variant(props: {
   return (
     <BadgeContainer label={props.label}>
       <TransactionButton
+        className={props.className}
         client={storybookThirdwebClient}
         disabled={props.disabled}
-        className={props.className}
-        variant={props.variant}
+        isLoggedIn={props.isLoggedIn}
         isPending={sendTx.isPending}
         onClick={() => {
           sendTx.mutate();
         }}
+        size={props.size}
         transactionCount={props.transactionCount}
         txChainID={props.chainId}
-        size={props.size}
-        isLoggedIn={props.isLoggedIn}
+        variant={props.variant}
       >
         {props.children || "Execute Tx"}
       </TransactionButton>
diff --git a/apps/dashboard/src/components/buttons/TransactionButton.tsx b/apps/dashboard/src/components/buttons/TransactionButton.tsx
index 473bec321ee..3e347c888f0 100644
--- a/apps/dashboard/src/components/buttons/TransactionButton.tsx
+++ b/apps/dashboard/src/components/buttons/TransactionButton.tsx
@@ -1,12 +1,4 @@
 "use client";
-import { Button } from "@/components/ui/button";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import { CHAIN_ID_TO_GNOSIS } from "constants/mappings";
 import { useActiveChainAsDashboardChain } from "lib/v5-adapter";
 import { ArrowLeftRightIcon, ExternalLinkIcon } from "lucide-react";
@@ -20,6 +12,14 @@ import {
   useConnectedWallets,
 } from "thirdweb/react";
 import type { Wallet, WalletId } from "thirdweb/wallets";
+import { Button } from "@/components/ui/button";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
 import { MismatchButton } from "./MismatchButton";
 
 type ButtonProps = React.ComponentProps<typeof Button>;
@@ -73,14 +73,14 @@ export const TransactionButton: React.FC<TransactionButtonProps> = ({
           disableNoFundsPopup={
             disableNoFundsPopup === undefined ? false : disableNoFundsPopup
           }
-          isPending={isPending}
-          variant={variant || "primary"}
           isLoggedIn={isLoggedIn}
+          isPending={isPending}
           txChainId={txChainID}
+          variant={variant || "primary"}
           {...restButtonProps}
-          disabled={disabled}
           checkBalance={checkBalance}
           className={cn("relative overflow-hidden", restButtonProps.className)}
+          disabled={disabled}
           style={{
             paddingLeft: transactionCount
               ? `${txCountDivWidth + 16}px`
@@ -118,10 +118,10 @@ export const TransactionButton: React.FC<TransactionButtonProps> = ({
         </MismatchButton>
       </PopoverTrigger>
 
-      <PopoverContent className="min-w-[300px]" sideOffset={10} side="top">
+      <PopoverContent className="min-w-[300px]" side="top" sideOffset={10}>
         <ExternalApprovalNotice
-          walletId={activeWallet?.id}
           initialFocusRef={initialFocusRef}
+          walletId={activeWallet?.id}
         />
       </PopoverContent>
     </Popover>
@@ -169,17 +169,17 @@ const ExternalApprovalNotice: React.FC<ExternalApprovalNoticeProps> = ({
 
         {isChainIdSupported && (
           <Button
-            ref={initialFocusRef}
             asChild
-            size="sm"
             className="mt-2 gap-2"
+            ref={initialFocusRef}
+            size="sm"
           >
             <Link
               href={`https://app.safe.global/${
                 CHAIN_ID_TO_GNOSIS[chainId as keyof typeof CHAIN_ID_TO_GNOSIS]
               }:${address}/transactions/queue`}
-              target="_blank"
               rel="noopener noreferrer"
+              target="_blank"
             >
               Go To Safe <ExternalLinkIcon className="size-4" />
             </Link>
diff --git a/apps/dashboard/src/components/cmd-k-search/index.tsx b/apps/dashboard/src/components/cmd-k-search/index.tsx
index 96e02542d03..373842fb487 100644
--- a/apps/dashboard/src/components/cmd-k-search/index.tsx
+++ b/apps/dashboard/src/components/cmd-k-search/index.tsx
@@ -1,34 +1,34 @@
 "use client";
 
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { cn } from "@/lib/utils";
 import {
-  type QueryClient,
   keepPreviousData,
+  type QueryClient,
   queryOptions,
   useQuery,
   useQueryClient,
 } from "@tanstack/react-query";
 import { ChainIconClient } from "components/icons/ChainIcon";
-import { type TrendingContract, fetchTopContracts } from "lib/search";
+import { fetchTopContracts, type TrendingContract } from "lib/search";
 import { ArrowRightIcon, CommandIcon, SearchIcon, XIcon } from "lucide-react";
 import Link from "next/link";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { useDebounce } from "use-debounce";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { cn } from "@/lib/utils";
 
 const typesenseApiKey =
   process.env.NEXT_PUBLIC_TYPESENSE_CONTRACT_API_KEY || "";
@@ -38,16 +38,16 @@ function contractTypesenseSearchQuery(
   queryClient: QueryClient,
 ) {
   return queryOptions({
-    queryKey: ["typesense-contract-search", { search: searchQuery }],
+    enabled: !!searchQuery && !!queryClient && !!typesenseApiKey,
+    placeholderData: keepPreviousData,
     queryFn: async () => {
       return fetchTopContracts({
-        query: searchQuery,
         perPage: 10,
+        query: searchQuery,
         timeRange: "month",
       });
     },
-    enabled: !!searchQuery && !!queryClient && !!typesenseApiKey,
-    placeholderData: keepPreviousData,
+    queryKey: ["typesense-contract-search", { search: searchQuery }],
   });
 }
 
@@ -167,12 +167,12 @@ export const CmdKSearchModal = (props: {
 
   return (
     <Dialog
-      open={open}
       onOpenChange={(isOpen) => {
         if (!isOpen) {
           handleClose();
         }
       }}
+      open={open}
     >
       <DialogContent className="gap-0 p-0">
         {/* Title */}
@@ -191,21 +191,21 @@ export const CmdKSearchModal = (props: {
               <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
               <Input
                 autoFocus
-                placeholder="Name or Contract Address"
                 className="px-10"
-                value={searchValue}
                 onChange={(e) => setSearchValue(e.target.value)}
+                placeholder="Name or Contract Address"
+                value={searchValue}
               />
               <div className="-translate-y-1/2 absolute top-1/2 right-3">
                 {isFetching ? (
                   <Spinner className="size-5 text-muted-foreground" />
                 ) : searchValue.length > 0 ? (
                   <Button
-                    size="sm"
                     aria-label="Clear search"
-                    variant="ghost"
                     className="translate-x-2 p-2"
                     onClick={() => setSearchValue("")}
+                    size="sm"
+                    variant="ghost"
                   >
                     <XIcon className="size-4 text-muted-foreground" />
                   </Button>
@@ -227,13 +227,13 @@ export const CmdKSearchModal = (props: {
                       return (
                         <SearchResult
                           client={props.client}
-                          key={`${result.chainMetadata.chainId}_${result.contractAddress}`}
-                          result={result}
                           isActive={idx === activeIndex}
+                          key={`${result.chainMetadata.chainId}_${result.contractAddress}`}
                           onClick={() => {
                             handleClose();
                           }}
                           onMouseEnter={() => setActiveIndex(idx)}
+                          result={result}
                         />
                       );
                     })}
@@ -258,9 +258,9 @@ export const CmdKSearch = (props: {
     <>
       <div className="relative hidden w-[300px] lg:block">
         <Input
+          className={cn("bg-transparent pr-4", props.className)}
           onClick={() => setOpen(true)}
           placeholder="Search any contract"
-          className={cn("bg-transparent pr-4", props.className)}
         />
         <div className="-translate-y-1/2 absolute top-1/2 right-3 flex items-center gap-[2px] text-muted-foreground text-sm">
           <CommandIcon className="size-3" /> K
@@ -268,15 +268,15 @@ export const CmdKSearch = (props: {
       </div>
 
       <Button
-        className="!h-auto !w-auto p-2 lg:hidden"
         aria-label="Search any contract"
-        variant="ghost"
+        className="!h-auto !w-auto p-2 lg:hidden"
         onClick={() => setOpen(true)}
+        variant="ghost"
       >
         <SearchIcon className="size-5" />
       </Button>
 
-      <CmdKSearchModal open={open} setOpen={setOpen} client={props.client} />
+      <CmdKSearchModal client={props.client} open={open} setOpen={setOpen} />
     </>
   );
 };
@@ -305,16 +305,16 @@ const SearchResult: React.FC<SearchResultProps> = ({
     >
       <ChainIconClient
         className="size-6 shrink-0"
-        src={result.chainMetadata?.icon?.url}
         client={client}
+        src={result.chainMetadata?.icon?.url}
       />
       <div className="flex flex-col gap-1">
         <h3 className="line-clamp-2 font-semibold text-foreground">
           <Link
+            className="before:absolute before:inset-0"
             href={`/${result.chainMetadata.chainId}/${result.contractAddress}`}
-            onMouseEnter={onMouseEnter}
             onClick={onClick}
-            className="before:absolute before:inset-0"
+            onMouseEnter={onMouseEnter}
           >
             {shortenIfAddress(result.name)}
           </Link>
diff --git a/apps/dashboard/src/components/configure-networks/ConfigureNetworkForm.tsx b/apps/dashboard/src/components/configure-networks/ConfigureNetworkForm.tsx
index 0f4c2613d38..4de71ad3b38 100644
--- a/apps/dashboard/src/components/configure-networks/ConfigureNetworkForm.tsx
+++ b/apps/dashboard/src/components/configure-networks/ConfigureNetworkForm.tsx
@@ -1,20 +1,21 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
-import { useStore } from "@/lib/reactive";
 import { ChainIconClient } from "components/icons/ChainIcon";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { getDashboardChainRpc } from "lib/rpc";
 import { CircleAlertIcon, Trash2Icon } from "lucide-react";
+import { useId } from "react";
 import { useForm } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
+import { useStore } from "@/lib/reactive";
 import {
-  type StoredChain,
   chainOverridesStore,
   removeChainOverrides,
+  type StoredChain,
 } from "../../stores/chainStores";
 import { ChainIdInput } from "./Form/ChainIdInput";
 import { IconUpload } from "./Form/IconUpload";
@@ -60,9 +61,17 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
 }) => {
   const { idToChain, nameToChain } = useAllChainsData();
   const chainOverrides = useStore(chainOverridesStore);
-
+  const currencySymbolId = useId();
+  const nameId = useId();
+  const networkTypeId = useId();
   const form = useForm<NetworkConfigFormData>({
+    mode: "onChange",
     values: {
+      chainId: editingChain?.chainId
+        ? `${editingChain?.chainId}`
+        : prefillChainId || "",
+      currencySymbol: editingChain?.nativeCurrency.symbol || "",
+      icon: editingChain?.icon?.url || "",
       name: editingChain?.name || prefillSlug || "",
       rpcUrl:
         (!editingChain || editingChain.status === "deprecated"
@@ -75,16 +84,10 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
                 editingChain,
                 client,
               )) || "",
-      chainId: editingChain?.chainId
-        ? `${editingChain?.chainId}`
-        : prefillChainId || "",
-      currencySymbol: editingChain?.nativeCurrency.symbol || "",
-      type: editingChain?.testnet ? "testnet" : "mainnet",
-      icon: editingChain?.icon?.url || "",
       slug: prefillSlug || editingChain?.slug || "",
       stackType: "",
+      type: editingChain?.testnet ? "testnet" : "mainnet",
     },
-    mode: "onChange",
   });
 
   const isFullyEditable = !editingChain || editingChain?.isCustom;
@@ -138,52 +141,52 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
     if (editingChain) {
       configuredNetwork = {
         ...editingChain,
-        name: data.name,
-        rpc: [data.rpcUrl],
         chainId: Number.parseInt(data.chainId),
-        nativeCurrency: {
-          ...editingChain.nativeCurrency,
-          symbol: data.currencySymbol,
-        },
         icon: editingChain.icon
           ? {
               ...editingChain.icon,
               url: data.icon,
             }
           : {
+              format: "",
+              height: 50,
               url: data.icon,
               // we don't care about these fields - adding dummy values
               width: 50,
-              height: 50,
-              format: "",
             },
-        testnet: data.type === "testnet",
-        stackType: data.stackType || "",
-      };
-    } else {
-      configuredNetwork = {
         name: data.name,
-        rpc: [data.rpcUrl],
-        chainId: Number.parseInt(data.chainId),
         nativeCurrency: {
+          ...editingChain.nativeCurrency,
           symbol: data.currencySymbol,
-          name: data.currencySymbol,
-          decimals: 18,
         },
+        rpc: [data.rpcUrl],
+        stackType: data.stackType || "",
         testnet: data.type === "testnet",
-        shortName: form.watch("slug"),
-        slug: form.watch("slug"),
+      };
+    } else {
+      configuredNetwork = {
         // we don't care about this field
         chain: "",
+        chainId: Number.parseInt(data.chainId),
         icon: data.icon
           ? {
+              format: "",
+              height: 50,
               url: data.icon,
               width: 50,
-              height: 50,
-              format: "",
             }
           : undefined,
+        name: data.name,
+        nativeCurrency: {
+          decimals: 18,
+          name: data.currencySymbol,
+          symbol: data.currencySymbol,
+        },
+        rpc: [data.rpcUrl],
+        shortName: form.watch("slug"),
+        slug: form.watch("slug"),
         stackType: data.stackType || "",
+        testnet: data.type === "testnet",
       };
     }
 
@@ -238,9 +241,9 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
                     <p>{c.name}</p>
                   </div>
                   <Button
+                    onClick={() => removeChainOverrides(c.chainId)}
                     size="icon"
                     variant="ghost"
-                    onClick={() => removeChainOverrides(c.chainId)}
                   >
                     <Trash2Icon className="size-4 text-destructive-text" />
                   </Button>
@@ -266,23 +269,21 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
         <div className="grid grid-cols-2 gap-4">
           {/* name */}
           <FormFieldSetup
-            htmlFor="name"
-            label="Name"
             errorMessage={networkNameErrorMessage}
+            htmlFor={nameId}
             isRequired
+            label="Name"
           >
             <Input
-              id="name"
               autoComplete="off"
-              placeholder="My Network"
               className="bg-card disabled:bg-card disabled:text-muted-foreground disabled:opacity-100"
-              type="text"
+              id={nameId}
               onChange={(e) => {
                 const value = e.target.value;
 
                 form.setValue("name", value, {
-                  shouldValidate: true,
                   shouldDirty: true,
+                  shouldValidate: true,
                 });
 
                 if (isFullyEditable) {
@@ -293,31 +294,33 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
                   }
                 }
               }}
+              placeholder="My Network"
               ref={ref}
+              type="text"
             />
           </FormFieldSetup>
 
           {/* Slug */}
-          <NetworkIDInput form={form} disabled={!isFullyEditable} />
+          <NetworkIDInput disabled={!isFullyEditable} form={form} />
         </div>
 
         {/* Chain ID + Currency Symbol */}
         <div className="grid grid-cols-2 gap-4">
-          <ChainIdInput form={form} disabled={!isFullyEditable} />
+          <ChainIdInput disabled={!isFullyEditable} form={form} />
 
           {/* Currency Symbol */}
           <FormFieldSetup
+            errorMessage={form.formState.errors.currencySymbol?.message}
+            htmlFor={currencySymbolId}
             isRequired
             label="Currency Symbol"
-            errorMessage={form.formState.errors.currencySymbol?.message}
-            htmlFor="currency-symbol"
           >
             <Input
-              id="currency-symbol"
-              disabled={!isFullyEditable}
-              placeholder="ETH"
               autoComplete="off"
               className="bg-card font-mono disabled:bg-card disabled:text-muted-foreground disabled:opacity-100"
+              disabled={!isFullyEditable}
+              id={currencySymbolId}
+              placeholder="ETH"
               type="text"
               {...form.register("currencySymbol", { required: true })}
             />
@@ -327,8 +330,8 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
         <div className="grid grid-cols-2 gap-4">
           {/* Testnet / Mainnet */}
           <FormFieldSetup
-            htmlFor="network-type"
             errorMessage={undefined}
+            htmlFor={networkTypeId}
             isRequired
             label="Type"
             tooltip={
@@ -346,23 +349,23 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
             }
           >
             <RadioGroup
-              id="network-type"
-              value={form.watch("type")}
+              className="flex gap-4"
+              id={networkTypeId}
               onValueChange={(v) => {
                 form.setValue("type", v === "testnet" ? "testnet" : "mainnet", {
-                  shouldValidate: true,
                   shouldDirty: true,
+                  shouldValidate: true,
                 });
               }}
-              className="flex gap-4"
+              value={form.watch("type")}
             >
               <div className="flex items-center gap-2">
-                <RadioGroupItem value="mainnet" id="mainnet" />
+                <RadioGroupItem value="mainnet" />
                 <Label htmlFor="mainnet">Mainnet</Label>
               </div>
 
               <div className="flex items-center gap-2">
-                <RadioGroupItem value="testnet" id="testnet" />
+                <RadioGroupItem value="testnet" />
                 <Label htmlFor="testnet">Testnet</Label>
               </div>
             </RadioGroup>
@@ -370,16 +373,15 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
 
           {/* Icon */}
           <FormFieldSetup
-            isRequired={false}
             errorMessage={form.formState.errors.icon?.message}
-            htmlFor="network-icon"
+            isRequired={false}
             label="Icon"
           >
             <div className="flex items-center gap-1">
               <ChainIconClient
                 className="size-5"
-                src={form.watch("icon")}
                 client={client}
+                src={form.watch("icon")}
               />
               <IconUpload
                 client={client}
@@ -406,17 +408,17 @@ export const ConfigureNetworkForm: React.FC<NetworkConfigFormProps> = ({
 
       {/* Buttons  */}
       <div className="flex flex-col justify-end gap-4 border-border border-t bg-card p-6 md:flex-row">
-        <Button type="submit" disabled={disableSubmit}>
+        <Button disabled={disableSubmit} type="submit">
           {editingChain ? "Update Network" : "Add Network"}
         </Button>
 
         {editedFrom && (
           <Button
-            variant="outline"
             onClick={() => {
               onSubmit(editedFrom);
               removeChainOverrides(editedFrom.chainId);
             }}
+            variant="outline"
           >
             Reset
           </Button>
diff --git a/apps/dashboard/src/components/configure-networks/ConfigureNetworkModal.tsx b/apps/dashboard/src/components/configure-networks/ConfigureNetworkModal.tsx
index 2f2305fd167..fe10901f016 100644
--- a/apps/dashboard/src/components/configure-networks/ConfigureNetworkModal.tsx
+++ b/apps/dashboard/src/components/configure-networks/ConfigureNetworkModal.tsx
@@ -1,8 +1,8 @@
-import { Dialog, DialogContent } from "@/components/ui/dialog";
 import type { ThirdwebClient } from "thirdweb";
+import { Dialog, DialogContent } from "@/components/ui/dialog";
 import {
-  type StoredChain,
   addRecentlyUsedChainId,
+  type StoredChain,
 } from "../../stores/chainStores";
 import { ConfigureNetworks } from "./ConfigureNetworks";
 
@@ -22,17 +22,17 @@ export const ConfigureNetworkModal: React.FC<ConfigureNetworkModalProps> = (
   };
 
   return (
-    <Dialog open={props.open} onOpenChange={props.onOpenChange}>
+    <Dialog onOpenChange={props.onOpenChange} open={props.open}>
       <DialogContent className="max-w-[480px] p-0">
         <ConfigureNetworks
+          client={props.client}
+          editChain={props.editChain}
           onNetworkAdded={(chain) => {
             addRecentlyUsedChainId(chain.chainId);
             props.onNetworkAdded?.(chain);
             onModalClose();
           }}
           onNetworkConfigured={onModalClose}
-          editChain={props.editChain}
-          client={props.client}
         />
       </DialogContent>
     </Dialog>
diff --git a/apps/dashboard/src/components/configure-networks/ConfigureNetworks.tsx b/apps/dashboard/src/components/configure-networks/ConfigureNetworks.tsx
index 3e9a79ec3e7..fb66138609a 100644
--- a/apps/dashboard/src/components/configure-networks/ConfigureNetworks.tsx
+++ b/apps/dashboard/src/components/configure-networks/ConfigureNetworks.tsx
@@ -2,9 +2,9 @@ import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
 import { reportChainConfigurationAdded } from "../../@/analytics/report";
 import {
-  type StoredChain,
   addChainOverrides,
   addRecentlyUsedChainId,
+  type StoredChain,
 } from "../../stores/chainStores";
 import { ConfigureNetworkForm } from "./ConfigureNetworkForm";
 
@@ -29,8 +29,8 @@ export const ConfigureNetworks: React.FC<ConfigureNetworksProps> = (props) => {
         reportChainConfigurationAdded({
           chainId: chain.chainId,
           chainName: chain.name,
-          rpcURLs: chain.rpc,
           nativeCurrency: chain.nativeCurrency,
+          rpcURLs: chain.rpc,
         });
         props.onNetworkAdded(chain);
       }
@@ -57,19 +57,19 @@ export const ConfigureNetworks: React.FC<ConfigureNetworksProps> = (props) => {
         {/* Modify the given chain */}
         {editChain && (
           <ConfigureNetworkForm
+            client={props.client}
             editingChain={editChain}
             onSubmit={handleSubmit}
-            client={props.client}
           />
         )}
 
         {/* Custom chain */}
         {!editChain && (
           <ConfigureNetworkForm
-            prefillSlug={props.prefillSlug}
-            prefillChainId={props.prefillChainId}
-            onSubmit={handleSubmit}
             client={props.client}
+            onSubmit={handleSubmit}
+            prefillChainId={props.prefillChainId}
+            prefillSlug={props.prefillSlug}
           />
         )}
       </div>
diff --git a/apps/dashboard/src/components/configure-networks/Form/ChainIdInput.tsx b/apps/dashboard/src/components/configure-networks/Form/ChainIdInput.tsx
index a99754fba8b..6456d96a42c 100644
--- a/apps/dashboard/src/components/configure-networks/Form/ChainIdInput.tsx
+++ b/apps/dashboard/src/components/configure-networks/Form/ChainIdInput.tsx
@@ -1,28 +1,30 @@
+import { useId } from "react";
+import type { UseFormReturn } from "react-hook-form";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Input } from "@/components/ui/input";
-import type { UseFormReturn } from "react-hook-form";
 import type { NetworkConfigFormData } from "../ConfigureNetworkForm";
 
 export const ChainIdInput: React.FC<{
   form: UseFormReturn<NetworkConfigFormData>;
   disabled: boolean;
 }> = ({ form, disabled }) => {
+  const chainIdId = useId();
   return (
     <FormFieldSetup
-      label="Chain ID"
-      htmlFor="chain-id"
-      isRequired
       errorMessage={
         form.formState.errors.chainId?.type === "taken"
           ? form.formState.errors.chainId?.message
           : undefined
       }
+      htmlFor={chainIdId}
+      isRequired
+      label="Chain ID"
     >
       <Input
-        disabled={disabled}
-        id="chain-id"
         autoComplete="off"
         className="bg-card font-mono disabled:bg-card disabled:text-muted-foreground disabled:opacity-100"
+        disabled={disabled}
+        id={chainIdId}
         onKeyDown={(e) => {
           // prevent typing e, +, -
           if (e.key === "e" || e.key === "+" || e.key === "-") {
diff --git a/apps/dashboard/src/components/configure-networks/Form/IconUpload.tsx b/apps/dashboard/src/components/configure-networks/Form/IconUpload.tsx
index dffbb909e01..ccab9adf218 100644
--- a/apps/dashboard/src/components/configure-networks/Form/IconUpload.tsx
+++ b/apps/dashboard/src/components/configure-networks/Form/IconUpload.tsx
@@ -1,5 +1,3 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
 import { useDashboardStorageUpload } from "@3rdweb-sdk/react/hooks/useDashboardStorageUpload";
 import { useQueryClient } from "@tanstack/react-query";
 import { PINNED_FILES_QUERY_KEY_ROOT } from "app/(app)/team/[team_slug]/(team)/~/usage/storage/your-files";
@@ -7,6 +5,8 @@ import { FileInput } from "components/shared/FileInput";
 import { UploadIcon } from "lucide-react";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 
 export const IconUpload: React.FC<{
   onUpload: (url: string) => void;
@@ -23,6 +23,10 @@ export const IconUpload: React.FC<{
     }
 
     storageUpload.mutate([file], {
+      onError(error) {
+        console.error(error);
+        toast.error("Failed to upload icon");
+      },
       onSuccess([uri]) {
         if (uri) {
           onUpload(uri);
@@ -34,24 +38,20 @@ export const IconUpload: React.FC<{
           queryKey: [PINNED_FILES_QUERY_KEY_ROOT],
         });
       },
-      onError(error) {
-        console.error(error);
-        toast.error("Failed to upload icon");
-      },
     });
   };
 
   return (
     <FileInput
-      client={client}
-      setValue={handleIconUpload}
       accept={{ "image/*": [] }}
       className="flex items-center"
+      client={client}
+      setValue={handleIconUpload}
     >
       <Button
-        variant="ghost"
         className="!h-auto gap-1.5 px-1 py-0 text-muted-foreground hover:bg-transparent hover:text-foreground"
         size="sm"
+        variant="ghost"
       >
         Upload Icon
         {storageUpload.isPending ? (
diff --git a/apps/dashboard/src/components/configure-networks/Form/NetworkIdInput.tsx b/apps/dashboard/src/components/configure-networks/Form/NetworkIdInput.tsx
index df1c7641740..94495e91120 100644
--- a/apps/dashboard/src/components/configure-networks/Form/NetworkIdInput.tsx
+++ b/apps/dashboard/src/components/configure-networks/Form/NetworkIdInput.tsx
@@ -1,7 +1,8 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Input } from "@/components/ui/input";
 import { useAllChainsData } from "hooks/chains/allChains";
+import { useId } from "react";
 import type { UseFormReturn } from "react-hook-form";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Input } from "@/components/ui/input";
 import type { NetworkConfigFormData } from "../ConfigureNetworkForm";
 
 export const NetworkIDInput: React.FC<{
@@ -9,10 +10,15 @@ export const NetworkIDInput: React.FC<{
   disabled?: boolean;
 }> = ({ form, disabled }) => {
   const { slugToChain } = useAllChainsData();
-
+  const slugId = useId();
   return (
     <FormFieldSetup
-      htmlFor="slug"
+      errorMessage={
+        form.formState.errors.slug?.type === "taken"
+          ? "Slug is taken by other network"
+          : undefined
+      }
+      htmlFor={slugId}
       isRequired
       label="Slug"
       tooltip={
@@ -25,24 +31,19 @@ export const NetworkIDInput: React.FC<{
           </p>
         </span>
       }
-      errorMessage={
-        form.formState.errors.slug?.type === "taken" ? (
-          <>Slug is taken by other network</>
-        ) : undefined
-      }
     >
       <Input
-        disabled={disabled}
         autoComplete="off"
-        placeholder="ethereum"
-        id="slug"
         className="bg-card font-mono disabled:bg-card disabled:text-muted-foreground disabled:opacity-100"
+        disabled={disabled}
+        id={slugId}
         onKeyDown={(e) => {
           // only allow alphanumeric characters and dashes
           if (!/^[a-z0-9-]*$/i.test(e.key)) {
             e.preventDefault();
           }
         }}
+        placeholder="ethereum"
         type="text"
         {...form.register("slug", {
           required: true,
diff --git a/apps/dashboard/src/components/configure-networks/Form/RpcInput.tsx b/apps/dashboard/src/components/configure-networks/Form/RpcInput.tsx
index 7b2128fe642..d29d4fe9f5f 100644
--- a/apps/dashboard/src/components/configure-networks/Form/RpcInput.tsx
+++ b/apps/dashboard/src/components/configure-networks/Form/RpcInput.tsx
@@ -1,11 +1,13 @@
+import { useId } from "react";
+import type { UseFormReturn } from "react-hook-form";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Input } from "@/components/ui/input";
-import type { UseFormReturn } from "react-hook-form";
 import type { NetworkConfigFormData } from "../ConfigureNetworkForm";
 
 export const RpcInput: React.FC<{
   form: UseFormReturn<NetworkConfigFormData>;
 }> = ({ form }) => {
+  const rpcUrlId = useId();
   const reg = form.register("rpcUrl", {
     required: true,
     validate: {
@@ -22,17 +24,17 @@ export const RpcInput: React.FC<{
 
   return (
     <FormFieldSetup
-      isRequired
       errorMessage={form.formState.errors.rpcUrl?.message}
-      htmlFor="rpc-url"
+      htmlFor={rpcUrlId}
+      isRequired
       label="RPC URL"
     >
       <Input
-        id="rpc-url"
         autoComplete="off"
+        className="bg-card"
+        id={rpcUrlId}
         placeholder="https://"
         type="url"
-        className="bg-card"
         {...reg}
       />
 
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/add-to-project-card.stories.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/add-to-project-card.stories.tsx
index c80ea4530af..4aae973300f 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/add-to-project-card.stories.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/add-to-project-card.stories.tsx
@@ -13,13 +13,13 @@ import {
 } from "./add-to-project-card";
 
 const meta = {
-  title: "DeployContract/AddToProject",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "DeployContract/AddToProject",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -36,8 +36,8 @@ function teamsAndProjectsStub(teamCount: number, projectCount: number) {
   for (let i = 0; i < teamCount; i++) {
     const team: MinimalTeam = {
       id: `team_${i + 1}`,
-      name: `Team ${i + 1}`,
       image: `https://picsum.photos/200?random=${i}`,
+      name: `Team ${i + 1}`,
       slug: `team-${i + 1}`,
     };
 
@@ -45,13 +45,13 @@ function teamsAndProjectsStub(teamCount: number, projectCount: number) {
     for (let j = 0; j < projectCount; j++) {
       projects.push({
         id: `project_${i + 1}_${j + 1}`,
-        name: `Project ${i + 1}_${j + 1}`,
         image: `https://picsum.photos/200?random=${i}`,
+        name: `Project ${i + 1}_${j + 1}`,
         slug: `project-${i + 1}-${j + 1}`,
       });
     }
 
-    teamsAndProjects.push({ team, projects });
+    teamsAndProjects.push({ projects, team });
   }
 
   return teamsAndProjects;
@@ -60,10 +60,10 @@ function teamsAndProjectsStub(teamCount: number, projectCount: number) {
 function Story() {
   return (
     <div className="container flex max-w-6xl flex-col gap-10 py-10">
-      <Variant label="1 Team, 0 Projects" teamCount={1} projectCount={0} />
-      <Variant label="1 Team, 1 Project" teamCount={1} projectCount={1} />
-      <Variant label="1 Team, 5 Projects" teamCount={1} projectCount={5} />
-      <Variant label="5 Teams, 5 Projects" teamCount={5} projectCount={5} />
+      <Variant label="1 Team, 0 Projects" projectCount={0} teamCount={1} />
+      <Variant label="1 Team, 1 Project" projectCount={1} teamCount={1} />
+      <Variant label="1 Team, 5 Projects" projectCount={5} teamCount={1} />
+      <Variant label="5 Teams, 5 Projects" projectCount={5} teamCount={5} />
     </div>
   );
 }
@@ -78,19 +78,19 @@ function Variant(props: {
   );
   const [isEnabled, setIsEnabled] = useState(true);
   const [selection, setSelection] = useState<TeamAndProjectSelection>({
-    team: teamsAndProjects[0]?.team,
     project: teamsAndProjects[0]?.projects[0],
+    team: teamsAndProjects[0]?.team,
   });
 
   return (
     <BadgeContainer label={props.label}>
       <AddToProjectCardUI
-        teamsAndProjects={teamsAndProjects}
         client={storybookThirdwebClient}
-        onSelectionChange={setSelection}
-        selection={selection}
         enabled={isEnabled}
+        onSelectionChange={setSelection}
         onSetEnabled={setIsEnabled}
+        selection={selection}
+        teamsAndProjects={teamsAndProjects}
       />
     </BadgeContainer>
   );
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/add-to-project-card.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/add-to-project-card.tsx
index df14a889b9b..4deb988c4be 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/add-to-project-card.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/add-to-project-card.tsx
@@ -1,10 +1,12 @@
 "use client";
 
+import { CircleAlertIcon, ExternalLinkIcon } from "lucide-react";
+import { useId } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import type { Project } from "@/api/projects";
 import type { Team } from "@/api/team";
 import { GradientAvatar } from "@/components/blocks/Avatars/GradientAvatar";
 import { ProjectAvatar } from "@/components/blocks/Avatars/ProjectAvatar";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Label } from "@/components/ui/label";
@@ -15,8 +17,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { CircleAlertIcon, ExternalLinkIcon } from "lucide-react";
-import type { ThirdwebClient } from "thirdweb";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { Fieldset } from "./common";
 
 export type MinimalTeam = Pick<Team, "id" | "name" | "image" | "slug">;
@@ -50,29 +51,29 @@ export function AddToProjectCardUI(props: TeamAndProjectSelectorProps) {
 
   return (
     <Fieldset
-      legend="Add To Project"
       description="Save the deployed contract in a project's contract list on thirdweb dashboard"
-      headerClassName="pr-14"
       headerChildren={
         <div className="absolute top-4 right-4 lg:top-6 lg:right-6">
           <Checkbox
-            className="size-5"
             checked={props.enabled}
+            className="size-5"
             onCheckedChange={(checked) => {
               props.onSetEnabled(!!checked);
             }}
           />
         </div>
       }
+      headerClassName="pr-14"
+      legend="Add To Project"
     >
       <div className="flex flex-col gap-5">
         {/* Team & Project selectors */}
         {props.enabled && (
           <AddToProjectSelector
-            selection={props.selection}
+            client={props.client}
             onSelectionChange={props.onSelectionChange}
+            selection={props.selection}
             teamsAndProjects={props.teamsAndProjects}
-            client={props.client}
           />
         )}
 
@@ -83,10 +84,10 @@ export function AddToProjectCardUI(props: TeamAndProjectSelectorProps) {
             <AlertTitle> Selected team has no projects </AlertTitle>
             <AlertDescription>
               <UnderlineLink
-                href={`/team/${selectedTeam.team.slug}`}
                 className="inline-flex items-center gap-2"
-                target="_blank"
+                href={`/team/${selectedTeam.team.slug}`}
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 Create Project <ExternalLinkIcon className="size-3.5" />
               </UnderlineLink>
@@ -123,15 +124,17 @@ export function AddToProjectSelector(props: {
     (t) => t.team.id === props.selection.team?.id,
   );
 
+  const teamSelectId = useId();
+  const projectSelectId = useId();
+
   return (
     <div className="flex flex-col gap-4 lg:flex-row lg:items-center lg:gap-2">
       {/* Team */}
       <div>
-        <Label htmlFor="team-select" className="mb-2 inline-block">
+        <Label className="mb-2 inline-block" htmlFor={teamSelectId}>
           Team
         </Label>
         <Select
-          value={props.selection.team?.id}
           onValueChange={(v) => {
             const teamAndProjects = props.teamsAndProjects.find(
               (t) => t.team.id === v,
@@ -139,24 +142,25 @@ export function AddToProjectSelector(props: {
 
             if (teamAndProjects) {
               props.onSelectionChange({
-                team: teamAndProjects.team,
                 project: teamAndProjects.projects?.[0],
+                team: teamAndProjects.team,
               });
             }
           }}
+          value={props.selection.team?.id}
         >
-          <SelectTrigger id="team-select" className="min-w-[200px]">
+          <SelectTrigger className="min-w-[200px]" id={teamSelectId}>
             <SelectValue placeholder="Select a team" />
           </SelectTrigger>
           <SelectContent>
             {props.teamsAndProjects.map(({ team }) => (
-              <SelectItem key={team.id} value={team.id} className="py-2.5">
+              <SelectItem className="py-2.5" key={team.id} value={team.id}>
                 <div className="flex items-center gap-2">
                   <GradientAvatar
-                    src={team.image || ""}
                     className="size-5"
-                    id={team.id}
                     client={props.client}
+                    id={team.id}
+                    src={team.image || ""}
                   />
 
                   <span>{team.name}</span>
@@ -174,11 +178,10 @@ export function AddToProjectSelector(props: {
 
       {/* Project */}
       <div>
-        <Label htmlFor="project-select" className="mb-2 inline-block">
+        <Label className="mb-2 inline-block" htmlFor={projectSelectId}>
           Project
         </Label>
         <Select
-          value={props.selection.project?.id}
           onValueChange={(v) => {
             const project = selectedTeam?.projects?.find((p) => p.id === v);
             if (project) {
@@ -188,8 +191,9 @@ export function AddToProjectSelector(props: {
               });
             }
           }}
+          value={props.selection.project?.id}
         >
-          <SelectTrigger id="project-select" className="min-w-[200px]">
+          <SelectTrigger className="min-w-[200px]" id={projectSelectId}>
             <SelectValue placeholder="Select a project" />
           </SelectTrigger>
           <SelectContent>
@@ -202,15 +206,15 @@ export function AddToProjectSelector(props: {
 
             {selectedTeam?.projects.map((project) => (
               <SelectItem
+                className="py-2.5"
                 key={project.id}
                 value={project.id}
-                className="py-2.5"
               >
                 <div className="flex items-center gap-2">
                   <ProjectAvatar
-                    src={project.image || ""}
                     className="size-5"
                     client={props.client}
+                    src={project.image || ""}
                   />
                   <span>{project.name}</span>
                 </div>
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/contract-metadata-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/contract-metadata-fieldset.tsx
index 4225296a5aa..82c8f651fb1 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/contract-metadata-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/contract-metadata-fieldset.tsx
@@ -1,8 +1,9 @@
+import { FileInput } from "components/shared/FileInput";
+import { useId } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { FileInput } from "components/shared/FileInput";
-import type { ThirdwebClient } from "thirdweb";
 import { Fieldset } from "./common";
 import type { CustomContractDeploymentForm } from "./custom-contract";
 
@@ -14,6 +15,10 @@ interface ContractMetadataFieldsetProps {
 export const ContractMetadataFieldset: React.FC<
   ContractMetadataFieldsetProps
 > = ({ form, client }) => {
+  const nameId = useId();
+  const symbolId = useId();
+  const descriptionId = useId();
+
   return (
     <Fieldset legend="Contract Metadata">
       <div className="flex flex-col gap-6 md:grid md:grid-cols-[200px_1fr]">
@@ -22,19 +27,19 @@ export const ContractMetadataFieldset: React.FC<
             form.getFieldState("contractMetadata.image", form.formState).error
               ?.message
           }
-          label="Image"
           isRequired={false}
+          label="Image"
         >
           <FileInput
-            client={client}
             accept={{ "image/*": [] }}
-            value={form.watch("contractMetadata.image")}
+            className="rounded border-border bg-background transition-all duration-200 hover:border-active-border hover:bg-background"
+            client={client}
             setValue={(file) =>
               form.setValue("contractMetadata.image", file, {
                 shouldTouch: true,
               })
             }
-            className="rounded border-border bg-background transition-all duration-200 hover:border-active-border hover:bg-background"
+            value={form.watch("contractMetadata.image")}
           />
         </FormFieldSetup>
 
@@ -43,16 +48,16 @@ export const ContractMetadataFieldset: React.FC<
           <div className="flex flex-col gap-6 lg:flex-row lg:gap-4">
             <FormFieldSetup
               className="grow"
-              label="Name"
-              isRequired
-              htmlFor="contractMetadata-name"
               errorMessage={
                 form.getFieldState("contractMetadata.name", form.formState)
                   .error?.message
               }
+              htmlFor={nameId}
+              isRequired
+              label="Name"
             >
               <Input
-                id="contractMetadata-name"
+                id={nameId}
                 {...form.register("contractMetadata.name", {
                   required: "Name is Required",
                 })}
@@ -61,35 +66,35 @@ export const ContractMetadataFieldset: React.FC<
 
             <FormFieldSetup
               className="lg:max-w-[300px]"
-              isRequired={false}
-              label="Symbol"
-              htmlFor="contractMetadata-symbol"
               errorMessage={
                 form.getFieldState("contractMetadata.symbol", form.formState)
                   .error?.message
               }
+              htmlFor={symbolId}
+              isRequired={false}
+              label="Symbol"
             >
               <Input
                 {...form.register("contractMetadata.symbol")}
-                id="contractMetadata-symbol"
+                id={symbolId}
               />
             </FormFieldSetup>
           </div>
 
           <FormFieldSetup
             className="flex grow flex-col"
-            label="Description"
-            isRequired={false}
-            htmlFor="contractMetadata-description"
             errorMessage={
               form.getFieldState("contractMetadata.description", form.formState)
                 .error?.message
             }
+            htmlFor={descriptionId}
+            isRequired={false}
+            label="Description"
           >
             <Textarea
               {...form.register("contractMetadata.description")}
               className="grow"
-              id="contractMetadata-description"
+              id={descriptionId}
             />
           </FormFieldSetup>
         </div>
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx
index 74691521c76..337659c6f6c 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx
@@ -1,18 +1,4 @@
 "use client";
-import {
-  reportContractDeployFailed,
-  reportContractDeployed,
-} from "@/analytics/report";
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-} from "@/components/ui/accordion";
-import { Alert, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { Flex, FormControl } from "@chakra-ui/react";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { verifyContract } from "app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage";
@@ -36,7 +22,7 @@ import {
 import Link from "next/link";
 import { useCallback, useMemo, useState } from "react";
 import { FormProvider, type UseFormReturn, useForm } from "react-hook-form";
-import { type ThirdwebClient, ZERO_ADDRESS, getContract } from "thirdweb";
+import { getContract, type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
 import type { FetchDeployMetadataResult } from "thirdweb/contract";
 import {
   deployContractfromDeployMetadata,
@@ -47,6 +33,20 @@ import { useActiveAccount, useActiveWalletChain } from "thirdweb/react";
 import { upload } from "thirdweb/storage";
 import { isZkSyncChain } from "thirdweb/utils";
 import { FormHelperText, FormLabel, Text } from "tw-components";
+import {
+  reportContractDeployed,
+  reportContractDeployFailed,
+} from "@/analytics/report";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@/components/ui/accordion";
+import { Alert, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import { useAddContractToProject } from "../../../app/(app)/team/[team_slug]/[project_slug]/(sidebar)/hooks/project-contracts";
 import {
   LAST_USED_PROJECT_ID,
@@ -69,8 +69,8 @@ import {
   useDeployStatusModal,
 } from "./deploy-context-modal";
 import {
-  ModularContractDefaultModulesFieldset,
   getModuleInstallParams,
+  ModularContractDefaultModulesFieldset,
   showPrimarySaleFieldset,
   showRoyaltyFieldset,
   showSuperchainBridgeFieldset,
@@ -170,8 +170,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
     project: MinimalProject | undefined;
   }>(() => {
     const defaultSelection = {
-      team: teamsAndProjects[0]?.team,
       project: teamsAndProjects[0]?.projects[0],
+      team: teamsAndProjects[0]?.team,
     };
 
     try {
@@ -191,8 +191,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
       if (teamWithProjects && project) {
         return {
-          team: teamWithProjects.team,
           project,
+          team: teamWithProjects.team,
         };
       }
     } catch {
@@ -281,8 +281,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                 : "",
             param.type,
             {
-              connectedWallet: activeAccount?.address,
               chainId: walletChain?.id,
+              connectedWallet: activeAccount?.address,
             },
           );
 
@@ -316,12 +316,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
     () =>
       ({
         deployDeterministic: isAccountFactory,
-        saltForCreate2: "",
-        signerAsSalt: true,
         deployParams: parsedDeployParams,
-        recipients: [
-          { address: activeAccount?.address || "", sharesBps: 10000 },
-        ],
         // set default values for modular contract modules with custom components
         moduleData:
           (activeAccount &&
@@ -355,6 +350,11 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
               {} as Record<string, Record<string, string>>,
             )) ||
           {},
+        recipients: [
+          { address: activeAccount?.address || "", sharesBps: 10000 },
+        ],
+        saltForCreate2: "",
+        signerAsSalt: true,
       }) satisfies CustomContractDeploymentFormData,
     [
       parsedDeployParams,
@@ -367,11 +367,11 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
   const form = useForm<CustomContractDeploymentFormData>({
     defaultValues: transformedQueryData,
-    values: transformedQueryData,
     resetOptions: {
       keepDirty: true,
       keepDirtyValues: true,
     },
+    values: transformedQueryData,
   });
   const formDeployParams = form.watch("deployParams");
 
@@ -464,12 +464,12 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
           return (
             <Param
               client={client}
-              key={paramKey}
-              paramKey={paramKey}
               deployParam={deployParam}
               extraMetadataParam={extraMetadataParam}
-              isRequired
               inputClassName="bg-background"
+              isRequired
+              key={paramKey}
+              paramKey={paramKey}
             />
           );
         })
@@ -526,9 +526,9 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
           chain: walletChain,
           client,
           params: {
-            name: params.contractMetadata?.name || "",
             contractURI: _contractURI,
             defaultAdmin: params.deployParams._defaultAdmin as string,
+            name: params.contractMetadata?.name || "",
             platformFeeBps: isFeeExempt
               ? Number(params.deployParams._platformFeeBps)
               : DEFAULT_FEE_BPS_NEW,
@@ -546,9 +546,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
       const initializeParams = {
         ...params.contractMetadata,
         ...params.deployParams,
-        payees,
-        shares,
         _contractURI,
+        payees,
         platformFeeBps: isFeeExempt
           ? Number(params.deployParams._platformFeeBps)
           : hasInbuiltDefaultFeeConfig
@@ -557,6 +556,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
         platformFeeRecipient: isFeeExempt
           ? (params.deployParams._platformFeeRecipient as string)
           : DEFAULT_FEE_RECIPIENT,
+        shares,
       };
 
       const salt = params.deployDeterministic
@@ -575,10 +575,10 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
         chain: walletChain,
         client,
         deployMetadata: isFeeExempt && metadataNoFee ? metadataNoFee : metadata,
-        initializeParams,
         implementationConstructorParams,
-        salt,
+        initializeParams,
         modules: moduleDeployData,
+        salt,
       });
 
       return coreContractAddress;
@@ -586,16 +586,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
   });
 
   const deployTransactions = useQuery({
-    queryKey: [
-      "deployTransactions",
-      {
-        chainId: walletChain?.id,
-        name: metadata.name,
-        publisher: metadata.publisher,
-        uri: metadata.metadataUri,
-        moduleUris: modules?.map((m) => m.metadataUri),
-      },
-    ],
+    enabled: walletChain !== undefined && metadata !== undefined,
     queryFn: async () => {
       if (!walletChain) {
         throw new Error("no wallet chain");
@@ -610,7 +601,16 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
         })),
       });
     },
-    enabled: walletChain !== undefined && metadata !== undefined,
+    queryKey: [
+      "deployTransactions",
+      {
+        chainId: walletChain?.id,
+        moduleUris: modules?.map((m) => m.metadataUri),
+        name: metadata.name,
+        publisher: metadata.publisher,
+        uri: metadata.metadataUri,
+      },
+    ],
   });
 
   const shouldShowDeterministicDeployWarning =
@@ -621,13 +621,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
   return (
     <>
       <FormProvider {...form}>
-        <Flex
-          flexGrow={1}
-          minH="full"
-          gap={8}
-          direction="column"
-          id="custom-contract-form"
-          as="form"
+        <form
+          className="flex grow flex-col gap-8 min-h-full"
           onSubmit={form.handleSubmit(async (formData) => {
             if (!walletChain?.id || !activeAccount || !isLoggedIn) {
               return;
@@ -636,8 +631,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
             // open the status modal
             const steps: DeployModalStep[] = [
               {
-                type: "deploy",
                 signatureCount: deployTransactions.data?.length || 1,
+                type: "deploy",
               },
             ];
 
@@ -659,8 +654,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
               reportContractDeployed({
                 address: contractAddr,
                 chainId: walletChain.id,
-                publisher: rewriteTwPublisher(metadata.publisher),
                 contractName: metadata.name,
+                publisher: rewriteTwPublisher(metadata.publisher),
               });
 
               deployStatusModal.nextStep();
@@ -684,10 +679,10 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                 addContractToProjectMutation.mutateAsync({
                   chainId: walletChain.id.toString(),
                   contractAddress: contractAddr,
+                  contractType: undefined,
+                  deploymentType: undefined,
                   projectId: importSelection.project.id,
                   teamId: importSelection.team.id,
-                  deploymentType: undefined,
-                  contractType: undefined,
                 });
               }
             } catch (e) {
@@ -695,10 +690,10 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
               console.error("failed to deploy contract", e);
               const parsedError = parseError(e);
               reportContractDeployFailed({
-                errorMessage: parsedError,
                 chainId: walletChain.id,
-                publisher: rewriteTwPublisher(metadata.publisher),
                 contractName: metadata.name,
+                errorMessage: parsedError,
+                publisher: rewriteTwPublisher(metadata.publisher),
               });
 
               deployStatusModal.close();
@@ -709,12 +704,19 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
             <>
               {/* Contract Metadata */}
               {hasContractURI && (
-                <ContractMetadataFieldset form={form} client={client} />
+                <ContractMetadataFieldset client={client} form={form} />
               )}
 
               {/* Primary Sale */}
               {hasPrimarySale && (
                 <PrimarySaleFieldset
+                  client={client}
+                  errorMessage={
+                    form.getFieldState(
+                      "deployParams._saleRecipient",
+                      form.formState,
+                    ).error?.message
+                  }
                   isInvalid={
                     !!form.getFieldState(
                       "deployParams._saleRecipient",
@@ -722,18 +724,18 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                     ).error
                   }
                   register={form.register("deployParams._saleRecipient")}
-                  errorMessage={
-                    form.getFieldState(
-                      "deployParams._saleRecipient",
-                      form.formState,
-                    ).error?.message
-                  }
-                  client={client}
                 />
               )}
 
               {hasPrimarySaleRecipient && (
                 <PrimarySaleFieldset
+                  client={client}
+                  errorMessage={
+                    form.getFieldState(
+                      "deployParams._primarySaleRecipient",
+                      form.formState,
+                    ).error?.message
+                  }
                   isInvalid={
                     !!form.getFieldState(
                       "deployParams._primarySaleRecipient",
@@ -741,32 +743,18 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                     ).error
                   }
                   register={form.register("deployParams._primarySaleRecipient")}
-                  errorMessage={
-                    form.getFieldState(
-                      "deployParams._primarySaleRecipient",
-                      form.formState,
-                    ).error?.message
-                  }
-                  client={client}
                 />
               )}
 
               {/* Royalty */}
               {hasRoyalty && (
                 <RoyaltyFieldset
-                  royaltyRecipient={{
-                    isInvalid: !!form.getFieldState(
-                      "deployParams._royaltyRecipient",
-                      form.formState,
-                    ).error,
-                    register: form.register("deployParams._royaltyRecipient"),
+                  client={client}
+                  royaltyBps={{
                     errorMessage: form.getFieldState(
-                      "deployParams._royaltyRecipient",
+                      "deployParams._royaltyBps",
                       form.formState,
                     ).error?.message,
-                  }}
-                  royaltyBps={{
-                    value: form.watch("deployParams._royaltyBps") as string,
                     isInvalid: !!form.getFieldState(
                       "deployParams._royaltyBps",
                       form.formState,
@@ -776,28 +764,35 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                         shouldTouch: true,
                       });
                     },
+                    value: form.watch("deployParams._royaltyBps") as string,
+                  }}
+                  royaltyRecipient={{
                     errorMessage: form.getFieldState(
-                      "deployParams._royaltyBps",
+                      "deployParams._royaltyRecipient",
                       form.formState,
                     ).error?.message,
+                    isInvalid: !!form.getFieldState(
+                      "deployParams._royaltyRecipient",
+                      form.formState,
+                    ).error,
+                    register: form.register("deployParams._royaltyRecipient"),
                   }}
-                  client={client}
                 />
               )}
 
               {hasPlatformFee && (
                 <PlatformFeeFieldset
+                  client={client}
+                  disabled={!isFeeExempt}
                   form={form}
                   isMarketplace={isMarketplace}
-                  disabled={!isFeeExempt}
-                  client={client}
                 />
               )}
 
-              {isSplit && <SplitFieldset form={form} client={client} />}
+              {isSplit && <SplitFieldset client={client} form={form} />}
 
               {hasTrustedForwarders && (
-                <TrustedForwardersFieldset form={form} client={client} />
+                <TrustedForwardersFieldset client={client} form={form} />
               )}
 
               {/* for StakeERC721 */}
@@ -815,12 +810,12 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
                       return (
                         <Param
-                          key={paramKey}
-                          paramKey={paramKey}
+                          client={client}
                           deployParam={deployParam}
                           extraMetadataParam={extraMetadataParam}
                           isRequired
-                          client={client}
+                          key={paramKey}
+                          paramKey={paramKey}
                         />
                       );
                     })}
@@ -843,12 +838,12 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
                       return (
                         <Param
-                          key={paramKey}
-                          paramKey={paramKey}
+                          client={client}
                           deployParam={deployParam}
                           extraMetadataParam={extraMetadataParam}
                           isRequired
-                          client={client}
+                          key={paramKey}
+                          paramKey={paramKey}
                         />
                       );
                     })}
@@ -885,33 +880,33 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
                   return (
                     <Param
-                      key={paramKey}
-                      paramKey={paramKey}
+                      client={client}
                       deployParam={deployParam}
                       extraMetadataParam={extraMetadataParam}
                       inputClassName="bg-card"
                       isRequired
-                      client={client}
+                      key={paramKey}
+                      paramKey={paramKey}
                     />
                   );
                 })}
 
               {isModular && modules && modules.length > 0 && (
                 <ModularContractDefaultModulesFieldset
+                  client={client}
                   form={form}
-                  modules={modules}
                   isTWPublisher={isTWPublisher}
-                  client={client}
+                  modules={modules}
                 />
               )}
 
               {advancedParams.length > 0 && (
                 <Accordion
-                  type="single"
-                  collapsible
                   className="rounded-lg border border-border bg-card"
+                  collapsible
+                  type="single"
                 >
-                  <AccordionItem value="advanced" className="border-b-0">
+                  <AccordionItem className="border-b-0" value="advanced">
                     <AccordionTrigger className="px-4 font-semibold text-xl tracking-tight lg:px-6">
                       Advanced Configuration
                     </AccordionTrigger>
@@ -926,11 +921,11 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
           <AddToProjectCardUI
             client={client}
-            teamsAndProjects={teamsAndProjects}
-            selection={importSelection}
             enabled={isImportEnabled}
             onSelectionChange={setImportSelection}
             onSetEnabled={setIsImportEnabled}
+            selection={importSelection}
+            teamsAndProjects={teamsAndProjects}
           />
 
           <Fieldset legend="Deploy Options">
@@ -947,8 +942,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                 <div className="flex flex-col gap-3">
                   <div className="flex flex-col gap-4 md:flex-row">
                     <NetworkSelectorButton
-                      client={client}
                       className="bg-background"
+                      client={client}
                       networksEnabled={
                         metadata?.name === "AccountFactory" ||
                         metadata?.networksForDeployment?.allNetworks ||
@@ -960,10 +955,10 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
                     <Button asChild variant="outline">
                       <Link
-                        href="/chainlist"
                         className="gap-3"
-                        target="_blank"
+                        href="/chainlist"
                         rel="noopener noreferrer"
+                        target="_blank"
                       >
                         View all chains
                         <ExternalLinkIcon className="size-4 bg-background text-muted-foreground" />
@@ -1012,7 +1007,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                   {isCreate2Deployment && (
                     <FormControl>
                       <Flex alignItems="center" my={1}>
-                        <FormLabel mb={0} flex="1" display="flex">
+                        <FormLabel display="flex" flex="1" mb={0}>
                           <Flex alignItems="baseline" gap={1}>
                             Optional Salt Input
                             <Text size="label.sm">(saltForCreate2)</Text>
@@ -1046,9 +1041,9 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
               {/* Deploy */}
               <div className="flex border-border border-t pt-6 md:justify-end">
                 <Button
+                  className="gap-2"
                   disabled={!activeAccount || !walletChain}
                   type="submit"
-                  className="gap-2"
                 >
                   Deploy Now
                   <ArrowUpFromLineIcon className="size-4" />
@@ -1056,7 +1051,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
               </div>
             </div>
           </Fieldset>
-        </Flex>
+        </form>
       </FormProvider>
       <DeployStatusModal deployStatusModal={deployStatusModal} />
     </>
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/deploy-context-modal.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/deploy-context-modal.tsx
index f59dbb20571..ff8756fdeed 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/deploy-context-modal.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/deploy-context-modal.tsx
@@ -1,4 +1,7 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { CircleCheckIcon, CircleIcon } from "lucide-react";
+import Link from "next/link";
+import { useCallback, useState } from "react";
+import { useActiveWallet } from "thirdweb/react";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -6,11 +9,8 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { cn } from "@/lib/utils";
-import { CircleCheckIcon, CircleIcon } from "lucide-react";
-import Link from "next/link";
-import { useCallback, useState } from "react";
-import { useActiveWallet } from "thirdweb/react";
 
 export type DeployModalStep = {
   type: "deploy" | "setNFTMetadata";
@@ -55,15 +55,15 @@ export function useDeployStatusModal(): DeployStatusModal {
   }, []);
 
   return {
-    open,
+    activeStep,
     close,
-    nextStep,
     isModalOpen,
-    steps,
-    activeStep,
+    nextStep,
+    open,
     setIsModalOpen,
-    viewContractLink,
     setViewContractLink,
+    steps,
+    viewContractLink,
   };
 }
 
@@ -77,8 +77,8 @@ export function DeployStatusModal(props: {
   return (
     <Dialog open={isModalOpen}>
       <DialogContent
-        dialogCloseClassName="hidden"
         className="gap-0 p-0 md:max-w-[480px]"
+        dialogCloseClassName="hidden"
       >
         <div className="flex flex-col gap-5 p-6">
           <DialogHeader>
@@ -93,10 +93,10 @@ export function DeployStatusModal(props: {
               const hasCompleted = i < activeStep;
               return (
                 <RenderDeployModalStep
+                  hasCompleted={hasCompleted}
+                  isActive={isActive}
                   key={step.type}
                   step={step}
-                  isActive={isActive}
-                  hasCompleted={hasCompleted}
                 />
               );
             })}
@@ -105,7 +105,7 @@ export function DeployStatusModal(props: {
 
         {viewContractLink && (
           <div className="mt-2 flex justify-end gap-4 border-border border-t p-6">
-            <Button variant="outline" onClick={() => setIsModalOpen(false)}>
+            <Button onClick={() => setIsModalOpen(false)} variant="outline">
               Close
             </Button>
             <Button asChild>
@@ -169,19 +169,18 @@ function getStepInfo(
   switch (step.type) {
     case "deploy": {
       return {
-        title: "Deploying contract",
         description:
           step.signatureCount > 0 && requiresSignature
             ? `Your wallet will prompt you to sign ${
                 step.signatureCount === 1 ? "the" : step.signatureCount || 1
               } transaction${step.signatureCount > 1 ? "s" : ""}.`
             : "This may take a few seconds",
+        title: "Deploying contract",
       };
     }
 
     case "setNFTMetadata": {
       return {
-        title: "Setting NFT metadata",
         description: (
           <>
             {step.signatureCount > 0 && requiresSignature
@@ -189,6 +188,7 @@ function getStepInfo(
               : "This may take a few seconds."}
           </>
         ),
+        title: "Setting NFT metadata",
       };
     }
   }
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/modular-contract-default-modules-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/modular-contract-default-modules-fieldset.tsx
index ceede8009b6..ae1a855842a 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/modular-contract-default-modules-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/modular-contract-default-modules-fieldset.tsx
@@ -28,11 +28,11 @@ export function ModularContractDefaultModulesFieldset(props: {
       {props.modules.map((mod) => {
         return (
           <RenderModule
+            client={props.client}
+            form={props.form}
+            isTWPublisher={props.isTWPublisher}
             key={mod.name}
             module={mod}
-            isTWPublisher={props.isTWPublisher}
-            form={props.form}
-            client={props.client}
           />
         );
       })}
@@ -62,10 +62,10 @@ function RenderModule(props: {
     if (showRoyaltyFieldset(paramNames)) {
       return (
         <RenderRoyaltyFieldset
-          module={module}
+          client={props.client}
           form={form}
           isTWPublisher
-          client={props.client}
+          module={module}
         />
       );
     }
@@ -73,10 +73,10 @@ function RenderModule(props: {
     if (showPrimarySaleFieldset(paramNames)) {
       return (
         <RenderPrimarySaleFieldset
-          module={module}
+          client={props.client}
           form={form}
           isTWPublisher
-          client={props.client}
+          module={module}
         />
       );
     }
@@ -84,10 +84,10 @@ function RenderModule(props: {
     if (showSequentialTokenIdFieldset(paramNames)) {
       return (
         <RenderSequentialTokenIdFieldset
-          module={module}
+          client={props.client}
           form={form}
           isTWPublisher
-          client={props.client}
+          module={module}
         />
       );
     }
@@ -105,18 +105,18 @@ function RenderModule(props: {
 
           return (
             <FormControl
-              key={formFieldKey}
-              isRequired
               isInvalid={
                 !!form.getFieldState(formFieldKey, form.formState).error
               }
+              isRequired
+              key={formFieldKey}
             >
               <FormLabel> {param.name}</FormLabel>
               <SolidityInput
                 client={props.client}
-                solidityType={param.type}
                 // @ts-expect-error - old types, need to update
                 solidityComponents={param.components}
+                solidityType={param.type}
                 {...form.register(formFieldKey)}
               />
               <FormErrorMessage>
@@ -146,15 +146,15 @@ function RenderPrimarySaleFieldset(props: {
 
   return (
     <PrimarySaleFieldset
-      isInvalid={
-        !!form.getFieldState(primarySaleRecipientPath, form.formState).error
-      }
-      register={form.register(primarySaleRecipientPath)}
+      client={client}
       errorMessage={
         form.getFieldState(primarySaleRecipientPath, form.formState).error
           ?.message
       }
-      client={client}
+      isInvalid={
+        !!form.getFieldState(primarySaleRecipientPath, form.formState).error
+      }
+      register={form.register(primarySaleRecipientPath)}
     />
   );
 }
@@ -171,12 +171,12 @@ function RenderSequentialTokenIdFieldset(props: {
 
   return (
     <SequentialTokenIdFieldset
-      isInvalid={!!form.getFieldState(startTokenIdPath, form.formState).error}
-      register={form.register(startTokenIdPath)}
+      client={client}
       errorMessage={
         form.getFieldState(startTokenIdPath, form.formState).error?.message
       }
-      client={client}
+      isInvalid={!!form.getFieldState(startTokenIdPath, form.formState).error}
+      register={form.register(startTokenIdPath)}
     />
   );
 }
@@ -200,33 +200,33 @@ function RenderRoyaltyFieldset(props: {
   return (
     <RoyaltyFieldset
       client={props.client}
-      royaltyRecipient={{
-        isInvalid: !!form.getFieldState(royaltyRecipientPath, form.formState)
-          .error,
-        register: form.register(royaltyRecipientPath, {
-          required: "Required",
-        }),
-        errorMessage: form.getFieldState(royaltyRecipientPath, form.formState)
-          .error?.message,
-      }}
       royaltyBps={{
+        errorMessage: form.getFieldState(royaltyBpsPath, form.formState).error
+          ?.message,
         isInvalid: !!form.getFieldState(royaltyBpsPath, form.formState).error,
-        value: form.watch(royaltyBpsPath) || "0",
         setValue: (value) =>
           form.setValue(royaltyBpsPath, value, {
             shouldTouch: true,
           }),
-        errorMessage: form.getFieldState(royaltyBpsPath, form.formState).error
-          ?.message,
+        value: form.watch(royaltyBpsPath) || "0",
+      }}
+      royaltyRecipient={{
+        errorMessage: form.getFieldState(royaltyRecipientPath, form.formState)
+          .error?.message,
+        isInvalid: !!form.getFieldState(royaltyRecipientPath, form.formState)
+          .error,
+        register: form.register(royaltyRecipientPath, {
+          required: "Required",
+        }),
       }}
       transferValidator={{
+        errorMessage: form.getFieldState(transferValidatorPath, form.formState)
+          .error?.message,
         isInvalid: !!form.getFieldState(transferValidatorPath, form.formState)
           .error,
         register: form.register(transferValidatorPath, {
           required: "Required",
         }),
-        errorMessage: form.getFieldState(transferValidatorPath, form.formState)
-          .error?.message,
       }}
     />
   );
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/param.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/param.tsx
index 119bcc3ab87..c5f06d7a54e 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/param.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/param.tsx
@@ -1,8 +1,8 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import { camelToTitle } from "contract-ui/components/solidity-inputs/helpers";
 import { useFormContext } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 
 interface ParamProps {
   paramKey: string;
@@ -35,13 +35,14 @@ export const Param: React.FC<ParamProps> = ({
 
   return (
     <FormFieldSetup
-      isRequired={isRequired}
-      key={paramKey}
+      className="relative"
       errorMessage={
         form.getFieldState(`deployParams.${paramKey}`, form.formState).error
           ?.message
       }
-      className="relative"
+      helperText={extraMetadataParam?.description}
+      isRequired={isRequired}
+      key={paramKey}
       label={
         <span className="inline-flex gap-1 align-baseline">
           {extraMetadataParam?.displayName
@@ -54,15 +55,14 @@ export const Param: React.FC<ParamProps> = ({
           </span>
         </span>
       }
-      helperText={extraMetadataParam?.description}
     >
       <span className="absolute top-0.5 right-0 text-muted-foreground text-sm">
         {deployParam.type}
       </span>
       <SolidityInput
-        solidityType={deployParam.type}
-        client={client}
         className={inputClassName}
+        client={client}
+        solidityType={deployParam.type}
         {...form.register(`deployParams.${paramKey}`)}
       />
     </FormFieldSetup>
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/platform-fee-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/platform-fee-fieldset.tsx
index 57927648511..574d3cd5abb 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/platform-fee-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/platform-fee-fieldset.tsx
@@ -1,8 +1,8 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { BasisPointsInput } from "components/inputs/BasisPointsInput";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import Link from "next/link";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Fieldset } from "./common";
 import type { CustomContractDeploymentForm } from "./custom-contract";
 
@@ -26,8 +26,6 @@ export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = ({
           <>
             <FormFieldSetup
               className="grow"
-              label="Recipient Address"
-              isRequired
               errorMessage={
                 form.getFieldState(
                   "deployParams._platformFeeRecipient",
@@ -44,6 +42,8 @@ export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = ({
                   happen on your contract.
                 </>
               }
+              isRequired
+              label="Recipient Address"
             >
               <SolidityInput
                 solidityType="address"
@@ -53,8 +53,6 @@ export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = ({
             </FormFieldSetup>
 
             <FormFieldSetup
-              label="Percentage"
-              isRequired
               className="shrink-0 md:max-w-[150px]"
               errorMessage={
                 form.getFieldState(
@@ -62,9 +60,10 @@ export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = ({
                   form.formState,
                 ).error?.message
               }
+              isRequired
+              label="Percentage"
             >
               <BasisPointsInput
-                value={Number(form.watch("deployParams._platformFeeBps"))}
                 onChange={(value) =>
                   form.setValue(
                     "deployParams._platformFeeBps",
@@ -74,6 +73,7 @@ export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = ({
                     },
                   )
                 }
+                value={Number(form.watch("deployParams._platformFeeBps"))}
               />
             </FormFieldSetup>
           </>
@@ -82,10 +82,10 @@ export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = ({
             A 2.5% platform fee is deducted from each sale to support ongoing
             platform operations and improvements.{" "}
             <Link
-              target="_blank"
-              rel="noopener noreferrer"
               className="text-blue-500 underline"
               href={"https://thirdweb.com/pricing"}
+              rel="noopener noreferrer"
+              target="_blank"
             >
               See fee breakdown on pricing page.
             </Link>
@@ -95,10 +95,10 @@ export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = ({
             A 2.5% platform fee is deducted from each primary sale price to
             support ongoing platform operations and improvements.{" "}
             <Link
-              target="_blank"
-              rel="noopener noreferrer"
               className="text-blue-500 underline"
               href={"https://thirdweb.com/pricing"}
+              rel="noopener noreferrer"
+              target="_blank"
             >
               See fee breakdown on pricing page.
             </Link>
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/primary-sale-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/primary-sale-fieldset.tsx
index bd9a12c1b8a..d1902ffd310 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/primary-sale-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/primary-sale-fieldset.tsx
@@ -1,7 +1,7 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import type { UseFormRegisterReturn } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Fieldset } from "./common";
 
 interface PrimarySaleFieldsetProps {
@@ -17,15 +17,15 @@ export const PrimarySaleFieldset: React.FC<PrimarySaleFieldsetProps> = (
   return (
     <Fieldset legend="Primary Sales">
       <FormFieldSetup
-        label="Recipient Address"
         errorMessage={props.errorMessage}
-        isRequired
         helperText={
           <>
             The wallet address that should receive the revenue from initial
             sales of the assets.
           </>
         }
+        isRequired
+        label="Recipient Address"
       >
         <SolidityInput
           solidityType="address"
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/royalty-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/royalty-fieldset.tsx
index 13084954bce..f39d2dfa758 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/royalty-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/royalty-fieldset.tsx
@@ -1,8 +1,8 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { BasisPointsInput } from "components/inputs/BasisPointsInput";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import type { UseFormRegisterReturn } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Fieldset } from "./common";
 
 export function RoyaltyFieldset(props: {
@@ -31,8 +31,6 @@ export function RoyaltyFieldset(props: {
         <div className="flex flex-col gap-4 md:flex-row">
           <FormFieldSetup
             className="grow"
-            isRequired
-            label="Recipient Address"
             errorMessage={props.royaltyRecipient.errorMessage}
             helperText={
               <>
@@ -40,6 +38,8 @@ export function RoyaltyFieldset(props: {
                 royalties earned from secondary sales of the assets.
               </>
             }
+            isRequired
+            label="Recipient Address"
           >
             <SolidityInput
               solidityType="address"
@@ -49,23 +49,21 @@ export function RoyaltyFieldset(props: {
           </FormFieldSetup>
 
           <FormFieldSetup
-            isRequired
-            label="Percentage"
             className="shrink-0 md:max-w-[150px]"
             errorMessage={props.royaltyBps.errorMessage}
+            isRequired
+            label="Percentage"
           >
             <BasisPointsInput
-              value={Number.isNaN(bpsNumValue) ? 0 : bpsNumValue}
-              onChange={(value) => props.royaltyBps.setValue(value.toString())}
               defaultValue={0}
+              onChange={(value) => props.royaltyBps.setValue(value.toString())}
+              value={Number.isNaN(bpsNumValue) ? 0 : bpsNumValue}
             />
           </FormFieldSetup>
         </div>
 
         {props.transferValidator && (
           <FormFieldSetup
-            isRequired
-            label="Transfer Validator Address"
             errorMessage={props.transferValidator.errorMessage}
             helperText={
               <>
@@ -74,6 +72,8 @@ export function RoyaltyFieldset(props: {
                 disables this validation.
               </>
             }
+            isRequired
+            label="Transfer Validator Address"
           >
             <SolidityInput
               solidityType="address"
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/sequential-token-id-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/sequential-token-id-fieldset.tsx
index c511d25ed6c..c588ad0fec1 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/sequential-token-id-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/sequential-token-id-fieldset.tsx
@@ -1,8 +1,8 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { FormControl } from "@/components/ui/form";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import type { UseFormRegisterReturn } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { FormControl } from "@/components/ui/form";
 
 interface SequentialTokenIdFieldsetProps {
   isInvalid: boolean;
@@ -16,11 +16,11 @@ export const SequentialTokenIdFieldset: React.FC<
 > = (props) => {
   return (
     <FormFieldSetup
-      htmlFor="startTokenId"
-      label="Start Token ID"
-      isRequired={true}
       errorMessage={props.errorMessage}
       helperText="The starting token ID for the NFT collection."
+      htmlFor="startTokenId"
+      isRequired={true}
+      label="Start Token ID"
     >
       <FormControl>
         <SolidityInput
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/split-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/split-fieldset.tsx
index e1e07177743..980a415640f 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/split-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/split-fieldset.tsx
@@ -1,11 +1,11 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Alert, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
 import { BasisPointsInput } from "components/inputs/BasisPointsInput";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import { InfoIcon, PlusIcon, Trash2Icon } from "lucide-react";
 import { useFieldArray } from "react-hook-form";
 import { type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Alert, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
 import { Fieldset } from "./common";
 import type { CustomContractDeploymentForm } from "./custom-contract";
 
@@ -24,8 +24,8 @@ export const SplitFieldset: React.FC<SplitFieldsetProps> = ({
   client,
 }) => {
   const { fields, append, remove } = useFieldArray({
-    name: "recipients",
     control: form.control,
+    name: "recipients",
   });
 
   const totalShares =
@@ -39,57 +39,57 @@ export const SplitFieldset: React.FC<SplitFieldsetProps> = ({
         <div className="flex flex-col gap-5">
           {fields.map((field, index) => {
             return (
-              <div key={field.id} className="flex items-end gap-3">
+              <div className="flex items-end gap-3" key={field.id}>
                 <FormFieldSetup
                   className="grow"
-                  isRequired={false}
-                  label="Recipient Address"
                   errorMessage={
                     form.getFieldState(
                       `recipients.${index}.address`,
                       form.formState,
                     ).error?.message
                   }
+                  isRequired={false}
+                  label="Recipient Address"
                 >
                   <SolidityInput
                     client={client}
-                    solidityType="address"
                     formContext={form}
                     placeholder={ZERO_ADDRESS}
+                    solidityType="address"
                     {...form.register(`recipients.${index}.address`)}
                   />
                 </FormFieldSetup>
 
                 {/*  */}
                 <FormFieldSetup
-                  label="Percentage"
                   className="max-w-[160px]"
-                  isRequired={false}
                   errorMessage={
                     form.getFieldState(
                       `recipients.${index}.sharesBps`,
                       form.formState,
                     ).error?.message
                   }
+                  isRequired={false}
+                  label="Percentage"
                 >
                   <BasisPointsInput
-                    value={form.watch(`recipients.${index}.sharesBps`)}
                     onChange={(value) =>
                       form.setValue(`recipients.${index}.sharesBps`, value, {
+                        shouldDirty: true,
                         shouldTouch: true,
                         shouldValidate: true,
-                        shouldDirty: true,
                       })
                     }
+                    value={form.watch(`recipients.${index}.sharesBps`)}
                   />
                 </FormFieldSetup>
 
                 <Button
-                  variant="outline"
+                  aria-label="remove row"
                   className="px-3 text-destructive-text"
                   disabled={fields.length === 1 || form.formState.isSubmitting}
-                  aria-label="remove row"
                   onClick={() => remove(index)}
+                  variant="outline"
                 >
                   <Trash2Icon className="size-4" />
                 </Button>
@@ -102,9 +102,9 @@ export const SplitFieldset: React.FC<SplitFieldsetProps> = ({
         <div>
           <Button
             className="gap-2"
-            variant="outline"
-            size="sm"
             onClick={() => append({ address: "", sharesBps: 0 })}
+            size="sm"
+            variant="outline"
           >
             <PlusIcon className="size-4" />
             Add Recipient
@@ -113,8 +113,8 @@ export const SplitFieldset: React.FC<SplitFieldsetProps> = ({
 
         {totalShares !== 10000 && (
           <Alert
-            variant="destructive"
             className="flex h-auto items-center gap-2"
+            variant="destructive"
           >
             <InfoIcon className="!text-destructive-text !static size-5 shrink-0" />
             <AlertTitle className="!m-0 !p-0 !text-destructive-text">
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/trusted-forwarders-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/trusted-forwarders-fieldset.tsx
index efa7d6e3a15..aa190d39ec2 100644
--- a/apps/dashboard/src/components/contract-components/contract-deploy-form/trusted-forwarders-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-deploy-form/trusted-forwarders-fieldset.tsx
@@ -1,6 +1,6 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Fieldset } from "./common";
 import type {
   CustomContractDeploymentForm,
@@ -25,8 +25,6 @@ export const TrustedForwardersFieldset: React.FC<
       {!isDynamicValue(value) && (
         <Fieldset legend="Gasless">
           <FormFieldSetup
-            isRequired
-            label="Trusted Forwarders"
             errorMessage={
               form.getFieldState(
                 "deployParams._trustedForwarders",
@@ -45,11 +43,13 @@ export const TrustedForwardersFieldset: React.FC<
                 </span>
               </>
             }
+            isRequired
+            label="Trusted Forwarders"
           >
             <SolidityInput
               client={client}
-              value={value}
               solidityType="address[]"
+              value={value}
               {...form.register("deployParams._trustedForwarders")}
             />
           </FormFieldSetup>
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/abi-selector.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/abi-selector.tsx
index 7f932366ab9..8361fdecfec 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/abi-selector.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/abi-selector.tsx
@@ -28,21 +28,21 @@ export const AbiSelector: React.FC<AbiSelectorProps> = ({
   return (
     <div className="flex w-full flex-row items-center gap-2">
       <Select
-        placeholder="Select function"
-        options={options}
-        defaultValue={options.find((o) => o.value === defaultValue)}
         chakraStyles={{
           container: (provided) => ({
             ...provided,
             width: "full",
           }),
         }}
-        value={options.find((o) => o.value === value)}
+        defaultValue={options.find((o) => o.value === defaultValue)}
         onChange={(selectedFn) => {
           if (selectedFn) {
             onChange((selectedFn as { label: string; value: string }).value);
           }
         }}
+        options={options}
+        placeholder="Select function"
+        value={options.find((o) => o.value === value)}
       />
     </div>
   );
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/contract-params-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/contract-params-fieldset.tsx
index 7cd335610aa..29c187c0f6a 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/contract-params-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/contract-params-fieldset.tsx
@@ -1,18 +1,18 @@
-import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
-import { InlineCode } from "@/components/ui/inline-code";
-import { Input } from "@/components/ui/input";
-import { Separator } from "@/components/ui/separator";
-import { Switch } from "@/components/ui/switch";
-import { Textarea } from "@/components/ui/textarea";
 import { FormControl, useBreakpointValue } from "@chakra-ui/react";
 import type { AbiParameter } from "abitype";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import { camelToTitle } from "contract-ui/components/solidity-inputs/helpers";
 import { getTemplateValuesForType } from "lib/deployment/template-values";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { useFormContext } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { InlineCode } from "@/components/ui/inline-code";
+import { Input } from "@/components/ui/input";
+import { Separator } from "@/components/ui/separator";
+import { Switch } from "@/components/ui/switch";
+import { Textarea } from "@/components/ui/textarea";
 import { DecodedInputArrayFieldset } from "./decoded-bytes-input/decoded-input-array-fieldset";
 import { RefInputFieldset } from "./ref-contract-input/ref-input-fieldset";
 
@@ -26,7 +26,8 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
 }) => {
   const form = useFormContext();
   const isMobile = useBreakpointValue({ base: true, md: false });
-
+  const displayNameId = useId();
+  const descriptionId = useId();
   const [isCustomInputEnabledArray, setIsCustomInputEnabledArray] = useState(
     Array(deployParams.length).fill(false),
   );
@@ -84,8 +85,8 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
           const paramTemplateValues = getTemplateValuesForType(param.type);
           return (
             <div
-              key={`implementation_${param.name}`}
               className="rounded-lg border border-border bg-card p-6"
+              key={`implementation_${param.name}`}
             >
               {/* Title + Type */}
               <div className="flex items-center gap-3">
@@ -108,9 +109,6 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
 
               {/* Display Name */}
               <FormFieldSetup
-                htmlFor="display-name"
-                isRequired={false}
-                label="Display Name"
                 errorMessage={
                   form.getFieldState(
                     `constructorParams.${
@@ -119,14 +117,12 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                     form.formState,
                   ).error?.message
                 }
+                htmlFor={displayNameId}
+                isRequired={false}
+                label="Display Name"
               >
                 <Input
-                  id="display-name"
-                  value={form.watch(
-                    `constructorParams.${
-                      param.name ? param.name : "*"
-                    }.displayName`,
-                  )}
+                  id={displayNameId}
                   onChange={(e) =>
                     form.setValue(
                       `constructorParams.${
@@ -136,6 +132,11 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                     )
                   }
                   placeholder={camelToTitle(param.name ? param.name : "*")}
+                  value={form.watch(
+                    `constructorParams.${
+                      param.name ? param.name : "*"
+                    }.displayName`,
+                  )}
                 />
               </FormFieldSetup>
 
@@ -143,8 +144,6 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
 
               {/* Description */}
               <FormFieldSetup
-                isRequired={false}
-                label="Description"
                 errorMessage={
                   form.getFieldState(
                     `constructorParams.${
@@ -153,7 +152,6 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                     form.formState,
                   ).error?.message
                 }
-                htmlFor="description"
                 helperText={
                   <>
                     {form.watch(
@@ -164,14 +162,14 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                     /400 characters
                   </>
                 }
+                htmlFor={descriptionId}
+                isRequired={false}
+                label="Description"
               >
                 <Textarea
-                  id="description"
-                  value={form.watch(
-                    `constructorParams.${
-                      param.name ? param.name : "*"
-                    }.description`,
-                  )}
+                  className="h-full"
+                  id={descriptionId}
+                  maxLength={400}
                   onChange={(e) =>
                     form.setValue(
                       `constructorParams.${
@@ -180,9 +178,12 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                       e.target.value,
                     )
                   }
-                  className="h-full"
-                  maxLength={400}
                   placeholder="Enter a description for this parameter."
+                  value={form.watch(
+                    `constructorParams.${
+                      param.name ? param.name : "*"
+                    }.description`,
+                  )}
                 />
               </FormFieldSetup>
 
@@ -218,9 +219,8 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                 {!isCustomInputEnabledArray[idx] ? (
                   <FormControl>
                     <SolidityInput
-                      client={client}
                       className="!bg-background !text-sm placeholder:!text-sm"
-                      solidityType={param.type}
+                      client={client}
                       placeholder={
                         isMobile ||
                         paramTemplateValues?.[0]?.value ===
@@ -228,6 +228,7 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                           ? "Pre-filled value."
                           : "This value will be pre-filled in the deploy form."
                       }
+                      solidityType={param.type}
                       {...form.register(
                         `constructorParams.${
                           param.name ? param.name : "*"
@@ -236,9 +237,9 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                     />
                   </FormControl>
                 ) : param.type === "address" || param.type === "address[]" ? (
-                  <RefInputFieldset param={param} client={client} />
+                  <RefInputFieldset client={client} param={param} />
                 ) : (
-                  <DecodedInputArrayFieldset param={param} client={client} />
+                  <DecodedInputArrayFieldset client={client} param={param} />
                 )}
 
                 {/* Checkboxes */}
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/custom-factory.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/custom-factory.tsx
index e27872d08d5..3c7fe4aaa61 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/custom-factory.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/custom-factory.tsx
@@ -1,4 +1,3 @@
-import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import {
   Box,
   Flex,
@@ -14,6 +13,7 @@ import { type Dispatch, type SetStateAction, useEffect } from "react";
 import { Controller, useFieldArray, useFormContext } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
 import { Button, Heading, Text } from "tw-components";
+import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { useCustomFactoryAbi } from "../hooks";
 import { AbiSelector } from "./abi-selector";
 
@@ -43,8 +43,8 @@ export const CustomFactory: React.FC<CustomFactoryProps> = ({
   }, [customFactoryAbi, setCustomFactoryAbi]);
 
   const { fields, append, remove } = useFieldArray({
-    name: "customFactoryAddresses",
     control: form.control,
+    name: "customFactoryAddresses",
   });
 
   // FIXME: all of this logic needs to be reworked
@@ -56,7 +56,7 @@ export const CustomFactory: React.FC<CustomFactoryProps> = ({
   }, [fields, append]);
 
   return (
-    <Flex px={0} pb={0} flexDir="column" gap={12}>
+    <Flex flexDir="column" gap={12} pb={0} px={0}>
       <UnorderedList>
         <Text as={ListItem}>
           Use this if you want to invoke your own function with custom logic
@@ -77,16 +77,16 @@ export const CustomFactory: React.FC<CustomFactoryProps> = ({
         </Flex>
         {fields.map((field, index) => (
           <div key={field.id}>
-            <FormControl isRequired as={Flex} gap={4}>
+            <FormControl as={Flex} gap={4} isRequired>
               <Box w={{ base: "full", md: "40%" }}>
                 <Controller
-                  name={`customFactoryAddresses[${index}].key`}
                   control={form.control}
+                  name={`customFactoryAddresses[${index}].key`}
                   render={({ field: _field }) => {
                     return (
                       <SingleNetworkSelector
-                        client={client}
                         chainId={_field.value}
+                        client={client}
                         onChange={(value) => {
                           _field.onChange(value);
                         }}
@@ -103,9 +103,9 @@ export const CustomFactory: React.FC<CustomFactoryProps> = ({
                 />
               </Box>
               <IconButton
-                isDisabled={fields.length === 1 || form.formState.isSubmitting}
-                icon={<TrashIcon className="size-5" />}
                 aria-label="Remove row"
+                icon={<TrashIcon className="size-5" />}
+                isDisabled={fields.length === 1 || form.formState.isSubmitting}
                 onClick={() => remove(index)}
               />
             </FormControl>
@@ -113,12 +113,12 @@ export const CustomFactory: React.FC<CustomFactoryProps> = ({
         ))}
         <div>
           <Button
-            type="button"
-            size="sm"
-            colorScheme="primary"
             borderRadius="md"
+            colorScheme="primary"
             leftIcon={<PlusIcon className="size-5" />}
             onClick={() => append({ key: "", value: "" })}
+            size="sm"
+            type="button"
           >
             Add Network
           </Button>
@@ -132,17 +132,17 @@ export const CustomFactory: React.FC<CustomFactoryProps> = ({
         <FormControl isRequired>
           {customFactoryAbi?.data ? (
             <AbiSelector
-              defaultValue="deployProxyByImplementation"
               abi={customFactoryAbi.data}
-              value={form.watch(
-                "factoryDeploymentData.customFactoryInput.factoryFunction",
-              )}
+              defaultValue="deployProxyByImplementation"
               onChange={(selectedFn) =>
                 form.setValue(
                   "factoryDeploymentData.customFactoryInput.factoryFunction",
                   selectedFn,
                 )
               }
+              value={form.watch(
+                "factoryDeploymentData.customFactoryInput.factoryFunction",
+              )}
             />
           ) : (
             <Text fontStyle="italic">
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input-array-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input-array-fieldset.tsx
index 61ab045d43d..ad0e725ee76 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input-array-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input-array-fieldset.tsx
@@ -1,3 +1,7 @@
+import type { AbiParameter } from "abitype";
+import { PlusIcon, TrashIcon } from "lucide-react";
+import { useFieldArray, useFormContext } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import {
   Accordion,
   AccordionContent,
@@ -7,10 +11,6 @@ import {
 import { Button } from "@/components/ui/button";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import type { AbiParameter } from "abitype";
-import { PlusIcon, TrashIcon } from "lucide-react";
-import { useFieldArray, useFormContext } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import { DecodedInputSet } from "./decoded-input-set";
 
 interface DecodedInputArrayFieldsetProps {
@@ -24,34 +24,31 @@ export const DecodedInputArrayFieldset: React.FC<
   const form = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
-    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode`,
     control: form.control,
+    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode`,
   });
 
   return (
     <fieldset>
       <div className={cn(fields.length > 0 && "border-border border-b")}>
         {fields.map((item, index) => (
-          <Accordion type="single" collapsible className="-mx-1" key={item.id}>
-            <AccordionItem value="metadata" className="border-none">
+          <Accordion className="-mx-1" collapsible key={item.id} type="single">
+            <AccordionItem className="border-none" value="metadata">
               <AccordionTrigger className="gap-3 border-border border-t px-1">
                 <div className="flex grow items-center justify-between gap-4">
                   Parameter set {index + 1}
                   <ToolTipLabel label="Remove parameter set">
                     <Button
-                      asChild
-                      size="sm"
-                      className="!text-destructive-text h-auto w-auto p-2"
-                      variant="ghost"
+                      className="!text-destructive-text"
                       onClick={(e) => {
                         e.preventDefault();
                         e.stopPropagation();
                         remove(index);
                       }}
+                      size="icon"
+                      variant="ghost"
                     >
-                      <div role="button" tabIndex={0}>
-                        <TrashIcon className="size-4" />
-                      </div>
+                      <TrashIcon className="size-4" />
                     </Button>
                   </ToolTipLabel>
                 </div>
@@ -59,9 +56,9 @@ export const DecodedInputArrayFieldset: React.FC<
               <AccordionContent className="px-1 pb-6">
                 <div className="rounded-lg border border-border px-6 pt-1 pb-6">
                   <DecodedInputSet
-                    setIndex={index}
-                    param={param}
                     client={client}
+                    param={param}
+                    setIndex={index}
                   />
                 </div>
               </AccordionContent>
@@ -72,18 +69,18 @@ export const DecodedInputArrayFieldset: React.FC<
 
       <div className="mt-6 flex justify-start">
         <Button
-          type="button"
-          size="sm"
           className="gap-2 bg-background"
-          variant="outline"
           disabled={param.type === "bytes" && fields.length >= 1}
           onClick={() =>
             append({
               contractId: "",
-              version: "",
               publisherAddress: "",
+              version: "",
             })
           }
+          size="sm"
+          type="button"
+          variant="outline"
         >
           <PlusIcon className="size-4" />
           Add parameter set
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input-set.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input-set.tsx
index 434974329d8..ad69236c266 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input-set.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input-set.tsx
@@ -1,3 +1,7 @@
+import type { AbiParameter } from "abitype";
+import { PlusIcon, TrashIcon } from "lucide-react";
+import { useFieldArray, useFormContext } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import {
   Accordion,
   AccordionContent,
@@ -6,10 +10,6 @@ import {
 } from "@/components/ui/accordion";
 import { Button } from "@/components/ui/button";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import type { AbiParameter } from "abitype";
-import { PlusIcon, TrashIcon } from "lucide-react";
-import { useFieldArray, useFormContext } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import { DecodedInput } from "./decoded-input";
 
 interface DecodedInputSetProps {
@@ -26,15 +26,15 @@ export const DecodedInputSet: React.FC<DecodedInputSetProps> = ({
   const form = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
-    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}`,
     control: form.control,
+    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}`,
   });
 
   return (
     <fieldset>
       {fields.map((item, index) => (
-        <Accordion type="single" collapsible className="-mx-1" key={item.id}>
-          <AccordionItem value="metadata" className="border-border border-b">
+        <Accordion className="-mx-1" collapsible key={item.id} type="single">
+          <AccordionItem className="border-border border-b" value="metadata">
             <AccordionTrigger className="gap-3 border-0 px-1 ">
               <div className="flex grow items-center justify-between gap-4">
                 <span className="font-medium text-sm">
@@ -42,30 +42,27 @@ export const DecodedInputSet: React.FC<DecodedInputSetProps> = ({
                 </span>
                 <ToolTipLabel label="Remove Parameter">
                   <Button
-                    asChild
-                    size="sm"
-                    className="!text-destructive-text h-auto w-auto p-2"
-                    variant="ghost"
+                    className="!text-destructive-text"
                     onClick={(e) => {
                       e.preventDefault();
                       e.stopPropagation();
                       remove(index);
                     }}
+                    size="icon"
+                    variant="ghost"
                   >
-                    <div role="button" tabIndex={0}>
-                      <TrashIcon className="size-4" />
-                    </div>
+                    <TrashIcon className="size-4" />
                   </Button>
                 </ToolTipLabel>
               </div>
             </AccordionTrigger>
             <AccordionContent className="px-1 pb-6">
               <DecodedInput
+                client={client}
                 key={item.id}
+                param={param}
                 paramIndex={index}
                 setIndex={setIndex}
-                param={param}
-                client={client}
               />
             </AccordionContent>
           </AccordionItem>
@@ -74,17 +71,17 @@ export const DecodedInputSet: React.FC<DecodedInputSetProps> = ({
 
       <div className="mt-6 flex justify-start">
         <Button
-          type="button"
-          size="sm"
           className="gap-2"
-          variant="outline"
           disabled={param.type === "bytes" && fields.length >= 1}
           onClick={() =>
             append({
-              type: "",
               defaultValue: "",
+              type: "",
             })
           }
+          size="sm"
+          type="button"
+          variant="outline"
         >
           <PlusIcon className="size-4" />
           Add Parameter
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input.tsx
index eb74bc1ea65..06f54f32ff5 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/decoded-input.tsx
@@ -1,3 +1,7 @@
+import type { AbiParameter } from "abitype";
+import { useState } from "react";
+import { useFormContext } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Input } from "@/components/ui/input";
 import {
@@ -8,10 +12,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
-import type { AbiParameter } from "abitype";
-import { useState } from "react";
-import { useFormContext } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import { RefBytesInputFieldset } from "./ref-bytes-input-fieldset";
 
 interface DecodedInputProps {
@@ -57,14 +57,14 @@ export const DecodedInput: React.FC<DecodedInputProps> = ({
     <div className={className}>
       {/* Type */}
       <FormFieldSetup
-        isRequired={true}
-        label="Parameter Type"
         errorMessage={
           form.getFieldState(
             `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}.${paramIndex}.type`,
             form.formState,
           ).error?.message
         }
+        isRequired={true}
+        label="Parameter Type"
       >
         <Select
           {...form.register(
@@ -111,10 +111,10 @@ export const DecodedInput: React.FC<DecodedInputProps> = ({
       <div>
         {isCustomAddress ? (
           <RefBytesInputFieldset
+            client={client}
             param={param}
-            setIndex={setIndex}
             paramIndex={paramIndex}
-            client={client}
+            setIndex={setIndex}
           />
         ) : (
           <Input
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/ref-bytes-input-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/ref-bytes-input-fieldset.tsx
index a5f8ec5f191..65debc47af3 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/ref-bytes-input-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/ref-bytes-input-fieldset.tsx
@@ -1,8 +1,8 @@
-import { Button } from "@/components/ui/button";
 import type { AbiParameter } from "abitype";
 import { PlusIcon } from "lucide-react";
 import { useFieldArray, useFormContext } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { Button } from "@/components/ui/button";
 import { RefBytesContractInput } from "./ref-bytes-input";
 
 interface RefBytesInputFieldsetProps {
@@ -21,39 +21,39 @@ export const RefBytesInputFieldset: React.FC<RefBytesInputFieldsetProps> = ({
   const form = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
-    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}.${paramIndex}.dynamicValue.refContracts`,
     control: form.control,
+    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}.${paramIndex}.dynamicValue.refContracts`,
   });
 
   return (
     <div className="flex flex-col gap-5">
       {fields.map((item, index) => (
         <RefBytesContractInput
-          key={item.id}
-          remove={remove}
+          className="border-border border-b pb-6"
+          client={client}
           index={index}
+          key={item.id}
           param={param}
           paramIndex={paramIndex}
+          remove={remove}
           setIndex={setIndex}
-          className="border-border border-b pb-6"
-          client={client}
         />
       ))}
 
       <div>
         <Button
-          type="button"
-          size="sm"
-          variant="outline"
           className="gap-2"
           onClick={() =>
             append({
               contractId: "",
-              version: "",
               publisherAddress: "",
               salt: "",
+              version: "",
             })
           }
+          size="sm"
+          type="button"
+          variant="outline"
         >
           <PlusIcon className="size-4" />
           Add Reference
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/ref-bytes-input.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/ref-bytes-input.tsx
index 12c3bae0ebe..a5ba65d3cd3 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/ref-bytes-input.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/decoded-bytes-input/ref-bytes-input.tsx
@@ -1,3 +1,7 @@
+import type { AbiParameter } from "abitype";
+import { TrashIcon } from "lucide-react";
+import { useFormContext } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -10,10 +14,6 @@ import {
 } from "@/components/ui/select";
 import { SkeletonContainer } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
-import type { AbiParameter } from "abitype";
-import { TrashIcon } from "lucide-react";
-import { useFormContext } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import { useAllVersions, usePublishedContractsQuery } from "../../hooks";
 
 interface RefBytesContractInputProps {
@@ -38,10 +38,10 @@ export const RefBytesContractInput: React.FC<RefBytesContractInputProps> = ({
   const form = useFormContext();
 
   const publishedContractsQuery = usePublishedContractsQuery({
-    client,
     address: form.watch(
       `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}.${paramIndex}.dynamicValue.refContracts.${index}.publisherAddress`,
     ),
+    client,
   });
 
   const allVersions = useAllVersions(
@@ -58,18 +58,18 @@ export const RefBytesContractInput: React.FC<RefBytesContractInputProps> = ({
     <div className={cn("flex flex-col items-end gap-4 lg:flex-row", className)}>
       <div className="grid grow grid-cols-1 gap-4 lg:grid-cols-4">
         <FormFieldSetup
-          label="Publisher"
-          isRequired={true}
           errorMessage={
             form.getFieldState(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}.${paramIndex}.dynamicValue.refContracts.${index}.publisherAddress`,
               form.formState,
             ).error?.message
           }
+          isRequired={true}
+          label="Publisher"
         >
           <Input
-            placeholder="Address or ENS"
             className="truncate"
+            placeholder="Address or ENS"
             {...form.register(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}.${paramIndex}.dynamicValue.refContracts.${index}.publisherAddress`,
             )}
@@ -77,19 +77,18 @@ export const RefBytesContractInput: React.FC<RefBytesContractInputProps> = ({
         </FormFieldSetup>
 
         <FormFieldSetup
-          label="Contract Name"
-          isRequired={true}
           errorMessage={
             form.getFieldState(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.contractId`,
               form.formState,
             ).error?.message
           }
+          isRequired={true}
+          label="Contract Name"
         >
           <SkeletonContainer
             className="block"
             loadedData={!publishedContractsQuery.isFetching ? true : undefined}
-            skeletonData={false}
             render={() => {
               return (
                 <Select
@@ -124,23 +123,23 @@ export const RefBytesContractInput: React.FC<RefBytesContractInputProps> = ({
                 </Select>
               );
             }}
+            skeletonData={false}
           />
         </FormFieldSetup>
 
         <FormFieldSetup
-          label="Contract Version"
-          isRequired={false}
           errorMessage={
             form.getFieldState(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.version`,
               form.formState,
             ).error?.message
           }
+          isRequired={false}
+          label="Contract Version"
         >
           <SkeletonContainer
             className="block"
             loadedData={!allVersions.isFetching ? true : undefined}
-            skeletonData={false}
             render={() => {
               return (
                 <Select
@@ -173,18 +172,19 @@ export const RefBytesContractInput: React.FC<RefBytesContractInputProps> = ({
                 </Select>
               );
             }}
+            skeletonData={false}
           />
         </FormFieldSetup>
 
         <FormFieldSetup
-          isRequired={false}
-          label="Salt"
           errorMessage={
             form.getFieldState(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.paramsToEncode.${setIndex}.${paramIndex}.dynamicValue.refContracts.${index}.salt`,
               form.formState,
             ).error?.message
           }
+          isRequired={false}
+          label="Salt"
         >
           <Input
             className="truncate"
@@ -198,9 +198,9 @@ export const RefBytesContractInput: React.FC<RefBytesContractInputProps> = ({
 
       <Button
         aria-label="Remove"
+        className="self-end text-destructive-text"
         onClick={() => remove(index)}
         variant="outline"
-        className="self-end text-destructive-text"
       >
         <TrashIcon className="size-4" />
       </Button>
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/default-factory.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/default-factory.tsx
index cb5075ce8d3..9de39df1c2f 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/default-factory.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/default-factory.tsx
@@ -18,7 +18,7 @@ export const DefaultFactory: React.FC<DefaultFactoryProps> = ({
   const form = useFormContext();
 
   return (
-    <Flex px={0} pb={0} flexDir="column" gap={12}>
+    <Flex flexDir="column" gap={12} pb={0} px={0}>
       <UnorderedList>
         <Text as={ListItem}>
           Default factory lets users deploy your contract to{" "}
@@ -32,8 +32,8 @@ export const DefaultFactory: React.FC<DefaultFactoryProps> = ({
           The factory is{" "}
           <Link
             color="primary.500"
-            isExternal
             href="https://github.com/thirdweb-dev/contracts/blob/main/contracts/TWStatelessFactory.sol"
+            isExternal
           >
             open-source
           </Link>
@@ -53,17 +53,17 @@ export const DefaultFactory: React.FC<DefaultFactoryProps> = ({
         </Flex>
         <FormControl isRequired>
           <AbiSelector
-            defaultValue="initialize"
             abi={abi}
-            value={form.watch(
-              "factoryDeploymentData.implementationInitializerFunction",
-            )}
+            defaultValue="initialize"
             onChange={(selectedFn) =>
               form.setValue(
                 "factoryDeploymentData.implementationInitializerFunction",
                 selectedFn,
               )
             }
+            value={form.watch(
+              "factoryDeploymentData.implementationInitializerFunction",
+            )}
           />
         </FormControl>
       </Flex>
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/external-links-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/external-links-fieldset.tsx
index 8d3df4685ba..5aa04019775 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/external-links-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/external-links-fieldset.tsx
@@ -1,15 +1,15 @@
-import { Button } from "@/components/ui/button";
 import { PlusIcon } from "lucide-react";
 import { useEffect } from "react";
 import { useFieldArray, useFormContext } from "react-hook-form";
+import { Button } from "@/components/ui/button";
 import { ExternalLinksInput } from "./external-links-input";
 
 export const ExternalLinksFieldset = () => {
   const form = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
-    name: "externalLinks",
     control: form.control,
+    name: "externalLinks",
   });
 
   // FIXME: all of this logic needs to be reworked
@@ -36,13 +36,10 @@ export const ExternalLinksFieldset = () => {
       </div>
       <div className="flex flex-col gap-4">
         {fields.map((item, index) => (
-          <ExternalLinksInput key={item.id} remove={remove} index={index} />
+          <ExternalLinksInput index={index} key={item.id} remove={remove} />
         ))}
         <div>
           <Button
-            type="button"
-            size="sm"
-            variant="outline"
             className="gap-2"
             onClick={() =>
               append({
@@ -50,6 +47,9 @@ export const ExternalLinksFieldset = () => {
                 url: "",
               })
             }
+            size="sm"
+            type="button"
+            variant="outline"
           >
             <PlusIcon className="size-5" />
             Add Resource
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/external-links-input.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/external-links-input.tsx
index 1bed8c27734..0c5241653e2 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/external-links-input.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/external-links-input.tsx
@@ -1,9 +1,9 @@
+import { TrashIcon } from "lucide-react";
+import { useFormContext } from "react-hook-form";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Separator } from "@/components/ui/separator";
-import { TrashIcon } from "lucide-react";
-import { useFormContext } from "react-hook-form";
 
 interface ExternalLinksInputProps {
   index: number;
@@ -20,7 +20,7 @@ export const ExternalLinksInput: React.FC<ExternalLinksInputProps> = ({
     <div className="flex flex-col gap-2">
       <div className="flex w-full flex-col gap-4 md:flex-row md:gap-2">
         <div className="flex flex-1 flex-col gap-1">
-          <Label htmlFor={`externalLinks.${index}.name`} className="capitalize">
+          <Label className="capitalize" htmlFor={`externalLinks.${index}.name`}>
             Resource Name
           </Label>
           <Input
@@ -41,7 +41,7 @@ export const ExternalLinksInput: React.FC<ExternalLinksInputProps> = ({
           )}
         </div>
         <div className="flex flex-1 flex-col gap-1">
-          <Label htmlFor={`externalLinks.${index}.url`} className="capitalize">
+          <Label className="capitalize" htmlFor={`externalLinks.${index}.url`}>
             Link
           </Label>
           <Input
@@ -68,11 +68,11 @@ export const ExternalLinksInput: React.FC<ExternalLinksInputProps> = ({
           )}
         </div>
         <Button
-          variant="ghost"
-          size="icon"
           aria-label="Remove row"
-          onClick={() => remove(index)}
           className="self-end"
+          onClick={() => remove(index)}
+          size="icon"
+          variant="ghost"
         >
           <TrashIcon className="size-5" />
           <span className="sr-only">Remove row</span>
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/factory-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/factory-fieldset.tsx
index 78f483d157b..dde9caaf7c3 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/factory-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/factory-fieldset.tsx
@@ -21,31 +21,31 @@ export const FactoryFieldset: React.FC<FactoryFieldsetProps> = ({
   const form = useFormContext();
 
   return (
-    <Flex gap={12} direction="column" as="fieldset">
-      <Flex gap={6} direction="column">
+    <Flex as="fieldset" direction="column" gap={12}>
+      <Flex direction="column" gap={6}>
         <Heading size="title.lg">Factory deploy settings</Heading>
-        <ButtonGroup size="sm" variant="ghost" spacing={{ base: 0.5, md: 2 }}>
+        <ButtonGroup size="sm" spacing={{ base: 0.5, md: 2 }} variant="ghost">
           <Button
-            type="button"
-            isActive={form.watch("deployType") === "autoFactory"}
             _active={{
               bg: "bgBlack",
               color: "bgWhite",
             }}
-            rounded="lg"
+            isActive={form.watch("deployType") === "autoFactory"}
             onClick={() => form.setValue("deployType", "autoFactory")}
+            rounded="lg"
+            type="button"
           >
             Default Factory
           </Button>
           <Button
-            type="button"
-            isActive={form.watch("deployType") === "customFactory"}
             _active={{
               bg: "bgBlack",
               color: "bgWhite",
             }}
-            rounded="lg"
+            isActive={form.watch("deployType") === "customFactory"}
             onClick={() => form.setValue("deployType", "customFactory")}
+            rounded="lg"
+            type="button"
           >
             Custom Factory (Advanced)
           </Button>
@@ -55,8 +55,8 @@ export const FactoryFieldset: React.FC<FactoryFieldsetProps> = ({
         )}
         {form.watch("deployType") === "customFactory" && (
           <CustomFactory
-            setCustomFactoryAbi={setCustomFactoryAbi}
             client={client}
+            setCustomFactoryAbi={setCustomFactoryAbi}
           />
         )}
       </Flex>
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/impl-params-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/impl-params-fieldset.tsx
index 49f7ac51c0c..6c8a8b345ec 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/impl-params-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/impl-params-fieldset.tsx
@@ -1,6 +1,3 @@
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
-import { InlineCode } from "@/components/ui/inline-code";
-import { Switch } from "@/components/ui/switch";
 import { FormControl, useBreakpointValue } from "@chakra-ui/react";
 import type { AbiParameter } from "abitype";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
@@ -8,6 +5,9 @@ import { getTemplateValuesForType } from "lib/deployment/template-values";
 import { useState } from "react";
 import { useFormContext } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { InlineCode } from "@/components/ui/inline-code";
+import { Switch } from "@/components/ui/switch";
 import { RefInputImplFieldset } from "./ref-contract-impl-input/ref-input-impl-fieldset";
 
 interface ImplementationParamsFieldsetProps {
@@ -75,8 +75,8 @@ export const ImplementationParamsFieldset: React.FC<
           const paramTemplateValues = getTemplateValuesForType(param.type);
           return (
             <div
-              key={`implementation_${param.name}`}
               className="rounded-lg border border-border bg-card p-6"
+              key={`implementation_${param.name}`}
             >
               {/* Title + Type */}
               <div className="flex items-center gap-3">
@@ -121,9 +121,8 @@ export const ImplementationParamsFieldset: React.FC<
                 {!isCustomInputEnabled[idx] ? (
                   <FormControl>
                     <SolidityInput
-                      client={client}
                       className="!bg-background !text-sm placeholder:!text-sm"
-                      solidityType={param.type}
+                      client={client}
                       placeholder={
                         isMobile ||
                         paramTemplateValues?.[0]?.value ===
@@ -131,6 +130,7 @@ export const ImplementationParamsFieldset: React.FC<
                           ? "Pre-filled value."
                           : "This value will be pre-filled in the deploy form."
                       }
+                      solidityType={param.type}
                       {...form.register(
                         `implConstructorParams.${
                           param.name ? param.name : "*"
@@ -139,7 +139,7 @@ export const ImplementationParamsFieldset: React.FC<
                     />
                   </FormControl>
                 ) : (
-                  <RefInputImplFieldset param={param} client={client} />
+                  <RefInputImplFieldset client={client} param={param} />
                 )}
 
                 {paramTemplateValues.length > 0 &&
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/index.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/index.tsx
index ca9f68dde72..21d56b35c94 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/index.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/index.tsx
@@ -1,7 +1,4 @@
 "use client";
-import { reportContractPublished } from "@/analytics/report";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 import { CustomConnectWallet } from "@3rdweb-sdk/react/components/connect-wallet";
 import { Box, Divider, Flex, IconButton } from "@chakra-ui/react";
 import type { Abi } from "abitype";
@@ -11,7 +8,7 @@ import {
 } from "constants/misc";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { ChevronFirstIcon } from "lucide-react";
-import { useMemo, useState } from "react";
+import { useId, useMemo, useState } from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
 import type { FetchDeployMetadataResult } from "thirdweb/contract";
@@ -21,6 +18,9 @@ import {
 } from "thirdweb/extensions/thirdweb";
 import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
 import { Button, Text } from "tw-components";
+import { reportContractPublished } from "@/analytics/report";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 import { useEns, useFunctionParamsFromABI } from "../hooks";
 import { ContractParamsFieldset } from "./contract-params-fieldset";
 import { FactoryFieldset } from "./factory-fieldset";
@@ -49,8 +49,8 @@ export function ContractPublishForm(props: {
     gasless: {
       experimentalChainlessSupport: true,
       provider: "engine",
-      relayerUrl: DASHBOARD_ENGINE_RELAYER_URL,
       relayerForwarderAddress: DASHBOARD_FORWARDER_ADDRESS,
+      relayerUrl: DASHBOARD_ENGINE_RELAYER_URL,
     },
   });
 
@@ -67,49 +67,49 @@ export function ContractPublishForm(props: {
   const transformedQueryData = useMemo(() => {
     return {
       ...props.publishMetadata,
-      name: props.publishMetadata.name || "",
       changelog: "",
-      version: placeholderVersion,
+      constructorParams: props.publishMetadata.constructorParams || {},
+      customFactoryAddresses: Object.entries(
+        props.publishMetadata.factoryDeploymentData?.customFactoryInput
+          ?.customFactoryAddresses || {},
+      ).map(([key, value]) => ({ key: Number(key), value })),
+      defaultExtensions: props.publishMetadata.defaultExtensions || [],
+      defaultModules: props.publishMetadata.defaultModules || [],
+      deployType: props.publishMetadata.deployType || "standard",
+      description:
+        props.publishMetadata.description ||
+        props.publishMetadata.info?.notice ||
+        "",
       displayName:
         props.publishMetadata.displayName ||
         props.publishMetadata.info?.title ||
         props.publishMetadata.name ||
         "",
-      description:
-        props.publishMetadata.description ||
-        props.publishMetadata.info?.notice ||
-        "",
+      extensionsParamName:
+        props.publishMetadata.factoryDeploymentData?.modularFactoryInput
+          ?.hooksParamName || "",
       factoryDeploymentData: props.publishMetadata?.factoryDeploymentData || {
-        factoryAddresses: {},
-        implementationAddresses: {},
-        implementationInitializerFunction: "initialize",
         customFactoryInput: {
-          factoryFunction:
-            props.publishMetadata.factoryDeploymentData?.customFactoryInput
-              ?.factoryFunction || "deployProxyByImplementation",
           customFactoryAddresses:
             props.publishMetadata.factoryDeploymentData?.customFactoryInput
               ?.customFactoryAddresses || {},
+          factoryFunction:
+            props.publishMetadata.factoryDeploymentData?.customFactoryInput
+              ?.factoryFunction || "deployProxyByImplementation",
           params:
             props.publishMetadata.factoryDeploymentData?.customFactoryInput
               ?.params || [],
         },
+        factoryAddresses: {},
+        implementationAddresses: {},
+        implementationInitializerFunction: "initialize",
       },
-      constructorParams: props.publishMetadata.constructorParams || {},
       implConstructorParams: props.publishMetadata.implConstructorParams || {},
+      name: props.publishMetadata.name || "",
       networksForDeployment: props.publishMetadata?.networksForDeployment || {
         allNetworks: true,
       },
-      deployType: props.publishMetadata.deployType || "standard",
-      customFactoryAddresses: Object.entries(
-        props.publishMetadata.factoryDeploymentData?.customFactoryInput
-          ?.customFactoryAddresses || {},
-      ).map(([key, value]) => ({ key: Number(key), value })),
-      defaultExtensions: props.publishMetadata.defaultExtensions || [],
-      defaultModules: props.publishMetadata.defaultModules || [],
-      extensionsParamName:
-        props.publishMetadata.factoryDeploymentData?.modularFactoryInput
-          ?.hooksParamName || "",
+      version: placeholderVersion,
     };
   }, [placeholderVersion, props.publishMetadata]);
 
@@ -117,11 +117,11 @@ export function ContractPublishForm(props: {
     FetchDeployMetadataResult & { name: string; version: string }
   >({
     defaultValues: transformedQueryData,
-    values: transformedQueryData,
     resetOptions: {
       keepDirty: true,
       keepDirtyValues: true,
     },
+    values: transformedQueryData,
   });
 
   const disableNext =
@@ -130,8 +130,8 @@ export function ContractPublishForm(props: {
     !!form.getFieldState("version", form.formState).error;
 
   const ensQuery = useEns({
-    client: props.client,
     addressOrEnsName: account?.address,
+    client: props.client,
   });
 
   const ensNameOrAddress = useMemo(() => {
@@ -184,17 +184,21 @@ export function ContractPublishForm(props: {
 
   useIsomorphicLayoutEffect(() => {
     window?.scrollTo({
-      top: 0,
       behavior: "smooth",
+      top: 0,
     });
   }, []);
 
+  const formId = useId();
+
   return (
     <FormProvider {...form}>
       <div className="w-full">
         <Flex
           as="form"
-          id="contract-release-form"
+          direction="column"
+          gap={6}
+          id={formId}
           onSubmit={form.handleSubmit((data) => {
             if (!account) {
               // no account, do nothing
@@ -218,35 +222,35 @@ export function ContractPublishForm(props: {
 
             const metadata = {
               ...data,
-              networksForDeployment: {
-                allNetworks:
-                  data.deployType === "customFactory"
-                    ? false
-                    : data.networksForDeployment?.allNetworks,
-                networksEnabled:
-                  addressArray.length > 0
-                    ? Object.keys(addressObj).map((val) => Number(val))
-                    : data.networksForDeployment?.networksEnabled,
-              },
               factoryDeploymentData: {
                 ...data.factoryDeploymentData,
-                implementationAddresses:
-                  data.factoryDeploymentData?.implementationAddresses || {},
-                implementationInitializerFunction:
-                  data.factoryDeploymentData
-                    ?.implementationInitializerFunction || "initialize",
                 customFactoryInput: {
+                  customFactoryAddresses:
+                    addressObj ||
+                    data.factoryDeploymentData?.customFactoryInput
+                      ?.customFactoryAddresses,
                   factoryFunction:
                     data.factoryDeploymentData?.customFactoryInput
                       ?.factoryFunction || "deployProxyByImplementation",
                   params:
                     data.factoryDeploymentData?.customFactoryInput?.params ||
                     [],
-                  customFactoryAddresses:
-                    addressObj ||
-                    data.factoryDeploymentData?.customFactoryInput
-                      ?.customFactoryAddresses,
                 },
+                implementationAddresses:
+                  data.factoryDeploymentData?.implementationAddresses || {},
+                implementationInitializerFunction:
+                  data.factoryDeploymentData
+                    ?.implementationInitializerFunction || "initialize",
+              },
+              networksForDeployment: {
+                allNetworks:
+                  data.deployType === "customFactory"
+                    ? false
+                    : data.networksForDeployment?.allNetworks,
+                networksEnabled:
+                  addressArray.length > 0
+                    ? Object.keys(addressObj).map((val) => Number(val))
+                    : data.networksForDeployment?.networksEnabled,
               },
             } satisfies FetchDeployMetadataResult & {
               name: string;
@@ -261,14 +265,18 @@ export function ContractPublishForm(props: {
             });
 
             sendTx.mutate(tx, {
+              onError: (err) => {
+                console.error("Failed to publish contract", err);
+                onError(err);
+              },
               onSuccess: async () => {
                 onSuccess();
 
                 reportContractPublished({
-                  publisher: ensNameOrAddress ?? "",
                   contractName: props.publishMetadata.name,
-                  version: data.version,
                   deployType: data.deployType,
+                  publisher: ensNameOrAddress ?? "",
+                  version: data.version,
                 });
                 await props.onPublishSuccess().catch((err) => {
                   console.error("Failed to run onPublishSuccess", err);
@@ -277,20 +285,14 @@ export function ContractPublishForm(props: {
                   router.push(successRedirectUrl, { scroll: true });
                 }
               },
-              onError: (err) => {
-                console.error("Failed to publish contract", err);
-                onError(err);
-              },
             });
           })}
-          direction="column"
-          gap={6}
         >
           {fieldsetToShow !== "landing" && (
             <div>
               <IconButton
-                w="inherit"
-                variant="ghost"
+                aria-label="Back"
+                icon={<ChevronFirstIcon className="size-6" />}
                 onClick={() =>
                   fieldsetToShow === "contractParams" &&
                   (form.watch("deployType") === "autoFactory" ||
@@ -303,8 +305,8 @@ export function ContractPublishForm(props: {
                         ? setFieldsetToShow("contractParams")
                         : setFieldsetToShow("landing")
                 }
-                aria-label="Back"
-                icon={<ChevronFirstIcon className="size-6" />}
+                variant="ghost"
+                w="inherit"
               >
                 Back
               </IconButton>
@@ -313,23 +315,23 @@ export function ContractPublishForm(props: {
 
           {fieldsetToShow === "landing" && (
             <LandingFieldset
+              client={props.client}
               latestVersion={latestVersion}
               placeholderVersion={placeholderVersion}
-              client={props.client}
             />
           )}
 
           {fieldsetToShow === "contractParams" && (
             <ContractParamsFieldset
-              deployParams={deployParams}
               client={props.client}
+              deployParams={deployParams}
             />
           )}
 
           {fieldsetToShow === "implParams" && implDeployParams?.length > 0 && (
             <ImplementationParamsFieldset
-              implParams={implDeployParams}
               client={props.client}
+              implParams={implDeployParams}
             />
           )}
 
@@ -337,32 +339,32 @@ export function ContractPublishForm(props: {
             <Flex flexDir="column" gap={24}>
               <FactoryFieldset
                 abi={props.publishMetadata.abi || []}
-                setCustomFactoryAbi={setCustomFactoryAbi}
                 client={props.client}
+                setCustomFactoryAbi={setCustomFactoryAbi}
               />
             </Flex>
           )}
 
           {fieldsetToShow === "networks" && (
             <Flex flexDir="column" gap={24}>
-              <NetworksFieldset fromStandard client={props.client} />
+              <NetworksFieldset client={props.client} fromStandard />
             </Flex>
           )}
 
           <Flex flexDir="column" gap={6}>
             <Divider />
             <Flex
-              justifyContent="space-between"
               alignItems="center"
               flexDir={{ base: "column", md: "row" }}
               gap={4}
+              justifyContent="space-between"
             >
               {!account ? (
                 <>
                   <Box />
                   <CustomConnectWallet
-                    isLoggedIn={props.isLoggedIn}
                     client={props.client}
+                    isLoggedIn={props.isLoggedIn}
                   />
                 </>
               ) : fieldsetToShow === "landing" &&
@@ -370,9 +372,9 @@ export function ContractPublishForm(props: {
                 <>
                   <Box />
                   <Button
-                    onClick={() => setFieldsetToShow("networks")}
                     colorScheme="primary"
                     isDisabled={disableNext}
+                    onClick={() => setFieldsetToShow("networks")}
                   >
                     Next
                   </Button>
@@ -383,9 +385,9 @@ export function ContractPublishForm(props: {
                 <>
                   <Box />
                   <Button
-                    onClick={() => setFieldsetToShow("factory")}
                     colorScheme="primary"
                     isDisabled={disableNext}
+                    onClick={() => setFieldsetToShow("factory")}
                   >
                     Next
                   </Button>
@@ -396,9 +398,9 @@ export function ContractPublishForm(props: {
                 <>
                   <Box />
                   <Button
+                    colorScheme="primary"
                     isDisabled={disableNext}
                     onClick={() => setFieldsetToShow("contractParams")}
-                    colorScheme="primary"
                   >
                     Next
                   </Button>
@@ -410,9 +412,9 @@ export function ContractPublishForm(props: {
                 <>
                   <Box />
                   <Button
+                    colorScheme="primary"
                     isDisabled={disableNext}
                     onClick={() => setFieldsetToShow("implParams")}
-                    colorScheme="primary"
                   >
                     Next
                   </Button>
@@ -422,9 +424,9 @@ export function ContractPublishForm(props: {
                 <>
                   <Box />
                   <Button
-                    onClick={() => setFieldsetToShow("implParams")}
                     colorScheme="primary"
                     isDisabled={disableNext}
+                    onClick={() => setFieldsetToShow("implParams")}
                   >
                     Next
                   </Button>
@@ -436,19 +438,18 @@ export function ContractPublishForm(props: {
                   </Text>
                   <Button
                     // differentiate this from the edit button
-                    key="submit-button"
                     borderRadius="md"
-                    position="relative"
-                    role="group"
                     colorScheme="blue"
-                    isLoading={isPending}
-                    form="contract-release-form"
+                    form={formId}
                     isDisabled={isDisabled}
+                    isLoading={isPending}
+                    key="submit-button"
                     loadingText={
                       sendTx.isSuccess
                         ? "Preparing page"
                         : "Publishing contract"
                     }
+                    position="relative"
                     type="submit"
                   >
                     Publish Contract
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/landing-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/landing-fieldset.tsx
index 42001d1d0c6..18737fe11b4 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/landing-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/landing-fieldset.tsx
@@ -57,13 +57,13 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
 
     if (!isValidSemver) {
       form.setError("version", {
-        type: "pattern",
         message: "Version must be valid semver.",
+        type: "pattern",
       });
     } else if (!isValidVersion) {
       form.setError("version", {
-        type: "manual",
         message: "Version must be greater than latest version.",
+        type: "manual",
       });
     } else {
       form.clearErrors("version");
@@ -71,8 +71,8 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
   };
 
   return (
-    <Flex gap={16} direction="column" as="fieldset" mt={{ base: 4, md: 12 }}>
-      <Flex gap={2} direction="column">
+    <Flex as="fieldset" direction="column" gap={16} mt={{ base: 4, md: 12 }}>
+      <Flex direction="column" gap={2}>
         <Heading size="title.lg">
           {!latestVersion ? "Publish" : "Edit"} your contract
         </Heading>
@@ -81,8 +81,8 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
           deployable in a single click.{" "}
           <Link
             color="blue.500"
-            isExternal
             href="https://portal.thirdweb.com/contracts/publish/overview"
+            isExternal
           >
             Learn more
           </Link>
@@ -94,12 +94,12 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
           <Box width="141px">
             <FileInput
               accept={{ "image/*": [] }}
+              className="rounded border border-border transition-all duration-200"
               client={client}
-              value={logoUrl}
+              helperText="Image"
               // @ts-expect-error - we upload the file later this is fine
               setValue={(file) => form.setValue("logo", file)}
-              className="rounded border border-border transition-all duration-200"
-              helperText="Image"
+              value={logoUrl}
             />
           </Box>
           <FormErrorMessage>
@@ -113,9 +113,9 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
           >
             <FormLabel>Contract Name</FormLabel>
             <Input
+              onChange={(e) => form.setValue("displayName", e.target.value)}
               placeholder="Ex. MyContract"
               value={form.watch("displayName")}
-              onChange={(e) => form.setValue("displayName", e.target.value)}
             />
             <FormErrorMessage>
               {form.formState.errors?.displayName?.message}
@@ -124,10 +124,10 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
           <FormControl isInvalid={!!form.formState.errors.description}>
             <FormLabel>Description</FormLabel>
             <Textarea
-              rows={2}
+              onChange={(e) => form.setValue("description", e.target.value)}
               placeholder="Briefly describe what your contract does."
+              rows={2}
               value={form.watch("description")}
-              onChange={(e) => form.setValue("description", e.target.value)}
             />
 
             <FormErrorMessage>
@@ -138,19 +138,19 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
       </Flex>
 
       <div>
-        <Heading size="title.md" mb={2}>
+        <Heading mb={2} size="title.md">
           README
         </Heading>
-        <Text size="body.md" mb={4}>
+        <Text mb={4} size="body.md">
           Describe what your contract does and how it should be used. Markdown
           formatting is supported.
         </Text>
         <FormControl isInvalid={!!form.formState.errors.readme}>
-          <Tabs isLazy lazyBehavior="keepMounted" colorScheme="gray">
+          <Tabs colorScheme="gray" isLazy lazyBehavior="keepMounted">
             <TabList
-              px={0}
               borderBottomColor="borderColor"
               borderBottomWidth="1px"
+              px={0}
             >
               <Tab gap={2}>
                 <Heading size="label.lg">Write</Heading>
@@ -160,17 +160,17 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
               </Tab>
             </TabList>
             <TabPanels pt={2}>
-              <TabPanel px={0} pb={0}>
+              <TabPanel pb={0} px={0}>
                 <Textarea
                   {...form.register("readme")}
-                  rows={12}
                   placeholder="Describe how users can use this contract. Add links if relevant."
+                  rows={12}
                 />
                 <FormErrorMessage>
                   {form.formState.errors?.readme?.message}
                 </FormErrorMessage>
               </TabPanel>
-              <TabPanel px={0} pb={0}>
+              <TabPanel pb={0} px={0}>
                 <Card>
                   <MarkdownRenderer markdownText={form.watch("readme") || ""} />
                 </Card>
@@ -181,15 +181,15 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
       </div>
       <ExternalLinksFieldset />
       <div>
-        <Heading size="title.md" mb={2}>
+        <Heading mb={2} size="title.md">
           Version information
         </Heading>
-        <Text size="body.md" mb={4}>
+        <Text mb={4} size="body.md">
           Set your contract version number, add release notes, and link to your
           contract&apos;s audit report.
         </Text>
         <Flex flexDir="column" gap={6}>
-          <FormControl isRequired isInvalid={!!form.formState.errors.version}>
+          <FormControl isInvalid={!!form.formState.errors.version} isRequired>
             <Flex alignItems="center" mb={1}>
               <FormLabel flex="1" mb={0}>
                 Version
@@ -199,9 +199,9 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
               )}
             </Flex>
             <Input
+              onChange={handleVersionChange}
               placeholder={placeholderVersion}
               value={form.watch("version")}
-              onChange={handleVersionChange}
             />
             <FormErrorMessage>
               {form.formState.errors?.version?.message}
@@ -210,11 +210,11 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
           {latestVersion && (
             <FormControl isInvalid={!!form.formState.errors.changelog}>
               <FormLabel>Release notes</FormLabel>
-              <Tabs isLazy lazyBehavior="keepMounted" colorScheme="gray">
+              <Tabs colorScheme="gray" isLazy lazyBehavior="keepMounted">
                 <TabList
-                  px={0}
                   borderBottomColor="borderColor"
                   borderBottomWidth="1px"
+                  px={0}
                 >
                   <Tab gap={2}>
                     <Heading size="label.lg">Write</Heading>
@@ -224,7 +224,7 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
                   </Tab>
                 </TabList>
                 <TabPanels pt={2}>
-                  <TabPanel px={0} pb={0}>
+                  <TabPanel pb={0} px={0}>
                     <Textarea
                       {...form.register("changelog")}
                       placeholder="Mention what is new in this version of your contract."
@@ -233,7 +233,7 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
                       {form.formState.errors?.changelog?.message}
                     </FormErrorMessage>
                   </TabPanel>
-                  <TabPanel px={0} pb={0}>
+                  <TabPanel pb={0} px={0}>
                     <Card>
                       <MarkdownRenderer
                         markdownText={form.watch("changelog") || ""}
@@ -247,8 +247,8 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
           <FormControl isInvalid={!!form.formState.errors.audit}>
             <FormLabel>Audit report</FormLabel>
             <SolidityInput
-              solidityType="string"
               client={client}
+              solidityType="string"
               {...form.register("audit")}
               placeholder="ipfs://... or https://..."
             />
@@ -262,29 +262,29 @@ export const LandingFieldset: React.FC<LandingFieldsetProps> = ({
         </Flex>
       </div>
       <div>
-        <Heading size="title.md" mb={2}>
+        <Heading mb={2} size="title.md">
           Deployment options
         </Heading>
-        <Text size="body.md" mb={4}>
+        <Text mb={4} size="body.md">
           Choose how users will deploy your published contract.
         </Text>
         <Flex flexDir="column" gap={2} width="full">
           <SelectOption
-            name="Direct deploy"
+            className="w-full"
             description="Users will directly deploy the full contract."
-            onClick={() => form.setValue("deployType", "standard")}
             isActive={form.watch("deployType") === "standard"}
-            className="w-full"
+            name="Direct deploy"
+            onClick={() => form.setValue("deployType", "standard")}
           />
           <SelectOption
-            name="Deploy via factory"
+            className="w-full"
             description="Users will deploy your contract through a default or custom factory contract."
-            onClick={() => form.setValue("deployType", "autoFactory")}
             isActive={
               form.watch("deployType") === "autoFactory" ||
               form.watch("deployType") === "customFactory"
             }
-            className="w-full"
+            name="Deploy via factory"
+            onClick={() => form.setValue("deployType", "autoFactory")}
           />
         </Flex>
       </div>
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/networks-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/networks-fieldset.tsx
index 88ae10af080..ef8d94916b7 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/networks-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/networks-fieldset.tsx
@@ -1,3 +1,6 @@
+import { useFormContext } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
+import { Heading, Text } from "tw-components";
 import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import {
   Select,
@@ -7,9 +10,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { cn } from "@/lib/utils";
-import { useFormContext } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
-import { Heading, Text } from "tw-components";
 
 interface NetworksFieldsetProps {
   fromStandard?: boolean;
@@ -31,12 +31,12 @@ export const NetworksFieldset: React.FC<NetworksFieldsetProps> = ({
       </div>
       <div className="flex flex-col gap-2" data-required>
         <Select
-          value={
-            form.watch("networksForDeployment.allNetworks") ? "all" : "specific"
-          }
           onValueChange={(value) =>
             form.setValue("networksForDeployment.allNetworks", value === "all")
           }
+          value={
+            form.watch("networksForDeployment.allNetworks") ? "all" : "specific"
+          }
         >
           <SelectTrigger className="w-full">
             <SelectValue />
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-impl-input/ref-input-impl-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-impl-input/ref-input-impl-fieldset.tsx
index f8b878e1311..9ff2fe1894d 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-impl-input/ref-input-impl-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-impl-input/ref-input-impl-fieldset.tsx
@@ -1,9 +1,9 @@
-import { cn } from "@/lib/utils";
 import type { AbiParameter } from "abitype";
 import { PlusIcon } from "lucide-react";
 import { useFieldArray, useFormContext } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
 import { Button } from "tw-components";
+import { cn } from "@/lib/utils";
 import { RefContractImplInput } from "./ref-input-impl";
 
 interface RefInputImplFieldsetProps {
@@ -18,8 +18,8 @@ export const RefInputImplFieldset: React.FC<RefInputImplFieldsetProps> = ({
   const form = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
-    name: `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts`,
     control: form.control,
+    name: `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts`,
   });
 
   const hideAddButton = param.type === "address" && fields.length >= 1;
@@ -28,30 +28,30 @@ export const RefInputImplFieldset: React.FC<RefInputImplFieldsetProps> = ({
     <div className="flex flex-col gap-5">
       {fields.map((item, index) => (
         <RefContractImplInput
-          key={item.id}
-          remove={remove}
-          index={index}
-          param={param}
           className={cn(!hideAddButton && "border-border border-b pb-5")}
           client={client}
+          index={index}
+          key={item.id}
+          param={param}
+          remove={remove}
         />
       ))}
 
       {!hideAddButton && (
         <div>
           <Button
-            type="button"
-            size="sm"
-            variant="outline"
             className="gap-2"
             onClick={() =>
               append({
                 contractId: "",
-                version: "",
                 publisherAddress: "",
                 salt: "",
+                version: "",
               })
             }
+            size="sm"
+            type="button"
+            variant="outline"
           >
             <PlusIcon className="size-4" />
             Add Reference
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-impl-input/ref-input-impl.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-impl-input/ref-input-impl.tsx
index 65c328c27a6..d0f06cd2512 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-impl-input/ref-input-impl.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-impl-input/ref-input-impl.tsx
@@ -1,3 +1,7 @@
+import type { AbiParameter } from "abitype";
+import { TrashIcon } from "lucide-react";
+import { useFormContext } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -10,10 +14,6 @@ import {
 } from "@/components/ui/select";
 import { SkeletonContainer } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
-import type { AbiParameter } from "abitype";
-import { TrashIcon } from "lucide-react";
-import { useFormContext } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import { useAllVersions, usePublishedContractsQuery } from "../../hooks";
 
 interface RefContractImplInputProps {
@@ -34,10 +34,10 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
   const form = useFormContext();
 
   const publishedContractsQuery = usePublishedContractsQuery({
-    client,
     address: form.watch(
       `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
     ),
+    client,
   });
 
   const allVersions = useAllVersions(
@@ -54,14 +54,14 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
     <div className={cn("flex flex-col gap-4 lg:flex-row", className)}>
       <div className="grid grow grid-cols-1 gap-4 lg:grid-cols-4">
         <FormFieldSetup
-          isRequired={true}
-          label="Publisher"
           errorMessage={
             form.getFieldState(
               `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
               form.formState,
             ).error?.message
           }
+          isRequired={true}
+          label="Publisher"
         >
           <Input
             className="truncate"
@@ -73,19 +73,18 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
         </FormFieldSetup>
 
         <FormFieldSetup
-          label="Contract Name"
-          isRequired={true}
           errorMessage={
             form.getFieldState(
               `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.contractId`,
               form.formState,
             ).error?.message
           }
+          isRequired={true}
+          label="Contract Name"
         >
           <SkeletonContainer
             className="block"
             loadedData={!publishedContractsQuery.isFetching ? true : undefined}
-            skeletonData={false}
             render={() => {
               return (
                 <Select
@@ -121,23 +120,23 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
                 </Select>
               );
             }}
+            skeletonData={false}
           />
         </FormFieldSetup>
 
         <FormFieldSetup
-          label="Contract Version"
-          isRequired={false}
           errorMessage={
             form.getFieldState(
               `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.version`,
               form.formState,
             ).error?.message
           }
+          isRequired={false}
+          label="Contract Version"
         >
           <SkeletonContainer
             className="block"
             loadedData={!allVersions.isFetching ? true : undefined}
-            skeletonData={false}
             render={() => {
               return (
                 <Select
@@ -170,18 +169,19 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
                 </Select>
               );
             }}
+            skeletonData={false}
           />
         </FormFieldSetup>
 
         <FormFieldSetup
-          isRequired={false}
-          label="Salt"
           errorMessage={
             form.getFieldState(
               `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.salt`,
               form.formState,
             ).error?.message
           }
+          isRequired={false}
+          label="Salt"
         >
           <Input
             className="truncate"
@@ -195,9 +195,9 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
 
       <Button
         aria-label="Remove"
+        className="self-end text-destructive-text"
         onClick={() => remove(index)}
         variant="outline"
-        className="self-end text-destructive-text"
       >
         <TrashIcon className="size-4" />
       </Button>
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-input/ref-input-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-input/ref-input-fieldset.tsx
index 56ba6d63460..0bd91d34ba8 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-input/ref-input-fieldset.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-input/ref-input-fieldset.tsx
@@ -1,9 +1,9 @@
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import type { AbiParameter } from "abitype";
 import { PlusIcon } from "lucide-react";
 import { useFieldArray, useFormContext } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 import { RefContractInput } from "./ref-input";
 
 interface RefInputFieldsetProps {
@@ -18,8 +18,8 @@ export const RefInputFieldset: React.FC<RefInputFieldsetProps> = ({
   const form = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
-    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts`,
     control: form.control,
+    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts`,
   });
   const hideAddButton = param.type === "address" && fields.length >= 1;
 
@@ -27,30 +27,30 @@ export const RefInputFieldset: React.FC<RefInputFieldsetProps> = ({
     <div className="flex flex-col gap-5">
       {fields.map((item, index) => (
         <RefContractInput
-          key={item.id}
-          remove={remove}
-          index={index}
-          param={param}
           className={cn(!hideAddButton && "border-border border-b pb-5")}
           client={client}
+          index={index}
+          key={item.id}
+          param={param}
+          remove={remove}
         />
       ))}
 
       {!hideAddButton && (
         <div>
           <Button
-            type="button"
-            size="sm"
-            variant="outline"
             className="gap-2"
             onClick={() =>
               append({
                 contractId: "",
-                version: "",
                 publisherAddress: "",
                 salt: "",
+                version: "",
               })
             }
+            size="sm"
+            type="button"
+            variant="outline"
           >
             <PlusIcon className="size-4" />
             Add Reference
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-input/ref-input.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-input/ref-input.tsx
index d5a593e7a94..9b11f975c75 100644
--- a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-input/ref-input.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-contract-input/ref-input.tsx
@@ -1,3 +1,7 @@
+import type { AbiParameter } from "abitype";
+import { TrashIcon } from "lucide-react";
+import { useFormContext } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -10,10 +14,6 @@ import {
 } from "@/components/ui/select";
 import { SkeletonContainer } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
-import type { AbiParameter } from "abitype";
-import { TrashIcon } from "lucide-react";
-import { useFormContext } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
 import { useAllVersions, usePublishedContractsQuery } from "../../hooks";
 
 interface RefContractInputProps {
@@ -34,10 +34,10 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
   const form = useFormContext();
 
   const publishedContractsQuery = usePublishedContractsQuery({
-    client,
     address: form.watch(
       `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
     ),
+    client,
   });
 
   const allVersions = useAllVersions(
@@ -54,14 +54,14 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
     <div className={cn("flex flex-col gap-4 lg:flex-row", className)}>
       <div className="grid grow grid-cols-1 gap-4 lg:grid-cols-4">
         <FormFieldSetup
-          isRequired={true}
-          label="Publisher"
           errorMessage={
             form.getFieldState(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
               form.formState,
             ).error?.message
           }
+          isRequired={true}
+          label="Publisher"
         >
           <Input
             className="truncate"
@@ -73,19 +73,18 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
         </FormFieldSetup>
 
         <FormFieldSetup
-          label="Contract Name"
-          isRequired={true}
           errorMessage={
             form.getFieldState(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.contractId`,
               form.formState,
             ).error?.message
           }
+          isRequired={true}
+          label="Contract Name"
         >
           <SkeletonContainer
             className="block"
             loadedData={!publishedContractsQuery.isFetching ? true : undefined}
-            skeletonData={false}
             render={() => {
               return (
                 <Select
@@ -121,23 +120,23 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
                 </Select>
               );
             }}
+            skeletonData={false}
           />
         </FormFieldSetup>
 
         <FormFieldSetup
-          label="Contract Version"
-          isRequired={false}
           errorMessage={
             form.getFieldState(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.version`,
               form.formState,
             ).error?.message
           }
+          isRequired={false}
+          label="Contract Version"
         >
           <SkeletonContainer
             className="block"
             loadedData={!allVersions.isFetching ? true : undefined}
-            skeletonData={false}
             render={() => {
               return (
                 <Select
@@ -170,18 +169,19 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
                 </Select>
               );
             }}
+            skeletonData={false}
           />
         </FormFieldSetup>
 
         <FormFieldSetup
-          isRequired={false}
-          label="Salt"
           errorMessage={
             form.getFieldState(
               `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.salt`,
               form.formState,
             ).error?.message
           }
+          isRequired={false}
+          label="Salt"
         >
           <Input
             className="truncate"
@@ -195,9 +195,9 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
 
       <Button
         aria-label="Remove"
+        className="self-end text-destructive-text"
         onClick={() => remove(index)}
         variant="outline"
-        className="self-end text-destructive-text"
       >
         <TrashIcon className="size-4" />
       </Button>
diff --git a/apps/dashboard/src/components/contract-components/contract-table/index.tsx b/apps/dashboard/src/components/contract-components/contract-table/index.tsx
index c2d49346d6e..d48430407a5 100644
--- a/apps/dashboard/src/components/contract-components/contract-table/index.tsx
+++ b/apps/dashboard/src/components/contract-components/contract-table/index.tsx
@@ -1,3 +1,4 @@
+import Link from "next/link";
 import {
   Table,
   TableBody,
@@ -8,7 +9,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
-import Link from "next/link";
 import { fetchDeployMetadata } from "../fetchDeployMetadata";
 import { ContractIdImage } from "../shared/contract-id-image";
 
@@ -55,10 +55,10 @@ export async function DeployableContractTable(
           {deployedContractMetadata.map((metadata, i) => {
             return (
               <TableRow
-                linkBox
                 className="cursor-pointer hover:bg-card"
                 // biome-ignore lint/suspicious/noArrayIndexKey: static list
                 key={i}
+                linkBox
               >
                 {/* Icon */}
                 <TableCell>
@@ -68,10 +68,10 @@ export async function DeployableContractTable(
                 {/* name */}
                 <TableCell>
                   <Link
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    href={`/contracts/${context}/${encodeURIComponent(metadata.contractId)}`}
                     className="text-left text-muted-foreground before:absolute before:inset-0"
+                    href={`/contracts/${context}/${encodeURIComponent(metadata.contractId)}`}
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
                     {metadata.name}
                   </Link>
diff --git a/apps/dashboard/src/components/contract-components/fetch-contracts-with-versions.ts b/apps/dashboard/src/components/contract-components/fetch-contracts-with-versions.ts
index 362320d4f8d..ea7b85e66f7 100644
--- a/apps/dashboard/src/components/contract-components/fetch-contracts-with-versions.ts
+++ b/apps/dashboard/src/components/contract-components/fetch-contracts-with-versions.ts
@@ -1,4 +1,4 @@
-import { type ThirdwebClient, isAddress } from "thirdweb";
+import { isAddress, type ThirdwebClient } from "thirdweb";
 import { fetchDeployMetadata } from "thirdweb/contract";
 import { resolveAddress } from "thirdweb/extensions/ens";
 import {
@@ -20,9 +20,9 @@ export async function fetchPublishedContractVersions(
   client: ThirdwebClient,
 ) {
   const sortedVersions = await getSortedPublishedContractVersions({
-    publisherAddress,
-    contractId,
     client,
+    contractId,
+    publisherAddress,
   });
 
   const responses = await Promise.allSettled(
@@ -57,13 +57,13 @@ async function getSortedPublishedContractVersions(params: {
 
   const allVersions = await getPublishedContractVersions({
     contract: getContractPublisher(client),
+    contractId: contractId,
     publisher: isAddress(publisherAddress)
       ? publisherAddress
       : await resolveAddress({
           client,
           name: mapThirdwebPublisher(publisherAddress),
         }),
-    contractId: contractId,
   });
 
   const sortedVersions = allVersions.toSorted((a, b) => {
@@ -82,9 +82,9 @@ export async function fetchLatestPublishedContractVersion(
   client: ThirdwebClient,
 ) {
   const sortedVersions = await getSortedPublishedContractVersions({
-    publisherAddress,
-    contractId,
     client,
+    contractId,
+    publisherAddress,
   });
 
   const latestVersion = sortedVersions[0];
diff --git a/apps/dashboard/src/components/contract-components/fetchPublishedContractsFromDeploy.ts b/apps/dashboard/src/components/contract-components/fetchPublishedContractsFromDeploy.ts
index df526b13ee4..ec7cc48fa7e 100644
--- a/apps/dashboard/src/components/contract-components/fetchPublishedContractsFromDeploy.ts
+++ b/apps/dashboard/src/components/contract-components/fetchPublishedContractsFromDeploy.ts
@@ -28,8 +28,8 @@ export async function fetchPublishedContractsFromDeploy(options: {
   }
 
   let publishURIs = await getPublishedUriFromCompilerUri({
-    contract: getContractPublisher(contract.client),
     compilerMetadataUri: contractUri,
+    contract: getContractPublisher(contract.client),
   });
 
   // Try fetching using contract name from compiler metadata for zksolc variants
@@ -37,8 +37,8 @@ export async function fetchPublishedContractsFromDeploy(options: {
   if (publishURIs.length === 0 && (await isZkSyncChain(contract.chain))) {
     try {
       const res = await download({
-        uri: contractUri,
         client: contract.client,
+        uri: contractUri,
       });
 
       const deployMetadata = (await res.json()) as ZkSolcMetadata;
diff --git a/apps/dashboard/src/components/contract-components/hooks.ts b/apps/dashboard/src/components/contract-components/hooks.ts
index 12121e63353..e1c41227d6a 100644
--- a/apps/dashboard/src/components/contract-components/hooks.ts
+++ b/apps/dashboard/src/components/contract-components/hooks.ts
@@ -9,8 +9,8 @@ import type { ThirdwebClient, ThirdwebContract } from "thirdweb";
 import { getContract, resolveContractAbi } from "thirdweb/contract";
 import { isAddress, isValidENSName } from "thirdweb/utils";
 import {
-  type PublishedContractWithVersion,
   fetchPublishedContractVersions,
+  type PublishedContractWithVersion,
 } from "./fetch-contracts-with-versions";
 import { fetchPublishedContracts } from "./fetchPublishedContracts";
 import { fetchPublishedContractsFromDeploy } from "./fetchPublishedContractsFromDeploy";
@@ -21,7 +21,7 @@ export function useAllVersions(
   client: ThirdwebClient,
 ) {
   return useQuery({
-    queryKey: ["all-releases", publisherAddress, contractId],
+    enabled: !!publisherAddress && !!contractId,
     queryFn: () => {
       if (!publisherAddress || !contractId) {
         // should never happen because we check for this in the enabled check
@@ -33,23 +33,22 @@ export function useAllVersions(
         client,
       );
     },
-
-    enabled: !!publisherAddress && !!contractId,
+    queryKey: ["all-releases", publisherAddress, contractId],
   });
 }
 
 export function usePublishedContractsFromDeploy(contract: ThirdwebContract) {
   return useQuery({
+    enabled: !!contract,
+    queryFn: () =>
+      fetchPublishedContractsFromDeploy({
+        contract,
+      }),
     queryKey: [
       "published-contracts-from-deploy",
       contract.chain.id,
       contract.address,
     ],
-    queryFn: () =>
-      fetchPublishedContractsFromDeploy({
-        contract,
-      }),
-    enabled: !!contract,
     retry: false,
   });
 }
@@ -111,9 +110,9 @@ export function usePublishedContractsQuery(params: {
 }) {
   const { client, address } = params;
   return useQuery<PublishedContractDetails[]>({
-    queryKey: ["published-contracts", address],
-    queryFn: () => fetchPublishedContracts({ address, client }),
     enabled: !!address,
+    queryFn: () => fetchPublishedContracts({ address, client }),
+    queryKey: ["published-contracts", address],
   });
 }
 
@@ -134,7 +133,13 @@ function ensQuery(params: {
     ensName: null,
   };
   return queryOptions({
-    queryKey: ["ens", addressOrEnsName],
+    enabled:
+      !!addressOrEnsName &&
+      (isAddress(addressOrEnsName) || isValidENSName(addressOrEnsName)),
+    // 24h
+    gcTime: 60 * 60 * 24 * 1000,
+    // default to the one we know already
+    placeholderData,
     queryFn: async () => {
       if (!addressOrEnsName) {
         return placeholderData;
@@ -163,16 +168,10 @@ function ensQuery(params: {
         ensName,
       };
     },
-    enabled:
-      !!addressOrEnsName &&
-      (isAddress(addressOrEnsName) || isValidENSName(addressOrEnsName)),
-    // 24h
-    gcTime: 60 * 60 * 24 * 1000,
+    queryKey: ["ens", addressOrEnsName],
+    retry: false,
     // 1h
     staleTime: 60 * 60 * 1000,
-    // default to the one we know already
-    placeholderData,
-    retry: false,
   });
 }
 
@@ -196,13 +195,13 @@ export function useCustomFactoryAbi(
   const chain = useV5DashboardChain(chainId);
 
   return useQuery({
-    queryKey: ["custom-factory-abi", { contractAddress, chainId }],
+    enabled: !!contractAddress && !!chainId,
     queryFn: () => {
       const contract = chain
         ? getContract({
-            client,
             address: contractAddress,
             chain,
+            client,
           })
         : undefined;
 
@@ -212,6 +211,6 @@ export function useCustomFactoryAbi(
 
       return resolveContractAbi<Abi>(contract);
     },
-    enabled: !!contractAddress && !!chainId,
+    queryKey: ["custom-factory-abi", { chainId, contractAddress }],
   });
 }
diff --git a/apps/dashboard/src/components/contract-components/import-contract/modal.tsx b/apps/dashboard/src/components/contract-components/import-contract/modal.tsx
index 0e2d957b198..4e731405dc5 100644
--- a/apps/dashboard/src/components/contract-components/import-contract/modal.tsx
+++ b/apps/dashboard/src/components/contract-components/import-contract/modal.tsx
@@ -1,7 +1,15 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useChainSlug } from "hooks/chains/chainSlug";
+import { ArrowDownToLineIcon, ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { getAddress, isAddress, type ThirdwebClient } from "thirdweb";
+import { useActiveWalletChain } from "thirdweb/react";
+import { z } from "zod";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -20,16 +28,8 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useChainSlug } from "hooks/chains/chainSlug";
-import { ArrowDownToLineIcon, ExternalLinkIcon } from "lucide-react";
-import Link from "next/link";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { type ThirdwebClient, getAddress, isAddress } from "thirdweb";
-import { useActiveWalletChain } from "thirdweb/react";
-import { z } from "zod";
 import { useAddContractToProject } from "../../../app/(app)/team/[team_slug]/[project_slug]/(sidebar)/hooks/project-contracts";
 
 type ImportModalProps = {
@@ -45,16 +45,16 @@ type ImportModalProps = {
 export const ImportModal: React.FC<ImportModalProps> = (props) => {
   return (
     <Dialog
-      open={props.isOpen}
       onOpenChange={(v) => {
         if (!v) {
           props.onClose();
         }
       }}
+      open={props.isOpen}
     >
       <DialogContent
-        dialogOverlayClassName="rounded-lg"
         className="gap-0 overflow-hidden p-0"
+        dialogOverlayClassName="rounded-lg"
       >
         <DialogHeader className="p-6">
           <DialogTitle className="font-semibold text-2xl tracking-tight">
@@ -66,11 +66,11 @@ export const ImportModal: React.FC<ImportModalProps> = (props) => {
         </DialogHeader>
 
         <ImportForm
-          teamId={props.teamId}
-          projectId={props.projectId}
           client={props.client}
-          type={props.type}
           onSuccess={props.onSuccess}
+          projectId={props.projectId}
+          teamId={props.teamId}
+          type={props.type}
         />
       </DialogContent>
     </Dialog>
@@ -78,6 +78,7 @@ export const ImportModal: React.FC<ImportModalProps> = (props) => {
 };
 
 const importFormSchema = z.object({
+  chainId: z.coerce.number(),
   contractAddress: z.string().refine(
     (v) => {
       try {
@@ -90,7 +91,6 @@ const importFormSchema = z.object({
       message: "Invalid contract address",
     },
   ),
-  chainId: z.coerce.number(),
 });
 
 function ImportForm(props: {
@@ -106,8 +106,8 @@ function ImportForm(props: {
   const form = useForm({
     resolver: zodResolver(importFormSchema),
     values: {
-      contractAddress: "",
       chainId: activeChainId || 1,
+      contractAddress: "",
     },
   });
   const chainSlug = useChainSlug(form.watch("chainId"));
@@ -154,19 +154,14 @@ function ImportForm(props: {
 
             addContractToProject.mutate(
               {
-                contractAddress,
                 chainId: chainId.toString(),
-                teamId: props.teamId,
-                projectId: props.projectId,
-                deploymentType: props.type === "contract" ? undefined : "asset",
+                contractAddress,
                 contractType: undefined,
+                deploymentType: props.type === "contract" ? undefined : "asset",
+                projectId: props.projectId,
+                teamId: props.teamId,
               },
               {
-                onSuccess: () => {
-                  router.refresh();
-                  toast.success("Contract imported successfully");
-                  props.onSuccess?.();
-                },
                 onError: (err) => {
                   console.error(err);
                   if (err.message.includes("PROJECT_CONTRACT_ALREADY_EXISTS")) {
@@ -175,6 +170,11 @@ function ImportForm(props: {
                     toast.error("Failed to import contract");
                   }
                 },
+                onSuccess: () => {
+                  router.refresh();
+                  toast.success("Contract imported successfully");
+                  props.onSuccess?.();
+                },
               },
             );
           } catch (err) {
@@ -202,11 +202,11 @@ function ImportForm(props: {
           <div>
             <Label className="mb-3 inline-block">Network</Label>
             <SingleNetworkSelector
-              client={props.client}
               chainId={form.watch("chainId")}
+              client={props.client}
+              disableChainId
               onChange={(v) => form.setValue("chainId", v)}
               side="top"
-              disableChainId
             />
           </div>
         </div>
@@ -217,14 +217,14 @@ function ImportForm(props: {
             <Button asChild className="gap-2">
               <Link
                 href={`/${chainSlug}/${addContractToProject.data.result.contractAddress}`}
-                target="_blank"
                 rel="noopener noreferrer"
+                target="_blank"
               >
                 View Contract <ExternalLinkIcon className="size-4" />
               </Link>
             </Button>
           ) : (
-            <Button type="submit" className="gap-2">
+            <Button className="gap-2" type="submit">
               {addContractToProject.isPending ? (
                 <Spinner className="size-4" />
               ) : (
diff --git a/apps/dashboard/src/components/contract-components/published-contract/index.tsx b/apps/dashboard/src/components/contract-components/published-contract/index.tsx
index cbe9491f7d9..f84dc02cadf 100644
--- a/apps/dashboard/src/components/contract-components/published-contract/index.tsx
+++ b/apps/dashboard/src/components/contract-components/published-contract/index.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
 import { Divider, Flex, GridItem, List, ListItem } from "@chakra-ui/react";
 import { useQuery } from "@tanstack/react-query";
 import { ContractFunctionsOverview } from "components/contract-functions/contract-functions";
@@ -23,6 +21,8 @@ import { useActiveAccount } from "thirdweb/react";
 import { download } from "thirdweb/storage";
 import invariant from "tiny-invariant";
 import { Card, Heading, LinkButton, Text } from "tw-components";
+import { Button } from "@/components/ui/button";
+import { Separator } from "@/components/ui/separator";
 import type { PublishedContractWithVersion } from "../fetch-contracts-with-versions";
 import {
   usePublishedContractEvents,
@@ -69,7 +69,7 @@ export const PublishedContract: React.FC<PublishedContractProps> = ({
   const licenses = correctAndUniqueLicenses(publishedContract?.licenses || []);
 
   const sources = useQuery({
-    queryKey: ["sources", publishedContract.publishMetadataUri],
+    enabled: !!publishedContract.metadata.sources,
     queryFn: async () => {
       invariant(
         publishedContract.metadata.sources,
@@ -85,7 +85,7 @@ export const PublishedContract: React.FC<PublishedContractProps> = ({
         .slice()
         .reverse();
     },
-    enabled: !!publishedContract.metadata.sources,
+    queryKey: ["sources", publishedContract.publishMetadataUri],
   });
 
   const implementationAddresses =
@@ -110,13 +110,13 @@ export const PublishedContract: React.FC<PublishedContractProps> = ({
         <Flex flexDir="column" gap={6}>
           {address === publishedContract.publisher && (
             <LinkButton
-              ml="auto"
-              size="sm"
-              variant="outline"
-              leftIcon={<PencilIcon className="size-3" />}
               href={`/contracts/publish/${encodeURIComponent(
                 publishedContract.publishMetadataUri.replace("ipfs://", ""),
               )}`}
+              leftIcon={<PencilIcon className="size-3" />}
+              ml="auto"
+              size="sm"
+              variant="outline"
             >
               Edit
             </LinkButton>
@@ -129,25 +129,25 @@ export const PublishedContract: React.FC<PublishedContractProps> = ({
 
           {publishedContract?.changelog && (
             <Card as={Flex} flexDir="column" gap={2} p={0}>
-              <Heading px={6} pt={5} pb={2} size="title.sm">
+              <Heading pb={2} pt={5} px={6} size="title.sm">
                 {publishedContract?.version} Release Notes
               </Heading>
               <Divider />
 
               <MarkdownRenderer
-                markdownText={publishedContract?.changelog}
                 className="px-6 pt-2 pb-5"
+                markdownText={publishedContract?.changelog}
               />
             </Card>
           )}
           {contractFunctions && (
             <Card p={0}>
               <ContractFunctionsOverview
-                functions={contractFunctions}
-                events={contractEvents}
-                sources={sources.data}
                 abi={publishedContract?.abi}
+                events={contractEvents}
+                functions={contractFunctions}
                 isLoggedIn={isLoggedIn}
+                sources={sources.data}
               />
             </Card>
           )}
@@ -158,8 +158,8 @@ export const PublishedContract: React.FC<PublishedContractProps> = ({
         <Flex flexDir="column" gap={6}>
           {publishedContract.publisher && (
             <PublisherHeader
-              wallet={publishedContract.publisher}
               client={client}
+              wallet={publishedContract.publisher}
             />
           )}
 
@@ -168,90 +168,85 @@ export const PublishedContract: React.FC<PublishedContractProps> = ({
           <div className="flex flex-col gap-4">
             <h4 className="font-semibold text-xl tracking-tight">Details</h4>
             <List as={Flex} flexDir="column" gap={5}>
-              <>
-                {publishedContract.publishTimestamp && (
-                  <ListItem>
-                    <Flex gap={3} alignItems="flex-start">
-                      <CalendarDaysIcon className="size-5 text-muted-foreground" />
-                      <Flex direction="column" gap={1}>
-                        <Heading as="h5" size="label.sm">
-                          Publish Date
-                        </Heading>
-                        <Text size="body.md" lineHeight={1.2}>
-                          {publishDate}
-                        </Text>
-                      </Flex>
-                    </Flex>
-                  </ListItem>
-                )}
-                {publishedContract?.audit && (
-                  <ListItem>
-                    <Flex gap={3} alignItems="flex-start">
-                      <ShieldCheckIcon className="size-5 text-green-500" />
-                      <Flex direction="column" gap={1}>
-                        <Heading as="h5" size="label.sm">
-                          Audit Report
-                        </Heading>
-                        <Text size="body.md" lineHeight={1.2}>
-                          <Link
-                            href={replaceIpfsUrl(
-                              publishedContract.audit,
-                              client,
-                            )}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            className="text-link-foreground hover:text-foreground"
-                          >
-                            View Audit Report
-                          </Link>
-                        </Text>
-                      </Flex>
+              {publishedContract.publishTimestamp && (
+                <ListItem>
+                  <Flex alignItems="flex-start" gap={3}>
+                    <CalendarDaysIcon className="size-5 text-muted-foreground" />
+                    <Flex direction="column" gap={1}>
+                      <Heading as="h5" size="label.sm">
+                        Publish Date
+                      </Heading>
+                      <Text lineHeight={1.2} size="body.md">
+                        {publishDate}
+                      </Text>
                     </Flex>
-                  </ListItem>
-                )}
+                  </Flex>
+                </ListItem>
+              )}
+              {publishedContract?.audit && (
                 <ListItem>
-                  <Flex gap={3} alignItems="flex-start">
-                    <BookOpenTextIcon className="size-5 text-muted-foreground" />
+                  <Flex alignItems="flex-start" gap={3}>
+                    <ShieldCheckIcon className="size-5 text-green-500" />
                     <Flex direction="column" gap={1}>
                       <Heading as="h5" size="label.sm">
-                        License
-                        {licenses.length > 1 ? "s" : ""}
+                        Audit Report
                       </Heading>
-                      <Text size="body.md" lineHeight={1.2}>
-                        {licenses.join(", ") || "None"}
+                      <Text lineHeight={1.2} size="body.md">
+                        <Link
+                          className="text-link-foreground hover:text-foreground"
+                          href={replaceIpfsUrl(publishedContract.audit, client)}
+                          rel="noopener noreferrer"
+                          target="_blank"
+                        >
+                          View Audit Report
+                        </Link>
                       </Text>
                     </Flex>
                   </Flex>
                 </ListItem>
-                {(publishedContract?.isDeployableViaProxy &&
-                  hasImplementationAddresses) ||
-                (publishedContract?.isDeployableViaFactory &&
-                  hasFactoryAddresses) ? (
-                  <ListItem>
-                    <Flex gap={2} alignItems="flex-start">
-                      <ServerIcon className="size-5 text-muted-foreground" />
-                      <Flex direction="column" gap={1}>
-                        <Heading as="h5" size="label.sm">
-                          {publishedContract?.isDeployableViaFactory
-                            ? "Factory"
-                            : "Proxy"}{" "}
-                          Enabled
-                        </Heading>
-                      </Flex>
+              )}
+              <ListItem>
+                <Flex alignItems="flex-start" gap={3}>
+                  <BookOpenTextIcon className="size-5 text-muted-foreground" />
+                  <Flex direction="column" gap={1}>
+                    <Heading as="h5" size="label.sm">
+                      License
+                      {licenses.length > 1 ? "s" : ""}
+                    </Heading>
+                    <Text lineHeight={1.2} size="body.md">
+                      {licenses.join(", ") || "None"}
+                    </Text>
+                  </Flex>
+                </Flex>
+              </ListItem>
+              {(publishedContract?.isDeployableViaProxy &&
+                hasImplementationAddresses) ||
+              (publishedContract?.isDeployableViaFactory &&
+                hasFactoryAddresses) ? (
+                <ListItem>
+                  <Flex alignItems="flex-start" gap={2}>
+                    <ServerIcon className="size-5 text-muted-foreground" />
+                    <Flex direction="column" gap={1}>
+                      <Heading as="h5" size="label.sm">
+                        {publishedContract?.isDeployableViaFactory
+                          ? "Factory"
+                          : "Proxy"}{" "}
+                        Enabled
+                      </Heading>
                     </Flex>
-                  </ListItem>
-                ) : null}
-              </>
+                  </Flex>
+                </ListItem>
+              ) : null}
             </List>
           </div>
 
           <Separator />
 
-          <Button asChild variant="outline" className="w-full gap-2 bg-card">
+          <Button asChild className="w-full gap-2 bg-card" variant="outline">
             <Link
               href="https://portal.thirdweb.com/contracts/publish/overview"
-              target="_blank"
               rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more about Publish{" "}
               <ExternalLinkIcon className="size-4 text-muted-foreground" />
@@ -288,8 +283,8 @@ async function fetchSourceFilesFromMetadata(
           const source = await Promise.race([
             (
               await download({
-                uri: `ipfs://${ipfsHash}`,
                 client,
+                uri: `ipfs://${ipfsHash}`,
               })
             ).text(),
             timeout,
diff --git a/apps/dashboard/src/components/contract-components/published-contract/markdown-renderer.stories.tsx b/apps/dashboard/src/components/contract-components/published-contract/markdown-renderer.stories.tsx
index 91eaa0d0061..0d339329f81 100644
--- a/apps/dashboard/src/components/contract-components/published-contract/markdown-renderer.stories.tsx
+++ b/apps/dashboard/src/components/contract-components/published-contract/markdown-renderer.stories.tsx
@@ -2,13 +2,13 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { MarkdownRenderer } from "./markdown-renderer";
 
 const meta = {
-  title: "blocks/MarkdownRenderer",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/MarkdownRenderer",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -146,17 +146,14 @@ function example() {
 <br />
 `;
 
-function Story(props: {
-  disableCodeHighlight?: boolean;
-  skipHtml?: boolean;
-}) {
+function Story(props: { disableCodeHighlight?: boolean; skipHtml?: boolean }) {
   return (
     <div className="container max-w-[800px] py-10">
       <MarkdownRenderer
-        markdownText={markdownExample}
         code={{
           disableCodeHighlight: props.disableCodeHighlight,
         }}
+        markdownText={markdownExample}
         skipHtml={props.skipHtml}
       />
     </div>
diff --git a/apps/dashboard/src/components/contract-components/published-contract/markdown-renderer.tsx b/apps/dashboard/src/components/contract-components/published-contract/markdown-renderer.tsx
index 3127f96c137..50fbd05d381 100644
--- a/apps/dashboard/src/components/contract-components/published-contract/markdown-renderer.tsx
+++ b/apps/dashboard/src/components/contract-components/published-contract/markdown-renderer.tsx
@@ -1,3 +1,6 @@
+import { onlyText } from "react-children-utilities";
+import ReactMarkdown from "react-markdown";
+import remarkGfm from "remark-gfm";
 import { CodeClient } from "@/components/ui/code/code.client";
 import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 import { InlineCode } from "@/components/ui/inline-code";
@@ -10,12 +13,8 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { cn } from "@/lib/utils";
-
 import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { onlyText } from "react-children-utilities";
-import ReactMarkdown from "react-markdown";
-import remarkGfm from "remark-gfm";
+import { cn } from "@/lib/utils";
 
 export const MarkdownRenderer: React.FC<{
   markdownText: string;
@@ -42,9 +41,55 @@ export const MarkdownRenderer: React.FC<{
   return (
     <div className={className}>
       <ReactMarkdown
-        remarkPlugins={[remarkGfm]}
-        skipHtml={markdownProps.skipHtml}
         components={{
+          a: (props) => (
+            <UnderlineLink
+              href={props.href ?? "#"}
+              rel="noopener noreferrer"
+              target="_blank"
+              {...cleanedProps(props)}
+              className="mt-4"
+            />
+          ),
+
+          code: ({ ...props }) => {
+            const codeStr = onlyText(props.children);
+
+            if (props?.className || codeStr.length > 100) {
+              if (code?.disableCodeHighlight || !props.className) {
+                return (
+                  <div className="my-4">
+                    {/* @ts-expect-error - TODO: fix this */}
+                    <PlainTextCodeBlock
+                      {...cleanedProps(props)}
+                      className={markdownProps.code?.className}
+                      code={onlyText(props.children).trim()}
+                    />
+                  </div>
+                );
+              }
+              const language = props.className.replace("language-", "");
+              return (
+                <div className="my-4">
+                  <CodeClient
+                    // @ts-expect-error - TODO: fix this
+                    lang={language}
+                    {...cleanedProps(props)}
+                    className={markdownProps.code?.className}
+                    code={onlyText(props.children).trim()}
+                    ignoreFormattingErrors={code?.ignoreFormattingErrors}
+                  />
+                </div>
+              );
+            }
+
+            return (
+              <InlineCode
+                className={markdownProps.inlineCode?.className}
+                code={onlyText(props.children).trim()}
+              />
+            );
+          },
           h1: (props) => (
             <h2
               className={cn(
@@ -96,58 +141,26 @@ export const MarkdownRenderer: React.FC<{
             />
           ),
 
-          a: (props) => (
-            <UnderlineLink
-              href={props.href ?? "#"}
-              target="_blank"
-              rel="noopener noreferrer"
-              {...cleanedProps(props)}
-              className="mt-4"
-            />
-          ),
-
           hr: (props) => (
             <hr {...cleanedProps(props)} className="my-5 bg-border" />
           ),
-
-          code: ({ ...props }) => {
-            const codeStr = onlyText(props.children);
-
-            if (props?.className || codeStr.length > 100) {
-              if (code?.disableCodeHighlight || !props.className) {
-                return (
-                  <div className="my-4">
-                    {/* @ts-expect-error - TODO: fix this */}
-                    <PlainTextCodeBlock
-                      {...cleanedProps(props)}
-                      code={onlyText(props.children).trim()}
-                      className={markdownProps.code?.className}
-                    />
-                  </div>
-                );
-              }
-              const language = props.className.replace("language-", "");
-              return (
-                <div className="my-4">
-                  <CodeClient
-                    // @ts-expect-error - TODO: fix this
-                    lang={language}
-                    {...cleanedProps(props)}
-                    code={onlyText(props.children).trim()}
-                    ignoreFormattingErrors={code?.ignoreFormattingErrors}
-                    className={markdownProps.code?.className}
-                  />
-                </div>
-              );
-            }
-
-            return (
-              <InlineCode
-                code={onlyText(props.children).trim()}
-                className={markdownProps.inlineCode?.className}
-              />
-            );
-          },
+          li: ({ children: c, ...props }) => (
+            <li
+              className={cn(
+                "mb-1.5 text-muted-foreground leading-loose [&>p]:m-0",
+                markdownProps.li?.className,
+              )}
+              {...cleanedProps(props)}
+            >
+              {c}
+            </li>
+          ),
+          ol: (props) => (
+            <ol
+              className="mb-4 list-outside list-decimal pl-5 [&_ol_li:first-of-type]:mt-1.5 [&_ul_li:first-of-type]:mt-1.5"
+              {...cleanedProps(props)}
+            />
+          ),
 
           p: (props) => (
             <p
@@ -158,6 +171,9 @@ export const MarkdownRenderer: React.FC<{
               {...cleanedProps(props)}
             />
           ),
+          strong(props) {
+            return <strong className="font-medium" {...cleanedProps(props)} />;
+          },
 
           table: (props) => (
             <div className="mb-6">
@@ -166,6 +182,11 @@ export const MarkdownRenderer: React.FC<{
               </TableContainer>
             </div>
           ),
+          tbody: (props) => <TableBody {...cleanedProps(props)} />,
+
+          td: (props) => (
+            <TableCell {...cleanedProps(props)} className="text-left" />
+          ),
 
           th: ({ children: c, ...props }) => (
             <TableHead
@@ -175,12 +196,7 @@ export const MarkdownRenderer: React.FC<{
               {c}
             </TableHead>
           ),
-
-          td: (props) => (
-            <TableCell {...cleanedProps(props)} className="text-left" />
-          ),
           thead: (props) => <TableHeader {...cleanedProps(props)} />,
-          tbody: (props) => <TableBody {...cleanedProps(props)} />,
           tr: (props) => <TableRow {...cleanedProps(props)} />,
           ul: (props) => {
             return (
@@ -190,27 +206,9 @@ export const MarkdownRenderer: React.FC<{
               />
             );
           },
-          ol: (props) => (
-            <ol
-              className="mb-4 list-outside list-decimal pl-5 [&_ol_li:first-of-type]:mt-1.5 [&_ul_li:first-of-type]:mt-1.5"
-              {...cleanedProps(props)}
-            />
-          ),
-          li: ({ children: c, ...props }) => (
-            <li
-              className={cn(
-                "mb-1.5 text-muted-foreground leading-loose [&>p]:m-0",
-                markdownProps.li?.className,
-              )}
-              {...cleanedProps(props)}
-            >
-              {c}
-            </li>
-          ),
-          strong(props) {
-            return <strong className="font-medium" {...cleanedProps(props)} />;
-          },
         }}
+        remarkPlugins={[remarkGfm]}
+        skipHtml={markdownProps.skipHtml}
       >
         {markdownText}
       </ReactMarkdown>
@@ -221,7 +219,7 @@ export const MarkdownRenderer: React.FC<{
 function cleanedProps<T extends object & { node?: unknown }>(
   props: T,
 ): Omit<T, "node"> {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  // biome-ignore lint/correctness/noUnusedVariables: EXPECTED
   const { node, ...rest } = props;
   return rest;
 }
diff --git a/apps/dashboard/src/components/contract-components/publisher/publisher-header.tsx b/apps/dashboard/src/components/contract-components/publisher/publisher-header.tsx
index 86dd628bc3b..cf7c95b4946 100644
--- a/apps/dashboard/src/components/contract-components/publisher/publisher-header.tsx
+++ b/apps/dashboard/src/components/contract-components/publisher/publisher-header.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { Skeleton } from "@/components/ui/skeleton";
 import { replaceDeployerAddress } from "lib/publisher-utils";
 import Link from "next/link";
 import { type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
@@ -13,6 +11,8 @@ import {
   AccountProvider,
 } from "thirdweb/react";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { Button } from "@/components/ui/button";
+import { Skeleton } from "@/components/ui/skeleton";
 import { useEns } from "../hooks";
 
 interface PublisherHeaderProps {
@@ -24,8 +24,8 @@ export const PublisherHeader: React.FC<PublisherHeaderProps> = ({
   client,
 }) => {
   const ensQuery = useEns({
-    client,
     addressOrEnsName: wallet,
+    client,
   });
 
   return (
@@ -39,20 +39,20 @@ export const PublisherHeader: React.FC<PublisherHeaderProps> = ({
       >
         <div className="relative flex items-center gap-3">
           <AccountAvatar
+            className="size-10 rounded-full border border-border border-solid object-cover"
             fallbackComponent={
               <AccountBlobbie className="size-10 rounded-full" />
             }
             loadingComponent={<Skeleton className="size-10 rounded-full" />}
-            className="size-10 rounded-full border border-border border-solid object-cover"
           />
 
           <Link
             className="before:absolute before:inset-0 hover:underline"
-            target="_blank"
-            rel="noopener noreferrer"
             href={replaceDeployerAddress(
               `/${ensQuery.data?.ensName || wallet}`,
             )}
+            rel="noopener noreferrer"
+            target="_blank"
           >
             <AccountName
               className="font-medium"
@@ -68,14 +68,14 @@ export const PublisherHeader: React.FC<PublisherHeaderProps> = ({
                   />
                 )
               }
-              loadingComponent={<Skeleton className="h-8 w-40" />}
               formatFn={(name) => replaceDeployerAddress(name)}
+              loadingComponent={<Skeleton className="h-8 w-40" />}
             />
           </Link>
         </div>
       </AccountProvider>
 
-      <Button variant="outline" asChild className="bg-card">
+      <Button asChild className="bg-card" variant="outline">
         <Link href={replaceDeployerAddress(`/${wallet}`)}>
           View all contracts
         </Link>
diff --git a/apps/dashboard/src/components/contract-components/shared/contract-id-image.tsx b/apps/dashboard/src/components/contract-components/shared/contract-id-image.tsx
index cb02cb0801d..abcce56f22a 100644
--- a/apps/dashboard/src/components/contract-components/shared/contract-id-image.tsx
+++ b/apps/dashboard/src/components/contract-components/shared/contract-id-image.tsx
@@ -1,9 +1,9 @@
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 /* eslint-disable @next/next/no-img-element */
 import { replaceIpfsUrl } from "lib/sdk";
 import type { StaticImageData } from "next/image";
 import Image from "next/image";
 import type { FetchDeployMetadataResult } from "thirdweb/contract";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import generalContractIcon from "../../../../public/assets/tw-icons/general.png";
 
 type ContractIdImageProps = {
@@ -31,8 +31,8 @@ export const ContractIdImage: React.FC<ContractIdImageProps> = ({
   }
 
   if (typeof img !== "string") {
-    return <Image className="size-8" src={img as StaticImageData} alt={""} />;
+    return <Image alt={""} className="size-8" src={img as StaticImageData} />;
   }
 
-  return <img className="size-8" src={img} alt={""} />;
+  return <img alt={""} className="size-8" src={img} />;
 };
diff --git a/apps/dashboard/src/components/contract-components/shared/sources-accordion.tsx b/apps/dashboard/src/components/contract-components/shared/sources-accordion.tsx
index 9e8587dbea1..957fdde053a 100644
--- a/apps/dashboard/src/components/contract-components/shared/sources-accordion.tsx
+++ b/apps/dashboard/src/components/contract-components/shared/sources-accordion.tsx
@@ -1,3 +1,4 @@
+import type { Abi } from "abitype";
 import {
   Accordion,
   AccordionContent,
@@ -5,30 +6,32 @@ import {
   AccordionTrigger,
 } from "@/components/ui/accordion";
 import { CodeClient } from "@/components/ui/code/code.client";
-import type { Abi } from "abitype";
 import type { SourceFile } from "../types";
 
 export function SourcesAccordion({
   sources,
   abi,
-}: { sources: SourceFile[]; abi?: Abi }) {
+}: {
+  sources: SourceFile[];
+  abi?: Abi;
+}) {
   return (
-    <Accordion type="multiple" className="w-full">
+    <Accordion className="w-full" type="multiple">
       {abi && (
         <SourceAccordionItem
-          filename="ABI"
-          code={JSON.stringify(abi, null, 2)}
           accordionId="abi"
+          code={JSON.stringify(abi, null, 2)}
+          filename="ABI"
           lang="json"
         />
       )}
 
       {sources.map((signature, i) => (
         <SourceAccordionItem
-          key={signature.filename}
-          filename={signature.filename || "Unknown"}
-          code={signature.source.trim()}
           accordionId={`acc-${i}`}
+          code={signature.source.trim()}
+          filename={signature.filename || "Unknown"}
+          key={signature.filename}
           lang="solidity"
         />
       ))}
@@ -44,18 +47,18 @@ function SourceAccordionItem(props: {
 }) {
   return (
     <AccordionItem
-      value={props.accordionId}
       className="first:border-t-0 last:border-b-0"
+      value={props.accordionId}
     >
       <AccordionTrigger className="flex justify-between px-4 py-3 font-mono text-sm">
         {props.filename}
       </AccordionTrigger>
       <AccordionContent className="border-t p-0">
         <CodeClient
+          className="rounded-none border-none"
           code={props.code}
           lang={props.lang}
           scrollableClassName="max-h-[600px]"
-          className="rounded-none border-none"
         />
       </AccordionContent>
     </AccordionItem>
diff --git a/apps/dashboard/src/components/contract-components/shared/sources-panel.tsx b/apps/dashboard/src/components/contract-components/shared/sources-panel.tsx
index 204a6d9ae1e..5cfb139c7f2 100644
--- a/apps/dashboard/src/components/contract-components/shared/sources-panel.tsx
+++ b/apps/dashboard/src/components/contract-components/shared/sources-panel.tsx
@@ -1,5 +1,5 @@
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import type { Abi } from "abitype";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import type { SourceFile } from "../types";
 import { SourcesAccordion } from "./sources-accordion";
 
@@ -13,14 +13,14 @@ export const SourcesPanel: React.FC<SourcesPanelProps> = ({ sources, abi }) => {
     <div className="flex flex-col gap-8">
       <div className="flex flex-col gap-4">
         {sources && sources?.length > 0 ? (
-          <SourcesAccordion sources={sources} abi={abi} />
+          <SourcesAccordion abi={abi} sources={sources} />
         ) : (
           <p className="text-muted-foreground text-sm">
             Contract source code not available. Try deploying with{" "}
             <UnderlineLink
               href="https://portal.thirdweb.com/contracts/deploy/overview"
-              target="_blank"
               rel="noopener noreferrer"
+              target="_blank"
             >
               thirdweb CLI v0.5+
             </UnderlineLink>
diff --git a/apps/dashboard/src/components/contract-components/tables/cells.tsx b/apps/dashboard/src/components/contract-components/tables/cells.tsx
index 066e7156289..a3ba3ed702a 100644
--- a/apps/dashboard/src/components/contract-components/tables/cells.tsx
+++ b/apps/dashboard/src/components/contract-components/tables/cells.tsx
@@ -1,15 +1,15 @@
 "use client";
 
-import { Badge } from "@/components/ui/badge";
-import { SkeletonContainer } from "@/components/ui/skeleton";
-import { cn } from "@/lib/utils";
 import { useDashboardContractMetadata } from "@3rdweb-sdk/react/hooks/useDashboardContractMetadata";
 import { useChainSlug } from "hooks/chains/chainSlug";
 import { useV5DashboardChain } from "lib/v5-adapter";
 import Link from "next/link";
 import { memo } from "react";
-import { type ThirdwebClient, getContract } from "thirdweb";
+import { getContract, type ThirdwebClient } from "thirdweb";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { Badge } from "@/components/ui/badge";
+import { SkeletonContainer } from "@/components/ui/skeleton";
+import { cn } from "@/lib/utils";
 import { THIRDWEB_DEPLOYER_ADDRESS } from "../../../constants/addresses";
 import { usePublishedContractsFromDeploy } from "../hooks";
 
@@ -25,9 +25,9 @@ export const ContractNameCell = memo(function ContractNameCell(props: {
   const chain = useV5DashboardChain(Number(props.chainId));
 
   const contract = getContract({
-    client: props.client,
     address: props.contractAddress,
     chain,
+    client: props.client,
   });
 
   const contractMetadata = useDashboardContractMetadata(contract);
@@ -37,21 +37,21 @@ export const ContractNameCell = memo(function ContractNameCell(props: {
       loadedData={
         contractMetadata.isFetching ? undefined : contractMetadata.data?.name
       }
-      skeletonData="Custom Contract"
       render={(v) => {
         return (
           <Link
-            href={`/team/${props.teamSlug}/${props.projectSlug}/contract/${chainSlug}/${props.contractAddress}`}
-            passHref
             className={cn(
               "text-foreground",
               props.linkOverlay && "before:absolute before:inset-0",
             )}
+            href={`/team/${props.teamSlug}/${props.projectSlug}/contract/${chainSlug}/${props.contractAddress}`}
+            passHref
           >
             {v || shortenIfAddress(props.contractAddress)}
           </Link>
         );
       }}
+      skeletonData="Custom Contract"
     />
   );
 });
@@ -63,9 +63,9 @@ export const ContractTypeCell = memo(function ContractTypeCell(props: {
 }) {
   const chain = useV5DashboardChain(Number(props.chainId));
   const contract = getContract({
-    client: props.client,
     address: props.contractAddress,
     chain,
+    client: props.client,
   });
 
   const publishedContractsFromDeployQuery =
@@ -101,21 +101,19 @@ export const ContractTypeCell = memo(function ContractTypeCell(props: {
   return (
     <SkeletonContainer
       loadedData={contractType || contractMetadata.data?.contractType}
-      skeletonData="Custom Contract"
       render={(v) => {
         return <ContractTypeCellUI name={v} />;
       }}
+      skeletonData="Custom Contract"
     />
   );
 });
 
-export function ContractTypeCellUI(props: {
-  name: string | undefined;
-}) {
+export function ContractTypeCellUI(props: { name: string | undefined }) {
   return (
     <Badge
-      variant="outline"
       className="line-clamp-1 inline-block max-w-[200px] truncate py-1"
+      variant="outline"
     >
       {props.name || "Custom"}
     </Badge>
diff --git a/apps/dashboard/src/components/contract-components/tables/contract-table.stories.tsx b/apps/dashboard/src/components/contract-components/tables/contract-table.stories.tsx
index 9cb3d218cc6..25cef5fd166 100644
--- a/apps/dashboard/src/components/contract-components/tables/contract-table.stories.tsx
+++ b/apps/dashboard/src/components/contract-components/tables/contract-table.stories.tsx
@@ -8,13 +8,13 @@ import {
 import { ContractTableUI } from "./contract-table";
 
 const meta = {
-  title: "Contracts/ContractTable",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Contracts/ContractTable",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -62,55 +62,54 @@ function Story() {
       <div className="container flex max-w-6xl flex-col gap-10 py-10">
         <BadgeContainer label="0 Contracts">
           <ContractTableUI
-            variant="contract"
             client={storybookThirdwebClient}
             contracts={[]}
-            removeContractFromProject={removeContractStub}
             pageSize={10}
-            teamSlug={teamSlug}
             projectSlug={projectSlug}
+            removeContractFromProject={removeContractStub}
+            teamSlug={teamSlug}
+            variant="contract"
           />
         </BadgeContainer>
 
         <BadgeContainer label="1 Contract">
           <ContractTableUI
-            variant="contract"
             client={storybookThirdwebClient}
             contracts={[popularPolygonNFTs[0] as ProjectContract]}
             pageSize={10}
+            projectSlug={projectSlug}
             removeContractFromProject={removeContractStub}
             teamSlug={teamSlug}
-            projectSlug={projectSlug}
+            variant="contract"
           />
         </BadgeContainer>
 
         <BadgeContainer label="5 Contracts, 1 chain">
           <ContractTableUI
-            variant="contract"
             client={storybookThirdwebClient}
             contracts={popularPolygonNFTs}
             pageSize={10}
+            projectSlug={projectSlug}
             removeContractFromProject={removeContractStub}
             teamSlug={teamSlug}
-            projectSlug={projectSlug}
+            variant="contract"
           />
         </BadgeContainer>
 
         <BadgeContainer label="10 Contracts, 2 chains">
           <ContractTableUI
-            variant="contract"
             client={storybookThirdwebClient}
             contracts={[...popularPolygonNFTs, ...EthereumPopularNFTs]}
             pageSize={10}
+            projectSlug={projectSlug}
             removeContractFromProject={removeContractStub}
             teamSlug={teamSlug}
-            projectSlug={projectSlug}
+            variant="contract"
           />
         </BadgeContainer>
 
         <BadgeContainer label="15 Contracts, 3 chains">
           <ContractTableUI
-            variant="contract"
             client={storybookThirdwebClient}
             contracts={[
               ...popularPolygonNFTs,
@@ -118,9 +117,10 @@ function Story() {
               ...basePopularTokens,
             ]}
             pageSize={10}
+            projectSlug={projectSlug}
             removeContractFromProject={removeContractStub}
             teamSlug={teamSlug}
-            projectSlug={projectSlug}
+            variant="contract"
           />
         </BadgeContainer>
       </div>
@@ -135,10 +135,10 @@ function projectContractStub(
   return {
     chainId,
     contractAddress,
+    contractType: null,
     createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-    id: `${chainId}-${contractAddress}`,
     deploymentType: null,
-    contractType: null,
+    id: `${chainId}-${contractAddress}`,
+    updatedAt: new Date().toISOString(),
   };
 }
diff --git a/apps/dashboard/src/components/contract-components/tables/contract-table.tsx b/apps/dashboard/src/components/contract-components/tables/contract-table.tsx
index bb1d825e13b..81de393a4ad 100644
--- a/apps/dashboard/src/components/contract-components/tables/contract-table.tsx
+++ b/apps/dashboard/src/components/contract-components/tables/contract-table.tsx
@@ -1,15 +1,24 @@
 "use client";
 
+import { useMutation } from "@tanstack/react-query";
+import { ChainIconClient } from "components/icons/ChainIcon";
+import { NetworkSelectDropdown } from "components/selects/NetworkSelectDropdown";
+import { useAllChainsData } from "hooks/chains/allChains";
+import { EllipsisVerticalIcon, ExternalLinkIcon, XIcon } from "lucide-react";
+import Link from "next/link";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
 import { PaginationButtons } from "@/components/pagination-buttons";
-import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { SkeletonContainer } from "@/components/ui/skeleton";
 import {
   Table,
@@ -21,16 +30,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { cn } from "@/lib/utils";
-import { useMutation } from "@tanstack/react-query";
-import { ChainIconClient } from "components/icons/ChainIcon";
-import { NetworkSelectDropdown } from "components/selects/NetworkSelectDropdown";
-import { useAllChainsData } from "hooks/chains/allChains";
-import { EllipsisVerticalIcon, ExternalLinkIcon, XIcon } from "lucide-react";
-import Link from "next/link";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import React from "react";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
 import type { ProjectContract } from "../../../app/(app)/account/contracts/_components/getProjectContracts";
 import { removeContractFromProject } from "../../../app/(app)/team/[team_slug]/[project_slug]/(sidebar)/hooks/project-contracts";
 import {
@@ -55,19 +54,19 @@ export function ContractTable(props: {
 }) {
   return (
     <ContractTableUI
-      variant={props.variant}
-      contracts={props.contracts}
       client={props.client}
+      contracts={props.contracts}
       pageSize={props.pageSize}
-      teamSlug={props.teamSlug}
       projectSlug={props.projectSlug}
       removeContractFromProject={async (contractId) => {
         await removeContractFromProject({
-          teamId: props.teamId,
-          projectId: props.projectId,
           contractId,
+          projectId: props.projectId,
+          teamId: props.teamId,
         });
       }}
+      teamSlug={props.teamSlug}
+      variant={props.variant}
     />
   );
 }
@@ -147,11 +146,11 @@ export function ContractTableUI(props: {
               <TableHead>Type</TableHead>
               <TableHead className="tracking-normal">
                 <NetworkFilterCell
-                  client={props.client}
-                  chainIds={uniqueChainIds}
                   chainId={
                     filters.chainId ? filters.chainId.toString() : undefined
                   }
+                  chainIds={uniqueChainIds}
+                  client={props.client}
                   setChainId={(chainId) => {
                     setFilters({
                       ...filters,
@@ -174,18 +173,18 @@ export function ContractTableUI(props: {
             {paginatedContracts.map((contract) => {
               return (
                 <TableRow
+                  className="cursor-pointer hover:bg-accent/50"
                   key={contract.id}
                   linkBox
-                  className="cursor-pointer hover:bg-accent/50"
                 >
                   <TableCell>
                     <ContractNameCell
                       chainId={contract.chainId}
+                      client={props.client}
                       contractAddress={contract.contractAddress}
                       linkOverlay
-                      teamSlug={props.teamSlug}
                       projectSlug={props.projectSlug}
-                      client={props.client}
+                      teamSlug={props.teamSlug}
                     />
                   </TableCell>
 
@@ -201,8 +200,8 @@ export function ContractTableUI(props: {
                     ) : (
                       <ContractTypeCell
                         chainId={contract.chainId}
-                        contractAddress={contract.contractAddress}
                         client={props.client}
+                        contractAddress={contract.contractAddress}
                       />
                     )}
                   </TableCell>
@@ -217,22 +216,22 @@ export function ContractTableUI(props: {
                   {props.variant === "contract" && (
                     <TableCell>
                       <CopyAddressButton
-                        copyIconPosition="left"
                         address={contract.contractAddress}
-                        variant="ghost"
                         className="-translate-x-2 relative z-10"
+                        copyIconPosition="left"
+                        variant="ghost"
                       />
                     </TableCell>
                   )}
 
                   {props.variant === "asset" && (
                     <TableCell>
-                      <Button variant="ghost" asChild size="sm">
+                      <Button asChild size="sm" variant="ghost">
                         <Link
+                          className="-translate-x-2 relative z-10 flex items-center gap-1.5 text-muted-foreground"
                           href={`/${contract.chainId}/${contract.contractAddress}`}
-                          target="_blank"
                           rel="noopener noreferrer"
-                          className="-translate-x-2 relative z-10 flex items-center gap-1.5 text-muted-foreground"
+                          target="_blank"
                         >
                           View <ExternalLinkIcon className="size-3" />
                         </Link>
@@ -243,14 +242,14 @@ export function ContractTableUI(props: {
                   <TableCell>
                     <ContractActionsCell
                       contractId={contract.id}
-                      removeContractFromProject={
-                        props.removeContractFromProject
-                      }
                       onContractRemoved={() => {
                         setDeletedContractIds((v) => {
                           return [...v, contract.id];
                         });
                       }}
+                      removeContractFromProject={
+                        props.removeContractFromProject
+                      }
                     />
                   </TableCell>
                 </TableRow>
@@ -268,11 +267,11 @@ export function ContractTableUI(props: {
                 <p className="mb-3">No contracts found</p>
               )}
               {props.variant === "contract" && (
-                <Button variant="outline" asChild className="bg-background">
+                <Button asChild className="bg-background" variant="outline">
                   <Link
                     href="/explore"
-                    target="_blank"
                     rel="noopener noreferrer"
+                    target="_blank"
                   >
                     Discover Contracts
                     <ExternalLinkIcon className="ml-2 size-4" />
@@ -320,11 +319,11 @@ const NetworkFilterCell = React.memo(function NetworkFilterCell({
 
   return (
     <NetworkSelectDropdown
-      useCleanChainName={true}
+      client={client}
       enabledChainIds={chainIds}
       onSelect={(chain) => setSelectedChain(chain)}
       selectedChain={selectedChain}
-      client={client}
+      useCleanChainName={true}
     />
   );
 });
@@ -342,19 +341,19 @@ const ChainNameCell = React.memo(function ChainNameCell(props: {
     <div className="flex items-center gap-2">
       <ChainIconClient
         className="size-5"
-        src={data?.icon?.url}
         client={props.client}
+        src={data?.icon?.url}
       />
       <SkeletonContainer
         loadedData={data ? cleanedChainName : undefined}
-        skeletonData={`Chain ID ${props.chainId}`}
         render={(v) => {
           return <p className="text-muted-foreground text-sm">{v}</p>;
         }}
+        skeletonData={`Chain ID ${props.chainId}`}
       />
 
       {data?.testnet && (
-        <Badge variant="outline" className="text-muted-foreground">
+        <Badge className="text-muted-foreground" variant="outline">
           Testnet
         </Badge>
       )}
@@ -371,10 +370,10 @@ const ContractActionsCell = React.memo(function ContractActionsCell(props: {
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
         <Button
-          size="icon"
-          variant="ghost"
           className="relative z-10"
           onClick={(e) => e.stopPropagation()}
+          size="icon"
+          variant="ghost"
         >
           <EllipsisVerticalIcon className="size-4" />
         </Button>
@@ -383,8 +382,8 @@ const ContractActionsCell = React.memo(function ContractActionsCell(props: {
       <DropdownMenuContent onClick={(e) => e.stopPropagation()}>
         <RemoveContractButton
           contractId={props.contractId}
-          removeContractFromProject={props.removeContractFromProject}
           onContractRemoved={props.onContractRemoved}
+          removeContractFromProject={props.removeContractFromProject}
         />
       </DropdownMenuContent>
     </DropdownMenu>
@@ -402,21 +401,21 @@ function RemoveContractButton(props: {
 
   return (
     <Button
-      variant="ghost"
+      className="justify-start gap-2"
+      disabled={removeMutation.isPending}
       onClick={(e) => {
         e.stopPropagation();
         removeMutation.mutateAsync(props.contractId, {
+          onError: () => {
+            toast.error("Failed to remove contract");
+          },
           onSuccess: () => {
             props.onContractRemoved?.();
             toast.success("Contract removed successfully");
           },
-          onError: () => {
-            toast.error("Failed to remove contract");
-          },
         });
       }}
-      disabled={removeMutation.isPending}
-      className="justify-start gap-2"
+      variant="ghost"
     >
       {removeMutation.isPending ? (
         <Spinner className="size-4" />
diff --git a/apps/dashboard/src/components/contract-components/tables/show-more-button.tsx b/apps/dashboard/src/components/contract-components/tables/show-more-button.tsx
index ca3d96e22a8..b8c914cb141 100644
--- a/apps/dashboard/src/components/contract-components/tables/show-more-button.tsx
+++ b/apps/dashboard/src/components/contract-components/tables/show-more-button.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@/components/ui/button";
 import { ChevronDownIcon } from "lucide-react";
 import type { SetStateAction } from "react";
+import { Button } from "@/components/ui/button";
 
 interface ShowMoreButtonProps {
   limit: number;
@@ -16,10 +16,10 @@ export const ShowMoreButton: React.FC<ShowMoreButtonProps> = ({
   return (
     <div className="flex justify-center border-border border-t py-4">
       <Button
+        className="gap-2"
         onClick={() => setShowMoreLimit(showMoreLimit + limit)}
-        variant="ghost"
         size="sm"
-        className="gap-2"
+        variant="ghost"
       >
         Show more
         <ChevronDownIcon className="size-4" />
diff --git a/apps/dashboard/src/components/contract-functions/contract-function-comment.tsx b/apps/dashboard/src/components/contract-functions/contract-function-comment.tsx
index 696f52e70a1..1286140d15c 100644
--- a/apps/dashboard/src/components/contract-functions/contract-function-comment.tsx
+++ b/apps/dashboard/src/components/contract-functions/contract-function-comment.tsx
@@ -1,7 +1,7 @@
-import { Badge } from "@/components/ui/badge";
-import { CodeClient } from "@/components/ui/code/code.client";
 import { useContractFunctionComment } from "contract-ui/hooks/useContractFunctionComment";
 import type { ThirdwebContract } from "thirdweb";
+import { Badge } from "@/components/ui/badge";
+import { CodeClient } from "@/components/ui/code/code.client";
 
 /**
  * Take in a contract & function, try to fetch the comment of that function
@@ -9,7 +9,10 @@ import type { ThirdwebContract } from "thirdweb";
 export default function ContractFunctionComment({
   contract,
   functionName,
-}: { contract: ThirdwebContract; functionName: string }) {
+}: {
+  contract: ThirdwebContract;
+  functionName: string;
+}) {
   const query = useContractFunctionComment(contract, functionName);
 
   if (query.isLoading) {
@@ -24,9 +27,9 @@ export default function ContractFunctionComment({
         About this function <Badge>Beta</Badge>
       </p>
       <CodeClient
-        lang="wikitext"
         code={query.data}
         copyButtonClassName="hidden"
+        lang="wikitext"
       />
     </>
   );
diff --git a/apps/dashboard/src/components/contract-functions/contract-function.tsx b/apps/dashboard/src/components/contract-functions/contract-function.tsx
index a9eb59957c0..a819c685f53 100644
--- a/apps/dashboard/src/components/contract-functions/contract-function.tsx
+++ b/apps/dashboard/src/components/contract-functions/contract-function.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import {
-  type CodeEnvironment,
-  CodeSegment,
-} from "@/components/blocks/code-segment.client";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Badge } from "@/components/ui/badge";
-import { Input } from "@/components/ui/input";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { cn } from "@/lib/utils";
 import {
   Box,
   Divider,
@@ -19,9 +10,9 @@ import {
   SimpleGrid,
   Tab,
   TabList,
+  Table,
   TabPanel,
   TabPanels,
-  Table,
   Tabs,
   Tbody,
   Td,
@@ -35,8 +26,8 @@ import { SearchIcon } from "lucide-react";
 import { usePathname, useSearchParams } from "next/navigation";
 import {
   type Dispatch,
-  type SetStateAction,
   lazy,
+  type SetStateAction,
   useMemo,
   useState,
 } from "react";
@@ -48,6 +39,15 @@ import { useReadContract } from "thirdweb/react";
 import { toFunctionSelector } from "thirdweb/utils";
 import { Button, Card, Heading, Text } from "tw-components";
 import { useDebounce } from "use-debounce";
+import {
+  type CodeEnvironment,
+  CodeSegment,
+} from "@/components/blocks/code-segment.client";
+import { Badge } from "@/components/ui/badge";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Input } from "@/components/ui/input";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { cn } from "@/lib/utils";
 import { useContractFunctionSelectors } from "../../contract-ui/hooks/useContractFunctionSelectors";
 import {
   COMMANDS,
@@ -129,45 +129,45 @@ function ContractFunctionInner(props: ContractFunctionProps) {
     : ("events" as const);
 
   const codeSnippet = formatSnippet(COMMANDS[commandsKey], {
-    contractAddress: contract.address,
-    fn,
     args: fn.inputs?.map((i) => i.name || ""),
     chainId: contract.chain.id,
+    contractAddress: contract.address,
     extensionNamespace,
+    fn,
   });
 
   return (
     <Flex direction="column" gap={1.5}>
-      <Flex alignItems="center" gap={2} direction="row" flexWrap="wrap">
-        <Flex alignItems="baseline" gap={1} flexWrap="wrap">
+      <Flex alignItems="center" direction="row" flexWrap="wrap" gap={2}>
+        <Flex alignItems="baseline" flexWrap="wrap" gap={1}>
           <Heading size="subtitle.md">{camelToTitle(fn.name)}</Heading>
-          <Heading size="subtitle.sm" className="text-muted-foreground">
+          <Heading className="text-muted-foreground" size="subtitle.sm">
             ({fn.name})
           </Heading>
         </Flex>
         {isFunction && <Badge variant="success">{fn.stateMutability}</Badge>}
         {functionSelector && (
           <CopyTextButton
+            className="ml-auto text-xs"
+            copyIconPosition="right"
             textToCopy={functionSelector}
             textToShow={functionSelector}
-            copyIconPosition="right"
             tooltip="The selector of this function"
-            className="ml-auto text-xs"
           />
         )}
       </Flex>
       {isFunction && (
         <InteractiveAbiFunction
-          key={JSON.stringify(fn)}
-          contract={contract}
           abiFunction={fn}
+          contract={contract}
           isLoggedIn={props.isLoggedIn}
+          key={JSON.stringify(fn)}
         />
       )}
 
       {codeSnippet && (
         <>
-          <Heading size="subtitle.md" mt={6}>
+          <Heading mt={6} size="subtitle.md">
             Use this function in your app
           </Heading>
           <Divider mb={2} />
@@ -183,9 +183,7 @@ function ContractFunctionInner(props: ContractFunctionProps) {
   );
 }
 
-function ContractFunctionInputs(props: {
-  fn: AbiFunction | AbiEvent;
-}) {
+function ContractFunctionInputs(props: { fn: AbiFunction | AbiEvent }) {
   const { fn } = props;
   const isFunction = "stateMutability" in fn;
 
@@ -193,12 +191,12 @@ function ContractFunctionInputs(props: {
     <Flex direction="column" gap={1.5}>
       <Flex
         alignItems={{ base: "start", md: "center" }}
-        gap={2}
         direction={{ base: "column", md: "row" }}
+        gap={2}
       >
-        <Flex alignItems="baseline" gap={1} flexWrap="wrap">
+        <Flex alignItems="baseline" flexWrap="wrap" gap={1}>
           <Heading size="subtitle.md">{camelToTitle(fn.name)}</Heading>
-          <Heading size="subtitle.sm" className="text-muted-foreground">
+          <Heading className="text-muted-foreground" size="subtitle.sm">
             ({fn.name})
           </Heading>
         </Flex>
@@ -212,20 +210,20 @@ function ContractFunctionInputs(props: {
             <Heading size="label.lg">Inputs</Heading>
             <Box
               borderTopRadius="lg"
-              p={0}
               overflowX="auto"
+              p={0}
               position="relative"
             >
               <Table size="sm">
                 <Thead>
                   <Tr>
                     <Th border="none">
-                      <Heading as="label" size="label.sm" color="faded">
+                      <Heading as="label" color="faded" size="label.sm">
                         Name
                       </Heading>
                     </Th>
                     <Th border="none">
-                      <Heading as="label" size="label.sm" color="faded">
+                      <Heading as="label" color="faded" size="label.sm">
                         Type
                       </Heading>
                     </Th>
@@ -234,28 +232,28 @@ function ContractFunctionInputs(props: {
                 <Tbody>
                   {fn.inputs.map((input, idx) => (
                     <Tr
-                      borderBottomWidth={1}
                       _last={{ borderBottomWidth: 0 }}
+                      borderBottomWidth={1}
                       key={`${input.name}+${idx}}`}
                     >
                       <Td
-                        borderBottomWidth="inherit"
                         borderBottomColor="borderColor"
+                        borderBottomWidth="inherit"
                       >
                         {input?.name ? (
                           <Text fontFamily="mono">{input.name}</Text>
                         ) : (
                           <Text
-                            fontStyle="italic"
                             className="text-muted-foreground"
+                            fontStyle="italic"
                           >
                             No name defined
                           </Text>
                         )}
                       </Td>
                       <Td
-                        borderBottomWidth="inherit"
                         borderBottomColor="borderColor"
+                        borderBottomWidth="inherit"
                       >
                         <Text fontFamily="mono">{input.type}</Text>
                       </Td>
@@ -372,15 +370,15 @@ export const ContractFunctionsPanel: React.FC<ContractFunctionsPanelProps> = ({
         )
       : e.functions;
     return (
-      <Flex key={e.extension} flexDir="column" mb={6}>
+      <Flex flexDir="column" key={e.extension} mb={6}>
         {e.extension ? (
           <>
-            <Flex alignItems="center" alignContent="center" gap={2}>
+            <Flex alignContent="center" alignItems="center" gap={2}>
               <Image
-                src="/assets/dashboard/extension-check.svg"
                 alt="Extension detected"
-                objectFit="contain"
                 mb="2px"
+                objectFit="contain"
+                src="/assets/dashboard/extension-check.svg"
               />
               <Heading as="label" size="label.md">
                 {e.extension}
@@ -390,7 +388,7 @@ export const ContractFunctionsPanel: React.FC<ContractFunctionsPanelProps> = ({
           </>
         ) : (
           <>
-            <Flex alignItems="center" alignContent="center" gap={2}>
+            <Flex alignContent="center" alignItems="center" gap={2}>
               <Heading as="label" size="label.md">
                 Other Functions
               </Heading>
@@ -401,8 +399,8 @@ export const ContractFunctionsPanel: React.FC<ContractFunctionsPanelProps> = ({
         {selectedFunction &&
           filteredFunctions.map((fn) => (
             <FunctionsOrEventsListItem
-              key={`${fn.name}_${fn.type}_${fn.inputs.length}`}
               fn={fn}
+              key={`${fn.name}_${fn.type}_${fn.inputs.length}`}
               selectedFunction={selectedFunction}
               setSelectedFunction={setSelectedFunction}
             />
@@ -412,37 +410,37 @@ export const ContractFunctionsPanel: React.FC<ContractFunctionsPanelProps> = ({
   };
 
   return (
-    <SimpleGrid height="100%" columns={12} gap={5}>
+    <SimpleGrid columns={12} gap={5} height="100%">
       <GridItem
         as={Card}
-        px={0}
-        pt={0}
+        className="bg-card"
+        colSpan={{ base: 12, md: 4 }}
         height="100%"
         overflow="auto"
-        colSpan={{ base: 12, md: 4 }}
         overflowY="auto"
-        className="bg-card"
+        pt={0}
+        px={0}
       >
         <List height="100%" overflowX="hidden">
           {(writeFunctions.length > 0 || viewFunctions.length > 0) && (
             <Tabs
-              defaultIndex={_defaultTabIndex}
               colorScheme="gray"
-              h="100%"
-              position="relative"
+              defaultIndex={_defaultTabIndex}
               display="flex"
               flexDir="column"
+              h="100%"
+              position="relative"
             >
               <TabList as={Flex}>
                 {writeFunctions.length > 0 && (
-                  <Tab gap={2} flex="1 1 0">
+                  <Tab flex="1 1 0" gap={2}>
                     <Heading color="inherit" my={1} size="label.md">
                       Write
                     </Heading>
                   </Tab>
                 )}
                 {viewFunctions.length > 0 && (
-                  <Tab gap={2} flex="1 1 0">
+                  <Tab flex="1 1 0" gap={2}>
                     <Heading color="inherit" my={1} size="label.md">
                       Read
                     </Heading>
@@ -454,10 +452,10 @@ export const ContractFunctionsPanel: React.FC<ContractFunctionsPanelProps> = ({
                 <div className="relative w-full">
                   <SearchIcon className="-translate-y-1/2 absolute top-[50%] left-3 size-4 text-muted-foreground" />
                   <Input
-                    value={_keywordSearch}
-                    placeholder="Search"
                     className="h-auto rounded-none border-x-0 bg-card py-3 pl-9 focus-visible:ring-0 focus-visible:ring-offset-0"
                     onChange={(e) => setKeywordSearch(e.target.value)}
+                    placeholder="Search"
+                    value={_keywordSearch}
                   />
                 </div>
               </div>
@@ -478,11 +476,11 @@ export const ContractFunctionsPanel: React.FC<ContractFunctionsPanelProps> = ({
           )}
 
           {events.length > 0 && selectedFunction && (
-            <Box px={4} pt={2} overflowX="hidden">
+            <Box overflowX="hidden" pt={2} px={4}>
               {events.map((fn) => (
                 <FunctionsOrEventsListItem
-                  key={`${fn.name}_${fn.type}_${fn.inputs.length}`}
                   fn={fn}
+                  key={`${fn.name}_${fn.type}_${fn.inputs.length}`}
                   selectedFunction={selectedFunction}
                   setSelectedFunction={setSelectedFunction}
                 />
@@ -493,15 +491,15 @@ export const ContractFunctionsPanel: React.FC<ContractFunctionsPanelProps> = ({
       </GridItem>
       <GridItem
         as={Card}
+        className="bg-card"
+        colSpan={{ base: 12, md: 8 }}
         height="100%"
         overflow="auto"
-        colSpan={{ base: 12, md: 8 }}
-        className="bg-card"
       >
         {selectedFunction && (
           <ContractFunction
-            fn={selectedFunction}
             contract={contract}
+            fn={selectedFunction}
             isLoggedIn={isLoggedIn}
           />
         )}
@@ -531,7 +529,6 @@ const FunctionsOrEventsListItem: React.FC<FunctionsOrEventsListItemProps> = ({
   return (
     <li className="my-1">
       <Button
-        size="sm"
         className={cn(
           "!font-medium !text-muted-foreground hover:!text-foreground font-mono",
           {
@@ -547,6 +544,7 @@ const FunctionsOrEventsListItem: React.FC<FunctionsOrEventsListItemProps> = ({
             router.push(`${pathname}?selector=${selector}`);
           }
         }}
+        size="sm"
         variant="link"
       >
         {fn.name}
diff --git a/apps/dashboard/src/components/contract-functions/contract-functions.tsx b/apps/dashboard/src/components/contract-functions/contract-functions.tsx
index dcd48071c98..000e0b7070f 100644
--- a/apps/dashboard/src/components/contract-functions/contract-functions.tsx
+++ b/apps/dashboard/src/components/contract-functions/contract-functions.tsx
@@ -37,11 +37,11 @@ export const ContractFunctionsOverview: React.FC<ContractFunctionsOverview> = ({
 }) => {
   if (onlyFunctions) {
     return (
-      <Flex height="100%" flexDir="column" gap={2}>
+      <Flex flexDir="column" gap={2} height="100%">
         {functions && functions.length > 0 && (
           <ContractFunctionsPanel
-            fnsOrEvents={functions}
             contract={contract}
+            fnsOrEvents={functions}
             isLoggedIn={isLoggedIn}
           />
         )}
@@ -51,8 +51,8 @@ export const ContractFunctionsOverview: React.FC<ContractFunctionsOverview> = ({
 
   return (
     <Flex flexDir="column" gap={2} w="100%">
-      <Tabs isLazy lazyBehavior="keepMounted" colorScheme="gray">
-        <TabList px={0} borderBottomColor="borderColor" borderBottomWidth="1px">
+      <Tabs colorScheme="gray" isLazy lazyBehavior="keepMounted">
+        <TabList borderBottomColor="borderColor" borderBottomWidth="1px" px={0}>
           {functions && functions.length > 0 ? (
             <Tab>
               <Heading color="inherit" my={1} size="label.lg">
@@ -86,8 +86,8 @@ export const ContractFunctionsOverview: React.FC<ContractFunctionsOverview> = ({
           {functions && functions.length > 0 ? (
             <TabPanel h="40rem">
               <ContractFunctionsPanel
-                fnsOrEvents={functions}
                 contract={contract}
+                fnsOrEvents={functions}
                 isLoggedIn={isLoggedIn}
               />
             </TabPanel>
@@ -95,8 +95,8 @@ export const ContractFunctionsOverview: React.FC<ContractFunctionsOverview> = ({
           {events && events?.length > 0 ? (
             <TabPanel>
               <ContractFunctionsPanel
-                fnsOrEvents={events}
                 contract={contract}
+                fnsOrEvents={events}
                 isLoggedIn={isLoggedIn}
               />
             </TabPanel>
@@ -106,15 +106,15 @@ export const ContractFunctionsOverview: React.FC<ContractFunctionsOverview> = ({
               <div className="flex flex-col gap-6">
                 <CodeOverview
                   abi={abi}
-                  noSidebar
                   chainId={contract?.chain.id || 1}
+                  noSidebar
                 />
               </div>
             </TabPanel>
           )}
           {(sources || abi) && (
             <TabPanel>
-              <SourcesPanel sources={sources} abi={abi} />
+              <SourcesPanel abi={abi} sources={sources} />
             </TabPanel>
           )}
         </TabPanels>
diff --git a/apps/dashboard/src/components/contract-functions/interactive-abi-function.tsx b/apps/dashboard/src/components/contract-functions/interactive-abi-function.tsx
index e94e2418a77..3ac1dd6d8f3 100644
--- a/apps/dashboard/src/components/contract-functions/interactive-abi-function.tsx
+++ b/apps/dashboard/src/components/contract-functions/interactive-abi-function.tsx
@@ -1,11 +1,5 @@
 "use client";
 
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Badge } from "@/components/ui/badge";
-import { CodeClient } from "@/components/ui/code/code.client";
-import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
-import { InlineCode } from "@/components/ui/inline-code";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import {
   ButtonGroup,
   Divider,
@@ -25,10 +19,10 @@ import { useEffect, useId, useMemo, useState } from "react";
 import { FormProvider, useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import {
-  type ThirdwebContract,
   prepareContractCall,
   readContract,
   simulateTransaction,
+  type ThirdwebContract,
   toSerializableTransaction,
   toWei,
 } from "thirdweb";
@@ -43,6 +37,12 @@ import {
   Heading,
   Text,
 } from "tw-components";
+import { Badge } from "@/components/ui/badge";
+import { CodeClient } from "@/components/ui/code/code.client";
+import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
+import { InlineCode } from "@/components/ui/inline-code";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
 function formatResponseData(data: unknown): {
   type: "json" | "text";
@@ -53,14 +53,14 @@ function formatResponseData(data: unknown): {
   if (typeof data === "string") {
     // "" is a valid response. For example, some token has `symbol` === ""
     if (data === "") {
-      return { type: "text", data: `""` };
+      return { data: `""`, type: "text" };
     }
-    return { type: "text", data };
+    return { data, type: "text" };
   }
   if (typeof data === "bigint") {
     return {
-      type: "text",
       data: data.toString(),
+      type: "text",
     };
   }
 
@@ -68,19 +68,18 @@ function formatResponseData(data: unknown): {
     // biome-ignore lint/suspicious/noExplicitAny: FIXME
     const receipt: any = (data as any).receipt;
     if (receipt) {
-      // biome-ignore lint/style/noParameterAssign: FIXME
       data = {
-        to: receipt.to,
+        events: receipt.events,
         from: receipt.from,
+        to: receipt.to,
         transactionHash: receipt.transactionHash,
-        events: receipt.events,
       };
     }
   }
 
   return {
-    type: "json",
     data: stringify(data, null, 2),
+    type: "json",
   };
 }
 
@@ -143,7 +142,10 @@ function useAsyncRead(contract: ThirdwebContract, abiFunction: AbiFunction) {
     mutationFn: async ({
       args,
       types,
-    }: { args: unknown[]; types: string[] }) => {
+    }: {
+      args: unknown[];
+      types: string[];
+    }) => {
       const params = parseAbiParams(types, args);
       return readContract({
         contract,
@@ -236,10 +238,10 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
     defaultValues: {
       params:
         abiFunction.inputs.map((i) => ({
+          components: "components" in i ? i.components : undefined,
           key: i.name || "key",
-          value: "",
           type: i.type,
-          components: "components" in i ? i.components : undefined,
+          value: "",
         })) || [],
       value: "0",
     },
@@ -359,9 +361,9 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
     const formatted = formatContractCall(d.params);
     const params = parseAbiParams(types, formatted);
     txSimulation.mutate({
+      abiFunction,
       contract,
       params,
-      abiFunction,
       value: d.value ? toWei(d.value) : undefined,
     });
   });
@@ -369,25 +371,25 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
   return (
     <FormProvider {...form}>
       <Card
-        gridColumn={{ base: "span 12", md: "span 9" }}
-        borderRadius="none"
+        as={Flex}
         bg="transparent"
         border="none"
-        as={Flex}
-        flexDirection="column"
-        gap={4}
+        borderRadius="none"
         boxShadow="none"
+        flexDirection="column"
         flexGrow={1}
-        w="100%"
+        gap={4}
+        gridColumn={{ base: "span 12", md: "span 9" }}
         p={0}
+        w="100%"
       >
         <Flex
-          position="relative"
-          w="100%"
+          as="form"
           direction="column"
           gap={2}
-          as="form"
           id={formId}
+          position="relative"
+          w="100%"
         >
           {fields.length > 0 && (
             <>
@@ -395,24 +397,24 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
               {fields.map((item, index) => {
                 return (
                   <FormControl
-                    key={item.id}
-                    mb="8px"
                     isInvalid={
                       !!form.getFieldState(
                         `params.${index}.value`,
                         form.formState,
                       ).error
                     }
+                    key={item.id}
+                    mb="8px"
                   >
                     <Flex justify="space-between">
                       <FormLabel>{camelToTitle(item.key)}</FormLabel>
                       <Text fontSize="12px">{item.key}</Text>
                     </Flex>
                     <SolidityInput
-                      solidityName={item.key}
-                      solidityType={item.type}
                       // @ts-expect-error - old types, need to update
                       solidityComponents={item.components}
+                      solidityName={item.key}
+                      solidityType={item.type}
                       {...form.register(`params.${index}.value`)}
                       functionName={abiFunction.name}
                     />
@@ -449,9 +451,9 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
               <Divider />
               <Heading size="label.sm">Error</Heading>
               <InlineCode
+                className="relative w-full whitespace-pre-wrap rounded-md border border-border p-4 text-red-500"
                 //  biome-ignore lint/suspicious/noExplicitAny: FIXME
                 code={formatError(error as any)}
-                className="relative w-full whitespace-pre-wrap rounded-md border border-border p-4 text-red-500"
               />
             </>
           ) : formattedResponseData ? (
@@ -471,8 +473,8 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
                 <PlainTextCodeBlock code={formattedResponseData.data} />
               ) : (
                 <CodeClient
-                  lang={formattedResponseData.type}
                   code={formattedResponseData.data}
+                  lang={formattedResponseData.type}
                 />
               )}
 
@@ -485,8 +487,8 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
                         formattedResponseData.data,
                         contract.client,
                       )}
-                      target="_blank"
                       rel="noopener noreferrer"
+                      target="_blank"
                     >
                       Open in gateway
                     </UnderlineLink>
@@ -497,10 +499,10 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
                 formattedResponseData.data.startsWith("https://")) ||
                 formattedResponseData.data.startsWith("http://")) && (
                 <Link
+                  className="mt-1 inline-flex items-center gap-2 text-muted-foreground text-sm hover:text-foreground"
                   href={formattedResponseData.data}
-                  target="_blank"
                   rel="noopener noreferrer"
-                  className="mt-1 inline-flex items-center gap-2 text-muted-foreground text-sm hover:text-foreground"
+                  target="_blank"
                 >
                   Open link
                   <ExternalLinkIcon className="size-4" />
@@ -514,23 +516,23 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
         <ButtonGroup ml="auto">
           {isView ? (
             <Button
-              isDisabled={!abiFunction}
-              rightIcon={<PlayIcon className="size-4" />}
               colorScheme="primary"
+              form={formId}
+              isDisabled={!abiFunction}
               isLoading={readLoading}
               onClick={handleContractRead}
-              form={formId}
+              rightIcon={<PlayIcon className="size-4" />}
             >
               Run
             </Button>
           ) : (
             <>
               <Button
-                onClick={handleContractSimulation}
                 isDisabled={
                   !abiFunction || txSimulation.isPending || mutationLoading
                 }
                 isLoading={txSimulation.isPending}
+                onClick={handleContractSimulation}
               >
                 <ToolTipLabel label="Simulate the transaction to see its potential outcome without actually sending it to the network. This action doesn't cost gas.">
                   <span className="mr-3">
@@ -544,12 +546,12 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
                 disabled={
                   !abiFunction || txSimulation.isPending || mutationLoading
                 }
-                transactionCount={1}
-                isPending={mutationLoading}
                 form={formId}
+                isLoggedIn={props.isLoggedIn}
+                isPending={mutationLoading}
                 onClick={handleContractWrite}
+                transactionCount={1}
                 txChainID={contract.chain.id}
-                isLoggedIn={props.isLoggedIn}
               >
                 Execute
               </TransactionButton>
diff --git a/apps/dashboard/src/components/contract-pages/forms/properties.shared.tsx b/apps/dashboard/src/components/contract-pages/forms/properties.shared.tsx
index bd24dc6f3fc..f40e3455ece 100644
--- a/apps/dashboard/src/components/contract-pages/forms/properties.shared.tsx
+++ b/apps/dashboard/src/components/contract-pages/forms/properties.shared.tsx
@@ -20,8 +20,8 @@ import {
   type UseFormRegister,
   type UseFormSetValue,
   type UseFormWatch,
-  type WatchObserver,
   useFieldArray,
+  type WatchObserver,
 } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
 import { Button, FormErrorMessage, FormLabel } from "tw-components";
@@ -71,15 +71,15 @@ export const PropertiesFormControl = <
 
   return (
     <div className="flex flex-col gap-4">
-      <Flex justify="space-between" align="center" direction="row">
+      <Flex align="center" direction="row" justify="space-between">
         <FormLabel m={0}>Attributes</FormLabel>
         <Button
-          rightIcon={<BanIcon className="size-4" />}
-          variant="outline"
           colorScheme="red"
-          size="xs"
           // biome-ignore lint/suspicious/noExplicitAny: FIXME
           onClick={() => replace([{ trait_type: "", value: "" } as any])}
+          rightIcon={<BanIcon className="size-4" />}
+          size="xs"
+          variant="outline"
         >
           Reset
         </Button>
@@ -96,8 +96,8 @@ export const PropertiesFormControl = <
         return (
           <div className="flex flex-row items-center gap-2" key={field.id}>
             <FormControl
-              isInvalid={isInvalid}
               className="flex flex-row items-start gap-3"
+              isInvalid={isInvalid}
             >
               <FormControl isInvalid={!!keyError}>
                 <Input
@@ -164,25 +164,25 @@ export const PropertiesFormControl = <
               </FormControl>
             </FormControl>
             <IconButton
-              onClick={() => remove(index)}
-              colorScheme="red"
-              variant="ghost"
               aria-label="remove key value pair"
-              size="xs"
+              colorScheme="red"
               icon={<XIcon />}
+              onClick={() => remove(index)}
+              size="xs"
+              variant="ghost"
             />
           </div>
         );
       })}
       <div className="flex flex-row gap-2">
         <Button
-          leftIcon={<PlusIcon className="size-5" />}
           colorScheme="purple"
-          size="sm"
+          leftIcon={<PlusIcon className="size-5" />}
           onClick={() =>
             // biome-ignore lint/suspicious/noExplicitAny: FIXME
             append({ trait_type: undefined, value: undefined } as any)
           }
+          size="sm"
         >
           Add Row
         </Button>
diff --git a/apps/dashboard/src/components/contract-pages/table/table-columns/cells/media-cell.tsx b/apps/dashboard/src/components/contract-pages/table/table-columns/cells/media-cell.tsx
index 2216dd06694..c76fd76f827 100644
--- a/apps/dashboard/src/components/contract-pages/table/table-columns/cells/media-cell.tsx
+++ b/apps/dashboard/src/components/contract-pages/table/table-columns/cells/media-cell.tsx
@@ -14,12 +14,12 @@ export const MediaCell: React.FC<MediaCellProps> = ({ cell, client }) => {
 
   return (
     <NFTMediaWithEmptyState
-      client={client}
       className="pointer-events-none"
+      client={client}
+      height="120px"
       metadata={nftMetadata}
       requireInteraction
       width="120px"
-      height="120px"
     />
   );
 };
diff --git a/apps/dashboard/src/components/dashboard/StepsCard.stories.tsx b/apps/dashboard/src/components/dashboard/StepsCard.stories.tsx
index 9dc3a8a3490..8efe850ac0b 100644
--- a/apps/dashboard/src/components/dashboard/StepsCard.stories.tsx
+++ b/apps/dashboard/src/components/dashboard/StepsCard.stories.tsx
@@ -3,8 +3,8 @@ import { BadgeContainer } from "../../stories/utils";
 import { StepsCard } from "./StepsCard";
 
 const meta = {
-  title: "Blocks/Cards/StepsCard",
   component: Component,
+  title: "Blocks/Cards/StepsCard",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -16,8 +16,8 @@ const defaultCardDescription =
 
 export const Variants: Story = {
   args: {
-    cardTitle: defaultCardTitle,
     cardDescription: defaultCardDescription,
+    cardTitle: defaultCardTitle,
   },
 };
 
@@ -28,38 +28,35 @@ function stepStub(options: {
   description?: string;
 }) {
   return {
-    title: `This is step ${options.id} title`,
+    children: <ChildrenPlaceholder />,
+    completed: options.completed,
     description:
       options.description ?? `This is step ${options.id} description`,
-    completed: options.completed,
-    children: <ChildrenPlaceholder />,
     showCompletedChildren: options.showCompletedChildren,
+    title: `This is step ${options.id} title`,
   };
 }
 
-function Component(props: {
-  cardTitle: string;
-  cardDescription: string;
-}) {
+function Component(props: { cardTitle: string; cardDescription: string }) {
   const { cardTitle, cardDescription } = props;
   return (
     <div className="container flex max-w-6xl flex-col gap-10 py-10">
       <BadgeContainer label="2 steps, 0 Completed">
         <StepsCard
+          description={cardDescription}
           steps={[
-            stepStub({ id: 1, completed: false }),
-            stepStub({ id: 2, completed: false }),
+            stepStub({ completed: false, id: 1 }),
+            stepStub({ completed: false, id: 2 }),
           ]}
           title={cardTitle}
-          description={cardDescription}
         />
       </BadgeContainer>
 
       <BadgeContainer label="2 steps, 0 Completed, No Card desc">
         <StepsCard
           steps={[
-            stepStub({ id: 1, completed: false }),
-            stepStub({ id: 2, completed: false }),
+            stepStub({ completed: false, id: 1 }),
+            stepStub({ completed: false, id: 2 }),
           ]}
           title={cardTitle}
         />
@@ -67,37 +64,37 @@ function Component(props: {
 
       <BadgeContainer label="2 steps, 1 Completed">
         <StepsCard
+          description={cardDescription}
           steps={[
-            stepStub({ id: 1, completed: true }),
-            stepStub({ id: 2, completed: false }),
+            stepStub({ completed: true, id: 1 }),
+            stepStub({ completed: false, id: 2 }),
           ]}
           title={cardTitle}
-          description={cardDescription}
         />
       </BadgeContainer>
 
       <BadgeContainer label="2 steps, First Completed, Show Completed">
         <StepsCard
+          description={cardDescription}
           steps={[
-            stepStub({ id: 1, completed: true, showCompletedChildren: true }),
+            stepStub({ completed: true, id: 1, showCompletedChildren: true }),
             stepStub({
-              id: 2,
               completed: false,
+              id: 2,
             }),
           ]}
           title={cardTitle}
-          description={cardDescription}
         />
       </BadgeContainer>
 
       <BadgeContainer label="2 steps, All Complete - No render">
         <StepsCard
+          description={cardDescription}
           steps={[
-            stepStub({ id: 1, completed: true }),
-            stepStub({ id: 2, completed: true }),
+            stepStub({ completed: true, id: 1 }),
+            stepStub({ completed: true, id: 2 }),
           ]}
           title={cardTitle}
-          description={cardDescription}
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/components/dashboard/StepsCard.tsx b/apps/dashboard/src/components/dashboard/StepsCard.tsx
index 3e9542fd985..4f565c69ffb 100644
--- a/apps/dashboard/src/components/dashboard/StepsCard.tsx
+++ b/apps/dashboard/src/components/dashboard/StepsCard.tsx
@@ -1,7 +1,7 @@
-import { Progress } from "@/components/ui/progress";
-import { cn } from "@/lib/utils";
 import { CheckIcon } from "lucide-react";
 import { type JSX, useMemo } from "react";
+import { Progress } from "@/components/ui/progress";
+import { cn } from "@/lib/utils";
 
 export type Step = {
   title: string | JSX.Element;
@@ -49,7 +49,7 @@ export const StepsCard: React.FC<StepsCardProps> = ({
           </p>
         )}
 
-        <Progress value={Math.max(percentage, 10)} className="h-2" />
+        <Progress className="h-2" value={Math.max(percentage, 10)} />
 
         <p className="text-link-foreground text-xs lg:text-sm">
           {lastStepCompleted + 1}/{steps.length} tasks completed
@@ -70,8 +70,8 @@ export const StepsCard: React.FC<StepsCardProps> = ({
               key={index}
             >
               <StepNumberBadge
-                number={index + 1}
                 isCompleted={step.completed}
+                number={index + 1}
               />
 
               <div className="grow">
@@ -107,10 +107,7 @@ export const StepsCard: React.FC<StepsCardProps> = ({
   );
 };
 
-function StepNumberBadge(props: {
-  number: number;
-  isCompleted: boolean;
-}) {
+function StepNumberBadge(props: { number: number; isCompleted: boolean }) {
   return (
     <div className="flex size-7 shrink-0 items-center justify-center self-start rounded-full border border-border bg-card">
       {props.isCompleted ? (
diff --git a/apps/dashboard/src/components/embedded-wallets/Analytics/InAppWalletUsersChartCard.stories.tsx b/apps/dashboard/src/components/embedded-wallets/Analytics/InAppWalletUsersChartCard.stories.tsx
index 31da759f97f..0b8911e3c10 100644
--- a/apps/dashboard/src/components/embedded-wallets/Analytics/InAppWalletUsersChartCard.stories.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Analytics/InAppWalletUsersChartCard.stories.tsx
@@ -5,8 +5,8 @@ import { BadgeContainer } from "../../../stories/utils";
 import { InAppWalletUsersChartCardUI } from "./InAppWalletUsersChartCard";
 
 const meta = {
-  title: "Charts/InAppWallets",
   component: Component,
+  title: "Charts/InAppWallets",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -24,55 +24,55 @@ function Component() {
     <div className="container flex max-w-6xl flex-col gap-10 py-10">
       <BadgeContainer label="30 days">
         <InAppWalletUsersChartCardUI
+          description={description}
           inAppWalletStats={createInAppWalletStatsStub(30)}
           isPending={false}
           title={title}
-          description={description}
         />
       </BadgeContainer>
 
       <BadgeContainer label="60 days">
         <InAppWalletUsersChartCardUI
+          description={description}
           inAppWalletStats={createInAppWalletStatsStub(60)}
           isPending={false}
           title={title}
-          description={description}
         />
       </BadgeContainer>
 
       <BadgeContainer label="120 days">
         <InAppWalletUsersChartCardUI
+          description={description}
           inAppWalletStats={createInAppWalletStatsStub(120)}
           isPending={false}
           title={title}
-          description={description}
         />
       </BadgeContainer>
 
       <BadgeContainer label="10 days">
         <InAppWalletUsersChartCardUI
+          description={description}
           inAppWalletStats={createInAppWalletStatsStub(10)}
           isPending={false}
           title={title}
-          description={description}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Empty List">
         <InAppWalletUsersChartCardUI
+          description={description}
           inAppWalletStats={createInAppWalletStatsStub(0)}
           isPending={false}
           title={title}
-          description={description}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Pending">
         <InAppWalletUsersChartCardUI
+          description={description}
           inAppWalletStats={[]}
           isPending={true}
           title={title}
-          description={description}
         />
       </BadgeContainer>
     </div>
@@ -116,9 +116,9 @@ function createInAppWalletStatsStub(days: number): InAppWalletStats[] {
   while (d !== 0) {
     const uniqueWallets = Math.floor(Math.random() * 100);
     stubbedData.push({
+      authenticationMethod: pickRandomAuthMethod(),
       date: new Date(2024, 11, d).toLocaleString(),
       uniqueWalletsConnected: uniqueWallets,
-      authenticationMethod: pickRandomAuthMethod(),
     });
 
     if (Math.random() > 0.7) {
diff --git a/apps/dashboard/src/components/embedded-wallets/Analytics/InAppWalletUsersChartCard.tsx b/apps/dashboard/src/components/embedded-wallets/Analytics/InAppWalletUsersChartCard.tsx
index 894c13e7c58..24bd1eb213c 100644
--- a/apps/dashboard/src/components/embedded-wallets/Analytics/InAppWalletUsersChartCard.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Analytics/InAppWalletUsersChartCard.tsx
@@ -1,7 +1,4 @@
 "use client";
-import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
-import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
-import type { ChartConfig } from "@/components/ui/chart";
 import { ReactIcon } from "components/icons/brand-icons/ReactIcon";
 import { TypeScriptIcon } from "components/icons/brand-icons/TypeScriptIcon";
 import { UnityIcon } from "components/icons/brand-icons/UnityIcon";
@@ -10,6 +7,9 @@ import { DocLink } from "components/shared/DocLink";
 import { format } from "date-fns";
 import { useMemo } from "react";
 import type { InAppWalletStats } from "types/analytics";
+import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
+import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
+import type { ChartConfig } from "@/components/ui/chart";
 
 type ChartData = Record<string, number> & {
   time: string; // human readable date
@@ -73,8 +73,8 @@ export function InAppWalletUsersChartCardUI(props: {
 
     authMethodsToShow.forEach((walletType, i) => {
       _chartConfig[walletType] = {
-        label: authMethodsToShow[i],
         color: `hsl(var(--chart-${(i % 10) + 1}))`,
+        label: authMethodsToShow[i],
       };
     });
 
@@ -82,16 +82,16 @@ export function InAppWalletUsersChartCardUI(props: {
       // Add Other
       authMethodsToShow.push("others");
       _chartConfig.others = {
-        label: "Others",
         color: "hsl(var(--muted-foreground))",
+        label: "Others",
       };
     }
 
     return {
+      chartConfig: _chartConfig,
       chartData: Array.from(_chartDataMap.values()).sort(
         (a, b) => new Date(a.time).getTime() - new Date(b.time).getTime(),
       ),
-      chartConfig: _chartConfig,
     };
   }, [inAppWalletStats]);
 
@@ -103,6 +103,8 @@ export function InAppWalletUsersChartCardUI(props: {
 
   return (
     <ThirdwebBarChart
+      chartClassName="aspect-[1.5] lg:aspect-[3.5]"
+      config={chartConfig}
       customHeader={
         <div className="relative px-6 pt-6">
           <h3 className="mb-0.5 font-semibold text-xl tracking-tight">
@@ -114,8 +116,8 @@ export function InAppWalletUsersChartCardUI(props: {
 
           <ExportToCSVButton
             className="top-6 right-6 mb-4 w-full bg-background md:absolute md:mb-0 md:flex md:w-auto"
-            fileName="Connect Wallets"
             disabled={disableActions}
+            fileName="Connect Wallets"
             getData={async () => {
               // Shows the number of each type of wallet connected on all dates
               const header = ["Date", ...uniqueAuthMethods];
@@ -132,13 +134,10 @@ export function InAppWalletUsersChartCardUI(props: {
         </div>
       }
       data={chartData}
-      isPending={props.isPending}
-      config={chartConfig}
-      chartClassName="aspect-[1.5] lg:aspect-[3.5]"
       emptyChartState={<InAppWalletUsersEmptyChartState />}
-      variant="stacked"
-      showLegend
       hideLabel={false}
+      isPending={props.isPending}
+      showLegend
       toolTipLabelFormatter={(_v, item) => {
         if (Array.isArray(item)) {
           const time = item[0].payload.time as number;
@@ -146,6 +145,7 @@ export function InAppWalletUsersChartCardUI(props: {
         }
         return undefined;
       }}
+      variant="stacked"
     />
   );
 }
@@ -158,29 +158,29 @@ function InAppWalletUsersEmptyChartState() {
       </span>
       <div className="flex max-w-md flex-wrap items-center justify-center gap-x-6 gap-y-4">
         <DocLink
-          link="https://portal.thirdweb.com/typescript/v5/inAppWallet"
-          label="TypeScript"
           icon={TypeScriptIcon}
+          label="TypeScript"
+          link="https://portal.thirdweb.com/typescript/v5/inAppWallet"
         />
         <DocLink
-          link="https://portal.thirdweb.com/react/v5/in-app-wallet/get-started"
-          label="React"
           icon={ReactIcon}
+          label="React"
+          link="https://portal.thirdweb.com/react/v5/in-app-wallet/get-started"
         />
         <DocLink
-          link="https://portal.thirdweb.com/react/v5/in-app-wallet/get-started"
-          label="React Native"
           icon={ReactIcon}
+          label="React Native"
+          link="https://portal.thirdweb.com/react/v5/in-app-wallet/get-started"
         />
         <DocLink
-          link="https://portal.thirdweb.com/unity/v5/wallets/in-app-wallet"
-          label="Unity"
           icon={UnityIcon}
+          label="Unity"
+          link="https://portal.thirdweb.com/unity/v5/wallets/in-app-wallet"
         />
         <DocLink
-          link="https://portal.thirdweb.com/unreal-engine/getting-started"
-          label="Unreal Engine"
           icon={UnrealIcon}
+          label="Unreal Engine"
+          link="https://portal.thirdweb.com/unreal-engine/getting-started"
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/components/embedded-wallets/Analytics/Summary.tsx b/apps/dashboard/src/components/embedded-wallets/Analytics/Summary.tsx
index 405d52958a3..c41fe4628ce 100644
--- a/apps/dashboard/src/components/embedded-wallets/Analytics/Summary.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Analytics/Summary.tsx
@@ -1,9 +1,9 @@
-import { getInAppWalletUsage } from "@/api/analytics";
 import { StatCard } from "components/analytics/stat";
 import { subDays } from "date-fns";
 import { ActivityIcon, UserIcon } from "lucide-react";
 import { Suspense } from "react";
 import type { InAppWalletStats } from "types/analytics";
+import { getInAppWalletUsage } from "@/api/analytics";
 
 function InAppWalletsSummaryInner(props: {
   allTimeStats: InAppWalletStats[] | undefined;
@@ -33,16 +33,16 @@ function InAppWalletsSummaryInner(props: {
   return (
     <div className="grid grid-cols-2 gap-4">
       <StatCard
-        label="Total Users"
-        value={allTimeStats?.uniqueWalletsConnected || 0}
         icon={ActivityIcon}
         isPending={props.isPending}
+        label="Total Users"
+        value={allTimeStats?.uniqueWalletsConnected || 0}
       />
       <StatCard
-        label="Monthly Active Users"
-        value={monthlyStats?.uniqueWalletsConnected || 0}
         icon={UserIcon}
         isPending={props.isPending}
+        label="Monthly Active Users"
+        value={monthlyStats?.uniqueWalletsConnected || 0}
       />
     </div>
   );
@@ -54,19 +54,19 @@ async function AsyncInAppWalletsSummary(props: {
 }) {
   const { teamId, projectId } = props;
   const allTimeStatsPromise = getInAppWalletUsage({
-    teamId,
-    projectId,
     from: new Date(2022, 0, 1),
-    to: new Date(),
     period: "all",
+    projectId,
+    teamId,
+    to: new Date(),
   });
 
   const monthlyStatsPromise = getInAppWalletUsage({
-    teamId,
-    projectId,
     from: subDays(new Date(), 30),
-    to: new Date(),
     period: "month",
+    projectId,
+    teamId,
+    to: new Date(),
   });
 
   const [allTimeStats, monthlyStats] = await Promise.all([
@@ -77,8 +77,8 @@ async function AsyncInAppWalletsSummary(props: {
   return (
     <InAppWalletsSummaryInner
       allTimeStats={allTimeStats || undefined}
-      monthlyStats={monthlyStats || undefined}
       isPending={false}
+      monthlyStats={monthlyStats || undefined}
     />
   );
 }
@@ -92,14 +92,14 @@ export function InAppWalletsSummary(props: {
       fallback={
         <InAppWalletsSummaryInner
           allTimeStats={undefined}
-          monthlyStats={undefined}
           isPending={true}
+          monthlyStats={undefined}
         />
       }
     >
       <AsyncInAppWalletsSummary
-        teamId={props.teamId}
         projectId={props.projectId}
+        teamId={props.teamId}
       />
     </Suspense>
   );
diff --git a/apps/dashboard/src/components/embedded-wallets/Analytics/index.tsx b/apps/dashboard/src/components/embedded-wallets/Analytics/index.tsx
index 99f16d8b32c..7fb56cbd277 100644
--- a/apps/dashboard/src/components/embedded-wallets/Analytics/index.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Analytics/index.tsx
@@ -1,9 +1,9 @@
-import { getInAppWalletUsage } from "@/api/analytics";
 import {
-  type Range,
   getLastNDaysRange,
+  type Range,
 } from "components/analytics/date-range-selector";
 import { Suspense } from "react";
+import { getInAppWalletUsage } from "@/api/analytics";
 import type { InAppWalletStats } from "../../../types/analytics";
 import { RangeSelector } from "../../analytics/range-selector";
 import { InAppWalletUsersChartCardUI } from "./InAppWalletUsersChartCard";
@@ -23,14 +23,14 @@ function InAppWalletAnalyticsInner({
 }: InAppWalletAnalyticsProps) {
   return (
     <div>
-      <RangeSelector range={range} interval={interval} />
+      <RangeSelector interval={interval} range={range} />
       <div className="h-6" />
       <div className="flex flex-col gap-4 lg:gap-6">
         <InAppWalletUsersChartCardUI
+          description="The total number of active in-app wallet users on your project."
           inAppWalletStats={stats || []}
           isPending={isPending}
           title="Unique Users"
-          description="The total number of active in-app wallet users on your project."
         />
       </div>
     </div>
@@ -50,11 +50,11 @@ async function AsyncInAppWalletAnalytics(
   const range = props.range ?? getLastNDaysRange("last-120");
 
   const stats = await getInAppWalletUsage({
-    teamId: props.teamId,
-    projectId: props.projectId,
     from: range.from,
-    to: range.to,
     period: props.interval,
+    projectId: props.projectId,
+    teamId: props.teamId,
+    to: range.to,
   }).catch((error) => {
     console.error(error);
     return [];
@@ -63,9 +63,9 @@ async function AsyncInAppWalletAnalytics(
   return (
     <InAppWalletAnalyticsInner
       {...props}
-      stats={stats}
-      range={range}
       isPending={false}
+      range={range}
+      stats={stats}
     />
   );
 }
@@ -74,7 +74,7 @@ export function InAppWalletAnalytics(props: AsyncInAppWalletAnalyticsProps) {
   return (
     <Suspense
       fallback={
-        <InAppWalletAnalyticsInner {...props} stats={[]} isPending={true} />
+        <InAppWalletAnalyticsInner {...props} isPending={true} stats={[]} />
       }
     >
       <AsyncInAppWalletAnalytics {...props} />
diff --git a/apps/dashboard/src/components/embedded-wallets/Configure/InAppWalletSettingsUI.stories.tsx b/apps/dashboard/src/components/embedded-wallets/Configure/InAppWalletSettingsUI.stories.tsx
index ee01f00bcde..d7b01cb4df3 100644
--- a/apps/dashboard/src/components/embedded-wallets/Configure/InAppWalletSettingsUI.stories.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Configure/InAppWalletSettingsUI.stories.tsx
@@ -1,17 +1,17 @@
-import type { Team } from "@/api/team";
 import type { Meta, StoryObj } from "@storybook/nextjs";
+import type { Team } from "@/api/team";
 import { projectStub } from "../../../stories/stubs";
 import { storybookThirdwebClient } from "../../../stories/utils";
 import { InAppWalletSettingsUI } from "./index";
 
 const meta = {
-  title: "settings/in-app-wallet",
   component: Variants,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "settings/in-app-wallet",
 } satisfies Meta<typeof Variants>;
 
 export default meta;
@@ -47,24 +47,18 @@ export const ProPlan: Story = {
   },
 };
 
-function Variants(props: {
-  currentPlan: Team["billingPlan"];
-}) {
+function Variants(props: { currentPlan: Team["billingPlan"] }) {
   return (
     <div className="mx-auto w-full max-w-[1140px] px-4 py-6">
       <div className="flex flex-col gap-10">
         <InAppWalletSettingsUI
-          teamPlan={props.currentPlan}
           client={storybookThirdwebClient}
-          project={projectStub("foo", "bar")}
-          teamId="bar"
           embeddedWalletService={{
             actions: [],
             name: "embeddedWallets",
           }}
-          teamSlug="bar"
           isUpdating={false}
-          updateApiKey={() => {}}
+          project={projectStub("foo", "bar")}
           smsCountryTiers={{
             // scaffold some countries to play around with the UI
             tier1: ["US", "CA"],
@@ -73,6 +67,10 @@ function Variants(props: {
             tier4: ["JP", "KR", "MX", "RU"],
             tier5: ["BR", "AR", "CO", "CL", "PE", "VE", "SA"],
           }}
+          teamId="bar"
+          teamPlan={props.currentPlan}
+          teamSlug="bar"
+          updateApiKey={() => {}}
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/components/embedded-wallets/Configure/index.tsx b/apps/dashboard/src/components/embedded-wallets/Configure/index.tsx
index 88443922b12..43c07596788 100644
--- a/apps/dashboard/src/components/embedded-wallets/Configure/index.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Configure/index.tsx
@@ -1,13 +1,29 @@
 "use client";
 
+import { updateProjectClient } from "@3rdweb-sdk/react/hooks/useApi";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import type { ProjectEmbeddedWalletsService } from "@thirdweb-dev/service-utils";
+import { GatedSwitch } from "components/settings/Account/Billing/GatedSwitch";
+import {
+  type ApiKeyEmbeddedWalletsValidationSchema,
+  apiKeyEmbeddedWalletsValidationSchema,
+} from "components/settings/ApiKeys/validations";
+import { CircleAlertIcon, PlusIcon, Trash2Icon } from "lucide-react";
+import Link from "next/link";
+import type React from "react";
+import { useState } from "react";
+import { type UseFormReturn, useFieldArray, useForm } from "react-hook-form";
+import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
+import { upload } from "thirdweb/storage";
+import { toArrFromList } from "utils/string";
 import type { Project } from "@/api/projects";
 import type { SMSCountryTiers } from "@/api/sms";
 import type { Team } from "@/api/team";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import {
   Form,
   FormControl,
@@ -19,27 +35,11 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Textarea } from "@/components/ui/textarea";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { cn } from "@/lib/utils";
-import { updateProjectClient } from "@3rdweb-sdk/react/hooks/useApi";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import type { ProjectEmbeddedWalletsService } from "@thirdweb-dev/service-utils";
-import { GatedSwitch } from "components/settings/Account/Billing/GatedSwitch";
-import {
-  type ApiKeyEmbeddedWalletsValidationSchema,
-  apiKeyEmbeddedWalletsValidationSchema,
-} from "components/settings/ApiKeys/validations";
-import { CircleAlertIcon, PlusIcon, Trash2Icon } from "lucide-react";
-import Link from "next/link";
-import type React from "react";
-import { useState } from "react";
-import { type UseFormReturn, useFieldArray, useForm } from "react-hook-form";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
-import { upload } from "thirdweb/storage";
-import { toArrFromList } from "utils/string";
 import { planToTierRecordForGating } from "../../settings/Account/Billing/planToTierRecord";
 import { FileInput } from "../../shared/FileInput";
 import CountrySelector from "./sms-country-select/country-selector";
@@ -74,22 +74,22 @@ export function InAppWalletSettingsPage(props: InAppWalletSettingsPageProps) {
 
   function handleUpdateProject(projectValues: Partial<Project>) {
     updateProject.mutate(projectValues, {
-      onSuccess: () => {
-        toast.success("In-App Wallet API Key configuration updated");
-      },
       onError: (err) => {
         toast.error("Failed to update an API Key");
         console.error(err);
       },
+      onSuccess: () => {
+        toast.success("In-App Wallet API Key configuration updated");
+      },
     });
   }
 
   return (
     <InAppWalletSettingsPageUI
       {...props}
-      updateApiKey={handleUpdateProject}
       isUpdating={updateProject.isPending}
       smsCountryTiers={props.smsCountryTiers}
+      updateApiKey={handleUpdateProject}
     />
   );
 }
@@ -129,8 +129,8 @@ const InAppWalletSettingsPageUI: React.FC<
   return (
     <InAppWalletSettingsUI
       {...props}
-      embeddedWalletService={embeddedWalletService}
       client={props.client}
+      embeddedWalletService={embeddedWalletService}
     />
   );
 };
@@ -169,8 +169,8 @@ export const InAppWalletSettingsUI: React.FC<
       ...(hasCustomBranding
         ? {
             branding: {
-              applicationName: config.applicationName || undefined,
               applicationImageUrl: config.applicationImageUrl || undefined,
+              applicationName: config.applicationName || undefined,
             },
           }
         : undefined),
@@ -194,8 +194,8 @@ export const InAppWalletSettingsUI: React.FC<
       return toast.error("Custom JSON Web Token configuration is invalid", {
         description:
           "To use In-App Wallets with Custom JSON Web Token, provide JWKS URI and AUD.",
-        duration: 9000,
         dismissible: true,
+        duration: 9000,
       });
     }
 
@@ -205,8 +205,8 @@ export const InAppWalletSettingsUI: React.FC<
         {
           description:
             "To use In-App Wallets with Custom Authentication Endpoint, provide a valid URL.",
-          duration: 9000,
           dismissible: true,
+          duration: 9000,
         },
       );
     }
@@ -218,10 +218,10 @@ export const InAppWalletSettingsUI: React.FC<
 
       return {
         ...service,
-        customAuthentication,
-        customAuthEndpoint,
         applicationImageUrl: branding?.applicationImageUrl,
         applicationName: branding?.applicationName || props.project.name,
+        customAuthEndpoint,
+        customAuthentication,
         redirectUrls: toArrFromList(redirectUrls || "", true),
         smsEnabledCountryISOs: values.smsEnabledCountryISOs,
       };
@@ -232,9 +232,9 @@ export const InAppWalletSettingsUI: React.FC<
         services: newServices,
       },
       {
+        hasCustomAuthEndpoint: !!customAuthEndpoint,
         hasCustomBranding: !!branding,
         hasCustomJwt: !!customAuthentication,
-        hasCustomAuthEndpoint: !!customAuthEndpoint,
       },
     );
   });
@@ -242,17 +242,17 @@ export const InAppWalletSettingsUI: React.FC<
   return (
     <Form {...form}>
       <form
-        onSubmit={handleSubmit}
         autoComplete="off"
         className="flex flex-col gap-6"
+        onSubmit={handleSubmit}
       >
         {/* Branding */}
         <BrandingFieldset
+          client={props.client}
           form={form}
+          requiredPlan={brandingRequiredPlan}
           teamPlan={props.teamPlan}
-          client={props.client}
           teamSlug={props.teamSlug}
-          requiredPlan={brandingRequiredPlan}
         />
 
         <NativeAppsFieldset form={form} />
@@ -261,33 +261,33 @@ export const InAppWalletSettingsUI: React.FC<
         <Fieldset legend="Authentication">
           <JSONWebTokenFields
             form={form}
+            requiredPlan={authRequiredPlan}
             teamPlan={props.teamPlan}
             teamSlug={props.teamSlug}
-            requiredPlan={authRequiredPlan}
           />
 
           <div className="h-5" />
 
           <AuthEndpointFields
             form={form}
+            requiredPlan={authRequiredPlan}
             teamPlan={props.teamPlan}
             teamSlug={props.teamSlug}
-            requiredPlan={authRequiredPlan}
           />
 
           <div className="h-5" />
 
           <SMSCountryFields
             form={form}
+            requiredPlan={authRequiredPlan}
             smsCountryTiers={props.smsCountryTiers}
             teamPlan={props.teamPlan}
-            requiredPlan={authRequiredPlan}
             teamSlug={props.teamSlug}
           />
         </Fieldset>
 
         <div className="flex justify-end">
-          <Button type="submit" variant="primary" className="gap-2">
+          <Button className="gap-2" type="submit" variant="primary">
             {props.isUpdating && <Spinner className="size-4" />}
             Save changes
           </Button>
@@ -307,18 +307,16 @@ function BrandingFieldset(props: {
   return (
     <Fieldset legend="Branding">
       <SwitchContainer
+        description="Pass a custom logo and app name to be used in the emails sent to users."
         switchId="branding-switch"
         title="Custom email logo and name"
-        description="Pass a custom logo and app name to be used in the emails sent to users."
       >
         <GatedSwitch
-          requiredPlan={props.requiredPlan}
-          teamSlug={props.teamSlug}
-          trackingLabel="customEmailLogoAndName"
           currentPlan={props.teamPlan}
+          requiredPlan={props.requiredPlan}
           switchProps={{
-            id: "branding-switch",
             checked: !!props.form.watch("branding"),
+            id: "branding-switch",
             onCheckedChange: (checked) =>
               props.form.setValue(
                 "branding",
@@ -330,14 +328,16 @@ function BrandingFieldset(props: {
                   : undefined,
               ),
           }}
+          teamSlug={props.teamSlug}
+          trackingLabel="customEmailLogoAndName"
         />
       </SwitchContainer>
 
       <GatedCollapsibleContainer
-        requiredPlan={props.requiredPlan}
-        currentPlan={props.teamPlan}
         className="grid grid-cols-1 gap-6 lg:grid-cols-2"
+        currentPlan={props.teamPlan}
         isExpanded={!!props.form.watch("branding")}
+        requiredPlan={props.requiredPlan}
       >
         {/* Application Image */}
         <FormField
@@ -354,13 +354,13 @@ function BrandingFieldset(props: {
               <FormControl>
                 <AppImageFormControl
                   client={props.client}
-                  uri={props.form.watch("branding.applicationImageUrl")}
                   setUri={(uri) => {
                     props.form.setValue("branding.applicationImageUrl", uri, {
                       shouldDirty: true,
                       shouldTouch: true,
                     });
                   }}
+                  uri={props.form.watch("branding.applicationImageUrl")}
                 />
               </FormControl>
               <FormMessage />
@@ -418,9 +418,10 @@ function AppImageFormControl(props: {
     <div className="flex">
       <div className="relative">
         <FileInput
-          client={props.client}
           accept={{ "image/*": [] }}
-          value={image || resolveUrl}
+          className="w-24 rounded-full bg-background lg:w-28"
+          client={props.client}
+          disableHelperText
           setValue={async (v) => {
             try {
               setImage(v);
@@ -433,8 +434,7 @@ function AppImageFormControl(props: {
               });
             }
           }}
-          className="w-24 rounded-full bg-background lg:w-28"
-          disableHelperText
+          value={image || resolveUrl}
         />
 
         {uploadImage.isPending && (
@@ -457,17 +457,16 @@ function SMSCountryFields(props: {
   return (
     <div>
       <SwitchContainer
+        description="Optionally allow users in selected countries to login via SMS OTP."
         switchId="sms-switch"
         title="SMS"
-        description="Optionally allow users in selected countries to login via SMS OTP."
       >
         <GatedSwitch
           currentPlan={props.teamPlan}
           requiredPlan={props.requiredPlan}
-          teamSlug={props.teamSlug}
           switchProps={{
-            id: "sms-switch",
             checked: !!props.form.watch("smsEnabledCountryISOs").length,
+            id: "sms-switch",
             onCheckedChange: (checked) =>
               props.form.setValue(
                 "smsEnabledCountryISOs",
@@ -477,6 +476,7 @@ function SMSCountryFields(props: {
                   : [],
               ),
           }}
+          teamSlug={props.teamSlug}
           trackingLabel="sms"
         />
       </SwitchContainer>
@@ -484,8 +484,8 @@ function SMSCountryFields(props: {
       <GatedCollapsibleContainer
         className="grid grid-cols-1"
         currentPlan={props.teamPlan}
-        requiredPlan={props.requiredPlan}
         isExpanded={!!props.form.watch("smsEnabledCountryISOs").length}
+        requiredPlan={props.requiredPlan}
       >
         <FormField
           control={props.form.control}
@@ -493,8 +493,8 @@ function SMSCountryFields(props: {
           render={({ field }) => (
             <CountrySelector
               countryTiers={props.smsCountryTiers}
-              selected={field.value}
               onChange={field.onChange}
+              selected={field.value}
             />
           )}
         />
@@ -512,44 +512,44 @@ function JSONWebTokenFields(props: {
   return (
     <div>
       <SwitchContainer
-        switchId="authentication-switch"
-        title="Custom JSON Web Token"
         description={
           <>
             Optionally allow users to authenticate with a custom JWT.{" "}
             <Link
-              target="_blank"
-              rel="noopener noreferrer"
-              href="https://portal.thirdweb.com/connect/in-app-wallet/custom-auth/custom-jwt-auth-server"
               className="text-link-foreground hover:text-foreground"
+              href="https://portal.thirdweb.com/connect/in-app-wallet/custom-auth/custom-jwt-auth-server"
+              rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more
             </Link>
           </>
         }
+        switchId="authentication-switch"
+        title="Custom JSON Web Token"
       >
         <GatedSwitch
-          trackingLabel="customAuthJWT"
           currentPlan={props.teamPlan}
           requiredPlan={props.requiredPlan}
-          teamSlug={props.teamSlug}
           switchProps={{
-            id: "authentication-switch",
             checked: !!props.form.watch("customAuthentication"),
+            id: "authentication-switch",
             onCheckedChange: (checked) => {
               props.form.setValue(
                 "customAuthentication",
-                checked ? { jwksUri: "", aud: "" } : undefined,
+                checked ? { aud: "", jwksUri: "" } : undefined,
               );
             },
           }}
+          teamSlug={props.teamSlug}
+          trackingLabel="customAuthJWT"
         />
       </SwitchContainer>
 
       <GatedCollapsibleContainer
         className="grid grid-cols-1 gap-6 lg:grid-cols-2"
-        isExpanded={!!props.form.watch("customAuthentication")}
         currentPlan={props.teamPlan}
+        isExpanded={!!props.form.watch("customAuthentication")}
         requiredPlan={props.requiredPlan}
       >
         <FormField
@@ -603,28 +603,29 @@ function AuthEndpointFields(props: {
   return (
     <div>
       <SwitchContainer
-        switchId="auth-endpoint-switch"
-        title="Custom Authentication Endpoint"
         description={
           <>
             Optionally allow users to authenticate with any arbitrary payload
             that you provide.{" "}
             <Link
-              target="_blank"
-              rel="noopener noreferrer"
-              href="https://portal.thirdweb.com/connect/in-app-wallet/custom-auth/custom-auth-server"
               className="text-link-foreground hover:text-foreground"
+              href="https://portal.thirdweb.com/connect/in-app-wallet/custom-auth/custom-auth-server"
+              rel="noopener noreferrer"
+              target="_blank"
             >
               Learn more
             </Link>
           </>
         }
+        switchId="auth-endpoint-switch"
+        title="Custom Authentication Endpoint"
       >
         <GatedSwitch
-          trackingLabel="customAuthEndpoint"
+          currentPlan={props.teamPlan}
+          requiredPlan={props.requiredPlan}
           switchProps={{
-            id: "auth-endpoint-switch",
             checked: expandCustomAuthEndpointField,
+            id: "auth-endpoint-switch",
             onCheckedChange: (checked) => {
               props.form.setValue(
                 "customAuthEndpoint",
@@ -637,9 +638,8 @@ function AuthEndpointFields(props: {
               );
             },
           }}
-          currentPlan={props.teamPlan}
-          requiredPlan={props.requiredPlan}
           teamSlug={props.teamSlug}
+          trackingLabel="customAuthEndpoint"
         />
       </SwitchContainer>
 
@@ -704,12 +704,12 @@ function AuthEndpointFieldsContent(props: {
                   )}
                 />
                 <Button
-                  variant="outline"
                   aria-label="Remove header"
+                  className="!w-auto px-3"
                   onClick={() => {
                     customHeaderFields.remove(customHeaderIdx);
                   }}
-                  className="!w-auto px-3"
+                  variant="outline"
                 >
                   <Trash2Icon className="size-4 shrink-0 text-destructive-text" />
                 </Button>
@@ -718,7 +718,6 @@ function AuthEndpointFieldsContent(props: {
           })}
 
           <Button
-            variant="outline"
             className="w-full gap-2 bg-background"
             onClick={() => {
               customHeaderFields.append({
@@ -726,6 +725,7 @@ function AuthEndpointFieldsContent(props: {
                 value: "",
               });
             }}
+            variant="outline"
           >
             <PlusIcon className="size-4" />
             Add header
@@ -793,10 +793,7 @@ function GatedCollapsibleContainer(props: {
   return <div className={cn("mt-6", props.className)}>{props.children}</div>;
 }
 
-function Fieldset(props: {
-  legend: string;
-  children: React.ReactNode;
-}) {
+function Fieldset(props: { legend: string; children: React.ReactNode }) {
   return (
     <DynamicHeight>
       <fieldset className="rounded-lg border border-border bg-card p-4 md:p-6">
@@ -820,7 +817,7 @@ function SwitchContainer(props: {
   return (
     <div className="flex items-center justify-between gap-6">
       <div>
-        <Label htmlFor={props.switchId} className="text-base">
+        <Label className="text-base" htmlFor={props.switchId}>
           {props.title}
         </Label>
         <p className="mt-0.5 text-muted-foreground text-sm ">
diff --git a/apps/dashboard/src/components/embedded-wallets/Configure/sms-country-select/country-selector.tsx b/apps/dashboard/src/components/embedded-wallets/Configure/sms-country-select/country-selector.tsx
index 937ea94437f..756d80db769 100644
--- a/apps/dashboard/src/components/embedded-wallets/Configure/sms-country-select/country-selector.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Configure/sms-country-select/country-selector.tsx
@@ -1,7 +1,7 @@
+import { CheckIcon, MinusIcon } from "lucide-react";
 import type { SMSCountryTiers } from "@/api/sms";
 import { Checkbox } from "@/components/ui/checkbox";
 import { cn } from "@/lib/utils";
-import { CheckIcon, MinusIcon } from "lucide-react";
 import {
   countryNames,
   countryPrefixes,
@@ -88,22 +88,22 @@ export default function CountrySelector({
   return (
     <div className="space-y-3">
       {Object.entries(countryTiers).map(([tier, countries], index) => (
-        <div key={tier} className="overflow-hidden rounded-md border">
+        <div className="overflow-hidden rounded-md border" key={tier}>
           <div className="flex items-center bg-muted/30 p-2">
             <div className="relative mr-2 flex items-center">
               <Checkbox
-                id={`tier-${index + 1}`}
                 checked={isTierSelected(tier)}
-                onCheckedChange={() => toggleTier(tier)}
                 className="h-4 w-4"
+                id={`tier-${index + 1}`}
+                onCheckedChange={() => toggleTier(tier)}
               />
               {isTierIndeterminate(tier) && (
                 <MinusIcon className="-translate-x-1/2 -translate-y-1/2 pointer-events-none absolute top-1/2 left-1/2 h-2.5 w-2.5 transform text-primary" />
               )}
             </div>
             <label
-              htmlFor={`tier-${index + 1}`}
               className="flex-1 cursor-pointer font-medium text-sm"
+              htmlFor={`tier-${index + 1}`}
             >
               Tier {index + 1}
               {isTierIndeterminate(tier) && (
@@ -136,25 +136,26 @@ export default function CountrySelector({
           >
             {countries.map((country) => (
               <div
-                key={country}
                 className={cn(
                   "relative flex cursor-pointer items-center justify-between rounded-md border p-1.5 transition-colors ",
                   isCountrySelected(country)
                     ? "border-primary bg-primary/10"
                     : "border-transparent hover:bg-muted/50",
                 )}
+                key={country}
                 onClick={() => toggleCountry(country)}
                 onKeyDown={(e) => {
                   if (e.key === "Enter" || e.key === " ") {
                     toggleCountry(country);
                   }
                 }}
+                // biome-ignore lint/a11y/useSemanticElements: FIXME
                 role="button"
                 tabIndex={0}
                 title={countryNames[country] || country}
               >
                 <span className="flex items-center space-x-2">
-                  <span className="text-lg" aria-hidden="true">
+                  <span aria-hidden="true" className="text-lg">
                     {getCountryFlag(country)}
                   </span>
                   <span className="font-medium text-xs">
diff --git a/apps/dashboard/src/components/embedded-wallets/Configure/sms-country-select/utils.ts b/apps/dashboard/src/components/embedded-wallets/Configure/sms-country-select/utils.ts
index 5ebd3c25109..89943daa541 100644
--- a/apps/dashboard/src/components/embedded-wallets/Configure/sms-country-select/utils.ts
+++ b/apps/dashboard/src/components/embedded-wallets/Configure/sms-country-select/utils.ts
@@ -9,449 +9,447 @@ export const tierPricing = {
 
 // Country names mapped to ISO codes
 export const countryNames: Record<string, string> = {
-  // Tier 1
-  CA: "Canada",
-  US: "United States",
-
-  // Tier 2
-  BH: "Bahrain",
-  CN: "China",
-  CR: "Costa Rica",
-  GB: "United Kingdom",
-  GL: "Greenland",
-  KR: "Korea Republic of",
-  LI: "Liechtenstein",
-  NF: "Norfolk Island",
-  PL: "Poland",
-  PR: "Puerto Rico",
-  PT: "Portugal",
-  SG: "Singapore",
-  TH: "Thailand",
-  TR: "Turkey",
-  VI: "Virgin Islands, U.S.",
-
-  // Tier 3
-  AR: "Argentina",
-  AT: "Austria",
-  AU: "Australia",
-  BA: "Bosnia and Herzegovina",
-  BN: "Brunei",
-  BR: "Brazil",
-  BS: "Bahamas",
-  BW: "Botswana",
-  CH: "Switzerland",
-  CL: "Chile",
-  CO: "Colombia",
-  CU: "Cuba",
-  CY: "Cyprus",
-  CZ: "Czech Republic",
-  DE: "Germany",
-  DK: "Denmark",
-  EE: "Estonia",
-  ES: "Spain",
-  FI: "Finland",
-  FM: "Micronesia",
-  FO: "Faroe Islands",
-  FR: "France",
-  GR: "Greece",
-  GU: "Guam",
-  HK: "Hong Kong",
-  HU: "Hungary",
-  IE: "Ireland",
-  IN: "India",
-  ID: "Indonesia",
-  IS: "Iceland",
-  IT: "Italy",
-  JP: "Japan",
-  LT: "Lithuania",
-  LU: "Luxembourg",
-  LV: "Latvia",
-  MD: "Moldova",
-  MK: "Macedonia",
-  MO: "Macao",
-  MT: "Malta",
-  NA: "Namibia",
-  NO: "Norway",
-  PW: "Palau",
-  RO: "Romania",
-  SB: "Solomon Islands",
-  SE: "Sweden",
-  SK: "Slovakia",
-  TW: "Taiwan",
-  UY: "Uruguay",
-  ZA: "South Africa",
-
   // Tier 4
   AD: "Andorra",
   AE: "United Arab Emirates",
+
+  // Tier 5
+  AF: "Afghanistan",
   AG: "Antigua and Barbuda",
   AI: "Anguilla",
   AL: "Albania",
   AM: "Armenia",
   AO: "Angola",
+
+  // Tier 3
+  AR: "Argentina",
   AS: "American Samoa",
+  AT: "Austria",
+  AU: "Australia",
   AW: "Aruba",
+  AZ: "Azerbaijan",
+  BA: "Bosnia and Herzegovina",
   BB: "Barbados",
+  BD: "Bangladesh",
   BE: "Belgium",
+  BF: "Burkina Faso",
   BG: "Bulgaria",
-  CK: "Cook Islands",
-  CM: "Cameroon",
-  DJ: "Djibouti",
-  DO: "Dominican Republic",
-  ER: "Eritrea",
-  FJ: "Fiji",
-  FK: "Falkland Islands",
-  GE: "Georgia",
-  GF: "French Guiana",
-  GI: "Gibraltar",
-  GM: "Gambia",
-  GN: "Guinea",
-  GP: "Guadeloupe",
-  GQ: "Equatorial Guinea",
-  HR: "Croatia",
-  KI: "Kiribati",
-  KN: "St Kitts and Nevis",
-  LR: "Liberia",
-  MC: "Monaco",
-  ME: "Montenegro",
-  MH: "Marshall Islands",
-  MQ: "Martinique",
-  MS: "Montserrat",
-  MU: "Mauritius",
-  MX: "Mexico",
-  NC: "New Caledonia",
-  NI: "Nicaragua",
-  NL: "Netherlands",
-  NU: "Niue",
-  NZ: "New Zealand",
-  OM: "Oman",
-  PA: "Panama",
-  PF: "French Polynesia",
-  PM: "St Pierre and Miquelon",
-  PY: "Paraguay",
-  RE: "Reunion/Mayotte",
-  SA: "Saudi Arabia",
-  SI: "Slovenia",
-  SL: "Sierra Leone",
-  SM: "San Marino",
-  SR: "Suriname",
-  ST: "Sao Tome and Principe",
-  SV: "El Salvador",
-  TC: "Turks and Caicos Islands",
-  TO: "Tonga",
-  TV: "Tuvalu",
-  UA: "Ukraine",
-  VE: "Venezuela",
-  VN: "Vietnam",
-  WF: "Wallis and Futuna",
 
-  // Tier 5
-  AF: "Afghanistan",
-  AZ: "Azerbaijan",
-  BD: "Bangladesh",
-  BF: "Burkina Faso",
+  // Tier 2
+  BH: "Bahrain",
   BI: "Burundi",
   BJ: "Benin",
   BM: "Bermuda",
+  BN: "Brunei",
   BO: "Bolivia",
+  BR: "Brazil",
+  BS: "Bahamas",
+  BW: "Botswana",
   BY: "Belarus",
   BZ: "Belize",
+  // Tier 1
+  CA: "Canada",
   CD: "DR Congo",
   CG: "Congo",
+  CH: "Switzerland",
   CI: "Ivory Coast",
+  CK: "Cook Islands",
+  CL: "Chile",
+  CM: "Cameroon",
+  CN: "China",
+  CO: "Colombia",
+  CR: "Costa Rica",
+  CU: "Cuba",
   CV: "Cape Verde",
+  CY: "Cyprus",
+  CZ: "Czech Republic",
+  DE: "Germany",
+  DJ: "Djibouti",
+  DK: "Denmark",
   DM: "Dominica",
+  DO: "Dominican Republic",
   DZ: "Algeria",
   EC: "Ecuador",
+  EE: "Estonia",
   EG: "Egypt",
+  ER: "Eritrea",
+  ES: "Spain",
   ET: "Ethiopia",
+  FI: "Finland",
+  FJ: "Fiji",
+  FK: "Falkland Islands",
+  FM: "Micronesia",
+  FO: "Faroe Islands",
+  FR: "France",
   GA: "Gabon",
+  GB: "United Kingdom",
   GD: "Grenada",
+  GE: "Georgia",
+  GF: "French Guiana",
   GH: "Ghana",
+  GI: "Gibraltar",
+  GL: "Greenland",
+  GM: "Gambia",
+  GN: "Guinea",
+  GP: "Guadeloupe",
+  GQ: "Equatorial Guinea",
+  GR: "Greece",
   GT: "Guatemala",
+  GU: "Guam",
   GW: "Guinea-Bissau",
   GY: "Guyana",
+  HK: "Hong Kong",
   HN: "Honduras",
+  HR: "Croatia",
   HT: "Haiti",
+  HU: "Hungary",
+  ID: "Indonesia",
+  IE: "Ireland",
   IL: "Israel",
+  IN: "India",
   IQ: "Iraq",
+  IS: "Iceland",
+  IT: "Italy",
   JM: "Jamaica",
   JO: "Jordan",
+  JP: "Japan",
   KE: "Kenya",
   KG: "Kyrgyzstan",
   KH: "Cambodia",
+  KI: "Kiribati",
+  KN: "St Kitts and Nevis",
+  KR: "Korea Republic of",
   KW: "Kuwait",
   KY: "Cayman Islands",
   KZ: "Kazakhstan",
   LA: "Laos PDR",
   LB: "Lebanon",
   LC: "St Lucia",
+  LI: "Liechtenstein",
   LK: "Sri Lanka",
+  LR: "Liberia",
   LS: "Lesotho",
+  LT: "Lithuania",
+  LU: "Luxembourg",
+  LV: "Latvia",
   LY: "Libya",
   MA: "Morocco",
+  MC: "Monaco",
+  MD: "Moldova",
+  ME: "Montenegro",
   MG: "Madagascar",
+  MH: "Marshall Islands",
+  MK: "Macedonia",
   ML: "Mali",
   MM: "Myanmar",
   MN: "Mongolia",
+  MO: "Macao",
+  MQ: "Martinique",
   MR: "Mauritania",
+  MS: "Montserrat",
+  MT: "Malta",
+  MU: "Mauritius",
   MV: "Maldives",
   MW: "Malawi",
+  MX: "Mexico",
   MY: "Malaysia",
   MZ: "Mozambique",
+  NA: "Namibia",
+  NC: "New Caledonia",
   NE: "Niger",
+  NF: "Norfolk Island",
   NG: "Nigeria",
+  NI: "Nicaragua",
+  NL: "Netherlands",
+  NO: "Norway",
   NP: "Nepal",
+  NU: "Niue",
+  NZ: "New Zealand",
+  OM: "Oman",
+  PA: "Panama",
   PE: "Peru",
+  PF: "French Polynesia",
   PH: "Philippines",
   PK: "Pakistan",
+  PL: "Poland",
+  PM: "St Pierre and Miquelon",
+  PR: "Puerto Rico",
   PS: "Palestinian Territory",
+  PT: "Portugal",
+  PW: "Palau",
+  PY: "Paraguay",
   QA: "Qatar",
+  RE: "Reunion/Mayotte",
+  RO: "Romania",
   RS: "Serbia",
   RW: "Rwanda",
+  SA: "Saudi Arabia",
+  SB: "Solomon Islands",
   SC: "Seychelles",
   SD: "Sudan",
+  SE: "Sweden",
+  SG: "Singapore",
+  SI: "Slovenia",
+  SK: "Slovakia",
+  SL: "Sierra Leone",
+  SM: "San Marino",
   SN: "Senegal",
   SO: "Somalia",
+  SR: "Suriname",
   SS: "South Sudan",
+  ST: "Sao Tome and Principe",
+  SV: "El Salvador",
   SY: "Syria",
   SZ: "Swaziland",
+  TC: "Turks and Caicos Islands",
   TD: "Chad",
   TG: "Togo",
+  TH: "Thailand",
   TL: "East Timor",
   TM: "Turkmenistan",
   TN: "Tunisia",
+  TO: "Tonga",
+  TR: "Turkey",
   TT: "Trinidad and Tobago",
+  TV: "Tuvalu",
+  TW: "Taiwan",
+  UA: "Ukraine",
   UG: "Uganda",
+  US: "United States",
+  UY: "Uruguay",
   VC: "St Vincent Grenadines",
+  VE: "Venezuela",
   VG: "Virgin Islands, British",
+  VI: "Virgin Islands, U.S.",
+  VN: "Vietnam",
   VU: "Vanuatu",
+  WF: "Wallis and Futuna",
   WS: "Samoa",
   YE: "Yemen",
+  ZA: "South Africa",
   ZM: "Zambia",
   ZW: "Zimbabwe",
 } as const;
 
 export const countryPrefixes: Record<string, string> = {
-  // Tier 1
-  CA: "+1",
-  US: "+1",
-
-  // Tier 2
-  BH: "+973",
-  CN: "+86",
-  CR: "+506",
-  GB: "+44",
-  GL: "+299",
-  KR: "+82",
-  LI: "+423",
-  NF: "+672",
-  PL: "+48",
-  PR: "+1",
-  PT: "+351",
-  SG: "+65",
-  TH: "+66",
-  TR: "+90",
-  VI: "+1",
-
-  // Tier 3
-  AR: "+54",
-  AT: "+43",
-  AU: "+61",
-  BA: "+387",
-  BN: "+673",
-  BR: "+55",
-  BS: "+1",
-  BW: "+267",
-  CH: "+41",
-  CL: "+56",
-  CO: "+57",
-  CU: "+53",
-  CY: "+357",
-  CZ: "+420",
-  DE: "+49",
-  DK: "+45",
-  EE: "+372",
-  ES: "+34",
-  FI: "+358",
-  FM: "+691",
-  FO: "+298",
-  FR: "+33",
-  GR: "+30",
-  GU: "+1",
-  HK: "+852",
-  HU: "+36",
-  IE: "+353",
-  IN: "+91",
-  ID: "+62",
-  IS: "+354",
-  IT: "+39",
-  JP: "+81",
-  LT: "+370",
-  LU: "+352",
-  LV: "+371",
-  MD: "+373",
-  MK: "+389",
-  MO: "+853",
-  MT: "+356",
-  NA: "+264",
-  NO: "+47",
-  PW: "+680",
-  RO: "+40",
-  SB: "+677",
-  SE: "+46",
-  SK: "+421",
-  TW: "+886",
-  UY: "+598",
-  ZA: "+27",
-
   // Tier 4
   AD: "+376",
   AE: "+971",
+
+  // Tier 5
+  AF: "+93",
   AG: "+1",
   AI: "+1",
   AL: "+355",
   AM: "+374",
   AO: "+244",
+
+  // Tier 3
+  AR: "+54",
   AS: "+1",
+  AT: "+43",
+  AU: "+61",
   AW: "+297",
+  AZ: "+994",
+  BA: "+387",
   BB: "+1",
+  BD: "+880",
   BE: "+32",
+  BF: "+226",
   BG: "+359",
-  CK: "+682",
-  CM: "+237",
-  DJ: "+253",
-  DO: "+1",
-  ER: "+291",
-  FJ: "+679",
-  FK: "+500",
-  GE: "+995",
-  GF: "+594",
-  GI: "+350",
-  GM: "+220",
-  GN: "+224",
-  GP: "+590",
-  GQ: "+240",
-  HR: "+385",
-  KI: "+686",
-  KN: "+1",
-  LR: "+231",
-  MC: "+377",
-  ME: "+382",
-  MH: "+692",
-  MQ: "+596",
-  MS: "+1",
-  MU: "+230",
-  MX: "+52",
-  NC: "+687",
-  NI: "+505",
-  NL: "+31",
-  NU: "+683",
-  NZ: "+64",
-  OM: "+968",
-  PA: "+507",
-  PF: "+689",
-  PM: "+508",
-  PY: "+595",
-  RE: "+262",
-  SA: "+966",
-  SI: "+386",
-  SL: "+232",
-  SM: "+378",
-  SR: "+597",
-  ST: "+239",
-  SV: "+503",
-  TC: "+1",
-  TO: "+676",
-  TV: "+688",
-  UA: "+380",
-  VE: "+58",
-  VN: "+84",
-  WF: "+681",
 
-  // Tier 5
-  AF: "+93",
-  AZ: "+994",
-  BD: "+880",
-  BF: "+226",
+  // Tier 2
+  BH: "+973",
   BI: "+257",
   BJ: "+229",
   BM: "+1",
+  BN: "+673",
   BO: "+591",
+  BR: "+55",
+  BS: "+1",
+  BW: "+267",
   BY: "+375",
   BZ: "+501",
+  // Tier 1
+  CA: "+1",
   CD: "+243",
   CG: "+242",
+  CH: "+41",
   CI: "+225",
+  CK: "+682",
+  CL: "+56",
+  CM: "+237",
+  CN: "+86",
+  CO: "+57",
+  CR: "+506",
+  CU: "+53",
   CV: "+238",
+  CY: "+357",
+  CZ: "+420",
+  DE: "+49",
+  DJ: "+253",
+  DK: "+45",
   DM: "+1",
+  DO: "+1",
   DZ: "+213",
   EC: "+593",
+  EE: "+372",
   EG: "+20",
+  ER: "+291",
+  ES: "+34",
   ET: "+251",
+  FI: "+358",
+  FJ: "+679",
+  FK: "+500",
+  FM: "+691",
+  FO: "+298",
+  FR: "+33",
   GA: "+241",
+  GB: "+44",
   GD: "+1",
+  GE: "+995",
+  GF: "+594",
   GH: "+233",
+  GI: "+350",
+  GL: "+299",
+  GM: "+220",
+  GN: "+224",
+  GP: "+590",
+  GQ: "+240",
+  GR: "+30",
   GT: "+502",
+  GU: "+1",
   GW: "+245",
   GY: "+592",
+  HK: "+852",
   HN: "+504",
+  HR: "+385",
   HT: "+509",
+  HU: "+36",
+  ID: "+62",
+  IE: "+353",
   IL: "+972",
+  IN: "+91",
   IQ: "+964",
+  IS: "+354",
+  IT: "+39",
   JM: "+1",
   JO: "+962",
+  JP: "+81",
   KE: "+254",
   KG: "+996",
   KH: "+855",
+  KI: "+686",
+  KN: "+1",
+  KR: "+82",
   KW: "+965",
   KY: "+1",
   KZ: "+7",
   LA: "+856",
   LB: "+961",
   LC: "+1",
+  LI: "+423",
   LK: "+94",
+  LR: "+231",
   LS: "+266",
+  LT: "+370",
+  LU: "+352",
+  LV: "+371",
   LY: "+218",
   MA: "+212",
+  MC: "+377",
+  MD: "+373",
+  ME: "+382",
   MG: "+261",
+  MH: "+692",
+  MK: "+389",
   ML: "+223",
   MM: "+95",
   MN: "+976",
+  MO: "+853",
+  MQ: "+596",
   MR: "+222",
+  MS: "+1",
+  MT: "+356",
+  MU: "+230",
   MV: "+960",
   MW: "+265",
+  MX: "+52",
   MY: "+60",
   MZ: "+258",
+  NA: "+264",
+  NC: "+687",
   NE: "+227",
+  NF: "+672",
   NG: "+234",
+  NI: "+505",
+  NL: "+31",
+  NO: "+47",
   NP: "+977",
+  NU: "+683",
+  NZ: "+64",
+  OM: "+968",
+  PA: "+507",
   PE: "+51",
+  PF: "+689",
   PH: "+63",
   PK: "+92",
+  PL: "+48",
+  PM: "+508",
+  PR: "+1",
   PS: "+970",
+  PT: "+351",
+  PW: "+680",
+  PY: "+595",
   QA: "+974",
+  RE: "+262",
+  RO: "+40",
   RS: "+381",
   RW: "+250",
+  SA: "+966",
+  SB: "+677",
   SC: "+248",
   SD: "+249",
+  SE: "+46",
+  SG: "+65",
+  SI: "+386",
+  SK: "+421",
+  SL: "+232",
+  SM: "+378",
   SN: "+221",
   SO: "+252",
+  SR: "+597",
   SS: "+211",
+  ST: "+239",
+  SV: "+503",
   SY: "+963",
   SZ: "+268",
+  TC: "+1",
   TD: "+235",
   TG: "+228",
+  TH: "+66",
   TL: "+670",
   TM: "+993",
   TN: "+216",
+  TO: "+676",
+  TR: "+90",
   TT: "+1",
+  TV: "+688",
+  TW: "+886",
+  UA: "+380",
   UG: "+256",
+  US: "+1",
+  UY: "+598",
   VC: "+1",
+  VE: "+58",
   VG: "+1",
+  VI: "+1",
+  VN: "+84",
   VU: "+678",
+  WF: "+681",
   WS: "+685",
   YE: "+967",
+  ZA: "+27",
   ZM: "+260",
   ZW: "+263",
 } as const;
diff --git a/apps/dashboard/src/components/embedded-wallets/Users/SearchInput.tsx b/apps/dashboard/src/components/embedded-wallets/Users/SearchInput.tsx
index 921b002e0c0..41eb3d62936 100644
--- a/apps/dashboard/src/components/embedded-wallets/Users/SearchInput.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Users/SearchInput.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { Input } from "@/components/ui/input";
 import { SearchIcon } from "lucide-react";
+import { Input } from "@/components/ui/input";
 
 export function SearchInput(props: {
   placeholder: string;
@@ -11,10 +11,10 @@ export function SearchInput(props: {
   return (
     <div className="relative">
       <Input
+        className="bg-card pl-9"
+        onChange={(e) => props.onValueChange(e.target.value)}
         placeholder={props.placeholder}
         value={props.value}
-        onChange={(e) => props.onValueChange(e.target.value)}
-        className="bg-card pl-9"
       />
       <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
     </div>
diff --git a/apps/dashboard/src/components/embedded-wallets/Users/index.tsx b/apps/dashboard/src/components/embedded-wallets/Users/index.tsx
index f0dba99f450..280beebd2d4 100644
--- a/apps/dashboard/src/components/embedded-wallets/Users/index.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Users/index.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import { WalletAddress } from "@/components/blocks/wallet-address";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
 import {
   useAllEmbeddedWallets,
   useEmbeddedWallets,
@@ -21,6 +12,15 @@ import Papa from "papaparse";
 import { useCallback, useMemo, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import type { WalletUser } from "thirdweb/wallets";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import { SearchInput } from "./SearchInput";
 
 const getUserIdentifier = (accounts: WalletUser["linkedAccounts"]) => {
@@ -44,26 +44,25 @@ export function InAppWalletUsersPageContent(props: {
   const columns = useMemo(() => {
     return [
       columnHelper.accessor("linkedAccounts", {
-        header: "User Identifier",
-        enableColumnFilter: true,
         cell: (cell) => {
           const identifier = getUserIdentifier(cell.getValue());
           return <span className="text-sm">{identifier}</span>;
         },
+        enableColumnFilter: true,
+        header: "User Identifier",
         id: "user_identifier",
       }),
       columnHelper.accessor("wallets", {
-        header: "Address",
         cell: (cell) => {
           const address = cell.getValue()[0]?.address;
           return address ? (
             <WalletAddress address={address} client={props.client} />
           ) : null;
         },
+        header: "Address",
         id: "address",
       }),
       columnHelper.accessor("wallets", {
-        header: "Created",
         cell: (cell) => {
           const value = cell.getValue()[0]?.createdAt;
 
@@ -76,10 +75,10 @@ export function InAppWalletUsersPageContent(props: {
             </span>
           );
         },
+        header: "Created",
         id: "created_at",
       }),
       columnHelper.accessor("linkedAccounts", {
-        header: "Login Methods",
         cell: (cell) => {
           const value = cell.getValue();
           const loginMethodsDisplay = value.reduce((acc, curr) => {
@@ -105,6 +104,7 @@ export function InAppWalletUsersPageContent(props: {
             </TooltipProvider>
           );
         },
+        header: "Login Methods",
         id: "login_methods",
       }),
     ];
@@ -158,12 +158,12 @@ export function InAppWalletUsersPageContent(props: {
     const csv = Papa.unparse(
       usersWallets.map((row) => {
         return {
-          user_identifier: getUserIdentifier(row.linkedAccounts),
           address: row.wallets[0]?.address || "Uninitialized",
           created: row.wallets[0]?.createdAt
             ? format(new Date(row.wallets[0].createdAt), "MMM dd, yyyy")
             : "Wallet not created yet",
           login_methods: row.linkedAccounts.map((acc) => acc.type).join(", "),
+          user_identifier: getUserIdentifier(row.linkedAccounts),
         };
       }),
     );
@@ -183,17 +183,17 @@ export function InAppWalletUsersPageContent(props: {
         <div className="flex items-center justify-end gap-3">
           <div className="w-full max-w-xs">
             <SearchInput
+              onValueChange={setSearchValue}
               placeholder="Search"
               value={searchValue}
-              onValueChange={setSearchValue}
             />
           </div>
           <Button
+            className="gap-2"
             disabled={wallets.length === 0 || isPending}
-            variant="outline"
             onClick={downloadCSV}
             size="sm"
-            className="gap-2"
+            variant="outline"
           >
             {isPending && <Spinner className="size-4" />}
             Download as .csv
@@ -202,31 +202,31 @@ export function InAppWalletUsersPageContent(props: {
 
         <div>
           <TWTable
-            title="in-app wallets"
-            data={filteredWallets}
             columns={columns}
-            isPending={walletsQuery.isPending}
+            data={filteredWallets}
             isFetched={walletsQuery.isFetched}
+            isPending={walletsQuery.isPending}
             tableContainerClassName="rounded-b-none"
+            title="in-app wallets"
           />
 
           <div className="flex justify-center gap-3 rounded-b-lg border border-t-0 bg-card p-6">
             <Button
-              variant="outline"
-              size="sm"
               className="gap-2 bg-background"
-              onClick={() => setActivePage((p) => Math.max(1, p - 1))}
               disabled={activePage === 1 || walletsQuery.isPending}
+              onClick={() => setActivePage((p) => Math.max(1, p - 1))}
+              size="sm"
+              variant="outline"
             >
               <ArrowLeftIcon className="size-4" />
               Previous
             </Button>
             <Button
-              variant="outline"
-              size="sm"
               className="gap-2 bg-background"
-              onClick={() => setActivePage((p) => p + 1)}
               disabled={wallets.length === 0 || walletsQuery.isPending}
+              onClick={() => setActivePage((p) => p + 1)}
+              size="sm"
+              variant="outline"
             >
               Next
               <ArrowRightIcon className="size-4" />
diff --git a/apps/dashboard/src/components/explore/contract-card/index.tsx b/apps/dashboard/src/components/explore/contract-card/index.tsx
index f4d63b90da7..79b40caad59 100644
--- a/apps/dashboard/src/components/explore/contract-card/index.tsx
+++ b/apps/dashboard/src/components/explore/contract-card/index.tsx
@@ -1,3 +1,7 @@
+import { moduleToBase64 } from "app/(app)/(dashboard)/published-contract/utils/module-base-64";
+import { replaceDeployerAddress } from "lib/publisher-utils";
+import { RocketIcon, ShieldCheckIcon } from "lucide-react";
+import Link from "next/link";
 import { ClientOnly } from "@/components/blocks/client-only";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -6,10 +10,6 @@ import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { cn } from "@/lib/utils";
-import { moduleToBase64 } from "app/(app)/(dashboard)/published-contract/utils/module-base-64";
-import { replaceDeployerAddress } from "lib/publisher-utils";
-import { RocketIcon, ShieldCheckIcon } from "lucide-react";
-import Link from "next/link";
 import { fetchPublishedContractVersion } from "../../contract-components/fetch-contracts-with-versions";
 import { ContractPublisher } from "../publisher";
 
@@ -95,8 +95,8 @@ export async function ContractCard({
   }
 
   const auditLink = resolveSchemeWithErrorHandler({
-    uri: publishedContractResult.audit,
     client: serverThirdwebClient,
+    uri: publishedContractResult.audit,
   });
 
   return (
@@ -112,10 +112,10 @@ export async function ContractCard({
           {auditLink && !isBeta && (
             <>
               <Link
-                target="_blank"
-                rel="noopener noreferrer"
                 className="relative z-1 flex items-center gap-1 font-medium text-sm text-success-text hover:underline"
                 href={auditLink}
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 <ShieldCheckIcon className="size-4" />
                 Audited
@@ -148,11 +148,11 @@ export async function ContractCard({
         <Link
           className="cursor-pointer before:absolute before:inset-0 before:z-0"
           href={getContractUrl({
-            publisher,
             contractId,
-            version,
             modules,
+            publisher,
             titleOverride,
+            version,
           })}
         >
           {(
@@ -171,7 +171,7 @@ export async function ContractCard({
       {modules.length ? (
         <div className="mt-auto flex flex-row flex-wrap gap-1 pt-3">
           {modules.slice(0, 2).map((m) => (
-            <Badge variant="outline" key={m.publisher + m.moduleId + m.version}>
+            <Badge key={m.publisher + m.moduleId + m.version} variant="outline">
               {m.moduleId.split("ERC")[0]}
             </Badge>
           ))}
@@ -197,18 +197,18 @@ export async function ContractCard({
 
         <div className="flex items-center justify-between">
           <Button
-            variant="outline"
-            size="sm"
-            className="relative z-10 h-auto gap-1.5 px-2.5 py-1.5 text-xs hover:bg-inverted hover:text-inverted-foreground"
             asChild
+            className="relative z-10 h-auto gap-1.5 px-2.5 py-1.5 text-xs hover:bg-inverted hover:text-inverted-foreground"
+            size="sm"
+            variant="outline"
           >
             <Link
               href={getContractUrl(
                 {
-                  publisher,
                   contractId,
-                  version,
                   modules,
+                  publisher,
+                  version,
                 },
                 true,
               )}
diff --git a/apps/dashboard/src/components/explore/contract-row/index.tsx b/apps/dashboard/src/components/explore/contract-row/index.tsx
index f5184080fec..9a144052dc9 100644
--- a/apps/dashboard/src/components/explore/contract-row/index.tsx
+++ b/apps/dashboard/src/components/explore/contract-row/index.tsx
@@ -24,10 +24,10 @@ export function ContractRow({ category }: ContractRowProps) {
             {category.description}{" "}
             {category.learnMore && (
               <Link
-                target="_blank"
-                rel="noopener noreferrer"
-                href={category.learnMore}
                 className="inline text-link-foreground"
+                href={category.learnMore}
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 Learn more
               </Link>
@@ -37,8 +37,8 @@ export function ContractRow({ category }: ContractRowProps) {
 
         {category.contracts.length > 6 && (
           <Link
-            href={`/explore/${category.id}`}
             className="flex shrink-0 items-center gap-1 text-base text-link-foreground hover:text-foreground"
+            href={`/explore/${category.id}`}
           >
             View all
             <ArrowRightIcon className="size-4" />
@@ -72,23 +72,23 @@ export function ContractRow({ category }: ContractRowProps) {
           }
           return (
             <Suspense
-              key={publisher + contractId + overrides?.title}
               fallback={<ContractCardSkeleton />}
+              key={publisher + contractId + overrides?.title}
             >
               <ContractCard
-                publisher={publisher}
                 contractId={contractId}
-                titleOverride={overrides?.title}
                 descriptionOverride={overrides?.description}
                 isBeta={category.isBeta}
                 modules={
                   modules?.length
                     ? modules.map((m) => ({
-                        publisher: m.split("/")[0] || "",
                         moduleId: m.split("/")[1] || "",
+                        publisher: m.split("/")[0] || "",
                       }))
                     : undefined
                 }
+                publisher={publisher}
+                titleOverride={overrides?.title}
               />
             </Suspense>
           );
diff --git a/apps/dashboard/src/components/explore/publisher/index.tsx b/apps/dashboard/src/components/explore/publisher/index.tsx
index dc5ea1c02cd..40fcdc30cc5 100644
--- a/apps/dashboard/src/components/explore/publisher/index.tsx
+++ b/apps/dashboard/src/components/explore/publisher/index.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Skeleton } from "@/components/ui/skeleton";
 import { replaceDeployerAddress } from "lib/publisher-utils";
 import Link from "next/link";
 import type { ThirdwebClient } from "thirdweb";
@@ -12,6 +11,7 @@ import {
   AccountProvider,
 } from "thirdweb/react";
 import { shortenIfAddress } from "utils/usedapp-external";
+import { Skeleton } from "@/components/ui/skeleton";
 
 interface ContractPublisherProps {
   addressOrEns: string;
@@ -29,9 +29,9 @@ export const ContractPublisher: React.FC<ContractPublisherProps> = ({
         href={replaceDeployerAddress(`/${addressOrEns}`)}
       >
         <AccountAvatar
+          className="size-5 rounded-full object-cover"
           fallbackComponent={<AccountBlobbie className="size-5 rounded-full" />}
           loadingComponent={<Skeleton className="size-5 rounded-full" />}
-          className="size-5 rounded-full object-cover"
         />
 
         <AccountName
@@ -44,8 +44,8 @@ export const ContractPublisher: React.FC<ContractPublisherProps> = ({
               }
             />
           }
-          loadingComponent={<Skeleton className="h-4 w-40" />}
           formatFn={(name) => replaceDeployerAddress(name)}
+          loadingComponent={<Skeleton className="h-4 w-40" />}
         />
       </Link>
     </AccountProvider>
diff --git a/apps/dashboard/src/components/explore/upsells/deploy-your-own.tsx b/apps/dashboard/src/components/explore/upsells/deploy-your-own.tsx
index 241ac30307c..2a5210e1c77 100644
--- a/apps/dashboard/src/components/explore/upsells/deploy-your-own.tsx
+++ b/apps/dashboard/src/components/explore/upsells/deploy-your-own.tsx
@@ -1,6 +1,6 @@
-import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
+import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 
 export const DeployUpsellCard: React.FC = () => {
   return (
@@ -16,8 +16,8 @@ export const DeployUpsellCard: React.FC = () => {
         <Link
           className="inline-flex items-center gap-1.5 text-link-foreground"
           href="https://portal.thirdweb.com/contracts/build/overview"
-          target="_blank"
           rel="noopener noreferrer"
+          target="_blank"
         >
           Learn more about the Solidity SDK
           <ExternalLinkIcon className="size-4" />
@@ -35,8 +35,8 @@ export const DeployUpsellCard: React.FC = () => {
         <Link
           className="inline-flex items-center gap-1.5 text-link-foreground"
           href="https://portal.thirdweb.com/contracts/deploy/overview"
-          target="_blank"
           rel="noopener noreferrer"
+          target="_blank"
         >
           Learn more about Deploy
           <ExternalLinkIcon className="size-4" />
diff --git a/apps/dashboard/src/components/explore/upsells/publish-submit.tsx b/apps/dashboard/src/components/explore/upsells/publish-submit.tsx
index 9982f4800d0..83551eeceda 100644
--- a/apps/dashboard/src/components/explore/upsells/publish-submit.tsx
+++ b/apps/dashboard/src/components/explore/upsells/publish-submit.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@/components/ui/button";
 import Image from "next/image";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 import exploreFeatureImage from "../../../../public/assets/landingpage/explore-featured.png";
 import heroIcon1 from "../../../../public/assets/product-pages/publish/hero-icon-1.png";
 import heroIcon2 from "../../../../public/assets/product-pages/publish/hero-icon-2.png";
@@ -19,7 +19,7 @@ export const PublishUpsellCard: React.FC = () => {
         </p>
 
         <div className="flex gap-2">
-          <Image className="hidden size-6 md:block" src={heroIcon1} alt="" />
+          <Image alt="" className="hidden size-6 md:block" src={heroIcon1} />
 
           <p className="text-muted-foreground">
             <span className="font-semibold text-foreground">
@@ -31,7 +31,7 @@ export const PublishUpsellCard: React.FC = () => {
         </div>
 
         <div className="flex gap-2">
-          <Image className="hidden size-6 md:block" src={heroIcon2} alt="" />
+          <Image alt="" className="hidden size-6 md:block" src={heroIcon2} />
           <p className="text-muted-foreground">
             <span className="font-semibold text-foreground">
               Shareable landing page.{" "}
@@ -43,16 +43,16 @@ export const PublishUpsellCard: React.FC = () => {
 
         <div className="mt-auto flex gap-2 pt-4">
           <Button asChild>
-            <Link href="/contact-us" target="_blank" rel="noopener noreferrer">
+            <Link href="/contact-us" rel="noopener noreferrer" target="_blank">
               Get In Touch
             </Link>
           </Button>
 
           <Button asChild variant="outline">
             <Link
-              target="_blank"
-              rel="noopener noreferrer"
               href="https://portal.thirdweb.com/contracts/publish/overview"
+              rel="noopener noreferrer"
+              target="_blank"
             >
               Learn More
             </Link>
@@ -60,10 +60,10 @@ export const PublishUpsellCard: React.FC = () => {
         </div>
       </div>
       <Image
+        alt=""
         className="hidden w-[40%] grayscale invert md:block dark:filter-none"
         draggable={false}
         src={exploreFeatureImage}
-        alt=""
       />
     </div>
   );
diff --git a/apps/dashboard/src/components/help/contact-forms/account/index.tsx b/apps/dashboard/src/components/help/contact-forms/account/index.tsx
index 2562e834e66..28d52421d3e 100644
--- a/apps/dashboard/src/components/help/contact-forms/account/index.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/account/index.tsx
@@ -10,40 +10,40 @@ type ProblemAreaItem = {
 
 const ACCOUNT_PROBLEM_AREAS: ProblemAreaItem[] = [
   {
-    label: "Pricing inquiry",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Pricing inquiry",
   },
   {
-    label: "Billing inquiry",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Billing inquiry",
   },
   {
-    label: "Usage inquiry",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Usage inquiry",
   },
   {
-    label: "Other",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Other",
   },
 ];
 
@@ -55,11 +55,11 @@ export default function AccountSupportForm() {
       <SupportForm_SelectInput
         formLabel="Problem area"
         name="extraInfo_Problem_Area"
-        promptText="Select a problem area"
+        onValueChange={setProblemArea}
         options={ACCOUNT_PROBLEM_AREAS.map((o) => o.label)}
+        promptText="Select a problem area"
         required={true}
         value={problemArea}
-        onValueChange={setProblemArea}
       />
       {ACCOUNT_PROBLEM_AREAS.find((o) => o.label === problemArea)?.component}
     </>
diff --git a/apps/dashboard/src/components/help/contact-forms/connect/AffectedAreaInput.tsx b/apps/dashboard/src/components/help/contact-forms/connect/AffectedAreaInput.tsx
index b69c5eaf059..a7b2485451e 100644
--- a/apps/dashboard/src/components/help/contact-forms/connect/AffectedAreaInput.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/connect/AffectedAreaInput.tsx
@@ -15,11 +15,11 @@ export const AffectedAreaInput = () => {
       <SupportForm_SelectInput
         formLabel="Affected area"
         name="extraInfo_Affected_Area"
-        required={true}
+        onValueChange={setSelectedAffectedArea}
         options={AFFECTED_AREAS}
         promptText="Select an affected area"
+        required={true}
         value={selectedAffectedArea}
-        onValueChange={setSelectedAffectedArea}
       />
       {selectedAffectedArea &&
         (selectedAffectedArea === "Application" ? (
@@ -27,11 +27,11 @@ export const AffectedAreaInput = () => {
             <SupportForm_SelectInput
               formLabel="SDK"
               name="extraInfo_SDK"
-              required={true}
-              promptText="Select SDK"
+              onValueChange={setSelectedSDK}
               options={["TypeScript", "React", "React Native", "Unity"]}
+              promptText="Select SDK"
+              required={true}
               value={selectedSDK}
-              onValueChange={setSelectedSDK}
             />
             {selectedSDK && (
               <>
@@ -39,14 +39,14 @@ export const AffectedAreaInput = () => {
                 <SupportForm_TextInput
                   formLabel="SDK Version"
                   formValue="extraInfo_SDK_Version"
-                  required={true}
                   inputType="text"
+                  required={true}
                 />
                 <SupportForm_TextInput
                   formLabel="Application URL"
                   formValue="extraInfo_Application_URL"
-                  required={false}
                   inputType="url"
+                  required={false}
                 />
                 <DescriptionInput />
                 <AttachmentForm />
diff --git a/apps/dashboard/src/components/help/contact-forms/connect/index.tsx b/apps/dashboard/src/components/help/contact-forms/connect/index.tsx
index 10225da68ac..a47f4f6a6ad 100644
--- a/apps/dashboard/src/components/help/contact-forms/connect/index.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/connect/index.tsx
@@ -15,8 +15,8 @@ const SDKVersionInput = () => (
   <SupportForm_TextInput
     formLabel="SDK Version"
     formValue="extraInfo_SDK_Version"
-    required={true}
     inputType="text"
+    required={true}
   />
 );
 
@@ -26,54 +26,53 @@ const OSSelect = () => {
     <SupportForm_SelectInput
       formLabel="OS"
       name="extraInfo_OS"
-      required={true}
-      promptText="Select an operating system"
+      onValueChange={setSelectedOS}
       options={["Windows", "MacOS", "Linux", "Other"]}
+      promptText="Select an operating system"
+      required={true}
       value={selectedOS}
-      onValueChange={setSelectedOS}
     />
   );
 };
 
 const PROBLEM_AREAS: ProblemAreaItem[] = [
   {
-    label: "Embedded wallet login issues",
     component: <AffectedAreaInput />,
+    label: "Embedded wallet login issues",
   },
   {
-    label: "Embedded wallet transaction issues",
     component: <AffectedAreaInput />,
+    label: "Embedded wallet transaction issues",
   },
   {
-    label: "Embedded wallet Custom Auth",
     component: <AffectedAreaInput />,
+    label: "Embedded wallet Custom Auth",
   },
   {
-    label: "Account Abstraction",
     component: <AffectedAreaInput />,
+    label: "Account Abstraction",
   },
   {
-    label: "In-app wallet",
     component: <AffectedAreaInput />,
+    label: "In-app wallet",
   },
   {
-    label: "Connect SDKs",
     component: (
       <>
         <SDKVersionInput />
         <SupportForm_TextInput
           formLabel="Application URL"
           formValue="extraInfo_Application_URL"
-          required={false}
           inputType="url"
+          required={false}
         />
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Connect SDKs",
   },
   {
-    label: "Unity SDK",
     component: (
       <>
         <UnitySupportForm />
@@ -82,9 +81,9 @@ const PROBLEM_AREAS: ProblemAreaItem[] = [
         <AttachmentForm />
       </>
     ),
+    label: "Unity SDK",
   },
   {
-    label: ".NET SDK",
     component: (
       <>
         <SDKVersionInput />
@@ -92,28 +91,29 @@ const PROBLEM_AREAS: ProblemAreaItem[] = [
         <SupportForm_TextInput
           formLabel="Framework"
           formValue="extraInfo_dotNET_Framework"
-          required={false}
-          placeholder="MAUI | Blazor | Godot, etc"
           inputType="text"
+          placeholder="MAUI | Blazor | Godot, etc"
+          required={false}
         />
         <SupportForm_TextInput
           formLabel="Target OS"
           formValue="extraInfo_dotNET_Target_OS"
-          required={false}
           inputType="text"
+          required={false}
         />
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: ".NET SDK",
   },
   {
-    label: "Pay",
     component: <AffectedAreaInput />,
+    label: "Pay",
   },
   {
-    label: "Auth",
     component: <AffectedAreaInput />,
+    label: "Auth",
   },
 ];
 
@@ -125,10 +125,10 @@ export default function ConnectSupportForm() {
       <SupportForm_SelectInput
         formLabel="Problem area"
         name="extraInfo_Problem_Area"
-        promptText="Select a problem area"
+        onValueChange={setSelectedProblemArea}
         options={PROBLEM_AREAS.map((o) => o.label)}
+        promptText="Select a problem area"
         required={true}
-        onValueChange={setSelectedProblemArea}
         value={selectedProblemArea}
       />
       {PROBLEM_AREAS.find((o) => o.label === selectedProblemArea)?.component}
diff --git a/apps/dashboard/src/components/help/contact-forms/contracts/index.tsx b/apps/dashboard/src/components/help/contact-forms/contracts/index.tsx
index 8bbdcbf5045..c06eeea8077 100644
--- a/apps/dashboard/src/components/help/contact-forms/contracts/index.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/contracts/index.tsx
@@ -14,8 +14,8 @@ const NetworkInput = () => (
     formLabel="Network"
     formValue="extraInfo_Network"
     inputType="text"
-    required={true}
     placeholder="Network name or chain ID"
+    required={true}
   />
 );
 
@@ -23,8 +23,8 @@ const ContractAddressInput = () => (
   <SupportForm_TextInput
     formLabel="Contract address"
     formValue="extraInfo_Contract_Address"
-    required={true}
     inputType="text"
+    required={true}
   />
 );
 
@@ -32,8 +32,8 @@ const ContractFunctionInput = () => (
   <SupportForm_TextInput
     formLabel="Contract function"
     formValue="extraInfo_Contract_Function"
-    required={true}
     inputType="text"
+    required={true}
   />
 );
 
@@ -41,9 +41,9 @@ const ContractTypeInput = () => (
   <SupportForm_TextInput
     formLabel="Contract type"
     formValue="extraInfo_Contract_Type"
-    required={false}
     inputType="text"
     placeholder={`"MarketplaceV3 | "NFTDrop" | ...`}
+    required={false}
   />
 );
 
@@ -53,18 +53,17 @@ const ContractAffectedAreaInput = () => {
     <SupportForm_SelectInput
       formLabel="Contract affected area"
       name="extraInfo_Affected_Area"
+      onValueChange={setSelectedAffectedArea}
       options={["Dashboard", "SDK"]}
-      required={true}
       promptText="Select an affected area"
+      required={true}
       value={selectedAffectedArea}
-      onValueChange={setSelectedAffectedArea}
     />
   );
 };
 
 const CONTRACT_PROBLEM_AREAS: ProblemAreaItem[] = [
   {
-    label: "Deploying a contract",
     component: (
       <>
         <NetworkInput />
@@ -74,9 +73,9 @@ const CONTRACT_PROBLEM_AREAS: ProblemAreaItem[] = [
         <AttachmentForm />
       </>
     ),
+    label: "Deploying a contract",
   },
   {
-    label: "Contract verification",
     component: (
       <>
         <NetworkInput />
@@ -86,9 +85,9 @@ const CONTRACT_PROBLEM_AREAS: ProblemAreaItem[] = [
         <AttachmentForm />
       </>
     ),
+    label: "Contract verification",
   },
   {
-    label: "Calling a function in my contract",
     component: (
       <>
         <NetworkInput />
@@ -99,24 +98,25 @@ const CONTRACT_PROBLEM_AREAS: ProblemAreaItem[] = [
         <AttachmentForm />
       </>
     ),
+    label: "Calling a function in my contract",
   },
   {
-    label: "Developing a custom contract",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Developing a custom contract",
   },
   {
-    label: "Other",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Other",
   },
 ];
 
@@ -127,11 +127,11 @@ export default function ContractSupportForm() {
       <SupportForm_SelectInput
         formLabel="Problem area"
         name="extraInfo_Problem_Area"
-        promptText="Select a problem area"
+        onValueChange={setProblemArea}
         options={CONTRACT_PROBLEM_AREAS.map((o) => o.label)}
+        promptText="Select a problem area"
         required={true}
         value={problemArea}
-        onValueChange={setProblemArea}
       />
       {CONTRACT_PROBLEM_AREAS.find((o) => o.label === problemArea)?.component}
     </>
diff --git a/apps/dashboard/src/components/help/contact-forms/engine/index.tsx b/apps/dashboard/src/components/help/contact-forms/engine/index.tsx
index be8864bac38..860765bccfc 100644
--- a/apps/dashboard/src/components/help/contact-forms/engine/index.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/engine/index.tsx
@@ -21,22 +21,22 @@ export default function EngineSupportForm() {
       <SupportForm_SelectInput
         formLabel="Problem area"
         name="extraInfo_Engine_Type"
-        promptText="Select Engine type"
-        options={ENGINE_TYPES}
-        value={selectedEngineType}
         onValueChange={setSelectedEngineType}
+        options={ENGINE_TYPES}
+        promptText="Select Engine type"
         required={true}
+        value={selectedEngineType}
       />
       {selectedEngineType && (
         <>
           <SupportForm_SelectInput
             formLabel="Problem area"
             name="extraInfo_Problem_Area"
-            promptText="Select a problem area"
+            onValueChange={setProblemArea}
             options={ENGINE_PROBLEM_AREAS}
+            promptText="Select a problem area"
             required={true}
             value={problemArea}
-            onValueChange={setProblemArea}
           />
 
           {problemArea && (
@@ -44,9 +44,9 @@ export default function EngineSupportForm() {
               <SupportForm_TextInput
                 formLabel="Engine URL"
                 formValue="extraInfo_Engine_URL"
-                required={true}
                 inputType="url"
                 placeholder="https://your-engine-url.com"
+                required={true}
               />
               <DescriptionInput />
               <AttachmentForm />
diff --git a/apps/dashboard/src/components/help/contact-forms/other/index.tsx b/apps/dashboard/src/components/help/contact-forms/other/index.tsx
index 585581eabc5..fcbc0440670 100644
--- a/apps/dashboard/src/components/help/contact-forms/other/index.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/other/index.tsx
@@ -10,40 +10,40 @@ type ProblemAreaItem = {
 
 const OTHER_PROBLEM_AREAS: ProblemAreaItem[] = [
   {
-    label: "General inquiry",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "General inquiry",
   },
   {
-    label: "Security",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Security",
   },
   {
-    label: "Feedback",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Feedback",
   },
   {
-    label: "Other",
     component: (
       <>
         <DescriptionInput />
         <AttachmentForm />
       </>
     ),
+    label: "Other",
   },
 ];
 
@@ -54,11 +54,11 @@ export default function OtherSupportForm() {
       <SupportForm_SelectInput
         formLabel="Problem area"
         name="extraInfo_Problem_Area"
-        promptText="Select a problem area"
+        onValueChange={setProblemArea}
         options={OTHER_PROBLEM_AREAS.map((o) => o.label)}
+        promptText="Select a problem area"
         required={true}
         value={problemArea}
-        onValueChange={setProblemArea}
       />
       {OTHER_PROBLEM_AREAS.find((o) => o.label === problemArea)?.component}
     </>
diff --git a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_AttachmentUploader.tsx b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_AttachmentUploader.tsx
index 348f25990a3..9cd3479f633 100644
--- a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_AttachmentUploader.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_AttachmentUploader.tsx
@@ -3,14 +3,14 @@ import { Label } from "@/components/ui/label";
 export const AttachmentForm = () => {
   return (
     <div className="flex flex-col items-start gap-2">
-      <Label htmlFor="files" className="relative">
+      <Label className="relative" htmlFor="files">
         Attachments
       </Label>
       <input
-        type="file"
-        multiple
         accept="image/*,video/*,"
+        multiple
         name="attachments"
+        type="file"
       />
     </div>
   );
diff --git a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_DescriptionInput.tsx b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_DescriptionInput.tsx
index 5a8da3ca1d0..24bed8dd13f 100644
--- a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_DescriptionInput.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_DescriptionInput.tsx
@@ -11,18 +11,18 @@ const defaultDescription =
 export const DescriptionInput = (props: Props) => {
   return (
     <div className="flex flex-col items-start gap-2">
-      <Label htmlFor="markdown" className="relative">
+      <Label className="relative" htmlFor="markdown">
         Description
         <span className="-top-1.5 -right-2 absolute text-destructive">•</span>
       </Label>
 
       <Textarea
+        autoComplete="off"
+        maxLength={10000}
         name="markdown"
         placeholder={props.placeholder ?? defaultDescription}
-        autoComplete="off"
-        rows={7}
         required
-        maxLength={10000}
+        rows={7}
       />
     </div>
   );
diff --git a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_SelectInput.tsx b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_SelectInput.tsx
index 2625655e936..1144797cdb8 100644
--- a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_SelectInput.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_SelectInput.tsx
@@ -23,7 +23,7 @@ export const SupportForm_SelectInput = (props: Props) => {
   return (
     <>
       <div className="flex flex-col items-start gap-2">
-        <Label htmlFor={name} className="relative">
+        <Label className="relative" htmlFor={name}>
           {formLabel}
           {required && (
             <span className="-top-1.5 -right-2 absolute text-destructive">
@@ -34,11 +34,11 @@ export const SupportForm_SelectInput = (props: Props) => {
 
         <Select
           name={name}
-          required={required}
-          value={props.value}
           onValueChange={(val) => {
             props.onValueChange(val);
           }}
+          required={required}
+          value={props.value}
         >
           <SelectTrigger>
             <SelectValue placeholder={promptText}>{props.value}</SelectValue>
diff --git a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TeamSelection.tsx b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TeamSelection.tsx
index bdce303f280..59420732905 100644
--- a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TeamSelection.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TeamSelection.tsx
@@ -1,3 +1,4 @@
+import { useId } from "react";
 import { Label } from "@/components/ui/label";
 import {
   Select,
@@ -23,22 +24,24 @@ export const SupportForm_TeamSelection = (props: Props) => {
     (t) => t.id === props.selectedTeamId,
   )?.name;
 
+  const teamId = useId();
+
   return (
     <>
       <div className="flex flex-col items-start gap-2">
-        <Label htmlFor="team" className="relative">
+        <Label className="relative" htmlFor={teamId}>
           Select Team
           <span className="-top-1.5 -right-2 absolute text-destructive">•</span>
         </Label>
 
         <Select
           name="teamId"
-          value={props.selectedTeamId}
           onValueChange={(selectedId) => {
             props.onChange(selectedId);
           }}
+          value={props.selectedTeamId}
         >
-          <SelectTrigger id="team">
+          <SelectTrigger id={teamId}>
             <SelectValue placeholder="Select a Team">
               {selectedTeamName}
             </SelectValue>
diff --git a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TelegramInput.tsx b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TelegramInput.tsx
index 47974ba026d..fc79ad23bd3 100644
--- a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TelegramInput.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TelegramInput.tsx
@@ -9,18 +9,18 @@ const defaultDescription = "@YourHandle";
 export const SupportForm_TelegramInput = (props: Props) => {
   return (
     <div className="flex flex-col items-start gap-2 bg-[#0a0a0a]">
-      <Label htmlFor="telegram" className="relative">
+      <Label className="relative" htmlFor="telegram">
         Telegram
         <span className="-top-1.5 -right-2 absolute text-destructive">•</span>
       </Label>
 
       <input
+        autoComplete="off"
         className="flex h-10 w-full items-center justify-between gap-2 rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1"
-        type="text"
+        maxLength={50}
         name="telegram"
         placeholder={props.placeholder ?? defaultDescription}
-        autoComplete="off"
-        maxLength={50}
+        type="text"
       />
     </div>
   );
diff --git a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TextInput.tsx b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TextInput.tsx
index 3a43c764382..4fea62f0a99 100644
--- a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TextInput.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_TextInput.tsx
@@ -1,6 +1,6 @@
+import type { HTMLInputTypeAttribute } from "react";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import type { HTMLInputTypeAttribute } from "react";
 
 type Props = {
   formLabel: string;
@@ -13,7 +13,7 @@ export const SupportForm_TextInput = (props: Props) => {
   const { formLabel, formValue, required, placeholder, inputType } = props;
   return (
     <div className="flex flex-col items-start gap-2">
-      <Label htmlFor={formValue} className="relative">
+      <Label className="relative" htmlFor={formValue}>
         {formLabel}
         {required && (
           <span className="-top-1.5 -right-2 absolute text-destructive">•</span>
@@ -23,8 +23,8 @@ export const SupportForm_TextInput = (props: Props) => {
       <Input
         name={formValue}
         placeholder={placeholder}
-        type={inputType}
         required={required}
+        type={inputType}
       />
     </div>
   );
diff --git a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_UnityInput.tsx b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_UnityInput.tsx
index feaa2a20585..bd68eda89ea 100644
--- a/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_UnityInput.tsx
+++ b/apps/dashboard/src/components/help/contact-forms/shared/SupportForm_UnityInput.tsx
@@ -22,26 +22,26 @@ export const UnitySupportForm = () => {
       <SupportForm_SelectInput
         formLabel="OS"
         name="extraInfo_OS"
-        required={true}
-        promptText="Select an operating system"
+        onValueChange={setSelectedOS}
         options={OPERATING_SYSTEMS}
+        promptText="Select an operating system"
+        required={true}
         value={selectedOS}
-        onValueChange={setSelectedOS}
       />
       <SupportForm_SelectInput
         formLabel="Target platform"
         name="extraInfo_Target_Platform"
-        required={true}
-        promptText="Select the target platform"
+        onValueChange={setSelectedTargetPlatform}
         options={TARGET_PLATFORMS}
+        promptText="Select the target platform"
+        required={true}
         value={selectedTargetPlatform}
-        onValueChange={setSelectedTargetPlatform}
       />
       <SupportForm_TextInput
         formLabel="Unity version"
         formValue="extraInfo_Unity_Version"
-        required={true}
         inputType="text"
+        required={true}
       />
     </>
   );
diff --git a/apps/dashboard/src/components/icons/ChainIcon.tsx b/apps/dashboard/src/components/icons/ChainIcon.tsx
index a3bf0d8e0fb..ea7dff9a9e9 100644
--- a/apps/dashboard/src/components/icons/ChainIcon.tsx
+++ b/apps/dashboard/src/components/icons/ChainIcon.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { Img } from "@/components/blocks/Img";
-import { cn } from "@/lib/utils";
 /* eslint-disable @next/next/no-img-element */
 import { replaceIpfsUrl } from "lib/sdk";
 import type { ThirdwebClient } from "thirdweb";
+import { Img } from "@/components/blocks/Img";
+import { cn } from "@/lib/utils";
 import { fallbackChainIcon } from "../../utils/chain-icons";
 
 type ImageProps = React.ComponentProps<"img">;
@@ -25,13 +25,13 @@ export const ChainIconClient = ({
     <Img
       {...restProps}
       // render different image element if src changes to avoid showing old image while loading new one
-      key={resolvedSrc}
+      alt=""
       className={cn("object-contain", restProps.className)}
-      src={resolvedSrc}
+      fallback={<img alt="" src={fallbackChainIcon} />}
+      key={resolvedSrc}
       loading={restProps.loading || "lazy"}
-      alt=""
-      fallback={<img src={fallbackChainIcon} alt="" />}
       skeleton={<div className="animate-pulse rounded-full bg-border" />}
+      src={resolvedSrc}
     />
   );
 };
diff --git a/apps/dashboard/src/components/icons/brand-icons/DiscordIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/DiscordIcon.tsx
index 30bb83ae939..38f5403eb20 100644
--- a/apps/dashboard/src/components/icons/brand-icons/DiscordIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/DiscordIcon.tsx
@@ -3,17 +3,16 @@ import type { SVGProps } from "react";
 export function DiscordIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
       enable-background="new 0 0 100 100"
       viewBox="0 0 100 100"
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
       fill="currentColor"
-      width={20}
       height={20}
       role="presentation"
+      width={20}
     >
       <path
-        id="Layer_2"
         d="M85.778,24.561c-11.641-8.71-22.793-8.466-22.793-8.466s-1.14,1.302-1.14,1.302c13.839,4.152,20.27,10.257,20.27,10.257
 		c-19.799-10.901-45.019-10.823-65.613,0c0,0,6.675-6.431,21.328-10.583c0,0-0.814-0.977-0.814-0.977s-11.071-0.244-22.793,8.466
 		c0,0-11.722,21.084-11.722,47.052c0,0,6.838,11.722,24.829,12.292c0,0,3.012-3.582,5.454-6.675
diff --git a/apps/dashboard/src/components/icons/brand-icons/DotNetIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/DotNetIcon.tsx
index 49c4c106661..744000e1979 100644
--- a/apps/dashboard/src/components/icons/brand-icons/DotNetIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/DotNetIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const DotNetIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>.NET</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/GithubIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/GithubIcon.tsx
index cf06395ab38..74da6d2d3c4 100644
--- a/apps/dashboard/src/components/icons/brand-icons/GithubIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/GithubIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const GithubIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>GitHub</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/InstagramIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/InstagramIcon.tsx
index 7bf1c78b668..a5bcc59a5e6 100644
--- a/apps/dashboard/src/components/icons/brand-icons/InstagramIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/InstagramIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const InstagramIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>Instagram</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/LinkedinIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/LinkedinIcon.tsx
index 21233414dd1..25fa0b81b55 100644
--- a/apps/dashboard/src/components/icons/brand-icons/LinkedinIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/LinkedinIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const LinkedInIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>LinkedIn</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/ReactIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/ReactIcon.tsx
index afaa2a707db..46ed547f79d 100644
--- a/apps/dashboard/src/components/icons/brand-icons/ReactIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/ReactIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const ReactIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>React</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/RedditIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/RedditIcon.tsx
index 8767f10c049..8a29024fd23 100644
--- a/apps/dashboard/src/components/icons/brand-icons/RedditIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/RedditIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const RedditIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>Reddit</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/TelegramIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/TelegramIcon.tsx
index f9cc12b4edb..eac1e696e15 100644
--- a/apps/dashboard/src/components/icons/brand-icons/TelegramIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/TelegramIcon.tsx
@@ -3,13 +3,13 @@ import type { SVGProps } from "react";
 export function TelegramIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24 24"
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
       fill="currentColor"
-      width={24}
       height={24}
       role="presentation"
+      width={24}
     >
       <path d="m12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12c0-6.627-5.373-12-12-12zm5.894 8.221-1.97 9.28c-.145.658-.537.818-1.084.508l-3-2.21-1.446 1.394c-.14.18-.357.295-.6.295-.002 0-.003 0-.005 0l.213-3.054 5.56-5.022c.24-.213-.054-.334-.373-.121l-6.869 4.326-2.96-.924c-.64-.203-.658-.64.135-.954l11.566-4.458c.538-.196 1.006.128.832.941z" />
     </svg>
diff --git a/apps/dashboard/src/components/icons/brand-icons/TiktokIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/TiktokIcon.tsx
index 48918f54265..03b67d51205 100644
--- a/apps/dashboard/src/components/icons/brand-icons/TiktokIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/TiktokIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const TiktokIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>TikTok</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/TypeScriptIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/TypeScriptIcon.tsx
index ec6d9168173..d300f85c9d7 100644
--- a/apps/dashboard/src/components/icons/brand-icons/TypeScriptIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/TypeScriptIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const TypeScriptIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>TypeScript</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/UnityIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/UnityIcon.tsx
index 59ca9cdc460..cea1122c5fd 100644
--- a/apps/dashboard/src/components/icons/brand-icons/UnityIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/UnityIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const UnityIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>Unity</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/UnrealIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/UnrealIcon.tsx
index c332739334a..abf0c0a8d1b 100644
--- a/apps/dashboard/src/components/icons/brand-icons/UnrealIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/UnrealIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const UnrealIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>Unreal Engine</title>
diff --git a/apps/dashboard/src/components/icons/brand-icons/XIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/XIcon.tsx
index 786ca8117c2..e11c60a778e 100644
--- a/apps/dashboard/src/components/icons/brand-icons/XIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/XIcon.tsx
@@ -5,13 +5,13 @@ export const XIcon = (props: SVGProps<SVGSVGElement>) => {
     <svg
       fill="currentColor"
       height="20"
+      role="presentation"
       viewBox="0 0 16 16"
       width="20"
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
       {...props}
     >
-      <g id="Twitter">
+      <g>
         <path d="M9.14163 7.19284L13.6089 2H12.5503L8.67137 6.50887L5.57328 2H2L6.68492 8.81821L2 14.2637H3.05866L7.15491 9.50218L10.4267 14.2637H14L9.14163 7.19284ZM7.69165 8.87828L7.21697 8.19934L3.44011 2.79694H5.06615L8.11412 7.15685L8.5888 7.83579L12.5508 13.503H10.9248L7.69165 8.87828Z" />
       </g>
     </svg>
diff --git a/apps/dashboard/src/components/icons/brand-icons/YoutubeIcon.tsx b/apps/dashboard/src/components/icons/brand-icons/YoutubeIcon.tsx
index 0fa0417942f..fd95f9f9bda 100644
--- a/apps/dashboard/src/components/icons/brand-icons/YoutubeIcon.tsx
+++ b/apps/dashboard/src/components/icons/brand-icons/YoutubeIcon.tsx
@@ -3,12 +3,12 @@ import type { SVGProps } from "react";
 export const YoutubeIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>YouTube</title>
diff --git a/apps/dashboard/src/components/inputs/BasisPointsInput.tsx b/apps/dashboard/src/components/inputs/BasisPointsInput.tsx
index c03ccf0966d..7d620cc9070 100644
--- a/apps/dashboard/src/components/inputs/BasisPointsInput.tsx
+++ b/apps/dashboard/src/components/inputs/BasisPointsInput.tsx
@@ -1,8 +1,9 @@
 /* eslint-disable no-restricted-syntax */
-import { Input } from "@/components/ui/input";
-import { cn } from "@/lib/utils";
+
 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>;
 
@@ -51,7 +52,7 @@ export const BasisPointsInput: React.FC<BasisPointsInputProps> = ({
           "rounded-r-none border-none focus-visible:ring-0 focus-visible:ring-offset-0",
           restInputProps.className,
         )}
-        onChange={(e) => setStringValue(e.target.value)}
+        maxLength={5}
         onBlur={(e) => {
           const val = e.target.value;
           const validValue = val.match(
@@ -63,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" />
diff --git a/apps/dashboard/src/components/ipfs-upload/button.tsx b/apps/dashboard/src/components/ipfs-upload/button.tsx
index 92455d5778a..a5c744bf1c4 100644
--- a/apps/dashboard/src/components/ipfs-upload/button.tsx
+++ b/apps/dashboard/src/components/ipfs-upload/button.tsx
@@ -24,6 +24,7 @@ export const IpfsUploadButton: ComponentWithChildren<IpfsUploadButtonProps> = ({
   const { onError } = useErrorHandler();
   const handleUpload = (file: File) => {
     storageUpload.mutate([file], {
+      onError: (error) => onError(error, "Failed to upload file"),
       onSuccess: ([uri]) => {
         if (uri) {
           onUpload(uri);
@@ -31,18 +32,17 @@ export const IpfsUploadButton: ComponentWithChildren<IpfsUploadButtonProps> = ({
           toast.error("File Upload but no URI returned");
         }
       },
-      onError: (error) => onError(error, "Failed to upload file"),
     });
   };
 
   return (
-    <FileInput setValue={handleUpload} client={client}>
+    <FileInput client={client} setValue={handleUpload}>
       <Button
-        size="sm"
-        variant="solid"
         aria-label="Upload to IPFS"
-        rightIcon={<UploadIcon className="size-4" />}
         isLoading={storageUpload.isPending}
+        rightIcon={<UploadIcon className="size-4" />}
+        size="sm"
+        variant="solid"
         {...buttonProps}
       >
         {children}
diff --git a/apps/dashboard/src/components/not-found-page.tsx b/apps/dashboard/src/components/not-found-page.tsx
index 0e29cbfcde0..ed83431a96b 100644
--- a/apps/dashboard/src/components/not-found-page.tsx
+++ b/apps/dashboard/src/components/not-found-page.tsx
@@ -21,17 +21,17 @@ export function NotFoundPage() {
           <div>
             <p className="text-center text-muted-foreground text-xl leading-7">
               Find live content on our{" "}
-              <Link href="/home" className="text-foreground hover:underline">
+              <Link className="text-foreground hover:underline" href="/home">
                 homepage
               </Link>
               ,{" "}
-              <Link href="/team" className="text-foreground hover:underline">
+              <Link className="text-foreground hover:underline" href="/team">
                 dashboard
               </Link>{" "}
               or{" "}
               <Link
-                href="https://portal.thirdweb.com"
                 className="text-foreground hover:underline"
+                href="https://portal.thirdweb.com"
               >
                 developer portal
               </Link>
@@ -41,8 +41,8 @@ export function NotFoundPage() {
 
           <Aurora
             color="hsl(var(--foreground)/8%)"
-            pos={{ top: "40%", left: "50%" }}
-            size={{ width: "100vw", height: "100vh" }}
+            pos={{ left: "50%", top: "40%" }}
+            size={{ height: "100vh", width: "100vw" }}
           />
         </div>
       </div>
@@ -61,12 +61,12 @@ const Aurora: React.FC<AuroraProps> = ({ color, pos, size }) => {
     <div
       className="pointer-events-none absolute"
       style={{
-        top: pos.top,
-        left: pos.left,
-        width: size.width,
+        backgroundImage: `radial-gradient(ellipse at center, ${color}, transparent 60%)`,
         height: size.height,
+        left: pos.left,
+        top: pos.top,
         transform: "translate(-50%, -50%)",
-        backgroundImage: `radial-gradient(ellipse at center, ${color}, transparent 60%)`,
+        width: size.width,
       }}
     />
   );
diff --git a/apps/dashboard/src/components/notices/AnnouncementBanner.tsx b/apps/dashboard/src/components/notices/AnnouncementBanner.tsx
index 0b87197eb94..450fa9cf12e 100644
--- a/apps/dashboard/src/components/notices/AnnouncementBanner.tsx
+++ b/apps/dashboard/src/components/notices/AnnouncementBanner.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import { useLocalStorage } from "hooks/useLocalStorage";
 import { XIcon } from "lucide-react";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
 function AnnouncementBannerUI(props: {
   href: string;
@@ -20,10 +20,10 @@ function AnnouncementBannerUI(props: {
   return (
     <div className="fade-in-0 relative w-full animate-in bg-blue-700 px-4 py-3 pr-14 text-white duration-400">
       <Link
+        className="container flex cursor-pointer items-center gap-2 lg:justify-center"
         href={props.href}
-        target={props.href.startsWith("http") ? "_blank" : undefined}
         rel={props.href.startsWith("http") ? "noopener noreferrer" : undefined}
-        className="container flex cursor-pointer items-center gap-2 lg:justify-center"
+        target={props.href.startsWith("http") ? "_blank" : undefined}
       >
         <span className="inline-block font-medium leading-normal hover:underline">
           {props.label}
@@ -31,11 +31,11 @@ function AnnouncementBannerUI(props: {
       </Link>
 
       <Button
-        size="icon"
-        variant="ghost"
-        onClick={() => setHasDismissedAnnouncement(true)}
         aria-label="Close announcement"
         className="-translate-y-1/2 absolute top-1/2 right-2 h-auto w-auto p-2 hover:bg-white/15 hover:text-white"
+        onClick={() => setHasDismissedAnnouncement(true)}
+        size="icon"
+        variant="ghost"
       >
         <XIcon className="size-5" />
       </Button>
diff --git a/apps/dashboard/src/components/onboarding/ApplyForOpCreditsForm.tsx b/apps/dashboard/src/components/onboarding/ApplyForOpCreditsForm.tsx
index 21f8570229b..55d913f3360 100644
--- a/apps/dashboard/src/components/onboarding/ApplyForOpCreditsForm.tsx
+++ b/apps/dashboard/src/components/onboarding/ApplyForOpCreditsForm.tsx
@@ -1,7 +1,3 @@
-import type { Team } from "@/api/team";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Textarea } from "@/components/ui/textarea";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { Flex, FormControl } from "@chakra-ui/react";
 import { Select as ChakraSelect } from "chakra-react-select";
@@ -10,6 +6,10 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { FormHelperText, FormLabel } from "tw-components";
+import type { Team } from "@/api/team";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
 import { PlanToCreditsRecord } from "./ApplyForOpCreditsModal";
 import { applyOpSponsorship } from "./applyOpSponsorship";
 
@@ -44,16 +44,16 @@ export const ApplyForOpCreditsForm: React.FC<ApplyForOpCreditsFormProps> = ({
   );
   const transformedQueryData = useMemo(
     () => ({
+      company: "",
+      email: account?.email || "",
       firstname: "",
       lastname: "",
-      thirdweb_account_id: account?.id || "",
       plan_type: PlanToCreditsRecord[plan].plan,
-      email: account?.email || "",
-      company: "",
-      website: "",
-      twitterhandle: "",
-      superchain_verticals: "",
       superchain_chain: "",
+      superchain_verticals: "",
+      thirdweb_account_id: account?.id || "",
+      twitterhandle: "",
+      website: "",
       what_would_you_like_to_meet_about_: "",
     }),
     [account, plan],
@@ -71,9 +71,9 @@ export const ApplyForOpCreditsForm: React.FC<ApplyForOpCreditsFormProps> = ({
 
   return (
     <Flex
+      as="form"
       direction="column"
       gap={4}
-      as="form"
       onSubmit={form.handleSubmit(async (data) => {
         const fields = Object.keys(data).map((key) => ({
           name: key,
@@ -133,6 +133,12 @@ export const ApplyForOpCreditsForm: React.FC<ApplyForOpCreditsFormProps> = ({
         <FormControl gap={6} isRequired>
           <FormLabel>Industry</FormLabel>
           <ChakraSelect
+            isRequired
+            onChange={(value) => {
+              if (value?.value) {
+                form.setValue("superchain_verticals", value.value);
+              }
+            }}
             options={[
               "DAOs",
               "Education & Community",
@@ -150,17 +156,19 @@ export const ApplyForOpCreditsForm: React.FC<ApplyForOpCreditsFormProps> = ({
                 vertical === "Payments & Finance (DeFi)" ? "DeFi" : vertical,
             }))}
             placeholder="Select industry"
-            isRequired
-            onChange={(value) => {
-              if (value?.value) {
-                form.setValue("superchain_verticals", value.value);
-              }
-            }}
           />
         </FormControl>
         <FormControl gap={6} isRequired>
           <FormLabel>Chain</FormLabel>
           <ChakraSelect
+            isMulti
+            isRequired
+            onChange={(values) => {
+              form.setValue(
+                "superchain_chain",
+                values.map(({ value }) => value).join(";"),
+              );
+            }}
             options={[
               "Optimism",
               "Base",
@@ -181,16 +189,8 @@ export const ApplyForOpCreditsForm: React.FC<ApplyForOpCreditsFormProps> = ({
               label: chain === "Optimism" ? "OP Mainnet" : chain,
               value: chain,
             }))}
-            onChange={(values) => {
-              form.setValue(
-                "superchain_chain",
-                values.map(({ value }) => value).join(";"),
-              );
-            }}
-            isMulti
-            selectedOptionStyle="check"
             placeholder="Select chains"
-            isRequired
+            selectedOptionStyle="check"
           />
         </FormControl>
         <FormControl gap={6}>
@@ -205,8 +205,8 @@ export const ApplyForOpCreditsForm: React.FC<ApplyForOpCreditsFormProps> = ({
       <div className="flex flex-row">
         <Button
           className="w-full"
-          type="submit"
           disabled={form.formState.isSubmitting}
+          type="submit"
         >
           {form.formState.isSubmitting ? "Applying..." : "Apply now"}
         </Button>
diff --git a/apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx b/apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx
index ce4a174ecfc..404878fe16b 100644
--- a/apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx
+++ b/apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx
@@ -1,5 +1,8 @@
+import { type Account, accountPlan } from "@3rdweb-sdk/react/hooks/useApi";
+import { useLocalStorage } from "hooks/useLocalStorage";
+import { ArrowRightIcon, CircleAlertIcon } from "lucide-react";
+import { useState } from "react";
 import type { Team } from "@/api/team";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import {
@@ -9,10 +12,7 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { type Account, accountPlan } from "@3rdweb-sdk/react/hooks/useApi";
-import { useLocalStorage } from "hooks/useLocalStorage";
-import { ArrowRightIcon, CircleAlertIcon } from "lucide-react";
-import { useState } from "react";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { TeamPlanBadge } from "../../app/(app)/components/TeamPlanBadge";
 import { getValidTeamPlan } from "../../app/(app)/team/components/TeamHeader/getValidTeamPlan";
 import { ApplyForOpCreditsForm } from "./ApplyForOpCreditsForm";
@@ -26,7 +26,6 @@ export type CreditsRecord = {
 };
 
 const tier2Credits: Omit<CreditsRecord, "plan"> = {
-  upTo: true,
   credits: "$2,500",
   features: [
     "10k monthly active wallets",
@@ -34,22 +33,23 @@ const tier2Credits: Omit<CreditsRecord, "plan"> = {
     "Custom Auth",
     "Custom Branding",
   ],
+  upTo: true,
 };
 
 const tier1Credits: Omit<CreditsRecord, "plan"> = {
-  upTo: true,
   credits: "$250",
+  upTo: true,
 };
 
 export const PlanToCreditsRecord: Record<Team["billingPlan"], CreditsRecord> = {
+  accelerate: {
+    plan: "accelerate",
+    ...tier2Credits,
+  },
   free: {
     plan: "free",
     ...tier1Credits,
   },
-  starter: {
-    plan: "starter",
-    ...tier1Credits,
-  },
 
   growth: {
     plan: "growth",
@@ -59,30 +59,27 @@ export const PlanToCreditsRecord: Record<Team["billingPlan"], CreditsRecord> = {
     plan: "growth_legacy",
     ...tier2Credits,
   },
-  accelerate: {
-    plan: "accelerate",
-    ...tier2Credits,
-  },
-  scale: {
-    plan: "scale",
-    ...tier2Credits,
-  },
   pro: {
-    plan: "pro",
-    upTo: true,
     credits: "$3,000+",
     features: [
       "Custom rate limits for APIs & Infra",
       "Enterprise grade SLAs",
       "Dedicated support",
     ],
+    plan: "pro",
+    upTo: true,
+  },
+  scale: {
+    plan: "scale",
+    ...tier2Credits,
+  },
+  starter: {
+    plan: "starter",
+    ...tier1Credits,
   },
 };
 
-export function ApplyForOpCredits(props: {
-  team: Team;
-  account: Account;
-}) {
+export function ApplyForOpCredits(props: { team: Team; account: Account }) {
   const { account, team } = props;
   const validTeamPlan = getValidTeamPlan(team);
   const hasValidPaymentMethod = validTeamPlan !== "free";
@@ -116,7 +113,7 @@ export function ApplyForOpCredits(props: {
           {/* alert */}
           {!hasValidPaymentMethod && (
             <div className="px-6 pb-6">
-              <Alert variant="warning" className="bg-background">
+              <Alert className="bg-background" variant="warning">
                 <CircleAlertIcon className="size-5" />
                 <AlertTitle>Payment method required</AlertTitle>
                 <AlertDescription>
@@ -135,10 +132,10 @@ export function ApplyForOpCredits(props: {
 
           <div className="flex justify-end border-t p-4">
             <ApplyOpCreditsButton
+              account={account}
               hasAppliedForOpGrant={hasAppliedForOpGrant}
               hasValidPaymentMethod={hasValidPaymentMethod}
               validTeamPlan={validTeamPlan}
-              account={account}
             />
           </div>
         </div>
@@ -187,11 +184,11 @@ function ApplyOpCreditsButton(props: {
   const [isOpen, setIsOpen] = useState(false);
 
   return (
-    <Sheet open={isOpen} onOpenChange={setIsOpen}>
+    <Sheet onOpenChange={setIsOpen} open={isOpen}>
       <SheetTrigger asChild>
         <Button
-          disabled={!hasValidPaymentMethod || hasAppliedForOpGrant}
           className="gap-2"
+          disabled={!hasValidPaymentMethod || hasAppliedForOpGrant}
           size="sm"
         >
           {hasAppliedForOpGrant ? (
@@ -210,11 +207,11 @@ function ApplyOpCreditsButton(props: {
         </SheetHeader>
         <div className="h-5" />
         <ApplyForOpCreditsForm
+          account={account}
           onClose={() => {
             setIsOpen(false);
           }}
           plan={validTeamPlan}
-          account={account}
         />
       </SheetContent>
     </Sheet>
diff --git a/apps/dashboard/src/components/onboarding/PlanCard.tsx b/apps/dashboard/src/components/onboarding/PlanCard.tsx
index 0cdaceb4bf5..419cec74e07 100644
--- a/apps/dashboard/src/components/onboarding/PlanCard.tsx
+++ b/apps/dashboard/src/components/onboarding/PlanCard.tsx
@@ -1,5 +1,5 @@
-import { Button } from "@/components/ui/button";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 import { TeamPlanBadge } from "../../app/(app)/components/TeamPlanBadge";
 import type { CreditsRecord } from "./ApplyForOpCreditsModal";
 
@@ -22,7 +22,7 @@ export function PlanCard({ creditsRecord, teamSlug }: PlanCardProps) {
         {creditsRecord.features && (
           <ul className="list-disc space-y-1 pl-4 text-muted-foreground text-sm">
             {creditsRecord.features.map((feature) => (
-              <li key={feature} className="text-muted-foreground">
+              <li className="text-muted-foreground" key={feature}>
                 {feature}
               </li>
             ))}
@@ -34,8 +34,8 @@ export function PlanCard({ creditsRecord, teamSlug }: PlanCardProps) {
         <Button
           asChild
           className="gap-2 bg-background"
-          variant="outline"
           size="sm"
+          variant="outline"
         >
           <Link href={`/team/${teamSlug}/~/settings/billing`}>Upgrade</Link>
         </Button>
diff --git a/apps/dashboard/src/components/onboarding/applyOpSponsorship.ts b/apps/dashboard/src/components/onboarding/applyOpSponsorship.ts
index c4c67b14f5f..487f476b6b7 100644
--- a/apps/dashboard/src/components/onboarding/applyOpSponsorship.ts
+++ b/apps/dashboard/src/components/onboarding/applyOpSponsorship.ts
@@ -19,12 +19,12 @@ export async function applyOpSponsorship(params: {
   const response = await fetch(
     "https://api.hsforms.com/submissions/v3/integration/secure/submit/23987964/2fbf6a3b-d4cc-4a23-a4f5-42674e8487b9",
     {
+      body: JSON.stringify({ fields }),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${process.env.HUBSPOT_ACCESS_TOKEN}`,
+        "Content-Type": "application/json",
       },
       method: "POST",
-      body: JSON.stringify({ fields }),
     },
   );
 
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/PayAnalytics.tsx b/apps/dashboard/src/components/pay/PayAnalytics/PayAnalytics.tsx
index 83bc9028464..00a9e329542 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/PayAnalytics.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/PayAnalytics.tsx
@@ -1,17 +1,17 @@
+import type { ThirdwebClient } from "thirdweb";
 import {
   getUniversalBridgeUsage,
   getUniversalBridgeWalletUsage,
 } from "@/api/analytics";
-import type { ThirdwebClient } from "thirdweb";
 import type { Range } from "../../analytics/date-range-selector";
-import { PayEmbedFTUX } from "./PayEmbedFTUX";
 import { PayCustomersTable } from "./components/PayCustomersTable";
-import { PayNewCustomers } from "./components/PayNewCustomers";
 import { PaymentHistory } from "./components/PaymentHistory";
 import { PaymentsSuccessRate } from "./components/PaymentsSuccessRate";
+import { PayNewCustomers } from "./components/PayNewCustomers";
 import { Payouts } from "./components/Payouts";
 import { TotalPayVolume } from "./components/TotalPayVolume";
 import { TotalVolumePieChart } from "./components/TotalVolumePieChart";
+import { PayEmbedFTUX } from "./PayEmbedFTUX";
 
 export async function PayAnalytics(props: {
   projectClientId: string;
@@ -25,28 +25,28 @@ export async function PayAnalytics(props: {
 
   const dateFormat =
     interval === "day"
-      ? { month: "short" as const, day: "numeric" as const }
+      ? { day: "numeric" as const, month: "short" as const }
       : {
-          month: "short" as const,
           day: "numeric" as const,
+          month: "short" as const,
         };
 
   const volumeDataPromise = getUniversalBridgeUsage({
-    teamId: teamId,
-    projectId: projectId,
     from: range.from,
-    to: range.to,
     period: interval,
+    projectId: projectId,
+    teamId: teamId,
+    to: range.to,
   }).catch((error) => {
     console.error(error);
     return [];
   });
   const walletDataPromise = getUniversalBridgeWalletUsage({
-    teamId: teamId,
-    projectId: projectId,
     from: range.from,
-    to: range.to,
     period: interval,
+    projectId: projectId,
+    teamId: teamId,
+    to: range.to,
   }).catch((error) => {
     console.error(error);
     return [];
@@ -93,13 +93,13 @@ export async function PayAnalytics(props: {
         <div className="border-border border-b pb-6 xl:border-none xl:pb-0">
           <PayNewCustomers data={walletData || []} dateFormat={dateFormat} />
         </div>
-        <PayCustomersTable data={walletData || []} client={props.client} />
+        <PayCustomersTable client={props.client} data={walletData || []} />
       </GridWithSeparator>
       <CardContainer>
         <PaymentHistory
           client={props.client}
-          teamId={props.teamId}
           projectClientId={props.projectClientId}
+          teamId={props.teamId}
         />
       </CardContainer>
     </div>
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/PayEmbedFTUX.tsx b/apps/dashboard/src/components/pay/PayAnalytics/PayEmbedFTUX.tsx
index 0804ef4a1fb..7cf3a02b736 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/PayEmbedFTUX.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/PayEmbedFTUX.tsx
@@ -1,10 +1,10 @@
 "use client";
-import { Button } from "@/components/ui/button";
-import { CodeServer } from "@/components/ui/code/code.server";
-import { TabButtons } from "@/components/ui/tabs";
 import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { CodeServer } from "@/components/ui/code/code.server";
+import { TabButtons } from "@/components/ui/tabs";
 
 export function PayEmbedFTUX(props: { clientId: string }) {
   const [tab, setTab] = useState("embed");
@@ -21,56 +21,56 @@ export function PayEmbedFTUX(props: { clientId: string }) {
           tabClassName="!text-sm"
           tabs={[
             {
+              isActive: tab === "embed",
               name: "Embed",
               onClick: () => setTab("embed"),
-              isActive: tab === "embed",
             },
             {
+              isActive: tab === "sdk",
               name: "SDK",
               onClick: () => setTab("sdk"),
-              isActive: tab === "sdk",
             },
             {
+              isActive: tab === "api",
               name: "API",
               onClick: () => setTab("api"),
-              isActive: tab === "api",
             },
           ]}
         />
         <div className="h-2" />
         {tab === "embed" && (
           <CodeServer
+            className="bg-background"
             code={embedCode(props.clientId)}
             lang="tsx"
-            className="bg-background"
           />
         )}
         {tab === "sdk" && (
           <CodeServer
-            code={sdkCode(props.clientId)}
-            lang="ts"
             className="bg-background"
+            code={sdkCode(props.clientId)}
             ignoreFormattingErrors
+            lang="ts"
           />
         )}
         {tab === "api" && (
           <CodeServer
-            code={apiCode(props.clientId)}
-            lang="bash"
             className="bg-background"
+            code={apiCode(props.clientId)}
             ignoreFormattingErrors
+            lang="bash"
           />
         )}
       </div>
 
       <div className="flex flex-col gap-3 border-t p-4 lg:flex-row lg:items-center lg:justify-between lg:p-6">
         <div className="flex gap-3">
-          <Button asChild variant="outline" size="sm">
+          <Button asChild size="sm" variant="outline">
             <Link
+              className="gap-2"
               href="https://portal.thirdweb.com/pay"
-              target="_blank"
               rel="noopener noreferrer"
-              className="gap-2"
+              target="_blank"
             >
               View Docs
               <ExternalLinkIcon className="size-4 text-muted-foreground" />
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/components/PayAnalyticsFilter.tsx b/apps/dashboard/src/components/pay/PayAnalytics/components/PayAnalyticsFilter.tsx
index f1f9dfc3607..718bf2d8aea 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/components/PayAnalyticsFilter.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/components/PayAnalyticsFilter.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { normalizeTimeISOString } from "@/lib/time";
 import { useQuery } from "@tanstack/react-query";
 import {
   DateRangeSelector,
@@ -12,6 +11,7 @@ import {
   useResponsiveSearchParams,
   useSetResponsiveSearchParams,
 } from "responsive-rsc";
+import { normalizeTimeISOString } from "@/lib/time";
 
 const STORAGE_KEY = "thirdweb:ub-analytics-range";
 
@@ -32,11 +32,7 @@ export function PayAnalyticsFilter() {
 
   // Load saved range from localStorage using useQuery
   useQuery<SavedRange | null>({
-    queryKey: [
-      "savedRange",
-      responsiveSearchParams.from,
-      responsiveSearchParams.to,
-    ],
+    enabled: !responsiveSearchParams.from && !responsiveSearchParams.to,
     queryFn: () => {
       const savedRangeString = localStorage.getItem(STORAGE_KEY);
       if (savedRangeString) {
@@ -44,20 +40,20 @@ export function PayAnalyticsFilter() {
           const savedRange = JSON.parse(savedRangeString) as SavedRange;
           // Get the current range based on the saved range type
           const { range } = getUniversalBridgeFiltersFromSearchParams({
-            from: undefined,
-            to: undefined,
-            interval: savedRange.interval,
             defaultRange:
               savedRange.rangeType === "custom"
                 ? "last-30"
                 : savedRange.rangeType || "last-30",
+            from: undefined,
+            interval: savedRange.interval,
+            to: undefined,
           });
 
           setResponsiveSearchParams((v) => ({
             ...v,
             from: normalizeTimeISOString(range.from),
-            to: normalizeTimeISOString(range.to),
             interval: savedRange.interval,
+            to: normalizeTimeISOString(range.to),
           }));
         } catch (e) {
           console.error("Failed to parse saved range:", e);
@@ -65,14 +61,18 @@ export function PayAnalyticsFilter() {
       }
       return null;
     },
-    enabled: !responsiveSearchParams.from && !responsiveSearchParams.to,
+    queryKey: [
+      "savedRange",
+      responsiveSearchParams.from,
+      responsiveSearchParams.to,
+    ],
   });
 
   const { range, interval } = getUniversalBridgeFiltersFromSearchParams({
+    defaultRange: "last-30",
     from: responsiveSearchParams.from,
-    to: responsiveSearchParams.to,
     interval: responsiveSearchParams.interval,
-    defaultRange: "last-30",
+    to: responsiveSearchParams.to,
   });
 
   const saveToLocalStorage = (params: {
@@ -85,8 +85,8 @@ export function PayAnalyticsFilter() {
   return (
     <div className="no-scrollbar flex items-center gap-3 max-sm:overflow-auto">
       <DateRangeSelector
-        range={range}
         popoverAlign="end"
+        range={range}
         setRange={(newRange) => {
           setResponsiveSearchParams((v: SearchParams) => {
             const newParams = {
@@ -96,8 +96,8 @@ export function PayAnalyticsFilter() {
             };
             // Save to localStorage
             saveToLocalStorage({
-              rangeType: newRange.type || "last-30",
               interval: newParams.interval || "day",
+              rangeType: newRange.type || "last-30",
             });
             return newParams;
           });
@@ -114,8 +114,8 @@ export function PayAnalyticsFilter() {
             };
             // Save to localStorage
             saveToLocalStorage({
-              rangeType: range.type || "last-30",
               interval: newInterval,
+              rangeType: range.type || "last-30",
             });
             return newParams;
           });
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/components/PayCustomersTable.tsx b/apps/dashboard/src/components/pay/PayAnalytics/components/PayCustomersTable.tsx
index 3a42637bcbe..18de5bf05fd 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/components/PayCustomersTable.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/components/PayCustomersTable.tsx
@@ -1,11 +1,11 @@
 "use client";
+import { useMemo } from "react";
+import type { ThirdwebClient } from "thirdweb";
+import type { UniversalBridgeWalletStats } from "types/analytics";
 import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
 import { SkeletonContainer } from "@/components/ui/skeleton";
-import { useMemo } from "react";
-import type { ThirdwebClient } from "thirdweb";
-import type { UniversalBridgeWalletStats } from "types/analytics";
 import { toUSD } from "../../../../utils/number";
 import {
   CardHeading,
@@ -47,8 +47,8 @@ export function PayCustomersTable(props: {
       <div className="h-5" />
       <ScrollShadow
         className="overflow-hidden rounded-lg border"
-        scrollableClassName="h-[280px]"
         disableTopShadow={true}
+        scrollableClassName="h-[280px]"
       >
         <table className="w-full">
           <thead>
@@ -61,10 +61,10 @@ export function PayCustomersTable(props: {
             {tableData.map((customer, i) => {
               return (
                 <CustomerTableRow
-                  key={customer.walletAddress}
+                  client={props.client}
                   customer={customer}
+                  key={customer.walletAddress}
                   rowIndex={i}
-                  client={props.client}
                 />
               );
             })}
@@ -97,21 +97,21 @@ function CustomerTableRow(props: {
       <TableData>
         <SkeletonContainer
           className="inline-flex"
-          style={delayAnim}
           loadedData={props.customer?.walletAddress}
-          skeletonData="0x0000000000000000000000000000000000000000"
           render={(v) => <WalletAddress address={v} client={props.client} />}
+          skeletonData="0x0000000000000000000000000000000000000000"
+          style={delayAnim}
         />
       </TableData>
       <TableData>
         <SkeletonContainer
-          style={delayAnim}
           className="inline-flex"
           loadedData={props.customer?.totalSpendUSDCents}
-          skeletonData={20000}
           render={(v) => {
             return <p>${(v / 100).toLocaleString()}</p>;
           }}
+          skeletonData={20000}
+          style={delayAnim}
         />
       </TableData>
     </tr>
@@ -141,8 +141,8 @@ function getTopCustomers(data: UniversalBridgeWalletStats[]) {
       .filter((x) => x.walletAddress === customer)
       .reduce((acc, curr) => acc + curr.amountUsdCents, 0);
     customersData.push({
-      walletAddress: customer,
       totalSpendUSDCents: totalSpend,
+      walletAddress: customer,
     });
   }
   return customersData.sort(
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/components/PayNewCustomers.tsx b/apps/dashboard/src/components/pay/PayAnalytics/components/PayNewCustomers.tsx
index 93177b52f7c..1360f4b4657 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/components/PayNewCustomers.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/components/PayNewCustomers.tsx
@@ -1,9 +1,9 @@
 "use client";
-import { SkeletonContainer } from "@/components/ui/skeleton";
 import { useId, useMemo } from "react";
 import { Area, AreaChart, ResponsiveContainer, Tooltip, XAxis } from "recharts";
 import type { UniversalBridgeWalletStats } from "types/analytics";
-import { CardHeading, NoDataOverlay, chartHeight } from "./common";
+import { SkeletonContainer } from "@/components/ui/skeleton";
+import { CardHeading, chartHeight, NoDataOverlay } from "./common";
 
 type GraphDataItem = {
   date: string;
@@ -70,22 +70,22 @@ export function PayNewCustomers(props: {
               loadedData={
                 isEmpty ? "NA" : graphData[graphData.length - 1]?.value || 0
               }
-              skeletonData={100}
               render={(v) => {
                 return (
                   <p className="font-semibold text-4xl tracking-tighter">{v}</p>
                 );
               }}
+              skeletonData={100}
             />
           </div>
         </div>
       </div>
 
       <div className="relative flex w-full justify-center">
-        <ResponsiveContainer width="100%" height={chartHeight}>
+        <ResponsiveContainer height={chartHeight} width="100%">
           <AreaChart data={graphData || emptyGraphData}>
             <defs>
-              <linearGradient id={uniqueId} x1="0" y1="0" x2="0" y2="1">
+              <linearGradient id={uniqueId} x1="0" x2="0" y1="0" y2="1">
                 <stop offset="5%" stopColor={chartColor} stopOpacity={0.3} />
                 <stop offset="95%" stopColor={chartColor} stopOpacity={0.0} />
               </linearGradient>
@@ -109,23 +109,23 @@ export function PayNewCustomers(props: {
               }}
             />
             <Area
-              type="monotone"
               dataKey="value"
-              stroke={chartColor}
-              fillOpacity={1}
               fill={`url(#${uniqueId})`}
-              strokeWidth={2}
+              fillOpacity={1}
+              stroke={chartColor}
               strokeLinecap="round"
+              strokeWidth={2}
+              type="monotone"
             />
 
             {graphData && (
               <XAxis
-                dataKey="date"
                 axisLine={false}
-                tickLine={false}
                 className="mt-5 font-sans text-xs"
-                stroke="hsl(var(--muted-foreground))"
+                dataKey="date"
                 dy={12}
+                stroke="hsl(var(--muted-foreground))"
+                tickLine={false}
               />
             )}
           </AreaChart>
@@ -141,8 +141,8 @@ const emptyGraphData: GraphDataItem[] = [5, 9, 7, 15, 7, 20].map(
     const date = new Date();
     date.setDate(date.getDate() + i - arr.length);
     return {
-      value: x,
       date: date.toISOString(),
+      value: x,
     };
   },
 );
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/components/PaymentHistory.tsx b/apps/dashboard/src/components/pay/PayAnalytics/components/PaymentHistory.tsx
index 6e6a629ebbd..cc98c95bb0b 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/components/PaymentHistory.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/components/PaymentHistory.tsx
@@ -1,20 +1,20 @@
 "use client";
+import { useQuery } from "@tanstack/react-query";
+import { format } from "date-fns";
+import { useMemo, useState } from "react";
+import { type ThirdwebClient, toTokens } from "thirdweb";
 import {
+  getPayments,
   type Payment,
   type PaymentsResponse,
-  getPayments,
 } from "@/api/universal-bridge/developer";
 import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { PaginationButtons } from "@/components/pagination-buttons";
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
 import { Badge } from "@/components/ui/badge";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
 import { Skeleton } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
-import { useQuery } from "@tanstack/react-query";
-import { format } from "date-fns";
-import { useMemo, useState } from "react";
-import { type ThirdwebClient, toTokens } from "thirdweb";
 import {
   CardHeading,
   TableData,
@@ -34,16 +34,16 @@ export function PaymentHistory(props: {
     PaymentsResponse,
     Error
   >({
-    queryKey: ["payments", props.projectClientId, page],
     queryFn: async () => {
       const res = await getPayments({
         clientId: props.projectClientId,
-        teamId: props.teamId,
         limit: pageSize,
         offset: (page - 1) * pageSize,
+        teamId: props.teamId,
       });
       return res;
     },
+    queryKey: ["payments", props.projectClientId, page],
     refetchInterval: 10_000,
   });
   const isEmpty = useMemo(
@@ -80,24 +80,20 @@ export function PaymentHistory(props: {
             </thead>
             <tbody>
               {(!isEmpty || isLoading) &&
-                (payPurchaseData && !isLoading ? (
-                  <>
-                    {payPurchaseData.data.map((purchase) => {
+                (payPurchaseData && !isLoading
+                  ? payPurchaseData.data.map((purchase) => {
                       return (
                         <TableRow
+                          client={props.client}
                           key={purchase.id}
                           purchase={purchase}
-                          client={props.client}
                         />
                       );
-                    })}
-                  </>
-                ) : (
-                  new Array(pageSize).fill(0).map((_, i) => (
-                    // biome-ignore lint/suspicious/noArrayIndexKey: ok
-                    <SkeletonTableRow key={i} />
-                  ))
-                ))}
+                    })
+                  : new Array(pageSize).fill(0).map((_, i) => (
+                      // biome-ignore lint/suspicious/noArrayIndexKey: ok
+                      <SkeletonTableRow key={i} />
+                    )))}
             </tbody>
           </table>
 
@@ -109,10 +105,10 @@ export function PaymentHistory(props: {
             <div className="my-8">
               <PaginationButtons
                 activePage={page}
+                onPageClick={setPage}
                 totalPages={Math.ceil(
                   payPurchaseData.meta.totalCount / pageSize,
                 )}
-                onPageClick={setPage}
               />
             </div>
           ) : null}
@@ -144,8 +140,8 @@ function TableRow(props: { purchase: Payment; client: ThirdwebClient }) {
 
   return (
     <tr
-      key={purchase.id}
       className="fade-in-0 border-border border-b duration-300"
+      key={purchase.id}
     >
       {/* Paid */}
       <TableData>{`${formatTokenAmount(originAmount)} ${purchase.originToken.symbol}`}</TableData>
@@ -158,13 +154,13 @@ function TableRow(props: { purchase: Payment; client: ThirdwebClient }) {
       {/* Type */}
       <TableData>
         <Badge
-          variant="secondary"
           className={cn(
             "uppercase",
             type === "Transfer"
               ? "bg-fuchsia-200 text-fuchsia-800 dark:bg-fuchsia-950 dark:text-fuchsia-200"
               : "bg-indigo-200 text-indigo-800 dark:bg-indigo-950 dark:text-indigo-200",
           )}
+          variant="secondary"
         >
           {type}
         </Badge>
@@ -173,6 +169,7 @@ function TableRow(props: { purchase: Payment; client: ThirdwebClient }) {
       {/* Status */}
       <TableData>
         <Badge
+          className="capitalize"
           variant={
             purchase.status === "COMPLETED"
               ? "success"
@@ -180,7 +177,6 @@ function TableRow(props: { purchase: Payment; client: ThirdwebClient }) {
                 ? "warning"
                 : "destructive"
           }
-          className="capitalize"
         >
           {purchase.status}
         </Badge>
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/components/PaymentsSuccessRate.tsx b/apps/dashboard/src/components/pay/PayAnalytics/components/PaymentsSuccessRate.tsx
index 2407893bacd..31b273a8e33 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/components/PaymentsSuccessRate.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/components/PaymentsSuccessRate.tsx
@@ -1,4 +1,6 @@
 "use client";
+import { useMemo, useState } from "react";
+import type { UniversalBridgeStats } from "types/analytics";
 import {
   Select,
   SelectContent,
@@ -9,16 +11,11 @@ import {
 import { SkeletonContainer } from "@/components/ui/skeleton";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { useState } from "react";
-import { useMemo } from "react";
-import type { UniversalBridgeStats } from "types/analytics";
 import { CardHeading } from "./common";
 
 type PayVolumeType = "all" | "crypto" | "fiat";
 
-export function PaymentsSuccessRate(props: {
-  data: UniversalBridgeStats[];
-}) {
+export function PaymentsSuccessRate(props: { data: UniversalBridgeStats[] }) {
   const [type, setType] = useState<PayVolumeType>("all");
   const isEmpty = useMemo(() => {
     return props.data.length === 0 || props.data.every((x) => x.count === 0);
@@ -41,17 +38,17 @@ export function PaymentsSuccessRate(props: {
     const total = succeeded + failed;
     if (total === 0) {
       return {
-        succeeded: 0,
         failed: 0,
         rate: 0,
+        succeeded: 0,
         total: 0,
       };
     }
     const rate = (succeeded / (succeeded + failed)) * 100;
     return {
-      succeeded,
       failed,
       rate,
+      succeeded,
       total,
     };
   }, [props.data, type]);
@@ -61,10 +58,10 @@ export function PaymentsSuccessRate(props: {
       <div className="flex items-center justify-between gap-2">
         <CardHeading> Payments </CardHeading>
         <Select
-          value={type}
           onValueChange={(value: PayVolumeType) => {
             setType(value);
           }}
+          value={type}
         >
           <SelectTrigger className="w-auto bg-transparent">
             <SelectValue placeholder="Select" />
@@ -84,27 +81,27 @@ export function PaymentsSuccessRate(props: {
         ) : (
           <SkeletonContainer
             loadedData={graphData.rate}
-            skeletonData={50}
             render={(rate) => <Bar rate={rate} />}
+            skeletonData={50}
           />
         )}
 
         <div className="h-6" />
 
         <InfoRow
-          label="Succeeded"
-          type="success"
           amount={graphData.succeeded}
           isEmpty={isEmpty}
+          label="Succeeded"
+          type="success"
         />
 
         <div className="h-3" />
 
         <InfoRow
-          label="Failed"
-          type="failure"
           amount={graphData.failed}
           isEmpty={isEmpty}
+          label="Failed"
+          type="failure"
         />
       </div>
     </div>
@@ -145,10 +142,10 @@ function InfoRow(props: {
         <div
           className={cn("size-5 rounded-lg", {
             "bg-accent": props.amount === undefined,
-            "bg-success-text":
-              props.amount !== undefined && props.type === "success",
             "bg-destructive-text":
               props.amount !== undefined && props.type === "failure",
+            "bg-success-text":
+              props.amount !== undefined && props.type === "success",
           })}
         />
         <p className="text-base text-muted-foreground">{props.label}</p>
@@ -161,10 +158,10 @@ function InfoRow(props: {
               ? props.amount.toLocaleString()
               : undefined
         }
-        skeletonData="50"
         render={(v) => {
           return <p className="font-medium text-base">{v}</p>;
         }}
+        skeletonData="50"
       />
     </div>
   );
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/components/Payouts.tsx b/apps/dashboard/src/components/pay/PayAnalytics/components/Payouts.tsx
index b4c88b76d21..a60261580db 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/components/Payouts.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/components/Payouts.tsx
@@ -1,10 +1,10 @@
 "use client";
-import { SkeletonContainer } from "@/components/ui/skeleton";
 import { useMemo } from "react";
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis } from "recharts";
 import type { UniversalBridgeStats } from "types/analytics";
+import { SkeletonContainer } from "@/components/ui/skeleton";
 import { toUSD } from "../../../../utils/number";
-import { CardHeading, NoDataOverlay, chartHeight } from "./common";
+import { CardHeading, chartHeight, NoDataOverlay } from "./common";
 
 type GraphData = {
   date: string;
@@ -72,7 +72,6 @@ export function Payouts(props: {
                   ? toUSD(totalPayoutsUSD)
                   : "NA"
             }
-            skeletonData="$20"
             render={(value) => {
               return (
                 <p className="font-semibold text-4xl tracking-tighter">
@@ -80,11 +79,12 @@ export function Payouts(props: {
                 </p>
               );
             }}
+            skeletonData="$20"
           />
         </div>
 
         <div className="relative flex w-full justify-center">
-          <ResponsiveContainer width="100%" height={chartHeight}>
+          <ResponsiveContainer height={chartHeight} width="100%">
             <BarChart data={isEmpty ? emptyGraphData : graphData}>
               <Tooltip
                 content={(x) => {
@@ -105,24 +105,24 @@ export function Payouts(props: {
                 cursor={{ fill: "hsl(var(--accent))", radius: 8 }}
               />
               <Bar
+                barSize={20}
+                className="stroke-background"
                 dataKey="value"
-                stroke="none"
-                fillOpacity={1}
                 fill={barColor}
+                fillOpacity={1}
                 radius={8}
-                barSize={20}
+                stroke="none"
                 strokeWidth={1}
-                className="stroke-background"
               />
 
               {graphData && (
                 <XAxis
-                  dataKey="date"
                   axisLine={false}
-                  tickLine={false}
                   className="font-sans text-xs"
-                  stroke="hsl(var(--muted-foreground))"
+                  dataKey="date"
                   dy={10}
+                  stroke="hsl(var(--muted-foreground))"
+                  tickLine={false}
                 />
               )}
             </BarChart>
@@ -141,7 +141,7 @@ const emptyGraphData: GraphData[] = [
   const date = new Date();
   date.setDate(date.getDate() + i - arr.length);
   return {
-    value: x,
     date: date.toISOString(),
+    value: x,
   };
 });
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/components/TotalPayVolume.tsx b/apps/dashboard/src/components/pay/PayAnalytics/components/TotalPayVolume.tsx
index c25f1ab9f3c..990a057d8e1 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/components/TotalPayVolume.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/components/TotalPayVolume.tsx
@@ -1,4 +1,7 @@
 "use client";
+import { useId, useMemo, useState } from "react";
+import { Area, AreaChart, ResponsiveContainer, Tooltip, XAxis } from "recharts";
+import type { UniversalBridgeStats } from "types/analytics";
 import {
   Select,
   SelectContent,
@@ -6,10 +9,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { useId, useMemo, useState } from "react";
-import { Area, AreaChart, ResponsiveContainer, Tooltip, XAxis } from "recharts";
-import type { UniversalBridgeStats } from "types/analytics";
-import { CardHeading, NoDataOverlay, chartHeight } from "./common";
+import { CardHeading, chartHeight, NoDataOverlay } from "./common";
 
 type GraphData = {
   date: string;
@@ -80,10 +80,10 @@ export function TotalPayVolume(props: {
         {props.data && (
           <div className="flex gap-2">
             <Select
-              value={type}
               onValueChange={(value: "all" | "crypto" | "fiat") => {
                 setType(value);
               }}
+              value={type}
             >
               <SelectTrigger className="bg-transparent">
                 <SelectValue placeholder="Select" />
@@ -101,10 +101,10 @@ export function TotalPayVolume(props: {
       <div className="h-10" />
 
       <div className="relative flex w-full flex-1 justify-center">
-        <ResponsiveContainer width="100%" height={chartHeight}>
+        <ResponsiveContainer height={chartHeight} width="100%">
           <AreaChart data={isEmpty ? emptyGraphData : graphData}>
             <defs>
-              <linearGradient id={uniqueId} x1="0" y1="0" x2="0" y2="1">
+              <linearGradient id={uniqueId} x1="0" x2="0" y1="0" y2="1">
                 <stop offset="5%" stopColor={chartColor} stopOpacity={0.4} />
                 <stop offset="95%" stopColor={chartColor} stopOpacity={0.0} />
               </linearGradient>
@@ -131,23 +131,23 @@ export function TotalPayVolume(props: {
             )}
 
             <Area
-              type="monotone"
               dataKey="value"
-              stroke={chartColor}
-              fillOpacity={1}
               fill={`url(#${uniqueId})`}
-              strokeWidth={2}
+              fillOpacity={1}
+              stroke={chartColor}
               strokeLinecap="round"
+              strokeWidth={2}
+              type="monotone"
             />
 
             {graphData && (
               <XAxis
-                dataKey="date"
                 axisLine={false}
-                tickLine={false}
                 className="font-sans text-xs"
-                stroke="hsl(var(--muted-foreground))"
+                dataKey="date"
                 dy={10}
+                stroke="hsl(var(--muted-foreground))"
+                tickLine={false}
               />
             )}
           </AreaChart>
@@ -162,7 +162,7 @@ const emptyGraphData: GraphData[] = [5, 9, 7, 15, 7, 20].map((x, i, arr) => {
   const date = new Date();
   date.setDate(date.getDate() + i - arr.length);
   return {
-    value: x,
     date: date.toISOString(),
+    value: x,
   };
 });
diff --git a/apps/dashboard/src/components/pay/PayAnalytics/components/TotalVolumePieChart.tsx b/apps/dashboard/src/components/pay/PayAnalytics/components/TotalVolumePieChart.tsx
index ef8b2e03394..d3b3a855e64 100644
--- a/apps/dashboard/src/components/pay/PayAnalytics/components/TotalVolumePieChart.tsx
+++ b/apps/dashboard/src/components/pay/PayAnalytics/components/TotalVolumePieChart.tsx
@@ -1,8 +1,8 @@
 "use client";
-import { SkeletonContainer } from "@/components/ui/skeleton";
-import { cn } from "@/lib/utils";
 import { Cell, Pie, PieChart } from "recharts";
 import type { UniversalBridgeStats } from "types/analytics";
+import { SkeletonContainer } from "@/components/ui/skeleton";
+import { cn } from "@/lib/utils";
 import { toUSD } from "../../../../utils/number";
 import { chartHeight } from "./common";
 
@@ -12,22 +12,20 @@ type VolData = {
   color: string;
 };
 
-export function TotalVolumePieChart(props: {
-  data: UniversalBridgeStats[];
-}) {
+export function TotalVolumePieChart(props: { data: UniversalBridgeStats[] }) {
   const data = props.data;
   const isEmpty =
     data.length === 0 || data.every((x) => x.amountUsdCents === 0);
   const skeletonData: VolData[] = [
     {
-      name: "Crypto",
       amount: 50,
       color: !isEmpty ? "hsl(var(--accent))" : "hsl(var(--muted))",
+      name: "Crypto",
     },
     {
-      name: "Fiat",
       amount: 50,
       color: !isEmpty ? "hsl(var(--accent))" : "hsl(var(--muted))",
+      name: "Fiat",
     },
   ];
 
@@ -41,14 +39,14 @@ export function TotalVolumePieChart(props: {
   const volumeData: VolData[] = !isEmpty
     ? [
         {
-          name: "Crypto",
           amount: cryptoTotalUSD,
           color: "hsl(var(--chart-1))",
+          name: "Crypto",
         },
         {
-          name: "Fiat",
           amount: fiatTotalUSD,
           color: "hsl(var(--chart-2))",
+          name: "Fiat",
         },
       ]
     : skeletonData;
@@ -58,25 +56,25 @@ export function TotalVolumePieChart(props: {
       <div className="flex flex-col justify-center gap-6 lg:flex-row">
         {/* Left */}
         <div className="relative flex justify-center">
-          <PieChart width={250} height={chartHeight}>
+          <PieChart height={chartHeight} width={250}>
             <Pie
-              style={{
-                outline: "none",
-              }}
               activeIndex={0}
-              data={volumeData}
-              dataKey="amount"
+              cornerRadius={100}
               cx="50%"
               cy="50%"
+              data={volumeData}
+              dataKey="amount"
               innerRadius="80%"
               outerRadius="100%"
-              stroke="none"
-              cornerRadius={100}
               paddingAngle={5}
+              stroke="none"
+              style={{
+                outline: "none",
+              }}
             >
               {volumeData.map((entry, index) => (
                 // biome-ignore lint/suspicious/noArrayIndexKey: ok
-                <Cell key={index} fill={entry.color} />
+                <Cell fill={entry.color} key={index} />
               ))}
             </Pie>
           </PieChart>
@@ -93,7 +91,6 @@ export function TotalVolumePieChart(props: {
                       ? toUSD(cryptoTotalUSD + fiatTotalUSD)
                       : "NA"
                 }
-                skeletonData="$100"
                 render={(totalAmount) => {
                   return (
                     <p
@@ -106,6 +103,7 @@ export function TotalVolumePieChart(props: {
                     </p>
                   );
                 }}
+                skeletonData="$100"
               />
             </div>
           </div>
@@ -115,12 +113,12 @@ export function TotalVolumePieChart(props: {
           <div className="flex justify-center gap-10 lg:flex-col lg:gap-4">
             {volumeData.map((v) => (
               <VolumeLegend
-                key={v.name}
-                color={v.color}
-                label={v.name}
                 amount={
                   !data ? undefined : data.length > 0 ? toUSD(v.amount) : "NA"
                 }
+                color={v.color}
+                key={v.name}
+                label={v.name}
               />
             ))}
           </div>
@@ -148,7 +146,6 @@ function VolumeLegend(props: {
 
         <SkeletonContainer
           loadedData={props.amount}
-          skeletonData="$50"
           render={(amount) => {
             return (
               <p className="font-semibold text-2xl text-foreground tracking-tight">
@@ -156,6 +153,7 @@ function VolumeLegend(props: {
               </p>
             );
           }}
+          skeletonData="$50"
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/components/pay/PayConfig.tsx b/apps/dashboard/src/components/pay/PayConfig.tsx
index 22ccd899ce7..896762cb9ce 100644
--- a/apps/dashboard/src/components/pay/PayConfig.tsx
+++ b/apps/dashboard/src/components/pay/PayConfig.tsx
@@ -1,5 +1,14 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import {
+  type ApiKeyPayConfigValidationSchema,
+  apiKeyPayConfigValidationSchema,
+} from "components/settings/ApiKeys/validations";
+import Link from "next/link";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
 import type { Project } from "@/api/projects";
 import { type Fee, updateFee } from "@/api/universal-bridge/developer";
 import { SettingsCard } from "@/components/blocks/SettingsCard";
@@ -11,15 +20,6 @@ import {
   FormLabel,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import {
-  type ApiKeyPayConfigValidationSchema,
-  apiKeyPayConfigValidationSchema,
-} from "components/settings/ApiKeys/validations";
-import Link from "next/link";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
 
 interface PayConfigProps {
   project: Project;
@@ -32,8 +32,8 @@ export const PayConfig: React.FC<PayConfigProps> = (props) => {
   const form = useForm<ApiKeyPayConfigValidationSchema>({
     resolver: zodResolver(apiKeyPayConfigValidationSchema),
     values: {
-      payoutAddress: props.fees.feeRecipient ?? "",
       developerFeeBPS: props.fees.feeBps ? props.fees.feeBps / 100 : 0,
+      payoutAddress: props.fees.feeRecipient ?? "",
     },
   });
 
@@ -44,9 +44,9 @@ export const PayConfig: React.FC<PayConfigProps> = (props) => {
     }) => {
       await updateFee({
         clientId: props.project.publishableKey,
-        teamId: props.teamId,
-        feeRecipient: values.payoutAddress,
         feeBps: values.developerFeeBPS,
+        feeRecipient: values.payoutAddress,
+        teamId: props.teamId,
       });
     },
   });
@@ -55,17 +55,17 @@ export const PayConfig: React.FC<PayConfigProps> = (props) => {
     ({ payoutAddress, developerFeeBPS }) => {
       updateFeeMutation.mutate(
         {
-          payoutAddress,
           developerFeeBPS: developerFeeBPS ? developerFeeBPS * 100 : 0,
+          payoutAddress,
         },
         {
-          onSuccess: () => {
-            toast.success("Fee sharing updated");
-          },
           onError: (err) => {
             toast.error("Failed to update fee sharing");
             console.error(err);
           },
+          onSuccess: () => {
+            toast.success("Fee sharing updated");
+          },
         },
       );
     },
@@ -76,16 +76,16 @@ export const PayConfig: React.FC<PayConfigProps> = (props) => {
 
   return (
     <Form {...form}>
-      <form onSubmit={handleSubmit} autoComplete="off">
+      <form autoComplete="off" onSubmit={handleSubmit}>
         <SettingsCard
           bottomText="Shared Fees are sent to recipient address"
           errorText={form.getFieldState("payoutAddress").error?.message}
+          noPermissionText={undefined}
           saveButton={{
-            type: "submit",
             disabled: !form.formState.isDirty,
             isPending: updateFeeMutation.isPending,
+            type: "submit",
           }}
-          noPermissionText={undefined}
         >
           <div>
             <h3 className="font-semibold text-xl tracking-tight">
@@ -95,10 +95,10 @@ export const PayConfig: React.FC<PayConfigProps> = (props) => {
               thirdweb collects a 0.3% protocol fee on swap transactions. You
               may set your own developer fee in addition to this fee.{" "}
               <Link
+                className="text-link-foreground hover:text-foreground"
                 href="https://portal.thirdweb.com/connect/pay/fee-sharing"
-                target="_blank"
                 rel="noopener noreferrer"
-                className="text-link-foreground hover:text-foreground"
+                target="_blank"
               >
                 Learn more.
               </Link>
@@ -125,7 +125,7 @@ export const PayConfig: React.FC<PayConfigProps> = (props) => {
                     <FormLabel>Fee amount</FormLabel>
                     <FormControl>
                       <div className="flex items-center gap-2">
-                        <Input {...field} type="number" placeholder="0.5" />
+                        <Input {...field} placeholder="0.5" type="number" />
                         <span className="text-muted-foreground text-sm">%</span>
                       </div>
                     </FormControl>
diff --git a/apps/dashboard/src/components/pay/RouteDiscovery.tsx b/apps/dashboard/src/components/pay/RouteDiscovery.tsx
index 87ef9cfd04b..e87f39d0319 100644
--- a/apps/dashboard/src/components/pay/RouteDiscovery.tsx
+++ b/apps/dashboard/src/components/pay/RouteDiscovery.tsx
@@ -1,14 +1,4 @@
 "use client";
-import { addUniversalBridgeTokenRoute } from "@/api/universal-bridge/tokens"; // Adjust the import path
-import { RouteDiscoveryCard } from "@/components/blocks/RouteDiscoveryCard";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
 import type { ProjectResponse } from "@thirdweb-dev/service-utils";
@@ -20,6 +10,16 @@ import {
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
+import { addUniversalBridgeTokenRoute } from "@/api/universal-bridge/tokens"; // Adjust the import path
+import { RouteDiscoveryCard } from "@/components/blocks/RouteDiscoveryCard";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
 
 export const RouteDiscovery = ({
   project,
@@ -29,23 +29,20 @@ export const RouteDiscovery = ({
   client: ThirdwebClient;
 }) => {
   const form = useForm<RouteDiscoveryValidationSchema>({
-    resolver: zodResolver(routeDiscoveryValidationSchema),
     defaultValues: {
       chainId: 1,
       tokenAddress: undefined,
     },
+    resolver: zodResolver(routeDiscoveryValidationSchema),
   });
 
   const submitDiscoveryMutation = useMutation({
-    mutationFn: async (values: {
-      chainId: number;
-      tokenAddress: string;
-    }) => {
+    mutationFn: async (values: { chainId: number; tokenAddress: string }) => {
       // Call the API to add the route
       const result = await addUniversalBridgeTokenRoute({
         chainId: values.chainId,
-        tokenAddress: values.tokenAddress,
         project,
+        tokenAddress: values.tokenAddress,
       });
 
       return result;
@@ -60,18 +57,18 @@ export const RouteDiscovery = ({
           tokenAddress,
         },
         {
-          onSuccess: () => {
-            toast.success("Token submitted successfully!", {
-              description:
-                "Thank you for your submission. Contact support if your token doesn't appear after some time.",
-            });
-          },
           onError: () => {
             toast.error("Token submission failed!", {
               description:
                 "Please double check the network and token address. If issues persist, please reach out to our support team.",
             });
           },
+          onSuccess: () => {
+            toast.success("Token submitted successfully!", {
+              description:
+                "Thank you for your submission. Contact support if your token doesn't appear after some time.",
+            });
+          },
         },
       );
     },
@@ -82,20 +79,20 @@ export const RouteDiscovery = ({
 
   return (
     <Form {...form}>
-      <form onSubmit={handleSubmit} autoComplete="off">
+      <form autoComplete="off" onSubmit={handleSubmit}>
         <RouteDiscoveryCard
           bottomText=""
           errorText={form.getFieldState("tokenAddress").error?.message}
+          noPermissionText={undefined}
           saveButton={
             // Only show the submit button in the default state
             {
-              type: "submit",
               disabled: !form.formState.isDirty,
               isPending: submitDiscoveryMutation.isPending,
+              type: "submit",
               variant: "outline",
             }
           }
-          noPermissionText={undefined}
         >
           <div>
             <h3 className="font-semibold text-xl tracking-tight">
diff --git a/apps/dashboard/src/components/selects/CustomChainRenderer.tsx b/apps/dashboard/src/components/selects/CustomChainRenderer.tsx
index 207ff5c8cfd..6c8f1c19ad4 100644
--- a/apps/dashboard/src/components/selects/CustomChainRenderer.tsx
+++ b/apps/dashboard/src/components/selects/CustomChainRenderer.tsx
@@ -1,15 +1,15 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import { ChainIconClient } from "components/icons/ChainIcon";
 import { OPSponsoredChains } from "constants/chains";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { SettingsIcon } from "lucide-react";
 import type { ThirdwebClient } from "thirdweb";
 import type { UseNetworkSwitcherModalOptions } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { cn } from "@/lib/utils";
 import {
-  type StoredChain,
   addRecentlyUsedChainId,
+  type StoredChain,
 } from "../../stores/chainStores";
 
 type ChainRenderProps = React.ComponentProps<
@@ -41,6 +41,7 @@ export const CustomChainRenderer = ({
     <div className="flex min-h-[48px] w-full cursor-pointer justify-start rounded-lg px-2 py-1 hover:bg-accent">
       <div className="group flex flex-1 items-center">
         {/* biome-ignore lint/a11y/useKeyWithClickEvents: FIXME */}
+        {/* biome-ignore lint/a11y/noStaticElementInteractions: FIXME */}
         <div
           className={cn(
             "flex flex-1 items-center gap-4",
@@ -53,9 +54,9 @@ export const CustomChainRenderer = ({
           }}
         >
           <ChainIconClient
-            src={chain.icon?.url}
-            client={client}
             className="size-8"
+            client={client}
+            src={chain.icon?.url}
           />
           <div className="flex flex-col gap-1">
             <div className="flex items-center gap-2">
@@ -74,10 +75,10 @@ export const CustomChainRenderer = ({
               )}
               {isSponsored && (
                 <div
+                  className="flex shrink-0 cursor-not-allowed items-center overflow-hidden rounded-xl px-2 py-1 font-medium text-xs"
                   style={{
                     background: "linear-gradient(to right, #701953, #5454B2)",
                   }}
-                  className="flex shrink-0 cursor-not-allowed items-center overflow-hidden rounded-xl px-2 py-1 font-medium text-xs"
                 >
                   Sponsored
                 </div>
@@ -100,9 +101,8 @@ export const CustomChainRenderer = ({
 
         {!disableChainConfig && storedChain && (
           <Button
-            variant="ghost"
-            className="ml-auto p-2 leading-4 transition-opacity hover:bg-transparent group-hover:opacity-100 md:opacity-0"
             aria-label="Configure Network"
+            className="ml-auto p-2 leading-4 transition-opacity hover:bg-transparent group-hover:opacity-100 md:opacity-0"
             onClick={() => {
               openEditChainModal(storedChain);
               addRecentlyUsedChainId(chain.id);
@@ -112,6 +112,7 @@ export const CustomChainRenderer = ({
                 console.error("close is undefined");
               }
             }}
+            variant="ghost"
           >
             <SettingsIcon className="size-4" />
           </Button>
diff --git a/apps/dashboard/src/components/selects/NetworkSelectDropdown.tsx b/apps/dashboard/src/components/selects/NetworkSelectDropdown.tsx
index a80f390e519..222c8e7ccb7 100644
--- a/apps/dashboard/src/components/selects/NetworkSelectDropdown.tsx
+++ b/apps/dashboard/src/components/selects/NetworkSelectDropdown.tsx
@@ -1,3 +1,7 @@
+import { ChainIconClient } from "components/icons/ChainIcon";
+import { useAllChainsData } from "hooks/chains/allChains";
+import { useMemo } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import {
   Select,
   SelectContent,
@@ -5,10 +9,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { ChainIconClient } from "components/icons/ChainIcon";
-import { useAllChainsData } from "hooks/chains/allChains";
-import { useMemo } from "react";
-import type { ThirdwebClient } from "thirdweb";
 
 interface NetworkSelectDropdownProps {
   enabledChainIds?: number[];
@@ -55,10 +55,10 @@ export const NetworkSelectDropdown: React.FC<NetworkSelectDropdownProps> = ({
   return (
     <Select
       disabled={isDisabled}
-      value={selectedChain || "all-chains"}
       onValueChange={(v) => {
         onSelect(v === "all-chains" ? undefined : v);
       }}
+      value={selectedChain || "all-chains"}
     >
       <SelectTrigger className="-translate-x-3 !h-auto inline-flex w-auto border-none bg-transparent px-1 py-0.5 font-medium hover:bg-accent focus:ring-0 focus:ring-offset-0">
         <SelectValue />
@@ -71,9 +71,9 @@ export const NetworkSelectDropdown: React.FC<NetworkSelectDropdownProps> = ({
         <SelectItem value="all-chains">
           <div className="flex items-center gap-2 py-1" data-all-chains>
             <ChainIconClient
-              src={undefined}
-              client={client}
               className="size-5"
+              client={client}
+              src={undefined}
             />
             All Networks
           </div>
@@ -83,9 +83,9 @@ export const NetworkSelectDropdown: React.FC<NetworkSelectDropdownProps> = ({
           <SelectItem key={chain.chainId} value={String(chain.chainId)}>
             <div className="flex items-center gap-2 py-1">
               <ChainIconClient
-                src={chain.icon?.url}
-                client={client}
                 className="size-5"
+                client={client}
+                src={chain.icon?.url}
               />
               {useCleanChainName ? cleanChainName(chain.name) : chain.name}
             </div>
diff --git a/apps/dashboard/src/components/selects/NetworkSelectorButton.tsx b/apps/dashboard/src/components/selects/NetworkSelectorButton.tsx
index a741c030219..39ae4c07eb6 100644
--- a/apps/dashboard/src/components/selects/NetworkSelectorButton.tsx
+++ b/apps/dashboard/src/components/selects/NetworkSelectorButton.tsx
@@ -1,8 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { useStore } from "@/lib/reactive";
-import { cn } from "@/lib/utils";
 import { popularChains } from "@3rdweb-sdk/react/components/popularChains";
 import { ChainIconClient } from "components/icons/ChainIcon";
 import { useAllChainsData } from "hooks/chains/allChains";
@@ -11,15 +8,17 @@ import { ChevronDownIcon } from "lucide-react";
 import { useTheme } from "next-themes";
 import { useEffect, useMemo, useRef, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
-import { useActiveWallet } from "thirdweb/react";
-import { useNetworkSwitcherModal } from "thirdweb/react";
+import { useActiveWallet, useNetworkSwitcherModal } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import { useStore } from "@/lib/reactive";
+import { cn } from "@/lib/utils";
 import { useFavoriteChainIds } from "../../app/(app)/(dashboard)/(chain)/components/client/star-button";
 import { getSDKTheme } from "../../app/(app)/components/sdk-component-theme";
 import { mapV4ChainToV5Chain } from "../../contexts/map-chains";
 import {
-  type StoredChain,
   addRecentlyUsedChainId,
   recentlyUsedChainIdsStore,
+  type StoredChain,
 } from "../../stores/chainStores";
 import { LazyConfigureNetworkModal } from "../configure-networks/LazyConfigureNetworkModal";
 import { CustomChainRenderer } from "./CustomChainRenderer";
@@ -144,67 +143,67 @@ export const NetworkSelectorButton: React.FC<NetworkSelectorButtonProps> = ({
   return (
     <>
       <Button
-        variant="outline"
-        disabled={isDisabled || !wallet}
         className={cn("w-full justify-start gap-2 text-left", className)}
+        disabled={isDisabled || !wallet}
         onClick={() => {
           networkSwitcherModal.open({
-            theme: getSDKTheme(theme === "light" ? "light" : "dark"),
+            client,
+            onCustomClick: networksEnabled
+              ? undefined
+              : () => {
+                  setEditChain(undefined);
+                  setIsNetworkConfigModalOpen(true);
+                },
+            async onSwitch(chain) {
+              addRecentlyUsedChainId(chain.id);
+              if (onSwitchChain) {
+                const storedChain = idToChain.get(chain.id);
+                if (storedChain) {
+                  onSwitchChain(storedChain);
+                }
+              }
+            },
+            renderChain(props) {
+              return (
+                <CustomChainRenderer
+                  {...props}
+                  client={client}
+                  openEditChainModal={(c) => {
+                    setIsNetworkConfigModalOpen(true);
+                    setEditChain(c);
+                  }}
+                />
+              );
+            },
             sections: [
               {
-                label: "Recently Used",
                 chains: (filteredRecentlyUsedChains ?? []).map(
                   mapV4ChainToV5Chain,
                 ),
+                label: "Recently Used",
               },
               {
-                label: "Favorites",
                 chains: favoriteChainsWithMetadata,
+                label: "Favorites",
               },
               {
-                label: "Popular",
                 chains: networksEnabled ? [] : popularChainsWithMetadata,
+                label: "Popular",
               },
               {
-                label: "All Networks",
                 chains: (chains ?? []).map(mapV4ChainToV5Chain),
+                label: "All Networks",
               },
             ],
-            renderChain(props) {
-              return (
-                <CustomChainRenderer
-                  {...props}
-                  client={client}
-                  openEditChainModal={(c) => {
-                    setIsNetworkConfigModalOpen(true);
-                    setEditChain(c);
-                  }}
-                />
-              );
-            },
-            onCustomClick: networksEnabled
-              ? undefined
-              : () => {
-                  setEditChain(undefined);
-                  setIsNetworkConfigModalOpen(true);
-                },
-            async onSwitch(chain) {
-              addRecentlyUsedChainId(chain.id);
-              if (onSwitchChain) {
-                const storedChain = idToChain.get(chain.id);
-                if (storedChain) {
-                  onSwitchChain(storedChain);
-                }
-              }
-            },
-            client,
+            theme: getSDKTheme(theme === "light" ? "light" : "dark"),
           });
         }}
+        variant="outline"
       >
         <ChainIconClient
-          src={chain?.icon?.url}
-          client={client}
           className="size-5"
+          client={client}
+          src={chain?.icon?.url}
         />
         {chain?.name || "Select Network"}
 
@@ -212,10 +211,10 @@ export const NetworkSelectorButton: React.FC<NetworkSelectorButtonProps> = ({
       </Button>
 
       <LazyConfigureNetworkModal
-        open={isNetworkConfigModalOpen}
-        onOpenChange={setIsNetworkConfigModalOpen}
-        editChain={editChain}
         client={client}
+        editChain={editChain}
+        onOpenChange={setIsNetworkConfigModalOpen}
+        open={isNetworkConfigModalOpen}
       />
     </>
   );
diff --git a/apps/dashboard/src/components/settings/Account/Billing/CancelPlanModal/CancelPlanModal.tsx b/apps/dashboard/src/components/settings/Account/Billing/CancelPlanModal/CancelPlanModal.tsx
index ddbbc2707eb..c7ec68a0096 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/CancelPlanModal/CancelPlanModal.tsx
+++ b/apps/dashboard/src/components/settings/Account/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,
@@ -10,10 +14,6 @@ import {
   SheetTrigger,
 } from "@/components/ui/sheet";
 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";
@@ -32,9 +32,9 @@ export function CancelPlanButton(props: {
   if (props.billingStatus !== "invalidPayment" && props.currentPlan !== "pro") {
     return (
       <ImmediateCancelPlanButton
-        teamId={props.teamId}
-        getTeam={props.getTeam}
         disabled={props.disabled}
+        getTeam={props.getTeam}
+        teamId={props.teamId}
       />
     );
   }
@@ -43,10 +43,10 @@ export function CancelPlanButton(props: {
     <Sheet>
       <SheetTrigger asChild>
         <Button
-          variant="outline"
-          size="sm"
           className="gap-2 bg-background"
           disabled={props.disabled}
+          size="sm"
+          variant="outline"
         >
           <CircleXIcon className="size-4 text-muted-foreground" />
           Cancel Plan
@@ -80,11 +80,11 @@ 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`}
-          target="_blank"
           rel="noopener noreferrer"
+          target="_blank"
         >
           See Invoices
         </Link>
@@ -103,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>
@@ -150,11 +150,11 @@ function ImmediateCancelPlanButton(props: {
 
   return (
     <Button
-      variant="outline"
-      size="sm"
+      asChild
       className="gap-2 bg-background"
       disabled={showPlanSpinner || props.disabled}
-      asChild
+      size="sm"
+      variant="outline"
     >
       <Link href={buildCancelPlanUrl({ teamId: props.teamId })} target="_blank">
         {showPlanSpinner ? (
diff --git a/apps/dashboard/src/components/settings/Account/Billing/CreditsItem.tsx b/apps/dashboard/src/components/settings/Account/Billing/CreditsItem.tsx
index 13f5e212196..544d527d219 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/CreditsItem.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/CreditsItem.tsx
@@ -1,5 +1,3 @@
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
 import type { Account, BillingCredit } from "@3rdweb-sdk/react/hooks/useApi";
 import { ChainIconClient } from "components/icons/ChainIcon";
 import { formatDistance } from "date-fns";
@@ -8,6 +6,8 @@ import { CircleAlertIcon } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
 import type { ThirdwebClient } from "thirdweb";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
 import { formatToDollars } from "./formatToDollars";
 
 interface CreditsItemProps {
@@ -52,23 +52,23 @@ export const CreditsItem: React.FC<CreditsItemProps> = ({
           <div className="absolute top-0 right-0">
             {isOpCredit ? (
               <ChainIconClient
-                src="ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/optimism/512.png"
                 className="size-6"
                 client={client}
+                src="ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/optimism/512.png"
               />
             ) : isTwCredit ? (
               <Image
-                src={require("../../../../../public/brand/thirdweb-icon.svg")}
                 alt="tw-credit"
                 className="size-6"
                 objectFit="contain"
+                src={require("../../../../../public/brand/thirdweb-icon.svg")}
               />
             ) : isStartupCredit ? (
               <Image
-                src={require("../../../../../public/brand/thirdweb-icon.svg")}
                 alt="tw-credit"
                 className="size-6"
                 objectFit="contain"
+                src={require("../../../../../public/brand/thirdweb-icon.svg")}
               />
             ) : null}
           </div>
diff --git a/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.stories.tsx b/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.stories.tsx
index 19abb833d55..ae0e6a57b33 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.stories.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.stories.tsx
@@ -1,3 +1,5 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useState } from "react";
 import type { Team } from "@/api/team";
 import { Label } from "@/components/ui/label";
 import {
@@ -7,14 +9,12 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useState } from "react";
 import { BadgeContainer } from "../../../../stories/utils";
 import { GatedSwitch } from "./GatedSwitch";
 
 const meta = {
-  title: "Billing/GatedSwitch",
   component: Variants,
+  title: "Billing/GatedSwitch",
 } satisfies Meta<typeof Variants>;
 
 export default meta;
@@ -46,10 +46,10 @@ function Variants() {
       <div className="flex items-center gap-2">
         <Label>Required Plan</Label>
         <Select
-          value={requiredPlan}
           onValueChange={(value) =>
             setRequiredPlan(value as typeof requiredPlan)
           }
+          value={requiredPlan}
         >
           <SelectTrigger className="w-[180px]">
             <SelectValue placeholder="Select plan" />
@@ -66,8 +66,8 @@ function Variants() {
       {plans.map((currentPlan) => (
         <BadgeContainer key={currentPlan} label={`plan: ${currentPlan}`}>
           <GatedSwitch
-            key={currentPlan}
             currentPlan={currentPlan}
+            key={currentPlan}
             requiredPlan={requiredPlan}
             teamSlug="foo"
           />
diff --git a/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.tsx b/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.tsx
index 1d1abce0194..8684f65b9ff 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.tsx
@@ -1,13 +1,13 @@
+import { ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
 import type { Team } from "@/api/team";
 import { Button } from "@/components/ui/button";
 import { Switch } from "@/components/ui/switch";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import { ExternalLinkIcon } from "lucide-react";
-import Link from "next/link";
 import {
-  TeamPlanBadge,
   getTeamPlanBadgeLabel,
+  TeamPlanBadge,
 } from "../../../../app/(app)/components/TeamPlanBadge";
 import { planToTierRecordForGating } from "./planToTierRecord";
 
@@ -45,11 +45,11 @@ export const GatedSwitch: React.FC<GatedSwitchProps> = (
             </p>
 
             <div className="flex w-full flex-col gap-2">
-              <Button asChild size="sm" className="justify-start gap-2">
+              <Button asChild className="justify-start gap-2" size="sm">
                 <Link
-                  target="_blank"
-                  rel="noopener noreferrer"
                   href={`/team/${props.teamSlug}/~/settings/billing?showPlans=true&highlight=${props.requiredPlan}`}
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
                   Upgrade to {getTeamPlanBadgeLabel(props.requiredPlan)} plan
                   <ExternalLinkIcon className="size-4" />
@@ -64,15 +64,15 @@ export const GatedSwitch: React.FC<GatedSwitchProps> = (
         {isUpgradeRequired && (
           <TeamPlanBadge
             plan={props.requiredPlan}
-            teamSlug={props.teamSlug}
             postfix="+"
+            teamSlug={props.teamSlug}
           />
         )}
         <Switch
           {...props.switchProps}
           checked={props.switchProps?.checked && !isUpgradeRequired}
-          disabled={props.switchProps?.disabled || isUpgradeRequired}
           className={cn("disabled:opacity-100", props.switchProps?.className)}
+          disabled={props.switchProps?.disabled || isUpgradeRequired}
         />
       </div>
     </ToolTipLabel>
diff --git a/apps/dashboard/src/components/settings/Account/Billing/PlanCard.tsx b/apps/dashboard/src/components/settings/Account/Billing/PlanCard.tsx
index c82db2c29ef..fbdcdf71d53 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/PlanCard.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/PlanCard.tsx
@@ -26,19 +26,19 @@ export const CreditsInfoCard = (props: {
   return (
     <section className="flex flex-col gap-4">
       <CreditsItem
+        client={props.client}
         credit={opCredit}
         isOpCreditDefault={true}
-        twAccount={props.twAccount}
-        client={props.client}
         teamSlug={props.teamSlug}
+        twAccount={props.twAccount}
       />
       {restCredits?.map((credit) => (
         <CreditsItem
-          key={credit.couponId}
-          credit={credit}
-          twAccount={props.twAccount}
           client={props.client}
+          credit={credit}
+          key={credit.couponId}
           teamSlug={props.teamSlug}
+          twAccount={props.twAccount}
         />
       ))}
     </section>
diff --git a/apps/dashboard/src/components/settings/Account/Billing/Pricing.tsx b/apps/dashboard/src/components/settings/Account/Billing/Pricing.tsx
index b729f64ac87..725883f8f19 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/Pricing.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/Pricing.tsx
@@ -1,10 +1,10 @@
 "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 { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useTransition } from "react";
 
 import { useStripeRedirectEvent } from "../../../../app/(app)/(stripe)/stripe-redirect/stripeRedirectChannel";
 import { getValidTeamPlan } from "../../../../app/(app)/team/components/TeamHeader/getValidTeamPlan";
@@ -12,13 +12,13 @@ import { PRO_CONTACT_US_URL } from "../../../../constants/pro";
 
 // this is used to determine whether to show "Upgrade" or "Downgrade" label based on tier level
 const planToTierRecord: Record<Team["billingPlan"], number> = {
+  accelerate: 5,
   free: 0,
-  starter: 2,
-  growth_legacy: 3,
   growth: 4,
-  accelerate: 5,
-  scale: 6,
+  growth_legacy: 3,
   pro: 7,
+  scale: 6,
+  starter: 2,
 };
 
 interface BillingPricingProps {
@@ -100,63 +100,63 @@ 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}
+          teamSlug={team.slug}
         />
 
         {/* 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}
-          teamSlug={team.slug}
-          teamId={team.id}
-          current={validTeamPlan === "pro"}
           cta={getPlanCta(validTeamPlan, "pro", isCurrentPlanScheduledToCancel)}
-          highlighted={highlightProPlan}
+          current={validTeamPlan === "pro"}
           getTeam={getTeam}
+          highlighted={highlightProPlan}
+          teamId={team.id}
+          teamSlug={team.slug}
         />
       </div>
     </div>
@@ -171,8 +171,8 @@ function getPlanCta(
   // 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",
     };
   }
diff --git a/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/Coupons.stories.tsx b/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/Coupons.stories.tsx
index f2772268b8f..13e15e96485 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/Coupons.stories.tsx
+++ b/apps/dashboard/src/components/settings/Account/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/nextjs";
-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>
   );
diff --git a/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/Coupons.tsx b/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/Coupons.tsx
index ef76d505404..c9a29eb163d 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/Coupons.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/Coupons.tsx
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { Suspense } from "react";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { getAuthToken } from "../../../../../app/(app)/api/lib/getAuthToken";
 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>
   );
diff --git a/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/CouponsClient.tsx b/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/CouponsClient.tsx
index 638629d91ac..5544979cefe 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/CouponsClient.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/CouponsClient.tsx
@@ -16,36 +16,23 @@ export function CouponsClient(
   return (
     <CouponsUI
       {...props}
-      deleteCoupon={async () => {
-        const res = await apiServerProxy({
-          method: "DELETE",
-          pathname: "/v1/active-coupon",
-          searchParams: props.teamId ? { teamId: props.teamId } : undefined,
-        });
-
-        if (!res.ok) {
-          throw new Error("Failed to delete coupon");
-        }
-
-        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,
           }),
+          headers: {
+            "Content-Type": "application/json",
+          },
+          method: "POST",
+          pathname: "/v1/coupons/redeem",
         });
 
         if (!res.ok) {
           return {
-            status: res.status,
             data: null,
+            status: res.status,
           };
         }
 
@@ -54,10 +41,23 @@ export function CouponsClient(
         router.refresh();
 
         return {
-          status: 200,
           data: json.data,
+          status: 200,
         };
       }}
+      deleteCoupon={async () => {
+        const res = await apiServerProxy({
+          method: "DELETE",
+          pathname: "/v1/active-coupon",
+          searchParams: props.teamId ? { teamId: props.teamId } : undefined,
+        });
+
+        if (!res.ok) {
+          throw new Error("Failed to delete coupon");
+        }
+
+        router.refresh();
+      }}
     />
   );
 }
diff --git a/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/CouponsUI.tsx b/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/CouponsUI.tsx
index e5bdf1f0aa9..1b3fb81ead6 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/CouponsUI.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/SubscriptionCoupons/CouponsUI.tsx
@@ -1,7 +1,17 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { useMutation } from "@tanstack/react-query";
+import { format, fromUnixTime } from "date-fns";
+import {
+  CalendarIcon,
+  CalendarX2Icon,
+  ClockIcon,
+  InfinityIcon,
+  Trash2Icon,
+} from "lucide-react";
+import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Table,
   TableBody,
@@ -12,16 +22,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import { useMutation } from "@tanstack/react-query";
-import { format, fromUnixTime } from "date-fns";
-import {
-  CalendarIcon,
-  CalendarX2Icon,
-  ClockIcon,
-  InfinityIcon,
-  Trash2Icon,
-} from "lucide-react";
-import { toast } from "sonner";
 
 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" />
diff --git a/apps/dashboard/src/components/settings/Account/Billing/formatToDollars.tsx b/apps/dashboard/src/components/settings/Account/Billing/formatToDollars.tsx
index 28142031508..412ae81cc3c 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/formatToDollars.tsx
+++ b/apps/dashboard/src/components/settings/Account/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);
 };
diff --git a/apps/dashboard/src/components/settings/Account/Billing/planToTierRecord.ts b/apps/dashboard/src/components/settings/Account/Billing/planToTierRecord.ts
index 1e146e09a58..48bed3ac660 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/planToTierRecord.ts
+++ b/apps/dashboard/src/components/settings/Account/Billing/planToTierRecord.ts
@@ -2,11 +2,11 @@ import type { Team } from "@/api/team";
 
 // Note: Growth legacy is considered higher tier in this hierarchy
 export const planToTierRecordForGating: Record<Team["billingPlan"], number> = {
+  accelerate: 4,
   free: 0,
-  starter: 1,
   growth: 3,
-  accelerate: 4,
   growth_legacy: 5,
-  scale: 6,
   pro: 7,
+  scale: 6,
+  starter: 1,
 };
diff --git a/apps/dashboard/src/components/settings/Account/Billing/renew-subscription/renew-subscription-button.tsx b/apps/dashboard/src/components/settings/Account/Billing/renew-subscription/renew-subscription-button.tsx
index e5b4b4e1e95..7470c418c6b 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/renew-subscription/renew-subscription-button.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/renew-subscription/renew-subscription-button.tsx
@@ -1,14 +1,14 @@
 "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 { 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";
 
@@ -68,11 +68,11 @@ export function RenewSubscriptionButton(props: {
 
   return (
     <Button
-      onClick={handleRenewSubscription}
-      variant="default"
-      size="sm"
       className="gap-2"
       disabled={showSpinner || props.disabled}
+      onClick={handleRenewSubscription}
+      size="sm"
+      variant="default"
     >
       {showSpinner ? (
         <Spinner className="size-4" />
diff --git a/apps/dashboard/src/components/settings/Account/Notifications.tsx b/apps/dashboard/src/components/settings/Account/Notifications.tsx
index ccf34ddce8f..6ddf7a859db 100644
--- a/apps/dashboard/src/components/settings/Account/Notifications.tsx
+++ b/apps/dashboard/src/components/settings/Account/Notifications.tsx
@@ -1,13 +1,13 @@
 "use client";
 
-import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
 import {
   type Account,
   useUpdateNotifications,
 } from "@3rdweb-sdk/react/hooks/useApi";
 import { useTxNotifications } from "hooks/useTxNotifications";
-import { useState } from "react";
+import { useId, useState } from "react";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
 
 interface NotificationsProps {
   account: Account;
@@ -34,8 +34,8 @@ export const Notifications: React.FC<NotificationsProps> = ({ account }) => {
     setPreferences(newPreferences);
 
     updateMutation.mutate(newPreferences, {
-      onSuccess,
       onError,
+      onSuccess,
     });
   };
 
@@ -43,18 +43,16 @@ export const Notifications: React.FC<NotificationsProps> = ({ account }) => {
     <div>
       <SettingSwitch
         checked={preferences?.billing === "email"}
-        onCheckedChange={(v) => handleChange("billing", v)}
-        label="Reminders"
         description="Approaching and exceeding usage credits"
-        id="reminders"
+        label="Reminders"
+        onCheckedChange={(v) => handleChange("billing", v)}
       />
 
       <SettingSwitch
         checked={preferences?.updates === "email"}
-        onCheckedChange={(v) => handleChange("updates", v)}
-        label="Product Updates"
         description="New features and key product updates"
-        id="product-updates"
+        label="Product Updates"
+        onCheckedChange={(v) => handleChange("updates", v)}
       />
     </div>
   );
@@ -65,20 +63,20 @@ function SettingSwitch(props: {
   onCheckedChange: (checked: boolean) => void;
   label: string;
   description: string;
-  id: string;
 }) {
+  const id = useId();
   return (
     <div className="flex items-center justify-between gap-6 border-border border-b py-6">
       <div>
-        <Label className="text-foreground text-lg" htmlFor={props.id}>
+        <Label className="text-foreground text-lg" htmlFor={id}>
           {props.label}
         </Label>
         <p className="text-muted-foreground text-sm"> {props.description}</p>
       </div>
       <Switch
         checked={props.checked}
+        id={id}
         onCheckedChange={props.onCheckedChange}
-        id={props.id}
       />
     </div>
   );
diff --git a/apps/dashboard/src/components/settings/ApiKeys/Alerts.tsx b/apps/dashboard/src/components/settings/ApiKeys/Alerts.tsx
index 8700da2a43c..54b41af2bac 100644
--- a/apps/dashboard/src/components/settings/ApiKeys/Alerts.tsx
+++ b/apps/dashboard/src/components/settings/ApiKeys/Alerts.tsx
@@ -1,10 +1,8 @@
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { CircleAlertIcon } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
-export const SmartWalletsBillingAlert = (props: {
-  teamSlug: string;
-}) => {
+export const SmartWalletsBillingAlert = (props: { teamSlug: string }) => {
   return (
     <Alert variant="warning">
       <CircleAlertIcon className="size-5" />
diff --git a/apps/dashboard/src/components/settings/ApiKeys/Create/CreateApiKeyModal.stories.tsx b/apps/dashboard/src/components/settings/ApiKeys/Create/CreateApiKeyModal.stories.tsx
index 9b097e267d9..35999e19cff 100644
--- a/apps/dashboard/src/components/settings/ApiKeys/Create/CreateApiKeyModal.stories.tsx
+++ b/apps/dashboard/src/components/settings/ApiKeys/Create/CreateApiKeyModal.stories.tsx
@@ -1,17 +1,17 @@
-import { Button } from "@/components/ui/button";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useState } from "react";
-import { CreateProjectDialogUI, type CreateProjectPrefillOptions } from ".";
+import { Button } from "@/components/ui/button";
 import { projectStub } from "../../../../stories/stubs";
+import { CreateProjectDialogUI, type CreateProjectPrefillOptions } from ".";
 
 const meta = {
-  title: "Project/Create Project Modal",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Project/Create Project Modal",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -21,16 +21,12 @@ export const Variants: Story = {
   args: {},
 };
 
-function Story(props: {
-  prefill?: CreateProjectPrefillOptions;
-}) {
+function Story(props: { prefill?: CreateProjectPrefillOptions }) {
   const [isOpen, setIsOpen] = useState(true);
 
   return (
     <div className="container flex max-w-6xl flex-col gap-10 py-10">
       <CreateProjectDialogUI
-        open={isOpen}
-        onOpenChange={setIsOpen}
         createProject={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           return {
@@ -38,16 +34,18 @@ function Story(props: {
             secret: "123",
           };
         }}
-        prefill={props.prefill}
         enableNebulaServiceByDefault={false}
+        onOpenChange={setIsOpen}
+        open={isOpen}
+        prefill={props.prefill}
         teamSlug="foo"
       />
 
       <Button
-        variant="outline"
         onClick={() => {
           setIsOpen(true);
         }}
+        variant="outline"
       >
         Open
       </Button>
diff --git a/apps/dashboard/src/components/settings/ApiKeys/Create/LazyCreateAPIKeyDialog.tsx b/apps/dashboard/src/components/settings/ApiKeys/Create/LazyCreateAPIKeyDialog.tsx
index def5aff28f6..724912cacf4 100644
--- a/apps/dashboard/src/components/settings/ApiKeys/Create/LazyCreateAPIKeyDialog.tsx
+++ b/apps/dashboard/src/components/settings/ApiKeys/Create/LazyCreateAPIKeyDialog.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Suspense, lazy, useEffect, useState } from "react";
+import { lazy, Suspense, useEffect, useState } from "react";
 import type { CreateProjectDialogProps } from "./index";
 
 const CreateProjectDialog = lazy(() => import("./index"));
diff --git a/apps/dashboard/src/components/settings/ApiKeys/Create/index.tsx b/apps/dashboard/src/components/settings/ApiKeys/Create/index.tsx
index b867f681469..1f7ee60c966 100644
--- a/apps/dashboard/src/components/settings/ApiKeys/Create/index.tsx
+++ b/apps/dashboard/src/components/settings/ApiKeys/Create/index.tsx
@@ -1,10 +1,21 @@
+import { createProjectClient } from "@3rdweb-sdk/react/hooks/useApi";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { DialogDescription } from "@radix-ui/react-dialog";
+import { useMutation } from "@tanstack/react-query";
+import type { ProjectService } from "@thirdweb-dev/service-utils";
+import { SERVICES } from "@thirdweb-dev/service-utils";
+import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { toArrFromList } from "utils/string";
+import { z } from "zod";
 import type { Project } from "@/api/projects";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import {
   Dialog,
   DialogClose,
@@ -13,8 +24,8 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
-import { Form } from "@/components/ui/form";
 import {
+  Form,
   FormControl,
   FormDescription,
   FormField,
@@ -23,20 +34,9 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Textarea } from "@/components/ui/textarea";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { createProjectClient } from "@3rdweb-sdk/react/hooks/useApi";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { DialogDescription } from "@radix-ui/react-dialog";
-import { useMutation } from "@tanstack/react-query";
-import type { ProjectService } from "@thirdweb-dev/service-utils";
-import { SERVICES } from "@thirdweb-dev/service-utils";
-import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { toArrFromList } from "utils/string";
-import { z } from "zod";
 import { projectDomainsSchema, projectNameSchema } from "../validations";
 
 const ALL_PROJECT_SERVICES = SERVICES.filter(
@@ -97,7 +97,6 @@ export const CreateProjectDialogUI = (props: {
 
   return (
     <Dialog
-      open={open}
       onOpenChange={(v) => {
         // Prevent closing the dialog when the API key is created - to make sure user does not accidentally close the dialog without copying the secret key
         if (screen.id === "api-details") {
@@ -106,6 +105,7 @@ export const CreateProjectDialogUI = (props: {
 
         onOpenChange(v);
       }}
+      open={open}
     >
       <DialogContent
         className="overflow-hidden p-0"
@@ -115,6 +115,7 @@ export const CreateProjectDialogUI = (props: {
           {screen.id === "create" && (
             <CreateProjectForm
               createProject={props.createProject}
+              enableNebulaServiceByDefault={props.enableNebulaServiceByDefault}
               onProjectCreated={(params) => {
                 setScreen({
                   id: "api-details",
@@ -123,20 +124,19 @@ export const CreateProjectDialogUI = (props: {
                 });
               }}
               prefill={props.prefill}
-              enableNebulaServiceByDefault={props.enableNebulaServiceByDefault}
             />
           )}
 
           {screen.id === "api-details" && (
             <CreatedProjectDetails
-              project={screen.project}
-              secret={screen.secret}
-              teamSlug={props.teamSlug}
               onComplete={() => {
                 onOpenChange(false);
                 setScreen({ id: "create" });
                 props.onCreateAndComplete?.();
               }}
+              project={screen.project}
+              secret={screen.secret}
+              teamSlug={props.teamSlug}
             />
           )}
         </DynamicHeight>
@@ -146,8 +146,8 @@ export const CreateProjectDialogUI = (props: {
 };
 
 const createProjectFormSchema = z.object({
-  name: projectNameSchema,
   domains: projectDomainsSchema,
+  name: projectNameSchema,
 });
 
 type CreateProjectFormSchema = z.infer<typeof createProjectFormSchema>;
@@ -159,10 +159,7 @@ function CreateProjectForm(props: {
   }>;
   prefill?: CreateProjectPrefillOptions;
   enableNebulaServiceByDefault: boolean;
-  onProjectCreated: (params: {
-    project: Project;
-    secret: string;
-  }) => void;
+  onProjectCreated: (params: { project: Project; secret: string }) => void;
 }) {
   const [showAlert, setShowAlert] = useState<"no-domain" | "any-domain">();
 
@@ -171,56 +168,53 @@ function CreateProjectForm(props: {
   });
 
   const form = useForm<CreateProjectFormSchema>({
-    resolver: zodResolver(createProjectFormSchema),
     defaultValues: {
-      name: props.prefill?.name || "",
       domains: props.prefill?.domains || "",
+      name: props.prefill?.name || "",
     },
+    resolver: zodResolver(createProjectFormSchema),
   });
 
-  function handleAPICreation(values: {
-    name: string;
-    domains: string;
-  }) {
+  function handleAPICreation(values: { name: string; domains: string }) {
     const servicesToEnableByDefault = props.enableNebulaServiceByDefault
       ? ALL_PROJECT_SERVICES
       : ALL_PROJECT_SERVICES.filter((srv) => srv.name !== "nebula");
 
     const formattedValues: Partial<Project> = {
-      name: values.name,
       domains: toArrFromList(values.domains),
+      name: values.name,
       // enable all services
       services: servicesToEnableByDefault.map((srv) => {
         if (srv.name === "storage") {
           return {
-            name: srv.name,
             actions: srv.actions.map((sa) => sa.name),
+            name: srv.name,
           } satisfies ProjectService;
         }
 
         if (srv.name === "pay") {
           return {
+            actions: [],
             name: "pay",
             payoutAddress: null,
-            actions: [],
           } satisfies ProjectService;
         }
 
         return {
-          name: srv.name,
           actions: [],
+          name: srv.name,
         } satisfies ProjectService;
       }),
     };
 
     createProject.mutate(formattedValues, {
+      onError: () => {
+        toast.error("Failed to create a project");
+      },
       onSuccess: (data) => {
         props.onProjectCreated(data);
         toast.success("Project created successfully");
       },
-      onError: () => {
-        toast.error("Failed to create a project");
-      },
     });
   }
 
@@ -231,8 +225,8 @@ function CreateProjectForm(props: {
       setShowAlert("any-domain");
     } else {
       handleAPICreation({
-        name: values.name,
         domains: values.domains,
+        name: values.name,
       });
     }
   });
@@ -240,22 +234,22 @@ function CreateProjectForm(props: {
   if (showAlert) {
     return (
       <DomainsAlert
-        type={showAlert}
         isCreating={createProject.isPending}
+        onGoBack={() => setShowAlert(undefined)}
         onProceed={() => {
           handleAPICreation({
-            name: form.getValues("name"),
             domains: form.getValues("domains"),
+            name: form.getValues("name"),
           });
         }}
-        onGoBack={() => setShowAlert(undefined)}
+        type={showAlert}
       />
     );
   }
 
   return (
     <Form {...form}>
-      <form onSubmit={handleSubmit} autoComplete="off">
+      <form autoComplete="off" onSubmit={handleSubmit}>
         <div className="p-6">
           <DialogHeader className="mb-4">
             <DialogTitle className="text-2xl">Create Project</DialogTitle>
@@ -351,14 +345,14 @@ function CreateProjectForm(props: {
 
         <DialogFooter className="flex gap-4 border-border border-t bg-card p-6 md:gap-2">
           <DialogClose asChild>
-            <Button variant="outline" className="min-w-28 gap-2">
+            <Button className="min-w-28 gap-2" variant="outline">
               Cancel
             </Button>
           </DialogClose>
           <Button
-            type="submit"
-            disabled={createProject.isPending}
             className="min-w-28 gap-2"
+            disabled={createProject.isPending}
+            type="submit"
           >
             {createProject.isPending && <Spinner className="size-4" />}
             Create
@@ -394,19 +388,19 @@ function DomainsAlert(props: {
 
       <DialogFooter className="!justify-between flex gap-4 border-border border-t bg-card p-6">
         <Button
-          variant="outline"
-          onClick={props.onGoBack}
           className="min-w-28 gap-2"
+          onClick={props.onGoBack}
+          variant="outline"
         >
           <ArrowLeftIcon className="size-4" />
           Update Domains
         </Button>
 
         <Button
-          type="button"
-          onClick={props.onProceed}
-          disabled={props.isCreating}
           className="min-w-28 gap-2"
+          disabled={props.isCreating}
+          onClick={props.onProceed}
+          type="button"
           variant="destructive"
         >
           {props.isCreating && <Spinner className="size-4" />}
@@ -444,10 +438,10 @@ function CreatedProjectDetails(props: {
           </p>
 
           <CopyTextButton
-            textToCopy={clientId}
             className="!h-auto w-full justify-between truncate bg-card px-3 py-3 font-mono"
-            textToShow={clientId}
             copyIconPosition="right"
+            textToCopy={clientId}
+            textToShow={clientId}
             tooltip="Copy Client ID"
           />
         </section>
@@ -461,10 +455,10 @@ function CreatedProjectDetails(props: {
           </p>
 
           <CopyTextButton
-            textToCopy={props.secret || ""}
             className="!h-auto w-full justify-between truncate bg-card px-3 py-3 font-mono"
-            textToShow={props.secret || ""}
             copyIconPosition="right"
+            textToCopy={props.secret || ""}
+            textToShow={props.secret || ""}
             tooltip="Copy Secret Key"
           />
         </section>
@@ -493,22 +487,22 @@ function CreatedProjectDetails(props: {
 
       <DialogFooter className="flex border-border border-t bg-card p-6">
         <Button
-          type="button"
-          onClick={props.onComplete}
+          className="min-w-28 gap-2"
           disabled={!secretStored}
+          onClick={props.onComplete}
+          type="button"
           variant="outline"
-          className="min-w-28 gap-2"
         >
           {props.teamSlug ? "Close" : "Complete"}
         </Button>
 
         {props.teamSlug && (
           <Button
+            className="min-w-28 gap-2"
+            disabled={!secretStored}
             onClick={() => {
               router.push(`/team/${props.teamSlug}/${props.project.slug}`);
             }}
-            disabled={!secretStored}
-            className="min-w-28 gap-2"
           >
             View Project
             <ArrowRightIcon className="size-4" />
diff --git a/apps/dashboard/src/components/settings/ApiKeys/validations.ts b/apps/dashboard/src/components/settings/ApiKeys/validations.ts
index 27108698e62..17c89dd5a31 100644
--- a/apps/dashboard/src/components/settings/ApiKeys/validations.ts
+++ b/apps/dashboard/src/components/settings/ApiKeys/validations.ts
@@ -21,8 +21,8 @@ export const projectDomainsSchema = z.string().refine(
 const customAuthValidation = z.union([
   z.undefined(),
   z.object({
-    jwksUri: z.string(),
     aud: z.string(),
+    jwksUri: z.string(),
   }),
 ]);
 
@@ -100,21 +100,20 @@ const redirectUriSchema = z
   });
 
 export const apiKeyEmbeddedWalletsValidationSchema = z.object({
-  customAuthentication: customAuthValidation,
-  customAuthEndpoint: customAuthEndpointValidation,
   branding: z.union([
     z.undefined(),
     z.object({
-      applicationName: applicationNameValidation,
       applicationImageUrl: applicationImageUrlValidation,
+      applicationName: applicationNameValidation,
     }),
   ]),
+  customAuthEndpoint: customAuthEndpointValidation,
+  customAuthentication: customAuthValidation,
   redirectUrls: redirectUriSchema,
   smsEnabledCountryISOs: z.array(z.string()),
 });
 
 export const apiKeyPayConfigValidationSchema = z.object({
-  payoutAddress: payoutAddressValidation,
   developerFeeBPS: z
     .string()
     .transform((val) => Number(val))
@@ -122,6 +121,7 @@ export const apiKeyPayConfigValidationSchema = z.object({
       message: "Developer fee must be between 0 and 100",
     })
     .optional(),
+  payoutAddress: payoutAddressValidation,
 });
 
 export const routeDiscoveryValidationSchema = z.object({
diff --git a/apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletRevokeModal.tsx b/apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletRevokeModal.tsx
index 78bc82c10b9..375a3c9de97 100644
--- a/apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletRevokeModal.tsx
+++ b/apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletRevokeModal.tsx
@@ -20,12 +20,12 @@ export const AuthorizedWalletRevokeModal: React.FC<
 > = ({ isOpen, onClose, onSubmit, authorizedWalletId }) => {
   return (
     <Dialog
-      open={isOpen}
       onOpenChange={(open) => {
         if (!open) {
           onClose();
         }
       }}
+      open={isOpen}
     >
       <DialogContent className="p-0">
         <DialogHeader className="p-6">
@@ -36,12 +36,12 @@ export const AuthorizedWalletRevokeModal: React.FC<
         </DialogHeader>
 
         <DialogFooter className="gap-4 border-border border-t bg-card p-6">
-          <Button variant="outline" onClick={onClose}>
+          <Button onClick={onClose} variant="outline">
             Cancel
           </Button>
           <Button
-            variant="destructive"
             onClick={() => onSubmit(authorizedWalletId)}
+            variant="destructive"
           >
             Revoke
           </Button>
diff --git a/apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletsTable.tsx b/apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletsTable.tsx
index dc091e861f5..d97e77f995b 100644
--- a/apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletsTable.tsx
+++ b/apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletsTable.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import {
   type AuthorizedWallet,
   useRevokeAuthorizedWallet,
@@ -13,6 +12,7 @@ import { toast } from "sonner";
 import { isAddress } from "thirdweb/utils";
 import type { ComponentWithChildren } from "types/component-with-children";
 import { shortenString } from "utils/usedapp-external";
+import { Button } from "@/components/ui/button";
 import { AuthorizedWalletRevokeModal } from "./AuthorizedWalletRevokeModal";
 
 interface AuthorizedWalletsTableProps {
@@ -34,7 +34,6 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
 
   const columns = [
     columnHelper.accessor("deviceName", {
-      header: "Device Name",
       cell: (cell) => {
         const value = cell.getValue();
         if (!value) {
@@ -45,10 +44,10 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
         }
         return <span className="text-sm">{value}</span>;
       },
+      header: "Device Name",
     }),
 
     columnHelper.accessor("createdAt", {
-      header: "Authorized at",
       cell: (cell) => {
         const value = cell.getValue();
 
@@ -58,10 +57,10 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
         const createdDate = format(new Date(value), "MMM dd, yyyy");
         return <span className="text-sm">{createdDate}</span>;
       },
+      header: "Authorized at",
     }),
 
     columnHelper.accessor("id", {
-      header: "",
       cell: (cell) => {
         const value = cell.getValue();
         if (!value) {
@@ -70,13 +69,14 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
         return (
           <Button
             onClick={() => handleOpen(value)}
-            variant="destructive"
             size="sm"
+            variant="destructive"
           >
             Revoke Access
           </Button>
         );
       },
+      header: "",
     }),
   ];
 
@@ -117,19 +117,19 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
     <>
       {revokeAuthorizedWalletId && (
         <AuthorizedWalletRevokeModal
+          authorizedWalletId={revokeAuthorizedWalletId || ""}
           isOpen={isOpen}
           onClose={handleClose}
-          authorizedWalletId={revokeAuthorizedWalletId || ""}
           onSubmit={handleSubmit}
         />
       )}
 
       <TWTable
-        title="Authorized Devices"
         columns={columns}
         data={authorizedWallets}
-        isPending={isPending}
         isFetched={isFetched}
+        isPending={isPending}
+        title="Authorized Devices"
       />
     </>
   );
diff --git a/apps/dashboard/src/components/shared/CurrencySelector.tsx b/apps/dashboard/src/components/shared/CurrencySelector.tsx
index b05193f1202..ac3d71ec43c 100644
--- a/apps/dashboard/src/components/shared/CurrencySelector.tsx
+++ b/apps/dashboard/src/components/shared/CurrencySelector.tsx
@@ -1,3 +1,7 @@
+import { CURRENCIES, type CurrencyMetadata } from "constants/currencies";
+import { useAllChainsData } from "hooks/chains/allChains";
+import { useMemo, useState } from "react";
+import { isAddress, NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS } from "thirdweb";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import {
@@ -8,10 +12,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { cn } from "@/lib/utils";
-import { CURRENCIES, type CurrencyMetadata } from "constants/currencies";
-import { useAllChainsData } from "hooks/chains/allChains";
-import { useMemo, useState } from "react";
-import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, isAddress } from "thirdweb";
 
 interface CurrencySelectorProps {
   value: string;
@@ -113,15 +113,15 @@ export function CurrencySelector({
         </Button>
         <Input
           className="w-full rounded-none"
-          required
+          onChange={(e) => setEditCustomCurrency(e.target.value)}
           placeholder="ERC20 Address"
+          required
           value={editCustomCurrency}
-          onChange={(e) => setEditCustomCurrency(e.target.value)}
         />
         <Button
           className="rounded-r-md rounded-l-none"
-          onClick={addCustomCurrency}
           disabled={!isAddress(editCustomCurrency)}
+          onClick={addCustomCurrency}
         >
           Save
         </Button>
@@ -139,13 +139,6 @@ export function CurrencySelector({
     >
       <Select
         disabled={isDisabled}
-        value={
-          isPaymentsSelector
-            ? value
-            : value?.toLowerCase() === ZERO_ADDRESS.toLowerCase()
-              ? NATIVE_TOKEN_ADDRESS.toLowerCase()
-              : value?.toLowerCase()
-        }
         onValueChange={(val) => {
           if (val === "custom") {
             setIsAddingCurrency(true);
@@ -155,6 +148,13 @@ export function CurrencySelector({
             } as React.ChangeEvent<HTMLSelectElement>);
           }
         }}
+        value={
+          isPaymentsSelector
+            ? value
+            : value?.toLowerCase() === ZERO_ADDRESS.toLowerCase()
+              ? NATIVE_TOKEN_ADDRESS.toLowerCase()
+              : value?.toLowerCase()
+        }
       >
         <SelectTrigger>
           <SelectValue placeholder="Select Currency" />
diff --git a/apps/dashboard/src/components/shared/DeprecatedAlert.tsx b/apps/dashboard/src/components/shared/DeprecatedAlert.tsx
index 5c8a2048ff3..7e68ff62121 100644
--- a/apps/dashboard/src/components/shared/DeprecatedAlert.tsx
+++ b/apps/dashboard/src/components/shared/DeprecatedAlert.tsx
@@ -1,16 +1,16 @@
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { CircleAlertIcon } from "lucide-react";
 import Link from "next/link";
 import {
-  type Chain,
-  type ChainMetadata,
   arbitrumSepolia,
   baseSepolia,
+  type Chain,
+  type ChainMetadata,
   mumbai,
   optimismSepolia,
   polygonAmoy,
   sepolia,
 } from "thirdweb/chains";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 
 interface DeprecatedAlertProps {
   chain: ChainMetadata | undefined;
@@ -24,15 +24,15 @@ const TO_BE_DEPRECATED_CHAINS: Record<number, { date: Date }> = {
 
 const RECOMMENDED_CHAINS: Record<number, Chain> = {
   // ethereum goerli
-  [5]: sepolia,
-  // base goerli
-  [84531]: baseSepolia,
+  5: sepolia,
   // optimism goerli
-  [420]: optimismSepolia,
-  // arbitrum goerli
-  [421613]: arbitrumSepolia,
+  420: optimismSepolia,
   // polygon mumbai
-  [80001]: polygonAmoy,
+  80001: polygonAmoy,
+  // base goerli
+  84531: baseSepolia,
+  // arbitrum goerli
+  421613: arbitrumSepolia,
 };
 
 export const DeprecatedAlert: React.FC<DeprecatedAlertProps> = ({ chain }) => {
@@ -51,8 +51,7 @@ export const DeprecatedAlert: React.FC<DeprecatedAlertProps> = ({ chain }) => {
   }
 
   const isDeprecatedSoon =
-    tobeDeprecatedChain &&
-    tobeDeprecatedChain.date.getTime() > new Date().getTime();
+    tobeDeprecatedChain && tobeDeprecatedChain.date.getTime() > Date.now();
   const message = isDeprecatedSoon
     ? `thirdweb services won't be available on this network after ${tobeDeprecatedChain.date.toLocaleDateString()}.`
     : "thirdweb services are not available on this network.";
@@ -73,8 +72,8 @@ export const DeprecatedAlert: React.FC<DeprecatedAlertProps> = ({ chain }) => {
             <br />
             We recommend switching to{" "}
             <Link
-              href={`/${recommendedChain.id}`}
               className="text-link-foreground hover:text-foreground"
+              href={`/${recommendedChain.id}`}
             >
               {recommendedChain.name}
             </Link>{" "}
diff --git a/apps/dashboard/src/components/shared/DocLink.tsx b/apps/dashboard/src/components/shared/DocLink.tsx
index 7e5964a31aa..3b8b37f01ff 100644
--- a/apps/dashboard/src/components/shared/DocLink.tsx
+++ b/apps/dashboard/src/components/shared/DocLink.tsx
@@ -7,10 +7,10 @@ export function DocLink(props: {
 }) {
   return (
     <Link
+      className="flex items-center gap-2 whitespace-nowrap text-muted-foreground text-sm hover:text-foreground"
       href={props.link}
-      target="_blank"
       rel="noopener noreferrer"
-      className="flex items-center gap-2 whitespace-nowrap text-muted-foreground text-sm hover:text-foreground"
+      target="_blank"
     >
       <props.icon className="size-4" />
       {props.label}
diff --git a/apps/dashboard/src/components/shared/FileInput.tsx b/apps/dashboard/src/components/shared/FileInput.tsx
index e857cabd296..52b5c9684db 100644
--- a/apps/dashboard/src/components/shared/FileInput.tsx
+++ b/apps/dashboard/src/components/shared/FileInput.tsx
@@ -1,5 +1,3 @@
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import { FilePreview } from "@app/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/file-preview";
 import { FilePlusIcon, UploadIcon } from "lucide-react";
 import { useCallback, useEffect, useRef } from "react";
@@ -10,6 +8,8 @@ import {
   useDropzone,
 } from "react-dropzone";
 import type { ThirdwebClient } from "thirdweb";
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 
 interface IFileInputProps {
   accept?: Accept;
@@ -60,8 +60,8 @@ export const FileInput: React.FC<IFileInputProps> = ({
     [setValue],
   );
   const { getRootProps, getInputProps } = useDropzone({
-    onDrop,
     accept,
+    onDrop,
   });
 
   const helperTextOrFile = helperText
@@ -98,15 +98,15 @@ export const FileInput: React.FC<IFileInputProps> = ({
       {showPreview &&
         (isDisabled ? (
           <div
-            style={{
-              aspectRatio: 1,
-              maxWidth: previewMaxWidth,
-            }}
             className={cn(
               "cursor-not-allowed bg-card opacity-50",
               "flex w-full items-center justify-center border border-border hover:bg-accent hover:ring-2 hover:ring-ring",
               className,
             )}
+            style={{
+              aspectRatio: 1,
+              maxWidth: previewMaxWidth,
+            }}
           >
             <div className="flex flex-col items-center gap-2 text-muted-foreground">
               <UploadIcon className="size-6" />
@@ -115,23 +115,23 @@ export const FileInput: React.FC<IFileInputProps> = ({
           </div>
         ) : (
           <div
-            style={{
-              aspectRatio: 1,
-              maxWidth: previewMaxWidth,
-            }}
             className={cn(
               "relative cursor-pointer overflow-hidden",
               "flex w-full items-center justify-center border border-border hover:bg-accent hover:ring-2 hover:ring-ring",
               value ? "bg-transparent" : "bg-card",
               className,
             )}
+            style={{
+              aspectRatio: 1,
+              maxWidth: previewMaxWidth,
+            }}
           >
             {value ? (
               <FilePreview
-                srcOrFile={value}
-                client={client}
                 className="h-full w-full"
+                client={client}
                 imgContainerClassName="h-full w-full"
+                srcOrFile={value}
               />
             ) : (
               <div className="flex flex-col items-center gap-2.5 text-muted-foreground">
@@ -151,7 +151,7 @@ export const FileInput: React.FC<IFileInputProps> = ({
       {showUploadButton ? (
         <div className="flex flex-col gap-2">
           {showUploadButton && (
-            <Button variant="outline" disabled={isDisabled} className="gap-2">
+            <Button className="gap-2" disabled={isDisabled} variant="outline">
               <FilePlusIcon className="size-4" /> {selectOrUpload}{" "}
               {helperTextOrFile}
             </Button>
diff --git a/apps/dashboard/src/components/shared/TWTable.tsx b/apps/dashboard/src/components/shared/TWTable.tsx
index 4f38e902773..678451a4862 100644
--- a/apps/dashboard/src/components/shared/TWTable.tsx
+++ b/apps/dashboard/src/components/shared/TWTable.tsx
@@ -1,6 +1,16 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  type ColumnDef,
+  flexRender,
+  getCoreRowModel,
+  type PaginationState,
+  type TableOptions,
+  useReactTable,
+} from "@tanstack/react-table";
+import { EllipsisVerticalIcon, MoveRightIcon } from "lucide-react";
+import pluralize from "pluralize";
+import { type ReactNode, type SetStateAction, useMemo, useState } from "react";
 import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -8,6 +18,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Separator } from "@/components/ui/separator";
 import {
   Table,
@@ -19,17 +30,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { cn } from "@/lib/utils";
-import {
-  type ColumnDef,
-  type PaginationState,
-  type TableOptions,
-  flexRender,
-  getCoreRowModel,
-  useReactTable,
-} from "@tanstack/react-table";
-import { EllipsisVerticalIcon, MoveRightIcon } from "lucide-react";
-import pluralize from "pluralize";
-import { type ReactNode, type SetStateAction, useMemo, useState } from "react";
 
 type CtaMenuItem<TRowData> = {
   icon?: ReactNode;
@@ -107,18 +107,18 @@ export function TWTable<TRowData>(tableProps: TWTableProps<TRowData>) {
     () =>
       tableProps.pagination
         ? {
+            manualPagination: true,
+            onPaginationChange: setPagination,
             pageCount: Math.ceil(slicedData.length / pageSize),
             state: { pagination },
-            onPaginationChange: setPagination,
-            manualPagination: true,
           }
         : {},
     [pageSize, pagination, slicedData.length, tableProps.pagination],
   );
 
   const table = useReactTable({
-    data: slicedData,
     columns: tableProps.columns,
+    data: slicedData,
     ...paginationOptions,
     getCoreRowModel: getCoreRowModel(),
     // TODO - add filtering?
@@ -135,7 +135,7 @@ export function TWTable<TRowData>(tableProps: TWTableProps<TRowData>) {
           {table.getHeaderGroups().map((headerGroup) => (
             <TableRow key={headerGroup.id}>
               {headerGroup.headers.map((header) => (
-                <TableHead key={header.id} colSpan={header.colSpan}>
+                <TableHead colSpan={header.colSpan} key={header.id}>
                   {header.isPlaceholder ? null : (
                     <div className="flex items-center gap-2 ">
                       {flexRender(
@@ -164,19 +164,20 @@ export function TWTable<TRowData>(tableProps: TWTableProps<TRowData>) {
             return (
               <TableRow
                 key={row.id}
+                // biome-ignore lint/a11y/useSemanticElements: FIXME
                 role="group"
                 {...(tableProps.onRowClick
                   ? {
-                      style: {
-                        cursor: "pointer",
-                      },
-                      onClick: () => tableProps.onRowClick?.(row.original),
-                      _hover: { bg: "blackAlpha.50" },
                       _dark: {
                         _hover: {
                           bg: "whiteAlpha.50",
                         },
                       },
+                      _hover: { bg: "blackAlpha.50" },
+                      onClick: () => tableProps.onRowClick?.(row.original),
+                      style: {
+                        cursor: "pointer",
+                      },
                     }
                   : {})}
                 className={tableProps.bodyRowClassName}
@@ -203,9 +204,9 @@ export function TWTable<TRowData>(tableProps: TWTableProps<TRowData>) {
                     <DropdownMenu>
                       <DropdownMenuTrigger asChild>
                         <Button
-                          variant="ghost"
                           aria-label="Actions"
                           className="!h-auto relative z-10 p-2.5"
+                          variant="ghost"
                         >
                           <EllipsisVerticalIcon className="size-4" />
                         </Button>
@@ -215,12 +216,12 @@ export function TWTable<TRowData>(tableProps: TWTableProps<TRowData>) {
                           ({ icon, text, onClick, isDestructive }) => {
                             return (
                               <DropdownMenuItem
-                                key={text}
-                                onClick={() => onClick(row.original)}
                                 className={cn(
                                   "min-w-[170px] cursor-pointer gap-3 px-3 py-3",
                                   isDestructive && "!text-destructive-text",
                                 )}
+                                key={text}
+                                onClick={() => onClick(row.original)}
                               >
                                 {icon}
                                 {text}
@@ -262,14 +263,14 @@ export function TWTable<TRowData>(tableProps: TWTableProps<TRowData>) {
         )}
 
       <ShowMoreButton
-        shouldShowMore={slicedData.length < tableProps.data.length}
+        pageSize={tableProps.showMore?.pageSize || -1}
+        setShowMoreLimit={setShowMoreLimit}
         shouldShowLess={
           !!tableProps.showMore?.showLess &&
           slicedData.length > tableProps.showMore.pageSize
         }
-        pageSize={tableProps.showMore?.pageSize || -1}
+        shouldShowMore={slicedData.length < tableProps.data.length}
         showMoreLimit={showMoreLimit}
-        setShowMoreLimit={setShowMoreLimit}
       />
     </TableContainer>
   );
@@ -305,18 +306,18 @@ const ShowMoreButton: React.FC<ShowMoreButtonProps> = ({
         <div className="flex items-center gap-2">
           {shouldShowMore && (
             <Button
-              variant="ghost"
-              size="sm"
               onClick={() => setShowMoreLimit(showMoreLimit + pageSize)}
+              size="sm"
+              variant="ghost"
             >
               Show more
             </Button>
           )}
           {shouldShowLess && (
             <Button
-              variant="ghost"
-              size="sm"
               onClick={() => setShowMoreLimit(newShowLess)}
+              size="sm"
+              variant="ghost"
             >
               Show Less
             </Button>
diff --git a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/AccountAbstractionSummary.tsx b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/AccountAbstractionSummary.tsx
index 871ae786b90..5e4c5e64531 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/AccountAbstractionSummary.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/AccountAbstractionSummary.tsx
@@ -1,8 +1,8 @@
-import { getAggregateUserOpUsage } from "@/api/analytics";
 import { StatCard } from "components/analytics/stat";
 import { ActivityIcon, CoinsIcon } from "lucide-react";
 import { Suspense } from "react";
 import type { UserOpStats } from "types/analytics";
+import { getAggregateUserOpUsage } from "@/api/analytics";
 
 function AccountAbstractionSummaryInner(props: {
   aggregateUserOpUsageQuery: UserOpStats | undefined;
@@ -11,22 +11,22 @@ function AccountAbstractionSummaryInner(props: {
   return (
     <div className="grid grid-cols-2 gap-4">
       <StatCard
-        label="Mainnet Sponsored Transactions"
-        value={props.aggregateUserOpUsageQuery?.successful || 0}
         icon={ActivityIcon}
         isPending={props.isPending}
+        label="Mainnet Sponsored Transactions"
+        value={props.aggregateUserOpUsageQuery?.successful || 0}
       />
       <StatCard
-        label="Mainnet Gas Sponsored"
-        value={props.aggregateUserOpUsageQuery?.sponsoredUsd || 0}
         formatter={(value: number) =>
           new Intl.NumberFormat("en-US", {
-            style: "currency",
             currency: "USD",
+            style: "currency",
           }).format(value)
         }
         icon={CoinsIcon}
         isPending={props.isPending}
+        label="Mainnet Gas Sponsored"
+        value={props.aggregateUserOpUsageQuery?.sponsoredUsd || 0}
       />
     </div>
   );
@@ -37,8 +37,8 @@ async function AsyncAccountAbstractionSummary(props: {
   projectId: string;
 }) {
   const aggregateUserOpStats = await getAggregateUserOpUsage({
-    teamId: props.teamId,
     projectId: props.projectId,
+    teamId: props.teamId,
   });
 
   return (
@@ -63,8 +63,8 @@ export function AccountAbstractionSummary(props: {
       }
     >
       <AsyncAccountAbstractionSummary
-        teamId={props.teamId}
         projectId={props.projectId}
+        teamId={props.teamId}
       />
     </Suspense>
   );
diff --git a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard.stories.tsx b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard.stories.tsx
index 7de622be521..8289df90a00 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard.stories.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard.stories.tsx
@@ -4,8 +4,8 @@ import { SponsoredTransactionsChartCard } from "./SponsoredTransactionsChartCard
 import { createUserOpStatsStub } from "./storyUtils";
 
 const meta = {
-  title: "Charts/Connect/Sponsored Transactions",
   component: Component,
+  title: "Charts/Connect/Sponsored Transactions",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -20,36 +20,36 @@ function Component() {
     <div className="container flex max-w-6xl flex-col gap-10 py-10">
       <BadgeContainer label="30 days">
         <SponsoredTransactionsChartCard
-          userOpStats={createUserOpStatsStub(30)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(30)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="60 days">
         <SponsoredTransactionsChartCard
-          userOpStats={createUserOpStatsStub(60)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(60)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="10 days">
         <SponsoredTransactionsChartCard
-          userOpStats={createUserOpStatsStub(10)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(10)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="0 days">
         <SponsoredTransactionsChartCard
-          userOpStats={createUserOpStatsStub(0)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(0)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Loading">
         <SponsoredTransactionsChartCard
-          userOpStats={createUserOpStatsStub(0)}
           isPending={true}
+          userOpStats={createUserOpStatsStub(0)}
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard.tsx b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard.tsx
index a6f21e11bc8..2554ba6fc38 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/SponsoredTransactionsChartCard.tsx
@@ -1,8 +1,5 @@
 "use client";
 
-import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
-import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
-import type { ChartConfig } from "@/components/ui/chart";
 import { DotNetIcon } from "components/icons/brand-icons/DotNetIcon";
 import { ReactIcon } from "components/icons/brand-icons/ReactIcon";
 import { TypeScriptIcon } from "components/icons/brand-icons/TypeScriptIcon";
@@ -13,6 +10,9 @@ import { format } from "date-fns";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { useMemo } from "react";
 import type { UserOpStats } from "types/analytics";
+import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
+import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
+import type { ChartConfig } from "@/components/ui/chart";
 import { formatTickerNumber } from "../../../lib/format-utils";
 
 type ChartData = Record<string, number> & {
@@ -73,21 +73,21 @@ export function SponsoredTransactionsChartCard(props: {
 
     chainsToShow.forEach((chainName, i) => {
       _chartConfig[chainName] = {
-        label: chainName,
         color: `hsl(var(--chart-${(i % 10) + 1}))`,
+        label: chainName,
       };
     });
 
     // Add Other
     chainsToShow.push("others");
     _chartConfig.others = {
-      label: "Others",
       color: "hsl(var(--muted-foreground))",
+      label: "Others",
     };
 
     return {
-      chartData: Array.from(_chartDataMap.values()),
       chartConfig: _chartConfig,
+      chartData: Array.from(_chartDataMap.values()),
     };
   }, [userOpStats, chainsStore]);
 
@@ -99,6 +99,8 @@ export function SponsoredTransactionsChartCard(props: {
 
   return (
     <ThirdwebBarChart
+      chartClassName="aspect-[1] lg:aspect-[3]"
+      config={chartConfig}
       customHeader={
         <div className="relative px-6 pt-6">
           <h3 className="mb-0.5 font-semibold text-xl tracking-tight">
@@ -111,8 +113,8 @@ export function SponsoredTransactionsChartCard(props: {
           <div className="top-6 right-6 mt-4 mb-8 grid grid-cols-2 items-center gap-2 md:absolute md:my-0 md:flex">
             <ExportToCSVButton
               className="bg-background"
-              fileName="Sponsored Transactions"
               disabled={disableActions}
+              fileName="Sponsored Transactions"
               getData={async () => {
                 const header = ["Date", ...uniqueChainIds];
                 const rows = chartData.map((data) => {
@@ -128,12 +130,11 @@ export function SponsoredTransactionsChartCard(props: {
           </div>
         </div>
       }
-      config={chartConfig}
       data={chartData}
+      emptyChartState={<EmptyAccountAbstractionChartContent />}
+      hideLabel={false}
       isPending={props.isPending}
-      chartClassName="aspect-[1] lg:aspect-[3]"
       showLegend
-      hideLabel={false}
       toolTipLabelFormatter={(_v, item) => {
         if (Array.isArray(item)) {
           const time = item[0].payload.time as number;
@@ -142,7 +143,6 @@ export function SponsoredTransactionsChartCard(props: {
         return undefined;
       }}
       toolTipValueFormatter={(value) => formatTickerNumber(Number(value))}
-      emptyChartState={<EmptyAccountAbstractionChartContent />}
     />
   );
 }
@@ -155,34 +155,34 @@ export function EmptyAccountAbstractionChartContent() {
       </span>
       <div className="flex max-w-md flex-wrap items-center justify-center gap-x-6 gap-y-4">
         <DocLink
-          link="https://portal.thirdweb.com/typescript/v5/account-abstraction/batching-transactions"
-          label="TypeScript"
           icon={TypeScriptIcon}
+          label="TypeScript"
+          link="https://portal.thirdweb.com/typescript/v5/account-abstraction/batching-transactions"
         />
         <DocLink
-          link="https://portal.thirdweb.com/react/v5/account-abstraction/batching-transactions"
-          label="React"
           icon={ReactIcon}
+          label="React"
+          link="https://portal.thirdweb.com/react/v5/account-abstraction/batching-transactions"
         />
         <DocLink
-          link="https://portal.thirdweb.com/react/v5/account-abstraction/get-started"
-          label="React Native"
           icon={ReactIcon}
+          label="React Native"
+          link="https://portal.thirdweb.com/react/v5/account-abstraction/get-started"
         />
         <DocLink
-          link="https://portal.thirdweb.com/unity/v5/wallets/account-abstraction"
-          label="Unity"
           icon={UnityIcon}
+          label="Unity"
+          link="https://portal.thirdweb.com/unity/v5/wallets/account-abstraction"
         />
         <DocLink
-          link="https://portal.thirdweb.com/unreal-engine/blueprints/smart-wallet"
-          label="Unreal Engine"
           icon={UnrealIcon}
+          label="Unreal Engine"
+          link="https://portal.thirdweb.com/unreal-engine/blueprints/smart-wallet"
         />
         <DocLink
-          link="https://portal.thirdweb.com/dotnet/wallets/providers/account-abstraction"
-          label=".NET"
           icon={DotNetIcon}
+          label=".NET"
+          link="https://portal.thirdweb.com/dotnet/wallets/providers/account-abstraction"
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/TotalSponsoredChartCard.stories.tsx b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/TotalSponsoredChartCard.stories.tsx
index 4be196b3bd1..7ee0f1e37ca 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/TotalSponsoredChartCard.stories.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/TotalSponsoredChartCard.stories.tsx
@@ -1,11 +1,11 @@
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { BadgeContainer } from "../../../stories/utils";
-import { TotalSponsoredChartCard } from "./TotalSponsoredChartCard";
 import { createUserOpStatsStub } from "./storyUtils";
+import { TotalSponsoredChartCard } from "./TotalSponsoredChartCard";
 
 const meta = {
-  title: "Charts/Connect/Total Sponsored",
   component: Component,
+  title: "Charts/Connect/Total Sponsored",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -20,43 +20,43 @@ function Component() {
     <div className="container flex max-w-6xl flex-col gap-10 py-10">
       <BadgeContainer label="30 days">
         <TotalSponsoredChartCard
-          userOpStats={createUserOpStatsStub(30)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(30)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="60 days">
         <TotalSponsoredChartCard
-          userOpStats={createUserOpStatsStub(60)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(60)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="120 days">
         <TotalSponsoredChartCard
-          userOpStats={createUserOpStatsStub(120)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(120)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="10 days">
         <TotalSponsoredChartCard
-          userOpStats={createUserOpStatsStub(10)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(10)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="0 days">
         <TotalSponsoredChartCard
-          userOpStats={createUserOpStatsStub(0)}
           isPending={false}
+          userOpStats={createUserOpStatsStub(0)}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Loading">
         <TotalSponsoredChartCard
-          userOpStats={createUserOpStatsStub(0)}
           isPending={true}
+          userOpStats={createUserOpStatsStub(0)}
         />
       </BadgeContainer>
     </div>
diff --git a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/TotalSponsoredChartCard.tsx b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/TotalSponsoredChartCard.tsx
index 9779f6801d0..6074e0836d7 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/TotalSponsoredChartCard.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/TotalSponsoredChartCard.tsx
@@ -1,8 +1,5 @@
 "use client";
 
-import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
-import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
-import type { ChartConfig } from "@/components/ui/chart";
 import { DotNetIcon } from "components/icons/brand-icons/DotNetIcon";
 import { ReactIcon } from "components/icons/brand-icons/ReactIcon";
 import { TypeScriptIcon } from "components/icons/brand-icons/TypeScriptIcon";
@@ -13,6 +10,9 @@ import { format } from "date-fns";
 import { useAllChainsData } from "hooks/chains/allChains";
 import { useMemo } from "react";
 import type { UserOpStats } from "types/analytics";
+import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
+import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
+import type { ChartConfig } from "@/components/ui/chart";
 import { toUSD } from "../../../utils/number";
 
 type ChartData = Record<string, number> & {
@@ -74,23 +74,23 @@ export function TotalSponsoredChartCard(props: {
 
     chainsToShow.forEach((walletType, i) => {
       _chartConfig[walletType] = {
-        label: chainsToShow[i],
         color: `hsl(var(--chart-${(i % 10) + 1}))`,
+        label: chainsToShow[i],
       };
     });
 
     // Add Other
     chainsToShow.push("others");
     _chartConfig.others = {
-      label: "Others",
       color: "hsl(var(--muted-foreground))",
+      label: "Others",
     };
 
     return {
+      chartConfig: _chartConfig,
       chartData: Array.from(_chartDataMap.values()).sort((a, b) => {
         return new Date(a.time).getTime() - new Date(b.time).getTime();
       }),
-      chartConfig: _chartConfig,
     };
   }, [userOpStats, chainsStore]);
 
@@ -102,6 +102,8 @@ export function TotalSponsoredChartCard(props: {
 
   return (
     <ThirdwebBarChart
+      chartClassName="aspect-[1] lg:aspect-[3.5]"
+      config={chartConfig}
       customHeader={
         <div className="relative px-6 pt-6">
           <h3 className="mb-0.5 font-semibold text-xl tracking-tight">
@@ -114,8 +116,8 @@ export function TotalSponsoredChartCard(props: {
           <div className="top-6 right-6 mt-4 mb-4 grid grid-cols-2 items-center gap-2 md:absolute md:my-0 md:flex">
             <ExportToCSVButton
               className="bg-background"
-              fileName="Gas Sponsored"
               disabled={disableActions}
+              fileName="Gas Sponsored"
               getData={async () => {
                 // Shows the number of each type of wallet connected on all dates
                 const header = ["Date", ...uniqueChainIds];
@@ -132,13 +134,11 @@ export function TotalSponsoredChartCard(props: {
           </div>
         </div>
       }
-      config={chartConfig}
       data={chartData}
-      isPending={props.isPending}
       emptyChartState={<TotalSponsoredChartCardEmptyChartState />}
-      variant="stacked"
-      showLegend
       hideLabel={false}
+      isPending={props.isPending}
+      showLegend
       toolTipLabelFormatter={(_v, item) => {
         if (Array.isArray(item)) {
           const time = item[0].payload.time as number;
@@ -153,7 +153,7 @@ export function TotalSponsoredChartCard(props: {
 
         return toUSD(value);
       }}
-      chartClassName="aspect-[1] lg:aspect-[3.5]"
+      variant="stacked"
     />
   );
 }
@@ -164,34 +164,34 @@ function TotalSponsoredChartCardEmptyChartState() {
       <span className="mb-6 text-lg">Sponsor gas for your users</span>
       <div className="flex max-w-md flex-wrap items-center justify-center gap-x-6 gap-y-4">
         <DocLink
-          link="https://portal.thirdweb.com/typescript/v5/account-abstraction/get-started"
-          label="TypeScript"
           icon={TypeScriptIcon}
+          label="TypeScript"
+          link="https://portal.thirdweb.com/typescript/v5/account-abstraction/get-started"
         />
         <DocLink
-          link="https://portal.thirdweb.com/react/v5/account-abstraction/get-started"
-          label="React"
           icon={ReactIcon}
+          label="React"
+          link="https://portal.thirdweb.com/react/v5/account-abstraction/get-started"
         />
         <DocLink
-          link="https://portal.thirdweb.com/react/v5/account-abstraction/get-started"
-          label="React Native"
           icon={ReactIcon}
+          label="React Native"
+          link="https://portal.thirdweb.com/react/v5/account-abstraction/get-started"
         />
         <DocLink
-          link="https://portal.thirdweb.com/unity/v5/wallets/account-abstraction"
-          label="Unity"
           icon={UnityIcon}
+          label="Unity"
+          link="https://portal.thirdweb.com/unity/v5/wallets/account-abstraction"
         />
         <DocLink
-          link="https://portal.thirdweb.com/unreal-engine/blueprints/smart-wallet"
-          label="Unreal Engine"
           icon={UnrealIcon}
+          label="Unreal Engine"
+          link="https://portal.thirdweb.com/unreal-engine/blueprints/smart-wallet"
         />
         <DocLink
-          link="https://portal.thirdweb.com/dotnet/wallets/providers/account-abstraction"
-          label=".NET"
           icon={DotNetIcon}
+          label=".NET"
+          link="https://portal.thirdweb.com/dotnet/wallets/providers/account-abstraction"
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/index.tsx b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/index.tsx
index 2131567bf89..d683f4d31fb 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/index.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/index.tsx
@@ -1,8 +1,8 @@
 "use client";
 import {
   DateRangeSelector,
-  type Range,
   getLastNDaysRange,
+  type Range,
 } from "components/analytics/date-range-selector";
 import { IntervalSelector } from "components/analytics/interval-selector";
 import { differenceInDays } from "date-fns";
@@ -96,23 +96,23 @@ export function AccountAbstractionAnalytics(props: {
 
       <div className="flex flex-col gap-4 lg:gap-6">
         <TotalSponsoredChartCard
-          userOpStats={props.userOpStats}
           isPending={isLoading}
+          userOpStats={props.userOpStats}
         />
 
         <SponsoredTransactionsChartCard
-          userOpStats={props.userOpStats}
           isPending={isLoading}
+          userOpStats={props.userOpStats}
         />
 
         <SponsoredTransactionsTable
           client={props.client}
-          teamId={props.teamId}
           from={from.toISOString()}
-          to={to.toISOString()}
-          variant="project"
           projectId={props.projectId}
+          teamId={props.teamId}
           teamSlug={props.teamSlug}
+          to={to.toISOString()}
+          variant="project"
         />
       </div>
     </div>
diff --git a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/storyUtils.ts b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/storyUtils.ts
index b9e39ffa617..c24a7a9e55f 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/storyUtils.ts
+++ b/apps/dashboard/src/components/smart-wallets/AccountAbstractionAnalytics/storyUtils.ts
@@ -11,11 +11,11 @@ export function createUserOpStatsStub(days: number): UserOpStats[] {
     const sponsoredUsd = Math.random() * 100;
 
     stubbedData.push({
+      chainId: Math.floor(Math.random() * 100).toString(),
       date: new Date(2024, 11, d).toLocaleString(),
-      successful,
       failed,
       sponsoredUsd,
-      chainId: Math.floor(Math.random() * 100).toString(),
+      successful,
     });
 
     if (Math.random() > 0.7) {
diff --git a/apps/dashboard/src/components/smart-wallets/AccountFactories/account-cell.tsx b/apps/dashboard/src/components/smart-wallets/AccountFactories/account-cell.tsx
index 56580974631..402bde567a2 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountFactories/account-cell.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountFactories/account-cell.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { SkeletonContainer } from "@/components/ui/skeleton";
 import { memo } from "react";
-import { type ThirdwebClient, getContract } from "thirdweb";
+import { getContract, type ThirdwebClient } from "thirdweb";
 import { getAllAccounts } from "thirdweb/extensions/erc4337";
 import { useReadContract } from "thirdweb/react";
+import { SkeletonContainer } from "@/components/ui/skeleton";
 import { useV5DashboardChain } from "../../../lib/v5-adapter";
 
 function useAccountCount(
@@ -40,10 +40,10 @@ export const FactoryAccountCell = memo(function FactoryAccountCell(props: {
   return (
     <SkeletonContainer
       loadedData={accountsQuery.data?.length}
-      skeletonData={100}
       render={(v) => {
         return <span> {v}</span>;
       }}
+      skeletonData={100}
     />
   );
 });
diff --git a/apps/dashboard/src/components/smart-wallets/AccountFactories/factory-contracts.tsx b/apps/dashboard/src/components/smart-wallets/AccountFactories/factory-contracts.tsx
index 93a74a10bb0..ebd03fa9ab4 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountFactories/factory-contracts.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountFactories/factory-contracts.tsx
@@ -1,5 +1,11 @@
 "use client";
 
+import { useQuery } from "@tanstack/react-query";
+import { ContractNameCell } from "components/contract-components/tables/cells";
+import { FactoryAccountCell } from "components/smart-wallets/AccountFactories/account-cell";
+import { useV5DashboardChain } from "lib/v5-adapter";
+import type { ThirdwebClient } from "thirdweb";
+import { getChainMetadata } from "thirdweb/chains";
 import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
 import { SkeletonContainer } from "@/components/ui/skeleton";
 import {
@@ -11,12 +17,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { useQuery } from "@tanstack/react-query";
-import { ContractNameCell } from "components/contract-components/tables/cells";
-import { FactoryAccountCell } from "components/smart-wallets/AccountFactories/account-cell";
-import { useV5DashboardChain } from "lib/v5-adapter";
-import type { ThirdwebClient } from "thirdweb";
-import { getChainMetadata } from "thirdweb/chains";
 import type { ProjectContract } from "../../../app/(app)/account/contracts/_components/getProjectContracts";
 
 interface FactoryContractsProps {
@@ -31,18 +31,18 @@ interface FactoryContractsProps {
 function NetworkName(props: { id: number }) {
   const chain = useV5DashboardChain(props.id);
   const chainQuery = useQuery({
-    queryKey: ["getChainByChainIdAsync", props.id],
     queryFn: () => getChainMetadata(chain),
+    queryKey: ["getChainByChainIdAsync", props.id],
   });
 
   return (
     <SkeletonContainer
       className="inline-block"
       loadedData={chainQuery.data?.name}
-      skeletonData="Ethereum Mainnet"
       render={(v) => {
         return <p className="text-muted-foreground text-sm">{v}</p>;
       }}
+      skeletonData="Ethereum Mainnet"
     />
   );
 }
@@ -70,10 +70,10 @@ export const FactoryContracts: React.FC<FactoryContractsProps> = ({
               <TableCell>
                 <ContractNameCell
                   chainId={contract.chainId}
+                  client={client}
                   contractAddress={contract.contractAddress}
-                  teamSlug={teamSlug}
                   projectSlug={projectSlug}
-                  client={client}
+                  teamSlug={teamSlug}
                 />
               </TableCell>
               <TableCell>
@@ -82,16 +82,16 @@ export const FactoryContracts: React.FC<FactoryContractsProps> = ({
               <TableCell>
                 <CopyAddressButton
                   address={contract.contractAddress}
+                  className="-translate-x-2"
                   copyIconPosition="left"
                   variant="ghost"
-                  className="-translate-x-2"
                 />
               </TableCell>
               <TableCell>
                 <FactoryAccountCell
                   chainId={contract.chainId}
-                  contractAddress={contract.contractAddress}
                   client={client}
+                  contractAddress={contract.contractAddress}
                 />
               </TableCell>
             </TableRow>
diff --git a/apps/dashboard/src/components/smart-wallets/AccountFactories/index.tsx b/apps/dashboard/src/components/smart-wallets/AccountFactories/index.tsx
index 69942496419..02ff236f64c 100644
--- a/apps/dashboard/src/components/smart-wallets/AccountFactories/index.tsx
+++ b/apps/dashboard/src/components/smart-wallets/AccountFactories/index.tsx
@@ -1,7 +1,10 @@
 "use client";
 
+import {
+  DEFAULT_ACCOUNT_FACTORY_V0_6,
+  DEFAULT_ACCOUNT_FACTORY_V0_7,
+} from "thirdweb/wallets/smart";
 import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import {
   Table,
   TableBody,
@@ -11,22 +14,19 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import {
-  DEFAULT_ACCOUNT_FACTORY_V0_6,
-  DEFAULT_ACCOUNT_FACTORY_V0_7,
-} from "thirdweb/wallets/smart";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
 export function DefaultFactoriesSection() {
   const data = [
     {
-      name: "AccountFactory (v0.6)",
       address: DEFAULT_ACCOUNT_FACTORY_V0_6,
       entrypointVersion: "0.6",
+      name: "AccountFactory (v0.6)",
     },
     {
-      name: "AccountFactory (v0.7)",
       address: DEFAULT_ACCOUNT_FACTORY_V0_7,
       entrypointVersion: "0.7",
+      name: "AccountFactory (v0.7)",
     },
   ];
 
@@ -40,8 +40,8 @@ export function DefaultFactoriesSection() {
           Ready to use account factories that are pre-deployed on each chain.{" "}
           <UnderlineLink
             href="https://playground.thirdweb.com/connect/account-abstraction/connect"
-            target="_blank"
             rel="noopener noreferrer"
+            target="_blank"
           >
             Learn how to use these in your apps
           </UnderlineLink>
@@ -66,9 +66,9 @@ export function DefaultFactoriesSection() {
                 <TableCell>
                   <CopyAddressButton
                     address={row.address}
+                    className="-translate-x-2"
                     copyIconPosition="left"
                     variant="ghost"
-                    className="-translate-x-2"
                   />
                 </TableCell>
                 <TableCell>{row.entrypointVersion}</TableCell>
diff --git a/apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx b/apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx
index fcd88c22060..dc8fde603dd 100644
--- a/apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx
+++ b/apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx
@@ -1,9 +1,5 @@
 "use client";
 
-import type { Project } from "@/api/projects";
-import type { Team } from "@/api/team";
-import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { updateProjectClient } from "@3rdweb-sdk/react/hooks/useApi";
 import {
   Box,
@@ -24,11 +20,15 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { TrashIcon } from "lucide-react";
 import { useMemo } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
-import { type ThirdwebClient, isAddress } from "thirdweb";
+import { isAddress, type ThirdwebClient } from "thirdweb";
 import { Button, FormErrorMessage, FormLabel, Text } from "tw-components";
 import { joinWithComma, toArrFromList } from "utils/string";
 import { validStrList } from "utils/validations";
 import { z } from "zod";
+import type { Project } from "@/api/projects";
+import type { Team } from "@/api/team";
+import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
 type AccountAbstractionSettingsPageProps = {
   bundlerService: ProjectBundlerService;
@@ -47,6 +47,7 @@ const aaSettingsFormSchema = z.object({
       message: "Some of the addresses are invalid",
     })
     .nullable(),
+  allowedOrBlockedWallets: z.string().nullable(),
   allowedWallets: z
     .string()
     .refine((str) => validStrList(str, isAddress), {
@@ -65,18 +66,6 @@ const aaSettingsFormSchema = z.object({
       message: "Some of the addresses are invalid",
     })
     .nullable(),
-  serverVerifier: z.object({
-    url: z
-      .string()
-      .refine((str) => str.startsWith("https://"), {
-        message: "URL must start with https://",
-      })
-      .nullable(),
-    headers: z
-      .array(z.object({ key: z.string(), value: z.string() }))
-      .nullable(),
-    enabled: z.boolean(),
-  }),
   globalLimit: z
     .object({
       maxSpend: z.string().refine((n) => Number.parseFloat(n) > 0, {
@@ -85,7 +74,18 @@ const aaSettingsFormSchema = z.object({
       maxSpendUnit: z.enum(["usd", "native"]),
     })
     .nullable(),
-  allowedOrBlockedWallets: z.string().nullable(),
+  serverVerifier: z.object({
+    enabled: z.boolean(),
+    headers: z
+      .array(z.object({ key: z.string(), value: z.string() }))
+      .nullable(),
+    url: z
+      .string()
+      .refine((str) => str.startsWith("https://"), {
+        message: "URL must start with https://",
+      })
+      .nullable(),
+  }),
 });
 
 export function AccountAbstractionSettingsPage(
@@ -123,6 +123,12 @@ export function AccountAbstractionSettingsPage(
         allowedContractAddresses && allowedContractAddresses.length > 0
           ? joinWithComma(allowedContractAddresses)
           : null,
+      allowedOrBlockedWallets:
+        allowedWallets && allowedWallets?.length > 0
+          ? "allowed"
+          : blockedWallets && blockedWallets?.length > 0
+            ? "blocked"
+            : null,
       allowedWallets:
         allowedWallets && allowedWallets?.length > 0
           ? joinWithComma(allowedWallets)
@@ -135,30 +141,24 @@ export function AccountAbstractionSettingsPage(
         policy.bypassWallets && policy.bypassWallets?.length > 0
           ? joinWithComma(policy.bypassWallets)
           : null,
+      globalLimit: policy.limits?.global ?? null,
       serverVerifier: policy.serverVerifier?.url
         ? {
-            url: policy.serverVerifier.url,
-            headers: policy.serverVerifier.headers || null,
             enabled: true,
+            headers: policy.serverVerifier.headers || null,
+            url: policy.serverVerifier.url,
           }
         : {
-            url: null,
-            headers: null,
             enabled: false,
+            headers: null,
+            url: null,
           },
-      globalLimit: policy.limits?.global ?? null,
-      allowedOrBlockedWallets:
-        allowedWallets && allowedWallets?.length > 0
-          ? "allowed"
-          : blockedWallets && blockedWallets?.length > 0
-            ? "blocked"
-            : null,
     };
   }, [policy]);
 
   const form = useForm<z.infer<typeof aaSettingsFormSchema>>({
-    resolver: zodResolver(aaSettingsFormSchema),
     defaultValues: transformedQueryData,
+    resolver: zodResolver(aaSettingsFormSchema),
     values: transformedQueryData,
   });
 
@@ -175,19 +175,19 @@ export function AccountAbstractionSettingsPage(
   return (
     <Flex flexDir="column" gap={8}>
       <Flex
+        alignItems="left"
         flexDir={{ base: "column", lg: "row" }}
         gap={8}
         justifyContent="space-between"
-        alignItems="left"
       >
         <Flex flexDir="column" gap={2}>
           <Text>
             Configure the rules for your sponsored transactions.{" "}
             <UnderlineLink
-              href="https://portal.thirdweb.com/wallets/smart-wallet/sponsorship-rules"
-              target="_blank"
               className="text-primary-500"
+              href="https://portal.thirdweb.com/wallets/smart-wallet/sponsorship-rules"
               rel="noopener noreferrer"
+              target="_blank"
             >
               View documentation
             </UnderlineLink>
@@ -196,9 +196,9 @@ export function AccountAbstractionSettingsPage(
         </Flex>
       </Flex>
       <Flex
+        as="form"
         flexDir="column"
         gap={6}
-        as="form"
         onSubmit={form.handleSubmit((values) => {
           const limits: ProjectBundlerService["limits"] | null =
             values.globalLimit
@@ -212,12 +212,11 @@ export function AccountAbstractionSettingsPage(
 
           const parsedValues: Omit<ProjectBundlerService, "name" | "actions"> =
             {
+              // don't set null - `updateProject` API adds chainId 0 to the list if its null and makes it `[0]`
+              allowedChainIds: values.allowedChainIds || [],
               allowedContractAddresses: values.allowedContractAddresses
                 ? toArrFromList(values.allowedContractAddresses)
                 : null,
-
-              // don't set null - `updateProject` API adds chainId 0 to the list if its null and makes it `[0]`
-              allowedChainIds: values.allowedChainIds || [],
               allowedWallets:
                 values.allowedOrBlockedWallets === "allowed" &&
                 values.allowedWallets !== null
@@ -232,6 +231,7 @@ export function AccountAbstractionSettingsPage(
                 values.bypassWallets !== null
                   ? toArrFromList(values.bypassWallets)
                   : null,
+              limits,
               serverVerifier:
                 values.serverVerifier &&
                 typeof values.serverVerifier.url === "string" &&
@@ -241,7 +241,6 @@ export function AccountAbstractionSettingsPage(
                       url: values.serverVerifier.url,
                     }
                   : null,
-              limits,
             };
 
           const newServices = props.project.services.map((service) => {
@@ -263,8 +262,8 @@ export function AccountAbstractionSettingsPage(
               services: newServices,
             },
             {
-              onSuccess,
               onError,
+              onSuccess,
             },
           );
         })}
@@ -309,8 +308,8 @@ export function AccountAbstractionSettingsPage(
                   <FormLabel>Spend limit</FormLabel>
                   <div className="flex flex-row items-center gap-2">
                     <Input
-                      w="xs"
                       placeholder="Enter an amount"
+                      w="xs"
                       {...form.register("globalLimit.maxSpend")}
                     />
                     <Select
@@ -351,10 +350,10 @@ export function AccountAbstractionSettingsPage(
                   Only sponsor transactions on the specified chains. <br /> By
                   default, transactions can be sponsored on any of the{" "}
                   <UnderlineLink
+                    className="text-primary-500"
                     href="https://portal.thirdweb.com/wallets/smart-wallet/infrastructure#supported-chains"
-                    target="_blank"
                     rel="noopener noreferrer"
-                    className="text-primary-500"
+                    target="_blank"
                   >
                     supported chains.
                   </UnderlineLink>
@@ -376,10 +375,10 @@ export function AccountAbstractionSettingsPage(
               <Flex flexDir="column">
                 <MultiNetworkSelector
                   client={props.client}
-                  selectedChainIds={form.watch("allowedChainIds") || []}
                   onChange={(chainIds) =>
                     form.setValue("allowedChainIds", chainIds)
                   }
+                  selectedChainIds={form.watch("allowedChainIds") || []}
                 />
                 <FormErrorMessage>
                   {
@@ -522,8 +521,8 @@ export function AccountAbstractionSettingsPage(
             <div className="flex flex-row items-center justify-between gap-6 lg:gap-12">
               <div>
                 <FormLabel
-                  pointerEvents="none"
                   htmlFor="server-verifier-switch"
+                  pointerEvents="none"
                 >
                   Server verifier
                 </FormLabel>
@@ -533,10 +532,10 @@ export function AccountAbstractionSettingsPage(
                   gives you fine grained control and lets you build your own
                   rules.{" "}
                   <UnderlineLink
+                    className="text-primary-500"
                     href="https://portal.thirdweb.com/wallets/smart-wallet/sponsorship-rules#setting-up-a-server-verifier"
-                    target="_blank"
                     rel="noopener noreferrer"
-                    className="text-primary-500"
+                    target="_blank"
                   >
                     View server verifier documentation
                   </UnderlineLink>
@@ -545,21 +544,21 @@ export function AccountAbstractionSettingsPage(
               </div>
 
               <GatedSwitch
-                requiredPlan="starter"
                 currentPlan={props.validTeamPlan}
-                teamSlug={props.teamSlug}
+                requiredPlan="starter"
                 switchProps={{
-                  id: "server-verifier-switch",
                   checked: form.watch("serverVerifier").enabled,
+                  id: "server-verifier-switch",
                   onCheckedChange: (checked) => {
                     form.setValue(
                       "serverVerifier",
                       !checked
-                        ? { enabled: false, url: null, headers: null }
-                        : { enabled: true, url: "", headers: [] },
+                        ? { enabled: false, headers: null, url: null }
+                        : { enabled: true, headers: [], url: "" },
                     );
                   },
                 }}
+                teamSlug={props.teamSlug}
               />
             </div>
             {form.watch("serverVerifier").enabled && (
@@ -589,7 +588,7 @@ export function AccountAbstractionSettingsPage(
                     {customHeaderFields.fields.map((_, customHeaderIdx) => {
                       return (
                         // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
-                        <Flex key={customHeaderIdx} gap={2} w="full">
+                        <Flex gap={2} key={customHeaderIdx} w="full">
                           <Input
                             placeholder="Key"
                             type="text"
@@ -684,9 +683,9 @@ export function AccountAbstractionSettingsPage(
 
         <Box alignSelf="flex-end">
           <Button
-            type="submit"
             colorScheme="primary"
             isLoading={updateProject.isPending}
+            type="submit"
           >
             Save changes
           </Button>
diff --git a/apps/dashboard/src/constants/currencies.ts b/apps/dashboard/src/constants/currencies.ts
index 62b5aa5a83f..2e35c9a7f8b 100644
--- a/apps/dashboard/src/constants/currencies.ts
+++ b/apps/dashboard/src/constants/currencies.ts
@@ -26,9 +26,9 @@ type NativeTokenInfo = {
 };
 
 const ethereumNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Ether",
   symbol: "ETH",
-  decimals: 18,
   wrapped: {
     address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
     name: "Wrapped Ether",
@@ -37,9 +37,9 @@ const ethereumNativeToken: NativeTokenInfo = {
 };
 
 const polygonNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Matic",
   symbol: "MATIC",
-  decimals: 18,
   wrapped: {
     address: "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270",
     name: "Wrapped Matic",
@@ -48,9 +48,9 @@ const polygonNativeToken: NativeTokenInfo = {
 };
 
 const avalancheNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Avalanche",
   symbol: "AVAX",
-  decimals: 18,
   wrapped: {
     address: "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
     name: "Wrapped AVAX",
@@ -59,9 +59,9 @@ const avalancheNativeToken: NativeTokenInfo = {
 };
 
 const avalancheFujiNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Avalanche",
   symbol: "AVAX",
-  decimals: 18,
   wrapped: {
     address: "0xd00ae08403B9bbb9124bB305C09058E32C39A48c",
     name: "Wrapped AVAX",
@@ -70,9 +70,9 @@ const avalancheFujiNativeToken: NativeTokenInfo = {
 };
 
 const fantomNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Fantom",
   symbol: "FTM",
-  decimals: 18,
   wrapped: {
     address: "0x21be370D5312f44cB42ce377BC9b8a0cEF1A4C83",
     name: "Wrapped Fantom",
@@ -81,9 +81,9 @@ const fantomNativeToken: NativeTokenInfo = {
 };
 
 const fantomTestnetNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Fantom",
   symbol: "FTM",
-  decimals: 18,
   wrapped: {
     address: "0xf1277d1Ed8AD466beddF92ef448A132661956621",
     name: "Wrapped Fantom",
@@ -92,9 +92,9 @@ const fantomTestnetNativeToken: NativeTokenInfo = {
 };
 
 const arbitrumNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Ether",
   symbol: "ETH",
-  decimals: 18,
   wrapped: {
     address: "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
     name: "Wrapped Ether",
@@ -103,9 +103,9 @@ const arbitrumNativeToken: NativeTokenInfo = {
 };
 
 const optimismNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Ether",
   symbol: "ETH",
-  decimals: 18,
   wrapped: {
     address: "0x4200000000000000000000000000000000000006",
     name: "Wrapped Ether",
@@ -114,9 +114,9 @@ const optimismNativeToken: NativeTokenInfo = {
 };
 
 const bscNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Binance Chain Native Token",
   symbol: "BNB",
-  decimals: 18,
   wrapped: {
     address: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
     name: "Wrapped Binance Chain Token",
@@ -125,9 +125,9 @@ const bscNativeToken: NativeTokenInfo = {
 };
 
 const bscTestnetNativeToken: NativeTokenInfo = {
+  decimals: 18,
   name: "Binance Chain Native Token",
   symbol: "TBNB",
-  decimals: 18,
   wrapped: {
     address: "0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd",
     name: "Wrapped Binance Chain Testnet Token",
@@ -199,18 +199,18 @@ const Fantom: CurrencyMetadata[] = [
     ...fantomNativeToken.wrapped,
   },
   {
-    name: "Wrapped Ether",
     address: "0x74b23882a30290451A17c44f4F05243b6b58C76d",
+    name: "Wrapped Ether",
     symbol: "WETH",
   },
   {
-    name: "USD Coin",
     address: "0x04068DA6C83AFCFA0e13ba15A6696662335D5B75",
+    name: "USD Coin",
     symbol: "USDC",
   },
   {
-    name: "Wrapped Bitcoin",
     address: "0x321162Cd933E2Be498Cd2267a90534A804051b11",
+    name: "Wrapped Bitcoin",
     symbol: "WBTC",
   },
 ];
diff --git a/apps/dashboard/src/constants/fee-config.ts b/apps/dashboard/src/constants/fee-config.ts
index 758fa256fd2..b65504fe8bb 100644
--- a/apps/dashboard/src/constants/fee-config.ts
+++ b/apps/dashboard/src/constants/fee-config.ts
@@ -1,13 +1,13 @@
 export const ZERO_FEE_VERSIONS: Record<string, string> = {
+  DropERC20: "5.0.3",
   DropERC721: "5.0.5",
   DropERC1155: "5.0.5",
-  DropERC20: "5.0.3",
-  TokenERC721: "5.0.2",
-  TokenERC1155: "5.0.2",
-  TokenERC20: "5.0.2",
   LoyaltyCard: "5.0.3",
   MarketplaceV3: "7.0.0",
   OpenEditionERC721FlatFee: "1.0.2",
+  TokenERC20: "5.0.2",
+  TokenERC721: "5.0.2",
+  TokenERC1155: "5.0.2",
 };
 
 export const ZERO_FEE_CHAINS = [232, 37111];
diff --git a/apps/dashboard/src/constants/mappings.ts b/apps/dashboard/src/constants/mappings.ts
index 21cf32ca32e..7b5ffe277e2 100644
--- a/apps/dashboard/src/constants/mappings.ts
+++ b/apps/dashboard/src/constants/mappings.ts
@@ -6,26 +6,26 @@ export const ROLE_DESCRIPTION_MAP: Record<
 > = {
   admin:
     "Determine who can grant or revoke roles and modify settings on this contract.",
+  asset: "Determine which assets can be used on this contract.",
+  lister: "Determine who can create new listings on this contract.",
   minter: "Determine who can mint / create new tokens on this contract.",
   pauser:
     "Determine who can pause (and unpause) all external calls made to this contract's contract.",
   transfer: "Determine who can transfer tokens on this contract.",
-  lister: "Determine who can create new listings on this contract.",
-  asset: "Determine which assets can be used on this contract.",
   unwrap: "Determine who can unwrap tokens on this contract.",
 };
 
 // gnosis mappings
 const GNOSIS_TO_CHAIN_ID = {
-  // supported mainnets
-  eth: 1,
-  matic: 137,
   avax: 43114,
+  "base-gor": 84531,
   bnb: 56,
-  oeth: 10,
+  // supported mainnets
+  eth: 1,
   // supported testnets
   gor: 5,
-  "base-gor": 84531,
+  matic: 137,
+  oeth: 10,
 } as const;
 
 export const CHAIN_ID_TO_GNOSIS = Object.entries(GNOSIS_TO_CHAIN_ID).reduce(
diff --git a/apps/dashboard/src/constants/schemas.ts b/apps/dashboard/src/constants/schemas.ts
index 8d60ae29e62..0213d852c84 100644
--- a/apps/dashboard/src/constants/schemas.ts
+++ b/apps/dashboard/src/constants/schemas.ts
@@ -1,8 +1,8 @@
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { resolveEns } from "lib/ens";
 import { isAddress } from "thirdweb";
 import { isValidENSName } from "thirdweb/utils";
 import z from "zod";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 
 /**
  * This file contains some useful zod schemas from the SDK v4
@@ -54,12 +54,12 @@ const FileOrStringSchema = z.union([FileSchema, z.string()]);
 
 export const CommonContractSchema = z
   .object({
-    name: z.string(),
+    app_uri: z.string().optional(),
+    defaultAdmin: AddressOrEnsSchema.optional(),
     description: z.string().optional(),
-    image: FileOrStringSchema.optional(),
     external_link: z.string().optional(),
-    app_uri: z.string().optional(),
+    image: FileOrStringSchema.optional(),
+    name: z.string(),
     social_urls: z.record(z.string()).optional(),
-    defaultAdmin: AddressOrEnsSchema.optional(),
   })
   .catchall(z.unknown());
diff --git a/apps/dashboard/src/contexts/error-handler.tsx b/apps/dashboard/src/contexts/error-handler.tsx
index 2d4745a57b8..408944ba97f 100644
--- a/apps/dashboard/src/contexts/error-handler.tsx
+++ b/apps/dashboard/src/contexts/error-handler.tsx
@@ -1,13 +1,5 @@
 "use client";
 
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
 import { CircleAlertIcon, InfoIcon } from "lucide-react";
 import Link from "next/link";
 import { createContext, useCallback, useContext, useState } from "react";
@@ -15,6 +7,14 @@ import { toast } from "sonner";
 import type { ComponentWithChildren } from "types/component-with-children";
 import { useDebounce } from "use-debounce";
 import { parseErrorToMessage } from "utils/errorParser";
+import { Button } from "@/components/ui/button";
+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
 
 interface ErrorContext {
   onError: (error: unknown, errorTitle?: string) => void;
@@ -24,8 +24,8 @@ interface ErrorContext {
 // TODO: figure out a way to remove this context
 // eslint-disable-next-line no-restricted-syntax
 const ErrorContext = createContext<ErrorContext>({
-  onError: () => undefined,
   dismissError: () => undefined,
+  onError: () => undefined,
 });
 
 // We have decided to not export this class from v5 because that area need to be reworked
@@ -70,12 +70,12 @@ export const ErrorProvider: ComponentWithChildren = ({ children }) => {
     <>
       <Dialog
         // Use the original for opening/closing modal
-        open={!!currentErrorOriginal}
         onOpenChange={(isOpen) => {
           if (!isOpen) {
             dismissError();
           }
         }}
+        open={!!currentErrorOriginal}
       >
         <DialogContent className="max-w-[480px] gap-0 p-0">
           {/* min-w-0 is actually required here  */}
@@ -142,16 +142,16 @@ export const ErrorProvider: ComponentWithChildren = ({ children }) => {
           <div className="flex justify-end gap-2 border-border border-t p-6">
             {currentError?.reason && (
               <CopyTextButton
+                className="px-4 py-2 text-sm"
                 copyIconPosition="left"
                 textToCopy={currentError.reason}
                 textToShow="Copy Error"
                 tooltip="Copy root cause of the error shown above"
-                className="px-4 py-2 text-sm"
               />
             )}
 
-            <Button variant="primary" asChild className="py-2 text-sm">
-              <Link href="/support" target="_blank" rel="noopener noreferrer">
+            <Button asChild className="py-2 text-sm" variant="primary">
+              <Link href="/support" rel="noopener noreferrer" target="_blank">
                 Visit support site
               </Link>
             </Button>
@@ -161,8 +161,8 @@ export const ErrorProvider: ComponentWithChildren = ({ children }) => {
 
       <ErrorContext.Provider
         value={{
-          onError,
           dismissError,
+          onError,
         }}
       >
         {children}
@@ -176,12 +176,12 @@ function CopyAddressFormControl(props: { address: string; label: string }) {
     <div className="flex flex-col gap-1.5">
       <p className="font-semibold text-sm">{props.label}</p>
       <CopyTextButton
-        textToCopy={props.address}
-        textToShow={props.address}
+        className="justify-start px-3 py-2 font-mono text-muted-foreground text-sm"
         copyIconPosition="left"
         iconClassName="size-3"
+        textToCopy={props.address}
+        textToShow={props.address}
         tooltip="Copy Address"
-        className="justify-start px-3 py-2 font-mono text-muted-foreground text-sm"
       />
     </div>
   );
diff --git a/apps/dashboard/src/contexts/map-chains.tsx b/apps/dashboard/src/contexts/map-chains.tsx
index bbd52a119e1..8751271f0da 100644
--- a/apps/dashboard/src/contexts/map-chains.tsx
+++ b/apps/dashboard/src/contexts/map-chains.tsx
@@ -3,17 +3,17 @@ import type { StoredChain } from "../stores/chainStores";
 
 export function mapV4ChainToV5Chain(v4Chain: StoredChain) {
   const chain: Chain = {
-    id: v4Chain.chainId,
-    // eslint-disable-next-line no-restricted-syntax
-    rpc: v4Chain.rpc[0] || defineChain(v4Chain.chainId).rpc,
     // TypeScript shenanigans, just avoiding as string assertion here
     blockExplorers: v4Chain.explorers?.map((x) => x),
     // TypeScript shenanigans, just avoiding as string assertion here
     faucets: v4Chain.faucets?.map((x) => x),
-    name: v4Chain.name,
     icon: v4Chain.icon,
-    testnet: v4Chain.testnet === true ? true : undefined,
+    id: v4Chain.chainId,
+    name: v4Chain.name,
     nativeCurrency: v4Chain.nativeCurrency,
+    // eslint-disable-next-line no-restricted-syntax
+    rpc: v4Chain.rpc[0] || defineChain(v4Chain.chainId).rpc,
+    testnet: v4Chain.testnet === true ? true : undefined,
   };
 
   return chain;
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/address-input.tsx b/apps/dashboard/src/contract-ui/components/solidity-inputs/address-input.tsx
index be523eb7203..bc8a3bb2c6e 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/address-input.tsx
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/address-input.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Input } from "@/components/ui/input";
 import { useEns } from "components/contract-components/hooks";
 import { CheckIcon } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
 import { isAddress, isValidENSName } from "thirdweb/utils";
+import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import type { SolidityInputProps } from ".";
 import { validateAddress } from "./helpers";
 
@@ -23,8 +23,8 @@ export const SolidityAddressInput: React.FC<SolidityInputProps> = ({
   const address = useActiveAccount()?.address;
 
   const ensQuery = useEns({
-    client,
     addressOrEnsName: localInput,
+    client,
   });
 
   const { setValue, clearErrors } = form;
@@ -54,8 +54,8 @@ export const SolidityAddressInput: React.FC<SolidityInputProps> = ({
   useEffect(() => {
     if (ensQuery.isError) {
       form.setError(inputName, {
-        type: "pattern",
         message: "Failed to resolve ENS name.",
+        type: "pattern",
       });
     }
   }, [ensQuery.isError, form, inputName]);
@@ -128,9 +128,9 @@ export const SolidityAddressInput: React.FC<SolidityInputProps> = ({
   return (
     <>
       <Input
-        placeholder="address"
-        // probably OK but obviously can be longer if ens name is passed?
         maxLength={42}
+        // probably OK but obviously can be longer if ens name is passed?
+        placeholder="address"
         {...restOfInputProps}
         onChange={(e) => handleChange(e.target.value)}
         // if we don't have a value from the form, use the local input (but if value is empty string then that's valid)
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/bool-input.tsx b/apps/dashboard/src/contract-ui/components/solidity-inputs/bool-input.tsx
index 9befe78a521..e1378be39a0 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/bool-input.tsx
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/bool-input.tsx
@@ -12,18 +12,18 @@ export const SolidityBoolInput: React.FC<SolidityInputProps> = ({
     <div className="flex flex-row">
       <div className="inline-flex overflow-hidden rounded-md border border-border">
         <Button
-          size="sm"
+          className="rounded-none border-r-0"
           onClick={() => form.setValue(inputName, "true")}
+          size="sm"
           variant={watchInput === "true" ? "default" : "outline"}
-          className="rounded-none border-r-0"
         >
           True
         </Button>
         <Button
-          size="sm"
+          className="rounded-none rounded-l-none"
           onClick={() => form.setValue(inputName, "false")}
+          size="sm"
           variant={watchInput === "false" ? "default" : "outline"}
-          className="rounded-none rounded-l-none"
         >
           False
         </Button>
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/bytes-input.tsx b/apps/dashboard/src/contract-ui/components/solidity-inputs/bytes-input.tsx
index a22e1cc0023..a2d3e8ec8c7 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/bytes-input.tsx
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/bytes-input.tsx
@@ -8,7 +8,7 @@ export const SolidityBytesInput: React.FC<SolidityInputWithTypeProps> = ({
   ...inputProps
 }) => {
   // discard size prop to fix type
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  // biome-ignore lint/correctness/noUnusedVariables: EXPECTED
   const { name, size, ...restOfInputProps } = inputProps;
   const inputName = name as string;
 
@@ -29,8 +29,8 @@ export const SolidityBytesInput: React.FC<SolidityInputWithTypeProps> = ({
     <Input
       placeholder={solidityType}
       {...restOfInputProps}
-      value={form.watch(inputName)}
       onChange={handleChange}
+      value={form.watch(inputName)}
     />
   );
 };
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/helpers.ts b/apps/dashboard/src/contract-ui/components/solidity-inputs/helpers.ts
index 880616117bc..ddc2f45a0c6 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/helpers.ts
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/helpers.ts
@@ -46,45 +46,43 @@ export const validateInt = (value: any, solidityType: string) => {
   const min = calculateIntMinValues(solidityType);
   const max = calculateIntMaxValues(solidityType);
 
-  // biome-ignore lint/style/noParameterAssign: FIXME
   value = value.toString();
 
-  // biome-ignore lint/style/noParameterAssign: FIXME
   value = value.replace(/,/g, ".");
 
   if (!value.match(new RegExp(/^(?!-0(\.0+)?$)-?(0|[1-9]\d*)(\.\d+)?$/))) {
     return {
-      type: "pattern",
       message: "Input is not a valid number.",
+      type: "pattern",
     };
   }
   if (value.includes(".") || value.includes(",")) {
     return {
-      type: "pattern",
       message:
         "Can't use decimals, you need to convert your input to Wei first.",
+      type: "pattern",
     };
   }
   try {
     const bigNumber = value || 0n;
     if (bigNumber < min) {
       return {
-        type: "minValue",
         message: solidityType.startsWith("uint")
           ? "Value must be a positive number for uint types."
           : `Value is lower than what ${solidityType} can store.}`,
+        type: "minValue",
       };
     }
     if (bigNumber > max) {
       return {
-        type: "maxValue",
         message: `Value is higher than what ${solidityType} can store.`,
+        type: "maxValue",
       };
     }
   } catch {
     return {
-      type: "pattern",
       message: "Input is not a valid number.",
+      type: "pattern",
     };
   }
 
@@ -130,15 +128,15 @@ const isValidBytes = (value: string, solidityType: string) => {
 export const validateBytes = (value: string, solidityType: string) => {
   if (!value?.startsWith("0x") && !value?.startsWith("[")) {
     return {
-      type: "pattern",
       message:
         "Invalid input. Accepted formats are hex strings (0x...) or array of numbers ([...]).",
+      type: "pattern",
     };
   }
   if (!isValidBytes(value, solidityType)) {
     return {
-      type: "pattern",
       message: `Value is not a valid ${solidityType}. Please check the length.`,
+      type: "pattern",
     };
   }
 
@@ -149,8 +147,8 @@ export const validateBytes = (value: string, solidityType: string) => {
 export const validateAddress = (value: string) => {
   if (!isAddress(value) && !isValidENSName(value)) {
     return {
-      type: "pattern",
       message: "Input is not a valid address or ENS name.",
+      type: "pattern",
     };
   }
 
@@ -179,7 +177,6 @@ export const validateSolidityInput = (value: string, solidityType: string) => {
 // other stuff
 export const camelToTitle = (string: string): string => {
   if (string[0] === "_") {
-    // biome-ignore lint/style/noParameterAssign: FIXME
     string = string.slice(1);
   }
   return string
@@ -210,7 +207,6 @@ function formatInputType(type: string, components?: FunctionComponents): any {
   if (type?.includes("tuple")) {
     // biome-ignore lint/suspicious/noExplicitAny: FIXME
     const obj: any = {};
-    // biome-ignore lint/complexity/noForEach: FIXME
     components?.forEach((component) => {
       obj[component.name] = formatInputType(
         component.type,
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/index.tsx b/apps/dashboard/src/contract-ui/components/solidity-inputs/index.tsx
index 67eca5a5f33..521dd3913ca 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/index.tsx
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/index.tsx
@@ -1,7 +1,7 @@
-import { Input } from "@/components/ui/input";
 import { forwardRef } from "react";
 import { type UseFormReturn, useFormContext } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
+import { Input } from "@/components/ui/input";
 import { SolidityAddressInput } from "./address-input";
 import { SolidityBoolInput } from "./bool-input";
 import { SolidityBytesInput } from "./bytes-input";
@@ -68,8 +68,8 @@ export const SolidityInput = forwardRef<
     return (
       <SolidityRawInput
         formContext={form}
-        solidityType={solidityType}
         solidityComponents={solidityComponents}
+        solidityType={solidityType}
         {...inputProps}
       />
     );
@@ -86,9 +86,9 @@ export const SolidityInput = forwardRef<
   if (solidityType === "tuple") {
     return (
       <SolidityTupleInput
-        solidityType={solidityType}
-        solidityComponents={solidityComponents}
         formContext={form}
+        solidityComponents={solidityComponents}
+        solidityType={solidityType}
         {...inputProps}
       />
     );
@@ -100,8 +100,8 @@ export const SolidityInput = forwardRef<
     return (
       <SolidityStringInput
         formContext={form}
-        solidityType={solidityType}
         solidityName={solidityName}
+        solidityType={solidityType}
         {...inputProps}
       />
     );
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/int-input.tsx b/apps/dashboard/src/contract-ui/components/solidity-inputs/int-input.tsx
index 48203f2f6cd..b0ef3d6cdcf 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/int-input.tsx
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/int-input.tsx
@@ -1,8 +1,8 @@
+import { useCallback } from "react";
+import { toWei } from "thirdweb";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { cn } from "@/lib/utils";
-import { useCallback } from "react";
-import { toWei } from "thirdweb";
 import type { SolidityInputWithTypeProps } from ".";
 import { validateInt } from "./helpers";
 
@@ -39,8 +39,8 @@ export const SolidityIntInput: React.FC<SolidityInputWithTypeProps> = ({
       form.clearErrors(inputName);
     } catch {
       form.setError(inputName, {
-        type: "pattern",
         message: "Can't be converted to WEI.",
+        type: "pattern",
       });
     }
   }, [form, inputName]);
@@ -55,16 +55,16 @@ export const SolidityIntInput: React.FC<SolidityInputWithTypeProps> = ({
       <Input
         placeholder={solidityType}
         {...restOfInputProps}
-        value={form.watch(inputName)}
-        onChange={handleChange}
         className={cn(
           showConversionButton && "pr-28",
           restOfInputProps.className,
         )}
+        onChange={handleChange}
+        value={form.watch(inputName)}
       />
       {showConversionButton && (
         <div className="absolute inset-y-0 right-0 flex items-center pr-1">
-          <Button variant="ghost" size="sm" onClick={handleConversion}>
+          <Button onClick={handleConversion} size="sm" variant="ghost">
             Convert to WEI
           </Button>
         </div>
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/raw-input.tsx b/apps/dashboard/src/contract-ui/components/solidity-inputs/raw-input.tsx
index 6c18d61765a..b3fee77e2fc 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/raw-input.tsx
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/raw-input.tsx
@@ -21,9 +21,9 @@ export const SolidityRawInput: React.FC<SolidityInputWithTypeProps> = ({
     form.setValue(inputName, value);
 
     const invalidInputError = {
-      type: "pattern",
       message:
         "Invalid input. Input should be passed in JSON format with valid values.",
+      type: "pattern",
     };
 
     const trimmedValue = value.trim();
@@ -55,8 +55,8 @@ export const SolidityRawInput: React.FC<SolidityInputWithTypeProps> = ({
         placeholder={solidityType}
         {...(restOfInputProps as TextareaProps)}
         className={cn("font-mono", restOfInputProps.className)}
-        value={form.watch(inputName)}
         onChange={handleChange}
+        value={form.watch(inputName)}
       />
       <div className="mt-2 text-muted-foreground text-sm">
         Input should be passed in JSON format - Ex:{" "}
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/string-input.tsx b/apps/dashboard/src/contract-ui/components/solidity-inputs/string-input.tsx
index 2b70f27e626..e3172d4d1fb 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/string-input.tsx
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/string-input.tsx
@@ -1,9 +1,9 @@
-import { Input } from "@/components/ui/input";
-import { cn } from "@/lib/utils";
 import { useDashboardStorageUpload } from "@3rdweb-sdk/react/hooks/useDashboardStorageUpload";
 import { useQueryClient } from "@tanstack/react-query";
 import { PINNED_FILES_QUERY_KEY_ROOT } from "app/(app)/team/[team_slug]/(team)/~/usage/storage/your-files";
 import { IpfsUploadButton } from "components/ipfs-upload/button";
+import { Input } from "@/components/ui/input";
+import { cn } from "@/lib/utils";
 import type { SolidityInputWithTypeProps } from ".";
 
 export const SolidityStringInput: React.FC<SolidityInputWithTypeProps> = ({
@@ -36,12 +36,12 @@ export const SolidityStringInput: React.FC<SolidityInputWithTypeProps> = ({
   return (
     <div className="relative flex">
       <Input
-        placeholder="string"
-        disabled={storageUpload.isPending}
         className={cn("pr-[90px] md:pr-[160px]", restOfInputProps.className)}
+        disabled={storageUpload.isPending}
+        placeholder="string"
         {...restOfInputProps}
-        value={form.watch(inputName)}
         onChange={handleChange}
+        value={form.watch(inputName)}
       />
       {showButton && (
         <div className="absolute inset-y-0 right-0 flex items-center pr-1">
@@ -55,7 +55,6 @@ export const SolidityStringInput: React.FC<SolidityInputWithTypeProps> = ({
                   // 2. Make sure there's a trailing slash at the end
                   // Otherwise the token URI will become `${uri}${tokenId}` when it should be `${uri}/${tokenId}`
                   if (!uri.endsWith("/")) {
-                    // biome-ignore lint/style/noParameterAssign: FIXME
                     uri += "/";
                   }
                 }
diff --git a/apps/dashboard/src/contract-ui/components/solidity-inputs/tuple-input.tsx b/apps/dashboard/src/contract-ui/components/solidity-inputs/tuple-input.tsx
index c4054f98737..cfca17ac18d 100644
--- a/apps/dashboard/src/contract-ui/components/solidity-inputs/tuple-input.tsx
+++ b/apps/dashboard/src/contract-ui/components/solidity-inputs/tuple-input.tsx
@@ -20,9 +20,9 @@ export const SolidityTupleInput: React.FC<SolidityInputWithTypeProps> = ({
     form.setValue(inputName, value);
 
     const invalidInputError = {
-      type: "pattern",
       message:
         "Invalid input. Input must be in JSON format and all the keys on the object should be present.",
+      type: "pattern",
     };
 
     const trimmedValue = value.trim();
@@ -56,9 +56,9 @@ export const SolidityTupleInput: React.FC<SolidityInputWithTypeProps> = ({
       <Textarea
         placeholder={solidityType}
         {...(restOfInputProps as TextareaProps)}
-        value={form.watch(inputName)}
         className={cn("font-mono", restOfInputProps.className)}
         onChange={handleChange}
+        value={form.watch(inputName)}
       />
       <p className="mt-2 text-muted-foreground text-sm">
         Input should be passed in JSON format - Ex:{" "}
diff --git a/apps/dashboard/src/contract-ui/hooks/permissions.ts b/apps/dashboard/src/contract-ui/hooks/permissions.ts
index 5c08bfe4626..978855262af 100644
--- a/apps/dashboard/src/contract-ui/hooks/permissions.ts
+++ b/apps/dashboard/src/contract-ui/hooks/permissions.ts
@@ -1,9 +1,9 @@
 import {
   type BaseTransactionOptions,
-  type Hex,
-  type ThirdwebContract,
   encode,
   getAddress,
+  type Hex,
+  type ThirdwebContract,
 } from "thirdweb";
 import { multicall } from "thirdweb/extensions/common";
 import { resolveAddress } from "thirdweb/extensions/ens";
@@ -32,7 +32,6 @@ export function createSetAllRoleMembersTx(options: {
   roleMemberMap: Awaited<ReturnType<typeof getAllRoleMembers>>;
 }) {
   return multicall({
-    contract: options.contract,
     asyncParams: async () => {
       const connectedWalletAddress = getAddress(options.account.address);
       // if we are removing multiple roles, we need to allways remove the connected wallet address *last*
@@ -124,5 +123,6 @@ export function createSetAllRoleMembersTx(options: {
         data: encoded,
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/apps/dashboard/src/contract-ui/hooks/useContractFunctionComment.ts b/apps/dashboard/src/contract-ui/hooks/useContractFunctionComment.ts
index eb145c3f064..01ce1b836ac 100644
--- a/apps/dashboard/src/contract-ui/hooks/useContractFunctionComment.ts
+++ b/apps/dashboard/src/contract-ui/hooks/useContractFunctionComment.ts
@@ -14,12 +14,6 @@ export function useContractFunctionComment(
   functionName: string,
 ) {
   return useQuery({
-    queryKey: [
-      "contract-function-comment",
-      contract?.chain.id || "",
-      contract?.address || "",
-      functionName,
-    ],
     queryFn: async (): Promise<string> => {
       const data = await getCompilerMetadata(contract);
       let comment = "";
@@ -77,8 +71,8 @@ export function useContractFunctionComment(
           if (ipfsLink) {
             const ipfsHash = ipfsLink.split("ipfs/")[1];
             const source = await download({
-              uri: `ipfs://${ipfsHash}`,
               client: contract.client,
+              uri: `ipfs://${ipfsHash}`,
             })
               .then((r) => r.text())
               .catch(() => "Failed to fetch source from IPFS");
@@ -99,6 +93,12 @@ export function useContractFunctionComment(
       }
       return extractFunctionComment(file.source, functionName);
     },
+    queryKey: [
+      "contract-function-comment",
+      contract?.chain.id || "",
+      contract?.address || "",
+      functionName,
+    ],
   });
 }
 
diff --git a/apps/dashboard/src/contract-ui/hooks/useContractFunctionSelectors.ts b/apps/dashboard/src/contract-ui/hooks/useContractFunctionSelectors.ts
index 2606e15bd79..e24d9306682 100644
--- a/apps/dashboard/src/contract-ui/hooks/useContractFunctionSelectors.ts
+++ b/apps/dashboard/src/contract-ui/hooks/useContractFunctionSelectors.ts
@@ -4,14 +4,14 @@ import type { ThirdwebContract } from "thirdweb";
 
 export function useContractFunctionSelectors(contract: ThirdwebContract) {
   return useQuery({
+    placeholderData: [],
+    queryFn: () => resolveFunctionSelectors(contract),
     queryKey: [
       "contract-function-selectors",
       {
-        chainId: contract.chain.id,
         address: contract.address,
+        chainId: contract.chain.id,
       },
     ],
-    queryFn: () => resolveFunctionSelectors(contract),
-    placeholderData: [],
   });
 }
diff --git a/apps/dashboard/src/contract-ui/hooks/useContractSources.ts b/apps/dashboard/src/contract-ui/hooks/useContractSources.ts
index d2b67c7af72..37597a48f06 100644
--- a/apps/dashboard/src/contract-ui/hooks/useContractSources.ts
+++ b/apps/dashboard/src/contract-ui/hooks/useContractSources.ts
@@ -8,11 +8,7 @@ import invariant from "tiny-invariant";
 
 export function useContractSources(contract?: ThirdwebContract) {
   return useQuery({
-    queryKey: [
-      "contract-sources",
-      contract?.chain.id || "",
-      contract?.address || "",
-    ],
+    enabled: !!contract,
     queryFn: async (): Promise<Array<{ filename: string; source: string }>> => {
       invariant(contract, "contract is required");
       const data = await getCompilerMetadata(contract);
@@ -34,8 +30,8 @@ export function useContractSources(contract?: ThirdwebContract) {
           if (ipfsLink) {
             const ipfsHash = ipfsLink.split("ipfs/")[1];
             const source = await download({
-              uri: `ipfs://${ipfsHash}`,
               client: contract.client,
+              uri: `ipfs://${ipfsHash}`,
             })
               .then((r) => r.text())
               .catch(() => "Failed to fetch source from IPFS");
@@ -51,6 +47,10 @@ export function useContractSources(contract?: ThirdwebContract) {
         }),
       );
     },
-    enabled: !!contract,
+    queryKey: [
+      "contract-sources",
+      contract?.chain.id || "",
+      contract?.address || "",
+    ],
   });
 }
diff --git a/apps/dashboard/src/contract-ui/tabs/code/components/code-overview.tsx b/apps/dashboard/src/contract-ui/tabs/code/components/code-overview.tsx
index 8777f410061..da17c13ef18 100644
--- a/apps/dashboard/src/contract-ui/tabs/code/components/code-overview.tsx
+++ b/apps/dashboard/src/contract-ui/tabs/code/components/code-overview.tsx
@@ -1,9 +1,4 @@
 "use client";
-import {
-  type CodeEnvironment,
-  CodeSegment,
-} from "@/components/blocks/code-segment.client";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import {
   Alert,
   AlertDescription,
@@ -39,6 +34,11 @@ import * as ERC4337Ext from "thirdweb/extensions/erc4337";
 import { useActiveAccount } from "thirdweb/react";
 import { toFunctionSelector } from "thirdweb/utils";
 import { Button, Card, Heading, Link, Text } from "tw-components";
+import {
+  type CodeEnvironment,
+  CodeSegment,
+} from "@/components/blocks/code-segment.client";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
 interface CodeOverviewProps {
   abi?: Abi;
@@ -49,6 +49,43 @@ interface CodeOverviewProps {
 }
 
 export const COMMANDS = {
+  events: {
+    javascript: `import { prepareEvent, getContractEvents } from "thirdweb";
+
+const preparedEvent = prepareEvent({
+  signature: "{{function}}"
+});
+const events = await getContractEvents({
+  contract,
+  events: [preparedEvent]
+});`,
+    react: `import { prepareEvent } from "thirdweb";
+import { useContractEvents } from "thirdweb/react";
+
+const preparedEvent = prepareEvent({
+  signature: "{{function}}"
+});
+
+export default function Component() {
+  const { data: event } = useContractEvents({
+    contract,
+    events: [preparedEvent]
+  });
+}`,
+    "react-native": `import { prepareEvent } from "thirdweb";
+import { useContractEvents } from "thirdweb/react";
+
+const preparedEvent = prepareEvent({
+  signature: "{{function}}"
+});
+
+export default function Component() {
+  const { data: event } = useContractEvents({
+    contract,
+    events: [preparedEvent]
+  });
+}`,
+  },
   install: {
     javascript: "npm i thirdweb",
     react: "npm i thirdweb",
@@ -56,6 +93,33 @@ export const COMMANDS = {
     unity: `// Download the .unitypackage from the latest release:
 // https://github.com/thirdweb-dev/unity-sdk/releases
 // and drag it into your project`,
+  },
+  read: {
+    javascript: `import { readContract } from "thirdweb";
+
+const data = await readContract({
+  contract,
+  method: "{{function}}",
+  params: [{{args}}]
+})`,
+    react: `import { useReadContract } from "thirdweb/react";
+
+export default function Component() {
+  const { data, isPending } = useReadContract({
+    contract,
+    method: "{{function}}",
+    params: [{{args}}]
+  });
+}`,
+    "react-native": `import { useReadContract } from "thirdweb/react";
+
+export default function Component() {
+  const { data, isPending } = useReadContract({
+    contract,
+    method: "{{function}}",
+    params: [{{args}}]
+  });
+}`,
   },
   setup: {
     javascript: `import { createThirdwebClient, getContract } from "thirdweb";
@@ -126,33 +190,6 @@ var sdk = ThirdwebManager.Instance.SDK;
 
 // Get your contract
 var contract = sdk.GetContract("{{contract_address}}");`,
-  },
-  read: {
-    javascript: `import { readContract } from "thirdweb";
-
-const data = await readContract({
-  contract,
-  method: "{{function}}",
-  params: [{{args}}]
-})`,
-    react: `import { useReadContract } from "thirdweb/react";
-
-export default function Component() {
-  const { data, isPending } = useReadContract({
-    contract,
-    method: "{{function}}",
-    params: [{{args}}]
-  });
-}`,
-    "react-native": `import { useReadContract } from "thirdweb/react";
-
-export default function Component() {
-  const { data, isPending } = useReadContract({
-    contract,
-    method: "{{function}}",
-    params: [{{args}}]
-  });
-}`,
   },
   write: {
     javascript: `import { prepareContractCall, sendTransaction } from "thirdweb";
@@ -195,55 +232,18 @@ export default function Component() {
     });
     sendTransaction(transaction);
   }
-}`,
-  },
-  events: {
-    javascript: `import { prepareEvent, getContractEvents } from "thirdweb";
-
-const preparedEvent = prepareEvent({
-  signature: "{{function}}"
-});
-const events = await getContractEvents({
-  contract,
-  events: [preparedEvent]
-});`,
-    react: `import { prepareEvent } from "thirdweb";
-import { useContractEvents } from "thirdweb/react";
-
-const preparedEvent = prepareEvent({
-  signature: "{{function}}"
-});
-
-export default function Component() {
-  const { data: event } = useContractEvents({
-    contract,
-    events: [preparedEvent]
-  });
-}`,
-    "react-native": `import { prepareEvent } from "thirdweb";
-import { useContractEvents } from "thirdweb/react";
-
-const preparedEvent = prepareEvent({
-  signature: "{{function}}"
-});
-
-export default function Component() {
-  const { data: event } = useContractEvents({
-    contract,
-    events: [preparedEvent]
-  });
 }`,
   },
 };
 
 const WALLETS_SNIPPETS = [
   {
-    id: "smart-wallet",
-    name: "Account Abstraction",
     description: "Deploy accounts for your users",
     iconUrl:
       "ipfs://QmeAJVqn17aDNQhjEU3kcWVZCFBrfta8LzaDGkS8Egdiyk/smart-wallet.svg",
+    id: "smart-wallet",
     link: "https://portal.thirdweb.com/references/typescript/v5/smartWallet",
+    name: "Account Abstraction",
     supportedLanguages: {
       javascript: `import { defineChain } from "thirdweb";
 import { inAppWallet, smartWallet } from "thirdweb/wallets";
@@ -402,20 +402,20 @@ const { data: event } = useContractEvents({
 const EXTENSION_NAMESPACE_FUNCTION_MAPPING = {
   erc20: {
     claim: {
-      name: "claimTo",
       args: ["to", "amount"],
+      name: "claimTo",
     },
   },
   erc721: {
     claim: {
-      name: "claimTo",
       args: ["to", "amount"],
+      name: "claimTo",
     },
   },
   erc1155: {
     claim: {
-      name: "claimTo",
       args: ["to", "amount", "tokenId"],
+      name: "claimTo",
     },
   },
 } as Record<
@@ -487,13 +487,13 @@ export function formatSnippet(
           codeForEnv = buildJavascriptSnippet({
             extensionName: extensionConfig.name,
             extensionNamespace,
+            fnArgs: extensionConfig.args,
             type:
               "stateMutability" in fn
                 ? fn.stateMutability === "view" || fn.stateMutability === "pure"
                   ? "read"
                   : "write"
                 : "event",
-            fnArgs: extensionConfig.args,
           });
           break;
         case "react":
@@ -501,13 +501,13 @@ export function formatSnippet(
           codeForEnv = buildReactSnippet({
             extensionName: extensionConfig.name,
             extensionNamespace,
+            fnArgs: extensionConfig.args,
             type:
               "stateMutability" in fn
                 ? fn.stateMutability === "view" || fn.stateMutability === "pure"
                   ? "read"
                   : "write"
                 : "event",
-            fnArgs: extensionConfig.args,
           });
           break;
       }
@@ -624,24 +624,24 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
   return (
     <SimpleGrid
       columns={12}
+      display={{ base: "block", md: "grid" }}
       gap={16}
       justifyContent="space-between"
       maxW="full"
       overflowX={{ base: "scroll", md: "hidden" }}
-      display={{ base: "block", md: "grid" }}
     >
       <GridItem as={Flex} colSpan={12} flexDir="column" gap={12}>
         {isAccountFactory && (
           <Flex flexDirection="column" gap={4}>
-            <Flex flexDir="column" gap={6} id="integrate-smart-wallet">
+            <Flex flexDir="column" gap={6}>
               <Heading size="title.md">Integrate your account factory</Heading>
               <Alert
-                status="info"
-                borderRadius="md"
+                alignItems="start"
                 as={Flex}
+                borderRadius="md"
                 flexDir="column"
-                alignItems="start"
                 gap={2}
+                status="info"
               >
                 <Flex justifyContent="start">
                   <AlertIcon />
@@ -651,10 +651,10 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                   The recommended way to use account factories is to integrate
                   the{" "}
                   <UnderlineLink
-                    target="_blank"
-                    rel="noopener noreferrer"
                     className="text-primary-500"
                     href="https://portal.thirdweb.com/connect/account-abstraction/overview"
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
                     Connect SDK
                   </UnderlineLink>{" "}
@@ -665,6 +665,7 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
               <Flex flexDir="column" gap={2}>
                 <CodeSegment
                   environment={environment}
+                  hideTabs
                   setEnvironment={setEnvironment}
                   snippet={formatSnippet(
                     (WALLETS_SNIPPETS.find((w) => w.id === "smart-wallet")
@@ -673,19 +674,18 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                       string
                     >,
                     {
-                      contractAddress,
                       address,
                       chainId,
+                      contractAddress,
                     },
                   )}
-                  hideTabs
                 />
               </Flex>
             </Flex>
           </Flex>
         )}
         <Flex flexDirection="column" gap={4}>
-          <Flex flexDir="column" gap={2} id="getting-started">
+          <Flex flexDir="column" gap={2}>
             <Heading size="title.md">
               {isAccountFactory
                 ? "Direct contract interaction (advanced)"
@@ -698,8 +698,8 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
             <Flex flexDir="column" gap={2}>
               <Text>Choose a language:</Text>
               <CodeSegment
-                onlyTabs
                 environment={environment}
+                onlyTabs
                 setEnvironment={setEnvironment}
                 snippet={COMMANDS.install}
               />
@@ -710,10 +710,10 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
               <Text>
                 Install the latest version of the SDK. <br />
                 <UnderlineLink
-                  target="_blank"
-                  rel="noopener noreferrer"
                   className="text-primary-500"
                   href={`https://portal.thirdweb.com/${environment}`}
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
                   Learn how in the{" "}
                   {environment === "react-native" ? "React Native" : "Unity"}{" "}
@@ -725,9 +725,9 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
               <>
                 <Text>Install the latest version of the SDK:</Text>
                 <CodeSegment
+                  environment={environment}
                   hideTabs
                   isInstallCommand
-                  environment={environment}
                   setEnvironment={setEnvironment}
                   snippet={COMMANDS.install}
                 />
@@ -738,21 +738,19 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
             <Text>Initialize the SDK and contract on your project:</Text>
             <CodeSegment
               environment={environment}
+              hideTabs
               setEnvironment={setEnvironment}
-              // biome-ignore lint/suspicious/noExplicitAny: FIXME
-              snippet={formatSnippet(COMMANDS.setup as any, {
-                contractAddress,
-
+              snippet={formatSnippet(COMMANDS.setup, {
                 chainId,
+                contractAddress,
               })}
-              hideTabs
             />
             <Text>
               You will need to pass a client ID/secret key to use
               thirdweb&apos;s infrastructure services. If you don&apos;t have
               any API keys yet you can create one by creating a project for free
               from the{" "}
-              <Link href="/team" color="primary.500">
+              <Link color="primary.500" href="/team">
                 dashboard
               </Link>
               .
@@ -760,45 +758,45 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
           </Flex>
         </Flex>
         {!onlyInstall && (
-          <Flex flexDirection="column" gap={6} id="functions-and-events">
+          <Flex flexDirection="column" gap={6}>
             <Heading size="title.md">All Functions & Events</Heading>
-            <SimpleGrid height="100%" columns={12} gap={3}>
+            <SimpleGrid columns={12} gap={3} height="100%">
               <GridItem
                 as={Card}
-                px={0}
-                pt={0}
+                colSpan={{ base: 12, md: 4 }}
                 height="100%"
                 overflow="auto"
-                colSpan={{ base: 12, md: 4 }}
                 overflowY="auto"
+                pt={0}
+                px={0}
               >
                 <List height="100%" overflowX="hidden">
                   {((writeFunctions || []).length > 0 ||
                     (readFunctions || []).length > 0) && (
                     <Tabs
                       colorScheme="gray"
-                      h="100%"
-                      position="relative"
                       display="flex"
                       flexDir="column"
+                      h="100%"
+                      position="relative"
                     >
                       <TabList as={Flex}>
                         {(writeFunctions || []).length > 0 && (
-                          <Tab gap={2} flex="1 1 0">
+                          <Tab flex="1 1 0" gap={2}>
                             <Heading color="inherit" my={1} size="label.md">
                               Write
                             </Heading>
                           </Tab>
                         )}
                         {(readFunctions || []).length > 0 && (
-                          <Tab gap={2} flex="1 1 0">
+                          <Tab flex="1 1 0" gap={2}>
                             <Heading color="inherit" my={1} size="label.md">
                               Read
                             </Heading>
                           </Tab>
                         )}
                         {(events || []).length > 0 && (
-                          <Tab gap={2} flex="1 1 0">
+                          <Tab flex="1 1 0" gap={2}>
                             <Heading color="inherit" my={1} size="label.md">
                               Events
                             </Heading>
@@ -808,32 +806,32 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                       <TabPanels h="auto" overflow="auto">
                         <TabPanel>
                           {writeFunctions?.map((fn) => (
-                            <ListItem my={0.5} key={fn.signature}>
+                            <ListItem key={fn.signature} my={0.5}>
                               <Button
-                                size="sm"
+                                _hover={{
+                                  opacity: 1,
+                                  textDecor: "underline",
+                                }}
+                                color="heading"
+                                fontFamily="mono"
                                 fontWeight={
                                   tab === "write" &&
                                   write?.signature === fn.signature
                                     ? 600
                                     : 400
                                 }
+                                onClick={() => {
+                                  setTab("write");
+                                  setWrite(fn);
+                                }}
                                 opacity={
                                   tab === "write" &&
                                   write?.signature === fn.signature
                                     ? 1
                                     : 0.65
                                 }
-                                onClick={() => {
-                                  setTab("write");
-                                  setWrite(fn);
-                                }}
-                                color="heading"
-                                _hover={{
-                                  opacity: 1,
-                                  textDecor: "underline",
-                                }}
+                                size="sm"
                                 variant="link"
-                                fontFamily="mono"
                               >
                                 {fn.name}
                               </Button>
@@ -842,32 +840,32 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                         </TabPanel>
                         <TabPanel>
                           {readFunctions?.map((fn) => (
-                            <ListItem my={0.5} key={fn.signature}>
+                            <ListItem key={fn.signature} my={0.5}>
                               <Button
-                                size="sm"
+                                _hover={{
+                                  opacity: 1,
+                                  textDecor: "underline",
+                                }}
+                                color="heading"
+                                fontFamily="mono"
                                 fontWeight={
                                   tab === "read" &&
                                   read?.signature === fn.signature
                                     ? 600
                                     : 400
                                 }
+                                onClick={() => {
+                                  setTab("read");
+                                  setRead(fn);
+                                }}
                                 opacity={
                                   tab === "read" &&
                                   read?.signature === fn.signature
                                     ? 1
                                     : 0.65
                                 }
-                                onClick={() => {
-                                  setTab("read");
-                                  setRead(fn);
-                                }}
-                                color="heading"
-                                _hover={{
-                                  opacity: 1,
-                                  textDecor: "underline",
-                                }}
+                                size="sm"
                                 variant="link"
-                                fontFamily="mono"
                               >
                                 {fn.name}
                               </Button>
@@ -876,9 +874,14 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                         </TabPanel>
                         <TabPanel>
                           {events?.map((ev) => (
-                            <ListItem my={0.5} key={ev.name}>
+                            <ListItem key={ev.name} my={0.5}>
                               <Button
-                                size="sm"
+                                _hover={{
+                                  opacity: 1,
+                                  textDecor: "underline",
+                                }}
+                                color="heading"
+                                fontFamily="mono"
                                 fontWeight={
                                   tab === "events" &&
                                   (event as AbiEvent).name ===
@@ -886,6 +889,10 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                                     ? 600
                                     : 400
                                 }
+                                onClick={() => {
+                                  setTab("events");
+                                  setEvent(ev);
+                                }}
                                 opacity={
                                   tab === "events" &&
                                   (event as AbiEvent).name ===
@@ -893,17 +900,8 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                                     ? 1
                                     : 0.65
                                 }
-                                onClick={() => {
-                                  setTab("events");
-                                  setEvent(ev);
-                                }}
-                                color="heading"
-                                _hover={{
-                                  opacity: 1,
-                                  textDecor: "underline",
-                                }}
+                                size="sm"
                                 variant="link"
-                                fontFamily="mono"
                               >
                                 {ev.name}
                               </Button>
@@ -917,9 +915,9 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
               </GridItem>
               <GridItem
                 as={Card}
+                colSpan={{ base: 12, md: 8 }}
                 height="100%"
                 overflow="auto"
-                colSpan={{ base: 12, md: 8 }}
               >
                 <CodeSegment
                   environment={environment}
@@ -928,9 +926,6 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                     // biome-ignore lint/suspicious/noExplicitAny: FIXME
                     COMMANDS[tab as keyof typeof COMMANDS] as any,
                     {
-                      contractAddress,
-                      fn:
-                        tab === "read" ? read : tab === "write" ? write : event,
                       args:
                         abi
                           ?.filter(
@@ -948,7 +943,10 @@ export const CodeOverview: React.FC<CodeOverviewProps> = ({
                           ?.inputs.map((i) => i.name || "") || [],
 
                       chainId,
+                      contractAddress,
                       extensionNamespace,
+                      fn:
+                        tab === "read" ? read : tab === "write" ? write : event,
                     },
                   )}
                 />
diff --git a/apps/dashboard/src/core-ui/batch-upload/batch-lazy-mint.tsx b/apps/dashboard/src/core-ui/batch-upload/batch-lazy-mint.tsx
index 891e8f35257..83e341bb63b 100644
--- a/apps/dashboard/src/core-ui/batch-upload/batch-lazy-mint.tsx
+++ b/apps/dashboard/src/core-ui/batch-upload/batch-lazy-mint.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
 import {
   Alert,
   AlertIcon,
@@ -33,6 +31,8 @@ import {
 import type { ComponentWithChildren } from "types/component-with-children";
 import { processInputData, shuffleData } from "utils/batch";
 import { z } from "zod";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { BatchTable } from "./batch-table";
 import { SelectOption } from "./lazy-mint-form/select-option";
 import { UploadStep } from "./upload-step";
@@ -60,27 +60,27 @@ type BatchLazyMintProps = BatchLazyMintEVMProps;
 
 const BatchLazyMintFormSchema = z
   .object({
+    confirmPassword: z
+      .string()
+      .min(1, "Please confirm your password.")
+      .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({
-        name: z.string().min(1, "A name is required"),
-        image: z.any().optional(),
         description: z.string().or(z.string().length(0)).optional(),
+        image: z.any().optional(),
+        name: z.string().min(1, "A name is required"),
       })
       .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(),
+    revealType: z.literal("instant").or(z.literal("delayed")).optional(),
 
     // shared logic
     shuffle: z.boolean().default(false),
-    revealType: z.literal("instant").or(z.literal("delayed")).optional(),
-
-    // metadata
-    metadatas: z.array(z.any()),
   })
   .refine((data) => data.password === data.confirmPassword, {
     message: "Passwords don't match",
@@ -93,12 +93,12 @@ type BatchLazyMintFormType = z.output<typeof BatchLazyMintFormSchema> & {
 
 function useBatchLazyMintForm() {
   return useForm<BatchLazyMintFormType>({
-    resolver: zodResolver(BatchLazyMintFormSchema),
     defaultValues: {
       metadatas: [],
       revealType: undefined,
       shuffle: false,
     },
+    resolver: zodResolver(BatchLazyMintFormSchema),
   });
 }
 
@@ -150,8 +150,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
@@ -171,16 +171,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",
         });
       })}
     >
@@ -189,10 +189,10 @@ export const BatchLazyMint: ComponentWithChildren<
           {nftMetadatas.length > 0 ? (
             <>
               <BatchTable
-                portalRef={paginationPortalRef}
+                client={props.client}
                 data={nftMetadatas}
                 nextTokenIdToMint={props.nextTokenIdToMint}
-                client={props.client}
+                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">
@@ -222,8 +222,8 @@ export const BatchLazyMint: ComponentWithChildren<
             </>
           ) : (
             <UploadStep
-              getRootProps={getRootProps}
               getInputProps={getInputProps}
+              getRootProps={getRootProps}
               hasFailed={hasError}
               isDragActive={isDragActive}
             />
@@ -231,31 +231,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">
@@ -265,14 +265,14 @@ export const BatchLazyMint: ComponentWithChildren<
               </CheckboxWithLabel>
               <div className="w-full md:w-[61%]">
                 <TransactionButton
-                  client={props.client}
-                  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`
@@ -280,12 +280,12 @@ export const BatchLazyMint: ComponentWithChildren<
                 </TransactionButton>
                 {props.children}
               </div>
-              <Text size="body.sm" mt={2}>
+              <Text mt={2} size="body.sm">
                 <UnderlineLink
-                  rel="noopener noreferrer"
+                  className="text-primary-500"
                   href="https://support.thirdweb.com/dashboard/n5evQ4EfEjEifczEQaZ1hL/batch-upload-troubleshooting/5WMQFqfaUTU1C8NM8FtJ2X"
+                  rel="noopener noreferrer"
                   target="_blank"
-                  className="text-primary-500"
                 >
                   Experiencing issues uploading your files?
                 </UnderlineLink>
@@ -316,30 +316,30 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
   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.
@@ -350,10 +350,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>
@@ -366,13 +366,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>
@@ -386,10 +386,10 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
                 </FormErrorMessage>
               </FormControl>
               <FormControl
-                isRequired
                 isInvalid={
                   !!form.getFieldState("confirmPassword", form.formState).error
                 }
+                isRequired
               >
                 <FormLabel>Confirm password</FormLabel>
                 <Input
@@ -416,14 +416,14 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
                 <FormLabel>Image</FormLabel>
                 <div className="w-auto md:w-[350px]">
                   <FileInput
-                    client={client}
                     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>
@@ -437,10 +437,10 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
                 </FormErrorMessage>
               </FormControl>
               <FormControl
-                isRequired
                 isInvalid={
                   !!form.getFieldState("placeHolder.name", form.formState).error
                 }
+                isRequired
               >
                 <FormLabel>Name</FormLabel>
                 <Input
diff --git a/apps/dashboard/src/core-ui/batch-upload/batch-table.tsx b/apps/dashboard/src/core-ui/batch-upload/batch-table.tsx
index fb618d44c84..eaba0292d71 100644
--- a/apps/dashboard/src/core-ui/batch-upload/batch-table.tsx
+++ b/apps/dashboard/src/core-ui/batch-upload/batch-table.tsx
@@ -1,5 +1,4 @@
-import { CodeClient } from "@/components/ui/code/code.client";
-import { ToolTipLabel } from "@/components/ui/tooltip";
+/** biome-ignore-all lint/nursery/noNestedComponentDefinitions: FIXME */
 import {
   Flex,
   IconButton,
@@ -23,6 +22,8 @@ import { useMemo } from "react";
 import { type Column, usePagination, useTable } from "react-table";
 import type { ThirdwebClient } from "thirdweb";
 import type { NFTInput } from "thirdweb/utils";
+import { CodeClient } from "@/components/ui/code/code.client";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import { FilePreview } from "../../app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/file-preview";
 
 interface BatchTableProps {
@@ -42,37 +43,36 @@ export const BatchTable: React.FC<BatchTableProps> = ({
     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 } }) => (
           <FilePreview
             className="size-24 shrink-0 rounded-lg object-contain"
-            srcOrFile={value}
             client={client}
+            srcOrFile={value}
           />
         ),
+        Header: "Image",
       },
       {
-        Header: "Animation Url",
         accessor: (row) => row.animation_url,
         Cell: ({ cell: { value } }: { cell: { value?: string } }) => (
           <FilePreview
             className="size-24 shrink-0 rounded-lg"
-            srcOrFile={value}
             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">
@@ -80,9 +80,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 }) =>
@@ -93,9 +93,10 @@ 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, client]);
@@ -124,8 +125,8 @@ export const BatchTable: React.FC<BatchTableProps> = ({
       columns,
       data,
       initialState: {
-        pageSize: 50,
         pageIndex: 0,
+        pageSize: 50,
       },
     },
     // will be fixed with @tanstack/react-table v8
@@ -136,7 +137,7 @@ export const BatchTable: React.FC<BatchTableProps> = ({
   // Render the UI for your table
   return (
     <Flex flexGrow={1} overflow="auto">
-      <TableContainer maxW="100%" className="w-full">
+      <TableContainer className="w-full" maxW="100%">
         <Table {...getTableProps()}>
           <Thead>
             {headerGroups.map((headerGroup, index) => (
@@ -159,8 +160,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}
                 >
@@ -187,15 +188,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">
@@ -203,15 +204,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)}
             />
 
diff --git a/apps/dashboard/src/core-ui/batch-upload/lazy-mint-form/select-option.tsx b/apps/dashboard/src/core-ui/batch-upload/lazy-mint-form/select-option.tsx
index fe89f4c366d..aa44b250897 100644
--- a/apps/dashboard/src/core-ui/batch-upload/lazy-mint-form/select-option.tsx
+++ b/apps/dashboard/src/core-ui/batch-upload/lazy-mint-form/select-option.tsx
@@ -1,8 +1,8 @@
+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";
-import { InfoIcon } from "lucide-react";
-import type { JSX, MouseEventHandler } from "react";
 
 interface SelectOptionProps extends React.HTMLAttributes<HTMLDivElement> {
   name: string;
diff --git a/apps/dashboard/src/core-ui/batch-upload/upload-step.tsx b/apps/dashboard/src/core-ui/batch-upload/upload-step.tsx
index 22fdb112593..8dbcbe4ca68 100644
--- a/apps/dashboard/src/core-ui/batch-upload/upload-step.tsx
+++ b/apps/dashboard/src/core-ui/batch-upload/upload-step.tsx
@@ -1,7 +1,7 @@
-import { UnorderedList } from "@/components/ui/List/List";
+import { UploadIcon } from "lucide-react";
 import { InlineCode } from "@/components/ui/inline-code";
+import { UnorderedList } from "@/components/ui/List/List";
 import { cn } from "@/lib/utils";
-import { UploadIcon } from "lucide-react";
 
 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
diff --git a/apps/dashboard/src/data/analytics/contract-event-breakdown.ts b/apps/dashboard/src/data/analytics/contract-event-breakdown.ts
index f38eed0d125..6d2b81eff1f 100644
--- a/apps/dashboard/src/data/analytics/contract-event-breakdown.ts
+++ b/apps/dashboard/src/data/analytics/contract-event-breakdown.ts
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getUnixTime } from "date-fns";
+import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getVercelEnv } from "../../lib/vercel-utils";
 
 type InsightAggregationEntry = {
@@ -72,8 +72,8 @@ export async function getContractEventBreakdown(params: {
     ) {
       collectedAggregations.push({
         count: value.count,
-        time: value.time,
         event_signature: value.event_signature,
+        time: value.time,
       });
     }
   }
diff --git a/apps/dashboard/src/data/analytics/contract-events.ts b/apps/dashboard/src/data/analytics/contract-events.ts
index c7c458a28ba..8c896359ca4 100644
--- a/apps/dashboard/src/data/analytics/contract-events.ts
+++ b/apps/dashboard/src/data/analytics/contract-events.ts
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getUnixTime } from "date-fns";
+import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getVercelEnv } from "../../lib/vercel-utils";
 
 // This is weird aggregation response type, this will be changed later in insight
diff --git a/apps/dashboard/src/data/analytics/contract-function-breakdown.ts b/apps/dashboard/src/data/analytics/contract-function-breakdown.ts
index 8c40251a277..0d2fe6b09e7 100644
--- a/apps/dashboard/src/data/analytics/contract-function-breakdown.ts
+++ b/apps/dashboard/src/data/analytics/contract-function-breakdown.ts
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getUnixTime } from "date-fns";
+import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getVercelEnv } from "../../lib/vercel-utils";
 
 type InsightAggregationEntry = {
@@ -77,8 +77,8 @@ export async function getContractFunctionBreakdown(params: {
     ) {
       collectedAggregations.push({
         count: value.count,
-        time: value.time,
         function_selector: value.function_selector,
+        time: value.time,
       });
     }
   }
diff --git a/apps/dashboard/src/data/analytics/contract-transactions.ts b/apps/dashboard/src/data/analytics/contract-transactions.ts
index eb5e840d231..f6e9f44cecc 100644
--- a/apps/dashboard/src/data/analytics/contract-transactions.ts
+++ b/apps/dashboard/src/data/analytics/contract-transactions.ts
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getUnixTime } from "date-fns";
+import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getVercelEnv } from "../../lib/vercel-utils";
 
 // This is weird aggregation response type, this will be changed later in insight
diff --git a/apps/dashboard/src/data/analytics/contract-wallet-analytics.ts b/apps/dashboard/src/data/analytics/contract-wallet-analytics.ts
index 32473d758a4..36951e3da4a 100644
--- a/apps/dashboard/src/data/analytics/contract-wallet-analytics.ts
+++ b/apps/dashboard/src/data/analytics/contract-wallet-analytics.ts
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getUnixTime } from "date-fns";
+import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
 import { getVercelEnv } from "../../lib/vercel-utils";
 
 // This is weird aggregation response type, this will be changed later in insight
diff --git a/apps/dashboard/src/data/analytics/hooks.ts b/apps/dashboard/src/data/analytics/hooks.ts
index 6710da57a03..940e4bd5345 100644
--- a/apps/dashboard/src/data/analytics/hooks.ts
+++ b/apps/dashboard/src/data/analytics/hooks.ts
@@ -24,19 +24,19 @@ export function useContractTransactionAnalytics(params: {
   const { startDate, endDate, contractAddress, chainId } = params;
 
   return useQuery({
+    queryFn: async () => {
+      return getContractTransactionAnalytics(params);
+    },
     queryKey: [
       "analytics",
       "transactions",
       {
-        contractAddress: contractAddress,
         chainId: chainId,
-        startDate: getDayKey(startDate),
+        contractAddress: contractAddress,
         endDate: getDayKey(endDate),
+        startDate: getDayKey(startDate),
       },
     ] as const,
-    queryFn: async () => {
-      return getContractTransactionAnalytics(params);
-    },
   });
 }
 
@@ -49,18 +49,18 @@ export function useTotalContractTransactionAnalytics(params: {
   contractAddress: string;
 }) {
   return useQuery({
+    queryFn: async () => {
+      return getTotalContractTransactions(params);
+    },
     queryKey: [
       "analytics",
       "total-transactions",
       {
-        contractAddress: params.contractAddress,
         chainId: params.chainId,
+        contractAddress: params.contractAddress,
         currentDate: getDayKey(new Date()),
       },
     ] as const,
-    queryFn: async () => {
-      return getTotalContractTransactions(params);
-    },
   });
 }
 
@@ -73,107 +73,107 @@ function getDayKey(date?: Date) {
 
 export function useContractEventAnalytics(params: AnalyticsQueryParams) {
   return useQuery({
+    enabled: !!params.contractAddress && !!params.chainId,
+    queryFn: async () => {
+      return await getContractEventAnalytics(params);
+    },
     queryKey: [
       "analytics",
       "logs",
       {
-        contractAddress: params.contractAddress,
         chainId: params.chainId,
-        startDate: getDayKey(params.startDate),
+        contractAddress: params.contractAddress,
         endDate: getDayKey(params.endDate),
+        startDate: getDayKey(params.startDate),
       },
     ] as const,
-    queryFn: async () => {
-      return await getContractEventAnalytics(params);
-    },
-    enabled: !!params.contractAddress && !!params.chainId,
   });
 }
 
 export function useTotalContractEvents(params: AnalyticsQueryParams) {
   return useQuery({
+    queryFn: async () => {
+      return getTotalContractEvents(params);
+    },
     queryKey: [
       "analytics",
       "total-logs",
       {
-        contractAddress: params.contractAddress,
         chainId: params.chainId,
+        contractAddress: params.contractAddress,
         currentDate: getDayKey(new Date()),
       },
     ] as const,
-    queryFn: async () => {
-      return getTotalContractEvents(params);
-    },
   });
 }
 
 export function useContractFunctionBreakdown(params: AnalyticsQueryParams) {
   return useQuery({
+    enabled: !!params.contractAddress && !!params.chainId,
+    queryFn: () => {
+      return getContractFunctionBreakdown(params);
+    },
     queryKey: [
       "analytics",
       "functions",
       {
-        contractAddress: params.contractAddress,
         chainId: params.chainId,
-        startDate: `${params.startDate?.getDate()}-${params.startDate?.getMonth()}-${params.startDate?.getFullYear()}`,
+        contractAddress: params.contractAddress,
         endDate: `${params.endDate?.getDate()}-${params.endDate?.getMonth()}-${params.endDate?.getFullYear()}`,
+        startDate: `${params.startDate?.getDate()}-${params.startDate?.getMonth()}-${params.startDate?.getFullYear()}`,
       },
     ] as const,
-    queryFn: () => {
-      return getContractFunctionBreakdown(params);
-    },
-    enabled: !!params.contractAddress && !!params.chainId,
   });
 }
 
 export function useContractEventBreakdown(params: AnalyticsQueryParams) {
   return useQuery({
+    enabled: !!params.contractAddress && !!params.chainId,
+    queryFn: () => {
+      return getContractEventBreakdown(params);
+    },
     queryKey: [
       "analytics",
       "events",
       {
-        contractAddress: params.contractAddress,
         chainId: params.chainId,
-        startDate: `${params.startDate?.getDate()}-${params.startDate?.getMonth()}-${params.startDate?.getFullYear()}`,
+        contractAddress: params.contractAddress,
         endDate: `${params.endDate?.getDate()}-${params.endDate?.getMonth()}-${params.endDate?.getFullYear()}`,
+        startDate: `${params.startDate?.getDate()}-${params.startDate?.getMonth()}-${params.startDate?.getFullYear()}`,
       },
     ] as const,
-    queryFn: () => {
-      return getContractEventBreakdown(params);
-    },
-    enabled: !!params.contractAddress && !!params.chainId,
   });
 }
 
 export function useContractUniqueWalletAnalytics(params: AnalyticsQueryParams) {
   return useQuery({
+    queryFn: async () => getContractUniqueWalletAnalytics(params),
     queryKey: [
       "analytics",
       "unique-wallets",
       {
-        contractAddress: params.contractAddress,
         chainId: params.chainId,
-        startDate: getDayKey(params.startDate),
+        contractAddress: params.contractAddress,
         endDate: getDayKey(params.endDate),
+        startDate: getDayKey(params.startDate),
       },
     ],
-    queryFn: async () => getContractUniqueWalletAnalytics(params),
   });
 }
 
 export function useTotalContractUniqueWallets(params: AnalyticsQueryParams) {
   return useQuery({
+    queryFn: () => {
+      return getTotalContractUniqueWallets(params);
+    },
     queryKey: [
       "analytics",
       "total-wallets",
       {
-        contractAddress: params.contractAddress,
         chainId: params.chainId,
+        contractAddress: params.contractAddress,
         currentDate: getDayKey(new Date()),
       },
     ] as const,
-    queryFn: () => {
-      return getTotalContractUniqueWallets(params);
-    },
   });
 }
diff --git a/apps/dashboard/src/data/explore.ts b/apps/dashboard/src/data/explore.ts
index ff29c03650d..48b43feb6c7 100644
--- a/apps/dashboard/src/data/explore.ts
+++ b/apps/dashboard/src/data/explore.ts
@@ -20,9 +20,6 @@ export interface ExploreCategory {
 }
 
 const POPULAR = {
-  id: "popular",
-  name: "Popular",
-  description: "A collection of our most deployed contracts.",
   contracts: [
     "thirdweb.eth/DropERC721",
     "thirdweb.eth/MarketplaceV3",
@@ -33,14 +30,12 @@ const POPULAR = {
     "thirdweb.eth/NFTStake",
     "unlock-protocol.eth/PublicLock",
   ],
+  description: "A collection of our most deployed contracts.",
+  id: "popular",
+  name: "Popular",
 } satisfies ExploreCategory;
 
 const NFTS = {
-  id: "nft",
-  name: "NFT",
-  displayName: "NFTs",
-  description:
-    "NFT Collections, Editions, Drops and everything else NFT-related.",
   contracts: [
     "thirdweb.eth/DropERC721",
     "thirdweb.eth/OpenEditionERC721",
@@ -53,49 +48,49 @@ const NFTS = {
     "thirdweb.eth/Multiwrap",
     "kronickatz.eth/ERC721NESDrop",
   ],
+  description:
+    "NFT Collections, Editions, Drops and everything else NFT-related.",
+  displayName: "NFTs",
+  id: "nft",
+  name: "NFT",
 } satisfies ExploreCategory;
 
 const GOVERNANCE = {
-  id: "daos-governance",
-  name: "DAOs & Governance",
-  description: "Create your own DAO, vote on proposals, and manage a treasury.",
   contracts: [
     "thirdweb.eth/VoteERC20",
     "thirdweb.eth/TokenERC20",
     "thirdweb.eth/Split",
   ],
+  description: "Create your own DAO, vote on proposals, and manage a treasury.",
+  id: "daos-governance",
+  name: "DAOs & Governance",
 } satisfies ExploreCategory;
 
 const DROPS = {
-  id: "drops",
-  name: "Drop",
-  displayName: "Drops",
-  description: "Release NFTs and Tokens based on preset Claim Conditions.",
   contracts: [
     "thirdweb.eth/DropERC721",
     "thirdweb.eth/DropERC1155",
     "thirdweb.eth/DropERC20",
   ],
+  description: "Release NFTs and Tokens based on preset Claim Conditions.",
+  displayName: "Drops",
+  id: "drops",
+  name: "Drop",
 } satisfies ExploreCategory;
 
 const MARKETS = {
-  id: "marketplace",
-  name: "Marketplace",
-  displayName: "Marketplaces",
-  description: "Quickly spin up your own on-chain marketplace for NFTs.",
   contracts: [
     "thirdweb.eth/MarketplaceV3",
     "thirdweb.eth/TokenERC20",
     "thirdweb.eth/Split",
   ],
+  description: "Quickly spin up your own on-chain marketplace for NFTs.",
+  displayName: "Marketplaces",
+  id: "marketplace",
+  name: "Marketplace",
 } satisfies ExploreCategory;
 
 const MODULAR_CONTRACTS = {
-  id: "modular-contracts",
-  name: "modular",
-  displayName: "Modular Contracts",
-  description:
-    "Collection of highly customizable and upgradeable smart contracts built with the modular contracts framework.",
   contracts: [
     // erc721 drop
     [
@@ -106,8 +101,8 @@ const MODULAR_CONTRACTS = {
         "deployer.thirdweb.eth/RoyaltyERC721",
       ],
       {
-        title: "Modular NFT Drop",
         description: "ERC721 NFTs that anyone can mint.",
+        title: "Modular NFT Drop",
       },
     ],
     // erc721 token
@@ -119,8 +114,8 @@ const MODULAR_CONTRACTS = {
         "deployer.thirdweb.eth/TransferableERC721",
       ],
       {
-        title: "Modular NFT Collection",
         description: "ERC721 NFTs that only owners can mint.",
+        title: "Modular NFT Collection",
       },
     ],
     // open edition 721
@@ -132,8 +127,8 @@ const MODULAR_CONTRACTS = {
         "deployer.thirdweb.eth/RoyaltyERC721",
       ],
       {
-        title: "Modular Open Edition",
         description: "ERC721 NFTs with identical metadata.",
+        title: "Modular Open Edition",
       },
     ],
     // erc1155 drop
@@ -146,8 +141,8 @@ const MODULAR_CONTRACTS = {
         "deployer.thirdweb.eth/SequentialTokenIdERC1155",
       ],
       {
-        title: "Modular Edition Drop",
         description: "ERC1155 NFTs that others can mint.",
+        title: "Modular Edition Drop",
       },
     ],
     // erc1155 token
@@ -160,8 +155,8 @@ const MODULAR_CONTRACTS = {
         "deployer.thirdweb.eth/SequentialTokenIdERC1155",
       ],
       {
-        title: "Modular Edition",
         description: "ERC1155 NFTs that only owners can mint.",
+        title: "Modular Edition",
       },
     ],
     // erc20 drop
@@ -172,8 +167,8 @@ const MODULAR_CONTRACTS = {
         "deployer.thirdweb.eth/TransferableERC20",
       ],
       {
-        title: "Modular Token Drop",
         description: "ERC20 Tokens that others can mint.",
+        title: "Modular Token Drop",
       },
     ],
     // erc20 token
@@ -184,18 +179,19 @@ const MODULAR_CONTRACTS = {
         "deployer.thirdweb.eth/TransferableERC20",
       ],
       {
-        title: "Modular Token",
         description: "ERC20 Tokens that only owners can mint.",
+        title: "Modular Token",
       },
     ],
   ],
+  description:
+    "Collection of highly customizable and upgradeable smart contracts built with the modular contracts framework.",
+  displayName: "Modular Contracts",
+  id: "modular-contracts",
+  name: "modular",
 } satisfies ExploreCategory;
 
 const SUPERCHAIN = {
-  id: "modular-superchain-contracts",
-  name: "Modular Superchain Contracts",
-  displayName: "Modular Superchain Contracts",
-  description: "Modular contracts with OP Superchain support",
   contracts: [
     // erc20 token + superchain
     [
@@ -206,8 +202,8 @@ const SUPERCHAIN = {
         "deployer.thirdweb.eth/SuperChainInterop",
       ],
       {
-        title: "Modular Superchain Token",
         description: "ERC20 Tokens that only owners can mint.",
+        title: "Modular Superchain Token",
       },
     ],
     // erc20 drop + superchain
@@ -219,30 +215,29 @@ const SUPERCHAIN = {
         "deployer.thirdweb.eth/SuperChainInterop",
       ],
       {
-        title: "Modular Superchain Token Drop",
         description: "ERC20 Tokens that others can mint.",
+        title: "Modular Superchain Token Drop",
       },
     ],
   ],
-  showInExplore: true,
+  description: "Modular contracts with OP Superchain support",
+  displayName: "Modular Superchain Contracts",
+  id: "modular-superchain-contracts",
   isBeta: true,
+  name: "Modular Superchain Contracts",
+  showInExplore: true,
 } satisfies ExploreCategory;
 
 const AIRDROP = {
-  id: "airdrop",
-  name: "Airdrop",
-  displayName: "Airdrops",
+  contracts: ["thirdweb.eth/Airdrop"],
   description:
     "Efficiently transfer large numbers of on-chain assets to a large number of recipients.",
-  contracts: ["thirdweb.eth/Airdrop"],
+  displayName: "Airdrops",
+  id: "airdrop",
+  name: "Airdrop",
 } satisfies ExploreCategory;
 
 const GAMING = {
-  id: "gaming",
-  name: "Gaming",
-  displayName: "Gaming",
-  description:
-    "A collection of contracts that are popular for building play-to-earn and free-to-own web3 games.",
   contracts: [
     "thirdweb.eth/MarketplaceV3",
     "thirdweb.eth/DropERC721",
@@ -251,65 +246,70 @@ const GAMING = {
     "thirdweb.eth/Multiwrap",
     "thirdweb.eth/NFTStake",
   ],
+  description:
+    "A collection of contracts that are popular for building play-to-earn and free-to-own web3 games.",
+  displayName: "Gaming",
+  id: "gaming",
+  name: "Gaming",
   showInExplore: false,
 } satisfies ExploreCategory;
 
 const LOYALTY = {
-  id: "loyalty",
-  name: "Loyalty",
-  displayName: "Loyalty",
-  description:
-    "A collection of contracts that are popular for building loyalty programs.",
   contracts: [
     "thirdweb.eth/LoyaltyCard",
     "thirdweb.eth/MarketplaceV3",
     "thirdweb.eth/TokenERC20",
   ],
+  description:
+    "A collection of contracts that are popular for building loyalty programs.",
+  displayName: "Loyalty",
+  id: "loyalty",
+  name: "Loyalty",
   showInExplore: false,
 } satisfies ExploreCategory;
 
 const COMMERCE = {
-  id: "commerce",
-  name: "Commerce",
-  displayName: "Commerce",
-  description:
-    "Most popular contracts for building web3 commerce apps. Reward loyal customers and sell NFTs through your storefront.",
   contracts: [
     "thirdweb.eth/TokenERC721",
     "thirdweb.eth/TokenERC1155",
     "thirdweb.eth/TokenERC20",
     "thirdweb.eth/Split",
   ],
+  description:
+    "Most popular contracts for building web3 commerce apps. Reward loyal customers and sell NFTs through your storefront.",
+  displayName: "Commerce",
+  id: "commerce",
+  name: "Commerce",
   showInExplore: false,
 } satisfies ExploreCategory;
 
 const STAKING = {
-  id: "staking",
-  name: "Staking",
-  displayName: "Staking",
-  description: "Stake your NFTs or tokens to earn ERC20 tokens in return.",
   contracts: [
     "thirdweb.eth/NFTStake",
     "thirdweb.eth/EditionStake",
     "thirdweb.eth/TokenStake",
   ],
+  description: "Stake your NFTs or tokens to earn ERC20 tokens in return.",
+  displayName: "Staking",
+  id: "staking",
+  name: "Staking",
   showInExplore: true,
 } satisfies ExploreCategory;
 
 const SMART_WALLET = {
-  id: "smart-wallet",
-  name: "Account Abstraction",
-  displayName: "Account Abstraction",
-  description:
-    "Account factories that let you spin up Account Abstraction (ERC-4337) wallets for your users. Not sure which factory is right for you?",
-  learnMore:
-    "https://portal.thirdweb.com/wallets/smart-wallet/get-started#1-deploy-a-smart-wallet-factory-contract",
   contracts: [
     "thirdweb.eth/AccountFactory",
     "thirdweb.eth/ManagedAccountFactory",
     "thirdweb.eth/AccountFactory_0_7",
     "thirdweb.eth/ManagedAccountFactory_0_7",
   ],
+  description:
+    "Account factories that let you spin up Account Abstraction (ERC-4337) wallets for your users. Not sure which factory is right for you?",
+  displayName: "Account Abstraction",
+  id: "smart-wallet",
+  learnMore:
+    "https://portal.thirdweb.com/wallets/smart-wallet/get-started#1-deploy-a-smart-wallet-factory-contract",
+  name: "Account Abstraction",
   showInExplore: true,
 } satisfies ExploreCategory;
 
diff --git a/apps/dashboard/src/hooks/chains/allChains.ts b/apps/dashboard/src/hooks/chains/allChains.ts
index 75ef8bf7f46..2764d960bdc 100644
--- a/apps/dashboard/src/hooks/chains/allChains.ts
+++ b/apps/dashboard/src/hooks/chains/allChains.ts
@@ -1,14 +1,14 @@
 "use client";
 
-import { isProd } from "@/constants/env-utils";
-import { createStore, useStore } from "@/lib/reactive";
 import { useQuery } from "@tanstack/react-query";
 import { useEffect } from "react";
 import type { Chain, ChainMetadata } from "thirdweb/chains";
+import { isProd } from "@/constants/env-utils";
+import { createStore, useStore } from "@/lib/reactive";
 import { mapV4ChainToV5Chain } from "../../contexts/map-chains";
 import {
-  type StoredChain,
   chainOverridesStore,
+  type StoredChain,
 } from "../../stores/chainStores";
 
 type AllChainsStore = {
@@ -126,8 +126,8 @@ export function useAllChainsData() {
   // trigger fetching all chains if this hook is used instead of putting this on root
   // so we can avoid fetching all chains if it's not required
   const allChainsQuery = useQuery({
-    queryKey: ["all-chains"],
     queryFn: () => fetchChainsFromApi(),
+    queryKey: ["all-chains"],
   });
 
   // eslint-disable-next-line no-restricted-syntax
diff --git a/apps/dashboard/src/hooks/tokens/tokens.ts b/apps/dashboard/src/hooks/tokens/tokens.ts
index 18da3934d79..8e1165433aa 100644
--- a/apps/dashboard/src/hooks/tokens/tokens.ts
+++ b/apps/dashboard/src/hooks/tokens/tokens.ts
@@ -1,13 +1,16 @@
-import { getUniversalBridgeTokens } from "@/api/universal-bridge/tokens";
 import { useQuery } from "@tanstack/react-query";
+import { getUniversalBridgeTokens } from "@/api/universal-bridge/tokens";
 
 export function useTokensData({
   chainId,
   enabled,
-}: { chainId?: number; enabled?: boolean }) {
+}: {
+  chainId?: number;
+  enabled?: boolean;
+}) {
   return useQuery({
-    queryKey: ["universal-bridge-tokens", chainId],
-    queryFn: () => getUniversalBridgeTokens({ chainId }),
     enabled,
+    queryFn: () => getUniversalBridgeTokens({ chainId }),
+    queryKey: ["universal-bridge-tokens", chainId],
   });
 }
diff --git a/apps/dashboard/src/hooks/useClipboard.ts b/apps/dashboard/src/hooks/useClipboard.ts
index 909f3619635..4b78dfc79d6 100644
--- a/apps/dashboard/src/hooks/useClipboard.ts
+++ b/apps/dashboard/src/hooks/useClipboard.ts
@@ -32,5 +32,5 @@ export function useClipboard(text: string, delay = 1500) {
     };
   }, [hasCopied, delay]);
 
-  return { onCopy, hasCopied };
+  return { hasCopied, onCopy };
 }
diff --git a/apps/dashboard/src/hooks/useCsvUpload.ts b/apps/dashboard/src/hooks/useCsvUpload.ts
index 816888ead65..f2b1eb95b58 100644
--- a/apps/dashboard/src/hooks/useCsvUpload.ts
+++ b/apps/dashboard/src/hooks/useCsvUpload.ts
@@ -2,9 +2,10 @@ import { useQuery } from "@tanstack/react-query";
 import pLimit from "p-limit";
 import Papa from "papaparse";
 import { useCallback, useState } from "react";
-import { type ThirdwebClient, ZERO_ADDRESS, isAddress } from "thirdweb";
+import { isAddress, type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
 import { resolveAddress } from "thirdweb/extensions/ens";
 import { csvMimeTypes } from "utils/batch";
+
 /**
  * Validate if the item.address is a valid ethereum address
  * Take in an { address: string, ...rest } object and return a new object, with 2 new props: `isValid` and `resolvedAddress`
@@ -25,8 +26,8 @@ async function checkIsAddress<T extends { address: string }>(props: {
     // if user wants to burn, they should use the Burn tab
     return {
       address,
-      resolvedAddress: address,
       isValid: false,
+      resolvedAddress: address,
       ...rest,
     };
   }
@@ -35,15 +36,15 @@ async function checkIsAddress<T extends { address: string }>(props: {
   try {
     resolvedAddress = isAddress(address)
       ? address
-      : await resolveAddress({ name: address, client: props.thirdwebClient });
+      : await resolveAddress({ client: props.thirdwebClient, name: address });
     isValid = !!resolvedAddress;
   } catch {
     isValid = false;
   }
   return {
     address,
-    resolvedAddress,
     isValid,
+    resolvedAddress,
     ...rest,
   };
 }
@@ -117,7 +118,6 @@ export function useCsvUpload<
         return;
       }
       Papa.parse(csv, {
-        header: true,
         complete: (results) => {
           const data = props.csvParser(results.data as T[]);
           if (!data[0]?.address) {
@@ -126,13 +126,13 @@ export function useCsvUpload<
           }
           setRawData(data);
         },
+        header: true,
       });
     },
     [props.csvParser],
   );
 
   const normalizeQuery = useQuery({
-    queryKey: ["snapshot-check-isAddress", rawData],
     queryFn: async () => {
       const limit = pLimit(50);
       const results = await Promise.all(
@@ -143,10 +143,11 @@ export function useCsvUpload<
         }),
       );
       return {
-        result: processAirdropData(results),
         invalidFound: !!results.find((item) => !item?.isValid),
+        result: processAirdropData(results),
       };
     },
+    queryKey: ["snapshot-check-isAddress", rawData],
     retry: false,
   });
 
@@ -173,12 +174,12 @@ export function useCsvUpload<
   );
 
   return {
+    noCsv,
     normalizeQuery,
-    setFiles,
+    processData,
     rawData,
-    noCsv,
-    reset,
     removeInvalid,
-    processData,
+    reset,
+    setFiles,
   };
 }
diff --git a/apps/dashboard/src/hooks/useTxNotifications.ts b/apps/dashboard/src/hooks/useTxNotifications.ts
index d193b2859c7..0964abc8579 100644
--- a/apps/dashboard/src/hooks/useTxNotifications.ts
+++ b/apps/dashboard/src/hooks/useTxNotifications.ts
@@ -29,5 +29,5 @@ export function useTxNotifications(
     [errorMessage, onError],
   );
 
-  return { onSuccess, onError: _onError };
+  return { onError: _onError, onSuccess };
 }
diff --git a/apps/dashboard/src/instrumentation-client.ts b/apps/dashboard/src/instrumentation-client.ts
index 6a9414eba40..ab28ec40bed 100644
--- a/apps/dashboard/src/instrumentation-client.ts
+++ b/apps/dashboard/src/instrumentation-client.ts
@@ -6,13 +6,13 @@ const NEXT_PUBLIC_POSTHOG_KEY = process.env.NEXT_PUBLIC_POSTHOG_KEY;
 if (NEXT_PUBLIC_POSTHOG_KEY) {
   posthog.init(NEXT_PUBLIC_POSTHOG_KEY, {
     api_host: "/_ph",
-    ui_host: "https://us.posthog.com",
-    capture_pageview: "history_change",
-    capture_pageleave: "if_capture_pageview",
-    // disable exception capture (for now)
-    capture_exceptions: false,
     // specifically disable autocapture (does not affect pageview capture)
     autocapture: false,
+    // disable exception capture (for now)
+    capture_exceptions: false,
+    capture_pageleave: "if_capture_pageview",
+    capture_pageview: "history_change",
     debug: process.env.NODE_ENV === "development",
+    ui_host: "https://us.posthog.com",
   });
 }
diff --git a/apps/dashboard/src/lib/cookie.ts b/apps/dashboard/src/lib/cookie.ts
index 88cca5a8370..9d0975faf06 100644
--- a/apps/dashboard/src/lib/cookie.ts
+++ b/apps/dashboard/src/lib/cookie.ts
@@ -21,9 +21,11 @@ export function getCookie(name: string) {
 export function setCookie(name: string, value: string, days = 365) {
   const date = new Date();
   date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
+  // biome-ignore lint/suspicious/noDocumentCookie: EXPECTED
   document.cookie = `${name}=${value};path=/;expires=${date.toUTCString()}`;
 }
 
 export function deleteCookie(name: string) {
+  // biome-ignore lint/suspicious/noDocumentCookie: EXPECTED
   document.cookie = `${name}=;path=/;expires=Thu, 01 Jan 1970 00:00:00 GMT`;
 }
diff --git a/apps/dashboard/src/lib/defineDashboardChain.ts b/apps/dashboard/src/lib/defineDashboardChain.ts
index 7e11d48e0ea..32f01d644b5 100644
--- a/apps/dashboard/src/lib/defineDashboardChain.ts
+++ b/apps/dashboard/src/lib/defineDashboardChain.ts
@@ -1,6 +1,6 @@
-import { PROD_OR_DEV_URL } from "@/constants/env-utils";
 import { defineChain } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
+import { PROD_OR_DEV_URL } from "@/constants/env-utils";
 import { mapV4ChainToV5Chain } from "../contexts/map-chains";
 
 export function defineDashboardChain(
diff --git a/apps/dashboard/src/lib/deployment/template-values.ts b/apps/dashboard/src/lib/deployment/template-values.ts
index ed36f7b114c..764846bb424 100644
--- a/apps/dashboard/src/lib/deployment/template-values.ts
+++ b/apps/dashboard/src/lib/deployment/template-values.ts
@@ -16,7 +16,6 @@ interface TemplateValue {
 
 const ADDRESS_TEMPLATE_VALUES: TemplateValue[] = [
   {
-    value: "{{connected_wallet}}",
     helperText: "Replaced with the address of the connected wallet.",
     replacerFunction: (searchValue, replacers) => {
       return searchValue.replaceAll(
@@ -24,12 +23,12 @@ const ADDRESS_TEMPLATE_VALUES: TemplateValue[] = [
         replacers.connectedWallet || "",
       );
     },
+    value: "{{connected_wallet}}",
   },
 ];
 
 const ADDRESS_ARRAY_TEMPLATE_VALUES: TemplateValue[] = [
   {
-    value: "{{trusted_forwarders}}",
     helperText:
       "Replaced with the addresses of the trusted (gasless) forwarders for the selected network.",
     replacerFunction: (searchValue) => {
@@ -39,6 +38,7 @@ const ADDRESS_ARRAY_TEMPLATE_VALUES: TemplateValue[] = [
         JSON.stringify(trustedForwardersForChain),
       );
     },
+    value: "{{trusted_forwarders}}",
   },
 ];
 
diff --git a/apps/dashboard/src/lib/ens.ts b/apps/dashboard/src/lib/ens.ts
index a01d8b4b74b..812cb25b0c8 100644
--- a/apps/dashboard/src/lib/ens.ts
+++ b/apps/dashboard/src/lib/ens.ts
@@ -1,4 +1,4 @@
-import { type ThirdwebClient, isAddress } from "thirdweb";
+import { isAddress, type ThirdwebClient } from "thirdweb";
 import { resolveAddress, resolveName } from "thirdweb/extensions/ens";
 import { isValidENSName } from "thirdweb/utils";
 
@@ -15,8 +15,8 @@ export async function resolveEns(
     return {
       address: ensNameOrAddress,
       ensName: await resolveName({
-        client,
         address: ensNameOrAddress,
+        client,
       }),
     };
   }
@@ -32,13 +32,13 @@ export async function resolveEns(
 
   if (!address) {
     return {
-      ensName: null,
       address: null,
+      ensName: null,
     };
   }
 
   return {
-    ensName: ensNameOrAddress,
     address,
+    ensName: ensNameOrAddress,
   };
 }
diff --git a/apps/dashboard/src/lib/project-showcase-constants.ts b/apps/dashboard/src/lib/project-showcase-constants.ts
index c2a4f822971..ea1841f0e6e 100644
--- a/apps/dashboard/src/lib/project-showcase-constants.ts
+++ b/apps/dashboard/src/lib/project-showcase-constants.ts
@@ -2,470 +2,470 @@
 
 export const PROJECT_SHOWCASE_DATA = [
   {
-    id: 1,
-    title: "Artifact",
-    slug: "artifact",
     description:
       "Blockchain-based platform for creating and trading digital art NFTs.",
+    id: 1,
     image: "ipfs://QmSdvppGQCFkTfSyQFpP55QpW52TQsZeKhxU1yUddKuS7S/artifact.png",
     industries: ["Art", "Games"],
     link: "https://www.gotartifact.com/",
+    slug: "artifact",
+    title: "Artifact",
   },
   {
-    id: 2,
-    title: "Bankless Academy",
-    slug: "bankless-academy",
     description: "No description available",
+    id: 2,
     image:
       "ipfs://QmVpJ7MkwhieELNiQ4iC9A5Nm2mbf2XVBfSJEnpQAsx3Zk/bankless_academy.png",
     industries: ["Education"],
     link: "https://app.banklessacademy.com/",
+    slug: "bankless-academy",
+    title: "Bankless Academy",
   },
   {
-    id: 3,
-    title: "Blue Social",
-    slug: "blue-social",
+    case_study: "https://blog.thirdweb.com/case-studies/blue-social-base/",
     description:
       "Social app that connects users through nearby Bluetooth technology.",
+    id: 3,
     image:
       "ipfs://QmTg3LzqpPgVmwjEqchSusUsbQTSzPDfGjbxyDYtXeoyVp/blue_social.png",
     industries: ["Social"],
     link: "https://blue.social/",
-    case_study: "https://blog.thirdweb.com/case-studies/blue-social-base/",
+    slug: "blue-social",
+    title: "Blue Social",
   },
   {
-    id: 4,
-    title: "bonfire",
-    slug: "bonfire",
     description:
       "A platform enabling creators and communities to build, manage, and monetize their digital content and experiences using Web3 tools.",
+    id: 4,
     image: "ipfs://QmTq1rA6hZSEiqufXrrXwUSBEVX72PRRT1hwR6K1Phpomc/bonfire.png",
     industries: ["Social"],
     link: "https://www.bonfire.xyz/",
+    slug: "bonfire",
+    title: "bonfire",
   },
   {
-    id: 5,
-    title: "Cityverse Tycoon",
-    slug: "cityverse-tycoon",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/cityverse-tycoon-web3-mobile-game-200k-downloads/",
     description:
       "City-building simulation game in the metaverse with strategic and economic elements.",
+    id: 5,
     image: "ipfs://QmTfWW3vZGjv7qJTdErztssEXNWzRnTBaT9fMifL1nb9Mq",
     industries: ["Games"],
     link: "https://cityversetycoon.com/",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/cityverse-tycoon-web3-mobile-game-200k-downloads/",
+    slug: "cityverse-tycoon",
+    title: "Cityverse Tycoon",
   },
   {
-    id: 6,
-    title: "Coinbase",
-    slug: "coinbase",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/coinbase-brings-onchain-experiences-to-life/",
     description:
       "Leading cryptocurrency exchange platform for buying, selling, and managing digital currencies.",
+    id: 6,
     image: "ipfs://Qmc4kY7YGccmo7iMcsJrDNPLz8PdzUEGrE2ExLDH6GWH2f",
     industries: ["Tools"],
     link: "https://coinbase.com",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/coinbase-brings-onchain-experiences-to-life/",
+    slug: "coinbase",
+    title: "Coinbase",
   },
   {
-    id: 7,
-    title: "Courtyard",
-    slug: "courtyard",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/courtyard-brings-collectors-onchain-with-fiat-payments/",
     description:
       "Platform for digitizing physical collectibles and trading them as NFTs.",
+    id: 7,
     image: "ipfs://QmecFM42reNfDoeHeL6UgV8FattD3BtnTvgEniqxJM2XjQ",
     industries: ["Art", "Mints"],
     link: "https://courtyard.io",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/courtyard-brings-collectors-onchain-with-fiat-payments/",
+    slug: "courtyard",
+    title: "Courtyard",
   },
   {
-    id: 8,
-    title: "Decent",
-    slug: "decent",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/decent-launches-nft-activation-with-uniswap-arbitrum-disco/",
     description:
       "Decentralized publishing platform empowering creators through blockchain-based content distribution.",
+    id: 8,
     image: "ipfs://QmYKg5D5AJ2FV2ivyTZs6wTZy8EoYPGPb6ghRsdHcWZXZa",
     industries: ["Education", "Mints"],
     link: "https://decent.xyz",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/decent-launches-nft-activation-with-uniswap-arbitrum-disco/",
+    slug: "decent",
+    title: "Decent",
   },
   {
-    id: 9,
-    title: "Developer DAO Academy",
-    slug: "developer-dao-academy",
     description:
       "An educational platform by Developer DAO that offers Web3 and blockchain development courses for developers of all skill levels.",
+    id: 9,
     image: "ipfs://QmeWx9KqbhdcX1CaPFaPB14FDym2x2LCyos5jWTowvxzqF",
     industries: ["Education"],
     link: "https://academy.developerdao.com/",
+    slug: "developer-dao-academy",
+    title: "Developer DAO Academy",
   },
   {
-    id: 10,
-    title: "Donatuz",
-    slug: "donatuz",
     description:
       "A donation platform that leverages blockchain technology to create transparent and efficient ways to support charitable causes and nonprofits.",
+    id: 10,
     image: "ipfs://QmZbufRw2P5HvTAX5MUAsZyFV3VsD5vHTja6b6FiVXCcGS",
     industries: ["Social"],
     link: "https://www.donatuz.com/",
+    slug: "donatuz",
+    title: "Donatuz",
   },
   {
-    id: 11,
-    title: "dtravel",
-    slug: "dtravel",
     description:
       "A decentralized travel booking platform allowing users to book vacation rentals using cryptocurrencies, powered by blockchain technology.",
+    id: 11,
     image: "ipfs://Qmdobva5hHNJaeJA2FrGW9An52VrxvWcGqUKPxqE853Ah2",
     industries: ["Real World Assets"],
     link: "https://www.dtravel.com/",
+    slug: "dtravel",
+    title: "dtravel",
   },
   {
-    id: 12,
-    title: "EVEN",
-    slug: "even",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/even-empowers-fans-to-support-their-favorite-music-artists-through-nfts/",
     description:
       "Music distribution platform that allows artists to sell music directly to fans via blockchain.",
+    id: 12,
     image: "ipfs://QmaTL2A3f2pE23cNiteecpakUviZu8nAcpWe8CD5bDwMXq",
     industries: ["Art"],
     link: "even.biz",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/even-empowers-fans-to-support-their-favorite-music-artists-through-nfts/",
+    slug: "even",
+    title: "EVEN",
   },
   {
-    id: 13,
-    title: "Forest Knight",
-    slug: "forest-knight",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/forrest-knight-thirdweb-pay/",
     description:
       "Tactical, turn-based blockchain game set in a fantasy universe.",
+    id: 13,
     image: "ipfs://QmcNZJ7Noq6nmjmBvEkTB5Xfs61gXVx9GgrbkQjvZAaZQS",
     industries: ["Games"],
     link: "forestknight.io",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/forrest-knight-thirdweb-pay/",
+    slug: "forest-knight",
+    title: "Forest Knight",
   },
   {
-    id: 14,
-    title: "fr3n",
-    slug: "fr3n",
     description:
       "A Web3 platform that helps developers and creators build decentralized apps (dApps) and Web3 projects with integrated community features.",
+    id: 14,
     image: "ipfs://QmQPWZTt3ckHws6rbLWSzJA92CcWSFXASfKit84GiEMfAf",
     industries: ["Social"],
     link: "https://fr3n.tech/",
+    slug: "fr3n",
+    title: "fr3n",
   },
   {
-    id: 15,
-    title: "Fractal",
-    slug: "fractal",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/fractal-web3-gaming-platform-and-marketplace-for-blockchain-games-expands-to-evm-chains/",
     description:
       "Fractal provides game studios with a set of tools to build web3 games easily, ranging from blockchain infrastructure to community-building solutions.",
+    id: 15,
     image: "ipfs://QmRQshpNLPiHQ21QAeeaRHWJLZyeDQLSYf1VT7DfjqG7rU",
     industries: ["Games", "Social"],
     link: "http://fractal.is/",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/fractal-web3-gaming-platform-and-marketplace-for-blockchain-games-expands-to-evm-chains/",
+    slug: "fractal",
+    title: "Fractal",
   },
   {
-    id: 16,
-    title: "frens",
-    slug: "frens",
     description:
       "A community-driven platform that brings friends together to share in decentralized autonomous organizations (DAOs) and collaborate on Web3 projects.",
+    id: 16,
     image: "ipfs://QmaVe3L9e2bJTWaNFXYM5rUqas11Cska6UmAFJdVn7fXbi",
     industries: ["Social"],
     link: "https://www.frens.lol/",
+    slug: "frens",
+    title: "frens",
   },
   {
-    id: 17,
-    title: "Furrend",
-    slug: "furrend",
     description:
       "A decentralized platform designed to connect pet owners with pet services through blockchain-powered transactions and community engagement.",
+    id: 17,
     image: "ipfs://QmQT7f9kq2LztcD6PpGdN2Cf6J3K7ptENNUZXdLS1Ha6DP",
     industries: ["Social"],
     link: "https://furrend.xyz/",
+    slug: "furrend",
+    title: "Furrend",
   },
   {
-    id: 18,
-    title: "Genesis Blockchain",
-    slug: "genesis-blockchain",
     description:
       "A blockchain infrastructure provider offering scalable, secure solutions for building decentralized applications on the Genesis Blockchain network.",
+    id: 18,
     image: "ipfs://QmW3PubszmG7YQWQDHNwui413cH5hioCiZz5PrFsUEJb6h",
     industries: ["Decentralized Finance"],
     link: "https://www.genesisblockchain.io/",
+    slug: "genesis-blockchain",
+    title: "Genesis Blockchain",
   },
   {
-    id: 19,
-    title: "Goat Gaming",
-    slug: "goat-gaming",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/how-goat-gaming-grew-by-250k-players-with-mini-games-on-telegram-with-thirdweb/",
     description:
       "Gaming community and platform for connecting gamers across various titles and events.",
+    id: 19,
     industries: ["Games"],
     link: "https://goatgaming.com/",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/how-goat-gaming-grew-by-250k-players-with-mini-games-on-telegram-with-thirdweb/",
+    slug: "goat-gaming",
+    title: "Goat Gaming",
   },
   {
-    id: 20,
-    title: "Hall of Goats",
-    slug: "hall-of-goats",
     description:
       "An NFT-based platform that celebrates and immortalizes legendary sports figures, offering unique collectible experiences to fans.",
+    id: 20,
     image: "ipfs://Qmca1gANxCr54xF5oqPYQy6zYMSi9eEWx3Jwr75BgDugpr",
     industries: ["Fitness"],
     link: "https://www.hallofgoats.com/",
+    slug: "hall-of-goats",
+    title: "Hall of Goats",
   },
   {
-    id: 21,
-    title: "Heroric Story / Fortunata",
-    slug: "heroric-story-fortunata",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/heroic-story-uses-dynamic-nfts-to-build-a-web3-free-to-own-mmorpg-fantasy-game/",
     description: "No description available",
+    id: 21,
     image: "ipfs://QmTDwS6aKFDJmjMwamD98mXtZoZqbegotuww34vJ8u2F2Y",
     industries: ["Games"],
     link: "https://www.heroicstory.com/",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/heroic-story-uses-dynamic-nfts-to-build-a-web3-free-to-own-mmorpg-fantasy-game/",
+    slug: "heroric-story-fortunata",
+    title: "Heroric Story / Fortunata",
   },
   {
-    id: 22,
-    title: "Icebreaker",
-    slug: "icebreaker",
     description:
       "A decentralized social networking platform that connects people by facilitating meaningful interactions through Web3 features.",
+    id: 22,
     image: "ipfs://QmWrak5tKJ6Eanb1GcDxevNeDkBUzMRdZMzVodfoLDrwvM",
     industries: ["Social", "Tools"],
     link: "https://www.icebreaker.xyz/",
+    slug: "icebreaker",
+    title: "Icebreaker",
   },
   {
-    id: 23,
-    title: "InfiniGods / King Of Destiny",
-    slug: "infinigods-king-of-destiny",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/king-of-destiny-launches-avatar-nfts-thirdweb-engine/",
     description:
       "Blockchain-based game inspired by ancient mythology, focused on strategy and role-playing elements.",
+    id: 23,
     image: "ipfs://QmVNfmuGi6fM4zodybo5KVAxqq7XcALr9wMzX7ZYwt3znV",
     industries: ["Games"],
     link: "https://infinigods.com",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/king-of-destiny-launches-avatar-nfts-thirdweb-engine/",
+    slug: "infinigods-king-of-destiny",
+    title: "InfiniGods / King Of Destiny",
   },
   {
-    id: 24,
-    title: "Intract",
-    slug: "intract",
     description:
       "A Web3 marketing platform that provides user acquisition and engagement tools to help blockchain projects grow their community and reach.",
+    id: 24,
     image: "ipfs://Qmeb2zNntsFsXruN2pkSWHxCJQXUbVM9qo8SKZoRFfhQpZ",
     industries: ["Social", "Tools"],
     link: "https://www.intract.io/",
+    slug: "intract",
+    title: "Intract",
   },
   {
-    id: 25,
-    title: "KPRVERSE",
-    slug: "kprverse",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/kprverse-boon-ramen-launch-ramen-wars/",
     description:
       "Immersive metaverse platform that combines gaming, art, and virtual reality experiences.",
+    id: 25,
     image: "ipfs://QmPTnJLBx8JzGibuZw7uwfaEL5F8j7XutajUJgA8Cqtsh5",
     industries: ["Art", "Games"],
     link: "https://kprverse.com",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/kprverse-boon-ramen-launch-ramen-wars/",
+    slug: "kprverse",
+    title: "KPRVERSE",
   },
   {
-    id: 26,
-    title: "Laguna Games / Crypto Unicorns",
-    slug: "laguna-games-crypto-unicorns",
     description:
       "Blockchain gaming studio known for developing decentralized, player-driven ecosystems.",
+    id: 26,
     image: "ipfs://QmSkfGyTU3iMyVWDjJ8G9QK4iTkAfmNnVghT48zXX4fSvx",
     industries: ["Games"],
     link: "https://laguna.games/",
+    slug: "laguna-games-crypto-unicorns",
+    title: "Laguna Games / Crypto Unicorns",
   },
   {
-    id: 27,
-    title: "Last Memories",
-    slug: "last-memories",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/last-memories-web3-game/",
     description:
       "Story-driven blockchain game featuring digital collectible memories and a mystery narrative.",
+    id: 27,
     image: "ipfs://QmRLkGxifuFbAcd3WaGV5jNsGvx8331iiFzibgjxHHebuh",
     industries: ["Games"],
     link: "https://lastmemories.io/en/",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/last-memories-web3-game/",
+    slug: "last-memories",
+    title: "Last Memories",
   },
   {
-    id: 28,
-    title: "Layer3",
-    slug: "layer3",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/layer3-powers-web3-adoption-through-gamified-experiences-nft-rewards/",
     description:
       "Web3 platform that incentivizes learning and interaction with decentralized apps through rewards.",
+    id: 28,
     image: "ipfs://QmZ1U5cxi4GJuJKwWVdifyEWvTiANXoQY9mazHf7ne8FDW",
     industries: ["Social", "Tools"],
     link: "https://layer3.xyz",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/layer3-powers-web3-adoption-through-gamified-experiences-nft-rewards/",
+    slug: "layer3",
+    title: "Layer3",
   },
   {
-    id: 29,
-    title: "Makeswift",
-    slug: "makeswift",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/makeswift-empowers-teams-to-build-web3-experiences-on-nextjs-websites-without-code/",
     description:
       "No-code website builder for quickly creating and managing modern, responsive sites.",
+    id: 29,
     image: "ipfs://QmUeMrHtkFxDjSM4XvPWwR78BPAEXBgkZW8J9vMTGv2omL",
     industries: ["Tools"],
     link: "https://makeswift.com",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/makeswift-empowers-teams-to-build-web3-experiences-on-nextjs-websites-without-code/",
+    slug: "makeswift",
+    title: "Makeswift",
   },
   {
-    id: 30,
-    title: "Meka Legends",
-    slug: "meka-legends",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/meka-legends-seamless-gameplay-with-thirdwebs-account-abstraction/",
     description:
       "Mech-themed blockchain-based game where players collect and battle with customizable robots.",
+    id: 30,
     image: "ipfs://QmagV85D2b5KNxVP9x2XGvi7Skb5ciCBkb2WCo8cv661td",
 
     industries: ["Games"],
     link: "https://mekalegends.com",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/meka-legends-seamless-gameplay-with-thirdwebs-account-abstraction/",
+    slug: "meka-legends",
+    title: "Meka Legends",
   },
   {
-    id: 31,
-    title: "Mirror",
-    slug: "mirror",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/mirror-creators-build-loyal-audiences-with-subscriber-nfts/",
     description:
       "Decentralized publishing platform that allows creators to write, fund, and share content via blockchain.",
+    id: 31,
     image: "ipfs://QmYXGnKbzagqQ7DoYUrU7k9iaUi7fNQEwZP4TMcn5PTPZu",
     industries: ["Social", "Tools"],
     link: "https://mirror.xyz",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/mirror-creators-build-loyal-audiences-with-subscriber-nfts/",
+    slug: "mirror",
+    title: "Mirror",
   },
   {
-    id: 32,
-    title: "Phaver",
-    slug: "phaver",
     description:
       "A decentralized social media platform where users can share and discover content, earn tokens, and interact with Web3 features, giving users ownership of their online presence.",
+    id: 32,
     image: "ipfs://QmXb7QbSxoapjzJwNrjHHUBQs243rCH8qzbC98XtGpBPaZ",
     industries: ["Social"],
     link: "https://phaver.com/",
+    slug: "phaver",
+    title: "Phaver",
   },
   {
-    id: 33,
-    title: "Pixels",
-    slug: "pixels",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/pixels-builds-an-onchain-ecosystem-for-its-web3-game/",
     description:
       "Pixelated blockchain-based farming game with metaverse elements and play-to-earn mechanics.",
+    id: 33,
     image: "ipfs://QmcrZniY3DPK6sGCPuGyXbWTrkSU23r2hHXrZA82rcLqsn",
     industries: ["Games"],
     link: "https://pixels.xyz",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/pixels-builds-an-onchain-ecosystem-for-its-web3-game/",
+    slug: "pixels",
+    title: "Pixels",
   },
   {
-    id: 34,
-    title: "Stand With Crypto",
-    slug: "stand-with-crypto",
+    case_study: "https://blog.thirdweb.com/case-studies/untitled-2/",
     description:
       "Movement advocating for the widespread adoption and defense of blockchain technology.",
-    industries: ["Education", "Social"],
+    id: 34,
     image: "ipfs://QmNh26mNw7cU1VuWqcZZedRhAPbcTqXeMH2Ei1kLbcgCB4",
+    industries: ["Education", "Social"],
     link: "https://standwithcrypto.org",
-    case_study: "https://blog.thirdweb.com/case-studies/untitled-2/",
+    slug: "stand-with-crypto",
+    title: "Stand With Crypto",
   },
   {
-    id: 35,
-    title: "Story Match",
-    slug: "story-match",
     description:
       "A gamified social app that enhances communication through interactive storytelling and role-playing games, designed to foster engaging conversations.",
+    id: 35,
     image: "ipfs://Qmau1mgrzahdfEtJFU9i2pSKMM7AwHav6tQCVEdJARUFpb",
     industries: ["Social"],
     link: "https://rooit.me/",
+    slug: "story-match",
+    title: "Story Match",
   },
   {
-    id: 36,
-    title: "StoryChain",
-    slug: "storychain",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/storychain-bridging-web2-and-web3-through-ai-powered-storytelling/",
     description:
       "Collaborative storytelling platform that uses blockchain to create, share, and own narrative content.",
+    id: 36,
     image: "ipfs://QmUUBdNHa7ZoiRQicNathMY6G8GTBA4S9cRY1RRBXAKpYi",
     industries: ["Social"],
     link: "https://storychain.io",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/storychain-bridging-web2-and-web3-through-ai-powered-storytelling/",
+    slug: "storychain",
+    title: "StoryChain",
   },
   {
-    id: 37,
-    title: "SuperVol",
-    slug: "supervol",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/supervol-pioneering-retail-crypto-options-trading-on-soneium/",
     description:
       "Trading platform that gamifies options trading with Web3 integration and decentralized finance.",
+    id: 37,
     image: "ipfs://QmXinFHSS2zEuHLP2hrk7fmzwjq1QqRrDu352fXPNojRad",
     industries: ["Decentralized Finance"],
     link: "https://supervol.io",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/supervol-pioneering-retail-crypto-options-trading-on-soneium/",
+    slug: "supervol",
+    title: "SuperVol",
   },
   {
-    id: 38,
-    title: "Tally",
-    slug: "tally",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/tally-expands-the-decentralized-web-with-dao-tools/",
     description:
       "Decentralized governance tool for DAOs, helping users vote and manage blockchain organizations.",
+    id: 38,
     image: "ipfs://Qmb8X3ceRvKMpuvAnrfQxFHsD2oBsXGypJ3pYp3ZC7Koq7",
     industries: ["Tools"],
     link: "https://tally.xyz",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/tally-expands-the-decentralized-web-with-dao-tools/",
+    slug: "tally",
+    title: "Tally",
   },
   {
-    id: 39,
-    title: "Torque Drift 2",
-    slug: "torque-drift-2",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/torque-drift-2-digital-ownership-racing-games/",
     description:
       "Blockchain-powered motorsport game focused on drifting and vehicle customization.",
+    id: 39,
     industries: ["Games"],
     link: "https://torquedrift.io",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/torque-drift-2-digital-ownership-racing-games/",
+    slug: "torque-drift-2",
+    title: "Torque Drift 2",
   },
   {
-    id: 40,
-    title: "Whal3s",
-    slug: "whal3s",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/whal3s-shapes-events-and-experiences-with-nfts/",
     description:
       "Community-driven NFT platform that offers exclusive digital content and benefits to NFT holders",
+    id: 40,
     image: "ipfs://QmYwk9BosE3vMrJnhQj62phwPW71qFWwcTuXYoYQPVwChU",
     industries: ["Art"],
     link: "https://whal3s.xyz",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/whal3s-shapes-events-and-experiences-with-nfts/",
+    slug: "whal3s",
+    title: "Whal3s",
   },
   {
-    id: 41,
-    title: "Xai",
-    slug: "xai",
     description:
       "Blockchain gaming platform focused on building decentralized, player-driven game economies.",
+    id: 41,
     industries: ["Decentralized Finance", "Games", "Tools"],
     link: "https://xaigames.io",
+    slug: "xai",
+    title: "Xai",
   },
   {
-    id: 42,
-    title: "Zeeverse",
-    slug: "zeeverse",
+    case_study:
+      "https://blog.thirdweb.com/case-studies/how-zeeverse-built-a-monster-tamer-rpg-with-seamless-web3-onboarding/",
     description:
       "Zeeverse is a free-to-play monster-tamer RPG set in an indigenous fantasy world.",
+    id: 42,
     image: "ipfs://QmU9MTJk4ESbJ7XGYUQzZqXxHWFUAx7SZNmeYDfLZHExtd",
     industries: ["Game"],
     link: "https://zee-verse.com/?ref=blog.thirdweb.com",
-    case_study:
-      "https://blog.thirdweb.com/case-studies/how-zeeverse-built-a-monster-tamer-rpg-with-seamless-web3-onboarding/",
+    slug: "zeeverse",
+    title: "Zeeverse",
   },
 ];
 
diff --git a/apps/dashboard/src/lib/redis.ts b/apps/dashboard/src/lib/redis.ts
index 5918dadd1ec..458e2442709 100644
--- a/apps/dashboard/src/lib/redis.ts
+++ b/apps/dashboard/src/lib/redis.ts
@@ -1,6 +1,6 @@
 import "server-only";
-import { REDIS_URL } from "@/constants/server-envs";
 import Redis from "ioredis";
+import { REDIS_URL } from "@/constants/server-envs";
 
 // wrapped in a function to avoid calling this during build
 let redis_: Redis;
diff --git a/apps/dashboard/src/lib/rpc.ts b/apps/dashboard/src/lib/rpc.ts
index ae400958f7b..3a3ffc61bf2 100644
--- a/apps/dashboard/src/lib/rpc.ts
+++ b/apps/dashboard/src/lib/rpc.ts
@@ -1,7 +1,7 @@
-import { isProd } from "@/constants/env-utils";
 import { defineDashboardChain } from "lib/defineDashboardChain";
 import type { ThirdwebClient } from "thirdweb";
 import { type ChainMetadata, getRpcUrlForChain } from "thirdweb/chains";
+import { isProd } from "@/constants/env-utils";
 import { hostnameEndsWith } from "../utils/url";
 
 export function getDashboardChainRpc(
diff --git a/apps/dashboard/src/lib/sdk.ts b/apps/dashboard/src/lib/sdk.ts
index 13b0fd6403d..03746c10c4a 100644
--- a/apps/dashboard/src/lib/sdk.ts
+++ b/apps/dashboard/src/lib/sdk.ts
@@ -5,8 +5,8 @@ export function replaceIpfsUrl(uri: string, client: ThirdwebClient) {
   try {
     // eslint-disable-next-line no-restricted-syntax
     return resolveScheme({
-      uri,
       client,
+      uri,
     });
   } catch (err) {
     console.error("error resolving ipfs url", uri, err);
diff --git a/apps/dashboard/src/lib/search.ts b/apps/dashboard/src/lib/search.ts
index 166fb3d6538..b9697a95dc5 100644
--- a/apps/dashboard/src/lib/search.ts
+++ b/apps/dashboard/src/lib/search.ts
@@ -49,10 +49,10 @@ const getSearchQueryUrl = ({
   baseUrl.searchParams.set("per_page", perPage.toString());
   const dateFilter =
     timeRange === "month"
-      ? `updatedAt:> ${new Date().getTime() - 30 * 24 * 60 * 60 * 1000}`
+      ? `updatedAt:> ${Date.now() - 30 * 24 * 60 * 60 * 1000}`
       : timeRange === "week"
-        ? `updatedAt:> ${new Date().getTime() - 7 * 24 * 60 * 60 * 1000}`
-        : `updatedAt:> ${new Date().getTime() - 1 * 24 * 60 * 60 * 1000}`;
+        ? `updatedAt:> ${Date.now() - 7 * 24 * 60 * 60 * 1000}`
+        : `updatedAt:> ${Date.now() - 1 * 24 * 60 * 60 * 1000}`;
   const gasUsageFilter =
     timeRange === "month"
       ? "last30Days.gasUsage:> 0"
@@ -85,12 +85,12 @@ export async function fetchTopContracts(args?: {
   invariant(typesenseApiKey, "No typesense api key");
   const res = await fetch(
     getSearchQueryUrl({
-      perPage: args?.perPage || 10,
-      page: args?.page || 1,
       chainId: args?.chainId,
+      page: args?.page || 1,
+      perPage: args?.perPage || 10,
       query: args?.query,
-      timeRange: args?.timeRange,
       sortBy: args?.sortBy,
+      timeRange: args?.timeRange,
     }),
     {
       headers: {
@@ -148,23 +148,23 @@ export async function fetchTopContracts(args?: {
       }
 
       return {
-        name,
         chainMetadata,
         contractAddress: document.contractAddress,
-        transactionCount: formatNumber(timeData.transactionCount),
-        transactionCountChange: timeData.transactionCountChange,
-        walletCount: formatNumber(timeData.walletCount),
-        walletCountChange: timeData.walletCountChange,
         gasUsage: `${formatNumber(timeData.gasUsage)} ${chainMetadata.nativeCurrency.symbol}`,
         gasUsageChange: timeData.gasUsageChange,
+        name,
+        transactionCount: formatNumber(timeData.transactionCount),
+        transactionCountChange: timeData.transactionCountChange,
+        type: (document.type as Array<string>)?.find((t) =>
+          t.startsWith("ERC"),
+        ),
         valueMoved:
           timeData.totalValueMoved !== 0
             ? `${formatNumber(timeData.totalValueMoved)} ${chainMetadata.nativeCurrency.symbol}`
             : "",
         valueMovedChange: timeData.totalValueMovedChange,
-        type: (document.type as Array<string>)?.find((t) =>
-          t.startsWith("ERC"),
-        ),
+        walletCount: formatNumber(timeData.walletCount),
+        walletCountChange: timeData.walletCountChange,
       } as TrendingContract;
     }),
   )) as TrendingContract[];
@@ -187,18 +187,18 @@ async function fetchContractName(chainId: number, contractAddress: string) {
 const formatNumber = (num: number) => {
   if (num >= 1000000) {
     return `${(num / 1000000).toLocaleString(undefined, {
-      minimumFractionDigits: 1,
       maximumFractionDigits: 1,
+      minimumFractionDigits: 1,
     })}M`;
   }
   if (num >= 1000) {
     return `${(num / 1000).toLocaleString(undefined, {
-      minimumFractionDigits: 1,
       maximumFractionDigits: 1,
+      minimumFractionDigits: 1,
     })}k`;
   }
   return num.toLocaleString(undefined, {
-    minimumFractionDigits: 0,
     maximumFractionDigits: num < 10 ? 2 : 1,
+    minimumFractionDigits: 0,
   });
 };
diff --git a/apps/dashboard/src/lib/time.ts b/apps/dashboard/src/lib/time.ts
index 6b06f0e1395..089b0ff9c16 100644
--- a/apps/dashboard/src/lib/time.ts
+++ b/apps/dashboard/src/lib/time.ts
@@ -7,10 +7,10 @@ export function getNebulaFiltersFromSearchParams(params: {
   interval: string | undefined | string[];
 }) {
   return getFiltersFromSearchParams({
+    defaultRange: "last-30",
     from: params.from,
-    to: params.to,
     interval: params.interval,
-    defaultRange: "last-30",
+    to: params.to,
   });
 }
 
@@ -21,9 +21,9 @@ export function getUniversalBridgeFiltersFromSearchParams(params: {
   defaultRange: DurationId;
 }) {
   return getFiltersFromSearchParams({
+    defaultRange: params.defaultRange,
     from: params.from,
-    to: params.to,
     interval: params.interval,
-    defaultRange: params.defaultRange,
+    to: params.to,
   });
 }
diff --git a/apps/dashboard/src/lib/wallet/nfts/alchemy.ts b/apps/dashboard/src/lib/wallet/nfts/alchemy.ts
index d34fc8ef164..0b22eeeb838 100644
--- a/apps/dashboard/src/lib/wallet/nfts/alchemy.ts
+++ b/apps/dashboard/src/lib/wallet/nfts/alchemy.ts
@@ -1,14 +1,14 @@
 import "server-only";
 
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { download } from "thirdweb/storage";
 import type { NFTMetadata } from "thirdweb/utils";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { handleArbitraryTokenURI, shouldDownloadURI } from "./tokenUri";
 import {
   type AlchemySupportedChainId,
+  alchemySupportedChainIdsMap,
   type GenerateURLParams,
   type WalletNFT,
-  alchemySupportedChainIdsMap,
 } from "./types";
 
 export function generateAlchemyUrl({ chainId, owner }: GenerateURLParams) {
@@ -32,20 +32,20 @@ export async function transformAlchemyResponseToNFT(
 
         try {
           return {
-            id: alchemyNFT.id.tokenId,
             contractAddress: alchemyNFT.contract.address,
+            id: alchemyNFT.id.tokenId,
             metadata: shouldDownloadURI(rawUri)
               ? await download({
-                  uri: handleArbitraryTokenURI(rawUri),
                   client: serverThirdwebClient,
+                  uri: handleArbitraryTokenURI(rawUri),
                 })
                   .then((res) => res.json())
                   .catch(() => ({}))
               : rawUri,
             owner,
             supply: alchemyNFT.balance || "1",
-            type: alchemyNFT.id.tokenMetadata.tokenType,
             tokenURI: rawUri,
+            type: alchemyNFT.id.tokenMetadata.tokenType,
           } as WalletNFT;
         } catch {
           return undefined as unknown as WalletNFT;
diff --git a/apps/dashboard/src/lib/wallet/nfts/moralis.ts b/apps/dashboard/src/lib/wallet/nfts/moralis.ts
index 3014edc2837..eec1b6bdf32 100644
--- a/apps/dashboard/src/lib/wallet/nfts/moralis.ts
+++ b/apps/dashboard/src/lib/wallet/nfts/moralis.ts
@@ -1,7 +1,7 @@
 import "server-only";
 
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { download } from "thirdweb/storage";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { handleArbitraryTokenURI, shouldDownloadURI } from "./tokenUri";
 import type { GenerateURLParams, WalletNFT } from "./types";
 
@@ -24,23 +24,23 @@ export async function transformMoralisResponseToNFT(
       moralisResponse.result.map(async (moralisNft) => {
         try {
           return {
-            id: moralisNft.token_id,
+            chainId,
             contractAddress: moralisNft.token_address,
-            tokenId: moralisNft.token_id,
+            id: moralisNft.token_id,
             metadata: shouldDownloadURI(moralisNft.token_uri)
               ? await download({
-                  uri: handleArbitraryTokenURI(moralisNft.token_uri),
                   client: serverThirdwebClient,
+                  uri: handleArbitraryTokenURI(moralisNft.token_uri),
                 })
                   .then((res) => res.json())
                   .catch(() => ({}))
               : moralisNft.token_uri,
             owner,
-            tokenURI: moralisNft.token_uri,
             supply: moralisNft.amount || "1",
-            type: moralisNft.contract_type,
             tokenAddress: moralisNft.token_address,
-            chainId,
+            tokenId: moralisNft.token_id,
+            tokenURI: moralisNft.token_uri,
+            type: moralisNft.contract_type,
           } as WalletNFT;
         } catch {
           return undefined as unknown as WalletNFT;
diff --git a/apps/dashboard/src/lib/wallet/nfts/types.ts b/apps/dashboard/src/lib/wallet/nfts/types.ts
index 8f19696f752..a55531741c9 100644
--- a/apps/dashboard/src/lib/wallet/nfts/types.ts
+++ b/apps/dashboard/src/lib/wallet/nfts/types.ts
@@ -46,11 +46,11 @@ export const alchemySupportedChainIdsMap: Record<number, string> = {
 
 // List: https://docs.moralis.io/supported-chains
 const moralisSupportedChainIdsMap: Record<number, string> = {
-  [ethereum.id]: "",
-  [sepolia.id]: "",
-  [polygon.id]: "",
-  [polygonMumbai.id]: "",
-  [bsc.id]: "",
+  [moonbeam.id]: "",
+  // Flow testnet
+  545: "",
+  // Flow
+  747: "",
   [bscTestnet.id]: "",
   [avalanche.id]: "",
   [fantom.id]: "",
@@ -63,47 +63,47 @@ const moralisSupportedChainIdsMap: Record<number, string> = {
   [polygonAmoy.id]: "",
   [optimism.id]: "",
   [linea.id]: "",
-  // Chiliz
-  [88888]: "",
-  // Chiliz testnet
-  [88882]: "",
-  // Holesky
-  [17000]: "",
+  [sepolia.id]: "",
+  // opBNB
+  204: "",
   // Pulse chain
-  [369]: "",
-  [moonbeam.id]: "",
-  // Moonriver
-  [1285]: "",
-  // Moonbase Alpha
-  [1287]: "",
+  369: "",
   [blast.id]: "",
   [blastSepolia.id]: "",
   [zkSync.id]: "",
   [zkSyncSepolia.id]: "",
-  // Mantle
-  [5000]: "",
-  // Mantle Sepolia
-  [5003]: "",
-  // opBNB
-  [204]: "",
+  [polygonMumbai.id]: "",
   [polygonZkEvm.id]: "",
   [polygonZkEvmTestnet.id]: "",
-  // Zeta chain
-  [7000]: "",
-  // Zeta chain testnet
-  [7001]: "",
-  // Flow
-  [747]: "",
-  // Flow testnet
-  [545]: "",
+  [ethereum.id]: "",
+  [bsc.id]: "",
+  // Lisk
+  1135: "",
+  [polygon.id]: "",
+  // Moonriver
+  1285: "",
+  // Moonbase Alpha
+  1287: "",
   // Ronin
-  [2020]: "",
+  2020: "",
   // Ronin Saigon testnet
-  [2021]: "",
-  // Lisk
-  [1135]: "",
+  2021: "",
   // Lisk Sepolia testnet
-  [4202]: "",
+  4202: "",
+  // Mantle
+  5000: "",
+  // Mantle Sepolia
+  5003: "",
+  // Zeta chain
+  7000: "",
+  // Zeta chain testnet
+  7001: "",
+  // Holesky
+  17000: "",
+  // Chiliz testnet
+  88882: "",
+  // Chiliz
+  88888: "",
 };
 
 export type AlchemySupportedChainId = keyof typeof alchemySupportedChainIdsMap;
diff --git a/apps/dashboard/src/middleware.ts b/apps/dashboard/src/middleware.ts
index c2fa6cd94e4..30b75952934 100644
--- a/apps/dashboard/src/middleware.ts
+++ b/apps/dashboard/src/middleware.ts
@@ -1,9 +1,9 @@
-import { isLoginRequired } from "@/constants/auth";
-import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
 import { type NextRequest, NextResponse } from "next/server";
 import { getAddress } from "thirdweb";
 import { getChainMetadata } from "thirdweb/chains";
 import { isValidENSName } from "thirdweb/utils";
+import { isLoginRequired } from "@/constants/auth";
+import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
 import { LAST_VISITED_TEAM_PAGE_PATH } from "./app/(app)/team/components/last-visited-page/consts";
 import { defineDashboardChain } from "./lib/defineDashboardChain";
 
@@ -29,7 +29,7 @@ export async function middleware(request: NextRequest) {
   // nebula subdomain handling
   const paths = pathname.slice(1).split("/");
 
-  let cookiesToSet: Record<string, string> | undefined = undefined;
+  let cookiesToSet: Record<string, string> | undefined;
 
   const activeAccount = request.cookies.get(COOKIE_ACTIVE_ACCOUNT)?.value;
   const authCookie = activeAccount
@@ -71,9 +71,9 @@ export async function middleware(request: NextRequest) {
 
       // if not logged in, rewrite to login page
       return redirect(request, "/login", {
+        cookiesToSet,
         permanent: false,
         searchParams: `next=${encodeURIComponent(`${pathname}${searchParamsString ? `?${searchParamsString}` : ""}`)}`,
-        cookiesToSet,
       });
     }
   }
@@ -127,8 +127,8 @@ export async function middleware(request: NextRequest) {
     // we want to always redirect this to "thirdweb.eth/..."
     if (paths[0] === "deployer.thirdweb.eth") {
       return redirect(request, `/thirdweb.eth/${paths.slice(1).join("/")}`, {
-        permanent: true,
         cookiesToSet,
+        permanent: true,
       });
     }
     // if we have exactly 1 path part, we're in the <address> case -> profile page
diff --git a/apps/dashboard/src/stores/SyncStoreToCookies.tsx b/apps/dashboard/src/stores/SyncStoreToCookies.tsx
index e34d3aa7878..4f82b1e5381 100644
--- a/apps/dashboard/src/stores/SyncStoreToCookies.tsx
+++ b/apps/dashboard/src/stores/SyncStoreToCookies.tsx
@@ -1,5 +1,5 @@
-import { type Store, useStore } from "@/lib/reactive";
 import { useEffect } from "react";
+import { type Store, useStore } from "@/lib/reactive";
 import { getCookie, setCookie } from "../lib/cookie";
 
 const loadedStoreKeys = new Set<string>();
diff --git a/apps/dashboard/src/stores/chainStores.tsx b/apps/dashboard/src/stores/chainStores.tsx
index bcc87f97a58..8fc551ecebe 100644
--- a/apps/dashboard/src/stores/chainStores.tsx
+++ b/apps/dashboard/src/stores/chainStores.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { createStore } from "@/lib/reactive";
 import type { ChainMetadata } from "thirdweb/chains";
+import { createStore } from "@/lib/reactive";
 import { SyncStoreToCookies } from "./SyncStoreToCookies";
 import {
   TW_LOCAL_CHAIN_STORE,
@@ -25,11 +25,11 @@ export function SyncChainStores() {
   return (
     <>
       <SyncStoreToCookies
-        storageKey={TW_LOCAL_CHAIN_STORE}
-        store={chainOverridesStore}
         onLoaded={() => {
           isChainOverridesLoadedStore.setValue(true);
         }}
+        storageKey={TW_LOCAL_CHAIN_STORE}
+        store={chainOverridesStore}
       />
 
       <SyncStoreToCookies
diff --git a/apps/dashboard/src/stories/stubs.ts b/apps/dashboard/src/stories/stubs.ts
index 427411c8790..455529a0234 100644
--- a/apps/dashboard/src/stories/stubs.ts
+++ b/apps/dashboard/src/stories/stubs.ts
@@ -1,12 +1,12 @@
-import type { Project } from "@/api/projects";
-import type { Team } from "@/api/team";
-import type { TeamSubscription } from "@/api/team-subscription";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import type {
   EngineAlert,
   EngineAlertRule,
   EngineNotificationChannel,
 } from "@3rdweb-sdk/react/hooks/useEngine";
+import type { Project } from "@/api/projects";
+import type { Team } from "@/api/team";
+import type { TeamSubscription } from "@/api/team-subscription";
 
 export function projectStub(id: string, teamId: string) {
   const project: Project = {
@@ -14,16 +14,16 @@ export function projectStub(id: string, teamId: string) {
     createdAt: new Date().toISOString(),
     domains: [] as string[],
     id: id,
-    updatedAt: new Date().toISOString(),
-    teamId: teamId,
-    slug: `project-${id}`,
+    image: null,
+    lastAccessedAt: null,
     name: `Project ${id}`,
     publishableKey: "pb-key",
-    lastAccessedAt: null,
-    image: null,
+    secretKeys: [],
     services: [],
+    slug: `project-${id}`,
+    teamId: teamId,
+    updatedAt: new Date().toISOString(),
     walletAddresses: [],
-    secretKeys: [],
   };
 
   return project;
@@ -31,86 +31,86 @@ export function projectStub(id: string, teamId: string) {
 
 export function teamStub(id: string, billingPlan: Team["billingPlan"]): Team {
   const team: Team = {
-    id: `team-${id}-id`,
+    billingEmail: "foo@example.com",
     billingPlan: billingPlan,
-    supportPlan: billingPlan,
     billingStatus: "validPayment",
-    name: `Team ${id}`,
-    slug: `team-${id}`,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-    billingEmail: "foo@example.com",
     canCreatePublicChains: null,
-    image: null,
-    isOnboarded: true,
-    enabledScopes: [
-      "pay",
-      "storage",
-      "rpc",
-      "bundler",
-      "insight",
-      "embeddedWallets",
-      "relayer",
-      "chainsaw",
-    ],
-    stripeCustomerId: "cus_1234567890",
     capabilities: {
-      platform: {
-        auditLogs: true,
-        ecosystemWallets: true,
-        seats: true,
-      },
-      rpc: {
+      bundler: {
         enabled: true,
+        mainnetEnabled: true,
         rateLimit: 1000,
       },
-      storage: {
+      embeddedWallets: {
+        customAuth: true,
+        customBranding: true,
         enabled: true,
-        download: {
-          rateLimit: 1000,
-        },
-        upload: {
-          totalFileSizeBytesLimit: 1_000_000_000,
-          rateLimit: 1000,
+        sms: {
+          domestic: true,
+          international: true,
         },
       },
-      bundler: {
+      engineCloud: {
         enabled: true,
-        rateLimit: 1000,
         mainnetEnabled: true,
+        rateLimit: 100,
       },
       insight: {
         enabled: true,
         rateLimit: 1000,
         webhooks: true,
       },
-      embeddedWallets: {
-        enabled: true,
-        customAuth: true,
-        customBranding: true,
-        sms: {
-          domestic: true,
-          international: true,
-        },
-      },
       nebula: {
         enabled: true,
         rateLimit: 1000,
       },
-      engineCloud: {
+      pay: {
         enabled: true,
-        rateLimit: 100,
-        mainnetEnabled: true,
+        rateLimit: 1000,
       },
-      pay: {
+      platform: {
+        auditLogs: true,
+        ecosystemWallets: true,
+        seats: true,
+      },
+      rpc: {
         enabled: true,
         rateLimit: 1000,
       },
+      storage: {
+        download: {
+          rateLimit: 1000,
+        },
+        enabled: true,
+        upload: {
+          rateLimit: 1000,
+          totalFileSizeBytesLimit: 1_000_000_000,
+        },
+      },
     },
+    createdAt: new Date().toISOString(),
+    dedicatedSupportChannel: null,
+    enabledScopes: [
+      "pay",
+      "storage",
+      "rpc",
+      "bundler",
+      "insight",
+      "embeddedWallets",
+      "relayer",
+      "chainsaw",
+    ],
+    id: `team-${id}-id`,
+    image: null,
+    isOnboarded: true,
+    name: `Team ${id}`,
     planCancellationDate: null,
+    slug: `team-${id}`,
+    stripeCustomerId: "cus_1234567890",
+    supportPlan: billingPlan,
     unthreadCustomerId: null,
+    updatedAt: new Date().toISOString(),
     verifiedDomain: null,
-    dedicatedSupportChannel: null,
   };
 
   return team;
@@ -119,37 +119,37 @@ export function teamStub(id: string, billingPlan: Team["billingPlan"]): Team {
 export const teamsAndProjectsStub: Array<{ team: Team; projects: Project[] }> =
   [
     {
-      team: teamStub("1", "free"),
       projects: [
         projectStub("t1p1", "team-1"),
         projectStub("t1p2", "team-1"),
         projectStub("t1p3", "team-1"),
         projectStub("t1p4", "team-1"),
       ],
+      team: teamStub("1", "free"),
     },
     {
-      team: teamStub("2", "starter"),
       projects: [projectStub("t2p1", "team-2"), projectStub("t2p2", "team-2")],
+      team: teamStub("2", "starter"),
     },
     {
-      team: teamStub("3", "growth"),
       projects: [projectStub("t3p1", "team-3"), projectStub("t2p2", "team-2")],
+      team: teamStub("3", "growth"),
     },
     {
-      team: teamStub("4", "growth_legacy"),
       projects: [projectStub("t4p1", "team-4")],
+      team: teamStub("4", "growth_legacy"),
     },
     {
-      team: teamStub("5", "accelerate"),
       projects: [projectStub("t5p1", "team-5")],
+      team: teamStub("5", "accelerate"),
     },
     {
-      team: teamStub("6", "scale"),
       projects: [projectStub("t6p1", "team-6")],
+      team: teamStub("6", "scale"),
     },
     {
-      team: teamStub("7", "pro"),
       projects: [projectStub("t7p1", "team-7")],
+      team: teamStub("7", "pro"),
     },
   ];
 
@@ -158,12 +158,12 @@ export function createEngineAlertRuleStub(
   overrides: Partial<EngineAlertRule> = {},
 ): EngineAlertRule {
   return {
-    title: `Alert Rule ${id}`,
-    routingKey: `alert.${id}`,
+    createdAt: new Date(),
     description: `This is a description for alert rule ${id}`,
     id: `alert-rule-${id}`,
-    createdAt: new Date(),
     pausedAt: null,
+    routingKey: `alert.${id}`,
+    title: `Alert Rule ${id}`,
     ...overrides,
   };
 }
@@ -173,13 +173,13 @@ export function createEngineNotificationChannelStub(
   overrides: Partial<EngineNotificationChannel> = {},
 ): EngineNotificationChannel {
   return {
+    createdAt: new Date(),
     id: Math.random().toString(),
+    pausedAt: new Date(),
     subscriptionRoutes: [`alert.${id}`],
     type: "slack",
     value:
       "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX",
-    createdAt: new Date(),
-    pausedAt: new Date(),
     ...overrides,
   };
 }
@@ -239,13 +239,13 @@ export function teamSubscriptionsStub(
   return [
     // plan
     {
+      currentPeriodEnd: "2024-12-15T20:56:06.000Z",
+      currentPeriodStart: "2024-11-15T20:56:06.000Z",
       id: "sub-1",
-      type: "PLAN",
       status: "active",
-      currentPeriodStart: "2024-11-15T20:56:06.000Z",
-      currentPeriodEnd: "2024-12-15T20:56:06.000Z",
-      trialStart: null,
       trialEnd: overrides?.trialEnd || null,
+      trialStart: null,
+      type: "PLAN",
       upcomingInvoice: {
         amount: planCost,
         currency: "usd",
@@ -259,13 +259,13 @@ export function teamSubscriptionsStub(
       },
     },
     {
+      currentPeriodEnd: "2024-12-15T20:56:06.000Z",
+      currentPeriodStart: "2024-11-15T20:56:15.000Z",
       id: "sub-2",
-      type: "USAGE",
       status: "active",
-      currentPeriodStart: "2024-11-15T20:56:15.000Z",
-      currentPeriodEnd: "2024-12-15T20:56:06.000Z",
-      trialStart: null,
       trialEnd: null,
+      trialStart: null,
+      type: "USAGE",
       upcomingInvoice: {
         amount: usageLinesTotalCost,
         currency: "usd",
@@ -308,11 +308,11 @@ export function teamSubscriptionsStub(
 
 export function newAccountStub(overrides?: Partial<Account>): Account {
   return {
+    creatorWalletAddress: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
     email: undefined,
-    name: undefined,
     id: "foo",
     isStaff: false,
-    creatorWalletAddress: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
+    name: undefined,
     ...overrides,
   };
 }
diff --git a/apps/dashboard/src/stories/utils.tsx b/apps/dashboard/src/stories/utils.tsx
index a813f7c690c..1ba520c44f6 100644
--- a/apps/dashboard/src/stories/utils.tsx
+++ b/apps/dashboard/src/stories/utils.tsx
@@ -1,10 +1,8 @@
+import { INITIAL_VIEWPORTS } from "storybook/viewport";
 import { Badge } from "@/components/ui/badge";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { INITIAL_VIEWPORTS } from "storybook/viewport";
 
-function StoryBadge(props: {
-  label: string;
-}) {
+function StoryBadge(props: { label: string }) {
   return (
     <Badge
       className="mb-3 self-start border-none bg-muted px-3 py-1 font-normal text-muted-foreground text-xs"
@@ -31,8 +29,8 @@ export function mobileViewport(
   key: "iphone14" | "iphone14promax" | "ipad11p" | "ipad12p",
 ) {
   return {
-    viewports: INITIAL_VIEWPORTS,
     defaultViewport: key,
+    viewports: INITIAL_VIEWPORTS,
   };
 }
 
diff --git a/apps/dashboard/src/theme/chakra-componens/skeleton.ts b/apps/dashboard/src/theme/chakra-componens/skeleton.ts
index 9251d5ed62d..f89b271c273 100644
--- a/apps/dashboard/src/theme/chakra-componens/skeleton.ts
+++ b/apps/dashboard/src/theme/chakra-componens/skeleton.ts
@@ -4,18 +4,18 @@ const $startColor = cssVar("skeleton-start-color");
 const $endColor = cssVar("skeleton-end-color");
 
 const thirdweb = defineStyle({
-  _light: {
-    [$startColor.variable]: "colors.gray.100",
-    [$endColor.variable]: "colors.gray.300",
-  },
   _dark: {
     [$startColor.variable]: "colors.gray.900",
     [$endColor.variable]: "colors.gray.800",
   },
+  _light: {
+    [$startColor.variable]: "colors.gray.100",
+    [$endColor.variable]: "colors.gray.300",
+  },
 });
 export const skeletonTheme = defineStyleConfig({
-  variants: { thirdweb },
   defaultProps: {
     variant: "thirdweb",
   },
+  variants: { thirdweb },
 });
diff --git a/apps/dashboard/src/theme/colors.ts b/apps/dashboard/src/theme/colors.ts
index 265de598b36..19f4bb9e469 100644
--- a/apps/dashboard/src/theme/colors.ts
+++ b/apps/dashboard/src/theme/colors.ts
@@ -91,42 +91,32 @@ const blue = {
 };
 
 const themeColors = {
-  transparent: "transparent",
-  red: {
-    50: "#FEF2F2",
-    100: "#FEE2E2",
-    200: "#FECACA",
-    300: "#FCA5A5",
-    400: "#F87171",
-    500: "#EF4444",
-    600: "#DC2626",
-    700: "#B91C1C",
-    800: "#991B1B",
-    900: "#7F1D1D",
-  },
-  orange: {
-    50: "#FFF7ED",
-    100: "#FFEDD5",
-    200: "#FED7AA",
-    300: "#FDBA74",
-    400: "#FB923C",
-    500: "#F97316",
-    600: "#EA580C",
-    700: "#C2410C",
-    800: "#9A3412",
-    900: "#7C2D12",
+  blackAlpha: {
+    50: "rgba(0,0,0,0.05)",
+    100: "rgba(0,0,0,0.1)",
+    200: "rgba(0,0,0,0.2)",
+    300: "rgba(0,0,0,0.3)",
+    400: "rgba(0,0,0,0.4)",
+    500: "rgba(0,0,0,0.5)",
+    600: "rgba(0,0,0,0.6)",
+    700: "rgba(0,0,0,0.7)",
+    800: "rgba(0,0,0,0.8)",
+    900: "rgba(0,0,0,0.9)",
   },
-  yellow: {
-    50: "#FEFCE8",
-    100: "#FEF9C3",
-    200: "#FEF08A",
-    300: "#FDE047",
-    400: "#FACC15",
-    500: "#EAB308",
-    600: "#CA8A04",
-    700: "#A16207",
-    800: "#854D0E",
-    900: "#713F12",
+  blue,
+  cyan: blue,
+
+  gray: {
+    50: "#F2F2F7",
+    100: "#E5E5EA",
+    200: "#E5E5EA",
+    300: "#D1D1D6",
+    400: "#C7C7CC",
+    500: "#AEAEB2",
+    600: "#8E8E93",
+    700: "#636366",
+    800: "#3A3A3C",
+    900: "#1C1C1E",
   },
   green: {
     50: "#ECFDF5",
@@ -140,21 +130,34 @@ const themeColors = {
     800: "#065F46",
     900: "#064E3B",
   },
-  teal: blue,
+  orange: {
+    50: "#FFF7ED",
+    100: "#FFEDD5",
+    200: "#FED7AA",
+    300: "#FDBA74",
+    400: "#FB923C",
+    500: "#F97316",
+    600: "#EA580C",
+    700: "#C2410C",
+    800: "#9A3412",
+    900: "#7C2D12",
+  },
   pink: blue,
-  cyan: blue,
-  blackAlpha: {
-    50: "rgba(0,0,0,0.05)",
-    100: "rgba(0,0,0,0.1)",
-    200: "rgba(0,0,0,0.2)",
-    300: "rgba(0,0,0,0.3)",
-    400: "rgba(0,0,0,0.4)",
-    500: "rgba(0,0,0,0.5)",
-    600: "rgba(0,0,0,0.6)",
-    700: "rgba(0,0,0,0.7)",
-    800: "rgba(0,0,0,0.8)",
-    900: "rgba(0,0,0,0.9)",
+  purple: blue,
+  red: {
+    50: "#FEF2F2",
+    100: "#FEE2E2",
+    200: "#FECACA",
+    300: "#FCA5A5",
+    400: "#F87171",
+    500: "#EF4444",
+    600: "#DC2626",
+    700: "#B91C1C",
+    800: "#991B1B",
+    900: "#7F1D1D",
   },
+  teal: blue,
+  transparent: "transparent",
   whiteAlpha: {
     50: "rgba(255,255,255,0.05)",
     100: "rgba(255,255,255,0.1)",
@@ -167,21 +170,18 @@ const themeColors = {
     800: "rgba(255,255,255,0.8)",
     900: "rgba(255,255,255,0.9)",
   },
-
-  gray: {
-    50: "#F2F2F7",
-    100: "#E5E5EA",
-    200: "#E5E5EA",
-    300: "#D1D1D6",
-    400: "#C7C7CC",
-    500: "#AEAEB2",
-    600: "#8E8E93",
-    700: "#636366",
-    800: "#3A3A3C",
-    900: "#1C1C1E",
+  yellow: {
+    50: "#FEFCE8",
+    100: "#FEF9C3",
+    200: "#FEF08A",
+    300: "#FDE047",
+    400: "#FACC15",
+    500: "#EAB308",
+    600: "#CA8A04",
+    700: "#A16207",
+    800: "#854D0E",
+    900: "#713F12",
   },
-  blue,
-  purple: blue,
 };
 
 export const colors = {
@@ -191,12 +191,12 @@ export const colors = {
 
   // theme colors
   ...themeColors,
+  backgroundDark: "#0E0E10",
+
+  // random
+  backgroundLight: "#F5F6F8",
 
   // blue: themeColors.primary,
   // purple: themeColors.primary,
   primary: themeColors.blue,
-
-  // random
-  backgroundLight: "#F5F6F8",
-  backgroundDark: "#0E0E10",
 };
diff --git a/apps/dashboard/src/theme/index.ts b/apps/dashboard/src/theme/index.ts
index 95803f8a4fe..9013a25281f 100644
--- a/apps/dashboard/src/theme/index.ts
+++ b/apps/dashboard/src/theme/index.ts
@@ -1,60 +1,14 @@
 "use client";
 
-import { type Theme, extendTheme } from "@chakra-ui/react";
+import { extendTheme, type Theme } from "@chakra-ui/react";
 import { getColor, mode } from "@chakra-ui/theme-tools";
 import { skeletonTheme } from "./chakra-componens/skeleton";
 import { colors } from "./colors";
 import { fontWeights, letterSpacings, lineHeights } from "./typography";
 
 const chakraTheme: Theme = extendTheme({
-  config: {
-    initialColorMode: "dark",
-    useSystemColorMode: false,
-  } as Theme["config"],
-  fonts: {
-    heading: "Inter, sans-serif",
-    body: "Inter, sans-serif",
-    mono: "IBM Plex Mono, monospace",
-  },
-  styles: {
-    global: {
-      "html, body": {
-        background: "#000",
-        padding: 0,
-        margin: 0,
-        fontFeatureSettings: `'zero' 1`,
-        scrollBehavior: "smooth",
-      },
-      body: {
-        colorScheme: "dark",
-      },
-      "::selection": {
-        backgroundColor: "#90cdf4",
-        color: "#fefefe",
-      },
-      "::-moz-selection": {
-        backgroundColor: "#90cdf4",
-        color: "#fefefe",
-      },
-    },
-  },
+  colors,
   components: {
-    Skeleton: skeletonTheme,
-    Heading: {
-      baseStyle: {
-        color: "heading",
-      },
-    },
-    Text: {
-      baseStyle: {
-        color: "paragraph",
-      },
-    },
-    Divider: {
-      baseStyle: {
-        borderColor: "borderColor",
-      },
-    },
     Badge: {
       baseStyle: {
         backgroundColor: "badgeBg",
@@ -73,149 +27,173 @@ const chakraTheme: Theme = extendTheme({
           const bgColor = getColor(theme, mode("white", "gray.800")(props));
 
           return {
-            border: "3px solid",
-            borderColor: "transparent",
-            borderRadius: "md",
-            background: `linear-gradient(${bgColor}, ${bgColor}) padding-box,
-            linear-gradient(135deg, ${lgFrom}, ${lgTo}, ${lgFrom}) border-box`,
-            transitionProperty: "opacity, background",
-            transitionDuration: "slow",
-            backgroundSize: "200%",
-            "> *": {
-              transitionProperty: "background",
-              transitionDuration: "slow",
-              transitionTimingFunction: "easeOut",
-              background: `linear-gradient(135deg, ${lgFrom}, ${lgTo}, ${lgFrom})`,
-              backgroundSize: "200%",
-              backgroundClip: "text",
-              textFillColor: "transparent",
-            },
             _hover: {
-              backgroundPosition: "right",
               "> *": {
                 backgroundPosition: "right",
               },
+              backgroundPosition: "right",
               opacity: 0.9,
             },
+            "> *": {
+              background: `linear-gradient(135deg, ${lgFrom}, ${lgTo}, ${lgFrom})`,
+              backgroundClip: "text",
+              backgroundSize: "200%",
+              textFillColor: "transparent",
+              transitionDuration: "slow",
+              transitionProperty: "background",
+              transitionTimingFunction: "easeOut",
+            },
+            background: `linear-gradient(${bgColor}, ${bgColor}) padding-box,
+            linear-gradient(135deg, ${lgFrom}, ${lgTo}, ${lgFrom}) border-box`,
+            backgroundSize: "200%",
+            border: "3px solid",
+            borderColor: "transparent",
+            borderRadius: "md",
+            transitionDuration: "slow",
+            transitionProperty: "opacity, background",
           };
         },
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         highlighted: (props: any) => ({
-          bg: "#151515",
           _hover: {
             boxShadow: "0 0 10px 2px rgba(51, 133, 255, 1)",
             transform: "scale(1.05)",
           },
-          size: "lg",
+          bg: "#151515",
           borderRadius: props.fullCircle ? "full" : "12px",
+          size: "lg",
         }),
         inverted: {
-          bg: "bgBlack",
-          color: "bgWhite",
-          _hover: {
-            opacity: 0.8,
-          },
           _disabled: {
             _hover: {
               bg: "bgBlack !important",
             },
           },
+          _hover: {
+            opacity: 0.8,
+          },
+          bg: "bgBlack",
+          color: "bgWhite",
         },
         outline: {
-          borderWidth: "1px",
-          borderColor: "inputBorder",
           _hover: {
             bg: "transparent",
             borderColor: "inputBorderHover",
           },
+          borderColor: "inputBorder",
+          borderWidth: "1px",
         },
       },
     },
-    Modal: {
+    Divider: {
       baseStyle: {
-        overlay: {
-          backdropFilter: "blur(5px)",
-        },
-        dialog: {
-          background: "backgroundHighlight",
-        },
+        borderColor: "borderColor",
       },
     },
     Drawer: {
       baseStyle: {
-        overlay: {
-          backdropFilter: "blur(5px)",
-        },
         dialog: {
           background: "backgroundHighlight",
         },
+        overlay: {
+          backdropFilter: "blur(5px)",
+        },
       },
     },
-    Select: {
+    Heading: {
+      baseStyle: {
+        color: "heading",
+      },
+    },
+    Input: {
       defaultProps: {
         variant: "filled",
       },
-      variants: {
-        filled: {
+      sizes: {
+        xl: {
+          addon: {
+            borderRadius: "md",
+            fontSize: "lg",
+            h: 14,
+            px: 4,
+          },
           field: {
-            borderWidth: "1px",
-            borderColor: "borderColor",
-            background: "inputBg",
-            _hover: {
-              background: "inputBgHover",
-              borderColor: "blue.500",
-            },
+            borderRadius: "md",
+            fontSize: "lg",
+            h: 14,
+            px: 4,
           },
         },
       },
-    },
-    Input: {
-      defaultProps: {
-        variant: "filled",
-      },
       variants: {
         filled: {
           field: {
-            borderWidth: "1px",
-            borderColor: "inputBorder",
-            background: "transparent",
-            _hover: {
-              borderColor: "inputBorderHover",
-              background: "transparent",
-            },
             _focus: {
               borderColor: "blue.500",
             },
+            _hover: {
+              background: "transparent",
+              borderColor: "inputBorderHover",
+            },
+            background: "transparent",
+            borderColor: "inputBorder",
+            borderWidth: "1px",
+          },
+        },
+      },
+    },
+    Menu: {
+      baseStyle: {
+        item: {
+          _hover: {
+            bg: "hsl(var(--muted))",
           },
+          bg: "backgroundHighlight",
+          py: 3,
+        },
+        list: {
+          bg: "backgroundHighlight",
+          borderColor: "borderColor",
+          borderRadius: "lg",
+          borderWidth: 1,
+          overflow: "hidden",
+          py: 0,
         },
       },
+    },
+    Modal: {
+      baseStyle: {
+        dialog: {
+          background: "backgroundHighlight",
+        },
+        overlay: {
+          backdropFilter: "blur(5px)",
+        },
+      },
+    },
+    NumberInput: {
+      defaultProps: {
+        variant: "filled",
+      },
       sizes: {
         xl: {
-          field: {
+          addon: {
+            borderRadius: "md",
             fontSize: "lg",
-            px: 4,
             h: 14,
-            borderRadius: "md",
+            px: 4,
           },
-          addon: {
+          field: {
+            borderRadius: "md",
             fontSize: "lg",
-            px: 4,
             h: 14,
-            borderRadius: "md",
+            px: 4,
           },
         },
       },
-    },
-    NumberInput: {
-      defaultProps: {
-        variant: "filled",
-      },
       variants: {
         filled: {
           field: {
-            borderWidth: "1px",
-            borderColor: "inputBorder",
-            background: "inputBg",
             _hover: {
               background: "inputBgHover",
               borderColor: "blue.500",
@@ -223,164 +201,186 @@ const chakraTheme: Theme = extendTheme({
             _invalid: {
               borderColor: "inputBorder",
             },
-          },
-        },
-      },
-      sizes: {
-        xl: {
-          field: {
-            fontSize: "lg",
-            px: 4,
-            h: 14,
-            borderRadius: "md",
-          },
-          addon: {
-            fontSize: "lg",
-            px: 4,
-            h: 14,
-            borderRadius: "md",
+            background: "inputBg",
+            borderColor: "inputBorder",
+            borderWidth: "1px",
           },
         },
       },
     },
-    Textarea: {
+    Select: {
       defaultProps: {
         variant: "filled",
       },
       variants: {
         filled: {
-          borderWidth: "1px",
-          borderColor: "inputBorder",
-          background: "transparent",
-          _hover: {
-            borderColor: "inputBorderHover",
-            background: "transparent",
-          },
-          _focus: {
-            borderColor: "blue.500",
+          field: {
+            _hover: {
+              background: "inputBgHover",
+              borderColor: "blue.500",
+            },
+            background: "inputBg",
+            borderColor: "borderColor",
+            borderWidth: "1px",
           },
         },
       },
     },
-    Menu: {
+    Skeleton: skeletonTheme,
+    Table: {
       baseStyle: {
-        list: {
-          bg: "backgroundHighlight",
-          py: 0,
-          borderWidth: 1,
+        cell: {
           borderColor: "borderColor",
-          borderRadius: "lg",
-          overflow: "hidden",
         },
-        item: {
-          bg: "backgroundHighlight",
-          _hover: {
-            bg: "hsl(var(--muted))",
-          },
-          py: 3,
+        tbody: {
+          background: "backgroundHighlight",
         },
-      },
-    },
-    Table: {
-      baseStyle: {
         thead: {
           background: "backgroundHighlight",
           borderBottomColor: "hsl(var(--border))",
           borderBottomWidth: 1,
         },
-        tbody: {
-          background: "backgroundHighlight",
-        },
-        cell: {
-          borderColor: "borderColor",
-        },
       },
       sizes: {
         md: {
           td: {
-            py: 2,
-            px: 6,
             borderBottom: "none",
             fontSize: "14px",
+            px: 6,
+            py: 2,
           },
           th: {
-            py: 4,
-            fontSize: "12px",
-            color: "faded",
             borderBottom: "none",
+            color: "faded",
+            fontSize: "12px",
             fontWeight: "600",
+            py: 4,
           },
         },
       },
     },
+    Text: {
+      baseStyle: {
+        color: "paragraph",
+      },
+    },
+    Textarea: {
+      defaultProps: {
+        variant: "filled",
+      },
+      variants: {
+        filled: {
+          _focus: {
+            borderColor: "blue.500",
+          },
+          _hover: {
+            background: "transparent",
+            borderColor: "inputBorderHover",
+          },
+          background: "transparent",
+          borderColor: "inputBorder",
+          borderWidth: "1px",
+        },
+      },
+    },
   },
-  colors,
+  config: {
+    initialColorMode: "dark",
+    useSystemColorMode: false,
+  } as Theme["config"],
   fontSizes: [],
+  fonts: {
+    body: "Inter, sans-serif",
+    heading: "Inter, sans-serif",
+    mono: "IBM Plex Mono, monospace",
+  },
   fontWeights,
-  lineHeights,
   letterSpacings,
-  sizes: {
-    container: {
-      page: "1170px",
-      hero: "1440px",
-    },
-  },
+  lineHeights,
   semanticTokens: {
     colors: {
-      // inputs
-      inputBg: { default: "hsl(var(--card))", _dark: "hsl(var(--card))" },
-      inputBgHover: { default: "hsl(var(--card))", _dark: "hsl(var(--card))" },
-      inputBorder: { default: "hsl(var(--input))", _dark: "hsl(var(--input))" },
-      inputBorderHover: {
-        default: "hsl(var(--input))",
-        _dark: "hsl(var(--input))",
-      },
-
-      // other
-      badgeBg: {
-        default: "hsl(var(--background))",
+      backgroundBody: {
         _dark: "hsl(var(--background))",
+        default: "hsl(var(--background))",
       },
       backgroundCardHighlight: {
+        _dark: "#0b0b0b",
         // equivalent to muted/50 but without transparency
         default: "#f8f8f8",
-        _dark: "#0b0b0b",
-      },
-      bgBlack: { default: "black", _dark: "white" },
-      bgWhite: { default: "#fff", _dark: "black" },
-      backgroundBody: {
-        default: "hsl(var(--background))",
-        _dark: "hsl(var(--background))",
       },
       backgroundHighlight: {
+        _dark: "#0b0b0b",
         // equivalent to muted/50 but without transparency
         default: "#f8f8f8",
-        _dark: "#0b0b0b",
       },
-      secondaryCardHighlight: {
-        default: "hsl(var(--background))",
+
+      // other
+      badgeBg: {
         _dark: "hsl(var(--background))",
+        default: "hsl(var(--background))",
       },
-      wordmark: {
-        default: "hsl(var(--muted-foreground))",
+      bgBlack: { _dark: "white", default: "black" },
+      bgWhite: { _dark: "black", default: "#fff" },
+
+      borderColor: {
+        _dark: "hsl(var(--border))",
+        default: "hsl(var(--border))",
+      },
+      faded: {
         _dark: "hsl(var(--muted-foreground))",
+        default: "hsl(var(--muted-foreground))",
       },
       heading: {
-        default: "hsl(var(--foreground))",
         _dark: "hsl(var(--foreground))",
+        default: "hsl(var(--foreground))",
+      },
+      // inputs
+      inputBg: { _dark: "hsl(var(--card))", default: "hsl(var(--card))" },
+      inputBgHover: { _dark: "hsl(var(--card))", default: "hsl(var(--card))" },
+      inputBorder: { _dark: "hsl(var(--input))", default: "hsl(var(--input))" },
+      inputBorderHover: {
+        _dark: "hsl(var(--input))",
+        default: "hsl(var(--input))",
       },
       paragraph: {
-        default: "hsl(var(--muted-foreground))",
         _dark: "hsl(var(--muted-foreground))",
-      },
-      faded: {
         default: "hsl(var(--muted-foreground))",
+      },
+      secondaryCardHighlight: {
+        _dark: "hsl(var(--background))",
+        default: "hsl(var(--background))",
+      },
+      wordmark: {
         _dark: "hsl(var(--muted-foreground))",
+        default: "hsl(var(--muted-foreground))",
       },
-
-      borderColor: {
-        default: "hsl(var(--border))",
-        _dark: "hsl(var(--border))",
+    },
+  },
+  sizes: {
+    container: {
+      hero: "1440px",
+      page: "1170px",
+    },
+  },
+  styles: {
+    global: {
+      "::-moz-selection": {
+        backgroundColor: "#90cdf4",
+        color: "#fefefe",
+      },
+      "::selection": {
+        backgroundColor: "#90cdf4",
+        color: "#fefefe",
+      },
+      body: {
+        colorScheme: "dark",
+      },
+      "html, body": {
+        background: "#000",
+        fontFeatureSettings: `'zero' 1`,
+        margin: 0,
+        padding: 0,
+        scrollBehavior: "smooth",
       },
     },
   },
diff --git a/apps/dashboard/src/theme/typography.ts b/apps/dashboard/src/theme/typography.ts
index 194781899f6..6bf5dbebaf3 100644
--- a/apps/dashboard/src/theme/typography.ts
+++ b/apps/dashboard/src/theme/typography.ts
@@ -1,25 +1,25 @@
 export const fontWeights = {
+  body: 400,
   display: 800,
-  title: 700,
-  subtitle: 500,
   label: 600,
-  body: 400,
+  subtitle: 500,
+  title: 700,
 } as const;
 
 export const lineHeights = {
+  body: 1.6,
   display: 1.2,
-  title: 1.125,
-  subtitle: 1.6,
   label: 1,
-  body: 1.6,
+  subtitle: 1.6,
+  title: 1.125,
 } as const;
 
 export const letterSpacings = {
+  body: "initial",
   display: -1.5,
-  title: 0.15,
-  subtitle: 0.1,
   label: "initial",
-  body: "initial",
+  subtitle: 0.1,
+  title: 0.15,
 } as const;
 
 type TypographyBase = "display" | "title" | "subtitle" | "label" | "body";
diff --git a/apps/dashboard/src/tw-components/button.tsx b/apps/dashboard/src/tw-components/button.tsx
index fc814e22024..9d372f63315 100644
--- a/apps/dashboard/src/tw-components/button.tsx
+++ b/apps/dashboard/src/tw-components/button.tsx
@@ -3,11 +3,11 @@
 import {
   Button as ChakraButton,
   type ButtonProps as ChakraButtonProps,
+  forwardRef,
   IconButton,
   type IconButtonProps,
   LightMode,
   Link,
-  forwardRef,
   useButtonGroup,
 } from "@chakra-ui/react";
 import { useClipboard } from "hooks/useClipboard";
@@ -18,10 +18,10 @@ import { ChakraNextLink } from "./link";
 import { convertFontSizeToCSSVar } from "./utils/typography";
 
 const buttonSizesMap = {
-  xs: "sm",
-  sm: "md",
-  md: "lg",
   lg: "xl",
+  md: "lg",
+  sm: "md",
+  xs: "sm",
 } as const;
 
 type PossibleButtonSize = keyof typeof buttonSizesMap;
@@ -42,10 +42,10 @@ export const Button = forwardRef<ButtonProps, "button">(
       _size = "md";
     }
     const props: ButtonProps = {
+      fontSize: convertFontSizeToCSSVar(`label.${buttonSizesMap[_size]}`),
       fontWeight: fontWeights.label,
-      lineHeight: lineHeights.label,
       letterSpacing: letterSpacings.label,
-      fontSize: convertFontSizeToCSSVar(`label.${buttonSizesMap[_size]}`),
+      lineHeight: lineHeights.label,
       size: _size,
       ...buttonGroupContext,
       ...restButtonProps,
@@ -59,8 +59,8 @@ export const Button = forwardRef<ButtonProps, "button">(
         <LightMode>
           <ChakraButton
             fontWeight={fontWeights.label}
-            lineHeight={lineHeights.label}
             letterSpacing={letterSpacings.label}
+            lineHeight={lineHeights.label}
             {...props}
             ref={ref}
           />
@@ -72,8 +72,8 @@ export const Button = forwardRef<ButtonProps, "button">(
       <ChakraButton
         {...props}
         fontWeight={fontWeights.label}
-        lineHeight={lineHeights.label}
         letterSpacing={letterSpacings.label}
+        lineHeight={lineHeights.label}
         ref={ref}
       />
     );
@@ -95,10 +95,10 @@ export const LinkButton = reactForwardRef<HTMLButtonElement, LinkButtonProps>(
           href={href}
           isExternal
           ref={ref}
-          textDecoration="none!important"
           rightIcon={
             noIcon ? undefined : <ExternalLinkIcon className="size-4" />
           }
+          textDecoration="none!important"
           {...restButtonProps}
         >
           {children}
@@ -138,15 +138,15 @@ export const Legacy_CopyButton = forwardRef<Legacy_CopyButtonProps, "button">(
 
     return (
       <IconButton
-        ref={ref}
         borderRadius="md"
-        variant="ghost"
         colorScheme="whiteAlpha"
-        size="sm"
-        onClick={copy}
         icon={
           hasCopied ? <CheckIcon className="text-success-text" /> : <CopyIcon />
         }
+        onClick={copy}
+        ref={ref}
+        size="sm"
+        variant="ghost"
         {...restButtonProps}
       />
     );
diff --git a/apps/dashboard/src/tw-components/card.tsx b/apps/dashboard/src/tw-components/card.tsx
index d156e8711b1..a14752253e9 100644
--- a/apps/dashboard/src/tw-components/card.tsx
+++ b/apps/dashboard/src/tw-components/card.tsx
@@ -6,22 +6,22 @@ type DefaultedBoxProps = Pick<
 >;
 
 const defaultBoxProps: Required<DefaultedBoxProps> = {
-  shadow: "sm",
-  px: 4,
-  py: 4,
+  borderColor: "borderColor",
   borderRadius: "xl",
   borderWidth: "1px",
-  borderColor: "borderColor",
+  px: 4,
+  py: 4,
+  shadow: "sm",
 };
 
 const borderRadiusMap = {
-  "3xl": "2xl",
   "2xl": "xl",
-  xl: "lg",
+  "3xl": "2xl",
   lg: "md",
   md: "sm",
-  sm: "none",
   none: "none",
+  sm: "none",
+  xl: "lg",
 };
 
 interface CardProps extends BoxProps {
@@ -53,26 +53,26 @@ export const Card: React.FC<CardProps> = ({
     <>
       {outlineBorder ? (
         <Box
-          p={outlineBorder.width}
           borderRadius={combinedProps.borderRadius}
-          position="relative"
           overflow="hidden"
+          p={outlineBorder.width}
+          position="relative"
           w={combinedProps.w || combinedProps.width}
         >
           <Box
-            zIndex={-1}
+            bgGradient={outlineBorder.gradient}
+            h="full"
+            left={0}
             position="absolute"
             top={0}
-            left={0}
             w="full"
-            h="full"
-            bgGradient={outlineBorder.gradient}
+            zIndex={-1}
           />
 
           <Box
             {...combinedProps}
-            w="full"
             borderRadius={getBorderRadius(combinedProps.borderRadius)}
+            w="full"
           >
             {children}
           </Box>
diff --git a/apps/dashboard/src/tw-components/form.tsx b/apps/dashboard/src/tw-components/form.tsx
index 3522627c01e..458cf8a7f24 100644
--- a/apps/dashboard/src/tw-components/form.tsx
+++ b/apps/dashboard/src/tw-components/form.tsx
@@ -9,12 +9,12 @@ import {
 import {
   type BodyBase,
   type BodySizes,
+  fontWeights,
   type LabelBase,
   type LabelSizes,
-  type TypographySize,
-  fontWeights,
   letterSpacings,
   lineHeights,
+  type TypographySize,
 } from "theme/typography";
 import type { ComponentWithChildren } from "types/component-with-children";
 import { convertFontSizeToCSSVar } from "./utils/typography";
@@ -33,8 +33,8 @@ export const FormLabel: ComponentWithChildren<FormLabelProps> = ({
     <FormLabelText
       fontSize={convertFontSizeToCSSVar(size)}
       fontWeight={fontWeights[base]}
-      lineHeight={lineHeights[base]}
       letterSpacing={letterSpacings[base]}
+      lineHeight={lineHeights[base]}
       {...restProps}
     />
   );
@@ -54,8 +54,8 @@ export const FormHelperText: ComponentWithChildren<FormHelperTextProps> = ({
     <ChakraFormHelperText
       fontSize={convertFontSizeToCSSVar(size)}
       fontWeight={fontWeights[base]}
-      lineHeight={lineHeights[base]}
       letterSpacing={letterSpacings[base]}
+      lineHeight={lineHeights[base]}
       {...restProps}
     />
   );
@@ -76,8 +76,8 @@ export const FormErrorMessage: ComponentWithChildren<FormErrorMessageProps> = ({
     <ChakraFormErrorMessage
       fontSize={convertFontSizeToCSSVar(size)}
       fontWeight={fontWeights[base]}
-      lineHeight={lineHeights[base]}
       letterSpacing={letterSpacings[base]}
+      lineHeight={lineHeights[base]}
       {...restProps}
     />
   );
diff --git a/apps/dashboard/src/tw-components/heading.tsx b/apps/dashboard/src/tw-components/heading.tsx
index 167bc583963..e1e403747fe 100644
--- a/apps/dashboard/src/tw-components/heading.tsx
+++ b/apps/dashboard/src/tw-components/heading.tsx
@@ -3,12 +3,12 @@ import {
   type HeadingProps as ChakraHeadingProps,
 } from "@chakra-ui/react";
 import {
+  fontWeights,
   type HeadingBase,
   type HeadingSizes,
-  type TypographySize,
-  fontWeights,
   letterSpacings,
   lineHeights,
+  type TypographySize,
 } from "theme/typography";
 import type { ComponentWithChildren } from "types/component-with-children";
 import { convertFontSizeToCSSVar } from "./utils/typography";
@@ -27,8 +27,8 @@ export const Heading: ComponentWithChildren<HeadingProps> = ({
     <ChakraHeading
       fontSize={convertFontSizeToCSSVar(size)}
       fontWeight={fontWeights[base]}
-      lineHeight={lineHeights[base]}
       letterSpacing={letterSpacings[base]}
+      lineHeight={lineHeights[base]}
       {...restProps}
     />
   );
diff --git a/apps/dashboard/src/tw-components/link.tsx b/apps/dashboard/src/tw-components/link.tsx
index befa72ca1fc..3aad69373af 100644
--- a/apps/dashboard/src/tw-components/link.tsx
+++ b/apps/dashboard/src/tw-components/link.tsx
@@ -12,7 +12,7 @@ type ChakraNextLinkProps = Omit<ChakraLinkProps, "as"> &
   Omit<_NextLinkProps, "as">;
 export const ChakraNextLink = forwardRef<ChakraNextLinkProps, "a">(
   (props, ref) => (
-    <ChakraLink as={_NextLink} {...props} ref={ref} prefetch={false} />
+    <ChakraLink as={_NextLink} {...props} prefetch={false} ref={ref} />
   ),
 );
 
@@ -34,7 +34,7 @@ export const Link = reactForwardRef<HTMLAnchorElement, LinkProps>(
   ({ href, isExternal, children, scroll, ...restLinkProps }, ref) => {
     if (isExternal) {
       return (
-        <ChakraLink isExternal href={href} ref={ref} {...restLinkProps}>
+        <ChakraLink href={href} isExternal ref={ref} {...restLinkProps}>
           {children}
         </ChakraLink>
       );
@@ -42,11 +42,11 @@ export const Link = reactForwardRef<HTMLAnchorElement, LinkProps>(
 
     return (
       <ChakraNextLink
+        _focus={{ boxShadow: "none" }}
         href={href}
+        ref={ref}
         scroll={scroll}
         scrollBehavior="smooth"
-        ref={ref}
-        _focus={{ boxShadow: "none" }}
         {...restLinkProps}
       >
         {children}
diff --git a/apps/dashboard/src/tw-components/nft-media.tsx b/apps/dashboard/src/tw-components/nft-media.tsx
index a945020c28f..26752628f52 100644
--- a/apps/dashboard/src/tw-components/nft-media.tsx
+++ b/apps/dashboard/src/tw-components/nft-media.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { ImageIcon } from "lucide-react";
 import type { ThirdwebClient } from "thirdweb";
 import { MediaRenderer } from "thirdweb/react";
+import { cn } from "@/lib/utils";
 
 export const NFTMediaWithEmptyState: React.FC<{
   className?: string;
@@ -22,14 +22,14 @@ export const NFTMediaWithEmptyState: React.FC<{
   if (!(props.metadata.image || props.metadata.animation_url)) {
     return (
       <div
-        style={{
-          width: props.width,
-          height: props.height,
-        }}
         className={cn(
           "grid h-full flex-shrink-0 place-items-center overflow-hidden rounded-lg border border-border object-contain",
           props.className,
         )}
+        style={{
+          height: props.height,
+          width: props.width,
+        }}
       >
         <div className="flex flex-col items-center gap-2">
           <ImageIcon className="size-8 text-muted-foreground" />
@@ -40,23 +40,23 @@ export const NFTMediaWithEmptyState: React.FC<{
   }
   return (
     <div
-      style={{
-        width: props.width,
-        height: props.height,
-      }}
       className={cn(
         "flex-shrink-0 overflow-hidden rounded-lg object-contain ",
         props.className,
       )}
+      style={{
+        height: props.height,
+        width: props.width,
+      }}
     >
       <MediaRenderer
-        client={props.client}
-        src={props.metadata.animation_url || props.metadata.image}
         alt={props.metadata.name?.toString() || ""}
+        className="[&>div]:!bg-accent [&_a]:!text-muted-foreground [&_a]:!no-underline [&_svg]:!size-6 [&_svg]:!text-muted-foreground aspect-square h-full w-full"
+        client={props.client}
+        controls={props.controls}
         poster={props.metadata.image}
         requireInteraction={props.requireInteraction}
-        controls={props.controls}
-        className="[&>div]:!bg-accent [&_a]:!text-muted-foreground [&_a]:!no-underline [&_svg]:!size-6 [&_svg]:!text-muted-foreground aspect-square h-full w-full"
+        src={props.metadata.animation_url || props.metadata.image}
       />
     </div>
   );
diff --git a/apps/dashboard/src/tw-components/text.tsx b/apps/dashboard/src/tw-components/text.tsx
index 2bc45aebb6c..dd77bf14533 100644
--- a/apps/dashboard/src/tw-components/text.tsx
+++ b/apps/dashboard/src/tw-components/text.tsx
@@ -3,12 +3,12 @@ import {
   type TextProps as ChakraTextProps,
 } from "@chakra-ui/react";
 import {
-  type TextBase,
-  type TextSizes,
-  type TypographySize,
   fontWeights,
   letterSpacings,
   lineHeights,
+  type TextBase,
+  type TextSizes,
+  type TypographySize,
 } from "theme/typography";
 import type { ComponentWithChildren } from "types/component-with-children";
 import { convertFontSizeToCSSVar } from "./utils/typography";
@@ -27,8 +27,8 @@ export const Text: ComponentWithChildren<TextProps> = ({
     <ChakraText
       fontSize={convertFontSizeToCSSVar(size)}
       fontWeight={fontWeights[base]}
-      lineHeight={lineHeights[base]}
       letterSpacing={letterSpacings[base]}
+      lineHeight={lineHeights[base]}
       {...restProps}
     />
   );
diff --git a/apps/dashboard/src/utils/batch.ts b/apps/dashboard/src/utils/batch.ts
index 5db5b43c319..430642de0c9 100644
--- a/apps/dashboard/src/utils/batch.ts
+++ b/apps/dashboard/src/utils/batch.ts
@@ -99,13 +99,12 @@ const getAcceptedFiles = async (acceptedFiles: File[]) => {
     .filter((f) => f.name !== csv?.name)
     .sort(sortAscending);
 
-  return { csv, json, images, videos };
+  return { csv, images, json, videos };
 };
 
 function removeEmptyKeysFromObject<T extends Record<string, unknown>>(
   obj: T,
 ): T {
-  // biome-ignore lint/complexity/noForEach: FIXME
   Object.keys(obj).forEach((key) => {
     if (obj[key] === "" || obj[key] === null || obj[key] === undefined) {
       delete obj[key];
@@ -151,22 +150,22 @@ const getMergedData = (
       } = row;
 
       return removeEmptyKeysFromObject({
-        name: name.toString(),
+        animation_url:
+          videoFiles.find((video) => video?.name === animation_url) ||
+          (!isAnimationUrlMapped && videoFiles[index]) ||
+          animation_url ||
+          undefined,
+        attributes: convertToOsStandard(removeEmptyKeysFromObject(properties)),
+        background_color,
         description: description?.toString(),
         external_url,
-        background_color,
-        youtube_url,
-        attributes: convertToOsStandard(removeEmptyKeysFromObject(properties)),
         image:
           imageFiles.find((img) => img?.name === image) ||
           (!isImageMapped && imageFiles[index]) ||
           image ||
           undefined,
-        animation_url:
-          videoFiles.find((video) => video?.name === animation_url) ||
-          (!isAnimationUrlMapped && videoFiles[index]) ||
-          animation_url ||
-          undefined,
+        name: name.toString(),
+        youtube_url,
       });
     });
   }
@@ -181,17 +180,17 @@ const getMergedData = (
     // biome-ignore lint/suspicious/noExplicitAny: FIXME
     return jsonData.map((nft: any, index: number) => ({
       ...nft,
+      animation_url:
+        videoFiles.find((video) => video?.name === nft?.animation_url) ||
+        (!isAnimationUrlMapped && videoFiles[index]) ||
+        nft.animation_url ||
+        undefined,
       image:
         imageFiles.find((img) => img?.name === nft?.image) ||
         (!isImageMapped && imageFiles[index]) ||
         nft.image ||
         nft.file_url ||
         undefined,
-      animation_url:
-        videoFiles.find((video) => video?.name === nft?.animation_url) ||
-        (!isAnimationUrlMapped && videoFiles[index]) ||
-        nft.animation_url ||
-        undefined,
     }));
   }
   return [];
@@ -206,8 +205,6 @@ export async function processInputData(
     setData(getMergedData(undefined, json, images, videos));
   } else if (csv) {
     Papa.parse<CSVData>(csv, {
-      header: true,
-      transformHeader,
       complete: (results) => {
         const validResults: Papa.ParseResult<CSVData> = {
           ...results,
@@ -223,6 +220,8 @@ export async function processInputData(
         }
         setData(getMergedData(validResults, undefined, images, videos));
       },
+      header: true,
+      transformHeader,
     });
   } else {
     throw new Error(
@@ -233,6 +232,6 @@ export async function processInputData(
 
 export const shuffleData = (array: NFTInput[]) =>
   array
-    .map((value) => ({ value, sort: Math.random() }))
+    .map((value) => ({ sort: Math.random(), value }))
     .sort((a, b) => a.sort - b.sort)
     .map(({ value }) => value);
diff --git a/apps/dashboard/src/utils/date-utils.ts b/apps/dashboard/src/utils/date-utils.ts
index e41ba62e325..a6f797afe03 100644
--- a/apps/dashboard/src/utils/date-utils.ts
+++ b/apps/dashboard/src/utils/date-utils.ts
@@ -3,7 +3,7 @@ import { format, isValid } from "date-fns";
 const DATE_TIME_LOCAL_FORMAT = "yyyy-MM-dd HH:mm";
 
 export function toDateTimeLocal(date?: Date | number | string) {
-  let parsedDate: Date | undefined = undefined;
+  let parsedDate: Date | undefined;
   if (date instanceof Date) {
     parsedDate = date;
   } else if (typeof date === "number") {
diff --git a/apps/dashboard/src/utils/errorParser.tsx b/apps/dashboard/src/utils/errorParser.tsx
index b010317f5f2..44c6e433462 100644
--- a/apps/dashboard/src/utils/errorParser.tsx
+++ b/apps/dashboard/src/utils/errorParser.tsx
@@ -7,9 +7,9 @@ const PLEASE_REACH_OUT_MESSAGE = (
     If you believe this is incorrect or the error persists, please visit our{" "}
     <Link
       className="font-semibold underline"
-      target="_blank"
       href="/support"
       rel="noopener noreferrer"
+      target="_blank"
     >
       support site
     </Link>
diff --git a/apps/dashboard/src/utils/number.ts b/apps/dashboard/src/utils/number.ts
index 56203ad136b..0bed2c0b962 100644
--- a/apps/dashboard/src/utils/number.ts
+++ b/apps/dashboard/src/utils/number.ts
@@ -1,10 +1,10 @@
 const usdCurrencyFormatter = new Intl.NumberFormat("en-US", {
-  style: "currency",
-  currency: "USD", // prefix with $
+  currency: "USD",
+  maximumFractionDigits: 2, // prefix with $
   minimumFractionDigits: 0, // don't show decimal places if value is a whole number
-  maximumFractionDigits: 2, // at max 2 decimal places
+  notation: "compact", // at max 2 decimal places
   roundingMode: "halfEven", // round to nearest even number, standard practice for financial calculations
-  notation: "compact", // shows 1.2M instead of 1,200,000, 1.2B instead of 1,200,000,000
+  style: "currency", // shows 1.2M instead of 1,200,000, 1.2B instead of 1,200,000,000
 });
 
 export const toUSD = (value: number) => {
diff --git a/apps/dashboard/src/utils/pricing.tsx b/apps/dashboard/src/utils/pricing.tsx
index de772d0e81d..c961ec4b867 100644
--- a/apps/dashboard/src/utils/pricing.tsx
+++ b/apps/dashboard/src/utils/pricing.tsx
@@ -18,27 +18,7 @@ export const TEAM_PLANS: Record<
     features: Array<string | string[]>;
   }
 > = {
-  starter: {
-    price: 5,
-    title: "Starter",
-    subTitle: null,
-    trialPeriodDays: 0,
-    description: "Ideal for individual developers who require basic features.",
-    features: [
-      "Community & AI Support",
-      "Web, Mobile & Gaming SDKs",
-      "Contract and Wallet APIs",
-      "Audited smart contracts",
-      "Managed Infrastructure (RPC, IPFS)",
-      "Account Abstraction",
-      "Engine Cloud",
-    ],
-  },
   growth: {
-    price: 99,
-    title: "Growth",
-    subTitle: "Everything in Starter, plus:",
-    trialPeriodDays: 0,
     description: "Ideal for teams building production-grade apps.",
     features: [
       "Email Support",
@@ -46,13 +26,28 @@ export const TEAM_PLANS: Record<
       "Invite Team Members",
       "Custom In-App Wallet Auth",
     ],
+    price: 99,
+    subTitle: "Everything in Starter, plus:",
+    title: "Growth",
+    trialPeriodDays: 0,
+  },
+  pro: {
+    description: "For large organizations with custom needs.",
+    features: [
+      "Dedicated Account Executive",
+      "12hr Guaranteed Response",
+      "No Rate Limits",
+      ["Custom Infrastructure Add-Ons", "Infrastructure for custom chains."],
+      ["Volume Discounts", "Negotiated volume discounts that fit your scale."],
+    ],
+    isStartingPriceOnly: true,
+    price: 1499,
+    subTitle: "Everything in Scale, plus:",
+    title: "Pro",
+    trialPeriodDays: 0,
   },
   scale: {
-    price: 499,
-    title: "Scale",
     description: "For funded startups and mid-size businesses.",
-    subTitle: "Everything in Growth, plus:",
-    trialPeriodDays: 0,
     features: [
       "Slack & Telegram Support",
       "24hr Guaranteed Response",
@@ -67,20 +62,25 @@ export const TEAM_PLANS: Record<
         "Dedicated RPC nodes, indexers, etc.",
       ],
     ],
-  },
-  pro: {
-    price: 1499,
-    isStartingPriceOnly: true,
-    title: "Pro",
-    subTitle: "Everything in Scale, plus:",
+    price: 499,
+    subTitle: "Everything in Growth, plus:",
+    title: "Scale",
     trialPeriodDays: 0,
-    description: "For large organizations with custom needs.",
+  },
+  starter: {
+    description: "Ideal for individual developers who require basic features.",
     features: [
-      "Dedicated Account Executive",
-      "12hr Guaranteed Response",
-      "No Rate Limits",
-      ["Custom Infrastructure Add-Ons", "Infrastructure for custom chains."],
-      ["Volume Discounts", "Negotiated volume discounts that fit your scale."],
+      "Community & AI Support",
+      "Web, Mobile & Gaming SDKs",
+      "Contract and Wallet APIs",
+      "Audited smart contracts",
+      "Managed Infrastructure (RPC, IPFS)",
+      "Account Abstraction",
+      "Engine Cloud",
     ],
+    price: 5,
+    subTitle: null,
+    title: "Starter",
+    trialPeriodDays: 0,
   },
 };
diff --git a/apps/dashboard/src/utils/zeroAddress.ts b/apps/dashboard/src/utils/zeroAddress.ts
index 84986081d89..cca8ad2008a 100644
--- a/apps/dashboard/src/utils/zeroAddress.ts
+++ b/apps/dashboard/src/utils/zeroAddress.ts
@@ -1,4 +1,4 @@
-import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS, isAddress } from "thirdweb";
+import { isAddress, NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS } from "thirdweb";
 
 export function isAddressZero(address: string): boolean {
   const lowerCaseAddress = (address || "").toLowerCase();
diff --git a/apps/dashboard/tailwind.config.js b/apps/dashboard/tailwind.config.js
index fdc57832312..67f7cb12354 100644
--- a/apps/dashboard/tailwind.config.js
+++ b/apps/dashboard/tailwind.config.js
@@ -2,8 +2,9 @@ import { fontFamily } from "tailwindcss/defaultTheme";
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  darkMode: ["class"],
   content: ["./src/**/*.{ts,tsx}"],
+  darkMode: ["class"],
+  plugins: [require("tailwindcss-animate")],
   prefix: "",
   theme: {
     container: {
@@ -19,20 +20,29 @@ module.exports = {
       },
     },
     extend: {
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+        "caret-blink": "caret-blink 1.25s ease-out infinite",
+        skeleton: "skeleton 2s cubic-bezier(0.4, 0, 0.6, 1) infinite",
+        "text-shimmer": "text-shimmer 1.25s linear infinite",
+      },
+      borderRadius: {
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
+      },
       colors: {
-        border: "hsl(var(--border))",
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
         "active-border": "hsl(var(--active-border))",
-        input: "hsl(var(--input))",
-        ring: "hsl(var(--ring))",
         background: "hsl(var(--background))",
-        foreground: "hsl(var(--foreground))",
-        primary: {
-          DEFAULT: "hsl(var(--primary))",
-          foreground: "hsl(var(--primary-foreground))",
-        },
-        secondary: {
-          DEFAULT: "hsl(var(--secondary))",
-          foreground: "hsl(var(--secondary-foreground))",
+        border: "hsl(var(--border))",
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
         },
         destructive: {
           DEFAULT: "hsl(var(--destructive))",
@@ -41,54 +51,55 @@ module.exports = {
           // destructive-text can be used on neutral bg - it's red-ish
           text: "hsl(var(--destructive-text))",
         },
-        success: {
-          // success-text can be used on neutral bg, it's green-ish
-          text: "hsl(var(--success-text))",
+        foreground: "hsl(var(--foreground))",
+        input: "hsl(var(--input))",
+        inverted: {
+          DEFAULT: "hsl(var(--inverted))",
+          foreground: "hsl(var(--inverted-foreground))",
+        },
+        link: {
+          foreground: "hsl(var(--link-foreground))",
         },
         muted: {
           DEFAULT: "hsl(var(--muted))",
           foreground: "hsl(var(--muted-foreground))",
         },
-        accent: {
-          DEFAULT: "hsl(var(--accent))",
-          foreground: "hsl(var(--accent-foreground))",
+        "nebula-pink": {
+          foreground: "hsl(var(--nebula-pink-foreground))",
         },
         popover: {
           DEFAULT: "hsl(var(--popover))",
           foreground: "hsl(var(--popover-foreground))",
         },
-        card: {
-          DEFAULT: "hsl(var(--card))",
-          foreground: "hsl(var(--card-foreground))",
-        },
-        inverted: {
-          DEFAULT: "hsl(var(--inverted))",
-          foreground: "hsl(var(--inverted-foreground))",
-        },
-        "nebula-pink": {
-          foreground: "hsl(var(--nebula-pink-foreground))",
-        },
-        warning: {
-          text: "hsl(var(--warning-text))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
         },
-        link: {
-          foreground: "hsl(var(--link-foreground))",
+        ring: "hsl(var(--ring))",
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
         },
         sidebar: {
+          accent: "hsl(var(--sidebar-accent))",
+          "accent-foreground": "hsl(var(--sidebar-accent-foreground))",
+          border: "hsl(var(--sidebar-border))",
           DEFAULT: "hsl(var(--sidebar-background))",
           foreground: "hsl(var(--sidebar-foreground))",
           primary: "hsl(var(--sidebar-primary))",
           "primary-foreground": "hsl(var(--sidebar-primary-foreground))",
-          accent: "hsl(var(--sidebar-accent))",
-          "accent-foreground": "hsl(var(--sidebar-accent-foreground))",
-          border: "hsl(var(--sidebar-border))",
           ring: "hsl(var(--sidebar-ring))",
         },
+        success: {
+          // success-text can be used on neutral bg, it's green-ish
+          text: "hsl(var(--success-text))",
+        },
+        warning: {
+          text: "hsl(var(--warning-text))",
+        },
       },
-      borderRadius: {
-        lg: "var(--radius)",
-        md: "calc(var(--radius) - 2px)",
-        sm: "calc(var(--radius) - 4px)",
+      fontFamily: {
+        sans: ["var(--font-sans)", ...fontFamily.sans],
       },
       keyframes: {
         "accordion-down": {
@@ -108,17 +119,6 @@ module.exports = {
           "100%": { backgroundPosition: "-100% 50%" },
         },
       },
-      animation: {
-        "accordion-down": "accordion-down 0.2s ease-out",
-        "accordion-up": "accordion-up 0.2s ease-out",
-        skeleton: "skeleton 2s cubic-bezier(0.4, 0, 0.6, 1) infinite",
-        "caret-blink": "caret-blink 1.25s ease-out infinite",
-        "text-shimmer": "text-shimmer 1.25s linear infinite",
-      },
-      fontFamily: {
-        sans: ["var(--font-sans)", ...fontFamily.sans],
-      },
     },
   },
-  plugins: [require("tailwindcss-animate")],
 };
diff --git a/apps/dashboard/tsconfig.json b/apps/dashboard/tsconfig.json
index 2981b36190a..08b5d695c33 100644
--- a/apps/dashboard/tsconfig.json
+++ b/apps/dashboard/tsconfig.json
@@ -1,33 +1,34 @@
 {
   "compilerOptions": {
-    "baseUrl": "./src",
-    "target": "ES2020",
-    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
+    "baseUrl": "./src",
+    "downlevelIteration": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
+    "forceConsistentCasingInFileNames": true,
+    "incremental": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
-    "downlevelIteration": true,
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "module": "esnext",
+    "moduleResolution": "node",
+    "noEmit": true,
     "noUncheckedIndexedAccess": true,
     "paths": {
+      "@app/*": ["app/(app)/*"],
       "tw-components": ["tw-components"],
-      "tw-components/*": ["tw-components/*"],
-      "@app/*": ["app/(app)/*"]
+      "tw-components/*": ["tw-components/*"]
     },
     "plugins": [
       {
         "name": "next"
       }
-    ]
+    ],
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "ES2020"
   },
+  "exclude": ["node_modules", ".next", "lib/__generated__"],
   "include": [
     "next-env.d.ts",
     "lucide-react.d.ts",
@@ -35,6 +36,5 @@
     "**/*.tsx",
     "additional.d.ts",
     ".next/types/**/*.ts"
-  ],
-  "exclude": ["node_modules", ".next", "lib/__generated__"]
+  ]
 }
diff --git a/apps/login/.gitignore b/apps/login/.gitignore
deleted file mode 100644
index 5ef6a520780..00000000000
--- a/apps/login/.gitignore
+++ /dev/null
@@ -1,41 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/versions
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-.pnpm-debug.log*
-
-# env files (can opt-in for committing if needed)
-.env*
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
diff --git a/apps/login/README.md b/apps/login/README.md
deleted file mode 100644
index e215bc4ccf1..00000000000
--- a/apps/login/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
-
-## Getting Started
-
-First, run the development server:
-
-```bash
-npm run dev
-# or
-yarn dev
-# or
-pnpm dev
-# or
-bun dev
-```
-
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
-
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
-
-This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
-
-## Learn More
-
-To learn more about Next.js, take a look at the following resources:
-
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
-
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
-
-## Deploy on Vercel
-
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
-
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
diff --git a/apps/login/components.json b/apps/login/components.json
deleted file mode 100644
index d9ef0ae537d..00000000000
--- a/apps/login/components.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
-  "rsc": true,
-  "tsx": true,
-  "tailwind": {
-    "config": "tailwind.config.ts",
-    "css": "app/globals.css",
-    "baseColor": "neutral",
-    "cssVariables": true,
-    "prefix": ""
-  },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils",
-    "ui": "@/components/ui",
-    "lib": "@/lib",
-    "hooks": "@/hooks"
-  },
-  "iconLibrary": "lucide"
-}
\ No newline at end of file
diff --git a/apps/login/eslint.config.mjs b/apps/login/eslint.config.mjs
deleted file mode 100644
index c85fb67c463..00000000000
--- a/apps/login/eslint.config.mjs
+++ /dev/null
@@ -1,16 +0,0 @@
-import { dirname } from "path";
-import { fileURLToPath } from "url";
-import { FlatCompat } from "@eslint/eslintrc";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const compat = new FlatCompat({
-  baseDirectory: __dirname,
-});
-
-const eslintConfig = [
-  ...compat.extends("next/core-web-vitals", "next/typescript"),
-];
-
-export default eslintConfig;
diff --git a/apps/login/next.config.ts b/apps/login/next.config.ts
deleted file mode 100644
index e9ffa3083ad..00000000000
--- a/apps/login/next.config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { NextConfig } from "next";
-
-const nextConfig: NextConfig = {
-  /* config options here */
-};
-
-export default nextConfig;
diff --git a/apps/login/package.json b/apps/login/package.json
deleted file mode 100644
index 8e3ef5b3be8..00000000000
--- a/apps/login/package.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "name": "thirdweb-login",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "dev": "next dev --turbopack",
-    "build": "next build",
-    "start": "next start",
-    "format": "biome format ./src --write",
-    "prelint": "biome check ./src",
-    "lint": "eslint ./src",
-    "prefix": "biome check ./src --fix",
-    "fix": "eslint ./src --fix",
-    "typecheck": "tsc --noEmit"
-  },
-  "dependencies": {
-    "@radix-ui/react-dropdown-menu": "^2.1.15",
-    "@radix-ui/react-label": "^2.1.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",
-    "class-variance-authority": "^0.7.1",
-    "clsx": "^2.1.1",
-    "jose": "6.0.11",
-    "lucide-react": "0.514.0",
-    "next": "15.3.3",
-    "next-themes": "^0.4.6",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
-    "server-only": "^0.0.1",
-    "sonner": "2.0.5",
-    "tailwind-merge": "^2.6.0",
-    "tailwindcss-animate": "^1.0.7",
-    "thirdweb": "workspace:*"
-  },
-  "devDependencies": {
-    "@eslint/eslintrc": "^3.3.1",
-    "@types/node": "22.14.1",
-    "@types/react": "19.1.8",
-    "@types/react-dom": "19.1.6",
-    "eslint": "9.24.0",
-    "eslint-config-next": "15.3.3",
-    "postcss": "8.5.5",
-    "tailwindcss": "3.4.17",
-    "typescript": "5.8.3"
-  }
-}
diff --git a/apps/login/postcss.config.mjs b/apps/login/postcss.config.mjs
deleted file mode 100644
index 1a69fd2a450..00000000000
--- a/apps/login/postcss.config.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-/** @type {import('postcss-load-config').Config} */
-const config = {
-  plugins: {
-    tailwindcss: {},
-  },
-};
-
-export default config;
diff --git a/apps/login/public/placeholder.svg b/apps/login/public/placeholder.svg
deleted file mode 100644
index e763910b27f..00000000000
--- a/apps/login/public/placeholder.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="1200" fill="none"><rect width="1200" height="1200" fill="#EAEAEA" rx="3"/><g opacity=".5"><g opacity=".5"><path fill="#FAFAFA" d="M600.709 736.5c-75.454 0-136.621-61.167-136.621-136.62 0-75.454 61.167-136.621 136.621-136.621 75.453 0 136.62 61.167 136.62 136.621 0 75.453-61.167 136.62-136.62 136.62Z"/><path stroke="#C9C9C9" stroke-width="2.418" d="M600.709 736.5c-75.454 0-136.621-61.167-136.621-136.62 0-75.454 61.167-136.621 136.621-136.621 75.453 0 136.62 61.167 136.62 136.621 0 75.453-61.167 136.62-136.62 136.62Z"/></g><path stroke="url(#a)" stroke-width="2.418" d="M0-1.209h553.581" transform="scale(1 -1) rotate(45 1163.11 91.165)"/><path stroke="url(#b)" stroke-width="2.418" d="M404.846 598.671h391.726"/><path stroke="url(#c)" stroke-width="2.418" d="M599.5 795.742V404.017"/><path stroke="url(#d)" stroke-width="2.418" d="m795.717 796.597-391.441-391.44"/><path fill="#fff" d="M600.709 656.704c-31.384 0-56.825-25.441-56.825-56.824 0-31.384 25.441-56.825 56.825-56.825 31.383 0 56.824 25.441 56.824 56.825 0 31.383-25.441 56.824-56.824 56.824Z"/><g clip-path="url(#e)"><path fill="#666" fill-rule="evenodd" d="M616.426 586.58h-31.434v16.176l3.553-3.554.531-.531h9.068l.074-.074 8.463-8.463h2.565l7.18 7.181V586.58Zm-15.715 14.654 3.698 3.699 1.283 1.282-2.565 2.565-1.282-1.283-5.2-5.199h-6.066l-5.514 5.514-.073.073v2.876a2.418 2.418 0 0 0 2.418 2.418h26.598a2.418 2.418 0 0 0 2.418-2.418v-8.317l-8.463-8.463-7.181 7.181-.071.072Zm-19.347 5.442v4.085a6.045 6.045 0 0 0 6.046 6.045h26.598a6.044 6.044 0 0 0 6.045-6.045v-7.108l1.356-1.355-1.282-1.283-.074-.073v-17.989h-38.689v23.43l-.146.146.146.147Z" clip-rule="evenodd"/></g><path stroke="#C9C9C9" stroke-width="2.418" d="M600.709 656.704c-31.384 0-56.825-25.441-56.825-56.824 0-31.384 25.441-56.825 56.825-56.825 31.383 0 56.824 25.441 56.824 56.825 0 31.383-25.441 56.824-56.824 56.824Z"/></g><defs><linearGradient id="a" x1="554.061" x2="-.48" y1=".083" y2=".087" gradientUnits="userSpaceOnUse"><stop stop-color="#C9C9C9" stop-opacity="0"/><stop offset=".208" stop-color="#C9C9C9"/><stop offset=".792" stop-color="#C9C9C9"/><stop offset="1" stop-color="#C9C9C9" stop-opacity="0"/></linearGradient><linearGradient id="b" x1="796.912" x2="404.507" y1="599.963" y2="599.965" gradientUnits="userSpaceOnUse"><stop stop-color="#C9C9C9" stop-opacity="0"/><stop offset=".208" stop-color="#C9C9C9"/><stop offset=".792" stop-color="#C9C9C9"/><stop offset="1" stop-color="#C9C9C9" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="600.792" x2="600.794" y1="403.677" y2="796.082" gradientUnits="userSpaceOnUse"><stop stop-color="#C9C9C9" stop-opacity="0"/><stop offset=".208" stop-color="#C9C9C9"/><stop offset=".792" stop-color="#C9C9C9"/><stop offset="1" stop-color="#C9C9C9" stop-opacity="0"/></linearGradient><linearGradient id="d" x1="404.85" x2="796.972" y1="403.903" y2="796.02" gradientUnits="userSpaceOnUse"><stop stop-color="#C9C9C9" stop-opacity="0"/><stop offset=".208" stop-color="#C9C9C9"/><stop offset=".792" stop-color="#C9C9C9"/><stop offset="1" stop-color="#C9C9C9" stop-opacity="0"/></linearGradient><clipPath id="e"><path fill="#fff" d="M581.364 580.535h38.689v38.689h-38.689z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/login/src/actions/create-code.ts b/apps/login/src/actions/create-code.ts
deleted file mode 100644
index 09376f43002..00000000000
--- a/apps/login/src/actions/create-code.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-"use server";
-import "server-only";
-import type { PermissionState } from "@/components/permission-card";
-import { SignJWT } from "jose";
-import { redirect } from "next/navigation";
-import { getLoginConfig } from "../api/login/config";
-import { getKeyInfo } from "../lib/keys";
-import type { Oauth2AuthorizeParams, Oauth2CodePayload } from "../lib/oauth";
-import { getValidSessionToken } from "../lib/siwe-server";
-
-export async function createCode(options: {
-  permissions: PermissionState;
-  oauthParams: Oauth2AuthorizeParams;
-}) {
-  // 1) check if the user is logged in
-  const jwt = await getValidSessionToken();
-  if (!jwt) {
-    return {
-      success: false,
-      error: "User is not logged in",
-    };
-  }
-
-  // 2) get the config for the client_id
-  const config = await getLoginConfig(options.oauthParams.client_id);
-  if (!config) {
-    return {
-      success: false,
-      error: "Invalid client_id",
-    };
-  }
-
-  // 3) TODO: validate redirect_uri against the config
-
-  // 4) get the key info
-  const { privateKey, alg } = await getKeyInfo();
-
-  // 4) Create the authorization code as a short-lived JWT
-  const now = Math.floor(Date.now() / 1000);
-  const codeExpiresInSeconds = 60; // 60 seconds
-
-  const codeJwt = await new SignJWT({
-    sub: jwt.sub,
-    scope: options.oauthParams.scope ?? "",
-    client_id: options.oauthParams.client_id,
-    code_challenge: options.oauthParams.code_challenge,
-    code_challenge_method: options.oauthParams.code_challenge_method,
-    redirect_uri: options.oauthParams.redirect_uri,
-    permissions: options.permissions,
-  } satisfies Oauth2CodePayload)
-    .setProtectedHeader({ alg: alg, typ: "JWT" })
-    .setIssuedAt(now)
-    .setExpirationTime(now + codeExpiresInSeconds)
-    .sign(privateKey);
-
-  // 4) Redirect back to the client's redirectUri with the code and state
-  const url = new URL(options.oauthParams.redirect_uri);
-  url.searchParams.set("code", codeJwt);
-  url.searchParams.set("state", options.oauthParams.state);
-
-  // redirect the user to the client's redirectUri with the code and state
-  redirect(url.toString());
-}
diff --git a/apps/login/src/actions/siwe.ts b/apps/login/src/actions/siwe.ts
deleted file mode 100644
index f499ab38d4c..00000000000
--- a/apps/login/src/actions/siwe.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-"use server";
-import "server-only";
-
-import { initDevMode } from "@/lib/dev-mode";
-import { cookies } from "next/headers";
-import { getAddress } from "thirdweb";
-import type {
-  GenerateLoginPayloadParams,
-  VerifyLoginPayloadParams,
-} from "thirdweb/auth";
-import {
-  SESSION_COOKIE_NAME,
-  SESSION_EXPIRATION_TIME_SECONDS,
-  getValidSessionToken,
-} from "../lib/siwe-server";
-import { SIWE_AUTH } from "../lib/siwe-server";
-
-initDevMode();
-
-export async function getLoginPayload(options: GenerateLoginPayloadParams) {
-  return SIWE_AUTH.generatePayload(options);
-}
-
-export async function doLogin(params: VerifyLoginPayloadParams) {
-  const result = await SIWE_AUTH.verifyPayload(params);
-  if (!result.valid) {
-    throw new Error(result.error);
-  }
-
-  const cookieStore = await cookies();
-
-  // create a session token
-  const token = await SIWE_AUTH.generateJWT(result);
-  cookieStore.set(SESSION_COOKIE_NAME, token, {
-    httpOnly: true,
-    secure: process.env.NODE_ENV === "production",
-    path: "/",
-    maxAge: SESSION_EXPIRATION_TIME_SECONDS,
-  });
-}
-
-export async function doLogout() {
-  const cookieStore = await cookies();
-  cookieStore.delete(SESSION_COOKIE_NAME);
-}
-
-export async function isLoggedIn(address: string) {
-  const jwt = await getValidSessionToken();
-  if (!jwt) {
-    return false;
-  }
-
-  try {
-    return getAddress(jwt.sub) === getAddress(address);
-  } catch {
-    return false;
-  }
-}
diff --git a/apps/login/src/api/login/config.ts b/apps/login/src/api/login/config.ts
deleted file mode 100644
index db4ece92bc3..00000000000
--- a/apps/login/src/api/login/config.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import "server-only";
-import { polygonAmoy } from "thirdweb/chains";
-import type { InAppWalletAuth } from "thirdweb/wallets";
-import type { Permission } from "../../components/permission-card";
-
-export async function getLoginConfig(clientId: string): Promise<LoginConfig> {
-  if (clientId === "demo") {
-    return DEMO_ENVIRONMENT;
-  }
-  // temporary manual config
-  if (clientId === "b24106adfb2ec212e6ec4d3b2e04db9e") {
-    return {
-      ...DEFAULT_CONFIG,
-      id: "mode_earn_app",
-      name: "Mode Earn App",
-      logo: "https://cdn.prod.website-files.com/61c25b8fda22538c7d02b8ae/64109452b73a8648ed02afee_mode-logo.svg",
-      logoLink: "https://www.modemobile.com/",
-      chainId: polygonAmoy.id,
-      sessionKeySignerAddress: "0xb89e32a18350d6df5bf0b89a227E098013C4Fa72",
-    };
-  }
-  // TODO: implement fetch for config from API server
-  return DEFAULT_CONFIG;
-}
-
-export type LoginConfig = {
-  id: string;
-  name: string;
-  logo: string;
-  logoLink: string;
-  chainId: number;
-  authOptions: Exclude<InAppWalletAuth, "backend">[];
-  permissions: Permission[];
-  sessionKeySignerAddress: string;
-};
-
-const DEMO_ENVIRONMENT: LoginConfig = {
-  id: "demo_app",
-  name: "thirdweb demo app",
-  logo: "https://thirdweb.com/brand/thirdweb-icon.svg",
-  logoLink: "https://thirdweb.com",
-  chainId: 84532,
-  sessionKeySignerAddress: "0x6f700ba0258886411D2536399624EAa7158d1742",
-  authOptions: [
-    "google",
-    "apple",
-    "facebook",
-    "discord",
-    "line",
-    "x",
-    "coinbase",
-    "farcaster",
-    "telegram",
-    "github",
-    "twitch",
-    "steam",
-    "guest",
-    "email",
-    "phone",
-    "passkey",
-    "wallet",
-  ],
-  permissions: [
-    {
-      id: "identity:read",
-      type: "toggle",
-      name: "User Identity",
-      description: "Access to read your identity information.",
-      mandatory: true,
-      initialState: true,
-    },
-    {
-      id: "contracts:write",
-      type: "toggle",
-      name: "All Contracts",
-      description: "Access to write to all smart contracts on your behalf.",
-      mandatory: true,
-      initialState: true,
-    },
-    {
-      id: "native:spend",
-      type: "number",
-      name: "Native Spend Limit",
-      description:
-        "Set the maximum amount of native currency you can spend on your behalf.",
-      mandatory: false,
-      initialState: 5,
-      min: 0,
-      step: 0.1,
-    },
-    {
-      id: "expiration",
-      type: "date",
-      name: "Expiration",
-      description: "The expiration date of these permissions.",
-      mandatory: false,
-      initialState: addToDate(new Date(), 30),
-    },
-  ],
-};
-
-const DEFAULT_CONFIG: LoginConfig = {
-  id: "default",
-  name: "thirdweb",
-  logo: "https://thirdweb.com/brand/thirdweb-icon.svg",
-  logoLink: "https://thirdweb.com",
-  chainId: 84532,
-  sessionKeySignerAddress: "0x6f700ba0258886411D2536399624EAa7158d1742",
-  authOptions: [
-    "google",
-    "apple",
-    "facebook",
-    "x",
-    "email",
-    "phone",
-    "passkey",
-    "wallet",
-    "guest",
-  ],
-  permissions: [
-    {
-      id: "identity:read",
-      type: "toggle",
-      name: "User Identity",
-      description: "Access to read your identity information.",
-      mandatory: true,
-      initialState: true,
-    },
-    {
-      id: "contracts:write",
-      type: "toggle",
-      name: "Interact with Contracts",
-      description: "Access to write to all smart contracts on your behalf.",
-      mandatory: true,
-      initialState: true,
-    },
-  ],
-};
-
-function addToDate(date: Date, days: number) {
-  const newDate = new Date(date);
-  newDate.setDate(newDate.getDate() + days);
-  return newDate;
-}
diff --git a/apps/login/src/app/api/jwks/route.ts b/apps/login/src/app/api/jwks/route.ts
deleted file mode 100644
index 00de5eabd2e..00000000000
--- a/apps/login/src/app/api/jwks/route.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { exportJWK } from "jose";
-import { NextResponse } from "next/server";
-import { getKeyInfo } from "../../../lib/keys";
-
-export async function GET() {
-  const { publicKey, kid } = await getKeyInfo();
-
-  // Convert to JWK
-  const jwk = await exportJWK(publicKey);
-
-  // Add the kid to the JWK
-  jwk.kid = kid;
-
-  return NextResponse.json({
-    // Return the JWK as array of keys (today only the one key exists)
-    keys: [jwk],
-  });
-}
diff --git a/apps/login/src/app/api/token/route.ts b/apps/login/src/app/api/token/route.ts
deleted file mode 100644
index b7f5ce4bc77..00000000000
--- a/apps/login/src/app/api/token/route.ts
+++ /dev/null
@@ -1,269 +0,0 @@
-import crypto from "node:crypto";
-import { SignJWT, jwtVerify } from "jose";
-import { type NextRequest, NextResponse } from "next/server";
-import { getKeyInfo } from "../../../lib/keys";
-import type {
-  Oauth2AuthToken,
-  Oauth2AuthTokenRequest,
-  Oauth2CodePayload,
-  Oauth2RefreshToken,
-  Oauth2RefreshTokenRequest,
-} from "../../../lib/oauth";
-
-const ACCESS_TOKEN_EXPIRATION_TIME = 900; // 15 minutes
-const REFRESH_TOKEN_EXPIRATION_TIME = 60 * 60 * 24 * 30; // 30 days
-
-// Helper for PKCE S256
-function sha256(input: string) {
-  return crypto.createHash("sha256").update(input).digest();
-}
-
-// biome-ignore lint/style/noRestrictedGlobals: is ok
-function base64url(buffer: Buffer | Uint8Array) {
-  return buffer
-    .toString("base64")
-    .replace(/=/g, "")
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_");
-}
-
-const corsHeaders = {
-  "Access-Control-Allow-Origin": "*",
-  "Access-Control-Allow-Methods": "POST, OPTIONS",
-  "Access-Control-Allow-Headers": "Content-Type",
-};
-
-export async function OPTIONS() {
-  return NextResponse.json(null, {
-    headers: {
-      "Access-Control-Allow-Origin": "*",
-      "Access-Control-Allow-Methods": "POST, OPTIONS",
-      "Access-Control-Allow-Headers": "Content-Type",
-    },
-  });
-}
-
-export async function POST(req: NextRequest) {
-  try {
-    // Retrieve form data
-    const body = (await req.json()) as
-      | Oauth2AuthTokenRequest
-      | Oauth2RefreshTokenRequest;
-    const grantType = body.grant_type;
-
-    switch (grantType) {
-      case "authorization_code":
-        return handleAuthorizationCode(body);
-      case "refresh_token":
-        return handleRefreshToken(body);
-      default:
-        return NextResponse.json(
-          { error: "unsupported_grant_type" },
-          {
-            status: 400,
-            headers: corsHeaders,
-          },
-        );
-    }
-  } catch (error) {
-    console.error(error);
-    return NextResponse.json(
-      { error: "server_error" },
-      { status: 500, headers: corsHeaders },
-    );
-  }
-}
-
-async function handleAuthorizationCode(body: Oauth2AuthTokenRequest) {
-  const code = body.code || "";
-  const codeVerifier = body.code_verifier || "";
-  const redirectUri = body.redirect_uri || "";
-  const clientId = body.client_id || "";
-
-  // Basic checks
-  if (!code || !codeVerifier || !redirectUri || !clientId) {
-    return NextResponse.json(
-      { error: "invalid_request" },
-      { status: 400, headers: corsHeaders },
-    );
-  }
-
-  const keyInfo = await getKeyInfo();
-
-  // 1) Verify the code JWT
-  let payload: Oauth2CodePayload;
-  try {
-    const { payload: verifiedPayload } = await jwtVerify<Oauth2CodePayload>(
-      code,
-      keyInfo.publicKey,
-    );
-    payload = verifiedPayload;
-
-    // verify the redirect_uri
-    if (payload.redirect_uri !== redirectUri) {
-      return NextResponse.json(
-        { error: "invalid_grant" },
-        { status: 400, headers: corsHeaders },
-      );
-    }
-    // verify the client_id
-    if (payload.client_id !== clientId) {
-      return NextResponse.json(
-        { error: "invalid_grant" },
-        { status: 400, headers: corsHeaders },
-      );
-    }
-  } catch (err) {
-    console.error("failed to verify code", err);
-    return NextResponse.json(
-      { error: "invalid_grant" },
-      { status: 400, headers: corsHeaders },
-    );
-  }
-
-  // 2) Validate PKCE
-  const { code_challenge, code_challenge_method } = payload;
-  if (!code_challenge) {
-    return NextResponse.json(
-      { error: "invalid_grant" },
-      { status: 400, headers: corsHeaders },
-    );
-  }
-
-  switch (code_challenge_method) {
-    case "S256":
-      {
-        const expectedChallenge = base64url(sha256(codeVerifier));
-        console.log(
-          "expectedChallenge",
-          expectedChallenge,
-          "code_challenge",
-          code_challenge,
-          codeVerifier,
-        );
-        if (expectedChallenge !== code_challenge) {
-          return NextResponse.json(
-            { error: "invalid_grant" },
-            { status: 400, headers: corsHeaders },
-          );
-        }
-      }
-      break;
-    case "plain": {
-      if (codeVerifier !== code_challenge) {
-        return NextResponse.json(
-          { error: "invalid_grant" },
-          { status: 400, headers: corsHeaders },
-        );
-      }
-      break;
-    }
-    default: {
-      return NextResponse.json(
-        { error: "invalid_request" },
-        { status: 400, headers: corsHeaders },
-      );
-    }
-  }
-
-  // 3) Issue short-lived access token
-
-  const now = Math.floor(Date.now() / 1000);
-  const accessTokenExpiresIn = 900; // e.g., 15 minutes
-
-  const JWT_PAYLOAD: Oauth2AuthToken = {
-    sub: payload.sub,
-    scope: payload.scope,
-    permissions: payload.permissions,
-    data: {},
-  };
-
-  const accessToken = await new SignJWT(JWT_PAYLOAD)
-    .setProtectedHeader({ alg: keyInfo.alg, typ: "JWT" })
-    .setIssuedAt(now)
-    .setExpirationTime(now + accessTokenExpiresIn)
-    .sign(keyInfo.privateKey);
-
-  // 4) Issue refresh token (longer-lived)
-  // TODO: consider storing somewhere for revocation/rotation
-  const refreshTokenExpiresIn = 60 * 60 * 24 * 30; // 30 days
-  const refreshToken = await new SignJWT({
-    originalData: JWT_PAYLOAD,
-  } satisfies Oauth2RefreshToken)
-    .setProtectedHeader({ alg: keyInfo.alg, typ: "JWT" })
-    .setIssuedAt(now)
-    .setExpirationTime(now + refreshTokenExpiresIn)
-    .sign(keyInfo.privateKey);
-
-  // 5) Return tokens
-  return NextResponse.json(
-    {
-      token_type: "Bearer",
-      access_token: accessToken,
-      expires_in: accessTokenExpiresIn,
-      refresh_token: refreshToken,
-    },
-    {
-      headers: corsHeaders,
-    },
-  );
-}
-
-async function handleRefreshToken(body: Oauth2RefreshTokenRequest) {
-  const refreshToken = body.refresh_token || "";
-  if (!refreshToken) {
-    return NextResponse.json(
-      { error: "invalid_request" },
-      { status: 400, headers: corsHeaders },
-    );
-  }
-
-  const keyInfo = await getKeyInfo();
-  // 1) Verify the refresh token JWT
-  let payload: Oauth2RefreshToken;
-  try {
-    const { payload: verifiedPayload } = await jwtVerify<Oauth2RefreshToken>(
-      refreshToken,
-      keyInfo.publicKey,
-    );
-    payload = verifiedPayload;
-    // If expired, jwtVerify will throw
-  } catch (err) {
-    console.error("failed to verify refresh token", err);
-    return NextResponse.json(
-      { error: "invalid_grant" },
-      { status: 400, headers: corsHeaders },
-    );
-  }
-
-  // 2) Issue new short-lived access token
-  const now = Math.floor(Date.now() / 1000);
-
-  const newAccessToken = await new SignJWT(payload.originalData)
-    .setProtectedHeader({ alg: keyInfo.alg, typ: "JWT" })
-    .setIssuedAt(now)
-    .setExpirationTime(now + ACCESS_TOKEN_EXPIRATION_TIME)
-    .sign(keyInfo.privateKey);
-
-  // 3) Optionally rotate refresh token
-  // TODO: do not need to to rotate this EVERY time, but also does not hurt to do, so carry on
-  const newRefreshToken = await new SignJWT({
-    originalData: payload.originalData,
-  } satisfies Oauth2RefreshToken)
-    .setProtectedHeader({ alg: keyInfo.alg, typ: "JWT" })
-    .setIssuedAt(now)
-    .setExpirationTime(now + REFRESH_TOKEN_EXPIRATION_TIME)
-    .sign(keyInfo.privateKey);
-
-  return NextResponse.json(
-    {
-      token_type: "Bearer",
-      access_token: newAccessToken,
-      expires_in: ACCESS_TOKEN_EXPIRATION_TIME,
-      refresh_token: newRefreshToken,
-    },
-    {
-      headers: corsHeaders,
-    },
-  );
-}
diff --git a/apps/login/src/app/authorize/page.tsx b/apps/login/src/app/authorize/page.tsx
deleted file mode 100644
index b9fcc018410..00000000000
--- a/apps/login/src/app/authorize/page.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import { getLoginConfig } from "@/api/login/config";
-import { LoginForm } from "@/components/login-form";
-import { ModeToggle } from "@/components/theme-toggle";
-import { notFound, redirect } from "next/navigation";
-import type { Oauth2AuthorizeParams } from "../../lib/oauth";
-
-function validateParams(searchParams: Oauth2AuthorizeParams) {
-  if (!searchParams.redirect_uri) {
-    // can't redirect so I guess it's 404
-    // TODO: show an error message
-    notFound();
-  }
-  if (searchParams.response_type !== "code") {
-    redirect(
-      `${searchParams.redirect_uri}?error=invalid_request&error_description=Invalid response type`,
-    );
-  }
-  if (!searchParams.client_id) {
-    redirect(
-      `${searchParams.redirect_uri}?error=invalid_request&error_description=Missing client_id`,
-    );
-  }
-
-  if (!searchParams.code_challenge) {
-    redirect(
-      `${searchParams.redirect_uri}?error=invalid_request&error_description=Missing code_challenge`,
-    );
-  }
-
-  if (
-    searchParams.code_challenge_method !== "S256" &&
-    searchParams.code_challenge_method !== "plain"
-  ) {
-    redirect(
-      `${searchParams.redirect_uri}?error=invalid_request&error_description=Invalid code challenge method`,
-    );
-  }
-}
-
-export default async function LoginPage(props: {
-  searchParams: Promise<Oauth2AuthorizeParams>;
-}) {
-  const searchParams = await props.searchParams;
-  // validate params
-  validateParams(searchParams);
-
-  // get the config
-  const config = await getLoginConfig(searchParams.client_id);
-
-  // if no config -> invalid client_id
-  if (!config) {
-    return (
-      <div className="flex min-h-svh flex-col items-center justify-center">
-        <div className="w-full max-w-md">
-          <p className="text-center font-medium text-lg">Invalid Client Id</p>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="grid min-h-svh lg:grid-cols-2">
-      <div className="relative hidden bg-muted lg:block">
-        <img
-          src="/placeholder.svg"
-          alt="brand content"
-          className="absolute inset-0 h-full w-full object-cover dark:brightness-[0.2] dark:grayscale"
-        />
-      </div>
-      <div className="flex flex-col gap-4 p-6 md:p-10">
-        <div className="flex items-center justify-between gap-2">
-          <a
-            href={config.logoLink}
-            className="flex items-center gap-2 font-medium"
-          >
-            <div className="flex h-6 w-6 items-center justify-center rounded-md bg-primary text-primary-foreground">
-              <img src={config.logo} alt={config.name} className="size-4" />
-            </div>
-            {config.name}
-          </a>
-          <ModeToggle />
-        </div>
-        <div className="flex flex-1 items-center justify-center py-6">
-          <div className="w-full max-w-md">
-            <LoginForm config={config} oauthParams={searchParams} />
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/login/src/app/favicon.ico b/apps/login/src/app/favicon.ico
deleted file mode 100644
index 55c8bb8b3da..00000000000
Binary files a/apps/login/src/app/favicon.ico and /dev/null differ
diff --git a/apps/login/src/app/globals.css b/apps/login/src/app/globals.css
deleted file mode 100644
index ad970d04b5f..00000000000
--- a/apps/login/src/app/globals.css
+++ /dev/null
@@ -1,115 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
-  :root {
-    --background: 0 0% 100%;
-
-    --foreground: 0 0% 3.9%;
-
-    --card: 0 0% 100%;
-
-    --card-foreground: 0 0% 3.9%;
-
-    --popover: 0 0% 100%;
-
-    --popover-foreground: 0 0% 3.9%;
-
-    --primary: 0 0% 9%;
-
-    --primary-foreground: 0 0% 98%;
-
-    --secondary: 0 0% 96.1%;
-
-    --secondary-foreground: 0 0% 9%;
-
-    --muted: 0 0% 96.1%;
-
-    --muted-foreground: 0 0% 45.1%;
-
-    --accent: 0 0% 96.1%;
-
-    --accent-foreground: 0 0% 9%;
-
-    --destructive: 0 84.2% 60.2%;
-
-    --destructive-foreground: 0 0% 98%;
-
-    --border: 0 0% 89.8%;
-
-    --input: 0 0% 89.8%;
-
-    --ring: 0 0% 3.9%;
-
-    --chart-1: 12 76% 61%;
-
-    --chart-2: 173 58% 39%;
-
-    --chart-3: 197 37% 24%;
-
-    --chart-4: 43 74% 66%;
-
-    --chart-5: 27 87% 67%;
-
-    --radius: 0.5rem;
-  }
-  .dark {
-    --background: 0 0% 3.9%;
-
-    --foreground: 0 0% 98%;
-
-    --card: 0 0% 3.9%;
-
-    --card-foreground: 0 0% 98%;
-
-    --popover: 0 0% 3.9%;
-
-    --popover-foreground: 0 0% 98%;
-
-    --primary: 0 0% 98%;
-
-    --primary-foreground: 0 0% 9%;
-
-    --secondary: 0 0% 14.9%;
-
-    --secondary-foreground: 0 0% 98%;
-
-    --muted: 0 0% 14.9%;
-
-    --muted-foreground: 0 0% 63.9%;
-
-    --accent: 0 0% 14.9%;
-
-    --accent-foreground: 0 0% 98%;
-
-    --destructive: 0 62.8% 30.6%;
-
-    --destructive-foreground: 0 0% 98%;
-
-    --border: 0 0% 14.9%;
-
-    --input: 0 0% 14.9%;
-
-    --ring: 0 0% 83.1%;
-
-    --chart-1: 220 70% 50%;
-
-    --chart-2: 160 60% 45%;
-
-    --chart-3: 30 80% 55%;
-
-    --chart-4: 280 65% 60%;
-
-    --chart-5: 340 75% 55%;
-  }
-}
-
-@layer base {
-  * {
-    @apply border-border outline-ring/50;
-  }
-  body {
-    @apply bg-background text-foreground;
-  }
-}
diff --git a/apps/login/src/app/layout.tsx b/apps/login/src/app/layout.tsx
deleted file mode 100644
index 0dd299af731..00000000000
--- a/apps/login/src/app/layout.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { Metadata } from "next";
-import { Fira_Code, Inter } from "next/font/google";
-import "./globals.css";
-import { Toaster } from "@/components/ui/sonner";
-import { Provider } from "@/providers/thirdweb-provider";
-import { ThemeProvider } from "../providers/theme-provider";
-
-const sansFont = Inter({
-  subsets: ["latin"],
-  variable: "--font-sans",
-  weight: "variable",
-});
-
-const monoFont = Fira_Code({
-  subsets: ["latin"],
-  variable: "--font-mono",
-  weight: "variable",
-});
-
-export const metadata: Metadata = {
-  title: "thirdweb login",
-};
-
-export default function RootLayout({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return (
-    <html lang="en">
-      <body className={`${sansFont.variable} ${monoFont.variable} antialiased`}>
-        <ThemeProvider
-          attribute="class"
-          defaultTheme="system"
-          enableSystem
-          disableTransitionOnChange
-        >
-          <Provider>{children}</Provider>
-          <Toaster />
-        </ThemeProvider>
-      </body>
-    </html>
-  );
-}
diff --git a/apps/login/src/components/login-form.tsx b/apps/login/src/components/login-form.tsx
deleted file mode 100644
index 999a0ed18d5..00000000000
--- a/apps/login/src/components/login-form.tsx
+++ /dev/null
@@ -1,207 +0,0 @@
-"use client";
-import { thirdwebClient } from "@/lib/thirdweb-client";
-import { useTheme } from "next-themes";
-import { redirect } from "next/navigation";
-import { toast } from "sonner";
-import { getContract, sendAndConfirmTransaction } from "thirdweb";
-import type { Chain, ThirdwebClient } from "thirdweb";
-import { defineChain } from "thirdweb/chains";
-import {
-  addSessionKey,
-  shouldUpdateSessionKey,
-} from "thirdweb/extensions/erc4337";
-import {
-  ConnectButton,
-  ConnectEmbed,
-  useActiveAccount,
-  useActiveWallet,
-  useSiweAuth,
-} from "thirdweb/react";
-import { type Account, inAppWallet } from "thirdweb/wallets";
-import { createCode } from "../actions/create-code";
-import {
-  doLogin,
-  doLogout,
-  getLoginPayload,
-  isLoggedIn,
-} from "../actions/siwe";
-import type { LoginConfig } from "../api/login/config";
-import type { Oauth2AuthorizeParams } from "../lib/oauth";
-import { PermissionCard, type PermissionState } from "./permission-card";
-import { Card, CardContent, CardHeader, CardTitle } from "./ui/card";
-
-export function LoginForm(props: {
-  config: LoginConfig;
-  oauthParams: Oauth2AuthorizeParams;
-}) {
-  const { resolvedTheme } = useTheme();
-
-  const activeWallet = useActiveWallet();
-  const activeAccount = useActiveAccount();
-
-  const siweAuth = useSiweAuth(activeWallet, activeAccount, {
-    getLoginPayload: getLoginPayload,
-    doLogin: doLogin,
-    doLogout: doLogout,
-    isLoggedIn: isLoggedIn,
-  });
-
-  // render the logged in state
-  if (activeAccount && siweAuth.isLoggedIn) {
-    return (
-      <div className="flex flex-col gap-4">
-        <Card>
-          <CardHeader>
-            <CardTitle>Your Account</CardTitle>
-          </CardHeader>
-          <CardContent>
-            <div className="flex flex-col">
-              <ConnectButton
-                accountAbstraction={{
-                  sponsorGas: true,
-                  chain: defineChain(props.config.chainId),
-                }}
-                theme={resolvedTheme === "light" ? "light" : "dark"}
-                client={thirdwebClient}
-                wallets={[
-                  inAppWallet({
-                    auth: {
-                      options: props.config.authOptions,
-                    },
-                    smartAccount: {
-                      sponsorGas: true,
-                      chain: defineChain(props.config.chainId),
-                    },
-                  }),
-                ]}
-              />
-            </div>
-          </CardContent>
-        </Card>
-        <PermissionCard
-          name={props.config.name}
-          permissions={props.config.permissions}
-          onAccept={async (permissions) => {
-            const t = toast.loading("Adding session key...", {
-              dismissible: false,
-            });
-            try {
-              // TODO: allow for an array of chainIds here
-              // should switch chain and add session key for each chainId
-              await ensureSessionKey({
-                account: activeAccount,
-                client: thirdwebClient,
-                chain: defineChain(props.config.chainId),
-                sessionKeySignerAddress: props.config.sessionKeySignerAddress,
-                permissions,
-              });
-
-              toast.loading("Finishing up...", {
-                id: t,
-              });
-
-              await createCode({
-                permissions,
-                oauthParams: props.oauthParams,
-              });
-
-              toast.success("Login successful", {
-                id: t,
-              });
-            } catch (err) {
-              console.error(err);
-              toast.error("Failed to add session key", {
-                id: t,
-              });
-            }
-          }}
-          onDeny={() => {
-            redirect(props.oauthParams.redirect_uri);
-          }}
-        />
-      </div>
-    );
-  }
-
-  return (
-    <ConnectEmbed
-      accountAbstraction={{
-        sponsorGas: true,
-        chain: defineChain(props.config.chainId),
-      }}
-      theme={resolvedTheme === "light" ? "light" : "dark"}
-      client={thirdwebClient}
-      wallets={[
-        inAppWallet({
-          auth: {
-            options: props.config.authOptions,
-          },
-          smartAccount: {
-            sponsorGas: true,
-            chain: defineChain(props.config.chainId),
-          },
-        }),
-      ]}
-      auth={{
-        getLoginPayload: getLoginPayload,
-        doLogin: doLogin,
-        doLogout: doLogout,
-        isLoggedIn: isLoggedIn,
-      }}
-    />
-  );
-}
-
-async function ensureSessionKey(options: {
-  account: Account;
-  client: ThirdwebClient;
-  chain: Chain;
-  sessionKeySignerAddress: string;
-  permissions: PermissionState;
-}) {
-  const accountContract = getContract({
-    address: options.account.address,
-    chain: options.chain,
-    client: options.client,
-  });
-
-  const newPermissions = {
-    approvedTargets:
-      typeof options.permissions["contracts:write"] === "boolean"
-        ? ("*" as const)
-        : options.permissions["contracts:write"],
-    permissionEndTimestamp: options.permissions.expiration,
-    nativeTokenLimitPerTransaction: options.permissions["native:spend"],
-  };
-
-  const needsUpdate = await shouldUpdateSessionKey({
-    accountContract,
-    sessionKeyAddress: options.sessionKeySignerAddress,
-    newPermissions,
-  });
-
-  // check if already added
-  if (!needsUpdate) {
-    return {
-      success: true,
-      message: "Session key already added",
-      transaction: null,
-    };
-  }
-  // if not added or needs to be updated, send tx to add the session key
-  const tx = await sendAndConfirmTransaction({
-    account: options.account,
-    transaction: addSessionKey({
-      account: options.account,
-      contract: accountContract,
-      sessionKeyAddress: options.sessionKeySignerAddress,
-      permissions: newPermissions,
-    }),
-  });
-
-  return {
-    success: true,
-    message: "Session key added",
-    transaction: tx,
-  };
-}
diff --git a/apps/login/src/components/permission-card.tsx b/apps/login/src/components/permission-card.tsx
deleted file mode 100644
index 8626fbba550..00000000000
--- a/apps/login/src/components/permission-card.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-"use client";
-
-import { Button } from "@/components/ui/button";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardFooter,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import {} from "@/components/ui/select";
-import { Separator } from "@/components/ui/separator";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { Lock } from "lucide-react";
-import { useState } from "react";
-
-type IdentityReadScope = {
-  id: "identity:read";
-  type: "toggle";
-  name: string;
-  description: string;
-  mandatory: true;
-  initialState: true;
-};
-
-// type ContractWriteScope = {
-//   id: "contracts:write";
-//   type: "list";
-//   name: string;
-//   description: string;
-//   mandatory: boolean;
-//   initialState: string[];
-// };
-
-type AllContractsWriteScope = {
-  id: "contracts:write";
-  type: "toggle";
-  name: string;
-  description: string;
-  mandatory: true;
-  initialState: true;
-};
-
-type NativeSpend = {
-  id: "native:spend";
-  type: "number";
-  name: string;
-  description: string;
-  mandatory: boolean;
-  initialState: number;
-  min?: number;
-  max?: number;
-  step?: number;
-};
-
-type ExpirationScope = {
-  id: "expiration";
-  type: "date";
-  name: string;
-  description: string;
-  mandatory: boolean;
-  initialState: Date;
-};
-
-export type Permission =
-  | IdentityReadScope
-  // | ContractWriteScope
-  | AllContractsWriteScope
-  | NativeSpend
-  | ExpirationScope;
-
-export type PermissionState = {
-  "contracts:write": string[] | boolean;
-  "identity:read": boolean;
-  "native:spend"?: number;
-  expiration?: Date;
-};
-
-export function PermissionCard(props: {
-  name: string;
-  permissions: Permission[];
-  onAccept: (permissions: PermissionState) => void;
-  onDeny: () => void;
-}) {
-  const [permissions, setPermissions] = useState<PermissionState>(() => {
-    const initialState = {} as PermissionState;
-    for (const perm of props.permissions) {
-      if (perm.type === "toggle") {
-        initialState[perm.id] = perm.mandatory;
-      } else if (perm.type === "number") {
-        initialState[perm.id] = perm.initialState || 0;
-      } else if (perm.type === "date") {
-        initialState[perm.id] = perm.initialState;
-      }
-    }
-    return initialState;
-  });
-
-  const handleNumberInputPermission = (id: string, value: string) => {
-    setPermissions((prev) => ({ ...prev, [id]: Number(value) }));
-  };
-
-  const handleDateInputPermission = (id: string, value: string) => {
-    setPermissions((prev) => ({ ...prev, [id]: new Date(value) }));
-  };
-
-  const mandatoryPermissions = props.permissions.filter((p) => p.mandatory);
-  const editablePermissions = props.permissions.filter((p) => !p.mandatory);
-
-  const renderPermission = (permission: Permission) => (
-    <div
-      key={permission.id}
-      className="flex items-center justify-between space-x-4 py-2"
-    >
-      <div className="flex items-center space-x-2">
-        {permission.mandatory && (
-          <Lock className="h-4 w-4 text-muted-foreground" />
-        )}
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Label
-              htmlFor={permission.id}
-              className="cursor-help font-medium text-sm leading-none"
-            >
-              {permission.name}
-            </Label>
-          </TooltipTrigger>
-          <TooltipContent>
-            <p>{permission.description}</p>
-          </TooltipContent>
-        </Tooltip>
-      </div>
-      {!permission.mandatory && (
-        <div className="flex items-center space-x-2">
-          {permission.type === "number" && (
-            <Input
-              id={permission.id}
-              type="number"
-              value={permissions[permission.id] as number}
-              onChange={(e) =>
-                handleNumberInputPermission(permission.id, e.target.value)
-              }
-              min={permission.min}
-              max={permission.max}
-              step={permission.step}
-              className="w-[100px]"
-            />
-          )}
-          {permission.type === "date" && (
-            <Input
-              id={permission.id}
-              type="date"
-              value={
-                (permissions[permission.id] as Date).toISOString().split("T")[0]
-              }
-              onChange={(e) =>
-                handleDateInputPermission(permission.id, e.target.value)
-              }
-            />
-          )}
-        </div>
-      )}
-    </div>
-  );
-
-  return (
-    <TooltipProvider>
-      <Card className="w-full max-w-2xl">
-        <CardHeader>
-          <CardTitle>App Permissions</CardTitle>
-          <CardDescription>
-            Review and manage the permissions requested by{" "}
-            <strong>{props.name}</strong>
-          </CardDescription>
-        </CardHeader>
-        <CardContent className="space-y-6">
-          <div>
-            <h3 className="mb-2 font-semibold text-lg">Requried Permissions</h3>
-            {mandatoryPermissions.map(renderPermission)}
-          </div>
-          {editablePermissions.length > 0 && (
-            <>
-              <Separator />
-              <div>
-                <h3 className="mb-2 font-semibold text-lg">
-                  Configurable Permissions
-                </h3>
-                {editablePermissions.map(renderPermission)}
-              </div>
-            </>
-          )}
-        </CardContent>
-        <CardFooter className="flex justify-between">
-          <Button variant="outline" onClick={props.onDeny}>
-            Deny All
-          </Button>
-          <Button onClick={() => props.onAccept(permissions)}>Accept</Button>
-        </CardFooter>
-      </Card>
-    </TooltipProvider>
-  );
-}
diff --git a/apps/login/src/components/theme-toggle.tsx b/apps/login/src/components/theme-toggle.tsx
deleted file mode 100644
index 240a0aac631..00000000000
--- a/apps/login/src/components/theme-toggle.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-"use client";
-
-import { Moon, Sun } from "lucide-react";
-import { useTheme } from "next-themes";
-
-import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-
-export function ModeToggle() {
-  const { setTheme } = useTheme();
-
-  return (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button variant="outline" size="icon">
-          <Sun className="dark:-rotate-90 h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:scale-0" />
-          <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
-          <span className="sr-only">Toggle theme</span>
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end">
-        <DropdownMenuItem onClick={() => setTheme("light")}>
-          Light
-        </DropdownMenuItem>
-        <DropdownMenuItem onClick={() => setTheme("dark")}>
-          Dark
-        </DropdownMenuItem>
-        <DropdownMenuItem onClick={() => setTheme("system")}>
-          System
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-}
diff --git a/apps/login/src/components/ui/button.tsx b/apps/login/src/components/ui/button.tsx
deleted file mode 100644
index 1579cf371b2..00000000000
--- a/apps/login/src/components/ui/button.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Slot } from "@radix-ui/react-slot";
-import { type VariantProps, cva } from "class-variance-authority";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const buttonVariants = cva(
-  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
-  {
-    variants: {
-      variant: {
-        default: "bg-primary text-primary-foreground hover:bg-primary/90",
-        destructive:
-          "bg-destructive text-destructive-foreground hover:bg-destructive/90",
-        outline:
-          "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
-        secondary:
-          "bg-secondary text-secondary-foreground hover:bg-secondary/80",
-        ghost: "hover:bg-accent hover:text-accent-foreground",
-        link: "text-primary underline-offset-4 hover:underline",
-      },
-      size: {
-        default: "h-10 px-4 py-2",
-        sm: "h-9 rounded-md px-3",
-        lg: "h-11 rounded-md px-8",
-        icon: "h-10 w-10",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
-    },
-  },
-);
-
-export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    VariantProps<typeof buttonVariants> {
-  asChild?: boolean;
-}
-
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : "button";
-    return (
-      <Comp
-        className={cn(buttonVariants({ variant, size, className }))}
-        ref={ref}
-        {...props}
-      />
-    );
-  },
-);
-Button.displayName = "Button";
-
-export { Button, buttonVariants };
diff --git a/apps/login/src/components/ui/card.tsx b/apps/login/src/components/ui/card.tsx
deleted file mode 100644
index 5a90768a118..00000000000
--- a/apps/login/src/components/ui/card.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const Card = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn(
-      "rounded-lg border bg-card text-card-foreground shadow-sm",
-      className,
-    )}
-    {...props}
-  />
-));
-Card.displayName = "Card";
-
-const CardHeader = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn("flex flex-col space-y-1.5 p-6", className)}
-    {...props}
-  />
-));
-CardHeader.displayName = "CardHeader";
-
-const CardTitle = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn(
-      "font-semibold text-2xl leading-none tracking-tight",
-      className,
-    )}
-    {...props}
-  />
-));
-CardTitle.displayName = "CardTitle";
-
-const CardDescription = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn("text-muted-foreground text-sm", className)}
-    {...props}
-  />
-));
-CardDescription.displayName = "CardDescription";
-
-const CardContent = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
-));
-CardContent.displayName = "CardContent";
-
-const CardFooter = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn("flex items-center p-6 pt-0", className)}
-    {...props}
-  />
-));
-CardFooter.displayName = "CardFooter";
-
-export {
-  Card,
-  CardHeader,
-  CardFooter,
-  CardTitle,
-  CardDescription,
-  CardContent,
-};
diff --git a/apps/login/src/components/ui/dropdown-menu.tsx b/apps/login/src/components/ui/dropdown-menu.tsx
deleted file mode 100644
index bf4dd503da7..00000000000
--- a/apps/login/src/components/ui/dropdown-menu.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-"use client";
-
-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
-import { Check, ChevronRight, Circle } from "lucide-react";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const DropdownMenu = DropdownMenuPrimitive.Root;
-
-const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
-
-const DropdownMenuGroup = DropdownMenuPrimitive.Group;
-
-const DropdownMenuPortal = DropdownMenuPrimitive.Portal;
-
-const DropdownMenuSub = DropdownMenuPrimitive.Sub;
-
-const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
-
-const DropdownMenuSubTrigger = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
-    inset?: boolean;
-  }
->(({ className, inset, children, ...props }, ref) => (
-  <DropdownMenuPrimitive.SubTrigger
-    ref={ref}
-    className={cn(
-      "flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
-      inset && "pl-8",
-      className,
-    )}
-    {...props}
-  >
-    {children}
-    <ChevronRight className="ml-auto" />
-  </DropdownMenuPrimitive.SubTrigger>
-));
-DropdownMenuSubTrigger.displayName =
-  DropdownMenuPrimitive.SubTrigger.displayName;
-
-const DropdownMenuSubContent = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
->(({ className, ...props }, ref) => (
-  <DropdownMenuPrimitive.SubContent
-    ref={ref}
-    className={cn(
-      "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=closed]:animate-out data-[state=open]:animate-in",
-      className,
-    )}
-    {...props}
-  />
-));
-DropdownMenuSubContent.displayName =
-  DropdownMenuPrimitive.SubContent.displayName;
-
-const DropdownMenuContent = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
->(({ className, sideOffset = 4, ...props }, ref) => (
-  <DropdownMenuPrimitive.Portal>
-    <DropdownMenuPrimitive.Content
-      ref={ref}
-      sideOffset={sideOffset}
-      className={cn(
-        "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
-        className,
-      )}
-      {...props}
-    />
-  </DropdownMenuPrimitive.Portal>
-));
-DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
-
-const DropdownMenuItem = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
-    inset?: boolean;
-  }
->(({ className, inset, ...props }, ref) => (
-  <DropdownMenuPrimitive.Item
-    ref={ref}
-    className={cn(
-      "relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
-      inset && "pl-8",
-      className,
-    )}
-    {...props}
-  />
-));
-DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;
-
-const DropdownMenuCheckboxItem = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
->(({ className, children, checked, ...props }, ref) => (
-  <DropdownMenuPrimitive.CheckboxItem
-    ref={ref}
-    className={cn(
-      "relative flex cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
-      className,
-    )}
-    checked={checked}
-    {...props}
-  >
-    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-      <DropdownMenuPrimitive.ItemIndicator>
-        <Check className="h-4 w-4" />
-      </DropdownMenuPrimitive.ItemIndicator>
-    </span>
-    {children}
-  </DropdownMenuPrimitive.CheckboxItem>
-));
-DropdownMenuCheckboxItem.displayName =
-  DropdownMenuPrimitive.CheckboxItem.displayName;
-
-const DropdownMenuRadioItem = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
->(({ className, children, ...props }, ref) => (
-  <DropdownMenuPrimitive.RadioItem
-    ref={ref}
-    className={cn(
-      "relative flex cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
-      className,
-    )}
-    {...props}
-  >
-    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-      <DropdownMenuPrimitive.ItemIndicator>
-        <Circle className="h-2 w-2 fill-current" />
-      </DropdownMenuPrimitive.ItemIndicator>
-    </span>
-    {children}
-  </DropdownMenuPrimitive.RadioItem>
-));
-DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;
-
-const DropdownMenuLabel = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Label>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
-    inset?: boolean;
-  }
->(({ className, inset, ...props }, ref) => (
-  <DropdownMenuPrimitive.Label
-    ref={ref}
-    className={cn(
-      "px-2 py-1.5 font-semibold text-sm",
-      inset && "pl-8",
-      className,
-    )}
-    {...props}
-  />
-));
-DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;
-
-const DropdownMenuSeparator = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
->(({ className, ...props }, ref) => (
-  <DropdownMenuPrimitive.Separator
-    ref={ref}
-    className={cn("-mx-1 my-1 h-px bg-muted", className)}
-    {...props}
-  />
-));
-DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName;
-
-const DropdownMenuShortcut = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLSpanElement>) => {
-  return (
-    <span
-      className={cn("ml-auto text-xs tracking-widest opacity-60", className)}
-      {...props}
-    />
-  );
-};
-DropdownMenuShortcut.displayName = "DropdownMenuShortcut";
-
-export {
-  DropdownMenu,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuCheckboxItem,
-  DropdownMenuRadioItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuShortcut,
-  DropdownMenuGroup,
-  DropdownMenuPortal,
-  DropdownMenuSub,
-  DropdownMenuSubContent,
-  DropdownMenuSubTrigger,
-  DropdownMenuRadioGroup,
-};
diff --git a/apps/login/src/components/ui/input.tsx b/apps/login/src/components/ui/input.tsx
deleted file mode 100644
index be7b421ba43..00000000000
--- a/apps/login/src/components/ui/input.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<"input">>(
-  ({ className, type, ...props }, ref) => {
-    return (
-      <input
-        type={type}
-        className={cn(
-          "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:font-medium file:text-foreground file:text-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
-          className,
-        )}
-        ref={ref}
-        {...props}
-      />
-    );
-  },
-);
-Input.displayName = "Input";
-
-export { Input };
diff --git a/apps/login/src/components/ui/label.tsx b/apps/login/src/components/ui/label.tsx
deleted file mode 100644
index 663ca2319ef..00000000000
--- a/apps/login/src/components/ui/label.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-"use client";
-
-import * as LabelPrimitive from "@radix-ui/react-label";
-import { type VariantProps, cva } from "class-variance-authority";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const labelVariants = cva(
-  "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
-);
-
-const Label = React.forwardRef<
-  React.ElementRef<typeof LabelPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
-    VariantProps<typeof labelVariants>
->(({ className, ...props }, ref) => (
-  <LabelPrimitive.Root
-    ref={ref}
-    className={cn(labelVariants(), className)}
-    {...props}
-  />
-));
-Label.displayName = LabelPrimitive.Root.displayName;
-
-export { Label };
diff --git a/apps/login/src/components/ui/select.tsx b/apps/login/src/components/ui/select.tsx
deleted file mode 100644
index 3c0034fea2b..00000000000
--- a/apps/login/src/components/ui/select.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-"use client";
-
-import * as SelectPrimitive from "@radix-ui/react-select";
-import { Check, ChevronDown, ChevronUp } from "lucide-react";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const Select = SelectPrimitive.Root;
-
-const SelectGroup = SelectPrimitive.Group;
-
-const SelectValue = SelectPrimitive.Value;
-
-const SelectTrigger = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
->(({ className, children, ...props }, ref) => (
-  <SelectPrimitive.Trigger
-    ref={ref}
-    className={cn(
-      "flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
-      className,
-    )}
-    {...props}
-  >
-    {children}
-    <SelectPrimitive.Icon asChild>
-      <ChevronDown className="h-4 w-4 opacity-50" />
-    </SelectPrimitive.Icon>
-  </SelectPrimitive.Trigger>
-));
-SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
-
-const SelectScrollUpButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
->(({ className, ...props }, ref) => (
-  <SelectPrimitive.ScrollUpButton
-    ref={ref}
-    className={cn(
-      "flex cursor-default items-center justify-center py-1",
-      className,
-    )}
-    {...props}
-  >
-    <ChevronUp className="h-4 w-4" />
-  </SelectPrimitive.ScrollUpButton>
-));
-SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
-
-const SelectScrollDownButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
->(({ className, ...props }, ref) => (
-  <SelectPrimitive.ScrollDownButton
-    ref={ref}
-    className={cn(
-      "flex cursor-default items-center justify-center py-1",
-      className,
-    )}
-    {...props}
-  >
-    <ChevronDown className="h-4 w-4" />
-  </SelectPrimitive.ScrollDownButton>
-));
-SelectScrollDownButton.displayName =
-  SelectPrimitive.ScrollDownButton.displayName;
-
-const SelectContent = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
->(({ className, children, position = "popper", ...props }, ref) => (
-  <SelectPrimitive.Portal>
-    <SelectPrimitive.Content
-      ref={ref}
-      className={cn(
-        "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
-        position === "popper" &&
-          "data-[side=left]:-translate-x-1 data-[side=top]:-translate-y-1 data-[side=right]:translate-x-1 data-[side=bottom]:translate-y-1",
-        className,
-      )}
-      position={position}
-      {...props}
-    >
-      <SelectScrollUpButton />
-      <SelectPrimitive.Viewport
-        className={cn(
-          "p-1",
-          position === "popper" &&
-            "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]",
-        )}
-      >
-        {children}
-      </SelectPrimitive.Viewport>
-      <SelectScrollDownButton />
-    </SelectPrimitive.Content>
-  </SelectPrimitive.Portal>
-));
-SelectContent.displayName = SelectPrimitive.Content.displayName;
-
-const SelectLabel = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Label>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
->(({ className, ...props }, ref) => (
-  <SelectPrimitive.Label
-    ref={ref}
-    className={cn("py-1.5 pr-2 pl-8 font-semibold text-sm", className)}
-    {...props}
-  />
-));
-SelectLabel.displayName = SelectPrimitive.Label.displayName;
-
-const SelectItem = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
->(({ className, children, ...props }, ref) => (
-  <SelectPrimitive.Item
-    ref={ref}
-    className={cn(
-      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
-      className,
-    )}
-    {...props}
-  >
-    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-      <SelectPrimitive.ItemIndicator>
-        <Check className="h-4 w-4" />
-      </SelectPrimitive.ItemIndicator>
-    </span>
-
-    <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
-  </SelectPrimitive.Item>
-));
-SelectItem.displayName = SelectPrimitive.Item.displayName;
-
-const SelectSeparator = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
->(({ className, ...props }, ref) => (
-  <SelectPrimitive.Separator
-    ref={ref}
-    className={cn("-mx-1 my-1 h-px bg-muted", className)}
-    {...props}
-  />
-));
-SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
-
-export {
-  Select,
-  SelectGroup,
-  SelectValue,
-  SelectTrigger,
-  SelectContent,
-  SelectLabel,
-  SelectItem,
-  SelectSeparator,
-  SelectScrollUpButton,
-  SelectScrollDownButton,
-};
diff --git a/apps/login/src/components/ui/separator.tsx b/apps/login/src/components/ui/separator.tsx
deleted file mode 100644
index 3cc446d24c2..00000000000
--- a/apps/login/src/components/ui/separator.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-"use client";
-
-import * as SeparatorPrimitive from "@radix-ui/react-separator";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const Separator = React.forwardRef<
-  React.ElementRef<typeof SeparatorPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
->(
-  (
-    { className, orientation = "horizontal", decorative = true, ...props },
-    ref,
-  ) => (
-    <SeparatorPrimitive.Root
-      ref={ref}
-      decorative={decorative}
-      orientation={orientation}
-      className={cn(
-        "shrink-0 bg-border",
-        orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
-        className,
-      )}
-      {...props}
-    />
-  ),
-);
-Separator.displayName = SeparatorPrimitive.Root.displayName;
-
-export { Separator };
diff --git a/apps/login/src/components/ui/sonner.tsx b/apps/login/src/components/ui/sonner.tsx
deleted file mode 100644
index 549cf8413d9..00000000000
--- a/apps/login/src/components/ui/sonner.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-"use client";
-
-import { useTheme } from "next-themes";
-import { Toaster as Sonner } from "sonner";
-
-type ToasterProps = React.ComponentProps<typeof Sonner>;
-
-const Toaster = ({ ...props }: ToasterProps) => {
-  const { theme = "system" } = useTheme();
-
-  return (
-    <Sonner
-      theme={theme as ToasterProps["theme"]}
-      className="toaster group"
-      toastOptions={{
-        classNames: {
-          toast:
-            "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",
-          description: "group-[.toast]:text-muted-foreground",
-          actionButton:
-            "group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",
-          cancelButton:
-            "group-[.toast]:bg-muted group-[.toast]:text-muted-foreground",
-        },
-      }}
-      {...props}
-    />
-  );
-};
-
-export { Toaster };
diff --git a/apps/login/src/components/ui/switch.tsx b/apps/login/src/components/ui/switch.tsx
deleted file mode 100644
index 4b6c039b12f..00000000000
--- a/apps/login/src/components/ui/switch.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-"use client";
-
-import * as SwitchPrimitives from "@radix-ui/react-switch";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const Switch = React.forwardRef<
-  React.ElementRef<typeof SwitchPrimitives.Root>,
-  React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
->(({ className, ...props }, ref) => (
-  <SwitchPrimitives.Root
-    className={cn(
-      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input",
-      className,
-    )}
-    {...props}
-    ref={ref}
-  >
-    <SwitchPrimitives.Thumb
-      className={cn(
-        "pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0",
-      )}
-    />
-  </SwitchPrimitives.Root>
-));
-Switch.displayName = SwitchPrimitives.Root.displayName;
-
-export { Switch };
diff --git a/apps/login/src/components/ui/tooltip.tsx b/apps/login/src/components/ui/tooltip.tsx
deleted file mode 100644
index 1a935647501..00000000000
--- a/apps/login/src/components/ui/tooltip.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-"use client";
-
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const TooltipProvider = TooltipPrimitive.Provider;
-
-const Tooltip = TooltipPrimitive.Root;
-
-const TooltipTrigger = TooltipPrimitive.Trigger;
-
-const TooltipContent = React.forwardRef<
-  React.ElementRef<typeof TooltipPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
->(({ className, sideOffset = 4, ...props }, ref) => (
-  <TooltipPrimitive.Content
-    ref={ref}
-    sideOffset={sideOffset}
-    className={cn(
-      "fade-in-0 zoom-in-95 data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 animate-in overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-popover-foreground text-sm shadow-md data-[state=closed]:animate-out",
-      className,
-    )}
-    {...props}
-  />
-));
-TooltipContent.displayName = TooltipPrimitive.Content.displayName;
-
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
diff --git a/apps/login/src/lib/dev-mode.ts b/apps/login/src/lib/dev-mode.ts
deleted file mode 100644
index 438c6c3358e..00000000000
--- a/apps/login/src/lib/dev-mode.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { setThirdwebDomains } from "thirdweb/utils";
-import {
-  THIRDWEB_BRIDGE_DOMAIN,
-  THIRDWEB_BUNDLER_DOMAIN,
-  THIRDWEB_INAPP_WALLET_DOMAIN,
-  THIRDWEB_PAY_DOMAIN,
-  THIRDWEB_RPC_DOMAIN,
-  THIRDWEB_SOCIAL_API_DOMAIN,
-  THIRDWEB_STORAGE_DOMAIN,
-} from "../lib/urls";
-import { getVercelEnv } from "../lib/vercel";
-
-export function initDevMode() {
-  if (getVercelEnv() !== "production") {
-    // if not on production: run this when creating a client to set the domains
-    setThirdwebDomains({
-      rpc: THIRDWEB_RPC_DOMAIN,
-      inAppWallet: THIRDWEB_INAPP_WALLET_DOMAIN,
-      pay: THIRDWEB_PAY_DOMAIN,
-      storage: THIRDWEB_STORAGE_DOMAIN,
-      social: THIRDWEB_SOCIAL_API_DOMAIN,
-      bundler: THIRDWEB_BUNDLER_DOMAIN,
-      bridge: THIRDWEB_BRIDGE_DOMAIN,
-    });
-  }
-}
diff --git a/apps/login/src/lib/keys.ts b/apps/login/src/lib/keys.ts
deleted file mode 100644
index 7e7bc7fcf9c..00000000000
--- a/apps/login/src/lib/keys.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import "server-only";
-
-import { type CryptoKey, importPKCS8, importSPKI } from "jose";
-
-const ALGORITHM = "RS256";
-
-let privateKeyPromise: Promise<CryptoKey> | null = null;
-let publicKeyPromise: Promise<CryptoKey> | null = null;
-
-export async function getKeyInfo() {
-  // Ensure these are loaded only once and cached
-  if (!privateKeyPromise) {
-    // biome-ignore lint/style/noNonNullAssertion: if this is not set the server will crash
-    privateKeyPromise = importPKCS8(process.env.RSA_PRIVATE_KEY!, ALGORITHM);
-  }
-  if (!publicKeyPromise) {
-    // biome-ignore lint/style/noNonNullAssertion: if this is not set the server will crash
-    publicKeyPromise = importSPKI(process.env.RSA_PUBLIC_KEY!, ALGORITHM);
-  }
-
-  // Wait for both imports to resolve
-  const [privateKey, publicKey] = await Promise.all([
-    privateKeyPromise,
-    publicKeyPromise,
-  ]);
-
-  return {
-    privateKey,
-    publicKey,
-    // biome-ignore lint/style/noNonNullAssertion: if this is not set the server will crash
-    kid: process.env.RSA_KEY_ID!,
-    alg: ALGORITHM,
-  };
-}
diff --git a/apps/login/src/lib/oauth.ts b/apps/login/src/lib/oauth.ts
deleted file mode 100644
index 91f3c872b66..00000000000
--- a/apps/login/src/lib/oauth.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { PermissionState } from "@/components/permission-card";
-
-export type Oauth2AuthorizeParams = {
-  client_id: string;
-  redirect_uri: string;
-  response_type: "code";
-  scope?: string; // currently unused
-  state: string;
-  code_challenge: string;
-  code_challenge_method: "S256" | "plain";
-};
-
-export type Oauth2CodePayload = {
-  sub: string;
-  scope: string;
-  client_id: string;
-  code_challenge: string;
-  code_challenge_method: "S256" | "plain";
-  redirect_uri: string;
-  permissions: PermissionState;
-};
-
-export type Oauth2AuthTokenRequest = {
-  grant_type: "authorization_code";
-  code: string;
-  code_verifier: string;
-  redirect_uri: string;
-  client_id: string;
-};
-
-export type Oauth2RefreshTokenRequest = {
-  grant_type: "refresh_token";
-  refresh_token: string;
-  redirect_uri: string;
-  client_id: string;
-};
-
-export type Oauth2AuthToken = {
-  sub: string;
-  scope: string;
-  permissions: PermissionState;
-  data?: Record<string, unknown>;
-};
-
-export type Oauth2RefreshToken = {
-  originalData: Oauth2AuthToken;
-};
diff --git a/apps/login/src/lib/siwe-server.ts b/apps/login/src/lib/siwe-server.ts
deleted file mode 100644
index 86bb57d3393..00000000000
--- a/apps/login/src/lib/siwe-server.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import "server-only";
-
-import { cookies } from "next/headers";
-import { createAuth } from "thirdweb/auth";
-import { privateKeyToAccount } from "thirdweb/wallets";
-import { initDevMode } from "./dev-mode";
-import { thirdwebClient } from "./thirdweb-client";
-
-initDevMode();
-
-export const SESSION_EXPIRATION_TIME_SECONDS = 60 * 60 * 24 * 30; // 30 days
-
-export const SESSION_COOKIE_NAME = "tw_session";
-
-export const SIWE_AUTH = createAuth({
-  domain: "login.thirdweb.com",
-  client: thirdwebClient,
-
-  adminAccount: privateKeyToAccount({
-    // biome-ignore lint/style/noNonNullAssertion: we know this is set
-    privateKey: process.env.AUTH_PKEY!,
-    client: thirdwebClient,
-  }),
-  jwt: {
-    expirationTimeSeconds: SESSION_EXPIRATION_TIME_SECONDS,
-  },
-});
-
-export async function getValidSessionToken() {
-  const cookieStore = await cookies();
-  const token = cookieStore.get(SESSION_COOKIE_NAME);
-  if (!token) {
-    return null;
-  }
-
-  const result = await SIWE_AUTH.verifyJWT({
-    jwt: token.value,
-  });
-
-  if (!result.valid) {
-    return null;
-  }
-
-  return result.parsedJWT;
-}
diff --git a/apps/login/src/lib/thirdweb-client.ts b/apps/login/src/lib/thirdweb-client.ts
deleted file mode 100644
index 1db4a07ef7b..00000000000
--- a/apps/login/src/lib/thirdweb-client.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createThirdwebClient } from "thirdweb";
-
-export const thirdwebClient = createThirdwebClient({
-  // biome-ignore lint/style/noNonNullAssertion: will throw error internally if not set
-  clientId: process.env.NEXT_PUBLIC_THIRDWEB_CLIENT_ID!,
-  // will only exist in the server environment, but that is fine
-  secretKey: process.env.THIRDWEB_SECRET_KEY,
-});
diff --git a/apps/login/src/lib/urls.ts b/apps/login/src/lib/urls.ts
deleted file mode 100644
index a5c54f2b6fd..00000000000
--- a/apps/login/src/lib/urls.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export const THIRDWEB_PAY_DOMAIN =
-  process.env.NEXT_PUBLIC_PAY_URL || "pay.thirdweb-dev.com";
-
-export const THIRDWEB_INAPP_WALLET_DOMAIN =
-  process.env.NEXT_PUBLIC_IN_APP_WALLET_URL ||
-  "embedded-wallet.thirdweb-dev.com";
-
-export const THIRDWEB_RPC_DOMAIN =
-  process.env.NEXT_PUBLIC_RPC_URL || "rpc.thirdweb-dev.com";
-
-export const THIRDWEB_STORAGE_DOMAIN =
-  process.env.NEXT_PUBLIC_STORAGE_URL || "storage.thirdweb-dev.com";
-
-export const THIRDWEB_SOCIAL_API_DOMAIN =
-  process.env.NEXT_PUBLIC_SOCIAL_URL || "social.thirdweb-dev.com";
-
-export const THIRDWEB_BUNDLER_DOMAIN =
-  process.env.NEXT_PUBLIC_BUNDLER_URL || "bundler.thirdweb-dev.com";
-
-export const THIRDWEB_BRIDGE_DOMAIN =
-  process.env.NEXT_PUBLIC_BRIDGE_URL || "bridge.thirdweb-dev.com";
diff --git a/apps/login/src/lib/utils.ts b/apps/login/src/lib/utils.ts
deleted file mode 100644
index 365058cebd7..00000000000
--- a/apps/login/src/lib/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { type ClassValue, clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
diff --git a/apps/login/src/lib/vercel.ts b/apps/login/src/lib/vercel.ts
deleted file mode 100644
index b9af323c575..00000000000
--- a/apps/login/src/lib/vercel.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export function getVercelEnv() {
-  const onVercel = process.env.vercel || process.env.NEXT_PUBLIC_VERCEL_ENV;
-  if (!onVercel) {
-    return "development";
-  }
-  return (process.env.VERCEL_ENV ||
-    process.env.NEXT_PUBLIC_VERCEL_ENV ||
-    "production") as "production" | "preview" | "development";
-}
diff --git a/apps/login/src/providers/theme-provider.tsx b/apps/login/src/providers/theme-provider.tsx
deleted file mode 100644
index f2df7ce74f7..00000000000
--- a/apps/login/src/providers/theme-provider.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-"use client";
-
-import { ThemeProvider as NextThemesProvider } from "next-themes";
-
-export function ThemeProvider({
-  children,
-  ...props
-}: React.ComponentProps<typeof NextThemesProvider>) {
-  return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
-}
diff --git a/apps/login/src/providers/thirdweb-provider.tsx b/apps/login/src/providers/thirdweb-provider.tsx
deleted file mode 100644
index ef574ae2f3e..00000000000
--- a/apps/login/src/providers/thirdweb-provider.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-"use client";
-import { initDevMode } from "@/lib/dev-mode";
-import { ThirdwebProvider } from "thirdweb/react";
-
-initDevMode();
-
-export function Provider({ children }: { children: React.ReactNode }) {
-  return <ThirdwebProvider>{children}</ThirdwebProvider>;
-}
diff --git a/apps/login/tailwind.config.ts b/apps/login/tailwind.config.ts
deleted file mode 100644
index 4b1affb351f..00000000000
--- a/apps/login/tailwind.config.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import type { Config } from "tailwindcss";
-
-export default {
-  darkMode: ["class"],
-  content: [
-    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
-    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
-  ],
-  theme: {
-    extend: {
-      colors: {
-        background: "hsl(var(--background))",
-        foreground: "hsl(var(--foreground))",
-        card: {
-          DEFAULT: "hsl(var(--card))",
-          foreground: "hsl(var(--card-foreground))",
-        },
-        popover: {
-          DEFAULT: "hsl(var(--popover))",
-          foreground: "hsl(var(--popover-foreground))",
-        },
-        primary: {
-          DEFAULT: "hsl(var(--primary))",
-          foreground: "hsl(var(--primary-foreground))",
-        },
-        secondary: {
-          DEFAULT: "hsl(var(--secondary))",
-          foreground: "hsl(var(--secondary-foreground))",
-        },
-        muted: {
-          DEFAULT: "hsl(var(--muted))",
-          foreground: "hsl(var(--muted-foreground))",
-        },
-        accent: {
-          DEFAULT: "hsl(var(--accent))",
-          foreground: "hsl(var(--accent-foreground))",
-        },
-        destructive: {
-          DEFAULT: "hsl(var(--destructive))",
-          foreground: "hsl(var(--destructive-foreground))",
-        },
-        border: "hsl(var(--border))",
-        input: "hsl(var(--input))",
-        ring: "hsl(var(--ring))",
-        chart: {
-          "1": "hsl(var(--chart-1))",
-          "2": "hsl(var(--chart-2))",
-          "3": "hsl(var(--chart-3))",
-          "4": "hsl(var(--chart-4))",
-          "5": "hsl(var(--chart-5))",
-        },
-      },
-      borderRadius: {
-        lg: "var(--radius)",
-        md: "calc(var(--radius) - 2px)",
-        sm: "calc(var(--radius) - 4px)",
-      },
-    },
-  },
-  plugins: [require("tailwindcss-animate")],
-} satisfies Config;
diff --git a/apps/login/tsconfig.json b/apps/login/tsconfig.json
deleted file mode 100644
index c1334095f87..00000000000
--- a/apps/login/tsconfig.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2017",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "incremental": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
-}
diff --git a/apps/nebula/.eslintrc.js b/apps/nebula/.eslintrc.js
index 39095430532..a4468d18d62 100644
--- a/apps/nebula/.eslintrc.js
+++ b/apps/nebula/.eslintrc.js
@@ -1,67 +1,14 @@
 module.exports = {
+  env: {
+    browser: true,
+    node: true,
+  },
   extends: [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:@next/next/recommended",
     "plugin:storybook/recommended",
   ],
-  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='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: "next/navigation",
-            importNames: ["useRouter"],
-            message:
-              'Use `import { useDashboardRouter } from "@/lib/DashboardRouter";` instead',
-          },
-          {
-            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"',
-          },
-        ],
-      },
-    ],
-  },
-  parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint", "react-compiler"],
-  parserOptions: {
-    ecmaVersion: 2019,
-    ecmaFeatures: {
-      impliedStrict: true,
-      jsx: true,
-    },
-    warnOnUnsupportedTypeScriptVersion: true,
-  },
-  settings: {
-    react: {
-      createClass: "createReactClass",
-      pragma: "React",
-      version: "detect",
-    },
-  },
   overrides: [
     // enable rule specifically for TypeScript files
     {
@@ -75,8 +22,8 @@ module.exports = {
     {
       files: ["*test.ts?(x)"],
       rules: {
-        "@typescript-eslint/no-non-null-assertion": "off",
         "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-non-null-assertion": "off",
 
         "react/display-name": "off",
       },
@@ -101,14 +48,75 @@ module.exports = {
         "import/newline-after-import": "off",
       },
     },
+    // turn OFF unused vars because biome handles it
+    {
+      files: ["*.ts", "*.tsx"],
+      rules: {
+        "@typescript-eslint/no-unused-vars": "off",
+      },
+    },
+
     // THIS NEEDS TO GO LAST!
     {
-      files: ["*.ts", "*.js", "*.tsx", "*.jsx"],
       extends: ["biome"],
+      files: ["*.ts", "*.js", "*.tsx", "*.jsx"],
     },
   ],
-  env: {
-    browser: true,
-    node: true,
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    ecmaFeatures: {
+      impliedStrict: true,
+      jsx: true,
+    },
+    ecmaVersion: 2019,
+    warnOnUnsupportedTypeScriptVersion: true,
+  },
+  plugins: ["@typescript-eslint", "react-compiler"],
+  rules: {
+    "no-restricted-imports": [
+      "error",
+      {
+        paths: [
+          {
+            importNames: ["useRouter"],
+            message:
+              'Use `import { useDashboardRouter } from "@/lib/DashboardRouter";` instead',
+            name: "next/navigation",
+          },
+          {
+            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"',
+            name: "lucide-react",
+          },
+        ],
+      },
+    ],
+    "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:
+          "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: {
+      createClass: "createReactClass",
+      pragma: "React",
+      version: "detect",
+    },
   },
 };
diff --git a/apps/nebula/biome.json b/apps/nebula/biome.json
index d879ec77ec7..780bbdcd1af 100644
--- a/apps/nebula/biome.json
+++ b/apps/nebula/biome.json
@@ -1,15 +1,4 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
-  "extends": ["../../biome.json"],
-  "overrides": [
-    {
-      "linter": {
-        "rules": {
-          "suspicious": {
-            "noImportantInKeyframe": "off"
-          }
-        }
-      }
-    }
-  ]
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
 }
diff --git a/apps/nebula/components.json b/apps/nebula/components.json
index b1dc07eb643..d6f9c61bbe9 100644
--- a/apps/nebula/components.json
+++ b/apps/nebula/components.json
@@ -1,17 +1,17 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils"
+  },
   "rsc": true,
-  "tsx": true,
+  "style": "default",
   "tailwind": {
+    "baseColor": "neutral",
     "config": "tailwind.config.js",
     "css": "src/global.css",
-    "baseColor": "neutral",
     "cssVariables": true,
     "prefix": ""
   },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils"
-  }
-}
\ No newline at end of file
+  "tsx": true
+}
diff --git a/apps/nebula/knip.json b/apps/nebula/knip.json
index c6e1afb1913..e1ef3daa50e 100644
--- a/apps/nebula/knip.json
+++ b/apps/nebula/knip.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://unpkg.com/knip@5/schema.json",
-  "next": true,
   "ignore": ["src/@/components/ui/**"],
-  "project": ["src/**"],
-  "ignoreBinaries": ["only-allow", "biome"],
-  "ignoreDependencies": ["thirdweb"]
+  "ignoreBinaries": ["only-allow"],
+  "ignoreDependencies": ["thirdweb"],
+  "next": true,
+  "project": ["src/**"]
 }
diff --git a/apps/nebula/next-sitemap.config.js b/apps/nebula/next-sitemap.config.js
index fd2986798da..43e9a97e1f5 100644
--- a/apps/nebula/next-sitemap.config.js
+++ b/apps/nebula/next-sitemap.config.js
@@ -2,19 +2,19 @@
 
 /** @type {import('next-sitemap').IConfig} */
 module.exports = {
-  siteUrl: process.env.SITE_URL || "https://nebula.thirdweb.com",
   generateRobotsTxt: true,
   robotsTxtOptions: {
     policies: [
       {
-        userAgent: "*",
         // allow all if production
         allow: process.env.VERCEL_ENV === "production" ? ["/"] : [],
         // disallow all if not production
         disallow: ["/move-funds"],
+        userAgent: "*",
       },
     ],
   },
+  siteUrl: process.env.SITE_URL || "https://nebula.thirdweb.com",
   transform: async (config, path) => {
     // ignore og image paths
     if (path.includes("_og") || path.includes("opengraph-image")) {
@@ -27,12 +27,12 @@ module.exports = {
     }
 
     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 ?? [],
     };
   },
 };
diff --git a/apps/nebula/next.config.ts b/apps/nebula/next.config.ts
index 9b584afef83..28ce29d2a55 100644
--- a/apps/nebula/next.config.ts
+++ b/apps/nebula/next.config.ts
@@ -41,35 +41,15 @@ const baseNextConfig: NextConfig = {
   eslint: {
     ignoreDuringBuilds: true,
   },
-  productionBrowserSourceMaps: false,
   experimental: {
-    webpackBuildWorker: true,
-    webpackMemoryOptimizations: true,
     serverSourceMaps: false,
     taint: true,
-  },
-  serverExternalPackages: ["pino-pretty"],
-  async rewrites() {
-    return [
-      {
-        source: "/_ph/static/:path*",
-        destination: "https://us-assets.i.posthog.com/static/:path*",
-      },
-      {
-        source: "/_ph/:path*",
-        destination: "https://us.i.posthog.com/:path*",
-      },
-      {
-        source: "/_ph/decide",
-        destination: "https://us.i.posthog.com/decide",
-      },
-    ];
+    webpackBuildWorker: true,
+    webpackMemoryOptimizations: true,
   },
   async headers() {
     return [
       {
-        // Apply these headers to all routes in your application.
-        source: "/(.*)",
         headers: [
           ...securityHeaders,
           {
@@ -77,10 +57,30 @@ const baseNextConfig: NextConfig = {
             value: "sec-ch-viewport-width",
           },
         ],
+        // Apply these headers to all routes in your application.
+        source: "/(.*)",
       },
     ];
   },
+  productionBrowserSourceMaps: false,
   reactStrictMode: true,
+  async rewrites() {
+    return [
+      {
+        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",
+      },
+    ];
+  },
+  serverExternalPackages: ["pino-pretty"],
 };
 
 export default baseNextConfig;
diff --git a/apps/nebula/package.json b/apps/nebula/package.json
index 0ccc9cf202c..135ef237b6e 100644
--- a/apps/nebula/package.json
+++ b/apps/nebula/package.json
@@ -1,22 +1,4 @@
 {
-  "name": "nebula",
-  "version": "0.0.2",
-  "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",
-    "postbuild": "next-sitemap",
-    "build:analyze": "ANALYZE=true pnpm run build",
-    "knip": "knip",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
-  },
   "dependencies": {
     "@hookform/resolvers": "^3.9.1",
     "@marsidev/react-turnstile": "^1.1.0",
@@ -58,6 +40,7 @@
     "zod": "3.25.62"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.0",
     "@chromatic-com/storybook": "4.0.0",
     "@next/eslint-plugin-next": "15.3.3",
     "@storybook/addon-docs": "9.0.8",
@@ -80,5 +63,23 @@
     "storybook": "9.0.8",
     "tailwindcss": "3.4.17",
     "typescript": "5.8.3"
-  }
+  },
+  "name": "nebula",
+  "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",
+    "knip": "knip",
+    "lint": "biome check ./src && knip && eslint ./src",
+    "postbuild": "next-sitemap",
+    "preinstall": "npx only-allow pnpm",
+    "start": "next start",
+    "storybook": "storybook dev -p 6006",
+    "typecheck": "tsc --noEmit"
+  },
+  "version": "0.0.2"
 }
diff --git a/apps/nebula/postcss.config.js b/apps/nebula/postcss.config.js
index 12a703d900d..4df9d3ba36d 100644
--- a/apps/nebula/postcss.config.js
+++ b/apps/nebula/postcss.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
     autoprefixer: {},
+    tailwindcss: {},
   },
 };
diff --git a/apps/nebula/src/@/components/blocks/ChainIcon.tsx b/apps/nebula/src/@/components/blocks/ChainIcon.tsx
index 334e647e913..fb4d7a1d33c 100644
--- a/apps/nebula/src/@/components/blocks/ChainIcon.tsx
+++ b/apps/nebula/src/@/components/blocks/ChainIcon.tsx
@@ -1,9 +1,9 @@
 "use client";
 
+import type { ThirdwebClient } from "thirdweb";
 import { Img } from "@/components/blocks/Img";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import { cn } from "@/lib/utils";
-import type { ThirdwebClient } from "thirdweb";
 
 type ImageProps = React.ComponentProps<"img">;
 
@@ -31,14 +31,15 @@ export const ChainIconClient = ({
     <Img
       {...restProps}
       // render different image element if src changes to avoid showing old image while loading new one
-      key={resolvedSrc}
+      alt={restProps.alt}
       className={cn("object-contain", restProps.className)}
-      src={resolvedSrc}
+      // eslint-disable-next-line @next/next/no-img-element
+      fallback={<img alt="" src={fallbackChainIcon} />}
+      key={resolvedSrc}
       loading={restProps.loading || "lazy"}
-      alt={restProps.alt}
       // eslint-disable-next-line @next/next/no-img-element
-      fallback={<img src={fallbackChainIcon} alt="" />}
       skeleton={<div className="animate-pulse rounded-full bg-border" />}
+      src={resolvedSrc}
     />
   );
 };
diff --git a/apps/nebula/src/@/components/blocks/FormFieldSetup.tsx b/apps/nebula/src/@/components/blocks/FormFieldSetup.tsx
index 346310925a9..d1cdfdfee71 100644
--- a/apps/nebula/src/@/components/blocks/FormFieldSetup.tsx
+++ b/apps/nebula/src/@/components/blocks/FormFieldSetup.tsx
@@ -1,7 +1,7 @@
-import { Label } from "@/components/ui/label";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { AsteriskIcon, InfoIcon } from "lucide-react";
 import type React from "react";
+import { Label } from "@/components/ui/label";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 export function FormFieldSetup(props: {
   htmlFor?: string;
diff --git a/apps/nebula/src/@/components/blocks/Img.stories.tsx b/apps/nebula/src/@/components/blocks/Img.stories.tsx
index 8a074ca74a8..2d723fe646a 100644
--- a/apps/nebula/src/@/components/blocks/Img.stories.tsx
+++ b/apps/nebula/src/@/components/blocks/Img.stories.tsx
@@ -1,14 +1,14 @@
-import { BadgeContainer } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { ImageIcon } from "lucide-react";
 import { useState } from "react";
-import { Spinner } from "../ui/Spinner/Spinner";
+import { BadgeContainer } from "@/storybook/utils";
 import { Button } from "../ui/button";
+import { Spinner } from "../ui/Spinner/Spinner";
 import { Img } from "./Img";
 
 const meta = {
-  title: "blocks/Img",
   component: Story,
+  title: "blocks/Img",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -51,24 +51,24 @@ function Story() {
 
       <BadgeContainer label="Custom Skeleton">
         <Img
-          src={undefined}
+          className="size-20"
           skeleton={
             <div className="flex items-center justify-center rounded-lg border">
               <Spinner className="size-6" />
             </div>
           }
-          className="size-20"
+          src={undefined}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Custom Fallback">
         <Img
+          className="size-20"
           fallback={
             <div className="flex items-center justify-center rounded-lg border">
               <ImageIcon className="size-10 text-muted-foreground" />
             </div>
           }
-          className="size-20"
           src="invalid-src"
         />
       </BadgeContainer>
@@ -82,7 +82,7 @@ function ToggleTest() {
   return (
     <div className="relative flex flex-col gap-10 border p-6">
       <Button
-        variant="outline"
+        className="absolute top-6 right-6 inline-flex"
         onClick={() => {
           if (src) {
             setSrc(undefined);
@@ -90,7 +90,7 @@ function ToggleTest() {
             setSrc("https://picsum.photos/400");
           }
         }}
-        className="absolute top-6 right-6 inline-flex"
+        variant="outline"
       >
         Toggle Src
       </Button>
diff --git a/apps/nebula/src/@/components/blocks/Img.tsx b/apps/nebula/src/@/components/blocks/Img.tsx
index ac94e7c966e..8970d444112 100644
--- a/apps/nebula/src/@/components/blocks/Img.tsx
+++ b/apps/nebula/src/@/components/blocks/Img.tsx
@@ -53,31 +53,31 @@ export function Img(props: imgElementProps) {
       <img
         {...restProps}
         // avoid setting empty src string to prevent request to the entire page
-        src={restProps.src || undefined}
-        ref={imgRef}
+        alt={restProps.alt || ""}
+        className={cn(
+          "fade-in-0 object-cover transition-opacity duration-300",
+          className,
+        )}
+        decoding="async"
         onError={(e) => {
           restProps.onError?.(e);
           setStatus("fallback");
         }}
+        ref={imgRef}
+        src={restProps.src || undefined}
         style={{
           opacity: status === "loaded" ? 1 : 0,
           ...restProps.style,
         }}
-        alt={restProps.alt || ""}
-        className={cn(
-          "fade-in-0 object-cover transition-opacity duration-300",
-          className,
-        )}
-        decoding="async"
       />
 
       {status !== "loaded" && (
         <div
-          style={restProps.style}
           className={cn(
             "fade-in-0 absolute inset-0 overflow-hidden transition-opacity duration-300 [&>*]:h-full [&>*]:w-full",
             className,
           )}
+          style={restProps.style}
         >
           {status === "pending" && (skeleton || defaultSkeleton)}
           {status === "fallback" && (fallback || defaultFallback)}
diff --git a/apps/nebula/src/@/components/blocks/MarkdownRenderer/markdown-renderer.stories.tsx b/apps/nebula/src/@/components/blocks/MarkdownRenderer/markdown-renderer.stories.tsx
index 91eaa0d0061..0d339329f81 100644
--- a/apps/nebula/src/@/components/blocks/MarkdownRenderer/markdown-renderer.stories.tsx
+++ b/apps/nebula/src/@/components/blocks/MarkdownRenderer/markdown-renderer.stories.tsx
@@ -2,13 +2,13 @@ import type { Meta, StoryObj } from "@storybook/nextjs";
 import { MarkdownRenderer } from "./markdown-renderer";
 
 const meta = {
-  title: "blocks/MarkdownRenderer",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/MarkdownRenderer",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -146,17 +146,14 @@ function example() {
 <br />
 `;
 
-function Story(props: {
-  disableCodeHighlight?: boolean;
-  skipHtml?: boolean;
-}) {
+function Story(props: { disableCodeHighlight?: boolean; skipHtml?: boolean }) {
   return (
     <div className="container max-w-[800px] py-10">
       <MarkdownRenderer
-        markdownText={markdownExample}
         code={{
           disableCodeHighlight: props.disableCodeHighlight,
         }}
+        markdownText={markdownExample}
         skipHtml={props.skipHtml}
       />
     </div>
diff --git a/apps/nebula/src/@/components/blocks/MarkdownRenderer/markdown-renderer.tsx b/apps/nebula/src/@/components/blocks/MarkdownRenderer/markdown-renderer.tsx
index 13bf46701a2..656dae17b05 100644
--- a/apps/nebula/src/@/components/blocks/MarkdownRenderer/markdown-renderer.tsx
+++ b/apps/nebula/src/@/components/blocks/MarkdownRenderer/markdown-renderer.tsx
@@ -1,3 +1,7 @@
+import Link from "next/link";
+import { onlyText } from "react-children-utilities";
+import ReactMarkdown from "react-markdown";
+import remarkGfm from "remark-gfm";
 import { CodeClient } from "@/components/ui/code/code.client";
 import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 import { InlineCode } from "@/components/ui/inline-code";
@@ -11,10 +15,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { cn } from "@/lib/utils";
-import Link from "next/link";
-import { onlyText } from "react-children-utilities";
-import ReactMarkdown from "react-markdown";
-import remarkGfm from "remark-gfm";
 
 export const MarkdownRenderer: React.FC<{
   markdownText: string;
@@ -41,9 +41,54 @@ export const MarkdownRenderer: React.FC<{
   return (
     <div className={className}>
       <ReactMarkdown
-        remarkPlugins={[remarkGfm]}
-        skipHtml={markdownProps.skipHtml}
         components={{
+          a: (props) => (
+            <Link
+              href={props.href ?? "#"}
+              target="_blank"
+              {...cleanedProps(props)}
+              className="mt-4 underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] hover:text-foreground hover:decoration-foreground hover:decoration-solid"
+            />
+          ),
+
+          code: ({ ...props }) => {
+            const codeStr = onlyText(props.children);
+
+            if (props?.className || codeStr.length > 100) {
+              if (code?.disableCodeHighlight || !props.className) {
+                return (
+                  <div className="my-4">
+                    {/* @ts-expect-error - TODO: fix this */}
+                    <PlainTextCodeBlock
+                      {...cleanedProps(props)}
+                      className={markdownProps.code?.className}
+                      code={onlyText(props.children).trim()}
+                    />
+                  </div>
+                );
+              }
+              const language = props.className.replace("language-", "");
+              return (
+                <div className="my-4">
+                  <CodeClient
+                    // @ts-expect-error - TODO: fix this
+                    lang={language}
+                    {...cleanedProps(props)}
+                    className={markdownProps.code?.className}
+                    code={onlyText(props.children).trim()}
+                    ignoreFormattingErrors={code?.ignoreFormattingErrors}
+                  />
+                </div>
+              );
+            }
+
+            return (
+              <InlineCode
+                className={markdownProps.inlineCode?.className}
+                code={onlyText(props.children).trim()}
+              />
+            );
+          },
           h1: (props) => (
             <h2
               className={cn(
@@ -95,57 +140,26 @@ export const MarkdownRenderer: React.FC<{
             />
           ),
 
-          a: (props) => (
-            <Link
-              href={props.href ?? "#"}
-              target="_blank"
-              {...cleanedProps(props)}
-              className="mt-4 underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] hover:text-foreground hover:decoration-foreground hover:decoration-solid"
-            />
-          ),
-
           hr: (props) => (
             <hr {...cleanedProps(props)} className="my-5 bg-border" />
           ),
-
-          code: ({ ...props }) => {
-            const codeStr = onlyText(props.children);
-
-            if (props?.className || codeStr.length > 100) {
-              if (code?.disableCodeHighlight || !props.className) {
-                return (
-                  <div className="my-4">
-                    {/* @ts-expect-error - TODO: fix this */}
-                    <PlainTextCodeBlock
-                      {...cleanedProps(props)}
-                      code={onlyText(props.children).trim()}
-                      className={markdownProps.code?.className}
-                    />
-                  </div>
-                );
-              }
-              const language = props.className.replace("language-", "");
-              return (
-                <div className="my-4">
-                  <CodeClient
-                    // @ts-expect-error - TODO: fix this
-                    lang={language}
-                    {...cleanedProps(props)}
-                    code={onlyText(props.children).trim()}
-                    ignoreFormattingErrors={code?.ignoreFormattingErrors}
-                    className={markdownProps.code?.className}
-                  />
-                </div>
-              );
-            }
-
-            return (
-              <InlineCode
-                code={onlyText(props.children).trim()}
-                className={markdownProps.inlineCode?.className}
-              />
-            );
-          },
+          li: ({ children: c, ...props }) => (
+            <li
+              className={cn(
+                "mb-1.5 text-muted-foreground leading-loose [&>p]:m-0",
+                markdownProps.li?.className,
+              )}
+              {...cleanedProps(props)}
+            >
+              {c}
+            </li>
+          ),
+          ol: (props) => (
+            <ol
+              className="mb-4 list-outside list-decimal pl-5 [&_ol_li:first-of-type]:mt-1.5 [&_ul_li:first-of-type]:mt-1.5"
+              {...cleanedProps(props)}
+            />
+          ),
 
           p: (props) => (
             <p
@@ -156,6 +170,9 @@ export const MarkdownRenderer: React.FC<{
               {...cleanedProps(props)}
             />
           ),
+          strong(props) {
+            return <strong className="font-medium" {...cleanedProps(props)} />;
+          },
 
           table: (props) => (
             <div className="mb-6">
@@ -164,6 +181,11 @@ export const MarkdownRenderer: React.FC<{
               </TableContainer>
             </div>
           ),
+          tbody: (props) => <TableBody {...cleanedProps(props)} />,
+
+          td: (props) => (
+            <TableCell {...cleanedProps(props)} className="text-left" />
+          ),
 
           th: ({ children: c, ...props }) => (
             <TableHead
@@ -173,12 +195,7 @@ export const MarkdownRenderer: React.FC<{
               {c}
             </TableHead>
           ),
-
-          td: (props) => (
-            <TableCell {...cleanedProps(props)} className="text-left" />
-          ),
           thead: (props) => <TableHeader {...cleanedProps(props)} />,
-          tbody: (props) => <TableBody {...cleanedProps(props)} />,
           tr: (props) => <TableRow {...cleanedProps(props)} />,
           ul: (props) => {
             return (
@@ -188,27 +205,9 @@ export const MarkdownRenderer: React.FC<{
               />
             );
           },
-          ol: (props) => (
-            <ol
-              className="mb-4 list-outside list-decimal pl-5 [&_ol_li:first-of-type]:mt-1.5 [&_ul_li:first-of-type]:mt-1.5"
-              {...cleanedProps(props)}
-            />
-          ),
-          li: ({ children: c, ...props }) => (
-            <li
-              className={cn(
-                "mb-1.5 text-muted-foreground leading-loose [&>p]:m-0",
-                markdownProps.li?.className,
-              )}
-              {...cleanedProps(props)}
-            >
-              {c}
-            </li>
-          ),
-          strong(props) {
-            return <strong className="font-medium" {...cleanedProps(props)} />;
-          },
         }}
+        remarkPlugins={[remarkGfm]}
+        skipHtml={markdownProps.skipHtml}
       >
         {markdownText}
       </ReactMarkdown>
@@ -219,7 +218,7 @@ export const MarkdownRenderer: React.FC<{
 function cleanedProps<T extends object & { node?: unknown }>(
   props: T,
 ): Omit<T, "node"> {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  // biome-ignore lint/correctness/noUnusedVariables: explicitly removing node here
   const { node, ...rest } = props;
   return rest;
 }
diff --git a/apps/nebula/src/@/components/blocks/MultiNetworkSelector.stories.tsx b/apps/nebula/src/@/components/blocks/MultiNetworkSelector.stories.tsx
index 3f76add6d5c..9398f0d348e 100644
--- a/apps/nebula/src/@/components/blocks/MultiNetworkSelector.stories.tsx
+++ b/apps/nebula/src/@/components/blocks/MultiNetworkSelector.stories.tsx
@@ -1,16 +1,16 @@
-import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useState } from "react";
+import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
 import { MultiNetworkSelector } from "./NetworkSelectors";
 
 const meta = {
-  title: "blocks/MultiNetworkSelector",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/MultiNetworkSelector",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -32,17 +32,14 @@ function Story() {
   );
 }
 
-function Variant(props: {
-  label: string;
-  selectedChainIds: number[];
-}) {
+function Variant(props: { label: string; selectedChainIds: number[] }) {
   const [chainIds, setChainIds] = useState<number[]>(props.selectedChainIds);
   return (
     <BadgeContainer label={props.label}>
       <MultiNetworkSelector
-        selectedChainIds={chainIds}
         client={storybookThirdwebClient}
         onChange={setChainIds}
+        selectedChainIds={chainIds}
       />
     </BadgeContainer>
   );
diff --git a/apps/nebula/src/@/components/blocks/NetworkSelectors.tsx b/apps/nebula/src/@/components/blocks/NetworkSelectors.tsx
index 9fe85684cde..339a8d0b854 100644
--- a/apps/nebula/src/@/components/blocks/NetworkSelectors.tsx
+++ b/apps/nebula/src/@/components/blocks/NetworkSelectors.tsx
@@ -1,10 +1,10 @@
 "use client";
 
+import { useCallback, useMemo } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import { MultiSelect } from "@/components/blocks/multi-select";
 import { SelectWithSearch } from "@/components/blocks/select-with-search";
 import { Badge } from "@/components/ui/badge";
-import { useCallback, useMemo } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import { useAllChainsData } from "../../hooks/chains";
 import { ChainIconClient } from "./ChainIcon";
 
@@ -98,15 +98,15 @@ export function MultiNetworkSelector(props: {
           <span className="flex grow gap-2 truncate text-left">
             <ChainIconClient
               className="size-5"
+              client={props.client}
               loading="lazy"
               src={chain.icon?.url}
-              client={props.client}
             />
             {cleanChainName(chain.name)}
           </span>
 
           {!props.disableChainId && (
-            <Badge variant="outline" className="gap-2">
+            <Badge className="gap-2" variant="outline">
               <span className="text-muted-foreground">Chain ID</span>
               {chain.chainId}
             </Badge>
@@ -119,24 +119,24 @@ export function MultiNetworkSelector(props: {
 
   return (
     <MultiSelect
-      searchPlaceholder="Search by Name or Chain Id"
-      selectedValues={props.selectedChainIds.map(String)}
-      popoverContentClassName={props.popoverContentClassName}
-      customTrigger={props.customTrigger}
-      options={options}
       align={props.align}
-      side={props.side}
-      showSelectedValuesInModal={props.showSelectedValuesInModal}
+      className={props.className}
+      customTrigger={props.customTrigger}
+      disabled={allChains.length === 0}
       onSelectedValuesChange={(chainIds) => {
         props.onChange(chainIds.map(Number));
       }}
+      options={options}
+      overrideSearchFn={searchFn}
       placeholder={
         allChains.length === 0 ? "Loading Chains..." : "Select Chains"
       }
-      disabled={allChains.length === 0}
-      overrideSearchFn={searchFn}
+      popoverContentClassName={props.popoverContentClassName}
       renderOption={renderOption}
-      className={props.className}
+      searchPlaceholder="Search by Name or Chain Id"
+      selectedValues={props.selectedChainIds.map(String)}
+      showSelectedValuesInModal={props.showSelectedValuesInModal}
+      side={props.side}
     />
   );
 }
@@ -208,15 +208,15 @@ export function SingleNetworkSelector(props: {
           <span className="flex grow gap-2 truncate text-left">
             <ChainIconClient
               className="size-5"
-              src={chain.icon?.url}
               client={props.client}
               loading="lazy"
+              src={chain.icon?.url}
             />
             {cleanChainName(chain.name)}
           </span>
 
           {!props.disableChainId && (
-            <Badge variant="outline" className="gap-2 max-sm:hidden">
+            <Badge className="gap-2 max-sm:hidden" variant="outline">
               <span className="text-muted-foreground">Chain ID</span>
               {chain.chainId}
             </Badge>
@@ -231,26 +231,26 @@ export function SingleNetworkSelector(props: {
 
   return (
     <SelectWithSearch
-      searchPlaceholder="Search by Name or Chain ID"
-      value={props.chainId?.toString()}
-      showCheck={false}
-      options={options}
+      align={props.align}
+      className={props.className}
+      closeOnSelect={true}
+      disabled={isLoadingChains}
       onValueChange={(chainId) => {
         props.onChange(Number(chainId));
       }}
-      closeOnSelect={true}
+      options={options}
+      overrideSearchFn={searchFn}
       placeholder={
         isLoadingChains
           ? "Loading Chains..."
           : props.placeholder || "Select Chain"
       }
-      overrideSearchFn={searchFn}
-      renderOption={renderOption}
-      className={props.className}
       popoverContentClassName={props.popoverContentClassName}
-      disabled={isLoadingChains}
+      renderOption={renderOption}
+      searchPlaceholder="Search by Name or Chain ID"
+      showCheck={false}
       side={props.side}
-      align={props.align}
+      value={props.chainId?.toString()}
     />
   );
 }
diff --git a/apps/nebula/src/@/components/blocks/SingleNetworkSelector.stories.tsx b/apps/nebula/src/@/components/blocks/SingleNetworkSelector.stories.tsx
index 2a2b87f5191..6eaa8a35ed6 100644
--- a/apps/nebula/src/@/components/blocks/SingleNetworkSelector.stories.tsx
+++ b/apps/nebula/src/@/components/blocks/SingleNetworkSelector.stories.tsx
@@ -1,16 +1,16 @@
-import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useState } from "react";
+import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
 import { SingleNetworkSelector } from "./NetworkSelectors";
 
 const meta = {
-  title: "blocks/SingleNetworkSelector",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/SingleNetworkSelector",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -23,12 +23,12 @@ export const Variants: Story = {
 function Story() {
   return (
     <div className="container flex max-w-6xl flex-col gap-8 py-10">
-      <Variant label="No Chain ID selected by default" chainId={undefined} />
-      <Variant label="Polygon selected by default" chainId={137} />
+      <Variant chainId={undefined} label="No Chain ID selected by default" />
+      <Variant chainId={137} label="Polygon selected by default" />
       <Variant
-        label="Show certain chains only"
         chainId={undefined}
         chainIds={[1, 137, 10]}
+        label="Show certain chains only"
       />
     </div>
   );
@@ -43,10 +43,10 @@ function Variant(props: {
   return (
     <BadgeContainer label={props.label}>
       <SingleNetworkSelector
-        client={storybookThirdwebClient}
         chainId={chainId}
-        onChange={setChainId}
         chainIds={props.chainIds}
+        client={storybookThirdwebClient}
+        onChange={setChainId}
       />
     </BadgeContainer>
   );
diff --git a/apps/nebula/src/@/components/blocks/auto-connect.tsx b/apps/nebula/src/@/components/blocks/auto-connect.tsx
index fa86400d5ed..55907421824 100644
--- a/apps/nebula/src/@/components/blocks/auto-connect.tsx
+++ b/apps/nebula/src/@/components/blocks/auto-connect.tsx
@@ -9,8 +9,8 @@ export function TWAutoConnect(props: {
 }) {
   return (
     <AutoConnect
-      client={props.client}
       accountAbstraction={props.accountAbstraction}
+      client={props.client}
     />
   );
 }
diff --git a/apps/nebula/src/@/components/blocks/buttons/MismatchButton.tsx b/apps/nebula/src/@/components/blocks/buttons/MismatchButton.tsx
index a3c56b1165d..b6cbd47b32d 100644
--- a/apps/nebula/src/@/components/blocks/buttons/MismatchButton.tsx
+++ b/apps/nebula/src/@/components/blocks/buttons/MismatchButton.tsx
@@ -1,38 +1,18 @@
 "use client";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import { getSDKTheme } from "@/config/sdk-component-theme";
-import { LOCAL_NODE_PKEY } from "@/constants/local-node";
-import { useAllChainsData } from "@/hooks/chains";
-import { cn } from "@/lib/utils";
-import type { ChainMetadataWithServices, ChainServices } from "@/types/chain";
 import { useMutation, useQuery } from "@tanstack/react-query";
 // import { getSDKTheme } from "app/(app)/components/sdk-component-theme";
 // import { useAllChainsData } from "hooks/chains/allChains";
 import { ExternalLinkIcon, UnplugIcon } from "lucide-react";
-import { useTheme } from "next-themes";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { useTheme } from "next-themes";
 import type React from "react";
 import { forwardRef, useCallback, useRef, useState } from "react";
 import { toast } from "sonner";
 import {
-  type ThirdwebClient,
   prepareTransaction,
   sendTransaction,
+  type ThirdwebClient,
   toWei,
 } from "thirdweb";
 import {
@@ -50,7 +30,27 @@ import {
   useSwitchActiveWalletChain,
   useWalletBalance,
 } from "thirdweb/react";
-import { type Wallet, privateKeyToAccount } from "thirdweb/wallets";
+import { privateKeyToAccount, type Wallet } from "thirdweb/wallets";
+import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { getSDKTheme } from "@/config/sdk-component-theme";
+import { LOCAL_NODE_PKEY } from "@/constants/local-node";
+import { useAllChainsData } from "@/hooks/chains";
+import { cn } from "@/lib/utils";
+import type { ChainMetadataWithServices, ChainServices } from "@/types/chain";
 
 const GAS_FREE_CHAINS = [
   75513, // Geek verse testnet
@@ -135,9 +135,9 @@ export const MismatchButton = forwardRef<
   if (connectionStatus === "connecting") {
     return (
       <Button
+        asChild
         className={props.className}
         size={props.size}
-        asChild
         variant="outline"
       >
         <div>
@@ -150,7 +150,7 @@ export const MismatchButton = forwardRef<
 
   if (!wallet || !chainId || !isLoggedIn) {
     return (
-      <Button className={props.className} size={props.size} asChild>
+      <Button asChild className={props.className} size={props.size}>
         <Link
           href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
         >
@@ -180,7 +180,6 @@ export const MismatchButton = forwardRef<
   return (
     <>
       <Popover
-        open={isMismatchPopoverOpen}
         onOpenChange={(v) => {
           if (v) {
             if (showSwitchChainPopover) {
@@ -190,17 +189,13 @@ export const MismatchButton = forwardRef<
             setIsMismatchPopoverOpen(false);
           }
         }}
+        open={isMismatchPopoverOpen}
       >
         <PopoverTrigger asChild>
           <Button
             {...buttonProps}
             className={cn("gap-2 disabled:opacity-100", buttonProps.className)}
             disabled={disabled}
-            type={
-              showSwitchChainPopover || showNoFundsPopup
-                ? "button"
-                : buttonProps.type
-            }
             onClick={async (e) => {
               e.stopPropagation();
 
@@ -230,6 +225,11 @@ export const MismatchButton = forwardRef<
               }
             }}
             ref={ref}
+            type={
+              showSwitchChainPopover || showNoFundsPopup
+                ? "button"
+                : buttonProps.type
+            }
           >
             {buttonProps.children}
             {showSpinner && <Spinner className="size-4 shrink-0" />}
@@ -237,24 +237,24 @@ export const MismatchButton = forwardRef<
         </PopoverTrigger>
         <PopoverContent className="min-w-[350px]" side="top" sideOffset={10}>
           <MismatchNotice
-            txChainId={txChainId}
             onClose={(hasSwitched) => {
               if (hasSwitched) {
                 setIsMismatchPopoverOpen(false);
               }
             }}
+            txChainId={txChainId}
           />
         </PopoverContent>
       </Popover>
 
       {/* Not Enough Funds */}
       <Dialog
-        open={!!dialog}
         onOpenChange={(v) => {
           if (!v) {
             setDialog(undefined);
           }
         }}
+        open={!!dialog}
       >
         <DialogContent
           className={cn(
@@ -268,6 +268,9 @@ export const MismatchButton = forwardRef<
             {dialog === "no-funds" && (
               <NoFundsDialogContent
                 chain={txChain}
+                client={props.client}
+                isLoggedIn={props.isLoggedIn}
+                onCloseModal={() => setDialog(undefined)}
                 openPayModal={() => {
                   // trackEvent({
                   //   category: "pay",
@@ -276,17 +279,13 @@ export const MismatchButton = forwardRef<
                   // });
                   setDialog("pay");
                 }}
-                onCloseModal={() => setDialog(undefined)}
-                isLoggedIn={props.isLoggedIn}
-                client={props.client}
               />
             )}
 
             {dialog === "pay" && (
               <PayEmbed
-                client={props.client}
-                theme={getSDKTheme(theme === "dark" ? "dark" : "light")}
                 className="!w-auto"
+                client={props.client}
                 payOptions={{
                   // onPurchaseSuccess(info) {
                   //   if (
@@ -324,6 +323,7 @@ export const MismatchButton = forwardRef<
                     chain: txChain,
                   },
                 }}
+                theme={getSDKTheme(theme === "dark" ? "dark" : "light")}
               />
             )}
           </DynamicHeight>
@@ -364,7 +364,7 @@ function NoFundsDialogContent(props: {
   client: ThirdwebClient;
 }) {
   const chainWithServiceInfoQuery = useQuery({
-    queryKey: ["chain-with-services", props.chain.id],
+    enabled: !!props.chain.id,
     queryFn: async () => {
       const [chainRes, chainServicesRes] = await Promise.all([
         fetchChainMetadata(props.chain.id).catch(() => undefined),
@@ -380,7 +380,7 @@ function NoFundsDialogContent(props: {
         services: chainServicesRes.services,
       } satisfies ChainMetadataWithServices;
     },
-    enabled: !!props.chain.id,
+    queryKey: ["chain-with-services", props.chain.id],
   });
 
   return (
@@ -414,9 +414,9 @@ function NoFundsDialogContent(props: {
               ) ? (
               // pay case
               <Button
-                variant="primary"
                 className="w-full"
                 onClick={props.openPayModal}
+                variant="primary"
               >
                 Buy Funds
               </Button>
@@ -427,15 +427,15 @@ function NoFundsDialogContent(props: {
       </div>
       {/* Footer */}
       <div className="flex justify-between gap-4 border-border border-t p-6">
-        <Button variant="outline" onClick={props.onCloseModal}>
+        <Button onClick={props.onCloseModal} variant="outline">
           Close
         </Button>
 
-        <Button variant="outline" asChild>
+        <Button asChild variant="outline">
           <Link
+            className="gap-2"
             href="https://portal.thirdweb.com/glossary/gas"
             target="_blank"
-            className="gap-2"
           >
             Learn about Gas <ExternalLinkIcon className="size-4" />
           </Link>
@@ -503,11 +503,11 @@ const MismatchNotice: React.FC<{
       </div>
 
       <Button
-        size="sm"
-        onClick={onSwitchWallet}
+        className="gap-2 capitalize disabled:opacity-100"
         disabled={!actuallyCanAttemptSwitch || switchNetworkMutation.isPending}
+        onClick={onSwitchWallet}
+        size="sm"
         variant="default"
-        className="gap-2 capitalize disabled:opacity-100"
       >
         {switchNetworkMutation.isPending ? (
           <Spinner className="size-4 shrink-0" />
@@ -538,13 +538,13 @@ const GetLocalHostTestnetFunds = (props: { client: ThirdwebClient }) => {
       return toast.error("No active account detected");
     }
     const faucet = privateKeyToAccount({
-      privateKey: LOCAL_NODE_PKEY,
       client: props.client,
+      privateKey: LOCAL_NODE_PKEY,
     });
     const transaction = prepareTransaction({
-      to: address,
       chain: localhost,
       client: props.client,
+      to: address,
       value: toWei("10"),
     });
     const promise = sendTransaction({
@@ -553,13 +553,13 @@ const GetLocalHostTestnetFunds = (props: { client: ThirdwebClient }) => {
     });
     toast.promise(promise, {
       error: "Failed to get funds from localhost",
-      success: "Successfully got funds from localhost",
       loading: "Requesting funds",
+      success: "Successfully got funds from localhost",
     });
   };
 
   return (
-    <Button variant="primary" onClick={requestFunds} className="w-full">
+    <Button className="w-full" onClick={requestFunds} variant="primary">
       Get Funds from Localhost
     </Button>
   );
diff --git a/apps/nebula/src/@/components/blocks/buttons/TransactionButton.stories.tsx b/apps/nebula/src/@/components/blocks/buttons/TransactionButton.stories.tsx
index 350e2ce409b..ac801eac0d5 100644
--- a/apps/nebula/src/@/components/blocks/buttons/TransactionButton.stories.tsx
+++ b/apps/nebula/src/@/components/blocks/buttons/TransactionButton.stories.tsx
@@ -1,3 +1,8 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useMutation } from "@tanstack/react-query";
+import { StarIcon } from "lucide-react";
+import { useState } from "react";
+import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import {
   Select,
@@ -9,21 +14,16 @@ import {
 } from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
 import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useMutation } from "@tanstack/react-query";
-import { StarIcon } from "lucide-react";
-import { useState } from "react";
-import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { TransactionButton } from "./TransactionButton";
 
 const meta = {
-  title: "blocks/TransactionButton",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/TransactionButton",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -41,18 +41,18 @@ function Story() {
     <ThirdwebProvider>
       <div className="container flex max-w-6xl flex-col gap-10 py-10">
         <FormFieldSetup
+          errorMessage={undefined}
           htmlFor="chain-id"
-          label="Transaction Chain Id"
           isRequired={false}
-          errorMessage={undefined}
+          label="Transaction Chain Id"
         >
           <Select
-            value={`${chainId}`}
             onValueChange={(v) => {
               setChainId(Number.parseInt(v));
             }}
+            value={`${chainId}`}
           >
-            <SelectTrigger className="w-[180px]" id="chain-id">
+            <SelectTrigger className="w-[180px]">
               <SelectValue />
             </SelectTrigger>
             <SelectContent>
@@ -82,24 +82,24 @@ function Story() {
         </div>
 
         <Variant
-          label="No Transactions"
-          transactionCount={undefined}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="No Transactions"
+          transactionCount={undefined}
         />
 
         <Variant
-          label="1 Transaction"
-          transactionCount={1}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="1 Transaction"
+          transactionCount={1}
         />
 
         <Variant
-          label="1 Transaction + children"
-          transactionCount={1}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="1 Transaction + children"
+          transactionCount={1}
         >
           <div className="flex items-center gap-2">
             <StarIcon className="size-4" />
@@ -108,10 +108,10 @@ function Story() {
         </Variant>
 
         <Variant
-          label="No Transaction count + children"
-          transactionCount={undefined}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="No Transaction count + children"
+          transactionCount={undefined}
         >
           <div className="flex items-center gap-2">
             <StarIcon className="size-4" />
@@ -120,50 +120,50 @@ function Story() {
         </Variant>
 
         <Variant
-          label="10 Transaction"
-          transactionCount={10}
           chainId={chainId}
           isLoggedIn={isLoggedIn}
+          label="10 Transaction"
+          transactionCount={10}
         />
 
         <Variant
+          chainId={chainId}
+          isLoggedIn={isLoggedIn}
           label="Destructive Variant"
           transactionCount={1}
-          chainId={chainId}
           variant="destructive"
-          isLoggedIn={isLoggedIn}
         />
 
         <Variant
+          chainId={chainId}
+          isLoggedIn={isLoggedIn}
           label="Destructive Variant, No Tx count"
           transactionCount={undefined}
-          chainId={chainId}
           variant="destructive"
-          isLoggedIn={isLoggedIn}
         />
 
         <Variant
-          label="class applied"
-          transactionCount={undefined}
           chainId={chainId}
           className="min-w-[300px]"
           isLoggedIn={isLoggedIn}
+          label="class applied"
+          transactionCount={undefined}
         />
 
         <Variant
-          label="size - sm"
-          transactionCount={undefined}
           chainId={chainId}
-          size="sm"
           isLoggedIn={isLoggedIn}
+          label="size - sm"
+          size="sm"
+          transactionCount={undefined}
         />
 
         <Variant
-          label="disabled"
-          transactionCount={undefined}
           chainId={chainId}
           disabled
           isLoggedIn={isLoggedIn}
+          label="disabled"
+          transactionCount={undefined}
         />
       </div>
     </ThirdwebProvider>
@@ -190,18 +190,18 @@ function Variant(props: {
   return (
     <BadgeContainer label={props.label}>
       <TransactionButton
+        className={props.className}
         client={storybookThirdwebClient}
         disabled={props.disabled}
-        className={props.className}
-        variant={props.variant}
+        isLoggedIn={props.isLoggedIn}
         isPending={sendTx.isPending}
         onClick={() => {
           sendTx.mutate();
         }}
+        size={props.size}
         transactionCount={props.transactionCount}
         txChainID={props.chainId}
-        size={props.size}
-        isLoggedIn={props.isLoggedIn}
+        variant={props.variant}
       >
         {props.children || "Execute Tx"}
       </TransactionButton>
diff --git a/apps/nebula/src/@/components/blocks/buttons/TransactionButton.tsx b/apps/nebula/src/@/components/blocks/buttons/TransactionButton.tsx
index 8ae0e1e5bc1..3a1bf760c77 100644
--- a/apps/nebula/src/@/components/blocks/buttons/TransactionButton.tsx
+++ b/apps/nebula/src/@/components/blocks/buttons/TransactionButton.tsx
@@ -1,13 +1,4 @@
 "use client";
-import type { Button } from "@/components/ui/button";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { useAllChainsData } from "@/hooks/chains";
-import { cn } from "@/lib/utils";
 import { ArrowLeftRightIcon } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
@@ -17,6 +8,15 @@ import {
   useConnectedWallets,
 } from "thirdweb/react";
 import type { Wallet } from "thirdweb/wallets";
+import type { Button } from "@/components/ui/button";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { useAllChainsData } from "@/hooks/chains";
+import { cn } from "@/lib/utils";
 import { MismatchButton } from "./MismatchButton";
 
 type ButtonProps = React.ComponentProps<typeof Button>;
@@ -72,14 +72,14 @@ export const TransactionButton: React.FC<TransactionButtonProps> = ({
           disableNoFundsPopup={
             disableNoFundsPopup === undefined ? false : disableNoFundsPopup
           }
-          isPending={isPending}
-          variant={variant || "primary"}
           isLoggedIn={isLoggedIn}
+          isPending={isPending}
           txChainId={txChainID}
+          variant={variant || "primary"}
           {...restButtonProps}
-          disabled={disabled}
           checkBalance={checkBalance}
           className={cn("relative overflow-hidden", restButtonProps.className)}
+          disabled={disabled}
           style={{
             paddingLeft: transactionCount
               ? `${txCountDivWidth + 16}px`
@@ -117,7 +117,7 @@ export const TransactionButton: React.FC<TransactionButtonProps> = ({
         </MismatchButton>
       </PopoverTrigger>
 
-      <PopoverContent className="min-w-[300px]" sideOffset={10} side="top">
+      <PopoverContent className="min-w-[300px]" side="top" sideOffset={10}>
         <ExternalApprovalNotice />
       </PopoverContent>
     </Popover>
diff --git a/apps/nebula/src/@/components/blocks/client-only.tsx b/apps/nebula/src/@/components/blocks/client-only.tsx
index 87d7ef5580e..00b85baeca5 100644
--- a/apps/nebula/src/@/components/blocks/client-only.tsx
+++ b/apps/nebula/src/@/components/blocks/client-only.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { type ReactNode, useEffect, useState } from "react";
+import { cn } from "@/lib/utils";
 
 interface ClientOnlyProps {
   /**
diff --git a/apps/nebula/src/@/components/blocks/multi-select.stories.tsx b/apps/nebula/src/@/components/blocks/multi-select.stories.tsx
index 9fdc1e604dc..e39aea925b2 100644
--- a/apps/nebula/src/@/components/blocks/multi-select.stories.tsx
+++ b/apps/nebula/src/@/components/blocks/multi-select.stories.tsx
@@ -1,16 +1,16 @@
-import { BadgeContainer } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useMemo, useState } from "react";
+import { BadgeContainer } from "@/storybook/utils";
 import { MultiSelect } from "./multi-select";
 
 const meta = {
-  title: "blocks/MultiSelect",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/MultiSelect",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -22,26 +22,26 @@ export const Variants: Story = {
 
 function createList(len: number) {
   return Array.from({ length: len }, (_, i) => ({
-    value: `${i}`,
     label: `Item ${i}`,
+    value: `${i}`,
   }));
 }
 
 function Story() {
   return (
     <div className="container flex max-w-6xl flex-col gap-6 py-10">
-      <VariantTest defaultValues={[]} storyLabel="5 items" listLen={5} />
-      <VariantTest defaultValues={[]} storyLabel="5000 items" listLen={5000} />
+      <VariantTest defaultValues={[]} listLen={5} storyLabel="5 items" />
+      <VariantTest defaultValues={[]} listLen={5000} storyLabel="5000 items" />
       <VariantTest
         defaultValues={["1", "3", "5"]}
-        storyLabel="20 items, 3 selected by default"
         listLen={20}
+        storyLabel="20 items, 3 selected by default"
       />
       <VariantTest
         defaultValues={["1", "2", "3", "4", "5", "6", "7"]}
-        storyLabel="20 items, 7 selected, show max 3"
         listLen={20}
         maxCount={3}
+        storyLabel="20 items, 7 selected, show max 3"
       />
     </div>
   );
@@ -59,13 +59,13 @@ function VariantTest(props: {
   return (
     <BadgeContainer label={props.storyLabel}>
       <MultiSelect
-        selectedValues={values}
-        options={list}
+        maxCount={props.maxCount}
         onSelectedValuesChange={(values) => {
           setValues(values);
         }}
+        options={list}
         placeholder="Select items"
-        maxCount={props.maxCount}
+        selectedValues={values}
       />
     </BadgeContainer>
   );
diff --git a/apps/nebula/src/@/components/blocks/multi-select.tsx b/apps/nebula/src/@/components/blocks/multi-select.tsx
index 591a4bc5b9a..2ea784e5a0c 100644
--- a/apps/nebula/src/@/components/blocks/multi-select.tsx
+++ b/apps/nebula/src/@/components/blocks/multi-select.tsx
@@ -1,6 +1,8 @@
-/* eslint-disable no-restricted-syntax */
+/** biome-ignore-all lint/a11y/useSemanticElements: TODO */
 "use client";
 
+import { CheckIcon, ChevronDownIcon, SearchIcon, XIcon } from "lucide-react";
+import { forwardRef, useCallback, useMemo, useRef, useState } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Popover,
@@ -9,18 +11,9 @@ import {
 } from "@/components/ui/popover";
 import { Separator } from "@/components/ui/separator";
 import { cn } from "@/lib/utils";
-import { CheckIcon, ChevronDownIcon, SearchIcon, XIcon } from "lucide-react";
-import {
-  forwardRef,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
 import { useShowMore } from "../../lib/useShowMore";
-import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 import { Input } from "../ui/input";
+import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 
 interface MultiSelectProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement> {
@@ -150,58 +143,48 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
 
     // scroll to top when options change
     const popoverElRef = useRef<HTMLDivElement>(null);
-    // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
-    useEffect(() => {
-      const scrollContainer =
-        popoverElRef.current?.querySelector("[data-scrollable]");
-      if (scrollContainer) {
-        scrollContainer.scrollTo({
-          top: 0,
-        });
-      }
-    }, [searchValue]);
 
     return (
-      <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen} modal>
+      <Popover modal onOpenChange={setIsPopoverOpen} open={isPopoverOpen}>
         <PopoverTrigger asChild>
           {props.customTrigger || (
             <Button
               ref={ref}
               {...props}
-              onClick={handleTogglePopover}
               className={cn(
                 "flex h-auto min-h-10 w-full items-center justify-between rounded-md border border-border bg-inherit p-3 hover:bg-inherit",
                 className,
               )}
+              onClick={handleTogglePopover}
             >
               {selectedValues.length > 0 ? (
                 <div className="flex w-full items-center justify-between">
                   <SelectedChainsBadges
-                    selectedValues={selectedValues}
-                    options={options}
+                    clearExtraOptions={clearExtraOptions}
                     maxCount={maxCount}
                     onClose={handleClear}
+                    options={options}
+                    selectedValues={selectedValues}
                     toggleOption={toggleOption}
-                    clearExtraOptions={clearExtraOptions}
                   />
                   <div className="flex items-center justify-between gap-2">
                     {/* Clear All */}
-                    {/* biome-ignore lint/a11y/useKeyWithClickEvents: <explanation> */}
-                    {/* biome-ignore lint/a11y/useFocusableInteractive: <explanation> */}
+                    {/* biome-ignore lint/a11y/useKeyWithClickEvents: TODO */}
+                    {/* biome-ignore lint/a11y/useFocusableInteractive: TODO */}
                     <div
-                      role="button"
+                      className="rounded p-1 hover:bg-accent"
                       onClick={(event) => {
                         event.stopPropagation();
                         handleClear();
                       }}
-                      className="rounded p-1 hover:bg-accent"
+                      role="button"
                     >
                       <XIcon className="h-4 cursor-pointer text-muted-foreground" />
                     </div>
 
                     <Separator
-                      orientation="vertical"
                       className="flex h-full min-h-6"
+                      orientation="vertical"
                     />
                     <ChevronDownIcon className="h-4 cursor-pointer text-muted-foreground" />
                   </div>
@@ -218,31 +201,41 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
           )}
         </PopoverTrigger>
         <PopoverContent
+          align={align}
           className={cn(
             "flex max-h-[500px] flex-col p-0",
             popoverContentClassName,
           )}
-          align={align}
+          onEscapeKeyDown={() => setIsPopoverOpen(false)}
+          ref={popoverElRef}
           side={side}
           sideOffset={10}
-          onEscapeKeyDown={() => setIsPopoverOpen(false)}
           style={{
-            width: "var(--radix-popover-trigger-width)",
             height:
               "calc(var(--radix-popover-content-available-height) - 40px)",
+            width: "var(--radix-popover-trigger-width)",
           }}
-          ref={popoverElRef}
         >
           {/* Search */}
           <div className="relative">
             <Input
-              placeholder={searchPlaceholder || "Search"}
-              value={searchValue}
-              // do not focus on the input when the popover opens to avoid opening the keyboard
-              tabIndex={-1}
-              onChange={(e) => setSearchValue(e.target.value)}
               className="!h-auto rounded-b-none border-0 border-border border-b py-4 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0"
+              onChange={(e) => {
+                setSearchValue(e.target.value);
+                // scroll to top when search value changes directly
+                const scrollContainer =
+                  popoverElRef.current?.querySelector("[data-scrollable]");
+                if (scrollContainer) {
+                  scrollContainer.scrollTo({
+                    top: 0,
+                  });
+                }
+              }}
+              // do not focus on the input when the popover opens to avoid opening the keyboard
               onKeyDown={handleInputKeyDown}
+              placeholder={searchPlaceholder || "Search"}
+              tabIndex={-1}
+              value={searchValue}
             />
             <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-4 size-4 text-muted-foreground" />
           </div>
@@ -255,8 +248,8 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
 
           {optionsToShow.length > 0 && (
             <ScrollShadow
-              scrollableClassName="p-1 h-full"
               className="flex-1 rounded"
+              scrollableClassName="p-1 h-full"
             >
               {/* List */}
               <div>
@@ -264,15 +257,15 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
                   const isSelected = selectedValues.includes(option.value);
                   return (
                     <Button
-                      key={option.value}
-                      role="option"
                       aria-selected={isSelected}
-                      onClick={() => toggleOption(option.value)}
-                      variant="ghost"
                       className="flex w-full cursor-pointer justify-start gap-3 rounded-sm px-3 py-2 text-left"
+                      key={option.value}
+                      onClick={() => toggleOption(option.value)}
                       ref={
                         i === optionsToShow.length - 1 ? lastItemRef : undefined
                       }
+                      role="option"
+                      variant="ghost"
                     >
                       <div
                         className={cn(
@@ -298,12 +291,12 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
           {showSelectedValuesInModal && selectedValues.length > 0 && (
             <div className="border-t px-3 py-3">
               <SelectedChainsBadges
-                selectedValues={selectedValues}
-                options={options}
+                clearExtraOptions={clearExtraOptions}
                 maxCount={maxCount}
                 onClose={handleClear}
+                options={options}
+                selectedValues={selectedValues}
                 toggleOption={toggleOption}
-                clearExtraOptions={clearExtraOptions}
               />
             </div>
           )}
@@ -313,10 +306,7 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
   },
 );
 
-function ClosableBadge(props: {
-  label: string;
-  onClose: () => void;
-}) {
+function ClosableBadge(props: { label: string; onClose: () => void }) {
   return (
     <span className="flex items-center gap-3 rounded-xl border border-border bg-muted px-2 py-1 text-foreground text-xs">
       {props.label}
diff --git a/apps/nebula/src/@/components/blocks/select-with-search.stories.tsx b/apps/nebula/src/@/components/blocks/select-with-search.stories.tsx
index 20a3f740811..d9deefe53ec 100644
--- a/apps/nebula/src/@/components/blocks/select-with-search.stories.tsx
+++ b/apps/nebula/src/@/components/blocks/select-with-search.stories.tsx
@@ -1,16 +1,16 @@
-import { BadgeContainer } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useMemo, useState } from "react";
+import { BadgeContainer } from "@/storybook/utils";
 import { SelectWithSearch } from "./select-with-search";
 
 const meta = {
-  title: "blocks/SelectWithSearch",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "blocks/SelectWithSearch",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -22,20 +22,20 @@ export const Variants: Story = {
 
 function createList(len: number) {
   return Array.from({ length: len }, (_, i) => ({
-    value: `${i}`,
     label: `Item ${i}`,
+    value: `${i}`,
   }));
 }
 
 function Story() {
   return (
     <div className="container flex max-w-6xl flex-col gap-6 py-10">
-      <VariantTest storyLabel="5 items" listLen={5} />
-      <VariantTest storyLabel="5000 items" listLen={5000} />
+      <VariantTest listLen={5} storyLabel="5 items" />
+      <VariantTest listLen={5000} storyLabel="5000 items" />
       <VariantTest
         defaultValue={"3"}
-        storyLabel="20 items, 3 selected by default"
         listLen={20}
+        storyLabel="20 items, 3 selected by default"
       />
     </div>
   );
@@ -52,10 +52,10 @@ function VariantTest(props: {
   return (
     <BadgeContainer label={props.storyLabel}>
       <SelectWithSearch
-        value={value}
-        options={list}
         onValueChange={setValue}
+        options={list}
         placeholder="Select items"
+        value={value}
       />
     </BadgeContainer>
   );
diff --git a/apps/nebula/src/@/components/blocks/select-with-search.tsx b/apps/nebula/src/@/components/blocks/select-with-search.tsx
index 13f18cbba24..d9ee03ffbb3 100644
--- a/apps/nebula/src/@/components/blocks/select-with-search.tsx
+++ b/apps/nebula/src/@/components/blocks/select-with-search.tsx
@@ -1,6 +1,7 @@
-/* eslint-disable no-restricted-syntax */
 "use client";
 
+import { CheckIcon, ChevronDownIcon, SearchIcon } from "lucide-react";
+import React, { useMemo, useRef } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Popover,
@@ -8,11 +9,9 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { cn } from "@/lib/utils";
-import { CheckIcon, ChevronDownIcon, SearchIcon } from "lucide-react";
-import React, { useRef, useMemo, useEffect } from "react";
 import { useShowMore } from "../../lib/useShowMore";
-import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 import { Input } from "../ui/input";
+import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 
 interface SelectWithSearchProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement> {
@@ -103,28 +102,18 @@ export const SelectWithSearch = React.forwardRef<
 
     // scroll to top when options change
     const popoverElRef = useRef<HTMLDivElement>(null);
-    // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
-    useEffect(() => {
-      const scrollContainer =
-        popoverElRef.current?.querySelector("[data-scrollable]");
-      if (scrollContainer) {
-        scrollContainer.scrollTo({
-          top: 0,
-        });
-      }
-    }, [searchValue]);
 
     return (
-      <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen} modal>
+      <Popover modal onOpenChange={setIsPopoverOpen} open={isPopoverOpen}>
         <PopoverTrigger asChild>
           <Button
             ref={ref}
             {...props}
-            onClick={() => setIsPopoverOpen(true)}
             className={cn(
               "flex w-full items-center justify-between rounded-md border border-border bg-inherit p-3 hover:bg-inherit",
               className,
             )}
+            onClick={() => setIsPopoverOpen(true)}
           >
             <div className="flex w-full items-center justify-between gap-2">
               <span
@@ -143,32 +132,42 @@ export const SelectWithSearch = React.forwardRef<
         </PopoverTrigger>
 
         <PopoverContent
-          className={cn("p-0", popoverContentClassName)}
           align={align || "center"}
+          className={cn("p-0", popoverContentClassName)}
+          onEscapeKeyDown={() => setIsPopoverOpen(false)}
+          ref={popoverElRef}
           side={side}
           sideOffset={10}
-          onEscapeKeyDown={() => setIsPopoverOpen(false)}
           style={{
-            width: "var(--radix-popover-trigger-width)",
             maxHeight: "var(--radix-popover-content-available-height)",
+            width: "var(--radix-popover-trigger-width)",
           }}
-          ref={popoverElRef}
         >
           <div>
             {/* Search */}
             <div className="relative">
               <Input
+                className="!h-auto rounded-b-none border-0 border-border border-b py-3 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0"
+                onChange={(e) => {
+                  setSearchValue(e.target.value);
+                  // just scroll to top when search value changes directly
+                  const scrollContainer =
+                    popoverElRef.current?.querySelector("[data-scrollable]");
+                  if (scrollContainer) {
+                    scrollContainer.scrollTo({
+                      top: 0,
+                    });
+                  }
+                }}
                 placeholder={searchPlaceholder || "Search"}
                 value={searchValue}
-                onChange={(e) => setSearchValue(e.target.value)}
-                className="!h-auto rounded-b-none border-0 border-border border-b py-3 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0"
               />
               <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-4 size-4 text-muted-foreground" />
             </div>
 
             <ScrollShadow
-              scrollableClassName="max-h-[min(calc(var(--radix-popover-content-available-height)-60px),350px)] p-1"
               className="rounded"
+              scrollableClassName="max-h-[min(calc(var(--radix-popover-content-available-height)-60px),350px)] p-1"
             >
               {/* List */}
               <div>
@@ -182,20 +181,21 @@ export const SelectWithSearch = React.forwardRef<
                   const isSelected = value === option.value;
                   return (
                     <Button
-                      key={option.value}
-                      role="option"
                       aria-selected={isSelected}
+                      className="flex w-full cursor-pointer justify-start gap-3 rounded-sm px-3 py-2 text-left"
+                      key={option.value}
                       onClick={() => {
                         onValueChange(option.value);
                         if (closeOnSelect) {
                           setIsPopoverOpen(false);
                         }
                       }}
-                      variant="ghost"
-                      className="flex w-full cursor-pointer justify-start gap-3 rounded-sm px-3 py-2 text-left"
                       ref={
                         i === optionsToShow.length - 1 ? lastItemRef : undefined
                       }
+                      // biome-ignore lint/a11y/useSemanticElements: TODO
+                      role="option"
+                      variant="ghost"
                     >
                       {showCheck && (
                         <div className="flex size-4 items-center justify-center">
diff --git a/apps/nebula/src/@/components/blocks/skeletons/GenericLoadingPage.tsx b/apps/nebula/src/@/components/blocks/skeletons/GenericLoadingPage.tsx
index 23a492985fd..bd3ce7076f6 100644
--- a/apps/nebula/src/@/components/blocks/skeletons/GenericLoadingPage.tsx
+++ b/apps/nebula/src/@/components/blocks/skeletons/GenericLoadingPage.tsx
@@ -3,11 +3,7 @@
 import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { cn } from "../../../lib/utils";
 
-export function GenericLoadingPage({
-  className,
-}: {
-  className?: string;
-}) {
+export function GenericLoadingPage({ className }: { className?: string }) {
   return (
     <div
       className={cn(
diff --git a/apps/nebula/src/@/components/blocks/wallet-address.tsx b/apps/nebula/src/@/components/blocks/wallet-address.tsx
index 75a7ac6a8a0..3ee3086c92b 100644
--- a/apps/nebula/src/@/components/blocks/wallet-address.tsx
+++ b/apps/nebula/src/@/components/blocks/wallet-address.tsx
@@ -1,4 +1,8 @@
 "use client";
+import { CheckIcon, CopyIcon, XIcon } from "lucide-react";
+import { useMemo } from "react";
+import { isAddress, type ThirdwebClient, ZERO_ADDRESS } from "thirdweb";
+import { Blobbie, type SocialProfile, useSocialProfiles } from "thirdweb/react";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import {
   HoverCard,
@@ -7,11 +11,6 @@ import {
 } from "@/components/ui/hover-card";
 import { useClipboard } from "@/hooks/use-clipboard";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { CheckIcon, CopyIcon, XIcon } from "lucide-react";
-import { useMemo } from "react";
-import { type ThirdwebClient, isAddress } from "thirdweb";
-import { ZERO_ADDRESS } from "thirdweb";
-import { Blobbie, type SocialProfile, useSocialProfiles } from "thirdweb/react";
 import { cn } from "../../lib/utils";
 import { Badge } from "../ui/badge";
 import { Button } from "../ui/button";
@@ -47,7 +46,7 @@ export function WalletAddress(props: {
 
   if (!isAddress(address)) {
     return (
-      <ToolTipLabel label={address} hoverable>
+      <ToolTipLabel hoverable label={address}>
         <span className="flex items-center gap-2 underline-offset-4 hover:underline">
           <div className="flex size-6 items-center justify-center rounded-full border bg-background">
             <XIcon className="size-4 text-muted-foreground" />
@@ -70,19 +69,19 @@ export function WalletAddress(props: {
         tabIndex={props.preventOpenOnFocus ? -1 : undefined}
       >
         <Button
-          onClick={(e) => e.stopPropagation()}
-          variant="link"
           className={cn(
             "flex flex-row items-center gap-2 px-0",
             props.className,
           )}
+          onClick={(e) => e.stopPropagation()}
+          variant="link"
         >
           {address && (
             <WalletAvatar
               address={address}
+              iconClassName={props.iconClassName}
               profiles={profiles.data || []}
               thirdwebClient={props.client}
-              iconClassName={props.iconClassName}
             />
           )}
           <span className="cursor-pointer font-mono">
@@ -101,10 +100,10 @@ export function WalletAddress(props: {
           <div className="flex items-center justify-between">
             <h3 className="font-semibold text-lg">Wallet Address</h3>
             <Button
-              variant="outline"
-              size="sm"
-              onClick={onCopy}
               className="flex items-center gap-2"
+              onClick={onCopy}
+              size="sm"
+              variant="outline"
             >
               {hasCopied ? (
                 <CheckIcon className="h-4 w-4" />
@@ -137,9 +136,9 @@ export function WalletAddress(props: {
                   {walletAvatarLink && (
                     <Avatar>
                       <AvatarImage
-                        src={walletAvatarLink}
                         alt={profile.name}
                         className="object-cover"
+                        src={walletAvatarLink}
                       />
                       {profile.name && (
                         <AvatarFallback>
@@ -197,14 +196,14 @@ function WalletAvatar(props: {
     >
       {resolvedAvatarSrc ? (
         <Img
-          src={resolvedAvatarSrc}
           className={cn("size-6 object-cover", props.iconClassName)}
+          src={resolvedAvatarSrc}
         />
       ) : (
         <Blobbie
           address={props.address}
-          size={24}
           className={props.iconClassName}
+          size={24}
         />
       )}
     </div>
diff --git a/apps/nebula/src/@/components/color-mode-toggle.tsx b/apps/nebula/src/@/components/color-mode-toggle.tsx
index 41dc2be94ba..69fa420315d 100644
--- a/apps/nebula/src/@/components/color-mode-toggle.tsx
+++ b/apps/nebula/src/@/components/color-mode-toggle.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { ClientOnly } from "@/components/blocks/client-only";
-import { Button } from "@/components/ui/button";
 import { MoonIcon, SunIcon } from "lucide-react";
 import { useTheme } from "next-themes";
+import { ClientOnly } from "@/components/blocks/client-only";
+import { Button } from "@/components/ui/button";
 import { Skeleton } from "./ui/skeleton";
 
 export function ToggleThemeButton() {
@@ -14,12 +14,12 @@ export function ToggleThemeButton() {
       ssr={<Skeleton className="size-[34px] rounded-full border bg-accent" />}
     >
       <Button
-        variant="outline"
+        aria-label="Toggle theme"
+        className="h-auto w-auto rounded-full border border-border bg-background p-2"
         onClick={() => {
           setTheme(theme === "dark" ? "light" : "dark");
         }}
-        aria-label="Toggle theme"
-        className="h-auto w-auto rounded-full border border-border bg-background p-2"
+        variant="outline"
       >
         {theme === "light" ? (
           <SunIcon className="size-4" />
diff --git a/apps/nebula/src/@/components/ui/CopyTextButton.tsx b/apps/nebula/src/@/components/ui/CopyTextButton.tsx
index 3d5993d9684..d9010706e14 100644
--- a/apps/nebula/src/@/components/ui/CopyTextButton.tsx
+++ b/apps/nebula/src/@/components/ui/CopyTextButton.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import { CheckIcon, CopyIcon } from "lucide-react";
 import { useClipboard } from "@/hooks/use-clipboard";
 import { cn } from "@/lib/utils";
-import { CheckIcon, CopyIcon } from "lucide-react";
 import { Button } from "./button";
 import { ToolTipLabel } from "./tooltip";
 
@@ -39,7 +39,6 @@ export function CopyTextButton(props: {
   return (
     <ToolTipLabel label={props.tooltip}>
       <Button
-        variant={props.variant || "outline"}
         aria-label={props.tooltip}
         className={cn(
           "flex h-auto w-auto gap-2 rounded-lg px-1.5 py-0.5 font-normal text-foreground",
@@ -50,6 +49,7 @@ export function CopyTextButton(props: {
           e.stopPropagation();
           props.onClick?.();
         }}
+        variant={props.variant || "outline"}
       >
         {props.copyIconPosition === "right" ? (
           <>
diff --git a/apps/nebula/src/@/components/ui/DynamicHeight.tsx b/apps/nebula/src/@/components/ui/DynamicHeight.tsx
index 144b592cf54..3e747c23e9c 100644
--- a/apps/nebula/src/@/components/ui/DynamicHeight.tsx
+++ b/apps/nebula/src/@/components/ui/DynamicHeight.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 import type React from "react";
 import { useRef, useState } from "react";
+import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 
 export function DynamicHeight(props: {
   children: React.ReactNode;
@@ -14,12 +14,12 @@ export function DynamicHeight(props: {
   return (
     <div
       style={{
+        boxSizing: "border-box",
         height: height ? `${height}px` : "auto",
+        overflow: "hidden",
         transition:
           props.transition ||
           "height 210ms cubic-bezier(0.175, 0.885, 0.32, 1.1)",
-        overflow: "hidden",
-        boxSizing: "border-box",
       }}
     >
       <div
@@ -55,5 +55,5 @@ function useHeightObserver() {
     };
   }, []);
 
-  return { height, elementRef };
+  return { elementRef, height };
 }
diff --git a/apps/nebula/src/@/components/ui/NavLink.tsx b/apps/nebula/src/@/components/ui/NavLink.tsx
index b55b237590a..fb89ece9d40 100644
--- a/apps/nebula/src/@/components/ui/NavLink.tsx
+++ b/apps/nebula/src/@/components/ui/NavLink.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { cn } from "@/lib/utils";
 
 export type NavButtonProps = {
   className?: string;
@@ -26,13 +26,13 @@ export function NavLink(props: React.PropsWithChildren<NavButtonProps>) {
     : false;
   return (
     <Link
-      href={props.href}
       className={cn(props.className, isActive && props.activeClassName)}
-      target={props.href.startsWith("http") ? "_blank" : undefined}
-      prefetch={false}
+      href={props.href}
       onClick={() => {
         props.onClick?.();
       }}
+      prefetch={false}
+      target={props.href.startsWith("http") ? "_blank" : undefined}
     >
       {props.children}
     </Link>
diff --git a/apps/nebula/src/@/components/ui/ScrollShadow/ScrollShadow.tsx b/apps/nebula/src/@/components/ui/ScrollShadow/ScrollShadow.tsx
index 85f605ce09a..360a258a433 100644
--- a/apps/nebula/src/@/components/ui/ScrollShadow/ScrollShadow.tsx
+++ b/apps/nebula/src/@/components/ui/ScrollShadow/ScrollShadow.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import { useRef } from "react";
 import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 import { cn } from "@/lib/utils";
-import { useRef } from "react";
 import styles from "./ScrollShadow.module.css";
 
 export function ScrollShadow(props: {
@@ -102,8 +102,8 @@ export function ScrollShadow(props: {
         )}
         ref={shadowTopEl}
         style={{
-          opacity: "0",
           display: props.disableTopShadow ? "none" : "block",
+          opacity: "0",
         }}
       />
       <div
@@ -141,8 +141,8 @@ export function ScrollShadow(props: {
       />
       <div
         className={cn("no-scrollbar overflow-auto", props.scrollableClassName)}
-        ref={scrollableEl}
         data-scrollable
+        ref={scrollableEl}
       >
         {props.children}
       </div>
diff --git a/apps/nebula/src/@/components/ui/Spinner/Spinner.module.css b/apps/nebula/src/@/components/ui/Spinner/Spinner.module.css
index 622a43a8a79..0367a2f3d33 100644
--- a/apps/nebula/src/@/components/ui/Spinner/Spinner.module.css
+++ b/apps/nebula/src/@/components/ui/Spinner/Spinner.module.css
@@ -1,7 +1,6 @@
 .loader {
   border-radius: 50%;
   position: relative;
-  animation: rotate 1s linear infinite;
   animation: rotate 2s linear infinite;
 }
 
diff --git a/apps/nebula/src/@/components/ui/Spinner/Spinner.tsx b/apps/nebula/src/@/components/ui/Spinner/Spinner.tsx
index c1f7d59f39d..4db57326dba 100644
--- a/apps/nebula/src/@/components/ui/Spinner/Spinner.tsx
+++ b/apps/nebula/src/@/components/ui/Spinner/Spinner.tsx
@@ -4,15 +4,15 @@ import style from "./Spinner.module.css";
 export function Spinner(props: { className?: string }) {
   return (
     <svg
-      viewBox="0 0 50 50"
       className={cn(style.loader, props.className || "size-4")}
+      viewBox="0 0 50 50"
     >
       <title>loading</title>
       <circle
         cx="25"
         cy="25"
-        r="20"
         fill="none"
+        r="20"
         stroke="currentColor"
         strokeWidth="4"
       />
diff --git a/apps/nebula/src/@/components/ui/avatar.tsx b/apps/nebula/src/@/components/ui/avatar.tsx
index 9b121d26b7a..d6c12b52ce6 100644
--- a/apps/nebula/src/@/components/ui/avatar.tsx
+++ b/apps/nebula/src/@/components/ui/avatar.tsx
@@ -10,11 +10,11 @@ const Avatar = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>
 >(({ className, ...props }, ref) => (
   <AvatarPrimitive.Root
-    ref={ref}
     className={cn(
       "relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -25,8 +25,8 @@ const AvatarImage = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
 >(({ className, ...props }, ref) => (
   <AvatarPrimitive.Image
-    ref={ref}
     className={cn("aspect-square h-full w-full", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -37,11 +37,11 @@ const AvatarFallback = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>
 >(({ className, ...props }, ref) => (
   <AvatarPrimitive.Fallback
-    ref={ref}
     className={cn(
       "flex h-full w-full items-center justify-center rounded-full bg-muted",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/nebula/src/@/components/ui/badge.tsx b/apps/nebula/src/@/components/ui/badge.tsx
index 078708826de..c1f5874fe11 100644
--- a/apps/nebula/src/@/components/ui/badge.tsx
+++ b/apps/nebula/src/@/components/ui/badge.tsx
@@ -1,4 +1,4 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import type * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -6,23 +6,23 @@ import { cn } from "@/lib/utils";
 const badgeVariants = cva(
   "inline-flex items-center rounded-full border border-border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 leading-4",
   {
+    defaultVariants: {
+      variant: "default",
+    },
     variants: {
       variant: {
         default: "border-transparent bg-primary/20 text-primary",
-        secondary:
-          "border-transparent bg-accent text-accent-foreground hover:bg-accent/80",
         destructive:
           "border-transparent dark:bg-red-950 dark:text-red-400 bg-red-500/20 text-red-800",
-        warning:
-          "border-transparent dark:bg-yellow-600/20 dark:text-yellow-500 bg-yellow-500/20 text-yellow-900",
         outline: "text-foreground",
+        secondary:
+          "border-transparent bg-accent text-accent-foreground hover:bg-accent/80",
         success:
           "border-transparent dark:bg-green-950/50 dark:text-green-400 bg-green-200 text-green-950",
+        warning:
+          "border-transparent dark:bg-yellow-600/20 dark:text-yellow-500 bg-yellow-500/20 text-yellow-900",
       },
     },
-    defaultVariants: {
-      variant: "default",
-    },
   },
 );
 
diff --git a/apps/nebula/src/@/components/ui/button.stories.tsx b/apps/nebula/src/@/components/ui/button.stories.tsx
index 0ff7fd2149f..8a6ef20f74c 100644
--- a/apps/nebula/src/@/components/ui/button.stories.tsx
+++ b/apps/nebula/src/@/components/ui/button.stories.tsx
@@ -1,11 +1,11 @@
-import { Button } from "@/components/ui/button";
-import { BadgeContainer } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { StarIcon } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import { BadgeContainer } from "@/storybook/utils";
 
 const meta = {
-  title: "Shadcn/Buttons",
   component: Component,
+  title: "Shadcn/Buttons",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -26,32 +26,30 @@ function Component() {
   );
 }
 
-function Variants(props: {
-  size: "default" | "icon" | "sm" | "lg";
-}) {
+function Variants(props: { size: "default" | "icon" | "sm" | "lg" }) {
   return (
     <BadgeContainer label={`Size: ${props.size}`}>
       <div className="flex gap-6">
         <Button size={props.size}>
           {props.size === "icon" ? <StarIcon className="size-4" /> : "Default"}
         </Button>
-        <Button variant="primary" size={props.size}>
+        <Button size={props.size} variant="primary">
           {props.size === "icon" ? <StarIcon className="size-4" /> : "Primary"}
         </Button>
-        <Button variant="secondary" size={props.size}>
+        <Button size={props.size} variant="secondary">
           {props.size === "icon" ? (
             <StarIcon className="size-4" />
           ) : (
             "Secondary"
           )}
         </Button>
-        <Button variant="ghost" size={props.size}>
+        <Button size={props.size} variant="ghost">
           {props.size === "icon" ? <StarIcon className="size-4" /> : "Ghost"}
         </Button>
-        <Button variant="outline" size={props.size}>
+        <Button size={props.size} variant="outline">
           {props.size === "icon" ? <StarIcon className="size-4" /> : "Outline"}
         </Button>
-        <Button variant="destructive" size={props.size}>
+        <Button size={props.size} variant="destructive">
           {props.size === "icon" ? (
             <StarIcon className="size-4" />
           ) : (
diff --git a/apps/nebula/src/@/components/ui/button.tsx b/apps/nebula/src/@/components/ui/button.tsx
index cb4966e89df..5e36eb49920 100644
--- a/apps/nebula/src/@/components/ui/button.tsx
+++ b/apps/nebula/src/@/components/ui/button.tsx
@@ -1,5 +1,5 @@
 import { Slot } from "@radix-ui/react-slot";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -7,32 +7,32 @@ import { cn } from "@/lib/utils";
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
   {
+    defaultVariants: {
+      size: "default",
+      variant: "default",
+    },
     variants: {
+      size: {
+        default: "h-10 px-4 py-2",
+        icon: "h-10 w-10",
+        lg: "h-11 rounded-md px-8",
+        sm: "h-9 rounded-md px-3",
+      },
       variant: {
-        primary: "bg-primary hover:bg-primary/90 text-primary-foreground ",
         default: "bg-foreground text-background hover:bg-foreground/90",
         destructive:
           "bg-destructive hover:bg-destructive/90 text-destructive-foreground ",
+        ghost: "hover:bg-accent hover:text-accent-foreground",
+        link: "underline-offset-4 hover:underline",
         outline:
           "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground",
+        pink: "border border-nebula-pink-foreground !text-nebula-pink-foreground bg-[hsl(var(--nebula-pink-foreground)/5%)] hover:bg-nebula-pink-foreground/10 dark:!text-foreground dark:bg-nebula-pink-foreground/10 dark:hover:bg-nebula-pink-foreground/20",
+        primary: "bg-primary hover:bg-primary/90 text-primary-foreground ",
         secondary:
           "bg-secondary hover:bg-secondary/80 text-secondary-foreground ",
-        ghost: "hover:bg-accent hover:text-accent-foreground",
-        link: "underline-offset-4 hover:underline",
-        pink: "border border-nebula-pink-foreground !text-nebula-pink-foreground bg-[hsl(var(--nebula-pink-foreground)/5%)] hover:bg-nebula-pink-foreground/10 dark:!text-foreground dark:bg-nebula-pink-foreground/10 dark:hover:bg-nebula-pink-foreground/20",
         upsell:
           "bg-green-600 text-white hover:bg-green-700 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5 transition-all duration-200",
       },
-      size: {
-        default: "h-10 px-4 py-2",
-        sm: "h-9 rounded-md px-3",
-        lg: "h-11 rounded-md px-8",
-        icon: "h-10 w-10",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
     },
   },
 );
@@ -66,13 +66,13 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 
     return (
       <Comp
+        aria-disabled={disabled ? true : undefined}
         className={cn(
-          buttonVariants({ variant, size, className }),
+          buttonVariants({ className, size, variant }),
           disabledClass,
         )}
-        ref={ref}
-        aria-disabled={disabled ? true : undefined}
         disabled={disabled}
+        ref={ref}
         {...props}
         {...btnOnlyProps}
       />
diff --git a/apps/nebula/src/@/components/ui/code/CodeBlockContainer.tsx b/apps/nebula/src/@/components/ui/code/CodeBlockContainer.tsx
index 6e3d35ab645..7be6fa33cca 100644
--- a/apps/nebula/src/@/components/ui/code/CodeBlockContainer.tsx
+++ b/apps/nebula/src/@/components/ui/code/CodeBlockContainer.tsx
@@ -1,10 +1,10 @@
 "use client";
 
+import { CheckIcon, CopyIcon } from "lucide-react";
 import { useClipboard } from "@/hooks/use-clipboard";
 import { cn } from "@/lib/utils";
-import { CheckIcon, CopyIcon } from "lucide-react";
-import { ScrollShadow } from "../ScrollShadow/ScrollShadow";
 import { Button } from "../button";
+import { ScrollShadow } from "../ScrollShadow/ScrollShadow";
 
 export function CodeBlockContainer(props: {
   codeToCopy: string;
@@ -26,29 +26,29 @@ export function CodeBlockContainer(props: {
       )}
     >
       <ScrollShadow
-        scrollableClassName={cn("p-4", props.scrollableClassName)}
         className={cn(
           "text-xs md:text-sm [&_*]:leading-relaxed",
           props.scrollableContainerClassName,
         )}
+        scrollableClassName={cn("p-4", props.scrollableClassName)}
         shadowColor={props.shadowColor || "hsl(var(--muted))"}
       >
         {props.children}
       </ScrollShadow>
 
       <Button
-        size="sm"
-        variant="outline"
-        onClick={() => {
-          onCopy();
-          props.onCopy?.(props.codeToCopy);
-        }}
         aria-label={hasCopied ? "Copied" : "Copy code to clipboard"}
-        title={hasCopied ? "Copied" : "Copy"}
         className={cn(
           "absolute top-3.5 right-3.5 h-auto bg-background p-2",
           props.copyButtonClassName,
         )}
+        onClick={() => {
+          onCopy();
+          props.onCopy?.(props.codeToCopy);
+        }}
+        size="sm"
+        title={hasCopied ? "Copied" : "Copy"}
+        variant="outline"
       >
         {hasCopied ? (
           <CheckIcon className="size-3 text-green-500" />
diff --git a/apps/nebula/src/@/components/ui/code/RenderCode.tsx b/apps/nebula/src/@/components/ui/code/RenderCode.tsx
index 29216115e3c..8f9bdc9bb7a 100644
--- a/apps/nebula/src/@/components/ui/code/RenderCode.tsx
+++ b/apps/nebula/src/@/components/ui/code/RenderCode.tsx
@@ -12,13 +12,13 @@ export function RenderCode(props: {
 }) {
   return (
     <CodeBlockContainer
-      codeToCopy={props.code}
       className={props.className}
+      codeToCopy={props.code}
       copyButtonClassName={props.copyButtonClassName}
+      onCopy={props.onCopy}
       scrollableClassName={props.scrollableClassName}
       scrollableContainerClassName={props.scrollableContainerClassName}
       shadowColor={props.shadowColor}
-      onCopy={props.onCopy}
     >
       <div
         // biome-ignore lint/security/noDangerouslySetInnerHtml: we know what we're doing here
diff --git a/apps/nebula/src/@/components/ui/code/code.client.tsx b/apps/nebula/src/@/components/ui/code/code.client.tsx
index 907d89b85c7..7787d10cb23 100644
--- a/apps/nebula/src/@/components/ui/code/code.client.tsx
+++ b/apps/nebula/src/@/components/ui/code/code.client.tsx
@@ -1,9 +1,9 @@
 "use client";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
 import type { BundledLanguage } from "shiki";
-import { RenderCode } from "./RenderCode";
 import { getCodeHtml } from "./getCodeHtml";
 import { PlainTextCodeBlock } from "./plaintext-code";
+import { RenderCode } from "./RenderCode";
 
 export type CodeProps = {
   code: string;
@@ -31,41 +31,41 @@ export const CodeClient: React.FC<CodeProps> = ({
   onCopy,
 }) => {
   const codeQuery = useQuery({
-    queryKey: ["getCodeHtml", code, lang],
+    placeholderData: keepPreviousDataOnCodeChange
+      ? keepPreviousData
+      : undefined,
     queryFn: () =>
       getCodeHtml(code, lang, {
         ignoreFormattingErrors: ignoreFormattingErrors,
       }),
-    placeholderData: keepPreviousDataOnCodeChange
-      ? keepPreviousData
-      : undefined,
+    queryKey: ["getCodeHtml", code, lang],
     retry: false,
   });
 
   if (!codeQuery.data) {
     return (
       <PlainTextCodeBlock
-        code={code}
         className={className}
-        scrollableClassName={scrollableClassName}
+        code={code}
         copyButtonClassName={copyButtonClassName}
+        onCopy={onCopy}
+        scrollableClassName={scrollableClassName}
         scrollableContainerClassName={scrollableContainerClassName}
         shadowColor={shadowColor}
-        onCopy={onCopy}
       />
     );
   }
 
   return (
     <RenderCode
+      className={className}
       code={codeQuery.data.formattedCode}
+      copyButtonClassName={copyButtonClassName}
       html={codeQuery.data.html}
-      className={className}
+      onCopy={onCopy}
       scrollableClassName={scrollableClassName}
-      copyButtonClassName={copyButtonClassName}
       scrollableContainerClassName={scrollableContainerClassName}
       shadowColor={shadowColor}
-      onCopy={onCopy}
     />
   );
 };
diff --git a/apps/nebula/src/@/components/ui/code/code.stories.tsx b/apps/nebula/src/@/components/ui/code/code.stories.tsx
index 4e23bdb3a14..6c134227fc2 100644
--- a/apps/nebula/src/@/components/ui/code/code.stories.tsx
+++ b/apps/nebula/src/@/components/ui/code/code.stories.tsx
@@ -1,11 +1,11 @@
-import { BadgeContainer } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
+import { BadgeContainer } from "@/storybook/utils";
 import { CodeClient } from "./code.client";
 
 const meta = {
-  title: "code/lang",
   component: Component,
   parameters: {},
+  title: "code/lang",
 } satisfies Meta<typeof Component>;
 
 export default meta;
diff --git a/apps/nebula/src/@/components/ui/code/getCodeHtml.tsx b/apps/nebula/src/@/components/ui/code/getCodeHtml.tsx
index 8750ec2819d..24e45e077e2 100644
--- a/apps/nebula/src/@/components/ui/code/getCodeHtml.tsx
+++ b/apps/nebula/src/@/components/ui/code/getCodeHtml.tsx
@@ -43,10 +43,10 @@ export async function getCodeHtml(
   const html = await codeToHtml(formattedCode, {
     lang: lang,
     themes: {
-      light: "github-light",
       dark: "github-dark-default",
+      light: "github-light",
     },
   });
 
-  return { html, formattedCode };
+  return { formattedCode, html };
 }
diff --git a/apps/nebula/src/@/components/ui/code/plaintext-code.stories.tsx b/apps/nebula/src/@/components/ui/code/plaintext-code.stories.tsx
index 6a80fe68439..00064cba244 100644
--- a/apps/nebula/src/@/components/ui/code/plaintext-code.stories.tsx
+++ b/apps/nebula/src/@/components/ui/code/plaintext-code.stories.tsx
@@ -1,11 +1,11 @@
-import { BadgeContainer } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
+import { BadgeContainer } from "@/storybook/utils";
 import { PlainTextCodeBlock } from "./plaintext-code";
 
 const meta = {
-  title: "code/plaintext",
   component: Component,
   parameters: {},
+  title: "code/plaintext",
 } satisfies Meta<typeof Component>;
 
 export default meta;
diff --git a/apps/nebula/src/@/components/ui/code/plaintext-code.tsx b/apps/nebula/src/@/components/ui/code/plaintext-code.tsx
index b1b05b0c22d..de79cc4d354 100644
--- a/apps/nebula/src/@/components/ui/code/plaintext-code.tsx
+++ b/apps/nebula/src/@/components/ui/code/plaintext-code.tsx
@@ -13,13 +13,13 @@ export function PlainTextCodeBlock(props: {
 }) {
   return (
     <CodeBlockContainer
-      codeToCopy={props.code}
       className={props.className}
+      codeToCopy={props.code}
       copyButtonClassName={props.copyButtonClassName}
+      onCopy={props.onCopy}
       scrollableClassName={props.scrollableClassName}
       scrollableContainerClassName={props.scrollableContainerClassName}
       shadowColor={props.shadowColor}
-      onCopy={props.onCopy}
     >
       <code className={cn("block whitespace-pre", props.codeClassName)}>
         {props.code}
diff --git a/apps/nebula/src/@/components/ui/decimal-input.tsx b/apps/nebula/src/@/components/ui/decimal-input.tsx
index ed3b7be6591..4d1e57b518a 100644
--- a/apps/nebula/src/@/components/ui/decimal-input.tsx
+++ b/apps/nebula/src/@/components/ui/decimal-input.tsx
@@ -10,13 +10,10 @@ export function DecimalInput(props: {
 }) {
   return (
     <Input
-      id={props.id}
-      type="text"
-      value={props.value}
       className={props.className}
-      inputMode="decimal"
-      placeholder={props.placeholder}
       disabled={props.disabled}
+      id={props.id}
+      inputMode="decimal"
       onChange={(e) => {
         const number = Number(e.target.value);
         // ignore if string becomes invalid number
@@ -34,6 +31,9 @@ export function DecimalInput(props: {
         }
         props.onChange(cleanedValue || "0");
       }}
+      placeholder={props.placeholder}
+      type="text"
+      value={props.value}
     />
   );
 }
diff --git a/apps/nebula/src/@/components/ui/dialog.tsx b/apps/nebula/src/@/components/ui/dialog.tsx
index df91afb5a27..27250b57c6c 100644
--- a/apps/nebula/src/@/components/ui/dialog.tsx
+++ b/apps/nebula/src/@/components/ui/dialog.tsx
@@ -19,11 +19,11 @@ const DialogOverlay = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Overlay
-    ref={ref}
     className={cn(
       "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80 data-[state=closed]:animate-out data-[state=open]:animate-in",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -41,7 +41,6 @@ const DialogContent = React.forwardRef<
     <DialogPortal>
       <DialogOverlay className={dialogOverlayClassName} />
       <DialogPrimitive.Content
-        ref={ref}
         className={cn(
           "fixed z-50 grid w-full gap-4 rounded-t-xl border border-border bg-background p-6 shadow-lg duration-300 md:max-w-lg md:rounded-lg",
           // on mobile - put the dialog at the bottom of the screen, animate - slide up and fade in
@@ -56,6 +55,7 @@ const DialogContent = React.forwardRef<
           "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
           className,
         )}
+        ref={ref}
         {...restProps}
       >
         {children}
@@ -104,11 +104,11 @@ const DialogTitle = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Title
-    ref={ref}
     className={cn(
       "font-semibold text-lg leading-none tracking-tight",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -119,8 +119,8 @@ const DialogDescription = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Description
-    ref={ref}
     className={cn("text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/nebula/src/@/components/ui/form.tsx b/apps/nebula/src/@/components/ui/form.tsx
index 23e760c1bb9..e7e6cd964ef 100644
--- a/apps/nebula/src/@/components/ui/form.tsx
+++ b/apps/nebula/src/@/components/ui/form.tsx
@@ -54,11 +54,11 @@ const useFormField = () => {
   const { id } = itemContext;
 
   return {
-    id,
-    name: fieldContext.name,
-    formItemId: `${id}-form-item`,
     formDescriptionId: `${id}-form-item-description`,
+    formItemId: `${id}-form-item`,
     formMessageId: `${id}-form-item-message`,
+    id,
+    name: fieldContext.name,
     ...fieldState,
   };
 };
@@ -79,7 +79,7 @@ const FormItem = React.forwardRef<
 
   return (
     <FormItemContext.Provider value={{ id }}>
-      <div ref={ref} className={cn("space-y-2", className)} {...props} />
+      <div className={cn("space-y-2", className)} ref={ref} {...props} />
     </FormItemContext.Provider>
   );
 });
@@ -93,9 +93,9 @@ const FormLabel = React.forwardRef<
 
   return (
     <Label
-      ref={ref}
       className={cn(error && "text-destructive-text", className)}
       htmlFor={formItemId}
+      ref={ref}
       {...props}
     />
   );
@@ -111,9 +111,9 @@ const RequiredFormLabel = React.forwardRef<
   return (
     <ToolTipLabel label="Required">
       <Label
-        ref={ref}
         className={cn(error && "text-destructive-text", "relative", className)}
         htmlFor={formItemId}
+        ref={ref}
         {...props}
       >
         {props.children}
@@ -135,14 +135,14 @@ const FormControl = React.forwardRef<
 
   return (
     <Slot
-      ref={ref}
-      id={formItemId}
       aria-describedby={
         !error
           ? `${formDescriptionId}`
           : `${formDescriptionId} ${formMessageId}`
       }
       aria-invalid={!!error}
+      id={formItemId}
+      ref={ref}
       {...props}
     />
   );
@@ -157,9 +157,9 @@ const FormDescription = React.forwardRef<
 
   return (
     <p
-      ref={ref}
-      id={formDescriptionId}
       className={cn("text-muted-foreground text-sm", className)}
+      id={formDescriptionId}
+      ref={ref}
       {...props}
     />
   );
@@ -179,9 +179,9 @@ const FormMessage = React.forwardRef<
 
   return (
     <p
-      ref={ref}
-      id={formMessageId}
       className={cn("font-medium text-destructive-text text-sm", className)}
+      id={formMessageId}
+      ref={ref}
       {...props}
     >
       {body}
diff --git a/apps/nebula/src/@/components/ui/hover-card.tsx b/apps/nebula/src/@/components/ui/hover-card.tsx
index c780522e55c..ff7b195700f 100644
--- a/apps/nebula/src/@/components/ui/hover-card.tsx
+++ b/apps/nebula/src/@/components/ui/hover-card.tsx
@@ -14,13 +14,13 @@ const HoverCardContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content>
 >(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
   <HoverCardPrimitive.Content
-    ref={ref}
     align={align}
-    sideOffset={sideOffset}
     className={cn(
       "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-64 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=closed]:animate-out data-[state=open]:animate-in",
       className,
     )}
+    ref={ref}
+    sideOffset={sideOffset}
     {...props}
   />
 ));
diff --git a/apps/nebula/src/@/components/ui/image-upload-button.tsx b/apps/nebula/src/@/components/ui/image-upload-button.tsx
index 803322967fc..6cf0c41e2d0 100644
--- a/apps/nebula/src/@/components/ui/image-upload-button.tsx
+++ b/apps/nebula/src/@/components/ui/image-upload-button.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import type React from "react";
 import { useRef } from "react";
+import { Button } from "@/components/ui/button";
 
 interface ImageUploadProps {
   value: File | undefined;
@@ -25,20 +25,20 @@ export function ImageUploadButton(props: ImageUploadProps) {
   return (
     <div>
       <Button
-        variant={props.variant}
-        onClick={() => fileInputRef.current?.click()}
         className={props.className}
+        onClick={() => fileInputRef.current?.click()}
+        variant={props.variant}
       >
         {props.children}
       </Button>
       <input
-        ref={fileInputRef}
-        type="file"
-        multiple={props.multiple}
         accept={props.accept}
-        onChange={handleFileChange}
-        className="hidden"
         aria-label="Upload image"
+        className="hidden"
+        multiple={props.multiple}
+        onChange={handleFileChange}
+        ref={fileInputRef}
+        type="file"
       />
     </div>
   );
diff --git a/apps/nebula/src/@/components/ui/inline-code.tsx b/apps/nebula/src/@/components/ui/inline-code.tsx
index e7e9765242e..de6973aa68a 100644
--- a/apps/nebula/src/@/components/ui/inline-code.tsx
+++ b/apps/nebula/src/@/components/ui/inline-code.tsx
@@ -3,7 +3,10 @@ import { cn } from "@/lib/utils";
 export function InlineCode({
   code,
   className,
-}: { code: string; className?: string }) {
+}: {
+  code: string;
+  className?: string;
+}) {
   return (
     <code
       className={cn(
diff --git a/apps/nebula/src/@/components/ui/input.tsx b/apps/nebula/src/@/components/ui/input.tsx
index 37529a8f2df..12ff2495f7f 100644
--- a/apps/nebula/src/@/components/ui/input.tsx
+++ b/apps/nebula/src/@/components/ui/input.tsx
@@ -9,12 +9,12 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
   ({ className, type, ...props }, ref) => {
     return (
       <input
-        type={type}
         className={cn(
           "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background selection:bg-foreground/10 file:border-0 file:bg-transparent file:font-medium file:text-sm placeholder:text-muted-foreground placeholder:text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:selection:bg-foreground/20",
           className,
         )}
         ref={ref}
+        type={type}
         {...props}
       />
     );
diff --git a/apps/nebula/src/@/components/ui/label.tsx b/apps/nebula/src/@/components/ui/label.tsx
index 663ca2319ef..e00b6b9e3eb 100644
--- a/apps/nebula/src/@/components/ui/label.tsx
+++ b/apps/nebula/src/@/components/ui/label.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as LabelPrimitive from "@radix-ui/react-label";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -16,8 +16,8 @@ const Label = React.forwardRef<
     VariantProps<typeof labelVariants>
 >(({ className, ...props }, ref) => (
   <LabelPrimitive.Root
-    ref={ref}
     className={cn(labelVariants(), className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/nebula/src/@/components/ui/popover.tsx b/apps/nebula/src/@/components/ui/popover.tsx
index b93e60dd6b5..1d4c0eea199 100644
--- a/apps/nebula/src/@/components/ui/popover.tsx
+++ b/apps/nebula/src/@/components/ui/popover.tsx
@@ -15,13 +15,13 @@ const PopoverContent = React.forwardRef<
 >(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
   <PopoverPrimitive.Portal>
     <PopoverPrimitive.Content
-      ref={ref}
       align={align}
-      sideOffset={sideOffset}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border border-border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=closed]:animate-out data-[state=open]:animate-in",
         className,
       )}
+      ref={ref}
+      sideOffset={sideOffset}
       {...props}
     />
   </PopoverPrimitive.Portal>
diff --git a/apps/nebula/src/@/components/ui/select.stories.tsx b/apps/nebula/src/@/components/ui/select.stories.tsx
index fbd0dc2ccb7..c729ef6d6c2 100644
--- a/apps/nebula/src/@/components/ui/select.stories.tsx
+++ b/apps/nebula/src/@/components/ui/select.stories.tsx
@@ -1,3 +1,4 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
 import {
   Select,
   SelectContent,
@@ -8,11 +9,10 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { BadgeContainer } from "@/storybook/utils";
-import type { Meta, StoryObj } from "@storybook/nextjs";
 
 const meta = {
-  title: "Shadcn/Select",
   component: Component,
+  title: "Shadcn/Select",
 } satisfies Meta<typeof Component>;
 
 export default meta;
diff --git a/apps/nebula/src/@/components/ui/select.tsx b/apps/nebula/src/@/components/ui/select.tsx
index 5447dec4bc3..402d92432f2 100644
--- a/apps/nebula/src/@/components/ui/select.tsx
+++ b/apps/nebula/src/@/components/ui/select.tsx
@@ -19,11 +19,11 @@ const SelectTrigger = React.forwardRef<
   }
 >(({ className, children, chevronClassName, ...props }, ref) => (
   <SelectPrimitive.Trigger
-    ref={ref}
     className={cn(
       "flex h-10 w-full items-center justify-between gap-2 rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
       className,
     )}
+    ref={ref}
     {...props}
   >
     {children}
@@ -75,7 +75,6 @@ const SelectContent = React.forwardRef<
 >(({ className, children, position = "popper", ...props }, ref) => (
   <SelectPrimitive.Portal>
     <SelectPrimitive.Content
-      ref={ref}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover text-popover-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
         position === "popper" &&
@@ -83,6 +82,7 @@ const SelectContent = React.forwardRef<
         className,
       )}
       position={position}
+      ref={ref}
       {...props}
     >
       {/* <SelectScrollUpButton /> */}
@@ -106,8 +106,8 @@ const SelectLabel = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.Label
-    ref={ref}
     className={cn("py-1.5 pr-2 pl-8 font-semibold text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -118,11 +118,11 @@ const SelectItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
 >(({ className, children, ...props }, ref) => (
   <SelectPrimitive.Item
-    ref={ref}
     className={cn(
       "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
@@ -141,8 +141,8 @@ const SelectSeparator = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.Separator
-    ref={ref}
     className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/nebula/src/@/components/ui/separator.tsx b/apps/nebula/src/@/components/ui/separator.tsx
index 3cc446d24c2..d1714458e89 100644
--- a/apps/nebula/src/@/components/ui/separator.tsx
+++ b/apps/nebula/src/@/components/ui/separator.tsx
@@ -14,14 +14,14 @@ const Separator = React.forwardRef<
     ref,
   ) => (
     <SeparatorPrimitive.Root
-      ref={ref}
-      decorative={decorative}
-      orientation={orientation}
       className={cn(
         "shrink-0 bg-border",
         orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
         className,
       )}
+      decorative={decorative}
+      orientation={orientation}
+      ref={ref}
       {...props}
     />
   ),
diff --git a/apps/nebula/src/@/components/ui/sheet.tsx b/apps/nebula/src/@/components/ui/sheet.tsx
index f861b3caadd..dd76042ff3f 100644
--- a/apps/nebula/src/@/components/ui/sheet.tsx
+++ b/apps/nebula/src/@/components/ui/sheet.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as SheetPrimitive from "@radix-ui/react-dialog";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import { XIcon } from "lucide-react";
 import * as React from "react";
 
@@ -33,19 +33,19 @@ SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;
 const sheetVariants = cva(
   "fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500 border-border",
   {
+    defaultVariants: {
+      side: "right",
+    },
     variants: {
       side: {
-        top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
         bottom:
           "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
         left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
         right:
           "inset-y-0 right-0 h-full w-3/4  border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
+        top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
       },
     },
-    defaultVariants: {
-      side: "right",
-    },
   },
 );
 
@@ -60,8 +60,8 @@ const SheetContent = React.forwardRef<
   <SheetPortal>
     <SheetOverlay />
     <SheetPrimitive.Content
-      ref={ref}
       className={cn(sheetVariants({ side }), className)}
+      ref={ref}
       {...props}
     >
       {children}
@@ -107,11 +107,11 @@ const SheetTitle = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <SheetPrimitive.Title
-    ref={ref}
     className={cn(
       "border-border font-semibold text-foreground text-lg",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -122,8 +122,8 @@ const SheetDescription = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <SheetPrimitive.Description
-    ref={ref}
     className={cn("border-border text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/nebula/src/@/components/ui/skeleton.tsx b/apps/nebula/src/@/components/ui/skeleton.tsx
index 17bd1f3ec02..3672f0283ba 100644
--- a/apps/nebula/src/@/components/ui/skeleton.tsx
+++ b/apps/nebula/src/@/components/ui/skeleton.tsx
@@ -22,12 +22,12 @@ function SkeletonContainer<T>(props: {
   const isLoading = props.loadedData === undefined;
   return (
     <div
-      style={props.style}
       aria-hidden={isLoading ? "true" : "false"}
       className={cn(
         isLoading && "inline-block animate-pulse rounded-lg bg-muted",
         props.className,
       )}
+      style={props.style}
     >
       <div className={cn(isLoading && "invisible")}>
         <div
diff --git a/apps/nebula/src/@/components/ui/sonner.tsx b/apps/nebula/src/@/components/ui/sonner.tsx
index ff1623b3354..3e3ac0df836 100644
--- a/apps/nebula/src/@/components/ui/sonner.tsx
+++ b/apps/nebula/src/@/components/ui/sonner.tsx
@@ -10,17 +10,17 @@ const Toaster = ({ ...props }: ToasterProps) => {
 
   return (
     <Sonner
-      theme={theme as ToasterProps["theme"]}
       className="toaster group"
+      theme={theme as ToasterProps["theme"]}
       toastOptions={{
         classNames: {
-          toast:
-            "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg group-[.toaster]:border",
-          description: "group-[.toast]:text-muted-foreground",
           actionButton:
             "group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",
           cancelButton:
             "group-[.toast]:bg-muted group-[.toast]:text-muted-foreground",
+          description: "group-[.toast]:text-muted-foreground",
+          toast:
+            "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg group-[.toaster]:border",
         },
       }}
       {...props}
diff --git a/apps/nebula/src/@/components/ui/table.stories.tsx b/apps/nebula/src/@/components/ui/table.stories.tsx
index e0a216e9927..a648cd52b8e 100644
--- a/apps/nebula/src/@/components/ui/table.stories.tsx
+++ b/apps/nebula/src/@/components/ui/table.stories.tsx
@@ -1,3 +1,5 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import Link from "next/link";
 import {
   Table,
   TableBody,
@@ -10,13 +12,11 @@ import {
 } from "@/components/ui/table";
 import { cn } from "@/lib/utils";
 import { BadgeContainer } from "@/storybook/utils";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import Link from "next/link";
 import { Badge } from "./badge";
 
 const meta = {
-  title: "Shadcn/Table",
   component: Component,
+  title: "Shadcn/Table",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -54,40 +54,37 @@ type Invoice = {
 const invoices: Invoice[] = [
   {
     invoice: "INV001",
+    paymentMethod: "Credit Card",
     paymentStatus: "Paid",
     totalAmount: "$250.00",
-    paymentMethod: "Credit Card",
   },
   {
     invoice: "INV002",
+    paymentMethod: "PayPal",
     paymentStatus: "Pending",
     totalAmount: "$150.00",
-    paymentMethod: "PayPal",
   },
   {
     invoice: "INV003",
+    paymentMethod: "Bank Transfer",
     paymentStatus: "Unpaid",
     totalAmount: "$350.00",
-    paymentMethod: "Bank Transfer",
   },
   {
     invoice: "INV004",
+    paymentMethod: "Credit Card",
     paymentStatus: "Paid",
     totalAmount: "$450.00",
-    paymentMethod: "Credit Card",
   },
   {
     invoice: "INV005",
+    paymentMethod: "PayPal",
     paymentStatus: "Paid",
     totalAmount: "$550.00",
-    paymentMethod: "PayPal",
   },
 ];
 
-function TableDemo(props: {
-  footer?: boolean;
-  linkBox?: boolean;
-}) {
+function TableDemo(props: { footer?: boolean; linkBox?: boolean }) {
   return (
     <TableContainer>
       <Table>
@@ -102,18 +99,18 @@ function TableDemo(props: {
         <TableBody>
           {invoices.map((invoice) => (
             <TableRow
-              key={invoice.invoice}
-              linkBox={props.linkBox}
               className={cn(
                 props.linkBox && "cursor-pointer hover:bg-accent/50",
               )}
+              key={invoice.invoice}
+              linkBox={props.linkBox}
             >
               <TableCell className="font-medium">
                 <Link
-                  href={`/invoices/${invoice.invoice}`}
                   className={cn(
                     props.linkBox && "before:absolute before:inset-0",
                   )}
+                  href={`/invoices/${invoice.invoice}`}
                 >
                   {invoice.invoice}
                 </Link>
diff --git a/apps/nebula/src/@/components/ui/table.tsx b/apps/nebula/src/@/components/ui/table.tsx
index 5c586685eaf..7f99dc39a1d 100644
--- a/apps/nebula/src/@/components/ui/table.tsx
+++ b/apps/nebula/src/@/components/ui/table.tsx
@@ -8,11 +8,11 @@ const Table = React.forwardRef<
   React.HTMLAttributes<HTMLTableElement>
 >(({ className, ...props }, ref) => (
   <table
-    ref={ref}
     className={cn(
       "w-full caption-bottom border-collapse align-top text-sm lining-nums tabular-nums",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -23,8 +23,8 @@ const TableHeader = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <thead
-    ref={ref}
     className={cn("relative border-b bg-background", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -36,8 +36,8 @@ const TableBody = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <tbody
-    ref={ref}
     className={cn("[&_tr:last-child]:border-0", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -48,11 +48,11 @@ const TableFooter = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <tfoot
-    ref={ref}
     className={cn(
       "border-border border-t bg-card font-medium [&>tr]:last:border-b-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -69,12 +69,12 @@ const TableRow = React.forwardRef<
   }
 >(({ className, linkBox, ...props }, ref) => (
   <tr
-    ref={ref}
     className={cn(
       "border-border border-b last:border-0 data-[state=selected]:bg-muted",
       linkBox && "relative translate-x-0 translate-y-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -85,11 +85,11 @@ const TableHead = React.forwardRef<
   React.ThHTMLAttributes<HTMLTableCellElement>
 >(({ className, ...props }, ref) => (
   <th
-    ref={ref}
     className={cn(
       "px-6 py-4 text-left align-middle font-medium text-muted-foreground text-xs uppercase tracking-wider [&:has([role=checkbox])]:pr-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -100,11 +100,11 @@ const TableCell = React.forwardRef<
   React.TdHTMLAttributes<HTMLTableCellElement>
 >(({ className, ...props }, ref) => (
   <td
-    ref={ref}
     className={cn(
       "px-6 py-4 text-start align-middle text-sm [&:has([role=checkbox])]:pr-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -115,8 +115,8 @@ const TableCaption = React.forwardRef<
   React.HTMLAttributes<HTMLTableCaptionElement>
 >(({ className, ...props }, ref) => (
   <caption
-    ref={ref}
     className={cn("py-4 text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -129,13 +129,13 @@ function TableContainer(props: {
 }) {
   return (
     <ScrollShadow
-      shadowClassName="z-30"
-      disableTopShadow
       className={cn(
         "relative whitespace-nowrap rounded-lg border border-border bg-card",
         props.className,
       )}
+      disableTopShadow
       scrollableClassName={props.scrollableContainerClassName}
+      shadowClassName="z-30"
       shadowColor="hsl(var(--muted))"
     >
       {props.children}
diff --git a/apps/nebula/src/@/components/ui/tabs.tsx b/apps/nebula/src/@/components/ui/tabs.tsx
index 0fe8f90b0cd..271e2943e0e 100644
--- a/apps/nebula/src/@/components/ui/tabs.tsx
+++ b/apps/nebula/src/@/components/ui/tabs.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import { useCallback, useRef, useState } from "react";
-import { ScrollShadow } from "./ScrollShadow/ScrollShadow";
+import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
+import { cn } from "@/lib/utils";
 import { Button } from "./button";
+import { ScrollShadow } from "./ScrollShadow/ScrollShadow";
 import { ToolTipLabel } from "./tooltip";
 
 export type TabLink = {
@@ -48,14 +48,11 @@ export function TabLinks(props: {
             return (
               <Button
                 asChild
-                key={tab.href}
                 disabled={tab.isDisabled}
+                key={tab.href}
                 variant="ghost"
               >
                 <Link
-                  data-active={tab.isActive}
-                  ref={tab.isActive ? activeTabRef : undefined}
-                  href={tab.href}
                   aria-disabled={tab.isDisabled}
                   className={cn(
                     "relative h-auto rounded-lg px-3 font-normal text-muted-foreground text-sm hover:bg-accent lg:text-sm",
@@ -63,6 +60,9 @@ export function TabLinks(props: {
                     tab.isDisabled && "pointer-events-none",
                     tab.isActive && "!text-foreground",
                   )}
+                  data-active={tab.isActive}
+                  href={tab.href}
+                  ref={tab.isActive ? activeTabRef : undefined}
                 >
                   {tab.name}
                 </Link>
@@ -73,8 +73,8 @@ export function TabLinks(props: {
 
         {/* Active line */}
         <div
-          ref={lineRef}
           className="fade-in-0 absolute bottom-0 left-0 h-[2px] animate-in rounded-lg bg-foreground"
+          ref={lineRef}
         />
       </ScrollShadow>
     </div>
@@ -123,8 +123,6 @@ export function TabButtons(props: {
                 label={tab.toolTip}
               >
                 <Button
-                  variant="ghost"
-                  ref={tab.isActive ? activeTabRef : undefined}
                   className={cn(
                     "relative inline-flex h-auto items-center gap-1.5 rounded-lg px-2 font-medium text-sm hover:bg-accent lg:px-3 lg:text-base",
                     !tab.isActive &&
@@ -134,6 +132,8 @@ export function TabButtons(props: {
                     tab.isActive && props.activeTabClassName,
                   )}
                   onClick={!tab.isDisabled ? tab.onClick : undefined}
+                  ref={tab.isActive ? activeTabRef : undefined}
+                  variant="ghost"
                 >
                   {tab.icon && (
                     <tab.icon
@@ -149,8 +149,8 @@ export function TabButtons(props: {
 
         {/* Active line */}
         <div
-          ref={lineRef}
           className="fade-in-0 absolute bottom-0 left-0 h-[2px] animate-in rounded-lg bg-foreground"
+          ref={lineRef}
         />
       </ScrollShadow>
     </div>
@@ -187,7 +187,7 @@ function useUnderline<El extends HTMLElement>() {
     }
 
     update();
-    let resizeObserver: ResizeObserver | undefined = undefined;
+    let resizeObserver: ResizeObserver | undefined;
 
     if (containerRef.current) {
       resizeObserver = new ResizeObserver(() => {
@@ -206,5 +206,5 @@ function useUnderline<El extends HTMLElement>() {
     };
   }, [activeTabEl]);
 
-  return { containerRef, lineRef, activeTabRef };
+  return { activeTabRef, containerRef, lineRef };
 }
diff --git a/apps/nebula/src/@/components/ui/text-shimmer.tsx b/apps/nebula/src/@/components/ui/text-shimmer.tsx
index 7355cb8c18a..d9929da529a 100644
--- a/apps/nebula/src/@/components/ui/text-shimmer.tsx
+++ b/apps/nebula/src/@/components/ui/text-shimmer.tsx
@@ -1,9 +1,6 @@
 import { cn } from "../../lib/utils";
 
-export function TextShimmer(props: {
-  text: string;
-  className?: string;
-}) {
+export function TextShimmer(props: { text: string; className?: string }) {
   return (
     <div className="flex">
       <p
diff --git a/apps/nebula/src/@/components/ui/tooltip.tsx b/apps/nebula/src/@/components/ui/tooltip.tsx
index cc07667ea2f..3a0ea11c6ae 100644
--- a/apps/nebula/src/@/components/ui/tooltip.tsx
+++ b/apps/nebula/src/@/components/ui/tooltip.tsx
@@ -16,12 +16,12 @@ const TooltipContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
 >(({ className, sideOffset = 4, ...props }, ref) => (
   <TooltipPrimitive.Content
-    ref={ref}
-    sideOffset={sideOffset}
     className={cn(
       "fade-in-0 zoom-in-95 data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 animate-in overflow-hidden rounded-md border border-border bg-popover px-3 py-1.5 text-popover-foreground text-sm shadow-md data-[state=closed]:animate-out",
       className,
     )}
+    ref={ref}
+    sideOffset={sideOffset}
     {...props}
   />
 ));
@@ -50,13 +50,13 @@ export function ToolTipLabel(props: {
           {props.children}
         </TooltipTrigger>
         <TooltipContent
-          side={props.side}
           align={props.align}
-          sideOffset={10}
           className={cn(
             "max-w-[400px] whitespace-normal p-0 leading-relaxed",
             props.contentClassName,
           )}
+          side={props.side}
+          sideOffset={10}
         >
           <div className="flex items-center gap-1.5 p-4 text-sm">
             {props.leftIcon}
diff --git a/apps/nebula/src/@/config/sdk-component-theme.ts b/apps/nebula/src/@/config/sdk-component-theme.ts
index 179c58dbab1..005818d2ac6 100644
--- a/apps/nebula/src/@/config/sdk-component-theme.ts
+++ b/apps/nebula/src/@/config/sdk-component-theme.ts
@@ -1,41 +1,41 @@
 import {
-  type Theme,
-  type ThemeOverrides,
   darkTheme,
   lightTheme,
+  type Theme,
+  type ThemeOverrides,
 } from "thirdweb/react";
 
 export function getSDKTheme(theme: "light" | "dark"): Theme {
   const overrides: ThemeOverrides = {
     colors: {
-      modalBg: "hsl(var(--card))",
+      accentButtonBg: "hsl(var(--primary))",
+      accentButtonText: "hsl(var(--primary-foreground))",
+      accentText: "hsl(var(--link-foreground))",
       borderColor: "hsl(var(--border))",
       connectedButtonBg: "hsl(var(--card))",
       connectedButtonBgHover: "hsl(var(--accent))",
-      tertiaryBg: "hsl(var(--muted)/50%)",
-      secondaryButtonBg: "hsl(var(--secondary))",
-      secondaryButtonHoverBg: "hsl(var(--secondary)/80%)",
+      danger: "hsl(var(--destructive-text))",
       inputAutofillBg: "hsl(var(--muted))",
-      secondaryIconHoverBg: "hsl(var(--accent))",
-      separatorLine: "hsl(var(--border))",
-      skeletonBg: "hsl(var(--muted))",
-      scrollbarBg: "hsl(var(--muted))",
-      secondaryText: "hsl(var(--muted-foreground))",
-      primaryText: "hsl(var(--foreground))",
-      accentText: "hsl(var(--link-foreground))",
-      accentButtonBg: "hsl(var(--primary))",
-      accentButtonText: "hsl(var(--primary-foreground))",
+      modalBg: "hsl(var(--card))",
       primaryButtonBg: "hsl(var(--inverted))",
       primaryButtonText: "hsl(var(--inverted-foreground))",
+      primaryText: "hsl(var(--foreground))",
+      scrollbarBg: "hsl(var(--muted))",
+      secondaryButtonBg: "hsl(var(--secondary))",
+      secondaryButtonHoverBg: "hsl(var(--secondary)/80%)",
       secondaryButtonText: "hsl(var(--secondary-foreground))",
-      tooltipBg: "hsl(var(--popover))",
-      tooltipText: "hsl(var(--popover-foreground))",
       secondaryIconColor: "hsl(var(--secondary-foreground))",
+      secondaryIconHoverBg: "hsl(var(--accent))",
       secondaryIconHoverColor: "hsl(var(--foreground))",
+      secondaryText: "hsl(var(--muted-foreground))",
       selectedTextBg: "hsl(var(--inverted))",
       selectedTextColor: "hsl(var(--inverted-foreground))",
-      danger: "hsl(var(--destructive-text))",
+      separatorLine: "hsl(var(--border))",
+      skeletonBg: "hsl(var(--muted))",
       success: "hsl(var(--success-text))",
+      tertiaryBg: "hsl(var(--muted)/50%)",
+      tooltipBg: "hsl(var(--popover))",
+      tooltipText: "hsl(var(--popover-foreground))",
     },
   };
 
diff --git a/apps/nebula/src/@/constants/nebula-client.ts b/apps/nebula/src/@/constants/nebula-client.ts
index d76a19a2354..b3361921e50 100644
--- a/apps/nebula/src/@/constants/nebula-client.ts
+++ b/apps/nebula/src/@/constants/nebula-client.ts
@@ -1,3 +1,5 @@
+import { createThirdwebClient } from "thirdweb";
+import { setThirdwebDomains } from "thirdweb/utils";
 import {
   NEXT_PUBLIC_IPFS_GATEWAY_URL,
   NEXT_PUBLIC_NEBULA_APP_CLIENT_ID,
@@ -13,33 +15,31 @@ import {
   THIRDWEB_STORAGE_DOMAIN,
 } from "@/constants/urls";
 import { getVercelEnv } from "@/utils/vercel-utils";
-import { createThirdwebClient } from "thirdweb";
-import { setThirdwebDomains } from "thirdweb/utils";
 
 // returns a thirdweb client with optional JWT passed in
 function getNebulaThirdwebClient() {
   if (getVercelEnv() !== "production") {
     // if not on production: run this when creating a client to set the domains
     setThirdwebDomains({
-      rpc: THIRDWEB_RPC_DOMAIN,
+      bridge: THIRDWEB_BRIDGE_URL,
+      bundler: THIRDWEB_BUNDLER_DOMAIN,
       inAppWallet: THIRDWEB_INAPP_WALLET_DOMAIN,
+      insight: THIRDWEB_INSIGHT_API_DOMAIN,
       pay: THIRDWEB_PAY_DOMAIN,
-      storage: THIRDWEB_STORAGE_DOMAIN,
+      rpc: THIRDWEB_RPC_DOMAIN,
       social: THIRDWEB_SOCIAL_API_DOMAIN,
-      bundler: THIRDWEB_BUNDLER_DOMAIN,
-      insight: THIRDWEB_INSIGHT_API_DOMAIN,
-      bridge: THIRDWEB_BRIDGE_URL,
+      storage: THIRDWEB_STORAGE_DOMAIN,
     });
   }
 
   return createThirdwebClient({
-    secretKey: undefined,
     clientId: NEXT_PUBLIC_NEBULA_APP_CLIENT_ID,
     config: {
       storage: {
         gatewayUrl: NEXT_PUBLIC_IPFS_GATEWAY_URL,
       },
     },
+    secretKey: undefined,
   });
 }
 
diff --git a/apps/nebula/src/@/hooks/chains.ts b/apps/nebula/src/@/hooks/chains.ts
index 36599b4fe85..588d0479450 100644
--- a/apps/nebula/src/@/hooks/chains.ts
+++ b/apps/nebula/src/@/hooks/chains.ts
@@ -1,12 +1,12 @@
 "use client";
 
+import { useQuery } from "@tanstack/react-query";
+import { useEffect } from "react";
+import type { Chain, ChainMetadata } from "thirdweb/chains";
 import { isProd } from "@/constants/env-utils";
 // import { isProd } from "@/constants/env-utils";
 import { createStore, useStore } from "@/lib/reactive";
 import { mapV4ChainToV5Chain } from "@/utils/map-chains";
-import { useQuery } from "@tanstack/react-query";
-import { useEffect } from "react";
-import type { Chain, ChainMetadata } from "thirdweb/chains";
 
 type AllChainsStore = {
   allChains: ChainMetadata[];
@@ -97,8 +97,8 @@ export function useAllChainsData() {
   // trigger fetching all chains if this hook is used instead of putting this on root
   // so we can avoid fetching all chains if it's not required
   const allChainsQuery = useQuery({
-    queryKey: ["all-chains"],
     queryFn: () => fetchChainsFromApi(),
+    queryKey: ["all-chains"],
   });
 
   // eslint-disable-next-line no-restricted-syntax
diff --git a/apps/nebula/src/@/hooks/use-clipboard.tsx b/apps/nebula/src/@/hooks/use-clipboard.tsx
index 909f3619635..4b78dfc79d6 100644
--- a/apps/nebula/src/@/hooks/use-clipboard.tsx
+++ b/apps/nebula/src/@/hooks/use-clipboard.tsx
@@ -32,5 +32,5 @@ export function useClipboard(text: string, delay = 1500) {
     };
   }, [hasCopied, delay]);
 
-  return { onCopy, hasCopied };
+  return { hasCopied, onCopy };
 }
diff --git a/apps/nebula/src/@/icons/NebulaIcon.tsx b/apps/nebula/src/@/icons/NebulaIcon.tsx
index bfd2636bf1b..1a59d089f01 100644
--- a/apps/nebula/src/@/icons/NebulaIcon.tsx
+++ b/apps/nebula/src/@/icons/NebulaIcon.tsx
@@ -1,12 +1,12 @@
 export function NebulaIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
-      height="24"
-      viewBox="0 0 153 153"
       className={props.className}
-      role="presentation"
       fill="none"
+      height="24"
+      role="presentation"
+      viewBox="0 0 153 153"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
@@ -14,10 +14,10 @@ export function NebulaIcon(props: { className?: string }) {
         fill="currentColor"
       />
       <path
-        fillRule="evenodd"
         clipRule="evenodd"
         d="M91.9481 29.4892C78.7023 32.4916 63.6745 40.7425 50.4663 53.9508C46.781 57.636 43.4817 61.4629 40.5746 65.3532C44.5585 68.8492 47.0735 73.9786 47.0735 79.6955C47.0735 90.2299 38.5336 98.7698 27.9992 98.7698C27.1107 98.7698 26.2364 98.7091 25.3803 98.5915C23.3955 110.414 25.9579 119.384 31.3537 124.78C37.2202 130.646 47.3123 133.164 60.701 130.129C73.9468 127.126 88.9745 118.875 102.183 105.667C105.888 101.962 109.204 98.1131 112.122 94.2007C108.103 90.7037 105.562 85.551 105.562 79.8048C105.562 69.2704 114.102 60.7305 124.636 60.7305C125.536 60.7305 126.421 60.7928 127.288 60.9133C129.237 49.147 126.674 40.2167 121.295 34.8381C115.429 28.9716 105.337 26.4545 91.9481 29.4892ZM16.3791 94.8229C13.4047 109.493 15.9004 122.818 24.608 131.526C42.6147 149.532 80.3662 140.975 108.928 112.413C113.381 107.96 117.348 103.284 120.803 98.494C122.042 98.7466 123.324 98.8792 124.636 98.8792C135.171 98.8792 143.711 90.3393 143.711 79.8048C143.711 73.6582 140.803 68.1906 136.289 64.7023C139.234 50.0687 136.73 36.7817 128.041 28.0925C110.034 10.0859 72.2829 18.6429 43.7206 47.2051C39.2988 51.627 35.3564 56.2691 31.9179 61.024C30.6531 60.7599 29.3423 60.6211 27.9992 60.6211C17.4647 60.6211 8.9248 69.161 8.9248 79.6955C8.9248 85.8567 11.8461 91.3357 16.3791 94.8229ZM124.636 70.2677C119.369 70.2677 115.099 74.5376 115.099 79.8048C115.099 85.0721 119.369 89.342 124.636 89.342C129.904 89.342 134.174 85.0721 134.174 79.8048C134.174 74.5376 129.904 70.2677 124.636 70.2677ZM18.462 79.6955C18.462 74.4282 22.7319 70.1583 27.9992 70.1583C33.2664 70.1583 37.5363 74.4282 37.5363 79.6955C37.5363 84.9627 33.2664 89.2326 27.9992 89.2326C22.7319 89.2326 18.462 84.9627 18.462 79.6955Z"
         fill="currentColor"
+        fillRule="evenodd"
       />
     </svg>
   );
diff --git a/apps/nebula/src/@/lib/DashboardRouter.tsx b/apps/nebula/src/@/lib/DashboardRouter.tsx
index 13d24b32648..458adea8a59 100644
--- a/apps/nebula/src/@/lib/DashboardRouter.tsx
+++ b/apps/nebula/src/@/lib/DashboardRouter.tsx
@@ -30,14 +30,14 @@ export function useDashboardRouter() {
   return useMemo(() => {
     return {
       ...router,
-      replace(href: string, options?: { scroll?: boolean }) {
+      push(href: string, options?: { scroll?: boolean }) {
         startTransition(() => {
-          router.replace(href, options);
+          router.push(href, options);
         });
       },
-      push(href: string, options?: { scroll?: boolean }) {
+      replace(href: string, options?: { scroll?: boolean }) {
         startTransition(() => {
-          router.push(href, options);
+          router.replace(href, options);
         });
       },
     };
@@ -109,10 +109,10 @@ export function DashboardRouterTopProgressBar() {
       className="fixed top-0 block h-[3px] bg-foreground"
       style={{
         opacity: isRouteLoading ? "1" : "0",
-        width: `${width}%`,
+        pointerEvents: "none",
         transition: width === 0 ? "none" : "width 0.2s ease, opacity 0.3s ease",
+        width: `${width}%`,
         zIndex: "100000000",
-        pointerEvents: "none",
       }}
     />
   );
diff --git a/apps/nebula/src/@/lib/resolveSchemeWithErrorHandler.ts b/apps/nebula/src/@/lib/resolveSchemeWithErrorHandler.ts
index 38a6a3946eb..193b8c5593c 100644
--- a/apps/nebula/src/@/lib/resolveSchemeWithErrorHandler.ts
+++ b/apps/nebula/src/@/lib/resolveSchemeWithErrorHandler.ts
@@ -11,8 +11,8 @@ export function resolveSchemeWithErrorHandler(options: {
   try {
     // eslint-disable-next-line no-restricted-syntax
     return resolveScheme({
-      uri: options.uri,
       client: options.client,
+      uri: options.uri,
     });
   } catch (err) {
     console.error("error resolving ipfs url", options.uri, err);
diff --git a/apps/nebula/src/@/storybook/utils.tsx b/apps/nebula/src/@/storybook/utils.tsx
index 63a167f93eb..68bb416bb58 100644
--- a/apps/nebula/src/@/storybook/utils.tsx
+++ b/apps/nebula/src/@/storybook/utils.tsx
@@ -1,9 +1,7 @@
 import { Badge } from "@/components/ui/badge";
 import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
 
-function StoryBadge(props: {
-  label: string;
-}) {
+function StoryBadge(props: { label: string }) {
   return (
     <Badge
       className="mb-3 self-start border-none bg-muted px-3 py-1 font-normal text-muted-foreground text-xs"
diff --git a/apps/nebula/src/@/utils/authToken.ts b/apps/nebula/src/@/utils/authToken.ts
index e81208541ea..1365de21e26 100644
--- a/apps/nebula/src/@/utils/authToken.ts
+++ b/apps/nebula/src/@/utils/authToken.ts
@@ -1,8 +1,8 @@
+import { cookies } from "next/headers";
 import {
   NEBULA_COOKIE_ACTIVE_ACCOUNT,
   NEBULA_COOKIE_PREFIX_TOKEN,
 } from "@/constants/cookies";
-import { cookies } from "next/headers";
 
 export async function getNebulaAuthToken() {
   const cookiesManager = await cookies();
diff --git a/apps/nebula/src/@/utils/isAuthTokenValid.ts b/apps/nebula/src/@/utils/isAuthTokenValid.ts
index 5cf8ce43006..31f4d9a1a79 100644
--- a/apps/nebula/src/@/utils/isAuthTokenValid.ts
+++ b/apps/nebula/src/@/utils/isAuthTokenValid.ts
@@ -2,11 +2,11 @@ import { NEXT_PUBLIC_NEBULA_URL } from "@/constants/public-envs";
 
 export async function isNebulaAuthTokenValid(token: string) {
   const res = await fetch(`${NEXT_PUBLIC_NEBULA_URL}/auth/verify`, {
-    method: "GET",
     headers: {
-      "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
     },
+    method: "GET",
   });
 
   if (!res.ok) {
diff --git a/apps/nebula/src/@/utils/isLoggedIntoNebula.ts b/apps/nebula/src/@/utils/isLoggedIntoNebula.ts
index d0e83b3af3f..226562c98da 100644
--- a/apps/nebula/src/@/utils/isLoggedIntoNebula.ts
+++ b/apps/nebula/src/@/utils/isLoggedIntoNebula.ts
@@ -34,8 +34,8 @@ export async function getNebulaLoginStatus(): Promise<
   }
 
   return {
-    isLoggedIn: true,
-    authToken,
     accountAddress,
+    authToken,
+    isLoggedIn: true,
   };
 }
diff --git a/apps/nebula/src/@/utils/map-chains.ts b/apps/nebula/src/@/utils/map-chains.ts
index b969f7f21ab..feafc831f19 100644
--- a/apps/nebula/src/@/utils/map-chains.ts
+++ b/apps/nebula/src/@/utils/map-chains.ts
@@ -3,17 +3,17 @@ import type { ChainMetadata } from "thirdweb/chains";
 
 export function mapV4ChainToV5Chain(v4Chain: ChainMetadata) {
   const chain: Chain = {
-    id: v4Chain.chainId,
-    // eslint-disable-next-line no-restricted-syntax
-    rpc: v4Chain.rpc[0] || defineChain(v4Chain.chainId).rpc,
     // TypeScript shenanigans, just avoiding as string assertion here
     blockExplorers: v4Chain.explorers?.map((x) => x),
     // TypeScript shenanigans, just avoiding as string assertion here
     faucets: v4Chain.faucets?.map((x) => x),
-    name: v4Chain.name,
     icon: v4Chain.icon,
-    testnet: v4Chain.testnet === true ? true : undefined,
+    id: v4Chain.chainId,
+    name: v4Chain.name,
     nativeCurrency: v4Chain.nativeCurrency,
+    // eslint-disable-next-line no-restricted-syntax
+    rpc: v4Chain.rpc[0] || defineChain(v4Chain.chainId).rpc,
+    testnet: v4Chain.testnet === true ? true : undefined,
   };
 
   return chain;
diff --git a/apps/nebula/src/@/utils/nebula-chains.ts b/apps/nebula/src/@/utils/nebula-chains.ts
index 8f24f6c8810..a03e1eef451 100644
--- a/apps/nebula/src/@/utils/nebula-chains.ts
+++ b/apps/nebula/src/@/utils/nebula-chains.ts
@@ -1,6 +1,6 @@
-import { fetchChain } from "@/utils/fetchChain";
 import { unstable_cache } from "next/cache";
 import type { ChainMetadata } from "thirdweb/chains";
+import { fetchChain } from "@/utils/fetchChain";
 
 export const getChainsForNebula = unstable_cache(
   async (chainNamesOrIds: string[] | string | undefined) => {
diff --git a/apps/nebula/src/@/utils/verifyTurnstileToken.ts b/apps/nebula/src/@/utils/verifyTurnstileToken.ts
index 01f59fb31e5..06fa4ddd447 100644
--- a/apps/nebula/src/@/utils/verifyTurnstileToken.ts
+++ b/apps/nebula/src/@/utils/verifyTurnstileToken.ts
@@ -1,7 +1,7 @@
 import "server-only";
-import { TURNSTILE_SECRET_KEY } from "@/constants/server-envs";
 import { ipAddress } from "@vercel/functions";
 import { headers } from "next/headers";
+import { TURNSTILE_SECRET_KEY } from "@/constants/server-envs";
 
 export async function verifyTurnstileToken(turnstileToken: string) {
   // get the request headers
@@ -41,8 +41,8 @@ export async function verifyTurnstileToken(turnstileToken: string) {
 
   if (!ip) {
     return {
-      error: "Could not get IP address. Please try again.",
       context: errors,
+      error: "Could not get IP address. Please try again.",
     };
   }
 
@@ -52,14 +52,14 @@ export async function verifyTurnstileToken(turnstileToken: string) {
     "https://challenges.cloudflare.com/turnstile/v0/siteverify",
     {
       body: JSON.stringify({
-        secret: TURNSTILE_SECRET_KEY,
-        response: turnstileToken,
         remoteip: ip,
+        response: turnstileToken,
+        secret: TURNSTILE_SECRET_KEY,
       }),
-      method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
 
diff --git a/apps/nebula/src/app/(app)/api/chat.ts b/apps/nebula/src/app/(app)/api/chat.ts
index 28c162c3ac9..e927c0fdddd 100644
--- a/apps/nebula/src/app/(app)/api/chat.ts
+++ b/apps/nebula/src/app/(app)/api/chat.ts
@@ -1,5 +1,5 @@
-import { NEXT_PUBLIC_NEBULA_URL } from "@/constants/public-envs";
 import { stream } from "fetch-event-stream";
+import { NEXT_PUBLIC_NEBULA_URL } from "@/constants/public-envs";
 import type { NebulaTxData, NebulaUserMessage } from "./types";
 
 export type NebulaContext = {
@@ -50,25 +50,25 @@ export async function promptNebula(params: {
 }) {
   const body: Record<string, string | boolean | object> = {
     messages: [params.message],
-    stream: true,
     session_id: params.sessionId,
+    stream: true,
   };
 
   if (params.context) {
     body.context = {
       chain_ids: params.context.chainIds || [],
-      wallet_address: params.context.walletAddress,
       networks: params.context.networks,
+      wallet_address: params.context.walletAddress,
     };
   }
 
   const events = await stream(`${NEXT_PUBLIC_NEBULA_URL}/chat`, {
-    method: "POST",
+    body: JSON.stringify(body),
     headers: {
       Authorization: `Bearer ${params.authToken}`,
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(body),
+    method: "POST",
     signal: params.abortController.signal,
   });
 
@@ -82,18 +82,18 @@ export async function promptNebula(params: {
     switch (event.event) {
       case "delta": {
         params.handleStream({
-          event: "delta",
           data: {
             v: JSON.parse(event.data).v,
           },
+          event: "delta",
         });
         break;
       }
 
       case "presence": {
         params.handleStream({
-          event: "presence",
           data: JSON.parse(event.data),
+          event: "presence",
         });
         break;
       }
@@ -109,8 +109,8 @@ export async function promptNebula(params: {
         };
 
         params.handleStream({
-          event: "image",
           data: data.data,
+          event: "image",
           request_id: data.request_id,
         });
         break;
@@ -123,10 +123,10 @@ export async function promptNebula(params: {
           try {
             const parsedTxData = JSON.parse(data.data) as NebulaTxData;
             params.handleStream({
-              event: "action",
-              type: "sign_transaction",
               data: parsedTxData,
+              event: "action",
               request_id: data.request_id,
+              type: "sign_transaction",
             });
           } catch (e) {
             console.error("failed to parse action data", e, { event });
@@ -137,10 +137,10 @@ export async function promptNebula(params: {
           try {
             const swapData = JSON.parse(data.data) as NebulaSwapData;
             params.handleStream({
-              event: "action",
-              type: "sign_swap",
               data: swapData,
+              event: "action",
               request_id: data.request_id,
+              type: "sign_swap",
             });
           } catch (e) {
             console.error("failed to parse action data", e, { event });
@@ -159,11 +159,11 @@ export async function promptNebula(params: {
         };
 
         params.handleStream({
-          event: "error",
           data: {
             code: data.code,
             errorMessage: data.error.message,
           },
+          event: "error",
         });
         break;
       }
@@ -171,11 +171,11 @@ export async function promptNebula(params: {
       case "init": {
         const data = JSON.parse(event.data);
         params.handleStream({
-          event: "init",
           data: {
-            session_id: data.session_id,
             request_id: data.request_id,
+            session_id: data.session_id,
           },
+          event: "init",
         });
         break;
       }
@@ -194,8 +194,8 @@ export async function promptNebula(params: {
         };
 
         params.handleStream({
-          event: "context",
           data: contextData,
+          event: "context",
         });
         break;
       }
diff --git a/apps/nebula/src/app/(app)/api/feedback.ts b/apps/nebula/src/app/(app)/api/feedback.ts
index 4709f21884d..e281e3cc596 100644
--- a/apps/nebula/src/app/(app)/api/feedback.ts
+++ b/apps/nebula/src/app/(app)/api/feedback.ts
@@ -8,15 +8,15 @@ export async function submitFeedback(params: {
   rating: "good" | "bad" | "neutral";
 }) {
   const res = await fetchWithAuthToken({
-    method: "POST",
-    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/feedback`,
+    authToken: params.authToken,
     body: {
-      session_id: params.sessionId,
-      request_id: params.requestId,
       feedback_rating:
         params.rating === "good" ? 1 : params.rating === "bad" ? -1 : 0,
+      request_id: params.requestId,
+      session_id: params.sessionId,
     },
-    authToken: params.authToken,
+    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/feedback`,
+    method: "POST",
   });
 
   if (!res.ok) {
diff --git a/apps/nebula/src/app/(app)/api/fetchWithAuthToken.ts b/apps/nebula/src/app/(app)/api/fetchWithAuthToken.ts
index 516fd3dc805..a9927b46c13 100644
--- a/apps/nebula/src/app/(app)/api/fetchWithAuthToken.ts
+++ b/apps/nebula/src/app/(app)/api/fetchWithAuthToken.ts
@@ -20,13 +20,13 @@ export async function fetchWithAuthToken(options: FetchWithKeyOptions) {
 
   try {
     const response = await fetch(options.endpoint, {
-      method: options.method,
+      body: "body" in options ? JSON.stringify(options.body) : undefined,
       headers: {
-        "Content-Type": "application/json",
         Accept: "application/json",
         Authorization: `Bearer ${options.authToken}`,
+        "Content-Type": "application/json",
       },
-      body: "body" in options ? JSON.stringify(options.body) : undefined,
+      method: options.method,
       signal: controller.signal,
     });
 
diff --git a/apps/nebula/src/app/(app)/api/session.ts b/apps/nebula/src/app/(app)/api/session.ts
index 338888f077c..871e30240a5 100644
--- a/apps/nebula/src/app/(app)/api/session.ts
+++ b/apps/nebula/src/app/(app)/api/session.ts
@@ -17,16 +17,16 @@ export async function createSession(params: {
   if (params.context) {
     body.context = {
       chain_ids: params.context.chainIds || [],
-      wallet_address: params.context.walletAddress,
       networks: params.context.networks,
+      wallet_address: params.context.walletAddress,
     };
   }
 
   const res = await fetchWithAuthToken({
-    method: "POST",
-    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session`,
-    body: body,
     authToken: params.authToken,
+    body: body,
+    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session`,
+    method: "POST",
   });
 
   if (!res.ok) {
@@ -47,16 +47,16 @@ export async function updateSession(params: {
   if (params.contextFilters) {
     body.context = {
       chain_ids: params.contextFilters.chainIds || [],
-      wallet_address: params.contextFilters.walletAddress,
       networks: params.contextFilters.networks,
+      wallet_address: params.contextFilters.walletAddress,
     };
   }
 
   const res = await fetchWithAuthToken({
-    method: "PUT",
-    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session/${params.sessionId}`,
-    body: body,
     authToken: params.authToken,
+    body: body,
+    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session/${params.sessionId}`,
+    method: "PUT",
   });
 
   if (!res.ok) {
@@ -72,9 +72,9 @@ export async function deleteSession(params: {
   sessionId: string;
 }) {
   const res = await fetchWithAuthToken({
-    method: "DELETE",
-    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session/${params.sessionId}`,
     authToken: params.authToken,
+    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session/${params.sessionId}`,
+    method: "DELETE",
   });
 
   if (!res.ok) {
@@ -85,13 +85,11 @@ export async function deleteSession(params: {
   return data.result as DeletedSessionInfo;
 }
 
-export async function getSessions(params: {
-  authToken: string;
-}) {
+export async function getSessions(params: { authToken: string }) {
   const res = await fetchWithAuthToken({
-    method: "GET",
-    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session/list`,
     authToken: params.authToken,
+    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session/list`,
+    method: "GET",
   });
 
   if (!res.ok) {
@@ -107,9 +105,9 @@ export async function getSessionById(params: {
   sessionId: string;
 }) {
   const res = await fetchWithAuthToken({
-    method: "GET",
-    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session/${params.sessionId}`,
     authToken: params.authToken,
+    endpoint: `${NEXT_PUBLIC_NEBULA_URL}/session/${params.sessionId}`,
+    method: "GET",
   });
 
   if (!res.ok) {
diff --git a/apps/nebula/src/app/(app)/chat/[session_id]/page.tsx b/apps/nebula/src/app/(app)/chat/[session_id]/page.tsx
index a3b4df3c0fd..624335a96ed 100644
--- a/apps/nebula/src/app/(app)/chat/[session_id]/page.tsx
+++ b/apps/nebula/src/app/(app)/chat/[session_id]/page.tsx
@@ -1,10 +1,10 @@
+import { redirect } from "next/navigation";
 import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
 import {
   getNebulaAuthToken,
   getNebulaAuthTokenWalletAddress,
 } from "@/utils/authToken";
 import { loginRedirect } from "@/utils/loginRedirect";
-import { redirect } from "next/navigation";
 import { getSessionById } from "../../api/session";
 import { ChatPageContent } from "../../components/ChatPageContent";
 
@@ -36,9 +36,9 @@ export default async function Page(props: {
       accountAddress={accountAddress}
       authToken={authToken}
       client={nebulaAppThirdwebClient}
+      initialParams={undefined}
       session={session}
       type="new-chat"
-      initialParams={undefined}
     />
   );
 }
diff --git a/apps/nebula/src/app/(app)/chat/history/ChatHistoryPage.stories.tsx b/apps/nebula/src/app/(app)/chat/history/ChatHistoryPage.stories.tsx
index 005ab1b45a1..7a29b517422 100644
--- a/apps/nebula/src/app/(app)/chat/history/ChatHistoryPage.stories.tsx
+++ b/apps/nebula/src/app/(app)/chat/history/ChatHistoryPage.stories.tsx
@@ -1,18 +1,12 @@
-import { randomLorem } from "@/storybook/stubs";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { subDays } from "date-fns";
 import { ThirdwebProvider } from "thirdweb/react";
+import { randomLorem } from "@/storybook/stubs";
 import { ChatPageLayout } from "../../components/ChatPageLayout";
 import { ChatHistoryPageUI } from "./ChatHistoryPage";
 
 const meta = {
-  title: "Nebula/history",
   component: Variant,
-  parameters: {
-    nextjs: {
-      appDirectory: true,
-    },
-  },
   decorators: [
     (Story) => (
       <ThirdwebProvider>
@@ -20,6 +14,12 @@ const meta = {
       </ThirdwebProvider>
     ),
   ],
+  parameters: {
+    nextjs: {
+      appDirectory: true,
+    },
+  },
+  title: "Nebula/history",
 } satisfies Meta<typeof Variant>;
 
 export default meta;
@@ -56,21 +56,18 @@ function createRandomSessions(length: number) {
     sessions.push({
       created_at: new Date().toISOString(),
       id: Math.random().toString(),
+      title: randomLorem(Math.floor(5 + Math.random() * 15)),
       updated_at: subDays(
         new Date(),
         Math.floor(Math.random() * 10),
       ).toISOString(),
-      title: randomLorem(Math.floor(5 + Math.random() * 15)),
     });
   }
 
   return sessions;
 }
 
-function Variant(props: {
-  length: number;
-  prefillSearch?: string;
-}) {
+function Variant(props: { length: number; prefillSearch?: string }) {
   return (
     <ChatPageLayout
       accountAddress="0x1234567890"
@@ -78,11 +75,11 @@ function Variant(props: {
       sessions={createRandomSessions(props.length)}
     >
       <ChatHistoryPageUI
-        sessions={createRandomSessions(props.length)}
-        prefillSearch={props.prefillSearch}
         deleteSession={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
+        prefillSearch={props.prefillSearch}
+        sessions={createRandomSessions(props.length)}
       />
     </ChatPageLayout>
   );
diff --git a/apps/nebula/src/app/(app)/chat/history/ChatHistoryPage.tsx b/apps/nebula/src/app/(app)/chat/history/ChatHistoryPage.tsx
index 2de74b13abd..d7f7c261f1e 100644
--- a/apps/nebula/src/app/(app)/chat/history/ChatHistoryPage.tsx
+++ b/apps/nebula/src/app/(app)/chat/history/ChatHistoryPage.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
 import { useMutation } from "@tanstack/react-query";
 import { formatDistance } from "date-fns";
 import Fuse from "fuse.js";
@@ -21,6 +12,15 @@ import {
 import Link from "next/link";
 import { useMemo, useState } from "react";
 import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { deleteSession } from "../../api/session";
 import type { TruncatedSessionInfo } from "../../api/types";
 import { useSessionsWithLocalOverrides } from "../../hooks/useSessionsWithLocalOverrides";
@@ -35,7 +35,7 @@ export function ChatHistoryPage(props: {
     <ChatHistoryPageUI
       {...props}
       deleteSession={async (s) => {
-        await deleteSession({ sessionId: s, authToken: props.authToken });
+        await deleteSession({ authToken: props.authToken, sessionId: s });
       }}
     />
   );
@@ -74,25 +74,25 @@ export function ChatHistoryPageUI(props: {
         <h1 className="px-6 font-semibold text-lg tracking-tight">All Chats</h1>
       </header>
       <SearchInput
+        onValueChange={setSearchVal}
         placeholder="Search for a chat"
         value={searchVal}
-        onValueChange={setSearchVal}
       />
 
       {filteredSessions.length > 0 && (
         <ScrollShadow
           className="flex-1"
           scrollableClassName="max-h-full py-6"
-          shadowColor="hsl(var(--background))"
           shadowClassName="z-10"
+          shadowColor="hsl(var(--background))"
         >
           {filteredSessions.length > 0 && (
             <div className="container flex max-w-[800px] flex-col gap-5">
               {filteredSessions.map((session) => (
                 <SessionCard
+                  deleteSession={props.deleteSession}
                   key={session.id + session.updated_at + session.created_at}
                   session={session}
-                  deleteSession={props.deleteSession}
                 />
               ))}
             </div>
@@ -149,10 +149,10 @@ function SearchInput(props: {
   return (
     <div className="relative">
       <Input
+        className="!border-b h-auto rounded-none border-0 px-6 py-4 pl-11 focus-visible:ring-0 focus-visible:ring-offset-0"
+        onChange={(e) => props.onValueChange(e.target.value)}
         placeholder={props.placeholder}
         value={props.value}
-        onChange={(e) => props.onValueChange(e.target.value)}
-        className="!border-b h-auto rounded-none border-0 px-6 py-4 pl-11 focus-visible:ring-0 focus-visible:ring-offset-0"
       />
       <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-5 size-4 text-muted-foreground" />
     </div>
@@ -203,17 +203,17 @@ function SessionCard(props: {
               <EllipsisIcon className="size-4 text-muted-foreground" />
             </Button>
           </PopoverTrigger>
-          <PopoverContent className="w-44 p-1" side="top" align="end">
+          <PopoverContent align="end" className="w-44 p-1" side="top">
             <Button
-              variant="ghost"
               className="!text-destructive-text flex w-full justify-start gap-2.5 px-2"
               onClick={() => {
                 const promise = deleteChat.mutateAsync();
                 toast.promise(promise, {
-                  success: "Chat deleted successfully",
                   error: "Failed to delete chat",
+                  success: "Chat deleted successfully",
                 });
               }}
+              variant="ghost"
             >
               {deleteChat.isPending ? (
                 <Spinner className="size-4" />
diff --git a/apps/nebula/src/app/(app)/chat/history/page.tsx b/apps/nebula/src/app/(app)/chat/history/page.tsx
index 59088c2d834..2d2e5fd4d08 100644
--- a/apps/nebula/src/app/(app)/chat/history/page.tsx
+++ b/apps/nebula/src/app/(app)/chat/history/page.tsx
@@ -11,5 +11,5 @@ export default async function Page() {
   }
 
   const sessions = await getSessions({ authToken }).catch(() => []);
-  return <ChatHistoryPage sessions={sessions} authToken={authToken} />;
+  return <ChatHistoryPage authToken={authToken} sessions={sessions} />;
 }
diff --git a/apps/nebula/src/app/(app)/chat/page.tsx b/apps/nebula/src/app/(app)/chat/page.tsx
index fb19eff12c4..a6008074ade 100644
--- a/apps/nebula/src/app/(app)/chat/page.tsx
+++ b/apps/nebula/src/app/(app)/chat/page.tsx
@@ -21,9 +21,9 @@ export default async function Page() {
       accountAddress={accountAddress}
       authToken={authToken}
       client={nebulaAppThirdwebClient}
+      initialParams={undefined}
       session={undefined}
       type="new-chat"
-      initialParams={undefined}
     />
   );
 }
diff --git a/apps/nebula/src/app/(app)/components/AssetsSection/AssetsSection.stories.tsx b/apps/nebula/src/app/(app)/components/AssetsSection/AssetsSection.stories.tsx
index 7d0f3b2fe2d..4bc5ef0fc73 100644
--- a/apps/nebula/src/app/(app)/components/AssetsSection/AssetsSection.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/AssetsSection/AssetsSection.stories.tsx
@@ -1,9 +1,8 @@
-import { storybookThirdwebClient } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
+import { storybookThirdwebClient } from "@/storybook/utils";
 import { type AssetBalance, AssetsSectionUI } from "./AssetsSection";
 
 const meta = {
-  title: "Nebula/AssetsSection",
   component: AssetsSectionUI,
   decorators: [
     (Story) => (
@@ -12,6 +11,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Nebula/AssetsSection",
 } satisfies Meta<typeof AssetsSectionUI>;
 
 export default meta;
@@ -19,83 +19,83 @@ type Story = StoryObj<typeof meta>;
 
 const tokensStub: AssetBalance[] = [
   {
+    balance: "10000000000000000000000",
     chain_id: 8453,
-    token_address: "0xe8e55a847bb446d967ef92f4580162fb8f2d3f38",
+    decimals: 18,
     name: "Broge",
     symbol: "BROGE",
-    decimals: 18,
-    balance: "10000000000000000000000",
+    token_address: "0xe8e55a847bb446d967ef92f4580162fb8f2d3f38",
   },
   {
+    balance: "2",
     chain_id: 8453,
-    token_address: "0x8d2757ea27aabf172da4cca4e5474c76016e3dc5",
+    decimals: 18,
     name: "clBTC",
     symbol: "clBTC",
-    decimals: 18,
-    balance: "2",
+    token_address: "0x8d2757ea27aabf172da4cca4e5474c76016e3dc5",
   },
   {
+    balance: "1000000000000000000",
     chain_id: 8453,
-    token_address: "0xb56d0839998fd79efcd15c27cf966250aa58d6d3",
+    decimals: 18,
     name: "BASED USA",
     symbol: "USA",
-    decimals: 18,
-    balance: "1000000000000000000",
+    token_address: "0xb56d0839998fd79efcd15c27cf966250aa58d6d3",
   },
   {
+    balance: "48888800000000000000",
     chain_id: 8453,
-    token_address: "0x600c9b69a65fb6d2551623a53ddef17b050233cd",
+    decimals: 18,
     name: "BearPaw",
     symbol: "PAW",
-    decimals: 18,
-    balance: "48888800000000000000",
+    token_address: "0x600c9b69a65fb6d2551623a53ddef17b050233cd",
   },
   {
+    balance: "69000000000000000000",
     chain_id: 8453,
-    token_address: "0x4c96a67b0577358894407af7bc3158fc1dffbeb5",
+    decimals: 18,
     name: "Degen Point Of View",
     symbol: "POV",
-    decimals: 18,
-    balance: "69000000000000000000",
+    token_address: "0x4c96a67b0577358894407af7bc3158fc1dffbeb5",
   },
   {
+    balance: "6237535850425",
     chain_id: 8453,
-    token_address: "0x4200000000000000000000000000000000000006",
+    decimals: 18,
     name: "Wrapped Ether",
     symbol: "WETH",
-    decimals: 18,
-    balance: "6237535850425",
+    token_address: "0x4200000000000000000000000000000000000006",
   },
 ];
 
 export const MultipleAssets: Story = {
   args: {
+    client: storybookThirdwebClient,
     data: tokensStub,
     isPending: false,
-    client: storybookThirdwebClient,
   },
 };
 
 export const SingleAsset: Story = {
   args: {
+    client: storybookThirdwebClient,
     data: tokensStub.slice(0, 1),
     isPending: false,
-    client: storybookThirdwebClient,
   },
 };
 
 export const EmptyAssets: Story = {
   args: {
+    client: storybookThirdwebClient,
     data: [],
     isPending: false,
-    client: storybookThirdwebClient,
   },
 };
 
 export const Loading: Story = {
   args: {
+    client: storybookThirdwebClient,
     data: [],
     isPending: true,
-    client: storybookThirdwebClient,
   },
 };
diff --git a/apps/nebula/src/app/(app)/components/AssetsSection/AssetsSection.tsx b/apps/nebula/src/app/(app)/components/AssetsSection/AssetsSection.tsx
index 9d3e5ba40ce..cfc361bd476 100644
--- a/apps/nebula/src/app/(app)/components/AssetsSection/AssetsSection.tsx
+++ b/apps/nebula/src/app/(app)/components/AssetsSection/AssetsSection.tsx
@@ -1,17 +1,12 @@
 "use client";
-import { ChainIconClient } from "@/components/blocks/ChainIcon";
-import { Skeleton } from "@/components/ui/skeleton";
-import { isProd } from "@/constants/env-utils";
-import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
-import { useAllChainsData } from "@/hooks/chains";
 import { useQuery } from "@tanstack/react-query";
 import { XIcon } from "lucide-react";
 import Link from "next/link";
 import {
-  NATIVE_TOKEN_ADDRESS,
-  type ThirdwebClient,
   defineChain,
   getAddress,
+  NATIVE_TOKEN_ADDRESS,
+  type ThirdwebClient,
   toTokens,
 } from "thirdweb";
 import {
@@ -22,6 +17,11 @@ import {
   useActiveWalletChain,
 } from "thirdweb/react";
 import { getWalletBalance } from "thirdweb/wallets";
+import { ChainIconClient } from "@/components/blocks/ChainIcon";
+import { Skeleton } from "@/components/ui/skeleton";
+import { isProd } from "@/constants/env-utils";
+import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
+import { useAllChainsData } from "@/hooks/chains";
 
 export type AssetBalance = {
   chain_id: number;
@@ -53,15 +53,15 @@ export function AssetsSectionUI(props: {
       {!props.isPending &&
         props.data.map((asset) => (
           <AssetItem
-            key={`${asset.chain_id}-${asset.token_address}`}
             asset={asset}
             client={props.client}
+            key={`${asset.chain_id}-${asset.token_address}`}
           />
         ))}
 
       {props.isPending &&
         new Array(10).fill(null).map((_, index) => (
-          // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+          // biome-ignore lint/suspicious/noArrayIndexKey: for the placeholder this is explicitly the key
           <SkeletonAssetItem key={index} />
         ))}
     </div>
@@ -80,10 +80,7 @@ function SkeletonAssetItem() {
   );
 }
 
-function AssetItem(props: {
-  asset: AssetBalance;
-  client: ThirdwebClient;
-}) {
+function AssetItem(props: { asset: AssetBalance; client: ThirdwebClient }) {
   const { idToChain } = useAllChainsData();
   const chainMeta = idToChain.get(props.asset.chain_id);
   const isNativeToken = props.asset.token_address === NATIVE_TOKEN_ADDRESS;
@@ -91,21 +88,21 @@ function AssetItem(props: {
   return (
     <TokenProvider
       address={props.asset.token_address}
-      client={props.client}
-      // eslint-disable-next-line no-restricted-syntax
       chain={defineChain(props.asset.chain_id)}
+      // eslint-disable-next-line no-restricted-syntax
+      client={props.client}
     >
       <div className="relative flex h-[48px] items-center gap-2.5 rounded-lg px-2 py-1 hover:bg-accent">
         <div className="relative">
           <TokenIcon
             className="size-8 rounded-full border"
-            loadingComponent={
+            fallbackComponent={
               <Blobbie
                 address={props.asset.token_address}
                 className="size-8 rounded-full"
               />
             }
-            fallbackComponent={
+            loadingComponent={
               <Blobbie
                 address={props.asset.token_address}
                 className="size-8 rounded-full"
@@ -115,8 +112,8 @@ function AssetItem(props: {
           {!isNativeToken && (
             <div className="-right-0.5 -bottom-0.5 absolute rounded-full border bg-background p-0.5">
               <ChainIconClient
-                client={props.client}
                 className="size-3.5"
+                client={props.client}
                 src={chainMeta?.icon?.url || ""}
               />
             </div>
@@ -125,13 +122,13 @@ function AssetItem(props: {
 
         <div className="flex min-w-0 flex-col text-sm">
           <Link
+            className="truncate font-medium before:absolute before:inset-0"
             href={
               isNativeToken
                 ? `https://thirdweb.com/${props.asset.chain_id}`
                 : `https://thirdweb.com/${props.asset.chain_id}/${props.asset.token_address}`
             }
             target="_blank"
-            className="truncate font-medium before:absolute before:inset-0"
           >
             {props.asset.name}
           </Link>
@@ -145,14 +142,12 @@ function AssetItem(props: {
   );
 }
 
-export function AssetsSection(props: {
-  client: ThirdwebClient;
-}) {
+export function AssetsSection(props: { client: ThirdwebClient }) {
   const account = useActiveAccount();
   const activeChain = useActiveWalletChain();
 
   const assetsQuery = useQuery({
-    queryKey: ["v1/tokens/erc20", account?.address, activeChain?.id],
+    enabled: !!account && !!activeChain,
     queryFn: async () => {
       if (!account || !activeChain) {
         return [];
@@ -211,11 +206,10 @@ export function AssetsSection(props: {
         return 0;
       });
     },
-    enabled: !!account && !!activeChain,
+    queryKey: ["v1/tokens/erc20", account?.address, activeChain?.id],
   });
 
   const nativeBalances = useQuery({
-    queryKey: ["getWalletBalance", account?.address, activeChain?.id],
     queryFn: async () => {
       if (!account || !activeChain) {
         return [];
@@ -226,10 +220,10 @@ export function AssetsSection(props: {
       const result = await Promise.allSettled(
         chains.map((chain) =>
           getWalletBalance({
+            address: account.address,
             // eslint-disable-next-line no-restricted-syntax
             chain: defineChain(chain),
             client: props.client,
-            address: account.address,
           }),
         ),
       );
@@ -237,15 +231,16 @@ export function AssetsSection(props: {
       return result
         .filter((r) => r.status === "fulfilled")
         .map((r) => ({
-          chain_id: r.value.chainId,
-          token_address: r.value.tokenAddress,
           balance: r.value.value.toString(),
+          chain_id: r.value.chainId,
+          decimals: r.value.decimals,
           name: r.value.name,
           symbol: r.value.symbol,
-          decimals: r.value.decimals,
+          token_address: r.value.tokenAddress,
         }))
         .filter((x) => x.balance !== "0") as AssetBalance[];
     },
+    queryKey: ["getWalletBalance", account?.address, activeChain?.id],
   });
 
   const isPending = assetsQuery.isPending || nativeBalances.isPending;
@@ -253,6 +248,6 @@ export function AssetsSection(props: {
   const data = [...(nativeBalances.data ?? []), ...(assetsQuery.data ?? [])];
 
   return (
-    <AssetsSectionUI data={data} isPending={isPending} client={props.client} />
+    <AssetsSectionUI client={props.client} data={data} isPending={isPending} />
   );
 }
diff --git a/apps/nebula/src/app/(app)/components/ChatBar.tsx b/apps/nebula/src/app/(app)/components/ChatBar.tsx
index f4f5abb086a..c67257b324a 100644
--- a/apps/nebula/src/app/(app)/components/ChatBar.tsx
+++ b/apps/nebula/src/app/(app)/components/ChatBar.tsx
@@ -1,23 +1,5 @@
 "use client";
 
-import { ChainIconClient } from "@/components/blocks/ChainIcon";
-import { Img } from "@/components/blocks/Img";
-import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { ImageUploadButton } from "@/components/ui/image-upload-button";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import { Skeleton } from "@/components/ui/skeleton";
-import { AutoResizeTextarea } from "@/components/ui/textarea";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { useAllChainsData } from "@/hooks/chains";
-import { cn } from "@/lib/utils";
 import { useMutation } from "@tanstack/react-query";
 import {
   ArrowUpIcon,
@@ -36,13 +18,31 @@ import {
   AccountBlobbie,
   AccountName,
   AccountProvider,
+  useActiveWallet,
   WalletIcon,
   WalletName,
   WalletProvider,
-  useActiveWallet,
 } from "thirdweb/react";
 import { shortenAddress } from "thirdweb/utils";
 import type { Wallet } from "thirdweb/wallets";
+import { ChainIconClient } from "@/components/blocks/ChainIcon";
+import { Img } from "@/components/blocks/Img";
+import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import { ImageUploadButton } from "@/components/ui/image-upload-button";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Skeleton } from "@/components/ui/skeleton";
+import { AutoResizeTextarea } from "@/components/ui/textarea";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { useAllChainsData } from "@/hooks/chains";
+import { cn } from "@/lib/utils";
 import type { NebulaContext } from "../api/chat";
 import type { NebulaUserMessage } from "../api/types";
 
@@ -86,16 +86,16 @@ export function ChatBar(props: {
 
   function handleSubmit(message: string) {
     const userMessage: NebulaUserMessage = {
+      content: [{ text: message, type: "text" }],
       role: "user",
-      content: [{ type: "text", text: message }],
     };
     if (images.length > 0) {
       for (const image of images) {
         if (image.b64) {
           userMessage.content.push({
-            type: "image",
             b64: image.b64,
             image_url: null,
+            type: "image",
           });
         }
       }
@@ -151,7 +151,7 @@ export function ChatBar(props: {
       const urls = await Promise.all(
         validFiles.map(async (image) => {
           const b64 = await uploadImageMutation.mutateAsync(image);
-          return { file: image, b64: b64 };
+          return { b64: b64, file: image };
         }),
       );
 
@@ -166,45 +166,46 @@ export function ChatBar(props: {
 
   return (
     <DynamicHeight transition="height 200ms ease">
+      {/** biome-ignore lint/a11y/noStaticElementInteractions: TODO */}
       <div
         className={cn(
           "overflow-hidden rounded-2xl border border-border bg-card transition-colors",
           isDragOver && "border-nebula-pink-foreground bg-nebula-pink/5",
           props.className,
         )}
-        onDrop={(e) => {
-          setIsDragOver(false);
+        onDragEnter={(e) => {
           e.preventDefault();
+          setIsDragOver(true);
           if (!props.allowImageUpload) {
-            showSigninToUploadImagesToast();
             return;
           }
-          const files = Array.from(e.dataTransfer.files);
-          if (files.length > 0) handleImageUpload(files);
         }}
-        onDragOver={(e) => {
+        onDragLeave={(e) => {
           e.preventDefault();
-          setIsDragOver(true);
           if (!props.allowImageUpload) {
             return;
           }
+          // Only set drag over to false if we're leaving the container entirely
+          if (!e.currentTarget.contains(e.relatedTarget as Node)) {
+            setIsDragOver(false);
+          }
         }}
-        onDragEnter={(e) => {
+        onDragOver={(e) => {
           e.preventDefault();
           setIsDragOver(true);
           if (!props.allowImageUpload) {
             return;
           }
         }}
-        onDragLeave={(e) => {
+        onDrop={(e) => {
+          setIsDragOver(false);
           e.preventDefault();
           if (!props.allowImageUpload) {
+            showSigninToUploadImagesToast();
             return;
           }
-          // Only set drag over to false if we're leaving the container entirely
-          if (!e.currentTarget.contains(e.relatedTarget as Node)) {
-            setIsDragOver(false);
-          }
+          const files = Array.from(e.dataTransfer.files);
+          if (files.length > 0) handleImageUpload(files);
         }}
       >
         {images.length > 0 && (
@@ -220,9 +221,19 @@ export function ChatBar(props: {
         <div className="p-2">
           <div className="max-h-[200px] overflow-y-auto">
             <AutoResizeTextarea
-              placeholder={props.placeholder}
-              value={message}
+              className="min-h-[60px] resize-none border-none bg-transparent pt-2 leading-relaxed focus-visible:ring-0 focus-visible:ring-offset-0"
+              disabled={props.isChatStreaming}
               onChange={(e) => setMessage(e.target.value)}
+              onKeyDown={(e) => {
+                // ignore if shift key is pressed to allow entering new lines
+                if (e.shiftKey) {
+                  return;
+                }
+                if (e.key === "Enter" && !props.isChatStreaming) {
+                  e.preventDefault();
+                  handleSubmit(message);
+                }
+              }}
               onPaste={(e) => {
                 const files = Array.from(e.clipboardData.files);
                 if (files.length > 0) {
@@ -234,18 +245,8 @@ export function ChatBar(props: {
                   handleImageUpload(files);
                 }
               }}
-              onKeyDown={(e) => {
-                // ignore if shift key is pressed to allow entering new lines
-                if (e.shiftKey) {
-                  return;
-                }
-                if (e.key === "Enter" && !props.isChatStreaming) {
-                  e.preventDefault();
-                  handleSubmit(message);
-                }
-              }}
-              className="min-h-[60px] resize-none border-none bg-transparent pt-2 leading-relaxed focus-visible:ring-0 focus-visible:ring-offset-0"
-              disabled={props.isChatStreaming}
+              placeholder={props.placeholder}
+              value={message}
             />
           </div>
 
@@ -258,25 +259,25 @@ export function ChatBar(props: {
                     !props.isConnectingWallet && (
                       <WalletSelector
                         client={props.client}
-                        wallets={props.connectedWallets}
-                        selectedAddress={
-                          props.context?.walletAddress || undefined
-                        }
                         onClick={(walletMeta) => {
                           props.setActiveWallet(walletMeta);
                           props.setContext({
-                            walletAddress: walletMeta.address,
                             chainIds: props.context?.chainIds || [],
                             networks: props.context?.networks || null,
+                            walletAddress: walletMeta.address,
                           });
                         }}
+                        selectedAddress={
+                          props.context?.walletAddress || undefined
+                        }
+                        wallets={props.connectedWallets}
                       />
                     )}
 
                   {props.isConnectingWallet && (
                     <Badge
-                      variant="outline"
                       className="h-auto w-auto shrink-0 gap-1.5 px-2 py-1.5"
+                      variant="outline"
                     >
                       <Spinner className="size-3" />
                       <span>Connecting Wallet</span>
@@ -284,31 +285,25 @@ export function ChatBar(props: {
                   )}
 
                   <MultiNetworkSelector
-                    client={props.client}
-                    hideTestnets
-                    disableChainId
-                    selectedChainIds={selectedChainIds}
-                    popoverContentClassName="!w-[calc(100vw-80px)] lg:!w-[320px]"
                     align="start"
-                    side="top"
-                    showSelectedValuesInModal={true}
+                    client={props.client}
                     customTrigger={
                       <Button
-                        variant="ghost"
                         className="h-auto w-full p-0 hover:bg-transparent "
+                        variant="ghost"
                       >
                         {selectedChainIds.length > 0 && firstChainId && (
                           <ChainBadge
                             chainId={firstChainId}
-                            plusMore={selectedChainIds.length - 1}
                             client={props.client}
+                            plusMore={selectedChainIds.length - 1}
                           />
                         )}
 
                         {selectedChainIds.length === 0 && (
                           <Badge
-                            variant="outline"
                             className="flex h-auto gap-1 px-2 py-1.5 hover:bg-accent"
+                            variant="outline"
                           >
                             Select Chains
                             <ChevronDownIcon className="size-3 text-muted-foreground" />
@@ -316,13 +311,16 @@ export function ChatBar(props: {
                         )}
                       </Button>
                     }
+                    disableChainId
+                    hideTestnets
                     onChange={(values) => {
                       props.setContext({
-                        walletAddress: props.context?.walletAddress || null,
                         chainIds: values.map((x) => x.toString()),
                         networks: props.context?.networks || null,
+                        walletAddress: props.context?.walletAddress || null,
                       });
                     }}
+                    popoverContentClassName="!w-[calc(100vw-80px)] lg:!w-[320px]"
                     priorityChains={[
                       1, // ethereum
                       56, // bnb smart chain mainnet (bsc)
@@ -334,6 +332,9 @@ export function ChatBar(props: {
                       80094, // berachain mainnet
                       10, // optimism
                     ]}
+                    selectedChainIds={selectedChainIds}
+                    showSelectedValuesInModal={true}
+                    side="top"
                   />
                 </div>
               )}
@@ -343,14 +344,14 @@ export function ChatBar(props: {
             <div className="flex items-center gap-2">
               {props.allowImageUpload ? (
                 <ImageUploadButton
-                  multiple
-                  value={undefined}
                   accept={supportedFileTypes.join(",")}
+                  className="!h-auto w-auto shrink-0 gap-2 p-2"
+                  multiple
                   onChange={(files) => {
                     handleImageUpload(files);
                   }}
+                  value={undefined}
                   variant="ghost"
-                  className="!h-auto w-auto shrink-0 gap-2 p-2"
                 >
                   <ToolTipLabel label="Attach Image">
                     <PaperclipIcon className="size-4" />
@@ -360,8 +361,8 @@ export function ChatBar(props: {
                 <Popover>
                   <PopoverTrigger asChild>
                     <Button
-                      variant="ghost"
                       className="!h-auto w-auto shrink-0 gap-2 p-2"
+                      variant="ghost"
                     >
                       <ToolTipLabel label="Attach Image">
                         <PaperclipIcon className="size-4" />
@@ -374,9 +375,9 @@ export function ChatBar(props: {
                         Get access to image uploads by signing in to Nebula
                       </p>
                       <Button
-                        variant="default"
-                        onClick={props.onLoginClick}
                         className="w-full"
+                        onClick={props.onLoginClick}
+                        variant="default"
                       >
                         Sign in
                       </Button>
@@ -388,11 +389,11 @@ export function ChatBar(props: {
               {/* Send / Stop */}
               {props.isChatStreaming ? (
                 <Button
-                  variant="default"
                   className="!h-auto w-auto shrink-0 gap-2 p-2"
                   onClick={() => {
                     props.abortChatStream();
                   }}
+                  variant="default"
                 >
                   <CircleStopIcon className="size-4" />
                   Stop
@@ -400,16 +401,16 @@ export function ChatBar(props: {
               ) : (
                 <Button
                   aria-label="Send"
+                  className="!h-auto w-auto border border-nebula-pink-foreground p-2 disabled:opacity-100"
                   disabled={
                     (message.trim() === "" && images.length === 0) ||
                     props.isConnectingWallet
                   }
-                  className="!h-auto w-auto border border-nebula-pink-foreground p-2 disabled:opacity-100"
-                  variant="pink"
                   onClick={() => {
                     if (message.trim() === "" && images.length === 0) return;
                     handleSubmit(message);
                   }}
+                  variant="pink"
                 >
                   <ArrowUpIcon className="size-4" />
                 </Button>
@@ -446,13 +447,13 @@ function ImagePreview(props: {
             key={image.file.name}
           >
             <Img
-              src={image.b64}
               className="size-8 rounded"
               skeleton={
                 <div className="flex items-center justify-center rounded border">
                   <Spinner className="size-4 text-muted-foreground" />
                 </div>
               }
+              src={image.b64}
             />
             <div className="w-[100px] lg:w-[120px]">
               <p className="truncate text-muted-foreground text-xs">
@@ -465,9 +466,9 @@ function ImagePreview(props: {
 
             <ToolTipLabel label="Remove Image">
               <Button
-                variant="outline"
                 className="-top-1.5 -right-1.5 absolute h-auto w-auto rounded-full bg-card p-0.5"
                 onClick={() => props.onRemove(index)}
+                variant="outline"
               >
                 <XIcon className="size-2.5" />
               </Button>
@@ -489,13 +490,13 @@ function ChainBadge(props: {
 
   return (
     <Badge
-      variant="outline"
       className="flex h-auto gap-1.5 px-1.5 py-1.5 hover:bg-accent"
+      variant="outline"
     >
       <ChainIconClient
-        src={chain?.icon?.url}
-        client={props.client}
         className="size-3.5"
+        client={props.client}
+        src={chain?.icon?.url}
       />
       {chain?.name ? shortenChainName(chain.name) : `Chain #${props.chainId}`}
       {props.plusMore > 0 && (
@@ -540,12 +541,12 @@ function WalletSelector(props: {
   });
 
   return (
-    <Popover open={open} onOpenChange={setOpen}>
+    <Popover onOpenChange={setOpen} open={open}>
       <PopoverTrigger asChild>
         <Button
-          variant="outline"
           aria-expanded={open}
           className="flex h-auto items-center gap-1 rounded-full px-2 py-1.5 text-xs"
+          variant="outline"
         >
           <WalletProvider id={activeWallet.id}>
             <AccountProvider
@@ -554,17 +555,17 @@ function WalletSelector(props: {
             >
               <AccountAvatar
                 className="size-3 rounded-full"
-                loadingComponent={accountAvatarFallback}
                 fallbackComponent={accountAvatarFallback}
+                loadingComponent={accountAvatarFallback}
               />
               <AccountName
                 className="text-xs"
-                loadingComponent={
+                fallbackComponent={
                   <span className="text-xs">
                     {shortenAddress(props.selectedAddress)}
                   </span>
                 }
-                fallbackComponent={
+                loadingComponent={
                   <span className="text-xs">
                     {shortenAddress(props.selectedAddress)}
                   </span>
@@ -601,23 +602,24 @@ function WalletSelector(props: {
 
             return (
               <div
-                role="button"
-                tabIndex={0}
-                key={wallet.address}
                 className={cn(
                   "flex cursor-pointer items-center justify-between px-3 py-4 hover:bg-accent/50",
                   props.selectedAddress === wallet.address && "bg-accent/50",
                 )}
+                key={wallet.address}
+                onClick={() => {
+                  setOpen(false);
+                  props.onClick(wallet);
+                }}
                 onKeyDown={(e) => {
                   if (e.key === "Enter" || e.key === " ") {
                     setOpen(false);
                     props.onClick(wallet);
                   }
                 }}
-                onClick={() => {
-                  setOpen(false);
-                  props.onClick(wallet);
-                }}
+                // biome-ignore lint/a11y/useSemanticElements: TODO
+                role="button"
+                tabIndex={0}
               >
                 <div className="flex items-center gap-2">
                   <WalletProvider id={wallet.walletId}>
@@ -629,20 +631,20 @@ function WalletSelector(props: {
                         <div className="flex items-center gap-2.5">
                           <AccountAvatar
                             className="size-8 rounded-full"
-                            loadingComponent={accountAvatarFallback}
                             fallbackComponent={accountAvatarFallback}
+                            loadingComponent={accountAvatarFallback}
                           />
 
                           <div className="flex flex-col">
                             <div className="flex items-center gap-1">
                               <AccountName
                                 className="text-sm"
-                                loadingComponent={
+                                fallbackComponent={
                                   <span className="text-sm">
                                     {shortenAddress(wallet.address)}
                                   </span>
                                 }
-                                fallbackComponent={
+                                loadingComponent={
                                   <span className="text-sm">
                                     {shortenAddress(wallet.address)}
                                   </span>
@@ -653,8 +655,8 @@ function WalletSelector(props: {
 
                               {wallet.walletId === "smart" && (
                                 <Badge
-                                  variant="outline"
                                   className="bg-card px-2"
+                                  variant="outline"
                                 >
                                   Gasless
                                 </Badge>
@@ -698,7 +700,6 @@ function CopyButton(props: { address: string }) {
   const [copied, setCopied] = useState(false);
   return (
     <Button
-      variant="ghost"
       className="h-auto w-auto p-1.5 text-muted-foreground"
       onClick={(e) => {
         e.stopPropagation();
@@ -708,6 +709,7 @@ function CopyButton(props: { address: string }) {
           setCopied(false);
         }, 1000);
       }}
+      variant="ghost"
     >
       {copied ? (
         <CheckIcon className="size-3 text-green-500" />
diff --git a/apps/nebula/src/app/(app)/components/ChatPageContent.tsx b/apps/nebula/src/app/(app)/components/ChatPageContent.tsx
index 23f5bc9fbdf..62631d03eac 100644
--- a/apps/nebula/src/app/(app)/components/ChatPageContent.tsx
+++ b/apps/nebula/src/app/(app)/components/ChatPageContent.tsx
@@ -1,13 +1,4 @@
 "use client";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
 import { ArrowRightIcon, MessageSquareXIcon } from "lucide-react";
 import Link from "next/link";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -18,6 +9,15 @@ import {
   useConnectedWallets,
   useSetActiveWallet,
 } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
 import { type NebulaContext, promptNebula } from "../api/chat";
 import { createSession, updateSession } from "../api/session";
 import type {
@@ -66,8 +66,8 @@ export function ChatPageContent(props: {
         contextRes?.chain_ids ||
         props.initialParams?.chainIds.map((x) => x.toString()) ||
         [],
-      walletAddress: contextRes?.wallet_address || props.accountAddress || null,
       networks: "mainnet",
+      walletAddress: contextRes?.wallet_address || props.accountAddress || null,
     };
 
     return value;
@@ -104,9 +104,9 @@ export function ChatPageContent(props: {
         const lastUsedChainIds = getLastUsedChainIds();
         if (lastUsedChainIds) {
           return {
+            chainIds: lastUsedChainIds,
             networks: _contextFilters?.networks || null,
             walletAddress: _contextFilters?.walletAddress || null,
-            chainIds: lastUsedChainIds,
           };
         }
       } catch {
@@ -144,12 +144,12 @@ export function ChatPageContent(props: {
       setMessages((prev) => [
         ...prev,
         {
-          type: "user",
           content: message.content,
+          type: "user",
         },
         {
-          type: "presence",
           texts: [],
+          type: "presence",
         },
       ]);
 
@@ -166,7 +166,7 @@ export function ChatPageContent(props: {
         await new Promise((resolve) => setTimeout(resolve, 1000));
         setMessages((prev) => [
           ...prev.slice(0, -1),
-          { type: "assistant", text: interceptedReply, request_id: undefined },
+          { request_id: undefined, text: interceptedReply, type: "assistant" },
         ]);
 
         return;
@@ -194,9 +194,9 @@ export function ChatPageContent(props: {
           const prevValue = newSessionsStore.getValue();
           newSessionsStore.setValue([
             {
+              created_at: new Date().toISOString(),
               id: currentSessionId,
               title: firstTextMessage,
-              created_at: new Date().toISOString(),
               updated_at: new Date().toISOString(),
             },
             ...prevValue,
@@ -207,12 +207,12 @@ export function ChatPageContent(props: {
 
         await handleNebulaPrompt({
           abortController,
-          message: message,
-          sessionId: currentSessionId,
           authToken: props.authToken,
-          setMessages,
           contextFilters: contextFilters,
+          message: message,
+          sessionId: currentSessionId,
           setContextFilters,
+          setMessages,
         });
       } catch (error) {
         if (abortController.signal.aborted) {
@@ -249,13 +249,13 @@ export function ChatPageContent(props: {
     ) {
       hasDoneAutoPrompt.current = true;
       handleSendMessage({
-        role: "user",
         content: [
           {
-            type: "text",
             text: props.initialParams.q,
+            type: "text",
           },
         ],
+        role: "user",
       });
     }
   }, [props.initialParams?.q, messages.length, handleSendMessage]);
@@ -280,8 +280,8 @@ export function ChatPageContent(props: {
     if (sessionId) {
       await updateSession({
         authToken: props.authToken,
-        sessionId,
         contextFilters: values,
+        sessionId,
       });
     }
   };
@@ -298,8 +298,8 @@ export function ChatPageContent(props: {
   return (
     <div className="flex grow flex-col overflow-hidden">
       <WalletDisconnectedDialog
-        open={showConnectModal}
         onOpenChange={setShowConnectModal}
+        open={showConnectModal}
       />
 
       <div className="flex grow overflow-hidden">
@@ -307,16 +307,16 @@ export function ChatPageContent(props: {
           {showEmptyState ? (
             <div className="fade-in-0 container flex max-w-[800px] grow animate-in flex-col justify-center">
               <EmptyStateChatPageContent
-                onLoginClick={undefined}
-                showAurora={true}
+                allowImageUpload={true}
+                connectedWallets={connectedWalletsMeta}
+                context={contextFilters}
                 isConnectingWallet={connectionStatus === "connecting"}
-                sendMessage={handleSendMessage}
+                onLoginClick={undefined}
                 prefillMessage={props.initialParams?.q}
-                context={contextFilters}
-                setContext={setContextFilters}
-                connectedWallets={connectedWalletsMeta}
+                sendMessage={handleSendMessage}
                 setActiveWallet={handleSetActiveWallet}
-                allowImageUpload={true}
+                setContext={setContextFilters}
+                showAurora={true}
               />
             </div>
           ) : (
@@ -339,41 +339,41 @@ export function ChatPageContent(props: {
 
               {messages.length > 0 && (
                 <Chats
-                  messages={messages}
-                  isChatStreaming={isChatStreaming}
                   authToken={props.authToken}
-                  sessionId={sessionId}
                   className="min-w-0 pt-6 pb-32"
                   client={props.client}
                   enableAutoScroll={enableAutoScroll}
-                  setEnableAutoScroll={setEnableAutoScroll}
+                  isChatStreaming={isChatStreaming}
+                  messages={messages}
                   sendMessage={handleSendMessage}
+                  sessionId={sessionId}
+                  setEnableAutoScroll={setEnableAutoScroll}
                 />
               )}
 
               <div className="container max-w-[800px]">
                 <ChatBar
-                  placeholder="Ask Nebula"
-                  isConnectingWallet={connectionStatus === "connecting"}
-                  showContextSelector={true}
-                  connectedWallets={connectedWalletsMeta}
-                  setActiveWallet={handleSetActiveWallet}
-                  client={props.client}
-                  prefillMessage={undefined}
-                  sendMessage={handleSendMessage}
-                  isChatStreaming={isChatStreaming}
                   abortChatStream={() => {
                     chatAbortController?.abort();
                     setChatAbortController(undefined);
                     setIsChatStreaming(false);
                   }}
+                  allowImageUpload={true}
+                  client={props.client}
+                  connectedWallets={connectedWalletsMeta}
                   context={contextFilters}
+                  isChatStreaming={isChatStreaming}
+                  isConnectingWallet={connectionStatus === "connecting"}
+                  onLoginClick={undefined}
+                  placeholder="Ask Nebula"
+                  prefillMessage={undefined}
+                  sendMessage={handleSendMessage}
+                  setActiveWallet={handleSetActiveWallet}
                   setContext={(v) => {
                     setContextFilters(v);
                     handleUpdateContextFilters(v);
                   }}
-                  allowImageUpload={true}
-                  onLoginClick={undefined}
+                  showContextSelector={true}
                 />
               </div>
             </div>
@@ -393,7 +393,7 @@ function WalletDisconnectedDialog(props: {
   onOpenChange: (value: boolean) => void;
 }) {
   return (
-    <Dialog open={props.open} onOpenChange={props.onOpenChange}>
+    <Dialog onOpenChange={props.onOpenChange} open={props.open}>
       <DialogContent className="p-0">
         <div className="p-6">
           <DialogHeader>
@@ -409,7 +409,7 @@ function WalletDisconnectedDialog(props: {
             <Button variant="outline">Cancel</Button>
           </DialogClose>
           <Button asChild>
-            <Link href="/login" className="gap-2">
+            <Link className="gap-2" href="/login">
               Connect Wallet
               <ArrowRightIcon className="size-4" />
             </Link>
@@ -472,9 +472,8 @@ async function handleNebulaPrompt(params: {
 
   await promptNebula({
     abortController,
-    message,
-    sessionId,
     authToken,
+    context: contextFilters,
     handleStream(res) {
       if (abortController.signal.aborted) {
         return;
@@ -492,9 +491,9 @@ async function handleNebulaPrompt(params: {
             return [
               ...prevMessages,
               {
-                type: "image",
                 data: res.data,
                 request_id: res.request_id,
+                type: "image",
               },
             ];
           });
@@ -516,9 +515,9 @@ async function handleNebulaPrompt(params: {
               return [
                 ...prev.slice(0, -1),
                 {
+                  request_id: requestIdForMessage,
                   text: lastMessage.text + res.data.v,
                   type: "assistant",
-                  request_id: requestIdForMessage,
                 },
               ];
             }
@@ -527,9 +526,9 @@ async function handleNebulaPrompt(params: {
             return [
               ...prev,
               {
+                request_id: requestIdForMessage,
                 text: res.data.v,
                 type: "assistant",
-                request_id: requestIdForMessage,
               },
             ];
           });
@@ -545,8 +544,8 @@ async function handleNebulaPrompt(params: {
               return [
                 ...prev.slice(0, -1),
                 {
-                  type: "presence",
                   texts: [...lastMessage.texts, res.data.data],
+                  type: "presence",
                 },
               ];
             }
@@ -565,10 +564,10 @@ async function handleNebulaPrompt(params: {
                 return [
                   ...prevMessages,
                   {
-                    type: "action",
-                    subtype: res.type,
                     data: res.data,
                     request_id: res.request_id,
+                    subtype: res.type,
+                    type: "action",
                   },
                 ];
               });
@@ -579,10 +578,10 @@ async function handleNebulaPrompt(params: {
                 return [
                   ...prevMessages,
                   {
-                    type: "action",
-                    subtype: res.type,
                     data: res.data,
                     request_id: res.request_id,
+                    subtype: res.type,
+                    type: "action",
                   },
                 ];
               });
@@ -595,8 +594,8 @@ async function handleNebulaPrompt(params: {
         case "context": {
           setContextFilters({
             chainIds: res.data.chain_ids.map((x) => x.toString()),
-            walletAddress: res.data.wallet_address,
             networks: res.data.networks,
+            walletAddress: res.data.wallet_address,
           });
           return;
         }
@@ -616,7 +615,8 @@ async function handleNebulaPrompt(params: {
         }
       }
     },
-    context: contextFilters,
+    message,
+    sessionId,
   });
 
   // if the stream ends without any delta or tx events - we have nothing to show
@@ -675,18 +675,18 @@ function parseHistoryToMessages(history: NebulaSessionHistoryMessage[]) {
           if (content.type === "sign_transaction") {
             const txData = JSON.parse(content.data);
             messages.push({
-              type: "action",
-              subtype: "sign_transaction",
               data: txData,
               request_id: content.request_id,
+              subtype: "sign_transaction",
+              type: "action",
             });
           } else if (content.type === "sign_swap") {
             const swapData = JSON.parse(content.data);
             messages.push({
-              type: "action",
-              subtype: "sign_swap",
               data: swapData,
               request_id: content.request_id,
+              subtype: "sign_swap",
+              type: "action",
             });
           }
         } catch (e) {
@@ -707,9 +707,9 @@ function parseHistoryToMessages(history: NebulaSessionHistoryMessage[]) {
         };
 
         messages.push({
-          type: "image",
           data: content.data,
           request_id: content.request_id,
+          type: "image",
         });
         break;
       }
@@ -720,8 +720,8 @@ function parseHistoryToMessages(history: NebulaSessionHistoryMessage[]) {
             typeof message.content === "string"
               ? [
                   {
-                    type: "text",
                     text: message.content,
+                    type: "text",
                   },
                 ]
               : message.content,
@@ -732,9 +732,9 @@ function parseHistoryToMessages(history: NebulaSessionHistoryMessage[]) {
 
       case "assistant": {
         messages.push({
+          request_id: undefined,
           text: message.content,
           type: message.role,
-          request_id: undefined,
         });
       }
     }
diff --git a/apps/nebula/src/app/(app)/components/ChatPageLayout.stories.tsx b/apps/nebula/src/app/(app)/components/ChatPageLayout.stories.tsx
index e76654c1f07..6b60cc0e867 100644
--- a/apps/nebula/src/app/(app)/components/ChatPageLayout.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/ChatPageLayout.stories.tsx
@@ -1,11 +1,10 @@
-import { randomLorem } from "@/storybook/stubs";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { ThirdwebProvider } from "thirdweb/react";
+import { randomLorem } from "@/storybook/stubs";
 import type { TruncatedSessionInfo } from "../api/types";
 import { ChatPageLayout } from "./ChatPageLayout";
 
 const meta = {
-  title: "Nebula/ChatPageLayout",
   component: Variant,
   decorators: [
     (Story) => (
@@ -19,6 +18,7 @@ const meta = {
       appDirectory: true,
     },
   },
+  title: "Nebula/ChatPageLayout",
 } satisfies Meta<typeof Variant>;
 
 export default meta;
@@ -44,16 +44,14 @@ export const ThirtyChats: Story = {
 
 function generateRandomSessions(count: number): TruncatedSessionInfo[] {
   return Array.from({ length: count }, (_, i) => ({
+    created_at: new Date().toISOString(),
     id: i.toString(),
     title: randomLorem(Math.floor(Math.random() * 10) + 1),
-    created_at: new Date().toISOString(),
     updated_at: new Date().toISOString(),
   }));
 }
 
-function Variant(props: {
-  sessions: TruncatedSessionInfo[];
-}) {
+function Variant(props: { sessions: TruncatedSessionInfo[] }) {
   return (
     <ChatPageLayout
       accountAddress="0xC569B9FD77d132e10954cA5E6EF617414e314b11"
diff --git a/apps/nebula/src/app/(app)/components/ChatPageLayout.tsx b/apps/nebula/src/app/(app)/components/ChatPageLayout.tsx
index 73bac5ae9b4..5ace2d47fe7 100644
--- a/apps/nebula/src/app/(app)/components/ChatPageLayout.tsx
+++ b/apps/nebula/src/app/(app)/components/ChatPageLayout.tsx
@@ -22,13 +22,13 @@ export function ChatPageLayout(props: {
     >
       <aside className="hidden w-[300px] shrink-0 border-border border-r bg-card lg:block">
         <ChatSidebar
-          sessions={props.sessions}
           authToken={props.authToken}
+          sessions={props.sessions}
           type="desktop"
         />
       </aside>
 
-      <MobileNav sessions={props.sessions} authToken={props.authToken} />
+      <MobileNav authToken={props.authToken} sessions={props.sessions} />
 
       <TWAutoConnect
         accountAbstraction={nebulaAAOptions}
diff --git a/apps/nebula/src/app/(app)/components/ChatSidebar.tsx b/apps/nebula/src/app/(app)/components/ChatSidebar.tsx
index 22acd26faca..5a1ddae4096 100644
--- a/apps/nebula/src/app/(app)/components/ChatSidebar.tsx
+++ b/apps/nebula/src/app/(app)/components/ChatSidebar.tsx
@@ -1,15 +1,4 @@
 "use client";
-import { useIsClientMounted } from "@/components/blocks/client-only";
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { TabButtons } from "@/components/ui/tabs";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
-import { NebulaIcon } from "@/icons/NebulaIcon";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { cn } from "@/lib/utils";
 import { useMutation } from "@tanstack/react-query";
 import {
   ChevronDownIcon,
@@ -20,8 +9,8 @@ import {
   PlusIcon,
   SunIcon,
 } from "lucide-react";
-import { useTheme } from "next-themes";
 import Link from "next/link";
+import { useTheme } from "next-themes";
 import { useState } from "react";
 import { toast } from "sonner";
 import {
@@ -29,9 +18,22 @@ import {
   AccountBlobbie,
   AccountProvider,
   useActiveWallet,
+  WalletIcon,
+  WalletName,
+  WalletProvider,
 } from "thirdweb/react";
-import { WalletIcon, WalletName, WalletProvider } from "thirdweb/react";
 import { shortenAddress } from "thirdweb/utils";
+import { useIsClientMounted } from "@/components/blocks/client-only";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { TabButtons } from "@/components/ui/tabs";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
+import { NebulaIcon } from "@/icons/NebulaIcon";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { cn } from "@/lib/utils";
 import { doNebulaLogout } from "../../login/auth-actions";
 import type { TruncatedSessionInfo } from "../api/types";
 import { useNewChatPageLink } from "../hooks/useNewChatPageLink";
@@ -57,12 +59,12 @@ export function ChatSidebar(props: {
   return (
     <div className="flex h-full flex-col">
       <div className="flex items-center justify-start gap-3 p-4 lg:justify-between">
-        <Link href="/" className="flex items-center gap-1">
-          <NebulaIcon className="size-6 text-foreground" aria-label="Nebula" />
+        <Link className="flex items-center gap-1" href="/">
+          <NebulaIcon aria-label="Nebula" className="size-6 text-foreground" />
           <span className="font-medium text-lg">Nebula</span>
         </Link>
 
-        <Badge variant="secondary" className="gap-1 py-1">
+        <Badge className="gap-1 py-1" variant="secondary">
           Beta
         </Badge>
       </div>
@@ -72,8 +74,8 @@ export function ChatSidebar(props: {
       <div className="flex flex-col gap-2 px-4">
         <Button
           asChild
-          variant="pink"
           className="w-full gap-2 rounded-lg border-nebula-pink-foreground"
+          variant="pink"
         >
           <Link href={newChatPage}>
             <PlusIcon className="size-4" />
@@ -90,8 +92,8 @@ export function ChatSidebar(props: {
             <h3 className="text-muted-foreground text-xs">Recent Chats</h3>
             {sessionsToShow.length < sessions.length && (
               <Link
-                href="/chat/history"
                 className="flex items-center gap-1 rounded-full text-foreground text-xs hover:underline"
+                href="/chat/history"
               >
                 View All
                 <ChevronRightIcon className="size-3.5 text-muted-foreground" />
@@ -103,10 +105,10 @@ export function ChatSidebar(props: {
             {sessionsToShow.map((session) => {
               return (
                 <ChatSidebarLink
+                  authToken={props.authToken}
+                  key={session.id}
                   sessionId={session.id}
                   title={session.title || "Untitled Chat"}
-                  key={session.id}
-                  authToken={props.authToken}
                 />
               );
             })}
@@ -129,6 +131,8 @@ export function ChatSidebar(props: {
         <ToggleThemeButton />
 
         <SidebarIconButton
+          icon={logoutMutation.isPending ? Spinner : LogOutIcon}
+          label="Log Out"
           onClick={async () => {
             try {
               await logoutMutation.mutateAsync();
@@ -137,8 +141,6 @@ export function ChatSidebar(props: {
               toast.error("Failed to log out");
             }
           }}
-          icon={logoutMutation.isPending ? Spinner : LogOutIcon}
-          label="Log Out"
         />
       </div>
     </div>
@@ -153,13 +155,13 @@ function WalletDetails() {
       <div className="flex items-center justify-between gap-2 border-t px-2 py-1.5">
         <CustomConnectButton />
         <Button
-          variant="ghost"
-          size="sm"
           className={cn(
             "h-auto w-auto p-1.5 transition-transform duration-300",
             isExpanded ? "rotate-180" : "",
           )}
           onClick={() => setIsExpanded(!isExpanded)}
+          size="sm"
+          variant="ghost"
         >
           <ChevronDownIcon className="size-4" />
         </Button>
@@ -168,18 +170,18 @@ function WalletDetails() {
       {isExpanded && (
         <div className="border-t border-dashed">
           <TabButtons
-            tabContainerClassName="px-2 pt-2"
             tabClassName="!text-sm py-1.5"
+            tabContainerClassName="px-2 pt-2"
             tabs={[
               {
+                isActive: tab === "assets",
                 name: "Assets",
                 onClick: () => setTab("assets"),
-                isActive: tab === "assets",
               },
               {
+                isActive: tab === "transactions",
                 name: "Recent Activity",
                 onClick: () => setTab("transactions"),
-                isActive: tab === "transactions",
               },
             ]}
           />
@@ -215,7 +217,6 @@ function CustomConnectButton() {
   return (
     <div className="[&>*]:!w-full grow">
       <NebulaConnectWallet
-        detailsButtonClassName="!bg-background hover:!border-active-border"
         customDetailsButton={
           activeWallet
             ? (address) => {
@@ -226,8 +227,8 @@ function CustomConnectButton() {
                       client={nebulaAppThirdwebClient}
                     >
                       <Button
-                        variant="ghost"
                         className="flex h-auto w-full items-center justify-start gap-2.5 rounded-lg px-2 hover:bg-accent"
+                        variant="ghost"
                       >
                         <AccountAvatar
                           className="size-8 rounded-full"
@@ -256,6 +257,7 @@ function CustomConnectButton() {
               }
             : undefined
         }
+        detailsButtonClassName="!bg-background hover:!border-active-border"
       />
     </div>
   );
@@ -267,13 +269,13 @@ function ToggleThemeButton() {
 
   return (
     <SidebarIconButton
-      onClick={() => {
-        setTheme(theme === "light" ? "dark" : "light");
-      }}
       icon={
         isClientMounted ? (theme === "light" ? SunIcon : MoonIcon) : Spinner
       }
       label="Toggle Theme"
+      onClick={() => {
+        setTheme(theme === "light" ? "dark" : "light");
+      }}
     />
   );
 }
@@ -288,14 +290,14 @@ function SidebarIconLink(props: {
     <ToolTipLabel label={props.label}>
       <Button
         asChild
-        variant="ghost"
         className="size-10 rounded-full p-0 text-muted-foreground hover:text-foreground"
+        variant="ghost"
       >
         <Link
+          aria-label={props.label}
           href={props.href}
-          target={props.target}
           prefetch={false}
-          aria-label={props.label}
+          target={props.target}
         >
           <props.icon className="size-5" />
         </Link>
@@ -312,10 +314,10 @@ function SidebarIconButton(props: {
   return (
     <ToolTipLabel label={props.label}>
       <Button
-        variant="ghost"
-        onClick={props.onClick}
         aria-label={props.label}
         className="size-10 rounded-full p-0 text-muted-foreground hover:text-foreground"
+        onClick={props.onClick}
+        variant="ghost"
       >
         <props.icon className="size-5" />
       </Button>
diff --git a/apps/nebula/src/app/(app)/components/ChatSidebarLink.tsx b/apps/nebula/src/app/(app)/components/ChatSidebarLink.tsx
index b263317caed..4f559af0915 100644
--- a/apps/nebula/src/app/(app)/components/ChatSidebarLink.tsx
+++ b/apps/nebula/src/app/(app)/components/ChatSidebarLink.tsx
@@ -1,18 +1,18 @@
 "use client";
 
-import { NavLink } from "@/components/ui/NavLink";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { useMutation } from "@tanstack/react-query";
+import { EllipsisIcon, TrashIcon } from "lucide-react";
+import { usePathname } from "next/navigation";
+import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
+import { NavLink } from "@/components/ui/NavLink";
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useMutation } from "@tanstack/react-query";
-import { EllipsisIcon, TrashIcon } from "lucide-react";
-import { usePathname } from "next/navigation";
-import { toast } from "sonner";
 import { deleteSession } from "../api/session";
 import { useNewChatPageLink } from "../hooks/useNewChatPageLink";
 import { deletedSessionsStore } from "../stores";
@@ -51,10 +51,10 @@ export function ChatSidebarLink(props: {
     >
       <Button
         asChild
-        variant="ghost"
         className="h-auto w-full items-center justify-between px-2 py-1.5 text-left text-sm hover:bg-transparent"
+        variant="ghost"
       >
-        <NavLink href={`/chat/${props.sessionId}`} activeClassName="bg-muted">
+        <NavLink activeClassName="bg-muted" href={`/chat/${props.sessionId}`}>
           <span className="line-clamp-1 block truncate">{props.title}</span>
         </NavLink>
       </Button>
@@ -69,15 +69,15 @@ export function ChatSidebarLink(props: {
         </PopoverTrigger>
         <PopoverContent className="w-44 p-1" side="right">
           <Button
-            variant="ghost"
             className="!text-destructive-text flex w-full justify-start gap-2.5 px-2"
             onClick={() => {
               const promise = deleteChat.mutateAsync();
               toast.promise(promise, {
-                success: "Chat deleted successfully",
                 error: "Failed to delete chat",
+                success: "Chat deleted successfully",
               });
             }}
+            variant="ghost"
           >
             {deleteChat.isPending ? (
               <Spinner className="size-4" />
diff --git a/apps/nebula/src/app/(app)/components/Chatbar.stories.tsx b/apps/nebula/src/app/(app)/components/Chatbar.stories.tsx
index e3b26e0b53a..d19f0098a3f 100644
--- a/apps/nebula/src/app/(app)/components/Chatbar.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/Chatbar.stories.tsx
@@ -1,17 +1,18 @@
-import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useState } from "react";
 import { ThirdwebProvider } from "thirdweb/react";
+import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
 import type { NebulaContext } from "../api/chat";
 import { ChatBar, type WalletMeta } from "./ChatBar";
+
 const meta = {
-  title: "Nebula/Chatbar",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Nebula/Chatbar",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -29,119 +30,119 @@ function Story() {
     <ThirdwebProvider>
       <div className="container flex max-w-[800px] flex-col gap-14 py-10">
         <Variant
-          label="Not Streaming"
+          activeAccountAddress={undefined}
+          connectedWallets={[]}
           isStreaming={false}
+          label="Not Streaming"
           showContextSelector={true}
-          connectedWallets={[]}
-          activeAccountAddress={undefined}
         />
         <Variant
-          label="Streaming"
+          activeAccountAddress={undefined}
+          connectedWallets={[]}
           isStreaming={true}
+          label="Streaming"
           showContextSelector={true}
-          connectedWallets={[]}
-          activeAccountAddress={undefined}
         />
 
         <Variant
-          label="1 Chain set in context"
-          isStreaming={false}
+          activeAccountAddress={undefined}
+          connectedWallets={[]}
           context={{
             chainIds: ["1"],
             networks: null,
             walletAddress: null,
           }}
+          isStreaming={false}
+          label="1 Chain set in context"
           showContextSelector={true}
-          connectedWallets={[]}
-          activeAccountAddress={undefined}
         />
 
         <Variant
-          label="3 Chains set in context"
-          isStreaming={false}
+          activeAccountAddress={undefined}
+          connectedWallets={[]}
           context={{
             chainIds: ["1", "137", "10"],
             networks: null,
             walletAddress: null,
           }}
+          isStreaming={false}
+          label="3 Chains set in context"
           showContextSelector={true}
-          connectedWallets={[]}
-          activeAccountAddress={undefined}
         />
 
         <Variant
-          label="5 Chains set in context, 1 user connected wallet"
-          isStreaming={false}
-          context={{
-            chainIds: ["1", "137", "10", "146", "80094"],
-            networks: null,
-            walletAddress: null,
-          }}
-          showContextSelector={true}
+          activeAccountAddress={userWalletAddress}
           connectedWallets={[
             {
-              walletId: "io.metamask",
               address: userWalletAddress,
+              walletId: "io.metamask",
             },
           ]}
-          activeAccountAddress={userWalletAddress}
-        />
-
-        <Variant
-          label="5 Chains set in context, 2 connected wallets - smart wallet active"
-          isStreaming={false}
           context={{
             chainIds: ["1", "137", "10", "146", "80094"],
             networks: null,
             walletAddress: null,
           }}
+          isStreaming={false}
+          label="5 Chains set in context, 1 user connected wallet"
           showContextSelector={true}
+        />
+
+        <Variant
+          activeAccountAddress={smartWalletAddress}
           connectedWallets={[
             {
-              walletId: "io.metamask",
               address: userWalletAddress,
+              walletId: "io.metamask",
             },
             {
-              walletId: "smart",
               address: smartWalletAddress,
+              walletId: "smart",
             },
           ]}
-          activeAccountAddress={smartWalletAddress}
+          context={{
+            chainIds: ["1", "137", "10", "146", "80094"],
+            networks: null,
+            walletAddress: null,
+          }}
+          isStreaming={false}
+          label="5 Chains set in context, 2 connected wallets - smart wallet active"
+          showContextSelector={true}
         />
 
         <Variant
-          label="Prefilled Message"
+          activeAccountAddress={undefined}
+          connectedWallets={[]}
           isStreaming={false}
+          label="Prefilled Message"
           prefillMessage="This is a prefilled message"
           showContextSelector={true}
-          connectedWallets={[]}
-          activeAccountAddress={undefined}
         />
 
         <Variant
-          label="No Context Selector"
+          activeAccountAddress={undefined}
+          connectedWallets={[]}
           isStreaming={false}
+          label="No Context Selector"
           showContextSelector={false}
-          connectedWallets={[]}
-          activeAccountAddress={undefined}
         />
 
         <Variant
-          label="No Image Upload"
-          isStreaming={false}
-          showContextSelector={true}
-          connectedWallets={[]}
           activeAccountAddress={undefined}
           allowImageUpload={false}
+          connectedWallets={[]}
+          isStreaming={false}
+          label="No Image Upload"
+          showContextSelector={true}
         />
 
         <Variant
-          label="Connecting Wallet"
-          isStreaming={false}
+          activeAccountAddress={undefined}
+          connectedWallets={[]}
           isConnectingWallet={true}
+          isStreaming={false}
+          label="Connecting Wallet"
           showContextSelector={true}
-          connectedWallets={[]}
-          activeAccountAddress={undefined}
         />
       </div>
     </ThirdwebProvider>
@@ -166,21 +167,19 @@ function Variant(props: {
   return (
     <BadgeContainer label={props.label}>
       <ChatBar
-        placeholder={"Ask Nebula"}
-        isConnectingWallet={props.isConnectingWallet || false}
-        client={storybookThirdwebClient}
         abortChatStream={() => {}}
-        onLoginClick={undefined}
-        isChatStreaming={props.isStreaming}
-        sendMessage={() => {}}
-        prefillMessage={props.prefillMessage}
-        context={context}
-        setContext={setContext}
-        showContextSelector={props.showContextSelector}
-        connectedWallets={props.connectedWallets}
         allowImageUpload={
           props.allowImageUpload === undefined ? true : props.allowImageUpload
         }
+        client={storybookThirdwebClient}
+        connectedWallets={props.connectedWallets}
+        context={context}
+        isChatStreaming={props.isStreaming}
+        isConnectingWallet={props.isConnectingWallet || false}
+        onLoginClick={undefined}
+        placeholder={"Ask Nebula"}
+        prefillMessage={props.prefillMessage}
+        sendMessage={() => {}}
         setActiveWallet={(wallet) => {
           setContext({
             chainIds: context?.chainIds || [],
@@ -188,6 +187,8 @@ function Variant(props: {
             walletAddress: wallet.address,
           });
         }}
+        setContext={setContext}
+        showContextSelector={props.showContextSelector}
       />
     </BadgeContainer>
   );
diff --git a/apps/nebula/src/app/(app)/components/Chats.stories.tsx b/apps/nebula/src/app/(app)/components/Chats.stories.tsx
index f208cfda275..3b731e3704e 100644
--- a/apps/nebula/src/app/(app)/components/Chats.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/Chats.stories.tsx
@@ -1,17 +1,11 @@
-import { randomLorem } from "@/storybook/stubs";
-import { storybookThirdwebClient } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
+import { randomLorem } from "@/storybook/stubs";
+import { storybookThirdwebClient } from "@/storybook/utils";
 import { type ChatMessage, Chats } from "./Chats";
 
 const meta = {
-  title: "Nebula/Chats",
   component: Variant,
-  parameters: {
-    nextjs: {
-      appDirectory: true,
-    },
-  },
   decorators: [
     (Story) => (
       <ThirdwebProvider>
@@ -24,6 +18,12 @@ const meta = {
       </ThirdwebProvider>
     ),
   ],
+  parameters: {
+    nextjs: {
+      appDirectory: true,
+    },
+  },
+  title: "Nebula/Chats",
 } satisfies Meta<typeof Variant>;
 
 export default meta;
@@ -35,8 +35,8 @@ export const UserPresenceError: Story = {
       {
         content: [
           {
-            type: "text",
             text: randomLorem(10),
+            type: "text",
           },
         ],
         type: "user",
@@ -57,20 +57,20 @@ export const SendTransaction: Story = {
   args: {
     messages: [
       {
+        request_id: undefined,
         text: randomLorem(40),
         type: "assistant",
-        request_id: undefined,
       },
       {
-        type: "action",
-        subtype: "sign_transaction",
-        request_id: "xxxxx",
         data: {
           chainId: 1,
-          to: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
           data: "0x",
+          to: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
           value: "0x16345785d8a0000",
         },
+        request_id: "xxxxx",
+        subtype: "sign_transaction",
+        type: "action",
       },
     ],
   },
@@ -80,14 +80,14 @@ export const WithAndWithoutRequestId: Story = {
   args: {
     messages: [
       {
+        request_id: "xxxxx",
         text: randomLorem(40),
         type: "assistant",
-        request_id: "xxxxx",
       },
       {
+        request_id: undefined,
         text: randomLorem(50),
         type: "assistant",
-        request_id: undefined,
       },
     ],
   },
@@ -205,36 +205,34 @@ export const Markdown: Story = {
   args: {
     messages: [
       {
+        request_id: undefined,
         text: responseWithCodeMarkdown,
         type: "assistant",
-        request_id: undefined,
       },
       {
-        type: "user",
         content: [
           {
-            type: "text",
             text: responseWithCodeMarkdown,
+            type: "text",
           },
         ],
+        type: "user",
       },
     ],
   },
 };
 
-function Variant(props: {
-  messages: ChatMessage[];
-}) {
+function Variant(props: { messages: ChatMessage[] }) {
   return (
     <Chats
-      enableAutoScroll={false}
-      setEnableAutoScroll={() => {}}
-      client={storybookThirdwebClient}
-      sendMessage={() => {}}
       authToken="xxxxx"
+      client={storybookThirdwebClient}
+      enableAutoScroll={false}
       isChatStreaming={false}
-      sessionId="xxxxx"
       messages={props.messages}
+      sendMessage={() => {}}
+      sessionId="xxxxx"
+      setEnableAutoScroll={() => {}}
     />
   );
 }
diff --git a/apps/nebula/src/app/(app)/components/Chats.tsx b/apps/nebula/src/app/(app)/components/Chats.tsx
index a26fb050c8f..f6b7a301a59 100644
--- a/apps/nebula/src/app/(app)/components/Chats.tsx
+++ b/apps/nebula/src/app/(app)/components/Chats.tsx
@@ -1,10 +1,10 @@
+import { AlertCircleIcon } from "lucide-react";
+import { useEffect, useRef } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import { MarkdownRenderer } from "@/components/blocks/MarkdownRenderer/markdown-renderer";
 import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
 import { NebulaIcon } from "@/icons/NebulaIcon";
 import { cn } from "@/lib/utils";
-import { AlertCircleIcon } from "lucide-react";
-import { useEffect, useRef } from "react";
-import type { ThirdwebClient } from "thirdweb";
 import type { NebulaSwapData } from "../api/chat";
 import type {
   NebulaTxData,
@@ -116,8 +116,8 @@ export function Chats(props: {
       <ScrollShadow
         className="flex-1"
         scrollableClassName="max-h-full overscroll-contain"
-        shadowColor="hsl(var(--background))"
         shadowClassName="z-[1]"
+        shadowColor="hsl(var(--background))"
       >
         <div className="container max-w-[800px]">
           <div className={cn("flex flex-col gap-5 py-4", props.className)}>
@@ -143,12 +143,12 @@ export function Chats(props: {
                   key={index}
                 >
                   <RenderMessage
-                    message={message}
-                    isMessagePending={isMessagePending}
+                    authToken={props.authToken}
                     client={props.client}
-                    sendMessage={props.sendMessage}
+                    isMessagePending={isMessagePending}
+                    message={message}
                     nextMessage={props.messages[index + 1]}
-                    authToken={props.authToken}
+                    sendMessage={props.sendMessage}
                     sessionId={props.sessionId}
                   />
                 </div>
@@ -179,12 +179,12 @@ function RenderMessage(props: {
         {props.message.content.map((msg, index) => {
           if (msg.type === "text") {
             return (
-              // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+              // biome-ignore lint/suspicious/noArrayIndexKey: TODO
               <div className="flex justify-end" key={index}>
                 <div className="max-w-[80%] overflow-auto rounded-xl border bg-card px-4 py-2">
                   <StyledMarkdownRenderer
-                    text={msg.text}
                     isMessagePending={props.isMessagePending}
+                    text={msg.text}
                     type="user"
                   />
                 </div>
@@ -194,9 +194,10 @@ function RenderMessage(props: {
 
           if (msg.type === "image") {
             return (
-              // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+              // biome-ignore lint/suspicious/noArrayIndexKey: TODO
               <div className="flex justify-end" key={index}>
                 <NebulaImage
+                  client={props.client}
                   type="submitted"
                   url={
                     typeof msg.b64 === "string"
@@ -205,7 +206,6 @@ function RenderMessage(props: {
                         : `data:image/png;base64,${msg.b64}`
                       : (msg.image_url ?? "")
                   }
-                  client={props.client}
                 />
               </div>
             );
@@ -251,13 +251,13 @@ function RenderMessage(props: {
       <div className="min-w-0 grow">
         <ScrollShadow className="rounded-lg">
           <RenderResponse
-            message={message}
-            isMessagePending={props.isMessagePending}
+            authToken={props.authToken}
             client={props.client}
-            sendMessage={props.sendMessage}
+            isMessagePending={props.isMessagePending}
+            message={message}
             nextMessage={props.nextMessage}
+            sendMessage={props.sendMessage}
             sessionId={props.sessionId}
-            authToken={props.authToken}
           />
         </ScrollShadow>
 
@@ -267,11 +267,11 @@ function RenderMessage(props: {
           props.sessionId &&
           message.request_id && (
             <MessageActions
-              messageText={message.text}
               authToken={props.authToken}
+              className="mt-4"
+              messageText={message.text}
               requestId={message.request_id}
               sessionId={props.sessionId}
-              className="mt-4"
             />
           )}
       </div>
@@ -294,8 +294,8 @@ function RenderResponse(props: {
     case "assistant":
       return (
         <StyledMarkdownRenderer
-          text={message.text}
           isMessagePending={isMessagePending}
+          text={message.text}
           type="assistant"
         />
       );
@@ -312,14 +312,14 @@ function RenderResponse(props: {
     case "image": {
       return (
         <NebulaImage
-          type="response"
-          url={message.data.url}
-          width={message.data.width}
-          height={message.data.height}
+          authToken={props.authToken}
           client={client}
+          height={message.data.height}
           requestId={message.request_id}
           sessionId={props.sessionId}
-          authToken={props.authToken}
+          type="response"
+          url={message.data.url}
+          width={message.data.width}
         />
       );
     }
@@ -328,7 +328,6 @@ function RenderResponse(props: {
       if (message.subtype === "sign_transaction") {
         return (
           <ExecuteTransactionCard
-            txData={message.data}
             client={client}
             onTxSettled={(txHash) => {
               // do not send automatic prompt if there is another transaction after this one
@@ -337,16 +336,17 @@ function RenderResponse(props: {
               }
 
               sendMessage({
-                role: "user",
                 content: [
                   {
-                    type: "transaction",
-                    transaction_hash: txHash,
                     chain_id: message.data.chainId,
+                    transaction_hash: txHash,
+                    type: "transaction",
                   },
                 ],
+                role: "user",
               });
             }}
+            txData={message.data}
           />
         );
       }
@@ -354,13 +354,12 @@ function RenderResponse(props: {
       if (message.subtype === "sign_swap") {
         if (message.data.action === "approval") {
           return (
-            <ApproveTransactionCard swapData={message.data} client={client} />
+            <ApproveTransactionCard client={client} swapData={message.data} />
           );
         }
 
         return (
           <SwapTransactionCard
-            swapData={message.data}
             client={client}
             onTxSettled={(txHash) => {
               // do not send automatic prompt if there is another transaction after this one
@@ -369,16 +368,17 @@ function RenderResponse(props: {
               }
 
               sendMessage({
-                role: "user",
                 content: [
                   {
-                    type: "transaction",
-                    transaction_hash: txHash,
                     chain_id: message.data.transaction.chainId,
+                    transaction_hash: txHash,
+                    type: "transaction",
                   },
                 ],
+                role: "user",
               });
             }}
+            swapData={message.data}
           />
         );
       }
@@ -401,21 +401,21 @@ function StyledMarkdownRenderer(props: {
 }) {
   return (
     <MarkdownRenderer
-      skipHtml
-      markdownText={props.text}
       className="text-foreground [&>*:first-child]:mt-0 [&>*:first-child]:border-none [&>*:first-child]:pb-0 [&>*:last-child]:mb-0"
       code={{
-        ignoreFormattingErrors: true,
         className: "bg-transparent",
+        ignoreFormattingErrors: true,
       }}
+      inlineCode={{ className: "border-none" }}
+      li={{ className: "text-foreground" }}
+      markdownText={props.text}
       p={{
         className:
           props.type === "assistant"
             ? "text-foreground"
             : "text-foreground leading-normal",
       }}
-      li={{ className: "text-foreground" }}
-      inlineCode={{ className: "border-none" }}
+      skipHtml
     />
   );
 }
diff --git a/apps/nebula/src/app/(app)/components/EmptyStateChatPageContent.stories.tsx b/apps/nebula/src/app/(app)/components/EmptyStateChatPageContent.stories.tsx
index 100d5bcc4ad..4b2854768a7 100644
--- a/apps/nebula/src/app/(app)/components/EmptyStateChatPageContent.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/EmptyStateChatPageContent.stories.tsx
@@ -3,13 +3,13 @@ import { ThirdwebProvider } from "thirdweb/react";
 import { EmptyStateChatPageContent } from "./EmptyStateChatPageContent";
 
 const meta = {
-  title: "Nebula/EmptyStateChatPage",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Nebula/EmptyStateChatPage",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -27,23 +27,21 @@ export const PrefilledMessage: Story = {
   },
 };
 
-function Story(props: {
-  prefillMessage: string | undefined;
-}) {
+function Story(props: { prefillMessage: string | undefined }) {
   return (
     <ThirdwebProvider>
       <div className="container flex max-w-[800px] grow flex-col justify-center overflow-hidden">
         <EmptyStateChatPageContent
-          onLoginClick={undefined}
-          showAurora={false}
+          allowImageUpload={true}
+          connectedWallets={[]}
+          context={undefined}
           isConnectingWallet={false}
-          sendMessage={() => {}}
+          onLoginClick={undefined}
           prefillMessage={props.prefillMessage}
-          context={undefined}
-          setContext={() => {}}
-          connectedWallets={[]}
+          sendMessage={() => {}}
           setActiveWallet={() => {}}
-          allowImageUpload={true}
+          setContext={() => {}}
+          showAurora={false}
         />
       </div>
     </ThirdwebProvider>
diff --git a/apps/nebula/src/app/(app)/components/EmptyStateChatPageContent.tsx b/apps/nebula/src/app/(app)/components/EmptyStateChatPageContent.tsx
index 5ae493dae34..fb81fe4db52 100644
--- a/apps/nebula/src/app/(app)/components/EmptyStateChatPageContent.tsx
+++ b/apps/nebula/src/app/(app)/components/EmptyStateChatPageContent.tsx
@@ -1,10 +1,10 @@
 "use client";
 
+import { ArrowUpRightIcon } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
 import { NebulaIcon } from "@/icons/NebulaIcon";
 import { cn } from "@/lib/utils";
-import { ArrowUpRightIcon } from "lucide-react";
 import type { NebulaContext } from "../api/chat";
 import type { NebulaUserMessage } from "../api/types";
 import { examplePrompts } from "../data/examplePrompts";
@@ -43,22 +43,22 @@ export function EmptyStateChatPageContent(props: {
         <div className="h-5" />
         <div className="mx-auto max-w-[600px]">
           <ChatBar
-            placeholder={"Ask Nebula"}
-            onLoginClick={props.onLoginClick}
-            isConnectingWallet={props.isConnectingWallet}
-            showContextSelector={true}
-            context={props.context}
-            setContext={props.setContext}
-            sendMessage={props.sendMessage}
-            isChatStreaming={false}
-            client={nebulaAppThirdwebClient}
-            connectedWallets={props.connectedWallets}
-            setActiveWallet={props.setActiveWallet}
             abortChatStream={() => {
               // the page will switch so, no need to handle abort here
             }}
-            prefillMessage={props.prefillMessage}
             allowImageUpload={props.allowImageUpload}
+            client={nebulaAppThirdwebClient}
+            connectedWallets={props.connectedWallets}
+            context={props.context}
+            isChatStreaming={false}
+            isConnectingWallet={props.isConnectingWallet}
+            onLoginClick={props.onLoginClick}
+            placeholder={"Ask Nebula"}
+            prefillMessage={props.prefillMessage}
+            sendMessage={props.sendMessage}
+            setActiveWallet={props.setActiveWallet}
+            setContext={props.setContext}
+            showContextSelector={true}
           />
           <div className="h-5" />
           <div className="flex flex-wrap justify-center gap-2.5">
@@ -69,8 +69,8 @@ export function EmptyStateChatPageContent(props: {
                   label={prompt.title}
                   onClick={() =>
                     props.sendMessage({
+                      content: [{ text: prompt.message, type: "text" }],
                       role: "user",
-                      content: [{ type: "text", text: prompt.message }],
                     })
                   }
                 />
@@ -86,9 +86,9 @@ export function EmptyStateChatPageContent(props: {
 function ExamplePrompt(props: { label: string; onClick: () => void }) {
   return (
     <Button
-      variant="outline"
       className="h-auto gap-1.5 rounded-full bg-card px-3 py-1 text-muted-foreground text-xs"
       onClick={props.onClick}
+      variant="outline"
     >
       {props.label} <ArrowUpRightIcon className="size-3" />
     </Button>
diff --git a/apps/nebula/src/app/(app)/components/ExecuteTransactionCard.stories.tsx b/apps/nebula/src/app/(app)/components/ExecuteTransactionCard.stories.tsx
index 9bdc67343d3..01f2845667d 100644
--- a/apps/nebula/src/app/(app)/components/ExecuteTransactionCard.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/ExecuteTransactionCard.stories.tsx
@@ -1,22 +1,22 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useState } from "react";
+import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import {
   BadgeContainer,
   storybookLog,
   storybookThirdwebClient,
 } from "@/storybook/utils";
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { useState } from "react";
-import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { ExecuteTransactionCardLayout } from "./ExecuteTransactionCard";
 import type { TxStatus } from "./Swap/common";
 
 const meta = {
-  title: "Nebula/actions/ExecuteTransactionCard",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Nebula/actions/ExecuteTransactionCard",
 } satisfies Meta<typeof Story>;
 
 export default meta;
@@ -40,40 +40,37 @@ function Story() {
         <Variant label="Sending" status={{ type: "sending" }} />
         <Variant
           label="Confirming"
-          status={{ type: "confirming", txHash: exampleTxHash }}
+          status={{ txHash: exampleTxHash, type: "confirming" }}
         />
         <Variant
           label="Confirmed"
-          status={{ type: "confirmed", txHash: exampleTxHash }}
+          status={{ txHash: exampleTxHash, type: "confirmed" }}
         />
         <Variant
           label="Failed"
-          status={{ type: "failed", txHash: exampleTxHash }}
+          status={{ txHash: exampleTxHash, type: "failed" }}
         />
       </div>
     </ThirdwebProvider>
   );
 }
 
-function Variant(props: {
-  label: string;
-  status: TxStatus;
-}) {
+function Variant(props: { label: string; status: TxStatus }) {
   const [status, setStatus] = useState<TxStatus>(props.status);
   return (
     <BadgeContainer label={props.label}>
       <ExecuteTransactionCardLayout
+        client={storybookThirdwebClient}
         onTxSettled={(txHash) => {
           storybookLog(`onTxSettled called with ${txHash}`);
         }}
         sendTx={async () => {}}
         setStatus={setStatus}
         status={status}
-        client={storybookThirdwebClient}
         txData={{
           chainId: 1,
-          to: "0xEb0effdFB4dC5b3d5d3aC6ce29F3ED213E95d675", // thirdweb.eth
-          data: "0x",
+          data: "0x", // thirdweb.eth
+          to: "0xEb0effdFB4dC5b3d5d3aC6ce29F3ED213E95d675",
           value: "0x16345785d8a0000", // 0.1 eth
         }}
       />
diff --git a/apps/nebula/src/app/(app)/components/ExecuteTransactionCard.tsx b/apps/nebula/src/app/(app)/components/ExecuteTransactionCard.tsx
index 693d0611af8..0f7be8e2adc 100644
--- a/apps/nebula/src/app/(app)/components/ExecuteTransactionCard.tsx
+++ b/apps/nebula/src/app/(app)/components/ExecuteTransactionCard.tsx
@@ -1,15 +1,15 @@
-import { ChainIconClient } from "@/components/blocks/ChainIcon";
-import { TransactionButton } from "@/components/blocks/buttons/TransactionButton";
-import { WalletAddress } from "@/components/blocks/wallet-address";
 import { ArrowRightLeftIcon } from "lucide-react";
 import {
-  type PreparedTransaction,
-  type ThirdwebClient,
   defineChain,
+  type PreparedTransaction,
   prepareTransaction,
+  type ThirdwebClient,
   toEther,
 } from "thirdweb";
 import { useActiveAccount } from "thirdweb/react";
+import { TransactionButton } from "@/components/blocks/buttons/TransactionButton";
+import { ChainIconClient } from "@/components/blocks/ChainIcon";
+import { WalletAddress } from "@/components/blocks/wallet-address";
 import type { NebulaTxData } from "../api/types";
 import {
   TxHashRow,
@@ -27,12 +27,12 @@ export function ExecuteTransactionCard(props: {
 
   return (
     <ExecuteTransactionCardLayout
-      txData={props.txData}
       client={props.client}
-      status={status}
-      setStatus={setStatus}
-      sendTx={sendTx}
       onTxSettled={props.onTxSettled}
+      sendTx={sendTx}
+      setStatus={setStatus}
+      status={status}
+      txData={props.txData}
     />
   );
 }
@@ -105,8 +105,8 @@ export function ExecuteTransactionCardLayout(props: {
             <div className="flex items-center gap-2">
               <ChainIconClient
                 className="size-5 rounded-full"
-                src={chain.icon?.url}
                 client={props.client}
+                src={chain.icon?.url}
               />
               <span className="text-foreground">
                 {chain.name || `Chain ID: ${txData.chainId}`}
@@ -129,16 +129,14 @@ export function ExecuteTransactionCardLayout(props: {
         {props.status.type !== "confirmed" && (
           <div className="flex items-center justify-end border-t px-4 py-5 lg:px-5">
             <TransactionButton
+              className="gap-2"
               client={props.client}
-              isPending={props.status.type === "sending"}
-              transactionCount={undefined}
-              txChainID={txData.chainId}
-              variant="default"
               disabled={
                 props.status.type === "sending" ||
                 props.status.type === "confirming"
               }
-              size="sm"
+              isLoggedIn={true}
+              isPending={props.status.type === "sending"}
               onClick={async () => {
                 const tx = prepareTransaction({
                   chain: chain,
@@ -150,8 +148,10 @@ export function ExecuteTransactionCardLayout(props: {
 
                 props.sendTx(tx, props.onTxSettled);
               }}
-              className="gap-2"
-              isLoggedIn={true}
+              size="sm"
+              transactionCount={undefined}
+              txChainID={txData.chainId}
+              variant="default"
             >
               <ArrowRightLeftIcon className="size-4" />
               Execute Transaction
diff --git a/apps/nebula/src/app/(app)/components/MessageActions.tsx b/apps/nebula/src/app/(app)/components/MessageActions.tsx
index 148b3f439ec..4355c5b44f8 100644
--- a/apps/nebula/src/app/(app)/components/MessageActions.tsx
+++ b/apps/nebula/src/app/(app)/components/MessageActions.tsx
@@ -1,6 +1,3 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
 import { useMutation } from "@tanstack/react-query";
 import {
   CheckIcon,
@@ -10,6 +7,9 @@ import {
 } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { cn } from "@/lib/utils";
 import { submitFeedback } from "../api/feedback";
 
 export function MessageActions(props: {
@@ -31,13 +31,13 @@ export function MessageActions(props: {
   }
   const sendPositiveRating = useMutation({
     mutationFn: () => sendRating("good"),
-    onSuccess() {
-      toast.info("Thanks for the feedback!", {
+    onError() {
+      toast.error("Failed to send feedback", {
         position: "top-right",
       });
     },
-    onError() {
-      toast.error("Failed to send feedback", {
+    onSuccess() {
+      toast.info("Thanks for the feedback!", {
         position: "top-right",
       });
     },
@@ -45,13 +45,13 @@ export function MessageActions(props: {
 
   const sendBadRating = useMutation({
     mutationFn: () => sendRating("bad"),
-    onSuccess() {
-      toast.info("Thanks for the feedback!", {
+    onError() {
+      toast.error("Failed to send feedback", {
         position: "top-right",
       });
     },
-    onError() {
-      toast.error("Failed to send feedback", {
+    onSuccess() {
+      toast.info("Thanks for the feedback!", {
         position: "top-right",
       });
     },
@@ -65,8 +65,6 @@ export function MessageActions(props: {
     >
       {messageText && (
         <Button
-          variant="outline"
-          size="sm"
           className={cn("h-8 gap-2 rounded-lg text-sm", props.buttonClassName)}
           onClick={() => {
             navigator.clipboard.writeText(messageText);
@@ -75,6 +73,8 @@ export function MessageActions(props: {
               setIsCopied(false);
             }, 1000);
           }}
+          size="sm"
+          variant="outline"
         >
           {isCopied ? (
             <CheckIcon className="size-3.5 text-green-500" />
@@ -86,8 +86,6 @@ export function MessageActions(props: {
       )}
 
       <Button
-        variant="outline"
-        size="sm"
         className={cn(
           "size-8 rounded-lg bg-background p-0",
           props.buttonClassName,
@@ -95,6 +93,8 @@ export function MessageActions(props: {
         onClick={() => {
           sendPositiveRating.mutate();
         }}
+        size="sm"
+        variant="outline"
       >
         {sendPositiveRating.isPending ? (
           <Spinner className="size-4" />
@@ -104,8 +104,6 @@ export function MessageActions(props: {
       </Button>
 
       <Button
-        variant="outline"
-        size="sm"
         className={cn(
           "size-8 rounded-lg bg-background p-0",
           props.buttonClassName,
@@ -113,6 +111,8 @@ export function MessageActions(props: {
         onClick={() => {
           sendBadRating.mutate();
         }}
+        size="sm"
+        variant="outline"
       >
         {sendBadRating.isPending ? (
           <Spinner className="size-4" />
diff --git a/apps/nebula/src/app/(app)/components/NebulaConnectButton.tsx b/apps/nebula/src/app/(app)/components/NebulaConnectButton.tsx
index 12a9894e7b3..6096f062687 100644
--- a/apps/nebula/src/app/(app)/components/NebulaConnectButton.tsx
+++ b/apps/nebula/src/app/(app)/components/NebulaConnectButton.tsx
@@ -1,20 +1,20 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { getSDKTheme } from "@/config/sdk-component-theme";
-import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
-import { useAllChainsData } from "@/hooks/chains";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { cn } from "@/lib/utils";
-import { useTheme } from "next-themes";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { useTheme } from "next-themes";
 import {
   ConnectButton,
   useActiveAccount,
   useActiveWalletConnectionStatus,
 } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { getSDKTheme } from "@/config/sdk-component-theme";
+import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
+import { useAllChainsData } from "@/hooks/chains";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { cn } from "@/lib/utils";
 import { doNebulaLogout } from "../../login/auth-actions";
 
 export const NebulaConnectWallet = (props: {
@@ -34,13 +34,13 @@ export const NebulaConnectWallet = (props: {
   if (connectionStatus === "connecting") {
     return (
       <Button
-        size="lg"
-        disabled
-        variant="outline"
         className={cn(
           props.signInLinkButtonClassName,
           "gap-2 disabled:opacity-100",
         )}
+        disabled
+        size="lg"
+        variant="outline"
       >
         <Spinner className="size-4" /> Connecting Wallet
       </Button>
@@ -51,9 +51,9 @@ export const NebulaConnectWallet = (props: {
     return (
       <Button
         asChild
-        variant="default"
         className={props.signInLinkButtonClassName}
         size="lg"
+        variant="default"
       >
         <Link
           href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
@@ -67,17 +67,27 @@ export const NebulaConnectWallet = (props: {
   const { customDetailsButton } = props;
   return (
     <ConnectButton
-      theme={getSDKTheme(t)}
+      appMetadata={{
+        logoUrl: "https://thirdweb.com/favicon.ico",
+        name: "thirdweb",
+        url: "https://thirdweb.com",
+      }}
+      autoConnect={false}
+      chains={allChainsV5}
       client={nebulaAppThirdwebClient}
+      connectButton={{
+        className: props.connectButtonClassName,
+      }}
       connectModal={{
         privacyPolicyUrl: "/privacy-policy",
-        termsOfServiceUrl: "/terms",
         showThirdwebBranding: false,
+        termsOfServiceUrl: "/terms",
       }}
-      appMetadata={{
-        name: "thirdweb",
-        logoUrl: "https://thirdweb.com/favicon.ico",
-        url: "https://thirdweb.com",
+      detailsButton={{
+        className: props.detailsButtonClassName,
+        render: customDetailsButton
+          ? () => customDetailsButton(account.address)
+          : undefined,
       }}
       onDisconnect={async () => {
         try {
@@ -87,18 +97,8 @@ export const NebulaConnectWallet = (props: {
           console.error("Failed to log out", err);
         }
       }}
-      connectButton={{
-        className: props.connectButtonClassName,
-      }}
-      detailsButton={{
-        className: props.detailsButtonClassName,
-        render: customDetailsButton
-          ? () => customDetailsButton(account.address)
-          : undefined,
-      }}
-      chains={allChainsV5}
       // we have an AutoConnect already added in root layout with AA configuration
-      autoConnect={false}
+      theme={getSDKTheme(t)}
     />
   );
 };
diff --git a/apps/nebula/src/app/(app)/components/NebulaImage.tsx b/apps/nebula/src/app/(app)/components/NebulaImage.tsx
index 1532e645623..d0b8269c64b 100644
--- a/apps/nebula/src/app/(app)/components/NebulaImage.tsx
+++ b/apps/nebula/src/app/(app)/components/NebulaImage.tsx
@@ -1,5 +1,7 @@
+import { useMutation } from "@tanstack/react-query";
+import { ArrowDownToLineIcon } from "lucide-react";
+import type { ThirdwebClient } from "thirdweb";
 import { Img } from "@/components/blocks/Img";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -7,10 +9,8 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
-import { useMutation } from "@tanstack/react-query";
-import { ArrowDownToLineIcon } from "lucide-react";
-import type { ThirdwebClient } from "thirdweb";
 import { MessageActions } from "./MessageActions";
 
 export function NebulaImage(
@@ -33,8 +33,8 @@ export function NebulaImage(
 ) {
   const src = props.url.startsWith("ipfs://")
     ? resolveSchemeWithErrorHandler({
-        uri: props.url,
         client: props.client,
+        uri: props.url,
       })
     : props.url;
 
@@ -51,13 +51,13 @@ export function NebulaImage(
       <Dialog>
         <DialogTrigger asChild>
           <Img
-            width={props.type === "response" ? props.width : undefined}
-            height={props.type === "response" ? props.height : undefined}
-            src={src}
             className="w-full rounded-lg border hover:border-active-border"
+            height={props.type === "response" ? props.height : undefined}
             skeleton={
               <div className="min-h-[300px] animate-skeleton bg-muted" />
             }
+            src={src}
+            width={props.type === "response" ? props.width : undefined}
           />
         </DialogTrigger>
 
@@ -67,21 +67,21 @@ export function NebulaImage(
         >
           <DialogTitle className="sr-only">Image</DialogTitle>
           <Img
-            src={src}
             className="h-full w-full object-contain"
             skeleton={<div className="animate-skeleton bg-muted" />}
+            src={src}
           />
         </DialogContent>
       </Dialog>
 
       <div className="absolute top-4 right-4 z-10 flex justify-between gap-2 opacity-0 transition-opacity duration-300 group-hover:opacity-100">
         <Button
-          variant="ghost"
-          size="sm"
           className="size-8 gap-2 rounded-lg bg-background/50 p-0 "
           onClick={async () => {
             downloadMutation.mutate();
           }}
+          size="sm"
+          variant="ghost"
         >
           {downloadMutation.isPending ? (
             <Spinner className="size-4" />
@@ -95,10 +95,10 @@ export function NebulaImage(
         <div className="absolute right-4 bottom-4 opacity-0 transition-opacity duration-300 group-hover:opacity-100">
           <MessageActions
             authToken={props.authToken}
+            buttonClassName="bg-background/50 border-none"
+            messageText={undefined}
             requestId={props.requestId}
             sessionId={props.sessionId}
-            messageText={undefined}
-            buttonClassName="bg-background/50 border-none"
           />
         </div>
       )}
diff --git a/apps/nebula/src/app/(app)/components/NebulaMobileNav.tsx b/apps/nebula/src/app/(app)/components/NebulaMobileNav.tsx
index 5b9aa2c516c..23a0845d67d 100644
--- a/apps/nebula/src/app/(app)/components/NebulaMobileNav.tsx
+++ b/apps/nebula/src/app/(app)/components/NebulaMobileNav.tsx
@@ -1,5 +1,8 @@
 "use client";
 
+import { MenuIcon } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Sheet,
@@ -7,9 +10,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { MenuIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
 import type { TruncatedSessionInfo } from "../api/types";
 import { useNewChatPageLink } from "../hooks/useNewChatPageLink";
 import { ChatSidebar } from "./ChatSidebar";
@@ -23,18 +23,17 @@ export function MobileNav(props: {
 
   return (
     <nav className="flex justify-between border-b bg-card px-4 py-4 lg:hidden">
-      <Sheet open={isOpen} onOpenChange={setIsOpen}>
+      <Sheet onOpenChange={setIsOpen} open={isOpen}>
         <SheetTrigger asChild>
           <Button
-            variant="ghost"
-            onClick={() => setIsOpen(!isOpen)}
             className="h-auto w-auto p-0.5"
+            onClick={() => setIsOpen(!isOpen)}
+            variant="ghost"
           >
             <MenuIcon className="size-8" />
           </Button>
         </SheetTrigger>
         <SheetContent
-          side="left"
           className="w-[calc(100vw-80px)] max-w-[300px] p-0"
           onClick={(e) => {
             if (!(e.target instanceof HTMLElement)) {
@@ -47,12 +46,13 @@ export function MobileNav(props: {
               setIsOpen(false);
             }
           }}
+          side="left"
         >
           <SheetTitle className="sr-only"> Menu </SheetTitle>
           <ChatSidebar
-            type="mobile"
             authToken={props.authToken}
             sessions={props.sessions}
+            type="mobile"
           />
         </SheetContent>
       </Sheet>
diff --git a/apps/nebula/src/app/(app)/components/Reasoning/Reasoning.stories.tsx b/apps/nebula/src/app/(app)/components/Reasoning/Reasoning.stories.tsx
index db8c31a55d6..65bc7f39af1 100644
--- a/apps/nebula/src/app/(app)/components/Reasoning/Reasoning.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/Reasoning/Reasoning.stories.tsx
@@ -1,9 +1,8 @@
-import { randomLorem } from "@/storybook/stubs";
 import type { Meta, StoryObj } from "@storybook/nextjs";
+import { randomLorem } from "@/storybook/stubs";
 import { Reasoning } from "./Reasoning";
 
 const meta = {
-  title: "Nebula/Reasoning",
   component: Story,
   decorators: [
     (Story) => (
@@ -12,6 +11,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Nebula/Reasoning",
 } satisfies Meta<typeof Story>;
 
 export default meta;
diff --git a/apps/nebula/src/app/(app)/components/Reasoning/Reasoning.tsx b/apps/nebula/src/app/(app)/components/Reasoning/Reasoning.tsx
index 2ce50e01590..be0bf2e90f6 100644
--- a/apps/nebula/src/app/(app)/components/Reasoning/Reasoning.tsx
+++ b/apps/nebula/src/app/(app)/components/Reasoning/Reasoning.tsx
@@ -1,14 +1,11 @@
-import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import { ChevronDownIcon } from "lucide-react";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { TextShimmer } from "@/components/ui/text-shimmer";
 import { cn } from "@/lib/utils";
-import { ChevronDownIcon } from "lucide-react";
-import { useState } from "react";
 
-export function Reasoning(props: {
-  isPending: boolean;
-  texts: string[];
-}) {
+export function Reasoning(props: { isPending: boolean; texts: string[] }) {
   const [_isOpen, setIsOpen] = useState(false);
   const isOpen = props.isPending ? true : _isOpen;
   const showAll = !props.isPending;
@@ -17,10 +14,10 @@ export function Reasoning(props: {
   return (
     <DynamicHeight>
       <Button
-        variant="link"
-        size="sm"
-        onClick={() => setIsOpen(!isOpen)}
         className="h-auto w-auto items-center gap-1 px-0 py-1 pb-2 font-normal text-base text-muted-foreground hover:text-foreground hover:no-underline"
+        onClick={() => setIsOpen(!isOpen)}
+        size="sm"
+        variant="link"
       >
         {props.isPending ? (
           <TextShimmer text="Reasoning..." />
@@ -44,8 +41,8 @@ export function Reasoning(props: {
             <ul className="list-none space-y-1.5">
               {props.texts.map((text) => (
                 <li
-                  key={text}
                   className="fade-in-0 animate-in text-muted-foreground text-sm leading-relaxed duration-300"
+                  key={text}
                 >
                   {text.trim()}
                 </li>
diff --git a/apps/nebula/src/app/(app)/components/Swap/SwapCards.stories.tsx b/apps/nebula/src/app/(app)/components/Swap/SwapCards.stories.tsx
index 49197accaba..719c4c9f356 100644
--- a/apps/nebula/src/app/(app)/components/Swap/SwapCards.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/Swap/SwapCards.stories.tsx
@@ -1,55 +1,55 @@
-import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { useState } from "react";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
+import { BadgeContainer, storybookThirdwebClient } from "@/storybook/utils";
 import type { NebulaSwapData } from "../../api/chat";
+import type { TxStatus } from "./common";
 import {
   ApproveTransactionCardLayout,
   SwapTransactionCardLayout,
 } from "./SwapCards";
-import type { TxStatus } from "./common";
 
 const meta = {
-  title: "Nebula/actions/Swap Cards",
   component: Story,
   parameters: {
     nextjs: {
       appDirectory: true,
     },
   },
+  title: "Nebula/actions/Swap Cards",
 } satisfies Meta<typeof Story>;
 
 export default meta;
 type Story = StoryObj<typeof meta>;
 
 const swapBaseData: Omit<NebulaSwapData, "action"> = {
-  transaction: {
-    chainId: 8453,
-    to: "0x4200000000000000000000000000000000000006",
-    data: "0x095ea7b3000000000000000000000000f8ab2dbe6c43bf1a856471182290f91d621ba76d000000000000000000000000000000000000000000000000016345785d8a0000",
-  },
-  intent: {
-    originChainId: 8453,
-    originTokenAddress: "0x4200000000000000000000000000000000000006",
-    destinationChainId: 8453,
-    destinationTokenAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-    amount: "100000000000000000",
-    sender: "0x1E68D1dB85f3F4e1cc8dd816709C529139f79290",
-    receiver: "0x1E68D1dB85f3F4e1cc8dd816709C529139f79290",
-  },
   from: {
     address: "0x4200000000000000000000000000000000000006",
     amount: "100000000000000000",
     chain_id: 1,
-    symbol: "WETH",
     decimals: 18,
+    symbol: "WETH",
+  },
+  intent: {
+    amount: "100000000000000000",
+    destinationChainId: 8453,
+    destinationTokenAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    originChainId: 8453,
+    originTokenAddress: "0x4200000000000000000000000000000000000006",
+    receiver: "0x1E68D1dB85f3F4e1cc8dd816709C529139f79290",
+    sender: "0x1E68D1dB85f3F4e1cc8dd816709C529139f79290",
   },
   to: {
     address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
     amount: "176443798",
     chain_id: 8453,
-    symbol: "USDC",
     decimals: 6,
+    symbol: "USDC",
+  },
+  transaction: {
+    chainId: 8453,
+    data: "0x095ea7b3000000000000000000000000f8ab2dbe6c43bf1a856471182290f91d621ba76d000000000000000000000000000000000000000000000000016345785d8a0000",
+    to: "0x4200000000000000000000000000000000000006",
   },
 };
 
@@ -74,9 +74,7 @@ export const Approve: Story = {
 const exampleTxHash =
   "0xbe81f5a6421625052214b41bb79d1d82751b29aa5639b54d120f00531bb8bcf";
 
-function Story(props: {
-  swapData: NebulaSwapData;
-}) {
+function Story(props: { swapData: NebulaSwapData }) {
   return (
     <ThirdwebProvider>
       <div className="container flex max-w-[800px] flex-col gap-10 py-10">
@@ -95,17 +93,17 @@ function Story(props: {
         />
         <Variant
           label="Confirming"
-          status={{ type: "confirming", txHash: exampleTxHash }}
+          status={{ txHash: exampleTxHash, type: "confirming" }}
           swapData={props.swapData}
         />
         <Variant
           label="Confirmed"
-          status={{ type: "confirmed", txHash: exampleTxHash }}
+          status={{ txHash: exampleTxHash, type: "confirmed" }}
           swapData={props.swapData}
         />
         <Variant
           label="Failed"
-          status={{ type: "failed", txHash: exampleTxHash }}
+          status={{ txHash: exampleTxHash, type: "failed" }}
           swapData={props.swapData}
         />
       </div>
@@ -123,18 +121,18 @@ function Variant(props: {
     <BadgeContainer label={props.label}>
       {props.swapData.action === "approval" ? (
         <ApproveTransactionCardLayout
+          client={storybookThirdwebClient}
           sendTx={async () => {}}
           setStatus={setStatus}
           status={status}
-          client={storybookThirdwebClient}
           swapData={props.swapData}
         />
       ) : (
         <SwapTransactionCardLayout
+          client={storybookThirdwebClient}
           sendTx={async () => {}}
           setStatus={setStatus}
           status={status}
-          client={storybookThirdwebClient}
           swapData={props.swapData}
         />
       )}
diff --git a/apps/nebula/src/app/(app)/components/Swap/SwapCards.tsx b/apps/nebula/src/app/(app)/components/Swap/SwapCards.tsx
index 17b4d9ddc97..38a0a3df69f 100644
--- a/apps/nebula/src/app/(app)/components/Swap/SwapCards.tsx
+++ b/apps/nebula/src/app/(app)/components/Swap/SwapCards.tsx
@@ -1,15 +1,15 @@
-import { ChainIconClient } from "@/components/blocks/ChainIcon";
-import { TransactionButton } from "@/components/blocks/buttons/TransactionButton";
 import { ArrowRightLeftIcon, CheckIcon } from "lucide-react";
 import {
-  NATIVE_TOKEN_ADDRESS,
-  type PreparedTransaction,
-  type ThirdwebClient,
   defineChain,
   getAddress,
+  NATIVE_TOKEN_ADDRESS,
+  type PreparedTransaction,
   prepareTransaction,
+  type ThirdwebClient,
   toTokens,
 } from "thirdweb";
+import { TransactionButton } from "@/components/blocks/buttons/TransactionButton";
+import { ChainIconClient } from "@/components/blocks/ChainIcon";
 import type { NebulaSwapData } from "../../api/chat";
 import { TxHashRow, type TxStatus, TxStatusRow, useTxSetup } from "./common";
 
@@ -22,11 +22,11 @@ export function SwapTransactionCard(props: {
 
   return (
     <SwapTransactionCardLayout
-      swapData={props.swapData}
       client={props.client}
-      status={status}
-      setStatus={setStatus}
       sendTx={(tx) => sendTx(tx, props.onTxSettled)}
+      setStatus={setStatus}
+      status={status}
+      swapData={props.swapData}
     />
   );
 }
@@ -58,20 +58,20 @@ export function SwapTransactionCardLayout(props: {
         <div className="px-4 text-sm lg:px-5 [&>*:not(:last-child)]:border-b [&>*]:min-h-14 [&>*]:py-3.5">
           <TokenRow
             amount={swapData.from.amount}
-            symbol={swapData.from.symbol}
             chainId={swapData.from.chain_id}
-            title="Sell"
             client={props.client}
             decimals={swapData.from.decimals}
+            symbol={swapData.from.symbol}
+            title="Sell"
           />
 
           <TokenRow
             amount={swapData.to.amount}
-            symbol={swapData.to.symbol}
             chainId={swapData.to.chain_id}
-            title="Buy"
             client={props.client}
             decimals={swapData.to.decimals}
+            symbol={swapData.to.symbol}
+            title="Buy"
           />
 
           {/* Status */}
@@ -92,34 +92,34 @@ export function SwapTransactionCardLayout(props: {
         {props.status.type !== "confirmed" && (
           <div className="flex items-center justify-end border-t px-4 py-4 lg:px-5">
             <TransactionButton
+              className="gap-2"
               client={props.client}
-              isPending={props.status.type === "sending"}
-              transactionCount={undefined}
-              txChainID={swapData.transaction.chainId}
-              variant="default"
               disabled={
                 props.status.type === "sending" ||
                 props.status.type === "confirming"
               }
-              size="sm"
+              isLoggedIn={true}
+              isPending={props.status.type === "sending"}
               onClick={async () => {
                 const tx = prepareTransaction({
                   chain: txChain,
                   client: props.client,
                   data: swapData.transaction.data,
-                  to: swapData.transaction.to,
                   erc20Value: isSellingNativeToken
                     ? undefined
                     : {
                         amountWei: BigInt(swapData.from.amount),
                         tokenAddress: swapData.from.address,
                       },
+                  to: swapData.transaction.to,
                 });
 
                 props.sendTx(tx);
               }}
-              className="gap-2"
-              isLoggedIn={true}
+              size="sm"
+              transactionCount={undefined}
+              txChainID={swapData.transaction.chainId}
+              variant="default"
             >
               <ArrowRightLeftIcon className="size-4" />
               Swap Tokens
@@ -139,11 +139,11 @@ export function ApproveTransactionCard(props: {
 
   return (
     <ApproveTransactionCardLayout
-      swapData={props.swapData}
       client={props.client}
-      status={status}
-      setStatus={setStatus}
       sendTx={(tx) => sendTx(tx, undefined)}
+      setStatus={setStatus}
+      status={status}
+      swapData={props.swapData}
     />
   );
 }
@@ -178,20 +178,20 @@ export function ApproveTransactionCardLayout(props: {
         <div className="px-4 text-sm lg:px-5 [&>*:not(:last-child)]:border-b [&>*]:min-h-14 [&>*]:py-3.5">
           <TokenRow
             amount={swapData.from.amount}
-            symbol={swapData.from.symbol}
             chainId={swapData.from.chain_id}
-            title="Approve Spending"
             client={props.client}
             decimals={swapData.from.decimals}
+            symbol={swapData.from.symbol}
+            title="Approve Spending"
           />
 
           <TokenRow
             amount={swapData.to.amount}
-            symbol={swapData.to.symbol}
             chainId={swapData.to.chain_id}
-            title="To Buy"
             client={props.client}
             decimals={swapData.to.decimals}
+            symbol={swapData.to.symbol}
+            title="To Buy"
           />
 
           {/* Status */}
@@ -212,13 +212,11 @@ export function ApproveTransactionCardLayout(props: {
         {props.status.type !== "confirmed" && (
           <div className="flex items-center justify-end border-t px-4 py-4 lg:px-5">
             <TransactionButton
+              className="gap-2"
               client={props.client}
-              isPending={isTransactionPending}
-              transactionCount={undefined}
-              txChainID={swapData.transaction.chainId}
-              variant="default"
               disabled={isTransactionPending}
-              size="sm"
+              isLoggedIn={true}
+              isPending={isTransactionPending}
               onClick={async () => {
                 const tx = prepareTransaction({
                   chain: txChain,
@@ -229,8 +227,10 @@ export function ApproveTransactionCardLayout(props: {
 
                 props.sendTx(tx);
               }}
-              className="gap-2"
-              isLoggedIn={true}
+              size="sm"
+              transactionCount={undefined}
+              txChainID={swapData.transaction.chainId}
+              variant="default"
             >
               <CheckIcon className="size-4" />
               Approve
@@ -263,9 +263,9 @@ function TokenRow(props: {
       <div>
         <div className="flex items-center gap-1.5">
           <ChainIconClient
-            src={chain.icon?.url || ""}
-            client={props.client}
             className="size-4"
+            client={props.client}
+            src={chain.icon?.url || ""}
           />
           <div>{chain.name}</div>
         </div>
diff --git a/apps/nebula/src/app/(app)/components/Swap/common.tsx b/apps/nebula/src/app/(app)/components/Swap/common.tsx
index e9065f259e0..0046ca08f1f 100644
--- a/apps/nebula/src/app/(app)/components/Swap/common.tsx
+++ b/apps/nebula/src/app/(app)/components/Swap/common.tsx
@@ -1,18 +1,16 @@
+import { CircleCheckIcon, CircleXIcon, ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
+import { useTheme } from "next-themes";
+import { useCallback, useState } from "react";
+import { type PreparedTransaction, waitForReceipt } from "thirdweb";
+import { useSendTransaction } from "thirdweb/react";
+import { Button } from "@/components/ui/button";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
 import { getSDKTheme } from "@/config/sdk-component-theme";
 import { useAllChainsData } from "@/hooks/chains";
 import { cn } from "@/lib/utils";
 
-import { CircleCheckIcon, CircleXIcon } from "lucide-react";
-import { ExternalLinkIcon } from "lucide-react";
-import { useTheme } from "next-themes";
-import Link from "next/link";
-import { useCallback, useState } from "react";
-import { type PreparedTransaction, waitForReceipt } from "thirdweb";
-import { useSendTransaction } from "thirdweb/react";
-
 export type TxStatus =
   | {
       type: "idle";
@@ -33,9 +31,7 @@ export type TxStatus =
       txHash: string | undefined;
     };
 
-export function TxStatusRow(props: {
-  status: TxStatus;
-}) {
+export function TxStatusRow(props: { status: TxStatus }) {
   return (
     <div className="flex items-center justify-between gap-2">
       <span className="font-medium text-muted-foreground">Status</span>
@@ -77,10 +73,7 @@ export function TxStatusRow(props: {
   );
 }
 
-export function TxHashRow(props: {
-  chainId: number;
-  txHash: string;
-}) {
+export function TxHashRow(props: { chainId: number; txHash: string }) {
   const { idToChain } = useAllChainsData();
   const chainMetadata = idToChain.get(props.chainId);
   const explorer = chainMetadata?.explorers?.[0]?.url;
@@ -94,9 +87,9 @@ export function TxHashRow(props: {
         {explorer ? (
           <Button
             asChild
-            variant="ghost"
-            size="sm"
             className="gap-1.5 font-mono"
+            size="sm"
+            variant="ghost"
           >
             <Link href={`${explorer}/tx/${props.txHash}`} target="_blank">
               {`${props.txHash.slice(0, 6)}...${props.txHash.slice(-4)}`}
@@ -105,12 +98,12 @@ export function TxHashRow(props: {
           </Button>
         ) : (
           <CopyTextButton
-            textToCopy={props.txHash}
-            textToShow={`${props.txHash.slice(0, 6)}...${props.txHash.slice(-4)}`}
-            variant="ghost"
             className="font-mono"
             copyIconPosition="right"
+            textToCopy={props.txHash}
+            textToShow={`${props.txHash.slice(0, 6)}...${props.txHash.slice(-4)}`}
             tooltip="Copy Transaction Hash"
+            variant="ghost"
           />
         )}
       </div>
@@ -143,15 +136,15 @@ export function useTxSetup() {
 
         // wait for receipt
         setStatus({
-          type: "confirming",
           txHash: submittedReceipt.transactionHash,
+          type: "confirming",
         });
 
         const confirmReceipt = await waitForReceipt(submittedReceipt);
         txHash = confirmReceipt.transactionHash;
         setStatus({
-          type: "confirmed",
           txHash: confirmReceipt.transactionHash,
+          type: "confirmed",
         });
 
         onTxSettled?.(txHash);
@@ -161,8 +154,8 @@ export function useTxSetup() {
           onTxSettled?.(txHash);
         }
         setStatus({
-          type: "failed",
           txHash: txHash,
+          type: "failed",
         });
       }
     },
@@ -170,8 +163,8 @@ export function useTxSetup() {
   );
 
   return {
-    status,
-    setStatus,
     sendTx,
+    setStatus,
+    status,
   };
 }
diff --git a/apps/nebula/src/app/(app)/components/TransactionsSection/TransactionsSection.stories.tsx b/apps/nebula/src/app/(app)/components/TransactionsSection/TransactionsSection.stories.tsx
index f8ce96179f0..55334295858 100644
--- a/apps/nebula/src/app/(app)/components/TransactionsSection/TransactionsSection.stories.tsx
+++ b/apps/nebula/src/app/(app)/components/TransactionsSection/TransactionsSection.stories.tsx
@@ -1,12 +1,11 @@
-import { storybookThirdwebClient } from "@/storybook/utils";
 import type { Meta, StoryObj } from "@storybook/nextjs";
+import { storybookThirdwebClient } from "@/storybook/utils";
 import {
   TransactionSectionUI,
   type WalletTransaction,
 } from "./TransactionsSection";
 
 const meta = {
-  title: "Nebula/TransactionsSection",
   component: TransactionSectionUI,
   decorators: [
     (Story) => (
@@ -15,6 +14,7 @@ const meta = {
       </div>
     ),
   ],
+  title: "Nebula/TransactionsSection",
 } satisfies Meta<typeof TransactionSectionUI>;
 
 export default meta;
@@ -23,131 +23,131 @@ type Story = StoryObj<typeof meta>;
 const transactionsStub: WalletTransaction[] = [
   {
     chain_id: "8453",
-    hash: "0x2a098695dcfa32a67ec115af7c8da1ef6f443ea72baf7e49525204dd521a985e",
-    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
-    to_address: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
-    value: "0",
     decoded: {
-      name: "transfer",
-      signature: "transfer(address,uint256)",
       inputs: {
         to: "0x83dd93fa5d8343094f850f90b3fb90088c1bb425",
         value: "10000",
       },
+      name: "transfer",
+      signature: "transfer(address,uint256)",
     },
+    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
+    hash: "0x2a098695dcfa32a67ec115af7c8da1ef6f443ea72baf7e49525204dd521a985e",
+    to_address: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+    value: "0",
   },
   {
     chain_id: "8453",
-    hash: "0xc521bfa0ba3e68fa1a52c67f93a8e215d3ade0b45956ba215390bcc0576202f1",
-    value: "1000000000000000",
-    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
-    to_address: "0x83dd93fa5d8343094f850f90b3fb90088c1bb425",
     decoded: {
+      inputs: null,
       name: "",
       signature: "",
-      inputs: null,
     },
-  },
-  {
-    chain_id: "8453",
-    hash: "0xf2d92059c9ea425ccf7568bfe2589b3c7e45b108b5af658ec79c2f2d3723e410",
     from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
+    hash: "0xc521bfa0ba3e68fa1a52c67f93a8e215d3ade0b45956ba215390bcc0576202f1",
     to_address: "0x83dd93fa5d8343094f850f90b3fb90088c1bb425",
     value: "1000000000000000",
+  },
+  {
+    chain_id: "8453",
     decoded: {
+      inputs: null,
       name: "",
       signature: "",
-      inputs: null,
     },
+    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
+    hash: "0xf2d92059c9ea425ccf7568bfe2589b3c7e45b108b5af658ec79c2f2d3723e410",
+    to_address: "0x83dd93fa5d8343094f850f90b3fb90088c1bb425",
+    value: "1000000000000000",
   },
   {
     chain_id: "8453",
-    hash: "0xea3da430876c09acfa665450a91edb99fe8dc018864c5dfa3ac53bf265ce8d66",
-    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
-    to_address: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
-    value: "0",
     decoded: {
-      name: "transfer",
-      signature: "transfer(address,uint256)",
       inputs: {
         to: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
         value: "100000",
       },
+      name: "transfer",
+      signature: "transfer(address,uint256)",
     },
-  },
-  {
-    chain_id: "8453",
-    hash: "0xad03e5b350645f2e4cdd066c30b2f6b708aa34bd4d1c5ca20fd81ecfe1656164",
     from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
+    hash: "0xea3da430876c09acfa665450a91edb99fe8dc018864c5dfa3ac53bf265ce8d66",
     to_address: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
     value: "0",
+  },
+  {
+    chain_id: "8453",
     decoded: {
-      name: "approve",
-      signature: "approve(address,uint256)",
       inputs: {
         spender: "0xf8ab2dbe6c43bf1a856471182290f91d621ba76d",
         value: "10000000",
       },
+      name: "approve",
+      signature: "approve(address,uint256)",
     },
+    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
+    hash: "0xad03e5b350645f2e4cdd066c30b2f6b708aa34bd4d1c5ca20fd81ecfe1656164",
+    to_address: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+    value: "0",
   },
   {
     chain_id: "8453",
-    hash: "0xd3106aaa4b7e530ac7530c8ea4984eec52670aabaf5969ae6bc8d8246e74c3c0",
-    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
-    to_address: "0xf8ab2dbe6c43bf1a856471182290f91d621ba76d",
-    value: "0",
     decoded: {
+      inputs: {},
       name: "initiateTransaction",
       signature:
         "initiateTransaction((bytes32,address,uint256,address,address,uint256,address,uint256,bytes,bytes),bytes)",
-      inputs: {},
     },
+    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
+    hash: "0xd3106aaa4b7e530ac7530c8ea4984eec52670aabaf5969ae6bc8d8246e74c3c0",
+    to_address: "0xf8ab2dbe6c43bf1a856471182290f91d621ba76d",
+    value: "0",
   },
   {
     chain_id: "8453",
-    hash: "0xd284b6e0dd938b4610ff1877c1d4692a8d10d83ec6be24789dc87e1ef4aa4756",
-    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
-    to_address: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
-    value: "0",
     decoded: {
-      name: "approve",
-      signature: "approve(address,uint256)",
       inputs: {
         spender: "0xf8ab2dbe6c43bf1a856471182290f91d621ba76d",
         value: "1000000",
       },
+      name: "approve",
+      signature: "approve(address,uint256)",
     },
+    from_address: "0x1f846f6dae38e1c88d71eaa191760b15f38b7a37",
+    hash: "0xd284b6e0dd938b4610ff1877c1d4692a8d10d83ec6be24789dc87e1ef4aa4756",
+    to_address: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+    value: "0",
   },
 ];
 
 export const MultipleAssets: Story = {
   args: {
+    client: storybookThirdwebClient,
     data: transactionsStub,
     isPending: false,
-    client: storybookThirdwebClient,
   },
 };
 
 export const SingleAsset: Story = {
   args: {
+    client: storybookThirdwebClient,
     data: transactionsStub.slice(0, 1),
     isPending: false,
-    client: storybookThirdwebClient,
   },
 };
 
 export const EmptyAssets: Story = {
   args: {
+    client: storybookThirdwebClient,
     data: [],
     isPending: false,
-    client: storybookThirdwebClient,
   },
 };
 
 export const Loading: Story = {
   args: {
+    client: storybookThirdwebClient,
     data: [],
     isPending: true,
-    client: storybookThirdwebClient,
   },
 };
diff --git a/apps/nebula/src/app/(app)/components/TransactionsSection/TransactionsSection.tsx b/apps/nebula/src/app/(app)/components/TransactionsSection/TransactionsSection.tsx
index fa94394cecd..8ebc59832fc 100644
--- a/apps/nebula/src/app/(app)/components/TransactionsSection/TransactionsSection.tsx
+++ b/apps/nebula/src/app/(app)/components/TransactionsSection/TransactionsSection.tsx
@@ -1,14 +1,14 @@
-import { ChainIconClient } from "@/components/blocks/ChainIcon";
-import { Skeleton } from "@/components/ui/skeleton";
-import { isProd } from "@/constants/env-utils";
-import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
-import { useAllChainsData } from "@/hooks/chains";
 import { useQuery } from "@tanstack/react-query";
 import { XIcon } from "lucide-react";
 import Link from "next/link";
 import type { ThirdwebClient } from "thirdweb";
 import { useActiveAccount, useActiveWalletChain } from "thirdweb/react";
 import { shortenAddress } from "thirdweb/utils";
+import { ChainIconClient } from "@/components/blocks/ChainIcon";
+import { Skeleton } from "@/components/ui/skeleton";
+import { isProd } from "@/constants/env-utils";
+import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
+import { useAllChainsData } from "@/hooks/chains";
 
 // Note: this is not the full object type returned from insight API, it only includes fields we care about
 export type WalletTransaction = {
@@ -45,15 +45,15 @@ export function TransactionSectionUI(props: {
       {!props.isPending &&
         props.data.map((asset) => (
           <TransactionInfo
+            client={props.client}
             key={asset.hash}
             transaction={asset}
-            client={props.client}
           />
         ))}
 
       {props.isPending &&
         new Array(10).fill(null).map((_, index) => (
-          // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+          // biome-ignore lint/suspicious/noArrayIndexKey: TODO
           <SkeletonAssetItem key={index} />
         ))}
     </div>
@@ -87,16 +87,16 @@ function TransactionInfo(props: {
   return (
     <div className="relative flex h-[48px] items-center gap-2.5 rounded-lg px-2 py-1 hover:bg-accent">
       <ChainIconClient
-        client={props.client}
         className="size-8 rounded-full border"
+        client={props.client}
         src={chainMeta?.icon?.url || ""}
       />
 
       <div className="flex min-w-0 flex-col text-sm">
         <Link
+          className="truncate font-medium capitalize before:absolute before:inset-0"
           href={`${explorer}/tx/${props.transaction.hash}`}
           target="_blank"
-          className="truncate font-medium capitalize before:absolute before:inset-0"
         >
           {title}
         </Link>
@@ -151,14 +151,12 @@ function getTransactionDescription(transaction: WalletTransaction) {
   return `To: ${shortenAddress(transaction.to_address)}`;
 }
 
-export function TransactionsSection(props: {
-  client: ThirdwebClient;
-}) {
+export function TransactionsSection(props: { client: ThirdwebClient }) {
   const account = useActiveAccount();
   const activeChain = useActiveWalletChain();
 
   const txQuery = useQuery({
-    queryKey: ["v1/wallets/transactions", account?.address, activeChain?.id],
+    enabled: !!account && !!activeChain,
     queryFn: async () => {
       if (!account || !activeChain) {
         return [];
@@ -191,15 +189,15 @@ export function TransactionsSection(props: {
 
       return json.data ?? [];
     },
+    queryKey: ["v1/wallets/transactions", account?.address, activeChain?.id],
     retry: false,
-    enabled: !!account && !!activeChain,
   });
 
   return (
     <TransactionSectionUI
+      client={props.client}
       data={txQuery.data ?? []}
       isPending={txQuery.isPending}
-      client={props.client}
     />
   );
 }
diff --git a/apps/nebula/src/app/(app)/data/examplePrompts.ts b/apps/nebula/src/app/(app)/data/examplePrompts.ts
index 951ea5a8098..34b95f66064 100644
--- a/apps/nebula/src/app/(app)/data/examplePrompts.ts
+++ b/apps/nebula/src/app/(app)/data/examplePrompts.ts
@@ -82,27 +82,27 @@ Great! How much ETH and to what address?
 
 export const examplePrompts: ExamplePrompt[] = [
   {
-    title: "What can Nebula do?",
-    message: "Tell me about Nebula's capabilities.",
     interceptedReply: whatCanNebulaDoReply,
+    message: "Tell me about Nebula's capabilities.",
+    title: "What can Nebula do?",
   },
   {
-    title: "Launch a Token",
-    message: "I'd like to deploy a token.",
     interceptedReply: deployTokenReply,
+    message: "I'd like to deploy a token.",
+    title: "Launch a Token",
   },
   {
-    title: "Buy USDC",
-    message: "I want to buy USDC",
     interceptedReply: buyUsdcReply,
+    message: "I want to buy USDC",
+    title: "Buy USDC",
   },
   {
-    title: "Analyze the Uniswap contracts",
     message: "Analyze the Uniswap v3 contracts on Ethereum",
+    title: "Analyze the Uniswap contracts",
   },
   {
-    title: "Send ETH to someone",
-    message: "I want to send some ETH",
     interceptedReply: transferEthReply,
+    message: "I want to send some ETH",
+    title: "Send ETH to someone",
   },
 ];
diff --git a/apps/nebula/src/app/(app)/layout.tsx b/apps/nebula/src/app/(app)/layout.tsx
index d0fa7ddf0a0..8a5398c1132 100644
--- a/apps/nebula/src/app/(app)/layout.tsx
+++ b/apps/nebula/src/app/(app)/layout.tsx
@@ -1,12 +1,10 @@
+import type React from "react";
 import { getNebulaLoginStatus } from "@/utils/isLoggedIntoNebula";
 import { loginRedirect } from "@/utils/loginRedirect";
-import type React from "react";
 import { getSessions } from "./api/session";
 import { ChatPageLayout } from "./components/ChatPageLayout";
 
-export default async function Layout(props: {
-  children: React.ReactNode;
-}) {
+export default async function Layout(props: { children: React.ReactNode }) {
   const loginStatus = await getNebulaLoginStatus();
 
   if (!loginStatus.isLoggedIn) {
diff --git a/apps/nebula/src/app/(app)/page.tsx b/apps/nebula/src/app/(app)/page.tsx
index 3853d42b51f..37d16ad0f1e 100644
--- a/apps/nebula/src/app/(app)/page.tsx
+++ b/apps/nebula/src/app/(app)/page.tsx
@@ -30,12 +30,12 @@ export default async function Page(props: {
       accountAddress={accountAddress}
       authToken={authToken}
       client={nebulaAppThirdwebClient}
-      session={undefined}
-      type="landing"
       initialParams={{
-        q: typeof searchParams.q === "string" ? searchParams.q : undefined,
         chainIds: chains.map((c) => c.chainId),
+        q: typeof searchParams.q === "string" ? searchParams.q : undefined,
       }}
+      session={undefined}
+      type="landing"
     />
   );
 }
diff --git a/apps/nebula/src/app/(app)/utils/getChainIds.ts b/apps/nebula/src/app/(app)/utils/getChainIds.ts
index 8f24f6c8810..a03e1eef451 100644
--- a/apps/nebula/src/app/(app)/utils/getChainIds.ts
+++ b/apps/nebula/src/app/(app)/utils/getChainIds.ts
@@ -1,6 +1,6 @@
-import { fetchChain } from "@/utils/fetchChain";
 import { unstable_cache } from "next/cache";
 import type { ChainMetadata } from "thirdweb/chains";
+import { fetchChain } from "@/utils/fetchChain";
 
 export const getChainsForNebula = unstable_cache(
   async (chainNamesOrIds: string[] | string | undefined) => {
diff --git a/apps/nebula/src/app/layout.tsx b/apps/nebula/src/app/layout.tsx
index a3a2fb01ddf..6683c961c73 100644
--- a/apps/nebula/src/app/layout.tsx
+++ b/apps/nebula/src/app/layout.tsx
@@ -1,9 +1,9 @@
 import type { Metadata } from "next";
 import "../global.css";
-import { DashboardRouterTopProgressBar } from "@/lib/DashboardRouter";
-import { cn } from "@/lib/utils";
 import { Inter } from "next/font/google";
 import NextTopLoader from "nextjs-toploader";
+import { DashboardRouterTopProgressBar } from "@/lib/DashboardRouter";
+import { cn } from "@/lib/utils";
 import { NebulaProviders } from "./providers";
 
 const title =
@@ -12,27 +12,25 @@ const description =
   "The most powerful AI for interacting with the blockchain, with real-time access to EVM chains and their data";
 
 export const metadata: Metadata = {
-  title,
   description,
   openGraph: {
-    title,
     description,
+    title,
   },
+  title,
 };
 
 const fontSans = Inter({
+  display: "swap",
   subsets: ["latin"],
   variable: "--font-sans",
-  display: "swap",
 });
 
-export default function Layout(props: {
-  children: React.ReactNode;
-}) {
+export default function Layout(props: { children: React.ReactNode }) {
   return (
     <html lang="en" suppressHydrationWarning>
       <head>
-        <link rel="icon" href="/assets/nebula/favicon.ico" />
+        <link href="/assets/nebula/favicon.ico" rel="icon" />
       </head>
       <body
         className={cn("bg-background font-sans antialiased", fontSans.variable)}
diff --git a/apps/nebula/src/app/login/NebulaConnectEmbedLogin.tsx b/apps/nebula/src/app/login/NebulaConnectEmbedLogin.tsx
index 445bf5aadb1..0f2a28ec4dd 100644
--- a/apps/nebula/src/app/login/NebulaConnectEmbedLogin.tsx
+++ b/apps/nebula/src/app/login/NebulaConnectEmbedLogin.tsx
@@ -1,14 +1,5 @@
 "use client";
 
-import { ClientOnly } from "@/components/blocks/client-only";
-import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { nebulaAAOptions } from "@/config/nebula-aa";
-import { getSDKTheme } from "@/config/sdk-component-theme";
-import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
-import { NEXT_PUBLIC_TURNSTILE_SITE_KEY } from "@/constants/public-envs";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { isVercel } from "@/utils/vercel-utils";
 import { Turnstile } from "@marsidev/react-turnstile";
 import { useTheme } from "next-themes";
 import { useEffect, useState } from "react";
@@ -19,6 +10,15 @@ import {
   useActiveWalletConnectionStatus,
 } from "thirdweb/react";
 import { createWallet, inAppWallet } from "thirdweb/wallets";
+import { ClientOnly } from "@/components/blocks/client-only";
+import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { nebulaAAOptions } from "@/config/nebula-aa";
+import { getSDKTheme } from "@/config/sdk-component-theme";
+import { nebulaAppThirdwebClient } from "@/constants/nebula-client";
+import { NEXT_PUBLIC_TURNSTILE_SITE_KEY } from "@/constants/public-envs";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { isVercel } from "@/utils/vercel-utils";
 import {
   doNebulaLogin,
   doNebulaLogout,
@@ -26,9 +26,7 @@ import {
   isNebulaLoggedIn,
 } from "./auth-actions";
 
-export function NebulaLoginPage(props: {
-  redirectPath: string;
-}) {
+export function NebulaLoginPage(props: { redirectPath: string }) {
   return (
     <main className="container z-10 flex grow flex-col items-center justify-center gap-6 py-12">
       <NebulaLoginPageContent {...props} />
@@ -57,9 +55,7 @@ const loginOptions = [
   createWallet("io.zerion.wallet"),
 ];
 
-function NebulaLoginPageContent(props: {
-  redirectPath: string;
-}) {
+function NebulaLoginPageContent(props: { redirectPath: string }) {
   const accountAddress = useActiveAccount()?.address;
   const [screen, setScreen] = useState<
     | { id: "login" }
@@ -102,12 +98,12 @@ function NebulaLoginPageContent(props: {
     !accountAddress
   ) {
     return (
-      <CustomConnectEmbed onLogin={onLogin} client={nebulaAppThirdwebClient} />
+      <CustomConnectEmbed client={nebulaAppThirdwebClient} onLogin={onLogin} />
     );
   }
 
   return (
-    <CustomConnectEmbed onLogin={onLogin} client={nebulaAppThirdwebClient} />
+    <CustomConnectEmbed client={nebulaAppThirdwebClient} onLogin={onLogin} />
   );
 }
 
@@ -124,6 +120,7 @@ function CustomConnectEmbed(props: {
   return (
     <div className="flex flex-col items-center gap-4">
       <Turnstile
+        onSuccess={(token) => setTurnstileToken(token)}
         options={{
           // only show if interaction is required
           appearance: alwaysShowTurnstile ? "always" : "interaction-only",
@@ -131,12 +128,11 @@ function CustomConnectEmbed(props: {
           theme: theme === "light" ? "light" : "dark",
         }}
         siteKey={NEXT_PUBLIC_TURNSTILE_SITE_KEY}
-        onSuccess={(token) => setTurnstileToken(token)}
       />
       <ClientOnly ssr={<ConnectEmbedSizedLoadingCard />}>
         <ConnectEmbed
+          accountAbstraction={nebulaAAOptions}
           auth={{
-            getLoginPayload: getNebulaLoginPayload,
             doLogin: async (loginPayload) => {
               if (isVercel() && !turnstileToken) {
                 setAlwaysShowTurnstile(true);
@@ -145,9 +141,9 @@ function CustomConnectEmbed(props: {
 
               try {
                 const result = await doNebulaLogin({
-                  type: "nebula-app",
                   loginPayload: loginPayload,
                   turnstileToken,
+                  type: "nebula-app",
                 });
                 if (result.error) {
                   console.error(
@@ -164,6 +160,7 @@ function CustomConnectEmbed(props: {
               }
             },
             doLogout: doNebulaLogout,
+            getLoginPayload: getNebulaLoginPayload,
             isLoggedIn: async (x) => {
               const isLoggedInResult = await isNebulaLoggedIn(x);
               if (isLoggedInResult) {
@@ -172,23 +169,20 @@ function CustomConnectEmbed(props: {
               return isLoggedInResult;
             },
           }}
-          wallets={loginOptions}
+          className="shadow-lg"
           client={props.client}
           modalSize="wide"
-          theme={getSDKTheme(theme === "light" ? "light" : "dark")}
-          className="shadow-lg"
           privacyPolicyUrl="/privacy-policy"
           termsOfServiceUrl="/terms"
-          accountAbstraction={nebulaAAOptions}
+          theme={getSDKTheme(theme === "light" ? "light" : "dark")}
+          wallets={loginOptions}
         />
       </ClientOnly>
     </div>
   );
 }
 
-function ConnectEmbedSizedCard(props: {
-  children: React.ReactNode;
-}) {
+function ConnectEmbedSizedCard(props: { children: React.ReactNode }) {
   return (
     <div className="flex min-h-[522px] w-full items-center justify-center rounded-xl border border-border bg-card shadow-lg max-sm:max-w-[358px] lg:min-h-[568px] lg:w-[728px]">
       {props.children}
diff --git a/apps/nebula/src/app/login/NebulaLoginPage.tsx b/apps/nebula/src/app/login/NebulaLoginPage.tsx
index 406b00dd7e5..31876579a9c 100644
--- a/apps/nebula/src/app/login/NebulaLoginPage.tsx
+++ b/apps/nebula/src/app/login/NebulaLoginPage.tsx
@@ -1,10 +1,10 @@
 "use client";
 
+import Link from "next/link";
+import { useState } from "react";
 import { ToggleThemeButton } from "@/components/color-mode-toggle";
 import { Button } from "@/components/ui/button";
 import { NebulaIcon } from "@/icons/NebulaIcon";
-import Link from "next/link";
-import { useState } from "react";
 import { EmptyStateChatPageContent } from "../(app)/components/EmptyStateChatPageContent";
 import { NebulaLoginPage } from "./NebulaConnectEmbedLogin";
 
@@ -57,23 +57,23 @@ export function NebulaLoggedOutStatePage(props: {
             <ToggleThemeButton />
 
             <Link
-              href="https://thirdweb.com/support"
               className="hidden text-muted-foreground text-sm hover:text-foreground lg:block"
+              href="https://thirdweb.com/support"
               target="_blank"
             >
               Support
             </Link>
 
             <Link
-              href="https://portal.thirdweb.com/"
               className="hidden text-muted-foreground text-sm hover:text-foreground lg:block"
+              href="https://portal.thirdweb.com/"
               target="_blank"
             >
               Docs
             </Link>
 
             {showPage === "welcome" && (
-              <Button size="sm" onClick={() => setShowPage("connect")}>
+              <Button onClick={() => setShowPage("connect")} size="sm">
                 Sign in
               </Button>
             )}
@@ -88,25 +88,18 @@ export function NebulaLoggedOutStatePage(props: {
       {showPage === "welcome" && (
         <div className="container relative flex max-w-[800px] grow flex-col justify-center overflow-hidden rounded-lg pb-6">
           <EmptyStateChatPageContent
-            showAurora={false}
             allowImageUpload={false}
-            isConnectingWallet={false}
-            onLoginClick={() => {
-              setShowPage("connect");
-            }}
-            prefillMessage={props.params.q}
+            connectedWallets={[]}
             context={{
-              walletAddress: null,
               chainIds: chainIds.map((x) => x.toString()),
               networks: null,
+              walletAddress: null,
             }}
-            setContext={(v) => {
-              if (v?.chainIds) {
-                setChainIds(v.chainIds.map(Number));
-              }
+            isConnectingWallet={false}
+            onLoginClick={() => {
+              setShowPage("connect");
             }}
-            connectedWallets={[]}
-            setActiveWallet={() => {}}
+            prefillMessage={props.params.q}
             sendMessage={(msg) => {
               const textMessage = msg.content.find((x) => x.type === "text");
               if (textMessage) {
@@ -114,6 +107,13 @@ export function NebulaLoggedOutStatePage(props: {
               }
               setShowPage("connect");
             }}
+            setActiveWallet={() => {}}
+            setContext={(v) => {
+              if (v?.chainIds) {
+                setChainIds(v.chainIds.map(Number));
+              }
+            }}
+            showAurora={false}
           />
         </div>
       )}
diff --git a/apps/nebula/src/app/login/auth-actions.ts b/apps/nebula/src/app/login/auth-actions.ts
index 250ef706890..94547c91765 100644
--- a/apps/nebula/src/app/login/auth-actions.ts
+++ b/apps/nebula/src/app/login/auth-actions.ts
@@ -1,6 +1,13 @@
 "use server";
 import "server-only";
 
+import { cookies } from "next/headers";
+import { getAddress } from "thirdweb";
+import type {
+  GenerateLoginPayloadParams,
+  LoginPayload,
+  VerifyLoginPayloadParams,
+} from "thirdweb/auth";
 import {
   NEBULA_COOKIE_ACTIVE_ACCOUNT,
   NEBULA_COOKIE_PREFIX_TOKEN,
@@ -9,13 +16,6 @@ import { NEXT_PUBLIC_NEBULA_URL } from "@/constants/public-envs";
 import { NEBULA_APP_SECRET_KEY } from "@/constants/server-envs";
 import { isVercel } from "@/utils/vercel-utils";
 import { verifyTurnstileToken } from "@/utils/verifyTurnstileToken";
-import { cookies } from "next/headers";
-import { getAddress } from "thirdweb";
-import type {
-  GenerateLoginPayloadParams,
-  LoginPayload,
-  VerifyLoginPayloadParams,
-} from "thirdweb/auth";
 
 const FOURTEEN_DAYS_IN_SECONDS = 14 * 24 * 60 * 60;
 
@@ -23,15 +23,15 @@ export async function getNebulaLoginPayload(
   params: GenerateLoginPayloadParams,
 ): Promise<LoginPayload> {
   const res = await fetch(`${NEXT_PUBLIC_NEBULA_URL}/auth/delegate/payload`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      "X-Secret-Key": NEBULA_APP_SECRET_KEY,
-    },
     body: JSON.stringify({
       address: params.address,
       chain_id: params.chainId?.toString(),
     }),
+    headers: {
+      "Content-Type": "application/json",
+      "X-Secret-Key": NEBULA_APP_SECRET_KEY,
+    },
+    method: "POST",
   });
 
   if (!res.ok) {
@@ -68,8 +68,8 @@ export async function doNebulaLogin(
     const result = await verifyTurnstileToken(params.turnstileToken);
     if (!result.success) {
       return {
-        error: "Invalid captcha. Please try again.",
         context: result.context,
+        error: "Invalid captcha. Please try again.",
       };
     }
   }
@@ -78,12 +78,12 @@ export async function doNebulaLogin(
 
   // forward the request to the API server
   const res = await fetch(`${NEXT_PUBLIC_NEBULA_URL}/auth/delegate/login`, {
-    method: "POST",
+    body: JSON.stringify(params.loginPayload),
     headers: {
       "Content-Type": "application/json",
       "X-Secret-Key": NEBULA_APP_SECRET_KEY,
     },
-    body: JSON.stringify(params.loginPayload),
+    method: "POST",
   });
 
   // if the request failed, log the error and throw an error
@@ -145,9 +145,9 @@ export async function doNebulaLogin(
     jwt,
     {
       httpOnly: true,
-      secure: true,
-      sameSite: "strict",
       maxAge: FOURTEEN_DAYS_IN_SECONDS,
+      sameSite: "strict",
+      secure: true,
     },
   );
 
@@ -157,9 +157,9 @@ export async function doNebulaLogin(
     getAddress(params.loginPayload.payload.address),
     {
       httpOnly: true,
-      secure: true,
-      sameSite: "strict",
       maxAge: FOURTEEN_DAYS_IN_SECONDS,
+      sameSite: "strict",
+      secure: true,
     },
   );
 
@@ -192,11 +192,11 @@ export async function isNebulaLoggedIn(address: string) {
   }
 
   const res = await fetch(`${NEXT_PUBLIC_NEBULA_URL}/auth/verify`, {
-    method: "GET",
     headers: {
-      "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
     },
+    method: "GET",
   });
 
   if (!res.ok) {
@@ -222,9 +222,9 @@ export async function isNebulaLoggedIn(address: string) {
   // set the active account cookie again
   cookieStore.set(NEBULA_COOKIE_ACTIVE_ACCOUNT, getAddress(address), {
     httpOnly: false,
-    secure: true,
-    sameSite: "strict",
     maxAge: FOURTEEN_DAYS_IN_SECONDS,
+    sameSite: "strict",
+    secure: true,
   });
   return true;
 }
diff --git a/apps/nebula/src/app/login/page.tsx b/apps/nebula/src/app/login/page.tsx
index 62f378e2d4d..098cb71a61d 100644
--- a/apps/nebula/src/app/login/page.tsx
+++ b/apps/nebula/src/app/login/page.tsx
@@ -17,8 +17,8 @@ export default async function NebulaLogin(props: {
       hasAuthToken={!!authToken}
       params={{
         chains: chains.map((c) => ({
-          slug: c.slug,
           id: c.chainId,
+          slug: c.slug,
         })),
         q: typeof searchParams.q === "string" ? searchParams.q : undefined,
       }}
diff --git a/apps/nebula/src/app/move-funds/connect-button.tsx b/apps/nebula/src/app/move-funds/connect-button.tsx
index 87e0626d67a..5a1343f2948 100644
--- a/apps/nebula/src/app/move-funds/connect-button.tsx
+++ b/apps/nebula/src/app/move-funds/connect-button.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { nebulaAAOptions } from "@/config/nebula-aa";
-import { getSDKTheme } from "@/config/sdk-component-theme";
 import { useTheme } from "next-themes";
 import { ConnectButton } from "thirdweb/react";
 import { inAppWallet } from "thirdweb/wallets";
+import { nebulaAAOptions } from "@/config/nebula-aa";
+import { getSDKTheme } from "@/config/sdk-component-theme";
 import { getClientDashboardThirdwebClient } from "./dashboard-client";
 
 // use dashboard client to allow users to connect to their original wallet and move funds to a different wallet
@@ -36,10 +36,8 @@ export function MoveFundsConnectButton(props: {
 
   return (
     <ConnectButton
-      wallets={loginOptions}
-      client={dashboardClient}
-      theme={getSDKTheme(theme === "light" ? "light" : "dark")}
       accountAbstraction={nebulaAAOptions}
+      client={dashboardClient}
       connectButton={{
         className: props.btnClassName,
         label: props.connectLabel,
@@ -47,6 +45,8 @@ export function MoveFundsConnectButton(props: {
       detailsButton={{
         className: props.btnClassName,
       }}
+      theme={getSDKTheme(theme === "light" ? "light" : "dark")}
+      wallets={loginOptions}
     />
   );
 }
diff --git a/apps/nebula/src/app/move-funds/dashboard-client.ts b/apps/nebula/src/app/move-funds/dashboard-client.ts
index 4a8909f718a..0d5eeaab9b5 100644
--- a/apps/nebula/src/app/move-funds/dashboard-client.ts
+++ b/apps/nebula/src/app/move-funds/dashboard-client.ts
@@ -1,3 +1,5 @@
+import { createThirdwebClient, type ThirdwebClient } from "thirdweb";
+import { setThirdwebDomains } from "thirdweb/utils";
 import {
   NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
   NEXT_PUBLIC_IPFS_GATEWAY_URL,
@@ -13,21 +15,19 @@ import {
   THIRDWEB_STORAGE_DOMAIN,
 } from "@/constants/urls";
 import { getVercelEnv } from "@/utils/vercel-utils";
-import { type ThirdwebClient, createThirdwebClient } from "thirdweb";
-import { setThirdwebDomains } from "thirdweb/utils";
 
 export function getClientDashboardThirdwebClient(): ThirdwebClient {
   if (getVercelEnv() !== "production") {
     // if not on production: run this when creating a client to set the domains
     setThirdwebDomains({
-      rpc: THIRDWEB_RPC_DOMAIN,
+      bridge: THIRDWEB_BRIDGE_URL,
+      bundler: THIRDWEB_BUNDLER_DOMAIN,
       inAppWallet: THIRDWEB_INAPP_WALLET_DOMAIN,
+      insight: THIRDWEB_INSIGHT_API_DOMAIN,
       pay: THIRDWEB_PAY_DOMAIN,
-      storage: THIRDWEB_STORAGE_DOMAIN,
+      rpc: THIRDWEB_RPC_DOMAIN,
       social: THIRDWEB_SOCIAL_API_DOMAIN,
-      bundler: THIRDWEB_BUNDLER_DOMAIN,
-      insight: THIRDWEB_INSIGHT_API_DOMAIN,
-      bridge: THIRDWEB_BRIDGE_URL,
+      storage: THIRDWEB_STORAGE_DOMAIN,
     });
   }
 
diff --git a/apps/nebula/src/app/move-funds/move-funds.tsx b/apps/nebula/src/app/move-funds/move-funds.tsx
index 53884e6a7b4..fc54a18ee56 100644
--- a/apps/nebula/src/app/move-funds/move-funds.tsx
+++ b/apps/nebula/src/app/move-funds/move-funds.tsx
@@ -1,37 +1,4 @@
 "use client";
-import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { TransactionButton } from "@/components/blocks/buttons/TransactionButton";
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Button } from "@/components/ui/button";
-import { DecimalInput } from "@/components/ui/decimal-input";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import { Skeleton } from "@/components/ui/skeleton";
-import { TabButtons } from "@/components/ui/tabs";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { isProd } from "@/constants/env-utils";
-import { cn } from "@/lib/utils";
-import { parseError } from "@/utils/parse-error";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import {
@@ -47,11 +14,11 @@ import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import {
   type Chain,
-  NATIVE_TOKEN_ADDRESS,
   defineChain,
   getAddress,
   getContract,
   isAddress,
+  NATIVE_TOKEN_ADDRESS,
   prepareTransaction,
   toWei,
 } from "thirdweb";
@@ -63,9 +30,6 @@ import {
   Blobbie,
   TokenIcon,
   TokenProvider,
-  WalletIcon,
-  WalletName,
-  WalletProvider,
   useActiveAccount,
   useActiveWallet,
   useActiveWalletChain,
@@ -74,10 +38,46 @@ import {
   useSendBatchTransaction,
   useSetActiveWallet,
   useWalletBalance,
+  WalletIcon,
+  WalletName,
+  WalletProvider,
 } from "thirdweb/react";
 import { shortenAddress, toTokens } from "thirdweb/utils";
-import { type Account, type Wallet, getWalletBalance } from "thirdweb/wallets";
+import { type Account, getWalletBalance, type Wallet } from "thirdweb/wallets";
 import { z } from "zod";
+import { TransactionButton } from "@/components/blocks/buttons/TransactionButton";
+import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
+import { Button } from "@/components/ui/button";
+import { DecimalInput } from "@/components/ui/decimal-input";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { Skeleton } from "@/components/ui/skeleton";
+import { TabButtons } from "@/components/ui/tabs";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { isProd } from "@/constants/env-utils";
+import { cn } from "@/lib/utils";
+import { parseError } from "@/utils/parse-error";
 import { MoveFundsConnectButton } from "./connect-button";
 import { getClientDashboardThirdwebClient } from "./dashboard-client";
 
@@ -138,10 +138,7 @@ export function MoveFundsPage() {
   );
 }
 
-function WalletDetails(props: {
-  wallet: Wallet;
-  account: Account;
-}) {
+function WalletDetails(props: { wallet: Wallet; account: Account }) {
   const accountBlobbie = <AccountBlobbie className="size-8 rounded-full" />;
   const accountAvatarFallback = (
     <WalletIcon
@@ -183,37 +180,34 @@ function WalletDetails(props: {
 
 const formSchema = z.object({
   chainId: z.number(),
+  receiverAddress: z.string().refine((val) => {
+    if (isAddress(val)) {
+      return true;
+    }
+    return false;
+  }, "Invalid address"),
   tokens: z.array(
     z.object({
+      amount: z.string().refine((val) => {
+        const amount = Number.parseFloat(val);
+        return !Number.isNaN(amount) && amount > 0;
+      }, "Amount must be a positive number"),
       token: z
         .object({
-          token_address: z.string(),
           balance: z.string(),
+          decimals: z.number(),
           name: z.string(),
           symbol: z.string(),
-          decimals: z.number(),
+          token_address: z.string(),
         })
         .nullable(),
-      amount: z.string().refine((val) => {
-        const amount = Number.parseFloat(val);
-        return !Number.isNaN(amount) && amount > 0;
-      }, "Amount must be a positive number"),
     }),
   ),
-  receiverAddress: z.string().refine((val) => {
-    if (isAddress(val)) {
-      return true;
-    }
-    return false;
-  }, "Invalid address"),
 });
 
 type FormValues = z.infer<typeof formSchema>;
 
-function SendFunds(props: {
-  accountAddress: string;
-  initialChainId: number;
-}) {
+function SendFunds(props: { accountAddress: string; initialChainId: number }) {
   const activeWallet = useActiveWallet();
   const activeAccount = useActiveAccount();
   const setActiveWallet = useSetActiveWallet();
@@ -230,12 +224,12 @@ function SendFunds(props: {
   const sendAndConfirmTransaction = useSendAndConfirmTransaction();
 
   const form = useForm<FormValues>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
       chainId: props.initialChainId,
-      tokens: [{ token: null, amount: "" }],
       receiverAddress: "",
+      tokens: [{ amount: "", token: null }],
     },
+    resolver: zodResolver(formSchema),
   });
 
   function getTokenTransferTransaction(params: {
@@ -265,9 +259,9 @@ function SendFunds(props: {
     });
 
     return transfer({
-      to: receiverAddress,
       amount: amount,
       contract: erc20Contract,
+      to: receiverAddress,
     });
   }
 
@@ -281,23 +275,23 @@ function SendFunds(props: {
 
     const transactions = tokens.map(({ token, amount }) => {
       return getTokenTransferTransaction({
-        token,
         amount,
         chain,
         receiverAddress,
+        token,
       });
     });
 
     const txPromise = sendBatchTransactions.mutateAsync(transactions);
     toast.promise(txPromise, {
-      loading: `Sending ${tokens.length} tokens`,
-      success: `${tokens.length} tokens sent successfully`,
       error: (result) => {
         return {
-          message: "Failed to send tokens. Please try again",
           description: parseError(result),
+          message: "Failed to send tokens. Please try again",
         };
       },
+      loading: `Sending ${tokens.length} tokens`,
+      success: `${tokens.length} tokens sent successfully`,
     });
 
     await txPromise;
@@ -315,23 +309,23 @@ function SendFunds(props: {
     for (const { token, amount } of tokens.values()) {
       try {
         const tx = getTokenTransferTransaction({
-          token,
           amount,
           chain,
           receiverAddress,
+          token,
         });
 
         const txPromise = sendAndConfirmTransaction.mutateAsync(tx);
 
         toast.promise(txPromise, {
-          loading: `Sending Token ${token.name}`,
-          success: `${token.name} sent successfully`,
           error: (result) => {
             return {
-              message: `Failed to send ${token.name}. Please try again`,
               description: parseError(result),
+              message: `Failed to send ${token.name}. Please try again`,
             };
           },
+          loading: `Sending Token ${token.name}`,
+          success: `${token.name} sent successfully`,
         });
 
         await txPromise;
@@ -377,17 +371,17 @@ function SendFunds(props: {
     try {
       if (activeAccount.sendBatchTransaction) {
         await handleBatchSubmit({
-          tokens: validTokens,
-          chain,
           activeAccount,
+          chain,
           receiverAddress: values.receiverAddress,
+          tokens: validTokens,
         });
       } else {
         await handleSingleSubmit({
-          tokens: validTokens,
-          chain,
           activeAccount,
+          chain,
           receiverAddress: values.receiverAddress,
+          tokens: validTokens,
         });
       }
     } catch {
@@ -406,20 +400,20 @@ function SendFunds(props: {
     <div className="rounded-xl border bg-card">
       <Form {...form}>
         <form
-          onSubmit={form.handleSubmit(handleSubmit)}
           className="space-y-3 p-4"
+          onSubmit={form.handleSubmit(handleSubmit)}
         >
           <div className="space-y-1.5">
             <Label>Wallet</Label>
             <Select
-              value={activeWallet?.id}
               onValueChange={(value) => {
                 const wallet = connectedWallets.find((w) => w.id === value);
                 if (wallet) {
                   setActiveWallet(wallet);
-                  form.setValue("tokens", [{ token: null, amount: "" }]);
+                  form.setValue("tokens", [{ amount: "", token: null }]);
                 }
               }}
+              value={activeWallet?.id}
             >
               <SelectTrigger className="h-auto">
                 <SelectValue placeholder="Select Wallet" />
@@ -430,7 +424,7 @@ function SendFunds(props: {
                   if (!account) return null;
                   return (
                     <SelectItem key={wallet.id} value={wallet.id}>
-                      <WalletDetails wallet={wallet} account={account} />
+                      <WalletDetails account={account} wallet={wallet} />
                     </SelectItem>
                   );
                 })}
@@ -446,14 +440,14 @@ function SendFunds(props: {
                 <FormLabel>Chain</FormLabel>
                 <FormControl>
                   <SingleNetworkSelector
-                    client={dashboardClient}
                     chainId={field.value}
+                    className="bg-background"
+                    client={dashboardClient}
                     disableChainId
                     onChange={(chain) => {
                       field.onChange(chain);
-                      form.setValue("tokens", [{ token: null, amount: "" }]);
+                      form.setValue("tokens", [{ amount: "", token: null }]);
                     }}
-                    className="bg-background"
                   />
                 </FormControl>
                 <FormMessage />
@@ -480,9 +474,9 @@ function SendFunds(props: {
                             <div className="relative w-full">
                               <DecimalInput
                                 className="truncate bg-background pr-14"
-                                value={field.value}
-                                placeholder="0.0"
                                 onChange={field.onChange}
+                                placeholder="0.0"
+                                value={field.value}
                               />
                               <div className="-translate-y-1/2 absolute top-1/2 right-3 text-muted-foreground text-sm">
                                 {
@@ -506,12 +500,12 @@ function SendFunds(props: {
                           <FormLabel className="text-xs">Token</FormLabel>
                           <FormControl>
                             <TokenSelectorPopover
-                              token={field.value}
-                              chainId={form.getValues("chainId")}
                               accountAddress={props.accountAddress}
+                              chainId={form.getValues("chainId")}
                               setToken={(token) => {
                                 field.onChange(token);
                               }}
+                              token={field.value}
                             />
                           </FormControl>
                           <FormMessage />
@@ -522,8 +516,6 @@ function SendFunds(props: {
                     {form.watch("tokens").length > 1 && (
                       <ToolTipLabel label="Remove">
                         <Button
-                          type="button"
-                          variant="outline"
                           className="mt-7 h-[38px] w-[38px] bg-background p-0"
                           onClick={() => {
                             const currentTokens = form.getValues("tokens");
@@ -532,6 +524,8 @@ function SendFunds(props: {
                               currentTokens.filter((_, i) => i !== index),
                             );
                           }}
+                          type="button"
+                          variant="outline"
                         >
                           <TrashIcon className="size-4" />
                         </Button>
@@ -544,11 +538,11 @@ function SendFunds(props: {
                       Balance:{" "}
                       <RenderTokenBalance
                         accountAddress={props.accountAddress}
+                        chainId={form.getValues("chainId")}
                         className="text-xs"
                         tokenAddress={form.getValues(
                           `tokens.${index}.token.token_address`,
                         )}
-                        chainId={form.getValues("chainId")}
                       />
                     </div>
                   )}
@@ -559,17 +553,17 @@ function SendFunds(props: {
 
           <div className="flex justify-start gap-2">
             <Button
-              type="button"
-              size="sm"
-              variant="outline"
               className="h-auto gap-1.5 rounded-lg bg-background px-3 py-2 text-xs"
               onClick={() => {
                 const currentTokens = form.getValues("tokens");
                 form.setValue("tokens", [
                   ...currentTokens,
-                  { token: null, amount: "" },
+                  { amount: "", token: null },
                 ]);
               }}
+              size="sm"
+              type="button"
+              variant="outline"
             >
               <PlusIcon className="size-4" />
               Add Token
@@ -596,14 +590,14 @@ function SendFunds(props: {
 
           <div className="!mt-6">
             <TransactionButton
+              className="w-full"
+              client={dashboardClient}
               disableNoFundsPopup={true}
-              txChainID={form.watch("chainId")}
-              isPending={isPending}
-              type="submit"
               isLoggedIn={true}
-              client={dashboardClient}
+              isPending={isPending}
               transactionCount={undefined}
-              className="w-full"
+              txChainID={form.watch("chainId")}
+              type="submit"
               variant="default"
             >
               Move Funds
@@ -624,20 +618,20 @@ function TokenSelectorPopover(props: {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 
   return (
-    <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
+    <Popover onOpenChange={setIsPopoverOpen} open={isPopoverOpen}>
       <PopoverTrigger asChild>
         <Button
-          variant="outline"
           className="h-auto w-full justify-start bg-background px-3 text-left"
+          variant="outline"
         >
           {props.token ? (
             <TokenDetails
-              token={props.token}
+              accountAddress={props.accountAddress}
               chainId={props.chainId}
-              showBalance={false}
-              iconClassName="size-5"
               className="gap-2"
-              accountAddress={props.accountAddress}
+              iconClassName="size-5"
+              showBalance={false}
+              token={props.token}
             />
           ) : (
             <div className="flex items-center gap-2">
@@ -709,12 +703,7 @@ function TokenSelectorPopoverContent(props: {
   });
 
   const manualTokenQuery = useQuery({
-    queryKey: [
-      "manual-token",
-      manualAddress,
-      props.chainId,
-      props.accountAddress,
-    ],
+    enabled: isAddress(manualAddress),
     queryFn: async () => {
       const balance = await getWalletBalance({
         address: props.accountAddress,
@@ -728,16 +717,21 @@ function TokenSelectorPopoverContent(props: {
       });
 
       const tokenInfo: WalletToken = {
-        token_address: manualAddress,
         balance: balance.value.toString(),
+        decimals: balance.decimals,
         name: balance.name,
         symbol: balance.symbol,
-        decimals: balance.decimals,
+        token_address: manualAddress,
       };
 
       return tokenInfo;
     },
-    enabled: isAddress(manualAddress),
+    queryKey: [
+      "manual-token",
+      manualAddress,
+      props.chainId,
+      props.accountAddress,
+    ],
   });
 
   const tokensToShow = useMemo(() => {
@@ -754,18 +748,18 @@ function TokenSelectorPopoverContent(props: {
   return (
     <div>
       <TabButtons
-        tabContainerClassName="pt-2 px-2"
         tabClassName="!text-sm"
+        tabContainerClassName="pt-2 px-2"
         tabs={[
           {
+            isActive: tab === "owned",
             name: "Owned Tokens",
             onClick: () => setTab("owned"),
-            isActive: tab === "owned",
           },
           {
+            isActive: tab === "custom",
             name: "Custom",
             onClick: () => setTab("custom"),
-            isActive: tab === "custom",
           },
         ]}
       />
@@ -775,10 +769,10 @@ function TokenSelectorPopoverContent(props: {
           <div className="relative">
             <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
             <Input
-              placeholder="Enter token address"
               className="h-12 rounded-none border-x-0 border-t-0 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:ring-offset-background"
-              value={manualAddress}
               onChange={(e) => setManualAddress(e.target.value)}
+              placeholder="Enter token address"
+              value={manualAddress}
             />
           </div>
 
@@ -792,19 +786,19 @@ function TokenSelectorPopoverContent(props: {
             <div className="p-2">
               {manualTokenQuery.data && (
                 <Button
-                  variant="ghost"
                   className="h-auto w-full justify-start gap-3 p-2 text-left"
                   onClick={() => {
                     if (manualTokenQuery.data) {
                       props.onSelect(manualTokenQuery.data);
                     }
                   }}
+                  variant="ghost"
                 >
                   <TokenDetails
-                    token={manualTokenQuery.data}
-                    chainId={props.chainId}
                     accountAddress={props.accountAddress}
+                    chainId={props.chainId}
                     showBalance={true}
+                    token={manualTokenQuery.data}
                   />
                   {props.selectedToken?.token_address ===
                     manualTokenQuery.data.token_address && (
@@ -826,20 +820,20 @@ function TokenSelectorPopoverContent(props: {
           <div className="relative">
             <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
             <Input
-              placeholder="Search owned tokens"
               className="h-12 rounded-none border-x-0 border-t-0 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:ring-offset-background"
-              value={search}
               onChange={(e) => setSearch(e.target.value)}
+              placeholder="Search owned tokens"
+              value={search}
             />
           </div>
           <ScrollShadow scrollableClassName="h-[350px] flex flex-col">
             <TokenList
               accountAddress={props.accountAddress}
               chainId={props.chainId}
-              onSelect={props.onSelect}
               className="flex grow flex-col overflow-y-auto p-2"
-              selectedToken={props.selectedToken}
               isPending={walletTokensQuery.isPending}
+              onSelect={props.onSelect}
+              selectedToken={props.selectedToken}
               tokens={tokensToShow || []}
             />
           </ScrollShadow>
@@ -862,7 +856,7 @@ function TokenList(props: {
     <div className={props.className}>
       {props.isPending &&
         new Array(10).fill(0).map((_, index) => (
-          // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+          // biome-ignore lint/suspicious/noArrayIndexKey: TODO
           <TokenSkeletonRow key={index} />
         ))}
 
@@ -872,16 +866,16 @@ function TokenList(props: {
             props.tokens.map((token) => {
               return (
                 <Button
-                  key={token.token_address + token.name + token.symbol}
-                  variant="ghost"
                   className="h-auto w-full justify-start gap-3 p-2 text-left"
+                  key={token.token_address + token.name + token.symbol}
                   onClick={() => props.onSelect(token)}
+                  variant="ghost"
                 >
                   <TokenDetails
-                    token={token}
-                    chainId={props.chainId}
                     accountAddress={props.accountAddress}
+                    chainId={props.chainId}
                     showBalance={true}
+                    token={token}
                   />
                   {props.selectedToken?.token_address ===
                     token.token_address && (
@@ -920,14 +914,14 @@ function TokenDetails(props: {
     <div className={cn("flex items-center gap-2.5", props.className)}>
       <TokenProvider
         address={props.token.token_address}
-        client={dashboardClient}
-        // eslint-disable-next-line no-restricted-syntax
         chain={defineChain(props.chainId)}
+        // eslint-disable-next-line no-restricted-syntax
+        client={dashboardClient}
       >
         <TokenIcon
           className={cn("size-8 rounded-full", props.iconClassName)}
-          loadingComponent={blobbie}
           fallbackComponent={blobbie}
+          loadingComponent={blobbie}
         />
       </TokenProvider>
       <div>
@@ -935,8 +929,8 @@ function TokenDetails(props: {
         {props.showBalance && (
           <RenderTokenBalance
             accountAddress={props.accountAddress}
-            tokenAddress={props.token.token_address}
             chainId={props.chainId}
+            tokenAddress={props.token.token_address}
           />
         )}
       </div>
@@ -966,12 +960,8 @@ type WalletToken = {
   decimals: number;
 };
 
-function useWalletTokens(params: {
-  address: string;
-  chainId: number;
-}) {
+function useWalletTokens(params: { address: string; chainId: number }) {
   return useQuery({
-    queryKey: ["v1/tokens", params],
     queryFn: async () => {
       const url = new URL(
         `https://insight.${isProd ? "thirdweb" : "thirdweb-dev"}.com/v1/tokens`,
@@ -1005,5 +995,6 @@ function useWalletTokens(params: {
 
       return uniqueTokens;
     },
+    queryKey: ["v1/tokens", params],
   });
 }
diff --git a/apps/nebula/src/app/move-funds/page.tsx b/apps/nebula/src/app/move-funds/page.tsx
index 199e1035364..df5b7da6ea3 100644
--- a/apps/nebula/src/app/move-funds/page.tsx
+++ b/apps/nebula/src/app/move-funds/page.tsx
@@ -1,6 +1,6 @@
+import Link from "next/link";
 import { ToggleThemeButton } from "@/components/color-mode-toggle";
 import { NebulaIcon } from "@/icons/NebulaIcon";
-import Link from "next/link";
 import { MoveFundsConnectButton } from "./connect-button";
 import { MoveFundsPage } from "./move-funds";
 
@@ -18,8 +18,8 @@ export default function RecoverPage() {
             <ToggleThemeButton />
 
             <Link
-              href="https://thirdweb.com/support"
               className="hidden text-muted-foreground text-sm hover:text-foreground lg:block"
+              href="https://thirdweb.com/support"
               target="_blank"
             >
               Support
diff --git a/apps/nebula/src/app/not-found.tsx b/apps/nebula/src/app/not-found.tsx
index 996b399c965..998c238a318 100644
--- a/apps/nebula/src/app/not-found.tsx
+++ b/apps/nebula/src/app/not-found.tsx
@@ -22,7 +22,7 @@ export default function NebulaNotFound() {
           <div>
             <p className="text-center text-muted-foreground text-xl leading-7">
               Go to{" "}
-              <Link href="/" className="text-foreground hover:underline">
+              <Link className="text-foreground hover:underline" href="/">
                 homepage
               </Link>
             </p>
@@ -30,8 +30,8 @@ export default function NebulaNotFound() {
 
           <Aurora
             color="hsl(var(--foreground)/8%)"
-            pos={{ top: "40%", left: "50%" }}
-            size={{ width: "100vw", height: "100vh" }}
+            pos={{ left: "50%", top: "40%" }}
+            size={{ height: "100vh", width: "100vw" }}
           />
         </div>
       </div>
@@ -50,12 +50,12 @@ const Aurora: React.FC<AuroraProps> = ({ color, pos, size }) => {
     <div
       className="pointer-events-none absolute"
       style={{
-        top: pos.top,
-        left: pos.left,
-        width: size.width,
+        backgroundImage: `radial-gradient(ellipse at center, ${color}, transparent 60%)`,
         height: size.height,
+        left: pos.left,
+        top: pos.top,
         transform: "translate(-50%, -50%)",
-        backgroundImage: `radial-gradient(ellipse at center, ${color}, transparent 60%)`,
+        width: size.width,
       }}
     />
   );
diff --git a/apps/nebula/src/app/providers.tsx b/apps/nebula/src/app/providers.tsx
index 2de7dc95164..cdbaeadb342 100644
--- a/apps/nebula/src/app/providers.tsx
+++ b/apps/nebula/src/app/providers.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { Toaster } from "@/components/ui/sonner";
-import { isSanctionedAddress } from "@/data/eth-sanctioned-addresses";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ThemeProvider } from "next-themes";
 import { useMemo } from "react";
 import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
+import { Toaster } from "@/components/ui/sonner";
+import { isSanctionedAddress } from "@/data/eth-sanctioned-addresses";
 import { NebulaConnectWallet } from "./(app)/components/NebulaConnectButton";
 
 const queryClient = new QueryClient();
@@ -16,9 +16,9 @@ export function NebulaProviders(props: { children: React.ReactNode }) {
       <ThirdwebProvider>
         <ThemeProvider
           attribute="class"
+          defaultTheme="light"
           disableTransitionOnChange
           enableSystem={false}
-          defaultTheme="light"
         >
           <Toaster richColors />
           <SanctionedAddressesChecker>
diff --git a/apps/nebula/src/instrumentation-client.ts b/apps/nebula/src/instrumentation-client.ts
index fd21d85797c..256e0475857 100644
--- a/apps/nebula/src/instrumentation-client.ts
+++ b/apps/nebula/src/instrumentation-client.ts
@@ -5,13 +5,13 @@ const NEXT_PUBLIC_POSTHOG_KEY = process.env.NEXT_PUBLIC_POSTHOG_KEY;
 if (NEXT_PUBLIC_POSTHOG_KEY) {
   posthog.init(NEXT_PUBLIC_POSTHOG_KEY, {
     api_host: "/_ph",
-    ui_host: "https://us.posthog.com",
-    capture_pageview: "history_change",
-    capture_pageleave: "if_capture_pageview",
-    // disable exception capture (for now)
-    capture_exceptions: false,
     // specifically disable autocapture (does not affect pageview capture)
     autocapture: false,
+    // disable exception capture (for now)
+    capture_exceptions: false,
+    capture_pageleave: "if_capture_pageview",
+    capture_pageview: "history_change",
     debug: process.env.NODE_ENV === "development",
+    ui_host: "https://us.posthog.com",
   });
 }
diff --git a/apps/nebula/tailwind.config.js b/apps/nebula/tailwind.config.js
index fdc57832312..67f7cb12354 100644
--- a/apps/nebula/tailwind.config.js
+++ b/apps/nebula/tailwind.config.js
@@ -2,8 +2,9 @@ import { fontFamily } from "tailwindcss/defaultTheme";
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  darkMode: ["class"],
   content: ["./src/**/*.{ts,tsx}"],
+  darkMode: ["class"],
+  plugins: [require("tailwindcss-animate")],
   prefix: "",
   theme: {
     container: {
@@ -19,20 +20,29 @@ module.exports = {
       },
     },
     extend: {
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+        "caret-blink": "caret-blink 1.25s ease-out infinite",
+        skeleton: "skeleton 2s cubic-bezier(0.4, 0, 0.6, 1) infinite",
+        "text-shimmer": "text-shimmer 1.25s linear infinite",
+      },
+      borderRadius: {
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
+      },
       colors: {
-        border: "hsl(var(--border))",
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
         "active-border": "hsl(var(--active-border))",
-        input: "hsl(var(--input))",
-        ring: "hsl(var(--ring))",
         background: "hsl(var(--background))",
-        foreground: "hsl(var(--foreground))",
-        primary: {
-          DEFAULT: "hsl(var(--primary))",
-          foreground: "hsl(var(--primary-foreground))",
-        },
-        secondary: {
-          DEFAULT: "hsl(var(--secondary))",
-          foreground: "hsl(var(--secondary-foreground))",
+        border: "hsl(var(--border))",
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
         },
         destructive: {
           DEFAULT: "hsl(var(--destructive))",
@@ -41,54 +51,55 @@ module.exports = {
           // destructive-text can be used on neutral bg - it's red-ish
           text: "hsl(var(--destructive-text))",
         },
-        success: {
-          // success-text can be used on neutral bg, it's green-ish
-          text: "hsl(var(--success-text))",
+        foreground: "hsl(var(--foreground))",
+        input: "hsl(var(--input))",
+        inverted: {
+          DEFAULT: "hsl(var(--inverted))",
+          foreground: "hsl(var(--inverted-foreground))",
+        },
+        link: {
+          foreground: "hsl(var(--link-foreground))",
         },
         muted: {
           DEFAULT: "hsl(var(--muted))",
           foreground: "hsl(var(--muted-foreground))",
         },
-        accent: {
-          DEFAULT: "hsl(var(--accent))",
-          foreground: "hsl(var(--accent-foreground))",
+        "nebula-pink": {
+          foreground: "hsl(var(--nebula-pink-foreground))",
         },
         popover: {
           DEFAULT: "hsl(var(--popover))",
           foreground: "hsl(var(--popover-foreground))",
         },
-        card: {
-          DEFAULT: "hsl(var(--card))",
-          foreground: "hsl(var(--card-foreground))",
-        },
-        inverted: {
-          DEFAULT: "hsl(var(--inverted))",
-          foreground: "hsl(var(--inverted-foreground))",
-        },
-        "nebula-pink": {
-          foreground: "hsl(var(--nebula-pink-foreground))",
-        },
-        warning: {
-          text: "hsl(var(--warning-text))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
         },
-        link: {
-          foreground: "hsl(var(--link-foreground))",
+        ring: "hsl(var(--ring))",
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
         },
         sidebar: {
+          accent: "hsl(var(--sidebar-accent))",
+          "accent-foreground": "hsl(var(--sidebar-accent-foreground))",
+          border: "hsl(var(--sidebar-border))",
           DEFAULT: "hsl(var(--sidebar-background))",
           foreground: "hsl(var(--sidebar-foreground))",
           primary: "hsl(var(--sidebar-primary))",
           "primary-foreground": "hsl(var(--sidebar-primary-foreground))",
-          accent: "hsl(var(--sidebar-accent))",
-          "accent-foreground": "hsl(var(--sidebar-accent-foreground))",
-          border: "hsl(var(--sidebar-border))",
           ring: "hsl(var(--sidebar-ring))",
         },
+        success: {
+          // success-text can be used on neutral bg, it's green-ish
+          text: "hsl(var(--success-text))",
+        },
+        warning: {
+          text: "hsl(var(--warning-text))",
+        },
       },
-      borderRadius: {
-        lg: "var(--radius)",
-        md: "calc(var(--radius) - 2px)",
-        sm: "calc(var(--radius) - 4px)",
+      fontFamily: {
+        sans: ["var(--font-sans)", ...fontFamily.sans],
       },
       keyframes: {
         "accordion-down": {
@@ -108,17 +119,6 @@ module.exports = {
           "100%": { backgroundPosition: "-100% 50%" },
         },
       },
-      animation: {
-        "accordion-down": "accordion-down 0.2s ease-out",
-        "accordion-up": "accordion-up 0.2s ease-out",
-        skeleton: "skeleton 2s cubic-bezier(0.4, 0, 0.6, 1) infinite",
-        "caret-blink": "caret-blink 1.25s ease-out infinite",
-        "text-shimmer": "text-shimmer 1.25s linear infinite",
-      },
-      fontFamily: {
-        sans: ["var(--font-sans)", ...fontFamily.sans],
-      },
     },
   },
-  plugins: [require("tailwindcss-animate")],
 };
diff --git a/apps/nebula/tsconfig.json b/apps/nebula/tsconfig.json
index 72dd93624f0..b66c1c261cf 100644
--- a/apps/nebula/tsconfig.json
+++ b/apps/nebula/tsconfig.json
@@ -1,28 +1,29 @@
 {
   "compilerOptions": {
-    "baseUrl": "./src",
-    "target": "ES2020",
-    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
+    "baseUrl": "./src",
+    "downlevelIteration": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
+    "forceConsistentCasingInFileNames": true,
+    "incremental": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
-    "downlevelIteration": true,
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "module": "esnext",
+    "moduleResolution": "node",
+    "noEmit": true,
     "noUncheckedIndexedAccess": true,
     "plugins": [
       {
         "name": "next"
       }
-    ]
+    ],
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "ES2020"
   },
+  "exclude": ["node_modules", ".next", "lib/__generated__"],
   "include": [
     "next-env.d.ts",
     "lucide-react.d.ts",
@@ -30,6 +31,5 @@
     "**/*.tsx",
     "additional.d.ts",
     ".next/types/**/*.ts"
-  ],
-  "exclude": ["node_modules", ".next", "lib/__generated__"]
+  ]
 }
diff --git a/apps/playground-web/.eslintrc.json b/apps/playground-web/.eslintrc.json
index ec8a5416a2c..2f446da1586 100644
--- a/apps/playground-web/.eslintrc.json
+++ b/apps/playground-web/.eslintrc.json
@@ -1,13 +1,13 @@
 {
   "extends": "next/core-web-vitals",
-  "rules": {
-    "react-compiler/react-compiler": "error"
-  },
-  "plugins": ["react-compiler"],
   "overrides": [
     {
-      "files": ["*.ts", "*.js", "*.tsx", "*.jsx"],
-      "extends": ["biome"]
+      "extends": ["biome"],
+      "files": ["*.ts", "*.js", "*.tsx", "*.jsx"]
     }
-  ]
+  ],
+  "plugins": ["react-compiler"],
+  "rules": {
+    "react-compiler/react-compiler": "error"
+  }
 }
diff --git a/apps/playground-web/biome.json b/apps/playground-web/biome.json
new file mode 100644
index 00000000000..780bbdcd1af
--- /dev/null
+++ b/apps/playground-web/biome.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
+}
diff --git a/apps/playground-web/components.json b/apps/playground-web/components.json
index 954465e0c43..05b99a14c4e 100644
--- a/apps/playground-web/components.json
+++ b/apps/playground-web/components.json
@@ -1,17 +1,17 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils"
+  },
   "rsc": true,
-  "tsx": true,
+  "style": "default",
   "tailwind": {
+    "baseColor": "gray",
     "config": "tailwind.config.ts",
     "css": "src/app/globals.css",
-    "baseColor": "gray",
     "cssVariables": true,
     "prefix": ""
   },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils"
-  }
+  "tsx": true
 }
diff --git a/apps/playground-web/knip.json b/apps/playground-web/knip.json
index 2049978134b..75ff819143e 100644
--- a/apps/playground-web/knip.json
+++ b/apps/playground-web/knip.json
@@ -1,8 +1,7 @@
 {
   "$schema": "https://unpkg.com/knip@5/schema.json",
-  "next": true,
   "ignore": ["src/components/ui/**", "src/app/insight/utils.ts"],
-  "project": ["src/**"],
   "ignoreDependencies": ["server-only"],
-  "ignoreBinaries": ["biome"]
+  "next": true,
+  "project": ["src/**"]
 }
diff --git a/apps/playground-web/next.config.mjs b/apps/playground-web/next.config.mjs
index 47d631a330b..50a13b16629 100644
--- a/apps/playground-web/next.config.mjs
+++ b/apps/playground-web/next.config.mjs
@@ -40,53 +40,53 @@ const nextConfig = {
   eslint: {
     ignoreDuringBuilds: true,
   },
-  productionBrowserSourceMaps: false,
   experimental: {
+    serverSourceMaps: false,
     webpackBuildWorker: true,
     webpackMemoryOptimizations: true,
-    serverSourceMaps: false,
   },
   async headers() {
     return [
       {
-        source: "/(.*)",
         headers: securityHeaders,
+        source: "/(.*)",
       },
     ];
   },
-  webpack: (config) => {
-    config.externals.push("pino-pretty", "lokijs", "encoding");
-    return config;
+  productionBrowserSourceMaps: false,
+  async redirects() {
+    return [
+      {
+        destination: "/connect/sign-in/button",
+        permanent: false,
+        source: "/connect/sign-in",
+      },
+      {
+        destination: "/connect/account-abstraction/connect",
+        permanent: false,
+        source: "/connect/account-abstraction",
+      },
+    ];
   },
   async rewrites() {
     return [
       {
-        source: "/_ph/static/:path*",
         destination: "https://us-assets.i.posthog.com/static/:path*",
+        source: "/_ph/static/:path*",
       },
       {
-        source: "/_ph/:path*",
         destination: "https://us.i.posthog.com/:path*",
+        source: "/_ph/:path*",
       },
       {
-        source: "/_ph/decide",
         destination: "https://us.i.posthog.com/decide",
+        source: "/_ph/decide",
       },
     ];
   },
-  async redirects() {
-    return [
-      {
-        source: "/connect/sign-in",
-        destination: "/connect/sign-in/button",
-        permanent: false,
-      },
-      {
-        source: "/connect/account-abstraction",
-        destination: "/connect/account-abstraction/connect",
-        permanent: false,
-      },
-    ];
+  webpack: (config) => {
+    config.externals.push("pino-pretty", "lokijs", "encoding");
+    return config;
   },
 };
 
diff --git a/apps/playground-web/package.json b/apps/playground-web/package.json
index dae8fa7e420..3f7a4ceb2c3 100644
--- a/apps/playground-web/package.json
+++ b/apps/playground-web/package.json
@@ -1,19 +1,4 @@
 {
-  "name": "playground-web",
-  "version": "0.1.1",
-  "private": true,
-  "scripts": {
-    "dev": "rm -rf .next && next dev --turbopack",
-    "build": "next build",
-    "start": "next start",
-    "format": "biome format ./src --write",
-    "prelint": "biome check ./src",
-    "lint": "biome check ./src && knip && eslint ./src",
-    "prefix": "biome check ./src --fix",
-    "fix": "eslint ./src --fix",
-    "typecheck": "tsc --noEmit",
-    "update-insight-blueprints": "bun scripts/updateInsightBlueprints.ts"
-  },
   "dependencies": {
     "@abstract-foundation/agw-react": "^1.6.4",
     "@hookform/resolvers": "^3.9.1",
@@ -50,6 +35,7 @@
     "zod": "3.25.62"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.0",
     "@types/node": "22.14.1",
     "@types/react": "19.1.8",
     "@types/react-dom": "19.1.6",
@@ -63,5 +49,20 @@
     "tailwindcss": "3.4.17",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "5.8.3"
-  }
+  },
+  "name": "playground-web",
+  "private": true,
+  "scripts": {
+    "build": "next build",
+    "dev": "rm -rf .next && next dev --turbopack",
+    "fix": "eslint ./src --fix",
+    "format": "biome format ./src --write",
+    "lint": "biome check ./src && knip && eslint ./src",
+    "prefix": "biome check ./src --fix",
+    "prelint": "biome check ./src",
+    "start": "next start",
+    "typecheck": "tsc --noEmit",
+    "update-insight-blueprints": "bun scripts/updateInsightBlueprints.ts"
+  },
+  "version": "0.1.1"
 }
diff --git a/apps/playground-web/postcss.config.js b/apps/playground-web/postcss.config.js
index 12a703d900d..4df9d3ba36d 100644
--- a/apps/playground-web/postcss.config.js
+++ b/apps/playground-web/postcss.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
     autoprefixer: {},
+    tailwindcss: {},
   },
 };
diff --git a/apps/playground-web/src/app/AppSidebar.tsx b/apps/playground-web/src/app/AppSidebar.tsx
index dc9bffe5e76..a0f4b4a8440 100644
--- a/apps/playground-web/src/app/AppSidebar.tsx
+++ b/apps/playground-web/src/app/AppSidebar.tsx
@@ -1,18 +1,16 @@
-import thirdwebIconSrc from "@/../public/thirdweb.svg";
-import { Sidebar, type SidebarLink } from "@/components/ui/sidebar";
 import Image from "next/image";
 import Link from "next/link";
+import thirdwebIconSrc from "@/../public/thirdweb.svg";
+import { Sidebar, type SidebarLink } from "@/components/ui/sidebar";
 import { ScrollShadow } from "../components/ui/ScrollShadow/ScrollShadow";
 import { otherLinks } from "./otherLinks";
 
-export function AppSidebar(props: {
-  links: SidebarLink[];
-}) {
+export function AppSidebar(props: { links: SidebarLink[] }) {
   return (
     <div className="z-10 hidden h-dvh w-[300px] flex-col border-border/50 border-r-2 xl:flex">
       <div className="border-b px-6 py-5">
         <div className="flex items-center gap-2">
-          <Image src={thirdwebIconSrc} className="size-6" alt="thirdweb" />
+          <Image alt="thirdweb" className="size-6" src={thirdwebIconSrc} />
           <span className="font-bold text-lg leading-none tracking-tight">
             Playground
           </span>
@@ -32,10 +30,10 @@ export function AppSidebar(props: {
         {otherLinks.map((link) => {
           return (
             <Link
-              key={link.href}
+              className="flex items-center gap-2 text-muted-foreground hover:text-foreground "
               href={link.href}
+              key={link.href}
               target="_blank"
-              className="flex items-center gap-2 text-muted-foreground hover:text-foreground "
             >
               {link.name}
             </Link>
diff --git a/apps/playground-web/src/app/MobileHeader.tsx b/apps/playground-web/src/app/MobileHeader.tsx
index b533bb5c5e0..703ee092205 100644
--- a/apps/playground-web/src/app/MobileHeader.tsx
+++ b/apps/playground-web/src/app/MobileHeader.tsx
@@ -1,18 +1,16 @@
 "use client";
 
-import thirdwebIconSrc from "@/../public/thirdweb.svg";
 import { MenuIcon, XIcon } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
 import { useEffect, useState } from "react";
-import { ScrollShadow } from "../components/ui/ScrollShadow/ScrollShadow";
+import thirdwebIconSrc from "@/../public/thirdweb.svg";
 import { Button } from "../components/ui/button";
+import { ScrollShadow } from "../components/ui/ScrollShadow/ScrollShadow";
 import { Sidebar, type SidebarLink } from "../components/ui/sidebar";
 import { otherLinks } from "./otherLinks";
 
-export function MobileHeader(props: {
-  links: SidebarLink[];
-}) {
+export function MobileHeader(props: { links: SidebarLink[] }) {
   const [isOpen, setIsOpen] = useState(false);
 
   useEffect(() => {
@@ -31,22 +29,22 @@ export function MobileHeader(props: {
     <>
       <header className="sticky top-0 z-10 flex justify-between gap-4 border-b bg-background px-4 py-4 xl:hidden">
         <Link
+          aria-label="thirdweb Docs"
           className="flex items-center gap-3"
           href="/"
-          aria-label="thirdweb Docs"
           title="thirdweb Docs"
         >
-          <Image src={thirdwebIconSrc} className="size-7" alt="" />
+          <Image alt="" className="size-7" src={thirdwebIconSrc} />
           <span className="font-bold text-xl leading-none tracking-tight">
             Playground
           </span>
         </Link>
         <Button
-          variant="outline"
           className="!h-auto p-2"
           onClick={() => {
             setIsOpen((v) => !v);
           }}
+          variant="outline"
         >
           {!isOpen ? (
             <MenuIcon className="size-6" />
@@ -78,10 +76,10 @@ export function MobileHeader(props: {
             {otherLinks.map((link) => {
               return (
                 <Link
-                  key={link.href}
+                  className="flex items-center gap-2 text-muted-foreground hover:text-foreground "
                   href={link.href}
+                  key={link.href}
                   target="_blank"
-                  className="flex items-center gap-2 text-muted-foreground hover:text-foreground "
                 >
                   {link.name}
                 </Link>
diff --git a/apps/playground-web/src/app/connect/account-abstraction/5792/page.tsx b/apps/playground-web/src/app/connect/account-abstraction/5792/page.tsx
index 319d4bf78d6..fd2f4ae8f7b 100644
--- a/apps/playground-web/src/app/connect/account-abstraction/5792/page.tsx
+++ b/apps/playground-web/src/app/connect/account-abstraction/5792/page.tsx
@@ -1,23 +1,22 @@
+import type { Metadata } from "next";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { Eip5792GetCapabilitiesPreview } from "../../../../components/account-abstraction/5792-get-capabilities";
 import { Eip5792SendCallsPreview } from "../../../../components/account-abstraction/5792-send-calls";
 import { PageLayout } from "../../../../components/blocks/APIHeader";
 import { CodeExample } from "../../../../components/code/code-example";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "EIP-5792 Wallet Capabilities | thirdweb Connect",
   description:
     "EIP-5792 capabilities allow you to view the capabilities of the connected wallet",
+  metadataBase,
+  title: "EIP-5792 Wallet Capabilities | thirdweb Connect",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="EIP-5792 Wallet Capabilities"
         description={
           <>
             EIP-5792 capabilities allow you to view the capabilities of the
@@ -25,6 +24,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/account-abstraction/overview?utm_source=playground"
+        title="EIP-5792 Wallet Capabilities"
       >
         <div className="flex flex-col gap-14">
           <Eip5792GetCapabilities />
@@ -39,12 +39,6 @@ function Eip5792GetCapabilities() {
   return (
     <>
       <CodeExample
-        header={{
-          title: "Getting the wallet capabilities",
-          description:
-            "Get the capabilities of the connected wallet using the useCapabilities hook",
-        }}
-        preview={<Eip5792GetCapabilitiesPreview />}
         code={`\
 import { useCapabilities } from "thirdweb/react";
 
@@ -58,7 +52,13 @@ function App() {
   return <div>Capabilities: {JSON.stringify(capabilities)}</div>;
 }
 `}
+        header={{
+          description:
+            "Get the capabilities of the connected wallet using the useCapabilities hook",
+          title: "Getting the wallet capabilities",
+        }}
         lang="tsx"
+        preview={<Eip5792GetCapabilitiesPreview />}
       />
     </>
   );
@@ -68,13 +68,6 @@ function Eip5792SendCalls() {
   return (
     <>
       <CodeExample
-        header={{
-          title: "Sending calls to the wallet",
-          description:
-            "Send batched calls to the connected wallet using the useSendCalls hook",
-        }}
-        preview={<Eip5792SendCallsPreview />}
-        lang="tsx"
         code={`\
 import { useSendCalls, useWaitForCallsReceipt } from "thirdweb/react";
 
@@ -98,6 +91,13 @@ function App() {
   );
 }
 `}
+        header={{
+          description:
+            "Send batched calls to the connected wallet using the useSendCalls hook",
+          title: "Sending calls to the wallet",
+        }}
+        lang="tsx"
+        preview={<Eip5792SendCallsPreview />}
       />
     </>
   );
diff --git a/apps/playground-web/src/app/connect/account-abstraction/7702/page.tsx b/apps/playground-web/src/app/connect/account-abstraction/7702/page.tsx
index c4a0c398f76..d464fe508a3 100644
--- a/apps/playground-web/src/app/connect/account-abstraction/7702/page.tsx
+++ b/apps/playground-web/src/app/connect/account-abstraction/7702/page.tsx
@@ -1,22 +1,21 @@
+import type { Metadata } from "next";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { Eip7702SmartAccountPreview } from "../../../../components/account-abstraction/7702-smart-account";
 import { PageLayout } from "../../../../components/blocks/APIHeader";
 import { CodeExample } from "../../../../components/code/code-example";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "EIP-7702 Smart Accounts | thirdweb Connect",
   description:
     "EIP-7702 smart accounts allow you to turn your EOA into a smart account with no code changes",
+  metadataBase,
+  title: "EIP-7702 Smart Accounts | thirdweb Connect",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="EIP-7702 Smart Accounts"
         description={
           <>
             EIP-7702 smart accounts allow you to turn your EOA into a smart
@@ -24,6 +23,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/account-abstraction/overview?utm_source=playground"
+        title="EIP-7702 Smart Accounts"
       >
         <Eip7702SmartAccount />
       </PageLayout>
@@ -35,12 +35,6 @@ function Eip7702SmartAccount() {
   return (
     <>
       <CodeExample
-        header={{
-          title: "Turning in-app wallets into EIP-7702 smart accounts",
-          description:
-            "In-app wallets can be turned into EIP-7702 smart accounts by changing the execution mode",
-        }}
-        preview={<Eip7702SmartAccountPreview />}
         code={`\
 import { claimTo } from "thirdweb/extensions/erc1155";
 import { TransactionButton } from "thirdweb/react";
@@ -78,7 +72,13 @@ function App() {
     </>
   );
 }`}
+        header={{
+          description:
+            "In-app wallets can be turned into EIP-7702 smart accounts by changing the execution mode",
+          title: "Turning in-app wallets into EIP-7702 smart accounts",
+        }}
         lang="tsx"
+        preview={<Eip7702SmartAccountPreview />}
       />
     </>
   );
diff --git a/apps/playground-web/src/app/connect/account-abstraction/connect/page.tsx b/apps/playground-web/src/app/connect/account-abstraction/connect/page.tsx
index 0b301631144..a935080a101 100644
--- a/apps/playground-web/src/app/connect/account-abstraction/connect/page.tsx
+++ b/apps/playground-web/src/app/connect/account-abstraction/connect/page.tsx
@@ -1,6 +1,6 @@
+import type { Metadata } from "next";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import {
   ConnectSmartAccountCustomPreview,
   ConnectSmartAccountPreview,
@@ -9,17 +9,16 @@ import { PageLayout } from "../../../../components/blocks/APIHeader";
 import { CodeExample } from "../../../../components/code/code-example";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Account Abstraction | thirdweb Connect",
   description:
     "Let users sign up with their email, phone number, social media accounts or directly with a wallet. Seamlessly integrate account abstraction and SIWE auth.",
+  metadataBase,
+  title: "Account Abstraction | thirdweb Connect",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Connect smart accounts"
         description={
           <>
             Let users connect to their smart accounts with any wallet and unlock
@@ -28,6 +27,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/account-abstraction/overview?utm_source=playground"
+        title="Connect smart accounts"
       >
         <ConnectSmartAccount />
       </PageLayout>
@@ -39,12 +39,6 @@ function ConnectSmartAccount() {
   return (
     <>
       <CodeExample
-        header={{
-          title: "Using prebuilt UI component",
-          description:
-            "Use the prebuilt UI components to connect to smart accounts",
-        }}
-        preview={<ConnectSmartAccountPreview />}
         code={`\
   import { ConnectButton } from "thirdweb/react";
 
@@ -55,16 +49,17 @@ function ConnectSmartAccount() {
 accountAbstraction={{ chain, sponsorGas: true }} />
 </>);
 };`}
+        header={{
+          description:
+            "Use the prebuilt UI components to connect to smart accounts",
+          title: "Using prebuilt UI component",
+        }}
         lang="tsx"
+        preview={<ConnectSmartAccountPreview />}
       />
 
       <div className="h-14" />
       <CodeExample
-        header={{
-          title: "Build custom UI",
-          description: "Build your own UI to connect to smart accounts",
-        }}
-        preview={<ConnectSmartAccountCustomPreview />}
         code={`\
   import { useConnect } from "thirdweb/react";
   import { createWallet } from "thirdweb/wallets";
@@ -84,7 +79,12 @@ accountAbstraction={{ chain, sponsorGas: true }} />
 })}>Connect with Google</button>
 </>);
 };`}
+        header={{
+          description: "Build your own UI to connect to smart accounts",
+          title: "Build custom UI",
+        }}
         lang="tsx"
+        preview={<ConnectSmartAccountCustomPreview />}
       />
     </>
   );
diff --git a/apps/playground-web/src/app/connect/account-abstraction/native-aa/page.tsx b/apps/playground-web/src/app/connect/account-abstraction/native-aa/page.tsx
index 97f07cea662..404dd599cf0 100644
--- a/apps/playground-web/src/app/connect/account-abstraction/native-aa/page.tsx
+++ b/apps/playground-web/src/app/connect/account-abstraction/native-aa/page.tsx
@@ -1,22 +1,21 @@
+import type { Metadata } from "next";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { SponsoredTxZksyncPreview } from "../../../../components/account-abstraction/sponsored-tx-zksync";
 import { PageLayout } from "../../../../components/blocks/APIHeader";
 import { CodeExample } from "../../../../components/code/code-example";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Native Account Abstraction",
   description:
     "On zkSync chains, you can take advantage of native account abstraction with no code changes",
+  metadataBase,
+  title: "Native Account Abstraction",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Native Account Abstraction"
         description={
           <>
             On zkSync chains, you can take advantage of native account
@@ -24,6 +23,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/account-abstraction/overview?utm_source=playground"
+        title="Native Account Abstraction"
       >
         <SponsoredZksyncTx />
       </PageLayout>
@@ -35,7 +35,6 @@ function SponsoredZksyncTx() {
   return (
     <>
       <CodeExample
-        preview={<SponsoredTxZksyncPreview />}
         code={`\
 import { claimTo } from "thirdweb/extensions/erc1155";
 import { TransactionButton } from "thirdweb/react";
@@ -70,6 +69,7 @@ function App() {
   );
 }`}
         lang="tsx"
+        preview={<SponsoredTxZksyncPreview />}
       />
     </>
   );
diff --git a/apps/playground-web/src/app/connect/account-abstraction/sponsor/page.tsx b/apps/playground-web/src/app/connect/account-abstraction/sponsor/page.tsx
index 993f1613d58..0e595b721ad 100644
--- a/apps/playground-web/src/app/connect/account-abstraction/sponsor/page.tsx
+++ b/apps/playground-web/src/app/connect/account-abstraction/sponsor/page.tsx
@@ -1,6 +1,6 @@
+import type { Metadata } from "next";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { ConnectSmartAccountCustomPreview } from "../../../../components/account-abstraction/connect-smart-account";
 import { SponsoredTxPreview } from "../../../../components/account-abstraction/sponsored-tx";
 import { PageLayout } from "../../../../components/blocks/APIHeader";
@@ -8,20 +8,20 @@ import { CodeExample } from "../../../../components/code/code-example";
 import { SponsoredInAppTxPreview } from "../../../../components/in-app-wallet/sponsored-tx";
 
 export const metadata: Metadata = {
+  description: "Turn any EOA into a smart contract wallet with EIP-4337.",
   metadataBase,
   title: "EIP-4337 Smart Contract Wallets | thirdweb Connect",
-  description: "Turn any EOA into a smart contract wallet with EIP-4337.",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="EIP-4337 Smart Contract Wallets"
         description={
           <>Turn any EOA into a smart contract wallet with EIP-4337.</>
         }
         docsLink="https://portal.thirdweb.com/connect/account-abstraction/overview?utm_source=playground"
+        title="EIP-4337 Smart Contract Wallets"
       >
         <div className="flex flex-col gap-14">
           <SponsoredTx />
@@ -36,12 +36,6 @@ export default function Page() {
 function SponsoredTx() {
   return (
     <CodeExample
-      header={{
-        title: "Usage with any external wallet",
-        description:
-          "Use the accountAbstraction flag on the ConnectButton or useConnect hook to automatically convert any external wallet to a EIP-4337 smart contract wallet.",
-      }}
-      preview={<SponsoredTxPreview />}
       code={`\
   import { useConnect } from "thirdweb/react";
   import { inAppWallet } from "thirdweb/wallets";
@@ -62,7 +56,13 @@ function SponsoredTx() {
 <TransactionButton transaction={() => claimTo({ contract, to: "0x123...", tokenId: 0n, quantity: 1n })}>Mint</TransactionButton>
 </>);
 };`}
+      header={{
+        description:
+          "Use the accountAbstraction flag on the ConnectButton or useConnect hook to automatically convert any external wallet to a EIP-4337 smart contract wallet.",
+        title: "Usage with any external wallet",
+      }}
       lang="tsx"
+      preview={<SponsoredTxPreview />}
     />
   );
 }
@@ -70,12 +70,6 @@ function SponsoredTx() {
 function SponsoredInAppTx() {
   return (
     <CodeExample
-      header={{
-        title: "Usage with in-app wallets",
-        description:
-          "Set the executionMode when creating your in-app wallet to turn it into a EIP-4337 smart contract wallet. Note that when set, the returned address will be the smart contract wallet address.",
-      }}
-      preview={<SponsoredInAppTxPreview />}
       code={`
 import { inAppWallet } from "thirdweb/wallets";
 import { claimTo } from "thirdweb/extensions/erc1155";
@@ -118,7 +112,13 @@ function App() {
     </>
   );
 }`}
+      header={{
+        description:
+          "Set the executionMode when creating your in-app wallet to turn it into a EIP-4337 smart contract wallet. Note that when set, the returned address will be the smart contract wallet address.",
+        title: "Usage with in-app wallets",
+      }}
       lang="tsx"
+      preview={<SponsoredInAppTxPreview />}
     />
   );
 }
@@ -126,11 +126,6 @@ function App() {
 function ConnectSmartAccount() {
   return (
     <CodeExample
-      header={{
-        title: "Build custom UI",
-        description: "Build your own UI to connect to 4337 smart accounts",
-      }}
-      preview={<ConnectSmartAccountCustomPreview />}
       code={`\
   import { useConnect } from "thirdweb/react";
   import { inAppWallet } from "thirdweb/wallets";
@@ -152,7 +147,12 @@ function ConnectSmartAccount() {
 })}>Connect with Google</button>
 </>);
 };`}
+      header={{
+        description: "Build your own UI to connect to 4337 smart accounts",
+        title: "Build custom UI",
+      }}
       lang="tsx"
+      preview={<ConnectSmartAccountCustomPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/auth/page.tsx b/apps/playground-web/src/app/connect/auth/page.tsx
index ed16a899961..07b57daf2c1 100644
--- a/apps/playground-web/src/app/connect/auth/page.tsx
+++ b/apps/playground-web/src/app/connect/auth/page.tsx
@@ -1,25 +1,24 @@
+import type { Metadata } from "next";
 import { BasicAuthPreview } from "@/components/auth/basic-auth";
 import { GatedContentPreview } from "@/components/auth/gated-content";
 import { SmartAccountAuthPreview } from "@/components/auth/smart-account-auth";
 import { CodeExample } from "@/components/code/code-example";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { BasicAuthHookPreview } from "../../../components/auth/basic-auth-hook";
 import { PageLayout } from "../../../components/blocks/APIHeader";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Auth | thirdweb Connect",
   description:
     "Authenticate users to your backend using only their wallet. This is a secure and easy way to authenticate users without requiring them to create an additional account.",
+  metadataBase,
+  title: "Auth | thirdweb Connect",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Auth"
         description={
           <>
             Authenticate users to your backend using only their wallet. This is
@@ -28,6 +27,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/typescript/v5/auth?utm_source=playground"
+        title="Auth"
       >
         <div className="flex flex-col gap-14">
           <BasicAuth />
@@ -43,11 +43,6 @@ export default function Page() {
 function BasicAuth() {
   return (
     <CodeExample
-      header={{
-        title: "Basic Auth",
-        description: "Add authentication to your app with a single component.",
-      }}
-      preview={<BasicAuthPreview />}
       code={`"use client";
 
 import {
@@ -78,7 +73,12 @@ export function AuthButton() {
   );
 }
 `}
+      header={{
+        description: "Add authentication to your app with a single component.",
+        title: "Basic Auth",
+      }}
       lang="tsx"
+      preview={<BasicAuthPreview />}
     />
   );
 }
@@ -86,12 +86,6 @@ export function AuthButton() {
 function BasicAuthHook() {
   return (
     <CodeExample
-      header={{
-        title: "Auth with your own UI",
-        description:
-          "Use the `useConnectModal` hook to add authentication to your app with your own UI.",
-      }}
-      preview={<BasicAuthHookPreview />}
       code={`"use client";
 
 import {
@@ -130,7 +124,13 @@ export function AuthHook() {
   return <Button type="button" onClick={onClick}>{isLoggedIn ? "Sign out" : "Sign in"}</Button>;
 }
 `}
+      header={{
+        description:
+          "Use the `useConnectModal` hook to add authentication to your app with your own UI.",
+        title: "Auth with your own UI",
+      }}
       lang="tsx"
+      preview={<BasicAuthHookPreview />}
     />
   );
 }
@@ -138,12 +138,6 @@ export function AuthHook() {
 function GatedContent() {
   return (
     <CodeExample
-      header={{
-        title: "Gating content with Auth",
-        description:
-          "Protect your page with thirdweb Auth. Deliver exclusive content to users who qualify.",
-      }}
-      preview={<GatedContentPreview />}
       code={`import { THIRDWEB_CLIENT } from "@/lib/client";
 import { cookies } from "next/headers";
 import { getAuthResult } from "@/app/connect/auth/server/actions/auth";
@@ -178,7 +172,13 @@ export async function GatedContentPreview() {
     </div>
   );
 }`}
+      header={{
+        description:
+          "Protect your page with thirdweb Auth. Deliver exclusive content to users who qualify.",
+        title: "Gating content with Auth",
+      }}
       lang="tsx"
+      preview={<GatedContentPreview />}
     />
   );
 }
@@ -186,11 +186,6 @@ export async function GatedContentPreview() {
 function SmartAccountAuth() {
   return (
     <CodeExample
-      header={{
-        title: "Smart Account Auth",
-        description: "Use smart accounts with Sign in with Ethereum (SIWE)",
-      }}
-      preview={<SmartAccountAuthPreview />}
       code={`"use client";
 
 import {
@@ -226,7 +221,12 @@ export function AuthButton() {
   );
 }
 `}
+      header={{
+        description: "Use smart accounts with Sign in with Ethereum (SIWE)",
+        title: "Smart Account Auth",
+      }}
       lang="tsx"
+      preview={<SmartAccountAuthPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/auth/server/actions/auth.ts b/apps/playground-web/src/app/connect/auth/server/actions/auth.ts
index 0c144b964e6..aecd72e9d3e 100644
--- a/apps/playground-web/src/app/connect/auth/server/actions/auth.ts
+++ b/apps/playground-web/src/app/connect/auth/server/actions/auth.ts
@@ -1,22 +1,22 @@
 "use server";
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { cookies } from "next/headers";
 import { getAddress } from "thirdweb";
 import {
+  createAuth,
   type GenerateLoginPayloadParams,
   type VerifyLoginPayloadParams,
-  createAuth,
 } from "thirdweb/auth";
 import { generateAccount, privateKeyToAccount } from "thirdweb/wallets";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 
 const privateKey = process.env.THIRDWEB_ADMIN_PRIVATE_KEY;
 
 const thirdwebAuth = createAuth({
-  domain: process.env.NEXT_PUBLIC_THIRDWEB_AUTH_DOMAIN || "thirdweb.com",
-  client: THIRDWEB_CLIENT,
   adminAccount: privateKey
     ? privateKeyToAccount({ client: THIRDWEB_CLIENT, privateKey })
     : await generateAccount({ client: THIRDWEB_CLIENT }),
+  client: THIRDWEB_CLIENT,
+  domain: process.env.NEXT_PUBLIC_THIRDWEB_AUTH_DOMAIN || "thirdweb.com",
 });
 
 export async function generatePayload(options: GenerateLoginPayloadParams) {
diff --git a/apps/playground-web/src/app/connect/blockchain-api/page.tsx b/apps/playground-web/src/app/connect/blockchain-api/page.tsx
index b589c52336b..5fca12d0f02 100644
--- a/apps/playground-web/src/app/connect/blockchain-api/page.tsx
+++ b/apps/playground-web/src/app/connect/blockchain-api/page.tsx
@@ -1,3 +1,4 @@
+import type { Metadata } from "next";
 import { ReadContractExtensionPreview } from "@/components/blockchain-api/read-contract-extension";
 import { ReadContractRawPreview } from "@/components/blockchain-api/read-contract-raw";
 import { WatchEventPreview } from "@/components/blockchain-api/watch-event-preview";
@@ -6,21 +7,19 @@ import { WriteContractRawPreview } from "@/components/blockchain-api/write-contr
 import { CodeExample } from "@/components/code/code-example";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { PageLayout } from "../../../components/blocks/APIHeader";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Blockchain API | thirdweb Connect",
   description:
     "Interact with EVM blockchains using thirdweb SDK. Create seamless NFT minting experience. Airdrop tokens to millions of users",
+  metadataBase,
+  title: "Blockchain API | thirdweb Connect",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Blockchain API"
         description={
           <>
             Performant, reliable and type safe API to read write to any contract
@@ -28,6 +27,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/typescript/v5?utm_source=playground"
+        title="Blockchain API"
       >
         <div className="flex flex-col gap-14">
           <ReadContractRaw />
@@ -45,12 +45,6 @@ export default function Page() {
 function ReadContractRaw() {
   return (
     <CodeExample
-      header={{
-        title: "Query blockchain data",
-        description:
-          "Read data from any contract or wallet. Type safe functions and hooks without needing full ABIs.",
-      }}
-      preview={<ReadContractRawPreview />}
       code={`import { getContract } from "thirdweb";
 import { ethereum } from "thirdweb/chains";
 import { MediaRenderer, useReadContract } from "thirdweb/react";
@@ -77,7 +71,13 @@ function App() {
   );
 }
 `}
+      header={{
+        description:
+          "Read data from any contract or wallet. Type safe functions and hooks without needing full ABIs.",
+        title: "Query blockchain data",
+      }}
       lang="tsx"
+      preview={<ReadContractRawPreview />}
     />
   );
 }
@@ -85,12 +85,6 @@ function App() {
 function ReadContractExtension() {
   return (
     <CodeExample
-      header={{
-        title: "Prebuilt read extensions",
-        description:
-          "Extensions let you do more with less code. High level functions with simple API that do pre and post processing for all common standards.",
-      }}
-      preview={<ReadContractExtensionPreview />}
       code={`import { getContract } from "thirdweb";
 import { ethereum } from "thirdweb/chains";
 import { MediaRenderer, useReadContract } from "thirdweb/react";
@@ -115,7 +109,13 @@ function App() {
   );
 }
 `}
+      header={{
+        description:
+          "Extensions let you do more with less code. High level functions with simple API that do pre and post processing for all common standards.",
+        title: "Prebuilt read extensions",
+      }}
       lang="tsx"
+      preview={<ReadContractExtensionPreview />}
     />
   );
 }
@@ -123,12 +123,6 @@ function App() {
 function WriteContractExtension() {
   return (
     <CodeExample
-      header={{
-        title: "Prebuilt write extensions",
-        description:
-          "Extensions let you do more with less code. High level functions with simple API that do pre and post processing for all common standards.",
-      }}
-      preview={<WriteContractExtensionPreview />}
       code={`import { getContract } from "thirdweb";
 import { sepolia } from "thirdweb/chains";
 import { claimTo } from "thirdweb/extensions/erc20";
@@ -153,7 +147,13 @@ function App() {
   </TransactionButton>
 }
 `}
+      header={{
+        description:
+          "Extensions let you do more with less code. High level functions with simple API that do pre and post processing for all common standards.",
+        title: "Prebuilt write extensions",
+      }}
       lang="tsx"
+      preview={<WriteContractExtensionPreview />}
     />
   );
 }
@@ -161,12 +161,6 @@ function App() {
 function WriteContractRaw() {
   return (
     <CodeExample
-      header={{
-        title: "Write data to blockchain",
-        description:
-          "Send transactions with the connected wallet. Type safe functions and hooks to send contracts call or raw transaction.",
-      }}
-      preview={<WriteContractRawPreview />}
       code={`import { getContract, prepareContractCall, toUnits } from "thirdweb";
 import { sepolia } from "thirdweb/chains";
 
@@ -196,7 +190,13 @@ function App() {
   </TransactionButton>
 }
 `}
+      header={{
+        description:
+          "Send transactions with the connected wallet. Type safe functions and hooks to send contracts call or raw transaction.",
+        title: "Write data to blockchain",
+      }}
       lang="tsx"
+      preview={<WriteContractRawPreview />}
     />
   );
 }
@@ -204,12 +204,6 @@ function App() {
 function WatchEvent() {
   return (
     <CodeExample
-      header={{
-        title: "Listen to blockchain events",
-        description:
-          "Subscribe to any contract event. Auto polling hooks and functions with type safe event extensions for all common standards.",
-      }}
-      preview={<WatchEventPreview />}
       code={`import { useContractEvents } from "thirdweb/react";
 import { getContract } from "thirdweb";
 import { base } from "thirdweb/chains";
@@ -235,7 +229,13 @@ function App() {
   });
 }
 `}
+      header={{
+        description:
+          "Subscribe to any contract event. Auto polling hooks and functions with type safe event extensions for all common standards.",
+        title: "Listen to blockchain events",
+      }}
       lang="tsx"
+      preview={<WatchEventPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/in-app-wallet/ecosystem/page.tsx b/apps/playground-web/src/app/connect/in-app-wallet/ecosystem/page.tsx
index a3d90ae7a3d..d998db36559 100644
--- a/apps/playground-web/src/app/connect/in-app-wallet/ecosystem/page.tsx
+++ b/apps/playground-web/src/app/connect/in-app-wallet/ecosystem/page.tsx
@@ -1,5 +1,5 @@
-import { CodeExample } from "@/components/code/code-example";
 import type { Metadata } from "next";
+import { CodeExample } from "@/components/code/code-example";
 import { PageLayout } from "../../../../components/blocks/APIHeader";
 import { EcosystemConnectEmbed } from "../../../../components/in-app-wallet/ecosystem";
 import { Profiles } from "../../../../components/in-app-wallet/profile-sections";
@@ -7,17 +7,16 @@ import ThirdwebProvider from "../../../../components/thirdweb-provider";
 import { metadataBase } from "../../../../lib/constants";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Build your own Ecosystem | thirdweb",
   description:
     "Build a public or permissioned ecosystem by allowing third party apps and games to connect to the same accounts.",
+  metadataBase,
+  title: "Build your own Ecosystem | thirdweb",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Build your own Ecosystem"
         description={
           <>
             Build a public or permissioned ecosystem by allowing third party
@@ -25,6 +24,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/wallet/ecosystem/set-up?utm_source=playground"
+        title="Build your own Ecosystem"
       >
         <ConnectEmbedExample />
         <div className="h-14" />
@@ -37,12 +37,6 @@ export default function Page() {
 function ConnectEmbedExample() {
   return (
     <CodeExample
-      header={{
-        title: "Connect Embed",
-        description:
-          "Connect to your ecosystem with a prebuilt UI. All settings are controlled in your dashboard.",
-      }}
-      preview={<EcosystemConnectEmbed />}
       code={`import { ecosystemWallet } from "thirdweb/wallets";
         import { ConnectEmbed } from "thirdweb/react";
 
@@ -56,7 +50,13 @@ function ConnectEmbedExample() {
           return (
 <ConnectEmbed client={client} wallets={wallets} />);
 };`}
+      header={{
+        description:
+          "Connect to your ecosystem with a prebuilt UI. All settings are controlled in your dashboard.",
+        title: "Connect Embed",
+      }}
       lang="tsx"
+      preview={<EcosystemConnectEmbed />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/in-app-wallet/page.tsx b/apps/playground-web/src/app/connect/in-app-wallet/page.tsx
index b4a25cbf27a..6e51d5db370 100644
--- a/apps/playground-web/src/app/connect/in-app-wallet/page.tsx
+++ b/apps/playground-web/src/app/connect/in-app-wallet/page.tsx
@@ -1,6 +1,6 @@
+import type { Metadata } from "next";
 import { CodeExample } from "@/components/code/code-example";
 import { CustomLoginForm } from "@/components/in-app-wallet/custom-login-form";
-import type { Metadata } from "next";
 import { PageLayout } from "../../../components/blocks/APIHeader";
 import { InAppConnectEmbed } from "../../../components/in-app-wallet/connect-button";
 import { Profiles } from "../../../components/in-app-wallet/profile-sections";
@@ -8,17 +8,16 @@ import ThirdwebProvider from "../../../components/thirdweb-provider";
 import { metadataBase } from "../../../lib/constants";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Any Auth | thirdweb in-app wallet",
   description:
     "Let users sign up with their email, phone number, social media accounts or directly with a wallet",
+  metadataBase,
+  title: "Any Auth | thirdweb in-app wallet",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Onboard users to web3 with any auth method"
         description={
           <>
             Use any of the built-in auth methods or bring your own.
@@ -28,6 +27,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/in-app-wallet/overview?utm_source=playground"
+        title="Onboard users to web3 with any auth method"
       >
         <UIIntegration />
         <div className="h-14" />
@@ -41,12 +41,6 @@ function UIIntegration() {
   return (
     <div>
       <CodeExample
-        header={{
-          title: "Prebuilt UI",
-          description:
-            "Instant out of the box authentication with a prebuilt UI.",
-        }}
-        preview={<InAppConnectEmbed />}
         code={`import { inAppWallet } from "thirdweb/wallets";
         import { ConnectEmbed } from "thirdweb/react";
 
@@ -84,18 +78,18 @@ function UIIntegration() {
           return (
 <ConnectEmbed client={client} wallets={wallets} />);
 };`}
+        header={{
+          description:
+            "Instant out of the box authentication with a prebuilt UI.",
+          title: "Prebuilt UI",
+        }}
         lang="tsx"
+        preview={<InAppConnectEmbed />}
       />
 
       <div className="h-14" />
 
       <CodeExample
-        header={{
-          title: "Custom UI",
-          description:
-            "Customize the login UI and integrate with your existing user base. No limits on customizations and auth methods.",
-        }}
-        preview={<CustomLoginForm />}
         code={`import { useState } from "react";
 import { useConnect } from "thirdweb/react";
 import { inAppWallet, preAuthenticate } from "thirdweb/wallets/in-app";
@@ -141,7 +135,13 @@ export function CustomLoginUi() {
   return <div> .... </div>
 }
 `}
+        header={{
+          description:
+            "Customize the login UI and integrate with your existing user base. No limits on customizations and auth methods.",
+          title: "Custom UI",
+        }}
         lang="tsx"
+        preview={<CustomLoginForm />}
       />
     </div>
   );
diff --git a/apps/playground-web/src/app/connect/in-app-wallet/sponsor/page.tsx b/apps/playground-web/src/app/connect/in-app-wallet/sponsor/page.tsx
index e76c4fa3bee..b28fb2365cf 100644
--- a/apps/playground-web/src/app/connect/in-app-wallet/sponsor/page.tsx
+++ b/apps/playground-web/src/app/connect/in-app-wallet/sponsor/page.tsx
@@ -1,22 +1,21 @@
-import { CodeExample } from "@/components/code/code-example";
 import type { Metadata } from "next";
+import { CodeExample } from "@/components/code/code-example";
 import { PageLayout } from "../../../../components/blocks/APIHeader";
 import { SponsoredInAppTxPreview } from "../../../../components/in-app-wallet/sponsored-tx";
 import ThirdwebProvider from "../../../../components/thirdweb-provider";
 import { metadataBase } from "../../../../lib/constants";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Signless Sponsored Transactions | thirdweb in-app wallet",
   description:
     "With in-app wallets, users don't need to confirm every transaction. Combine it with smart account flag to cover gas costs for the best UX",
+  metadataBase,
+  title: "Signless Sponsored Transactions | thirdweb in-app wallet",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Signless Sponsored Transactions"
         description={
           <>
             With in-app wallets, users {"don't"} need to confirm every
@@ -27,6 +26,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/in-app-wallet/overview?utm_source=playground"
+        title="Signless Sponsored Transactions"
       >
         <SponsoredInAppTx />
       </PageLayout>
@@ -37,7 +37,6 @@ export default function Page() {
 function SponsoredInAppTx() {
   return (
     <CodeExample
-      preview={<SponsoredInAppTxPreview />}
       code={`
 import { inAppWallet } from "thirdweb/wallets";
 import { claimTo } from "thirdweb/extensions/erc1155";
@@ -81,6 +80,7 @@ function App() {
   );
 }`}
       lang="tsx"
+      preview={<SponsoredInAppTxPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/pay/backend/layout.tsx b/apps/playground-web/src/app/connect/pay/backend/layout.tsx
index 7da15deddb0..cba4df70052 100644
--- a/apps/playground-web/src/app/connect/pay/backend/layout.tsx
+++ b/apps/playground-web/src/app/connect/pay/backend/layout.tsx
@@ -1,17 +1,15 @@
 import type React from "react";
 import { PageHeader } from "../../../../components/blocks/APIHeader";
 
-export default function Layout(props: {
-  children: React.ReactNode;
-}) {
+export default function Layout(props: { children: React.ReactNode }) {
   return (
     <div>
       <PageHeader
-        title="Universal Bridge API"
         description={
           <>HTTP API to bridge, swap and onramp to and from any currency</>
         }
         docsLink="https://portal.thirdweb.com/connect/pay/overview?utm_source=playground"
+        title="Universal Bridge API"
       />
 
       {props.children}
diff --git a/apps/playground-web/src/app/connect/pay/backend/page.tsx b/apps/playground-web/src/app/connect/pay/backend/page.tsx
index 6b78f8b5c39..7659a6bdff0 100644
--- a/apps/playground-web/src/app/connect/pay/backend/page.tsx
+++ b/apps/playground-web/src/app/connect/pay/backend/page.tsx
@@ -1,6 +1,6 @@
+import Link from "next/link";
 import { Button } from "@/components/ui/button";
 import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
-import Link from "next/link";
 import { getBridgePaths } from "./utils";
 
 export default async function Page() {
@@ -28,7 +28,6 @@ export default async function Page() {
 
         <div className="flex flex-col gap-8">
           <BlueprintSection
-            title="Available GET endpoints"
             blueprints={paths
               .filter(
                 ([_pathName, pathObj]) => typeof pathObj?.get !== "undefined",
@@ -38,11 +37,12 @@ export default async function Page() {
                   throw new Error(`Path not found: ${pathName}`);
                 }
                 return {
-                  name: pathName,
                   description: pathObj.get?.description || "",
                   link: `/connect/pay/backend/reference?route=${pathName}`,
+                  name: pathName,
                 };
               })}
+            title="Available GET endpoints"
           />
         </div>
       </div>
@@ -66,15 +66,15 @@ function BlueprintSection(props: {
         <TableBody>
           {props.blueprints.map((item) => (
             <TableRow
-              key={item.link}
               className="group hover:bg-accent/50"
+              key={item.link}
               linkBox
             >
               <TableCell>
                 <span className="flex items-center gap-3">
                   <Link
-                    href={item.link}
                     className="before:absolute before:inset-0"
+                    href={item.link}
                   >
                     <div className="flex flex-col">
                       <p className="font-semibold text-base">{item.name}</p>
diff --git a/apps/playground-web/src/app/connect/pay/backend/reference/page.tsx b/apps/playground-web/src/app/connect/pay/backend/reference/page.tsx
index 68885f61bcc..6d24142dc36 100644
--- a/apps/playground-web/src/app/connect/pay/backend/reference/page.tsx
+++ b/apps/playground-web/src/app/connect/pay/backend/reference/page.tsx
@@ -1,3 +1,4 @@
+import { redirect } from "next/navigation";
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -5,7 +6,6 @@ import {
   BreadcrumbList,
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
-import { redirect } from "next/navigation";
 import { THIRDWEB_CLIENT } from "../../../../../lib/client";
 import { isProd } from "../../../../../lib/env";
 import { BlueprintPlayground } from "../../../../insight/[blueprint_slug]/blueprint-playground.client";
@@ -46,13 +46,13 @@ export default async function Page(props: {
       )}
 
       <BlueprintPlayground
-        key={params.route}
-        metadata={pathMetadata}
         backLink={"/connect/pay/backend"}
         clientId={THIRDWEB_CLIENT.clientId}
+        domain={domain}
+        key={params.route}
+        metadata={pathMetadata}
         path={params.route}
         supportedChainIds={[]}
-        domain={domain}
       />
     </div>
   );
diff --git a/apps/playground-web/src/app/connect/pay/commerce/page.tsx b/apps/playground-web/src/app/connect/pay/commerce/page.tsx
index 85fea0d845f..7c90b443061 100644
--- a/apps/playground-web/src/app/connect/pay/commerce/page.tsx
+++ b/apps/playground-web/src/app/connect/pay/commerce/page.tsx
@@ -1,28 +1,28 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import { CodeExample } from "@/components/code/code-example";
 import { BuyMerchPreview } from "@/components/pay/direct-payment";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Integrate Fiat & Cross-Chain Crypto Payments | Universal Bridge",
   description:
     "The easiest way for users to transact in your app. Onramp users in clicks and generate revenue for each user transaction. Integrate for free.",
+  metadataBase,
+  title: "Integrate Fiat & Cross-Chain Crypto Payments | Universal Bridge",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Commerce payments with fiat or crypto"
         description={
           <>
             Let your users pay for any service with fiat or crypto on any chain.
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/pay/get-started?utm_source=playground"
+        title="Commerce payments with fiat or crypto"
       >
         <BuyMerch />
       </PageLayout>
@@ -33,19 +33,6 @@ export default function Page() {
 function BuyMerch() {
   return (
     <CodeExample
-      header={{
-        title: "Checkout",
-        description: (
-          <>
-            Take payments from Fiat or Crypto directly to your seller wallet.
-            <br />
-            Get notified for every sale through webhooks, which lets you trigger
-            any action you want like shipping physical goods, activating
-            services or doing onchain actions.
-          </>
-        ),
-      }}
-      preview={<BuyMerchPreview />}
       code={`import { CheckoutWidget, getDefaultToken } from "thirdweb/react";
           import { base } from "thirdweb/chains";
 
@@ -64,7 +51,20 @@ function BuyMerch() {
       />
           );
         };`}
+      header={{
+        description: (
+          <>
+            Take payments from Fiat or Crypto directly to your seller wallet.
+            <br />
+            Get notified for every sale through webhooks, which lets you trigger
+            any action you want like shipping physical goods, activating
+            services or doing onchain actions.
+          </>
+        ),
+        title: "Checkout",
+      }}
       lang="tsx"
+      preview={<BuyMerchPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/pay/components/CodeGen.tsx b/apps/playground-web/src/app/connect/pay/components/CodeGen.tsx
index f0d399cd8a4..320bea9502d 100644
--- a/apps/playground-web/src/app/connect/pay/components/CodeGen.tsx
+++ b/apps/playground-web/src/app/connect/pay/components/CodeGen.tsx
@@ -1,4 +1,4 @@
-import { Suspense, lazy } from "react";
+import { lazy, Suspense } from "react";
 import { CodeLoading } from "../../../../components/code/code.client";
 import type { BridgeComponentsPlaygroundOptions } from "./types";
 
@@ -6,17 +6,15 @@ const CodeClient = lazy(
   () => import("../../../../components/code/code.client"),
 );
 
-export function CodeGen(props: {
-  options: BridgeComponentsPlaygroundOptions;
-}) {
+export function CodeGen(props: { options: BridgeComponentsPlaygroundOptions }) {
   return (
     <div className="flex w-full grow flex-col">
       <Suspense fallback={<CodeLoading />}>
         <CodeClient
+          className="grow"
           code={getCode(props.options)}
           lang="tsx"
           loader={<CodeLoading />}
-          className="grow"
         />
       </Suspense>
     </div>
@@ -25,10 +23,10 @@ export function CodeGen(props: {
 
 function getCode(options: BridgeComponentsPlaygroundOptions) {
   const imports = {
+    chains: [] as string[],
     react: ["PayEmbed"] as string[],
     thirdweb: [] as string[],
     wallets: [] as string[],
-    chains: [] as string[],
   };
 
   // Check if we have a custom chain (not base chain which has id 8453)
diff --git a/apps/playground-web/src/app/connect/pay/embed/LeftSection.tsx b/apps/playground-web/src/app/connect/pay/embed/LeftSection.tsx
index 11a0d139189..8a268a2ced4 100644
--- a/apps/playground-web/src/app/connect/pay/embed/LeftSection.tsx
+++ b/apps/playground-web/src/app/connect/pay/embed/LeftSection.tsx
@@ -1,8 +1,5 @@
 "use client";
 
-import { CustomRadioGroup } from "@/components/ui/CustomRadioGroup";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
 import {
   CreditCardIcon,
   ExternalLinkIcon,
@@ -12,9 +9,12 @@ import {
 } from "lucide-react";
 import Link from "next/link";
 import type React from "react";
-import { useState } from "react";
+import { useId, useState } from "react";
 import type { Address } from "thirdweb";
 import { defineChain } from "thirdweb/chains";
+import { CustomRadioGroup } from "@/components/ui/CustomRadioGroup";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
 import { cn } from "../../../../lib/utils";
 import { CollapsibleSection } from "../../sign-in/components/CollapsibleSection";
 import { ColorFormGroup } from "../../sign-in/components/ColorFormGroup";
@@ -42,23 +42,30 @@ export function LeftSection(props: {
     payOptions.buyTokenAddress || "",
   );
 
+  const payModeId = useId();
+  const buyTokenAmountId = useId();
+  const buyTokenChainId = useId();
+  const tokenAddressId = useId();
+  const sellerAddressId = useId();
+  const paymentAmountId = useId();
+  const directPaymentChainId = useId();
+  const modalTitleId = useId();
+  const modalTitleIconId = useId();
+  const modalDescriptionId = useId();
+  const themeId = useId();
+
   return (
     <div className="flex flex-col gap-4">
       <CollapsibleSection
-        title="Payment Options"
-        icon={CreditCardIcon}
         defaultOpen
+        icon={CreditCardIcon}
+        title="Payment Options"
       >
         <div className="flex flex-col gap-6 pt-5">
           <section className="flex flex-col gap-3">
-            <Label htmlFor="pay-mode">Widget</Label>
+            <Label htmlFor={payModeId}>Widget</Label>
             <CustomRadioGroup
-              id="pay-mode"
-              options={[
-                { value: "buy", label: "Buy" },
-                { value: "checkout", label: "Checkout" },
-                { value: "transaction", label: "Transaction" },
-              ]}
+              id={payModeId}
               onValueChange={(value) => {
                 setOptions(
                   (v) =>
@@ -71,6 +78,11 @@ export function LeftSection(props: {
                     }) satisfies BridgeComponentsPlaygroundOptions,
                 );
               }}
+              options={[
+                { label: "Buy", value: "buy" },
+                { label: "Checkout", value: "checkout" },
+                { label: "Transaction", value: "transaction" },
+              ]}
               value={payOptions.widget || "buy"}
             />
           </section>
@@ -82,12 +94,10 @@ export function LeftSection(props: {
               <div className="space-y-4">
                 <div className="grid grid-cols-1 gap-6 md:grid-cols-2 md:gap-4">
                   <div className="flex flex-col gap-2">
-                    <Label htmlFor="buy-token-amount">Amount</Label>
+                    <Label htmlFor={buyTokenAmountId}>Amount</Label>
                     <Input
-                      id="buy-token-amount"
-                      placeholder="0.01"
                       className="bg-card"
-                      value={payOptions.buyTokenAmount || ""}
+                      id={buyTokenAmountId}
                       onChange={(e) =>
                         setOptions((v) => ({
                           ...v,
@@ -97,18 +107,17 @@ export function LeftSection(props: {
                           },
                         }))
                       }
+                      placeholder="0.01"
+                      value={payOptions.buyTokenAmount || ""}
                     />
                   </div>
 
                   {/* Chain selection */}
                   <div className="flex flex-col gap-2">
-                    <Label htmlFor="fund-wallet-chain-id">Chain ID</Label>
+                    <Label htmlFor={buyTokenChainId}>Chain ID</Label>
                     <Input
-                      id="fund-wallet-chain-id"
-                      type="text"
-                      placeholder="1 (Ethereum)"
                       className="bg-card"
-                      value={payOptions.buyTokenChain?.id || ""}
+                      id={buyTokenChainId}
                       onChange={(e) => {
                         const chainId = Number.parseInt(e.target.value);
                         if (!Number.isNaN(chainId)) {
@@ -122,6 +131,9 @@ export function LeftSection(props: {
                           }));
                         }
                       }}
+                      placeholder="1 (Ethereum)"
+                      type="text"
+                      value={payOptions.buyTokenChain?.id || ""}
                     />
                   </div>
                 </div>
@@ -131,11 +143,10 @@ export function LeftSection(props: {
                   <div className="space-y-4">
                     <div className="grid grid-cols-1 gap-4 md:grid-cols-2 md:gap-4">
                       <div className="flex flex-1 flex-col gap-2">
-                        <Label htmlFor="token-address">Token Address</Label>
+                        <Label htmlFor={tokenAddressId}>Token Address</Label>
                         <Input
-                          id="token-address"
-                          placeholder="0x..."
-                          value={payOptions.buyTokenAddress}
+                          className={cn("bg-card")}
+                          id={tokenAddressId}
                           onChange={(e) => {
                             setOptions((v) => ({
                               ...v,
@@ -145,7 +156,8 @@ export function LeftSection(props: {
                               },
                             }));
                           }}
-                          className={cn("bg-card")}
+                          placeholder="0x..."
+                          value={payOptions.buyTokenAddress}
                         />
                       </div>
                     </div>
@@ -158,12 +170,10 @@ export function LeftSection(props: {
             {payOptions.widget === "checkout" && (
               <div className="space-y-4">
                 <div className="flex flex-col gap-2">
-                  <Label htmlFor="seller-address">Seller Address</Label>
+                  <Label htmlFor={sellerAddressId}>Seller Address</Label>
                   <Input
-                    id="seller-address"
-                    placeholder="0x..."
                     className="bg-card"
-                    value={payOptions.sellerAddress || ""}
+                    id={sellerAddressId}
                     onChange={(e) => {
                       setOptions((v) => ({
                         ...v,
@@ -173,17 +183,17 @@ export function LeftSection(props: {
                         },
                       }));
                     }}
+                    placeholder="0x..."
+                    value={payOptions.sellerAddress || ""}
                   />
                 </div>
 
                 <div className="grid grid-cols-1 gap-4 md:grid-cols-2 md:gap-4">
                   <div className="flex flex-col gap-2">
-                    <Label htmlFor="payment-amount">Price</Label>
+                    <Label htmlFor={paymentAmountId}>Price</Label>
                     <Input
-                      id="payment-amount"
-                      placeholder="0.01"
                       className="bg-card"
-                      value={payOptions.buyTokenAmount || ""}
+                      id={paymentAmountId}
                       onChange={(e) =>
                         setOptions((v) => ({
                           ...v,
@@ -193,18 +203,17 @@ export function LeftSection(props: {
                           },
                         }))
                       }
+                      placeholder="0.01"
+                      value={payOptions.buyTokenAmount || ""}
                     />
                   </div>
 
                   {/* Chain selection */}
                   <div className="flex flex-col gap-2">
-                    <Label htmlFor="direct-payment-chain-id">Chain ID</Label>
+                    <Label htmlFor={directPaymentChainId}>Chain ID</Label>
                     <Input
-                      id="direct-payment-chain-id"
-                      type="number"
-                      placeholder="1 (Ethereum)"
                       className="bg-card"
-                      value={payOptions.buyTokenChain?.id || ""}
+                      id={directPaymentChainId}
                       onChange={(e) => {
                         const chainId = Number.parseInt(e.target.value);
                         if (!Number.isNaN(chainId)) {
@@ -218,6 +227,9 @@ export function LeftSection(props: {
                           }));
                         }
                       }}
+                      placeholder="1 (Ethereum)"
+                      type="number"
+                      value={payOptions.buyTokenChain?.id || ""}
                     />
                   </div>
                 </div>
@@ -227,13 +239,13 @@ export function LeftSection(props: {
                   <div className="space-y-4">
                     <div className="grid grid-cols-1 gap-4 md:grid-cols-2 md:gap-4">
                       <div className="flex flex-1 flex-col gap-2">
-                        <Label htmlFor="token-address">Token Address</Label>
+                        <Label htmlFor={tokenAddressId}>Token Address</Label>
                         <Input
-                          id="token-address"
+                          className={cn("bg-card")}
+                          id={tokenAddressId}
+                          onChange={(e) => setTokenAddress(e.target.value)}
                           placeholder="0x..."
                           value={tokenAddress}
-                          onChange={(e) => setTokenAddress(e.target.value)}
-                          className={cn("bg-card")}
                         />
                       </div>
                     </div>
@@ -260,17 +272,15 @@ export function LeftSection(props: {
         </div>
       </CollapsibleSection>
 
-      <CollapsibleSection title="Metadata Options" icon={Settings2Icon}>
+      <CollapsibleSection icon={Settings2Icon} title="Metadata Options">
         <div className="flex flex-col gap-6 pt-5">
           <div className="grid grid-cols-1 gap-6 md:grid-cols-2 md:gap-4">
             {/* Modal title */}
             <div className="flex flex-col gap-2">
-              <Label htmlFor="modal-title">Title</Label>
+              <Label htmlFor={modalTitleId}>Title</Label>
               <Input
-                id="modal-title"
-                placeholder="Product name"
                 className="bg-card"
-                value={options.payOptions.title}
+                id={modalTitleId}
                 onChange={(e) =>
                   setOptions((v) => ({
                     ...v,
@@ -280,17 +290,17 @@ export function LeftSection(props: {
                     },
                   }))
                 }
+                placeholder="Product name"
+                value={options.payOptions.title}
               />
             </div>
 
             {/* Modal Title Icon */}
             <div className="flex flex-col gap-2">
-              <Label htmlFor="modal-title">Image</Label>
+              <Label htmlFor={modalTitleIconId}>Image</Label>
               <Input
-                id="modal-title"
-                placeholder="https://..."
                 className="bg-card"
-                value={options.payOptions.image}
+                id={modalTitleIconId}
                 onChange={(e) =>
                   setOptions((v) => ({
                     ...v,
@@ -300,18 +310,18 @@ export function LeftSection(props: {
                     },
                   }))
                 }
+                placeholder="https://..."
+                value={options.payOptions.image}
               />
             </div>
           </div>
 
           {/* Modal description */}
           <div className="flex flex-col gap-2">
-            <Label htmlFor="modal-description">Image</Label>
+            <Label htmlFor={modalDescriptionId}>Image</Label>
             <Input
-              id="modal-description"
-              placeholder="Your own description here"
               className="bg-card"
-              value={options.payOptions.description}
+              id={modalDescriptionId}
               onChange={(e) =>
                 setOptions((v) => ({
                   ...v,
@@ -321,22 +331,24 @@ export function LeftSection(props: {
                   },
                 }))
               }
+              placeholder="Your own description here"
+              value={options.payOptions.description}
             />
           </div>
         </div>
       </CollapsibleSection>
 
-      <CollapsibleSection title="Appearance" icon={PaletteIcon}>
+      <CollapsibleSection icon={PaletteIcon} title="Appearance">
         {/* Theme */}
         <section className="flex flex-col gap-3 pt-6">
           <Label htmlFor="theme"> Theme </Label>
           <CustomRadioGroup
-            id="theme"
+            id={themeId}
+            onValueChange={setThemeType}
             options={[
-              { value: "dark", label: "Dark" },
-              { value: "light", label: "Light" },
+              { label: "Dark", value: "dark" },
+              { label: "Light", value: "light" },
             ]}
-            onValueChange={setThemeType}
             value={theme.type}
           />
         </section>
@@ -345,17 +357,17 @@ export function LeftSection(props: {
 
         {/* Colors */}
         <ColorFormGroup
-          theme={options.theme}
           onChange={(newTheme) => {
             setOptions((v) => ({
               ...v,
               theme: newTheme,
             }));
           }}
+          theme={options.theme}
         />
       </CollapsibleSection>
 
-      <CollapsibleSection title="Sponsor gas fees" icon={FuelIcon}>
+      <CollapsibleSection icon={FuelIcon} title="Sponsor gas fees">
         <div className="mt-4 flex items-start gap-6">
           <div className="flex flex-col gap-2">
             <p className="">
@@ -364,9 +376,9 @@ export function LeftSection(props: {
             </p>
 
             <Link
+              className="inline-flex items-center gap-2 text-muted-foreground hover:text-foreground"
               href="https://portal.thirdweb.com/connect/account-abstraction/overview?utm_source=playground"
               target="_blank"
-              className="inline-flex items-center gap-2 text-muted-foreground hover:text-foreground"
             >
               Learn more about Account Abstraction
               <ExternalLinkIcon className="size-4" />
diff --git a/apps/playground-web/src/app/connect/pay/embed/RightSection.tsx b/apps/playground-web/src/app/connect/pay/embed/RightSection.tsx
index c27296bf2e6..3eb7d04d944 100644
--- a/apps/playground-web/src/app/connect/pay/embed/RightSection.tsx
+++ b/apps/playground-web/src/app/connect/pay/embed/RightSection.tsx
@@ -7,9 +7,9 @@ import { claimTo } from "thirdweb/extensions/erc1155";
 import {
   BuyWidget,
   CheckoutWidget,
-  TransactionWidget,
   darkTheme,
   lightTheme,
+  TransactionWidget,
   useActiveAccount,
 } from "thirdweb/react";
 import { Button } from "../../../../components/ui/button";
@@ -55,12 +55,12 @@ export function RightSection(props: {
   if (props.options.payOptions.widget === "buy") {
     embed = (
       <BuyWidget
+        amount={props.options.payOptions.buyTokenAmount}
+        chain={props.options.payOptions.buyTokenChain}
         client={THIRDWEB_CLIENT}
         theme={themeObj}
         title={props.options.payOptions.title}
         tokenAddress={props.options.payOptions.buyTokenAddress}
-        chain={props.options.payOptions.buyTokenChain}
-        amount={props.options.payOptions.buyTokenAmount}
       />
     );
   }
@@ -68,20 +68,20 @@ export function RightSection(props: {
   if (props.options.payOptions.widget === "checkout") {
     embed = (
       <CheckoutWidget
+        amount={props.options.payOptions.buyTokenAmount}
+        chain={props.options.payOptions.buyTokenChain}
         client={THIRDWEB_CLIENT}
-        theme={themeObj}
         name={props.options.payOptions.title}
-        tokenAddress={props.options.payOptions.buyTokenAddress}
-        chain={props.options.payOptions.buyTokenChain}
-        amount={props.options.payOptions.buyTokenAmount}
-        seller={props.options.payOptions.sellerAddress}
         presetOptions={[1, 2, 3]}
         purchaseData={{
-          name: "Black Hoodie",
           description: "Size L | Ships worldwide.",
           image:
             "https://placehold.co/600x400/1d1d23/7c7a85?text=Your%20Product%20Here&font=roboto",
+          name: "Black Hoodie",
         }}
+        seller={props.options.payOptions.sellerAddress}
+        theme={themeObj}
+        tokenAddress={props.options.payOptions.buyTokenAddress}
       />
     );
   }
@@ -90,16 +90,16 @@ export function RightSection(props: {
     embed = (
       <TransactionWidget
         client={THIRDWEB_CLIENT}
+        description={props.options.payOptions.description}
+        image={props.options.payOptions.image}
         theme={themeObj}
+        title={props.options.payOptions.title}
         transaction={claimTo({
           contract: nftContract,
           quantity: 1n,
-          tokenId: 2n,
           to: account?.address || "",
+          tokenId: 2n,
         })}
-        title={props.options.payOptions.title}
-        description={props.options.payOptions.description}
-        image={props.options.payOptions.image}
       />
     );
   }
@@ -109,13 +109,13 @@ export function RightSection(props: {
       <TabButtons
         tabs={[
           {
-            name: "UI",
             isActive: previewTab === "ui",
+            name: "UI",
             onClick: () => setPreviewTab("ui"),
           },
           {
-            name: "Code",
             isActive: previewTab === "code",
+            name: "Code",
             onClick: () => setPreviewTab("code"),
           },
         ]}
@@ -164,15 +164,15 @@ function TabButtons(props: {
       <div className="flex justify-start gap-1 rounded-lg border bg-card p-2 shadow-md md:inline-flex">
         {props.tabs.map((tab) => (
           <Button
-            key={tab.name}
-            onClick={tab.onClick}
-            variant="ghost"
             className={cn(
               "gap-2 px-4 text-base",
               tab.isActive
                 ? "bg-accent text-foreground"
                 : "bg-transparent text-muted-foreground",
             )}
+            key={tab.name}
+            onClick={tab.onClick}
+            variant="ghost"
           >
             {tab.name}
           </Button>
diff --git a/apps/playground-web/src/app/connect/pay/embed/page.tsx b/apps/playground-web/src/app/connect/pay/embed/page.tsx
index 1224d03e62f..b97ea46a286 100644
--- a/apps/playground-web/src/app/connect/pay/embed/page.tsx
+++ b/apps/playground-web/src/app/connect/pay/embed/page.tsx
@@ -7,21 +7,21 @@ import { RightSection } from "./RightSection";
 
 // NOTE: Only set the values that are actually the default values used by PayEmbed component
 const defaultConnectOptions: BridgeComponentsPlaygroundOptions = {
-  theme: {
-    type: "dark",
-    darkColorOverrides: {},
-    lightColorOverrides: {},
-  },
   payOptions: {
-    widget: "buy",
-    title: "",
-    image: "",
-    description: "",
     buyTokenAddress: undefined,
     buyTokenAmount: "0.002",
     buyTokenChain: arbitrum,
+    description: "",
+    image: "",
     sellerAddress: "0x0000000000000000000000000000000000000000",
+    title: "",
     transactionData: "",
+    widget: "buy",
+  },
+  theme: {
+    darkColorOverrides: {},
+    lightColorOverrides: {},
+    type: "dark",
   },
 };
 
@@ -39,7 +39,7 @@ export default function BridgeComponentsPlayground(props: {
         <LeftSection options={options} setOptions={setOptions} />
       </div>
 
-      <RightSection tab={searchParams.tab} options={options} />
+      <RightSection options={options} tab={searchParams.tab} />
     </div>
   );
 }
diff --git a/apps/playground-web/src/app/connect/pay/fund-wallet/page.tsx b/apps/playground-web/src/app/connect/pay/fund-wallet/page.tsx
index 89e49d55264..5a456d02b2a 100644
--- a/apps/playground-web/src/app/connect/pay/fund-wallet/page.tsx
+++ b/apps/playground-web/src/app/connect/pay/fund-wallet/page.tsx
@@ -1,22 +1,21 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import { CodeExample } from "@/components/code/code-example";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { StyledBuyWidgetPreview } from "@/components/universal-bridge/buy";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Buy Crypto | thirdweb Universal Bridge",
   description:
     "The easiest way for users to fund their wallets. Onramp users in clicks and generate revenue for each user transaction. Integrate for free.",
+  metadataBase,
+  title: "Buy Crypto | thirdweb Universal Bridge",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="The easiest way for users to fund their wallets"
         description={
           <>
             Onramp users with credit card &amp; cross-chain crypto payments —
@@ -24,6 +23,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/pay/get-started?utm_source=playground"
+        title="The easiest way for users to fund their wallets"
       >
         <StyledPayWidget />
       </PageLayout>
@@ -34,17 +34,6 @@ export default function Page() {
 function StyledPayWidget() {
   return (
     <CodeExample
-      header={{
-        title: "Buy Crypto",
-        description: (
-          <>
-            Inline component that allows users to buy any currency.
-            <br />
-            Customize theme, currency, amounts, payment methods and more.
-          </>
-        ),
-      }}
-      preview={<StyledBuyWidgetPreview />}
       code={`\
 import { BuyWidget } from "thirdweb/react";
 
@@ -59,7 +48,18 @@ function App() {
       />
   );
 }`}
+      header={{
+        description: (
+          <>
+            Inline component that allows users to buy any currency.
+            <br />
+            Customize theme, currency, amounts, payment methods and more.
+          </>
+        ),
+        title: "Buy Crypto",
+      }}
       lang="tsx"
+      preview={<StyledBuyWidgetPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/pay/page.tsx b/apps/playground-web/src/app/connect/pay/page.tsx
index 682ec65dbfe..d822fbefe3a 100644
--- a/apps/playground-web/src/app/connect/pay/page.tsx
+++ b/apps/playground-web/src/app/connect/pay/page.tsx
@@ -1,15 +1,15 @@
+import type { Metadata } from "next";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { PageLayout } from "../../../components/blocks/APIHeader";
 import PayEmbedPlayground from "./embed/page";
 
 export const metadata: Metadata = {
+  description:
+    "The easiest way for users to transact in your app. Onramp users, pay with any token and generate revenue for each user transaction. Integrate for free.",
   metadataBase,
   title:
     "Integrate Fiat & Cross-Chain Crypto Payments | thirdweb Universal Bridge",
-  description:
-    "The easiest way for users to transact in your app. Onramp users, pay with any token and generate revenue for each user transaction. Integrate for free.",
 };
 
 export default function Page(props: {
@@ -18,7 +18,6 @@ export default function Page(props: {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Universal Bridge UI component"
         description={
           <>
             Onramp users with credit card &amp; cross-chain crypto payments —
@@ -26,6 +25,7 @@ export default function Page(props: {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/pay/get-started?utm_source=playground"
+        title="Universal Bridge UI component"
       >
         <PayEmbedPlayground searchParams={props.searchParams} />
       </PageLayout>
diff --git a/apps/playground-web/src/app/connect/pay/transactions/page.tsx b/apps/playground-web/src/app/connect/pay/transactions/page.tsx
index b1016de56cd..54e1c391411 100644
--- a/apps/playground-web/src/app/connect/pay/transactions/page.tsx
+++ b/apps/playground-web/src/app/connect/pay/transactions/page.tsx
@@ -1,3 +1,4 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import { CodeExample } from "@/components/code/code-example";
 import {
@@ -6,20 +7,19 @@ import {
 } from "@/components/pay/transaction-button";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Integrate Fiat & Cross-Chain Crypto Payments | thirdweb Pay",
   description:
     "The easiest way for users to transact in your app. Onramp users in clicks and generate revenue for each user transaction. Integrate for free.",
+  metadataBase,
+  title: "Integrate Fiat & Cross-Chain Crypto Payments | thirdweb Pay",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Onchain transactions with fiat or crypto"
+        containerClassName="space-y-12"
         description={
           <>
             Let your users pay for onchain transactions with fiat or crypto on
@@ -27,7 +27,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/pay/get-started?utm_source=playground"
-        containerClassName="space-y-12"
+        title="Onchain transactions with fiat or crypto"
       >
         <BuyOnchainAsset />
         <NoFundsPopup />
@@ -39,20 +39,6 @@ export default function Page() {
 function BuyOnchainAsset() {
   return (
     <CodeExample
-      header={{
-        title: "Transactions",
-        description: (
-          <>
-            Let your users pay for onchain transactions with fiat or crypto on
-            any chain.
-            <br />
-            Amounts are calculated automatically from the transaction, and will
-            get executed after the user has obtained the necessary funds via
-            onramp or swap.
-          </>
-        ),
-      }}
-      preview={<PayTransactionPreview />}
       code={`import { claimTo } from "thirdweb/extensions/erc1155";
           import { PayEmbed, useActiveAccount } from "thirdweb/react";
 
@@ -79,7 +65,21 @@ function BuyOnchainAsset() {
         />
           );
         };`}
+      header={{
+        description: (
+          <>
+            Let your users pay for onchain transactions with fiat or crypto on
+            any chain.
+            <br />
+            Amounts are calculated automatically from the transaction, and will
+            get executed after the user has obtained the necessary funds via
+            onramp or swap.
+          </>
+        ),
+        title: "Transactions",
+      }}
       lang="tsx"
+      preview={<PayTransactionPreview />}
     />
   );
 }
@@ -87,16 +87,6 @@ function BuyOnchainAsset() {
 function NoFundsPopup() {
   return (
     <CodeExample
-      header={{
-        title: "Automatic Onramp",
-        description: (
-          <>
-            Any transaction with value will automatically trigger onramp to fund
-            the wallet if needed before executing the transaction.
-          </>
-        ),
-      }}
-      preview={<PayTransactionButtonPreview />}
       code={`import { transfer } from "thirdweb/extensions/erc1155";
           import { TransactionButton, useActiveAccount } from "thirdweb/react";
 
@@ -120,7 +110,17 @@ function NoFundsPopup() {
             </TransactionButton>
           );
         };`}
+      header={{
+        description: (
+          <>
+            Any transaction with value will automatically trigger onramp to fund
+            the wallet if needed before executing the transaction.
+          </>
+        ),
+        title: "Automatic Onramp",
+      }}
       lang="tsx"
+      preview={<PayTransactionButtonPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/sign-in/button/LeftSection.tsx b/apps/playground-web/src/app/connect/sign-in/button/LeftSection.tsx
index 507f2ffbe5c..829b06f186f 100644
--- a/apps/playground-web/src/app/connect/sign-in/button/LeftSection.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/button/LeftSection.tsx
@@ -1,7 +1,3 @@
-import { CustomRadioGroup } from "@/components/ui/CustomRadioGroup";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
 import {
   ExternalLinkIcon,
   FuelIcon,
@@ -13,13 +9,18 @@ import {
 } from "lucide-react";
 import Link from "next/link";
 import type React from "react";
+import { useId } from "react";
+import { CustomRadioGroup } from "@/components/ui/CustomRadioGroup";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
 import { Switch } from "../../../../components/ui/switch";
 import { CollapsibleSection } from "../components/CollapsibleSection";
 import { ColorFormGroup } from "../components/ColorFormGroup";
 import { InAppWalletFormGroup } from "../components/InAppWalletFormGroup";
 import { LocaleFormControl } from "../components/LocaleFormControl";
-import { WalletsSelection } from "../components/WalletsSelection";
 import type { ConnectPlaygroundOptions } from "../components/types";
+import { WalletsSelection } from "../components/WalletsSelection";
 
 export function LeftSection(props: {
   connectOptions: ConnectPlaygroundOptions;
@@ -42,12 +43,22 @@ export function LeftSection(props: {
   const setModalSize = (modalSize: "compact" | "wide") =>
     setConnectOptions((v) => ({ ...v, modalSize }));
 
+  const modalSizeId = useId();
+  const modalTitleId = useId();
+  const modalTitleIconId = useId();
+  const tosLinkId = useId();
+  const privacyLinkId = useId();
+  const showThirdwebBrandingId = useId();
+  const requireApprovalId = useId();
+  const themeId = useId();
+  const btnLabelId = useId();
+
   return (
     <div className="flex flex-col gap-4">
       <CollapsibleSection
-        title="Wallets"
-        icon={WalletCardsIcon}
         defaultOpen
+        icon={WalletCardsIcon}
+        title="Wallets"
         triggerContainerClassName="pt-0"
       >
         <div className="h-3" />
@@ -56,18 +67,18 @@ export function LeftSection(props: {
         <WalletsSelection {...props} />
       </CollapsibleSection>
 
-      <CollapsibleSection title="Modal Options" icon={Settings2Icon}>
+      <CollapsibleSection icon={Settings2Icon} title="Modal Options">
         <div className="flex flex-col gap-6 pt-5">
           {/* Modal Size */}
           <section className="flex flex-col gap-3">
-            <Label htmlFor="modal-size"> Modal Size </Label>
+            <Label htmlFor={modalSizeId}> Modal Size </Label>
             <CustomRadioGroup
-              id="modal-size"
+              id={modalSizeId}
+              onValueChange={setModalSize}
               options={[
-                { value: "compact", label: "Compact" },
-                { value: "wide", label: "Wide" },
+                { label: "Compact", value: "compact" },
+                { label: "Wide", value: "wide" },
               ]}
-              onValueChange={setModalSize}
               value={modalSize}
             />
           </section>
@@ -81,33 +92,33 @@ export function LeftSection(props: {
           <div className="grid grid-cols-1 gap-6 md:grid-cols-2 md:gap-4">
             {/* Modal title */}
             <div className="flex flex-col gap-2">
-              <Label htmlFor="modal-title"> Modal Title </Label>
+              <Label htmlFor={modalTitleId}> Modal Title </Label>
               <Input
-                id="modal-title"
-                placeholder="Sign in"
-                value={connectOptions.modalTitle}
+                id={modalTitleId}
                 onChange={(e) =>
                   setConnectOptions((v) => ({
                     ...v,
                     modalTitle: e.target.value,
                   }))
                 }
+                placeholder="Sign in"
+                value={connectOptions.modalTitle}
               />
             </div>
 
             {/* Modal Title Icon */}
             <div className="flex flex-col gap-2">
-              <Label htmlFor="modal-title"> Modal Title Icon </Label>
+              <Label htmlFor={modalTitleIconId}> Modal Title Icon </Label>
               <Input
-                id="modal-title"
-                placeholder="https://..."
-                value={connectOptions.modalTitleIcon}
+                id={modalTitleIconId}
                 onChange={(e) =>
                   setConnectOptions((v) => ({
                     ...v,
                     modalTitleIcon: e.target.value,
                   }))
                 }
+                placeholder="https://..."
+                value={connectOptions.modalTitleIcon}
               />
             </div>
           </div>
@@ -115,33 +126,33 @@ export function LeftSection(props: {
           <div className="grid grid-cols-1 gap-6 md:grid-cols-2 md:gap-4">
             {/* TOS link */}
             <div className="flex flex-col gap-2">
-              <Label htmlFor="tos-link"> Terms of Service Link </Label>
+              <Label htmlFor={tosLinkId}> Terms of Service Link </Label>
               <Input
-                id="tos-link"
-                placeholder="https://..."
-                value={connectOptions.termsOfServiceLink}
+                id={tosLinkId}
                 onChange={(e) =>
                   setConnectOptions((v) => ({
                     ...v,
                     termsOfServiceLink: e.target.value,
                   }))
                 }
+                placeholder="https://..."
+                value={connectOptions.termsOfServiceLink}
               />
             </div>
 
             {/* Privacy Policy Link */}
             <div className="flex flex-col gap-2">
-              <Label htmlFor="privacy-link"> Privacy Policy Link </Label>
+              <Label htmlFor={privacyLinkId}> Privacy Policy Link </Label>
               <Input
-                id="privacy-link"
-                placeholder="https://..."
-                value={connectOptions.privacyPolicyLink}
+                id={privacyLinkId}
                 onChange={(e) =>
                   setConnectOptions((v) => ({
                     ...v,
                     privacyPolicyLink: e.target.value,
                   }))
                 }
+                placeholder="https://..."
+                value={connectOptions.privacyPolicyLink}
               />
             </div>
           </div>
@@ -150,8 +161,8 @@ export function LeftSection(props: {
             {/* Thirdweb Branding */}
             <section className="flex items-center gap-2">
               <Checkbox
-                id="show-thirdweb-branding"
                 checked={connectOptions.ShowThirdwebBranding}
+                id={showThirdwebBrandingId}
                 onCheckedChange={(checkState) => {
                   setConnectOptions((v) => ({
                     ...v,
@@ -159,7 +170,7 @@ export function LeftSection(props: {
                   }));
                 }}
               />
-              <Label htmlFor="show-thirdweb-branding">
+              <Label htmlFor={showThirdwebBrandingId}>
                 Show thirdweb branding
               </Label>
             </section>
@@ -167,8 +178,8 @@ export function LeftSection(props: {
             {/* Require Approval */}
             <section className="flex items-center gap-2">
               <Checkbox
-                id="require-approval"
                 checked={connectOptions.requireApproval}
+                id={requireApprovalId}
                 onCheckedChange={(checkState) => {
                   setConnectOptions((v) => ({
                     ...v,
@@ -176,23 +187,23 @@ export function LeftSection(props: {
                   }));
                 }}
               />
-              <Label htmlFor="require-approval">Require TOS approval</Label>
+              <Label htmlFor={requireApprovalId}>Require TOS approval</Label>
             </section>
           </div>
         </div>
       </CollapsibleSection>
 
-      <CollapsibleSection title="Appearance" icon={PaletteIcon}>
+      <CollapsibleSection icon={PaletteIcon} title="Appearance">
         {/* Theme */}
         <section className="flex flex-col gap-3 pt-6">
-          <Label htmlFor="theme"> Theme </Label>
+          <Label htmlFor={themeId}> Theme </Label>
           <CustomRadioGroup
-            id="theme"
+            id={themeId}
+            onValueChange={setThemeType}
             options={[
-              { value: "dark", label: "Dark" },
-              { value: "light", label: "Light" },
+              { label: "Dark", value: "dark" },
+              { label: "Light", value: "light" },
             ]}
-            onValueChange={setThemeType}
             value={theme.type}
           />
         </section>
@@ -201,17 +212,17 @@ export function LeftSection(props: {
 
         {/* Colors */}
         <ColorFormGroup
-          theme={connectOptions.theme}
           onChange={(newTheme) => {
             setConnectOptions((v) => ({
               ...v,
               theme: newTheme,
             }));
           }}
+          theme={connectOptions.theme}
         />
       </CollapsibleSection>
 
-      <CollapsibleSection title="Auth (SIWE)" icon={KeyRoundIcon}>
+      <CollapsibleSection icon={KeyRoundIcon} title="Auth (SIWE)">
         <div className="mt-4 flex items-start gap-2">
           <div className="flex flex-col gap-2">
             <span>
@@ -219,9 +230,9 @@ export function LeftSection(props: {
               after connecting wallet
             </span>
             <Link
+              className="inline-flex items-center gap-2 text-muted-foreground hover:text-foreground"
               href="https://portal.thirdweb.com/connect/auth?utm_source=playground"
               target="_blank"
-              className="inline-flex items-center gap-2 text-muted-foreground hover:text-foreground"
             >
               Learn more about Auth
               <ExternalLinkIcon className="size-4" />
@@ -239,7 +250,7 @@ export function LeftSection(props: {
         </div>
       </CollapsibleSection>
 
-      <CollapsibleSection title="Sponsor gas fees" icon={FuelIcon}>
+      <CollapsibleSection icon={FuelIcon} title="Sponsor gas fees">
         <div className="mt-4 flex items-start gap-6">
           <div className="flex flex-col gap-2">
             <p className="">
@@ -248,9 +259,9 @@ export function LeftSection(props: {
             </p>
 
             <Link
+              className="inline-flex items-center gap-2 text-muted-foreground hover:text-foreground"
               href="https://portal.thirdweb.com/connect/account-abstraction/overview?utm_source=playground"
               target="_blank"
-              className="inline-flex items-center gap-2 text-muted-foreground hover:text-foreground"
             >
               Learn more about Account Abstraction
               <ExternalLinkIcon className="size-4" />
@@ -268,19 +279,19 @@ export function LeftSection(props: {
         </div>
       </CollapsibleSection>
 
-      <CollapsibleSection title="Button Options" icon={RectangleHorizontalIcon}>
+      <CollapsibleSection icon={RectangleHorizontalIcon} title="Button Options">
         <div className="flex flex-col gap-2 pt-5">
-          <Label htmlFor="btn-label"> Button Label </Label>
+          <Label htmlFor={btnLabelId}> Button Label </Label>
           <Input
-            id="btn-label"
-            placeholder="Connect"
-            value={connectOptions.buttonLabel}
+            id={btnLabelId}
             onChange={(e) =>
               setConnectOptions((v) => ({
                 ...v,
                 buttonLabel: e.target.value,
               }))
             }
+            placeholder="Connect"
+            value={connectOptions.buttonLabel}
           />
         </div>
       </CollapsibleSection>
diff --git a/apps/playground-web/src/app/connect/sign-in/button/RightSection.tsx b/apps/playground-web/src/app/connect/sign-in/button/RightSection.tsx
index 681d4d372a7..e95d746c0de 100644
--- a/apps/playground-web/src/app/connect/sign-in/button/RightSection.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/button/RightSection.tsx
@@ -17,8 +17,8 @@ import {
   lightTheme,
   useActiveAccount,
   useActiveWallet,
+  useSiweAuth,
 } from "thirdweb/react";
-import { useSiweAuth } from "thirdweb/react";
 import { createWallet } from "thirdweb/wallets";
 import { Button } from "../../../../components/ui/button";
 import { THIRDWEB_CLIENT } from "../../../../lib/client";
@@ -64,14 +64,14 @@ export function RightSection(props: {
     },
     async getLoginPayload(params) {
       return {
-        domain: "",
         address: params.address,
-        statement: "",
-        version: "",
-        nonce: "",
-        issued_at: "",
+        domain: "",
         expiration_time: "",
         invalid_before: "",
+        issued_at: "",
+        nonce: "",
+        statement: "",
+        version: "",
       };
     },
     async isLoggedIn() {
@@ -104,39 +104,39 @@ export function RightSection(props: {
 
   const connectButton = (
     <ConnectButton
-      client={THIRDWEB_CLIENT}
+      accountAbstraction={
+        connectOptions.enableAccountAbstraction
+          ? {
+              chain: sepolia,
+              sponsorGas: true,
+            }
+          : undefined
+      }
+      auth={connectOptions.enableAuth ? playgroundAuth : undefined}
       autoConnect={false}
-      theme={themeObj}
-      locale={connectOptions.localeId}
+      chains={[
+        defineChain(578),
+        sepolia,
+        baseSepolia,
+        optimismSepolia,
+        arbitrumSepolia,
+      ]}
+      client={THIRDWEB_CLIENT}
       connectButton={{
         label: connectOptions.buttonLabel,
       }}
       connectModal={{
+        privacyPolicyUrl: connectOptions.privacyPolicyLink,
+        requireApproval: connectOptions.requireApproval,
+        showThirdwebBranding: connectOptions.ShowThirdwebBranding,
         size: connectOptions.modalSize,
+        termsOfServiceUrl: connectOptions.termsOfServiceLink,
         title: connectOptions.modalTitle,
         titleIcon: connectOptions.modalTitleIcon,
-        termsOfServiceUrl: connectOptions.termsOfServiceLink,
-        privacyPolicyUrl: connectOptions.privacyPolicyLink,
-        showThirdwebBranding: connectOptions.ShowThirdwebBranding,
-        requireApproval: connectOptions.requireApproval,
       }}
-      chains={[
-        defineChain(578),
-        sepolia,
-        baseSepolia,
-        optimismSepolia,
-        arbitrumSepolia,
-      ]}
+      locale={connectOptions.localeId}
+      theme={themeObj}
       wallets={wallets}
-      auth={connectOptions.enableAuth ? playgroundAuth : undefined}
-      accountAbstraction={
-        connectOptions.enableAccountAbstraction
-          ? {
-              chain: sepolia,
-              sponsorGas: true,
-            }
-          : undefined
-      }
     />
   );
 
@@ -145,18 +145,18 @@ export function RightSection(props: {
       <TabButtons
         tabs={[
           {
-            name: "Modal",
             isActive: previewTab === "modal",
+            name: "Modal",
             onClick: () => setPreviewTab("modal"),
           },
           {
-            name: "Button",
             isActive: previewTab === "button",
+            name: "Button",
             onClick: () => setPreviewTab("button"),
           },
           {
-            name: "Code",
             isActive: previewTab === "code",
+            name: "Code",
             onClick: () => setPreviewTab("code"),
           },
         ]}
@@ -177,18 +177,6 @@ export function RightSection(props: {
           ) : (
             <div className="relative">
               <ConnectEmbed
-                client={THIRDWEB_CLIENT}
-                autoConnect={false}
-                modalSize={connectOptions.modalSize}
-                theme={themeObj}
-                className="shadow-xl"
-                wallets={wallets}
-                header={{
-                  title: connectOptions.modalTitle,
-                  titleIcon: connectOptions.modalTitleIcon,
-                }}
-                locale={connectOptions.localeId}
-                auth={connectOptions.enableAuth ? playgroundAuth : undefined}
                 accountAbstraction={
                   connectOptions.enableAccountAbstraction
                     ? {
@@ -197,10 +185,22 @@ export function RightSection(props: {
                       }
                     : undefined
                 }
-                termsOfServiceUrl={connectOptions.termsOfServiceLink}
+                auth={connectOptions.enableAuth ? playgroundAuth : undefined}
+                autoConnect={false}
+                className="shadow-xl"
+                client={THIRDWEB_CLIENT}
+                header={{
+                  title: connectOptions.modalTitle,
+                  titleIcon: connectOptions.modalTitleIcon,
+                }}
+                locale={connectOptions.localeId}
+                modalSize={connectOptions.modalSize}
                 privacyPolicyUrl={connectOptions.privacyPolicyLink}
-                showThirdwebBranding={connectOptions.ShowThirdwebBranding}
                 requireApproval={connectOptions.requireApproval}
+                showThirdwebBranding={connectOptions.ShowThirdwebBranding}
+                termsOfServiceUrl={connectOptions.termsOfServiceLink}
+                theme={themeObj}
+                wallets={wallets}
               />
               {/* Fake X icon to make it looks exactly like a modal  */}
               <XIcon
@@ -276,15 +276,15 @@ function TabButtons(props: {
       <div className="flex justify-start gap-1 rounded-lg border bg-card p-2 shadow-md md:inline-flex">
         {props.tabs.map((tab) => (
           <Button
-            key={tab.name}
-            onClick={tab.onClick}
-            variant="ghost"
             className={cn(
               "gap-2 px-4 text-base",
               tab.isActive
                 ? "bg-accent text-foreground"
                 : "bg-transparent text-muted-foreground",
             )}
+            key={tab.name}
+            onClick={tab.onClick}
+            variant="ghost"
           >
             {tab.name}
           </Button>
diff --git a/apps/playground-web/src/app/connect/sign-in/button/page.tsx b/apps/playground-web/src/app/connect/sign-in/button/page.tsx
index 3d2cc41dd2d..9fd52d55df9 100644
--- a/apps/playground-web/src/app/connect/sign-in/button/page.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/button/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import ThirdwebProvider from "@/components/thirdweb-provider";
 import { use, useState } from "react";
+import ThirdwebProvider from "@/components/thirdweb-provider";
 import { PageLayout } from "../../../../components/blocks/APIHeader";
 import type { ConnectPlaygroundOptions } from "../components/types";
 import { LeftSection } from "./LeftSection";
@@ -21,15 +21,25 @@ const defaultInAppLoginMethods: ConnectPlaygroundOptions["inAppWallet"]["methods
 
 // NOTE: Only set the values that are actually the default values used by Connect component
 const defaultConnectOptions: ConnectPlaygroundOptions = {
+  buttonLabel: undefined,
+  enableAccountAbstraction: false,
+  enableAuth: false,
+  inAppWallet: {
+    enabled: true,
+    methods: defaultInAppLoginMethods,
+  },
+  localeId: "en_US",
   modalSize: "compact",
+  modalTitle: undefined,
+  modalTitleIcon: undefined,
+  privacyPolicyLink: undefined,
+  requireApproval: false,
+  ShowThirdwebBranding: true,
+  termsOfServiceLink: undefined,
   theme: {
-    type: "dark",
     darkColorOverrides: {},
     lightColorOverrides: {},
-  },
-  inAppWallet: {
-    methods: defaultInAppLoginMethods,
-    enabled: true,
+    type: "dark",
   },
   walletIds: [
     "io.metamask",
@@ -38,16 +48,6 @@ const defaultConnectOptions: ConnectPlaygroundOptions = {
     "io.rabby",
     "io.zerion.wallet",
   ],
-  modalTitle: undefined,
-  modalTitleIcon: undefined,
-  localeId: "en_US",
-  enableAuth: false,
-  termsOfServiceLink: undefined,
-  privacyPolicyLink: undefined,
-  enableAccountAbstraction: false,
-  buttonLabel: undefined,
-  ShowThirdwebBranding: true,
-  requireApproval: false,
 };
 
 export default function Page(props: {
@@ -60,7 +60,6 @@ export default function Page(props: {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="ConnectButton"
         description={
           <>
             A fully featured wallet connection component that allows to Connect
@@ -70,6 +69,7 @@ export default function Page(props: {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/sign-in/overview?utm_source=playground"
+        title="ConnectButton"
       >
         <div className="relative flex flex-col-reverse gap-6 xl:min-h-[900px] xl:flex-row xl:gap-6">
           <div className="grow border-b pb-10 xl:mb-0 xl:border-r xl:border-b-0 xl:pr-6">
@@ -80,8 +80,8 @@ export default function Page(props: {
           </div>
 
           <RightSection
-            tab={searchParams.tab}
             connectOptions={connectOptions}
+            tab={searchParams.tab}
           />
         </div>
       </PageLayout>
diff --git a/apps/playground-web/src/app/connect/sign-in/components/CodeGen.tsx b/apps/playground-web/src/app/connect/sign-in/components/CodeGen.tsx
index 6c417ec12c4..886e46cb7a9 100644
--- a/apps/playground-web/src/app/connect/sign-in/components/CodeGen.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/components/CodeGen.tsx
@@ -1,4 +1,4 @@
-import { Suspense, lazy } from "react";
+import { lazy, Suspense } from "react";
 import { CodeLoading } from "../../../../components/code/code.client";
 import type { ConnectPlaygroundOptions } from "./types";
 
@@ -6,18 +6,16 @@ const CodeClient = lazy(
   () => import("../../../../components/code/code.client"),
 );
 
-export function CodeGen(props: {
-  connectOptions: ConnectPlaygroundOptions;
-}) {
+export function CodeGen(props: { connectOptions: ConnectPlaygroundOptions }) {
   return (
     <div className="flex w-full grow flex-col">
       <Suspense fallback={<CodeLoading />}>
         <CodeClient
+          className="xl:h-[calc(100vh-100px)]"
           code={getCode(props.connectOptions)}
           lang="tsx"
-          loader={<CodeLoading />}
           // Need to add max-h in both places - TODO figure out a better way
-          className="xl:h-[calc(100vh-100px)]"
+          loader={<CodeLoading />}
           scrollableClassName="xl:h-[calc(100vh-100px)]"
         />
       </Suspense>
@@ -28,10 +26,10 @@ export function CodeGen(props: {
 function getCode(connectOptions: ConnectPlaygroundOptions) {
   const walletCodes: string[] = [];
   const imports = {
+    chains: [] as string[],
     react: [] as string[],
     thirdweb: [] as string[],
     wallets: [] as string[],
-    chains: [] as string[],
   };
 
   if (
@@ -83,32 +81,32 @@ function getCode(connectOptions: ConnectPlaygroundOptions) {
   }
 
   const props: Record<string, string | undefined> = {
+    accountAbstraction: connectOptions.enableAccountAbstraction
+      ? accountAbstractCode
+      : undefined,
+    auth: connectOptions.enableAuth ? authPlaceholder : undefined,
     client: "client",
-    wallets: "wallets",
-    theme: themeProp,
     connectButton: connectOptions.buttonLabel
       ? stringifyIgnoreFalsy({
           label: connectOptions.buttonLabel,
         })
       : undefined,
     connectModal: stringifyIgnoreFalsy({
-      size: connectOptions.modalSize,
-      title: connectOptions.modalTitle,
-      titleIcon: connectOptions.modalTitleIcon,
+      privacyPolicyUrl: connectOptions.privacyPolicyLink,
       showThirdwebBranding: !connectOptions.ShowThirdwebBranding
         ? false
         : undefined,
+      size: connectOptions.modalSize,
       termsOfServiceUrl: connectOptions.termsOfServiceLink,
-      privacyPolicyUrl: connectOptions.privacyPolicyLink,
+      title: connectOptions.modalTitle,
+      titleIcon: connectOptions.modalTitleIcon,
     }),
-    accountAbstraction: connectOptions.enableAccountAbstraction
-      ? accountAbstractCode
-      : undefined,
     locale:
       connectOptions.localeId === "en_US"
         ? undefined
         : quotes(connectOptions.localeId),
-    auth: connectOptions.enableAuth ? authPlaceholder : undefined,
+    theme: themeProp,
+    wallets: "wallets",
   };
 
   return `\
diff --git a/apps/playground-web/src/app/connect/sign-in/components/CollapsibleSection.tsx b/apps/playground-web/src/app/connect/sign-in/components/CollapsibleSection.tsx
index 1fe8ff0f927..de31a2b246f 100644
--- a/apps/playground-web/src/app/connect/sign-in/components/CollapsibleSection.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/components/CollapsibleSection.tsx
@@ -10,8 +10,11 @@ export function CollapsibleSection(props: {
 }) {
   return (
     <CustomAccordion
-      chevronPosition="right"
+      activeTriggerClassName="bg-card text-foreground "
       chevronClassName="size-5"
+      chevronPosition="right"
+      containerClassName="border-none"
+      defaultOpen={props.defaultOpen}
       trigger={
         <span className="flex items-center gap-3 font-semibold text-lg tracking-tight">
           <props.icon className="size-5" />
@@ -22,9 +25,6 @@ export function CollapsibleSection(props: {
         "rounded-2xl !px-5 !py-3 text-muted-foreground hover:text-foreground bg-card  border hover:bg-accent transition-colors",
         props.triggerContainerClassName,
       )}
-      activeTriggerClassName="bg-card text-foreground "
-      defaultOpen={props.defaultOpen}
-      containerClassName="border-none"
     >
       {/* 4px to prevent cutting off focus rings  */}
       <div className="px-[4px]">{props.children}</div>
diff --git a/apps/playground-web/src/app/connect/sign-in/components/ColorFormGroup.tsx b/apps/playground-web/src/app/connect/sign-in/components/ColorFormGroup.tsx
index ed5885a0226..08be9f14248 100644
--- a/apps/playground-web/src/app/connect/sign-in/components/ColorFormGroup.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/components/ColorFormGroup.tsx
@@ -1,8 +1,8 @@
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Input } from "@/components/ui/input";
 import { SearchIcon, SectionIcon } from "lucide-react";
 import { useState } from "react";
-import { type Theme, darkTheme, lightTheme } from "thirdweb/react";
+import { darkTheme, lightTheme, type Theme } from "thirdweb/react";
+import { Input } from "@/components/ui/input";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
 import { ColorInput } from "./ColorInput";
 import type { ConnectPlaygroundOptions } from "./types";
 
@@ -39,10 +39,10 @@ export function ColorFormGroup(props: {
         <div className="relative max-w-[320px] grow">
           <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
           <Input
-            placeholder="Search"
             className="rounded-lg pl-9"
-            value={search}
             onChange={(e) => setSearch(e.target.value)}
+            placeholder="Search"
+            value={search}
           />
         </div>
       </div>
@@ -68,7 +68,6 @@ export function ColorFormGroup(props: {
                       >
                         <ColorInput
                           className="size-10"
-                          value={themeObj.colors[color.colorId]}
                           onChange={(value) => {
                             const overridesKey =
                               theme.type === "dark"
@@ -84,6 +83,7 @@ export function ColorFormGroup(props: {
                             };
                             onChange(newTheme);
                           }}
+                          value={themeObj.colors[color.colorId]}
                         />
                         <div>
                           <div>{color.label}</div>
@@ -118,7 +118,6 @@ const colorSections: Array<{
   }>;
 }> = [
   {
-    section: "General",
     colors: [
       {
         colorId: "modalBg",
@@ -145,9 +144,9 @@ const colorSections: Array<{
         label: "Skeleton Background",
       },
     ],
+    section: "General",
   },
   {
-    section: "Texts",
     colors: [
       {
         colorId: "primaryText",
@@ -167,9 +166,9 @@ const colorSections: Array<{
         label: "Selected Text Background",
       },
     ],
+    section: "Texts",
   },
   {
-    section: "Buttons",
     colors: [
       {
         colorId: "primaryButtonBg",
@@ -208,9 +207,9 @@ const colorSections: Array<{
         label: "Connected Button Hover Background",
       },
     ],
+    section: "Buttons",
   },
   {
-    section: "Icons",
     colors: [
       {
         colorId: "secondaryIconColor",
@@ -225,9 +224,9 @@ const colorSections: Array<{
         label: "Secondary Icon Hover Background",
       },
     ],
+    section: "Icons",
   },
   {
-    section: "Others",
     colors: [
       {
         colorId: "danger",
@@ -254,5 +253,6 @@ const colorSections: Array<{
         label: "Scrollbar Background",
       },
     ],
+    section: "Others",
   },
 ];
diff --git a/apps/playground-web/src/app/connect/sign-in/components/ColorInput/index.tsx b/apps/playground-web/src/app/connect/sign-in/components/ColorInput/index.tsx
index 77e0f79ac31..17ab6dc9162 100644
--- a/apps/playground-web/src/app/connect/sign-in/components/ColorInput/index.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/components/ColorInput/index.tsx
@@ -1,10 +1,10 @@
+import ColorPicker from "react-pick-color";
+import { useDebouncedCallback } from "use-debounce";
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
-import ColorPicker from "react-pick-color";
-import { useDebouncedCallback } from "use-debounce";
 import { cn } from "../../../../../lib/utils";
 
 export function ColorInput(props: {
@@ -32,6 +32,7 @@ export function ColorInput(props: {
       </PopoverTrigger>
       <PopoverContent className="w-auto border-none p-0">
         <ColorPicker
+          className="p-2"
           color={props.value}
           hideAlpha
           onChange={({ hsl }) =>
@@ -44,11 +45,10 @@ export function ColorInput(props: {
             borderColor: "hsl(var(--border))",
             borderRadius: "var(--radius)",
             boxShadow: "var(--shadow)",
-            inputBackground: "hsl(var(--input))",
             color: "hsl(var(--foreground))",
+            inputBackground: "hsl(var(--input))",
             width: "300px",
           }}
-          className="p-2"
         />
       </PopoverContent>
     </Popover>
diff --git a/apps/playground-web/src/app/connect/sign-in/components/InAppWalletFormGroup.tsx b/apps/playground-web/src/app/connect/sign-in/components/InAppWalletFormGroup.tsx
index 0f68f7ffd90..3b8ea7404bb 100644
--- a/apps/playground-web/src/app/connect/sign-in/components/InAppWalletFormGroup.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/components/InAppWalletFormGroup.tsx
@@ -1,9 +1,9 @@
-import { Checkbox } from "@/components/ui/checkbox";
-import { Switch } from "@/components/ui/switch";
-import { cn } from "@/lib/utils";
 import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
 import type { InAppWalletAuth } from "thirdweb/wallets";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Switch } from "@/components/ui/switch";
+import { cn } from "@/lib/utils";
 import type { ConnectPlaygroundOptions } from "./types";
 
 const allInAppWalletLoginMethods: InAppWalletAuth[] = [
@@ -37,9 +37,9 @@ export function InAppWalletFormGroup(props: {
     <div className="rounded-xl border bg-card">
       <div className="flex items-center justify-between gap-2 p-4">
         <Link
-          target="_blank"
           className="group flex items-center gap-2"
           href="https://portal.thirdweb.com/connect/in-app-wallet/overview?utm_source=playground"
+          target="_blank"
         >
           <h2 className="font-semibold tracking-tight">In-App Wallet</h2>
           <ExternalLinkIcon className="mt-[-2px] size-4 text-muted-foreground group-hover:text-foreground" />
@@ -65,12 +65,12 @@ export function InAppWalletFormGroup(props: {
                   "flex cursor-pointer items-center gap-2 rounded-lg py-1.5",
                   !enabled && "opacity-50",
                 )}
-                key={method}
                 htmlFor={`in-app-wallet-${method}`}
+                key={method}
               >
                 <Checkbox
-                  id={`in-app-wallet-${method}`}
                   checked={enabled}
+                  id={`in-app-wallet-${method}`}
                   onCheckedChange={(checked) => {
                     setConnectOptions((v) => {
                       const newInAppWallet = { ...v.inAppWallet };
diff --git a/apps/playground-web/src/app/connect/sign-in/components/LocaleFormControl.tsx b/apps/playground-web/src/app/connect/sign-in/components/LocaleFormControl.tsx
index ef24ecea5aa..1fda6537dac 100644
--- a/apps/playground-web/src/app/connect/sign-in/components/LocaleFormControl.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/components/LocaleFormControl.tsx
@@ -1,3 +1,5 @@
+import { useId } from "react";
+import type { LocaleId } from "thirdweb/react";
 import { Label } from "@/components/ui/label";
 import {
   Select,
@@ -7,7 +9,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import type { LocaleId } from "thirdweb/react";
 import type { ConnectPlaygroundOptions } from "./types";
 
 const locales: {
@@ -15,36 +16,36 @@ const locales: {
   id: LocaleId;
 }[] = [
   {
-    name: "English",
     id: "en_US",
+    name: "English",
   },
   {
-    name: "Spanish",
     id: "es_ES",
+    name: "Spanish",
   },
   {
-    name: "Japanese",
     id: "ja_JP",
+    name: "Japanese",
   },
   {
-    name: "Korean",
     id: "ko_KR",
+    name: "Korean",
   },
   {
-    name: "Filipino",
     id: "tl_PH",
+    name: "Filipino",
   },
   {
-    name: "Vietnamese",
     id: "vi_VN",
+    name: "Vietnamese",
   },
   {
-    name: "German",
     id: "de_DE",
+    name: "German",
   },
   {
-    name: "French",
     id: "fr_FR",
+    name: "French",
   },
 ];
 
@@ -55,18 +56,19 @@ export function LocaleFormControl(props: {
   >;
 }) {
   const { connectOptions, setConnectOptions } = props;
+  const id = useId();
   return (
     <div className="flex flex-col gap-2">
-      <Label htmlFor="modal-locale">Locale</Label>
+      <Label htmlFor={id}>Locale</Label>
       <Select
-        value={connectOptions.localeId}
         onValueChange={(v) => {
           const locale = locales.find((locale) => locale.id === v);
           if (!locale) return;
           setConnectOptions((v) => ({ ...v, localeId: locale.id }));
         }}
+        value={connectOptions.localeId}
       >
-        <SelectTrigger id="modal-locale">
+        <SelectTrigger id={id}>
           <SelectValue placeholder="English" />
         </SelectTrigger>
         <SelectContent>
diff --git a/apps/playground-web/src/app/connect/sign-in/components/WalletsSelection.tsx b/apps/playground-web/src/app/connect/sign-in/components/WalletsSelection.tsx
index ea00775c59b..7631803232b 100644
--- a/apps/playground-web/src/app/connect/sign-in/components/WalletsSelection.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/components/WalletsSelection.tsx
@@ -1,15 +1,15 @@
+import { useQuery } from "@tanstack/react-query";
+import { CheckIcon, SearchIcon } from "lucide-react";
+import { useState } from "react";
+import { useWalletImage } from "thirdweb/react";
+import { getAllWalletsList, type WalletId } from "thirdweb/wallets";
+import { Button } from "@/components/ui/button";
 import { Img } from "@/components/ui/Img";
+import { Input } from "@/components/ui/input";
 import { LoadingDots } from "@/components/ui/LoadingDots";
 import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { cn } from "@/lib/utils";
-import { useQuery } from "@tanstack/react-query";
-import { CheckIcon, SearchIcon } from "lucide-react";
-import { useState } from "react";
-import { useWalletImage } from "thirdweb/react";
-import { type WalletId, getAllWalletsList } from "thirdweb/wallets";
 import type { ConnectPlaygroundOptions } from "./types";
 
 export function WalletsSelection(props: {
@@ -21,8 +21,8 @@ export function WalletsSelection(props: {
   const { connectOptions, setConnectOptions } = props;
   const [isEdited, setIsEdited] = useState(false);
   const walletsQuery = useQuery({
-    queryKey: ["wallets"],
     queryFn: () => getAllWalletsList(),
+    queryKey: ["wallets"],
   });
 
   const [search, setSearch] = useState("");
@@ -61,10 +61,10 @@ export function WalletsSelection(props: {
         <div className="relative max-w-[320px] grow">
           <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" />
           <Input
-            placeholder="Search from 500+ wallets"
             className="rounded-lg pl-9"
-            value={search}
             onChange={(e) => setSearch(e.target.value)}
+            placeholder="Search from 500+ wallets"
+            value={search}
           />
         </div>
       </div>
@@ -73,9 +73,9 @@ export function WalletsSelection(props: {
 
       {wallets && (
         <ScrollShadow
+          className="fade-in-0 animate-in duration-500"
           scrollableClassName="h-[250px] px-2"
           shadowColor="hsl(var(--muted))"
-          className="fade-in-0 animate-in duration-500"
         >
           <div className="h-2" />
           <div className="grid grid-cols-1 gap-x-4 gap-y-1.5 md:grid-cols-2">
@@ -83,8 +83,8 @@ export function WalletsSelection(props: {
               const enabled = connectOptions.walletIds.includes(wallet.id);
               return (
                 <WalletButton
-                  id={wallet.id}
                   enabled={enabled}
+                  id={wallet.id}
                   key={wallet.id}
                   name={wallet.name}
                   onClick={() => {
@@ -134,10 +134,10 @@ function WalletButton(props: {
     >
       <span className="flex items-center gap-3">
         <Img
-          src={walletImage.data}
           alt=""
           className="size-7 rounded-lg"
           loading="lazy"
+          src={walletImage.data}
         />
         <span className="truncate"> {props.name}</span>
       </span>
diff --git a/apps/playground-web/src/app/connect/sign-in/embed/page.tsx b/apps/playground-web/src/app/connect/sign-in/embed/page.tsx
index 3098dd05608..81fd7782680 100644
--- a/apps/playground-web/src/app/connect/sign-in/embed/page.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/embed/page.tsx
@@ -1,22 +1,21 @@
+import type { Metadata } from "next";
 import { CodeExample } from "@/components/code/code-example";
 import { StyledConnectEmbed } from "@/components/styled-connect-embed";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { PageLayout } from "../../../../components/blocks/APIHeader";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Sign In, Account Abstraction and SIWE Auth | thirdweb ConnectEmbed",
   description:
     "Let users sign up with their email, phone number, social media accounts or directly with a wallet. Seamlessly integrate account abstraction and SIWE auth.",
+  metadataBase,
+  title: "Sign In, Account Abstraction and SIWE Auth | thirdweb ConnectEmbed",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="ConnectEmbed"
         description={
           <>
             Create a login experience tailor-made for your app. Add your wallets
@@ -25,6 +24,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/sign-in/overview?utm_source=playground"
+        title="ConnectEmbed"
       >
         <EmbedComponent />
       </PageLayout>
@@ -36,7 +36,6 @@ function EmbedComponent() {
   return (
     <>
       <CodeExample
-        preview={<StyledConnectEmbed />}
         code={`import { createThirdwebClient } from "thirdweb";
 import { ConnectEmbed } from "thirdweb/react";
 
@@ -50,6 +49,7 @@ return (
 );
 };`}
         lang="tsx"
+        preview={<StyledConnectEmbed />}
       />
     </>
   );
diff --git a/apps/playground-web/src/app/connect/sign-in/headless/page.tsx b/apps/playground-web/src/app/connect/sign-in/headless/page.tsx
index ba17cdc9338..79eccc1709b 100644
--- a/apps/playground-web/src/app/connect/sign-in/headless/page.tsx
+++ b/apps/playground-web/src/app/connect/sign-in/headless/page.tsx
@@ -1,23 +1,22 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import { CodeExample } from "@/components/code/code-example";
 import { HooksPreview } from "@/components/sign-in/hooks";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { ModalPreview } from "../../../../components/sign-in/modal";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Sign In, Account Abstraction and SIWE Auth | thirdweb Connect",
   description:
     "Let users sign up with their email, phone number, social media accounts or directly with a wallet. Seamlessly integrate account abstraction and SIWE auth.",
+  metadataBase,
+  title: "Sign In, Account Abstraction and SIWE Auth | thirdweb Connect",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Headless"
         description={
           <>
             Create a login experience tailor-made for your app. Add your wallets
@@ -26,6 +25,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/connect/sign-in/overview?utm_source=playground"
+        title="Headless"
       >
         <div className="flex flex-col gap-14">
           <BuildCustomUISection />
@@ -40,10 +40,6 @@ function OpenConnectModalSection() {
   return (
     <>
       <CodeExample
-        header={{
-          title: "Open prebuilt connect modal using a hook",
-        }}
-        preview={<ModalPreview />}
         code={`\
 import { useConnectModal } from "thirdweb/react";
 
@@ -62,7 +58,11 @@ function App() {
     </button>
   );
 }`}
+        header={{
+          title: "Open prebuilt connect modal using a hook",
+        }}
         lang="tsx"
+        preview={<ModalPreview />}
       />
     </>
   );
@@ -71,13 +71,6 @@ function App() {
 function BuildCustomUISection() {
   return (
     <CodeExample
-      lang="tsx"
-      header={{
-        title: "Create custom UI using hooks",
-        description:
-          "Full control over your UI using react hooks. Wallet state management is all handled for you.",
-      }}
-      preview={<HooksPreview />}
       code={`\
 import { useConnect } from "thirdweb/react";
 import { createWallet } from "thirdweb/wallets";
@@ -117,6 +110,13 @@ function App() {
     </button>
   );
 }`}
+      header={{
+        description:
+          "Full control over your UI using react hooks. Wallet state management is all handled for you.",
+        title: "Create custom UI using hooks",
+      }}
+      lang="tsx"
+      preview={<HooksPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/social/page.tsx b/apps/playground-web/src/app/connect/social/page.tsx
index eef99816fcd..4811add0830 100644
--- a/apps/playground-web/src/app/connect/social/page.tsx
+++ b/apps/playground-web/src/app/connect/social/page.tsx
@@ -1,29 +1,29 @@
+import type { Metadata } from "next";
 import { CodeExample } from "@/components/code/code-example";
 import { SocialProfiles } from "@/components/social/social-profiles";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 import { PageLayout } from "../../../components/blocks/APIHeader";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Social APIs | thirdweb Connect",
   description:
     "Retrieve any user's onchain identity from popular protocols like ENS, Lens, Farcaster, and more.",
+  metadataBase,
+  title: "Social APIs | thirdweb Connect",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Get any user's onchain identity"
         description={
           <>
             Gain context about your users and their profiles across other apps
             as soon as they sign into your app.
           </>
         }
-        docsLink="https://portal.thirdweb.com/connect?utm_source=playground" // TODO: update this once we have Social API docs
+        docsLink="https://portal.thirdweb.com/connect?utm_source=playground"
+        title="Get any user's onchain identity" // TODO: update this once we have Social API docs
       >
         <UserProfiles />
       </PageLayout>
@@ -34,12 +34,6 @@ export default function Page() {
 function UserProfiles() {
   return (
     <CodeExample
-      header={{
-        title: "Social Profiles",
-        description:
-          "Get user's profiles across apps like ENS, Lens, Farcaster, and more.",
-      }}
-      preview={<SocialProfiles />}
       code={`import { useSocialProfiles, useActiveAccount } from "thirdweb/react";
 
         function App(){
@@ -57,7 +51,13 @@ function UserProfiles() {
 }
     </div>);
 }; `}
+      header={{
+        description:
+          "Get user's profiles across apps like ENS, Lens, Farcaster, and more.",
+        title: "Social Profiles",
+      }}
       lang="tsx"
+      preview={<SocialProfiles />}
     />
   );
 }
diff --git a/apps/playground-web/src/app/connect/ui/chain/page.tsx b/apps/playground-web/src/app/connect/ui/chain/page.tsx
index ec2da96d543..8df27db802e 100644
--- a/apps/playground-web/src/app/connect/ui/chain/page.tsx
+++ b/apps/playground-web/src/app/connect/ui/chain/page.tsx
@@ -1,3 +1,4 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import {
   ChainIconExample,
@@ -5,24 +6,23 @@ import {
 } from "@/components/headless-ui/chain-examples";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 
 export const metadata: Metadata = {
+  description: "Headless UI components for rendering chain name and icon",
   metadataBase,
   title: "Chain Components",
-  description: "Headless UI components for rendering chain name and icon",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Chain Components"
+        containerClassName="space-y-12"
         description={
           <>Headless UI components for rendering chain name and icon</>
         }
         docsLink="https://portal.thirdweb.com/react/v5/components/onchain#chains?utm_source=playground"
-        containerClassName="space-y-12"
+        title="Chain Components"
       >
         <ChainIconExample />
         <ChainNameExample />
diff --git a/apps/playground-web/src/app/connect/ui/nft/page.tsx b/apps/playground-web/src/app/connect/ui/nft/page.tsx
index b93d56923d7..99145089022 100644
--- a/apps/playground-web/src/app/connect/ui/nft/page.tsx
+++ b/apps/playground-web/src/app/connect/ui/nft/page.tsx
@@ -1,3 +1,4 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import {
   NftCardExample,
@@ -7,24 +8,23 @@ import {
 } from "@/components/headless-ui/nft-examples";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "NFT Components",
   description:
     "Elevate your NFT marketplace with our React headless UI components, engineered for seamless digital asset transactions. These customizable, zero-styling components simplify NFT interactions while giving developers complete freedom to craft their perfect user interface.",
+  metadataBase,
+  title: "NFT Components",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="NFT Components"
         description={
           <>Headless UI components for rendering NFT Media and metadata</>
         }
         docsLink="https://portal.thirdweb.com/react/v5/components/onchain#nfts?utm_source=playground"
+        title="NFT Components"
       >
         <div className="space-y-14">
           <NftMediaExample />
diff --git a/apps/playground-web/src/app/connect/ui/page.tsx b/apps/playground-web/src/app/connect/ui/page.tsx
index c973d177198..c30d19b6a8b 100644
--- a/apps/playground-web/src/app/connect/ui/page.tsx
+++ b/apps/playground-web/src/app/connect/ui/page.tsx
@@ -1,3 +1,4 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import {
   AccountAvatarExample,
@@ -7,20 +8,18 @@ import {
 } from "@/components/headless-ui/account-examples";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Account Components",
   description:
     "Headless components for rendering account information like ENS name, ENS avatar, account balance and more",
+  metadataBase,
+  title: "Account Components",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Account Components"
         description={
           <>
             Headless components for rendering account information like ENS name,
@@ -28,6 +27,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/react/v5/components/account?utm_source=playground"
+        title="Account Components"
       >
         <div className="space-y-16">
           <AccountNameExample />
diff --git a/apps/playground-web/src/app/connect/ui/token/page.tsx b/apps/playground-web/src/app/connect/ui/token/page.tsx
index 143d02e1f9e..0ef6505090e 100644
--- a/apps/playground-web/src/app/connect/ui/token/page.tsx
+++ b/apps/playground-web/src/app/connect/ui/token/page.tsx
@@ -1,3 +1,4 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import {
   TokenImageBasic,
@@ -6,27 +7,26 @@ import {
 } from "@/components/headless-ui/token-examples";
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  metadataBase,
-  title: "Token Components",
   description:
     "Headless UI components for rendering token image, name, and symbol",
+  metadataBase,
+  title: "Token Components",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Token Components"
+        containerClassName="space-y-12"
         description={
           <>
             Headless UI components for rendering token image, name, and symbol
           </>
         }
         docsLink="https://portal.thirdweb.com/react/v5/components/onchain#tokens?utm_source=playground"
-        containerClassName="space-y-12"
+        title="Token Components"
       >
         <TokenImageBasic />
         <TokenNameBasic />
diff --git a/apps/playground-web/src/app/connect/ui/wallet/page.tsx b/apps/playground-web/src/app/connect/ui/wallet/page.tsx
index f979dc0a5da..64b14767169 100644
--- a/apps/playground-web/src/app/connect/ui/wallet/page.tsx
+++ b/apps/playground-web/src/app/connect/ui/wallet/page.tsx
@@ -1,29 +1,28 @@
+import type { Metadata } from "next";
 import { PageLayout } from "@/components/blocks/APIHeader";
 import {
   WalletIconExample,
   WalletNameExample,
 } from "@/components/headless-ui/wallet-examples";
-
 import ThirdwebProvider from "@/components/thirdweb-provider";
 import { metadataBase } from "@/lib/constants";
-import type { Metadata } from "next";
 
 export const metadata: Metadata = {
+  description: "Headless UI components for rendering wallet name and icon",
   metadataBase,
   title: "Wallet Components",
-  description: "Headless UI components for rendering wallet name and icon",
 };
 
 export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Wallet Components"
+        containerClassName="space-y-12"
         description={
           <>Headless UI components for rendering wallet name and icon</>
         }
         docsLink="https://portal.thirdweb.com/react/v5/connecting-wallets/ui-components?utm_source=playground"
-        containerClassName="space-y-12"
+        title="Wallet Components"
       >
         <WalletIconExample />
         <WalletNameExample />
diff --git a/apps/playground-web/src/app/engine/_hooks/useEngineTxStatus.ts b/apps/playground-web/src/app/engine/_hooks/useEngineTxStatus.ts
index cfbedc2a4ce..a34df1d3d41 100644
--- a/apps/playground-web/src/app/engine/_hooks/useEngineTxStatus.ts
+++ b/apps/playground-web/src/app/engine/_hooks/useEngineTxStatus.ts
@@ -4,7 +4,7 @@ import type { EngineTxStatus } from "../types";
 
 export function useEngineTxStatus(queueId: string | undefined) {
   return useQuery({
-    queryKey: ["engineTxStatus", queueId],
+    enabled: !!queueId,
     queryFn: async () => {
       if (!queueId) throw new Error("No queue ID provided");
       const res = await get_engine_tx_status(queueId);
@@ -13,53 +13,53 @@ export function useEngineTxStatus(queueId: string | undefined) {
       switch (res.status) {
         case "QUEUED": {
           txStatus = {
-            queueId: queueId,
-            status: "queued",
+            cancelledAt: null,
             chainId: res.chain.id.toString(),
-            transactionHash: null,
+            minedAt: null,
             queuedAt: res.createdAt,
+            queueId: queueId,
             sentAt: null,
-            minedAt: null,
-            cancelledAt: null,
+            status: "queued",
+            transactionHash: null,
           };
           break;
         }
         case "SUBMITTED": {
           txStatus = {
-            queueId: queueId,
-            status: "sent",
+            cancelledAt: null,
             chainId: res.chain.id.toString(),
-            transactionHash: null,
+            minedAt: null,
             queuedAt: res.createdAt,
+            queueId: queueId,
             sentAt: res.createdAt,
-            minedAt: null,
-            cancelledAt: null,
+            status: "sent",
+            transactionHash: null,
           };
           break;
         }
         case "CONFIRMED": {
           txStatus = {
-            queueId: queueId,
-            status: "mined",
+            cancelledAt: null,
             chainId: res.chain.id.toString(),
-            transactionHash: res.transactionHash,
+            minedAt: res.confirmedAt,
             queuedAt: res.createdAt,
+            queueId: queueId,
             sentAt: res.confirmedAt,
-            minedAt: res.confirmedAt,
-            cancelledAt: null,
+            status: "mined",
+            transactionHash: res.transactionHash,
           };
           break;
         }
         case "FAILED": {
           txStatus = {
-            queueId: queueId,
-            status: "errored",
+            cancelledAt: res.cancelledAt,
             chainId: res.chain.id.toString(),
-            transactionHash: null,
+            minedAt: null,
             queuedAt: res.createdAt,
+            queueId: queueId,
             sentAt: null,
-            minedAt: null,
-            cancelledAt: res.cancelledAt,
+            status: "errored",
+            transactionHash: null,
           };
           break;
         }
@@ -70,7 +70,7 @@ export function useEngineTxStatus(queueId: string | undefined) {
 
       return txStatus;
     },
-    enabled: !!queueId,
+    queryKey: ["engineTxStatus", queueId],
     refetchInterval(query) {
       const status = query.state.data?.status;
       const isFinalStatus =
@@ -78,27 +78,24 @@ export function useEngineTxStatus(queueId: string | undefined) {
 
       return isFinalStatus ? false : 2000;
     },
-    staleTime: 0,
     retry: false,
+    staleTime: 0,
   });
 }
 
 export function useOptimisticallyUpdateEngineTxStatus() {
   const queryClient = useQueryClient();
 
-  return (params: {
-    chainId: number;
-    queueId: string;
-  }) => {
+  return (params: { chainId: number; queueId: string }) => {
     queryClient.setQueryData(["engineTxStatus", params.queueId], {
-      status: "queued",
+      cancelledAt: null,
       chainId: params.chainId.toString(),
-      queueId: params.queueId,
-      transactionHash: null,
+      minedAt: null,
       queuedAt: new Date().toISOString(),
+      queueId: params.queueId,
       sentAt: null,
-      minedAt: null,
-      cancelledAt: null,
+      status: "queued",
+      transactionHash: null,
     } satisfies EngineTxStatus);
   };
 }
diff --git a/apps/playground-web/src/app/engine/actions.ts b/apps/playground-web/src/app/engine/actions.ts
index aacca6fef93..03a68d2e5ca 100644
--- a/apps/playground-web/src/app/engine/actions.ts
+++ b/apps/playground-web/src/app/engine/actions.ts
@@ -1,10 +1,11 @@
 "use server";
 
-import { Engine, defineChain, encode, getContract } from "thirdweb";
+import { defineChain, Engine, encode, getContract } from "thirdweb";
 import { multicall } from "thirdweb/extensions/common";
 import * as ERC20 from "thirdweb/extensions/erc20";
 import * as ERC1155 from "thirdweb/extensions/erc1155";
 import { THIRDWEB_CLIENT } from "../../lib/client";
+
 const BACKEND_WALLET_ADDRESS = process.env.ENGINE_BACKEND_WALLET as string;
 const ENGINE_VAULT_ACCESS_TOKEN = process.env
   .ENGINE_VAULT_ACCESS_TOKEN as string;
@@ -32,9 +33,9 @@ export async function airdrop_tokens_with_engine(params: {
     params.receivers.map((receiver) =>
       encode(
         ERC20.mintTo({
+          amount: receiver.amount,
           contract,
           to: receiver.toAddress,
-          amount: receiver.amount,
         }),
       ),
     ),
@@ -79,8 +80,8 @@ export async function mint_erc1155_nft_with_engine(params: MintNFTParams) {
       client: THIRDWEB_CLIENT,
     }),
     nft: params.metadataWithSupply.metadata,
-    to: params.toAddress,
     supply: BigInt(params.metadataWithSupply.supply),
+    to: params.toAddress,
   });
   const res = await serverWallet.enqueueTransaction({ transaction: tx });
 
@@ -102,9 +103,9 @@ export async function claim_erc1155_nft_with_engine(params: ClaimNFTParams) {
       chain: defineChain(params.chainId),
       client: THIRDWEB_CLIENT,
     }),
+    quantity: BigInt(params.quantity),
     to: params.receiverAddress,
     tokenId: BigInt(params.tokenId),
-    quantity: BigInt(params.quantity),
   });
   const res = await serverWallet.enqueueTransaction({ transaction: tx });
 
diff --git a/apps/playground-web/src/app/engine/airdrop/_components/airdrop-card.tsx b/apps/playground-web/src/app/engine/airdrop/_components/airdrop-card.tsx
index 1a0abecc68b..d4315175e1c 100644
--- a/apps/playground-web/src/app/engine/airdrop/_components/airdrop-card.tsx
+++ b/apps/playground-web/src/app/engine/airdrop/_components/airdrop-card.tsx
@@ -1,5 +1,8 @@
 "use client";
 
+import { formatDate } from "date-fns";
+import { CheckIcon, ExternalLinkIcon, SendIcon, XIcon } from "lucide-react";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Card,
@@ -9,9 +12,6 @@ import {
   CardTitle,
 } from "@/components/ui/card";
 import { Progress } from "@/components/ui/progress";
-import { formatDate } from "date-fns";
-import { CheckIcon, ExternalLinkIcon, SendIcon, XIcon } from "lucide-react";
-import { useState } from "react";
 import { Spinner } from "../../../../components/ui/Spinner/Spinner";
 import { cn } from "../../../../lib/utils";
 import type { EngineTxStatus } from "../../types";
@@ -78,12 +78,12 @@ export function EngineAirdropCard(props: {
       </CardHeader>
       <CardContent>
         <div className="space-y-4">
-          <Progress value={progressPercentage} className="h-2" />
+          <Progress className="h-2" value={progressPercentage} />
           {airdropState && (
             <AirdropStateInfo
-              txStatus={props.txStatus}
               isAirdropping={props.isAirdropping}
               state={airdropState}
+              txStatus={props.txStatus}
             />
           )}
         </div>
@@ -122,12 +122,12 @@ function getAirdropState(
   if (!txStatus) {
     if (isAirdropping) {
       return {
-        title: "Sending Transaction Request",
         status: "pending",
         timestamp: {
           prefix: "Started at",
           value: new Date().toISOString(),
         },
+        title: "Sending Transaction Request",
       };
     }
     return undefined;
@@ -135,41 +135,41 @@ function getAirdropState(
 
   if (txStatus.status === "queued") {
     return {
-      title: "Transaction queued",
       status: "pending",
       timestamp: {
         prefix: "Queued at",
         value: txStatus.queuedAt as string,
       },
+      title: "Transaction queued",
     };
   }
 
   if (txStatus.status === "sent") {
     return {
-      title: "Transaction sent",
       status: "pending",
       timestamp: {
         prefix: "Sent at",
         value: txStatus.sentAt as string,
       },
+      title: "Transaction sent",
     };
   }
 
   if (txStatus.status === "mined") {
     return {
-      title: "Transaction mined",
       status: "success",
       timestamp: {
         prefix: "Mined at",
         value: txStatus.minedAt as string,
       },
+      title: "Transaction mined",
     };
   }
 
   if (txStatus.status === "cancelled" || txStatus.status === "errored") {
     return {
-      title: "Transaction failed",
       status: "error",
+      title: "Transaction failed",
     };
   }
 
@@ -202,10 +202,10 @@ function AirdropStateInfo(props: {
           <div className="flex items-center text-sm">
             <span className="mr-1 text-muted-foreground">Transaction Hash</span>
             <a
-              target="_blank"
-              rel="noopener noreferrer"
-              href={`${airdropExample.chainExplorer}/tx/${props.txStatus.transactionHash}`}
               className="flex items-center gap-1 font-mono text-muted-foreground underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] hover:text-foreground"
+              href={`${airdropExample.chainExplorer}/tx/${props.txStatus.transactionHash}`}
+              rel="noopener noreferrer"
+              target="_blank"
             >
               {props.txStatus.transactionHash.slice(0, 6)}...
               {props.txStatus.transactionHash.slice(-4)}
diff --git a/apps/playground-web/src/app/engine/airdrop/_components/airdrop-code.tsx b/apps/playground-web/src/app/engine/airdrop/_components/airdrop-code.tsx
index c7c919da575..5bbb0611d9e 100644
--- a/apps/playground-web/src/app/engine/airdrop/_components/airdrop-code.tsx
+++ b/apps/playground-web/src/app/engine/airdrop/_components/airdrop-code.tsx
@@ -36,8 +36,8 @@ export function AirdropCode() {
 const engineAirdropSendCode = `\
 const addresses = ${JSON.stringify(
   airdropExample.receivers.map((x) => ({
-    recipient: x.toAddress,
     amount: x.amount,
+    recipient: x.toAddress,
   })),
   null,
   2,
diff --git a/apps/playground-web/src/app/engine/airdrop/_components/airdrop-preview.tsx b/apps/playground-web/src/app/engine/airdrop/_components/airdrop-preview.tsx
index 3849529ff34..3d72a55e6e7 100644
--- a/apps/playground-web/src/app/engine/airdrop/_components/airdrop-preview.tsx
+++ b/apps/playground-web/src/app/engine/airdrop/_components/airdrop-preview.tsx
@@ -19,8 +19,8 @@ export function EngineAirdropPreview() {
   const airdropMutation = useMutation({
     mutationFn: async () => {
       const response = await airdrop_tokens_with_engine({
-        contractAddress: airdropExample.contractAddress,
         chainId: airdropExample.chainId,
+        contractAddress: airdropExample.contractAddress,
         receivers: airdropExample.receivers,
       });
 
@@ -49,16 +49,16 @@ export function EngineAirdropPreview() {
       <div className="rounded-lg border bg-card">
         <div className="grid md:grid-cols-2">
           <div className="flex flex-col overflow-hidden">
-            <TabName name="Details" icon={InfoIcon} />
+            <TabName icon={InfoIcon} name="Details" />
             <AirdropConfig />
           </div>
           <div className="flex flex-col border-t lg:border-t-0 lg:border-l ">
-            <TabName name="Preview" icon={EyeIcon} />
+            <TabName icon={EyeIcon} name="Preview" />
             <div className="flex grow items-center justify-center px-4 py-10">
               <EngineAirdropCard
-                txStatus={engineTxStatusQuery.data}
                 isAirdropping={airdropMutation.isPending}
                 onStartAirdrop={handleSubmit}
+                txStatus={engineTxStatusQuery.data}
               />
             </div>
           </div>
@@ -87,8 +87,8 @@ function AirdropConfig() {
         <h3 className="mb-2 font-medium">Network</h3>
         <a
           href="https://thirdweb.com/base-sepolia-testnet/"
-          target="_blank"
           rel="noopener noreferrer"
+          target="_blank"
         >
           <Badge variant="secondary">Base Sepolia</Badge>
         </a>
@@ -97,10 +97,10 @@ function AirdropConfig() {
       <div>
         <h3 className="mb-2 font-medium">Token Contract</h3>
         <a
+          className="flex w-full items-center justify-between rounded bg-muted/50 px-3 py-2 font-mono text-sm transition-colors hover:bg-muted"
           href="https://thirdweb.com/base-sepolia-testnet/0xcB30dB8FB977e8b27ae34c86aF16C4F5E428c0bE"
-          target="_blank"
           rel="noopener noreferrer"
-          className="flex w-full items-center justify-between rounded bg-muted/50 px-3 py-2 font-mono text-sm transition-colors hover:bg-muted"
+          target="_blank"
         >
           <span className="truncate">{airdropExample.contractAddress}</span>
           <ExternalLinkIcon className="size-3" />
@@ -114,8 +114,8 @@ function AirdropConfig() {
         <ul className="space-y-2">
           {airdropExample.receivers.map((recipient) => (
             <li
-              key={recipient.toAddress}
               className="flex-1 truncate rounded bg-muted/50 px-3 py-2 font-mono text-sm"
+              key={recipient.toAddress}
             >
               {recipient.toAddress}
             </li>
diff --git a/apps/playground-web/src/app/engine/airdrop/constants.ts b/apps/playground-web/src/app/engine/airdrop/constants.ts
index 1ce71bf4c38..57620c3a076 100644
--- a/apps/playground-web/src/app/engine/airdrop/constants.ts
+++ b/apps/playground-web/src/app/engine/airdrop/constants.ts
@@ -1,11 +1,11 @@
 export const airdropExample = {
-  contractAddress: "0x6E238275023A2575136CF60f655B6B2C0C58b4ac",
+  chainExplorer: "https://base-sepolia.blockscout.com",
   chainId: 84532,
   chainName: "Base Sepolia",
-  chainExplorer: "https://base-sepolia.blockscout.com",
+  contractAddress: "0x6E238275023A2575136CF60f655B6B2C0C58b4ac",
   receivers: [
-    { toAddress: "0x1f91EB653116A43413930c1df0CF5794fCc2D611", amount: "1" },
-    { toAddress: "0xA707E9650631800a635c629e9C8E5937b7277a08", amount: "1" },
-    { toAddress: "0xF1f466c973C197e5D9318F6241C2da31742d3d03", amount: "1" },
+    { amount: "1", toAddress: "0x1f91EB653116A43413930c1df0CF5794fCc2D611" },
+    { amount: "1", toAddress: "0xA707E9650631800a635c629e9C8E5937b7277a08" },
+    { amount: "1", toAddress: "0xF1f466c973C197e5D9318F6241C2da31742d3d03" },
   ],
 };
diff --git a/apps/playground-web/src/app/engine/airdrop/page.tsx b/apps/playground-web/src/app/engine/airdrop/page.tsx
index 71bd9f371b9..ef676f8c77b 100644
--- a/apps/playground-web/src/app/engine/airdrop/page.tsx
+++ b/apps/playground-web/src/app/engine/airdrop/page.tsx
@@ -7,7 +7,6 @@ export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Airdrop"
         description={
           <>
             Engine makes it effortless for any developer to airdrop tokens at
@@ -15,6 +14,7 @@ export default function Page() {
           </>
         }
         docsLink="https://thirdweb-engine.apidocumentation.com/reference#tag/erc20/POST/contract/{chain}/{contractAddress}/erc20/mint-batch-to?utm_source=playground"
+        title="Airdrop"
       >
         <EngineAirdropPreview />
         <div className="h-10" />
diff --git a/apps/playground-web/src/app/engine/minting/_components/mint-preview.tsx b/apps/playground-web/src/app/engine/minting/_components/mint-preview.tsx
index a216f2b8ed6..80b864d62f9 100644
--- a/apps/playground-web/src/app/engine/minting/_components/mint-preview.tsx
+++ b/apps/playground-web/src/app/engine/minting/_components/mint-preview.tsx
@@ -1,5 +1,13 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { CheckIcon, UploadIcon, XIcon } from "lucide-react";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { upload } from "thirdweb/storage";
+import { isAddress, shortenAddress } from "thirdweb/utils";
+import * as z from "zod";
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -12,14 +20,6 @@ import {
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { THIRDWEB_CLIENT } from "@/lib/client";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { CheckIcon, UploadIcon, XIcon } from "lucide-react";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { upload } from "thirdweb/storage";
-import { isAddress, shortenAddress } from "thirdweb/utils";
-import * as z from "zod";
 import { UploadImage } from "../../../../components/blocks/upload-image";
 import { Spinner } from "../../../../components/ui/Spinner/Spinner";
 import { tryCatch } from "../../../../lib/try-catch";
@@ -29,8 +29,21 @@ import type { EngineTxStatus } from "../../types";
 import { mintExample } from "../constants";
 
 const formSchema = z.object({
-  name: z.string().min(1, "Required"),
   description: z.string().optional(),
+  image: z
+    .instanceof(File, {
+      message: "Required",
+    })
+    .refine((file) => {
+      // file must not be larger than 500kb
+      if (file.size > 500 * 1024) {
+        return "Image must not be larger than 500kb";
+      }
+
+      return true;
+    }),
+  name: z.string().min(1, "Required"),
+  supply: z.coerce.number().int("Must be Integer").min(1, "Required"),
   walletAddress: z
     .string()
     .min(1, "Required")
@@ -47,19 +60,6 @@ const formSchema = z.object({
         message: "Invalid wallet address",
       },
     ),
-  supply: z.coerce.number().int("Must be Integer").min(1, "Required"),
-  image: z
-    .instanceof(File, {
-      message: "Required",
-    })
-    .refine((file) => {
-      // file must not be larger than 500kb
-      if (file.size > 500 * 1024) {
-        return "Image must not be larger than 500kb";
-      }
-
-      return true;
-    }),
 });
 
 type FormValues = z.infer<typeof formSchema>;
@@ -67,7 +67,10 @@ type FormValues = z.infer<typeof formSchema>;
 function TransactionStatusIcon({
   status,
   isPending,
-}: { status?: string; isPending: boolean }) {
+}: {
+  status?: string;
+  isPending: boolean;
+}) {
   function getIcon() {
     if (isPending) {
       return <Spinner className="size-4" />;
@@ -99,7 +102,10 @@ function TransactionStatusIcon({
 function TransactionStatusMessage({
   status,
   isPending,
-}: { status?: string; isPending: boolean }) {
+}: {
+  status?: string;
+  isPending: boolean;
+}) {
   if (isPending) {
     return "Sending Transaction Request";
   }
@@ -122,17 +128,20 @@ function TransactionStatusMessage({
 function TransactionHashLink({
   hash,
   explorer,
-}: { hash: string; explorer: string }) {
+}: {
+  hash: string;
+  explorer: string;
+}) {
   const shortHash = `${hash.slice(0, 6)}...${hash.slice(-4)}`;
 
   return (
     <span className="block text-muted-foreground text-sm">
       Transaction Hash:{" "}
       <a
+        className="font-mono underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] hover:text-foreground"
         href={`${explorer}/tx/${hash}`}
-        target="_blank"
         rel="noreferrer"
-        className="font-mono underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] hover:text-foreground"
+        target="_blank"
       >
         {shortHash}
       </a>
@@ -151,17 +160,17 @@ function TransactionStatus({
 }) {
   return (
     <div className="flex items-center gap-2 text-foreground">
-      <TransactionStatusIcon status={status} isPending={isPending} />
+      <TransactionStatusIcon isPending={isPending} status={status} />
 
       <p className="space-y-0.5">
         <span className="block">
-          <TransactionStatusMessage status={status} isPending={isPending} />
+          <TransactionStatusMessage isPending={isPending} status={status} />
         </span>
 
         {transactionHash && (
           <TransactionHashLink
-            hash={transactionHash}
             explorer={mintExample.chainExplorer}
+            hash={transactionHash}
           />
         )}
       </p>
@@ -176,13 +185,13 @@ export function EngineMintPreview() {
   const [hasSentTx, setHasSentTx] = useState(false);
 
   const form = useForm<FormValues>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
-      name: "",
       description: "",
-      walletAddress: "",
+      name: "",
       supply: 1,
+      walletAddress: "",
     },
+    resolver: zodResolver(formSchema),
   });
 
   const mintMutation = useMutation({
@@ -205,17 +214,17 @@ export function EngineMintPreview() {
       }
 
       return mint_erc1155_nft_with_engine({
-        contractAddress: mintExample.contractAddress,
         chainId: mintExample.chainId,
-        toAddress: params.address,
+        contractAddress: mintExample.contractAddress,
         metadataWithSupply: {
           metadata: {
-            name: params.name,
             description: params.description,
             image: uploadResult.data,
+            name: params.name,
           },
           supply: params.supply,
         },
+        toAddress: params.address,
       });
     },
   });
@@ -224,22 +233,22 @@ export function EngineMintPreview() {
     setHasSentTx(true);
     const result = await mintMutation.mutateAsync({
       address: data.walletAddress,
-      name: data.name,
       description: data.description || "",
       image: data.image,
+      name: data.name,
       supply: data.supply.toString(),
     });
 
     // optimistic update
     queryClient.setQueryData(["engineTxStatus", result], {
-      status: "queued",
+      cancelledAt: null,
       chainId: mintExample.chainId.toString(),
-      queueId: result,
-      transactionHash: null,
+      minedAt: null,
       queuedAt: new Date().toISOString(),
+      queueId: result,
       sentAt: null,
-      minedAt: null,
-      cancelledAt: null,
+      status: "queued",
+      transactionHash: null,
     } satisfies EngineTxStatus);
 
     setQueueId(result);
@@ -251,10 +260,10 @@ export function EngineMintPreview() {
       <p className="mb-4 text-muted-foreground">
         Mint ERC1155 NFTs in{" "}
         <a
-          href={`https://thirdweb.com/${mintExample.chainId}/${mintExample.contractAddress}`}
-          target="_blank"
           className="font-mono underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] hover:text-foreground"
+          href={`https://thirdweb.com/${mintExample.chainId}/${mintExample.contractAddress}`}
           rel="noopener noreferrer"
+          target="_blank"
         >
           {shortenAddress(mintExample.contractAddress)}
         </a>{" "}
@@ -263,7 +272,7 @@ export function EngineMintPreview() {
 
       <div className="w-full rounded-lg border bg-card">
         <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+          <form className="space-y-6" onSubmit={form.handleSubmit(onSubmit)}>
             <div className="space-y-6 p-4 lg:p-6">
               <div className="space-y-4">
                 <div className="flex flex-col gap-6 lg:flex-row">
@@ -276,11 +285,10 @@ export function EngineMintPreview() {
                         <FormLabel>Image</FormLabel>
                         <FormControl>
                           <UploadImage
-                            id="image"
+                            className="w-full bg-background lg:w-[300px]"
                             onImageUpload={(file) =>
                               form.setValue("image", file)
                             }
-                            className="w-full bg-background lg:w-[300px]"
                           />
                         </FormControl>
                         <FormMessage />
@@ -327,8 +335,8 @@ export function EngineMintPreview() {
                             <FormLabel>Receiver Address</FormLabel>
                             <FormControl>
                               <Input
-                                placeholder="0x..."
                                 className="font-mono"
+                                placeholder="0x..."
                                 {...field}
                               />
                             </FormControl>
@@ -344,7 +352,7 @@ export function EngineMintPreview() {
                           <FormItem className="lg:w-32">
                             <FormLabel>Supply</FormLabel>
                             <FormControl>
-                              <Input type="number" min="1" {...field} />
+                              <Input min="1" type="number" {...field} />
                             </FormControl>
                             <FormMessage />
                           </FormItem>
@@ -358,16 +366,16 @@ export function EngineMintPreview() {
 
             <div className="flex items-center justify-between gap-6 border-t p-4 lg:p-6">
               <TransactionStatus
-                status={engineTxStatusQuery.data?.status}
                 isPending={mintMutation.isPending}
+                status={engineTxStatusQuery.data?.status}
                 transactionHash={engineTxStatusQuery.data?.transactionHash}
               />
 
               {!hasSentTx && (
                 <Button
-                  type="submit"
-                  disabled={mintMutation.isPending}
                   className="min-w-36 gap-2"
+                  disabled={mintMutation.isPending}
+                  type="submit"
                 >
                   {mintMutation.isPending ? (
                     <Spinner className="size-4" />
diff --git a/apps/playground-web/src/app/engine/minting/constants.ts b/apps/playground-web/src/app/engine/minting/constants.ts
index 16db77bedfb..57ad6060076 100644
--- a/apps/playground-web/src/app/engine/minting/constants.ts
+++ b/apps/playground-web/src/app/engine/minting/constants.ts
@@ -1,6 +1,6 @@
 export const mintExample = {
-  contractAddress: "0x8a4E14591088bBce4a4Dcfa677C1af78d336d6FB",
+  chainExplorer: "https://base-sepolia.blockscout.com",
   chainId: 84532,
   chainName: "Base Sepolia",
-  chainExplorer: "https://base-sepolia.blockscout.com",
+  contractAddress: "0x8a4E14591088bBce4a4Dcfa677C1af78d336d6FB",
 };
diff --git a/apps/playground-web/src/app/engine/minting/page.tsx b/apps/playground-web/src/app/engine/minting/page.tsx
index f44c05d9b9c..e3a4e6db846 100644
--- a/apps/playground-web/src/app/engine/minting/page.tsx
+++ b/apps/playground-web/src/app/engine/minting/page.tsx
@@ -7,7 +7,6 @@ export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Mint Dynamic NFTs"
         description={
           <>
             Allow your users to mint new tokens into any given contract. You
@@ -15,6 +14,7 @@ export default function Page() {
           </>
         }
         docsLink="https://thirdweb-engine.apidocumentation.com/reference#tag/erc1155/POST/contract/{chain}/{contractAddress}/erc1155/mint-to?utm_source=playground"
+        title="Mint Dynamic NFTs"
       >
         <EngineMintPreview />
         <div className="h-10" />
diff --git a/apps/playground-web/src/app/engine/webhooks/_components/webhooks-preview.tsx b/apps/playground-web/src/app/engine/webhooks/_components/webhooks-preview.tsx
index d2a6ede505d..4f33829a297 100644
--- a/apps/playground-web/src/app/engine/webhooks/_components/webhooks-preview.tsx
+++ b/apps/playground-web/src/app/engine/webhooks/_components/webhooks-preview.tsx
@@ -1,5 +1,13 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
+import { Code2Icon, ExternalLinkIcon, PlayIcon, RssIcon } from "lucide-react";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { MediaRenderer } from "thirdweb/react";
+import { isAddress, shortenAddress } from "thirdweb/utils";
+import * as z from "zod";
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -11,18 +19,10 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
-import { Code2Icon, ExternalLinkIcon, PlayIcon, RssIcon } from "lucide-react";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { MediaRenderer } from "thirdweb/react";
-import { isAddress, shortenAddress } from "thirdweb/utils";
-import * as z from "zod";
 import CodeClient from "../../../../components/code/code.client";
 import { LoadingDots } from "../../../../components/ui/LoadingDots";
-import { Spinner } from "../../../../components/ui/Spinner/Spinner";
 import { Label } from "../../../../components/ui/label";
+import { Spinner } from "../../../../components/ui/Spinner/Spinner";
 import { THIRDWEB_CLIENT } from "../../../../lib/client";
 import { useEngineTxStatus } from "../../_hooks/useEngineTxStatus";
 import { claim_erc1155_nft_with_engine } from "../../actions";
@@ -50,20 +50,20 @@ export function EngineWebhooksPreview() {
   const engineTxStatusQuery = useEngineTxStatus(queueId);
 
   const form = useForm<z.infer<typeof formSchema>>({
-    resolver: zodResolver(formSchema),
     defaultValues: {
       receiverAddress: "",
     },
+    resolver: zodResolver(formSchema),
   });
 
   const claimMutation = useMutation({
     mutationFn: async (address: string) => {
       const response = await claim_erc1155_nft_with_engine({
-        contractAddress: claimExample.contractAddress,
         chainId: claimExample.chainId,
+        contractAddress: claimExample.contractAddress,
+        quantity: 1,
         receiverAddress: address,
         tokenId: claimExample.tokenId,
-        quantity: 1,
       });
       return response;
     },
@@ -77,11 +77,11 @@ export function EngineWebhooksPreview() {
   return (
     <div className="grid w-full grid-cols-1 rounded-lg border bg-card lg:grid-cols-[500px_1fr]">
       <div>
-        <TabName name="Claim NFT" icon={PlayIcon} />
+        <TabName icon={PlayIcon} name="Claim NFT" />
         <Form {...form}>
           <form
-            onSubmit={form.handleSubmit(onSubmit)}
             className="w-full space-y-6 p-6"
+            onSubmit={form.handleSubmit(onSubmit)}
           >
             {/* contract & Network */}
             <div className="space-y-1">
@@ -89,8 +89,8 @@ export function EngineWebhooksPreview() {
               <a
                 className="flex items-center gap-2 font-mono text-muted-foreground text-sm underline decoration-muted-foreground/50 underline-offset-4 hover:text-foreground"
                 href={`https://thirdweb.com/${claimExample.chainId}/${claimExample.contractAddress}`}
-                target="_blank"
                 rel="noreferrer"
+                target="_blank"
               >
                 {shortenAddress(claimExample.contractAddress)}{" "}
                 <ExternalLinkIcon className="size-3" />
@@ -100,12 +100,12 @@ export function EngineWebhooksPreview() {
             <div className="space-y-1">
               <Label htmlFor="receiver-address">NFT</Label>
               <MediaRenderer
+                className="aspect-square w-48 rounded-lg border"
                 client={THIRDWEB_CLIENT}
                 src={claimExample.mediaURI}
-                className="aspect-square w-48 rounded-lg border"
                 style={{
-                  width: "192px",
                   height: "192px",
+                  width: "192px",
                 }}
               />
             </div>
@@ -128,9 +128,9 @@ export function EngineWebhooksPreview() {
             />
 
             <Button
-              type="submit"
-              disabled={claimMutation.isPending}
               className="w-full gap-2"
+              disabled={claimMutation.isPending}
+              type="submit"
             >
               {claimMutation.isPending && <Spinner className="size-4" />}
               Claim NFT
@@ -140,18 +140,18 @@ export function EngineWebhooksPreview() {
       </div>
 
       <div className="flex min-h-[400px] grow flex-col border-t lg:border-t-0 lg:border-l">
-        <TabName name="Webhook payload" icon={Code2Icon} />
+        <TabName icon={Code2Icon} name="Webhook payload" />
         {engineTxStatusQuery.data ? (
           <div className="flex grow flex-col">
             <CodeClient
-              lang="json"
+              className="grow rounded-none border-none"
               code={JSON.stringify(engineTxStatusQuery.data, null, 2)}
+              lang="json"
               loader={
                 <div className="flex grow items-center justify-center">
                   <LoadingDots />
                 </div>
               }
-              className="grow rounded-none border-none"
               scrollableContainerClassName="h-full"
             />
           </div>
diff --git a/apps/playground-web/src/app/engine/webhooks/constants.ts b/apps/playground-web/src/app/engine/webhooks/constants.ts
index 77ee0930957..f89585f011b 100644
--- a/apps/playground-web/src/app/engine/webhooks/constants.ts
+++ b/apps/playground-web/src/app/engine/webhooks/constants.ts
@@ -1,9 +1,9 @@
 export const claimExample = {
-  // todo change all this
-  contractAddress: "0x688fab2D5C97FDf3ef871db952611100aa1cD69b",
-  tokenId: "0",
+  chainExplorer: "https://base-sepolia.blockscout.com",
   chainId: 84532,
   chainName: "Base Sepolia",
-  chainExplorer: "https://base-sepolia.blockscout.com",
+  // todo change all this
+  contractAddress: "0x688fab2D5C97FDf3ef871db952611100aa1cD69b",
   mediaURI: "ipfs://Qmdmn8kbpLyT7XS8spbawfbkye1JV68kHfJPJe95YW9MNK/0.png",
+  tokenId: "0",
 };
diff --git a/apps/playground-web/src/app/engine/webhooks/page.tsx b/apps/playground-web/src/app/engine/webhooks/page.tsx
index ea6bb8b540f..3fd85879759 100644
--- a/apps/playground-web/src/app/engine/webhooks/page.tsx
+++ b/apps/playground-web/src/app/engine/webhooks/page.tsx
@@ -6,7 +6,6 @@ export default function Page() {
   return (
     <ThirdwebProvider>
       <PageLayout
-        title="Webhooks"
         description={
           <>
             Configure webhooks in Engine to notify your backend server of
@@ -14,6 +13,7 @@ export default function Page() {
           </>
         }
         docsLink="https://portal.thirdweb.com/engine/features/webhooks?utm_source=playground"
+        title="Webhooks"
       >
         <EngineWebhooksPreview />
       </PageLayout>
diff --git a/apps/playground-web/src/app/hooks/chains.ts b/apps/playground-web/src/app/hooks/chains.ts
index 45de3cc93fc..abb7ca51506 100644
--- a/apps/playground-web/src/app/hooks/chains.ts
+++ b/apps/playground-web/src/app/hooks/chains.ts
@@ -16,7 +16,6 @@ async function fetchChainsFromApi() {
 
 export function useAllChainsData() {
   const query = useQuery({
-    queryKey: ["all-chains"],
     queryFn: async () => {
       const idToChain = new Map<number, ChainMetadata>();
       const chains = await fetchChainsFromApi();
@@ -30,10 +29,11 @@ export function useAllChainsData() {
         idToChain,
       };
     },
+    queryKey: ["all-chains"],
   });
 
   return {
-    isPending: query.isLoading,
     data: query.data || { allChains: [], idToChain: new Map() },
+    isPending: query.isLoading,
   };
 }
diff --git a/apps/playground-web/src/app/insight/[blueprint_slug]/aggregate-parameter-input.client.tsx b/apps/playground-web/src/app/insight/[blueprint_slug]/aggregate-parameter-input.client.tsx
index 1f58fc34be9..79c8a4f3436 100644
--- a/apps/playground-web/src/app/insight/[blueprint_slug]/aggregate-parameter-input.client.tsx
+++ b/apps/playground-web/src/app/insight/[blueprint_slug]/aggregate-parameter-input.client.tsx
@@ -1,5 +1,8 @@
 "use client";
 
+import { InfoIcon, SearchIcon } from "lucide-react";
+import { useMemo, useState } from "react";
+import type { ControllerRenderProps } from "react-hook-form";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
@@ -10,9 +13,6 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { Textarea } from "@/components/ui/textarea";
-import { InfoIcon, SearchIcon } from "lucide-react";
-import { useMemo, useState } from "react";
-import type { ControllerRenderProps } from "react-hook-form";
 
 interface Preset {
   id: string;
@@ -176,10 +176,10 @@ const BLOCKS_PRESETS: Preset[] = [
 ];
 
 const ENDPOINT_SPECIFIC_PRESETS: Record<string, Preset[]> = {
+  "/v1/blocks": BLOCKS_PRESETS,
+  "/v1/events": EVENTS_PRESETS,
   "/v1/transactions": GENERAL_TRANSACTIONS_PRESETS,
   "/v1/wallets/{wallet_address}/transactions": WALLET_TRANSACTIONS_PRESETS,
-  "/v1/events": EVENTS_PRESETS,
-  "/v1/blocks": BLOCKS_PRESETS,
   // Add more endpoint paths and their specific presets here
 };
 
@@ -263,18 +263,18 @@ export function AggregateParameterInput({
 
   return (
     <div className="relative w-full">
-      <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
+      <Popover onOpenChange={setIsPopoverOpen} open={isPopoverOpen}>
         <PopoverTrigger asChild>
           <Button
-            variant="ghost"
             className="-ml-1 w-full justify-start border-0 border-none bg-transparent font-mono text-muted-foreground shadow-none hover:bg-transparent hover:text-muted-foreground focus:ring-0 focus:ring-offset-0"
+            variant="ghost"
           >
             <span className="truncate">{getButtonText()}</span>
           </Button>
         </PopoverTrigger>
         <PopoverContent
-          className="w-[calc(100vw-2rem)] p-0 sm:w-[32rem]"
           align="center"
+          className="w-[calc(100vw-2rem)] p-0 sm:w-[32rem]"
           onOpenAutoFocus={(e) => e.preventDefault()}
         >
           <div className="space-y-4 p-4">
@@ -288,12 +288,11 @@ export function AggregateParameterInput({
                 )}
               </div>
               <Textarea
-                id="aggregate-textarea"
-                placeholder={placeholder}
-                value={(value as string) || ""}
-                onChange={handleTextareaChange}
                 className="min-h-[100px] font-mono text-sm"
+                onChange={handleTextareaChange}
+                placeholder={placeholder}
                 spellCheck={false}
+                value={(value as string) || ""}
               />
             </div>
 
@@ -302,11 +301,11 @@ export function AggregateParameterInput({
                 <div className="relative w-full">
                   <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-2.5 h-4 w-4 text-muted-foreground" />
                   <Input
-                    type="search"
-                    placeholder="Search presets..."
                     className="h-8 pl-8 text-sm"
-                    value={searchTerm}
                     onChange={(e) => setSearchTerm(e.target.value)}
+                    placeholder="Search presets..."
+                    type="search"
+                    value={searchTerm}
                   />
                 </div>
               </div>
@@ -315,21 +314,21 @@ export function AggregateParameterInput({
                 {filteredPresets.length > 0 ? (
                   <div className="divide-y">
                     {filteredPresets.map((preset) => (
-                      <div key={preset.id} className="p-3 hover:bg-accent/50">
+                      <div className="p-3 hover:bg-accent/50" key={preset.id}>
                         <div className="flex items-start space-x-3">
                           <Checkbox
-                            id={preset.id}
                             checked={selectedPresets.includes(preset.id)}
+                            className="mt-1 h-4 w-4 rounded"
+                            id={preset.id}
                             onCheckedChange={() =>
                               handlePresetToggle(preset.id)
                             }
-                            className="mt-1 h-4 w-4 rounded"
                           />
                           <div className="flex-1 space-y-1">
                             <div className="flex items-center">
                               <Label
-                                htmlFor={preset.id}
                                 className="cursor-pointer font-medium text-sm leading-none"
+                                htmlFor={preset.id}
                               >
                                 {preset.label}
                               </Label>
diff --git a/apps/playground-web/src/app/insight/[blueprint_slug]/blueprint-playground.client.tsx b/apps/playground-web/src/app/insight/[blueprint_slug]/blueprint-playground.client.tsx
index 7555eec0980..a94bf9491b5 100644
--- a/apps/playground-web/src/app/insight/[blueprint_slug]/blueprint-playground.client.tsx
+++ b/apps/playground-web/src/app/insight/[blueprint_slug]/blueprint-playground.client.tsx
@@ -1,20 +1,4 @@
 "use client";
-import { CodeClient, CodeLoading } from "@/components/code/code.client";
-import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Form, FormField, FormItem, FormMessage } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
 import {
@@ -33,6 +17,22 @@ import {
   useForm,
 } from "react-hook-form";
 import { z } from "zod";
+import { CodeClient, CodeLoading } from "@/components/code/code.client";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Form, FormField, FormItem, FormMessage } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { ScrollShadow } from "@/components/ui/ScrollShadow/ScrollShadow";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
 import { MultiNetworkSelector } from "../../../components/blocks/NetworkSelectors";
 import type { BlueprintParameter, BlueprintPathMetadata } from "../utils";
 import { AggregateParameterInput } from "./aggregate-parameter-input.client";
@@ -55,14 +55,14 @@ export function BlueprintPlayground(props: {
       const start = performance.now();
       try {
         const res = await fetch(url, {
-          signal: controller.signal,
           headers: {
             "x-client-id": props.clientId,
           },
+          signal: controller.signal,
         });
         return {
-          status: res.status,
           data: await res.text(),
+          status: res.status,
           time: performance.now() - start,
         };
       } catch (e) {
@@ -83,24 +83,24 @@ export function BlueprintPlayground(props: {
 
   return (
     <BlueprintPlaygroundUI
+      abortRequest={() => {
+        if (abortController) {
+          // just abort it - don't set a new controller
+          abortController.abort();
+        }
+      }}
       backLink={props.backLink}
       clientId={props.clientId}
-      metadata={props.metadata}
+      domain={props.domain}
       isPending={requestMutation.isPending}
+      metadata={props.metadata}
       onRun={(url) => {
         requestMutation.mutate(url);
       }}
+      path={props.path}
       response={
         abortController?.signal.aborted ? undefined : requestMutation.data
       }
-      abortRequest={() => {
-        if (abortController) {
-          // just abort it - don't set a new controller
-          abortController.abort();
-        }
-      }}
-      domain={props.domain}
-      path={props.path}
       supportedChainIds={props.supportedChainIds}
     />
   );
@@ -180,18 +180,18 @@ function BlueprintPlaygroundUI(props: {
   }, [parameters]);
 
   const form = useForm<z.infer<typeof formSchema>>({
-    resolver: zodResolver(formSchema),
     defaultValues: defaultValues,
+    resolver: zodResolver(formSchema),
   });
 
   function onSubmit(values: z.infer<typeof formSchema>) {
     const url = createBlueprintUrl({
-      parameters: parameters,
-      values: values,
       clientId: props.clientId,
       domain: props.domain,
-      path: props.path,
       intent: "run",
+      parameters: parameters,
+      path: props.path,
+      values: values,
     });
 
     props.onRun(url);
@@ -204,29 +204,29 @@ function BlueprintPlaygroundUI(props: {
           <div className="flex grow flex-col">
             <div className="flex grow flex-col overflow-hidden rounded-xl border bg-card">
               <PlaygroundHeader
+                clientId={props.clientId}
                 domain={props.domain}
+                getFormValues={() => form.getValues()}
+                isPending={props.isPending}
                 parameters={parameters}
                 path={props.path}
-                isPending={props.isPending}
-                getFormValues={() => form.getValues()}
-                clientId={props.clientId}
               />
               <div className="grid grow grid-cols-1 lg:grid-cols-2">
                 <div className="flex max-h-[500px] grow flex-col max-sm:border-b lg:max-h-[740px] lg:border-r">
                   <RequestConfigSection
                     domain={props.domain}
+                    form={form}
                     parameters={parameters}
                     path={props.path}
-                    form={form}
                     supportedChainIds={props.supportedChainIds}
                   />
                 </div>
 
                 <div className="flex h-[500px] grow flex-col lg:h-[740px]">
                   <ResponseSection
+                    abortRequest={props.abortRequest}
                     isPending={props.isPending}
                     response={props.response}
-                    abortRequest={props.abortRequest}
                   />
                 </div>
               </div>
@@ -253,17 +253,16 @@ function PlaygroundHeader(props: {
         <div className="flex items-center gap-2 overflow-hidden rounded-xl border bg-muted/50 p-2 lg:justify-center">
           {/* copy url */}
           <Button
-            variant="ghost"
             className="hover:accent h-auto w-auto p-1"
             onClick={() => {
               setHasCopied(true);
               const url = createBlueprintUrl({
                 clientId: props.clientId,
-                parameters: props.parameters,
                 domain: props.domain,
+                intent: "copy",
+                parameters: props.parameters,
                 path: props.path,
                 values: props.getFormValues(),
-                intent: "copy",
               });
 
               setTimeout(() => {
@@ -271,6 +270,7 @@ function PlaygroundHeader(props: {
               }, 500);
               navigator.clipboard.writeText(url);
             }}
+            variant="ghost"
           >
             {hasCopied ? (
               <CheckIcon className="size-4 text-green-500" />
@@ -309,10 +309,10 @@ function PlaygroundHeader(props: {
         </div>
 
         <Button
-          size="sm"
           className="gap-2 rounded-lg lg:hidden"
-          type="submit"
           disabled={props.isPending}
+          size="sm"
+          type="submit"
         >
           {props.isPending ? (
             <Spinner className="size-4" />
@@ -353,9 +353,9 @@ function RequestConfigSection(props: {
     }
 
     return {
+      filterQueryParams,
       pathVariables,
       queryParams,
-      filterQueryParams,
     };
   }, [props.parameters]);
 
@@ -377,36 +377,36 @@ function RequestConfigSection(props: {
       <ScrollShadow className="flex-1" scrollableClassName="max-h-full">
         {pathVariables.length > 0 && (
           <ParameterSection
-            parameters={pathVariables}
             className="border-b"
-            title="Path Variables"
-            form={props.form}
             domain={props.domain}
+            form={props.form}
+            parameters={pathVariables}
             path={props.path}
             supportedChainIds={props.supportedChainIds}
+            title="Path Variables"
           />
         )}
 
         {queryParams.length > 0 && (
           <ParameterSection
             className="border-b"
-            parameters={queryParams}
-            title="Query Parameters"
-            form={props.form}
             domain={props.domain}
+            form={props.form}
+            parameters={queryParams}
             path={props.path}
             supportedChainIds={props.supportedChainIds}
+            title="Query Parameters"
           />
         )}
 
         {filterQueryParams.length > 0 && (
           <ParameterSection
-            parameters={filterQueryParams}
-            title="Filter Query Parameters"
-            form={props.form}
             domain={props.domain}
+            form={props.form}
+            parameters={filterQueryParams}
             path={props.path}
             supportedChainIds={props.supportedChainIds}
+            title="Filter Query Parameters"
           />
         )}
       </ScrollShadow>
@@ -452,8 +452,8 @@ function ParameterSection(props: {
 
           return (
             <FormField
-              key={param.name}
               control={props.form.control}
+              key={param.name}
               name={param.name}
               render={({ field }) => (
                 <FormItem
@@ -463,13 +463,13 @@ function ParameterSection(props: {
                   )}
                 >
                   <div
-                    key={param.name}
                     className={cn(
                       "grid items-center",
                       param.name === "chain_id"
                         ? "grid-cols-1 lg:grid-cols-2"
                         : "grid-cols-2",
                     )}
+                    key={param.name}
                   >
                     <div className="flex h-full flex-row flex-wrap items-center justify-between gap-1 border-r px-3 py-2">
                       <div className="font-medium font-mono text-sm">
@@ -487,42 +487,42 @@ function ParameterSection(props: {
                     <div className="relative">
                       {param.name === "chain_id" ? (
                         <MultiNetworkSelector
-                          selectedBadgeClassName="bg-background"
-                          selectedChainIds={
-                            props.form.watch("chain_id") as number[]
+                          chainIds={
+                            props.supportedChainIds.length > 0
+                              ? props.supportedChainIds
+                              : undefined
                           }
+                          className="rounded-none border-0 border-t lg:border-none"
                           onChange={(chainIds) => {
                             props.form.setValue("chain_id", chainIds, {
-                              shouldValidate: true,
                               shouldDirty: true,
+                              shouldValidate: true,
                             });
                           }}
-                          className="rounded-none border-0 border-t lg:border-none"
                           popoverContentClassName="min-w-[calc(100vw-20px)] lg:min-w-[500px]"
-                          chainIds={
-                            props.supportedChainIds.length > 0
-                              ? props.supportedChainIds
-                              : undefined
+                          selectedBadgeClassName="bg-background"
+                          selectedChainIds={
+                            props.form.watch("chain_id") as number[]
                           }
                         />
                       ) : !Array.isArray(field.value) ? (
                         <>
                           <ParameterInput
-                            param={param}
+                            endpointPath={props.path}
                             field={{
                               ...field,
                               value: field.value,
                             }}
-                            showTip={showTip}
                             hasError={hasError}
+                            param={param}
                             placeholder={param.description || param.name}
-                            endpointPath={props.path}
+                            showTip={showTip}
                           />
 
                           {showTip && (
                             <ToolTipLabel
-                              hoverable
                               contentClassName="max-w-[100vw] break-all"
+                              hoverable
                               label={
                                 <div className="flex flex-col gap-2">
                                   {description && (
@@ -550,8 +550,8 @@ function ParameterSection(props: {
                             >
                               <Button
                                 asChild
-                                variant="ghost"
                                 className="-translate-y-1/2 absolute top-1/2 right-2 hidden h-auto w-auto p-1.5 text-muted-foreground opacity-50 hover:opacity-100 lg:flex"
+                                variant="ghost"
                               >
                                 <div>
                                   <InfoIcon className="size-4" />
@@ -594,17 +594,17 @@ function ParameterInput(props: {
     return (
       <Select
         {...restField}
-        value={value.toString()}
         onValueChange={(v) => {
           onChange({ target: { value: v } });
         }}
+        value={value.toString()}
       >
         <SelectTrigger
+          chevronClassName="hidden"
           className={cn(
             "border-none bg-transparent pr-10 font-mono focus:ring-0 focus:ring-offset-0",
             value === "" && "text-muted-foreground",
           )}
-          chevronClassName="hidden"
         >
           <SelectValue placeholder="Select" />
         </SelectTrigger>
@@ -612,7 +612,7 @@ function ParameterInput(props: {
         <SelectContent className="font-mono">
           {param.schema.enum.map((val) => {
             return (
-              <SelectItem value={val} key={val}>
+              <SelectItem key={val} value={val}>
                 {val}
               </SelectItem>
             );
@@ -625,10 +625,10 @@ function ParameterInput(props: {
   if (param.name === "aggregate") {
     return (
       <AggregateParameterInput
+        endpointPath={props.endpointPath}
         field={field}
-        showTip={showTip}
         placeholder={placeholder}
-        endpointPath={props.endpointPath}
+        showTip={showTip}
       />
     );
   }
@@ -698,7 +698,7 @@ function ResponseSection(props: {
       {props.isPending && (
         <div className="flex grow flex-col items-center justify-center gap-4">
           <Spinner className="size-14 text-muted-foreground" />
-          <Button variant="ghost" onClick={props.abortRequest} size="sm">
+          <Button onClick={props.abortRequest} size="sm" variant="ghost">
             Cancel
           </Button>
         </div>
@@ -721,12 +721,12 @@ function ResponseSection(props: {
 
       {!props.isPending && props.response && (
         <CodeClient
-          loader={<CodeLoading />}
-          lang="json"
-          code={formattedData || ""}
           className="rounded-none border-none bg-transparent"
-          scrollableContainerClassName="h-full"
+          code={formattedData || ""}
+          lang="json"
+          loader={<CodeLoading />}
           scrollableClassName="h-full"
+          scrollableContainerClassName="h-full"
           // shadowColor="hsl(var(--muted)/50%)"
         />
       )}
@@ -805,7 +805,7 @@ function openAPIV3ParamToZodFormSchema(
 
     case "array": {
       if ("type" in schema.items) {
-        let itemSchema: z.ZodTypeAny | undefined = undefined;
+        let itemSchema: z.ZodTypeAny | undefined;
         if (schema.items.type === "number") {
           itemSchema = z.number();
         } else if (schema.items.type === "integer") {
diff --git a/apps/playground-web/src/app/insight/[blueprint_slug]/page.tsx b/apps/playground-web/src/app/insight/[blueprint_slug]/page.tsx
index f11aad927ae..03483618d08 100644
--- a/apps/playground-web/src/app/insight/[blueprint_slug]/page.tsx
+++ b/apps/playground-web/src/app/insight/[blueprint_slug]/page.tsx
@@ -1,3 +1,4 @@
+import { redirect } from "next/navigation";
 import { Badge } from "@/components/ui/badge";
 import {
   Breadcrumb,
@@ -7,7 +8,6 @@ import {
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
 import { cn } from "@/lib/utils";
-import { redirect } from "next/navigation";
 import { THIRDWEB_CLIENT } from "../../../lib/client";
 import { isProd } from "../../../lib/env";
 import { fetchBlueprintSpec } from "../utils";
@@ -64,7 +64,7 @@ export default async function Page(props: {
             {title}
           </span>
           {pathMetadata.deprecated && (
-            <Badge variant="destructive" className="text-xs">
+            <Badge className="text-xs" variant="destructive">
               Deprecated
             </Badge>
           )}
@@ -78,13 +78,13 @@ export default async function Page(props: {
         </div>
       )}
       <BlueprintPlayground
-        key={searchParams.path}
-        metadata={pathMetadata}
         backLink={"/insight"}
         clientId={THIRDWEB_CLIENT.clientId}
+        domain={domain}
+        key={searchParams.path}
+        metadata={pathMetadata}
         path={searchParams.path}
         supportedChainIds={supportedChainIds}
-        domain={domain}
       />
     </div>
   );
diff --git a/apps/playground-web/src/app/insight/insightBlueprints.ts b/apps/playground-web/src/app/insight/insightBlueprints.ts
index 2c5b3a4b680..d6acb3f39b8 100644
--- a/apps/playground-web/src/app/insight/insightBlueprints.ts
+++ b/apps/playground-web/src/app/insight/insightBlueprints.ts
@@ -7,19 +7,19 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Events",
     paths: [
       {
+        deprecated: false,
         name: "Get events",
         path: "/v1/events",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get contract events",
         path: "/v1/events/{contractAddress}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get contract events with specific signature",
         path: "/v1/events/{contractAddress}/{signature}",
-        deprecated: false,
       },
     ],
   },
@@ -28,19 +28,19 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Transactions",
     paths: [
       {
+        deprecated: false,
         name: "Get transactions",
         path: "/v1/transactions",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get contract transactions",
         path: "/v1/transactions/{contractAddress}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get contract transactions with specific signature",
         path: "/v1/transactions/{contractAddress}/{signature}",
-        deprecated: false,
       },
     ],
   },
@@ -49,9 +49,9 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Blocks",
     paths: [
       {
+        deprecated: false,
         name: "Get blocks",
         path: "/v1/blocks",
-        deprecated: false,
       },
     ],
   },
@@ -60,59 +60,59 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Tokens",
     paths: [
       {
+        deprecated: false,
         name: "Get token owners by contract",
         path: "/v1/tokens/owners",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get token transfers by transaction",
         path: "/v1/tokens/transfers/transaction/{transaction_hash}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get token transfers by contract",
         path: "/v1/tokens/transfers/{contract_address}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get token transfers",
         path: "/v1/tokens/transfers",
-        deprecated: false,
       },
       {
+        deprecated: true,
         name: "Get ERC-20 balances by address",
         path: "/v1/tokens/erc20/{ownerAddress}",
-        deprecated: true,
       },
       {
+        deprecated: false,
         name: "Get tokens",
         path: "/v1/tokens",
-        deprecated: false,
       },
       {
+        deprecated: true,
         name: "Get ERC-721 balances by address",
         path: "/v1/tokens/erc721/{ownerAddress}",
-        deprecated: true,
       },
       {
+        deprecated: true,
         name: "Get ERC-1155 balances by address",
         path: "/v1/tokens/erc1155/{ownerAddress}",
-        deprecated: true,
       },
       {
+        deprecated: false,
         name: "Get supported tokens for price data",
         path: "/v1/tokens/price/supported",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get token price",
         path: "/v1/tokens/price",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Token lookup",
         path: "/v1/tokens/lookup",
-        deprecated: false,
       },
     ],
   },
@@ -121,69 +121,69 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Nfts",
     paths: [
       {
+        deprecated: false,
         name: "Get NFT balances by address",
         path: "/v1/nfts/balance/{ownerAddress}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get collection",
         path: "/v1/nfts/collections/{contract_address}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFTs",
         path: "/v1/nfts",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFT owners by contract",
         path: "/v1/nfts/owners/{contract_address}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFT owners by token",
         path: "/v1/nfts/owners/{contract_address}/{token_id}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFT transfers",
         path: "/v1/nfts/transfers",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFT transfers by transaction",
         path: "/v1/nfts/transfers/transaction/{transaction_hash}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFT transfers by contract",
         path: "/v1/nfts/transfers/{contract_address}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFTs by contract",
         path: "/v1/nfts/{contract_address}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFT transfers by token",
         path: "/v1/nfts/transfers/{contract_address}/{token_id}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get NFT by token ID",
         path: "/v1/nfts/{contract_address}/{token_id}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Force refresh collection metadata",
         path: "/v1/nfts/metadata/refresh/{contract_address}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Force refresh token metadata",
         path: "/v1/nfts/metadata/refresh/{contract_address}/{token_id}",
-        deprecated: false,
       },
     ],
   },
@@ -192,9 +192,9 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Wallets",
     paths: [
       {
+        deprecated: false,
         name: "Get wallet transactions",
         path: "/v1/wallets/{wallet_address}/transactions",
-        deprecated: false,
       },
     ],
   },
@@ -203,14 +203,14 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Contracts",
     paths: [
       {
+        deprecated: false,
         name: "Get contract ABI​",
         path: "/v1/contracts/abi/{contractAddress}",
-        deprecated: false,
       },
       {
+        deprecated: false,
         name: "Get contract metadata​",
         path: "/v1/contracts/metadata/{contractAddress}",
-        deprecated: false,
       },
     ],
   },
@@ -219,9 +219,9 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Decode",
     paths: [
       {
+        deprecated: false,
         name: "Decode logs and transactions​",
         path: "/v1/decode/{contractAddress}",
-        deprecated: false,
       },
     ],
   },
@@ -230,9 +230,9 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     name: "Resolve",
     paths: [
       {
+        deprecated: false,
         name: "Resolve",
         path: "/v1/resolve/{input}",
-        deprecated: false,
       },
     ],
   },
diff --git a/apps/playground-web/src/app/insight/layout.tsx b/apps/playground-web/src/app/insight/layout.tsx
index 9e04c8b589c..39a967a52ca 100644
--- a/apps/playground-web/src/app/insight/layout.tsx
+++ b/apps/playground-web/src/app/insight/layout.tsx
@@ -1,17 +1,15 @@
 import type React from "react";
 import { PageLayout } from "../../components/blocks/APIHeader";
 
-export default function Layout(props: {
-  children: React.ReactNode;
-}) {
+export default function Layout(props: { children: React.ReactNode }) {
   return (
     <PageLayout
-      title="Insight"
+      containerClassName="pb-16"
       description={
         <>Simple & customizable endpoints for querying rich blockchain data</>
       }
       docsLink="https://portal.thirdweb.com/insight?utm_source=playground"
-      containerClassName="pb-16"
+      title="Insight"
     >
       {props.children}
     </PageLayout>
diff --git a/apps/playground-web/src/app/insight/page.tsx b/apps/playground-web/src/app/insight/page.tsx
index 5585ff5ed7c..ffb7e5588ea 100644
--- a/apps/playground-web/src/app/insight/page.tsx
+++ b/apps/playground-web/src/app/insight/page.tsx
@@ -1,5 +1,5 @@
-import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
 import Link from "next/link";
+import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
 import { insightBlueprints } from "./insightBlueprints";
 
 export default function Page() {
@@ -11,9 +11,9 @@ export default function Page() {
         user-friendly format. <br /> There is no need for ABIs, decoding, RPC,
         or web3 knowledge to fetch blockchain data.{" "}
         <Link
+          className="underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] hover:decoration-solid"
           href="https://portal.thirdweb.com/insight/blueprints?utm_source=playground"
           target="_blank"
-          className="underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] hover:decoration-solid"
         >
           Learn more about Insight Blueprints{" "}
         </Link>
@@ -23,15 +23,15 @@ export default function Page() {
         {insightBlueprints.map((blueprint) => {
           return (
             <BlueprintSection
-              key={blueprint.id}
-              title={blueprint.name}
               blueprints={blueprint.paths.map((pathInfo) => {
                 return {
-                  name: pathInfo.name,
-                  link: `/insight/${blueprint.id}?path=${pathInfo.path}`,
                   deprecated: pathInfo.deprecated,
+                  link: `/insight/${blueprint.id}?path=${pathInfo.path}`,
+                  name: pathInfo.name,
                 };
               })}
+              key={blueprint.id}
+              title={blueprint.name}
             />
           );
         })}
@@ -53,19 +53,19 @@ function BlueprintSection(props: {
         <TableBody>
           {props.blueprints.map((item) => (
             <TableRow
-              key={item.link}
               className="group hover:bg-accent/50"
+              key={item.link}
               linkBox
             >
               <TableCell>
                 <span className="flex items-center gap-3">
                   <Link
-                    href={item.link}
                     className={`${
                       item.deprecated
                         ? "line-through before:absolute before:inset-0"
                         : ""
                     }`}
+                    href={item.link}
                   >
                     {item.name}
                   </Link>
diff --git a/apps/playground-web/src/app/insight/utils.ts b/apps/playground-web/src/app/insight/utils.ts
index f17b1087fdd..2f47d9a121c 100644
--- a/apps/playground-web/src/app/insight/utils.ts
+++ b/apps/playground-web/src/app/insight/utils.ts
@@ -41,9 +41,7 @@ export type MinimalBlueprintSpec = {
   }[];
 };
 
-export async function fetchBlueprintSpec(params: {
-  blueprintId: string;
-}) {
+export async function fetchBlueprintSpec(params: { blueprintId: string }) {
   const res = await fetch(
     `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/blueprints/${params.blueprintId}`,
   );
diff --git a/apps/playground-web/src/app/layout.tsx b/apps/playground-web/src/app/layout.tsx
index 86a7b34e3b1..4cb73e93b26 100644
--- a/apps/playground-web/src/app/layout.tsx
+++ b/apps/playground-web/src/app/layout.tsx
@@ -1,8 +1,8 @@
-import { metadataBase } from "@/lib/constants";
-import { cn } from "@/lib/utils";
 import type { Metadata } from "next";
 import { Fira_Code, Inter } from "next/font/google";
 import Script from "next/script";
+import { metadataBase } from "@/lib/constants";
+import { cn } from "@/lib/utils";
 import { AppSidebar } from "./AppSidebar";
 import { Providers } from "./providers";
 import "./globals.css";
@@ -23,9 +23,9 @@ const monoFont = Fira_Code({
 });
 
 export const metadata: Metadata = {
+  description: "thirdweb playground",
   metadataBase,
   title: "thirdweb playground",
-  description: "thirdweb playground",
 };
 
 export default async function RootLayout({
@@ -38,10 +38,10 @@ export default async function RootLayout({
     <html lang="en" suppressHydrationWarning>
       <head>
         <Script
-          src="https://thirdweb.com/js/pl.js"
-          defer
-          data-domain="playground.thirdweb.com"
           data-api="https://pl.thirdweb.com/api/event"
+          data-domain="playground.thirdweb.com"
+          defer
+          src="https://thirdweb.com/js/pl.js"
         />
       </head>
 
diff --git a/apps/playground-web/src/app/login/_sdk_.ts b/apps/playground-web/src/app/login/_sdk_.ts
index 5e8a2e2e626..f65628f772c 100644
--- a/apps/playground-web/src/app/login/_sdk_.ts
+++ b/apps/playground-web/src/app/login/_sdk_.ts
@@ -26,18 +26,18 @@ export async function handleLogin(code: string) {
   const redirectUri = window.location.href;
 
   fetch(`${LOGIN_URL}/api/token`, {
-    method: "POST",
     body: JSON.stringify({
+      client_id: CLIENT_ID,
       code,
       code_verifier: codeVerifier,
-      state,
-      client_id: CLIENT_ID,
-      redirect_uri: redirectUri,
       grant_type: "authorization_code",
+      redirect_uri: redirectUri,
+      state,
     }),
     headers: {
       "Content-Type": "application/json",
     },
+    method: "POST",
   })
     .then((res) => res.json())
     .then((data) => {
@@ -58,8 +58,8 @@ async function generateCodeChallenge() {
     new TextEncoder().encode(codeVerifier),
   );
   return {
-    codeVerifier: codeVerifier,
     codeChallenge: base64UrlEncode(codeChallenge),
+    codeVerifier: codeVerifier,
   };
 }
 
diff --git a/apps/playground-web/src/app/login/page.tsx b/apps/playground-web/src/app/login/page.tsx
index f85160457b8..b2f021c1085 100644
--- a/apps/playground-web/src/app/login/page.tsx
+++ b/apps/playground-web/src/app/login/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import { useSearchParams } from "next/navigation";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { useSearchParams } from "next/navigation";
 import { handleLogin, triggerLogin } from "./_sdk_";
 
 export default function LoginPage() {
diff --git a/apps/playground-web/src/app/navLinks.ts b/apps/playground-web/src/app/navLinks.ts
index beefbeee987..29a6be8169a 100644
--- a/apps/playground-web/src/app/navLinks.ts
+++ b/apps/playground-web/src/app/navLinks.ts
@@ -3,147 +3,147 @@ import { insightBlueprints } from "./insight/insightBlueprints";
 
 const staticSidebarLinks: SidebarLink[] = [
   {
-    name: "Wallets",
     isCollapsible: false,
     links: [
       {
-        name: "ConnectButton",
         href: "/connect/sign-in/button",
+        name: "ConnectButton",
       },
       {
-        name: "ConnectEmbed",
         href: "/connect/sign-in/embed",
+        name: "ConnectEmbed",
       },
       {
-        name: "Headless Connect",
         href: "/connect/sign-in/headless",
+        name: "Headless Connect",
       },
       {
-        name: "In-App Wallets",
         href: "/connect/in-app-wallet",
+        name: "In-App Wallets",
       },
       {
-        name: "Ecosystem Wallets",
         href: "/connect/in-app-wallet/ecosystem",
+        name: "Ecosystem Wallets",
       },
       {
-        name: "EIP-4337",
         href: "/connect/account-abstraction/sponsor",
+        name: "EIP-4337",
       },
       {
-        name: "EIP-7702",
         href: "/connect/account-abstraction/7702",
+        name: "EIP-7702",
       },
       {
-        name: "EIP-5792",
         href: "/connect/account-abstraction/5792",
+        name: "EIP-5792",
       },
       {
-        name: "Native AA (zkSync)",
         href: "/connect/account-abstraction/native-aa",
+        name: "Native AA (zkSync)",
       },
       {
-        name: "Auth",
         href: "/connect/auth",
+        name: "Auth",
       },
       {
-        name: "Social",
         href: "/connect/social",
+        name: "Social",
       },
       {
-        name: "Blockchain API",
         href: "/connect/blockchain-api",
+        name: "Blockchain API",
       },
       {
-        name: "Headless Components",
         expanded: false,
         links: [
           {
-            name: "Account",
             href: "/connect/ui",
+            name: "Account",
           },
           {
-            name: "NFT",
             href: "/connect/ui/nft",
+            name: "NFT",
           },
           {
-            name: "Token",
             href: "/connect/ui/token",
+            name: "Token",
           },
           {
-            name: "Chain",
             href: "/connect/ui/chain",
+            name: "Chain",
           },
           {
-            name: "Wallet",
             href: "/connect/ui/wallet",
+            name: "Wallet",
           },
         ],
+        name: "Headless Components",
       },
     ],
+    name: "Wallets",
   },
 ];
 
 const universalBridgeSidebarLinks: SidebarLink = {
-  name: "Universal Bridge",
-  isCollapsible: false,
   expanded: false,
+  isCollapsible: false,
   links: [
     {
-      name: "UI Component",
       href: "/connect/pay",
+      name: "UI Component",
     },
     {
-      name: "Buy Crypto",
       href: "/connect/pay/fund-wallet",
+      name: "Buy Crypto",
     },
     {
-      name: "Checkout",
       href: "/connect/pay/commerce",
+      name: "Checkout",
     },
     {
-      name: "Transactions",
       href: "/connect/pay/transactions",
+      name: "Transactions",
     },
     {
-      name: "Backend API",
       href: "/connect/pay/backend",
+      name: "Backend API",
     },
   ],
+  name: "Universal Bridge",
 };
 
 const engineSidebarLinks: SidebarLink = {
-  name: "Transactions",
-  isCollapsible: false,
   expanded: false,
+  isCollapsible: false,
   links: [
     {
-      name: "Airdrop",
       href: "/engine/airdrop",
+      name: "Airdrop",
     },
     {
-      name: "Mint NFTs",
       href: "/engine/minting",
+      name: "Mint NFTs",
     },
     {
-      name: "Webhooks",
       href: "/engine/webhooks",
+      name: "Webhooks",
     },
   ],
+  name: "Transactions",
 };
 
 export function getSidebarLinks() {
   const insightLinks: SidebarLink[] = insightBlueprints.map((blueprint) => {
     return {
-      name: blueprint.name,
       expanded: false,
       links: blueprint.paths.map((pathInfo) => {
         return {
-          name: pathInfo.name,
-          href: `/insight/${blueprint.id}?path=${pathInfo.path}`,
           crossedOut: pathInfo.deprecated,
+          href: `/insight/${blueprint.id}?path=${pathInfo.path}`,
+          name: pathInfo.name,
         };
       }),
+      name: blueprint.name,
     };
   });
 
@@ -152,10 +152,10 @@ export function getSidebarLinks() {
     universalBridgeSidebarLinks,
     engineSidebarLinks,
     {
-      name: "Insight",
-      isCollapsible: false,
       expanded: false,
+      isCollapsible: false,
       links: insightLinks,
+      name: "Insight",
     },
   ];
 
diff --git a/apps/playground-web/src/app/otherLinks.ts b/apps/playground-web/src/app/otherLinks.ts
index 6f38620fa5c..fded9feab67 100644
--- a/apps/playground-web/src/app/otherLinks.ts
+++ b/apps/playground-web/src/app/otherLinks.ts
@@ -1,14 +1,14 @@
 export const otherLinks: { name: string; href: string }[] = [
   {
-    name: "Dashboard",
     href: "https://thirdweb.com/team?utm_source=playground",
+    name: "Dashboard",
   },
   {
-    name: "Docs",
     href: "https://portal.thirdweb.com?utm_source=playground",
+    name: "Docs",
   },
   {
-    name: "Github",
     href: "https://github.com/thirdweb-dev",
+    name: "Github",
   },
 ];
diff --git a/apps/playground-web/src/app/providers.tsx b/apps/playground-web/src/app/providers.tsx
index c86b9820610..d4bfbc211d1 100644
--- a/apps/playground-web/src/app/providers.tsx
+++ b/apps/playground-web/src/app/providers.tsx
@@ -1,11 +1,10 @@
 "use client";
 
-import { ThemeProvider as NextThemesProvider } from "next-themes";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import type { ThemeProviderProps } from "next-themes";
+import { ThemeProvider as NextThemesProvider } from "next-themes";
 import type * as React from "react";
 
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-
 const queryClient = new QueryClient();
 
 export const Providers: React.FC<React.PropsWithChildren> = ({ children }) => {
diff --git a/apps/playground-web/src/components/ClientOnly.tsx b/apps/playground-web/src/components/ClientOnly.tsx
index 10e6fe240f5..fa01e3ee8c3 100644
--- a/apps/playground-web/src/components/ClientOnly.tsx
+++ b/apps/playground-web/src/components/ClientOnly.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { type ReactNode, useEffect, useState } from "react";
+import { cn } from "@/lib/utils";
 
 interface ClientOnlyProps {
   /**
diff --git a/apps/playground-web/src/components/account-abstraction/5792-get-capabilities.tsx b/apps/playground-web/src/components/account-abstraction/5792-get-capabilities.tsx
index 2f95f076a13..03a0b22083c 100644
--- a/apps/playground-web/src/components/account-abstraction/5792-get-capabilities.tsx
+++ b/apps/playground-web/src/components/account-abstraction/5792-get-capabilities.tsx
@@ -1,6 +1,5 @@
 "use client";
 import { sepolia } from "thirdweb/chains";
-import {} from "thirdweb/extensions/erc1155";
 import {
   ConnectButton,
   useActiveWallet,
@@ -24,15 +23,15 @@ export function Eip5792GetCapabilitiesPreview() {
         <>
           <div className="flex flex-col justify-center gap-2 p-2">
             <ConnectButton
-              client={THIRDWEB_CLIENT}
               chain={sepolia}
+              client={THIRDWEB_CLIENT}
+              connectButton={{
+                label: "Login to view wallet capabilities",
+              }}
               wallets={[
                 createWallet("io.metamask"),
                 createWallet("com.coinbase.wallet"),
               ]}
-              connectButton={{
-                label: "Login to view wallet capabilities",
-              }}
             />
           </div>
           <p className="text-lg">
@@ -40,12 +39,12 @@ export function Eip5792GetCapabilitiesPreview() {
           </p>
           {capabilities.data ? (
             <CodeClient
+              className="max-h-[500px] w-[400px] overflow-y-auto"
               code={JSON.stringify(capabilities.data, null, 2)}
               lang="json"
               loader={<div className="mt-24 w-full">Loading...</div>}
-              className="max-h-[500px] w-[400px] overflow-y-auto"
-              scrollableContainerClassName="h-full"
               scrollableClassName="h-full"
+              scrollableContainerClassName="h-full"
             />
           ) : null}
         </>
diff --git a/apps/playground-web/src/components/account-abstraction/5792-send-calls.tsx b/apps/playground-web/src/components/account-abstraction/5792-send-calls.tsx
index a536ae703a8..d5f24d0292a 100644
--- a/apps/playground-web/src/components/account-abstraction/5792-send-calls.tsx
+++ b/apps/playground-web/src/components/account-abstraction/5792-send-calls.tsx
@@ -1,8 +1,7 @@
 "use client";
 import { getContract } from "thirdweb";
 import { sepolia } from "thirdweb/chains";
-import { claimTo } from "thirdweb/extensions/erc1155";
-import { getNFT, getOwnedNFTs } from "thirdweb/extensions/erc1155";
+import { claimTo, getNFT, getOwnedNFTs } from "thirdweb/extensions/erc1155";
 import {
   ConnectButton,
   MediaRenderer,
@@ -14,7 +13,6 @@ import {
 import { shortenHex } from "thirdweb/utils";
 import { createWallet } from "thirdweb/wallets";
 import { THIRDWEB_CLIENT } from "../../lib/client";
-import { Spinner } from "../ui/Spinner/Spinner";
 import { Button } from "../ui/button";
 import {
   Card,
@@ -23,6 +21,7 @@ import {
   CardHeader,
   CardTitle,
 } from "../ui/card";
+import { Spinner } from "../ui/Spinner/Spinner";
 
 const chain = sepolia;
 
@@ -49,18 +48,18 @@ export function Eip5792SendCallsPreview() {
     tokenId: 1n,
   });
   const { data: ownedNfts } = useReadContract(getOwnedNFTs, {
-    contract: editionDropContract,
-    useIndexer: false,
     // biome-ignore lint/style/noNonNullAssertion: handled by queryOptions
     address: activeEOA?.address!,
+    contract: editionDropContract,
     queryOptions: { enabled: !!activeEOA },
+    useIndexer: false,
   });
   const { data: ownedNfts2 } = useReadContract(getOwnedNFTs, {
-    contract: editionDropContract2,
-    useIndexer: false,
     // biome-ignore lint/style/noNonNullAssertion: handled by queryOptions
     address: activeEOA?.address!,
+    contract: editionDropContract2,
     queryOptions: { enabled: !!activeEOA },
+    useIndexer: false,
   });
 
   const sendCalls = useSendCalls();
@@ -83,15 +82,15 @@ export function Eip5792SendCallsPreview() {
               <Card className="mb-4">
                 <CardContent className="pt-6">
                   <ConnectButton
-                    client={THIRDWEB_CLIENT}
                     chain={sepolia}
+                    client={THIRDWEB_CLIENT}
+                    connectButton={{
+                      label: "Login to mint!",
+                    }}
                     wallets={[
                       createWallet("io.metamask"),
                       createWallet("com.coinbase.wallet"),
                     ]}
-                    connectButton={{
-                      label: "Login to mint!",
-                    }}
                   />
                 </CardContent>
               </Card>
@@ -107,10 +106,10 @@ export function Eip5792SendCallsPreview() {
                     {nft && (
                       <>
                         <MediaRenderer
+                          alt={nft.metadata.name || "NFT Image"}
+                          className="h-32 w-32 rounded-lg"
                           client={THIRDWEB_CLIENT}
                           src={nft.metadata.image}
-                          className="h-32 w-32 rounded-lg"
-                          alt={nft.metadata.name || "NFT Image"}
                         />
                         <p className="mt-2 font-medium text-sm">
                           {nft.metadata.name}
@@ -131,10 +130,10 @@ export function Eip5792SendCallsPreview() {
                     {nft2 && (
                       <>
                         <MediaRenderer
+                          alt={nft2.metadata.name || "NFT Image"}
+                          className="h-32 w-32 rounded-lg"
                           client={THIRDWEB_CLIENT}
                           src={nft2.metadata.image}
-                          className="h-32 w-32 rounded-lg"
-                          alt={nft2.metadata.name || "NFT Image"}
                         />
                         <p className="mt-2 font-medium text-sm">
                           {nft2.metadata.name}
@@ -151,25 +150,25 @@ export function Eip5792SendCallsPreview() {
               <CardFooter className="flex justify-center">
                 {activeEOA && (
                   <Button
+                    disabled={sendCalls.isPending || results.isLoading}
                     onClick={async () => {
                       await sendCalls.mutateAsync({
                         calls: [
                           claimTo({
                             contract: editionDropContract2,
-                            tokenId: 0n,
-                            to: activeEOA.address,
                             quantity: 1n,
+                            to: activeEOA.address,
+                            tokenId: 0n,
                           }),
                           claimTo({
                             contract: editionDropContract,
-                            tokenId: 1n,
-                            to: activeEOA.address,
                             quantity: 1n,
+                            to: activeEOA.address,
+                            tokenId: 1n,
                           }),
                         ],
                       });
                     }}
-                    disabled={sendCalls.isPending || results.isLoading}
                   >
                     {results.isLoading ? (
                       "Confirming..."
@@ -208,42 +207,42 @@ export function Eip5792SendCallsPreview() {
                     Transaction Confirmed!
                   </p>
                   <a
+                    className="flex items-center gap-1 text-primary text-sm hover:underline"
                     href={`${chain.blockExplorers?.[0]?.url}/tx/${txHash}`}
-                    target="_blank"
                     rel="noopener noreferrer"
-                    className="flex items-center gap-1 text-primary text-sm hover:underline"
+                    target="_blank"
                   >
                     {shortenHex(txHash)}
                     <svg
-                      width="12"
+                      aria-label="Open in Explorer"
+                      className="ml-1"
+                      fill="none"
                       height="12"
+                      role="img"
                       viewBox="0 0 24 24"
-                      fill="none"
+                      width="12"
                       xmlns="http://www.w3.org/2000/svg"
-                      className="ml-1"
-                      role="img"
-                      aria-label="Open in Explorer"
                     >
                       <path
                         d="M18 13V19C18 19.5304 17.7893 20.0391 17.4142 20.4142C17.0391 20.7893 16.5304 21 16 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V8C3 7.46957 3.21071 6.96086 3.58579 6.58579C3.96086 6.21071 4.46957 6 5 6H11"
                         stroke="currentColor"
-                        strokeWidth="2"
                         strokeLinecap="round"
                         strokeLinejoin="round"
+                        strokeWidth="2"
                       />
                       <path
                         d="M15 3H21V9"
                         stroke="currentColor"
-                        strokeWidth="2"
                         strokeLinecap="round"
                         strokeLinejoin="round"
+                        strokeWidth="2"
                       />
                       <path
                         d="M10 14L21 3"
                         stroke="currentColor"
-                        strokeWidth="2"
                         strokeLinecap="round"
                         strokeLinejoin="round"
+                        strokeWidth="2"
                       />
                     </svg>
                   </a>
diff --git a/apps/playground-web/src/components/account-abstraction/7702-smart-account.tsx b/apps/playground-web/src/components/account-abstraction/7702-smart-account.tsx
index dabaf818aec..c097a81e300 100644
--- a/apps/playground-web/src/components/account-abstraction/7702-smart-account.tsx
+++ b/apps/playground-web/src/components/account-abstraction/7702-smart-account.tsx
@@ -3,8 +3,7 @@
 import { useState } from "react";
 import { getContract } from "thirdweb";
 import { baseSepolia } from "thirdweb/chains";
-import { claimTo } from "thirdweb/extensions/erc1155";
-import { getNFT, getOwnedNFTs } from "thirdweb/extensions/erc1155";
+import { claimTo, getNFT, getOwnedNFTs } from "thirdweb/extensions/erc1155";
 import {
   ConnectButton,
   MediaRenderer,
@@ -46,11 +45,11 @@ export function Eip7702SmartAccountPreview() {
     tokenId: editionDropTokenId,
   });
   const { data: ownedNfts } = useReadContract(getOwnedNFTs, {
-    contract: editionDropContract,
-    useIndexer: false,
     // biome-ignore lint/style/noNonNullAssertion: handled by queryOptions
     address: activeEOA?.address!,
+    contract: editionDropContract,
     queryOptions: { enabled: !!activeEOA },
+    useIndexer: false,
   });
 
   if (activeEOA && activeWallet && activeWallet?.id !== iaw.id) {
@@ -76,19 +75,19 @@ export function Eip7702SmartAccountPreview() {
         <>
           <div className="flex flex-col justify-center gap-2 p-2">
             <ConnectButton
-              client={THIRDWEB_CLIENT}
               chain={chain}
-              wallets={[iaw]}
+              client={THIRDWEB_CLIENT}
               connectButton={{
                 label: "Login to mint!",
               }}
+              wallets={[iaw]}
             />
           </div>
           {nft ? (
             <MediaRenderer
               client={THIRDWEB_CLIENT}
               src={nft.metadata.image}
-              style={{ width: "300px", marginTop: "10px" }}
+              style={{ marginTop: "10px", width: "300px" }}
             />
           ) : null}
           {activeEOA ? (
@@ -98,26 +97,26 @@ export function Eip7702SmartAccountPreview() {
                 {nft?.metadata?.name}
               </p>
               <TransactionButton
-                transaction={() =>
-                  claimTo({
-                    contract: editionDropContract,
-                    tokenId: editionDropTokenId,
-                    to: activeEOA.address,
-                    quantity: 1n,
-                  })
-                }
-                payModal={{
-                  metadata: nft?.metadata,
+                onClick={() => {
+                  setTxHash(null);
                 }}
                 onError={(error) => {
                   alert(`Error: ${error.message}`);
                 }}
-                onClick={() => {
-                  setTxHash(null);
-                }}
                 onTransactionSent={async (tx) => {
                   setTxHash(tx.transactionHash);
                 }}
+                payModal={{
+                  metadata: nft?.metadata,
+                }}
+                transaction={() =>
+                  claimTo({
+                    contract: editionDropContract,
+                    quantity: 1n,
+                    to: activeEOA.address,
+                    tokenId: editionDropTokenId,
+                  })
+                }
               >
                 Mint with EIP-7702
               </TransactionButton>
@@ -128,10 +127,10 @@ export function Eip7702SmartAccountPreview() {
               <p className="mb-2 text-center text-green-500">
                 Minted! Tx Hash:{" "}
                 <a
+                  className="underline"
                   href={`${chain.blockExplorers?.[0]?.url}/tx/${txHash}`}
-                  target="_blank"
                   rel="noopener noreferrer"
-                  className="underline"
+                  target="_blank"
                 >
                   {shortenHex(txHash)}
                 </a>
diff --git a/apps/playground-web/src/components/account-abstraction/connect-smart-account.tsx b/apps/playground-web/src/components/account-abstraction/connect-smart-account.tsx
index 4ef48d114e6..57407f3ce7f 100644
--- a/apps/playground-web/src/components/account-abstraction/connect-smart-account.tsx
+++ b/apps/playground-web/src/components/account-abstraction/connect-smart-account.tsx
@@ -18,14 +18,14 @@ export function ConnectSmartAccountPreview() {
   return (
     <div className="flex flex-col">
       <StyledConnectButton
-        detailsModal={{
-          // We hide the in-app wallet so they can't switch to it
-          hiddenWallets: ["inApp"],
-        }}
         accountAbstraction={{
           chain: baseSepolia,
           sponsorGas: true,
         }}
+        detailsModal={{
+          // We hide the in-app wallet so they can't switch to it
+          hiddenWallets: ["inApp"],
+        }}
       />
     </div>
   );
@@ -35,23 +35,23 @@ export function ConnectSmartAccountCustomPreview() {
   const account = useActiveAccount();
   const wallet = useActiveWallet();
   const connectMutation = useConnect({
-    client: THIRDWEB_CLIENT,
     accountAbstraction: { chain: baseSepolia, sponsorGas: true },
+    client: THIRDWEB_CLIENT,
   });
   const { disconnect } = useDisconnect();
   const balanceQuery = useWalletBalance({
-    client: THIRDWEB_CLIENT,
     address: account?.address,
     chain: baseSepolia,
+    client: THIRDWEB_CLIENT,
   });
 
   const connect = async () => {
     const wallet = await connectMutation.connect(async () => {
       const adminWallet = inAppWallet();
       await adminWallet.connect({
+        chain: baseSepolia,
         client: THIRDWEB_CLIENT,
         strategy: "google",
-        chain: baseSepolia,
       });
       return adminWallet;
     });
@@ -69,18 +69,18 @@ export function ConnectSmartAccountCustomPreview() {
               {balanceQuery.data?.symbol}
             </p>
           </div>
-          <Button variant="outline" onClick={() => disconnect(wallet)}>
+          <Button onClick={() => disconnect(wallet)} variant="outline">
             Disconnect
           </Button>
         </>
       ) : (
         <Button
-          variant="default"
-          onClick={connect}
           className="rounded-full p-6"
+          onClick={connect}
+          variant="default"
         >
           {/* eslint-disable-next-line @next/next/no-img-element */}
-          <img src={socialIcons.google} alt="Google" className="mr-2 h-4 w-4" />
+          <img alt="Google" className="mr-2 h-4 w-4" src={socialIcons.google} />
           Connect with Google
         </Button>
       )}
diff --git a/apps/playground-web/src/components/account-abstraction/sponsored-tx-zksync.tsx b/apps/playground-web/src/components/account-abstraction/sponsored-tx-zksync.tsx
index e2f300a7240..d255dbd7445 100644
--- a/apps/playground-web/src/components/account-abstraction/sponsored-tx-zksync.tsx
+++ b/apps/playground-web/src/components/account-abstraction/sponsored-tx-zksync.tsx
@@ -22,9 +22,9 @@ import { WALLETS } from "../../lib/constants";
 // });
 const chain = zkSyncSepolia;
 const editionDropContract = getContract({
-  client: THIRDWEB_CLIENT,
   address: "0xd563ACBeD80e63B257B2524562BdD7Ec666eEE77",
   chain,
+  client: THIRDWEB_CLIENT,
 });
 const editionDropTokenId = 0n;
 
@@ -36,9 +36,9 @@ export function SponsoredTxZksyncPreview() {
     tokenId: editionDropTokenId,
   });
   const { data: ownedNfts } = useReadContract(getOwnedNFTs, {
-    contract: editionDropContract,
     // biome-ignore lint/style/noNonNullAssertion: handled by queryOptions
     address: smartAccount?.address!,
+    contract: editionDropContract,
     queryOptions: { enabled: !!smartAccount },
   });
 
@@ -50,23 +50,23 @@ export function SponsoredTxZksyncPreview() {
         <>
           <div className="flex flex-col justify-center gap-2 p-2">
             <ConnectButton
-              client={THIRDWEB_CLIENT}
-              chain={chain}
-              wallets={WALLETS}
               accountAbstraction={{
                 chain,
                 sponsorGas: true,
               }}
+              chain={chain}
+              client={THIRDWEB_CLIENT}
               connectButton={{
                 label: "Login to mint this Kitten!",
               }}
+              wallets={WALLETS}
             />
           </div>
           {nft ? (
             <MediaRenderer
               client={THIRDWEB_CLIENT}
               src={nft.metadata.image}
-              style={{ width: "400px", marginTop: "10px" }}
+              style={{ marginTop: "10px", width: "400px" }}
             />
           ) : null}
           {smartAccount ? (
@@ -76,27 +76,27 @@ export function SponsoredTxZksyncPreview() {
                 Kittens
               </p>
               <TransactionButton
-                transaction={() =>
-                  claimTo({
-                    contract: editionDropContract,
-                    tokenId: editionDropTokenId,
-                    to: smartAccount.address,
-                    quantity: 1n,
-                  })
-                }
-                payModal={{
-                  metadata: nft?.metadata,
+                onClick={() => {
+                  setTxHash(null);
                 }}
                 onError={(error) => {
                   console.error("error", error);
                   alert(`Error: ${error.message}`);
                 }}
-                onClick={() => {
-                  setTxHash(null);
-                }}
                 onTransactionConfirmed={async (receipt) => {
                   setTxHash(receipt.transactionHash);
                 }}
+                payModal={{
+                  metadata: nft?.metadata,
+                }}
+                transaction={() =>
+                  claimTo({
+                    contract: editionDropContract,
+                    quantity: 1n,
+                    to: smartAccount.address,
+                    tokenId: editionDropTokenId,
+                  })
+                }
               >
                 Mint
               </TransactionButton>
@@ -107,10 +107,10 @@ export function SponsoredTxZksyncPreview() {
               <p className="mb-2 text-center text-green-500">
                 Minted! Tx Hash:{" "}
                 <a
+                  className="underline"
                   href={`${chain.blockExplorers?.[0]?.url}/tx/${txHash}`}
-                  target="_blank"
                   rel="noopener noreferrer"
-                  className="underline"
+                  target="_blank"
                 >
                   {shortenHex(txHash)}
                 </a>
diff --git a/apps/playground-web/src/components/account-abstraction/sponsored-tx.tsx b/apps/playground-web/src/components/account-abstraction/sponsored-tx.tsx
index de5b2d9bd64..03d4a43012d 100644
--- a/apps/playground-web/src/components/account-abstraction/sponsored-tx.tsx
+++ b/apps/playground-web/src/components/account-abstraction/sponsored-tx.tsx
@@ -33,11 +33,11 @@ export function SponsoredTxPreview() {
     tokenId: editionDropTokenId,
   });
   const { data: ownedNfts } = useReadContract(getOwnedNFTs, {
-    contract: editionDropContract,
     // biome-ignore lint/style/noNonNullAssertion: handled by queryOptions
     address: smartAccount?.address!,
-    useIndexer: false,
+    contract: editionDropContract,
     queryOptions: { enabled: !!smartAccount },
+    useIndexer: false,
   });
 
   return (
@@ -48,23 +48,23 @@ export function SponsoredTxPreview() {
         <>
           <div className="flex flex-col justify-center gap-2 p-2">
             <ConnectButton
-              client={THIRDWEB_CLIENT}
-              chain={chain}
-              wallets={WALLETS}
               accountAbstraction={{
                 chain,
                 sponsorGas: true,
               }}
+              chain={chain}
+              client={THIRDWEB_CLIENT}
               connectButton={{
                 label: "Login to mint this Kitten!",
               }}
+              wallets={WALLETS}
             />
           </div>
           {nft ? (
             <MediaRenderer
               client={THIRDWEB_CLIENT}
               src={nft.metadata.image}
-              style={{ width: "300px", marginTop: "10px" }}
+              style={{ marginTop: "10px", width: "300px" }}
             />
           ) : null}
           {smartAccount ? (
@@ -74,26 +74,26 @@ export function SponsoredTxPreview() {
                 {nft?.metadata?.name}
               </p>
               <TransactionButton
-                transaction={() =>
-                  claimTo({
-                    contract: editionDropContract,
-                    tokenId: editionDropTokenId,
-                    to: smartAccount.address,
-                    quantity: 1n,
-                  })
-                }
-                payModal={{
-                  metadata: nft?.metadata,
+                onClick={() => {
+                  setTxHash(null);
                 }}
                 onError={(error) => {
                   alert(`Error: ${error.message}`);
                 }}
-                onClick={() => {
-                  setTxHash(null);
-                }}
                 onTransactionConfirmed={async (receipt) => {
                   setTxHash(receipt.transactionHash);
                 }}
+                payModal={{
+                  metadata: nft?.metadata,
+                }}
+                transaction={() =>
+                  claimTo({
+                    contract: editionDropContract,
+                    quantity: 1n,
+                    to: smartAccount.address,
+                    tokenId: editionDropTokenId,
+                  })
+                }
               >
                 Mint with EIP-4337
               </TransactionButton>
@@ -104,10 +104,10 @@ export function SponsoredTxPreview() {
               <p className="mb-2 text-center text-green-500">
                 Minted! Tx Hash:{" "}
                 <a
+                  className="underline"
                   href={`${chain.blockExplorers?.[0]?.url}/tx/${txHash}`}
-                  target="_blank"
                   rel="noopener noreferrer"
-                  className="underline"
+                  target="_blank"
                 >
                   {shortenHex(txHash)}
                 </a>
diff --git a/apps/playground-web/src/components/auth/auth-button.tsx b/apps/playground-web/src/components/auth/auth-button.tsx
index 08de975f3c2..1c9ba59bbef 100644
--- a/apps/playground-web/src/components/auth/auth-button.tsx
+++ b/apps/playground-web/src/components/auth/auth-button.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { ConnectButton } from "thirdweb/react";
+import { createWallet, inAppWallet } from "thirdweb/wallets";
 import {
   generatePayload,
   isLoggedIn,
@@ -7,18 +9,23 @@ import {
   logout,
 } from "@/app/connect/auth/server/actions/auth";
 import { THIRDWEB_CLIENT } from "@/lib/client";
-import { ConnectButton } from "thirdweb/react";
-import { createWallet, inAppWallet } from "thirdweb/wallets";
 
 export function AuthButton() {
   return (
     <ConnectButton
+      auth={{
+        doLogin: (params) => login(params),
+        doLogout: () => logout(),
+        getLoginPayload: ({ address }) =>
+          generatePayload({ address, chainId: 84532 }),
+        isLoggedIn: (address) => isLoggedIn(address),
+      }}
       client={THIRDWEB_CLIENT}
       wallets={[
         inAppWallet({
           auth: {
-            options: ["google", "telegram", "github"],
             mode: "redirect",
+            options: ["google", "telegram", "github"],
           },
         }),
         createWallet("io.metamask"),
@@ -27,13 +34,6 @@ export function AuthButton() {
         createWallet("io.rabby"),
         createWallet("io.zerion.wallet"),
       ]}
-      auth={{
-        isLoggedIn: (address) => isLoggedIn(address),
-        doLogin: (params) => login(params),
-        getLoginPayload: ({ address }) =>
-          generatePayload({ address, chainId: 84532 }),
-        doLogout: () => logout(),
-      }}
     />
   );
 }
diff --git a/apps/playground-web/src/components/auth/auth-hook.tsx b/apps/playground-web/src/components/auth/auth-hook.tsx
index 97635ab30e9..22fe5a8454f 100644
--- a/apps/playground-web/src/components/auth/auth-hook.tsx
+++ b/apps/playground-web/src/components/auth/auth-hook.tsx
@@ -1,26 +1,26 @@
 "use client";
 
-import {
-  generatePayload,
-  isLoggedIn,
-  login,
-  logout,
-} from "@/app/connect/auth/server/actions/auth";
 import {
   type SiweAuthOptions,
   useActiveWallet,
   useConnectModal,
   useSiweAuth,
 } from "thirdweb/react";
+import {
+  generatePayload,
+  isLoggedIn,
+  login,
+  logout,
+} from "@/app/connect/auth/server/actions/auth";
 import { THIRDWEB_CLIENT } from "../../lib/client";
 import { Button } from "../ui/button";
 
 const auth: SiweAuthOptions = {
-  isLoggedIn: (address) => isLoggedIn(address),
   doLogin: (params) => login(params),
+  doLogout: () => logout(),
   getLoginPayload: ({ address }) =>
     generatePayload({ address, chainId: 84532 }),
-  doLogout: () => logout(),
+  isLoggedIn: (address) => isLoggedIn(address),
 };
 
 export function AuthHook() {
@@ -37,14 +37,14 @@ export function AuthHook() {
       await doLogout();
     } else {
       await connect({
-        client: THIRDWEB_CLIENT,
         auth,
+        client: THIRDWEB_CLIENT,
       });
     }
   };
 
   return (
-    <Button type="button" onClick={onClick}>
+    <Button onClick={onClick} type="button">
       {isLoggedIn ? "Sign out" : "Sign in"}
     </Button>
   );
diff --git a/apps/playground-web/src/components/auth/basic-auth-hook.tsx b/apps/playground-web/src/components/auth/basic-auth-hook.tsx
index 1d2faf78b76..840b670b595 100644
--- a/apps/playground-web/src/components/auth/basic-auth-hook.tsx
+++ b/apps/playground-web/src/components/auth/basic-auth-hook.tsx
@@ -14,7 +14,7 @@ export async function BasicAuthHookPreview() {
         <table className="table-auto border-collapse rounded-lg backdrop-blur">
           <tbody>
             {Object.keys(jwt).map((key) => (
-              <tr key={key} className="">
+              <tr className="" key={key}>
                 <td className="rounded border p-2">{key}</td>
                 <td
                   className={cn(
diff --git a/apps/playground-web/src/components/auth/basic-auth.tsx b/apps/playground-web/src/components/auth/basic-auth.tsx
index 1bf752f8cf7..cd63d46e512 100644
--- a/apps/playground-web/src/components/auth/basic-auth.tsx
+++ b/apps/playground-web/src/components/auth/basic-auth.tsx
@@ -14,7 +14,7 @@ export async function BasicAuthPreview() {
         <table className="table-auto border-collapse rounded-lg backdrop-blur">
           <tbody>
             {Object.keys(jwt).map((key) => (
-              <tr key={key} className="">
+              <tr className="" key={key}>
                 <td className="rounded border p-2">{key}</td>
                 <td
                   className={cn(
diff --git a/apps/playground-web/src/components/auth/gated-content.tsx b/apps/playground-web/src/components/auth/gated-content.tsx
index 5c7da700f76..95a3a39aa24 100644
--- a/apps/playground-web/src/components/auth/gated-content.tsx
+++ b/apps/playground-web/src/components/auth/gated-content.tsx
@@ -1,10 +1,10 @@
-import { getAuthResult } from "@/app/connect/auth/server/actions/auth";
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { cookies } from "next/headers";
 import Link from "next/link";
 import { getContract } from "thirdweb";
 import { sepolia } from "thirdweb/chains";
 import { balanceOf } from "thirdweb/extensions/erc20";
+import { getAuthResult } from "@/app/connect/auth/server/actions/auth";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 import { AuthButton } from "./auth-button";
 
 export async function GatedContentPreview() {
@@ -37,8 +37,8 @@ export async function GatedContentPreview() {
     const requiredQuantity = 10n; // 10 erc20 token
 
     const ownedBalance = await balanceOf({
-      contract: erc20Contract,
       address: userAddress,
+      contract: erc20Contract,
     });
 
     return ownedBalance < requiredQuantity;
@@ -57,8 +57,8 @@ export async function GatedContentPreview() {
           <br />
           Mint some tokens{" "}
           <Link
-            href="/connect/blockchain-api"
             className="font-bold text-yellow-400"
+            href="/connect/blockchain-api"
           >
             here
           </Link>
@@ -82,10 +82,10 @@ export async function GatedContentPreview() {
         <br />
         Mint a free commemorative NFT{" "}
         <a
+          className="font-bold text-yellow-400 underline"
           href="https://thirdweb.com/arbitrum/0xE7d6D628163de95D1c72c343ee852539B51f35Dc/nfts/0?utm_source=playground"
           rel="noreferrer"
           target="_blank"
-          className="font-bold text-yellow-400 underline"
         >
           here
         </a>
diff --git a/apps/playground-web/src/components/auth/smart-account-auth-button.tsx b/apps/playground-web/src/components/auth/smart-account-auth-button.tsx
index c5a8e6e50b2..a6531e1a062 100644
--- a/apps/playground-web/src/components/auth/smart-account-auth-button.tsx
+++ b/apps/playground-web/src/components/auth/smart-account-auth-button.tsx
@@ -1,4 +1,6 @@
 "use client";
+import { defineChain } from "thirdweb";
+import { ConnectButton } from "thirdweb/react";
 import {
   generatePayload,
   isLoggedIn,
@@ -6,24 +8,22 @@ import {
   logout,
 } from "@/app/connect/auth/server/actions/auth";
 import { THIRDWEB_CLIENT } from "@/lib/client";
-import { defineChain } from "thirdweb";
-import { ConnectButton } from "thirdweb/react";
 
 export function SmartAccountAuthButton() {
   return (
     <ConnectButton
-      client={THIRDWEB_CLIENT}
       accountAbstraction={{
         chain: defineChain(17000),
         sponsorGas: true,
       }}
       auth={{
-        isLoggedIn: (address) => isLoggedIn(address),
         doLogin: (params) => login(params),
+        doLogout: () => logout(),
         getLoginPayload: ({ address }) =>
           generatePayload({ address, chainId: 17000 }),
-        doLogout: () => logout(),
+        isLoggedIn: (address) => isLoggedIn(address),
       }}
+      client={THIRDWEB_CLIENT}
     />
   );
 }
diff --git a/apps/playground-web/src/components/auth/smart-account-auth.tsx b/apps/playground-web/src/components/auth/smart-account-auth.tsx
index e3f4b3bf7ce..958943020bd 100644
--- a/apps/playground-web/src/components/auth/smart-account-auth.tsx
+++ b/apps/playground-web/src/components/auth/smart-account-auth.tsx
@@ -14,7 +14,7 @@ export async function SmartAccountAuthPreview() {
         <table className="table-auto border-collapse rounded-lg backdrop-blur">
           <tbody>
             {Object.keys(jwt).map((key) => (
-              <tr key={key} className="">
+              <tr className="" key={key}>
                 <td className="rounded border p-2">{key}</td>
                 <td
                   className={cn(
diff --git a/apps/playground-web/src/components/blockchain-api/read-contract-extension.tsx b/apps/playground-web/src/components/blockchain-api/read-contract-extension.tsx
index cf8f6863ec4..48658e55155 100644
--- a/apps/playground-web/src/components/blockchain-api/read-contract-extension.tsx
+++ b/apps/playground-web/src/components/blockchain-api/read-contract-extension.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { getContract } from "thirdweb";
 import { ethereum } from "thirdweb/chains";
 import { getNFT } from "thirdweb/extensions/erc721";
 import { MediaRenderer, useReadContract } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 
 const contract = getContract({
   address: "0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d",
@@ -21,10 +21,10 @@ export function ReadContractExtensionPreview() {
   return (
     <div className="rounded-2xl backdrop-blur">
       <MediaRenderer
-        client={THIRDWEB_CLIENT}
-        src={data?.metadata.image}
         className="rounded-2xl shadow-gray-100"
+        client={THIRDWEB_CLIENT}
         gatewayUrl="https://ipfs.io/ipfs/"
+        src={data?.metadata.image}
       />
     </div>
   );
diff --git a/apps/playground-web/src/components/blockchain-api/read-contract-raw.tsx b/apps/playground-web/src/components/blockchain-api/read-contract-raw.tsx
index 57b324a2f0a..03a5e5ddc2a 100644
--- a/apps/playground-web/src/components/blockchain-api/read-contract-raw.tsx
+++ b/apps/playground-web/src/components/blockchain-api/read-contract-raw.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { getContract } from "thirdweb";
 import { ethereum } from "thirdweb/chains";
 import { MediaRenderer, useReadContract } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 
 const onChainCryptoPunks = getContract({
   address: "0x16F5A35647D6F03D5D3da7b35409D65ba03aF3B2",
@@ -23,9 +23,9 @@ export function ReadContractRawPreview() {
   // Read the image of the tokenId #1
   const { data } = useReadContract({
     contract: onChainCryptoPunks,
+    from: "0x16F5A35647D6F03D5D3da7b35409D65ba03aF3B2",
     method: "function punkImageSvg(uint16 index) view returns (string svg)",
     params: [1],
-    from: "0x16F5A35647D6F03D5D3da7b35409D65ba03aF3B2",
   });
 
   return (
diff --git a/apps/playground-web/src/components/blockchain-api/watch-event-preview.tsx b/apps/playground-web/src/components/blockchain-api/watch-event-preview.tsx
index 78074b81771..daa3d6f47e3 100644
--- a/apps/playground-web/src/components/blockchain-api/watch-event-preview.tsx
+++ b/apps/playground-web/src/components/blockchain-api/watch-event-preview.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { useMemo } from "react";
 import { getContract, toTokens } from "thirdweb";
 import { base } from "thirdweb/chains";
 import { transferEvent } from "thirdweb/extensions/erc20";
 import { useContractEvents } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 import { shortenAddress } from "./shortenAddress";
 
 type Item = {
@@ -23,9 +23,9 @@ const usdcContractOnBase = getContract({
 
 export function WatchEventPreview() {
   const contractEvents = useContractEvents({
+    blockRange: 100,
     contract: usdcContractOnBase,
     events: [transferEvent()],
-    blockRange: 100,
   });
 
   const items: Item[] = useMemo(() => {
@@ -35,9 +35,9 @@ export function WatchEventPreview() {
         const { from, to, value } = item.args;
         return {
           from: shortenAddress(from),
+          hash: item.transactionHash,
           to: shortenAddress(to),
           value: Number(toTokens(value, 6)).toFixed(1),
-          hash: item.transactionHash,
         };
       })
       .filter(
diff --git a/apps/playground-web/src/components/blockchain-api/write-contract-extension.tsx b/apps/playground-web/src/components/blockchain-api/write-contract-extension.tsx
index 0bf2d2a590f..e04c88f2792 100644
--- a/apps/playground-web/src/components/blockchain-api/write-contract-extension.tsx
+++ b/apps/playground-web/src/components/blockchain-api/write-contract-extension.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import Image from "next/image";
 import { useState } from "react";
 import { getContract } from "thirdweb";
@@ -11,6 +10,7 @@ import {
   TransactionButton,
   useActiveAccount,
 } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 import { shortenAddress } from "./shortenAddress";
 
 const twCoinContract = getContract({
@@ -26,36 +26,36 @@ export function WriteContractExtensionPreview() {
   return (
     <div className="flex flex-col">
       <Image
-        src="/twcoin.svg"
+        alt=""
         className="mx-auto size-32 animate-bounce rounded-2xl"
-        width={50}
         height={50}
-        alt=""
+        src="/twcoin.svg"
+        width={50}
       />
       <div className="my-3 text-center">Claim free testnet tokens</div>
       {account ? (
         <TransactionButton
+          onClick={() => {
+            setError("");
+            setTxHash("");
+          }}
+          onError={(error) => {
+            setError(error.message);
+          }}
+          onTransactionConfirmed={(receipt) => {
+            console.log("Transaction confirmed", receipt.transactionHash);
+          }}
+          onTransactionSent={(result) => {
+            console.log("Transaction submitted", result.transactionHash);
+            setTxHash(result.transactionHash);
+          }}
           transaction={() =>
             claimTo({
               contract: twCoinContract,
-              to: account.address,
               quantity: "10",
+              to: account.address,
             })
           }
-          onTransactionSent={(result) => {
-            console.log("Transaction submitted", result.transactionHash);
-            setTxHash(result.transactionHash);
-          }}
-          onTransactionConfirmed={(receipt) => {
-            console.log("Transaction confirmed", receipt.transactionHash);
-          }}
-          onError={(error) => {
-            setError(error.message);
-          }}
-          onClick={() => {
-            setError("");
-            setTxHash("");
-          }}
         >
           Claim {txHash ? "more" : ""}
         </TransactionButton>
@@ -65,21 +65,17 @@ export function WriteContractExtensionPreview() {
 
       {error ? (
         <div className="mt-4 text-center text-red-600 text-sm">{error}</div>
-      ) : (
-        <>
-          {txHash && sepolia.blockExplorers && (
-            <a
-              target="_blank"
-              rel="noreferrer"
-              href={`${sepolia.blockExplorers[0].url}/tx/${txHash}`}
-              className="mt-3 text-center text-green-400"
-            >
-              Tx sent:{" "}
-              <span className="underline">{shortenAddress(txHash, 6)}</span>
-            </a>
-          )}
-        </>
-      )}
+      ) : txHash && sepolia.blockExplorers ? (
+        <a
+          className="mt-3 text-center text-green-400"
+          href={`${sepolia.blockExplorers[0].url}/tx/${txHash}`}
+          rel="noreferrer"
+          target="_blank"
+        >
+          Tx sent:{" "}
+          <span className="underline">{shortenAddress(txHash, 6)}</span>
+        </a>
+      ) : null}
     </div>
   );
 }
diff --git a/apps/playground-web/src/components/blockchain-api/write-contract-raw.tsx b/apps/playground-web/src/components/blockchain-api/write-contract-raw.tsx
index 5fabd658535..4bd8e3a8160 100644
--- a/apps/playground-web/src/components/blockchain-api/write-contract-raw.tsx
+++ b/apps/playground-web/src/components/blockchain-api/write-contract-raw.tsx
@@ -1,11 +1,10 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import Image from "next/image";
 import { useState } from "react";
 import {
-  type Hex,
   getContract,
+  type Hex,
   prepareContractCall,
   toTokens,
   toUnits,
@@ -18,6 +17,7 @@ import {
   useActiveAccount,
   useReadContract,
 } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 import { shortenAddress } from "./shortenAddress";
 
 const twCoinContract = getContract({
@@ -32,8 +32,8 @@ export function WriteContractRawPreview() {
   const account = useActiveAccount();
   const [to, setTo] = useState<string>("");
   const { data: balance } = useReadContract(balanceOf, {
-    contract: twCoinContract,
     address: account?.address ?? "0x",
+    contract: twCoinContract,
     queryOptions: {
       enabled: !!account?.address,
     },
@@ -46,11 +46,11 @@ export function WriteContractRawPreview() {
             <div className="text-2xl">Your balance</div>
             <div className="flex flex-row justify-start gap-3">
               <Image
-                src="/twcoin.svg"
+                alt=""
                 className="mx-auto size-5 animate-bounce rounded-2xl"
-                width={50}
                 height={50}
-                alt=""
+                src="/twcoin.svg"
+                width={50}
               />
               <div>
                 <span className="text-green-600">
@@ -63,9 +63,9 @@ export function WriteContractRawPreview() {
 
           <input
             className="mb-3 rounded-lg border bg-transparent px-3 py-2"
-            type="text"
-            placeholder="0x..."
             onChange={(e) => setTo(e.target.value)}
+            placeholder="0x..."
+            type="text"
           />
         </>
       ) : (
@@ -74,22 +74,9 @@ export function WriteContractRawPreview() {
 
       {account ? (
         <TransactionButton
-          transaction={() =>
-            prepareContractCall({
-              contract: twCoinContract,
-              method:
-                "function transfer(address to, uint256 value) returns (bool)",
-              // In reality you should properly validate the params
-              // we keep it simple in this demo
-              params: [to as Hex, toUnits("5", 18)],
-            })
-          }
-          onTransactionSent={(result) => {
-            console.log("Transaction submitted", result.transactionHash);
-            setTxHash(result.transactionHash);
-          }}
-          onTransactionConfirmed={(receipt) => {
-            console.log("Transaction confirmed", receipt.transactionHash);
+          onClick={() => {
+            setError("");
+            setTxHash("");
           }}
           onError={(error) => {
             // Probably the most common error for this use case
@@ -101,10 +88,23 @@ export function WriteContractRawPreview() {
               : error.message;
             setError(_message);
           }}
-          onClick={() => {
-            setError("");
-            setTxHash("");
+          onTransactionConfirmed={(receipt) => {
+            console.log("Transaction confirmed", receipt.transactionHash);
           }}
+          onTransactionSent={(result) => {
+            console.log("Transaction submitted", result.transactionHash);
+            setTxHash(result.transactionHash);
+          }}
+          transaction={() =>
+            prepareContractCall({
+              contract: twCoinContract,
+              method:
+                "function transfer(address to, uint256 value) returns (bool)",
+              // In reality you should properly validate the params
+              // we keep it simple in this demo
+              params: [to as Hex, toUnits("5", 18)],
+            })
+          }
         >
           Send {txHash ? "more" : ""}
         </TransactionButton>
@@ -124,10 +124,10 @@ export function WriteContractRawPreview() {
         <>
           {txHash && sepolia.blockExplorers && (
             <a
-              target="_blank"
-              rel="noreferrer"
-              href={`${sepolia.blockExplorers[0].url}/tx/${txHash}`}
               className="mt-3 text-center text-green-400"
+              href={`${sepolia.blockExplorers[0].url}/tx/${txHash}`}
+              rel="noreferrer"
+              target="_blank"
             >
               Tx sent:{" "}
               <span className="underline">{shortenAddress(txHash, 6)}</span>
diff --git a/apps/playground-web/src/components/blocks/APIHeader.tsx b/apps/playground-web/src/components/blocks/APIHeader.tsx
index 0bdfc172ea2..7b295ca2c50 100644
--- a/apps/playground-web/src/components/blocks/APIHeader.tsx
+++ b/apps/playground-web/src/components/blocks/APIHeader.tsx
@@ -25,15 +25,15 @@ export function PageHeader(props: {
         <div className="flex flex-col gap-3 md:flex-row">
           <Button asChild>
             <Link
-              target="_blank"
               href={"https://thirdweb.com/dashboard?utm_source=playground"}
+              target="_blank"
             >
               <PresentationIcon className="mr-2 h-4 w-4" />
               Add instantly
             </Link>
           </Button>
-          <Button asChild variant="outline" className="bg-card">
-            <Link target="_blank" href={props.docsLink}>
+          <Button asChild className="bg-card" variant="outline">
+            <Link href={props.docsLink} target="_blank">
               <BookOpenIcon className="mr-2 h-4 w-4" />
               Documentation
             </Link>
@@ -54,9 +54,9 @@ export function PageLayout(props: {
   return (
     <main>
       <PageHeader
-        title={props.title}
         description={props.description}
         docsLink={props.docsLink}
+        title={props.title}
       />
       <div className={cn("container pb-8", props.containerClassName)}>
         {props.children}
diff --git a/apps/playground-web/src/components/blocks/ChainIcon.tsx b/apps/playground-web/src/components/blocks/ChainIcon.tsx
index f601ccc6b76..2e7d6d1ee52 100644
--- a/apps/playground-web/src/components/blocks/ChainIcon.tsx
+++ b/apps/playground-web/src/components/blocks/ChainIcon.tsx
@@ -23,13 +23,13 @@ export const ChainIcon = ({ ipfsSrc, ...restProps }: ChainIconProps) => {
     <Img
       {...restProps}
       // render different image element if src changes to avoid showing old image while loading new one
-      key={src}
+      alt=""
       className={cn("object-contain", restProps.className)}
-      src={src}
+      fallback={<img alt="" src={fallbackChainIcon} />}
+      key={src}
       loading={restProps.loading || "lazy"}
-      alt=""
-      fallback={<img src={fallbackChainIcon} alt="" />}
       skeleton={<div className="animate-pulse rounded-full bg-border" />}
+      src={src}
     />
   );
 };
@@ -38,8 +38,8 @@ function replaceIpfsUrl(uri: string) {
   try {
     // eslint-disable-next-line no-restricted-syntax
     return resolveScheme({
-      uri,
       client: THIRDWEB_CLIENT,
+      uri,
     });
   } catch (err) {
     console.error("error resolving ipfs url", uri, err);
diff --git a/apps/playground-web/src/components/blocks/NetworkSelectors.tsx b/apps/playground-web/src/components/blocks/NetworkSelectors.tsx
index 1d29951cb25..828034f16ce 100644
--- a/apps/playground-web/src/components/blocks/NetworkSelectors.tsx
+++ b/apps/playground-web/src/components/blocks/NetworkSelectors.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { Badge } from "@/components/ui/badge";
 import { useCallback, useMemo } from "react";
+import { Badge } from "@/components/ui/badge";
 import { useAllChainsData } from "../../app/hooks/chains";
 import { ChainIcon } from "./ChainIcon";
 import { MultiSelect } from "./multi-select";
@@ -96,7 +96,7 @@ export function MultiNetworkSelector(props: {
           </span>
 
           {!props.disableChainId && (
-            <Badge variant="outline" className="gap-2">
+            <Badge className="gap-2" variant="outline">
               <span className="text-muted-foreground">Chain ID</span>
               {chain.chainId}
             </Badge>
@@ -109,21 +109,21 @@ export function MultiNetworkSelector(props: {
 
   return (
     <MultiSelect
-      searchPlaceholder="Search by Name or Chain Id"
-      selectedValues={props.selectedChainIds.map(String)}
-      options={options}
+      className={props.className}
+      disabled={allChains.length === 0}
       onSelectedValuesChange={(chainIds) => {
         props.onChange(chainIds.map(Number));
       }}
+      options={options}
+      overrideSearchFn={searchFn}
       placeholder={
         allChains.length === 0 ? "Loading Chains..." : "Select Chains"
       }
-      disabled={allChains.length === 0}
-      overrideSearchFn={searchFn}
-      renderOption={renderOption}
-      className={props.className}
       popoverContentClassName={props.popoverContentClassName}
+      renderOption={renderOption}
+      searchPlaceholder="Search by Name or Chain Id"
       selectedBadgeClassName={props.selectedBadgeClassName}
+      selectedValues={props.selectedChainIds.map(String)}
     />
   );
 }
diff --git a/apps/playground-web/src/components/blocks/multi-select.tsx b/apps/playground-web/src/components/blocks/multi-select.tsx
index 3abf03124b3..c92845f3fe0 100644
--- a/apps/playground-web/src/components/blocks/multi-select.tsx
+++ b/apps/playground-web/src/components/blocks/multi-select.tsx
@@ -1,14 +1,7 @@
 /* eslint-disable no-restricted-syntax */
+/** biome-ignore-all lint/a11y/useSemanticElements: TODO */
 "use client";
 
-import { Button } from "@/components/ui/button";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import { Separator } from "@/components/ui/separator";
-import { cn } from "@/lib/utils";
 import { CheckIcon, ChevronDownIcon, SearchIcon, XIcon } from "lucide-react";
 import {
   forwardRef,
@@ -18,9 +11,17 @@ import {
   useRef,
   useState,
 } from "react";
+import { Button } from "@/components/ui/button";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { Separator } from "@/components/ui/separator";
+import { cn } from "@/lib/utils";
 import { useShowMore } from "../../lib/useShowMore";
-import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 import { Input } from "../ui/input";
+import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow";
 
 interface MultiSelectProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement> {
@@ -156,16 +157,16 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
     }, [searchValue]);
 
     return (
-      <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen} modal>
+      <Popover modal onOpenChange={setIsPopoverOpen} open={isPopoverOpen}>
         <PopoverTrigger asChild>
           <Button
             ref={ref}
             {...props}
-            onClick={handleTogglePopover}
             className={cn(
               "flex h-auto min-h-10 w-full items-center justify-between rounded-md border border-border bg-inherit p-3 hover:bg-inherit",
               className,
             )}
+            onClick={handleTogglePopover}
           >
             {selectedValues.length > 0 ? (
               <div className="flex w-full justify-between">
@@ -179,10 +180,10 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
 
                     return (
                       <ClosableBadge
+                        className={selectedBadgeClassName}
                         key={value}
                         label={option.label}
                         onClose={() => toggleOption(value)}
-                        className={selectedBadgeClassName}
                       />
                     );
                   })}
@@ -198,22 +199,22 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
 
                 <div className="flex items-center justify-between gap-2">
                   {/* Clear All */}
-                  {/* biome-ignore lint/a11y/useKeyWithClickEvents: <explanation> */}
-                  {/* biome-ignore lint/a11y/useFocusableInteractive: <explanation> */}
+                  {/* biome-ignore lint/a11y/useKeyWithClickEvents: TODO */}
+                  {/* biome-ignore lint/a11y/useFocusableInteractive: TODO */}
                   <div
-                    role="button"
+                    className="rounded p-1 hover:bg-accent"
                     onClick={(event) => {
                       event.stopPropagation();
                       handleClear();
                     }}
-                    className="rounded p-1 hover:bg-accent"
+                    role="button"
                   >
                     <XIcon className="h-4 cursor-pointer text-muted-foreground" />
                   </div>
 
                   <Separator
-                    orientation="vertical"
                     className="flex h-full min-h-6"
+                    orientation="vertical"
                   />
                   <ChevronDownIcon className="h-4 cursor-pointer text-muted-foreground" />
                 </div>
@@ -229,32 +230,32 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
           </Button>
         </PopoverTrigger>
         <PopoverContent
-          className={cn("p-0", popoverContentClassName)}
           align="center"
-          sideOffset={10}
+          className={cn("p-0", popoverContentClassName)}
           onEscapeKeyDown={() => setIsPopoverOpen(false)}
+          ref={popoverElRef}
+          sideOffset={10}
           style={{
-            width: "var(--radix-popover-trigger-width)",
             maxHeight: "var(--radix-popover-content-available-height)",
+            width: "var(--radix-popover-trigger-width)",
           }}
-          ref={popoverElRef}
         >
           <div>
             {/* Search */}
             <div className="relative">
               <Input
-                placeholder={searchPlaceholder || "Search"}
-                value={searchValue}
-                onChange={(e) => setSearchValue(e.target.value)}
                 className="!h-auto rounded-b-none border-0 border-border border-b py-4 pl-10 focus-visible:ring-0 focus-visible:ring-offset-0"
+                onChange={(e) => setSearchValue(e.target.value)}
                 onKeyDown={handleInputKeyDown}
+                placeholder={searchPlaceholder || "Search"}
+                value={searchValue}
               />
               <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-4 size-4 text-muted-foreground" />
             </div>
 
             <ScrollShadow
-              scrollableClassName="max-h-[min(calc(var(--radix-popover-content-available-height)-60px),350px)] p-1"
               className="rounded"
+              scrollableClassName="max-h-[min(calc(var(--radix-popover-content-available-height)-60px),350px)] p-1"
             >
               {/* List */}
               <div>
@@ -268,15 +269,15 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
                   const isSelected = selectedValues.includes(option.value);
                   return (
                     <Button
-                      key={option.value}
-                      role="option"
                       aria-selected={isSelected}
-                      onClick={() => toggleOption(option.value)}
-                      variant="ghost"
                       className="flex w-full cursor-pointer justify-start gap-3 rounded-sm px-3 py-2 text-left"
+                      key={option.value}
+                      onClick={() => toggleOption(option.value)}
                       ref={
                         i === optionsToShow.length - 1 ? lastItemRef : undefined
                       }
+                      role="option"
+                      variant="ghost"
                     >
                       <div
                         className={cn(
diff --git a/apps/playground-web/src/components/blocks/upload-image.tsx b/apps/playground-web/src/components/blocks/upload-image.tsx
index 4e4845ce655..cbecf55e2c5 100644
--- a/apps/playground-web/src/components/blocks/upload-image.tsx
+++ b/apps/playground-web/src/components/blocks/upload-image.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { UploadIcon } from "lucide-react";
 import { type ChangeEvent, useRef, useState } from "react";
+import { cn } from "@/lib/utils";
 
 export function UploadImage(props: {
   onImageUpload?: (file: File) => void;
@@ -40,7 +40,8 @@ export function UploadImage(props: {
   };
 
   return (
-    // biome-ignore lint/a11y/useKeyWithClickEvents: <explanation>
+    // biome-ignore lint/a11y/useKeyWithClickEvents: TODO
+    // biome-ignore lint/a11y/noStaticElementInteractions: TODO
     <div
       className={cn(
         "relative aspect-square w-80 cursor-pointer overflow-hidden rounded-lg border",
@@ -50,20 +51,20 @@ export function UploadImage(props: {
       onClick={handleClick}
     >
       <input
-        id={props.id}
-        type="file"
-        ref={fileInputRef}
-        className="hidden"
         accept="image/*"
+        className="hidden"
+        id={props.id}
         onChange={handleFileChange}
+        ref={fileInputRef}
+        type="file"
       />
 
       {preview ? (
         // eslint-disable-next-line @next/next/no-img-element
         <img
-          src={preview}
           alt="Preview"
           className="h-full w-full object-contain"
+          src={preview}
         />
       ) : (
         <div className="flex h-full w-full flex-col items-center justify-center p-4 text-muted-foreground">
diff --git a/apps/playground-web/src/components/code/RenderCode.tsx b/apps/playground-web/src/components/code/RenderCode.tsx
index 8d4f04b9701..0357c59dee7 100644
--- a/apps/playground-web/src/components/code/RenderCode.tsx
+++ b/apps/playground-web/src/components/code/RenderCode.tsx
@@ -17,11 +17,11 @@ export function RenderCode(props: {
       )}
     >
       <ScrollShadow
-        scrollableClassName={cn("p-4", props.scrollableClassName)}
         className={cn(
           "h-full text-xs md:text-sm [&_*]:leading-relaxed",
           props.scrollableContainerClassName,
         )}
+        scrollableClassName={cn("p-4", props.scrollableClassName)}
         shadowColor="hsl(var(--muted))"
       >
         <div
@@ -30,9 +30,9 @@ export function RenderCode(props: {
         />
       </ScrollShadow>
       <CopyButton
-        text={props.code}
-        iconClassName="size-3"
         className="absolute top-4 right-4 z-10 border bg-background p-2 opacity-0 transition-opacity duration-300 group-hover:opacity-100"
+        iconClassName="size-3"
+        text={props.code}
       />
     </div>
   );
diff --git a/apps/playground-web/src/components/code/code-example.tsx b/apps/playground-web/src/components/code/code-example.tsx
index c201254f149..780de776825 100644
--- a/apps/playground-web/src/components/code/code-example.tsx
+++ b/apps/playground-web/src/components/code/code-example.tsx
@@ -34,18 +34,18 @@ export const CodeExample: React.FC<CodeExampleProps> = ({
       )}
       <div className="grid grid-cols-1 overflow-hidden rounded-lg border bg-card md:grid-cols-2">
         <div className="flex grow flex-col border-b md:border-r md:border-b-0">
-          <TabName name="Code" icon={Code2Icon} />
+          <TabName icon={Code2Icon} name="Code" />
           <Code
+            className="h-full rounded-none border-none"
             code={code}
             lang={lang}
-            className="h-full rounded-none border-none"
           />
         </div>
         <div className="flex grow flex-col">
-          <TabName name="Preview" icon={EyeIcon} />
+          <TabName icon={EyeIcon} name="Preview" />
           <ClientOnly
-            ssr={null}
             className="relative grid h-full min-h-[300px] place-items-center bg-background py-20"
+            ssr={null}
           >
             {preview}
           </ClientOnly>
diff --git a/apps/playground-web/src/components/code/code.client.tsx b/apps/playground-web/src/components/code/code.client.tsx
index bdde002bbd0..c2d51da94bc 100644
--- a/apps/playground-web/src/components/code/code.client.tsx
+++ b/apps/playground-web/src/components/code/code.client.tsx
@@ -1,8 +1,8 @@
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
 import type { BundledLanguage } from "shiki";
 import { LoadingDots } from "../ui/LoadingDots";
-import { RenderCode } from "./RenderCode";
 import { getCodeHtml } from "./getCodeHtml";
+import { RenderCode } from "./RenderCode";
 
 // Use CodeClient where the code changes based user input
 // Using RSC in that scenario feels too slow and unnecessary keep hitting the server
@@ -33,9 +33,9 @@ export const CodeClient: React.FC<CodeProps> = ({
   scrollableContainerClassName,
 }) => {
   const codeQuery = useQuery({
-    queryKey: ["html", code],
-    queryFn: () => getCodeHtml(code, lang),
     placeholderData: keepPreviousData,
+    queryFn: () => getCodeHtml(code, lang),
+    queryKey: ["html", code],
   });
 
   if (!codeQuery.data) {
@@ -44,9 +44,9 @@ export const CodeClient: React.FC<CodeProps> = ({
 
   return (
     <RenderCode
+      className={className}
       code={codeQuery.data.formattedCode}
       html={codeQuery.data.html}
-      className={className}
       scrollableClassName={scrollableClassName}
       scrollableContainerClassName={scrollableContainerClassName}
     />
diff --git a/apps/playground-web/src/components/code/code.tsx b/apps/playground-web/src/components/code/code.tsx
index d8a638605ad..1c87c58ee32 100644
--- a/apps/playground-web/src/components/code/code.tsx
+++ b/apps/playground-web/src/components/code/code.tsx
@@ -1,6 +1,6 @@
 import type { BundledLanguage } from "shiki";
-import { RenderCode } from "./RenderCode";
 import { getCodeHtml } from "./getCodeHtml";
+import { RenderCode } from "./RenderCode";
 
 type CodeProps = {
   code: string;
@@ -18,9 +18,9 @@ export const Code: React.FC<CodeProps> = async ({
   const { html, formattedCode } = await getCodeHtml(code, lang);
   return (
     <RenderCode
+      className={className}
       code={formattedCode}
       html={html}
-      className={className}
       scrollableClassName={scrollableClassName}
     />
   );
diff --git a/apps/playground-web/src/components/code/getCodeHtml.tsx b/apps/playground-web/src/components/code/getCodeHtml.tsx
index f18f7db1050..aa4e06784a5 100644
--- a/apps/playground-web/src/components/code/getCodeHtml.tsx
+++ b/apps/playground-web/src/components/code/getCodeHtml.tsx
@@ -29,10 +29,10 @@ export async function getCodeHtml(code: string, lang: BundledLanguage) {
   const html = await codeToHtml(formattedCode, {
     lang: lang,
     themes: {
-      light: "github-light",
       dark: "github-dark-default",
+      light: "github-light",
     },
   });
 
-  return { html, formattedCode };
+  return { formattedCode, html };
 }
diff --git a/apps/playground-web/src/components/headless-ui/account-examples.tsx b/apps/playground-web/src/components/headless-ui/account-examples.tsx
index cd33c914c74..f32e4d0102f 100644
--- a/apps/playground-web/src/components/headless-ui/account-examples.tsx
+++ b/apps/playground-web/src/components/headless-ui/account-examples.tsx
@@ -14,11 +14,6 @@ export function AccountNameExample() {
   return (
     <div>
       <CodeExample
-        header={{
-          title: "AccountName",
-          description: "Show the social alias associated with the account.",
-        }}
-        preview={<AccountNameBasicPreview />}
         code={`import { AccountProvider, AccountName } from "thirdweb/react";
 
 function App() {
@@ -26,7 +21,12 @@ function App() {
     <AccountName loadingComponent={<span>Loading...</span>} />
   </AccountProvider>
 }`}
+        header={{
+          description: "Show the social alias associated with the account.",
+          title: "AccountName",
+        }}
         lang="tsx"
+        preview={<AccountNameBasicPreview />}
       />
 
       <p className="my-4 text-muted-foreground">
@@ -34,7 +34,6 @@ function App() {
       </p>
 
       <CodeExample
-        preview={<AccountNameCustomPreview />}
         code={`import { AccountProvider, AccountName } from "thirdweb/react";
 
 function App() {
@@ -44,6 +43,7 @@ function App() {
   </AccountProvider>
 }`}
         lang="tsx"
+        preview={<AccountNameCustomPreview />}
       />
     </div>
   );
@@ -53,11 +53,6 @@ export function AccountBalanceExample() {
   return (
     <div>
       <CodeExample
-        header={{
-          title: "AccountBalance",
-          description: "Display the current native balance of the wallet.",
-        }}
-        preview={<AccountBalanceBasicPreview />}
         code={`import { AccountProvider, AccountAddress } from "thirdweb/react";
 import { shortenAddress } from "thirdweb/utils";
 
@@ -69,7 +64,12 @@ function App() {
     />
   </AccountProvider>
 }`}
+        header={{
+          description: "Display the current native balance of the wallet.",
+          title: "AccountBalance",
+        }}
         lang="tsx"
+        preview={<AccountBalanceBasicPreview />}
       />
 
       <p className="my-4 text-muted-foreground">
@@ -77,7 +77,6 @@ function App() {
       </p>
 
       <CodeExample
-        preview={<AccountBalanceCustomTokenPreview />}
         code={`import { AccountProvider, AccountAddress } from "thirdweb/react";
 import { shortenAddress } from "thirdweb/utils";
 
@@ -93,6 +92,7 @@ function App() {
   </AccountProvider>
 }`}
         lang="tsx"
+        preview={<AccountBalanceCustomTokenPreview />}
       />
 
       <p className="my-4 text-muted-foreground">
@@ -100,7 +100,6 @@ function App() {
       </p>
 
       <CodeExample
-        preview={<AccountBalanceFormatPreview />}
         code={`import { AccountProvider, AccountAddress, type AccountBalanceFormatParams } from "thirdweb/react";
 
 function App() {
@@ -112,6 +111,7 @@ function App() {
   </AccountProvider>
 }`}
         lang="tsx"
+        preview={<AccountBalanceFormatPreview />}
       />
 
       <p className="my-4 text-muted-foreground">
@@ -119,7 +119,6 @@ function App() {
       </p>
 
       <CodeExample
-        preview={<AccountBalanceUSDPreview />}
         code={`import { AccountProvider, AccountAddress } from "thirdweb/react";
 
 function App() {
@@ -134,6 +133,7 @@ function App() {
   )
 }`}
         lang="tsx"
+        preview={<AccountBalanceUSDPreview />}
       />
     </div>
   );
@@ -142,11 +142,6 @@ function App() {
 export function AccountAvatarExample() {
   return (
     <CodeExample
-      header={{
-        title: "AccountAvatar",
-        description: "Show the social avatar associated with the account",
-      }}
-      preview={<AccountAvatarBasicPreview />}
       code={`import { AccountProvider, AccountAvatar } from "thirdweb/react";
 
 function App() {
@@ -154,7 +149,12 @@ function App() {
     <AccountAvatar className="w-20 h-20 rounded-full" loadingComponent={<span>Loading...</span>} />
   </AccountProvider>
 }`}
+      header={{
+        description: "Show the social avatar associated with the account",
+        title: "AccountAvatar",
+      }}
       lang="tsx"
+      preview={<AccountAvatarBasicPreview />}
     />
   );
 }
@@ -162,12 +162,6 @@ function App() {
 export function AccountBlobbieExample() {
   return (
     <CodeExample
-      header={{
-        title: "AccountBlobbie",
-        description:
-          "Show the unique blobbie generated from the wallet address",
-      }}
-      preview={<AccountBlobbieBasicPreview />}
       code={`import { AccountProvider, AccountBlobbie } from "thirdweb/react";
 
 function App() {
@@ -175,7 +169,13 @@ function App() {
     <AccountBlobbie className="h-20 w-20 rounded-full" />
   </AccountProvider>
 }`}
+      header={{
+        description:
+          "Show the unique blobbie generated from the wallet address",
+        title: "AccountBlobbie",
+      }}
       lang="tsx"
+      preview={<AccountBlobbieBasicPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/components/headless-ui/account-previews.tsx b/apps/playground-web/src/components/headless-ui/account-previews.tsx
index b128dbf9504..fd2bce24212 100644
--- a/apps/playground-web/src/components/headless-ui/account-previews.tsx
+++ b/apps/playground-web/src/components/headless-ui/account-previews.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { ethereum } from "thirdweb/chains";
 import {
   AccountAvatar,
@@ -10,6 +9,7 @@ import {
   AccountName,
   AccountProvider,
 } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 
 const vitalikAddress = "0xd8da6bf26964af9d7eed9e03e53415d37aa96045";
 
@@ -25,8 +25,8 @@ export function AccountNameCustomPreview() {
   return (
     <AccountProvider address={vitalikAddress} client={THIRDWEB_CLIENT}>
       <AccountName
-        socialType="lens"
         loadingComponent={<span>Loading...</span>}
+        socialType="lens"
       />
     </AccountProvider>
   );
@@ -48,8 +48,8 @@ export function AccountBalanceCustomTokenPreview() {
     <AccountProvider address={vitalikAddress} client={THIRDWEB_CLIENT}>
       <AccountBalance
         chain={ethereum}
-        tokenAddress="0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
         loadingComponent={<span>Loading...</span>}
+        tokenAddress="0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
       />
     </AccountProvider>
   );
@@ -74,8 +74,8 @@ export function AccountBalanceUSDPreview() {
     <AccountProvider address={vitalikAddress} client={THIRDWEB_CLIENT}>
       <AccountBalance
         chain={ethereum}
-        showBalanceInFiat="USD"
         loadingComponent={<span>Loading...</span>}
+        showBalanceInFiat="USD"
       />
     </AccountProvider>
   );
diff --git a/apps/playground-web/src/components/headless-ui/chain-examples.tsx b/apps/playground-web/src/components/headless-ui/chain-examples.tsx
index a76fe319c0b..faad89127c8 100644
--- a/apps/playground-web/src/components/headless-ui/chain-examples.tsx
+++ b/apps/playground-web/src/components/headless-ui/chain-examples.tsx
@@ -4,11 +4,6 @@ import { ChainIconPreview, ChainNamePreview } from "./chain-previews";
 export function ChainIconExample() {
   return (
     <CodeExample
-      header={{
-        title: "ChainIcon",
-        description: "Show the native icon of a network",
-      }}
-      preview={<ChainIconPreview />}
       code={`import { ChainProvider, ChainIcon } from "thirdweb/react";
 
 function App() {
@@ -22,7 +17,12 @@ function App() {
     </ChainProvider>
   )
 }`}
+      header={{
+        description: "Show the native icon of a network",
+        title: "ChainIcon",
+      }}
       lang="tsx"
+      preview={<ChainIconPreview />}
     />
   );
 }
@@ -30,11 +30,6 @@ function App() {
 export function ChainNameExample() {
   return (
     <CodeExample
-      header={{
-        title: "ChainName",
-        description: "Show the name of the chain",
-      }}
-      preview={<ChainNamePreview />}
       code={`import { ChainProvider, ChainName } from "thirdweb/react";
 
 function App() {
@@ -44,7 +39,12 @@ function App() {
     </ChainProvider>
   )
 }`}
+      header={{
+        description: "Show the name of the chain",
+        title: "ChainName",
+      }}
       lang="tsx"
+      preview={<ChainNamePreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/components/headless-ui/chain-previews.tsx b/apps/playground-web/src/components/headless-ui/chain-previews.tsx
index c8a655487d8..b48a2396235 100644
--- a/apps/playground-web/src/components/headless-ui/chain-previews.tsx
+++ b/apps/playground-web/src/components/headless-ui/chain-previews.tsx
@@ -1,15 +1,15 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { avalanche } from "thirdweb/chains";
 import { ChainIcon, ChainName, ChainProvider } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 
 export function ChainIconPreview() {
   return (
     <ChainProvider chain={avalanche}>
       <ChainIcon
-        client={THIRDWEB_CLIENT}
         className="h-auto w-20 rounded-full"
+        client={THIRDWEB_CLIENT}
         loadingComponent={<span>Loading...</span>}
       />
     </ChainProvider>
diff --git a/apps/playground-web/src/components/headless-ui/nft-examples.tsx b/apps/playground-web/src/components/headless-ui/nft-examples.tsx
index ba87c9a060c..b243cf1ae6a 100644
--- a/apps/playground-web/src/components/headless-ui/nft-examples.tsx
+++ b/apps/playground-web/src/components/headless-ui/nft-examples.tsx
@@ -11,11 +11,6 @@ export function NftMediaExample() {
   return (
     <div>
       <CodeExample
-        header={{
-          title: "NFTMedia",
-          description: "Show the media of an NFT in a collection.",
-        }}
-        preview={<NftMediaBasicPreview />}
         code={`import { NFTProvider, NFTMedia } from "thirdweb/react";
 
 function App() {
@@ -23,7 +18,12 @@ function App() {
     <NFTMedia className="rounded-md w-40 h-40" loadingComponent={<span>Loading...</span>} />
   </NFTProvider>
 }`}
+        header={{
+          description: "Show the media of an NFT in a collection.",
+          title: "NFTMedia",
+        }}
         lang="tsx"
+        preview={<NftMediaBasicPreview />}
       />
 
       <p className="my-4 text-muted-foreground">
@@ -33,7 +33,6 @@ function App() {
       </p>
 
       <CodeExample
-        preview={<NftMediaOverridePreview />}
         code={`import { NFTProvider, NFTMedia } from "thirdweb/react";
 
 function App() {
@@ -48,6 +47,7 @@ function App() {
     </NFTProvider>
 }`}
         lang="tsx"
+        preview={<NftMediaOverridePreview />}
       />
     </div>
   );
@@ -56,11 +56,6 @@ function App() {
 export function NftNameExample() {
   return (
     <CodeExample
-      header={{
-        title: "NFTName",
-        description: "Show the name of an NFT in a collection.",
-      }}
-      preview={<NftNameBasicPreview />}
       code={`import { NFTProvider, NFTName } from "thirdweb/react";
 
 function App() {
@@ -68,7 +63,12 @@ function App() {
     <NFTName loadingComponent={<span>Loading...</span>} />
   </NFTProvider>
 }`}
+      header={{
+        description: "Show the name of an NFT in a collection.",
+        title: "NFTName",
+      }}
       lang="tsx"
+      preview={<NftNameBasicPreview />}
     />
   );
 }
@@ -76,11 +76,6 @@ function App() {
 export function NftDescriptionBasic() {
   return (
     <CodeExample
-      header={{
-        title: "NFTDescription",
-        description: "Show the description of an NFT in a collection.",
-      }}
-      preview={<NftDescriptionBasicPreview />}
       code={`import { NFTProvider, NFTDescription } from "thirdweb/react";
 
 function App() {
@@ -88,7 +83,12 @@ function App() {
     <NFTDescription className="text-center" loadingComponent={<span>Loading...</span>} />
   </NFTProvider>
 }`}
+      header={{
+        description: "Show the description of an NFT in a collection.",
+        title: "NFTDescription",
+      }}
       lang="tsx"
+      preview={<NftDescriptionBasicPreview />}
     />
   );
 }
@@ -96,12 +96,6 @@ function App() {
 export function NftCardExample() {
   return (
     <CodeExample
-      header={{
-        title: "Build an NFT Card",
-        description:
-          "Using these headless components, you can easily build your own NFT Card",
-      }}
-      preview={<NftCardDemoPreview />}
       code={`import { NFTProvider, NFTDescription, NFTName, NFTMedia } from "thirdweb/react";
 
 function App() {
@@ -118,7 +112,13 @@ function App() {
     </NFTProvider>
   )
 }`}
+      header={{
+        description:
+          "Using these headless components, you can easily build your own NFT Card",
+        title: "Build an NFT Card",
+      }}
       lang="tsx"
+      preview={<NftCardDemoPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/components/headless-ui/nft-previews.tsx b/apps/playground-web/src/components/headless-ui/nft-previews.tsx
index 46f19cf3a4e..a6467c7145e 100644
--- a/apps/playground-web/src/components/headless-ui/nft-previews.tsx
+++ b/apps/playground-web/src/components/headless-ui/nft-previews.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { getContract } from "thirdweb";
 import { ethereum } from "thirdweb/chains";
 import { NFTDescription, NFTMedia, NFTName, NFTProvider } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 
 const nftContract = getContract({
   address: "0xbd3531da5cf5857e7cfaa92426877b022e612cf8",
@@ -13,7 +13,7 @@ const nftContract = getContract({
 
 export function NftMediaBasicPreview() {
   return (
-    <NFTProvider tokenId={0n} contract={nftContract}>
+    <NFTProvider contract={nftContract} tokenId={0n}>
       <NFTMedia
         className="h-40 w-40 rounded-md"
         loadingComponent={<span>Loading...</span>}
@@ -24,12 +24,12 @@ export function NftMediaBasicPreview() {
 
 export function NftMediaOverridePreview() {
   return (
-    <NFTProvider tokenId={0n} contract={nftContract}>
+    <NFTProvider contract={nftContract} tokenId={0n}>
       <NFTMedia
         className="h-40 w-40 rounded-md border"
         mediaResolver={{
-          src: "ipfs://QmeGCqV1mSHTZrvuFzW1XZdCRRGXB6AmSotTqHoxA2xfDo/1.mp4",
           poster: "ipfs://QmeGCqV1mSHTZrvuFzW1XZdCRRGXB6AmSotTqHoxA2xfDo/0.png",
+          src: "ipfs://QmeGCqV1mSHTZrvuFzW1XZdCRRGXB6AmSotTqHoxA2xfDo/1.mp4",
         }}
       />
     </NFTProvider>
@@ -38,7 +38,7 @@ export function NftMediaOverridePreview() {
 
 export function NftNameBasicPreview() {
   return (
-    <NFTProvider tokenId={0n} contract={nftContract}>
+    <NFTProvider contract={nftContract} tokenId={0n}>
       <NFTName loadingComponent={<span>Loading...</span>} />
     </NFTProvider>
   );
@@ -46,7 +46,7 @@ export function NftNameBasicPreview() {
 
 export function NftDescriptionBasicPreview() {
   return (
-    <NFTProvider tokenId={0n} contract={nftContract}>
+    <NFTProvider contract={nftContract} tokenId={0n}>
       <NFTDescription
         className="block px-6 text-center"
         loadingComponent={<span>Loading...</span>}
@@ -57,7 +57,7 @@ export function NftDescriptionBasicPreview() {
 
 export function NftCardDemoPreview() {
   return (
-    <NFTProvider tokenId={0n} contract={nftContract}>
+    <NFTProvider contract={nftContract} tokenId={0n}>
       <div className="flex w-[230px] flex-col gap-3 rounded-lg border bg-zinc-900 px-1 py-3">
         <NFTMedia className="rounded-md px-2 text-center" />
         <NFTName className="px-2 font-bold" />
diff --git a/apps/playground-web/src/components/headless-ui/token-examples.tsx b/apps/playground-web/src/components/headless-ui/token-examples.tsx
index 29198a73ad1..f11287ba527 100644
--- a/apps/playground-web/src/components/headless-ui/token-examples.tsx
+++ b/apps/playground-web/src/components/headless-ui/token-examples.tsx
@@ -10,11 +10,6 @@ export function TokenImageBasic() {
   return (
     <div>
       <CodeExample
-        header={{
-          title: "TokenIcon",
-          description: "Show the default native icon of a network",
-        }}
-        preview={<TokenImageBasicPreview />}
         code={`import { TokenProvider, TokenIcon } from "thirdweb/react";
 
 function App() {
@@ -28,14 +23,18 @@ function App() {
     </TokenProvider>
   )
 }`}
+        header={{
+          description: "Show the default native icon of a network",
+          title: "TokenIcon",
+        }}
         lang="tsx"
+        preview={<TokenImageBasicPreview />}
       />
       <p className="my-4 text-muted-foreground text-sm">
         Override the {`token's`} icon using the iconResolver prop.
       </p>
 
       <CodeExample
-        preview={<TokenImageOverridePreview />}
         code={`\
 import { TokenProvider, TokenIcon } from "thirdweb/react";
 
@@ -55,6 +54,7 @@ function App() {
   )
 }`}
         lang="tsx"
+        preview={<TokenImageOverridePreview />}
       />
     </div>
   );
@@ -63,11 +63,6 @@ function App() {
 export function TokenNameBasic() {
   return (
     <CodeExample
-      header={{
-        title: "TokenName",
-        description: "Show the name of the token",
-      }}
-      preview={<TokenNameBasicPreview />}
       code={`import { TokenProvider, TokenName } from "thirdweb/react";
 
 function App() {
@@ -81,7 +76,12 @@ function App() {
     </TokenProvider>
   )
 }`}
+      header={{
+        description: "Show the name of the token",
+        title: "TokenName",
+      }}
       lang="tsx"
+      preview={<TokenNameBasicPreview />}
     />
   );
 }
@@ -89,11 +89,6 @@ function App() {
 export function TokenSymbolBasic() {
   return (
     <CodeExample
-      header={{
-        title: "TokenSymbol",
-        description: "Show the symbol of the token",
-      }}
-      preview={<TokenSymbolBasicPreview />}
       code={`import { TokenProvider, TokenSymbol } from "thirdweb/react";
 
 function App() {
@@ -107,7 +102,12 @@ function App() {
     </TokenProvider>
   )
 }`}
+      header={{
+        description: "Show the symbol of the token",
+        title: "TokenSymbol",
+      }}
       lang="tsx"
+      preview={<TokenSymbolBasicPreview />}
     />
   );
 }
diff --git a/apps/playground-web/src/components/headless-ui/token-previews.tsx b/apps/playground-web/src/components/headless-ui/token-previews.tsx
index 5310459e731..ccab07976e0 100644
--- a/apps/playground-web/src/components/headless-ui/token-previews.tsx
+++ b/apps/playground-web/src/components/headless-ui/token-previews.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { NATIVE_TOKEN_ADDRESS } from "thirdweb";
 import { ethereum } from "thirdweb/chains";
 import {
@@ -9,6 +8,7 @@ import {
   TokenProvider,
   TokenSymbol,
 } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 
 const USDC_ADDRESS = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48";
 
@@ -16,8 +16,8 @@ export function TokenImageBasicPreview() {
   return (
     <TokenProvider
       address={NATIVE_TOKEN_ADDRESS}
-      client={THIRDWEB_CLIENT}
       chain={ethereum}
+      client={THIRDWEB_CLIENT}
     >
       <TokenIcon className="h-auto w-20 rounded-full" />
     </TokenProvider>
@@ -28,8 +28,8 @@ export function TokenImageOverridePreview() {
   return (
     <TokenProvider
       address={USDC_ADDRESS}
-      client={THIRDWEB_CLIENT}
       chain={ethereum}
+      client={THIRDWEB_CLIENT}
     >
       <TokenIcon
         className="h-auto w-20 rounded-full"
@@ -43,8 +43,8 @@ export function TokenNameBasicPreview() {
   return (
     <TokenProvider
       address={USDC_ADDRESS}
-      client={THIRDWEB_CLIENT}
       chain={ethereum}
+      client={THIRDWEB_CLIENT}
     >
       <TokenName loadingComponent={<span>Loading...</span>} />
     </TokenProvider>
@@ -55,8 +55,8 @@ export function TokenSymbolBasicPreview() {
   return (
     <TokenProvider
       address={USDC_ADDRESS}
-      client={THIRDWEB_CLIENT}
       chain={ethereum}
+      client={THIRDWEB_CLIENT}
     >
       <TokenSymbol loadingComponent={<span>Loading...</span>} />
     </TokenProvider>
diff --git a/apps/playground-web/src/components/headless-ui/wallet-examples.tsx b/apps/playground-web/src/components/headless-ui/wallet-examples.tsx
index 1c2f6e1f6d6..8d90e00377c 100644
--- a/apps/playground-web/src/components/headless-ui/wallet-examples.tsx
+++ b/apps/playground-web/src/components/headless-ui/wallet-examples.tsx
@@ -8,11 +8,6 @@ import {
 export function WalletIconExample() {
   return (
     <CodeExample
-      header={{
-        title: "WalletIcon",
-        description: "Show the icon of a crypto wallet",
-      }}
-      preview={<WalletIconBasicPreview />}
       code={`import { WalletProvider, WalletIcon } from "thirdweb/react";
 
 function App() {
@@ -25,7 +20,12 @@ function App() {
     </WalletProvider>
   )
 }`}
+      header={{
+        description: "Show the icon of a crypto wallet",
+        title: "WalletIcon",
+      }}
       lang="tsx"
+      preview={<WalletIconBasicPreview />}
     />
   );
 }
@@ -34,11 +34,6 @@ export function WalletNameExample() {
   return (
     <div>
       <CodeExample
-        header={{
-          title: "WalletName",
-          description: "Show the name of a crypto wallet",
-        }}
-        preview={<WalletNameBasicPreview />}
         code={`import { WalletProvider, WalletName } from "thirdweb/react";
 
 function App() {
@@ -48,7 +43,12 @@ function App() {
     </WalletProvider>
   )
 }`}
+        header={{
+          description: "Show the name of a crypto wallet",
+          title: "WalletName",
+        }}
         lang="tsx"
+        preview={<WalletNameBasicPreview />}
       />
 
       <p className="my-4 text-muted-foreground text-sm">
@@ -56,7 +56,6 @@ function App() {
       </p>
 
       <CodeExample
-        preview={<WalletNameFormatPreview />}
         code={`import { WalletProvider, WalletName } from "thirdweb/react";
 
 function App() {
@@ -70,6 +69,7 @@ function App() {
   )
 }`}
         lang="tsx"
+        preview={<WalletNameFormatPreview />}
       />
     </div>
   );
diff --git a/apps/playground-web/src/components/headless-ui/wallet-previews.tsx b/apps/playground-web/src/components/headless-ui/wallet-previews.tsx
index bedcb692906..ece57057173 100644
--- a/apps/playground-web/src/components/headless-ui/wallet-previews.tsx
+++ b/apps/playground-web/src/components/headless-ui/wallet-previews.tsx
@@ -4,6 +4,7 @@ import { WalletIcon, WalletName, WalletProvider } from "thirdweb/react";
 
 export function WalletIconBasicPreview() {
   return (
+    // biome-ignore lint/nursery/useUniqueElementIds:ID is not the html attribute in this case
     <WalletProvider id="io.metamask">
       <WalletIcon
         className="h-20 w-20 rounded-full"
@@ -15,6 +16,7 @@ export function WalletIconBasicPreview() {
 
 export function WalletNameBasicPreview() {
   return (
+    // biome-ignore lint/nursery/useUniqueElementIds:ID is not the html attribute in this case
     <WalletProvider id="io.metamask">
       <WalletName loadingComponent={<span>Loading...</span>} />
     </WalletProvider>
@@ -23,6 +25,7 @@ export function WalletNameBasicPreview() {
 
 export function WalletNameFormatPreview() {
   return (
+    // biome-ignore lint/nursery/useUniqueElementIds:ID is not the html attribute in this case
     <WalletProvider id="io.metamask">
       <WalletName
         formatFn={(str: string) => `${str} Wallet`}
diff --git a/apps/playground-web/src/components/in-app-wallet/custom-login-form.tsx b/apps/playground-web/src/components/in-app-wallet/custom-login-form.tsx
index a48d08d2565..55aa7d89bb6 100644
--- a/apps/playground-web/src/components/in-app-wallet/custom-login-form.tsx
+++ b/apps/playground-web/src/components/in-app-wallet/custom-login-form.tsx
@@ -1,11 +1,11 @@
 "use client";
 
+import { useId, useState } from "react";
+import { useActiveAccount, useConnect } from "thirdweb/react";
+import { inAppWallet, preAuthenticate } from "thirdweb/wallets";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { THIRDWEB_CLIENT } from "@/lib/client";
-import { useState } from "react";
-import { useActiveAccount, useConnect } from "thirdweb/react";
-import { inAppWallet, preAuthenticate } from "thirdweb/wallets";
 import { Label } from "../ui/label";
 import { InAppConnectEmbed } from "./connect-button";
 
@@ -20,8 +20,8 @@ export function CustomLoginForm() {
     setScreen("verify");
     await preAuthenticate({
       client: THIRDWEB_CLIENT,
-      strategy: "email",
       email,
+      strategy: "email",
     });
   };
 
@@ -29,10 +29,10 @@ export function CustomLoginForm() {
     connect(async () => {
       const wallet = inAppWallet();
       await wallet.connect({
-        strategy: "email",
+        client: THIRDWEB_CLIENT,
         email,
+        strategy: "email",
         verificationCode,
-        client: THIRDWEB_CLIENT,
       });
       return wallet;
     });
@@ -42,19 +42,22 @@ export function CustomLoginForm() {
     connect(async () => {
       const wallet = inAppWallet({
         auth: {
-          options: ["google"],
           mode: "redirect",
+          options: ["google"],
           redirectUrl: `${window.location.origin}/connect/in-app-wallet`,
         },
       });
       await wallet.connect({
-        strategy: "google",
         client: THIRDWEB_CLIENT,
+        strategy: "google",
       });
       return wallet;
     });
   };
 
+  const emailId = useId();
+  const verificationCodeId = useId();
+
   if (account) {
     return <InAppConnectEmbed />;
   }
@@ -63,27 +66,27 @@ export function CustomLoginForm() {
     return (
       <div className="flex w-full max-w-xl flex-col space-y-4 p-6">
         <div>
-          <Label htmlFor="email" className="mb-2 block">
+          <Label className="mb-2 block" htmlFor={emailId}>
             Email Address
           </Label>
           <Input
-            type="email"
-            id="email"
-            value={email}
+            id={emailId}
             onChange={(e) => setEmail(e.target.value)}
             placeholder="Enter your email"
             required
+            type="email"
+            value={email}
           />
         </div>
         <Button
-          type="submit"
-          onClick={() => sendEmailVerificationCode(email)}
           disabled={isConnecting || !email}
+          onClick={() => sendEmailVerificationCode(email)}
+          type="submit"
         >
           {isConnecting ? "Submitting..." : "Submit"}
         </Button>
         <p className="text-center text-sm text-white">Or</p>
-        <Button type="button" onClick={loginWithGoogle}>
+        <Button onClick={loginWithGoogle} type="button">
           Login with Google
         </Button>
         {error && <p className="max-w-[300px] text-red-500">{error.message}</p>}
@@ -95,22 +98,22 @@ export function CustomLoginForm() {
     return (
       <div className="flex w-full max-w-xl flex-col space-y-4 p-6">
         <div>
-          <Label htmlFor="verification-code" className="mb-2 block">
+          <Label className="mb-2 block" htmlFor={verificationCodeId}>
             Verification Code
           </Label>
           <Input
-            type="text"
-            id="verification-code"
-            value={verificationCode}
+            id={verificationCodeId}
             onChange={(e) => setVerificationCode(e.target.value)}
             placeholder="Enter the code you received"
             required
+            type="text"
+            value={verificationCode}
           />
         </div>
         <Button
-          type="submit"
-          onClick={() => loginWithEmail(email, verificationCode)}
           disabled={isConnecting || !verificationCode}
+          onClick={() => loginWithEmail(email, verificationCode)}
+          type="submit"
         >
           {isConnecting ? "Submitting..." : "Submit"}
         </Button>
diff --git a/apps/playground-web/src/components/in-app-wallet/profile-sections.tsx b/apps/playground-web/src/components/in-app-wallet/profile-sections.tsx
index f09da54a19e..efefc64ea52 100644
--- a/apps/playground-web/src/components/in-app-wallet/profile-sections.tsx
+++ b/apps/playground-web/src/components/in-app-wallet/profile-sections.tsx
@@ -5,12 +5,6 @@ export function Profiles() {
   return (
     <div>
       <CodeExample
-        header={{
-          title: "View Linked Profiles",
-          description:
-            "View all web2 and web3 linked profiles for a user along with specific details for each profile type, including name, email, profile picture and more.",
-        }}
-        preview={<LinkedAccounts />}
         code={`\
 import { useProfiles, useActiveAccount, ConnectButton } from "thirdweb/react";
 
@@ -26,24 +20,18 @@ function App() {
 
   return <code> {JSON.stringify(profiles || [], null, 2)}</code>;
 }`}
+        header={{
+          description:
+            "View all web2 and web3 linked profiles for a user along with specific details for each profile type, including name, email, profile picture and more.",
+          title: "View Linked Profiles",
+        }}
         lang="tsx"
+        preview={<LinkedAccounts />}
       />
 
       <div className="h-14" />
 
       <CodeExample
-        header={{
-          title: "Link a Profile",
-          description: (
-            <>
-              Link a web2 or web3 profile to the connected account.
-              <br />
-              You can do this with hooks like shown here or from the prebuilt
-              connect UI.
-            </>
-          ),
-        }}
-        preview={<LinkAccount />}
         code={`\
 import { useLinkProfile, useActiveAccount, ConnectButton } from "thirdweb/react";
 
@@ -80,7 +68,19 @@ function App() {
     </div>
   );
 }`}
+        header={{
+          description: (
+            <>
+              Link a web2 or web3 profile to the connected account.
+              <br />
+              You can do this with hooks like shown here or from the prebuilt
+              connect UI.
+            </>
+          ),
+          title: "Link a Profile",
+        }}
         lang="tsx"
+        preview={<LinkAccount />}
       />
     </div>
   );
diff --git a/apps/playground-web/src/components/in-app-wallet/profiles.tsx b/apps/playground-web/src/components/in-app-wallet/profiles.tsx
index df48400c720..329331f8644 100644
--- a/apps/playground-web/src/components/in-app-wallet/profiles.tsx
+++ b/apps/playground-web/src/components/in-app-wallet/profiles.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { baseSepolia } from "thirdweb/chains";
 import { useActiveAccount, useLinkProfile, useProfiles } from "thirdweb/react";
-import { type WalletId, createWallet } from "thirdweb/wallets";
+import { createWallet, type WalletId } from "thirdweb/wallets";
 import { THIRDWEB_CLIENT } from "../../lib/client";
 import CodeClient, { CodeLoading } from "../code/code.client";
 import { StyledConnectButton } from "../styled-connect-button";
@@ -35,10 +35,10 @@ export function LinkAccount() {
   const account = useActiveAccount();
   const linkWallet = async (walletId: WalletId) => {
     linkProfile({
+      chain: baseSepolia,
       client: THIRDWEB_CLIENT,
       strategy: "wallet",
       wallet: createWallet(walletId),
-      chain: baseSepolia,
     });
   };
 
@@ -69,18 +69,18 @@ export function LinkAccount() {
                 Link Coinbase Wallet
               </Button> */}
               <Button
-                variant="default"
-                onClick={() => linkWallet("io.metamask")}
                 className="rounded-full p-6"
                 disabled={isPending}
+                onClick={() => linkWallet("io.metamask")}
+                variant="default"
               >
                 Link MetaMask
               </Button>
               <Button
-                variant="default"
-                onClick={linkPasskey}
                 className="rounded-full p-6"
                 disabled={isPending}
+                onClick={linkPasskey}
+                variant="default"
               >
                 Link Passkey
               </Button>
diff --git a/apps/playground-web/src/components/in-app-wallet/sponsored-tx.tsx b/apps/playground-web/src/components/in-app-wallet/sponsored-tx.tsx
index 415a09e20cc..4b00c392051 100644
--- a/apps/playground-web/src/components/in-app-wallet/sponsored-tx.tsx
+++ b/apps/playground-web/src/components/in-app-wallet/sponsored-tx.tsx
@@ -20,9 +20,9 @@ export function SponsoredInAppTxPreview() {
     tokenId: editionDropTokenId,
   });
   const { data: ownedNfts } = useReadContract(getOwnedNFTs, {
-    contract: editionDropContract,
     // biome-ignore lint/style/noNonNullAssertion: handled by queryOptions
     address: smartAccount?.address!,
+    contract: editionDropContract,
     queryOptions: { enabled: !!smartAccount },
   });
 
@@ -64,7 +64,7 @@ export function SponsoredInAppTxPreview() {
             <MediaRenderer
               client={THIRDWEB_CLIENT}
               src={nft.metadata.image}
-              style={{ width: "400px", marginTop: "10px" }}
+              style={{ marginTop: "10px", width: "400px" }}
             />
           ) : null}
           {smartAccount ? (
@@ -75,20 +75,20 @@ export function SponsoredInAppTxPreview() {
               </p>
               <div className="flex justify-center">
                 <TransactionButton
-                  transaction={() =>
-                    claimTo({
-                      contract: editionDropContract,
-                      tokenId: editionDropTokenId,
-                      to: smartAccount.address,
-                      quantity: 1n,
-                    })
-                  }
                   onError={(error) => {
                     alert(`Error: ${error.message}`);
                   }}
                   onTransactionConfirmed={async () => {
                     alert("Minted successful!");
                   }}
+                  transaction={() =>
+                    claimTo({
+                      contract: editionDropContract,
+                      quantity: 1n,
+                      to: smartAccount.address,
+                      tokenId: editionDropTokenId,
+                    })
+                  }
                 >
                   Mint
                 </TransactionButton>
@@ -97,9 +97,9 @@ export function SponsoredInAppTxPreview() {
           ) : (
             <p
               style={{
+                marginTop: "10px",
                 textAlign: "center",
                 width: "400px",
-                marginTop: "10px",
               }}
             >
               Login to mint this Kitten!
diff --git a/apps/playground-web/src/components/pay/direct-payment.tsx b/apps/playground-web/src/components/pay/direct-payment.tsx
index a502ccf3a27..b6d7302fdd9 100644
--- a/apps/playground-web/src/components/pay/direct-payment.tsx
+++ b/apps/playground-web/src/components/pay/direct-payment.tsx
@@ -7,15 +7,15 @@ export function BuyMerchPreview() {
   return (
     <>
       <CheckoutWidget
-        client={THIRDWEB_CLIENT}
-        theme="light"
-        chain={base}
         amount={"2"}
-        tokenAddress="0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
-        seller="0xEb0effdFB4dC5b3d5d3aC6ce29F3ED213E95d675"
+        chain={base}
+        client={THIRDWEB_CLIENT}
+        description="Size L | Ships worldwide."
         feePayer="seller"
         name="Black Hoodie"
-        description="Size L | Ships worldwide."
+        seller="0xEb0effdFB4dC5b3d5d3aC6ce29F3ED213E95d675"
+        theme="light"
+        tokenAddress="0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
       />
     </>
   );
diff --git a/apps/playground-web/src/components/pay/transaction-button.tsx b/apps/playground-web/src/components/pay/transaction-button.tsx
index 6975b08c1ff..9f30cdcf657 100644
--- a/apps/playground-web/src/components/pay/transaction-button.tsx
+++ b/apps/playground-web/src/components/pay/transaction-button.tsx
@@ -6,9 +6,9 @@ import { base, baseSepolia, polygon } from "thirdweb/chains";
 import { transfer } from "thirdweb/extensions/erc20";
 import { claimTo, getNFT } from "thirdweb/extensions/erc1155";
 import {
+  getDefaultToken,
   TransactionButton,
   TransactionWidget,
-  getDefaultToken,
   useActiveAccount,
   useReadContract,
 } from "thirdweb/react";
@@ -41,18 +41,18 @@ export function PayTransactionPreview() {
 
   return (
     <TransactionWidget
+      amount={"0.1"}
       client={THIRDWEB_CLIENT}
+      description={nft?.metadata?.description}
+      image={nft?.metadata?.image}
       theme={theme === "light" ? "light" : "dark"}
+      title={nft?.metadata?.name}
       transaction={claimTo({
         contract: nftContract,
         quantity: 1n,
-        tokenId: 2n,
         to: account?.address || "",
+        tokenId: 2n,
       })}
-      amount={"0.1"}
-      title={nft?.metadata?.name}
-      description={nft?.metadata?.description}
-      image={nft?.metadata?.image}
     />
   );
 }
@@ -71,31 +71,37 @@ export function PayTransactionButtonPreview() {
             Price:{" "}
             {USDC?.icon && (
               // eslint-disable-next-line @next/next/no-img-element
-              <img src={USDC.icon} width={16} alt={USDC.name} />
+              <img alt={USDC.name} src={USDC.icon} width={16} />
             )}
             50 {USDC?.symbol}
           </div>
           <TransactionButton
+            onError={(e) => {
+              console.error(e);
+            }}
+            payModal={{
+              theme: theme === "light" ? "light" : "dark",
+            }}
             transaction={() => {
               if (!account) throw new Error("No active account");
               return transfer({
-                contract: usdcContract,
                 amount: "50",
+                contract: usdcContract,
                 to: account?.address || "",
               });
             }}
-            onError={(e) => {
-              console.error(e);
-            }}
-            payModal={{
-              theme: theme === "light" ? "light" : "dark",
-            }}
           >
             Buy VIP Pass
           </TransactionButton>
           <div className="h-10" />
           <div className="flex items-center gap-2">Price: 0.1 ETH</div>
           <TransactionButton
+            onError={(e) => {
+              console.error(e);
+            }}
+            payModal={{
+              theme: theme === "light" ? "light" : "dark",
+            }}
             transaction={() => {
               if (!account) throw new Error("No active account");
               return prepareTransaction({
@@ -105,12 +111,6 @@ export function PayTransactionButtonPreview() {
                 value: toWei("0.1"),
               });
             }}
-            onError={(e) => {
-              console.error(e);
-            }}
-            payModal={{
-              theme: theme === "light" ? "light" : "dark",
-            }}
           >
             Send 0.1 ETH
           </TransactionButton>
diff --git a/apps/playground-web/src/components/sign-in/hooks.tsx b/apps/playground-web/src/components/sign-in/hooks.tsx
index 704615ec6bd..d42a7f1abc7 100644
--- a/apps/playground-web/src/components/sign-in/hooks.tsx
+++ b/apps/playground-web/src/components/sign-in/hooks.tsx
@@ -33,13 +33,13 @@ export function HooksPreview() {
         <>
           <p className="py-4">Connected: {shortenAddress(account.address)}</p>
           {wallet && (
-            <Button variant="outline" onClick={() => disconnect(wallet)}>
+            <Button onClick={() => disconnect(wallet)} variant="outline">
               Disconnect
             </Button>
           )}
         </>
       ) : (
-        <Button variant="default" onClick={connect}>
+        <Button onClick={connect} variant="default">
           {connectMutation.isConnecting ? "Connecting..." : "Connect MetaMask"}
         </Button>
       )}
diff --git a/apps/playground-web/src/components/sign-in/modal.tsx b/apps/playground-web/src/components/sign-in/modal.tsx
index 521be1b53c8..a8bbc5a717a 100644
--- a/apps/playground-web/src/components/sign-in/modal.tsx
+++ b/apps/playground-web/src/components/sign-in/modal.tsx
@@ -24,14 +24,14 @@ const playgroundAuth: ConnectButtonProps["auth"] = {
   },
   async getLoginPayload(params) {
     return {
-      domain: "",
       address: params.address,
-      statement: "",
-      version: "",
-      nonce: "",
-      issued_at: "",
+      domain: "",
       expiration_time: "",
       invalid_before: "",
+      issued_at: "",
+      nonce: "",
+      statement: "",
+      version: "",
     };
   },
   async isLoggedIn() {
@@ -51,8 +51,8 @@ export function ModalPreview({ enableAuth }: { enableAuth?: boolean }) {
 
   const connect = async () => {
     const wallet = await connectMutation.connect({
-      client: THIRDWEB_CLIENT,
       auth: enableAuth ? playgroundAuth : undefined,
+      client: THIRDWEB_CLIENT,
     });
     console.log("connected", wallet);
     return wallet;
@@ -63,12 +63,12 @@ export function ModalPreview({ enableAuth }: { enableAuth?: boolean }) {
       {account && wallet ? (
         <>
           <p className="py-4">Connected as {shortenAddress(account.address)}</p>
-          <Button variant="outline" onClick={() => disconnect(wallet)}>
+          <Button onClick={() => disconnect(wallet)} variant="outline">
             Disconnect
           </Button>
         </>
       ) : (
-        <Button variant="default" onClick={connect}>
+        <Button onClick={connect} variant="default">
           Sign in
         </Button>
       )}
diff --git a/apps/playground-web/src/components/social/social-profiles.tsx b/apps/playground-web/src/components/social/social-profiles.tsx
index 2919e68537f..4024ad42f25 100644
--- a/apps/playground-web/src/components/social/social-profiles.tsx
+++ b/apps/playground-web/src/components/social/social-profiles.tsx
@@ -1,14 +1,14 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { Loader2Icon } from "lucide-react";
 import { useState } from "react";
 import { isAddress } from "thirdweb";
 import { resolveAddress } from "thirdweb/extensions/ens";
-import { type SocialProfile, getSocialProfiles } from "thirdweb/social";
+import { getSocialProfiles, type SocialProfile } from "thirdweb/social";
 import { resolveScheme } from "thirdweb/storage";
 import { isValidENSName } from "thirdweb/utils";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 import { Badge } from "../ui/badge";
 import { Button } from "../ui/button";
 import { Input } from "../ui/input";
@@ -36,8 +36,8 @@ export function SocialProfiles() {
         setProfiles([]);
       } else {
         const profiles = await getSocialProfiles({
-          client: THIRDWEB_CLIENT,
           address: resolvedAddress,
+          client: THIRDWEB_CLIENT,
         });
         setProfiles(profiles);
       }
@@ -48,13 +48,13 @@ export function SocialProfiles() {
     <div className="flex min-h-[300px] w-[300px] flex-col gap-4">
       <div className="flex items-center gap-2">
         <Input
+          onChange={(e) => setAddress(e.target.value)}
           placeholder="Enter an address or ENS"
           value={address}
-          onChange={(e) => setAddress(e.target.value)}
         />
         <Button
-          onClick={() => searchProfiles(address || "")}
           disabled={!address}
+          onClick={() => searchProfiles(address || "")}
         >
           Search
         </Button>
@@ -62,8 +62,8 @@ export function SocialProfiles() {
       {!isPending &&
         profiles?.map((profile) => (
           <SocialProfileCard
-            profile={profile}
             key={`${profile.type}-${profile.name}`}
+            profile={profile}
           />
         ))}
       {(profiles?.length === 0 || !profiles) && !isPending && (
@@ -85,7 +85,6 @@ export function SocialProfiles() {
 function SocialProfileCard({ profile }: { profile: SocialProfile }) {
   // This query protects against weird avatar formats that might be returned
   const { data: avatar } = useQuery({
-    queryKey: ["avatar", profile.avatar],
     queryFn: async () => {
       if (profile.avatar) {
         try {
@@ -98,13 +97,14 @@ function SocialProfileCard({ profile }: { profile: SocialProfile }) {
         }
       }
     },
+    queryKey: ["avatar", profile.avatar],
   });
 
   return (
     <div className="flex gap-4 rounded-lg border bg-background p-4 shadow-md">
       {avatar ? (
         // eslint-disable-next-line @next/next/no-img-element
-        <img src={avatar} alt={profile.name} className="size-10 rounded-full" />
+        <img alt={profile.name} className="size-10 rounded-full" src={avatar} />
       ) : (
         <div className="size-10 rounded-full bg-muted-foreground" />
       )}
diff --git a/apps/playground-web/src/components/styled-connect-button.tsx b/apps/playground-web/src/components/styled-connect-button.tsx
index 668943ffbcb..235b9c7960d 100644
--- a/apps/playground-web/src/components/styled-connect-button.tsx
+++ b/apps/playground-web/src/components/styled-connect-button.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { useTheme } from "next-themes";
 import {
   abstract,
@@ -10,8 +9,9 @@ import {
   polygonAmoy,
   sepolia,
 } from "thirdweb/chains";
-import { ConnectButton } from "thirdweb/react";
 import type { ConnectButtonProps } from "thirdweb/react";
+import { ConnectButton } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 import { WALLETS } from "../lib/constants";
 
 export function StyledConnectButton(
@@ -29,9 +29,9 @@ export function StyledConnectButton(
         arbitrumSepolia,
         abstract,
       ]}
-      wallets={WALLETS}
       client={THIRDWEB_CLIENT}
       theme={theme === "light" ? "light" : "dark"}
+      wallets={WALLETS}
       {...props}
     />
   );
diff --git a/apps/playground-web/src/components/styled-connect-embed.tsx b/apps/playground-web/src/components/styled-connect-embed.tsx
index 937f7d0ce98..37f0703c84d 100644
--- a/apps/playground-web/src/components/styled-connect-embed.tsx
+++ b/apps/playground-web/src/components/styled-connect-embed.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { useTheme } from "next-themes";
 import {
   arbitrumSepolia,
@@ -14,6 +13,7 @@ import {
   type ConnectEmbedProps,
   useActiveAccount,
 } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 import { WALLETS } from "../lib/constants";
 import { StyledConnectButton } from "./styled-connect-button";
 
@@ -36,9 +36,9 @@ export function StyledConnectEmbed(
         polygonAmoy,
         arbitrumSepolia,
       ]}
-      wallets={WALLETS}
       client={THIRDWEB_CLIENT}
       theme={theme === "light" ? "light" : "dark"}
+      wallets={WALLETS}
       {...props}
     />
   );
diff --git a/apps/playground-web/src/components/thirdweb-provider.tsx b/apps/playground-web/src/components/thirdweb-provider.tsx
index 8f85da2cb61..e9ef6fd9037 100644
--- a/apps/playground-web/src/components/thirdweb-provider.tsx
+++ b/apps/playground-web/src/components/thirdweb-provider.tsx
@@ -4,6 +4,8 @@ import { ThirdwebProvider as _ThirdwebProvider } from "thirdweb/react";
 // This is a wrapper for the ThirdwebProvider to be used individually on each page
 export default function ThirdwebProvider({
   children,
-}: { children: React.ReactNode }) {
+}: {
+  children: React.ReactNode;
+}) {
   return <_ThirdwebProvider>{children}</_ThirdwebProvider>;
 }
diff --git a/apps/playground-web/src/components/ui/Anchor.tsx b/apps/playground-web/src/components/ui/Anchor.tsx
index a13f3f7bff5..7b52036a6b2 100644
--- a/apps/playground-web/src/components/ui/Anchor.tsx
+++ b/apps/playground-web/src/components/ui/Anchor.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { LinkIcon } from "lucide-react";
+import { cn } from "@/lib/utils";
 
 export function Anchor(props: {
   id: string;
@@ -19,8 +19,8 @@ export function Anchor(props: {
       {props.children}
       {props.id && (
         <a
-          href={`#${props.id}`}
           className="text-muted-foreground no-underline opacity-0 transition-opacity group-hover/anchor:opacity-100"
+          href={`#${props.id}`}
           onClick={(e) => {
             e.stopPropagation();
           }}
diff --git a/apps/playground-web/src/components/ui/CopyButton.tsx b/apps/playground-web/src/components/ui/CopyButton.tsx
index fd2595fe0eb..d9b8c85c830 100644
--- a/apps/playground-web/src/components/ui/CopyButton.tsx
+++ b/apps/playground-web/src/components/ui/CopyButton.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { CheckIcon, CopyIcon } from "lucide-react";
 import { useState } from "react";
+import { cn } from "@/lib/utils";
 import { Button } from "./button";
 import { ToolTipLabel } from "./tooltip";
 
@@ -15,7 +15,6 @@ export function CopyButton(props: {
   return (
     <ToolTipLabel label="Copy">
       <Button
-        variant="ghost"
         aria-label="Copy"
         className={cn("h-auto w-auto p-1", props.className)}
         onClick={() => {
@@ -23,6 +22,7 @@ export function CopyButton(props: {
           setIsCopied(true);
           setTimeout(() => setIsCopied(false), 1000);
         }}
+        variant="ghost"
       >
         {isCopied ? (
           <CheckIcon
diff --git a/apps/playground-web/src/components/ui/CustomAccordion.tsx b/apps/playground-web/src/components/ui/CustomAccordion.tsx
index 852e629a603..b5142789341 100644
--- a/apps/playground-web/src/components/ui/CustomAccordion.tsx
+++ b/apps/playground-web/src/components/ui/CustomAccordion.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { ChevronDownIcon } from "lucide-react";
 import { useEffect, useId, useRef, useState } from "react";
+import { cn } from "@/lib/utils";
 import { Anchor } from "./Anchor";
 import { DynamicHeight } from "./DynamicHeight";
 
@@ -89,14 +89,8 @@ export function CustomAccordion(props: CustomAccordionProps) {
       data-custom-accordion
     >
       <button
-        type="button"
-        data-open={isOpen}
-        id={buttonId}
         aria-controls={contentId}
         aria-expanded={isOpen}
-        onClick={() => {
-          setIsOpen((c) => !c);
-        }}
         className={cn(
           "flex w-full flex-1 cursor-pointer items-center gap-3",
           props.triggerContainerClassName,
@@ -105,6 +99,12 @@ export function CustomAccordion(props: CustomAccordionProps) {
             ? "flex-row-reverse justify-between"
             : "",
         )}
+        data-open={isOpen}
+        id={buttonId}
+        onClick={() => {
+          setIsOpen((c) => !c);
+        }}
+        type="button"
       >
         <ChevronDownIcon
           className={cn(
@@ -122,11 +122,12 @@ export function CustomAccordion(props: CustomAccordionProps) {
       </button>
 
       <DynamicHeight>
+        {/** biome-ignore lint/a11y/useAriaPropsSupportedByRole: TODO */}
         <div
-          id={contentId}
           aria-labelledby={buttonId}
-          data-open={isOpen}
           className="overflow-hidden"
+          data-open={isOpen}
+          id={contentId}
         >
           <div
             className={cn(
diff --git a/apps/playground-web/src/components/ui/CustomRadioGroup.tsx b/apps/playground-web/src/components/ui/CustomRadioGroup.tsx
index 02f1acebeb8..d4cd9ec2104 100644
--- a/apps/playground-web/src/components/ui/CustomRadioGroup.tsx
+++ b/apps/playground-web/src/components/ui/CustomRadioGroup.tsx
@@ -13,18 +13,18 @@ export function CustomRadioGroup<T extends string>(props: {
 }) {
   return (
     <RadioGroup
-      id={props.id}
       className="flex gap-6"
-      value={props.value}
+      id={props.id}
       onValueChange={(v) => {
         props.onValueChange(v as T);
       }}
+      value={props.value}
     >
       {props.options.map((option) => {
         return (
-          <div key={option.value} className={cn("flex items-center space-x-2")}>
-            <RadioGroupItem value={option.value} id={option.value} />
-            <Label htmlFor={option.value} className="cursor-pointer">
+          <div className={cn("flex items-center space-x-2")} key={option.value}>
+            <RadioGroupItem id={option.value} value={option.value} />
+            <Label className="cursor-pointer" htmlFor={option.value}>
               {option.label}
             </Label>
           </div>
diff --git a/apps/playground-web/src/components/ui/DynamicHeight.tsx b/apps/playground-web/src/components/ui/DynamicHeight.tsx
index 5af4384b247..c14031d92e6 100644
--- a/apps/playground-web/src/components/ui/DynamicHeight.tsx
+++ b/apps/playground-web/src/components/ui/DynamicHeight.tsx
@@ -13,12 +13,12 @@ export function DynamicHeight(props: {
   return (
     <div
       style={{
+        boxSizing: "border-box",
         height: typeof height === "number" ? `${height}px` : "auto",
+        overflow: "hidden",
         transition:
           props.transition ||
           "height 210ms cubic-bezier(0.175, 0.885, 0.32, 1.1)",
-        overflow: "hidden",
-        boxSizing: "border-box",
       }}
     >
       <div
@@ -54,5 +54,5 @@ export function useHeightObserver() {
     };
   }, []);
 
-  return { height, elementRef: elementRef };
+  return { elementRef: elementRef, height };
 }
diff --git a/apps/playground-web/src/components/ui/Img.tsx b/apps/playground-web/src/components/ui/Img.tsx
index 98910e168c0..51c1ebaad05 100644
--- a/apps/playground-web/src/components/ui/Img.tsx
+++ b/apps/playground-web/src/components/ui/Img.tsx
@@ -51,30 +51,30 @@ export function Img(props: imgElementProps) {
       <img
         {...restProps}
         // avoid setting empty src string to prevent request to the entire page
-        src={restProps.src || undefined}
-        ref={imgRef}
+        alt={restProps.alt || ""}
+        className={cn(
+          "fade-in-0 object-cover transition-opacity duration-300",
+          className,
+        )}
+        decoding="async"
         onError={() => {
           setStatus("fallback");
         }}
+        ref={imgRef}
+        src={restProps.src || undefined}
         style={{
           opacity: status === "loaded" ? 1 : 0,
           ...restProps.style,
         }}
-        alt={restProps.alt || ""}
-        className={cn(
-          "fade-in-0 object-cover transition-opacity duration-300",
-          className,
-        )}
-        decoding="async"
       />
 
       {status !== "loaded" && (
         <div
-          style={restProps.style}
           className={cn(
             "fade-in-0 absolute inset-0 overflow-hidden transition-opacity duration-300 [&>*]:h-full [&>*]:w-full",
             className,
           )}
+          style={restProps.style}
         >
           {status === "pending" && (skeleton || defaultSkeleton)}
           {status === "fallback" && (fallback || defaultFallback)}
diff --git a/apps/playground-web/src/components/ui/ScrollShadow/ScrollShadow.tsx b/apps/playground-web/src/components/ui/ScrollShadow/ScrollShadow.tsx
index cb7b2000ae1..367bdc544f7 100644
--- a/apps/playground-web/src/components/ui/ScrollShadow/ScrollShadow.tsx
+++ b/apps/playground-web/src/components/ui/ScrollShadow/ScrollShadow.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { useLayoutEffect, useRef } from "react";
+import { cn } from "@/lib/utils";
 import styles from "./ScrollShadow.module.css";
 
 export function ScrollShadow(props: {
@@ -101,8 +101,8 @@ export function ScrollShadow(props: {
         )}
         ref={shadowTopEl}
         style={{
-          opacity: "0",
           display: props.disableTopShadow ? "none" : "block",
+          opacity: "0",
         }}
       />
       <div
@@ -140,8 +140,8 @@ export function ScrollShadow(props: {
       />
       <div
         className={cn("no-scrollbar overflow-auto", props.scrollableClassName)}
-        ref={scrollableEl}
         data-scrollable
+        ref={scrollableEl}
       >
         {props.children}
       </div>
diff --git a/apps/playground-web/src/components/ui/Spinner/Spinner.module.css b/apps/playground-web/src/components/ui/Spinner/Spinner.module.css
index 622a43a8a79..0367a2f3d33 100644
--- a/apps/playground-web/src/components/ui/Spinner/Spinner.module.css
+++ b/apps/playground-web/src/components/ui/Spinner/Spinner.module.css
@@ -1,7 +1,6 @@
 .loader {
   border-radius: 50%;
   position: relative;
-  animation: rotate 1s linear infinite;
   animation: rotate 2s linear infinite;
 }
 
diff --git a/apps/playground-web/src/components/ui/Spinner/Spinner.tsx b/apps/playground-web/src/components/ui/Spinner/Spinner.tsx
index c1f7d59f39d..4db57326dba 100644
--- a/apps/playground-web/src/components/ui/Spinner/Spinner.tsx
+++ b/apps/playground-web/src/components/ui/Spinner/Spinner.tsx
@@ -4,15 +4,15 @@ import style from "./Spinner.module.css";
 export function Spinner(props: { className?: string }) {
   return (
     <svg
-      viewBox="0 0 50 50"
       className={cn(style.loader, props.className || "size-4")}
+      viewBox="0 0 50 50"
     >
       <title>loading</title>
       <circle
         cx="25"
         cy="25"
-        r="20"
         fill="none"
+        r="20"
         stroke="currentColor"
         strokeWidth="4"
       />
diff --git a/apps/playground-web/src/components/ui/badge.tsx b/apps/playground-web/src/components/ui/badge.tsx
index 078708826de..c1f5874fe11 100644
--- a/apps/playground-web/src/components/ui/badge.tsx
+++ b/apps/playground-web/src/components/ui/badge.tsx
@@ -1,4 +1,4 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import type * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -6,23 +6,23 @@ import { cn } from "@/lib/utils";
 const badgeVariants = cva(
   "inline-flex items-center rounded-full border border-border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 leading-4",
   {
+    defaultVariants: {
+      variant: "default",
+    },
     variants: {
       variant: {
         default: "border-transparent bg-primary/20 text-primary",
-        secondary:
-          "border-transparent bg-accent text-accent-foreground hover:bg-accent/80",
         destructive:
           "border-transparent dark:bg-red-950 dark:text-red-400 bg-red-500/20 text-red-800",
-        warning:
-          "border-transparent dark:bg-yellow-600/20 dark:text-yellow-500 bg-yellow-500/20 text-yellow-900",
         outline: "text-foreground",
+        secondary:
+          "border-transparent bg-accent text-accent-foreground hover:bg-accent/80",
         success:
           "border-transparent dark:bg-green-950/50 dark:text-green-400 bg-green-200 text-green-950",
+        warning:
+          "border-transparent dark:bg-yellow-600/20 dark:text-yellow-500 bg-yellow-500/20 text-yellow-900",
       },
     },
-    defaultVariants: {
-      variant: "default",
-    },
   },
 );
 
diff --git a/apps/playground-web/src/components/ui/breadcrumb.tsx b/apps/playground-web/src/components/ui/breadcrumb.tsx
index 43a51570252..0ea38b62151 100644
--- a/apps/playground-web/src/components/ui/breadcrumb.tsx
+++ b/apps/playground-web/src/components/ui/breadcrumb.tsx
@@ -9,7 +9,7 @@ const Breadcrumb = React.forwardRef<
   React.ComponentPropsWithoutRef<"nav"> & {
     separator?: React.ReactNode;
   }
->(({ ...props }, ref) => <nav ref={ref} aria-label="breadcrumb" {...props} />);
+>(({ ...props }, ref) => <nav aria-label="breadcrumb" ref={ref} {...props} />);
 Breadcrumb.displayName = "Breadcrumb";
 
 const BreadcrumbList = React.forwardRef<
@@ -17,11 +17,11 @@ const BreadcrumbList = React.forwardRef<
   React.ComponentPropsWithoutRef<"ol">
 >(({ className, ...props }, ref) => (
   <ol
-    ref={ref}
     className={cn(
       "flex flex-wrap items-center gap-1.5 break-words text-muted-foreground text-sm sm:gap-2.5",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -32,8 +32,8 @@ const BreadcrumbItem = React.forwardRef<
   React.ComponentPropsWithoutRef<"li">
 >(({ className, ...props }, ref) => (
   <li
-    ref={ref}
     className={cn("inline-flex items-center gap-1.5", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -49,8 +49,8 @@ const BreadcrumbLink = React.forwardRef<
 
   return (
     <Comp
-      ref={ref}
       className={cn("transition-colors hover:text-foreground", className)}
+      ref={ref}
       {...props}
     />
   );
@@ -63,11 +63,11 @@ const BreadcrumbPage = React.forwardRef<
 >(({ className, ...props }, ref) => (
   // biome-ignore lint/a11y/useFocusableInteractive: required
   <span
-    ref={ref}
-    role="link"
-    aria-disabled="true"
     aria-current="page"
+    aria-disabled="true"
     className={cn("font-normal text-foreground", className)}
+    ref={ref}
+    role="link"
     {...props}
   />
 ));
@@ -79,9 +79,9 @@ const BreadcrumbSeparator = ({
   ...props
 }: React.ComponentProps<"li">) => (
   <li
-    role="presentation"
     aria-hidden="true"
     className={cn("[&>svg]:size-3.5", className)}
+    role="presentation"
     {...props}
   >
     {children ?? <ChevronRightIcon />}
@@ -94,16 +94,16 @@ const BreadcrumbEllipsis = ({
   ...props
 }: React.ComponentProps<"span">) => (
   <span
-    role="presentation"
     aria-hidden="true"
     className={cn("flex h-9 w-9 items-center justify-center", className)}
+    role="presentation"
     {...props}
   >
     <MoreHorizontalIcon className="h-4 w-4" />
     <span className="sr-only">More</span>
   </span>
 );
-BreadcrumbEllipsis.displayName = "BreadcrumbElipssis";
+BreadcrumbEllipsis.displayName = "BreadcrumbEllipsis";
 
 export {
   Breadcrumb,
diff --git a/apps/playground-web/src/components/ui/button.tsx b/apps/playground-web/src/components/ui/button.tsx
index f2d72c6c9b8..abfefab7181 100644
--- a/apps/playground-web/src/components/ui/button.tsx
+++ b/apps/playground-web/src/components/ui/button.tsx
@@ -1,5 +1,5 @@
 import { Slot } from "@radix-ui/react-slot";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -7,32 +7,32 @@ import { cn } from "@/lib/utils";
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
   {
+    defaultVariants: {
+      size: "default",
+      variant: "default",
+    },
     variants: {
+      size: {
+        default: "h-10 px-4 py-2",
+        icon: "h-10 w-10",
+        lg: "h-11 rounded-md px-8",
+        sm: "h-9 rounded-md px-3",
+      },
       variant: {
-        primary:
-          "bg-primary hover:bg-primary/90 text-semibold text-primary-foreground ",
         default: "bg-foreground text-background hover:bg-foreground/90",
         destructive:
           "bg-destructive hover:bg-destructive/90 text-semibold text-destructive-foreground ",
+        ghost: "hover:bg-accent text-semibold hover:text-accent-foreground",
+        link: "text-primary underline-offset-4 hover:underline text-semibold",
         outline:
           "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground text-semibold",
+        primary:
+          "bg-primary hover:bg-primary/90 text-semibold text-primary-foreground ",
         secondary:
           "bg-secondary hover:bg-secondary/80 text-semibold text-secondary-foreground ",
-        ghost: "hover:bg-accent text-semibold hover:text-accent-foreground",
-        link: "text-primary underline-offset-4 hover:underline text-semibold",
         upsell:
           "bg-gradient-to-r from-purple-500 to-pink-500 text-white hover:from-purple-600 hover:to-pink-600 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5 transition-all duration-200",
       },
-      size: {
-        default: "h-10 px-4 py-2",
-        sm: "h-9 rounded-md px-3",
-        lg: "h-11 rounded-md px-8",
-        icon: "h-10 w-10",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
     },
   },
 );
@@ -50,7 +50,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
       Comp === "button" ? { type: "button" as const } : undefined;
     return (
       <Comp
-        className={cn(buttonVariants({ variant, size, className }))}
+        className={cn(buttonVariants({ className, size, variant }))}
         ref={ref}
         {...btnOnlyProps}
         {...props}
diff --git a/apps/playground-web/src/components/ui/card.tsx b/apps/playground-web/src/components/ui/card.tsx
index 5a90768a118..34b2ab0c142 100644
--- a/apps/playground-web/src/components/ui/card.tsx
+++ b/apps/playground-web/src/components/ui/card.tsx
@@ -7,11 +7,11 @@ const Card = React.forwardRef<
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
     className={cn(
       "rounded-lg border bg-card text-card-foreground shadow-sm",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -22,8 +22,8 @@ const CardHeader = React.forwardRef<
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
     className={cn("flex flex-col space-y-1.5 p-6", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -34,11 +34,11 @@ const CardTitle = React.forwardRef<
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
     className={cn(
       "font-semibold text-2xl leading-none tracking-tight",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -49,8 +49,8 @@ const CardDescription = React.forwardRef<
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
     className={cn("text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -60,7 +60,7 @@ const CardContent = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
-  <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
+  <div className={cn("p-6 pt-0", className)} ref={ref} {...props} />
 ));
 CardContent.displayName = "CardContent";
 
@@ -69,8 +69,8 @@ const CardFooter = React.forwardRef<
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div
-    ref={ref}
     className={cn("flex items-center p-6 pt-0", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/playground-web/src/components/ui/checkbox.tsx b/apps/playground-web/src/components/ui/checkbox.tsx
index 6a075b318f7..89e73cd4a21 100644
--- a/apps/playground-web/src/components/ui/checkbox.tsx
+++ b/apps/playground-web/src/components/ui/checkbox.tsx
@@ -11,11 +11,11 @@ const Checkbox = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
 >(({ className, ...props }, ref) => (
   <CheckboxPrimitive.Root
-    ref={ref}
     className={cn(
       "peer h-4 w-4 shrink-0 rounded-sm border border-foreground ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-inverted data-[state=checked]:text-inverted-foreground",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <CheckboxPrimitive.Indicator
diff --git a/apps/playground-web/src/components/ui/form.tsx b/apps/playground-web/src/components/ui/form.tsx
index c7d226f8a30..4b612fd9786 100644
--- a/apps/playground-web/src/components/ui/form.tsx
+++ b/apps/playground-web/src/components/ui/form.tsx
@@ -54,11 +54,11 @@ const useFormField = () => {
   const { id } = itemContext;
 
   return {
-    id,
-    name: fieldContext.name,
-    formItemId: `${id}-form-item`,
     formDescriptionId: `${id}-form-item-description`,
+    formItemId: `${id}-form-item`,
     formMessageId: `${id}-form-item-message`,
+    id,
+    name: fieldContext.name,
     ...fieldState,
   };
 };
@@ -79,7 +79,7 @@ const FormItem = React.forwardRef<
 
   return (
     <FormItemContext.Provider value={{ id }}>
-      <div ref={ref} className={cn("space-y-2", className)} {...props} />
+      <div className={cn("space-y-2", className)} ref={ref} {...props} />
     </FormItemContext.Provider>
   );
 });
@@ -93,9 +93,9 @@ const FormLabel = React.forwardRef<
 
   return (
     <Label
-      ref={ref}
       className={cn(error && "text-destructive-text", className)}
       htmlFor={formItemId}
+      ref={ref}
       {...props}
     />
   );
@@ -111,9 +111,9 @@ const RequiredFormLabel = React.forwardRef<
   return (
     <ToolTipLabel label="Required">
       <Label
-        ref={ref}
         className={cn(error && "text-destructive-text", "relative", className)}
         htmlFor={formItemId}
+        ref={ref}
         {...props}
       >
         {props.children}
@@ -136,14 +136,14 @@ const FormControl = React.forwardRef<
 
   return (
     <Slot
-      ref={ref}
-      id={formItemId}
       aria-describedby={
         !error
           ? `${formDescriptionId}`
           : `${formDescriptionId} ${formMessageId}`
       }
       aria-invalid={!!error}
+      id={formItemId}
+      ref={ref}
       {...props}
     />
   );
@@ -158,9 +158,9 @@ const FormDescription = React.forwardRef<
 
   return (
     <p
-      ref={ref}
-      id={formDescriptionId}
       className={cn("text-muted-foreground text-sm", className)}
+      id={formDescriptionId}
+      ref={ref}
       {...props}
     />
   );
@@ -180,9 +180,9 @@ const FormMessage = React.forwardRef<
 
   return (
     <p
-      ref={ref}
-      id={formMessageId}
       className={cn("font-medium text-destructive-text text-sm", className)}
+      id={formMessageId}
+      ref={ref}
       {...props}
     >
       {body}
diff --git a/apps/playground-web/src/components/ui/input.tsx b/apps/playground-web/src/components/ui/input.tsx
index 5a55979787b..13fafaeb973 100644
--- a/apps/playground-web/src/components/ui/input.tsx
+++ b/apps/playground-web/src/components/ui/input.tsx
@@ -9,12 +9,12 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
   ({ className, type, ...props }, ref) => {
     return (
       <input
-        type={type}
         className={cn(
           "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:font-medium file:text-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
           className,
         )}
         ref={ref}
+        type={type}
         {...props}
       />
     );
diff --git a/apps/playground-web/src/components/ui/label.tsx b/apps/playground-web/src/components/ui/label.tsx
index 663ca2319ef..e00b6b9e3eb 100644
--- a/apps/playground-web/src/components/ui/label.tsx
+++ b/apps/playground-web/src/components/ui/label.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as LabelPrimitive from "@radix-ui/react-label";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -16,8 +16,8 @@ const Label = React.forwardRef<
     VariantProps<typeof labelVariants>
 >(({ className, ...props }, ref) => (
   <LabelPrimitive.Root
-    ref={ref}
     className={cn(labelVariants(), className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/playground-web/src/components/ui/popover.tsx b/apps/playground-web/src/components/ui/popover.tsx
index 8b6355dc66b..eb6640e3864 100644
--- a/apps/playground-web/src/components/ui/popover.tsx
+++ b/apps/playground-web/src/components/ui/popover.tsx
@@ -15,13 +15,13 @@ const PopoverContent = React.forwardRef<
 >(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
   <PopoverPrimitive.Portal>
     <PopoverPrimitive.Content
-      ref={ref}
       align={align}
-      sideOffset={sideOffset}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=closed]:animate-out data-[state=open]:animate-in",
         className,
       )}
+      ref={ref}
+      sideOffset={sideOffset}
       {...props}
     />
   </PopoverPrimitive.Portal>
diff --git a/apps/playground-web/src/components/ui/progress.tsx b/apps/playground-web/src/components/ui/progress.tsx
index bc8b003e972..7092490dc24 100644
--- a/apps/playground-web/src/components/ui/progress.tsx
+++ b/apps/playground-web/src/components/ui/progress.tsx
@@ -10,11 +10,11 @@ const Progress = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>
 >(({ className, value, ...props }, ref) => (
   <ProgressPrimitive.Root
-    ref={ref}
     className={cn(
       "relative h-4 w-full overflow-hidden rounded-full bg-secondary",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <ProgressPrimitive.Indicator
diff --git a/apps/playground-web/src/components/ui/radio-group.tsx b/apps/playground-web/src/components/ui/radio-group.tsx
index c9788763ca8..f67784083e7 100644
--- a/apps/playground-web/src/components/ui/radio-group.tsx
+++ b/apps/playground-web/src/components/ui/radio-group.tsx
@@ -26,11 +26,11 @@ const RadioGroupItem = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <RadioGroupPrimitive.Item
-      ref={ref}
       className={cn(
         "aspect-square h-4 w-4 rounded-full border border-inverted text-inverted ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
         className,
       )}
+      ref={ref}
       {...props}
     >
       <RadioGroupPrimitive.Indicator className="flex items-center justify-center">
diff --git a/apps/playground-web/src/components/ui/select.tsx b/apps/playground-web/src/components/ui/select.tsx
index a7335ddd7ff..61bced4bad5 100644
--- a/apps/playground-web/src/components/ui/select.tsx
+++ b/apps/playground-web/src/components/ui/select.tsx
@@ -19,11 +19,11 @@ const SelectTrigger = React.forwardRef<
   }
 >(({ className, children, chevronClassName, ...props }, ref) => (
   <SelectPrimitive.Trigger
-    ref={ref}
     className={cn(
       "flex h-10 w-full items-center justify-between gap-2 rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
       className,
     )}
+    ref={ref}
     {...props}
   >
     {children}
@@ -75,7 +75,6 @@ const SelectContent = React.forwardRef<
 >(({ className, children, position = "popper", ...props }, ref) => (
   <SelectPrimitive.Portal>
     <SelectPrimitive.Content
-      ref={ref}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover text-popover-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
         position === "popper" &&
@@ -83,6 +82,7 @@ const SelectContent = React.forwardRef<
         className,
       )}
       position={position}
+      ref={ref}
       {...props}
     >
       {/* <SelectScrollUpButton /> */}
@@ -106,8 +106,8 @@ const SelectLabel = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.Label
-    ref={ref}
     className={cn("py-1.5 pr-2 pl-8 font-semibold text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -118,11 +118,11 @@ const SelectItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
 >(({ className, children, ...props }, ref) => (
   <SelectPrimitive.Item
-    ref={ref}
     className={cn(
       "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
@@ -141,8 +141,8 @@ const SelectSeparator = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.Separator
-    ref={ref}
     className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/playground-web/src/components/ui/separator.tsx b/apps/playground-web/src/components/ui/separator.tsx
index 3cc446d24c2..d1714458e89 100644
--- a/apps/playground-web/src/components/ui/separator.tsx
+++ b/apps/playground-web/src/components/ui/separator.tsx
@@ -14,14 +14,14 @@ const Separator = React.forwardRef<
     ref,
   ) => (
     <SeparatorPrimitive.Root
-      ref={ref}
-      decorative={decorative}
-      orientation={orientation}
       className={cn(
         "shrink-0 bg-border",
         orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
         className,
       )}
+      decorative={decorative}
+      orientation={orientation}
+      ref={ref}
       {...props}
     />
   ),
diff --git a/apps/playground-web/src/components/ui/sidebar.tsx b/apps/playground-web/src/components/ui/sidebar.tsx
index 0b9da32a758..852cf3d9b00 100644
--- a/apps/playground-web/src/components/ui/sidebar.tsx
+++ b/apps/playground-web/src/components/ui/sidebar.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import clsx from "clsx";
 import Link from "next/link";
 import { usePathname, useSearchParams } from "next/navigation";
 import { Suspense, useRef } from "react";
+import { cn } from "@/lib/utils";
 import { ClientOnly } from "../ClientOnly";
 import { CustomAccordion } from "./CustomAccordion";
 
@@ -79,13 +79,13 @@ function SidebarItem(props: { link: SidebarLink; onLinkClick?: () => void }) {
 
   return (
     <Link
-      href={link.href}
-      onClick={props.onLinkClick}
       className={clsx(
         "block overflow-hidden text-ellipsis py-1 font-medium transition-colors duration-300 hover:text-foreground lg:text-base",
         isActive ? "text-foreground" : "text-muted-foreground",
         "crossedOut" in link && link.crossedOut && "line-through",
       )}
+      href={link.href}
+      onClick={props.onLinkClick}
     >
       {link.name}
     </Link>
@@ -149,9 +149,9 @@ function SidebarCategory(props: {
 
   const hasActiveHref = containsActiveHref(
     {
-      name: name,
-      links: links,
       href: href,
+      links: links,
+      name: name,
     },
     currentPageHref,
   );
@@ -174,7 +174,7 @@ function SidebarCategory(props: {
   );
 
   const triggerEl = href ? (
-    <Link href={href} className={cn("block w-full text-left font-medium")}>
+    <Link className={cn("block w-full text-left font-medium")} href={href}>
       {triggerElContent}
     </Link>
   ) : (
@@ -184,11 +184,11 @@ function SidebarCategory(props: {
   return (
     <ClientOnly ssr={triggerEl}>
       <CustomAccordion
-        defaultOpen={defaultOpen}
+        chevronPosition="right"
         containerClassName="border-none"
-        triggerContainerClassName="lg:text-base group"
+        defaultOpen={defaultOpen}
         trigger={triggerEl}
-        chevronPosition="right"
+        triggerContainerClassName="lg:text-base group"
       >
         <ul className="flex flex-col border-l pl-4">
           {links.map((link, i) => {
diff --git a/apps/playground-web/src/components/ui/table.tsx b/apps/playground-web/src/components/ui/table.tsx
index 5c586685eaf..7f99dc39a1d 100644
--- a/apps/playground-web/src/components/ui/table.tsx
+++ b/apps/playground-web/src/components/ui/table.tsx
@@ -8,11 +8,11 @@ const Table = React.forwardRef<
   React.HTMLAttributes<HTMLTableElement>
 >(({ className, ...props }, ref) => (
   <table
-    ref={ref}
     className={cn(
       "w-full caption-bottom border-collapse align-top text-sm lining-nums tabular-nums",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -23,8 +23,8 @@ const TableHeader = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <thead
-    ref={ref}
     className={cn("relative border-b bg-background", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -36,8 +36,8 @@ const TableBody = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <tbody
-    ref={ref}
     className={cn("[&_tr:last-child]:border-0", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -48,11 +48,11 @@ const TableFooter = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <tfoot
-    ref={ref}
     className={cn(
       "border-border border-t bg-card font-medium [&>tr]:last:border-b-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -69,12 +69,12 @@ const TableRow = React.forwardRef<
   }
 >(({ className, linkBox, ...props }, ref) => (
   <tr
-    ref={ref}
     className={cn(
       "border-border border-b last:border-0 data-[state=selected]:bg-muted",
       linkBox && "relative translate-x-0 translate-y-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -85,11 +85,11 @@ const TableHead = React.forwardRef<
   React.ThHTMLAttributes<HTMLTableCellElement>
 >(({ className, ...props }, ref) => (
   <th
-    ref={ref}
     className={cn(
       "px-6 py-4 text-left align-middle font-medium text-muted-foreground text-xs uppercase tracking-wider [&:has([role=checkbox])]:pr-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -100,11 +100,11 @@ const TableCell = React.forwardRef<
   React.TdHTMLAttributes<HTMLTableCellElement>
 >(({ className, ...props }, ref) => (
   <td
-    ref={ref}
     className={cn(
       "px-6 py-4 text-start align-middle text-sm [&:has([role=checkbox])]:pr-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -115,8 +115,8 @@ const TableCaption = React.forwardRef<
   React.HTMLAttributes<HTMLTableCaptionElement>
 >(({ className, ...props }, ref) => (
   <caption
-    ref={ref}
     className={cn("py-4 text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -129,13 +129,13 @@ function TableContainer(props: {
 }) {
   return (
     <ScrollShadow
-      shadowClassName="z-30"
-      disableTopShadow
       className={cn(
         "relative whitespace-nowrap rounded-lg border border-border bg-card",
         props.className,
       )}
+      disableTopShadow
       scrollableClassName={props.scrollableContainerClassName}
+      shadowClassName="z-30"
       shadowColor="hsl(var(--muted))"
     >
       {props.children}
diff --git a/apps/playground-web/src/components/ui/tooltip.tsx b/apps/playground-web/src/components/ui/tooltip.tsx
index 392c1740796..28ab2e10b6b 100644
--- a/apps/playground-web/src/components/ui/tooltip.tsx
+++ b/apps/playground-web/src/components/ui/tooltip.tsx
@@ -16,12 +16,12 @@ const TooltipContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
 >(({ className, sideOffset = 4, ...props }, ref) => (
   <TooltipPrimitive.Content
-    ref={ref}
-    sideOffset={sideOffset}
     className={cn(
       "fade-in-0 zoom-in-95 data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 animate-in overflow-hidden rounded-md border border-border bg-popover px-3 py-1.5 text-popover-foreground text-sm shadow-md data-[state=closed]:animate-out",
       className,
     )}
+    ref={ref}
+    sideOffset={sideOffset}
     {...props}
   />
 ));
@@ -50,13 +50,13 @@ export function ToolTipLabel(props: {
           {props.children}
         </TooltipTrigger>
         <TooltipContent
-          side={props.side}
           align={props.align}
-          sideOffset={10}
           className={cn(
             "max-w-[400px] whitespace-normal leading-relaxed",
             props.contentClassName,
           )}
+          side={props.side}
+          sideOffset={10}
         >
           <div className="flex items-center gap-1.5 p-2 text-sm">
             {props.leftIcon}
diff --git a/apps/playground-web/src/components/universal-bridge/buy.tsx b/apps/playground-web/src/components/universal-bridge/buy.tsx
index 14ae27ea67a..d22338e93b7 100644
--- a/apps/playground-web/src/components/universal-bridge/buy.tsx
+++ b/apps/playground-web/src/components/universal-bridge/buy.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { THIRDWEB_CLIENT } from "@/lib/client";
 import { useTheme } from "next-themes";
 import { NATIVE_TOKEN_ADDRESS } from "thirdweb";
 import { arbitrum } from "thirdweb/chains";
 import { BuyWidget } from "thirdweb/react";
+import { THIRDWEB_CLIENT } from "@/lib/client";
 
 export function StyledBuyWidgetPreview() {
   const { theme } = useTheme();
@@ -13,12 +13,12 @@ export function StyledBuyWidgetPreview() {
     <div className="flex flex-col items-center justify-center">
       <div className="h-10" />
       <BuyWidget
+        amount={"0.1"}
+        chain={arbitrum}
         client={THIRDWEB_CLIENT}
         theme={theme === "light" ? "light" : "dark"}
         title="Get Funds"
         tokenAddress={NATIVE_TOKEN_ADDRESS}
-        chain={arbitrum}
-        amount={"0.1"}
       />
     </div>
   );
diff --git a/apps/playground-web/src/instrumentation-client.ts b/apps/playground-web/src/instrumentation-client.ts
index fd21d85797c..256e0475857 100644
--- a/apps/playground-web/src/instrumentation-client.ts
+++ b/apps/playground-web/src/instrumentation-client.ts
@@ -5,13 +5,13 @@ const NEXT_PUBLIC_POSTHOG_KEY = process.env.NEXT_PUBLIC_POSTHOG_KEY;
 if (NEXT_PUBLIC_POSTHOG_KEY) {
   posthog.init(NEXT_PUBLIC_POSTHOG_KEY, {
     api_host: "/_ph",
-    ui_host: "https://us.posthog.com",
-    capture_pageview: "history_change",
-    capture_pageleave: "if_capture_pageview",
-    // disable exception capture (for now)
-    capture_exceptions: false,
     // specifically disable autocapture (does not affect pageview capture)
     autocapture: false,
+    // disable exception capture (for now)
+    capture_exceptions: false,
+    capture_pageleave: "if_capture_pageview",
+    capture_pageview: "history_change",
     debug: process.env.NODE_ENV === "development",
+    ui_host: "https://us.posthog.com",
   });
 }
diff --git a/apps/playground-web/src/lib/client.ts b/apps/playground-web/src/lib/client.ts
index f8494c4d607..31ee7dacce2 100644
--- a/apps/playground-web/src/lib/client.ts
+++ b/apps/playground-web/src/lib/client.ts
@@ -2,15 +2,15 @@ import { createThirdwebClient } from "thirdweb";
 import { setThirdwebDomains } from "thirdweb/utils";
 
 setThirdwebDomains({
+  analytics: process.env.NEXT_PUBLIC_ANALYTICS_URL,
+  bridge: process.env.NEXT_PUBLIC_BRIDGE_URL,
+  bundler: process.env.NEXT_PUBLIC_BUNDLER_URL,
   inAppWallet: process.env.NEXT_PUBLIC_IN_APP_WALLET_URL,
+  insight: process.env.NEXT_PUBLIC_INSIGHT_URL,
+  pay: process.env.NEXT_PUBLIC_PAY_URL,
   rpc: process.env.NEXT_PUBLIC_RPC_URL,
   social: process.env.NEXT_PUBLIC_SOCIAL_URL,
   storage: process.env.NEXT_PUBLIC_STORAGE_URL,
-  bundler: process.env.NEXT_PUBLIC_BUNDLER_URL,
-  pay: process.env.NEXT_PUBLIC_PAY_URL,
-  analytics: process.env.NEXT_PUBLIC_ANALYTICS_URL,
-  insight: process.env.NEXT_PUBLIC_INSIGHT_URL,
-  bridge: process.env.NEXT_PUBLIC_BRIDGE_URL,
 });
 
 const isDev =
@@ -20,7 +20,6 @@ const isDev =
 export const THIRDWEB_CLIENT = createThirdwebClient(
   process.env.THIRDWEB_SECRET_KEY
     ? {
-        secretKey: process.env.THIRDWEB_SECRET_KEY,
         clientId: process.env.NEXT_PUBLIC_THIRDWEB_CLIENT_ID as string,
         config: {
           storage: isDev
@@ -29,6 +28,7 @@ export const THIRDWEB_CLIENT = createThirdwebClient(
               }
             : undefined,
         },
+        secretKey: process.env.THIRDWEB_SECRET_KEY,
       }
     : {
         clientId: process.env.NEXT_PUBLIC_THIRDWEB_CLIENT_ID as string,
diff --git a/apps/playground-web/src/lib/constants.ts b/apps/playground-web/src/lib/constants.ts
index 81706550735..7dcbff9092f 100644
--- a/apps/playground-web/src/lib/constants.ts
+++ b/apps/playground-web/src/lib/constants.ts
@@ -17,6 +17,7 @@ const getDomain = () => {
 export const WALLETS = [
   createWallet("inApp", {
     auth: {
+      mode: "redirect",
       options: [
         "google",
         "discord",
@@ -27,7 +28,6 @@ export const WALLETS = [
         "farcaster",
         "line",
       ],
-      mode: "redirect",
       passkeyDomain: getDomain(),
     },
   }),
diff --git a/apps/playground-web/tailwind.config.ts b/apps/playground-web/tailwind.config.ts
index a18f4cbb11a..e8f8cec977b 100644
--- a/apps/playground-web/tailwind.config.ts
+++ b/apps/playground-web/tailwind.config.ts
@@ -2,8 +2,9 @@ import { fontFamily } from "tailwindcss/defaultTheme";
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  darkMode: ["class"],
   content: ["./src/**/*.{ts,tsx}"],
+  darkMode: ["class"],
+  plugins: [require("tailwindcss-animate")],
   prefix: "",
   theme: {
     container: {
@@ -19,63 +20,71 @@ module.exports = {
       },
     },
     extend: {
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+      },
+      borderRadius: {
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
+      },
       colors: {
-        border: "hsl(var(--border))",
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
         "active-border": "hsl(var(--active-border))",
-        input: "hsl(var(--input))",
-        ring: "hsl(var(--ring))",
         background: "hsl(var(--background))",
-        foreground: "hsl(var(--foreground))",
-        primary: {
-          DEFAULT: "hsl(var(--primary))",
-          foreground: "hsl(var(--primary-foreground))",
+        border: "hsl(var(--border))",
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
         },
-        secondary: {
-          DEFAULT: "hsl(var(--secondary))",
-          foreground: "hsl(var(--secondary-foreground))",
+        code: {
+          DEFAULT: "hsl(var(--code))",
         },
         destructive: {
           DEFAULT: "hsl(var(--destructive))",
           foreground: "hsl(var(--destructive-foreground))",
           text: "hsl(var(--destructive-text))",
         },
+        foreground: "hsl(var(--foreground))",
+        input: "hsl(var(--input))",
+        inverted: {
+          DEFAULT: "hsl(var(--inverted))",
+          foreground: "hsl(var(--inverted-foreground))",
+        },
+        link: {
+          foreground: "hsl(var(--link-foreground))",
+        },
         muted: {
           DEFAULT: "hsl(var(--muted))",
           foreground: "hsl(var(--muted-foreground))",
         },
-        accent: {
-          DEFAULT: "hsl(var(--accent))",
-          foreground: "hsl(var(--accent-foreground))",
-        },
         popover: {
           DEFAULT: "hsl(var(--popover))",
           foreground: "hsl(var(--popover-foreground))",
         },
-        card: {
-          DEFAULT: "hsl(var(--card))",
-          foreground: "hsl(var(--card-foreground))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
+        },
+        ring: "hsl(var(--ring))",
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
         },
         success: {
           text: "hsl(var(--success-text))",
         },
-        inverted: {
-          DEFAULT: "hsl(var(--inverted))",
-          foreground: "hsl(var(--inverted-foreground))",
-        },
-        code: {
-          DEFAULT: "hsl(var(--code))",
-        },
         warning: {
           text: "hsl(var(--warning-text))",
         },
-        link: {
-          foreground: "hsl(var(--link-foreground))",
-        },
       },
-      borderRadius: {
-        lg: "var(--radius)",
-        md: "calc(var(--radius) - 2px)",
-        sm: "calc(var(--radius) - 4px)",
+      fontFamily: {
+        mono: ["var(--font-mono)", ...fontFamily.mono],
+        sans: ["var(--font-sans)", ...fontFamily.sans],
       },
       keyframes: {
         "accordion-down": {
@@ -87,15 +96,6 @@ module.exports = {
           to: { height: "0" },
         },
       },
-      animation: {
-        "accordion-down": "accordion-down 0.2s ease-out",
-        "accordion-up": "accordion-up 0.2s ease-out",
-      },
-      fontFamily: {
-        sans: ["var(--font-sans)", ...fontFamily.sans],
-        mono: ["var(--font-mono)", ...fontFamily.mono],
-      },
     },
   },
-  plugins: [require("tailwindcss-animate")],
 };
diff --git a/apps/playground-web/tsconfig.json b/apps/playground-web/tsconfig.json
index 8e91f66799a..6c90130b254 100644
--- a/apps/playground-web/tsconfig.json
+++ b/apps/playground-web/tsconfig.json
@@ -1,33 +1,33 @@
 {
   "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
+    "incremental": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "noEmit": true,
+    "paths": {
+      "@/*": ["./src/*"]
+    },
     "plugins": [
       {
         "name": "next"
       }
     ],
-    "paths": {
-      "@/*": ["./src/*"]
-    },
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
     "target": "ES2020"
   },
+  "exclude": ["node_modules"],
   "include": [
     "lucide-react.d.ts",
     "next-env.d.ts",
     "**/*.ts",
     "**/*.tsx",
     ".next/types/**/*.ts"
-  ],
-  "exclude": ["node_modules"]
+  ]
 }
diff --git a/apps/portal/.eslintrc.json b/apps/portal/.eslintrc.json
index 48f93b9653e..624496e87b1 100644
--- a/apps/portal/.eslintrc.json
+++ b/apps/portal/.eslintrc.json
@@ -1,6 +1,4 @@
 {
-  "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint", "svg-jsx"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
@@ -8,17 +6,26 @@
     "plugin:mdx/recommended",
     "plugin:tailwindcss/recommended"
   ],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {
+        "@typescript-eslint/no-unused-vars": "off"
+      }
+    },
+    // has to go last
+    {
+      "extends": ["biome"],
+      "files": ["*.ts", "*.js", "*.tsx", "*.jsx"]
+    }
+  ],
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint", "svg-jsx"],
   "rules": {
-    "no-unused-vars": "off",
-    "@typescript-eslint/no-unused-vars": "error",
     "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-unused-vars": "error",
+    "no-unused-vars": "off",
     "svg-jsx/camel-case-dash": "error",
     "tailwindcss/classnames-order": "off"
-  },
-  "overrides": [
-    {
-      "files": ["*.ts", "*.js", "*.tsx", "*.jsx"],
-      "extends": ["biome"]
-    }
-  ]
+  }
 }
diff --git a/apps/portal/.gitignore b/apps/portal/.gitignore
index 182bbb9ac4e..c9664886183 100644
--- a/apps/portal/.gitignore
+++ b/apps/portal/.gitignore
@@ -29,6 +29,7 @@ yarn-error.log*
 
 # vercel
 .vercel
+.next
 
 # typescript
 *.tsbuildinfo
diff --git a/apps/portal/.prettierrc b/apps/portal/.prettierrc
index 1aa46a23cb5..23dd0f80dec 100644
--- a/apps/portal/.prettierrc
+++ b/apps/portal/.prettierrc
@@ -1,17 +1,17 @@
 {
-	"tabWidth": 2,
-	"useTabs": true,
-	"tailwindFunctions": ["clsx", "cn"],
-	"singleQuote": false,
-	"trailingComma": "all",
-	"printWidth": 80,
-	"semi": true,
-	"overrides": [
-		{
-			"files": "redirects.mjs",
-			"options": {
-				"printWidth": 200
-			}
-		}
-	]
+  "overrides": [
+    {
+      "files": "redirects.mjs",
+      "options": {
+        "printWidth": 200
+      }
+    }
+  ],
+  "printWidth": 80,
+  "semi": true,
+  "singleQuote": false,
+  "tabWidth": 2,
+  "tailwindFunctions": ["clsx", "cn"],
+  "trailingComma": "all",
+  "useTabs": true
 }
diff --git a/apps/portal/biome.json b/apps/portal/biome.json
index 568d3f7dbe1..780bbdcd1af 100644
--- a/apps/portal/biome.json
+++ b/apps/portal/biome.json
@@ -1,7 +1,4 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
-  "extends": ["../../biome.json"],
-  "files": {
-    "ignore": ["src/app/references/components/TDoc/fetchDocs/v4-legacy-docs/**"]
-  }
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
 }
diff --git a/apps/portal/components.json b/apps/portal/components.json
index 481fbbc995d..b37680d3de1 100644
--- a/apps/portal/components.json
+++ b/apps/portal/components.json
@@ -1,16 +1,16 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils"
+  },
   "rsc": true,
-  "tsx": true,
+  "style": "default",
   "tailwind": {
+    "baseColor": "gray",
     "config": "tailwind.config.ts",
     "css": "src/app/globals.css",
-    "baseColor": "gray",
     "cssVariables": true
   },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils"
-  }
-}
\ No newline at end of file
+  "tsx": true
+}
diff --git a/apps/portal/knip.json b/apps/portal/knip.json
index 96cb6198606..6d8eb39d614 100644
--- a/apps/portal/knip.json
+++ b/apps/portal/knip.json
@@ -1,15 +1,5 @@
 {
   "$schema": "https://unpkg.com/knip@5/schema.json",
-  "next": true,
-  "project": ["src/**"],
-  "ignoreBinaries": ["only-allow", "biome"],
-  "ignore": ["src/components/ui/**"],
-  "ignoreDependencies": [
-    "@thirdweb-dev/chains",
-    "@thirdweb-dev/wallets",
-    "thirdweb",
-    "@types/flexsearch"
-  ],
   "entry": [
     "next.config.{js,ts,cjs,mjs}",
     "{instrumentation,middleware}.{js,ts}",
@@ -29,5 +19,15 @@
     "src/app/**/{opengraph,twitter}-image.{js,jsx,ts,tsx}",
     "src/pages/**/*.{js,jsx,ts,tsx}",
     "scripts/*.ts"
-  ]
+  ],
+  "ignore": ["src/components/ui/**"],
+  "ignoreBinaries": ["only-allow"],
+  "ignoreDependencies": [
+    "@thirdweb-dev/chains",
+    "@thirdweb-dev/wallets",
+    "thirdweb",
+    "@types/flexsearch"
+  ],
+  "next": true,
+  "project": ["src/**"]
 }
diff --git a/apps/portal/mdx-components.tsx b/apps/portal/mdx-components.tsx
index 5a4a1bc2b31..b81c53dd5cb 100644
--- a/apps/portal/mdx-components.tsx
+++ b/apps/portal/mdx-components.tsx
@@ -1,13 +1,13 @@
+import GithubSlugger from "github-slugger";
+import type { MDXComponents } from "mdx/types";
+import type { BuiltinLanguage } from "shiki";
 import { CodeBlock } from "@/components/Document/Code";
 import { DocLink } from "@/components/Document/DocLink";
 import { Heading } from "@/components/Document/Heading";
 import { OrderedList, UnorderedList } from "@/components/Document/List";
 import { Paragraph } from "@/components/Document/Paragraph";
 import { Separator } from "@/components/Document/Separator";
-import { TBody, Table, Td, Th, Tr } from "@/components/Document/Table";
-import GithubSlugger from "github-slugger";
-import type { MDXComponents } from "mdx/types";
-import type { BuiltinLanguage } from "shiki";
+import { Table, TBody, Td, Th, Tr } from "@/components/Document/Table";
 import { InlineCode } from "./src/components/Document";
 
 export function useMDXComponents(components: MDXComponents): MDXComponents {
@@ -29,7 +29,10 @@ export function useMDXComponents(components: MDXComponents): MDXComponents {
     },
   ) {
     return (
-      <Heading level={depth} id={props.id || nameToLink(props.children) || ""}>
+      <Heading
+        anchorId={props.id || nameToLink(props.children) || ""}
+        level={depth}
+      >
         {props.children}
       </Heading>
     );
@@ -41,6 +44,21 @@ export function useMDXComponents(components: MDXComponents): MDXComponents {
       const { href, children } = props;
       return <DocLink href={href || ""}>{children}</DocLink>;
     },
+    code(props) {
+      const code = props.children;
+      const lang = props.className?.replace("language-", "");
+
+      if (!props.className) {
+        return <InlineCode code={typeof code === "string" ? code : ""} />;
+      }
+
+      return (
+        <CodeBlock
+          code={typeof code === "string" ? code : ""}
+          lang={lang as BuiltinLanguage}
+        />
+      );
+    },
     h1(props) {
       return getHeading(1, props);
     },
@@ -59,47 +77,32 @@ export function useMDXComponents(components: MDXComponents): MDXComponents {
     h6(props) {
       return getHeading(6, props);
     },
-    code(props) {
-      const code = props.children;
-      const lang = props.className?.replace("language-", "");
-
-      if (!props.className) {
-        return <InlineCode code={typeof code === "string" ? code : ""} />;
-      }
-
-      return (
-        <CodeBlock
-          lang={lang as BuiltinLanguage}
-          code={typeof code === "string" ? code : ""}
-        />
-      );
-    },
-    p(props) {
-      return <Paragraph>{props.children}</Paragraph>;
-    },
-    ul(props) {
-      return <UnorderedList>{props.children}</UnorderedList>;
+    hr() {
+      return <Separator />;
     },
     ol(props) {
       return <OrderedList>{props.children}</OrderedList>;
     },
-    hr() {
-      return <Separator />;
+    p(props) {
+      return <Paragraph>{props.children}</Paragraph>;
     },
     table(props) {
       return <Table>{props.children}</Table>;
     },
-    th(props) {
-      return <Th>{props.children}</Th>;
+    tbody(props) {
+      return <TBody>{props.children}</TBody>;
     },
     td(props) {
       return <Td>{props.children}</Td>;
     },
+    th(props) {
+      return <Th>{props.children}</Th>;
+    },
     tr(props) {
       return <Tr>{props.children}</Tr>;
     },
-    tbody(props) {
-      return <TBody>{props.children}</TBody>;
+    ul(props) {
+      return <UnorderedList>{props.children}</UnorderedList>;
     },
   };
 }
diff --git a/apps/portal/next-sitemap.config.js b/apps/portal/next-sitemap.config.js
index 045fd1f1b3c..142b80b96ef 100644
--- a/apps/portal/next-sitemap.config.js
+++ b/apps/portal/next-sitemap.config.js
@@ -1,26 +1,26 @@
 /** @type {import('next-sitemap').IConfig} */
 module.exports = {
-	siteUrl: process.env.SITE_URL || "https://portal.thirdweb.com",
-	generateRobotsTxt: true, // (optional)
-	robotsTxtOptions: {
-		// disallow all crawlers on dev and preview
-		policies: [
-			{
-				userAgent: "*",
-				[process.env.VERCEL_ENV !== "preview" &&
-				process.env.VERCEL_ENV !== "development"
-					? "allow"
-					: "disallow"]: "/",
-			},
-		],
-	},
-	exclude: [
-		// exclude v4 stuff
-		"*/v4*",
-		"*/react-native/v0*",
-		"/wallet-sdk*",
-		"/storage-sdk*",
-		// exclude styleguide
-		"/styleguide*",
-	],
+  exclude: [
+    // exclude v4 stuff
+    "*/v4*",
+    "*/react-native/v0*",
+    "/wallet-sdk*",
+    "/storage-sdk*",
+    // exclude styleguide
+    "/styleguide*",
+  ],
+  generateRobotsTxt: true, // (optional)
+  robotsTxtOptions: {
+    // disallow all crawlers on dev and preview
+    policies: [
+      {
+        userAgent: "*",
+        [process.env.VERCEL_ENV !== "preview" &&
+        process.env.VERCEL_ENV !== "development"
+          ? "allow"
+          : "disallow"]: "/",
+      },
+    ],
+  },
+  siteUrl: process.env.SITE_URL || "https://portal.thirdweb.com",
 };
diff --git a/apps/portal/next.config.mjs b/apps/portal/next.config.mjs
index 0c8dd08acb3..40f4ff35da5 100644
--- a/apps/portal/next.config.mjs
+++ b/apps/portal/next.config.mjs
@@ -50,27 +50,35 @@ const nextConfig = {
   eslint: {
     ignoreDuringBuilds: true,
   },
-  productionBrowserSourceMaps: false,
   experimental: {
+    serverSourceMaps: false,
     webpackBuildWorker: true,
     webpackMemoryOptimizations: true,
-    serverSourceMaps: false,
+  },
+  async headers() {
+    return [
+      {
+        headers: securityHeaders,
+        source: "/(.*)",
+      },
+    ];
   },
   pageExtensions: ["mdx", "tsx", "ts"],
+  productionBrowserSourceMaps: false,
   redirects,
   async rewrites() {
     return [
       {
-        source: "/_ph/static/:path*",
         destination: "https://us-assets.i.posthog.com/static/:path*",
+        source: "/_ph/static/:path*",
       },
       {
-        source: "/_ph/:path*",
         destination: "https://us.i.posthog.com/:path*",
+        source: "/_ph/:path*",
       },
       {
-        source: "/_ph/decide",
         destination: "https://us.i.posthog.com/decide",
+        source: "/_ph/decide",
       },
     ];
   },
@@ -78,14 +86,6 @@ const nextConfig = {
     config.externals.push("pino-pretty", "lokijs", "encoding");
     return config;
   },
-  async headers() {
-    return [
-      {
-        source: "/(.*)",
-        headers: securityHeaders,
-      },
-    ];
-  },
 };
 
 export default withMDX(nextConfig);
diff --git a/apps/portal/package.json b/apps/portal/package.json
index 34df7b8a1a2..507b613226f 100644
--- a/apps/portal/package.json
+++ b/apps/portal/package.json
@@ -1,23 +1,4 @@
 {
-  "name": "portal",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "preinstall": "npx only-allow pnpm",
-    "predev": "pnpm run create-index",
-    "dev": "next dev",
-    "prebuild": "pnpm run create-index",
-    "build": "next build",
-    "postbuild": "pnpm run extract-search-data && pnpm run extract-llm-content && pnpm next-sitemap",
-    "extract-llm-content": "pnpm tsx scripts/extractLLMData.ts",
-    "start": "next start",
-    "lint": "biome check ./src && knip && eslint ./src",
-    "fix": "biome check ./src --fix && eslint ./src --fix",
-    "create-index": "pnpm tsx scripts/createEmptySearchIndex.ts",
-    "extract-search-data": "pnpm tsx scripts/extractSearchData.ts",
-    "typecheck": "tsc --noEmit",
-    "knip": "knip"
-  },
   "dependencies": {
     "@dirtycajunrice/klee": "^1.0.6",
     "@mdx-js/loader": "3.1.0",
@@ -60,6 +41,7 @@
     "typedoc-better-json": "0.9.4"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.0",
     "@next/eslint-plugin-next": "15.3.3",
     "@types/flexsearch": "^0.7.42",
     "@types/he": "^1.2.3",
@@ -83,5 +65,24 @@
     "tailwindcss": "3.4.17",
     "tsx": "4.20.1",
     "typescript": "5.8.3"
-  }
+  },
+  "name": "portal",
+  "private": true,
+  "scripts": {
+    "build": "next build",
+    "create-index": "pnpm tsx scripts/createEmptySearchIndex.ts",
+    "dev": "next dev",
+    "extract-llm-content": "pnpm tsx scripts/extractLLMData.ts",
+    "extract-search-data": "pnpm tsx scripts/extractSearchData.ts",
+    "fix": "biome check ./src --fix && eslint ./src --fix",
+    "knip": "knip",
+    "lint": "biome check ./src && knip && eslint ./src",
+    "postbuild": "pnpm run extract-search-data && pnpm run extract-llm-content && pnpm next-sitemap",
+    "prebuild": "pnpm run create-index",
+    "predev": "pnpm run create-index",
+    "preinstall": "npx only-allow pnpm",
+    "start": "next start",
+    "typecheck": "tsc --noEmit"
+  },
+  "version": "0.1.0"
 }
diff --git a/apps/portal/postcss.config.js b/apps/portal/postcss.config.js
index 33ad091d26d..4df9d3ba36d 100644
--- a/apps/portal/postcss.config.js
+++ b/apps/portal/postcss.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
     autoprefixer: {},
+    tailwindcss: {},
   },
-}
+};
diff --git a/apps/portal/redirects.mjs b/apps/portal/redirects.mjs
index 456a3dfb57d..5c4d2c6a9b4 100644
--- a/apps/portal/redirects.mjs
+++ b/apps/portal/redirects.mjs
@@ -1,71 +1,67 @@
 // @ts-check
 
 const unrealEngineRedirects = {
-  "/unreal/:path*": "/unreal-engine/:path*",
-  "/unreal-engine/cpp/wallet-handle": "/unreal-engine/cpp/wallet-handles",
   "/unreal-engine/blueprints/private-key-wallet":
     "unreal-engine/blueprints/in-app-wallet",
+  "/unreal-engine/cpp/wallet-handle": "/unreal-engine/cpp/wallet-handles",
+  "/unreal/:path*": "/unreal-engine/:path*",
 };
 
 const reactRedirects = {
   "/react": "/react/v4",
   "/react/connecting-wallets": "/react/v4/connecting-wallets",
-  // providers
-  "/react/react.thirdwebprovider": "/react/v4/ThirdwebProvider",
-  "/react/react.thirdwebsdkprovider": "/react/v4/ThirdwebSDKProvider",
+  "/react/react.blocto": "/references/react/v4/bloctoWallet",
+  "/react/react.coin98": "/references/react/v4/coin98Wallet",
+  "/react/react.coinbasewallet": "/references/react/v4/coinbaseWallet",
   // components
   "/react/react.connectwallet": "/react/v4/components/ConnectWallet",
-  "/react/react.web3button": "/react/v4/components/Web3Button",
-  "/react/react.thirdwebnftmedia": "/react/v4/components/ThirdwebNftMedia",
-  "/react/react.mediarenderer": "/react/v4/components/MediaRenderer",
-  // wallets
-  "/react/react.metamaskwallet": "/references/react/v4/metamaskWallet",
-  "/react/react.coinbasewallet": "/references/react/v4/coinbaseWallet",
-  "/react/react.walletconnect": "/references/react/v4/walletconnect",
-  "/react/react.smartwallet": "/references/react/v4/smartWallet",
+  "/react/react.core": "/references/react/v4/coreWallet",
+  "/react/react.defiwallet": "/references/react/v4/cryptoDefiWallet",
   "/react/react.embeddedwallet": "/references/react/v4/embeddedWallet",
-  "/react/react.paperwallet": "/references/react/v4/embeddedWallet",
+  "/react/react.frame": "/references/react/v4/frameWallet",
   "/react/react.localwallet": "/references/react/v4/localWallet",
-  "/react/react.trustWallet": "/references/react/v4/trustWallet",
-  "/react/react.zerion": "/references/react/v4/zerionWallet",
   "/react/react.magiclink": "/references/react/v4/magicLink",
-  "/react/react.safewallet": "/references/react/v4/safeWallet",
-  "/react/react.blocto": "/references/react/v4/bloctoWallet",
-  "/react/react.frame": "/references/react/v4/frameWallet",
-  "/react/react.phantom": "/references/react/v4/phantomWallet",
-  "/react/react.rainbowWallet": "/references/react/v4/rainbowWallet",
-  "/react/react.coin98": "/references/react/v4/coin98Wallet",
-  "/react/react.core": "/references/react/v4/coreWallet",
-  "/react/react.defiwallet": "/references/react/v4/cryptoDefiWallet",
+  "/react/react.mediarenderer": "/react/v4/components/MediaRenderer",
+  // wallets
+  "/react/react.metamaskwallet": "/references/react/v4/metamaskWallet",
   "/react/react.okx": "/references/react/v4/okxWallet",
   "/react/react.onekey": "/references/react/v4/oneKeyWallet",
+  "/react/react.paperwallet": "/references/react/v4/embeddedWallet",
+  "/react/react.phantom": "/references/react/v4/phantomWallet",
   "/react/react.rabby": "/references/react/v4/rabbyWallet",
-  // hooks
-  "/react/react.useaddress": "/references/react/v4/useAddress",
-  "/react/react.usecontract": "/references/react/v4/useContract",
-  "/react/react.usecontractread": "/references/react/v4/useContractRead",
-  "/react/react.usecontractwrite": "/references/react/v4/useContractWrite",
-  "/react/react.usecontractevents": "/references/react/v4/useContractEvents",
-  "/react/react.usesdk": "/references/react/v4/useSDK",
+  "/react/react.rainbowWallet": "/references/react/v4/rainbowWallet",
+  "/react/react.safewallet": "/references/react/v4/safeWallet",
+  "/react/react.smartwallet": "/references/react/v4/smartWallet",
+  "/react/react.thirdwebnftmedia": "/react/v4/components/ThirdwebNftMedia",
+  // providers
+  "/react/react.thirdwebprovider": "/react/v4/ThirdwebProvider",
+  "/react/react.thirdwebsdkprovider": "/react/v4/ThirdwebSDKProvider",
+  "/react/react.trustWallet": "/references/react/v4/trustWallet",
+  "/react/react.useacceptdirectlistingoffer":
+    "/references/react/v4/useAcceptDirectListingOffer",
+  "/react/react.useaccountadmins": "/references/react/v4/useAccountAdmins",
+  "/react/react.useaccountadminsandsigners":
+    "/references/react/v4/useAccountAdminsAndSigners",
+  "/react/react.useaccountsigners": "/references/react/v4/useAccountSigners",
   "/react/react.useactiveclaimcondition":
     "/references/react/v4/useActiveClaimCondition",
   "/react/react.useactiveclaimconditionforwallet":
     "/references/react/v4/useActiveClaimConditionForWallet",
-  "/react/react.useclaimconditions": "/references/react/v4/useClaimConditions",
-  "/react/react.useclaimerproofs": "/references/react/v4/useClaimerProofs",
-  "/react/react.useclaimineligibilityreasons":
-    "/references/react/v4/useClaimIneligibilityReasons",
-  "/react/react.usesetclaimconditions":
-    "/references/react/v4/useSetClaimConditions",
-  "/react/react.usebatchestoreveal": "/references/react/v4/useBatchesToReveal",
-  "/react/react.usedelayedreveallazymint":
-    "/references/react/v4/useDelayedRevealLazyMint",
-  "/react/react.usereveallazymint": "/references/react/v4/useRevealLazyMint",
-  "/react/react.useacceptdirectlistingoffer":
-    "/references/react/v4/useAcceptDirectListingOffer",
   "/react/react.useactivelistings": "/references/react/v4/useActiveListings",
+  "/react/react.useaddadmin": "/references/react/v4/useAddAdmin",
+  // hooks
+  "/react/react.useaddress": "/references/react/v4/useAddress",
+  "/react/react.useairdropnft": "/references/react/v4/useAirdropNFT",
+  "/react/react.useallrolemembers": "/references/react/v4/useAllRoleMembers",
   "/react/react.useauctionwinner": "/references/react/v4/useAuctionWinner",
+  "/react/react.usebalance": "/references/react/v4/useBalance",
+  "/react/react.usebalanceforaddress":
+    "/references/react/v4/useBalanceForAddress",
+  "/react/react.usebatchestoreveal": "/references/react/v4/useBatchesToReveal",
   "/react/react.usebidbuffer": "/references/react/v4/useBidBuffer",
+  "/react/react.usebloctowallet": "/references/react/v4/useBloctoWallet",
+  "/react/react.useburnnft": "/references/react/v4/useBurnNFT",
+  "/react/react.useburntoken": "/references/react/v4/useBurnToken",
   "/react/react.usebuydirectlisting":
     "/references/react/v4/useBuyDirectListing",
   "/react/react.usebuynow": "/references/react/v4/useBuyNow",
@@ -74,14 +70,44 @@ const reactRedirects = {
   "/react/react.usecancelenglishauction":
     "/references/react/v4/useCancelEnglishAuction",
   "/react/react.usecancellisting": "/references/react/v4/useCancelListing",
+  "/react/react.usechain": "/references/react/v4/useChain",
+  "/react/react.usechainid": "/references/react/v4/useChainId",
+  "/react/react.useclaimconditions": "/references/react/v4/useClaimConditions",
+  "/react/react.useclaimednfts": "/references/react/v4/useClaimedNFTs",
+  "/react/react.useclaimednftsupply":
+    "/references/react/v4/useClaimedNFTSupply",
+  "/react/react.useclaimerproofs": "/references/react/v4/useClaimerProofs",
+  "/react/react.useclaimineligibilityreasons":
+    "/references/react/v4/useClaimIneligibilityReasons",
+  "/react/react.useclaimnft": "/references/react/v4/useClaimNFT",
+  "/react/react.useclaimtoken": "/references/react/v4/useClaimToken",
+  "/react/react.usecoinbasewallet": "/references/react/v4/useCoinbaseWallet",
+  "/react/react.usecompilermetadata":
+    "/references/react/v4/useCompilerMetadata",
+  "/react/react.useconnect": "/references/react/v4/useConnect",
+  "/react/react.useconnectionstatus":
+    "/references/react/v4/useConnectionStatus",
+  "/react/react.usecontract": "/references/react/v4/useContract",
+  "/react/react.usecontractevents": "/references/react/v4/useContractEvents",
+  "/react/react.usecontractread": "/references/react/v4/useContractRead",
+  "/react/react.usecontracttype": "/references/react/v4/useContractType",
+  "/react/react.usecontractwrite": "/references/react/v4/useContractWrite",
   "/react/react.usecreateauctionlisting":
     "/references/react/v4/useCreateAuctionListing",
   "/react/react.usecreatedirectlisting":
     "/references/react/v4/useCreateDirectListing",
+  "/react/react.usecreatesessionkey":
+    "/references/react/v4/useCreateSessionKey",
+  "/react/react.usecreatewalletinstance":
+    "/references/react/v4/useCreateWalletInstance",
+  "/react/react.usedelayedreveallazymint":
+    "/references/react/v4/useDelayedRevealLazyMint",
   "/react/react.usedirectlisting": "/references/react/v4/useDirectListing",
   "/react/react.usedirectlistings": "/references/react/v4/useDirectListings",
   "/react/react.usedirectlistingscount":
     "/references/react/v4/useDirectListingsCount",
+  "/react/react.usedisconnect": "/references/react/v4/useDisconnect",
+  "/react/react.useembeeddedwallet": "/references/react/v4/useEmbeddedWallet",
   "/react/react.useenglishauction": "/references/react/v4/useEnglishAuction",
   "/react/react.useenglishauctions": "/references/react/v4/useEnglishAuctions",
   "/react/react.useenglishauctionscount":
@@ -90,133 +116,117 @@ const reactRedirects = {
     "/references/react/v4/useEnglishAuctionWinningBid",
   "/react/react.useexecuteauctionsale":
     "/references/react/v4/useExecuteAuctionSale",
+  "/react/react.useframewallet": "/references/react/v4/useFrameWallet",
+  "/react/react.usegrantrole": "/references/react/v4/useGrantRole",
+  "/react/react.useisaddressrole": "/references/react/v4/useIsAddressRole",
+  "/react/react.uselazymint": "/references/react/v4/useLazyMint",
   "/react/react.uselisting": "/references/react/v4/useListing",
   "/react/react.uselistings": "/references/react/v4/useListings",
   "/react/react.uselistingscount": "/references/react/v4/useListingsCount",
+  "/react/react.uselogin": "/references/react/v4/useLogin",
+  "/react/react.uselogout": "/references/react/v4/useLogout",
+  "/react/react.usemagic": "/references/react/v4/useMagic",
   "/react/react.usemakebid": "/references/react/v4/useMakeBid",
   "/react/react.usemakeoffer": "/references/react/v4/useMakeOffer",
-  "/react/react.useminimumnextbid": "/references/react/v4/useMinimumNextBid",
-  "/react/react.useoffers": "/references/react/v4/useOffers",
-  "/react/react.usevaliddirectlistings":
-    "/references/react/v4/useValidDirectListings",
-  "/react/react.usevalidenglishauctions":
-    "/references/react/v4/useValidEnglishAuctions",
-  "/react/react.usewinningbid": "/references/react/v4/useWinningBid",
-  "/react/react.usecompilermetadata":
-    "/references/react/v4/useCompilerMetadata",
-  "/react/react.usecontracttype": "/references/react/v4/useContractType",
   "/react/react.usemetadata": "/references/react/v4/useMetadata",
-  "/react/react.useresolvedmediatype":
-    "/references/react/v4/useResolvedMediaType",
-  "/react/react.useupdatemetadata": "/references/react/v4/useUpdateMetadata",
-  "/react/react.usechain": "/references/react/v4/useChain",
-  "/react/react.useSwitchChain": "/references/react/v4/useSwitchChain",
-  "/react/react.usechainid": "/references/react/v4/useChainId",
-  "/react/react.usenft": "/references/react/v4/useNFT",
-  "/react/react.useairdropnft": "/references/react/v4/useAirdropNFT",
-  "/react/react.useburnnft": "/references/react/v4/useBurnNFT",
+  "/react/react.usemetamask": "/references/react/v4/useMetamask",
+  "/react/react.useminimumnextbid": "/references/react/v4/useMinimumNextBid",
   "/react/react.usemintnft": "/references/react/v4/useMintNFT",
   "/react/react.usemintnftsupply": "/references/react/v4/useMintNFTSupply",
+  "/react/react.useminttoken": "/references/react/v4/useMintToken",
+  "/react/react.usenft": "/references/react/v4/useNFT",
   "/react/react.usenftbalance": "/references/react/v4/useNFTBalance",
   "/react/react.usenfts": "/references/react/v4/useNFTs",
+  "/react/react.useoffers": "/references/react/v4/useOffers",
   "/react/react.useownednfts": "/references/react/v4/useOwnedNFTs",
+  "/react/react.useplatformfees": "/references/react/v4/usePlatformFees",
+  "/react/react.useprimarysalerecipient":
+    "/references/react/v4/usePrimarySaleRecipient",
+  "/react/react.userainbowwallet": "/references/react/v4/useRainbowWallet",
+  "/react/react.useremoveadmin": "/references/react/v4/useRemoveAdmin",
+  "/react/react.useresetclaimconditions":
+    "/references/react/v4/useResetClaimConditions",
+  "/react/react.useresolvedmediatype":
+    "/references/react/v4/useResolvedMediaType",
+  "/react/react.usereveallazymint": "/references/react/v4/useRevealLazyMint",
+  "/react/react.userevokerole": "/references/react/v4/useRevokeRole",
+  "/react/react.userevokesessionkey":
+    "/references/react/v4/useRevokeSessionKey",
+  "/react/react.userolemembers": "/references/react/v4/useRoleMembers",
+  "/react/react.useroyaltysettings": "/references/react/v4/useRoyaltySettings",
+  "/react/react.useSwitchChain": "/references/react/v4/useSwitchChain",
+  "/react/react.usesafe": "/references/react/v4/useSafe",
+  "/react/react.usesdk": "/references/react/v4/useSDK",
+  "/react/react.usesetclaimconditions":
+    "/references/react/v4/useSetClaimConditions",
+  "/react/react.usesetconnectedwallet":
+    "/references/react/v4/useSetConnectedWallet",
+  "/react/react.usesetconnectionstatus":
+    "/references/react/v4/useSetConnectionStatus",
+  "/react/react.usesigner": "/references/react/v4/useSigner",
+  "/react/react.usesmartwallet": "/references/react/v4/useSmartWallet",
+  "/react/react.usestorage": "/references/react/v4/useStorage",
+  "/react/react.usestorageupload": "/references/react/v4/useStorageUpload",
+  "/react/react.usetokenbalance": "/references/react/v4/useTokenBalance",
+  "/react/react.usetokendecimals": "/references/react/v4/useTokenDecimals",
+  "/react/react.usetokensupply": "/references/react/v4/useTokenSupply",
   "/react/react.usetotalcirculatingsupply":
     "/references/react/v4/useTotalCirculatingSupply",
   "/react/react.usetotalcount": "/references/react/v4/useTotalCount",
+  "/react/react.usetransferbatchtoken":
+    "/references/react/v4/useTransferBatchToken",
   "/react/react.usetransfernft": "/references/react/v4/useTransferNFT",
-  "/react/react.useclaimednfts": "/references/react/v4/useClaimedNFTs",
-  "/react/react.useclaimednftsupply":
-    "/references/react/v4/useClaimedNFTSupply",
-  "/react/react.useclaimnft": "/references/react/v4/useClaimNFT",
-  "/react/react.uselazymint": "/references/react/v4/useLazyMint",
-  "/react/react.useresetclaimconditions":
-    "/references/react/v4/useResetClaimConditions",
+  "/react/react.usetransfertoken": "/references/react/v4/useTransferToken",
+  "/react/react.usetrustwallet": "/references/react/v4/useTrustWallet",
   "/react/react.useunclaimednfts": "/references/react/v4/useUnclaimedNFTs",
   "/react/react.useunclaimednftsupply":
     "/references/react/v4/useUnclaimedNFTSupply",
-  "/react/react.useallrolemembers": "/references/react/v4/useAllRoleMembers",
-  "/react/react.usegrantrole": "/references/react/v4/useGrantRole",
-  "/react/react.useisaddressrole": "/references/react/v4/useIsAddressRole",
-  "/react/react.userevokerole": "/references/react/v4/useRevokeRole",
-  "/react/react.userolemembers": "/references/react/v4/useRoleMembers",
-  "/react/react.useplatformfees": "/references/react/v4/usePlatformFees",
-  "/react/react.useprimarysalerecipient":
-    "/references/react/v4/usePrimarySaleRecipient",
-  "/react/react.useroyaltysettings": "/references/react/v4/useRoyaltySettings",
+  "/react/react.useupdatemetadata": "/references/react/v4/useUpdateMetadata",
   "/react/react.useupdateplatformfees":
     "/references/react/v4/useUpdatePlatformFees",
   "/react/react.useupdateprimarysalerecipient":
     "/references/react/v4/useUpdatePrimarySaleRecipient",
   "/react/react.useupdateroyaltysettings":
     "/references/react/v4/useUpdateRoyaltySettings",
-  "/react/react.usebalance": "/references/react/v4/useBalance",
-  "/react/react.usebalanceforaddress":
-    "/references/react/v4/useBalanceForAddress",
-  "/react/react.useburntoken": "/references/react/v4/useBurnToken",
-  "/react/react.useminttoken": "/references/react/v4/useMintToken",
-  "/react/react.usetokenbalance": "/references/react/v4/useTokenBalance",
-  "/react/react.usetokendecimals": "/references/react/v4/useTokenDecimals",
-  "/react/react.usetokensupply": "/references/react/v4/useTokenSupply",
-  "/react/react.usetransferbatchtoken":
-    "/references/react/v4/useTransferBatchToken",
-  "/react/react.usetransfertoken": "/references/react/v4/useTransferToken",
-  "/react/react.useclaimtoken": "/references/react/v4/useClaimToken",
-  "/react/react.useconnect": "/references/react/v4/useConnect",
-  "/react/react.usedisconnect": "/references/react/v4/useDisconnect",
+  "/react/react.useuser": "/references/react/v4/useUser",
+  "/react/react.usevaliddirectlistings":
+    "/references/react/v4/useValidDirectListings",
+  "/react/react.usevalidenglishauctions":
+    "/references/react/v4/useValidEnglishAuctions",
   "/react/react.usewallet": "/references/react/v4/useWallet",
-  "/react/react.useconnectionstatus":
-    "/references/react/v4/useConnectionStatus",
-  "/react/react.usesigner": "/references/react/v4/useSigner",
-  "/react/react.usemetamask": "/references/react/v4/useMetamask",
-  "/react/react.usecoinbasewallet": "/references/react/v4/useCoinbaseWallet",
-  "/react/react.usewalletconnect": "/references/react/v4/useWalletConnect",
-  "/react/react.usesmartwallet": "/references/react/v4/useSmartWallet",
-  "/react/react.useembeeddedwallet": "/references/react/v4/useEmbeddedWallet",
-  "/react/react.usesafe": "/references/react/v4/useSafe",
-  "/react/react.usemagic": "/references/react/v4/useMagic",
-  "/react/react.userainbowwallet": "/references/react/v4/useRainbowWallet",
-  "/react/react.usetrustwallet": "/references/react/v4/useTrustWallet",
-  "/react/react.usebloctowallet": "/references/react/v4/useBloctoWallet",
-  "/react/react.useframewallet": "/references/react/v4/useFrameWallet",
-  "/react/react.usesetconnectedwallet":
-    "/references/react/v4/useSetConnectedWallet",
-  "/react/react.usesetconnectionstatus":
-    "/references/react/v4/useSetConnectionStatus",
-  "/react/react.usecreatewalletinstance":
-    "/references/react/v4/useCreateWalletInstance",
   "/react/react.usewalletconfig": "/references/react/v4/useWalletConfig",
-  "/react/react.useaccountadmins": "/references/react/v4/useAccountAdmins",
-  "/react/react.useaccountadminsandsigners":
-    "/references/react/v4/useAccountAdminsAndSigners",
-  "/react/react.useaccountsigners": "/references/react/v4/useAccountSigners",
-  "/react/react.useaddadmin": "/references/react/v4/useAddAdmin",
-  "/react/react.usecreatesessionkey":
-    "/references/react/v4/useCreateSessionKey",
-  "/react/react.useremoveadmin": "/references/react/v4/useRemoveAdmin",
-  "/react/react.userevokesessionkey":
-    "/references/react/v4/useRevokeSessionKey",
-  "/react/react.uselogin": "/references/react/v4/useLogin",
-  "/react/react.uselogout": "/references/react/v4/useLogout",
-  "/react/react.useuser": "/references/react/v4/useUser",
-  "/react/react.usestorage": "/references/react/v4/useStorage",
-  "/react/react.usestorageupload": "/references/react/v4/useStorageUpload",
-  "/ui-components/web3button": "/react/v4/components/Web3Button",
+  "/react/react.usewalletconnect": "/references/react/v4/useWalletConnect",
+  "/react/react.usewinningbid": "/references/react/v4/useWinningBid",
+  "/react/react.walletconnect": "/references/react/v4/walletconnect",
+  "/react/react.web3button": "/react/v4/components/Web3Button",
+  "/react/react.zerion": "/references/react/v4/zerionWallet",
   "/react/v5/in-app-wallet/how-to/get-in-app-wallet-details-on-server":
     "/react/v5/in-app-wallet/how-to/get-user-details",
+  "/ui-components/web3button": "/react/v4/components/Web3Button",
 };
 
 const solidityRedirects = {
+  "/interact/overview": "/connect/blockchain-api",
   "/solidity": "/contracts/build",
-  "/solidity/extensions": "/contracts/build/extensions",
-  "/solidity/extensions/erc721": "/contracts/build/extensions/erc-721/ERC721",
-  "/solidity/extensions/erc1155":
-    "/contracts/build/extensions/erc-1155/ERC1155",
-  "/solidity/extensions/erc20mintable":
-    "/contracts/build/extensions/erc-20/ERC20BatchMintable",
-  "/solidity/base-contracts/erc721base":
-    "/contracts/build/base-contracts/erc-721/base",
+  "/solidity/base-contract/erc721delayedreveal":
+    "/contracts/build/base-contracts/erc-721/delayed-reveal",
+  "/solidity/base-contract/erc1155delayedreveal":
+    "/contracts/build/extensions/erc-1155/ERC1155Revealable",
+  "/solidity/base-contracts": "/contracts/build/base-contracts",
+  "/solidity/base-contracts/account":
+    "/contracts/build/base-contracts/erc-4337/account",
+  "/solidity/base-contracts/account-factory":
+    "/contracts/build/base-contracts/erc-4337/account-factory",
+  "/solidity/base-contracts/erc20base":
+    "/contracts/build/base-contracts/erc-20/base",
   "/solidity/base-contracts/erc20drop":
     "/contracts/build/base-contracts/erc-20/drop",
+  "/solidity/base-contracts/erc20signaturemint":
+    "/contracts/build/base-contracts/erc-20/signature-mint",
+  "/solidity/base-contracts/erc20vote":
+    "/contracts/build/base-contracts/erc-20/vote",
+  "/solidity/base-contracts/erc721base":
+    "/contracts/build/base-contracts/erc-721/base",
   "/solidity/base-contracts/erc721delayedreveal":
     "/contracts/build/base-contracts/erc-721/delayed-reveal",
   "/solidity/base-contracts/erc721drop":
@@ -225,182 +235,172 @@ const solidityRedirects = {
     "/contracts/build/base-contracts/erc-721/lazy-mint",
   "/solidity/base-contracts/erc721signaturemint":
     "/contracts/build/base-contracts/erc-721/signature-mint",
+  "/solidity/base-contracts/erc1155base":
+    "/contracts/build/base-contracts/erc-1155/base",
+  "/solidity/base-contracts/erc1155delayedreveal":
+    "/contracts/build/base-contracts/erc-1155/delayed-reveal",
+  "/solidity/base-contracts/erc1155drop":
+    "/contracts/build/base-contracts/erc-1155/drop",
+  "/solidity/base-contracts/erc1155lazymint":
+    "/contracts/build/base-contracts/erc-1155/lazy-mint",
+  "/solidity/base-contracts/erc1155signaturemint":
+    "/contracts/build/base-contracts/erc-1155/signature-mint",
+  "/solidity/base-contracts/managed-account":
+    "/contracts/build/base-contracts/erc-4337/managed-account",
+  "/solidity/base-contracts/managed-account-factory":
+    "/contracts/build/base-contracts/erc-4337/managed-account-factory",
+  "/solidity/base-contracts/smart-accounts":
+    "/contracts/build/base-contracts/erc-4337",
+  "/solidity/base-contracts/staking/staking20base":
+    "/contracts/build/base-contracts/erc-20/staking",
+  "/solidity/base-contracts/staking/staking721base":
+    "/contracts/build/base-contracts/erc-721/staking",
+  "/solidity/base-contracts/staking/staking1155base":
+    "/contracts/build/base-contracts/erc-1155/staking",
+  "/solidity/extensions": "/contracts/build/extensions",
+  "/solidity/extensions/base-account":
+    "/contracts/build/extensions/erc-4337/SmartWallet",
+  "/solidity/extensions/base-account-factory":
+    "/contracts/build/extensions/erc-4337/SmartWalletFactory",
+  "/solidity/extensions/contract-metadata":
+    "/contracts/build/extensions/general/ContractMetadata",
+  "/solidity/extensions/contractmetadata":
+    "/contracts/build/extensions/general/ContractMetadata",
+  "/solidity/extensions/delayedreveal":
+    "/contracts/build/extensions/general/DelayedReveal",
+  "/solidity/extensions/drop": "/contracts/build/extensions/general/Drop",
+  "/solidity/extensions/dropsinglephase":
+    "/contracts/build/extensions/general/DropSinglePhase",
+  "/solidity/extensions/erc20": "/contracts/build/extensions/erc-20/ERC20",
+  "/solidity/extensions/erc20batchmintable":
+    "/contracts/build/extensions/erc-20/ERC20BatchMintable",
   "/solidity/extensions/erc20claimconditions":
     "/contracts/build/extensions/erc-20/ERC20ClaimConditions",
-  "/solidity/extensions/erc721mintable":
-    "/contracts/build/extensions/erc-721/ERC721Mintable",
-  "/solidity/extensions/erc721burnable":
-    "/contracts/build/extensions/erc-721/ERC721Burnable",
+  "/solidity/extensions/erc20mintable":
+    "/contracts/build/extensions/erc-20/ERC20BatchMintable",
+  "/solidity/extensions/erc20Permit":
+    "/contracts/build/extensions/erc-20/ERC20Permit",
+  "/solidity/extensions/erc721": "/contracts/build/extensions/erc-721/ERC721",
   "/solidity/extensions/erc721batchmintable":
     "/contracts/build/extensions/erc-721/ERC721BatchMintable",
-  "/solidity/extensions/erc721supply":
-    "/contracts/build/extensions/erc-721/ERC721Supply",
-  "/solidity/extensions/royalty": "/contracts/build/extensions/general/Royalty",
+  "/solidity/extensions/erc721burnable":
+    "/contracts/build/extensions/erc-721/ERC721Burnable",
+  "/solidity/extensions/erc721claimable":
+    "/contracts/build/extensions/erc-721/ERC721Claimable",
+  "/solidity/extensions/erc721claimconditions":
+    "/contracts/build/extensions/erc-721/ERC721ClaimConditions",
+  "/solidity/extensions/erc721claimcustom":
+    "/contracts/build/extensions/erc-721/ERC721ClaimCustom",
   "/solidity/extensions/erc721claimphases":
     "/contracts/build/extensions/erc-721/ERC721ClaimPhases",
-  "/solidity/extensions/contractmetadata":
-    "/contracts/build/extensions/general/ContractMetadata",
-  "/solidity/extensions/ownable": "/contracts/build/extensions/general/Ownable",
-  "/solidity/extensions/multicall":
-    "/contracts/build/extensions/general/Multicall",
-  "/solidity/extensions/dropsinglephase":
-    "/contracts/build/extensions/general/DropSinglePhase",
+  "/solidity/extensions/erc721mintable":
+    "/contracts/build/extensions/erc-721/ERC721Mintable",
+  "/solidity/extensions/erc721revealable":
+    "/contracts/build/extensions/erc-721/ERC721Revealable",
+  "/solidity/extensions/erc721signaturemint":
+    "/contracts/build/extensions/erc-721/ERC721SignatureMint",
+  "/solidity/extensions/erc721supply":
+    "/contracts/build/extensions/erc-721/ERC721Supply",
+  "/solidity/extensions/erc1155":
+    "/contracts/build/extensions/erc-1155/ERC1155",
   "/solidity/extensions/erc1155batchmintable":
     "/contracts/build/extensions/erc-1155/ERC1155BatchMintable",
   "/solidity/extensions/erc1155burnable":
     "/contracts/build/extensions/erc-1155/ERC1155Burnable",
-  "/solidity/extensions/erc1155enumerable":
-    "/contracts/build/extensions/erc-1155/ERC1155Enumerable",
-  "/solidity/extensions/erc1155mintable":
-    "/contracts/build/extensions/erc-1155/ERC1155Mintable",
-  "/solidity/base-contracts/erc1155lazymint":
-    "/contracts/build/base-contracts/erc-1155/lazy-mint",
-  "/solidity/extensions/lazymint":
-    "/contracts/build/extensions/general/LazyMint",
+  "/solidity/extensions/erc1155claimable":
+    "/contracts/build/extensions/erc-1155/ERC1155Claimable",
+  "/solidity/extensions/erc1155claimconditions":
+    "/contracts/build/extensions/erc-1155/ERC1155ClaimConditions",
   "/solidity/extensions/erc1155claimcustom":
     "/contracts/build/extensions/erc-1155/ERC1155ClaimCustom",
-  "/solidity/extensions/delayedreveal":
-    "/contracts/build/extensions/general/DelayedReveal",
+  "/solidity/extensions/erc1155claimphases":
+    "/contracts/build/extensions/erc-1155/ERC1155ClaimPhases",
   "/solidity/extensions/erc1155dropsinglephase":
     "/contracts/build/extensions/erc-1155/ERC1155DropSinglePhase",
-  "/solidity/extensions/erc1155claimconditions":
-    "/contracts/build/extensions/erc-1155/ERC1155ClaimConditions",
-  "/solidity/extensions/primarysale":
-    "/contracts/build/extensions/general/PrimarySale",
-  "/solidity/extensions/erc1155signaturemint":
-    "/contracts/build/extensions/erc-1155/ERC1155SignatureMint",
-  "/solidity/base-contracts/erc1155base":
-    "/contracts/build/base-contracts/erc-1155/base",
-  "/solidity/extensions/erc721revealable":
-    "/contracts/build/extensions/erc-721/ERC721Revealable",
+  "/solidity/extensions/erc1155enumerable":
+    "/contracts/build/extensions/erc-1155/ERC1155Enumerable",
+  "/solidity/extensions/erc1155mintable":
+    "/contracts/build/extensions/erc-1155/ERC1155Mintable",
   "/solidity/extensions/erc1155revealable":
     "/contracts/build/extensions/erc-1155/ERC1155Revealable",
-  "/solidity/extensions/erc20Permit":
-    "/contracts/build/extensions/erc-20/ERC20Permit",
-  "/solidity/extensions/erc20batchmintable":
-    "/contracts/build/extensions/erc-20/ERC20BatchMintable",
-  "/solidity/base-contracts/erc20base":
-    "/contracts/build/base-contracts/erc-20/base",
-  "/solidity/extensions/erc20": "/contracts/build/extensions/erc-20/ERC20",
-  "/solidity/base-contracts/erc20vote":
-    "/contracts/build/base-contracts/erc-20/vote",
-  "/solidity/extensions/base-account":
-    "/contracts/build/extensions/erc-4337/SmartWallet",
-  "/solidity/extensions/base-account-factory":
-    "/contracts/build/extensions/erc-4337/SmartWalletFactory",
-  "/solidity/base-contracts": "/contracts/build/base-contracts",
-  "/solidity/base-contracts/account-factory":
-    "/contracts/build/base-contracts/erc-4337/account-factory",
-  "/solidity/base-contracts/account":
-    "/contracts/build/base-contracts/erc-4337/account",
-  "/solidity/base-contracts/managed-account-factory":
-    "/contracts/build/base-contracts/erc-4337/managed-account-factory",
-  "/solidity/base-contracts/managed-account":
-    "/contracts/build/base-contracts/erc-4337/managed-account",
-  "/solidity/extensions/erc721claimcustom":
-    "/contracts/build/extensions/erc-721/ERC721ClaimCustom",
-  "/solidity/extensions/permissions":
-    "/contracts/build/extensions/general/Permissions",
-  "/solidity/base-contracts/erc1155drop":
-    "/contracts/build/base-contracts/erc-1155/drop",
-  "/solidity/base-contracts/erc1155signaturemint":
-    "/contracts/build/base-contracts/erc-1155/signature-mint",
-  "/solidity/base-contracts/erc20signaturemint":
-    "/contracts/build/base-contracts/erc-20/signature-mint",
+  "/solidity/extensions/erc1155signaturemint":
+    "/contracts/build/extensions/erc-1155/ERC1155SignatureMint",
   "/solidity/extensions/erc1155supply":
     "/contracts/build/extensions/erc-1155/ERC1155Supply",
-  "/solidity/extensions/erc1155claimable":
-    "/contracts/build/extensions/erc-1155/ERC1155Claimable",
+  "/solidity/extensions/lazymint":
+    "/contracts/build/extensions/general/LazyMint",
+  "/solidity/extensions/multicall":
+    "/contracts/build/extensions/general/Multicall",
+  "/solidity/extensions/ownable": "/contracts/build/extensions/general/Ownable",
+  "/solidity/extensions/permissions":
+    "/contracts/build/extensions/general/Permissions",
   "/solidity/extensions/platformfee":
     "/contracts/build/extensions/general/PlatformFee",
-  "/solidity/base-contracts/erc1155delayedreveal":
-    "/contracts/build/base-contracts/erc-1155/delayed-reveal",
-  "/solidity/extensions/drop": "/contracts/build/extensions/general/Drop",
-  "/solidity/extensions/erc721claimable":
-    "/contracts/build/extensions/erc-721/ERC721Claimable",
-  "/solidity/base-contract/erc1155delayedreveal":
-    "/contracts/build/extensions/erc-1155/ERC1155Revealable",
-  "/solidity/extensions/erc721claimconditions":
-    "/contracts/build/extensions/erc-721/ERC721ClaimConditions",
-  "/solidity/extensions/erc721signaturemint":
-    "/contracts/build/extensions/erc-721/ERC721SignatureMint",
-  "/solidity/extensions/contract-metadata":
-    "/contracts/build/extensions/general/ContractMetadata",
-  "/solidity/extensions/erc1155claimphases":
-    "/contracts/build/extensions/erc-1155/ERC1155ClaimPhases",
-  "/solidity/base-contracts/staking/staking1155base":
-    "/contracts/build/base-contracts/erc-1155/staking",
-  "/solidity/base-contracts/staking/staking20base":
-    "/contracts/build/base-contracts/erc-20/staking",
-  "/solidity/base-contracts/staking/staking721base":
-    "/contracts/build/base-contracts/erc-721/staking",
-  "/solidity/base-contract/erc721delayedreveal":
-    "/contracts/build/base-contracts/erc-721/delayed-reveal",
-  "/solidity/base-contracts/smart-accounts":
-    "/contracts/build/base-contracts/erc-4337",
-  "/interact/overview": "/connect/blockchain-api",
+  "/solidity/extensions/primarysale":
+    "/contracts/build/extensions/general/PrimarySale",
+  "/solidity/extensions/royalty": "/contracts/build/extensions/general/Royalty",
 };
 
 const extensionsTable = "/typescript/v4/extensions#all-available-extensions";
 
 const typescriptRedirects = {
   "/typescript": "/typescript/v4",
+  "/typescript/extensions": "/typescript/v4/extensions",
   "/typescript/getting-started": "/typescript/v4/getting-started",
-  "/typescript/sdk.thirdwebsdk": "/typescript/v4/getting-started",
-  "/typescript/sdk.thirdwebsdk.fromprivatekey":
-    "/references/typescript/v4/ThirdwebSDK#fromPrivateKey",
-  "/typescript/sdk.thirdwebsdk.fromwallet":
-    "/references/typescript/v4/ThirdwebSDK#fromWallet",
-  "/typescript/sdk.thirdwebsdk.fromsigner":
-    "/references/typescript/v4/ThirdwebSDK#fromSigner",
+  // extensions path*
+  "/typescript/sdk:path*": extensionsTable,
   "/typescript/sdk.contractdeployer": "/typescript/v4/deploy",
   "/typescript/sdk.contractverifier":
     "/typescript/v4/utilities#contract-verification",
-  "/typescript/extensions": "/typescript/v4/extensions",
-  "/typescript/sdk.thirdwebsdk.smartcontract": "/typescript/v4/extensions",
+  "/typescript/sdk.erc20": "/references/typescript/v4/Erc20",
+  // extensions
+  "/typescript/sdk.erc721": "/references/typescript/v4/Erc721",
+  "/typescript/sdk.erc1155": "/references/typescript/v4/Erc1155",
   "/typescript/sdk.smartcontract.call": "/typescript/v4/extensions",
   "/typescript/sdk.smartcontract.prepare":
     "/typescript/v4/extensions#preparing-transactions",
+  "/typescript/sdk.thirdwebsdk": "/typescript/v4/getting-started",
   "/typescript/sdk.thirdwebsdk.detectextensions":
     "/v4/extensions#detecting-avilable-extensions",
-  // extensions
-  "/typescript/sdk.erc721": "/references/typescript/v4/Erc721",
-  "/typescript/sdk.erc1155": "/references/typescript/v4/Erc1155",
-  "/typescript/sdk.erc20": "/references/typescript/v4/Erc20",
-  // extensions path*
-  "/typescript/sdk:path*": extensionsTable,
+  "/typescript/sdk.thirdwebsdk.fromprivatekey":
+    "/references/typescript/v4/ThirdwebSDK#fromPrivateKey",
+  "/typescript/sdk.thirdwebsdk.fromsigner":
+    "/references/typescript/v4/ThirdwebSDK#fromSigner",
+  "/typescript/sdk.thirdwebsdk.fromwallet":
+    "/references/typescript/v4/ThirdwebSDK#fromWallet",
+  "/typescript/sdk.thirdwebsdk.smartcontract": "/typescript/v4/extensions",
 };
 
 const reactNativeRedirects = {
   "/react-native": "/typescript/v5/react-native",
+  // others
+  "/react-native/available-hooks": "/references/react-native/v0/hooks",
+  "/react-native/faq/deeplinks": "/react-native/v0/faq",
   "/react-native/getting-started": "/typescript/v5/react-native",
-  // wallets
-  "/react-native/react-native.embeddedwallet":
-    "/react-native/v0/wallets/embedded-wallet",
-  "/react-native/react-native.smartwallet":
-    "/react-native/v0/wallets/smartwallet",
-  "/react-native/react-native.walletconnect":
-    "/react-native/v0/wallets/walletconnect",
-  "/react-native/react-native.metamask": "/react-native/v0/wallets/metamask",
-  "/react-native/react-native.magic": "/react-native/v0/wallets/magiclink",
-  "/react-native/react-native.rainbow": "/react-native/v0/wallets/rainbow",
-  "/react-native/react-native.trust": "/react-native/v0/wallets/trust",
   "/react-native/react-native.coinbase": "/react-native/v0/wallets/coinbase",
-  "/react-native/react-native.localwallet":
-    "/react-native/v0/wallets/local-wallet",
   // components
   "/react-native/react-native.connectwallet":
     "/react-native/v0/components/ConnectWallet",
-  "/react-native/react-native.web3button":
-    "/react-native/v0/components/Web3Button",
-  // others
-  "/react-native/available-hooks": "/references/react-native/v0/hooks",
+  // wallets
+  "/react-native/react-native.embeddedwallet":
+    "/react-native/v0/wallets/embedded-wallet",
+  "/react-native/react-native.localwallet":
+    "/react-native/v0/wallets/local-wallet",
+  "/react-native/react-native.magic": "/react-native/v0/wallets/magiclink",
+  "/react-native/react-native.metamask": "/react-native/v0/wallets/metamask",
+  "/react-native/react-native.rainbow": "/react-native/v0/wallets/rainbow",
+  "/react-native/react-native.smartwallet":
+    "/react-native/v0/wallets/smartwallet",
+  "/react-native/react-native.trust": "/react-native/v0/wallets/trust",
   "/react-native/react-native.uselogin": "/references/react-native/v0/useLogin",
   "/react-native/react-native.uselogout":
     "/references/react-native/v0/useLogout",
   "/react-native/react-native.useuser": "/references/react-native/v0/useUser",
+  "/react-native/react-native.walletconnect":
+    "/react-native/v0/wallets/walletconnect",
+  "/react-native/react-native.web3button":
+    "/react-native/v0/components/Web3Button",
   "/react-native/storage": "/references/react-native/v0/hooks#storage",
-  "/react-native/faq/deeplinks": "/react-native/v0/faq",
   "/typescript/v5/react-native/installation":
     "/typescript/v5/react-native/getting-started",
 };
@@ -408,78 +408,15 @@ const reactNativeRedirects = {
 const unityRedirects = {
   // top level
   "/unity": "/unity/v5",
-  "/unity/getting-started": "/unity/v4/getting-started",
-  // core
-  "/unity/thirdwebmanager": "/unity/v4/thirdwebmanager",
-  "/unity/storage": "/unity/v4/storage",
-  // wallets
-  "/unity/wallets/prefab": "/unity/v4/wallets/prefab",
-  // wallet providers
-  "/unity/wallets/providers/in-app-wallet":
-    "/unity/v4/wallets/providers/in-app-wallet",
-  "/unity/wallets/providers/account-abstraction":
-    "/unity/v4/wallets/providers/account-abstraction",
-  "/unity/wallets/providers/local-wallet":
-    "/unity/v4/wallets/providers/local-wallet",
-  "/unity/wallets/providers/metamask": "/unity/v4/wallets/providers/metamask",
-  "/unity/wallets/providers/coinbase": "/unity/v4/wallets/providers/coinbase",
-  "/unity/wallets/providers/walletconnect":
-    "/unity/v4/wallets/providers/walletconnect",
-  "/unity/wallets/providers/hyperplay": "/unity/v4/wallets/providers/hyperplay",
-  "/unity/wallets/providers/rabby": "/unity/v4/wallets/providers/rabby",
-  // wallet actions
-  "/unity/wallets/actions/connect": "/unity/v4/wallets/actions/connect",
-  "/unity/wallets/actions/disconnect": "/unity/v4/wallets/actions/disconnect",
-  "/unity/wallets/actions/authenticate":
-    "/unity/v4/wallets/actions/authenticate",
-  "/unity/wallets/actions/getaddress": "/unity/v4/wallets/actions/getaddress",
-  "/unity/wallets/actions/getbalance": "/unity/v4/wallets/actions/getbalance",
-  "/unity/wallets/actions/getchainid": "/unity/v4/wallets/actions/getchainid",
-  "/unity/wallets/actions/isconnected": "/unity/v4/wallets/actions/isconnected",
-  "/unity/wallets/actions/recoveraddress":
-    "/unity/v4/wallets/actions/recoveraddress",
-  "/unity/wallets/actions/sendrawtransaction":
-    "/unity/v4/wallets/actions/sendrawtransaction",
-  "/unity/wallets/actions/executerawtransaction":
-    "/unity/v4/wallets/actions/executerawtransaction",
-  "/unity/wallets/actions/sign": "/unity/v4/wallets/actions/sign",
-  "/unity/wallets/actions/switchnetwork":
-    "/unity/v4/wallets/actions/switchnetwork",
-  "/unity/wallets/actions/transfer": "/unity/v4/wallets/actions/transfer",
-  "/unity/wallets/actions/addadmin": "/unity/v4/wallets/actions/addadmin",
-  "/unity/wallets/actions/removeadmin": "/unity/v4/wallets/actions/removeadmin",
-  "/unity/wallets/actions/createsessionkey":
-    "/unity/v4/wallets/actions/createsessionkey",
-  "/unity/wallets/actions/revokesessionkey":
-    "/unity/v4/wallets/actions/revokesessionkey",
-  "/unity/wallets/actions/getallactivesigners":
-    "/unity/v4/wallets/actions/getallactivesigners",
-  "/unity/wallets/actions/getemail": "/unity/v4/wallets/actions/getemail",
-  "/unity/wallets/actions/getnonce": "/unity/v4/wallets/actions/getnonce",
-  "/unity/wallets/actions/getsigneraddress":
-    "/unity/v4/wallets/actions/getsigneraddress",
-  "/unity/wallets/actions/signtypeddatav4":
-    "/unity/v4/wallets/actions/signtypeddatav4",
-  // submission
-  "/unity/wallets/submission": "/unity/v4/wallets/submission",
-  // pay
-  "/unity/pay/getbuyhistory": "/unity/v4/pay/getbuyhistory",
-  // buy with fiat
-  "/unity/pay/getbuywithfiatquote": "/unity/v4/pay/getbuywithfiatquote",
-  "/unity/pay/buywithfiat": "/unity/v4/pay/buywithfiat",
-  "/unity/pay/getbuywithfiatstatus": "/unity/v4/pay/getbuywithfiatstatus",
-  "/unity/pay/getbuywithfiatcurrencies":
-    "/unity/v4/pay/getbuywithfiatcurrencies",
-  // buy with crypto
-  "/unity/pay/getbuywithcryptoquote": "/unity/v4/pay/getbuywithcryptoquote",
-  "/unity/pay/buywithcrypto": "/unity/v4/pay/buywithcrypto",
-  "/unity/pay/getbuywithcryptostatus": "/unity/v4/pay/getbuywithcryptostatus",
+  // blocks
+  "/unity/blocks/getblock": "/unity/v4/blocks/getblock",
+  "/unity/blocks/getblockwithtransactions":
+    "/unity/v4/blocks/getblockwithtransactions",
+  "/unity/blocks/getlatestblocknumber": "/unity/v4/blocks/getlatestblocknumber",
+  "/unity/blocks/getlatestblocktimestamp":
+    "/unity/v4/blocks/getlatestblocktimestamp",
   // blockchain api
   "/unity/contracts": "/unity/v4/contracts",
-  "/unity/contracts/get": "/unity/v4/contracts/get",
-  "/unity/contracts/read": "/unity/v4/contracts/read",
-  "/unity/contracts/write": "/unity/v4/contracts/write",
-  "/unity/contracts/prepare": "/unity/v4/contracts/prepare",
   // erc20
   "/unity/contracts/erc20/erc20": "/unity/v4/contracts/erc20/erc20",
   "/unity/contracts/erc20/erc20burnable":
@@ -516,10 +453,6 @@ const unityRedirects = {
     "/unity/v4/contracts/erc1155/erc1155mintable",
   "/unity/contracts/erc1155/erc1155signaturemintable":
     "/unity/v4/contracts/erc1155/erc1155signaturemintable",
-  // marketplace
-  "/unity/contracts/marketplace": "/unity/v4/contracts/marketplace",
-  // pack
-  "/unity/contracts/pack": "/unity/v4/contracts/pack",
   // events
   "/unity/contracts/events/get": "/unity/v4/contracts/events/get",
   "/unity/contracts/events/getall": "/unity/v4/contracts/events/getall",
@@ -527,245 +460,335 @@ const unityRedirects = {
     "/unity/v4/contracts/events/listentoall",
   "/unity/contracts/events/removealllisteners":
     "/unity/v4/contracts/events/removealllisteners",
-  // blocks
-  "/unity/blocks/getblock": "/unity/v4/blocks/getblock",
-  "/unity/blocks/getblockwithtransactions":
-    "/unity/v4/blocks/getblockwithtransactions",
-  "/unity/blocks/getlatestblocknumber": "/unity/v4/blocks/getlatestblocknumber",
-  "/unity/blocks/getlatestblocktimestamp":
-    "/unity/v4/blocks/getlatestblocktimestamp",
+  "/unity/contracts/get": "/unity/v4/contracts/get",
+  // marketplace
+  "/unity/contracts/marketplace": "/unity/v4/contracts/marketplace",
+  // pack
+  "/unity/contracts/pack": "/unity/v4/contracts/pack",
+  "/unity/contracts/prepare": "/unity/v4/contracts/prepare",
+  "/unity/contracts/read": "/unity/v4/contracts/read",
+  "/unity/contracts/write": "/unity/v4/contracts/write",
+  "/unity/getting-started": "/unity/v4/getting-started",
+  "/unity/pay/buywithcrypto": "/unity/v4/pay/buywithcrypto",
+  "/unity/pay/buywithfiat": "/unity/v4/pay/buywithfiat",
+  // pay
+  "/unity/pay/getbuyhistory": "/unity/v4/pay/getbuyhistory",
+  // buy with crypto
+  "/unity/pay/getbuywithcryptoquote": "/unity/v4/pay/getbuywithcryptoquote",
+  "/unity/pay/getbuywithcryptostatus": "/unity/v4/pay/getbuywithcryptostatus",
+  "/unity/pay/getbuywithfiatcurrencies":
+    "/unity/v4/pay/getbuywithfiatcurrencies",
+  // buy with fiat
+  "/unity/pay/getbuywithfiatquote": "/unity/v4/pay/getbuywithfiatquote",
+  "/unity/pay/getbuywithfiatstatus": "/unity/v4/pay/getbuywithfiatstatus",
+  "/unity/storage": "/unity/v4/storage",
+  // core
+  "/unity/thirdwebmanager": "/unity/v4/thirdwebmanager",
+  "/unity/wallets/actions/addadmin": "/unity/v4/wallets/actions/addadmin",
+  "/unity/wallets/actions/authenticate":
+    "/unity/v4/wallets/actions/authenticate",
+  // wallet actions
+  "/unity/wallets/actions/connect": "/unity/v4/wallets/actions/connect",
+  "/unity/wallets/actions/createsessionkey":
+    "/unity/v4/wallets/actions/createsessionkey",
+  "/unity/wallets/actions/disconnect": "/unity/v4/wallets/actions/disconnect",
+  "/unity/wallets/actions/executerawtransaction":
+    "/unity/v4/wallets/actions/executerawtransaction",
+  "/unity/wallets/actions/getaddress": "/unity/v4/wallets/actions/getaddress",
+  "/unity/wallets/actions/getallactivesigners":
+    "/unity/v4/wallets/actions/getallactivesigners",
+  "/unity/wallets/actions/getbalance": "/unity/v4/wallets/actions/getbalance",
+  "/unity/wallets/actions/getchainid": "/unity/v4/wallets/actions/getchainid",
+  "/unity/wallets/actions/getemail": "/unity/v4/wallets/actions/getemail",
+  "/unity/wallets/actions/getnonce": "/unity/v4/wallets/actions/getnonce",
+  "/unity/wallets/actions/getsigneraddress":
+    "/unity/v4/wallets/actions/getsigneraddress",
+  "/unity/wallets/actions/isconnected": "/unity/v4/wallets/actions/isconnected",
+  "/unity/wallets/actions/recoveraddress":
+    "/unity/v4/wallets/actions/recoveraddress",
+  "/unity/wallets/actions/removeadmin": "/unity/v4/wallets/actions/removeadmin",
+  "/unity/wallets/actions/revokesessionkey":
+    "/unity/v4/wallets/actions/revokesessionkey",
+  "/unity/wallets/actions/sendrawtransaction":
+    "/unity/v4/wallets/actions/sendrawtransaction",
+  "/unity/wallets/actions/sign": "/unity/v4/wallets/actions/sign",
+  "/unity/wallets/actions/signtypeddatav4":
+    "/unity/v4/wallets/actions/signtypeddatav4",
+  "/unity/wallets/actions/switchnetwork":
+    "/unity/v4/wallets/actions/switchnetwork",
+  "/unity/wallets/actions/transfer": "/unity/v4/wallets/actions/transfer",
+  // wallets
+  "/unity/wallets/prefab": "/unity/v4/wallets/prefab",
+  "/unity/wallets/providers/account-abstraction":
+    "/unity/v4/wallets/providers/account-abstraction",
+  "/unity/wallets/providers/coinbase": "/unity/v4/wallets/providers/coinbase",
+  "/unity/wallets/providers/hyperplay": "/unity/v4/wallets/providers/hyperplay",
+  // wallet providers
+  "/unity/wallets/providers/in-app-wallet":
+    "/unity/v4/wallets/providers/in-app-wallet",
+  "/unity/wallets/providers/local-wallet":
+    "/unity/v4/wallets/providers/local-wallet",
+  "/unity/wallets/providers/metamask": "/unity/v4/wallets/providers/metamask",
+  "/unity/wallets/providers/rabby": "/unity/v4/wallets/providers/rabby",
+  "/unity/wallets/providers/walletconnect":
+    "/unity/v4/wallets/providers/walletconnect",
+  // submission
+  "/unity/wallets/submission": "/unity/v4/wallets/submission",
 };
 
 const walletRedirects = {
+  //auth
+  "/auth": "/connect/auth",
+  "/auth/client-frameworks/react": "/connect/auth/client-frameworks/react",
+  "/auth/client-frameworks/react-native":
+    "/connect/auth/client-frameworks/react-native",
+  "/auth/faqs": "/connect/auth/faq",
+  "/auth/getting-started": "/connect/auth/get-started",
+  "/auth/how-auth-works": "/connect/auth/how-it-works",
+  "/auth/how-auth-works/auth-api": "/connect/auth/how-it-works/api",
+  "/auth/how-auth-works/json-web-tokens": "/connect/auth/how-it-works/jwt",
+  "/auth/how-auth-works/sign-in-with-wallet": "/connect/auth/how-it-works/siwe",
+  "/auth/integrations/firebase": "/connect/auth/integrations/firebase",
+  "/auth/integrations/next-auth": "/connect/auth/integrations/next-auth",
+  "/auth/integrations/supabase": "/connect/auth/integrations/supabase",
+  "/auth/server-frameworks/express": "/connect/auth/server-frameworks/express",
+  "/auth/server-frameworks/next": "/connect/auth/server-frameworks/next",
+  "/auth/wallet-configuration": "/connect/auth/wallet-configuration",
   //connect
   "/connect/architecture": "/connect",
-  "/connect/sign-in": "/connect/sign-in/overview",
-  "/connect/usage-with-react-sdk": "/connect/sign-in",
-  "/connect/usage-with-react-native-sdk": "/connect/sign-in",
-  "/connect/usage-with-typescript-sdk": "/connect/sign-in",
-  "/connect/usage-with-unity-sdk": "/connect/sign-in",
+  "/connect/auth/client-frameworks/react": "/connect/auth",
+  "/connect/auth/client-frameworks/react-native": "/connect/auth",
+  "/connect/auth/faqs": "/connect/auth",
+  "/connect/auth/get-started": "/connect/auth",
+  "/connect/auth/how-it-works": "/connect/auth",
+  "/connect/auth/how-it-works/api": "/connect/auth",
+  "/connect/auth/how-it-works/jwt": "/connect/auth",
+  "/connect/auth/how-it-works/siwe": "/connect/auth",
+  "/connect/auth/integrations/firebase": "/connect/auth",
+  "/connect/auth/integrations/next-auth": "/connect/auth",
+  "/connect/auth/integrations/supabase": "/connect/auth",
+  "/connect/auth/server-frameworks/express": "/connect/auth",
+  "/connect/auth/server-frameworks/next": "/connect/auth",
+  "/connect/auth/wallet-configuration": "/connect/auth",
   "/connect/connect-wallet": "/connect/connect",
-  "/connect/supported-wallets": "/connect/connect",
-  "/connect/connect-wallet/wallet-providers": "/connect/connect",
-  "/connect/connect-wallet/theme": "/connect/sign-in",
+  "/connect/connect-wallet/auth": "/connect/sign-in",
   "/connect/connect-wallet/button-title": "/connect/sign-in",
-  "/connect/connect-wallet/modal-title": "/connect/sign-in",
-  "/connect/connect-wallet/modal-size": "/connect/sign-in",
-  "/connect/connect-wallet/welcome-screen": "/connect/sign-in",
-  "/connect/connect-wallet/custom-button": "/connect/sign-in",
   "/connect/connect-wallet/class-name": "/connect/sign-in",
+  "/connect/connect-wallet/custom-button": "/connect/sign-in",
+  "/connect/connect-wallet/custom-ui": "/connect/sign-in/custom-ui",
   "/connect/connect-wallet/drop-down-positions": "/connect/sign-in",
   "/connect/connect-wallet/hide-testnet-faucet": "/connect/sign-in",
-  "/connect/connect-wallet/auth": "/connect/sign-in",
-  "/connect/connect-wallet/switch-chain": "/connect/sign-in",
+  "/connect/connect-wallet/modal-size": "/connect/sign-in",
+  "/connect/connect-wallet/modal-title": "/connect/sign-in",
   "/connect/connect-wallet/privacy-policy": "/connect/sign-in",
+  "/connect/connect-wallet/switch-chain": "/connect/sign-in",
   "/connect/connect-wallet/terms-of-service": "/connect/sign-in",
-  "/connect/connect-wallet/custom-ui": "/connect/sign-in/custom-ui",
-  "/connect/faqs": "/connect/sign-in",
+  "/connect/connect-wallet/theme": "/connect/sign-in",
+  "/connect/connect-wallet/wallet-providers": "/connect/connect",
+  "/connect/connect-wallet/welcome-screen": "/connect/sign-in",
+  "/connect/ecosystem/ecosystem-premissions":
+    "/connect/wallet/ecosystem/permissions",
 
   "/connect/ecosystem/faq": "/connect/wallet/faq",
   "/connect/ecosystem/get-started": "/connect/wallet/get-started",
+  "/connect/ecosystem/integrating-partners":
+    "/connect/wallet/ecosystem/integrating-partners",
   "/connect/ecosystem/overview": "/connect/wallet/overview",
   "/connect/ecosystem/pregenerate-wallets":
     "/connect/wallet/pregenerate-wallets",
   "/connect/ecosystem/security": "/connect/wallet/security",
   "/connect/ecosystem/wallet-explorer": "/connect/wallet/ecosystem/portal",
-  "/connect/ecosystem/ecosystem-premissions":
-    "/connect/wallet/ecosystem/permissions",
-  "/connect/ecosystem/integrating-partners":
-    "/connect/wallet/ecosystem/integrating-partners",
-
-  "/connect/in-app-wallet/overview": "/connect/wallet/overview",
-  "/connect/in-app-wallet/security": "/connect/wallet/security",
-  "/connect/in-app-wallet/get-started": "/connect/wallet/get-started",
+  "/connect/faqs": "/connect/sign-in",
   "/connect/in-app-wallet/faqs": "/connect/wallet/faq",
+  "/connect/in-app-wallet/get-started": "/connect/wallet/get-started",
+  "/connect/in-app-wallet/guides/export-private-key":
+    "/connect/wallet/user-management/export-private-key",
+  "/connect/in-app-wallet/guides/get-user-details":
+    "/connect/wallet/user-management/get-user-profiles",
   "/connect/in-app-wallet/guides/link-multiple-profiles":
     "/connect/wallet/user-management/link-multiple-identity",
   "/connect/in-app-wallet/guides/retrieve-linked-profiles":
     "/connect/wallet/user-management/get-user-profiles",
-  "/connect/in-app-wallet/guides/get-user-details":
-    "/connect/wallet/user-management/get-user-profiles",
-  "/connect/in-app-wallet/guides/export-private-key":
-    "/connect/wallet/user-management/export-private-key",
 
-  "/connect/sign-in/overview": "/connect/wallet/overview",
+  "/connect/in-app-wallet/overview": "/connect/wallet/overview",
+  "/connect/in-app-wallet/security": "/connect/wallet/security",
+  "/connect/sign-in": "/connect/sign-in/overview",
   "/connect/sign-in/ConnectButton": "/connect/wallet/get-started",
   "/connect/sign-in/ConnectEmbed": "/connect/wallet/get-started",
   "/connect/sign-in/Custom-UI": "/connect/wallet/get-started",
   "/connect/sign-in/methods/email-and-phone":
     "/connect/wallet/sign-in-methods/configure",
-  "/connect/sign-in/methods/social-logins":
-    "/connect/wallet/sign-in-methods/configure",
-  "/connect/sign-in/methods/guest-mode":
-    "/connect/wallet/sign-in-methods/guest",
   "/connect/sign-in/methods/external-wallets":
     "/connect/wallet/sign-in-methods/external-wallets",
+  "/connect/sign-in/methods/guest-mode":
+    "/connect/wallet/sign-in-methods/guest",
+  "/connect/sign-in/methods/social-logins":
+    "/connect/wallet/sign-in-methods/configure",
+
+  "/connect/sign-in/overview": "/connect/wallet/overview",
+  "/connect/supported-wallets": "/connect/connect",
+  "/connect/usage-with-react-native-sdk": "/connect/sign-in",
+  "/connect/usage-with-react-sdk": "/connect/sign-in",
+  "/connect/usage-with-typescript-sdk": "/connect/sign-in",
+  "/connect/usage-with-unity-sdk": "/connect/sign-in",
 
   //embedded wallet
   "/embedded-wallet": "/wallets/embedded-wallet/overview",
-  "/embedded-wallet/how-it-works": "/wallets/embedded-wallet/how-it-works",
-  "/embedded-wallet/getting-started": "/wallets/embedded-wallet/get-started",
   "/embedded-wallet/connect": "/wallets/embedded-wallet/how-to/connect-users",
   "/embedded-wallet/custom":
     "/wallets/embedded-wallet/how-to/build-your-own-ui",
-  "/embedded-wallet/use":
-    "/wallets/embedded-wallet/how-to/interact-with-wallets",
-  "/embedded-wallet/interact":
-    "/wallets/embedded-wallet/how-to/interact-blockchain",
-  "/embedded-wallet/smart-wallet-and-embedded-wallet":
-    "/wallets/embedded-wallet/how-to/enable-gasless",
-  "/embedded-wallet/export-private-key":
-    "/wallets/embedded-wallet/how-to/export-private-key",
   "/embedded-wallet/custom-auth":
     "/wallets/embedded-wallet/custom-auth/configuration",
   "/embedded-wallet/custom-auth-server":
     "/wallets/embedded-wallet/custom-auth/custom-auth-server",
-  "/embedded-wallet/integrate-firebase":
-    "/wallets/embedded-wallet/custom-auth/firebase-auth",
   "/embedded-wallet/custom-jwt-auth-server":
     "/wallets/embedded-wallet/custom-auth/custom-jwt-auth-server",
+  "/embedded-wallet/export-private-key":
+    "/wallets/embedded-wallet/how-to/export-private-key",
   "/embedded-wallet/faqs": "/wallets/embedded-wallet/faqs",
+  "/embedded-wallet/getting-started": "/wallets/embedded-wallet/get-started",
+  "/embedded-wallet/how-it-works": "/wallets/embedded-wallet/how-it-works",
+  "/embedded-wallet/integrate-firebase":
+    "/wallets/embedded-wallet/custom-auth/firebase-auth",
+  "/embedded-wallet/interact":
+    "/wallets/embedded-wallet/how-to/interact-blockchain",
+  "/embedded-wallet/smart-wallet-and-embedded-wallet":
+    "/wallets/embedded-wallet/how-to/enable-gasless",
+  "/embedded-wallet/use":
+    "/wallets/embedded-wallet/how-to/interact-with-wallets",
   //smart wallet
   "/smart-wallet": "/wallets/smart-wallet",
-  "/smart-wallet/how-it-works": "/wallets/smart-wallet/how-it-works",
+  "/smart-wallet/faqs": "/wallets/smart-wallet/faq",
   "/smart-wallet/getting-started": "/wallets/smart-wallet/get-started",
-  "/smart-wallet/infrastructure": "wallets/smart-wallet/infrastructure",
-  "/smart-wallet/permissions": "/wallets/smart-wallet/permissions",
   "/smart-wallet/guides/react": "/wallets/smart-wallet/guides/react",
   "/smart-wallet/guides/typescript": "/wallets/smart-wallet/guides/typescript",
-  "/smart-wallet/faqs": "/wallets/smart-wallet/faq",
-  //auth
-  "/auth": "/connect/auth",
-  "/auth/how-auth-works": "/connect/auth/how-it-works",
-  "/auth/how-auth-works/sign-in-with-wallet": "/connect/auth/how-it-works/siwe",
-  "/auth/how-auth-works/json-web-tokens": "/connect/auth/how-it-works/jwt",
-  "/auth/how-auth-works/auth-api": "/connect/auth/how-it-works/api",
-  "/auth/getting-started": "/connect/auth/get-started",
-  "/auth/client-frameworks/react": "/connect/auth/client-frameworks/react",
-  "/auth/client-frameworks/react-native":
-    "/connect/auth/client-frameworks/react-native",
-  "/auth/server-frameworks/next": "/connect/auth/server-frameworks/next",
-  "/auth/server-frameworks/express": "/connect/auth/server-frameworks/express",
-  "/auth/integrations/next-auth": "/connect/auth/integrations/next-auth",
-  "/auth/integrations/supabase": "/connect/auth/integrations/supabase",
-  "/auth/integrations/firebase": "/connect/auth/integrations/firebase",
-  "/auth/wallet-configuration": "/connect/auth/wallet-configuration",
-  "/auth/faqs": "/connect/auth/faq",
-  "/connect/auth/how-it-works": "/connect/auth",
-  "/connect/auth/how-it-works/siwe": "/connect/auth",
-  "/connect/auth/how-it-works/jwt": "/connect/auth",
-  "/connect/auth/how-it-works/api": "/connect/auth",
-  "/connect/auth/get-started": "/connect/auth",
-  "/connect/auth/client-frameworks/react": "/connect/auth",
-  "/connect/auth/client-frameworks/react-native": "/connect/auth",
-  "/connect/auth/server-frameworks/next": "/connect/auth",
-  "/connect/auth/server-frameworks/express": "/connect/auth",
-  "/connect/auth/integrations/next-auth": "/connect/auth",
-  "/connect/auth/integrations/supabase": "/connect/auth",
-  "/connect/auth/integrations/firebase": "/connect/auth",
-  "/connect/auth/wallet-configuration": "/connect/auth",
-  "/connect/auth/faqs": "/connect/auth",
+  "/smart-wallet/how-it-works": "/wallets/smart-wallet/how-it-works",
+  "/smart-wallet/infrastructure": "wallets/smart-wallet/infrastructure",
+  "/smart-wallet/permissions": "/wallets/smart-wallet/permissions",
   // Wallet SDK
   "/wallet": "/wallet-sdk/v2",
   "/wallet/architecture": "/wallet-sdk/v2",
-  "/wallet/getting-started": "/wallet-sdk/v2/usage",
-  "/wallet/usage-with-typescript-sdk": "/wallet-sdk/v2/usage",
-  "/wallet/usage-with-react-sdk": "/wallet-sdk/v2/usage",
-  "/wallet/usage-with-react-native-sdk": "/wallet-sdk/v2/usage",
-  "/wallet/usage-with-unity-sdk": "/wallet-sdk/v2/usage",
+  "/wallet/aws-kms": "/references/wallets/v2/AwsKmsWallet",
+  "/wallet/aws-secrets-manager":
+    "/references/wallets/v2/AwsSecretsManagerWallet",
+  "/wallet/blocto": "/references/wallets/v2/BloctoWallet",
   // build a wallet
   "/wallet/build-a-wallet": "/wallet-sdk/v2/build",
+  "/wallet/coin98-wallet": "/references/wallets/v2/Coin98Wallet",
+  "/wallet/coinbase-wallet": "/references/wallets/v2/CoinbaseWallet",
+  "/wallet/core-wallet": "/references/wallets/v2/CoreWallet",
+  "/wallet/defi-wallet": "/references/wallets/v2/CryptoDefiWallet",
+  "/wallet/embedded-wallet": "/references/wallets/v2/EmbeddedWallet",
+  "/wallet/ethers": "/references/wallets/v2/EthersWallet",
+  "/wallet/frame": "/references/wallets/v2/FrameWallet",
+  "/wallet/getting-started": "/wallet-sdk/v2/usage",
   "/wallet/interfaces/abstract-client-wallet":
     "/references/wallets/v2/AbstractClientWallet",
   "/wallet/interfaces/abstract-wallet": "/references/wallets/v2/AbstractWallet",
   "/wallet/interfaces/connector": "/references/wallets/v2/Connector",
-  // wallets
-  "/wallet/metamask": "/references/wallets/v2/MetaMaskWallet",
-  "/wallet/coinbase-wallet": "/references/wallets/v2/CoinbaseWallet",
-  "/wallet/wallet-connect-v2": "/references/wallets/v2/WalletConnect",
-  "/wallet/smart-wallet": "/references/wallets/v2/SmartWallet",
-  "/wallet/embedded-wallet": "/references/wallets/v2/EmbeddedWallet",
-  "/wallet/paper": "/references/wallets/v2/EmbeddedWallet",
   "/wallet/local-wallet": "/references/wallets/v2/LocalWallet",
   "/wallet/local-wallet-node": "/references/wallets/v2/LocalWalletNode",
-  "/wallet/trust-wallet": "/references/wallets/v2/TrustWallet",
-  "/wallet/zerion-wallet": "/references/wallets/v2/ZerionWallet",
   "/wallet/magic": "/references/wallets/v2/MagicLink",
-  "/wallet/rainbow": "/references/wallets/v2/RainbowWallet",
-  "/wallet/safe": "/references/wallets/v2/SafeWallet",
-  "/wallet/blocto": "/references/wallets/v2/BloctoWallet",
-  "/wallet/frame": "/references/wallets/v2/FrameWallet",
-  "/wallet/phantom": "/references/wallets/v2/PhantomWallet",
-  "/wallet/aws-kms": "/references/wallets/v2/AwsKmsWallet",
-  "/wallet/aws-secrets-manager":
-    "/references/wallets/v2/AwsSecretsManagerWallet",
-  "/wallet/coin98-wallet": "/references/wallets/v2/Coin98Wallet",
-  "/wallet/core-wallet": "/references/wallets/v2/CoreWallet",
-  "/wallet/defi-wallet": "/references/wallets/v2/CryptoDefiWallet",
-  "/wallet/ethers": "/references/wallets/v2/EthersWallet",
+  // wallets
+  "/wallet/metamask": "/references/wallets/v2/MetaMaskWallet",
   "/wallet/okx-wallet": "/references/wallets/v2/OKXWallet",
   "/wallet/onekey-wallet": "/references/wallets/v2/OneKeyWallet",
+  "/wallet/paper": "/references/wallets/v2/EmbeddedWallet",
+  "/wallet/phantom": "/references/wallets/v2/PhantomWallet",
   "/wallet/private-key": "/references/wallets/v2/PrivateKeyWallet",
   "/wallet/rabby-wallet": "/references/wallets/v2/RabbyWallet",
+  "/wallet/rainbow": "/references/wallets/v2/RainbowWallet",
+  "/wallet/safe": "/references/wallets/v2/SafeWallet",
+  "/wallet/smart-wallet": "/references/wallets/v2/SmartWallet",
+  "/wallet/trust-wallet": "/references/wallets/v2/TrustWallet",
+  "/wallet/usage-with-react-native-sdk": "/wallet-sdk/v2/usage",
+  "/wallet/usage-with-react-sdk": "/wallet-sdk/v2/usage",
+  "/wallet/usage-with-typescript-sdk": "/wallet-sdk/v2/usage",
+  "/wallet/usage-with-unity-sdk": "/wallet-sdk/v2/usage",
+  "/wallet/wallet-connect-v2": "/references/wallets/v2/WalletConnect",
+  "/wallet/zerion-wallet": "/references/wallets/v2/ZerionWallet",
 };
 
 const paymentRedirects = {
   "/checkouts": "/payments",
-  "/checkouts/getting-started": "/payments/nft-checkout/getting-started",
-  "/checkouts/enable-contract": "/payments/nft-checkout/enable-contract",
+  "/checkouts/api-reference": "/payments/nft-checkout/api-reference",
   "/checkouts/checkout-link": "/payments/nft-checkout/checkout-link",
-  "/checkouts/go-live-checklist": "/payments/nft-checkout/go-live-checklist",
-  "/checkouts/elements": "/payments/nft-checkout/elements",
   "/checkouts/checkout-with-card": "/payments/nft-checkout/checkout-with-card",
   "/checkouts/checkout-with-eth": "/payments/nft-checkout/checkout-with-eth",
-  "/checkouts/webhooks": "/payments/nft-checkout/webhooks",
-  "/checkouts/translations": "/payments/nft-checkout/translations",
+  "/checkouts/custom-contracts": "/payments/nft-checkout/custom-contracts",
+  "/checkouts/elements": "/payments/nft-checkout/elements",
+  "/checkouts/enable-contract": "/payments/nft-checkout/enable-contract",
+  "/checkouts/erc20-pricing": "/payments/nft-checkout/erc20-pricing",
+  "/checkouts/faq": "/payments/nft-checkout/faq",
+  "/checkouts/getting-started": "/payments/nft-checkout/getting-started",
+  "/checkouts/go-live-checklist": "/payments/nft-checkout/go-live-checklist",
   "/checkouts/marketplaces": "/payments/nft-checkout/marketplaces",
   "/checkouts/one-time-checkout-link":
     "/payments/nft-checkout/one-time-checkout-link",
-  "/checkouts/custom-contracts": "/payments/nft-checkout/custom-contracts",
   "/checkouts/pre-built-contracts":
     "/payments/nft-checkout/pre-built-contracts",
-  "/checkouts/erc20-pricing": "/payments/nft-checkout/erc20-pricing",
-  "/checkouts/api-reference": "/payments/nft-checkout/api-reference",
-  "/checkouts/faq": "/payments/nft-checkout/faq",
-  "/payments/:match*": "/connect/pay/overview",
-  "/connect/pay/buy-with-fiat": "/connect/pay/overview",
-  "/connect/pay/buy-with-crypto": "/connect/pay/overview",
-  "/connect/pay/buy-with-crypto/overview": "/connect/pay/overview",
-  "/connect/pay/buy-with-crypto/fee-sharing": "/connect/pay/fee-sharing",
+  "/checkouts/translations": "/payments/nft-checkout/translations",
+  "/checkouts/webhooks": "/payments/nft-checkout/webhooks",
+  "/connect/in-app-wallet/guides/get-in-app-wallet-details-on-server":
+    "/connect/in-app-wallet/guides/get-user-details",
+  "/connect/in-app-wallet/how-it-works": "/connect/in-app-wallet/security",
   "/connect/pay/build-a-custom-experience":
     "/connect/pay/guides/build-a-custom-experience",
+  "/connect/pay/buy-with-crypto": "/connect/pay/overview",
+  "/connect/pay/buy-with-crypto/fee-sharing": "/connect/pay/fee-sharing",
+  "/connect/pay/buy-with-crypto/overview": "/connect/pay/overview",
+  "/connect/pay/buy-with-fiat": "/connect/pay/overview",
   "/connect/pay/enable-test-mode": "/connect/pay/guides/enable-test-mode",
   "/connect/pay/guides/enable-test-mode": "/connect/pay/testing-pay",
-  "/connect/in-app-wallet/how-it-works": "/connect/in-app-wallet/security",
-  "/connect/in-app-wallet/guides/get-in-app-wallet-details-on-server":
-    "/connect/in-app-wallet/guides/get-user-details",
+  "/payments/:match*": "/connect/pay/overview",
 };
 
 const contractRedirects = {
+  "/contracts/DropERC721": "/contracts/explore/pre-built-contracts/nft-drop",
+  "/contracts/DropERC1155":
+    "/contracts/explore/pre-built-contracts/edition-drop",
+  //design documentation
+  "/contracts/design/Drop": "/contracts/design-docs/drop",
+  "/contracts/design/Marketplace": "/contracts/design-docs/marketplace",
+  "/contracts/design/Multiwrap": "/contracts/design-docs/multiwrap",
+  "/contracts/design/Pack": "/contracts/design-docs/pack",
+  "/contracts/design/SignatureDrop": "/contracts",
+  "/contracts/design/SignatureMint": "/contracts/design-docs/signature-mint",
+  "/contracts/Multiwrap": "/contracts/design-docs/multiwrap",
+  // contract references
+  "/contracts/TokenERC20": "/contracts/explore/pre-built-contracts/token",
+  "/contracts/TokenERC721":
+    "/contracts/explore/pre-built-contracts/nft-collection",
+  "/contracts/TokenERC1155": "/contracts/explore/pre-built-contracts/edition",
+  "/contracts/VoteERC20": "/contracts/build/base-contracts/erc-20/vote",
+  //deploy
+  "/deploy": "contracts/deploy/overview",
+  "/deploy/faqs": "/contracts/deploy/overview",
+  "/deploy/getting-started": "/contracts/deploy/deploy-contract",
+  "/deploy/how-it-works": "/contracts/deploy/overview",
+  "/explore/faqs": "/contracts",
+  "/interact": "/contracts",
   //pre-built contracts
   "/pre-built-contracts": "/contracts",
-  "/pre-built-contracts/how-it-works": "/contracts",
-  "/explore/faqs": "/contracts",
   "/pre-built-contracts/account-factory":
     "/contracts/explore/pre-built-contracts/account-factory",
-  "/pre-built-contracts/airdrop-erc1155-claimable":
-    "/explore/pre-built-contracts/airdrop-erc1155-claimable",
-  "/pre-built-contracts/airdrop-erc1155":
-    "/contracts/explore/pre-built-contracts/airdrop-erc1155",
-  "/pre-built-contracts/airdrop-erc20-claimable":
-    "/contracts/explore/pre-built-contracts/airdrop-erc20-claimable",
   "/pre-built-contracts/airdrop-erc20":
     "/contracts/explore/pre-built-contracts/airdrop-erc20",
-  "/pre-built-contracts/airdrop-erc721-claimable":
-    "/contracts/explore/pre-built-contracts/airdrop-erc721-claimable",
+  "/pre-built-contracts/airdrop-erc20-claimable":
+    "/contracts/explore/pre-built-contracts/airdrop-erc20-claimable",
   "/pre-built-contracts/airdrop-erc721":
     "/contracts/explore/pre-built-contracts/airdrop-erc721",
-  "/pre-built-contracts/edition-drop":
-    "/contracts/explore/pre-built-contracts/edition-drop",
+  "/pre-built-contracts/airdrop-erc721-claimable":
+    "/contracts/explore/pre-built-contracts/airdrop-erc721-claimable",
+  "/pre-built-contracts/airdrop-erc1155":
+    "/contracts/explore/pre-built-contracts/airdrop-erc1155",
+  "/pre-built-contracts/airdrop-erc1155-claimable":
+    "/explore/pre-built-contracts/airdrop-erc1155-claimable",
   "/pre-built-contracts/edition":
     "/contracts/explore/pre-built-contracts/edition",
+  "/pre-built-contracts/edition-drop":
+    "/contracts/explore/pre-built-contracts/edition-drop",
+  "/pre-built-contracts/how-it-works": "/contracts",
   "/pre-built-contracts/loyalty-card":
     "/contracts/explore/pre-built-contracts/loyalty-card",
   "/pre-built-contracts/managed-account-factory":
@@ -783,94 +806,72 @@ const contractRedirects = {
   "/pre-built-contracts/pack": "/contracts/explore/pre-built-contracts/pack",
   "/pre-built-contracts/signature-drop": "/contracts",
   "/pre-built-contracts/split": "/contracts/explore/pre-built-contracts/split",
-  "/pre-built-contracts/stake-erc1155":
-    "/contracts/explore/pre-built-contracts/stake-erc1155",
   "/pre-built-contracts/stake-erc20":
     "/contracts/explore/pre-built-contracts/stake-erc20",
   "/pre-built-contracts/stake-erc721":
     "/contracts/explore/pre-built-contracts/stake-erc721",
+  "/pre-built-contracts/stake-erc1155":
+    "/contracts/explore/pre-built-contracts/stake-erc1155",
+  "/pre-built-contracts/token": "/contracts/explore/pre-built-contracts/token",
   "/pre-built-contracts/token-drop":
     "/contracts/explore/pre-built-contracts/token-drop",
-  "/pre-built-contracts/token": "/contracts/explore/pre-built-contracts/token",
   "/pre-built-contracts/vote": "/contracts/explore/pre-built-contracts/vote",
-  //deploy
-  "/deploy": "contracts/deploy/overview",
-  "/deploy/how-it-works": "/contracts/deploy/overview",
-  "/deploy/getting-started": "/contracts/deploy/deploy-contract",
-  "/deploy/faqs": "/contracts/deploy/overview",
   //publish
   "/publish": "/contracts/publish/overview",
-  "/publish/getting-started": "/contracts/publish/publish-contract",
   "/publish/deployment-options": "/contracts/publish/publish-options",
   "/publish/get-featured-on-explore": "/contracts/publish/overview",
-  "/sdk": "/contracts",
-  "/sdk/how-it-works": "/contracts",
-  "/sdk/getting-started": "/contracts",
-  //design documentation
-  "/contracts/design/Drop": "/contracts/design-docs/drop",
-  "/contracts/design/Marketplace": "/contracts/design-docs/marketplace",
-  "/contracts/design/SignatureMint": "/contracts/design-docs/signature-mint",
-  "/contracts/design/Multiwrap": "/contracts/design-docs/multiwrap",
-  "/contracts/design/Pack": "/contracts/design-docs/pack",
-  "/contracts/design/SignatureDrop": "/contracts",
-  "/interact": "/contracts",
-  // contract references
-  "/contracts/TokenERC20": "/contracts/explore/pre-built-contracts/token",
-  "/contracts/DropERC721": "/contracts/explore/pre-built-contracts/nft-drop",
-  "/contracts/DropERC1155":
-    "/contracts/explore/pre-built-contracts/edition-drop",
-  "/contracts/TokenERC721":
-    "/contracts/explore/pre-built-contracts/nft-collection",
-  "/contracts/TokenERC1155": "/contracts/explore/pre-built-contracts/edition",
-  "/contracts/Multiwrap": "/contracts/design-docs/multiwrap",
-  "/contracts/VoteERC20": "/contracts/build/base-contracts/erc-20/vote",
+  "/publish/getting-started": "/contracts/publish/publish-contract",
+  "/sdk": "/contracts",
+  "/sdk/getting-started": "/contracts",
+  "/sdk/how-it-works": "/contracts",
 };
 
 const infrastructureRedirects = {
+  "/engine": "/engine/v3",
+  "/engine/features/permissions": "/engine/features/admins",
+  "/guides/engine/relayer": "/engine/features/relayer",
   //engine top-level
   "/infrastructure/engine": "/engine",
-  "/infrastructure/engine/get-started": "/engine/get-started",
-  "/infrastructure/engine/production-checklist": "/engine/production-checklist",
-  "/infrastructure/engine/self-host": "/engine/self-host",
+  "/infrastructure/engine/faq": "/engine/faq",
   "/infrastructure/engine/features/backend-wallets":
     "/engine/features/backend-wallets",
   "/infrastructure/engine/features/contracts": "/engine/features/contracts",
+  "/infrastructure/engine/features/gasless-transactions":
+    "/engine/features/gasless-transactions",
   "/infrastructure/engine/features/permissions": "/engine/features/permissions",
-  "/infrastructure/engine/features/webhooks": "/engine/features/webhooks",
+  "/infrastructure/engine/features/relayers": "/engine/features/relayers",
   "/infrastructure/engine/features/smart-wallets":
     "/engine/features/smart-wallets",
-  "/infrastructure/engine/features/relayers": "/engine/features/relayers",
-  "/infrastructure/engine/features/gasless-transactions":
-    "/engine/features/gasless-transactions",
+  "/infrastructure/engine/features/webhooks": "/engine/features/webhooks",
+  "/infrastructure/engine/get-started": "/engine/get-started",
   "/infrastructure/engine/guides/airdrop-nfts": "/engine/guides/airdrop-nfts",
   "/infrastructure/engine/guides/nft-checkout": "/engine/guides/nft-checkout",
   "/infrastructure/engine/guides/smart-wallets": "/engine/guides/smart-wallets",
+  "/infrastructure/engine/overview": "/engine",
+  "/infrastructure/engine/production-checklist": "/engine/production-checklist",
   "/infrastructure/engine/references/api-reference":
     "/engine/references/api-reference",
   "/infrastructure/engine/references/typescript":
     "/engine/references/typescript",
+  "/infrastructure/engine/self-host": "/engine/self-host",
   "/infrastucture/engine/security": "/engine/security",
-  "/infrastructure/engine/faq": "/engine/faq",
-  "/guides/engine/relayer": "/engine/features/relayer",
-  "/infrastructure/engine/overview": "/engine",
-  "/engine/features/permissions": "/engine/features/admins",
-  "/engine": "/engine/v3",
+  //rpc-edge
+  "/rpc-edge": "/infrastructure/rpc-edge/overview",
+  "/rpc-edge/faqs": "/infrastructure/rpc-edge/overview",
+  "/rpc-edge/get-started": "/infrastructure/rpc-edge/get-started",
+  "/storage/host-web-app":
+    "/infrastructure/storage/how-to-use-storage/host-web-app",
 
   //storage
   "/storage/how-storage-works": "/infrastructure/storage/how-storage-works",
   "/storage/upload-to-ipfs":
     "/infrastructure/storage/how-to-use-storage/upload-files-to-ipfs",
-  "/storage/host-web-app":
-    "/infrastructure/storage/how-to-use-storage/host-web-app",
-  //rpc-edge
-  "/rpc-edge": "/infrastructure/rpc-edge/overview",
-  "/rpc-edge/get-started": "/infrastructure/rpc-edge/get-started",
-  "/rpc-edge/faqs": "/infrastructure/rpc-edge/overview",
 };
 
 const glossaryRedirects = {
-  "/glossary": "https://thirdweb.com/learn/glossary",
   "/claim-phases": "https://thirdweb.com/learn/glossary/claim-phases",
+  "/glossary": "https://thirdweb.com/learn/glossary",
+  "/glossary/bundler": "https://thirdweb.com/learn/glossary/bundler",
   "/glossary/claiming": "https://thirdweb.com/learn/glossary/claim-phases",
   "/glossary/composability":
     "https://thirdweb.com/learn/glossary/composability",
@@ -901,154 +902,157 @@ const glossaryRedirects = {
   "/glossary/rpc": "https://thirdweb.com/learn/glossary/rpc-url",
   "/glossary/signature-based-minting":
     "https://thirdweb.com/learn/glossary/signature-based-minting",
-  "/glossary/smart-contract":
-    "https://thirdweb.com/learn/glossary/smart-contract",
   "/glossary/smart-account":
     "https://thirdweb.com/learn/glossary/smart-account",
+  "/glossary/smart-contract":
+    "https://thirdweb.com/learn/glossary/smart-contract",
   "/glossary/soulbound": "https://thirdweb.com/learn/glossary/soulbound-tokens",
   "/glossary/staking": "https://thirdweb.com/learn/glossary/staking",
   "/glossary/token": "https://thirdweb.com/learn/glossary/token",
   "/glossary/wallet": "https://thirdweb.com/learn/glossary/",
-  "/glossary/bundler": "https://thirdweb.com/learn/glossary/bundler",
 };
 
 const otherRedirects = {
-  // wallets > connect redirects
-  "/wallets": "/connect",
-  "/wallets/connect/:path*": "/connect/connect/:path*",
-  "/wallets/embedded-wallet/:path*": "/connect/embedded-wallet/:path*",
-  "/wallets/auth/:path*": "/connect/auth/:path*",
-  // guides
-  "/solana/:match*": "https://blog.thirdweb.com/discontinuing-solana-support/",
-  "/pre-built-contracts/solana/:match*":
-    "https://blog.thirdweb.com/discontinuing-solana-support/",
-  "/learn/recipes/:match*": "https://blog.thirdweb.com/",
-  "/guides/tag/bundle-collection": "https://blog.thirdweb.com/tag/edition",
-  "/guides/tag/bundle-drop": "https://blog.thirdweb.com/tag/bundle-drop",
-  "/guides/bundle-drop": "https://blog.thirdweb.com/tag/edition-drop",
-  "/guides/splits": "https://blog.thirdweb.com/tag/split",
+  "/api-keys": "/account/api-keys",
+  "/connect/account-abstraction": "/connect/account-abstraction/overview",
+  // connect
+  "/connect/connect": "/connect/sign-in",
+  "/connect/ecosystems/:path*": "/connect/wallet/overview",
+  "/connect/embedded-wallet/:path*": "/connect/in-app-wallet/:path*",
+  "/connect/embedded-wallet/how-to/get-embedded-wallet-details-on-server":
+    "/connect/in-app-wallet/how-to/get-in-app-wallet-details-on-server",
+  "/connect/in-app-wallet/how-to/get-in-app-wallet-details-on-server":
+    "/connect/in-app-wallet/guides/get-in-app-wallet-details-on-server",
+  "/connect/smart-wallet/:path*": "/connect/account-abstraction/:path*",
+  "/connect/wallet/sign-in-methods/overview":
+    "/connect/wallet/sign-in-methods/configure",
+  "/contractkit/:path*": "/contracts",
+  "/contracts-sdk/:path*": "/contracts/build",
+  "/contracts/drops": "/contracts",
+  "/contracts/edition": "/contracts/explore/pre-built-contracts/edition",
+  "/contracts/edition-drop":
+    "/contracts/explore/pre-built-contracts/edition-drop",
+  "/contracts/governance": "/contracts",
+  "/contracts/marketplace":
+    "/contracts/explore/pre-built-contracts/marketplace",
+  "/contracts/nft-collection":
+    "contracts/explore/pre-built-contracts/nft-collection",
+  // solidity sdk
+  "/contracts/nft-drop": "/contracts/explore/pre-built-contracts/nft-drop",
+  "/contracts/nfts-and-tokens": "/contracts",
+  "/contracts/pack": "/contracts/explore/pre-built-contracts/pack",
+  "/contracts/split": "/contracts/explore/pre-built-contracts/split",
+  "/contracts/token": "/contracts/explore/pre-built-contracts/token",
+  "/contracts/token-drop": "/contracts/explore/pre-built-contracts/token-drop",
+  "/contracts/vote": "/contracts/explore/pre-built-contracts/vote",
+  "/engine/features/smart-wallets": "/engine/features/account-abstraction",
+  "/extensions/:path*": "/contracts/build/extensions",
+  "/gaming": "/",
+  "/gaming-kit/:path*": "/unity",
+  "/gamingkit/:path*": "/unity",
+  "/go": "/engine/overview",
+  "/guides": "https://blog.thirdweb.com/guides",
   "/guides/bundle-collection": "https://blog.thirdweb.com/tag/edition",
+  "/guides/bundle-drop": "https://blog.thirdweb.com/tag/edition-drop",
   "/guides/connect-wallet":
     "https://blog.thirdweb.com/guides/add-connectwallet-to-your-website/",
   "/guides/create-a-drop-with-thirdweb-dashboard":
     "https://blog.thirdweb.com/guides/release-an-nft-drop-with-no-code",
+  "/guides/create-a-pack-with-typescript-and-nextjs":
+    "https://blog.thirdweb.com/guides/create-an-nft-lootbox",
+  "/guides/create-your-own-marketplace-with-thirdweb-typescript-sdk":
+    "https://blog.thirdweb.com/guides/nft-marketplace-with-typescript-next",
+  "/guides/edition": "https://blog.thirdweb.com/tag/edition",
+  "/guides/edition-drop": "https://blog.thirdweb.com/tag/edition-drop",
+  "/guides/marketplace": "https://blog.thirdweb.com/tag/marketplace",
   "/guides/minting-with-signature":
     "https://blog.thirdweb.com/guides/on-demand-minting",
-  "/guides/nft-drop": "https://blog.thirdweb.com/tag/nft-drop",
   "/guides/nft-collection": "https://blog.thirdweb.com/tag/nft-collection",
-  "/guides/edition-drop": "https://blog.thirdweb.com/tag/edition-drop",
-  "/guides/edition": "https://blog.thirdweb.com/tag/edition",
-  "/guides/token": "https://blog.thirdweb.com/tag/token",
-  "/guides/vote": "https://blog.thirdweb.com/tag/vote",
-  "/guides/split": "https://blog.thirdweb.com/tag/split",
-  "/guides/marketplace": "https://blog.thirdweb.com/tag/marketplace",
-  "/guides/pack": "https://blog.thirdweb.com/tag/pack",
-  "/guides": "https://blog.thirdweb.com/guides",
-  "/tag/:match*": "https://blog.thirdweb.com/tag/:match*",
+  "/guides/nft-drop": "https://blog.thirdweb.com/tag/nft-drop",
   "/guides/on-demand-minting":
     "https://blog.thirdweb.com/guides/mint-nft-unique-code",
-  "/guides/create-your-own-marketplace-with-thirdweb-typescript-sdk":
-    "https://blog.thirdweb.com/guides/nft-marketplace-with-typescript-next",
-  "/guides/create-a-pack-with-typescript-and-nextjs":
-    "https://blog.thirdweb.com/guides/create-an-nft-lootbox",
+  "/guides/pack": "https://blog.thirdweb.com/tag/pack",
   "/guides/randomized-nft-drop":
     "https://blog.thirdweb.com/guides/shuffle-nft-drop",
-  // solidity sdk
-  "/contracts/nft-drop": "/contracts/explore/pre-built-contracts/nft-drop",
-  "/contracts/nft-collection":
-    "contracts/explore/pre-built-contracts/nft-collection",
-  "/contracts/edition-drop":
-    "/contracts/explore/pre-built-contracts/edition-drop",
-  "/contracts/edition": "/contracts/explore/pre-built-contracts/edition",
-  "/contracts/token-drop": "/contracts/explore/pre-built-contracts/token-drop",
-  "/contracts/token": "/contracts/explore/pre-built-contracts/token",
-  "/contracts/vote": "/contracts/explore/pre-built-contracts/vote",
-  "/contracts/split": "/contracts/explore/pre-built-contracts/split",
-  "/contracts/marketplace":
-    "/contracts/explore/pre-built-contracts/marketplace",
-  "/contracts/pack": "/contracts/explore/pre-built-contracts/pack",
-  "/contracts/nfts-and-tokens": "/contracts",
-  "/contracts/drops": "/contracts",
-  "/contracts/governance": "/contracts",
-  // account abstraction rename
-  "/wallets/smart-wallet/:path*": "/connect/account-abstraction/:path*",
-  "/connect/smart-wallet/:path*": "/connect/account-abstraction/:path*",
-  "/connect/account-abstraction": "/connect/account-abstraction/overview",
-  "/unity/wallets/providers/smart-wallet":
-    "/unity/wallets/providers/account-abstraction",
-  "/engine/features/smart-wallets": "/engine/features/account-abstraction",
+  "/guides/split": "https://blog.thirdweb.com/tag/split",
+  "/guides/splits": "https://blog.thirdweb.com/tag/split",
+  "/guides/tag/bundle-collection": "https://blog.thirdweb.com/tag/edition",
+  "/guides/tag/bundle-drop": "https://blog.thirdweb.com/tag/bundle-drop",
+  "/guides/token": "https://blog.thirdweb.com/tag/token",
+  "/guides/vote": "https://blog.thirdweb.com/tag/vote",
+  "/learn/recipes/:match*": "https://blog.thirdweb.com/",
   // others
   "/pre-built-contracts/:path*": "/contracts",
-  "/thirdweb-deploy/:path*": "/contracts/deploy/overview",
-  "/thirdweb-cli": "/cli",
-  "/smart-contracts": "/contracts",
-  "/contracts-sdk/:path*": "/contracts/build",
-  "/unity/connectwalletnative": "/unity/wallets/prefab",
-  "/unity/prefabs/thirdwebmanager": "/unity/thirdwebmanager",
-  "/gamingkit/:path*": "/unity",
-  "/gaming-kit/:path*": "/unity",
-  "/contractkit/:path*": "/contracts",
-  "/extensions/:path*": "/contracts/build/extensions",
-  "/release/:match*": "/contracts/publish/overview",
-  "/sdk/:path*": "/typescript/v4",
-  "/web3-api/:path*": "/infrastructure/engine/overview",
-  "/api-keys": "/account/api-keys",
+  "/pre-built-contracts/solana/:match*":
+    "https://blog.thirdweb.com/discontinuing-solana-support/",
   "/python": "/engine/overview",
-  "/go": "/engine/overview",
-  "/ui-components/connectwalletbutton": "/react/v4/components/ConnectWallet",
-  "/ui-components/nft-renderer": "/react/v4/components/ThirdwebNftMedia",
-  "/ui-components/ipfs-media-renderer": "/react/v4/components/MediaRenderer",
-  "/templates": "https://thirdweb.com/templates",
-  "/gaming": "/",
-  "/solutions": "/",
-  "/solutions/gaming": "/",
-  "/signature-minting": "/contracts/design-docs/signature-mint",
+  "/react-native/v0/wallets/embedded-wallet":
+    "/react-native/v0/wallets/in-app-wallet",
   // in-app wallet
   "/references/typescript/v5/embeddedWallet":
     "/references/typescript/v5/inAppWallet",
-  "/connect/embedded-wallet/:path*": "/connect/in-app-wallet/:path*",
-  "/connect/embedded-wallet/how-to/get-embedded-wallet-details-on-server":
-    "/connect/in-app-wallet/how-to/get-in-app-wallet-details-on-server",
-  "/react-native/v0/wallets/embedded-wallet":
-    "/react-native/v0/wallets/in-app-wallet",
+  "/release/:match*": "/contracts/publish/overview",
+  "/sdk/:path*": "/typescript/v4",
+  "/signature-minting": "/contracts/design-docs/signature-mint",
+  "/smart-contracts": "/contracts",
+  // guides
+  "/solana/:match*": "https://blog.thirdweb.com/discontinuing-solana-support/",
+  "/solutions": "/",
+  "/solutions/gaming": "/",
+  "/tag/:match*": "https://blog.thirdweb.com/tag/:match*",
+  "/templates": "https://thirdweb.com/templates",
+  "/thirdweb-cli": "/cli",
+  "/thirdweb-deploy/:path*": "/contracts/deploy/overview",
+  "/ui-components/connectwalletbutton": "/react/v4/components/ConnectWallet",
+  "/ui-components/ipfs-media-renderer": "/react/v4/components/MediaRenderer",
+  "/ui-components/nft-renderer": "/react/v4/components/ThirdwebNftMedia",
+  "/unity/connectwalletnative": "/unity/wallets/prefab",
+  "/unity/prefabs/thirdwebmanager": "/unity/thirdwebmanager",
   "/unity/wallets/providers/embedded-wallet":
     "/unity/wallets/providers/in-app-wallet",
-  // connect
-  "/connect/connect": "/connect/sign-in",
-  "/connect/in-app-wallet/how-to/get-in-app-wallet-details-on-server":
-    "/connect/in-app-wallet/guides/get-in-app-wallet-details-on-server",
-  "/connect/ecosystems/:path*": "/connect/wallet/overview",
+  "/unity/wallets/providers/smart-wallet":
+    "/unity/wallets/providers/account-abstraction",
   "/wallet/get-started/overview": "/connect/wallet/overview",
-  "/connect/wallet/sign-in-methods/overview":
-    "/connect/wallet/sign-in-methods/configure",
+  // wallets > connect redirects
+  "/wallets": "/connect",
+  "/wallets/auth/:path*": "/connect/auth/:path*",
+  "/wallets/connect/:path*": "/connect/connect/:path*",
+  "/wallets/embedded-wallet/:path*": "/connect/embedded-wallet/:path*",
+  // account abstraction rename
+  "/wallets/smart-wallet/:path*": "/connect/account-abstraction/:path*",
+  "/web3-api/:path*": "/infrastructure/engine/overview",
 };
 
 const v5RestructuredRedirects = {
   "/typescript/v5/react": "/react/v5",
-  "/typescript/v5/react/:path*": "/react/v5/:path*",
   "/typescript/v5/react-native": "/react-native/v5",
   "/typescript/v5/react-native/:path*": "/react-native/v5/:path*",
+  "/typescript/v5/react/:path*": "/react/v5/:path*",
 };
 
 const v4ToV5Redirects = {
-  "/typescript/v4": "/typescript/v5",
-  "/typescript/v4/:path*": "/typescript/v5",
-  "/react/v4": "/react/v5",
-  "/react/v4/:path*": "/react/v5",
   "/react-native/v0": "/react-native/v5",
   "/react-native/v0/:path*": "/react-native/v5",
-  "/wallet-sdk/:path*": "/connect",
+  "/react/v4": "/react/v5",
+  "/react/v4/:path*": "/react/v5",
+  "/references/wallets": "/typescript/v5/supported-wallets",
+  "/references/wallets/:path*": "/typescript/v5/supported-wallets",
   "/storage-sdk/v2": "/typescript/v5/storage",
   "/storage-sdk/v2/:path*": "/typescript/v5/storage",
+  "/typescript/v4": "/typescript/v5",
+  "/typescript/v4/:path*": "/typescript/v5",
   "/unity/v4": "/unity/v5",
   "/unity/v4/:path*": "/unity/v5",
-  "/references/wallets": "/typescript/v5/supported-wallets",
-  "/references/wallets/:path*": "/typescript/v5/supported-wallets",
+  "/wallet-sdk/:path*": "/connect",
 };
 
 const payRedirects = {
-  "/connect/pay/overview": "/pay",
-  "/connect/pay/onramp-providers": "/pay/onramp-providers",
+  "/connect/pay/customization/connectbutton":
+    "/pay/customization/connectbutton",
+  "/connect/pay/customization/payembed": "/pay/customization/payembed",
+  "/connect/pay/customization/send-transaction":
+    "/pay/customization/send-transaction",
+  "/connect/pay/faqs": "/pay/faqs",
   "/connect/pay/fees": "/pay/fees",
   "/connect/pay/get-started": "/pay/get-started",
   "/connect/pay/guides/accept-direct-payments":
@@ -1057,14 +1061,10 @@ const payRedirects = {
     "/pay/guides/build-a-custom-experience",
   "/connect/pay/guides/cross-chain-swapping":
     "/pay/guides/cross-chain-swapping",
-  "/connect/pay/customization/connectbutton":
-    "/pay/customization/connectbutton",
-  "/connect/pay/customization/payembed": "/pay/customization/payembed",
-  "/connect/pay/customization/send-transaction":
-    "/pay/customization/send-transaction",
-  "/connect/pay/webhooks": "/pay/webhooks",
+  "/connect/pay/onramp-providers": "/pay/onramp-providers",
+  "/connect/pay/overview": "/pay",
   "/connect/pay/testing-pay": "/pay/testing-pay",
-  "/connect/pay/faqs": "/pay/faqs",
+  "/connect/pay/webhooks": "/pay/webhooks",
 };
 
 /**
@@ -1099,7 +1099,7 @@ export const redirects = async () => {
 function createRedirects(linkMap, permanent = true) {
   const redirects = [];
   for (const key in linkMap) {
-    redirects.push({ source: key, destination: linkMap[key], permanent });
+    redirects.push({ destination: linkMap[key], permanent, source: key });
   }
   return redirects;
 }
diff --git a/apps/portal/src/app/Header.tsx b/apps/portal/src/app/Header.tsx
index 5f027f1b41e..f4fe8a43d39 100644
--- a/apps/portal/src/app/Header.tsx
+++ b/apps/portal/src/app/Header.tsx
@@ -1,13 +1,5 @@
 "use client";
 
-import { DocSearch } from "@/components/others/DocSearch";
-import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import clsx from "clsx";
 import {
   ChevronDownIcon,
@@ -18,6 +10,14 @@ import {
 import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
 import { useState } from "react";
+import { DocSearch } from "@/components/others/DocSearch";
+import { Button } from "@/components/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
 import { GithubIcon } from "../components/Document/GithubButtonLink";
 import { CustomAccordion } from "../components/others/CustomAccordion";
 import { ThemeSwitcher } from "../components/others/theme/ThemeSwitcher";
@@ -32,55 +32,55 @@ import { ThirdwebIcon } from "../icons/thirdweb";
 
 const links = [
   {
-    name: "Connect",
     href: "/connect",
+    name: "Connect",
   },
   {
-    name: "Bridge",
     href: "/pay",
+    name: "Bridge",
   },
   {
-    name: "Engine",
     href: "/engine",
+    name: "Engine",
   },
   {
-    name: "Contracts",
     href: "/contracts",
+    name: "Contracts",
   },
   {
-    name: "Insight",
     href: "/insight",
+    name: "Insight",
   },
   {
-    name: "Nebula",
     href: "/nebula",
+    name: "Nebula",
   },
   {
-    name: "Vault",
     href: "/vault",
+    name: "Vault",
   },
 ];
 
 const toolLinks = [
   {
-    name: "Chain List",
     href: "https://thirdweb.com/chainlist",
+    name: "Chain List",
   },
   {
-    name: "Wei Converter",
     href: "https://thirdweb.com/tools/wei-converter",
+    name: "Wei Converter",
   },
   {
-    name: "Hex Converter",
     href: "https://thirdweb.com/tools/hex-converter",
+    name: "Hex Converter",
   },
   {
-    name: "API Keys",
     href: "/account/api-keys",
+    name: "API Keys",
   },
   {
-    name: "CLI",
     href: "/cli",
+    name: "CLI",
   },
 ];
 
@@ -90,106 +90,106 @@ export const connectLinks: Array<{
   icon: React.FC<{ className?: string }>;
 }> = [
   {
-    name: "Overview",
     href: "/connect",
     icon: TableOfContentsIcon,
+    name: "Overview",
   },
   {
-    name: "TypeScript",
     href: "/typescript/v5",
     icon: TypeScriptIcon,
+    name: "TypeScript",
   },
   {
-    name: "React",
     href: "/react/v5",
     icon: ReactIcon,
+    name: "React",
   },
   {
-    name: "React Native",
     href: "/react-native/v5",
     icon: ReactIcon,
+    name: "React Native",
   },
   {
-    name: ".NET",
     href: "/dotnet",
     icon: DotNetIcon,
+    name: ".NET",
   },
   {
-    name: "Unity",
     href: "/unity",
     icon: UnityIcon,
+    name: "Unity",
   },
   {
-    name: "Unreal Engine",
     href: "/unreal-engine",
     icon: UnrealEngineIcon,
+    name: "Unreal Engine",
   },
 ] as const;
 
 const apisLinks = [
   {
-    name: "Nebula",
     href: "/nebula/api-reference",
+    name: "Nebula",
   },
   {
-    name: "Insight",
     href: "https://insight.thirdweb.com/reference",
+    name: "Insight",
   },
   {
-    name: "Engine Cloud",
     href: "https://engine.thirdweb.com/reference#tag/write",
+    name: "Engine Cloud",
   },
   {
-    name: "Universal Bridge",
     href: "https://bridge.thirdweb.com/reference",
+    name: "Universal Bridge",
   },
 ];
 
 const sdkLinks = [
   {
-    name: "TypeScript",
     href: "/typescript/v5",
     icon: TypeScriptIcon,
+    name: "TypeScript",
   },
   {
-    name: "React",
     href: "/react/v5",
     icon: ReactIcon,
+    name: "React",
   },
   {
-    name: "React Native",
     href: "/react-native/v5",
     icon: ReactIcon,
+    name: "React Native",
   },
   {
-    name: ".NET",
     href: "/dotnet",
     icon: DotNetIcon,
+    name: ".NET",
   },
   {
-    name: "Unity",
     href: "/unity",
     icon: UnityIcon,
+    name: "Unity",
   },
   {
-    name: "Unreal Engine",
     href: "/unreal-engine",
     icon: UnrealEngineIcon,
+    name: "Unreal Engine",
   },
 ];
 
 const supportLinks = [
   {
-    name: "Get thirdweb support",
     href: "/knowledge-base",
+    name: "Get thirdweb support",
   },
   {
-    name: "Account",
     href: "/account",
+    name: "Account",
   },
   {
-    name: "Status",
     href: "https://status.thirdweb.com",
+    name: "Status",
   },
 ];
 
@@ -203,9 +203,9 @@ export function Header() {
         {/* Top row */}
         <div className="flex items-center gap-2">
           <Link
+            aria-label="thirdweb Docs"
             className="flex items-center gap-2"
             href="/"
-            aria-label="thirdweb Docs"
             title="thirdweb Docs"
           >
             <ThirdwebIcon className="size-8" />
@@ -237,9 +237,9 @@ export function Header() {
 
           <div className="hidden xl:block">
             <Link
+              className="text-foreground"
               href="https://github.com/thirdweb-dev"
               target="_blank"
-              className="text-foreground"
             >
               <GithubIcon className="mx-3 size-6" />
             </Link>
@@ -249,16 +249,16 @@ export function Header() {
             <ThemeSwitcher className="border-none bg-transparent" />
             <DocSearch variant="icon" />
             <Button
-              variant="ghost"
               className="p-2"
               onClick={() => router.push("/chat")}
+              variant="ghost"
             >
               <MessageCircleIcon className="size-7" />
             </Button>
             <Button
-              variant="ghost"
               className="p-2"
               onClick={() => setShowBurgerMenu(!showBurgerMenu)}
+              variant="ghost"
             >
               <MenuIcon className="size-7" />
             </Button>
@@ -282,7 +282,7 @@ export function Header() {
                     setShowBurgerMenu(false);
                   }}
                 >
-                  <NavLink name={link.name} href={link.href} />
+                  <NavLink href={link.href} name={link.name} />
                 </li>
               );
             })}
@@ -292,38 +292,38 @@ export function Header() {
         <div className="flex items-center gap-3">
           <div className="px-1">
             <DropdownLinks
+              category="SDKs"
               links={sdkLinks}
               onLinkClick={() => setShowBurgerMenu(false)}
-              category="SDKs"
             />
           </div>
           <div className="px-1">
             <DropdownLinks
+              category="APIs"
               links={apisLinks}
               onLinkClick={() => setShowBurgerMenu(false)}
-              category="APIs"
             />
           </div>
 
           <div className="px-1">
             <DropdownLinks
+              category="Tools"
               links={toolLinks}
               onLinkClick={() => setShowBurgerMenu(false)}
-              category="Tools"
             />
           </div>
 
           <div className="px-1">
             <DropdownLinks
+              category="Support"
               links={supportLinks}
               onLinkClick={() => setShowBurgerMenu(false)}
-              category="Support"
             />
           </div>
 
           <NavLink
-            name="Changelog"
             href="/changelog"
+            name="Changelog"
             onClick={() => {
               setShowBurgerMenu(false);
             }}
@@ -339,9 +339,9 @@ export function Header() {
               <h3 className="font-semibold text-lg">Products</h3>
               {links.map((link) => (
                 <NavLink
+                  href={link.href}
                   key={link.name}
                   name={link.name}
-                  href={link.href}
                   onClick={() => setShowBurgerMenu(false)}
                 />
               ))}
@@ -351,10 +351,10 @@ export function Header() {
               <h3 className="font-semibold text-lg">SDKs</h3>
               {sdkLinks.map((link) => (
                 <NavLink
-                  key={link.name}
-                  name={link.name}
                   href={link.href}
                   icon={link.icon}
+                  key={link.name}
+                  name={link.name}
                   onClick={() => setShowBurgerMenu(false)}
                 />
               ))}
@@ -364,9 +364,9 @@ export function Header() {
               <h3 className="font-semibold text-lg">APIs</h3>
               {apisLinks.map((link) => (
                 <NavLink
+                  href={link.href}
                   key={link.name}
                   name={link.name}
-                  href={link.href}
                   onClick={() => setShowBurgerMenu(false)}
                 />
               ))}
@@ -376,17 +376,17 @@ export function Header() {
               <h3 className="font-semibold text-lg">Support</h3>
               {supportLinks.map((link) => (
                 <NavLink
+                  href={link.href}
                   key={link.name}
                   name={link.name}
-                  href={link.href}
                   onClick={() => setShowBurgerMenu(false)}
                 />
               ))}
             </div>
 
             <NavLink
-              name="Changelog"
               href="/changelog"
+              name="Changelog"
               onClick={() => setShowBurgerMenu(false)}
             />
 
@@ -394,9 +394,9 @@ export function Header() {
               <h3 className="font-semibold text-lg">Tools</h3>
               {toolLinks.map((link) => (
                 <NavLink
+                  href={link.href}
                   key={link.name}
                   name={link.name}
-                  href={link.href}
                   onClick={() => setShowBurgerMenu(false)}
                 />
               ))}
@@ -424,8 +424,8 @@ function DropdownLinks(props: {
         <DropdownMenu>
           <DropdownMenuTrigger asChild>
             <Button
-              variant="ghost"
               className="inline-flex items-center gap-1 p-0 font-medium text-muted-foreground text-sm hover:bg-transparent hover:text-foreground"
+              variant="ghost"
             >
               {props.category}
               <ChevronDownIcon className="size-4 text-muted-foreground opacity-70" />
@@ -451,10 +451,10 @@ function DropdownLinks(props: {
                       <info.icon className="size-5 text-foreground" />
                     )}
                     <Link
+                      className="before:absolute before:inset-0"
+                      href={info.href}
                       prefetch={false}
                       target={info.href.startsWith("http") ? "_blank" : ""}
-                      href={info.href}
-                      className="before:absolute before:inset-0"
                     >
                       {info.name}
                     </Link>
@@ -479,11 +479,11 @@ function DropdownLinks(props: {
               {props.links.map((info) => {
                 return (
                   <NavLink
+                    href={info.href}
+                    icon={info.icon}
                     key={info.name}
                     name={info.name}
-                    href={info.href}
                     onClick={props.onLinkClick}
-                    icon={info.icon}
                   />
                 );
               })}
@@ -504,14 +504,14 @@ function NavLink(props: {
   const pathname = usePathname();
   return (
     <Link
-      href={props.href}
-      onClick={props.onClick}
-      target={props.href.startsWith("http") ? "_blank" : ""}
       className={clsx(
         "font-medium text-base transition-colors hover:text-foreground xl:text-sm",
         pathname === props.href ? "text-foreground" : "text-muted-foreground ",
         props.icon ? "flex flex-row gap-3" : "",
       )}
+      href={props.href}
+      onClick={props.onClick}
+      target={props.href.startsWith("http") ? "_blank" : ""}
     >
       {props.icon ? (
         <>
diff --git a/apps/portal/src/app/account/layout.tsx b/apps/portal/src/app/account/layout.tsx
index f376e279701..d2c0273af10 100644
--- a/apps/portal/src/app/account/layout.tsx
+++ b/apps/portal/src/app/account/layout.tsx
@@ -3,7 +3,7 @@ import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true} noLLM={true}>
+    <DocLayout editPageButton={true} noLLM={true} sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
diff --git a/apps/portal/src/app/account/sidebar.tsx b/apps/portal/src/app/account/sidebar.tsx
index b57f70057aa..08ff2c0f318 100644
--- a/apps/portal/src/app/account/sidebar.tsx
+++ b/apps/portal/src/app/account/sidebar.tsx
@@ -1,75 +1,76 @@
 const accountSlug = "/account";
+
 import type { SideBar } from "@/components/Layouts/DocLayout";
 
 export const sidebar: SideBar = {
-  name: "Teams & Accounts",
   links: [
     {
-      name: "Account",
       links: [
         {
-          name: "Create Account",
           href: `${accountSlug}/create-account`,
+          name: "Create Account",
         },
         {
-          name: "Link Accounts",
           href: `${accountSlug}/link-accounts`,
+          name: "Link Accounts",
         },
       ],
+      name: "Account",
     },
     {
-      name: "Teams",
       links: [
         {
-          name: "Manage Teams",
           href: `${accountSlug}/teams/manage-teams`,
+          name: "Manage Teams",
         },
         {
-          name: "Manage Team Members",
           href: `${accountSlug}/teams/manage-team-members`,
+          name: "Manage Team Members",
         },
         {
-          name: "Manage Billing",
           href: `${accountSlug}/billing/manage-billing`,
+          name: "Manage Billing",
         },
       ],
+      name: "Teams",
     },
     {
-      name: "Projects",
       links: [
         {
-          name: "Overview",
           href: `${accountSlug}/api-keys`,
+          name: "Overview",
         },
         {
-          name: "Create API Key",
           href: `${accountSlug}/api-keys/create`,
+          name: "Create API Key",
         },
         {
-          name: "Use API Key",
           href: `${accountSlug}/api-keys/use`,
+          name: "Use API Key",
         },
         {
-          name: "Edit enabled services",
           href: `${accountSlug}/api-keys/edit-services`,
+          name: "Edit enabled services",
         },
         {
-          name: "Delete API Key",
           href: `${accountSlug}/api-keys/delete`,
+          name: "Delete API Key",
         },
         {
-          name: "Access Restrictions",
           href: `${accountSlug}/api-keys/access`,
+          name: "Access Restrictions",
         },
         {
-          name: "Transfer Projects",
           href: `${accountSlug}/api-keys/transfer-projects`,
+          name: "Transfer Projects",
         },
       ],
+      name: "Projects",
     },
     {
-      name: "FAQs",
       href: `${accountSlug}/faq`,
+      name: "FAQs",
     },
   ],
+  name: "Teams & Accounts",
 };
diff --git a/apps/portal/src/app/api/email-signup/route.ts b/apps/portal/src/app/api/email-signup/route.ts
index fff4f496972..602083c423c 100644
--- a/apps/portal/src/app/api/email-signup/route.ts
+++ b/apps/portal/src/app/api/email-signup/route.ts
@@ -17,16 +17,16 @@ export async function POST(request: NextRequest) {
   const response = await fetch(
     "https://api.beehiiv.com/v2/publications/pub_9f54090a-6d14-406b-adfd-dbb30574f664/subscriptions",
     {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${process.env.BEEHIIV_API_KEY}`,
-      },
-      method: "POST",
       body: JSON.stringify({
         email,
         send_welcome_email,
         utm_source: "thirdweb.com",
       }),
+      headers: {
+        Authorization: `Bearer ${process.env.BEEHIIV_API_KEY}`,
+        "Content-Type": "application/json",
+      },
+      method: "POST",
     },
   );
 
diff --git a/apps/portal/src/app/api/og/route.tsx b/apps/portal/src/app/api/og/route.tsx
index 6f5433f240b..86a71b57785 100644
--- a/apps/portal/src/app/api/og/route.tsx
+++ b/apps/portal/src/app/api/og/route.tsx
@@ -33,61 +33,61 @@ export async function GET(request: Request) {
     // ImageResponse JSX element
     <div
       style={{
+        alignItems: "center",
         background: "black",
-        width: "100%",
-        height: "100%",
         display: "flex",
-        alignItems: "center",
+        height: "100%",
+        width: "100%",
       }}
     >
       <img
-        src={`${BAST_URL}/og/background-1.png`}
         alt=""
-        width={width}
         height={height}
+        src={`${BAST_URL}/og/background-1.png`}
         style={{
-          position: "absolute",
-          top: 0,
-          left: 0,
           bottom: 0,
+          left: 0,
+          position: "absolute",
           right: 0,
+          top: 0,
         }}
+        width={width}
       />
 
       {/* Left */}
       <div
         style={{
           color: "white",
-          width: "50%",
-          padding: "80px 60px",
           display: "flex",
           flexDirection: "column",
+          padding: "80px 60px",
+          width: "50%",
         }}
       >
         <div
           style={{
+            alignItems: "center",
             display: "flex",
             gap: "10px",
-            alignItems: "center",
             marginBottom: "40px",
           }}
         >
           <img
-            src={`${BAST_URL}/icons/thirdweb-logo.svg`}
             alt=""
-            width={300 / 1.7}
             height={50 / 1.7}
+            src={`${BAST_URL}/icons/thirdweb-logo.svg`}
             style={{
               display: "flex",
             }}
+            width={300 / 1.7}
           />
 
           <div
             style={{
-              fontSize: "26px",
+              color: "white",
               fontFamily: "Inter",
+              fontSize: "26px",
               fontWeight: 600,
-              color: "white",
               marginTop: "2px",
             }}
           >
@@ -97,10 +97,10 @@ export async function GET(request: Request) {
 
         <div
           style={{
-            fontSize: "60px",
+            display: "flex",
             fontFamily: "Inter",
+            fontSize: "60px",
             fontWeight: 600,
-            display: "flex",
             marginBottom: "40px",
             wordBreak: title.includes(" ") ? "break-word" : "break-all",
           }}
@@ -116,12 +116,12 @@ export async function GET(request: Request) {
           <div
             style={{
               background: "white",
-              padding: "14px 20px",
-              fontSize: "24px",
+              borderRadius: "10px",
               color: "black",
               fontFamily: "Inter",
+              fontSize: "24px",
               fontWeight: 600,
-              borderRadius: "10px",
+              padding: "14px 20px",
             }}
           >
             Read More
@@ -130,30 +130,30 @@ export async function GET(request: Request) {
       </div>
 
       <img
-        src={iconUrl}
         alt=""
-        width={iconSize}
         height={iconSize}
+        src={iconUrl}
         style={{
           display: "flex",
           position: "absolute",
           right: width / 6.6,
           top: height / 2 - iconSize / 2 + 10,
         }}
+        width={iconSize}
       />
     </div>,
     // ImageResponse options
     {
-      width: width,
-      height: height,
       fonts: [
         {
-          name: "Inter",
           data: await inter600,
+          name: "Inter",
           style: "normal",
           weight: 600,
         },
       ],
+      height: height,
+      width: width,
     },
   );
 }
diff --git a/apps/portal/src/app/api/search/extraction/index.ts b/apps/portal/src/app/api/search/extraction/index.ts
index 8a2f903a7b6..22a8e4d1bb3 100644
--- a/apps/portal/src/app/api/search/extraction/index.ts
+++ b/apps/portal/src/app/api/search/extraction/index.ts
@@ -1,10 +1,10 @@
 import { readFile } from "node:fs/promises";
 import {
+  parse,
   CommentNode as X_CommentNode,
   HTMLElement as X_HTMLElement,
   type Node as X_Node,
   TextNode as X_TextNode,
-  parse,
 } from "node-html-parser";
 import type { PageData, PageSectionData } from "../types";
 import { getFilesRecursive } from "./getFilesRecursive";
@@ -30,10 +30,10 @@ export async function extractContent(
     htmlFiles.map(async (filePath) => {
       const htmlContent = await readFile(filePath, "utf-8");
       const mainEl = parse(htmlContent, {
-        comment: false,
         blockTextElements: {
           pre: true,
         },
+        comment: false,
       }).querySelector("main");
 
       if (!mainEl) {
@@ -103,8 +103,8 @@ function extractPageSearchData(
 
   return {
     href: filePath.replace(nextOutputDir, "").replace(".html", ""),
-    title: pageTitle ? trimExtraSpace(pageTitle) : "",
     sections: getPageSectionsForSearchIndex(main),
+    title: pageTitle ? trimExtraSpace(pageTitle) : "",
   };
 }
 
@@ -139,9 +139,9 @@ function getPageSectionsForSearchIndex(main: X_HTMLElement): PageSectionData[] {
         }
 
         sectionData.push({
-          title: node.text,
-          href: node.parentNode.querySelector("a")?.getAttribute("href") || "",
           content: "",
+          href: node.parentNode.querySelector("a")?.getAttribute("href") || "",
+          title: node.text,
         });
       } else {
         for (const child of node.childNodes) {
diff --git a/apps/portal/src/app/api/search/extraction/llm-extract.ts b/apps/portal/src/app/api/search/extraction/llm-extract.ts
index ed2b7ee424b..b49a820debf 100644
--- a/apps/portal/src/app/api/search/extraction/llm-extract.ts
+++ b/apps/portal/src/app/api/search/extraction/llm-extract.ts
@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import he from "he";
 import { NodeHtmlMarkdown } from "node-html-markdown";
-import { type HTMLElement as X_HTMLElement, parse } from "node-html-parser";
+import { parse, type HTMLElement as X_HTMLElement } from "node-html-parser";
 import type { LinkGroup } from "../../../../components/others/Sidebar";
 import { fetchTypeScriptDoc } from "../../../references/components/TDoc/fetchDocs/fetchTypeScriptDoc";
 import { getSidebarLinkGroups } from "../../../references/components/TDoc/utils/getSidebarLinkgroups";
@@ -93,10 +93,10 @@ export async function extractContentForLLM(
     try {
       const htmlContent = await readFile(htmlFilePath, "utf-8");
       const mainEl = parse(htmlContent, {
-        comment: false,
         blockTextElements: {
           pre: true,
         },
+        comment: false,
       }).querySelector("main");
 
       if (!mainEl) {
@@ -169,12 +169,12 @@ function extractPageLLMContent(
     main.getAttribute("data-noindex") === "true" ||
     main.getAttribute("data-no-llm") === "true"
   ) {
-    return { links: "", full: "" };
+    return { full: "", links: "" };
   }
 
   const htmlToMarkdown = new NodeHtmlMarkdown({
-    keepDataImages: false,
     ignore: ["button"],
+    keepDataImages: false,
     maxConsecutiveNewlines: 2,
   });
 
@@ -242,10 +242,10 @@ function extractPageLLMContent(
   const preTags = main.querySelectorAll("pre");
   for (const preTag of preTags) {
     const codeBlock = parse(preTag.innerHTML.toString(), {
-      comment: false,
       blockTextElements: {
         pre: true,
       },
+      comment: false,
     }).querySelector("code");
 
     if (codeBlock) {
@@ -285,7 +285,7 @@ function extractPageLLMContent(
   fullContent += `${htmlToMarkdown.translate(main.toString())}`;
 
   return {
-    links: linksContent,
     full: fullContent,
+    links: linksContent,
   };
 }
diff --git a/apps/portal/src/app/api/search/indexing/createIndex.ts b/apps/portal/src/app/api/search/indexing/createIndex.ts
index 4cbf6ce3add..2050e6cd832 100644
--- a/apps/portal/src/app/api/search/indexing/createIndex.ts
+++ b/apps/portal/src/app/api/search/indexing/createIndex.ts
@@ -22,22 +22,22 @@ async function createSearchIndexes(): Promise<Indexes> {
   // create indexes
   const pageTitleIndex: PageTitleIndex = new FlexSearch.Document({
     cache: 100,
-    tokenize: "full",
     document: {
       id: "id",
       index: ["title", "id"],
     },
+    tokenize: "full",
   });
 
   const sectionIndex: SectionIndex = new FlexSearch.Document({
     cache: 100,
-    preset: "default",
-    tokenize: "full",
     document: {
       id: "id",
       index: ["title", "content"],
       store: ["title", "content", "pageId", "href", "id"],
     },
+    preset: "default",
+    tokenize: "full",
   });
 
   // add data to indexes
@@ -56,11 +56,11 @@ async function createSearchIndexes(): Promise<Indexes> {
     if (pageData.sections) {
       for (const section of pageData.sections) {
         sectionIndex.add({
-          id: sectionId++,
-          title: section.title || "",
           content: section.content,
           href: section.href || "",
+          id: sectionId++,
           pageId: pageId,
+          title: section.title || "",
         });
       }
     }
@@ -69,8 +69,8 @@ async function createSearchIndexes(): Promise<Indexes> {
   console.debug("SEARCH INDEX CREATED");
 
   return {
-    sectionIndex,
     pageTitleIndex,
+    sectionIndex,
     websiteData,
   };
 }
diff --git a/apps/portal/src/app/api/search/route.ts b/apps/portal/src/app/api/search/route.ts
index 50e8bccdec0..91a2ede45e3 100644
--- a/apps/portal/src/app/api/search/route.ts
+++ b/apps/portal/src/app/api/search/route.ts
@@ -1,5 +1,5 @@
-import { search } from "@/app/api/search/searching/search";
 import { type NextRequest, NextResponse } from "next/server";
+import { search } from "@/app/api/search/searching/search";
 
 export async function GET(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams;
diff --git a/apps/portal/src/app/api/search/searching/search.ts b/apps/portal/src/app/api/search/searching/search.ts
index 5f0973cfb41..dd7b43f509f 100644
--- a/apps/portal/src/app/api/search/searching/search.ts
+++ b/apps/portal/src/app/api/search/searching/search.ts
@@ -95,8 +95,8 @@ export async function search(query: string): Promise<SearchResult> {
     query,
     maxResults - pageTitleResults.length,
     {
-      index: "title",
       enrich: true,
+      index: "title",
     },
   );
 
@@ -108,8 +108,8 @@ export async function search(query: string): Promise<SearchResult> {
   }
 
   const sectionContentMatches = sectionIndex.search<true>(query, 100, {
-    index: "content",
     enrich: true,
+    index: "content",
     suggest: true,
   });
 
diff --git a/apps/portal/src/app/changelog/[slug]/page.tsx b/apps/portal/src/app/changelog/[slug]/page.tsx
index 7dd9d1e02ea..e6eb9be34ef 100644
--- a/apps/portal/src/app/changelog/[slug]/page.tsx
+++ b/apps/portal/src/app/changelog/[slug]/page.tsx
@@ -1,8 +1,8 @@
 /* eslint-disable @next/next/no-img-element */
 
-import { cn } from "@/lib/utils";
 import { notFound } from "next/navigation";
 import ReactHtmlParser from "react-html-parser";
+import { cn } from "@/lib/utils";
 import { fetchChangeLogs, fetchPost } from "../ghost";
 import "./styles.css";
 import { ArrowLeftIcon } from "lucide-react";
@@ -27,8 +27,8 @@ export default async function Page(props: {
     <div className="changelog-page">
       <Button asChild>
         <Link
-          href="/changelog"
           className="-translate-x-1/4 !p-2 !text-muted-foreground hover:!text-foreground mb-4 bg-transparent"
+          href="/changelog"
         >
           <ArrowLeftIcon className="size-6" />
         </Link>
@@ -56,9 +56,9 @@ export default async function Page(props: {
 
           return (
             <Author
+              key={author.id}
               name={author.name}
               profileImage={author.profile_image}
-              key={author.id}
             />
           );
         })}
diff --git a/apps/portal/src/app/changelog/components/Author.tsx b/apps/portal/src/app/changelog/components/Author.tsx
index 6cccfc51f3e..75344e3dc4c 100644
--- a/apps/portal/src/app/changelog/components/Author.tsx
+++ b/apps/portal/src/app/changelog/components/Author.tsx
@@ -5,9 +5,9 @@ export function Author(props: { name: string; profileImage?: string | null }) {
     <div className="flex items-center gap-1.5">
       {props.profileImage && (
         <img
-          src={props.profileImage}
-          className="size-8 rounded-[50%] border"
           alt=""
+          className="size-8 rounded-[50%] border"
+          src={props.profileImage}
         />
       )}
       <span className="font-medium text-muted-foreground text-sm">
diff --git a/apps/portal/src/app/changelog/components/RenderData.tsx b/apps/portal/src/app/changelog/components/RenderData.tsx
index 48b9ac51c57..1f6e76857c6 100644
--- a/apps/portal/src/app/changelog/components/RenderData.tsx
+++ b/apps/portal/src/app/changelog/components/RenderData.tsx
@@ -4,11 +4,11 @@ import { cn } from "../../../lib/utils";
 export function RenderDate(props: { iso: string; className?: string }) {
   return (
     <time
-      dateTime={props.iso}
       className={cn(
         "font-medium text-muted-foreground text-sm",
         props.className,
       )}
+      dateTime={props.iso}
     >
       {formatDistance(new Date(props.iso), new Date())} ago
     </time>
diff --git a/apps/portal/src/app/changelog/ghost.ts b/apps/portal/src/app/changelog/ghost.ts
index 3c1a4b103fd..3e3eded7d33 100644
--- a/apps/portal/src/app/changelog/ghost.ts
+++ b/apps/portal/src/app/changelog/ghost.ts
@@ -5,12 +5,12 @@ const GHOST_THIRDWEB_BLOG_KEY = "49c62b5137df1c17ab6b9e46e3";
 
 export async function fetchChangeLogs() {
   const queryParamsString = Object.entries({
-    key: GHOST_THIRDWEB_BLOG_KEY,
     fields: ["title", "slug", "published_at"].join(","),
     filter: "tag:changelog",
+    include: ["authors", "tags"].join(","),
+    key: GHOST_THIRDWEB_BLOG_KEY,
     limit: "20",
     order: "published_at DESC",
-    include: ["authors", "tags"].join(","),
   })
     .map(([key, value]) => `${key}=${value}`)
     .join("&");
@@ -30,9 +30,9 @@ export async function fetchChangeLogs() {
 
 export async function fetchPost(slug: string) {
   const queryParamsString = Object.entries({
-    key: GHOST_THIRDWEB_BLOG_KEY,
     filter: `slug:${slug}`,
     include: ["authors", "tags"].join(","),
+    key: GHOST_THIRDWEB_BLOG_KEY,
     limit: "1",
   })
     .map(([key, value]) => `${key}=${value}`)
diff --git a/apps/portal/src/app/changelog/page.tsx b/apps/portal/src/app/changelog/page.tsx
index f73113fe053..b16f4c26f48 100644
--- a/apps/portal/src/app/changelog/page.tsx
+++ b/apps/portal/src/app/changelog/page.tsx
@@ -1,9 +1,9 @@
-import { Heading } from "@/components/Document";
 import { createMetadata } from "@doc";
 import GithubSlugger from "github-slugger";
 import { PlusIcon } from "lucide-react";
 import Link from "next/link";
 import ReactHtmlParser from "react-html-parser";
+import { Heading } from "@/components/Document";
 import { Author } from "./components/Author";
 import { ChangelogIndexTOC } from "./components/ChangeLogIndexTOC";
 import { RenderDate } from "./components/RenderData";
@@ -12,13 +12,13 @@ import { transform } from "./utils/transform";
 import "./[slug]/styles.css";
 
 export const metadata = createMetadata({
-  title: "Changelog",
   description:
     "View the latest updates and changes in thirdweb SDKs and services",
   image: {
-    title: "thirdweb Changelog",
     icon: "changelog",
+    title: "thirdweb Changelog",
   },
+  title: "Changelog",
 });
 
 export default async function Page() {
@@ -47,18 +47,18 @@ async function PageContent() {
       <div className="flex flex-col gap-10 xl:border-l-2 xl:pl-12">
         {posts.map((post) => {
           return (
-            <div key={post.id} className="relative pb-10">
+            <div className="relative pb-10" key={post.id}>
               <div className="mb-2 flex items-center gap-5">
                 {post.published_at && (
-                  <RenderDate iso={post.published_at} className="text-base" />
+                  <RenderDate className="text-base" iso={post.published_at} />
                 )}
                 <div className="flex gap-5">
                   {post.authors?.map((author) => {
                     return (
                       <Author
+                        key={author.id}
                         name={author.name || ""}
                         profileImage={author.profile_image}
-                        key={author.id}
                       />
                     );
                   })}
@@ -71,15 +71,15 @@ async function PageContent() {
 
               <div>
                 <Heading
-                  level={2}
+                  anchorClassName="[&>a]:hidden m-0 border-b pb-5 mb-5"
+                  anchorId={slugger.slug(post.title || "")}
                   // eslint-disable-next-line tailwindcss/no-custom-classname
                   className="changelog-title"
-                  id={slugger.slug(post.title || "")}
-                  anchorClassName="[&>a]:hidden m-0 border-b pb-5 mb-5"
+                  level={2}
                 >
                   <Link
-                    href={`/changelog/${post.slug}`}
                     className="!text-foreground font-bold text-3xl tracking-tighter hover:underline md:text-4xl xl:text-5xl"
+                    href={`/changelog/${post.slug}`}
                   >
                     {post.title}
                   </Link>
diff --git a/apps/portal/src/app/changelog/utils/transform.tsx b/apps/portal/src/app/changelog/utils/transform.tsx
index c49d403b7a8..694b4ff381a 100644
--- a/apps/portal/src/app/changelog/utils/transform.tsx
+++ b/apps/portal/src/app/changelog/utils/transform.tsx
@@ -1,4 +1,9 @@
 /* eslint-disable @next/next/no-img-element */
+
+import { Fragment } from "react";
+import type { Transform } from "react-html-parser";
+import { convertNodeToElement } from "react-html-parser";
+import type { BundledLanguage, SpecialLanguage } from "shiki";
 import {
   CodeBlock,
   DocLink,
@@ -8,10 +13,6 @@ import {
   Separator,
   UnorderedList,
 } from "@/components/Document";
-import { Fragment } from "react";
-import { convertNodeToElement } from "react-html-parser";
-import type { Transform } from "react-html-parser";
-import type { BundledLanguage, SpecialLanguage } from "shiki";
 
 const headingTags = new Set(["h1", "h2", "h3", "h4", "h5", "h6"]);
 
@@ -49,7 +50,7 @@ export const transform: Transform = (node, index: number) => {
     const level = Number.parseInt(node.name[1] || "");
 
     return (
-      <Heading level={level} id="#" anchorClassName="mt-10">
+      <Heading anchorClassName="mt-10" anchorId="#" level={level}>
         {getChildren()}
       </Heading>
     );
@@ -108,7 +109,7 @@ export const transform: Transform = (node, index: number) => {
       // }
     }
     if (code) {
-      return <CodeBlock lang={lang} code={code} />;
+      return <CodeBlock code={code} lang={lang} />;
     }
   }
 
diff --git a/apps/portal/src/app/chat/page.tsx b/apps/portal/src/app/chat/page.tsx
index 1570158f924..8c9c068c065 100644
--- a/apps/portal/src/app/chat/page.tsx
+++ b/apps/portal/src/app/chat/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { Chat } from "@/components/AI/chat";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { Chat } from "@/components/AI/chat";
 
 const queryClient = new QueryClient();
 
diff --git a/apps/portal/src/app/cli/layout.tsx b/apps/portal/src/app/cli/layout.tsx
index f376e279701..d2c0273af10 100644
--- a/apps/portal/src/app/cli/layout.tsx
+++ b/apps/portal/src/app/cli/layout.tsx
@@ -3,7 +3,7 @@ import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true} noLLM={true}>
+    <DocLayout editPageButton={true} noLLM={true} sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
diff --git a/apps/portal/src/app/cli/sidebar.tsx b/apps/portal/src/app/cli/sidebar.tsx
index bf56c40e211..e3592f199fb 100644
--- a/apps/portal/src/app/cli/sidebar.tsx
+++ b/apps/portal/src/app/cli/sidebar.tsx
@@ -1,47 +1,47 @@
 import type { SideBar } from "@/components/Layouts/DocLayout";
 
 export const sidebar: SideBar = {
-  name: "thirdweb CLI",
   links: [
     {
-      name: "Overview",
       href: "/cli",
+      name: "Overview",
     },
     {
-      name: "Create",
       href: "/cli/create",
+      name: "Create",
     },
     {
-      name: "Install",
       href: "/cli/install",
+      name: "Install",
     },
     {
-      name: "Build",
       href: "/cli/build",
+      name: "Build",
     },
     {
-      name: "Generate",
       href: "/cli/generate",
+      name: "Generate",
     },
     {
-      name: "Login",
       href: "/cli/login",
+      name: "Login",
     },
     {
-      name: "Logout",
       href: "/cli/logout",
+      name: "Logout",
     },
     {
-      name: "Upload",
       href: "/cli/upload",
+      name: "Upload",
     },
     {
-      name: "Deploy",
       href: "/contracts/deploy/overview",
+      name: "Deploy",
     },
     {
-      name: "Publish",
       href: "/contracts/publish/overview",
+      name: "Publish",
     },
   ],
+  name: "thirdweb CLI",
 };
diff --git a/apps/portal/src/app/connect/layout.tsx b/apps/portal/src/app/connect/layout.tsx
index 23d6a60404d..d2dbfe0619f 100644
--- a/apps/portal/src/app/connect/layout.tsx
+++ b/apps/portal/src/app/connect/layout.tsx
@@ -5,8 +5,8 @@ import { sidebar } from "./sidebar";
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Connect</p>
diff --git a/apps/portal/src/app/connect/sidebar.tsx b/apps/portal/src/app/connect/sidebar.tsx
index d3f47ab7f03..085bcc12ec8 100644
--- a/apps/portal/src/app/connect/sidebar.tsx
+++ b/apps/portal/src/app/connect/sidebar.tsx
@@ -1,6 +1,6 @@
+import { ExternalLinkIcon } from "lucide-react";
 import type { SideBar } from "@/components/Layouts/DocLayout";
 import { DotNetIcon, ReactIcon, TypeScriptIcon, UnityIcon } from "@/icons";
-import { ExternalLinkIcon } from "lucide-react";
 import { UnrealEngineIcon } from "../../icons/sdks/UnrealEngineIcon";
 
 // TODO: move the following two slugs to walletSlug with updated docs
@@ -11,273 +11,271 @@ const aAslug = "/connect/account-abstraction";
 const authSlug = "/connect/auth";
 
 export const sidebar: SideBar = {
-  name: "Connect",
   links: [
     { separator: true },
     {
-      name: "Introduction",
       href: "/connect",
+      name: "Introduction",
     },
     {
-      name: "Why thirdweb?",
       href: "/connect/why-thirdweb",
+      name: "Why thirdweb?",
     },
     {
-      name: "Playground",
       href: "https://playground.thirdweb.com/",
       icon: <ExternalLinkIcon />,
+      name: "Playground",
     },
     {
-      name: "Templates",
       href: "https://thirdweb.com/templates",
       icon: <ExternalLinkIcon />,
+      name: "Templates",
     },
     { separator: true },
     // Connect\
     {
-      name: "Onboard Users",
       expanded: true,
       isCollapsible: false,
       links: [
         {
-          name: "Overview",
           href: `${walletSlug}/overview`,
+          name: "Overview",
         },
         {
-          name: "Security",
           href: `${walletSlug}/security`,
+          name: "Security",
         },
         {
-          name: "Get Started",
           href: `${walletSlug}/get-started`,
+          name: "Get Started",
         },
         {
-          name: "External Wallets",
           href: `${walletSlug}/sign-in-methods/external-wallets`,
+          name: "External Wallets",
         },
         {
-          name: "In-App Wallets",
           links: [
             {
-              name: "Sign-In Methods",
               href: `${walletSlug}/sign-in-methods/configure`,
+              name: "Sign-In Methods",
             },
             {
-              name: "Fetch Users",
               href: `${walletSlug}/get-users`,
+              name: "Fetch Users",
             },
             {
-              name: "Pregenerate Wallets",
               href: `${walletSlug}/pregenerate-wallets`,
+              name: "Pregenerate Wallets",
             },
             {
-              name: "Guest Mode",
               href: `${walletSlug}/sign-in-methods/guest`,
+              name: "Guest Mode",
             },
             {
-              name: "FAQ",
               href: `${walletSlug}/in-app-wallet/faq`,
+              name: "FAQ",
             },
             {
-              name: "Custom Authentication",
               links: [
                 {
-                  name: "Overview",
                   href: `${inAppSlug}/custom-auth/overview`,
+                  name: "Overview",
                 },
                 {
-                  name: "Configuration",
                   href: `${inAppSlug}/custom-auth/configuration`,
+                  name: "Configuration",
                 },
                 {
-                  name: "Integration guides",
                   links: [
                     {
-                      name: "Custom auth server (OIDC Auth)",
                       href: `${inAppSlug}/custom-auth/custom-jwt-auth-server`,
+                      name: "Custom auth server (OIDC Auth)",
                     },
                     {
-                      name: "Custom auth server (Generic Auth)",
                       href: `${inAppSlug}/custom-auth/custom-auth-server`,
+                      name: "Custom auth server (Generic Auth)",
                     },
                     {
-                      name: "Firebase Auth",
                       href: `${inAppSlug}/custom-auth/firebase-auth`,
+                      name: "Firebase Auth",
                     },
                   ],
+                  name: "Integration guides",
                 },
               ],
+              name: "Custom Authentication",
             },
           ],
+          name: "In-App Wallets",
         },
         {
-          name: "Ecosystem Wallets",
           links: [
             {
-              name: "Set-up",
               href: `${walletSlug}/ecosystem/set-up`,
+              name: "Set-up",
             },
             {
-              name: "Ecosystem Portal",
               href: `${walletSlug}/ecosystem/portal`,
+              name: "Ecosystem Portal",
             },
             {
-              name: "Managing Ecosystem Permissions",
               href: `${walletSlug}/ecosystem/permissions`,
+              name: "Managing Ecosystem Permissions",
             },
             {
-              name: "Integrating with Partners",
               href: `${walletSlug}/ecosystem/integrating-partners`,
+              name: "Integrating with Partners",
             },
             {
-              name: "Register with WalletConnect",
               href: `${walletSlug}/ecosystem/register-walletconnect`,
+              name: "Register with WalletConnect",
             },
             {
-              name: "FAQ",
               href: `${walletSlug}/ecosystem/faq`,
+              name: "FAQ",
             },
           ],
+          name: "Ecosystem Wallets",
         },
         //Account abstraction
         {
-          name: "Account Abstraction",
           links: [
             {
-              name: "Overview",
               href: `${aAslug}/overview`,
+              name: "Overview",
             },
             {
-              name: "How it Works",
               href: `${aAslug}/how-it-works`,
+              name: "How it Works",
             },
             {
-              name: "Get Started",
               links: [
                 {
-                  name: "TypeScript",
                   href: "/typescript/v5/account-abstraction/get-started",
                   icon: <TypeScriptIcon />,
+                  name: "TypeScript",
                 },
                 {
-                  name: "React",
                   href: "/react/v5/account-abstraction/get-started",
                   icon: <ReactIcon />,
+                  name: "React",
                 },
                 {
-                  name: "React Native",
                   // TODO - add react-native dedicated page
                   href: "/react/v5/account-abstraction/get-started",
                   icon: <ReactIcon />,
+                  name: "React Native",
                 },
                 {
-                  name: "Dotnet",
                   href: "/dotnet/wallets/providers/account-abstraction",
                   icon: <DotNetIcon />,
+                  name: "Dotnet",
                 },
                 {
-                  name: "Unity",
                   href: "/unity/wallets/providers/account-abstraction",
                   icon: <UnityIcon />,
+                  name: "Unity",
                 },
               ],
+              name: "Get Started",
             },
             {
-              name: "ERC-20 Paymaster",
               href: `${aAslug}/erc-20-paymaster`,
+              name: "ERC-20 Paymaster",
             },
             {
-              name: "Account Factories",
               href: `${aAslug}/factories`,
+              name: "Account Factories",
             },
             {
-              name: "Bundler & Paymaster",
               href: `${aAslug}/infrastructure`,
+              name: "Bundler & Paymaster",
             },
             {
-              name: "Sponsorship rules",
               href: `${aAslug}/sponsorship-rules`,
+              name: "Sponsorship rules",
             },
             {
-              name: "API Reference",
               href: `${aAslug}/api`,
+              name: "API Reference",
             },
             {
-              name: "FAQs",
               href: `${aAslug}/faq`,
+              name: "FAQs",
             },
           ],
+          name: "Account Abstraction",
         },
         {
-          name: "Web3 Onboard",
           links: [
             {
-              name: "Overview",
               href: `${walletSlug}/web3-onboard/overview`,
+              name: "Overview",
             },
             {
-              name: "Migration Guide",
               href: `${walletSlug}/web3-onboard/migration-guide`,
+              name: "Migration Guide",
             },
           ],
+          name: "Web3 Onboard",
         },
         {
-          name: "Migrate to thirdweb",
           href: `${walletSlug}/migrate-to-thirdweb`,
+          name: "Migrate to thirdweb",
         },
         {
-          name: "FAQ",
           href: `${walletSlug}/faq`,
+          name: "FAQ",
         },
       ],
+      name: "Onboard Users",
     },
     { separator: true },
     // User identity
     {
-      name: "User Identity",
       isCollapsible: false,
       links: [
         // Auth
         // TODO move to TS reference
         {
-          name: "Sign In with Ethereum",
           links: [
             {
-              name: "Get Started",
               href: `${authSlug}`,
+              name: "Get Started",
             },
             {
-              name: "Frameworks",
-              isCollapsible: true,
               expanded: false,
+              isCollapsible: true,
               links: [
                 {
-                  name: "Next.js",
                   href: `${authSlug}/frameworks/next`,
+                  name: "Next.js",
                 },
                 {
-                  name: "React + Express",
                   href: `${authSlug}/frameworks/react-express`,
+                  name: "React + Express",
                 },
               ],
+              name: "Frameworks",
             },
             {
-              name: "Deploying to Production",
               href: `${authSlug}/deploying-to-production`,
+              name: "Deploying to Production",
             },
           ],
+          name: "Sign In with Ethereum",
         },
         {
-          name: "Get User Profiles",
           href: `${walletSlug}/user-management/get-user-profiles`,
+          name: "Get User Profiles",
         },
         {
-          name: "Link Multiple Identities",
           href: `${walletSlug}/user-management/link-multiple-identity`,
+          name: "Link Multiple Identities",
         },
         {
-          name: "Export Private Keys",
           href: `${walletSlug}/user-management/export-private-key`,
+          name: "Export Private Keys",
         },
         // TODO:
         // {
@@ -285,45 +283,47 @@ export const sidebar: SideBar = {
         //   href: `${walletSlug}/user-management/deleting-user-details`,
         // },
       ],
+      name: "User Identity",
     },
     { separator: true },
     // Blockchain API
     // TODO Overview page?
     {
-      name: "API References",
       isCollapsible: false,
       links: [
         {
-          name: "TypeScript",
           href: "/typescript/v5",
           icon: <TypeScriptIcon />,
+          name: "TypeScript",
         },
         {
-          name: "React",
           href: "/react/v5",
           icon: <ReactIcon />,
+          name: "React",
         },
         {
-          name: "React Native",
           href: "/react-native/v5",
           icon: <ReactIcon />,
+          name: "React Native",
         },
         {
-          name: "Dotnet",
           href: "/dotnet",
           icon: <DotNetIcon />,
+          name: "Dotnet",
         },
         {
-          name: "Unity",
           href: "/unity",
           icon: <UnityIcon />,
+          name: "Unity",
         },
         {
-          name: "Unreal Engine",
           href: "/unreal-engine",
           icon: <UnrealEngineIcon />,
+          name: "Unreal Engine",
         },
       ],
+      name: "API References",
     },
   ],
+  name: "Connect",
 };
diff --git a/apps/portal/src/app/contracts/layout.tsx b/apps/portal/src/app/contracts/layout.tsx
index fe7ef3298e3..d612d6d3dde 100644
--- a/apps/portal/src/app/contracts/layout.tsx
+++ b/apps/portal/src/app/contracts/layout.tsx
@@ -4,18 +4,18 @@ import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true}>
+    <DocLayout editPageButton={true} sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
 }
 
 export const metadata = createMetadata({
-  title: "thirdweb Contracts",
   description:
     "Easily create, deploy, and manage smart contracts on any EVM compatible blockchain",
   image: {
-    title: "thirdweb contracts",
     icon: "contract",
+    title: "thirdweb contracts",
   },
+  title: "thirdweb Contracts",
 });
diff --git a/apps/portal/src/app/contracts/sidebar.tsx b/apps/portal/src/app/contracts/sidebar.tsx
index b78b37c55bb..813784c7140 100644
--- a/apps/portal/src/app/contracts/sidebar.tsx
+++ b/apps/portal/src/app/contracts/sidebar.tsx
@@ -16,832 +16,832 @@ const extensionsSlug = "/contracts/build/extensions";
 const baseContractsSlug = "/contracts/build/base-contracts";
 
 export const sidebar: SideBar = {
-  name: "Contracts",
   links: [
     {
-      name: "Overview",
       href: "/contracts",
+      name: "Overview",
     },
     { separator: true },
     {
-      name: "Deployment Tools",
       isCollapsible: false,
       links: [
         {
-          name: "Overview",
           href: `${deploySlug}/overview`,
+          name: "Overview",
         },
         {
-          name: "Deploy Contract",
           href: `${deploySlug}/deploy-contract`,
+          name: "Deploy Contract",
         },
         {
-          name: "Publish Contract",
           href: `${publishSlug}/publish-contract`,
+          name: "Publish Contract",
         },
         {
-          name: "CLI Reference",
           href: `${deploySlug}/reference`,
+          name: "CLI Reference",
         },
         {
-          name: "Publish Options",
           href: `${publishSlug}/publish-options`,
+          name: "Publish Options",
         },
       ],
+      name: "Deployment Tools",
     },
     // explore
     {
-      name: "Explore (Contract Library)",
       isCollapsible: false,
       links: [
         {
-          name: "Overview",
           href: "/contracts/explore/overview",
+          name: "Overview",
         },
         {
-          name: "Pre-built Modular",
           links: [
             {
-              name: "ERC-20",
               links: [
                 {
-                  name: "Token",
                   href: `${prebuiltModular}/token`,
+                  name: "Token",
                 },
                 {
-                  name: "Token Drop",
                   href: `${prebuiltModular}/token-drop`,
+                  name: "Token Drop",
                 },
               ],
+              name: "ERC-20",
             },
             {
-              name: "ERC-721",
               links: [
                 {
-                  name: "NFT Collection",
                   href: `${prebuiltModular}/nft-collection`,
+                  name: "NFT Collection",
                 },
                 {
-                  name: "NFT Drop",
                   href: `${prebuiltModular}/nft-drop`,
+                  name: "NFT Drop",
                 },
                 {
-                  name: "Open Edition",
                   href: `${prebuiltModular}/open-edition`,
+                  name: "Open Edition",
                 },
               ],
+              name: "ERC-721",
             },
             {
-              name: "ERC-1155",
               links: [
                 {
-                  name: "Edition",
                   href: `${prebuiltModular}/edition`,
+                  name: "Edition",
                 },
                 {
-                  name: "Edition Drop",
                   href: `${prebuiltModular}/edition-drop`,
+                  name: "Edition Drop",
                 },
               ],
+              name: "ERC-1155",
             },
           ],
+          name: "Pre-built Modular",
         },
         {
-          name: "Pre-built Standard",
           links: [
             {
-              name: "ERC-20",
               links: [
                 {
-                  name: "Token",
                   href: `${prebuiltSlug}/token`,
+                  name: "Token",
                 },
                 {
-                  name: "Token Drop",
                   href: `${prebuiltSlug}/token-drop`,
+                  name: "Token Drop",
                 },
                 {
-                  name: "Stake ERC-20",
                   href: `${prebuiltSlug}/stake-erc20`,
+                  name: "Stake ERC-20",
                 },
                 {
-                  name: "Airdrop ERC-20",
                   href: `${prebuiltSlug}/airdrop-erc20`,
+                  name: "Airdrop ERC-20",
                 },
                 {
-                  name: "Airdrop ERC-20 (Claimable)",
                   href: `${prebuiltSlug}/airdrop-erc20-claimable`,
+                  name: "Airdrop ERC-20 (Claimable)",
                 },
               ],
+              name: "ERC-20",
             },
             {
-              name: "ERC-721",
               links: [
                 {
-                  name: "NFT Collection",
                   href: `${prebuiltSlug}/nft-collection`,
+                  name: "NFT Collection",
                 },
                 {
-                  name: "NFT Drop",
                   href: `${prebuiltSlug}/nft-drop`,
+                  name: "NFT Drop",
                 },
                 {
-                  name: "Loyalty Card",
                   href: `${prebuiltSlug}/loyalty-card`,
+                  name: "Loyalty Card",
                 },
                 {
-                  name: "Open Edition",
                   href: `${prebuiltSlug}/open-edition`,
+                  name: "Open Edition",
                 },
                 {
-                  name: "Stake ERC-721",
                   href: `${prebuiltSlug}/stake-erc721`,
+                  name: "Stake ERC-721",
                 },
                 {
-                  name: "Airdrop ERC-721",
                   href: `${prebuiltSlug}/airdrop-erc721`,
+                  name: "Airdrop ERC-721",
                 },
                 {
-                  name: "Airdrop ERC-721 (Claimable)",
                   href: `${prebuiltSlug}/airdrop-erc721-claimable`,
+                  name: "Airdrop ERC-721 (Claimable)",
                 },
               ],
+              name: "ERC-721",
             },
             {
-              name: "ERC-1155",
               links: [
                 {
-                  name: "Edition",
                   href: `${prebuiltSlug}/edition`,
+                  name: "Edition",
                 },
                 {
-                  name: "Edition Drop",
                   href: `${prebuiltSlug}/edition-drop`,
+                  name: "Edition Drop",
                 },
                 {
-                  name: "Stake ERC-1155",
                   href: `${prebuiltSlug}/stake-erc1155`,
+                  name: "Stake ERC-1155",
                 },
                 {
-                  name: "Airdrop ERC-1155",
                   href: `${prebuiltSlug}/airdrop-erc1155`,
+                  name: "Airdrop ERC-1155",
                 },
                 {
-                  name: "Airdrop ERC-1155 (Claimable)",
                   href: `${prebuiltSlug}/airdrop-erc1155-claimable`,
+                  name: "Airdrop ERC-1155 (Claimable)",
                 },
               ],
+              name: "ERC-1155",
             },
             {
-              name: "ERC-4337",
               links: [
                 {
-                  name: "Account Factory",
                   href: `${prebuiltSlug}/account-factory`,
+                  name: "Account Factory",
                 },
                 {
-                  name: "Managed Account Factory",
                   href: `${prebuiltSlug}/managed-account-factory`,
+                  name: "Managed Account Factory",
                 },
               ],
+              name: "ERC-4337",
             },
             {
-              name: "MISC.",
               links: [
                 {
-                  name: "Marketplace",
                   href: `${prebuiltSlug}/marketplace`,
+                  name: "Marketplace",
                 },
                 {
-                  name: "Multiwrap",
                   href: `${prebuiltSlug}/multiwrap`,
+                  name: "Multiwrap",
                 },
                 {
-                  name: "Pack",
                   href: `${prebuiltSlug}/pack`,
+                  name: "Pack",
                 },
                 {
-                  name: "Split",
                   href: `${prebuiltSlug}/split`,
+                  name: "Split",
                 },
                 {
-                  name: "Vote",
                   href: `${prebuiltSlug}/vote`,
+                  name: "Vote",
                 },
               ],
+              name: "MISC.",
             },
           ],
+          name: "Pre-built Standard",
         },
       ],
+      name: "Explore (Contract Library)",
     },
 
     { separator: true },
     // modular contracts
     {
-      name: "Modular Contract Framework",
       isCollapsible: false,
       links: [
         {
-          name: "Overview",
           href: `${modularContractsSlug}/overview`,
+          name: "Overview",
         },
         {
-          name: "How it works",
           href: `${modularContractsSlug}/how-it-works`,
+          name: "How it works",
         },
         {
-          name: "Get Started",
           href: `${modularContractsSlug}/get-started`,
           links: [
             {
-              name: "Create a Core Contract",
               href: `${modularContractsSlug}/get-started/create-core-contract`,
+              name: "Create a Core Contract",
             },
             {
-              name: "Create a Module Contract",
               href: `${modularContractsSlug}/get-started/create-module-contract`,
+              name: "Create a Module Contract",
             },
             {
-              name: "Deploy a Modular Contract",
               href: `${modularContractsSlug}/get-started/deploy-modular-contract`,
+              name: "Deploy a Modular Contract",
             },
           ],
+          name: "Get Started",
         },
         {
-          name: "Tutorials",
           links: [
             {
-              name: "Deploy ERC-20 Core",
               href: `${modularContractsSlug}/tutorials/deploy-erc20-core`,
+              name: "Deploy ERC-20 Core",
             },
           ],
+          name: "Tutorials",
         },
         // core contracts
         {
-          name: "Core Contracts",
           links: [
             {
-              name: "ERC-20",
               href: `${coreContractsSlug}/erc-20`,
+              name: "ERC-20",
             },
             {
-              name: "ERC-721",
               href: `${coreContractsSlug}/erc-721`,
+              name: "ERC-721",
             },
             {
-              name: "ERC-1155",
               href: `${coreContractsSlug}/erc-1155`,
+              name: "ERC-1155",
             },
           ],
+          name: "Core Contracts",
         },
         // modules
         {
-          name: "Module Contracts",
           links: [
             {
-              name: "ERC-20",
               links: [
                 {
-                  name: "Minting",
                   links: [
                     {
-                      name: "ClaimableERC20",
                       href: `${modulesContractsSlug}/erc-20/minting/claimableERC20`,
+                      name: "ClaimableERC20",
                     },
                     {
-                      name: "MintableERC20",
                       href: `${modulesContractsSlug}/erc-20/minting/mintableERC20`,
+                      name: "MintableERC20",
                     },
                   ],
+                  name: "Minting",
                 },
                 {
-                  name: "Miscellaneous",
                   links: [
                     {
-                      name: "TransferableERC20",
                       href: `${modulesContractsSlug}/erc-20/misc/transferableERC20`,
+                      name: "TransferableERC20",
                     },
                     {
-                      name: "CreatorTokenERC20",
                       href: `${modulesContractsSlug}/erc-20/misc/creatorTokenERC20`,
+                      name: "CreatorTokenERC20",
                     },
                   ],
+                  name: "Miscellaneous",
                 },
               ],
+              name: "ERC-20",
             },
             {
-              name: "ERC-721",
               links: [
                 {
-                  name: "Metadata",
                   links: [
                     {
-                      name: "BatchMetadataERC721",
                       href: `${modulesContractsSlug}/erc-721/metadata/batchMetadataERC721`,
+                      name: "BatchMetadataERC721",
                     },
                     {
-                      name: "OpenEditionMetadataERC721",
                       href: `${modulesContractsSlug}/erc-721/metadata/openEditionMetadataERC721`,
+                      name: "OpenEditionMetadataERC721",
                     },
                   ],
+                  name: "Metadata",
                 },
                 {
-                  name: "Minting",
                   links: [
                     {
-                      name: "ClaimableERC721",
                       href: `${modulesContractsSlug}/erc-721/minting/claimableERC721`,
+                      name: "ClaimableERC721",
                     },
                     {
-                      name: "MintableERC721",
                       href: `${modulesContractsSlug}/erc-721/minting/mintableERC721`,
+                      name: "MintableERC721",
                     },
                   ],
+                  name: "Minting",
                 },
                 {
-                  name: "Miscellaneous",
                   links: [
                     {
-                      name: "RoyaltyERC721",
                       href: `${modulesContractsSlug}/erc-721/misc/royaltyERC721`,
+                      name: "RoyaltyERC721",
                     },
                     {
-                      name: "TransferableERC721",
                       href: `${modulesContractsSlug}/erc-721/misc/transferableERC721`,
+                      name: "TransferableERC721",
                     },
                   ],
+                  name: "Miscellaneous",
                 },
               ],
+              name: "ERC-721",
             },
             {
-              name: "ERC-1155",
               links: [
                 {
-                  name: "Metadata",
                   links: [
                     {
-                      name: "BatchMetadataERC1155",
                       href: `${modulesContractsSlug}/erc-1155/metadata/batchMetadataERC1155`,
+                      name: "BatchMetadataERC1155",
                     },
                     {
-                      name: "OpenEditionMetadataERC1155",
                       href: `${modulesContractsSlug}/erc-1155/metadata/openEditionMetadataERC1155`,
+                      name: "OpenEditionMetadataERC1155",
                     },
                   ],
+                  name: "Metadata",
                 },
                 {
-                  name: "Minting",
                   links: [
                     {
-                      name: "ClaimableERC1155",
                       href: `${modulesContractsSlug}/erc-1155/minting/claimableERC1155`,
+                      name: "ClaimableERC1155",
                     },
                     {
-                      name: "MintableERC1155",
                       href: `${modulesContractsSlug}/erc-1155/minting/mintableERC1155`,
+                      name: "MintableERC1155",
                     },
                   ],
+                  name: "Minting",
                 },
                 {
-                  name: "Miscellaneous",
                   links: [
                     {
-                      name: "RoyaltyERC1155",
                       href: `${modulesContractsSlug}/erc-1155/misc/royaltyERC1155`,
+                      name: "RoyaltyERC1155",
                     },
                     {
-                      name: "TransferableERC1155",
                       href: `${modulesContractsSlug}/erc-1155/misc/transferableERC1155`,
+                      name: "TransferableERC1155",
                     },
                     {
-                      name: "SequentialTokenIdERC1155",
                       href: `${modulesContractsSlug}/erc-1155/misc/sequentialTokenIdERC1155`,
+                      name: "SequentialTokenIdERC1155",
                     },
                   ],
+                  name: "Miscellaneous",
                 },
               ],
+              name: "ERC-1155",
             },
             {
-              name: "Cross-Chain",
               links: [
                 {
-                  name: "Agglayer",
                   href: `${modulesContractsSlug}/cross-chain/agglayer`,
+                  name: "Agglayer",
                 },
               ],
+              name: "Cross-Chain",
             },
           ],
+          name: "Module Contracts",
         },
       ],
+      name: "Modular Contract Framework",
     },
 
     { separator: true },
     // build
     {
-      name: "Build",
       icon: <ContractModularContractIcon />,
       isCollapsible: false,
       links: [
         {
-          name: "Overview",
           href: `${buildSlug}/overview`,
+          name: "Overview",
         },
         {
-          name: "Get Started",
           href: `${buildSlug}/get-started`,
+          name: "Get Started",
         },
         // modular contracts
         {
-          name: "Modular Contracts",
           href: `${buildSlug}/modular-contracts`,
+          name: "Modular Contracts",
         },
         // base contracts
         {
-          name: "Base Contracts",
           href: `${baseContractsSlug}`,
           links: [
             {
-              name: "ERC-20",
               links: [
                 {
-                  name: "Base",
                   href: `${baseContractsSlug}/erc-20/base`,
+                  name: "Base",
                 },
                 {
-                  name: "Drop",
                   href: `${baseContractsSlug}/erc-20/drop`,
+                  name: "Drop",
                 },
                 {
-                  name: "Drop Vote",
                   href: `${baseContractsSlug}/erc-20/drop-vote`,
+                  name: "Drop Vote",
                 },
                 {
-                  name: "Signature Mint",
                   href: `${baseContractsSlug}/erc-20/signature-mint`,
+                  name: "Signature Mint",
                 },
                 {
-                  name: "Signature Mint Vote",
                   href: `${baseContractsSlug}/erc-20/signature-mint-vote`,
+                  name: "Signature Mint Vote",
                 },
                 {
-                  name: "Vote",
                   href: `${baseContractsSlug}/erc-20/vote`,
+                  name: "Vote",
                 },
               ],
+              name: "ERC-20",
             },
             {
-              name: "ERC-721",
               links: [
                 {
-                  name: "Base",
                   href: `${baseContractsSlug}/erc-721/base`,
+                  name: "Base",
                 },
                 {
-                  name: "Delayed Reveal",
                   href: `${baseContractsSlug}/erc-721/delayed-reveal`,
+                  name: "Delayed Reveal",
                 },
                 {
-                  name: "Drop",
                   href: `${baseContractsSlug}/erc-721/drop`,
+                  name: "Drop",
                 },
                 {
-                  name: "Lazy Mint",
                   href: `${baseContractsSlug}/erc-721/lazy-mint`,
+                  name: "Lazy Mint",
                 },
                 {
-                  name: "Signature Mint",
                   href: `${baseContractsSlug}/erc-721/signature-mint`,
+                  name: "Signature Mint",
                 },
               ],
+              name: "ERC-721",
             },
             {
-              name: "ERC-1155",
               links: [
                 {
-                  name: "Base",
                   href: `${baseContractsSlug}/erc-1155/base`,
+                  name: "Base",
                 },
                 {
-                  name: "Delayed Reveal",
                   href: `${baseContractsSlug}/erc-1155/delayed-reveal`,
+                  name: "Delayed Reveal",
                 },
                 {
-                  name: "Drop",
                   href: `${baseContractsSlug}/erc-1155/drop`,
+                  name: "Drop",
                 },
                 {
-                  name: "Lazy Mint",
                   href: `${baseContractsSlug}/erc-1155/lazy-mint`,
+                  name: "Lazy Mint",
                 },
                 {
-                  name: "Signature Mint",
                   href: `${baseContractsSlug}/erc-1155/signature-mint`,
+                  name: "Signature Mint",
                 },
               ],
+              name: "ERC-1155",
             },
             {
-              name: "ERC-4337",
               href: `${baseContractsSlug}/erc-4337`,
               links: [
                 {
-                  name: "Account",
                   href: `${baseContractsSlug}/erc-4337/account`,
+                  name: "Account",
                 },
                 {
-                  name: "Account Factory",
                   href: `${baseContractsSlug}/erc-4337/account-factory`,
+                  name: "Account Factory",
                 },
                 {
-                  name: "Managed Account",
                   href: `${baseContractsSlug}/erc-4337/managed-account`,
+                  name: "Managed Account",
                 },
                 {
-                  name: "Managed Account Factory",
                   href: `${baseContractsSlug}/erc-4337/managed-account-factory`,
+                  name: "Managed Account Factory",
                 },
               ],
+              name: "ERC-4337",
             },
           ],
+          name: "Base Contracts",
         },
         // extensions
         {
-          name: "Extensions",
           href: `${extensionsSlug}`,
           links: [
             {
-              name: "General",
               links: [
                 {
-                  name: "BatchMintMetadata",
                   href: `${extensionsSlug}/general/BatchMintMetadata`,
+                  name: "BatchMintMetadata",
                 },
                 {
-                  name: "ContractMetadata",
                   href: `${extensionsSlug}/general/ContractMetadata`,
+                  name: "ContractMetadata",
                 },
                 {
-                  name: "DelayedReveal",
                   href: `${extensionsSlug}/general/DelayedReveal`,
+                  name: "DelayedReveal",
                 },
                 {
-                  name: "Drop",
                   href: `${extensionsSlug}/general/Drop`,
+                  name: "Drop",
                 },
                 {
-                  name: "DropSinglePhase",
                   href: `${extensionsSlug}/general/DropSinglePhase`,
+                  name: "DropSinglePhase",
                 },
                 {
-                  name: "LazyMint",
                   href: `${extensionsSlug}/general/LazyMint`,
+                  name: "LazyMint",
                 },
                 {
-                  name: "Multicall",
                   href: `${extensionsSlug}/general/Multicall`,
+                  name: "Multicall",
                 },
                 {
-                  name: "Ownable",
                   href: `${extensionsSlug}/general/Ownable`,
+                  name: "Ownable",
                 },
                 {
-                  name: "Permissions",
                   href: `${extensionsSlug}/general/Permissions`,
+                  name: "Permissions",
                 },
                 {
-                  name: "PermissionsEnumerable",
                   href: `${extensionsSlug}/general/PermissionsEnumerable`,
+                  name: "PermissionsEnumerable",
                 },
                 {
-                  name: "PlatformFee",
                   href: `${extensionsSlug}/general/PlatformFee`,
+                  name: "PlatformFee",
                 },
                 {
-                  name: "PrimarySale",
                   href: `${extensionsSlug}/general/PrimarySale`,
+                  name: "PrimarySale",
                 },
                 {
-                  name: "Royalty",
                   href: `${extensionsSlug}/general/Royalty`,
+                  name: "Royalty",
                 },
               ],
+              name: "General",
             },
             {
-              name: "ERC-20",
               links: [
                 {
-                  name: "ERC20",
                   href: `${extensionsSlug}/erc-20/ERC20`,
+                  name: "ERC20",
                 },
                 {
-                  name: "ERC20BatchMintable",
                   href: `${extensionsSlug}/erc-20/ERC20BatchMintable`,
+                  name: "ERC20BatchMintable",
                 },
                 {
-                  name: "ERC20Burnable",
                   href: `${extensionsSlug}/erc-20/ERC20Burnable`,
+                  name: "ERC20Burnable",
                 },
                 {
-                  name: "ERC20ClaimConditions",
                   href: `${extensionsSlug}/erc-20/ERC20ClaimConditions`,
+                  name: "ERC20ClaimConditions",
                 },
                 {
-                  name: "ERC20Mintable",
                   href: `${extensionsSlug}/erc-20/ERC20Mintable`,
+                  name: "ERC20Mintable",
                 },
                 {
-                  name: "ERC20Permit",
                   href: `${extensionsSlug}/erc-20/ERC20Permit`,
+                  name: "ERC20Permit",
                 },
                 {
-                  name: "ERC20SignatureMint",
                   href: `${extensionsSlug}/erc-20/ERC20SignatureMint`,
+                  name: "ERC20SignatureMint",
                 },
                 {
-                  name: "ERC20Staking",
                   href: `${extensionsSlug}/erc-20/ERC20Staking`,
+                  name: "ERC20Staking",
                 },
               ],
+              name: "ERC-20",
             },
             {
-              name: "ERC-721",
               links: [
                 {
-                  name: "ERC721",
                   href: `${extensionsSlug}/erc-721/ERC721`,
+                  name: "ERC721",
                 },
                 {
-                  name: "ERC721BatchMintable",
                   href: `${extensionsSlug}/erc-721/ERC721BatchMintable`,
+                  name: "ERC721BatchMintable",
                 },
                 {
-                  name: "ERC721Burnable",
                   href: `${extensionsSlug}/erc-721/ERC721Burnable`,
+                  name: "ERC721Burnable",
                 },
                 {
-                  name: "ERC721ClaimConditions",
                   href: `${extensionsSlug}/erc-721/ERC721ClaimConditions`,
+                  name: "ERC721ClaimConditions",
                 },
                 {
-                  name: "ERC721ClaimCustom",
                   href: `${extensionsSlug}/erc-721/ERC721ClaimCustom`,
+                  name: "ERC721ClaimCustom",
                 },
                 {
-                  name: "ERC721ClaimPhases",
                   href: `${extensionsSlug}/erc-721/ERC721ClaimPhases`,
+                  name: "ERC721ClaimPhases",
                 },
                 {
-                  name: "ERC721Claimable",
                   href: `${extensionsSlug}/erc-721/ERC721Claimable`,
+                  name: "ERC721Claimable",
                 },
                 {
-                  name: "ERC721Enumerable",
                   href: `${extensionsSlug}/erc-721/ERC721Enumerable`,
+                  name: "ERC721Enumerable",
                 },
                 {
-                  name: "ERC721Mintable",
                   href: `${extensionsSlug}/erc-721/ERC721Mintable`,
+                  name: "ERC721Mintable",
                 },
                 {
-                  name: "ERC721Revealable",
                   href: `${extensionsSlug}/erc-721/ERC721Revealable`,
+                  name: "ERC721Revealable",
                 },
                 {
-                  name: "ERC721SignatureMint",
                   href: `${extensionsSlug}/erc-721/ERC721SignatureMint`,
+                  name: "ERC721SignatureMint",
                 },
                 {
-                  name: "ERC721Staking",
                   href: `${extensionsSlug}/erc-721/ERC721Staking`,
+                  name: "ERC721Staking",
                 },
                 {
-                  name: "ERC721Supply",
                   href: `${extensionsSlug}/erc-721/ERC721Supply`,
+                  name: "ERC721Supply",
                 },
               ],
+              name: "ERC-721",
             },
             {
-              name: "ERC-1155",
               links: [
                 {
-                  name: "ERC1155",
                   href: `${extensionsSlug}/erc-1155/ERC1155`,
+                  name: "ERC1155",
                 },
                 {
-                  name: "ERC1155BatchMintable",
                   href: `${extensionsSlug}/erc-1155/ERC1155BatchMintable`,
+                  name: "ERC1155BatchMintable",
                 },
                 {
-                  name: "ERC1155Burnable",
                   href: `${extensionsSlug}/erc-1155/ERC1155Burnable`,
+                  name: "ERC1155Burnable",
                 },
                 {
-                  name: "ERC1155ClaimConditions",
                   href: `${extensionsSlug}/erc-1155/ERC1155ClaimConditions`,
+                  name: "ERC1155ClaimConditions",
                 },
                 {
-                  name: "ERC1155ClaimCustom",
                   href: `${extensionsSlug}/erc-1155/ERC1155ClaimCustom`,
+                  name: "ERC1155ClaimCustom",
                 },
                 {
-                  name: "ERC1155ClaimPhases",
                   href: `${extensionsSlug}/erc-1155/ERC1155ClaimPhases`,
+                  name: "ERC1155ClaimPhases",
                 },
                 {
-                  name: "ERC1155Claimable",
                   href: `${extensionsSlug}/erc-1155/ERC1155Claimable`,
+                  name: "ERC1155Claimable",
                 },
                 {
-                  name: "ERC1155Drop",
                   href: `${extensionsSlug}/erc-1155/ERC1155Drop`,
+                  name: "ERC1155Drop",
                 },
                 {
-                  name: "ERC1155DropSinglePhase",
                   href: `${extensionsSlug}/erc-1155/ERC1155DropSinglePhase`,
+                  name: "ERC1155DropSinglePhase",
                 },
                 {
-                  name: "ERC1155Enumerable",
                   href: `${extensionsSlug}/erc-1155/ERC1155Enumerable`,
+                  name: "ERC1155Enumerable",
                 },
                 {
-                  name: "ERC1155Mintable",
                   href: `${extensionsSlug}/erc-1155/ERC1155Mintable`,
+                  name: "ERC1155Mintable",
                 },
                 {
-                  name: "ERC1155Revealable",
                   href: `${extensionsSlug}/erc-1155/ERC1155Revealable`,
+                  name: "ERC1155Revealable",
                 },
                 {
-                  name: "ERC1155SignatureMint",
                   href: `${extensionsSlug}/erc-1155/ERC1155SignatureMint`,
+                  name: "ERC1155SignatureMint",
                 },
                 {
-                  name: "ERC1155Staking",
                   href: `${extensionsSlug}/erc-1155/ERC1155Staking`,
+                  name: "ERC1155Staking",
                 },
                 {
-                  name: "ERC1155Supply",
                   href: `${extensionsSlug}/erc-1155/ERC1155Supply`,
+                  name: "ERC1155Supply",
                 },
               ],
+              name: "ERC-1155",
             },
             {
-              name: "ERC-4337",
               links: [
                 {
-                  name: "SmartWallet",
                   href: `${extensionsSlug}/erc-4337/SmartWallet`,
+                  name: "SmartWallet",
                 },
                 {
-                  name: "SmartWalletFactory",
                   href: `${extensionsSlug}/erc-4337/SmartWalletFactory`,
+                  name: "SmartWalletFactory",
                 },
               ],
+              name: "ERC-4337",
             },
           ],
+          name: "Extensions",
         },
         // stylus
         {
-          name: "Arbitrum Stylus",
           href: `${buildSlug}/stylus`,
+          name: "Arbitrum Stylus",
         },
       ],
+      name: "Build",
     },
     { separator: true },
     // resources
     {
-      name: "Resources",
       isCollapsible: false,
       links: [
         {
-          name: "Design Docs",
           links: [
             {
-              name: "Modular Contracts",
               href: `${designDocs}/modular-contracts`,
+              name: "Modular Contracts",
             },
             {
-              name: "Drop",
               href: `${designDocs}/drop`,
+              name: "Drop",
             },
             {
-              name: "Marketplace",
               href: `${designDocs}/marketplace`,
+              name: "Marketplace",
             },
             {
-              name: "Multiwrap",
               href: `${designDocs}/multiwrap`,
+              name: "Multiwrap",
             },
             {
-              name: "Pack",
               href: `${designDocs}/pack`,
+              name: "Pack",
             },
             {
-              name: "Signature Mint",
               href: `${designDocs}/signature-mint`,
+              name: "Signature Mint",
             },
           ],
+          name: "Design Docs",
         },
       ],
+      name: "Resources",
     },
   ],
+  name: "Contracts",
 };
diff --git a/apps/portal/src/app/dotnet/layout.tsx b/apps/portal/src/app/dotnet/layout.tsx
index d14045a150e..a32dbddc91f 100644
--- a/apps/portal/src/app/dotnet/layout.tsx
+++ b/apps/portal/src/app/dotnet/layout.tsx
@@ -6,8 +6,8 @@ import { sidebar } from "./sidebar";
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Connect</p>
@@ -21,11 +21,11 @@ export default async function Layout(props: { children: React.ReactNode }) {
 }
 
 export const metadata = createMetadata({
+  description:
+    "Connect to user's wallets, interact with smart contracts, sign in with email or phone number, unlock Account Abstraction features; all with built-in RPC URLs, IPFS gateways, Godot support and more.",
   image: {
-    title: "thirdweb .NET SDK",
     icon: "dotnet",
+    title: "thirdweb .NET SDK",
   },
   title: "thirdweb .NET SDK",
-  description:
-    "Connect to user's wallets, interact with smart contracts, sign in with email or phone number, unlock Account Abstraction features; all with built-in RPC URLs, IPFS gateways, Godot support and more.",
 });
diff --git a/apps/portal/src/app/dotnet/sidebar.tsx b/apps/portal/src/app/dotnet/sidebar.tsx
index 462f388b136..61a54b1308b 100644
--- a/apps/portal/src/app/dotnet/sidebar.tsx
+++ b/apps/portal/src/app/dotnet/sidebar.tsx
@@ -1,331 +1,331 @@
+import { CodeIcon, ExternalLinkIcon, ZapIcon } from "lucide-react";
 import type { SideBar } from "@/components/Layouts/DocLayout";
 import type { SidebarLink } from "@/components/others/Sidebar";
-import { CodeIcon, ExternalLinkIcon, ZapIcon } from "lucide-react";
 
 const walletProviders: SidebarLink = (() => {
   const parentSlug = "/dotnet/wallets/providers";
   return {
-    name: "Wallet Providers",
     links: [
       {
-        name: "In App Wallet",
         href: `${parentSlug}/in-app-wallet`,
+        name: "In App Wallet",
       },
       {
-        name: "Ecosystem Wallet",
         href: `${parentSlug}/ecosystem-wallet`,
+        name: "Ecosystem Wallet",
       },
       {
-        name: "Account Abstraction",
         href: `${parentSlug}/account-abstraction`,
+        name: "Account Abstraction",
       },
       {
-        name: "Private Key Wallet",
         href: `${parentSlug}/private-key`,
+        name: "Private Key Wallet",
       },
       {
-        name: "Engine Wallet",
         href: `${parentSlug}/engine-wallet`,
+        name: "Engine Wallet",
       },
     ],
+    name: "Wallet Providers",
   };
 })();
 
 const walletActions: SidebarLink = (() => {
   const parentSlug = "/dotnet/wallets/actions";
   return {
-    name: "Wallet Actions",
     links: [
       {
-        name: "IThirdwebWallet",
         isCollapsible: false,
         links: [
           {
-            name: "GetAddress",
             href: `${parentSlug}/getaddress`,
+            name: "GetAddress",
           },
           {
-            name: "IsConnected",
             href: `${parentSlug}/isconnected`,
+            name: "IsConnected",
           },
           {
-            name: "Sign",
             href: `${parentSlug}/sign`,
+            name: "Sign",
           },
           {
-            name: "SignTypedDataV4",
             href: `${parentSlug}/signtypeddatav4`,
+            name: "SignTypedDataV4",
           },
           {
-            name: "Authenticate",
             href: `${parentSlug}/authenticate`,
+            name: "Authenticate",
           },
           {
-            name: "Disconnect",
             href: `${parentSlug}/disconnect`,
+            name: "Disconnect",
           },
           {
-            name: "SendTransaction",
             href: `${parentSlug}/sendtransaction`,
+            name: "SendTransaction",
           },
           {
-            name: "ExecuteTransaction",
             href: `${parentSlug}/executetransaction`,
+            name: "ExecuteTransaction",
           },
           {
-            name: "Transfer",
             href: `${parentSlug}/transfer`,
+            name: "Transfer",
           },
           {
-            name: "SwitchNetwork",
             href: `${parentSlug}/switchnetwork`,
+            name: "SwitchNetwork",
           },
           {
-            name: "SignAuthorization",
             href: `${parentSlug}/signauthorization`,
+            name: "SignAuthorization",
           },
         ],
+        name: "IThirdwebWallet",
       },
       {
-        name: "InAppWallet & EcosystemWallet",
         isCollapsible: false,
         links: [
           {
-            name: "GetUserDetails",
             href: `${parentSlug}/getuserdetails`,
+            name: "GetUserDetails",
           },
           {
-            name: "GetUserAuthDetails",
             href: `${parentSlug}/getuserauthdetails`,
+            name: "GetUserAuthDetails",
           },
           {
-            name: "GetEcosystemDetails",
             href: `${parentSlug}/getecosystemdetails`,
+            name: "GetEcosystemDetails",
           },
           {
-            name: "GenerateExternalLoginLink",
             href: `${parentSlug}/generateexternalloginlink`,
+            name: "GenerateExternalLoginLink",
           },
         ],
+        name: "InAppWallet & EcosystemWallet",
       },
       {
-        name: "SmartWallet",
         isCollapsible: false,
         links: [
           {
-            name: "IsDeployed",
             href: `${parentSlug}/isdeployed`,
+            name: "IsDeployed",
           },
           {
-            name: "CreateSessionKey",
             href: `${parentSlug}/createsessionkey`,
+            name: "CreateSessionKey",
           },
           {
-            name: "AddAdmin",
             href: `${parentSlug}/addadmin`,
+            name: "AddAdmin",
           },
           {
-            name: "RemoveAdmin",
             href: `${parentSlug}/removeadmin`,
+            name: "RemoveAdmin",
           },
           {
-            name: "GetAllActiveSigners",
             href: `${parentSlug}/getallactivesigners`,
+            name: "GetAllActiveSigners",
           },
           {
-            name: "GetAllAdmins",
             href: `${parentSlug}/getalladmins`,
+            name: "GetAllAdmins",
           },
           {
-            name: "GetPersonalWallet",
             href: `${parentSlug}/getpersonalwallet`,
+            name: "GetPersonalWallet",
           },
           {
-            name: "GetBalance",
             href: `${parentSlug}/getbalance`,
+            name: "GetBalance",
           },
           {
-            name: "GetTransactionCount",
             href: `${parentSlug}/gettransactioncount`,
+            name: "GetTransactionCount",
           },
         ],
+        name: "SmartWallet",
       },
     ],
+    name: "Wallet Actions",
   };
 })();
 
 const contracts: SidebarLink = {
-  name: "Contract Interactions",
   links: [
     {
-      name: "Create Contract",
       href: "/dotnet/contracts/create",
+      name: "Create Contract",
     },
     {
-      name: "Contract Extensions",
       href: "/dotnet/contracts/extensions",
+      name: "Contract Extensions",
     },
     {
-      name: "Read Contract",
       href: "/dotnet/contracts/read",
+      name: "Read Contract",
     },
     {
-      name: "Write Contract",
       href: "/dotnet/contracts/write",
+      name: "Write Contract",
     },
     {
-      name: "Prepare Transaction",
       href: "/dotnet/contracts/prepare",
+      name: "Prepare Transaction",
     },
   ],
+  name: "Contract Interactions",
 };
 
 const transactions: SidebarLink = {
-  name: "Transaction Builder",
   links: [
     {
-      name: "Create Transaction",
       href: "/dotnet/transactions/create",
+      name: "Create Transaction",
     },
     {
-      name: "Instance Methods",
       href: "/dotnet/transactions/instance",
+      name: "Instance Methods",
     },
     {
-      name: "Static Methods",
       href: "/dotnet/transactions/static",
+      name: "Static Methods",
     },
   ],
+  name: "Transaction Builder",
 };
 
 export const sidebar: SideBar = {
-  name: ".NET SDK",
   links: [
     { separator: true },
     {
-      name: "Overview",
       href: "/dotnet",
+      name: "Overview",
     },
     {
-      name: "Getting Started",
       href: "/dotnet/getting-started",
       icon: <ZapIcon />,
+      name: "Getting Started",
     },
     {
-      name: "API Reference",
       href: "https://thirdweb-dev.github.io/dotnet/index.html",
-      isCollapsible: false,
       icon: <ExternalLinkIcon />,
+      isCollapsible: false,
+      name: "API Reference",
     },
     {
-      name: "Integrations",
-      isCollapsible: true,
       icon: <CodeIcon />,
+      isCollapsible: true,
       links: [
         {
-          name: "Unity",
           href: "/unity/v5",
+          name: "Unity",
         },
         {
-          name: "Godot",
           href: "/dotnet/godot",
+          name: "Godot",
         },
         {
-          name: "MAUI",
           href: "/dotnet/maui",
+          name: "MAUI",
         },
       ],
+      name: "Integrations",
     },
     {
       separator: true,
     },
     {
-      name: "Core",
       isCollapsible: false,
       links: [
         {
-          name: "Thirdweb Client",
           href: "/dotnet/client",
+          name: "Thirdweb Client",
         },
         {
-          name: "Storage",
           href: "/dotnet/storage",
+          name: "Storage",
         },
         {
-          name: "Utilities",
           href: "/dotnet/utils",
+          name: "Utilities",
         },
       ],
+      name: "Core",
     },
     {
       separator: true,
     },
     {
-      name: "Wallets",
       isCollapsible: false,
       links: [walletProviders, walletActions],
+      name: "Wallets",
     },
     {
       separator: true,
     },
     {
-      name: "Transactions",
       isCollapsible: false,
       links: [contracts, transactions],
+      name: "Transactions",
     },
     {
       separator: true,
     },
     {
-      name: "Bridge",
       isCollapsible: false,
       links: [
         {
-          name: "Quickstart",
           href: "/dotnet/universal-bridge/quickstart",
+          name: "Quickstart",
         },
         {
-          name: "Universal Bridge Full Reference",
           href: "https://thirdweb-dev.github.io/dotnet/docs/Thirdweb.Bridge.ThirdwebBridge.html",
+          name: "Universal Bridge Full Reference",
         },
       ],
+      name: "Bridge",
     },
     {
       separator: true,
     },
     {
-      name: "Indexer",
       isCollapsible: false,
       links: [
         {
-          name: "Quickstart",
           href: "/dotnet/insight/quickstart",
+          name: "Quickstart",
         },
         {
-          name: "Insight Full Reference",
           href: "https://thirdweb-dev.github.io/dotnet/docs/Thirdweb.Indexer.ThirdwebInsight.html",
+          name: "Insight Full Reference",
         },
       ],
+      name: "Indexer",
     },
     {
       separator: true,
     },
     {
-      name: "AI",
       isCollapsible: false,
       links: [
         {
-          name: "Quickstart",
           href: "/dotnet/nebula/quickstart",
+          name: "Quickstart",
         },
         {
-          name: "Nebula Full Reference",
           href: "https://thirdweb-dev.github.io/dotnet/docs/Thirdweb.AI.ThirdwebNebula.html",
+          name: "Nebula Full Reference",
         },
       ],
+      name: "AI",
     },
     {
       separator: true,
     },
   ],
+  name: ".NET SDK",
 };
diff --git a/apps/portal/src/app/engine/v2/layout.tsx b/apps/portal/src/app/engine/v2/layout.tsx
index 356fd8693e1..ded308d76eb 100644
--- a/apps/portal/src/app/engine/v2/layout.tsx
+++ b/apps/portal/src/app/engine/v2/layout.tsx
@@ -1,13 +1,13 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { EngineVersionSelector } from "../../../components/others/EngineVersionSelector";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Engine</p>
@@ -21,7 +21,7 @@ export default async function Layout(props: { children: React.ReactNode }) {
 }
 
 export const metadata = createMetadata({
-  title: "Engine",
   description:
     "Engine is a backend HTTP server that calls smart contracts using your managed backend wallets.",
+  title: "Engine",
 });
diff --git a/apps/portal/src/app/engine/v2/sidebar.tsx b/apps/portal/src/app/engine/v2/sidebar.tsx
index 5742bf96b62..57d768b0ac0 100644
--- a/apps/portal/src/app/engine/v2/sidebar.tsx
+++ b/apps/portal/src/app/engine/v2/sidebar.tsx
@@ -1,4 +1,3 @@
-import type { SideBar } from "@/components/Layouts/DocLayout";
 import {
   BookMarkedIcon,
   BracesIcon,
@@ -14,154 +13,155 @@ import {
   WalletIcon,
   WrenchIcon,
 } from "lucide-react";
+import type { SideBar } from "@/components/Layouts/DocLayout";
 
 const engineSlug = "/engine/v2";
 
 export const sidebar: SideBar = {
-  name: "Engine",
   links: [
     {
-      name: "Overview",
       href: engineSlug,
       icon: <CloudIcon />,
+      name: "Overview",
     },
     {
-      name: "Playground",
       href: "https://playground.thirdweb.com/engine/airdrop",
       icon: <ExternalLinkIcon />,
+      name: "Playground",
     },
     {
-      name: "Get Started",
       href: `${engineSlug}/get-started`,
       icon: <RocketIcon />,
+      name: "Get Started",
     },
     {
-      name: "Key Concepts",
       icon: <KeyIcon />,
       links: [
         {
-          name: "Transactions",
           href: `${engineSlug}/features/transactions`,
+          name: "Transactions",
         },
         {
-          name: "Contracts",
           href: `${engineSlug}/features/contracts`,
+          name: "Contracts",
         },
         {
-          name: "Admins",
           href: `${engineSlug}/features/admins`,
+          name: "Admins",
         },
         {
-          name: "Access Tokens",
           href: `${engineSlug}/features/access-tokens`,
+          name: "Access Tokens",
         },
         {
-          name: "Webhooks",
           href: `${engineSlug}/features/webhooks`,
+          name: "Webhooks",
         },
         {
-          name: "Preventing Duplicate Transactions",
           href: `${engineSlug}/features/preventing-duplicate-transactions`,
+          name: "Preventing Duplicate Transactions",
         },
         {
-          name: "Custom Chains",
           href: `${engineSlug}/features/custom-chains`,
+          name: "Custom Chains",
         },
         {
-          name: "Account Abstraction",
           href: `${engineSlug}/features/account-abstraction`,
+          name: "Account Abstraction",
         },
         {
-          name: "Relayers",
           href: `${engineSlug}/features/relayers`,
+          name: "Relayers",
         },
         {
-          name: "Gasless Transactions",
           href: `${engineSlug}/features/gasless-transactions`,
+          name: "Gasless Transactions",
         },
         {
-          name: "Contract Subscriptions",
           href: `${engineSlug}/features/contract-subscriptions`,
+          name: "Contract Subscriptions",
         },
         {
-          name: "Alert Notifications",
           href: `${engineSlug}/features/alert-notifications`,
+          name: "Alert Notifications",
         },
         {
-          name: "Security",
           href: `${engineSlug}/features/security`,
+          name: "Security",
         },
       ],
+      name: "Key Concepts",
     },
     {
-      name: "Configure Wallets",
       href: `${engineSlug}/configure-wallets`,
       icon: <WalletIcon />,
       links: [
         {
-          name: "Smart Server Wallet",
           href: `${engineSlug}/configure-wallets/server-wallet`,
+          name: "Smart Server Wallet",
         },
         {
-          name: "AWS KMS",
           href: `${engineSlug}/configure-wallets/aws-kms`,
+          name: "AWS KMS",
         },
         {
-          name: "Google Cloud KMS",
           href: `${engineSlug}/configure-wallets/gcp-kms`,
+          name: "Google Cloud KMS",
         },
         {
-          name: "Circle Wallet",
           href: `${engineSlug}/configure-wallets/circle-wallet`,
+          name: "Circle Wallet",
         },
         {
-          name: "Wallet Credentials",
           href: `${engineSlug}/configure-wallets/wallet-credentials`,
+          name: "Wallet Credentials",
         },
       ],
+      name: "Configure Wallets",
     },
     {
-      name: "Tutorials",
       icon: <BookMarkedIcon />,
       links: [
-        { name: "Airdrop NFTs", href: `${engineSlug}/guides/airdrop-nfts` },
-        { name: "NFT Checkout", href: `${engineSlug}/guides/nft-checkout` },
+        { href: `${engineSlug}/guides/airdrop-nfts`, name: "Airdrop NFTs" },
+        { href: `${engineSlug}/guides/nft-checkout`, name: "NFT Checkout" },
       ],
+      name: "Tutorials",
     },
     {
-      name: "API Reference",
       href: "https://thirdweb-engine.apidocumentation.com/",
       icon: <BracesIcon />,
+      name: "API Reference",
     },
     {
-      name: "Typescript SDK",
       href: `${engineSlug}/references/typescript`,
       icon: <CodeIcon />,
+      name: "Typescript SDK",
     },
     {
-      name: "Prod Checklist",
       href: `${engineSlug}/production-checklist`,
       icon: <ListCheckIcon />,
+      name: "Prod Checklist",
     },
     {
-      name: "Self-Host",
       href: `${engineSlug}/self-host`,
       icon: <ServerIcon />,
+      name: "Self-Host",
     },
     {
-      name: "Security",
       href: `${engineSlug}/security`,
       icon: <ShieldQuestionIcon />,
+      name: "Security",
     },
     {
-      name: "Troubleshoot",
       href: `${engineSlug}/troubleshooting`,
       icon: <WrenchIcon />,
+      name: "Troubleshoot",
     },
     {
-      name: "FAQ",
       href: `${engineSlug}/faq`,
       icon: <MessageCircleQuestionIcon />,
+      name: "FAQ",
     },
   ],
+  name: "Engine",
 };
diff --git a/apps/portal/src/app/engine/v3/layout.tsx b/apps/portal/src/app/engine/v3/layout.tsx
index 183b051c7a1..ef6a66be178 100644
--- a/apps/portal/src/app/engine/v3/layout.tsx
+++ b/apps/portal/src/app/engine/v3/layout.tsx
@@ -1,13 +1,13 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { EngineVersionSelector } from "../../../components/others/EngineVersionSelector";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Engine</p>
@@ -21,7 +21,7 @@ export default async function Layout(props: { children: React.ReactNode }) {
 }
 
 export const metadata = createMetadata({
-  title: "Engine V3",
   description:
     "Engine is a backend HTTP server that calls smart contracts using your managed backend wallets.",
+  title: "Engine V3",
 });
diff --git a/apps/portal/src/app/engine/v3/sidebar.tsx b/apps/portal/src/app/engine/v3/sidebar.tsx
index d35f871ccd6..8f585193f13 100644
--- a/apps/portal/src/app/engine/v3/sidebar.tsx
+++ b/apps/portal/src/app/engine/v3/sidebar.tsx
@@ -1,4 +1,3 @@
-import type { SideBar } from "@/components/Layouts/DocLayout";
 import {
   BracesIcon,
   CloudIcon,
@@ -11,76 +10,77 @@ import {
   WalletIcon,
   WrenchIcon,
 } from "lucide-react";
+import type { SideBar } from "@/components/Layouts/DocLayout";
 
 const engineV3Slug = "/engine/v3";
 
 export const sidebar: SideBar = {
-  name: "Engine",
   links: [
     {
-      name: "Overview",
       href: engineV3Slug,
       icon: <CloudIcon />,
+      name: "Overview",
     },
     {
-      name: "Playground",
       href: "https://playground.thirdweb.com/engine/airdrop",
       icon: <ExternalLinkIcon />,
+      name: "Playground",
     },
     {
-      name: "Get Started",
       href: `${engineV3Slug}/get-started`,
       icon: <RocketIcon />,
+      name: "Get Started",
     },
     {
-      name: "Key Concepts",
       icon: <KeyIcon />,
       links: [
         {
-          name: "Vault",
           href: "/vault",
+          name: "Vault",
         },
       ],
+      name: "Key Concepts",
     },
     {
-      name: "Configure Wallets",
       icon: <WalletIcon />,
       links: [
         {
-          name: "Smart Server Wallet",
           href: `${engineV3Slug}/configure-wallets/smart-server-wallet`,
+          name: "Smart Server Wallet",
         },
       ],
+      name: "Configure Wallets",
     },
     {
-      name: "API Reference",
       href: "https://engine.thirdweb.com/reference",
       icon: <BracesIcon />,
+      name: "API Reference",
     },
     {
-      name: "TypeScript SDK",
       href: "/references/typescript/v5/serverWallet",
       icon: <CodeIcon />,
+      name: "TypeScript SDK",
     },
     {
-      name: "Security",
       href: "/vault/security",
       icon: <ShieldQuestionIcon />,
+      name: "Security",
     },
     {
-      name: "Migrate from v2",
       href: `${engineV3Slug}/migrate`,
       icon: <WrenchIcon />,
+      name: "Migrate from v2",
     },
     {
-      name: "Troubleshoot",
       href: `${engineV3Slug}/troubleshoot`,
       icon: <WrenchIcon />,
+      name: "Troubleshoot",
     },
     {
-      name: "FAQ",
       href: `${engineV3Slug}/faq`,
       icon: <MessageCircleQuestionIcon />,
+      name: "FAQ",
     },
   ],
+  name: "Engine",
 };
diff --git a/apps/portal/src/app/globals.css b/apps/portal/src/app/globals.css
index d7d1770c992..a5e469e40f9 100644
--- a/apps/portal/src/app/globals.css
+++ b/apps/portal/src/app/globals.css
@@ -193,10 +193,12 @@ html:not(.dark) .dark-only {
   display: none;
 }
 
+/* biome-ignore lint/style/noDescendingSpecificity:we explicitly WANT to target SPANs INSIDE of CODE tags */
 code span {
   color: var(--code-light-color);
 }
 
+/* biome-ignore lint/style/noDescendingSpecificity:we explicitly WANT to target SPANs INSIDE of CODE tags */
 .dark code span {
   color: var(--code-dark-color);
 }
diff --git a/apps/portal/src/app/infrastructure/layout.tsx b/apps/portal/src/app/infrastructure/layout.tsx
index 00a80efc7ce..2884479bf6b 100644
--- a/apps/portal/src/app/infrastructure/layout.tsx
+++ b/apps/portal/src/app/infrastructure/layout.tsx
@@ -1,17 +1,17 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true} noIndex>
+    <DocLayout editPageButton={true} noIndex sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
 }
 
 export const metadata = createMetadata({
-  title: "thirdweb Infrastructure",
   description:
     "All the infrastructure to scale and build production grade web3 applications",
+  title: "thirdweb Infrastructure",
 });
diff --git a/apps/portal/src/app/infrastructure/sidebar.tsx b/apps/portal/src/app/infrastructure/sidebar.tsx
index 7d43890de38..c3cf309f62f 100644
--- a/apps/portal/src/app/infrastructure/sidebar.tsx
+++ b/apps/portal/src/app/infrastructure/sidebar.tsx
@@ -5,62 +5,62 @@ const storageSlug = "/infrastructure/storage";
 const rpcSlug = "/infrastructure/rpc-edge";
 
 export const sidebar: SideBar = {
-  name: "Infrastructure",
   links: [
     {
-      name: "Overview",
       href: "/infrastructure",
+      name: "Overview",
     },
     // Storage
     { separator: true },
     {
-      name: "Storage",
       icon: <InfraStorageIcon />,
       isCollapsible: false,
       links: [
         {
-          name: "Overview",
           href: `${storageSlug}/overview`,
+          name: "Overview",
         },
         {
-          name: "How Storage Works",
           href: `${storageSlug}/how-storage-works`,
+          name: "How Storage Works",
         },
         {
-          name: "How to Use Storage",
           links: [
             {
-              name: "Connect SDK",
               href: "/connect",
+              name: "Connect SDK",
             },
             {
-              name: "Upload Files to IPFS",
               href: `${storageSlug}/how-to-use-storage/upload-files-to-ipfs`,
+              name: "Upload Files to IPFS",
             },
             {
-              name: "Host Web App",
               href: `${storageSlug}/how-to-use-storage/host-web-app`,
+              name: "Host Web App",
             },
           ],
+          name: "How to Use Storage",
         },
       ],
+      name: "Storage",
     },
     //RPC Edge
     { separator: true },
     {
-      name: "RPC Edge",
       icon: <InfraRPCIcon />,
       isCollapsible: false,
       links: [
         {
-          name: "Overview",
           href: `${rpcSlug}/overview`,
+          name: "Overview",
         },
         {
-          name: "Get Started",
           href: `${rpcSlug}/get-started`,
+          name: "Get Started",
         },
       ],
+      name: "RPC Edge",
     },
   ],
+  name: "Infrastructure",
 };
diff --git a/apps/portal/src/app/insight/layout.tsx b/apps/portal/src/app/insight/layout.tsx
index e51f6778d4b..3aaed384197 100644
--- a/apps/portal/src/app/insight/layout.tsx
+++ b/apps/portal/src/app/insight/layout.tsx
@@ -1,20 +1,20 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true}>
+    <DocLayout editPageButton={true} sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
 }
 
 export const metadata = createMetadata({
-  title: "Insight",
   description: "Query, transform and analyze blockchain data",
   image: {
-    title: "Insight",
     icon: "insight",
+    title: "Insight",
   },
+  title: "Insight",
 });
diff --git a/apps/portal/src/app/insight/sidebar.tsx b/apps/portal/src/app/insight/sidebar.tsx
index 4ca3bfcda35..f8b191cf6c8 100644
--- a/apps/portal/src/app/insight/sidebar.tsx
+++ b/apps/portal/src/app/insight/sidebar.tsx
@@ -1,4 +1,3 @@
-import type { SideBar } from "@/components/Layouts/DocLayout";
 import {
   AlbumIcon,
   BoxIcon,
@@ -12,94 +11,95 @@ import {
   WebhookIcon,
   WrenchIcon,
 } from "lucide-react";
+import type { SideBar } from "@/components/Layouts/DocLayout";
 
 const insightSlug = "/insight";
 
 export const sidebar: SideBar = {
-  name: "Insight",
   links: [
     {
-      name: "Overview",
       href: "/insight",
       icon: <BoxIcon />,
+      name: "Overview",
     },
     {
-      name: "Use Cases",
       href: `${insightSlug}/use-cases`,
       icon: <StickyNoteIcon />,
+      name: "Use Cases",
     },
     {
-      name: "Playground",
       href: "https://playground.thirdweb.com/insight",
       icon: <ExternalLinkIcon />,
+      name: "Playground",
     },
     {
-      name: "Get Started",
       href: `${insightSlug}/get-started`,
       icon: <RocketIcon />,
+      name: "Get Started",
     },
     {
-      name: "Blueprints",
       href: `${insightSlug}/blueprints`,
       icon: <AlbumIcon />,
+      name: "Blueprints",
     },
     {
-      name: "Multichain Queries",
       href: `${insightSlug}/multichain-queries`,
       icon: <NetworkIcon />,
+      name: "Multichain Queries",
     },
     {
-      name: "Agents & LLMs",
       href: `${insightSlug}/agents-and-llms`,
       icon: <BrainIcon />,
       links: [
         {
-          name: "llms.txt",
           href: `${insightSlug}/agents-and-llms/llmstxt`,
+          name: "llms.txt",
         },
       ],
+      name: "Agents & LLMs",
     },
     {
-      name: "Webhooks",
       href: `${insightSlug}/webhooks`,
       icon: <WebhookIcon />,
       links: [
         {
-          name: "Get Started",
           href: `${insightSlug}/webhooks`,
+          name: "Get Started",
         },
         {
-          name: "Managing Webhooks",
           href: `${insightSlug}/webhooks/managing-webhooks`,
+          name: "Managing Webhooks",
         },
         {
-          name: "Filtering",
           href: `${insightSlug}/webhooks/filtering`,
+          name: "Filtering",
         },
         {
-          name: "Payload",
           href: `${insightSlug}/webhooks/payload`,
+          name: "Payload",
         },
         {
-          name: "API Reference",
           href: "https://insight.thirdweb.com/reference#tag/webhooks",
+          name: "API Reference",
         },
       ],
+      name: "Webhooks",
     },
     {
-      name: "API Reference",
       href: "https://insight.thirdweb.com/reference",
       icon: <BracesIcon />,
+      name: "API Reference",
     },
     {
-      name: "Troubleshoot",
       href: `${insightSlug}/troubleshoot`,
       icon: <WrenchIcon />,
+      name: "Troubleshoot",
     },
     {
-      name: "FAQs",
       href: `${insightSlug}/faqs`,
       icon: <MessageCircleQuestionIcon />,
+      name: "FAQs",
     },
   ],
+  name: "Insight",
 };
diff --git a/apps/portal/src/app/knowledge-base/layout.tsx b/apps/portal/src/app/knowledge-base/layout.tsx
index b1f2b498b38..dd955736585 100644
--- a/apps/portal/src/app/knowledge-base/layout.tsx
+++ b/apps/portal/src/app/knowledge-base/layout.tsx
@@ -1,18 +1,17 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true}>
+    <DocLayout editPageButton={true} sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
 }
 
 export const metadata = createMetadata({
-  title: "thirdweb Knowledge Base",
-
   description:
     "This Knowledge Base collects concise guides and troubleshooting tips for common web3 development challenges—especially when using thirdweb, but many articles apply to any web3 project.",
+  title: "thirdweb Knowledge Base",
 });
diff --git a/apps/portal/src/app/knowledge-base/sidebar.tsx b/apps/portal/src/app/knowledge-base/sidebar.tsx
index c58484ac0ec..48b5215673e 100644
--- a/apps/portal/src/app/knowledge-base/sidebar.tsx
+++ b/apps/portal/src/app/knowledge-base/sidebar.tsx
@@ -1,87 +1,86 @@
-import type { SideBar } from "@/components/Layouts/DocLayout";
-
 import { BracesIcon, CodeIcon, RocketIcon } from "lucide-react";
+import type { SideBar } from "@/components/Layouts/DocLayout";
 
 export const sidebar: SideBar = {
-  name: "Support Knowledge Base",
   links: [
     {
-      name: "Get Started",
       href: "/knowledge-base/get-started",
       icon: <RocketIcon />,
+      name: "Get Started",
     },
     {
       separator: true,
     },
     {
-      name: "thirdweb Resources",
       isCollapsible: false,
       links: [
         {
-          name: "How to",
           icon: <BracesIcon />,
           links: [
             {
-              name: "Verify your team email domain",
               expanded: true,
               href: "/knowledge-base/how-to/verify-your-team-email-domain",
+              name: "Verify your team email domain",
             },
             {
-              name: "Creating soulbound NFTs",
               expanded: true,
               href: "/knowledge-base/how-to/creating-soulbound-nfts",
+              name: "Creating soulbound NFTs",
             },
             {
-              name: "Console error sharing",
               expanded: true,
               href: "/knowledge-base/how-to/console-error-sharing",
+              name: "Console error sharing",
             },
             {
-              name: "Deploy mint template",
               expanded: true,
               href: "/knowledge-base/how-to/deploy-mint-template",
+              name: "Deploy mint template",
             },
           ],
+          name: "How to",
         },
       ],
+      name: "thirdweb Resources",
     },
     {
-      name: "Troubleshoot",
       isCollapsible: false,
       links: [
         {
-          name: "Onchain common errors",
           icon: <RocketIcon />,
           links: [
             {
-              name: "Thirdweb CLI: Device Link Error",
               href: "/knowledge-base/onchain-common-errors/thirdweb-cli/device-link-error",
+              name: "Thirdweb CLI: Device Link Error",
             },
           ],
+          name: "Onchain common errors",
         },
         {
-          name: "Contracts",
           icon: <CodeIcon />,
           links: [
             {
-              name: "Airdrop Contract",
               href: "/knowledge-base/troubleshoot/contracts/airdrop-contract",
+              name: "Airdrop Contract",
             },
             {
-              name: "Embed Feature Not Found",
               href: "/knowledge-base/troubleshoot/contracts/embed-feature-not-found",
+              name: "Embed Feature Not Found",
             },
             {
-              name: "Batch Upload",
               href: "/knowledge-base/troubleshoot/contracts/batch-upload",
+              name: "Batch Upload",
             },
             {
-              name: "Transfer Amount Exceeds Allowance",
               href: "/knowledge-base/troubleshoot/contracts/erc20-transfer-allowance",
+              name: "Transfer Amount Exceeds Allowance",
             },
           ],
+          name: "Contracts",
         },
       ],
+      name: "Troubleshoot",
     },
   ],
+  name: "Support Knowledge Base",
 };
diff --git a/apps/portal/src/app/layout.tsx b/apps/portal/src/app/layout.tsx
index fcac8e73768..c8fd14915e1 100644
--- a/apps/portal/src/app/layout.tsx
+++ b/apps/portal/src/app/layout.tsx
@@ -1,9 +1,9 @@
 import "./globals.css";
-import { createMetadata } from "@/components/Document";
-import { ThemeProvider } from "next-themes";
 import { Fira_Code, Inter } from "next/font/google";
 import Script from "next/script";
+import { ThemeProvider } from "next-themes";
 import NextTopLoader from "nextjs-toploader";
+import { createMetadata } from "@/components/Document";
 import { StickyTopContainer } from "../components/Document/StickyTopContainer";
 import { Banner } from "../components/others/Banner";
 import { EnableSmoothScroll } from "../components/others/SmoothScroll";
@@ -23,8 +23,8 @@ const monoFont = Fira_Code({
 });
 
 export const metadata = createMetadata({
-  title: "thirdweb docs",
   description: "thirdweb developer portal",
+  title: "thirdweb docs",
 });
 
 export default function RootLayout({
@@ -36,10 +36,10 @@ export default function RootLayout({
     <html lang="en" suppressHydrationWarning>
       <head>
         <Script
-          src="https://thirdweb.com/js/pl.js"
-          defer
-          data-domain="portal.thirdweb.com"
           data-api="https://pl.thirdweb.com/api/event"
+          data-domain="portal.thirdweb.com"
+          defer
+          src="https://thirdweb.com/js/pl.js"
         />
       </head>
 
@@ -49,9 +49,9 @@ export default function RootLayout({
       >
         <ThemeProvider
           attribute="class"
+          defaultTheme="dark"
           disableTransitionOnChange
           enableSystem={false}
-          defaultTheme="dark"
         >
           <NextTopLoader
             color="hsl(var(--link-foreground))"
@@ -63,11 +63,9 @@ export default function RootLayout({
 
           <div className="relative flex min-h-screen flex-col">
             <StickyTopContainer>
-              {/* Note: Please change id as well when changing text or href so that new banner is shown to user even if user dismissed the older one  */}
               <Banner
-                id="ub-launch"
-                text="Let users pay with whatever they have without leaving your app"
                 href="https://thirdweb.com/connect/universal-bridge"
+                text="Let users pay with whatever they have without leaving your app"
               />
               <Header />
             </StickyTopContainer>
diff --git a/apps/portal/src/app/nebula/api-reference/chat/EndpointMetadata.tsx b/apps/portal/src/app/nebula/api-reference/chat/EndpointMetadata.tsx
index f98d309ab19..c2f0856262c 100644
--- a/apps/portal/src/app/nebula/api-reference/chat/EndpointMetadata.tsx
+++ b/apps/portal/src/app/nebula/api-reference/chat/EndpointMetadata.tsx
@@ -26,45 +26,45 @@ export function EndpointMetadata() {
   return (
     <ApiEndpoint
       metadata={{
-        title: "Send Message",
         description: "Process a chat message and return the response",
+        method: "POST",
         origin: "https://nebula-api.thirdweb.com",
         path: "/chat",
-        method: "POST",
         request: {
-          pathParameters: [],
-          headers: [nebulaSecretKeyHeaderParameter],
           bodyParameters: [
             {
+              description: "The message to be processed.",
+              example: "Hello",
               name: "message",
               required: true,
-              description: "The message to be processed.",
               type: "string",
-              example: "Hello",
             },
             {
+              description: "Whether to stream the response or not",
+              example: false,
               name: "stream",
               required: false,
-              description: "Whether to stream the response or not",
               type: "boolean",
-              example: false,
             },
             {
-              name: "session_id",
-              type: "string",
-              example: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-              required: false,
               description:
                 "The session ID to associate with the message. If not provided, a new session will be created.",
+              example: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+              name: "session_id",
+              required: false,
+              type: "string",
             },
             nebulaContextParameter,
           ],
+          headers: [nebulaSecretKeyHeaderParameter],
+          pathParameters: [],
         },
         responseExamples: {
           200: response200Example,
           401: nebulaAPI401Response,
           422: nebulaAPI422Response,
         },
+        title: "Send Message",
       }}
     />
   );
diff --git a/apps/portal/src/app/nebula/api-reference/clear-session/EndpointMetadata.tsx b/apps/portal/src/app/nebula/api-reference/clear-session/EndpointMetadata.tsx
index c34fc6f7259..4af16becf6c 100644
--- a/apps/portal/src/app/nebula/api-reference/clear-session/EndpointMetadata.tsx
+++ b/apps/portal/src/app/nebula/api-reference/clear-session/EndpointMetadata.tsx
@@ -10,21 +10,21 @@ export function EndpointMetadata() {
   return (
     <ApiEndpoint
       metadata={{
-        title: "Clear Session",
         description:
           "Clears all messages for a specific session using the session ID.",
+        method: "POST",
         origin: "https://nebula-api.thirdweb.com",
         path: "/session/{session_id}/clear",
-        method: "POST",
         request: {
-          pathParameters: [nebulaSessionIdPathParameter],
-          headers: [nebulaSecretKeyHeaderParameter],
           bodyParameters: [],
+          headers: [nebulaSecretKeyHeaderParameter],
+          pathParameters: [nebulaSessionIdPathParameter],
         },
         responseExamples: {
           200: nebulaFullSessionResponse,
           401: nebulaAPI401Response,
         },
+        title: "Clear Session",
       }}
     />
   );
diff --git a/apps/portal/src/app/nebula/api-reference/common.ts b/apps/portal/src/app/nebula/api-reference/common.ts
index f2686e8c3c7..f0d5f953cff 100644
--- a/apps/portal/src/app/nebula/api-reference/common.ts
+++ b/apps/portal/src/app/nebula/api-reference/common.ts
@@ -50,19 +50,19 @@ export const nebulaAPI422Response = `\
 }`;
 
 export const nebulaSecretKeyHeaderParameter: APIParameter = {
+  description: "Your thirdweb secret key for authentication.",
+  example: "YOUR_THIRDWEB_SECRET_KEY",
   name: "x-secret-key",
   required: true,
-  description: "Your thirdweb secret key for authentication.",
   type: "string",
-  example: "YOUR_THIRDWEB_SECRET_KEY",
 };
 
 export const nebulaSessionIdPathParameter: APIParameter = {
+  description: "The unique ID of the session",
+  example: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
   name: "session_id",
   required: true,
-  description: "The unique ID of the session",
   type: "string",
-  example: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
 };
 const nebulaContextFilterType = `\
 {
@@ -71,8 +71,8 @@ const nebulaContextFilterType = `\
 }`;
 
 export const nebulaContextParameter: APIParameter = {
+  description: "Provide additional context information along with the message",
   name: "context",
   required: false,
-  description: "Provide additional context information along with the message",
   type: nebulaContextFilterType,
 };
diff --git a/apps/portal/src/app/nebula/api-reference/create-session/EndpointMetadata.tsx b/apps/portal/src/app/nebula/api-reference/create-session/EndpointMetadata.tsx
index 7db6042a8a9..4772585a374 100644
--- a/apps/portal/src/app/nebula/api-reference/create-session/EndpointMetadata.tsx
+++ b/apps/portal/src/app/nebula/api-reference/create-session/EndpointMetadata.tsx
@@ -11,29 +11,29 @@ export function EndpointMetadata() {
   return (
     <ApiEndpoint
       metadata={{
-        title: "Create Session",
         description: "Creates a new session.",
-        path: "/session",
-        origin: "https://nebula-api.thirdweb.com",
         method: "POST",
+        origin: "https://nebula-api.thirdweb.com",
+        path: "/session",
         request: {
-          headers: [nebulaSecretKeyHeaderParameter],
-          pathParameters: [],
           bodyParameters: [
             {
-              name: "title",
               description: "Set a custom title for the session.",
-              type: "string",
+              name: "title",
               required: false,
+              type: "string",
             },
             nebulaContextParameter,
           ],
+          headers: [nebulaSecretKeyHeaderParameter],
+          pathParameters: [],
         },
         responseExamples: {
           200: nebulaFullSessionResponse,
           401: nebulaAPI401Response,
           422: nebulaAPI422Response,
         },
+        title: "Create Session",
       }}
     />
   );
diff --git a/apps/portal/src/app/nebula/api-reference/delete-session/EndpointMetadata.tsx b/apps/portal/src/app/nebula/api-reference/delete-session/EndpointMetadata.tsx
index 95171c41b34..0e02d2b846d 100644
--- a/apps/portal/src/app/nebula/api-reference/delete-session/EndpointMetadata.tsx
+++ b/apps/portal/src/app/nebula/api-reference/delete-session/EndpointMetadata.tsx
@@ -18,21 +18,21 @@ export function EndpointMetadata() {
   return (
     <ApiEndpoint
       metadata={{
-        title: "Delete Session",
-        method: "DELETE",
         description: "Deletes a session by ID",
+        method: "DELETE",
         origin: "https://nebula-api.thirdweb.com",
         path: "/session/{session_id}",
         request: {
-          pathParameters: [nebulaSessionIdPathParameter],
-          headers: [nebulaSecretKeyHeaderParameter],
           bodyParameters: [],
+          headers: [nebulaSecretKeyHeaderParameter],
+          pathParameters: [nebulaSessionIdPathParameter],
         },
         responseExamples: {
           200: response200Example,
-          422: nebulaAPI422Response,
           401: nebulaAPI401Response,
+          422: nebulaAPI422Response,
         },
+        title: "Delete Session",
       }}
     />
   );
diff --git a/apps/portal/src/app/nebula/api-reference/execute/EndpointMetadata.tsx b/apps/portal/src/app/nebula/api-reference/execute/EndpointMetadata.tsx
index fe6f37eb65f..9af5d5aa1ed 100644
--- a/apps/portal/src/app/nebula/api-reference/execute/EndpointMetadata.tsx
+++ b/apps/portal/src/app/nebula/api-reference/execute/EndpointMetadata.tsx
@@ -26,7 +26,6 @@ export function EndpointMetadata() {
   return (
     <ApiEndpoint
       metadata={{
-        title: "Execute Action",
         description: (
           <>
             Executes a specified action. <br /> It is similar to /chat but it
@@ -34,43 +33,44 @@ export function EndpointMetadata() {
             history context.
           </>
         ),
-        path: "/execute",
-        origin: "https://nebula-api.thirdweb.com",
         method: "POST",
+        origin: "https://nebula-api.thirdweb.com",
+        path: "/execute",
         request: {
-          pathParameters: [],
-          headers: [nebulaSecretKeyHeaderParameter],
           bodyParameters: [
             {
+              description: "The message to be processed.",
+              example: "Hello",
               name: "message",
               required: true,
-              description: "The message to be processed.",
               type: "string",
-              example: "Hello",
             },
             {
+              description: "Whether to stream the response or not",
+              example: false,
               name: "stream",
               required: false,
-              description: "Whether to stream the response or not",
               type: "boolean",
-              example: false,
             },
             {
-              name: "session_id",
-              type: "string",
-              example: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-              required: false,
               description:
                 "The session ID to associate with the message. If not provided, a new session will be created.",
+              example: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+              name: "session_id",
+              required: false,
+              type: "string",
             },
             nebulaContextParameter,
           ],
+          headers: [nebulaSecretKeyHeaderParameter],
+          pathParameters: [],
         },
         responseExamples: {
           200: response200Example,
           401: nebulaAPI401Response,
           422: nebulaAPI422Response,
         },
+        title: "Execute Action",
       }}
     />
   );
diff --git a/apps/portal/src/app/nebula/api-reference/get-session/EndpointMetadata.tsx b/apps/portal/src/app/nebula/api-reference/get-session/EndpointMetadata.tsx
index fbcdf0a2079..2acd77f5132 100644
--- a/apps/portal/src/app/nebula/api-reference/get-session/EndpointMetadata.tsx
+++ b/apps/portal/src/app/nebula/api-reference/get-session/EndpointMetadata.tsx
@@ -11,21 +11,21 @@ export function EndpointMetadata() {
   return (
     <ApiEndpoint
       metadata={{
-        title: "Get Session",
         description: "Get details of a session by ID",
-        path: "/session/{session_id}",
-        origin: "https://nebula-api.thirdweb.com",
         method: "GET",
+        origin: "https://nebula-api.thirdweb.com",
+        path: "/session/{session_id}",
         request: {
-          pathParameters: [nebulaSessionIdPathParameter],
-          headers: [nebulaSecretKeyHeaderParameter],
           bodyParameters: [],
+          headers: [nebulaSecretKeyHeaderParameter],
+          pathParameters: [nebulaSessionIdPathParameter],
         },
         responseExamples: {
           200: nebulaFullSessionResponse,
           401: nebulaAPI401Response,
           422: nebulaAPI422Response,
         },
+        title: "Get Session",
       }}
     />
   );
diff --git a/apps/portal/src/app/nebula/api-reference/list-session/EndpointMetadata.tsx b/apps/portal/src/app/nebula/api-reference/list-session/EndpointMetadata.tsx
index 857355c13d5..2b7ac71f436 100644
--- a/apps/portal/src/app/nebula/api-reference/list-session/EndpointMetadata.tsx
+++ b/apps/portal/src/app/nebula/api-reference/list-session/EndpointMetadata.tsx
@@ -20,20 +20,20 @@ export function EndpointMetadata() {
   return (
     <ApiEndpoint
       metadata={{
-        title: "List Sessions",
         description: "Fetches a list of all available sessions.",
+        method: "GET",
         origin: "https://nebula-api.thirdweb.com",
         path: "/session/list",
-        method: "GET",
         request: {
-          pathParameters: [],
           bodyParameters: [],
           headers: [nebulaSecretKeyHeaderParameter],
+          pathParameters: [],
         },
         responseExamples: {
           200: response200Example,
           401: nebulaAPI401Response,
         },
+        title: "List Sessions",
       }}
     />
   );
diff --git a/apps/portal/src/app/nebula/api-reference/update-session/EndpointMetadata.tsx b/apps/portal/src/app/nebula/api-reference/update-session/EndpointMetadata.tsx
index 1b8747f7f3b..9c954c1f4ab 100644
--- a/apps/portal/src/app/nebula/api-reference/update-session/EndpointMetadata.tsx
+++ b/apps/portal/src/app/nebula/api-reference/update-session/EndpointMetadata.tsx
@@ -12,29 +12,29 @@ export function EndpointMetadata() {
   return (
     <ApiEndpoint
       metadata={{
-        title: "Update Session",
-        method: "PUT",
         description: "Update session details like title, context, etc.",
+        method: "PUT",
         origin: "https://nebula-api.thirdweb.com",
         path: "/session/{session_id}",
         request: {
-          pathParameters: [nebulaSessionIdPathParameter],
-          headers: [nebulaSecretKeyHeaderParameter],
           bodyParameters: [
             {
-              name: "title",
               description: "Set a custom title for the session.",
-              type: "string",
+              name: "title",
               required: false,
+              type: "string",
             },
             nebulaContextParameter,
           ],
+          headers: [nebulaSecretKeyHeaderParameter],
+          pathParameters: [nebulaSessionIdPathParameter],
         },
         responseExamples: {
           200: nebulaFullSessionResponse,
-          422: nebulaAPI422Response,
           401: nebulaAPI401Response,
+          422: nebulaAPI422Response,
         },
+        title: "Update Session",
       }}
     />
   );
diff --git a/apps/portal/src/app/nebula/layout.tsx b/apps/portal/src/app/nebula/layout.tsx
index 213305a88e7..bdc827a9ce4 100644
--- a/apps/portal/src/app/nebula/layout.tsx
+++ b/apps/portal/src/app/nebula/layout.tsx
@@ -1,21 +1,21 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true}>
+    <DocLayout editPageButton={true} sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
 }
 
 export const metadata = createMetadata({
-  title: "thirdweb Nebula Documentation",
+  description:
+    "thirdweb Nebula Docs : explore the Nebula API Reference and unlock the most powerful AI to interact with the blockchain yet.",
   image: {
-    title: "Nebula Docs",
     icon: "nebula",
+    title: "Nebula Docs",
   },
-  description:
-    "thirdweb Nebula Docs : explore the Nebula API Reference and unlock the most powerful AI to interact with the blockchain yet.",
+  title: "thirdweb Nebula Documentation",
 });
diff --git a/apps/portal/src/app/nebula/sidebar.tsx b/apps/portal/src/app/nebula/sidebar.tsx
index f3a154ca6cd..149566ffd1d 100644
--- a/apps/portal/src/app/nebula/sidebar.tsx
+++ b/apps/portal/src/app/nebula/sidebar.tsx
@@ -1,6 +1,3 @@
-import type { SideBar } from "@/components/Layouts/DocLayout";
-import { NebulaSideIcon, TypeScriptIcon, UnityIcon } from "@/icons";
-
 import {
   BlocksIcon,
   BracesIcon,
@@ -13,204 +10,206 @@ import {
   WorkflowIcon,
   WrenchIcon,
 } from "lucide-react";
+import type { SideBar } from "@/components/Layouts/DocLayout";
+import { NebulaSideIcon, TypeScriptIcon, UnityIcon } from "@/icons";
 
 export const sidebar: SideBar = {
-  name: "AI",
   links: [
     {
-      name: "Overview",
       href: "/nebula",
       icon: <NebulaSideIcon />,
+      name: "Overview",
     },
     {
-      name: "Prompt Guide",
       href: "/nebula/prompt-guide",
       icon: <PencilRulerIcon />,
+      name: "Prompt Guide",
     },
     {
-      name: "Playground",
       href: "https://nebula.thirdweb.com",
       icon: <ExternalLinkIcon />,
+      name: "Playground",
     },
     {
       separator: true,
     },
     {
-      name: "Nebula (API)",
       isCollapsible: false,
       links: [
         {
-          name: "Get Started",
           href: "/nebula/get-started",
           icon: <RocketIcon />,
+          name: "Get Started",
         },
         {
-          name: "Key Concepts",
           icon: <KeyIcon />,
           links: [
             {
-              name: "Chat & Execute",
               href: "/nebula/key-concepts/chat-execute",
+              name: "Chat & Execute",
             },
             {
-              name: "Context Filters",
               href: "/nebula/key-concepts/context-filters",
+              name: "Context Filters",
             },
             {
-              name: "Execute Config",
               href: "/nebula/key-concepts/execute-configuration",
+              name: "Execute Config",
             },
             {
-              name: "Response Handling",
               href: "/nebula/key-concepts/response-handling",
+              name: "Response Handling",
             },
             {
-              name: "Sessions",
               href: "/nebula/key-concepts/sessions",
+              name: "Sessions",
             },
           ],
+          name: "Key Concepts",
         },
         {
-          name: "API Reference",
           href: "/nebula/api-reference",
           icon: <BracesIcon />,
           links: [
             {
-              name: "Chat",
               expanded: true,
               links: [
                 {
-                  name: "Send Message",
                   href: "/nebula/api-reference/chat",
+                  name: "Send Message",
                 },
                 {
-                  name: "Execute Action",
                   href: "/nebula/api-reference/execute",
+                  name: "Execute Action",
                 },
               ],
+              name: "Chat",
             },
             {
-              name: "Session",
               expanded: true,
               links: [
                 {
-                  name: "List Sessions",
                   href: "/nebula/api-reference/list-session",
+                  name: "List Sessions",
                 },
                 {
-                  name: "Get Session",
                   href: "/nebula/api-reference/get-session",
+                  name: "Get Session",
                 },
                 {
-                  name: "Create Session",
                   href: "/nebula/api-reference/create-session",
+                  name: "Create Session",
                 },
                 {
-                  name: "Update Session",
                   href: "/nebula/api-reference/update-session",
+                  name: "Update Session",
                 },
                 {
-                  name: "Clear Session",
                   href: "/nebula/api-reference/clear-session",
+                  name: "Clear Session",
                 },
                 {
-                  name: "Delete Session",
                   href: "/nebula/api-reference/delete-session",
+                  name: "Delete Session",
                 },
               ],
+              name: "Session",
             },
           ],
+          name: "API Reference",
         },
         {
-          name: "SDK Reference",
           icon: <CodeIcon />,
           links: [
             {
-              name: "Typescript",
               href: "/references/typescript/v5/chat",
               icon: <TypeScriptIcon />,
+              name: "Typescript",
             },
             {
-              name: "Unity",
               href: "/dotnet/nebula/quickstart",
               icon: <UnityIcon />,
+              name: "Unity",
             },
           ],
+          name: "SDK Reference",
         },
         {
-          name: "Plugins & Integrations",
           href: "/nebula/plugins",
           icon: <BlocksIcon />,
           links: [
             {
-              name: "OpenAI",
               href: "/nebula/plugins/openai",
+              name: "OpenAI",
             },
             {
-              name: "Eliza",
               href: "/nebula/plugins/eliza",
+              name: "Eliza",
             },
           ],
+          name: "Plugins & Integrations",
         },
       ],
+      name: "Nebula (API)",
     },
     {
-      name: "MCP Server",
       isCollapsible: false,
       links: [
         {
-          name: "Get Started",
           href: "/nebula/mcp-server/get-started",
           icon: <RocketIcon />,
+          name: "Get Started",
         },
         {
-          name: "Integrations",
           icon: <WorkflowIcon />,
           links: [
             {
-              name: "Claude Desktop",
               href: "/nebula/mcp-server/integrations/claude-desktop",
+              name: "Claude Desktop",
             },
             {
-              name: "MCP Clients",
               href: "/nebula/mcp-server/integrations/mcp-clients",
+              name: "MCP Clients",
             },
           ],
+          name: "Integrations",
         },
       ],
+      name: "MCP Server",
     },
     {
-      name: "Tools",
       isCollapsible: false,
       links: [
         {
-          name: "Python SDK",
           icon: <CodeIcon />,
           links: [
             {
-              name: "Installation",
               href: "/nebula/tools/python-sdk/installation",
+              name: "Installation",
             },
             {
-              name: "Examples",
               href: "https://github.com/thirdweb-dev/ai/tree/main/python/examples",
+              name: "Examples",
             },
           ],
+          name: "Python SDK",
         },
       ],
+      name: "Tools",
     },
     {
       separator: true,
     },
     {
-      name: "Troubleshoot",
       href: "/nebula/troubleshoot",
       icon: <WrenchIcon />,
+      name: "Troubleshoot",
     },
     {
-      name: "FAQs",
       href: "/nebula/faqs",
       icon: <MessageCircleQuestionIcon />,
+      name: "FAQs",
     },
   ],
+  name: "AI",
 };
diff --git a/apps/portal/src/app/page.tsx b/apps/portal/src/app/page.tsx
index 2cd1c7a4a93..c0d94ed9a8b 100644
--- a/apps/portal/src/app/page.tsx
+++ b/apps/portal/src/app/page.tsx
@@ -1,13 +1,15 @@
-import { Grid, Heading, SDKCard } from "@/components/Document";
-import { Button } from "@/components/ui/button";
 import { MessageCircleIcon } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
-import { UnityIcon } from "../icons";
-import { DotNetIcon } from "../icons";
-import { UnrealEngineIcon } from "../icons";
-import { ReactIcon } from "../icons";
-import { TypeScriptIcon } from "../icons";
+import { Grid, Heading, SDKCard } from "@/components/Document";
+import { Button } from "@/components/ui/button";
+import {
+  DotNetIcon,
+  ReactIcon,
+  TypeScriptIcon,
+  UnityIcon,
+  UnrealEngineIcon,
+} from "../icons";
 import { BridgeIcon } from "../icons/products/BridgeIcon";
 import { ConnectIcon } from "../icons/products/ConnectIcon";
 import { EngineIcon } from "../icons/products/EngineIcon";
@@ -54,8 +56,8 @@ function Hero() {
 
       {/* right */}
       <div className="hidden justify-center lg:flex">
-        <Image src={DocsHeroDark} alt="" className="dark-only w-full" />
-        <Image src={DocsHeroLight} alt="" className="light-only w-full" />
+        <Image alt="" className="dark-only w-full" src={DocsHeroDark} />
+        <Image alt="" className="light-only w-full" src={DocsHeroLight} />
       </div>
     </section>
   );
@@ -64,13 +66,13 @@ function Hero() {
 function PlaygroundSection() {
   return (
     <section>
-      <SectionTitle id="playground" title="Live Demos" />
+      <SectionTitle anchorId="playground" title="Live Demos" />
       <ArticleCardIndex
-        href="https://playground.thirdweb.com"
-        title="Playground"
-        external
         description="Try out our interactive playground to get started"
+        external
+        href="https://playground.thirdweb.com"
         icon={PlaygroundIcon}
+        title="Playground"
       />
     </section>
   );
@@ -79,78 +81,78 @@ function PlaygroundSection() {
 function ReferenceSection() {
   return (
     <section>
-      <SectionTitle id="reference" title="API Reference" />
+      <SectionTitle anchorId="reference" title="API Reference" />
       <SectionTitle
-        id="client"
-        title="Client libraries"
-        level={4}
+        anchorId="client"
         className="text-muted-foreground"
+        level={4}
+        title="Client libraries"
       />
       <Grid>
         <SDKCard
-          title="TypeScript"
           href="/typescript/v5"
           icon={TypeScriptIcon}
+          title="TypeScript"
         />
-        <SDKCard title="React" href="/react/v5" icon={ReactIcon} />
+        <SDKCard href="/react/v5" icon={ReactIcon} title="React" />
         <SDKCard
-          title="React Native"
           href="/react-native/v5"
           icon={ReactIcon}
+          title="React Native"
         />
-        <SDKCard title="DotNet" href="/dotnet" icon={DotNetIcon} />
-        <SDKCard title="Unity" href="/unity" icon={UnityIcon} />
+        <SDKCard href="/dotnet" icon={DotNetIcon} title="DotNet" />
+        <SDKCard href="/unity" icon={UnityIcon} title="Unity" />
         <SDKCard
-          title="Unreal Engine"
           href="/unreal-engine"
           icon={UnrealEngineIcon}
+          title="Unreal Engine"
         />
       </Grid>
       <SectionTitle
-        id="backend"
-        title="Backend APIs"
-        level={4}
+        anchorId="backend"
         className="text-muted-foreground"
+        level={4}
+        title="Backend APIs"
       />
       <Grid>
         <SDKCard
-          title="Engine"
           href="https://thirdweb-engine.apidocumentation.com/"
           icon={EngineIcon}
-          isExternal
           iconClassName="text-muted-foreground"
+          isExternal
+          title="Engine"
         />
         <SDKCard
-          title="Insight"
           href="https://insight.thirdweb.com/reference#tag/webhooks"
           icon={InsightIcon}
-          isExternal
           iconClassName="text-muted-foreground"
+          isExternal
+          title="Insight"
         />
         <SDKCard
-          title="Universal Bridge"
           href="https://bridge.thirdweb.com/reference"
           icon={BridgeIcon}
-          isExternal
           iconClassName="text-muted-foreground"
+          isExternal
+          title="Universal Bridge"
         />
         <SDKCard
-          title="Wallets"
-          href="/connect/wallet/get-users" // TODO: actual openAPI docs
-          icon={ConnectIcon}
+          href="/connect/wallet/get-users"
+          icon={ConnectIcon} // TODO: actual openAPI docs
           iconClassName="text-muted-foreground"
+          title="Wallets"
         />
         <SDKCard
-          title="Bundler"
-          href="/connect/account-abstraction/api" // TODO: actual openAPI docs
-          icon={ConnectIcon}
+          href="/connect/account-abstraction/api"
+          icon={ConnectIcon} // TODO: actual openAPI docs
           iconClassName="text-muted-foreground"
+          title="Bundler"
         />
         <SDKCard
-          title="Nebula"
-          href="/nebula/api-reference" // TODO: actual openAPI docs
-          icon={NebulaIcon}
+          href="/nebula/api-reference"
+          icon={NebulaIcon} // TODO: actual openAPI docs
           iconClassName="text-muted-foreground"
+          title="Nebula"
         />
       </Grid>
     </section>
@@ -160,37 +162,37 @@ function ReferenceSection() {
 function LearningResourcesSection() {
   return (
     <section>
-      <SectionTitle id="learning" title="Learning Resources" />
+      <SectionTitle anchorId="learning" title="Learning Resources" />
       <Grid className="md:grid-cols-1 lg:grid-cols-2">
         <ArticleCardIndex
-          href="/connect"
-          title="Connect"
           description="Wallets, auth, and onchain interactions"
+          href="/connect"
           icon={ConnectIcon}
+          title="Connect"
         />
         <ArticleCardIndex
-          href="/pay"
-          title="Universal Bridge"
           description="Bridge and onramp tokens on any chain"
+          href="/pay"
           icon={BridgeIcon}
+          title="Universal Bridge"
         />
         <ArticleCardIndex
-          href="/engine"
-          title="Engine"
           description="Reliable transactions and monitoring"
+          href="/engine"
           icon={EngineIcon}
+          title="Engine"
         />
         <ArticleCardIndex
-          href="/insight"
-          title="Insight"
           description="Blockchain data queries and transformations"
+          href="/insight"
           icon={InsightIcon}
+          title="Insight"
         />
         <ArticleCardIndex
-          href="/nebula"
-          title="Nebula"
           description="API interface for LLMs"
+          href="/nebula"
           icon={NebulaIcon}
+          title="Nebula"
         />
       </Grid>
     </section>
@@ -199,16 +201,16 @@ function LearningResourcesSection() {
 
 function SectionTitle(props: {
   title: string;
-  id: string;
+  anchorId: string;
   level?: number;
   className?: string;
 }) {
   return (
     <Heading
-      id={props.id}
-      level={props.level || 2}
       anchorClassName="mb-4 mt-0"
+      anchorId={props.anchorId}
       className={cn(props.className)}
+      level={props.level || 2}
     >
       {props.title}
     </Heading>
@@ -227,9 +229,9 @@ function ArticleCardIndex(props: {
 }) {
   return (
     <Link
+      className="flex items-center gap-4 rounded-lg border bg-card p-4 transition-colors hover:border-active-border"
       href={props.href}
       target={props.external ? "_blank" : undefined}
-      className="flex items-center gap-4 rounded-lg border bg-card p-4 transition-colors hover:border-active-border"
     >
       <div className="flex items-center gap-3">
         {props.icon && <props.icon className="text-muted-foreground" />}
diff --git a/apps/portal/src/app/pay/layout.tsx b/apps/portal/src/app/pay/layout.tsx
index 491e6e1ff15..0712d62ed43 100644
--- a/apps/portal/src/app/pay/layout.tsx
+++ b/apps/portal/src/app/pay/layout.tsx
@@ -1,21 +1,21 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true}>
+    <DocLayout editPageButton={true} sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
 }
 
 export const metadata = createMetadata({
-  title: "thirdweb Universal Bridge Documentation",
+  description:
+    "thirdweb Universal Bridge documentation. Learn how to use the thirdweb Universal Bridge to send and receive tokens across different blockchains.",
   image: {
-    title: "thirdweb Universal Bridge Docs",
     icon: "nebula",
+    title: "thirdweb Universal Bridge Docs",
   },
-  description:
-    "thirdweb Universal Bridge documentation. Learn how to use the thirdweb Universal Bridge to send and receive tokens across different blockchains.",
+  title: "thirdweb Universal Bridge Documentation",
 });
diff --git a/apps/portal/src/app/pay/sidebar.tsx b/apps/portal/src/app/pay/sidebar.tsx
index ff3c38ff660..4d198af9239 100644
--- a/apps/portal/src/app/pay/sidebar.tsx
+++ b/apps/portal/src/app/pay/sidebar.tsx
@@ -1,4 +1,3 @@
-import type { SideBar } from "@/components/Layouts/DocLayout";
 import {
   AlbumIcon,
   ArrowLeftRightIcon,
@@ -13,119 +12,120 @@ import {
   WebhookIcon,
   WrenchIcon,
 } from "lucide-react";
+import type { SideBar } from "@/components/Layouts/DocLayout";
 
 const paySlug = "/pay";
 
 export const sidebar: SideBar = {
-  name: "Universal Bridge",
   links: [
     {
-      name: "Overview",
       href: `${paySlug}`,
       icon: <WalletIcon />,
+      name: "Overview",
     },
     {
-      name: "Supported Routes",
       href: "https://thirdweb.com/routes",
       icon: <ArrowLeftRightIcon />,
+      name: "Supported Routes",
     },
     {
-      name: "Onramp Providers",
       href: `${paySlug}/onramp-providers`,
       icon: <TriangleRightIcon />,
+      name: "Onramp Providers",
     },
     {
-      name: "Service Fees",
       href: `${paySlug}/fees`,
       icon: <CircleDollarSignIcon />,
+      name: "Service Fees",
     },
     {
-      name: "Get Started",
       href: `${paySlug}/get-started`,
       icon: <RocketIcon />,
       links: [
         {
-          name: "Installation",
           href: `${paySlug}/get-started#installation`,
+          name: "Installation",
         },
         {
-          name: "Recipes",
           href: `${paySlug}/get-started#recipes`,
+          name: "Recipes",
         },
       ],
+      name: "Get Started",
     },
     {
-      name: "Tutorials",
-      isCollapsible: true,
       icon: <AlbumIcon />,
+      isCollapsible: true,
       links: [
         {
-          name: "Cross-Chain Swapping",
           href: `${paySlug}/guides/cross-chain-swapping`,
+          name: "Cross-Chain Swapping",
         },
         {
-          name: "Swap with Smart Accounts",
           href: `${paySlug}/guides/smart-accounts`,
+          name: "Swap with Smart Accounts",
         },
         {
-          name: "Fiat Onramp",
           href: `${paySlug}/guides/onramp-integration`,
+          name: "Fiat Onramp",
         },
         {
-          name: "NFT Checkout",
           href: `${paySlug}/guides/nft-checkout`,
+          name: "NFT Checkout",
         },
       ],
+      name: "Tutorials",
     },
     {
-      name: "Customization",
-      isCollapsible: true,
       icon: <PaletteIcon />,
+      isCollapsible: true,
       links: [
         {
-          name: "ConnectButton",
           href: `${paySlug}/customization/connectbutton`,
+          name: "ConnectButton",
         },
         {
-          name: "PayEmbed",
           href: `${paySlug}/customization/payembed`,
+          name: "PayEmbed",
         },
         {
-          name: "useSendTransaction",
           href: `${paySlug}/customization/send-transaction`,
+          name: "useSendTransaction",
         },
       ],
+      name: "Customization",
     },
     {
-      name: "API Reference",
       href: "https://bridge.thirdweb.com/reference",
       icon: <BracesIcon />,
+      name: "API Reference",
     },
     {
-      name: "SDK Reference",
       href: "/typescript/v5/buy/quote",
       icon: <CodeIcon />,
       links: [
         {
-          name: "TypeScript SDK",
           href: "/typescript/v5/buy/quote",
+          name: "TypeScript SDK",
         },
       ],
+      name: "SDK Reference",
     },
     {
-      name: "Webhooks",
       href: `${paySlug}/webhooks`,
       icon: <WebhookIcon />,
+      name: "Webhooks",
     },
     {
-      name: "Troubleshoot",
       href: `${paySlug}/troubleshoot`,
       icon: <WrenchIcon />,
+      name: "Troubleshoot",
     },
     {
-      name: "FAQs",
       href: `${paySlug}/faqs`,
       icon: <MessageCircleQuestionIcon />,
+      name: "FAQs",
     },
   ],
+  name: "Universal Bridge",
 };
diff --git a/apps/portal/src/app/react-native/v5/[...slug]/page.tsx b/apps/portal/src/app/react-native/v5/[...slug]/page.tsx
index 588c390b517..8ebd8dcd5d1 100644
--- a/apps/portal/src/app/react-native/v5/[...slug]/page.tsx
+++ b/apps/portal/src/app/react-native/v5/[...slug]/page.tsx
@@ -1,6 +1,6 @@
 import notFound from "../../../not-found";
-import { RootTDoc } from "../../../references/components/TDoc/Root";
 import { fetchTypeScriptDoc } from "../../../references/components/TDoc/fetchDocs/fetchTypeScriptDoc";
+import { RootTDoc } from "../../../references/components/TDoc/Root";
 import { getSlugToDocMap } from "../../../references/components/TDoc/utils/slugs";
 
 type PageProps = { params: Promise<{ slug: string[] }> };
diff --git a/apps/portal/src/app/react-native/v5/layout.tsx b/apps/portal/src/app/react-native/v5/layout.tsx
index 9c69f07fe3a..7a474caa5ba 100644
--- a/apps/portal/src/app/react-native/v5/layout.tsx
+++ b/apps/portal/src/app/react-native/v5/layout.tsx
@@ -1,13 +1,13 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { PlatformSelector } from "../../../components/others/PlatformSelector";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Connect</p>
@@ -21,7 +21,7 @@ export default async function Layout(props: { children: React.ReactNode }) {
 }
 
 export const metadata = createMetadata({
-  title: "thirdweb React Native SDK",
   description:
     "A type-safe library to interact with any EVM-compatible blockchain in React Native applications",
+  title: "thirdweb React Native SDK",
 });
diff --git a/apps/portal/src/app/react-native/v5/sidebar.tsx b/apps/portal/src/app/react-native/v5/sidebar.tsx
index 451101c218c..13267b23ed1 100644
--- a/apps/portal/src/app/react-native/v5/sidebar.tsx
+++ b/apps/portal/src/app/react-native/v5/sidebar.tsx
@@ -5,44 +5,44 @@ import { ReactIcon, TypeScriptIcon } from "../../../icons";
 const slug = "/react-native/v5";
 
 export const sidebar: SideBar = {
-  name: "Connect React Native SDK",
   links: [
     {
       separator: true,
     },
     {
-      name: "Overview",
       href: slug,
+      name: "Overview",
     },
     {
-      name: "Getting Started",
       href: `${slug}/getting-started`,
       icon: <ZapIcon />,
+      name: "Getting Started",
     },
     {
-      name: "Troubleshooting",
       href: `${slug}/troubleshooting`,
       icon: <BugIcon />,
+      name: "Troubleshooting",
     },
     {
-      name: "Differences from React",
       href: `${slug}/differences`,
       icon: <BookIcon />,
+      name: "Differences from React",
     },
     {
-      name: "TypeScript docs",
       href: "/typescript/v5",
       icon: <TypeScriptIcon />,
+      name: "TypeScript docs",
     },
     {
-      name: "React docs",
       href: "/react/v5",
       icon: <ReactIcon />,
+      name: "React docs",
     },
     {
-      name: "API Reference",
       href: "/references/typescript/v5",
       icon: <CodeIcon />,
+      name: "API Reference",
     },
   ],
+  name: "Connect React Native SDK",
 };
diff --git a/apps/portal/src/app/react/v5/[...slug]/page.tsx b/apps/portal/src/app/react/v5/[...slug]/page.tsx
index 588c390b517..8ebd8dcd5d1 100644
--- a/apps/portal/src/app/react/v5/[...slug]/page.tsx
+++ b/apps/portal/src/app/react/v5/[...slug]/page.tsx
@@ -1,6 +1,6 @@
 import notFound from "../../../not-found";
-import { RootTDoc } from "../../../references/components/TDoc/Root";
 import { fetchTypeScriptDoc } from "../../../references/components/TDoc/fetchDocs/fetchTypeScriptDoc";
+import { RootTDoc } from "../../../references/components/TDoc/Root";
 import { getSlugToDocMap } from "../../../references/components/TDoc/utils/slugs";
 
 type PageProps = { params: Promise<{ slug: string[] }> };
diff --git a/apps/portal/src/app/react/v5/layout.tsx b/apps/portal/src/app/react/v5/layout.tsx
index a4fba31dd03..c84645b448b 100644
--- a/apps/portal/src/app/react/v5/layout.tsx
+++ b/apps/portal/src/app/react/v5/layout.tsx
@@ -1,13 +1,13 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { PlatformSelector } from "../../../components/others/PlatformSelector";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Connect</p>
@@ -21,7 +21,7 @@ export default async function Layout(props: { children: React.ReactNode }) {
 }
 
 export const metadata = createMetadata({
-  title: "thirdweb React SDK",
   description:
     "A type-safe library to interact with any EVM-compatible blockchain in React applications.",
+  title: "thirdweb React SDK",
 });
diff --git a/apps/portal/src/app/react/v5/sidebar.tsx b/apps/portal/src/app/react/v5/sidebar.tsx
index ddad151cc3d..09860856c87 100644
--- a/apps/portal/src/app/react/v5/sidebar.tsx
+++ b/apps/portal/src/app/react/v5/sidebar.tsx
@@ -4,178 +4,178 @@ import type { SideBar } from "../../../components/Layouts/DocLayout";
 const slug = "/react/v5";
 
 export const sidebar: SideBar = {
-  name: "Connect React SDK",
   links: [
     {
       separator: true,
     },
     {
-      name: "Overview",
       href: slug,
+      name: "Overview",
     },
     {
-      name: "Getting Started",
       href: `${slug}/getting-started`,
       icon: <ZapIcon />,
+      name: "Getting Started",
     },
     {
-      name: "Live Playground",
       href: "https://playground.thirdweb.com/",
       icon: <ExternalLinkIcon />,
+      name: "Live Playground",
     },
     {
-      name: "API Reference",
       href: "/references/typescript/v5",
-      isCollapsible: false,
       icon: <CodeIcon />,
+      isCollapsible: false,
+      name: "API Reference",
     },
     {
       separator: true,
     },
     {
-      name: "Onboarding Users",
       isCollapsible: false,
       links: [
         {
-          name: "UI Components",
           href: `${slug}/connecting-wallets/ui-components`,
+          name: "UI Components",
         },
         {
-          name: "Connection Hooks",
           href: `${slug}/connecting-wallets/hooks`,
+          name: "Connection Hooks",
         },
         {
-          name: "In-App Wallets",
           href: `${slug}/in-app-wallet/get-started`,
+          name: "In-App Wallets",
         },
         {
-          name: "Ecosystems Wallets",
           href: `${slug}/ecosystem-wallet/get-started`,
+          name: "Ecosystems Wallets",
         },
         {
-          name: "External Wallets",
           href: "/typescript/v5/supported-wallets",
+          name: "External Wallets",
         },
         {
-          name: "Account Abstraction",
           href: `${slug}/account-abstraction/get-started`,
+          name: "Account Abstraction",
         },
         {
-          name: "Funding wallets",
           href: `${slug}/pay/fund-wallets`,
+          name: "Funding wallets",
         },
       ],
+      name: "Onboarding Users",
     },
     {
       separator: true,
     },
     {
-      name: "User Identity",
       isCollapsible: false,
       links: [
         {
-          name: "UI Components",
           href: `${slug}/components/account`,
+          name: "UI Components",
         },
         {
-          name: "Sign in with Ethereum",
           href: `${slug}/auth`,
+          name: "Sign in with Ethereum",
         },
         {
-          name: "Link Profiles",
           href: `${slug}/linking`,
+          name: "Link Profiles",
         },
         {
-          name: "Web3 Social Identities",
           href: `${slug}/social`,
+          name: "Web3 Social Identities",
         },
         {
-          name: "Permissions",
           href: `${slug}/account-abstraction/permissions`,
+          name: "Permissions",
         },
         {
-          name: "Export private key",
           href: `${slug}/in-app-wallet/export-private-key`,
+          name: "Export private key",
         },
       ],
+      name: "User Identity",
     },
     {
       separator: true,
     },
     {
-      name: "Onchain Interactions",
       isCollapsible: false,
       links: [
         // TODO - SPONSOR TRANSACTIONS
         {
-          name: "UI Components",
           href: `${slug}/components/onchain`,
+          name: "UI Components",
         },
         {
-          name: "Reading State",
           href: `${slug}/reading-state`,
+          name: "Reading State",
         },
         {
-          name: "Transactions",
           href: `${slug}/transactions`,
+          name: "Transactions",
         },
         {
-          name: "Sponsored Transactions",
           href: `${slug}/in-app-wallet/enable-gasless`,
+          name: "Sponsored Transactions",
         },
         {
-          name: "Chain Abstraction",
           href: `${slug}/pay/transaction`,
+          name: "Chain Abstraction",
         },
       ],
+      name: "Onchain Interactions",
     },
     {
       separator: true,
     },
     {
-      name: "Advanced",
       isCollapsible: false,
       links: [
         {
+          href: `${slug}/adapters`,
           // TODO one guide per library
           name: "Usage with other libraries",
-          href: `${slug}/adapters`,
         },
         {
-          name: "Shared Logins",
           links: ["SiteEmbed", "SiteLink"].map((name) => ({
-            name,
             href: `${slug}/${name}`,
+            name,
           })),
+          name: "Shared Logins",
         },
       ],
+      name: "Advanced",
     },
     { separator: true },
     {
-      name: "Migrate from v4",
       href: `${slug}/migrate`,
       links: [
         {
-          name: "Installation",
           href: `${slug}/migrate/installation`,
+          name: "Installation",
         },
         {
-          name: "Interacting with contracts",
           href: `${slug}/migrate/contracts`,
+          name: "Interacting with contracts",
         },
         {
-          name: "ethers.js Adapter",
           href: `${slug}/migrate/ethers-adapter`,
+          name: "ethers.js Adapter",
         },
         {
-          name: "Cheatsheet",
           href: `${slug}/migrate/cheatsheet`,
+          name: "Cheatsheet",
         },
       ],
+      name: "Migrate from v4",
     },
     {
-      name: "Migrate from RainbowKit",
       href: `${slug}/rainbow-kit-migrate`,
+      name: "Migrate from RainbowKit",
     },
   ],
+  name: "Connect React SDK",
 };
diff --git a/apps/portal/src/app/references/components/TDoc/Accessor.tsx b/apps/portal/src/app/references/components/TDoc/Accessor.tsx
index 9182cd658df..1d664c40caf 100644
--- a/apps/portal/src/app/references/components/TDoc/Accessor.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Accessor.tsx
@@ -1,7 +1,7 @@
-import { Callout, Details } from "@/components/Document";
-import { sluggerContext } from "@/contexts/slugger";
 import invariant from "tiny-invariant";
 import { type AccessorDoc, getAccessorSignature } from "typedoc-better-json";
+import { Callout, Details } from "@/components/Document";
+import { sluggerContext } from "@/contexts/slugger";
 import { CodeBlock } from "../../../../components/Document/Code";
 import { Heading } from "../../../../components/Document/Heading";
 import { DeprecatedCalloutTDoc } from "./Deprecated";
@@ -29,7 +29,7 @@ export async function AccessorTDoc(props: {
   return (
     <>
       {props.hideHeading !== true && (
-        <Heading level={props.level} id={doc.name}>
+        <Heading anchorId={doc.name} level={props.level}>
           {doc.name}
         </Heading>
       )}
@@ -46,17 +46,17 @@ export async function AccessorTDoc(props: {
         </Callout>
       )}
 
-      <Details id="signature" summary="Signature" noIndex>
+      <Details anchorId="signature" noIndex summary="Signature">
         <CodeBlock
-          lang="ts"
           code={signatureCode}
+          lang="ts"
           tokenLinks={tokens ? await getTokenLinks(tokens) : undefined}
         />
       </Details>
 
       {exampleTag?.summary && (
         <>
-          <Heading level={subLevel} id={slugger.slug("example")} noIndex>
+          <Heading anchorId={slugger.slug("example")} level={subLevel} noIndex>
             Example
           </Heading>
           <TypedocSummary summary={exampleTag.summary} />
@@ -65,7 +65,7 @@ export async function AccessorTDoc(props: {
 
       {doc.returns?.summary && (
         <>
-          <Heading id="returns" level={props.level + 1} noIndex>
+          <Heading anchorId="returns" level={props.level + 1} noIndex>
             Returns
           </Heading>
           {doc.returns?.summary && (
diff --git a/apps/portal/src/app/references/components/TDoc/Class.tsx b/apps/portal/src/app/references/components/TDoc/Class.tsx
index a207f01755a..1bdf61967ce 100644
--- a/apps/portal/src/app/references/components/TDoc/Class.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Class.tsx
@@ -1,12 +1,12 @@
-import { Callout } from "@/components/Document";
-import { sluggerContext } from "@/contexts/slugger";
 import invariant from "tiny-invariant";
 import {
   type ClassDoc,
   type FunctionDoc,
-  type VariableDoc,
   getClassSignature,
+  type VariableDoc,
 } from "typedoc-better-json";
+import { Callout } from "@/components/Document";
+import { sluggerContext } from "@/contexts/slugger";
 import { CodeBlock } from "../../../../components/Document/Code";
 import { Details } from "../../../../components/Document/Details";
 import { Heading } from "../../../../components/Document/Heading";
@@ -15,9 +15,9 @@ import { DeprecatedCalloutTDoc } from "./Deprecated";
 import { FunctionTDoc } from "./Function";
 import { SourceLinkTypeDoc } from "./SourceLink";
 import { TypedocSummary } from "./Summary";
-import { VariableTDoc } from "./Variable";
 import { getTags } from "./utils/getTags";
 import { getTokenLinks } from "./utils/getTokenLinks";
+import { VariableTDoc } from "./Variable";
 
 export async function ClassTDoc(props: { doc: ClassDoc }) {
   const { doc } = props;
@@ -114,9 +114,9 @@ export async function ClassTDoc(props: { doc: ClassDoc }) {
       const flags = method.signatures?.[0]?.flags;
       return (
         <Details
+          anchorId={method.name}
           key={method.name}
           summary={method.name}
-          id={method.name}
           tags={[
             flags?.isOptional ? "optional" : "",
             flags?.isStatic ? "static" : "",
@@ -134,7 +134,7 @@ export async function ClassTDoc(props: { doc: ClassDoc }) {
 
   return (
     <div>
-      <Heading level={1} id={doc.name}>
+      <Heading anchorId={doc.name} level={1}>
         {doc.name}
       </Heading>
 
@@ -152,24 +152,24 @@ export async function ClassTDoc(props: { doc: ClassDoc }) {
 
       {exampleTag?.summary && (
         <>
-          <Heading level={3} id={slugger.slug("example")} noIndex>
+          <Heading anchorId={slugger.slug("example")} level={3} noIndex>
             Example
           </Heading>
           <TypedocSummary summary={exampleTag.summary} />
         </>
       )}
 
-      <Details summary="Signature" id={slugger.slug("signature")} noIndex>
+      <Details anchorId={slugger.slug("signature")} noIndex summary="Signature">
         <CodeBlock
-          lang="ts"
           code={signatureCode}
+          lang="ts"
           tokenLinks={tokens ? await getTokenLinks(tokens) : undefined}
         />
       </Details>
 
       {/* Constructor */}
       {doc.constructor && (
-        <Details id="constructor" level={2} summary="Constructor" noIndex>
+        <Details anchorId="constructor" level={2} noIndex summary="Constructor">
           <FunctionTDoc doc={doc.constructor} level={2} showHeading={false} />
         </Details>
       )}
@@ -177,7 +177,7 @@ export async function ClassTDoc(props: { doc: ClassDoc }) {
       {/* Methods */}
       {regularMethods && regularMethods.length > 0 && (
         <div>
-          <Heading level={2} id="methods" noIndex>
+          <Heading anchorId="methods" level={2} noIndex>
             Methods
           </Heading>
           <div>{renderMethods(regularMethods)}</div>
@@ -187,7 +187,7 @@ export async function ClassTDoc(props: { doc: ClassDoc }) {
       {/* Inherited methods */}
       {inheritedMethods && inheritedMethods.length > 0 && (
         <div>
-          <Heading level={2} id="methods" noIndex>
+          <Heading anchorId="methods" level={2} noIndex>
             Inherited Methods
           </Heading>
           <div>{renderMethods(inheritedMethods)}</div>
@@ -197,16 +197,16 @@ export async function ClassTDoc(props: { doc: ClassDoc }) {
       {/* Properties */}
       {properties && properties.length > 0 && (
         <div>
-          <Heading level={2} id="properties" noIndex>
+          <Heading anchorId="properties" level={2} noIndex>
             Properties
           </Heading>
           <div>
             {properties.map((property) => {
               return (
                 <Details
+                  anchorId={property.name}
                   key={property.name}
                   summary={property.name}
-                  id={property.name}
                 >
                   <VariableTDoc
                     doc={property}
@@ -224,22 +224,22 @@ export async function ClassTDoc(props: { doc: ClassDoc }) {
       {/* Accessor */}
       {accessors && accessors.length > 0 && (
         <div>
-          <Heading level={2} id="properties" className="text-5xl" noIndex>
+          <Heading anchorId="properties" className="text-5xl" level={2} noIndex>
             Accessors
           </Heading>
           <div>
             {accessors.map((accessor) => {
               return (
                 <Details
+                  anchorId={accessor.name}
                   key={accessor.name}
-                  id={accessor.name}
                   summary={accessor.name}
                 >
                   <AccessorTDoc
                     doc={accessor}
+                    hideHeading={true}
                     key={accessor.name}
                     level={3}
-                    hideHeading={true}
                   />
                 </Details>
               );
diff --git a/apps/portal/src/app/references/components/TDoc/Deprecated.tsx b/apps/portal/src/app/references/components/TDoc/Deprecated.tsx
index a286188811a..977ad022ed4 100644
--- a/apps/portal/src/app/references/components/TDoc/Deprecated.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Deprecated.tsx
@@ -4,7 +4,7 @@ import { TypedocSummary } from "./Summary";
 
 export function DeprecatedCalloutTDoc(props: { tag: BlockTag }) {
   return (
-    <Callout variant="warning" disableIcon>
+    <Callout disableIcon variant="warning">
       <div className="flex w-full flex-col gap-2 ">
         <div className="font-semibold text-lg">Deprecated</div>
         <div>
diff --git a/apps/portal/src/app/references/components/TDoc/Enum.tsx b/apps/portal/src/app/references/components/TDoc/Enum.tsx
index 495d7baf774..2829db97fe0 100644
--- a/apps/portal/src/app/references/components/TDoc/Enum.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Enum.tsx
@@ -1,7 +1,7 @@
-import { Callout } from "@/components/Document";
-import { sluggerContext } from "@/contexts/slugger";
 import invariant from "tiny-invariant";
 import { type EnumDoc, getEnumSignature } from "typedoc-better-json";
+import { Callout } from "@/components/Document";
+import { sluggerContext } from "@/contexts/slugger";
 import { CodeBlock } from "../../../../components/Document/Code";
 import { Heading } from "../../../../components/Document/Heading";
 import { DeprecatedCalloutTDoc } from "./Deprecated";
@@ -24,7 +24,7 @@ export function EnumTDoc(props: { doc: EnumDoc; level: number }) {
 
   return (
     <>
-      <Heading level={props.level} id={doc.name}>
+      <Heading anchorId={doc.name} level={props.level}>
         {doc.name}
       </Heading>
 
@@ -36,7 +36,7 @@ export function EnumTDoc(props: { doc: EnumDoc; level: number }) {
 
       {exampleTag?.summary && (
         <>
-          <Heading level={subLevel} id={slugger.slug("example")} noIndex>
+          <Heading anchorId={slugger.slug("example")} level={subLevel} noIndex>
             Example
           </Heading>
           <TypedocSummary summary={exampleTag.summary} />
@@ -49,15 +49,15 @@ export function EnumTDoc(props: { doc: EnumDoc; level: number }) {
         </Callout>
       )}
 
-      <CodeBlock lang="ts" code={code} />
+      <CodeBlock code={code} lang="ts" />
 
       {doc.members?.map((member) => {
         return (
           <MemberTDoc
             doc={member}
-            level={props.level + 1}
             enumName={doc.name}
             key={member.name}
+            level={props.level + 1}
           />
         );
       })}
@@ -74,11 +74,11 @@ function MemberTDoc(props: {
 
   return (
     <div key={member.name}>
-      <Heading level={props.level + 1} id={member.name}>
+      <Heading anchorId={member.name} level={props.level + 1}>
         {member.name}
       </Heading>
       {member.summary && <TypedocSummary summary={member.summary} />}
-      <CodeBlock lang="ts" code={`${member.value.code}`} />
+      <CodeBlock code={`${member.value.code}`} lang="ts" />
     </div>
   );
 }
diff --git a/apps/portal/src/app/references/components/TDoc/Function.tsx b/apps/portal/src/app/references/components/TDoc/Function.tsx
index 91425c4f006..731dc3552b9 100644
--- a/apps/portal/src/app/references/components/TDoc/Function.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Function.tsx
@@ -1,24 +1,24 @@
-import { DocLink, Paragraph } from "@/components/Document";
-import { InlineCode } from "@/components/Document/InlineCode";
-import { sluggerContext } from "@/contexts/slugger";
 import invariant from "tiny-invariant";
 import {
   type FunctionDoc,
   type FunctionParameter,
   type FunctionSignature,
+  getFunctionSignature,
   type InterfaceDoc,
   type Summary,
   type TypeInfo,
-  getFunctionSignature,
 } from "typedoc-better-json";
+import { DocLink, Paragraph } from "@/components/Document";
+import { InlineCode } from "@/components/Document/InlineCode";
+import { sluggerContext } from "@/contexts/slugger";
 import { Callout } from "../../../../components/Document/Callout";
 import { CodeBlock } from "../../../../components/Document/Code";
 import { Details } from "../../../../components/Document/Details";
 import { Heading } from "../../../../components/Document/Heading";
 import { DeprecatedCalloutTDoc } from "./Deprecated";
+import fetchDocBySlug from "./fetchDocs/fetchDocBySlug";
 import { SourceLinkTypeDoc } from "./SourceLink";
 import { TypedocSummary } from "./Summary";
-import fetchDocBySlug from "./fetchDocs/fetchDocBySlug";
 import { getExtensionName } from "./utils/getSidebarLinkgroups";
 import { getTags } from "./utils/getTags";
 import { getTokenLinks } from "./utils/getTokenLinks";
@@ -45,7 +45,7 @@ export function FunctionTDoc(props: {
   return (
     <>
       {props.showHeading !== false && (
-        <Heading level={props.level} id={slugger.slug(doc.name)}>
+        <Heading anchorId={slugger.slug(doc.name)} level={props.level}>
           {extensionName && extensionName !== "Common"
             ? `${extensionName}.${doc.name}`
             : doc.name}
@@ -55,12 +55,12 @@ export function FunctionTDoc(props: {
       {doc.source && <SourceLinkTypeDoc href={doc.source} />}
       {doc.signatures?.map((signature, i) => (
         <RenderFunctionSignature
-          signatureId={multipleSignatures ? i + 1 : undefined}
-          signature={signature}
-          name={doc.name}
-          level={props.level + 1}
           // biome-ignore lint/suspicious/noArrayIndexKey: nothing better available
           key={i}
+          level={props.level + 1}
+          name={doc.name}
+          signature={signature}
+          signatureId={multipleSignatures ? i + 1 : undefined}
         />
       ))}
     </>
@@ -93,12 +93,12 @@ async function RenderFunctionSignature(props: {
     <>
       {props.signatureId && (
         <Heading
-          level={props.level}
-          id={slugger.slug(
+          anchorId={slugger.slug(
             `${props.name}-signature-${props.signatureId}`,
             false,
           )}
           className="text-foreground"
+          level={props.level}
           noIndex
         >
           Signature
@@ -126,7 +126,7 @@ async function RenderFunctionSignature(props: {
 
       {exampleTag?.summary && (
         <>
-          <Heading level={subLevel} id={slugger.slug("example")} noIndex>
+          <Heading anchorId={slugger.slug("example")} level={subLevel} noIndex>
             Example
           </Heading>
           <TypedocSummary summary={exampleTag.summary} />
@@ -134,10 +134,10 @@ async function RenderFunctionSignature(props: {
       )}
 
       <Details
+        anchorId={slugger.slug("signature")}
+        noIndex
         startExpanded
-        id={slugger.slug("signature")}
         summary="Signature"
-        noIndex
       >
         <CodeBlock
           code={signatureCode.code}
@@ -149,8 +149,11 @@ async function RenderFunctionSignature(props: {
       {signature.parameters && (
         <div className="mt-5">
           <Heading
+            anchorId={slugger.slug(
+              `${props.name}--param--${props.name}`,
+              false,
+            )}
             level={subLevel}
-            id={slugger.slug(`${props.name}--param--${props.name}`, false)}
             noIndex
           >
             Parameters
@@ -158,11 +161,11 @@ async function RenderFunctionSignature(props: {
           {props.signature.parameters?.map(async (param) => {
             return (
               <Details
-                id={slugger.slug(param.name)}
+                anchorId={slugger.slug(param.name)}
                 key={param.name}
                 level={props.level + 1}
-                summary={param.name}
                 startExpanded
+                summary={param.name}
                 tags={[
                   param.flags?.isOptional ? "optional" : "",
                   param.flags?.isPrivate ? "private" : "",
@@ -170,7 +173,7 @@ async function RenderFunctionSignature(props: {
                   param.flags?.isStatic ? "static" : "",
                 ].filter((w) => w)}
               >
-                <ParameterTDoc param={param} level={subLevel} />
+                <ParameterTDoc level={subLevel} param={param} />
               </Details>
             );
           })}
@@ -180,8 +183,8 @@ async function RenderFunctionSignature(props: {
       {signature.returns && (
         <div className="mt-5">
           <Heading
+            anchorId={slugger.slug(`${props.name}-returns`)}
             level={subLevel}
-            id={slugger.slug(`${props.name}-returns`)}
             noIndex
           >
             Returns
@@ -189,10 +192,10 @@ async function RenderFunctionSignature(props: {
           <div>
             {signature.returns.type && (
               <Details
+                anchorId={slugger.slug(`${props.name}-return-type`)}
+                noIndex
                 startExpanded
-                id={slugger.slug(`${props.name}-return-type`)}
                 summary="Return Type"
-                noIndex
               >
                 <ReturnsTDoc returns={signature.returns} />
               </Details>
@@ -207,7 +210,7 @@ async function RenderFunctionSignature(props: {
 
       {prepareTag && (
         <div className="mt-8" data-noindex>
-          <Callout variant="info" title="Preparable">
+          <Callout title="Preparable" variant="info">
             <Paragraph>
               You can also prepare the transaction without executing it by
               calling <InlineCode code={`${name}.prepare()`} /> with same
@@ -303,10 +306,10 @@ async function ParameterTDoc(props: {
           {showType && (
             <>
               <Heading
+                anchorClassName={!param.summary ? "mt-0" : ""}
+                anchorId={slugger.slug(`${param.name}type`)}
                 level={props.level + 1}
-                id={slugger.slug(`${param.name}type`)}
                 noIndex
-                anchorClassName={!param.summary ? "mt-0" : ""}
               >
                 Type
               </Heading>
@@ -314,6 +317,7 @@ async function ParameterTDoc(props: {
               <CodeBlock
                 // Prioritize the unrolled type when showing the parameter codeblock
                 code={`let ${param.name}: ${fullTypeDoc?.type?.code ?? param.type.code}`}
+                lang="ts"
                 tokenLinks={
                   param.type.tokens
                     ? await getTokenLinks([
@@ -322,7 +326,6 @@ async function ParameterTDoc(props: {
                       ])
                     : undefined
                 }
-                lang="ts"
               />
             </>
           )}
@@ -330,8 +333,8 @@ async function ParameterTDoc(props: {
           {exampleTag?.summary && (
             <>
               <Heading
+                anchorId={slugger.slug(`${param.name}example`)}
                 level={props.level + 1}
-                id={slugger.slug(`${param.name}example`)}
                 noIndex
               >
                 Example
diff --git a/apps/portal/src/app/references/components/TDoc/PageLayout.tsx b/apps/portal/src/app/references/components/TDoc/PageLayout.tsx
index d7106f678b1..d75ce99645c 100644
--- a/apps/portal/src/app/references/components/TDoc/PageLayout.tsx
+++ b/apps/portal/src/app/references/components/TDoc/PageLayout.tsx
@@ -1,19 +1,19 @@
+import GithubSlugger from "github-slugger";
+import { FileTextIcon, FolderOpenIcon } from "lucide-react";
+import type { Metadata } from "next";
+import { notFound } from "next/navigation";
+import invariant from "tiny-invariant";
+import type { TransformedDoc } from "typedoc-better-json";
 import {
   ArticleIconCard,
+  createMetadata,
   Details,
   Heading,
-  createMetadata,
 } from "@/components/Document";
 import { Breadcrumb } from "@/components/Document/Breadcrumb";
 import { DocLayout } from "@/components/Layouts/DocLayout";
 import type { LinkGroup, LinkMeta } from "@/components/others/Sidebar";
 import { sluggerContext } from "@/contexts/slugger";
-import GithubSlugger from "github-slugger";
-import { FileTextIcon, FolderOpenIcon } from "lucide-react";
-import type { Metadata } from "next";
-import { notFound } from "next/navigation";
-import invariant from "tiny-invariant";
-import type { TransformedDoc } from "typedoc-better-json";
 import type { MetadataImageIcon } from "../../../../components/Document/metadata";
 import { RootTDoc } from "./Root";
 import { getSidebarLinkGroups } from "./utils/getSidebarLinkgroups";
@@ -56,9 +56,9 @@ export function getTDocPage(options: {
       if (docSlug in subgroups) {
         return (
           <CategoryPage
-            slug={docSlug as keyof typeof subgroups}
             doc={doc}
             packageSlug={packageSlug}
+            slug={docSlug as keyof typeof subgroups}
             version={version}
           />
         );
@@ -76,12 +76,12 @@ export function getTDocPage(options: {
           <Breadcrumb
             crumbs={[
               {
-                name: "References",
                 href: `/references/${packageSlug}/${version}`,
+                name: "References",
               },
               {
-                name: selectedDoc.name,
                 href: `/references/${packageSlug}/${version}/${selectedDoc.name}`,
+                name: selectedDoc.name,
               },
             ]}
           />
@@ -146,24 +146,24 @@ export function getTDocPage(options: {
     }
 
     return createMetadata({
-      title: `${docName} - ${sdkTitle}`,
       description: `${docName} API Reference - ${sdkTitle}`,
       image: {
-        title: docName,
         icon: metadataIcon,
+        title: docName,
       },
+      title: `${docName} - ${sdkTitle}`,
     });
   }
 
   return {
+    default: Page,
     // force-static on dev and previews to lower the build time and vercel cost
     dynamic: (process.env.VERCEL_ENV !== "preview" &&
     process.env.VERCEL_ENV !== "development"
       ? "force-static"
       : "auto") as "force-static" | "auto",
-    default: Page,
-    generateStaticParams,
     generateMetadata,
+    generateStaticParams,
   };
 }
 
@@ -183,11 +183,11 @@ export function getTDocLayout(options: {
     return (
       <DocLayout
         sideBar={{
-          name: sdkTitle,
           links: getSidebarLinkGroups(
             doc,
             `/references/${packageSlug}/${version}`,
           ),
+          name: sdkTitle,
         }}
       >
         {props.children}
@@ -212,7 +212,7 @@ async function IndexContent(props: {
 
   return (
     <div>
-      <Heading id="reference" level={1}>
+      <Heading anchorId="reference" level={1}>
         {props.sdkTitle} Reference
       </Heading>
 
@@ -221,10 +221,10 @@ async function IndexContent(props: {
           const slug = nameToSubgroupSlug[linkGroup.name];
           return (
             <ArticleIconCard
-              key={linkGroup.name}
               href={`/references/${props.packageSlug}/${props.version}/${slug}`}
-              title={linkGroup.name}
               icon={FolderOpenIcon}
+              key={linkGroup.name}
+              title={linkGroup.name}
             />
           );
         })}
@@ -257,10 +257,10 @@ function CategoryPage(props: {
 
   return (
     <div>
-      <Heading level={1} id={props.slug}>
+      <Heading anchorId={props.slug} level={1}>
         {subgroups[props.slug]}
       </Heading>
-      <RenderLinkGroup linkGroup={linkGroup} level={0} />
+      <RenderLinkGroup level={0} linkGroup={linkGroup} />
     </div>
   );
 }
@@ -284,11 +284,11 @@ function RenderLinkGroup(props: { linkGroup: LinkGroup; level: number }) {
           const link = _link as LinkMeta;
           return (
             <ArticleIconCard
-              title={link.name}
-              key={link.href}
+              className="p-3"
               href={link.href}
               icon={FileTextIcon}
-              className="p-3"
+              key={link.href}
+              title={link.name}
             />
           );
         })}
@@ -303,7 +303,7 @@ function RenderLinkGroup(props: { linkGroup: LinkGroup; level: number }) {
         if ("links" in link) {
           return (
             // biome-ignore lint/suspicious/noArrayIndexKey: nothing better available
-            <GroupOfLinks linkGroup={link} level={props.level + 1} key={i} />
+            <GroupOfLinks key={i} level={props.level + 1} linkGroup={link} />
           );
         }
       })}
@@ -311,9 +311,9 @@ function RenderLinkGroup(props: { linkGroup: LinkGroup; level: number }) {
         <GroupOfLinks
           level={props.level + 1}
           linkGroup={{
+            expanded: true,
             links: ungroupedLinks,
             name: "Others",
-            expanded: true,
           }}
         />
       )}
@@ -327,13 +327,13 @@ function GroupOfLinks(props: { linkGroup: LinkGroup; level: number }) {
 
   return (
     <Details
-      id={slugger.slug(props.linkGroup.name)}
-      summary={props.linkGroup.name}
       accordionItemClassName="m-0"
       accordionTriggerClassName="rounded-lg"
+      anchorId={slugger.slug(props.linkGroup.name)}
       headingClassName="py-0.5 text-lg"
+      summary={props.linkGroup.name}
     >
-      <RenderLinkGroup linkGroup={props.linkGroup} level={props.level + 1} />
+      <RenderLinkGroup level={props.level + 1} linkGroup={props.linkGroup} />
     </Details>
   );
 }
diff --git a/apps/portal/src/app/references/components/TDoc/Root.tsx b/apps/portal/src/app/references/components/TDoc/Root.tsx
index dfba2cf3494..5ac816688b2 100644
--- a/apps/portal/src/app/references/components/TDoc/Root.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Root.tsx
@@ -1,11 +1,11 @@
-import { sluggerContext } from "@/contexts/slugger";
 import GithubSlugger from "github-slugger";
+import { sluggerContext } from "@/contexts/slugger";
 import { ClassTDoc } from "./Class";
 import { EnumTDoc } from "./Enum";
 import { FunctionTDoc } from "./Function";
 import { TypeTDoc } from "./Type";
-import { VariableTDoc } from "./Variable";
 import type { SomeDoc } from "./types";
+import { VariableTDoc } from "./Variable";
 
 export function RootTDoc(props: { doc: SomeDoc }) {
   sluggerContext.set(new GithubSlugger());
diff --git a/apps/portal/src/app/references/components/TDoc/SourceLink.tsx b/apps/portal/src/app/references/components/TDoc/SourceLink.tsx
index 2cf4d06ba8a..1936486189f 100644
--- a/apps/portal/src/app/references/components/TDoc/SourceLink.tsx
+++ b/apps/portal/src/app/references/components/TDoc/SourceLink.tsx
@@ -4,8 +4,8 @@ export function SourceLinkTypeDoc(props: { href: string }) {
   return (
     <div className="mb-6" data-noindex>
       <Link
-        href={props.href}
         className="text-muted-foreground text-sm hover:text-foreground"
+        href={props.href}
         target="_blank"
       >
         <span className="text-muted-foreground"> Defined in </span>
diff --git a/apps/portal/src/app/references/components/TDoc/Summary.tsx b/apps/portal/src/app/references/components/TDoc/Summary.tsx
index 6ce9dd8a816..9bd9ba7c68a 100644
--- a/apps/portal/src/app/references/components/TDoc/Summary.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Summary.tsx
@@ -1,6 +1,6 @@
-import { sluggerContext } from "@/contexts/slugger";
 import invariant from "tiny-invariant";
 import type { FunctionSignature } from "typedoc-better-json";
+import { sluggerContext } from "@/contexts/slugger";
 import { CodeBlock } from "../../../../components/Document/Code";
 import { DocLink } from "../../../../components/Document/DocLink";
 import { Heading } from "../../../../components/Document/Heading";
@@ -24,7 +24,7 @@ export function TypedocSummary(props: {
         switch (s.type) {
           case "code": {
             return (
-              <CodeBlock lang={s.lang} code={s.value} key={Math.random()} />
+              <CodeBlock code={s.value} key={Math.random()} lang={s.lang} />
             );
           }
 
@@ -75,7 +75,7 @@ export function TypedocSummary(props: {
           case "listItem": {
             return (
               <li key={Math.random()}>
-                <TypedocSummary summary={s.children} className="mb-0" />
+                <TypedocSummary className="mb-0" summary={s.children} />
               </li>
             );
           }
@@ -83,10 +83,13 @@ export function TypedocSummary(props: {
           case "heading": {
             return (
               <Heading
+                anchorId={slugger.slug(
+                  // biome-ignore lint/suspicious/noExplicitAny: complex type
+                  (s.children[0] as any)?.value ?? "",
+                  false,
+                )}
                 key={Math.random()}
                 level={s.depth}
-                // biome-ignore lint/suspicious/noExplicitAny: complex type
-                id={slugger.slug((s.children[0] as any)?.value ?? "", false)}
               >
                 <TypedocSummary summary={s.children} />
               </Heading>
diff --git a/apps/portal/src/app/references/components/TDoc/Type.tsx b/apps/portal/src/app/references/components/TDoc/Type.tsx
index 7df525b227f..0be474b1a6d 100644
--- a/apps/portal/src/app/references/components/TDoc/Type.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Type.tsx
@@ -1,7 +1,7 @@
+import invariant from "tiny-invariant";
+import { getInterfaceSignature, type InterfaceDoc } from "typedoc-better-json";
 import { Callout } from "@/components/Document";
 import { sluggerContext } from "@/contexts/slugger";
-import invariant from "tiny-invariant";
-import { type InterfaceDoc, getInterfaceSignature } from "typedoc-better-json";
 import { CodeBlock } from "../../../../components/Document/Code";
 import { Details } from "../../../../components/Document/Details";
 import { Heading } from "../../../../components/Document/Heading";
@@ -27,7 +27,7 @@ export async function TypeTDoc(props: { doc: InterfaceDoc; level: number }) {
 
   return (
     <>
-      <Heading level={props.level} id={doc.name}>
+      <Heading anchorId={doc.name} level={props.level}>
         {doc.name}
       </Heading>
 
@@ -38,14 +38,14 @@ export async function TypeTDoc(props: { doc: InterfaceDoc; level: number }) {
       {remarksTag?.summary && <TypedocSummary summary={remarksTag.summary} />}
 
       <CodeBlock
-        lang="ts"
         code={code}
+        lang="ts"
         tokenLinks={tokens ? await getTokenLinks(tokens) : undefined}
       />
 
       {exampleTag?.summary && (
         <>
-          <Heading level={subLevel} id={slugger.slug("example")} noIndex>
+          <Heading anchorId={slugger.slug("example")} level={subLevel} noIndex>
             Example
           </Heading>
           <TypedocSummary summary={exampleTag.summary} />
@@ -61,14 +61,14 @@ export async function TypeTDoc(props: { doc: InterfaceDoc; level: number }) {
       {doc.typeDeclaration?.map((declaration) => {
         return (
           <Details
+            anchorId={declaration.name}
             key={declaration.name}
             summary={declaration.name}
-            id={declaration.name}
           >
             <TypeDeclarationTDoc
-              showHeading={false}
               doc={declaration}
               level={props.level + 1}
+              showHeading={false}
             />
           </Details>
         );
diff --git a/apps/portal/src/app/references/components/TDoc/TypeDeclaration.tsx b/apps/portal/src/app/references/components/TDoc/TypeDeclaration.tsx
index 0ebd076c728..6afc6c15aa4 100644
--- a/apps/portal/src/app/references/components/TDoc/TypeDeclaration.tsx
+++ b/apps/portal/src/app/references/components/TDoc/TypeDeclaration.tsx
@@ -1,10 +1,10 @@
-import { Callout } from "@/components/Document";
-import { sluggerContext } from "@/contexts/slugger";
 import invariant from "tiny-invariant";
 import type {
   SubTypeDeclarationDoc,
   TypeDeclarationDoc,
 } from "typedoc-better-json";
+import { Callout } from "@/components/Document";
+import { sluggerContext } from "@/contexts/slugger";
 import { CodeBlock } from "../../../../components/Document/Code";
 import { Heading } from "../../../../components/Document/Heading";
 import { DeprecatedCalloutTDoc } from "./Deprecated";
@@ -58,7 +58,7 @@ async function SubtypeDeclarationTDoc(props: {
   return (
     <>
       {showHeading !== false && (
-        <Heading level={level} id={doc.name}>
+        <Heading anchorId={doc.name} level={level}>
           {doc.name}
         </Heading>
       )}
@@ -74,8 +74,8 @@ async function SubtypeDeclarationTDoc(props: {
       )}
 
       <CodeBlock
-        lang="ts"
         code={`type ${doc.name} = ${doc.type.code}`}
+        lang="ts"
         tokenLinks={
           doc.type.tokens ? await getTokenLinks(doc.type.tokens) : undefined
         }
@@ -83,7 +83,7 @@ async function SubtypeDeclarationTDoc(props: {
 
       {exampleTag?.summary && (
         <>
-          <Heading level={subLevel} id={slugger.slug("example")} noIndex>
+          <Heading anchorId={slugger.slug("example")} level={subLevel} noIndex>
             Example
           </Heading>
           <TypedocSummary summary={exampleTag.summary} />
diff --git a/apps/portal/src/app/references/components/TDoc/Variable.tsx b/apps/portal/src/app/references/components/TDoc/Variable.tsx
index 72e160d6ace..ee6bdf78506 100644
--- a/apps/portal/src/app/references/components/TDoc/Variable.tsx
+++ b/apps/portal/src/app/references/components/TDoc/Variable.tsx
@@ -1,11 +1,11 @@
-import { Callout } from "@/components/Document";
-import { sluggerContext } from "@/contexts/slugger";
 import invariant from "tiny-invariant";
 import type {
   TypeDeclarationDoc,
   TypeInfo,
   VariableDoc,
 } from "typedoc-better-json";
+import { Callout } from "@/components/Document";
+import { sluggerContext } from "@/contexts/slugger";
 import { CodeBlock } from "../../../../components/Document/Code";
 import { Details } from "../../../../components/Document/Details";
 import { Heading } from "../../../../components/Document/Heading";
@@ -37,7 +37,7 @@ export async function VariableTDoc(props: {
   return (
     <>
       {props.showHeading !== false && (
-        <Heading level={props.level} id={doc.name}>
+        <Heading anchorId={doc.name} level={props.level}>
           {doc.name}
         </Heading>
       )}
@@ -55,14 +55,14 @@ export async function VariableTDoc(props: {
       )}
 
       <CodeBlock
-        lang="ts"
         code={`let ${doc.name}: ${signatureCode}`}
+        lang="ts"
         tokenLinks={tokens ? await getTokenLinks(tokens) : undefined}
       />
 
       {exampleTag?.summary && (
         <>
-          <Heading level={subLevel} id={slugger.slug("example")} noIndex>
+          <Heading anchorId={slugger.slug("example")} level={subLevel} noIndex>
             Example
           </Heading>
           <TypedocSummary summary={exampleTag.summary} />
@@ -72,9 +72,9 @@ export async function VariableTDoc(props: {
       {doc.typeDeclaration?.map((declaration) => {
         return (
           <Details
+            anchorId={declaration.name}
             key={declaration.name}
             summary={declaration.name}
-            id={declaration.name}
           >
             {"kind" in declaration && declaration.kind === "function" ? (
               <FunctionTDoc
diff --git a/apps/portal/src/app/references/components/TDoc/utils/getSidebarLinkgroups.ts b/apps/portal/src/app/references/components/TDoc/utils/getSidebarLinkgroups.ts
index 759f98065a3..d2e2808b283 100644
--- a/apps/portal/src/app/references/components/TDoc/utils/getSidebarLinkgroups.ts
+++ b/apps/portal/src/app/references/components/TDoc/utils/getSidebarLinkgroups.ts
@@ -1,5 +1,5 @@
-import type { SomeDoc } from "@/app/references/components/TDoc/types";
 import type { BlockTag, TransformedDoc } from "typedoc-better-json";
+import type { SomeDoc } from "@/app/references/components/TDoc/types";
 import type {
   LinkGroup,
   SidebarLink,
@@ -8,44 +8,44 @@ import { subgroups } from "./subgroups";
 import { uniqueSlugger } from "./uniqueSlugger";
 
 const tagsToGroup = {
-  "@contract": "Contract",
+  "@abstractWallet": "Abstract Wallets",
+  "@account": "Account",
+  "@appURI": "App URI",
+  "@auth": "Auth",
+  "@bridge": "Universal Bridge",
+  "@buyCrypto": "Buy Crypto",
+  "@chain": "Chain",
   "@claimConditions": "Claim Conditions",
-  "@nftDrop": "NFT Drop",
-  "@platformFees": "Royalty & Fees",
-  "@nft": "NFT",
-  "@metadata": "Metadata",
-  "@permissionControl": "Permissions Control",
-  "@networkConnection": "Network Connection",
+  "@client": "Client",
+  "@connectWallet": "Connect Wallet",
+  "@contract": "Contract",
   "@delayedReveal": "Delayed Reveal",
+  "@engine": "Engine",
+  "@extension": "Extensions",
+  "@insight": "Insight",
+  "@locale": "Locale",
   "@marketplace": "Marketplace",
-  "@walletConnection": "Wallet Connection",
-  "@walletUtils": "Wallet Utilities",
-  "@token": "Tokens",
-  "@auth": "Auth",
+  "@metadata": "Metadata",
+  "@modules": "Modules",
+  "@nebula": "Nebula",
+  "@networkConnection": "Network Connection",
+  "@nft": "NFT",
+  "@nftDrop": "NFT Drop",
+  "@others": "Miscellaneous",
+  "@permissionControl": "Permissions Control",
+  "@platformFees": "Royalty & Fees",
+  "@rpc": "RPC",
   "@smartWallet": "Smart Wallet",
-  "@connectWallet": "Connect Wallet",
-  "@appURI": "App URI",
+  "@social": "Social API",
   "@storage": "Storage",
-  "@others": "Miscellaneous",
-  "@wallet": "Wallets",
-  "@walletConfig": "WalletConfig",
   "@theme": "Theme",
-  "@locale": "Locale",
-  "@abstractWallet": "Abstract Wallets",
-  "@extension": "Extensions",
-  "@rpc": "RPC",
+  "@token": "Tokens",
   "@transaction": "Transactions",
-  "@bridge": "Universal Bridge",
-  "@buyCrypto": "Buy Crypto",
   "@utils": "Utils",
-  "@chain": "Chain",
-  "@social": "Social API",
-  "@modules": "Modules",
-  "@client": "Client",
-  "@account": "Account",
-  "@nebula": "Nebula",
-  "@insight": "Insight",
-  "@engine": "Engine",
+  "@wallet": "Wallets",
+  "@walletConfig": "WalletConfig",
+  "@walletConnection": "Wallet Connection",
+  "@walletUtils": "Wallet Utilities",
 } as const;
 
 type TagKey = keyof typeof tagsToGroup;
@@ -194,26 +194,26 @@ export function getSidebarLinkGroups(doc: TransformedDoc, path: string) {
       const extensionLinkGroups = Object.entries(extensionGroups).map(
         ([extensionName, docs]) => {
           const links = docs.map((d) => ({
-            name: d.name,
             href: getLink(`${path}/${extensionName.toLowerCase()}/${d.name}`),
+            name: d.name,
           }));
           return {
-            name: extensionName,
             links,
+            name: extensionName,
           };
         },
       );
       if (!linkGroups.find((group) => group.name === name)) {
         linkGroups.push({
-          name: name,
           href: getLink(`${path}/${key}`),
-          links: [{ name: "Extensions", links: extensionLinkGroups }],
           isCollapsible: false,
+          links: [{ links: extensionLinkGroups, name: "Extensions" }],
+          name: name,
         });
       } else {
         linkGroups
           .find((group) => group.name === name)
-          ?.links.push({ name: "Extensions", links: extensionLinkGroups });
+          ?.links.push({ links: extensionLinkGroups, name: "Extensions" });
       }
     }
 
@@ -234,25 +234,25 @@ export function getSidebarLinkGroups(doc: TransformedDoc, path: string) {
       const extensionLinkGroups = Object.entries(extensionGroups).map(
         ([extensionName, docs]) => {
           const links = docs.map((d) => ({
-            name: d.name,
             href: getLink(`${path}/${extensionName.toLowerCase()}/${d.name}`),
+            name: d.name,
           }));
           return {
-            name: extensionName,
             links,
+            name: extensionName,
           };
         },
       );
       if (!linkGroups.find((group) => group.name === name)) {
         linkGroups.push({
-          name: name,
           href: getLink(`${path}/${key}`),
-          links: [{ name: "modules", links: extensionLinkGroups }],
+          links: [{ links: extensionLinkGroups, name: "modules" }],
+          name: name,
         });
       } else {
         linkGroups
           .find((group) => group.name === name)
-          ?.links.push({ name: "Modules", links: extensionLinkGroups });
+          ?.links.push({ links: extensionLinkGroups, name: "Modules" });
       }
     }
 
@@ -278,13 +278,13 @@ export function getSidebarLinkGroups(doc: TransformedDoc, path: string) {
         .filter(([namespaceName]) => namespaceName.toLowerCase() !== "common")
         .map(([namespaceName, docs]) => {
           const links = docs.map((d) => ({
-            name: d.name,
             href: getLink(`${path}/${namespaceName.toLowerCase()}/${d.name}`),
+            name: d.name,
           }));
           return {
-            name: namespaceName,
             href: "",
             links,
+            name: namespaceName,
           };
         });
 
@@ -295,23 +295,23 @@ export function getSidebarLinkGroups(doc: TransformedDoc, path: string) {
         const docs = group[1];
         for (const doc of docs) {
           bridgeLinkGroups.push({
-            name: doc.name,
             href: getLink(`${path}/${doc.name}`),
+            name: doc.name,
           });
         }
       }
 
       if (!linkGroups.find((group) => group.name === name)) {
         linkGroups.push({
-          name: name,
           href: getLink(`${path}/${key}`),
-          links: [{ name: "Universal Bridge", links: bridgeLinkGroups }],
           isCollapsible: false,
+          links: [{ links: bridgeLinkGroups, name: "Universal Bridge" }],
+          name: name,
         });
       } else {
         linkGroups
           .find((group) => group.name === name)
-          ?.links.push({ name: "Universal Bridge", links: bridgeLinkGroups });
+          ?.links.push({ links: bridgeLinkGroups, name: "Universal Bridge" });
       }
     }
 
@@ -355,11 +355,11 @@ export function getSidebarLinkGroups(doc: TransformedDoc, path: string) {
       }
 
       links.push({
-        name: tagsToGroup[tag],
         links: groupDocs.map((d) => ({
-          name: d.name,
           href: getLink(`${path}/${d.name}`),
+          name: d.name,
         })),
+        name: tagsToGroup[tag],
       });
     };
 
@@ -369,8 +369,8 @@ export function getSidebarLinkGroups(doc: TransformedDoc, path: string) {
 
     for (const d of ungroupedLinks) {
       links.push({
-        name: d.name,
         href: getLink(`${path}/${d.name}`),
+        name: d.name,
       });
     }
 
@@ -383,10 +383,10 @@ export function getSidebarLinkGroups(doc: TransformedDoc, path: string) {
     // create new group
     else {
       linkGroups.push({
-        name: name,
-        links: links,
         href: getLink(`${path}/${key}`),
         isCollapsible: false,
+        links: links,
+        name: name,
       });
     }
   }
diff --git a/apps/portal/src/app/references/components/TDoc/utils/getTags.ts b/apps/portal/src/app/references/components/TDoc/utils/getTags.ts
index 3311c072924..dd11d49dea8 100644
--- a/apps/portal/src/app/references/components/TDoc/utils/getTags.ts
+++ b/apps/portal/src/app/references/components/TDoc/utils/getTags.ts
@@ -10,10 +10,10 @@ export function getTags(blockTags?: BlockTag[]) {
   const prepareTag = blockTags?.find((t) => t.tag === "@prepare");
 
   return {
-    exampleTag,
     deprecatedTag,
+    exampleTag,
+    prepareTag,
     remarksTag,
     seeTag,
-    prepareTag,
   };
 }
diff --git a/apps/portal/src/app/references/components/TDoc/utils/slugs.ts b/apps/portal/src/app/references/components/TDoc/utils/slugs.ts
index 7306c3f480f..ff927db0a7e 100644
--- a/apps/portal/src/app/references/components/TDoc/utils/slugs.ts
+++ b/apps/portal/src/app/references/components/TDoc/utils/slugs.ts
@@ -1,5 +1,5 @@
-import type { SomeDoc } from "@/app/references/components/TDoc/types";
 import type { TransformedDoc } from "typedoc-better-json";
+import type { SomeDoc } from "@/app/references/components/TDoc/types";
 import { getExtensionName } from "./getSidebarLinkgroups";
 import { subgroups } from "./subgroups";
 import { uniqueSlugger } from "./uniqueSlugger";
diff --git a/apps/portal/src/app/references/components/TDoc/utils/subgroups.ts b/apps/portal/src/app/references/components/TDoc/utils/subgroups.ts
index 7925e2b21fd..67c4d8cd7f7 100644
--- a/apps/portal/src/app/references/components/TDoc/utils/subgroups.ts
+++ b/apps/portal/src/app/references/components/TDoc/utils/subgroups.ts
@@ -1,7 +1,7 @@
 export const subgroups = {
   components: "UI Components",
-  hooks: "React Hooks",
   functions: "Core Functions",
+  hooks: "React Hooks",
 };
 
 export const nameToSubgroupSlug = (() => {
diff --git a/apps/portal/src/app/references/typescript/[version]/[[...slug]]/page.tsx b/apps/portal/src/app/references/typescript/[version]/[[...slug]]/page.tsx
index 75021bf39d0..efea91edd0c 100644
--- a/apps/portal/src/app/references/typescript/[version]/[[...slug]]/page.tsx
+++ b/apps/portal/src/app/references/typescript/[version]/[[...slug]]/page.tsx
@@ -1,14 +1,14 @@
-import { getTDocPage } from "@/app/references/components/TDoc/PageLayout";
 import { fetchTypeScriptDoc } from "@/app/references/components/TDoc/fetchDocs/fetchTypeScriptDoc";
+import { getTDocPage } from "@/app/references/components/TDoc/PageLayout";
 
 const config = getTDocPage({
-  sdkTitle: "TypeScript SDK",
   getDoc: fetchTypeScriptDoc,
-  packageSlug: "typescript",
   async getVersions() {
     return ["v5"];
   },
   metadataIcon: "typescript",
+  packageSlug: "typescript",
+  sdkTitle: "TypeScript SDK",
 });
 
 export default config.default;
diff --git a/apps/portal/src/app/references/typescript/[version]/layout.tsx b/apps/portal/src/app/references/typescript/[version]/layout.tsx
index a75739d52f2..7270075eed2 100644
--- a/apps/portal/src/app/references/typescript/[version]/layout.tsx
+++ b/apps/portal/src/app/references/typescript/[version]/layout.tsx
@@ -1,6 +1,6 @@
-import { getTDocLayout } from "@/app/references/components/TDoc/PageLayout";
-import { fetchTypeScriptDoc } from "@/app/references/components/TDoc/fetchDocs/fetchTypeScriptDoc";
 import { createMetadata } from "@doc";
+import { fetchTypeScriptDoc } from "@/app/references/components/TDoc/fetchDocs/fetchTypeScriptDoc";
+import { getTDocLayout } from "@/app/references/components/TDoc/PageLayout";
 
 export default getTDocLayout({
   getDoc: fetchTypeScriptDoc,
@@ -9,12 +9,12 @@ export default getTDocLayout({
 });
 
 export const metadata = createMetadata({
+  description: "Full Reference for thirdweb TypeScript SDK.",
   image: {
-    title: "thirdweb TypeScript SDK Reference",
     icon: "typescript",
+    title: "thirdweb TypeScript SDK Reference",
   },
   title: "References | thirdweb TypeScript SDK ",
-  description: "Full Reference for thirdweb TypeScript SDK.",
 });
 
 export const revalidate = 86400; // revalidate every day
diff --git a/apps/portal/src/app/styleguide/layout.tsx b/apps/portal/src/app/styleguide/layout.tsx
index ffcf3b43988..a57ca889602 100644
--- a/apps/portal/src/app/styleguide/layout.tsx
+++ b/apps/portal/src/app/styleguide/layout.tsx
@@ -3,7 +3,7 @@ import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true} noIndex>
+    <DocLayout editPageButton={true} noIndex sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
diff --git a/apps/portal/src/app/styleguide/sidebar.tsx b/apps/portal/src/app/styleguide/sidebar.tsx
index 26075824e09..fefefe906c7 100644
--- a/apps/portal/src/app/styleguide/sidebar.tsx
+++ b/apps/portal/src/app/styleguide/sidebar.tsx
@@ -1,31 +1,31 @@
 import type { SideBar } from "@/components/Layouts/DocLayout";
 
 export const sidebar: SideBar = {
-  name: "Styleguide",
   links: [
     {
-      name: "Basics",
       href: "/styleguide",
+      name: "Basics",
     },
     {
-      name: "Code",
       href: "/styleguide/code",
+      name: "Code",
     },
     {
-      name: "Tabs",
       href: "/styleguide/tabs",
+      name: "Tabs",
     },
     {
-      name: "Steps",
       href: "/styleguide/steps",
+      name: "Steps",
     },
     {
-      name: "Cards",
       href: "/styleguide/cards",
+      name: "Cards",
     },
     {
-      name: "Callouts",
       href: "/styleguide/callouts",
+      name: "Callouts",
     },
   ],
+  name: "Styleguide",
 };
diff --git a/apps/portal/src/app/typescript/v5/[...slug]/page.tsx b/apps/portal/src/app/typescript/v5/[...slug]/page.tsx
index bc8c4bc982d..af7b4a29400 100644
--- a/apps/portal/src/app/typescript/v5/[...slug]/page.tsx
+++ b/apps/portal/src/app/typescript/v5/[...slug]/page.tsx
@@ -1,6 +1,6 @@
 import notFound from "../../../not-found";
-import { RootTDoc } from "../../../references/components/TDoc/Root";
 import { fetchTypeScriptDoc } from "../../../references/components/TDoc/fetchDocs/fetchTypeScriptDoc";
+import { RootTDoc } from "../../../references/components/TDoc/Root";
 import { getSlugToDocMap } from "../../../references/components/TDoc/utils/slugs";
 
 type PageProps = { params: Promise<{ slug: string[] }> };
diff --git a/apps/portal/src/app/typescript/v5/extensions/built-in/page.tsx b/apps/portal/src/app/typescript/v5/extensions/built-in/page.tsx
index 16b241475ef..bd9932dd42d 100644
--- a/apps/portal/src/app/typescript/v5/extensions/built-in/page.tsx
+++ b/apps/portal/src/app/typescript/v5/extensions/built-in/page.tsx
@@ -1,4 +1,4 @@
-import { TBody, Table, Td, Th, Tr } from "@/components/Document/Table";
+import { Table, TBody, Td, Th, Tr } from "@/components/Document/Table";
 import {
   DocLink,
   Heading,
@@ -26,8 +26,8 @@ export default async function ExtensionPage() {
 
   const overrides: Record<string, { name?: string; description?: string }> = {
     common: {
-      name: "Common",
       description: "Common contract extensions",
+      name: "Common",
     },
     erc20: { description: "ERC20 token standard extensions" },
     erc721: { description: "ERC721 token standard extensions" },
@@ -39,7 +39,7 @@ export default async function ExtensionPage() {
   };
   return (
     <>
-      <Heading level={1} id="built-in-extensions">
+      <Heading anchorId="built-in-extensions" level={1}>
         Built-in extensions for common standards
       </Heading>
       <Paragraph>
diff --git a/apps/portal/src/app/typescript/v5/layout.tsx b/apps/portal/src/app/typescript/v5/layout.tsx
index 60bd2542f12..69c80953f8f 100644
--- a/apps/portal/src/app/typescript/v5/layout.tsx
+++ b/apps/portal/src/app/typescript/v5/layout.tsx
@@ -1,13 +1,13 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { PlatformSelector } from "../../../components/others/PlatformSelector";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Connect</p>
@@ -21,7 +21,7 @@ export default async function Layout(props: { children: React.ReactNode }) {
 }
 
 export const metadata = createMetadata({
-  title: "thirdweb TypeScript SDK",
   description:
     "A type-safe library to interact with any EVM-compatible blockchain in Node, web and native applications.",
+  title: "thirdweb TypeScript SDK",
 });
diff --git a/apps/portal/src/app/typescript/v5/modular/built-in/page.tsx b/apps/portal/src/app/typescript/v5/modular/built-in/page.tsx
index 593b102d4b1..b1267b7dbf5 100644
--- a/apps/portal/src/app/typescript/v5/modular/built-in/page.tsx
+++ b/apps/portal/src/app/typescript/v5/modular/built-in/page.tsx
@@ -1,4 +1,4 @@
-import { TBody, Table, Td, Th, Tr } from "@/components/Document/Table";
+import { Table, TBody, Td, Th, Tr } from "@/components/Document/Table";
 import {
   DocLink,
   Heading,
@@ -25,7 +25,7 @@ export default async function ModulesPage() {
   ];
   return (
     <>
-      <Heading level={1} id="built-in-extensions">
+      <Heading anchorId="built-in-extensions" level={1}>
         Built-in modules
       </Heading>
       <Paragraph>
diff --git a/apps/portal/src/app/typescript/v5/sidebar.tsx b/apps/portal/src/app/typescript/v5/sidebar.tsx
index 350835cc526..89b66060121 100644
--- a/apps/portal/src/app/typescript/v5/sidebar.tsx
+++ b/apps/portal/src/app/typescript/v5/sidebar.tsx
@@ -10,165 +10,162 @@ const slug = "/typescript/v5";
 const docs = await fetchTypeScriptDoc();
 
 export const sidebar: SideBar = {
-  name: "Connect Typescript SDK",
   links: [
     {
       separator: true,
     },
     {
-      name: "Overview",
       href: slug,
+      name: "Overview",
     },
     {
-      name: "Getting Started",
       href: `${slug}/getting-started`,
       icon: <ZapIcon />,
+      name: "Getting Started",
     },
     {
-      name: "Live Playground",
       href: "https://playground.thirdweb.com/",
       icon: <ExternalLinkIcon />,
+      name: "Live Playground",
     },
     {
-      name: "API Reference",
       href: "/references/typescript/v5",
       icon: <CodeIcon />,
+      name: "API Reference",
     },
     { separator: true },
     {
-      name: "Core Concepts",
       isCollapsible: false,
       links: [
         {
-          name: "Client",
           href: `${slug}/client`,
+          name: "Client",
         },
         {
-          name: "Chains",
           href: `${slug}/chain`,
+          name: "Chains",
         },
         {
-          name: "Contracts",
           href: `${slug}/contract`,
+          name: "Contracts",
         },
         {
-          name: "Accounts & Wallets",
           href: `${slug}/wallets`,
+          name: "Accounts & Wallets",
         },
       ],
+      name: "Core Concepts",
     },
     { separator: true },
     {
-      name: "Onboarding Users",
       isCollapsible: false,
       links: [
         {
-          name: "External Wallets",
           href: `${slug}/supported-wallets`,
+          name: "External Wallets",
         },
         {
-          name: "In-App Wallets",
           href: `${slug}/in-app-wallet`,
+          name: "In-App Wallets",
         },
         {
-          name: "Ecosystem Wallets",
           href: `${slug}/ecosystem-wallet`,
+          name: "Ecosystem Wallets",
         },
         {
-          name: "Account Abstraction",
           links: [
             {
-              name: "Getting Started",
               href: `${slug}/account-abstraction/get-started`,
+              name: "Getting Started",
             },
             {
-              name: "Batching Transactions",
               href: `${slug}/account-abstraction/batching-transactions`,
+              name: "Batching Transactions",
             },
           ],
+          name: "Account Abstraction",
         },
       ],
+      name: "Onboarding Users",
     },
     { separator: true },
     {
-      name: "Identity Management",
       isCollapsible: false,
       links: [
         {
-          name: "Sign In With Ethereum",
           href: `${slug}/auth`,
+          name: "Sign In With Ethereum",
         },
         {
-          name: "Link Profiles",
           href: `${slug}/linkProfile`,
+          name: "Link Profiles",
         },
         {
-          name: "Web3 Social Identities",
           href: `${slug}/getSocialProfiles`,
+          name: "Web3 Social Identities",
         },
         {
-          name: "Permissions",
           href: `${slug}/account-abstraction/permissions`,
+          name: "Permissions",
         },
       ],
+      name: "Identity Management",
     },
     { separator: true },
     {
-      name: "Onchain Interactions",
       isCollapsible: false,
       links: [
         {
-          name: "Reading state",
           href: `${slug}/transactions/read`,
+          name: "Reading state",
         },
         {
-          name: "Preparing transactions",
           href: `${slug}/transactions/prepare`,
+          name: "Preparing transactions",
         },
         {
-          name: "Sending transactions",
           href: `${slug}/transactions/send`,
+          name: "Sending transactions",
         },
         {
-          name: "Extensions",
           links: [
             {
-              name: "Using Extensions",
               href: `${slug}/extensions/use`,
+              name: "Using Extensions",
             },
             {
-              name: "Generating Extensions",
               href: `${slug}/extensions/generate`,
+              name: "Generating Extensions",
             },
             {
-              name: "Writing Extensions",
               href: `${slug}/extensions/create`,
+              name: "Writing Extensions",
             },
             {
-              name: "Available Extensions",
               href: `${slug}/extensions/built-in`,
+              name: "Available Extensions",
             },
             {
-              name: "Examples",
               links: [
                 {
-                  name: "Lens Protocol",
                   href: `${slug}/extensions/examples/lens-protocol`,
+                  name: "Lens Protocol",
                 },
                 {
-                  name: "Transfering tokens",
                   href: `${slug}/extensions/examples/transfering-tokens`,
+                  name: "Transfering tokens",
                 },
                 {
-                  name: "Ethereum Name Service",
                   href: `${slug}/extensions/examples/ethereum-name-service`,
+                  name: "Ethereum Name Service",
                 },
               ],
+              name: "Examples",
             },
           ],
+          name: "Extensions",
         },
         {
-          name: "Deploying contracts",
           links:
             docs.functions
               ?.filter((f) => {
@@ -177,37 +174,37 @@ export const sidebar: SideBar = {
               })
               .sort((a, b) => a.name.localeCompare(b.name))
               .map((f) => ({
-                name: f.name,
                 href: `${slug}/deploy/${f.name}`,
+                name: f.name,
               })) || [],
+          name: "Deploying contracts",
         },
         {
-          name: "Modular contracts",
           links: [
             {
-              name: "Introduction",
               href: `${slug}/modular`,
+              name: "Introduction",
             },
             {
-              name: "Deploying",
               href: `${slug}/modular/deploy`,
+              name: "Deploying",
             },
             {
-              name: "Upgrading",
               href: `${slug}/modular/upgrade`,
+              name: "Upgrading",
             },
             {
-              name: "Interacting",
               href: `${slug}/modular/interact`,
+              name: "Interacting",
             },
             {
-              name: "Available Modules",
               href: `${slug}/modular/built-in`,
+              name: "Available Modules",
             },
           ],
+          name: "Modular contracts",
         },
         {
-          name: "RPC Methods",
           links:
             docs.functions
               ?.filter((f) => {
@@ -215,19 +212,18 @@ export const sidebar: SideBar = {
                 return tag === "@rpc";
               })
               ?.map((f) => ({
-                name: f.name,
                 href: `${slug}/${f.name}`,
+                name: f.name,
               })) || [],
+          name: "RPC Methods",
         },
         {
-          name: "IPFS Storage",
           href: `${slug}/storage`,
+          name: "IPFS Storage",
         },
         {
-          name: "Bridge, Swap, and Onramp",
           links: [
             {
-              name: "Buy",
               links:
                 docs.functions
                   ?.filter((f) => {
@@ -250,13 +246,13 @@ export const sidebar: SideBar = {
                       ? getExtensionName(blockTag) || "Common"
                       : "Common";
                     return {
-                      name: f.name,
                       href: `${slug}/${extensionName.toLowerCase()}/${f.name}`,
+                      name: f.name,
                     };
                   }) || [],
+              name: "Buy",
             },
             {
-              name: "Sell",
               links:
                 docs.functions
                   ?.filter((f) => {
@@ -279,13 +275,13 @@ export const sidebar: SideBar = {
                       ? getExtensionName(blockTag) || "Common"
                       : "Common";
                     return {
-                      name: f.name,
                       href: `${slug}/${extensionName.toLowerCase()}/${f.name}`,
+                      name: f.name,
                     };
                   }) || [],
+              name: "Sell",
             },
             {
-              name: "Onramp",
               links:
                 docs.functions
                   ?.filter((f) => {
@@ -308,10 +304,11 @@ export const sidebar: SideBar = {
                       ? getExtensionName(blockTag) || "Common"
                       : "Common";
                     return {
-                      name: f.name,
                       href: `${slug}/${extensionName.toLowerCase()}/${f.name}`,
+                      name: f.name,
                     };
                   }) || [],
+              name: "Onramp",
             },
             ...(docs.functions
               ?.filter((f) => {
@@ -328,22 +325,25 @@ export const sidebar: SideBar = {
               })
               ?.map((f) => {
                 return {
-                  name: f.name,
                   href: `${slug}/${f.name}`,
+                  name: f.name,
                 };
               }) || []),
           ],
+          name: "Bridge, Swap, and Onramp",
         },
       ],
+      name: "Onchain Interactions",
     },
     { separator: true },
     {
-      name: "Usage with other libraries",
       href: `${slug}/adapters`,
+      name: "Usage with other libraries",
     },
     {
-      name: "Migrate from v4",
       href: `${slug}/migrate`,
+      name: "Migrate from v4",
     },
   ],
+  name: "Connect Typescript SDK",
 };
diff --git a/apps/portal/src/app/typescript/v5/supported-wallets/[walletId]/page.tsx b/apps/portal/src/app/typescript/v5/supported-wallets/[walletId]/page.tsx
index 682c235fbf1..e8b9cd660ec 100644
--- a/apps/portal/src/app/typescript/v5/supported-wallets/[walletId]/page.tsx
+++ b/apps/portal/src/app/typescript/v5/supported-wallets/[walletId]/page.tsx
@@ -1,20 +1,20 @@
 /* eslint-disable @next/next/no-img-element */
 
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { GlobeIcon } from "lucide-react";
 import Image from "next/image";
 import {
-  type WalletId,
   getAllWalletsList,
   getWalletInfo,
+  type WalletId,
 } from "thirdweb/wallets";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import {
   Breadcrumb,
   CodeBlock,
+  createMetadata,
   DocLink,
   Heading,
   Paragraph,
-  createMetadata,
 } from "../../../../../components/Document";
 import appStoreSvg from "./assets/appstore.svg";
 import chromeStoreSvg from "./assets/chromestore.svg";
@@ -31,12 +31,12 @@ export async function generateMetadata(props: PageProps) {
   const walletMetadata = await getWalletInfo(params.walletId);
 
   return createMetadata({
-    title: walletMetadata.name,
     description: `Connect ${walletMetadata.name} with thirdweb Connect SDK`,
     image: {
-      title: walletMetadata.name,
       icon: "wallets",
+      title: walletMetadata.name,
     },
+    title: walletMetadata.name,
   });
 }
 
@@ -68,19 +68,19 @@ export default async function Page(props: PageProps) {
       />
       <div className="mb-10 flex items-center gap-3 [&_h1]:m-0">
         <Image
-          src={walletImage}
-          width={36}
-          height={36}
           alt=""
           className="rounded-lg"
+          height={36}
+          src={walletImage}
+          width={36}
         />
-        <Heading level={1} id="title">
+        <Heading anchorId="title" level={1}>
           {walletMetadata.name}
         </Heading>
       </div>
       <DocLink
-        href={walletMetadata.homepage}
         className="flex items-center gap-2"
+        href={walletMetadata.homepage}
       >
         <GlobeIcon className="size-5" />
         {walletMetadata.homepage}
@@ -88,30 +88,30 @@ export default async function Page(props: PageProps) {
       <div className="mt-6 mb-12 flex gap-4">
         {walletMetadata.app.android && (
           <DocLink
-            href={walletMetadata.app.android}
             className="transition-transform"
+            href={walletMetadata.app.android}
           >
-            <Image src={playStoreSvg} height={50} alt="Play Store" />
+            <Image alt="Play Store" height={50} src={playStoreSvg} />
           </DocLink>
         )}
 
         {walletMetadata.app.chrome && (
           <DocLink href={walletMetadata.app.chrome}>
-            <Image src={chromeStoreSvg} height={50} alt="Play Store" />
+            <Image alt="Play Store" height={50} src={chromeStoreSvg} />
           </DocLink>
         )}
 
         {walletMetadata.app.ios && (
           <DocLink href={walletMetadata.app.ios}>
-            <Image src={appStoreSvg} height={50} alt="Play Store" />
+            <Image alt="Play Store" height={50} src={appStoreSvg} />
           </DocLink>
         )}
       </div>
-      <Heading level={2} id="wallet-id">
+      <Heading anchorId="wallet-id" level={2}>
         Wallet ID
       </Heading>
-      <CodeBlock lang="ts" code={`"${params.walletId}"`} />
-      <Heading level={2} id="wallet-id">
+      <CodeBlock code={`"${params.walletId}"`} lang="ts" />
+      <Heading anchorId="connect-wallet" level={2}>
         Connect Wallet
       </Heading>
       <Tabs defaultValue="tab-1">
@@ -122,7 +122,6 @@ export default async function Page(props: PageProps) {
         </TabsList>
         <TabsContent value="tab-1">
           <CodeBlock
-            lang="ts"
             code={
               isWCSupported && isInjectedSupported
                 ? injectedAndWCSupportedCodeTS(params.walletId)
@@ -132,11 +131,11 @@ export default async function Page(props: PageProps) {
                     ? WCSupportedTS(params.walletId)
                     : "Code not available"
             }
+            lang="ts"
           />
         </TabsContent>
         <TabsContent value="tab-2">
           <CodeBlock
-            lang="ts"
             code={
               isWCSupported && isInjectedSupported
                 ? injectedAndWCSupportedCodeReact(params.walletId)
@@ -146,6 +145,7 @@ export default async function Page(props: PageProps) {
                     ? WCSupportedCodeReact(params.walletId)
                     : "Code not available"
             }
+            lang="ts"
           />
         </TabsContent>
         <TabsContent value="tab-3">
@@ -159,10 +159,10 @@ export default async function Page(props: PageProps) {
               ConnectEmbed
             </DocLink>{" "}
             component to get a pre-built UI for connecting the wallet.
-            <Heading level={3} id="connect-component">
+            <Heading anchorId="connect-component" level={3}>
               Example
             </Heading>
-            <CodeBlock lang="tsx" code={componentCode(params.walletId)} />
+            <CodeBlock code={componentCode(params.walletId)} lang="tsx" />
           </Paragraph>
         </TabsContent>
       </Tabs>
diff --git a/apps/portal/src/app/typescript/v5/supported-wallets/com.coinbase.wallet/page.tsx b/apps/portal/src/app/typescript/v5/supported-wallets/com.coinbase.wallet/page.tsx
index 32fcf2eb427..8bcd2995e62 100644
--- a/apps/portal/src/app/typescript/v5/supported-wallets/com.coinbase.wallet/page.tsx
+++ b/apps/portal/src/app/typescript/v5/supported-wallets/com.coinbase.wallet/page.tsx
@@ -1,16 +1,16 @@
 /* eslint-disable @next/next/no-img-element */
 
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { GlobeIcon } from "lucide-react";
 import Image from "next/image";
 import { getWalletInfo } from "thirdweb/wallets";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import {
   Breadcrumb,
   CodeBlock,
+  createMetadata,
   DocLink,
   Heading,
   Paragraph,
-  createMetadata,
 } from "../../../../../components/Document";
 
 const walletId = "com.coinbase.wallet";
@@ -19,12 +19,12 @@ export async function generateMetadata() {
   const walletMetadata = await getWalletInfo(walletId);
 
   return createMetadata({
-    title: walletMetadata.name,
     description: `Connect ${walletMetadata.name} with thirdweb Connect SDK`,
     image: {
-      title: walletMetadata.name,
       icon: "wallets",
+      title: walletMetadata.name,
     },
+    title: walletMetadata.name,
   });
 }
 
@@ -51,32 +51,32 @@ export default async function Page() {
 
       <div className="mb-10 flex items-center gap-3 [&_h1]:m-0">
         <Image
-          src={walletImage}
-          width={36}
-          height={36}
           alt=""
           className="rounded-lg"
+          height={36}
+          src={walletImage}
+          width={36}
         />
-        <Heading level={1} id="title">
+        <Heading anchorId="title" level={1}>
           {walletMetadata.name}
         </Heading>
       </div>
 
       <DocLink
-        href={walletMetadata.homepage}
         className="flex items-center gap-2"
+        href={walletMetadata.homepage}
       >
         <GlobeIcon className="size-5" />
         {walletMetadata.homepage}
       </DocLink>
 
-      <Heading level={2} id="wallet-id">
+      <Heading anchorId="wallet-id" level={2}>
         Wallet ID
       </Heading>
 
-      <CodeBlock lang="ts" code={`"${walletId}"`} />
+      <CodeBlock code={`"${walletId}"`} lang="ts" />
 
-      <Heading level={2} id="wallet-id">
+      <Heading anchorId="connect-wallet" level={2}>
         Connect Wallet
       </Heading>
 
@@ -87,10 +87,10 @@ export default async function Page() {
           <TabsTrigger value="tab-3"> React (Component) </TabsTrigger>
         </TabsList>
         <TabsContent value="tab-1">
-          <CodeBlock lang="ts" code={injectedSupportedTS()} />
+          <CodeBlock code={injectedSupportedTS()} lang="ts" />
         </TabsContent>
         <TabsContent value="tab-2">
-          <CodeBlock lang="ts" code={injectedSupportedCodeReact()} />
+          <CodeBlock code={injectedSupportedCodeReact()} lang="ts" />
         </TabsContent>
         <TabsContent value="tab-3">
           <Paragraph>
@@ -103,15 +103,15 @@ export default async function Page() {
               ConnectEmbed
             </DocLink>{" "}
             component to get a pre-built UI for connecting the wallet.{" "}
-            <Heading level={3} id="connect-component">
+            <Heading anchorId="connect-component" level={3}>
               Example
             </Heading>{" "}
-            <CodeBlock lang="tsx" code={componentCode()} />
+            <CodeBlock code={componentCode()} lang="tsx" />
           </Paragraph>
         </TabsContent>
       </Tabs>
 
-      <Heading level={2} id="reference">
+      <Heading anchorId="reference" level={2}>
         Reference
       </Heading>
 
diff --git a/apps/portal/src/app/unity/v5/layout.tsx b/apps/portal/src/app/unity/v5/layout.tsx
index b9ca048c77e..4eed88f3b9d 100644
--- a/apps/portal/src/app/unity/v5/layout.tsx
+++ b/apps/portal/src/app/unity/v5/layout.tsx
@@ -6,8 +6,8 @@ import { sidebar } from "./sidebar";
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Connect</p>
@@ -21,11 +21,11 @@ export default async function Layout(props: { children: React.ReactNode }) {
 }
 
 export const metadata = createMetadata({
+  description:
+    "Connect to user's wallets, interact with smart contracts, sign messages, and utilize common standards such as tokens, NFTs, marketplaces; all with built-in RPC URLs, IPFS gateways, and more.",
   image: {
-    title: "thirdweb Unity SDK",
     icon: "unity",
+    title: "thirdweb Unity SDK",
   },
   title: "thirdweb Unity SDK",
-  description:
-    "Connect to user's wallets, interact with smart contracts, sign messages, and utilize common standards such as tokens, NFTs, marketplaces; all with built-in RPC URLs, IPFS gateways, and more.",
 });
diff --git a/apps/portal/src/app/unity/v5/sidebar.tsx b/apps/portal/src/app/unity/v5/sidebar.tsx
index 2d95c9e8b0d..4fa429c592a 100644
--- a/apps/portal/src/app/unity/v5/sidebar.tsx
+++ b/apps/portal/src/app/unity/v5/sidebar.tsx
@@ -1,124 +1,124 @@
-import type { SideBar } from "@/components/Layouts/DocLayout";
 import { CodeIcon, ExternalLinkIcon, ZapIcon } from "lucide-react";
+import type { SideBar } from "@/components/Layouts/DocLayout";
 
 const sdkSlug = "/unity/v5";
 const walletProvidersSlug = `${sdkSlug}/wallets`;
 
 export const sidebar: SideBar = {
-  name: "Unity SDK",
   links: [
     { separator: true },
     {
-      name: "Overview",
       href: sdkSlug,
+      name: "Overview",
     },
     {
-      name: "Getting Started",
       href: `${sdkSlug}/getting-started`,
       icon: <ZapIcon />,
+      name: "Getting Started",
     },
     {
-      name: "API Reference",
       href: "/dotnet",
-      isCollapsible: false,
       icon: <CodeIcon />,
+      isCollapsible: false,
+      name: "API Reference",
     },
     {
       separator: true,
     },
     {
-      name: "Core",
       isCollapsible: false,
       links: [
         {
-          name: "Thirdweb Manager",
           href: `${sdkSlug}/thirdwebmanager`,
+          name: "Thirdweb Manager",
         },
         {
-          name: "Build Instructions",
           href: `${sdkSlug}/build-instructions`,
+          name: "Build Instructions",
         },
       ],
+      name: "Core",
     },
     {
       separator: true,
     },
     {
-      name: "Onboarding Users",
       isCollapsible: false,
       links: [
         {
-          name: "In-App Wallet",
           href: `${walletProvidersSlug}/in-app-wallet`,
+          name: "In-App Wallet",
         },
         {
-          name: "Ecosystem Wallet",
           href: `${walletProvidersSlug}/ecosystem-wallet`,
+          name: "Ecosystem Wallet",
         },
         {
-          name: "Account Abstraction",
           href: `${walletProvidersSlug}/account-abstraction`,
+          name: "Account Abstraction",
         },
         {
-          name: "Private Key Wallet",
           href: `${walletProvidersSlug}/private-key`,
+          name: "Private Key Wallet",
         },
         {
-          name: "WalletConnect Wallet",
           href: `${walletProvidersSlug}/walletconnect`,
+          name: "WalletConnect Wallet",
         },
         {
-          name: "MetaMask Wallet (WebGL)",
           href: `${walletProvidersSlug}/metamask`,
+          name: "MetaMask Wallet (WebGL)",
         },
       ],
+      name: "Onboarding Users",
     },
     {
       separator: true,
     },
     {
-      name: "Onchain Interactions",
       isCollapsible: false,
       links: [
         {
-          name: "Interacting with Contracts",
           href: `${sdkSlug}/contracts`,
+          name: "Interacting with Contracts",
         },
         {
-          name: "Contract Extensions",
           href: "/dotnet/contracts/extensions",
+          name: "Contract Extensions",
         },
       ],
+      name: "Onchain Interactions",
     },
     {
       separator: true,
     },
     {
-      name: "Advanced Functionality",
       isCollapsible: false,
       links: [
         {
-          name: "Insight Indexer",
           href: "/dotnet/insight/quickstart",
           icon: <ExternalLinkIcon />,
+          name: "Insight Indexer",
         },
         {
-          name: "Nebula AI",
           href: "/dotnet/nebula/quickstart",
           icon: <ExternalLinkIcon />,
+          name: "Nebula AI",
         },
         {
-          name: "Universal Bridge",
           href: "/dotnet/universal-bridge/quickstart",
           icon: <ExternalLinkIcon />,
+          name: "Universal Bridge",
         },
       ],
+      name: "Advanced Functionality",
     },
 
     { separator: true },
     {
-      name: "Migrate from v4",
       href: `${sdkSlug}/migration-guide`,
+      name: "Migrate from v4",
     },
   ],
+  name: "Unity SDK",
 };
diff --git a/apps/portal/src/app/unreal-engine/blueprints/sidebar.ts b/apps/portal/src/app/unreal-engine/blueprints/sidebar.ts
index 46c6f33f3d1..00883b4eac5 100644
--- a/apps/portal/src/app/unreal-engine/blueprints/sidebar.ts
+++ b/apps/portal/src/app/unreal-engine/blueprints/sidebar.ts
@@ -2,28 +2,28 @@ import { hrefBuilder } from "@/app/unreal-engine/util";
 import type { LinkGroup } from "@/components/others/Sidebar";
 
 export const blueprints: LinkGroup = hrefBuilder("/blueprints", {
-  name: "Blueprints",
   isCollapsible: true,
   links: [
     {
-      name: "Overview",
       href: "",
+      name: "Overview",
     },
     {
-      name: "In App Wallets",
       href: "/in-app-wallet",
+      name: "In App Wallets",
     },
     {
-      name: "Smart Wallets",
       href: "/smart-wallet",
+      name: "Smart Wallets",
     },
     {
-      name: "Engine",
       href: "/engine",
+      name: "Engine",
     },
     {
-      name: "Utilities",
       href: "/utilities",
+      name: "Utilities",
     },
   ],
+  name: "Blueprints",
 });
diff --git a/apps/portal/src/app/unreal-engine/cpp/sidebar.ts b/apps/portal/src/app/unreal-engine/cpp/sidebar.ts
index 9e8e8ac6dac..73e696aef4c 100644
--- a/apps/portal/src/app/unreal-engine/cpp/sidebar.ts
+++ b/apps/portal/src/app/unreal-engine/cpp/sidebar.ts
@@ -2,40 +2,40 @@ import { hrefBuilder } from "@/app/unreal-engine/util";
 import type { LinkGroup } from "@/components/others/Sidebar";
 
 export const cpp: LinkGroup = hrefBuilder("/cpp", {
-  name: "C++",
   isCollapsible: true,
   links: [
     {
-      name: "Namespaces",
       isCollapsible: false,
       links: [
         {
-          name: "Thirdweb",
           href: "/thirdweb",
+          name: "Thirdweb",
         },
         {
-          name: "ThirdwebUtils",
           href: "/thirdweb-utils",
+          name: "ThirdwebUtils",
         },
       ],
+      name: "Namespaces",
     },
     {
-      name: "Classes",
       isCollapsible: false,
       links: [
         {
-          name: "Common",
           href: "/common",
+          name: "Common",
         },
         {
-          name: "Runtime Settings",
           href: "/runtime-settings",
+          name: "Runtime Settings",
         },
         {
-          name: "Wallet Handles",
           href: "/wallet-handles",
+          name: "Wallet Handles",
         },
       ],
+      name: "Classes",
     },
   ],
+  name: "C++",
 });
diff --git a/apps/portal/src/app/unreal-engine/layout.tsx b/apps/portal/src/app/unreal-engine/layout.tsx
index e11149334d3..64121310fe8 100644
--- a/apps/portal/src/app/unreal-engine/layout.tsx
+++ b/apps/portal/src/app/unreal-engine/layout.tsx
@@ -6,8 +6,8 @@ import { sidebar } from "./sidebar";
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
     <DocLayout
-      sideBar={sidebar}
       editPageButton={true}
+      sideBar={sidebar}
       sidebarHeader={
         <div className="flex-col items-center gap-1">
           <p className="py-5 font-semibold text-foreground text-lg">Connect</p>
@@ -21,11 +21,11 @@ export default async function Layout(props: { children: React.ReactNode }) {
 }
 
 export const metadata = createMetadata({
+  description:
+    "Seamlessly create In-App Wallets, sign in with email or socials, unlock Account Abstraction features and more.",
   image: {
-    title: "Thirdweb Unreal Engine SDK",
     icon: "unreal-engine",
+    title: "Thirdweb Unreal Engine SDK",
   },
   title: "Thirdweb Unreal Engine SDK",
-  description:
-    "Seamlessly create In-App Wallets, sign in with email or socials, unlock Account Abstraction features and more.",
 });
diff --git a/apps/portal/src/app/unreal-engine/sidebar.tsx b/apps/portal/src/app/unreal-engine/sidebar.tsx
index 0de9afe2142..2f50da6eba1 100644
--- a/apps/portal/src/app/unreal-engine/sidebar.tsx
+++ b/apps/portal/src/app/unreal-engine/sidebar.tsx
@@ -1,23 +1,23 @@
+import { ZapIcon } from "lucide-react";
 import { blueprints } from "@/app/unreal-engine/blueprints/sidebar";
 import { cpp } from "@/app/unreal-engine/cpp/sidebar";
 import { hrefBuilder } from "@/app/unreal-engine/util";
 import type { SideBar } from "@/components/Layouts/DocLayout";
-import { ZapIcon } from "lucide-react";
 
 export const sidebar: SideBar = hrefBuilder("/unreal-engine", {
-  name: "Unreal Engine SDK",
   links: [
     { separator: true },
     {
-      name: "Overview",
       href: "",
+      name: "Overview",
     },
     {
-      name: "Getting Started",
       href: "/getting-started",
       icon: <ZapIcon />,
+      name: "Getting Started",
     },
     blueprints,
     cpp,
   ],
+  name: "Unreal Engine SDK",
 });
diff --git a/apps/portal/src/app/unreal-engine/util.ts b/apps/portal/src/app/unreal-engine/util.ts
index 00d80f7c9ac..b6055be578a 100644
--- a/apps/portal/src/app/unreal-engine/util.ts
+++ b/apps/portal/src/app/unreal-engine/util.ts
@@ -1,6 +1,6 @@
+import { createMetadata } from "@doc";
 import type { SideBar } from "@/components/Layouts/DocLayout";
 import type { SidebarLink } from "@/components/others/Sidebar";
-import { createMetadata } from "@doc";
 
 export const createUnrealEngineMetadata = (
   params: Parameters<typeof createMetadata>[0],
diff --git a/apps/portal/src/app/vault/layout.tsx b/apps/portal/src/app/vault/layout.tsx
index 42d3436a83e..ad52cf1ed38 100644
--- a/apps/portal/src/app/vault/layout.tsx
+++ b/apps/portal/src/app/vault/layout.tsx
@@ -1,17 +1,17 @@
-import { DocLayout } from "@/components/Layouts/DocLayout";
 import { createMetadata } from "@doc";
+import { DocLayout } from "@/components/Layouts/DocLayout";
 import { sidebar } from "./sidebar";
 
 export default async function Layout(props: { children: React.ReactNode }) {
   return (
-    <DocLayout sideBar={sidebar} editPageButton={true}>
+    <DocLayout editPageButton={true} sideBar={sidebar}>
       {props.children}
     </DocLayout>
   );
 }
 
 export const metadata = createMetadata({
-  title: "Vault",
   description:
     "Vault is an open-source non-custodial key management service, secured with TEE architecture (AWS Nitro Enclaves) and designed for blockchain applications.",
+  title: "Vault",
 });
diff --git a/apps/portal/src/app/vault/sidebar.tsx b/apps/portal/src/app/vault/sidebar.tsx
index 79b4ece2ff7..2108de684e6 100644
--- a/apps/portal/src/app/vault/sidebar.tsx
+++ b/apps/portal/src/app/vault/sidebar.tsx
@@ -1,4 +1,3 @@
-import type { SideBar } from "@/components/Layouts/DocLayout";
 import {
   Code2Icon,
   KeyIcon,
@@ -8,95 +7,96 @@ import {
   VaultIcon,
   WrenchIcon,
 } from "lucide-react";
+import type { SideBar } from "@/components/Layouts/DocLayout";
 
 export const sidebar: SideBar = {
-  name: "Vault",
   links: [
     {
-      name: "Overview",
       href: "/vault",
       icon: <VaultIcon />,
+      name: "Overview",
     },
     {
-      name: "Get Started",
       href: "/vault/get-started",
       icon: <RocketIcon />,
+      name: "Get Started",
     },
     {
-      name: "Key Concepts",
       icon: <KeyIcon />,
       links: [
         {
-          name: "Key Management",
           href: "/vault/key-concepts/key-management",
+          name: "Key Management",
         },
         {
-          name: "Entities",
           href: "/vault/key-concepts/entities",
+          name: "Entities",
         },
         {
-          name: "Accounts",
           href: "/vault/key-concepts/accounts",
+          name: "Accounts",
         },
         {
-          name: "Access Tokens",
           href: "/vault/key-concepts/access-tokens",
+          name: "Access Tokens",
         },
         {
-          name: "Access Control",
           href: "/vault/key-concepts/access-control",
+          name: "Access Control",
         },
       ],
+      name: "Key Concepts",
     },
     {
-      name: "TypeScript SDK",
       icon: <Code2Icon />,
       links: [
         {
-          name: "Overview",
           href: "/vault/sdk",
+          name: "Overview",
         },
         {
-          name: "Installation",
           href: "/vault/sdk/installation",
+          name: "Installation",
         },
         {
-          name: "API Reference",
           href: "/vault/sdk/api-reference",
+          name: "API Reference",
         },
         {
-          name: "Guides",
           links: [
             {
-              name: "Creating & Managing EOAs",
               href: "/vault/sdk/guides/creating-eoas",
+              name: "Creating & Managing EOAs",
             },
             {
-              name: "Signing Transactions & Messages",
               href: "/vault/sdk/guides/signing",
+              name: "Signing Transactions & Messages",
             },
             {
-              name: "Managing Access Tokens",
               href: "/vault/sdk/guides/access-tokens",
+              name: "Managing Access Tokens",
             },
           ],
+          name: "Guides",
         },
       ],
+      name: "TypeScript SDK",
     },
     {
-      name: "Security",
       href: "/vault/security",
       icon: <ShieldQuestionIcon />,
+      name: "Security",
     },
     {
-      name: "Troubleshoot",
       href: "/vault/troubleshoot",
       icon: <WrenchIcon />,
+      name: "Troubleshoot",
     },
     {
-      name: "FAQs",
       href: "/vault/faqs",
       icon: <MessageCircleQuestionIcon />,
+      name: "FAQs",
     },
   ],
+  name: "Vault",
 };
diff --git a/apps/portal/src/components/AI/api.ts b/apps/portal/src/components/AI/api.ts
index 4024d693967..0dc58b6d015 100644
--- a/apps/portal/src/components/AI/api.ts
+++ b/apps/portal/src/components/AI/api.ts
@@ -9,17 +9,17 @@ export const getChatResponse = async (
 ) => {
   try {
     const payload = {
-      message: userMessage,
       conversationId: sessionId,
+      message: userMessage,
       source: "portal",
     };
     const response = await fetch(`${apiUrl}/v1/chat`, {
-      method: "POST",
+      body: JSON.stringify(payload),
       headers: {
         "Content-Type": "application/json",
         "x-service-api-key": serviceKey,
       },
-      body: JSON.stringify(payload),
+      method: "POST",
     });
 
     if (!response.ok) {
@@ -49,12 +49,12 @@ export const sendFeedback = async (
 ) => {
   try {
     const response = await fetch(`${apiUrl}/v1/chat/feedback`, {
-      method: "POST",
+      body: JSON.stringify({ conversationId, feedbackRating }),
       headers: {
         "Content-Type": "application/json",
         "x-service-api-key": serviceKey,
       },
-      body: JSON.stringify({ conversationId, feedbackRating }),
+      method: "POST",
     });
 
     if (!response.ok) {
diff --git a/apps/portal/src/components/AI/chat.tsx b/apps/portal/src/components/AI/chat.tsx
index a3c6aabdc90..6cf6dd66abc 100644
--- a/apps/portal/src/components/AI/chat.tsx
+++ b/apps/portal/src/components/AI/chat.tsx
@@ -1,12 +1,11 @@
 "use client";
 
-import { MarkdownRenderer } from "@/components/markdown/MarkdownRenderer";
-import { LoadingDots } from "@/components/ui/LoadingDots";
-import { Button } from "@/components/ui/button";
-import { AutoResizeTextarea } from "@/components/ui/textarea";
-import { cn } from "@/lib/utils";
-import { MessageCircleIcon } from "lucide-react";
-import { ArrowUpIcon, ThumbsDownIcon, ThumbsUpIcon } from "lucide-react";
+import {
+  ArrowUpIcon,
+  MessageCircleIcon,
+  ThumbsDownIcon,
+  ThumbsUpIcon,
+} from "lucide-react";
 import { usePostHog } from "posthog-js/react";
 import {
   type ChangeEvent,
@@ -16,6 +15,11 @@ import {
   useRef,
   useState,
 } from "react";
+import { MarkdownRenderer } from "@/components/markdown/MarkdownRenderer";
+import { Button } from "@/components/ui/button";
+import { LoadingDots } from "@/components/ui/LoadingDots";
+import { AutoResizeTextarea } from "@/components/ui/textarea";
+import { cn } from "@/lib/utils";
 import { getChatResponse, sendFeedback } from "./api";
 
 interface Message {
@@ -35,7 +39,9 @@ const predefinedPrompts = [
 // Empty State Component
 function ChatEmptyState({
   onPromptClick,
-}: { onPromptClick: (prompt: string) => void }) {
+}: {
+  onPromptClick: (prompt: string) => void;
+}) {
   return (
     <div className="flex flex-col items-center justify-center space-y-8 py-16 text-center">
       <MessageCircleIcon className="size-16" />
@@ -48,10 +54,10 @@ function ChatEmptyState({
       <div className="flex w-full max-w-md flex-col items-center justify-center space-y-3">
         {predefinedPrompts.map((prompt) => (
           <Button
-            key={prompt}
-            variant="outline"
             className="h-auto w-full justify-start whitespace-normal p-4 text-left"
+            key={prompt}
             onClick={() => onPromptClick(prompt)}
+            variant="outline"
           >
             {prompt}
           </Button>
@@ -75,22 +81,22 @@ export function Chat() {
       if (!content.trim()) return;
 
       posthog?.capture("siwa.send-message", {
-        sessionId: conversationId,
         message: content,
+        sessionId: conversationId,
       });
 
       const userMessage: Message = {
+        content,
         id: Date.now().toString(),
         role: "user",
-        content,
       };
 
       const loadingMessageId = (Date.now() + 1).toString();
       const assistantLoadingMessage: Message = {
-        id: loadingMessageId,
-        role: "assistant",
         content: "",
+        id: loadingMessageId,
         isLoading: true,
+        role: "assistant",
       };
 
       setMessages((prevMessages) => [
@@ -171,10 +177,7 @@ export function Chat() {
   };
 
   return (
-    <div
-      className="mx-auto flex size-full flex-col overflow-hidden lg:min-w-[800px] lg:max-w-5xl"
-      id="chat-container"
-    >
+    <div className="mx-auto flex size-full flex-col overflow-hidden lg:min-w-[800px] lg:max-w-5xl">
       <div className="flex-1 overflow-y-auto p-4">
         {messages.length === 0 ? (
           <ChatEmptyState onPromptClick={handleSendMessage} />
@@ -182,12 +185,12 @@ export function Chat() {
           <div className="space-y-4">
             {messages.map((message, index) => (
               <div
-                key={message.id}
-                ref={index === messages.length - 1 ? lastMessageRef : null}
                 className={cn(
                   "flex",
                   message.role === "user" ? "justify-end" : "justify-start",
                 )}
+                key={message.id}
+                ref={index === messages.length - 1 ? lastMessageRef : null}
               >
                 <div
                   className={cn(
@@ -202,8 +205,8 @@ export function Chat() {
                   ) : (
                     <>
                       <StyledMarkdownRenderer
-                        text={message.content}
                         isMessagePending={false}
+                        text={message.content}
                         type={message.role}
                       />
                       {message.role === "assistant" && !message.isLoading && (
@@ -211,18 +214,18 @@ export function Chat() {
                           {!message.feedback && (
                             <>
                               <button
-                                type="button"
                                 aria-label="Thumbs up"
                                 className="text-muted-foreground transition-colors hover:text-green-500"
                                 onClick={() => handleFeedback(message.id, 1)}
+                                type="button"
                               >
                                 <ThumbsUpIcon className="size-5" />
                               </button>
                               <button
-                                type="button"
                                 aria-label="Thumbs down"
                                 className="text-muted-foreground transition-colors hover:text-red-500"
                                 onClick={() => handleFeedback(message.id, -1)}
+                                type="button"
                               >
                                 <ThumbsDownIcon className="size-5" />
                               </button>
@@ -241,23 +244,23 @@ export function Chat() {
       <div className="p-4">
         <div className="relative rounded-lg bg-muted text-muted-foreground">
           <AutoResizeTextarea
-            value={input}
+            className="min-h-[100px] resize-none bg-transparent pt-4 pr-20 pl-4"
             onChange={handleInputChange}
             onKeyDown={handleKeyDown}
             placeholder="Ask AI Assistant..."
-            className="min-h-[100px] resize-none bg-transparent pt-4 pr-20 pl-4"
             rows={2}
+            value={input}
           />
           <Button
-            type="submit"
-            variant={"primary"}
             className="-translate-y-1/2 absolute top-1/2 right-2"
+            disabled={!input.trim()}
             onClick={() => {
               const currentInput = input;
               setInput("");
               handleSendMessage(currentInput);
             }}
-            disabled={!input.trim()}
+            type="submit"
+            variant={"primary"}
           >
             <ArrowUpIcon />
           </Button>
@@ -274,21 +277,21 @@ function StyledMarkdownRenderer(props: {
 }) {
   return (
     <MarkdownRenderer
-      skipHtml
-      markdownText={props.text}
       className="text-foreground [&>*:first-child]:mt-0 [&>*:first-child]:border-none [&>*:first-child]:pb-0 [&>*:last-child]:mb-0"
       code={{
-        ignoreFormattingErrors: true,
         className: "bg-transparent",
+        ignoreFormattingErrors: true,
       }}
+      inlineCode={{ className: "border-none" }}
+      li={{ className: "text-foreground" }}
+      markdownText={props.text}
       p={{
         className:
           props.type === "assistant"
             ? "text-foreground"
             : "text-foreground leading-normal",
       }}
-      li={{ className: "text-foreground" }}
-      inlineCode={{ className: "border-none" }}
+      skipHtml
     />
   );
 }
diff --git a/apps/portal/src/components/Document/APIEndpointMeta/ApiEndpoint.tsx b/apps/portal/src/components/Document/APIEndpointMeta/ApiEndpoint.tsx
index 7bb1ad8e009..c57556e1a85 100644
--- a/apps/portal/src/components/Document/APIEndpointMeta/ApiEndpoint.tsx
+++ b/apps/portal/src/components/Document/APIEndpointMeta/ApiEndpoint.tsx
@@ -36,9 +36,7 @@ type ApiEndpointMeta = {
   responseExamples: Record<string, string>;
 };
 
-export function ApiEndpoint(props: {
-  metadata: ApiEndpointMeta;
-}) {
+export function ApiEndpoint(props: { metadata: ApiEndpointMeta }) {
   const { request, responseExamples } = props.metadata;
 
   const requestExamples: Array<{
@@ -50,15 +48,15 @@ export function ApiEndpoint(props: {
       code: createFetchCommand({
         metadata: props.metadata,
       }),
-      lang: "javascript",
       label: "Fetch",
+      lang: "javascript",
     },
     {
       code: createCurlCommand({
         metadata: props.metadata,
       }),
-      lang: "bash",
       label: "Curl",
+      lang: "bash",
     },
   ];
 
@@ -68,7 +66,7 @@ export function ApiEndpoint(props: {
     <div>
       <div>
         <div className="mb-5 flex flex-col gap-3 border-b pb-5">
-          <Heading level={1} id="title" className="mb-0">
+          <Heading anchorId="title" className="mb-0" level={1}>
             {props.metadata.title}
           </Heading>
           <Paragraph className="mb-0">{props.metadata.description}</Paragraph>
@@ -76,25 +74,25 @@ export function ApiEndpoint(props: {
 
         {/* Headers */}
         {request.headers.length > 0 && (
-          <ParameterSection title="Headers" parameters={request.headers} />
+          <ParameterSection parameters={request.headers} title="Headers" />
         )}
 
         {/* Path parameters */}
         {request.pathParameters.length > 0 && (
           <ParameterSection
-            title="Path parameters"
             parameters={request.pathParameters}
+            title="Path parameters"
           />
         )}
 
         {/* Body  */}
         {request.bodyParameters.length > 0 && (
-          <ParameterSection title="Body" parameters={request.bodyParameters} />
+          <ParameterSection parameters={request.bodyParameters} title="Body" />
         )}
       </div>
 
       <div>
-        <Heading id="request" level={2} className="text-lg lg:text-lg">
+        <Heading anchorId="request" className="text-lg lg:text-lg" level={2}>
           Request
         </Heading>
         <div className="rounded-lg border">
@@ -102,29 +100,29 @@ export function ApiEndpoint(props: {
             // render <CodeBlock /> on server and pass it to client
             codeExamples={requestExamples.map((example) => {
               return {
-                label: example.label,
                 code: (
                   <CodeBlock
-                    code={example.code}
-                    lang={example.lang}
                     className="rounded-none border-none"
+                    code={example.code}
                     containerClassName="m-0"
+                    lang={example.lang}
                   />
                 ),
+                label: example.label,
               };
             })}
-            method={props.metadata.method}
             endpointUrl={props.metadata.path}
+            method={props.metadata.method}
           />
         </div>
       </div>
 
       <div>
-        <Heading id="response" level={2} className="text-lg lg:text-lg">
+        <Heading anchorId="response" className="text-lg lg:text-lg" level={2}>
           Response
         </Heading>
         <div className="overflow-hidden rounded-lg border">
-          <Tabs defaultValue={responseKeys[0]} className="w-full">
+          <Tabs className="w-full" defaultValue={responseKeys[0]}>
             <TabsList className="w-full">
               {responseKeys.map((status) => (
                 <TabsTrigger key={status} value={status}>
@@ -143,12 +141,12 @@ export function ApiEndpoint(props: {
             </TabsList>
 
             {responseKeys.map((status) => (
-              <TabsContent key={status} value={status} className="m-0">
+              <TabsContent className="m-0" key={status} value={status}>
                 <CodeBlock
+                  className="rounded-none border-none"
                   code={responseExamples[status] as string}
-                  lang="json"
                   containerClassName="m-0"
-                  className="rounded-none border-none"
+                  lang="json"
                   scrollContainerClassName="max-h-[600px]"
                 />
               </TabsContent>
@@ -167,10 +165,10 @@ function ParameterSection(props: {
   return (
     <div className="mb-5">
       <Heading
-        level={2}
-        id={props.title}
-        className="text-lg md:text-lg"
         anchorClassName="m-0 mb-2"
+        anchorId={props.title}
+        className="text-lg md:text-lg"
+        level={2}
       >
         {props.title}
       </Heading>
@@ -194,9 +192,9 @@ function ParameterItem({ param }: { param: APIParameter }) {
   return (
     <Details
       accordionItemClassName="my-1"
+      accordionTriggerClassName="font-mono"
       summary={param.name}
       tags={param.required ? ["Required"] : []}
-      accordionTriggerClassName="font-mono"
     >
       <div className={"flex flex-col gap-2"}>
         <Paragraph>{param.description}</Paragraph>
@@ -204,10 +202,10 @@ function ParameterItem({ param }: { param: APIParameter }) {
           <div className="rounded-lg border">
             <h4 className="border-b p-3 text-sm"> Type </h4>
             <CodeBlock
+              className="border-none"
               code={param.type}
-              lang="typescript"
               containerClassName="mb-0"
-              className="border-none"
+              lang="typescript"
             />
           </div>
         )}
@@ -216,9 +214,7 @@ function ParameterItem({ param }: { param: APIParameter }) {
   );
 }
 
-function createCurlCommand(params: {
-  metadata: ApiEndpointMeta;
-}) {
+function createCurlCommand(params: { metadata: ApiEndpointMeta }) {
   const url = `${params.metadata.origin}${params.metadata.path}`;
   const bodyObj: Record<string, string | number | boolean | object> = {};
 
@@ -249,9 +245,7 @@ function createCurlCommand(params: {
   return `curl -X ${params.metadata.method} ${requestData}`;
 }
 
-function createFetchCommand(params: {
-  metadata: ApiEndpointMeta;
-}) {
+function createFetchCommand(params: { metadata: ApiEndpointMeta }) {
   const headersObj: Record<string, string | number | boolean | object> = {};
   const bodyObj: Record<string, string | number | boolean | object> = {};
   const { request } = params.metadata;
diff --git a/apps/portal/src/components/Document/APIEndpointMeta/RequestExample.tsx b/apps/portal/src/components/Document/APIEndpointMeta/RequestExample.tsx
index 7bf2afb9628..988165a6662 100644
--- a/apps/portal/src/components/Document/APIEndpointMeta/RequestExample.tsx
+++ b/apps/portal/src/components/Document/APIEndpointMeta/RequestExample.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useState } from "react";
 import { Badge } from "@/components/ui/badge";
 import {
   Select,
@@ -8,7 +9,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { useState } from "react";
 
 export function RequestExample(props: {
   codeExamples: Array<{
@@ -32,12 +32,12 @@ export function RequestExample(props: {
           </span>
         </div>
         <Select
-          value={selectedExample?.label}
           onValueChange={(value: string) => {
             setSelectedExample(
               props.codeExamples.find((example) => example.label === value),
             );
           }}
+          value={selectedExample?.label}
         >
           <SelectTrigger className="w-[130px]">
             <SelectValue />
diff --git a/apps/portal/src/components/Document/AuthList.tsx b/apps/portal/src/components/Document/AuthList.tsx
index 525103f8988..bb0895a95b6 100644
--- a/apps/portal/src/components/Document/AuthList.tsx
+++ b/apps/portal/src/components/Document/AuthList.tsx
@@ -1,7 +1,8 @@
 /* eslint-disable @next/next/no-img-element */
-import { cn } from "@/lib/utils";
+
 import type { InAppWalletAuth } from "thirdweb/wallets";
 import { getSocialIcon } from "thirdweb/wallets/in-app";
+import { cn } from "@/lib/utils";
 
 const authOptions: InAppWalletAuth[] = [
   "email",
@@ -29,9 +30,9 @@ export function AuthList() {
     <div className={cn("my-4 rounded-lg border bg-card p-4")}>
       <ul className="grid grid-cols-1 gap-4 md:grid-cols-2">
         {authOptions?.map((auth) => (
-          <li key={auth} className="flex items-center">
+          <li className="flex items-center" key={auth}>
             <div className="flex flex-row items-center gap-3">
-              <img src={getSocialIcon(auth)} alt={auth} className="size-5" />
+              <img alt={auth} className="size-5" src={getSocialIcon(auth)} />
               {auth.charAt(0).toUpperCase() + auth.slice(1)}
             </div>
           </li>
diff --git a/apps/portal/src/components/Document/Breadcrumb.tsx b/apps/portal/src/components/Document/Breadcrumb.tsx
index 96d1f9f28b1..6cb2820836c 100644
--- a/apps/portal/src/components/Document/Breadcrumb.tsx
+++ b/apps/portal/src/components/Document/Breadcrumb.tsx
@@ -8,14 +8,15 @@ type Crumb = {
 
 export function Breadcrumb(props: { crumbs: Crumb[] }) {
   return (
-    <nav id="bradcrumb" className="mb-6" data-noindex>
+    // biome-ignore lint/nursery/useUniqueElementIds: this acts as a target for hrefs
+    <nav className="mb-6" data-noindex id="bradcrumb">
       <ul className="flex flex-wrap items-center gap-1 text-sm">
         {props.crumbs.map((crumb, i) => {
           return (
-            <li key={crumb.name} className="flex items-center gap-1">
+            <li className="flex items-center gap-1" key={crumb.name}>
               <Link
-                href={crumb.href}
                 className="font-medium text-muted-foreground transition-colors hover:text-foreground"
+                href={crumb.href}
               >
                 {crumb.name}
               </Link>
diff --git a/apps/portal/src/components/Document/Callout.tsx b/apps/portal/src/components/Document/Callout.tsx
index f8e860069f1..9afc5e9a4fd 100644
--- a/apps/portal/src/components/Document/Callout.tsx
+++ b/apps/portal/src/components/Document/Callout.tsx
@@ -1,5 +1,5 @@
-import { cn } from "@/lib/utils";
 import { AlertCircleIcon, AlertTriangleIcon, InfoIcon } from "lucide-react";
+import { cn } from "@/lib/utils";
 
 export function Callout(props: {
   children: React.ReactNode;
@@ -9,8 +9,8 @@ export function Callout(props: {
 }) {
   return (
     <div
-      role="alert"
       className={cn("my-5 flex flex-col gap-1 rounded-lg border bg-card p-4")}
+      role="alert"
     >
       {/* Icon + title */}
       {props.title && (
diff --git a/apps/portal/src/components/Document/Cards/ArticleCard.tsx b/apps/portal/src/components/Document/Cards/ArticleCard.tsx
index d100599f5a8..4b281eb5a8b 100644
--- a/apps/portal/src/components/Document/Cards/ArticleCard.tsx
+++ b/apps/portal/src/components/Document/Cards/ArticleCard.tsx
@@ -1,7 +1,7 @@
-import { cn } from "@/lib/utils";
 import type { StaticImport } from "next/dist/shared/lib/get-img-props";
 import Image from "next/image";
 import Link from "next/link";
+import { cn } from "@/lib/utils";
 
 export function ArticleCard(props: {
   title: string;
@@ -11,9 +11,9 @@ export function ArticleCard(props: {
   const isExternal = props.href.startsWith("http");
   return (
     <Link
+      className="flex cursor-default bg-card"
       data-noindex
       href={props.href}
-      className="flex cursor-default bg-card"
       target={isExternal ? "_blank" : undefined}
     >
       <article className="group/article w-full overflow-hidden rounded-lg border transition-colors hover:border-active-border">
@@ -39,19 +39,19 @@ export function ArticleIconCard(props: {
   const isExternal = props.href.startsWith("http");
   return (
     <Link
-      data-noindex
-      href={props.href}
       className={cn(
         "flex items-center gap-4 rounded-lg border bg-card p-4 transition-colors hover:border-active-border",
         props.className,
       )}
+      data-noindex
+      href={props.href}
       target={isExternal ? "_blank" : undefined}
     >
       {props.icon && (
         <props.icon className="size-6 shrink-0 text-muted-foreground" />
       )}
       {props.image && (
-        <Image src={props.image} alt="" className="size-6 shrink-0" />
+        <Image alt="" className="size-6 shrink-0" src={props.image} />
       )}
       <div className="flex flex-col gap-0.5">
         <h3 className="font-semibold text-base text-foreground">
diff --git a/apps/portal/src/components/Document/Cards/ConnectCard.tsx b/apps/portal/src/components/Document/Cards/ConnectCard.tsx
index d253ebb1db7..166cdae0923 100644
--- a/apps/portal/src/components/Document/Cards/ConnectCard.tsx
+++ b/apps/portal/src/components/Document/Cards/ConnectCard.tsx
@@ -9,13 +9,13 @@ export function ConnectCard(props: {
 }) {
   return (
     <Link
+      className="flex cursor-default"
       href={props.href}
       target={props.isExternal ? "_blank" : undefined}
-      className="flex cursor-default"
     >
       <article className="group/article flex w-full items-center overflow-hidden rounded-lg border bg-card transition-colors hover:border-active-border">
         <div className="flex w-full items-center gap-4 p-4">
-          <Image src={props.iconUrl} width={40} height={40} alt="" />
+          <Image alt="" height={40} src={props.iconUrl} width={40} />
           <h3 className="font-medium text-base">{props.title}</h3>
         </div>
       </article>
diff --git a/apps/portal/src/components/Document/Cards/GithubTemplateCard.tsx b/apps/portal/src/components/Document/Cards/GithubTemplateCard.tsx
index d01ebd5fac6..dd706bc47f1 100644
--- a/apps/portal/src/components/Document/Cards/GithubTemplateCard.tsx
+++ b/apps/portal/src/components/Document/Cards/GithubTemplateCard.tsx
@@ -7,7 +7,7 @@ export function GithubTemplateCard(props: {
   tag?: string;
 }) {
   return (
-    <Link href={props.href} target="_blank" className="flex cursor-default">
+    <Link className="flex cursor-default" href={props.href} target="_blank">
       <article className="group/article flex w-full items-center overflow-hidden rounded-lg border bg-card transition-colors duration-300 hover:border-active-border">
         <div className="flex w-full items-center gap-3 p-4">
           <GithubIcon className="size-5 shrink-0" />
diff --git a/apps/portal/src/components/Document/Code.tsx b/apps/portal/src/components/Document/Code.tsx
index a6e8185c83f..9c890c44f9c 100644
--- a/apps/portal/src/components/Document/Code.tsx
+++ b/apps/portal/src/components/Document/Code.tsx
@@ -1,18 +1,18 @@
 import "server-only";
 
-// others
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import * as parserBabel from "prettier/plugins/babel";
 // prettier
 import { format } from "prettier/standalone";
 import {
   type BuiltinLanguage,
-  type SpecialLanguage,
-  type ThemedToken,
   codeToTokens,
+  type SpecialLanguage,
   stringifyTokenStyle,
+  type ThemedToken,
 } from "shiki";
+// others
+import { cn } from "@/lib/utils";
 
 import { CopyButton } from "../others/CopyButton";
 import { ScrollShadow } from "../others/ScrollShadow/ScrollShadow";
@@ -74,8 +74,8 @@ export async function CodeBlock(props: {
         lang={lang}
       >
         <ScrollShadow
-          scrollableClassName={cn("p-4", props.scrollContainerClassName)}
           className=""
+          scrollableClassName={cn("p-4", props.scrollContainerClassName)}
         >
           <RenderCode code={code} lang={lang} tokenLinks={tokenLinks} />
         </ScrollShadow>
@@ -96,16 +96,16 @@ async function RenderCode(props: {
   const { tokens } = await codeToTokens(props.code, {
     lang: (props.lang || "javascript") as BuiltinLanguage | SpecialLanguage,
     themes: {
-      light: "github-light",
       dark: "github-dark-dimmed",
+      light: "github-light",
     },
   });
 
   const getThemeColors = (token: ThemedToken) => {
     if (!token.htmlStyle) {
       return {
-        lightColor: undefined,
         darkColor: undefined,
+        lightColor: undefined,
       };
     }
     const styleStr = stringifyTokenStyle(token.htmlStyle);
@@ -113,8 +113,8 @@ async function RenderCode(props: {
     const lightColor = lightStyle?.split(":")[1];
     const darkColor = darkStyle?.split(":")[1];
     return {
-      lightColor,
       darkColor,
+      lightColor,
     };
   };
 
@@ -128,8 +128,8 @@ async function RenderCode(props: {
               const { lightColor, darkColor } = getThemeColors(token);
 
               const style = {
-                "--code-light-color": lightColor,
                 "--code-dark-color": darkColor,
+                "--code-light-color": lightColor,
               } as React.CSSProperties;
 
               const href = props.tokenLinks?.has(token.content)
@@ -139,10 +139,10 @@ async function RenderCode(props: {
               if (href) {
                 return (
                   <Link
+                    className="group/codelink relative py-0.5"
+                    href={href || "#"}
                     // biome-ignore lint/suspicious/noArrayIndexKey: index is the identity here
                     key={i}
-                    href={href || "#"}
-                    className="group/codelink relative py-0.5"
                     style={style}
                   >
                     {/* Token */}
@@ -163,7 +163,7 @@ async function RenderCode(props: {
 
               return (
                 // biome-ignore lint/suspicious/noArrayIndexKey: index is the identity here
-                <span key={i} style={style} data-token={token.content}>
+                <span data-token={token.content} key={i} style={style}>
                   {token.content}
                 </span>
               );
diff --git a/apps/portal/src/components/Document/ContractDeployCard.tsx b/apps/portal/src/components/Document/ContractDeployCard.tsx
index d979d416790..df0be9c8824 100644
--- a/apps/portal/src/components/Document/ContractDeployCard.tsx
+++ b/apps/portal/src/components/Document/ContractDeployCard.tsx
@@ -1,5 +1,5 @@
-import { Button } from "@/components/ui/button";
 import Link from "next/link";
+import { Button } from "@/components/ui/button";
 import { Paragraph } from "./Paragraph";
 
 /**
diff --git a/apps/portal/src/components/Document/Details.tsx b/apps/portal/src/components/Document/Details.tsx
index b95a0bfda3a..6b063115a58 100644
--- a/apps/portal/src/components/Document/Details.tsx
+++ b/apps/portal/src/components/Document/Details.tsx
@@ -8,7 +8,7 @@ export function Details(props: {
   children: React.ReactNode;
   level?: number;
   headingClassName?: string;
-  id?: string;
+  anchorId?: string;
   tags?: string[];
   noIndex?: boolean;
   startExpanded?: boolean;
@@ -16,19 +16,16 @@ export function Details(props: {
   accordionTriggerClassName?: string;
 }) {
   const id =
-    props.id || (typeof props.summary === "string" ? props.summary : "");
+    props.anchorId || (typeof props.summary === "string" ? props.summary : "");
 
   return (
     <CustomAccordion
-      defaultOpen={props.startExpanded}
+      anchorId={id ? `${id}` : undefined}
       containerClassName={cn(
         "group/details border-b-0 border-l transition-colors hover:border-active-border my-4",
         props.accordionItemClassName,
       )}
-      triggerContainerClassName={cn(
-        "flex px-3 py-1 text-foreground group",
-        props.accordionTriggerClassName,
-      )}
+      defaultOpen={props.startExpanded}
       trigger={
         <div className="flex gap-3">
           <h4
@@ -56,7 +53,10 @@ export function Details(props: {
           )}
         </div>
       }
-      id={id ? `${id}` : undefined}
+      triggerContainerClassName={cn(
+        "flex px-3 py-1 text-foreground group",
+        props.accordionTriggerClassName,
+      )}
     >
       <div className="pt-4 pl-4 [&>:first-child]:mt-0">{props.children}</div>
     </CustomAccordion>
diff --git a/apps/portal/src/components/Document/DocImage.tsx b/apps/portal/src/components/Document/DocImage.tsx
index 658a0bfffcf..c1eb4a23847 100644
--- a/apps/portal/src/components/Document/DocImage.tsx
+++ b/apps/portal/src/components/Document/DocImage.tsx
@@ -1,6 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
-import { cn } from "@/lib/utils";
+
 import Image from "next/image";
+import { cn } from "@/lib/utils";
 
 export function DocImage(props: {
   src: React.ComponentProps<typeof Image>["src"];
@@ -19,9 +20,9 @@ export function DocImage(props: {
       )}
     >
       {typeof src === "string" ? (
-        <img className={cls} alt={alt || ""} src={src} />
+        <img alt={alt || ""} className={cls} src={src} />
       ) : (
-        <Image className={cls} alt={alt || ""} src={src} />
+        <Image alt={alt || ""} className={cls} src={src} />
       )}
     </div>
   );
diff --git a/apps/portal/src/components/Document/DocLink.tsx b/apps/portal/src/components/Document/DocLink.tsx
index 36ba6b63163..037ae71e929 100644
--- a/apps/portal/src/components/Document/DocLink.tsx
+++ b/apps/portal/src/components/Document/DocLink.tsx
@@ -1,5 +1,5 @@
-import { cn } from "@/lib/utils";
 import Link from "next/link";
+import { cn } from "@/lib/utils";
 
 export function DocLink(props: {
   href: string;
@@ -9,11 +9,11 @@ export function DocLink(props: {
 }) {
   return (
     <Link
-      href={props.href}
       className={cn(
         "underline decoration-muted-foreground/50 decoration-dotted underline-offset-[5px] transition-colors hover:decoration-foreground hover:decoration-solid",
         props.className,
       )}
+      href={props.href}
       target={
         props.target ||
         (props.href.startsWith("http") || props.href.includes(".pdf")
diff --git a/apps/portal/src/components/Document/EditPage.tsx b/apps/portal/src/components/Document/EditPage.tsx
index f938eba671e..0cd694a02e9 100644
--- a/apps/portal/src/components/Document/EditPage.tsx
+++ b/apps/portal/src/components/Document/EditPage.tsx
@@ -7,9 +7,9 @@ const prefix =
 export function EditPage(props: { path: string }) {
   return (
     <Link
+      className="inline-flex items-center rounded-lg border text-sm duration-200 hover:border-active-border"
       href={prefix + props.path}
       target="_blank"
-      className="inline-flex items-center rounded-lg border text-sm duration-200 hover:border-active-border"
     >
       <div className="p-2.5">
         <GithubIcon className="size-5" />
diff --git a/apps/portal/src/components/Document/ExpandableGrid.tsx b/apps/portal/src/components/Document/ExpandableGrid.tsx
index 414d9b6e15a..64149206004 100644
--- a/apps/portal/src/components/Document/ExpandableGrid.tsx
+++ b/apps/portal/src/components/Document/ExpandableGrid.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { ChevronDownIcon } from "lucide-react";
 import { useState } from "react";
+import { cn } from "@/lib/utils";
 import { DynamicHeight } from "../others/DynamicHeight";
 import { Button } from "../ui/button";
 import { Grid } from "./Grid";
@@ -18,9 +18,9 @@ export function ExpandableGrid(props: { children: React.ReactNode }) {
       </Grid>
       <div className="mt-3 flex justify-end">
         <Button
-          variant="ghost"
-          onClick={() => setIsExpanded(!isExpanded)}
           className="gap-2 p-0 text-muted-foreground hover:bg-transparent hover:text-foreground"
+          onClick={() => setIsExpanded(!isExpanded)}
+          variant="ghost"
         >
           <ChevronDownIcon
             className={cn(
diff --git a/apps/portal/src/components/Document/FeatureCard.tsx b/apps/portal/src/components/Document/FeatureCard.tsx
index 192fecae402..93810d0a28a 100644
--- a/apps/portal/src/components/Document/FeatureCard.tsx
+++ b/apps/portal/src/components/Document/FeatureCard.tsx
@@ -13,11 +13,11 @@ export function FeatureCard(props: FeatureCardItem) {
       <div>
         {typeof iconUrl === "string" ? (
           <Image
-            src={iconUrl}
             alt=""
-            width={24}
-            height={24}
             className="mt-0.5"
+            height={24}
+            src={iconUrl}
+            width={24}
           />
         ) : (
           iconUrl
diff --git a/apps/portal/src/components/Document/GithubButtonLink.tsx b/apps/portal/src/components/Document/GithubButtonLink.tsx
index 99f4ef4d899..9632c80f217 100644
--- a/apps/portal/src/components/Document/GithubButtonLink.tsx
+++ b/apps/portal/src/components/Document/GithubButtonLink.tsx
@@ -4,12 +4,12 @@ import type { SVGProps } from "react";
 export const GithubIcon = (props: SVGProps<SVGSVGElement>) => {
   return (
     <svg
+      fill="currentColor"
+      height={24}
       role="img"
       viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
       width={24}
-      height={24}
+      xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <title>GitHub</title>
@@ -21,9 +21,9 @@ export const GithubIcon = (props: SVGProps<SVGSVGElement>) => {
 export function GithubButtonLink(props: { href: string }) {
   return (
     <Link
+      className="inline-flex items-center rounded-lg border text-sm duration-200 hover:border-active-border"
       href={props.href}
       target="_blank"
-      className="inline-flex items-center rounded-lg border text-sm duration-200 hover:border-active-border"
     >
       <div className="p-2.5">
         <GithubIcon className="size-5" />
diff --git a/apps/portal/src/components/Document/Heading.tsx b/apps/portal/src/components/Document/Heading.tsx
index bac716b241d..f18dcfa3208 100644
--- a/apps/portal/src/components/Document/Heading.tsx
+++ b/apps/portal/src/components/Document/Heading.tsx
@@ -3,7 +3,7 @@ import { Anchor } from "../ui/Anchor";
 
 export function Heading(props: {
   children: React.ReactNode;
-  id: string;
+  anchorId: string;
   level: number;
   className?: string;
   anchorClassName?: string;
@@ -27,9 +27,9 @@ export function Heading(props: {
     case 2: {
       return (
         <Anchor
-          id={props.id}
           className={cn("mt-7 mb-2", props.anchorClassName)}
           data-noindex={props.noIndex}
+          id={props.anchorId}
         >
           <h2
             className={cn(
@@ -46,9 +46,9 @@ export function Heading(props: {
     case 3: {
       return (
         <Anchor
-          id={props.id}
           className={cn("mt-7 mb-3", props.anchorClassName)}
           data-noindex={props.noIndex}
+          id={props.anchorId}
         >
           <h3
             className={cn(
@@ -65,9 +65,9 @@ export function Heading(props: {
     case 4: {
       return (
         <Anchor
-          id={props.id}
           className={cn("mt-7 mb-3", props.anchorClassName)}
           data-noindex={props.noIndex}
+          id={props.anchorId}
         >
           <h4
             className={cn(
@@ -84,9 +84,9 @@ export function Heading(props: {
     case 5: {
       return (
         <Anchor
-          id={props.id}
           className={cn("mt-7 mb-3", props.anchorClassName)}
           data-noindex={props.noIndex}
+          id={props.anchorId}
         >
           <h5
             className={cn(
@@ -103,9 +103,9 @@ export function Heading(props: {
     default: {
       return (
         <Anchor
-          id={props.id}
           className={cn("mt-7 mb-3", props.anchorClassName)}
           data-noindex={props.noIndex}
+          id={props.anchorId}
         >
           <h6
             className={cn(
diff --git a/apps/portal/src/components/Document/PageFooter.tsx b/apps/portal/src/components/Document/PageFooter.tsx
index 78e11bbae06..e79bd444dca 100644
--- a/apps/portal/src/components/Document/PageFooter.tsx
+++ b/apps/portal/src/components/Document/PageFooter.tsx
@@ -5,9 +5,9 @@ import {
   ScrollTextIcon,
   VideoIcon,
 } from "lucide-react";
-import { DocLink } from ".";
 import { Feedback } from "../others/Feedback";
 import { Subscribe } from "../others/Subscribe";
+import { DocLink } from ".";
 import { AutoEditPageButton } from "./AutoEditPageButton";
 
 export function PageFooter(props: { editPageButton?: true }) {
@@ -30,31 +30,31 @@ function Links() {
   return (
     <ul className="flex flex-col gap-3">
       <FooterLinkItem
-        prefix="Need help?"
-        label="Visit our support site"
         href="https://thirdweb.com/support"
         icon={BadgeHelpIcon}
+        label="Visit our support site"
+        prefix="Need help?"
       />
 
       <FooterLinkItem
-        prefix="Watch our"
-        label="video Tutorials"
         href="https://www.youtube.com/@thirdweb_"
         icon={VideoIcon}
+        label="video Tutorials"
+        prefix="Watch our"
       />
 
       <FooterLinkItem
-        prefix="View our"
-        label="changelog"
         href="/changelog"
         icon={ScrollTextIcon}
+        label="changelog"
+        prefix="View our"
       />
 
       <FooterLinkItem
-        prefix="Using AI?"
-        label="View llms.txt"
         href="/llms-full.txt"
         icon={BrainIcon}
+        label="View llms.txt"
+        prefix="Using AI?"
       />
     </ul>
   );
diff --git a/apps/portal/src/components/Document/SDKCard.tsx b/apps/portal/src/components/Document/SDKCard.tsx
index 8d0062be67d..8310f4e9bfb 100644
--- a/apps/portal/src/components/Document/SDKCard.tsx
+++ b/apps/portal/src/components/Document/SDKCard.tsx
@@ -10,9 +10,9 @@ export function SDKCard(props: {
 }) {
   return (
     <Link
+      className="flex items-center gap-2 rounded-lg border bg-card p-4 transition-colors hover:border-active-border"
       href={props.href}
       target={props.isExternal ? "_blank" : undefined}
-      className="flex items-center gap-2 rounded-lg border bg-card p-4 transition-colors hover:border-active-border"
     >
       {props.icon && (
         <props.icon
diff --git a/apps/portal/src/components/Document/Steps/Steps.tsx b/apps/portal/src/components/Document/Steps/Steps.tsx
index dcd1a3aded7..1aa5ad9964c 100644
--- a/apps/portal/src/components/Document/Steps/Steps.tsx
+++ b/apps/portal/src/components/Document/Steps/Steps.tsx
@@ -1,5 +1,5 @@
-import { Heading } from "..";
 import { cn } from "../../../lib/utils";
+import { Heading } from "..";
 import styles from "./Steps.module.css";
 
 export function Steps(props: { children: React.ReactNode }) {
@@ -20,7 +20,7 @@ export function Step(props: {
   return (
     <li>
       <div data-step>
-        <Heading level={3} id={props.id || props.title}>
+        <Heading anchorId={props.id || props.title} level={3}>
           {props.title}
         </Heading>
       </div>
diff --git a/apps/portal/src/components/Document/StickyTopContainer.tsx b/apps/portal/src/components/Document/StickyTopContainer.tsx
index 0b0268f015e..9c686020b0b 100644
--- a/apps/portal/src/components/Document/StickyTopContainer.tsx
+++ b/apps/portal/src/components/Document/StickyTopContainer.tsx
@@ -45,5 +45,5 @@ function useHeightObserver() {
     };
   }, []);
 
-  return { height, elementRef: elementRef };
+  return { elementRef: elementRef, height };
 }
diff --git a/apps/portal/src/components/Document/index.ts b/apps/portal/src/components/Document/index.ts
index 438872eae92..e3154319dd9 100644
--- a/apps/portal/src/components/Document/index.ts
+++ b/apps/portal/src/components/Document/index.ts
@@ -1,30 +1,31 @@
 // export { CustomAccordion } from "../others/CustomAccordion";
+
+// export { Table } from "./Table";
+export { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
+export { AuthList } from "./AuthList";
 export { Breadcrumb } from "./Breadcrumb";
 export { Callout } from "./Callout";
+export { ArticleCard, ArticleIconCard } from "./Cards/ArticleCard";
+export { ConnectCard } from "./Cards/ConnectCard";
+export { GithubTemplateCard } from "./Cards/GithubTemplateCard";
 export { CodeBlock } from "./Code";
 export { Details } from "./Details";
+export { DocImage } from "./DocImage";
 export { DocLink } from "./DocLink";
+export { ExpandableGrid } from "./ExpandableGrid";
+export { FeatureCard } from "./FeatureCard";
+export { GithubButtonLink } from "./GithubButtonLink";
+// export { EditPage } from "./EditPage";
+export { Grid } from "./Grid";
 export { Heading } from "./Heading";
+// export { ApiEndpoint } from "./APIEndpointMeta/ApiEndpoint";
+export { InlineCode } from "./InlineCode";
 export { InstallTabs } from "./InstallTabs";
 export { UnorderedList } from "./List";
+export { createMetadata } from "./metadata";
 export { OpenSourceCard } from "./OpenSourceCard";
 export { Paragraph } from "./Paragraph";
-export { Separator } from "./Separator";
-// export { Table } from "./Table";
-export { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
-export { Steps, Step } from "./Steps/Steps";
-export { ArticleCard, ArticleIconCard } from "./Cards/ArticleCard";
-export { GithubButtonLink } from "./GithubButtonLink";
-// export { EditPage } from "./EditPage";
-export { Grid } from "./Grid";
 export { SDKCard } from "./SDKCard";
-export { DocImage } from "./DocImage";
-export { GithubTemplateCard } from "./Cards/GithubTemplateCard";
-export { ExpandableGrid } from "./ExpandableGrid";
+export { Separator } from "./Separator";
 export { Stack } from "./Stack";
-export { createMetadata } from "./metadata";
-export { ConnectCard } from "./Cards/ConnectCard";
-export { AuthList } from "./AuthList";
-export { FeatureCard } from "./FeatureCard";
-// export { ApiEndpoint } from "./APIEndpointMeta/ApiEndpoint";
-export { InlineCode } from "./InlineCode";
+export { Step, Steps } from "./Steps/Steps";
diff --git a/apps/portal/src/components/Document/metadata.ts b/apps/portal/src/components/Document/metadata.ts
index 0312002d8c1..a9de8f463e5 100644
--- a/apps/portal/src/components/Document/metadata.ts
+++ b/apps/portal/src/components/Document/metadata.ts
@@ -33,31 +33,31 @@ export function createMetadata(obj: {
   image?: DynamicImageOptions;
 }): Metadata {
   return {
-    title: obj.title,
     description: obj.description,
     metadataBase: new URL("https://portal.thirdweb.com"),
-    twitter: {
-      title: obj.title,
-      description: obj.description,
-      creator: "@thirdweb",
-      site: "@thirdweb",
-      card: "summary_large_image",
-    },
     openGraph: {
-      title: obj.title,
       description: obj.description,
-      locale: "en_US",
-      type: "website",
-      siteName: "thirdweb docs",
       images: obj.image
         ? [
             {
+              height: 630,
               url: `${BAST_URL}/api/og?icon=${obj.image.icon}&title=${obj.image.title}`,
               width: 1200,
-              height: 630,
             },
           ]
         : undefined,
+      locale: "en_US",
+      siteName: "thirdweb docs",
+      title: obj.title,
+      type: "website",
+    },
+    title: obj.title,
+    twitter: {
+      card: "summary_large_image",
+      creator: "@thirdweb",
+      description: obj.description,
+      site: "@thirdweb",
+      title: obj.title,
     },
   };
 }
diff --git a/apps/portal/src/components/Layouts/DocLayout.tsx b/apps/portal/src/components/Layouts/DocLayout.tsx
index c1eda77141a..9d2e78f1df4 100644
--- a/apps/portal/src/components/Layouts/DocLayout.tsx
+++ b/apps/portal/src/components/Layouts/DocLayout.tsx
@@ -43,8 +43,8 @@ export function DocLayout(props: DocLayoutProps) {
       </div>
       <main
         className="relative flex w-full flex-col overflow-hidden"
-        data-noindex={props.noIndex}
         data-no-llm={props.noLLM}
+        data-noindex={props.noIndex}
       >
         <div className="grow xl:mt-6">{props.children}</div>
         <div className="mt-16 xl:mt-20">
diff --git a/apps/portal/src/components/code/CodeBlockContainer.tsx b/apps/portal/src/components/code/CodeBlockContainer.tsx
index 1e9aac377ff..5ac37577bd1 100644
--- a/apps/portal/src/components/code/CodeBlockContainer.tsx
+++ b/apps/portal/src/components/code/CodeBlockContainer.tsx
@@ -1,10 +1,10 @@
 "use client";
 
+import { CheckIcon, CopyIcon } from "lucide-react";
 import { useClipboard } from "@/hooks/useClipboard"; // Adjusted path for portal
 import { cn } from "@/lib/utils";
-import { CheckIcon, CopyIcon } from "lucide-react";
-import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow"; // Adjusted path for portal
 import { Button } from "../ui/button"; // Adjusted path for portal
+import { ScrollShadow } from "../ui/ScrollShadow/ScrollShadow"; // Adjusted path for portal
 
 export function CodeBlockContainer(props: {
   codeToCopy: string;
@@ -26,27 +26,27 @@ export function CodeBlockContainer(props: {
       )}
     >
       <ScrollShadow
-        scrollableClassName={cn("p-4", props.scrollableClassName)}
         className={cn(
           "text-xs md:text-sm [&_*]:leading-relaxed",
           props.scrollableContainerClassName,
         )}
+        scrollableClassName={cn("p-4", props.scrollableClassName)}
         shadowColor={props.shadowColor || "hsl(var(--muted))"}
       >
         {props.children}
       </ScrollShadow>
 
       <Button
-        size="sm"
-        variant="outline"
-        onClick={() => {
-          onClipboardCopy(); // Use renamed function
-          props.onCopy?.(props.codeToCopy);
-        }}
         className={cn(
           "absolute top-3.5 right-3.5 h-auto bg-background p-2",
           props.copyButtonClassName,
         )}
+        onClick={() => {
+          onClipboardCopy(); // Use renamed function
+          props.onCopy?.(props.codeToCopy);
+        }}
+        size="sm"
+        variant="outline"
       >
         {hasCopied ? (
           <CheckIcon className="size-3 text-green-500" />
diff --git a/apps/portal/src/components/code/RenderCode.tsx b/apps/portal/src/components/code/RenderCode.tsx
index 97eb760ba66..3057bcf6d10 100644
--- a/apps/portal/src/components/code/RenderCode.tsx
+++ b/apps/portal/src/components/code/RenderCode.tsx
@@ -17,11 +17,11 @@ export function RenderCode(props: {
       )}
     >
       <ScrollShadow
-        scrollableClassName={cn("p-4", props.scrollableClassName)}
         className={cn(
           "h-full text-xs md:text-sm [&_*]:leading-relaxed",
           props.scrollableContainerClassName,
         )}
+        scrollableClassName={cn("p-4", props.scrollableClassName)}
         shadowColor="hsl(var(--muted))"
       >
         <div
@@ -30,9 +30,9 @@ export function RenderCode(props: {
         />
       </ScrollShadow>
       <CopyButton
-        text={props.code}
-        iconClassName="size-3"
         className="absolute top-4 right-4 z-[10] border bg-background p-2 opacity-0 transition-opacity duration-300 group-hover:opacity-100"
+        iconClassName="size-3"
+        text={props.code}
       />
     </div>
   );
diff --git a/apps/portal/src/components/code/code.client.tsx b/apps/portal/src/components/code/code.client.tsx
index 48cb042719d..e0ed9789863 100644
--- a/apps/portal/src/components/code/code.client.tsx
+++ b/apps/portal/src/components/code/code.client.tsx
@@ -1,8 +1,8 @@
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
 import type { BundledLanguage } from "shiki";
 import { LoadingDots } from "../ui/LoadingDots";
-import { RenderCode } from "./RenderCode";
 import { getCodeHtml } from "./getCodeHtml";
+import { RenderCode } from "./RenderCode";
 
 // Use CodeClient where the code changes based user input
 // Using RSC in that scenario feels too slow and unnecessary keep hitting the server
@@ -33,9 +33,9 @@ export const CodeClient: React.FC<CodeProps> = ({
   scrollableContainerClassName,
 }) => {
   const codeQuery = useQuery({
-    queryKey: ["html", code],
-    queryFn: () => getCodeHtml(code, lang),
     placeholderData: keepPreviousData,
+    queryFn: () => getCodeHtml(code, lang),
+    queryKey: ["html", code],
   });
 
   if (!codeQuery.data) {
@@ -44,9 +44,9 @@ export const CodeClient: React.FC<CodeProps> = ({
 
   return (
     <RenderCode
+      className={className}
       code={codeQuery.data.formattedCode}
       html={codeQuery.data.html}
-      className={className}
       scrollableClassName={scrollableClassName}
       scrollableContainerClassName={scrollableContainerClassName}
     />
diff --git a/apps/portal/src/components/code/getCodeHtml.tsx b/apps/portal/src/components/code/getCodeHtml.tsx
index ed9449df319..f083aee0126 100644
--- a/apps/portal/src/components/code/getCodeHtml.tsx
+++ b/apps/portal/src/components/code/getCodeHtml.tsx
@@ -38,10 +38,10 @@ export async function getCodeHtml(
   const html = await codeToHtml(formattedCode, {
     lang: (lang || "javascript") as BundledLanguage,
     themes: {
-      light: "github-light",
       dark: "github-dark-default",
+      light: "github-light",
     },
   });
 
-  return { html, formattedCode };
+  return { formattedCode, html };
 }
diff --git a/apps/portal/src/components/code/plaintext-code.tsx b/apps/portal/src/components/code/plaintext-code.tsx
index 0722d92831f..f85a5099741 100644
--- a/apps/portal/src/components/code/plaintext-code.tsx
+++ b/apps/portal/src/components/code/plaintext-code.tsx
@@ -13,13 +13,13 @@ export function PlainTextCodeBlock(props: {
 }) {
   return (
     <CodeBlockContainer
-      codeToCopy={props.code}
       className={props.className}
+      codeToCopy={props.code}
       copyButtonClassName={props.copyButtonClassName}
+      onCopy={props.onCopy}
       scrollableClassName={props.scrollableClassName}
       scrollableContainerClassName={props.scrollableContainerClassName}
       shadowColor={props.shadowColor}
-      onCopy={props.onCopy}
     >
       <code className={cn("block whitespace-pre", props.codeClassName)}>
         {props.code}
diff --git a/apps/portal/src/components/markdown/MarkdownRenderer.tsx b/apps/portal/src/components/markdown/MarkdownRenderer.tsx
index 287495b5b89..33d2c4a2b44 100644
--- a/apps/portal/src/components/markdown/MarkdownRenderer.tsx
+++ b/apps/portal/src/components/markdown/MarkdownRenderer.tsx
@@ -1,3 +1,8 @@
+import Link from "next/link";
+import { onlyText } from "react-children-utilities"; // Assuming this dependency is available
+import ReactMarkdown from "react-markdown";
+import remarkGfm from "remark-gfm"; // Assuming this dependency is available
+import type { BundledLanguage } from "shiki"; // For CodeClient lang prop
 import { CodeClient, CodeLoading } from "@/components/code/code.client"; // Adjusted path for portal
 import { PlainTextCodeBlock } from "@/components/code/plaintext-code"; // Adjusted path for portal
 import { InlineCode } from "@/components/ui/inline-code"; // Adjusted path for portal
@@ -11,17 +16,12 @@ import {
   TableRow,
 } from "@/components/ui/table"; // Adjusted path for portal
 import { cn } from "@/lib/utils"; // Adjusted path for portal
-import Link from "next/link";
-import { onlyText } from "react-children-utilities"; // Assuming this dependency is available
-import ReactMarkdown from "react-markdown";
-import remarkGfm from "remark-gfm"; // Assuming this dependency is available
-import type { BundledLanguage } from "shiki"; // For CodeClient lang prop
 
 // Helper function to remove the 'node' prop before spreading
 function cleanedProps<T extends object & { node?: unknown }>(
   props: T,
 ): Omit<T, "node"> {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  // biome-ignore lint/correctness/noUnusedVariables: node is used for react-markdown
   const { node, ...rest } = props;
   return rest;
 }
@@ -51,54 +51,7 @@ export const MarkdownRenderer: React.FC<{
   return (
     <div className={className}>
       <ReactMarkdown
-        remarkPlugins={[remarkGfm]}
-        skipHtml={markdownProps.skipHtml}
         components={{
-          h1: (props) => (
-            <h2
-              className={cn(
-                commonHeadingClassName,
-                "mb-3 border-border border-b pb-2 text-xl md:text-2xl", // Sorted
-              )}
-              {...cleanedProps(props)}
-            />
-          ),
-          h2: (props) => (
-            <h3
-              {...cleanedProps(props)}
-              className={cn(
-                commonHeadingClassName,
-                "mt-8 mb-3 border-border border-b pb-2 text-lg md:text-xl", // Sorted
-              )}
-            />
-          ),
-          h3: (props) => (
-            <h4
-              {...cleanedProps(props)}
-              className={cn(
-                commonHeadingClassName,
-                "mt-4 text-base md:text-lg", // Consider portal styles
-              )}
-            />
-          ),
-          h4: (props) => (
-            <h5
-              {...cleanedProps(props)}
-              className={cn(commonHeadingClassName, "mt-4 text-lg")} // Consider portal styles
-            />
-          ),
-          h5: (props) => (
-            <h6
-              {...cleanedProps(props)}
-              className={cn(commonHeadingClassName, "mt-4 text-lg")} // Consider portal styles
-            />
-          ),
-          h6: (props) => (
-            <p
-              {...cleanedProps(props)}
-              className={cn(commonHeadingClassName, "mt-4 text-lg")} // Consider portal styles
-            />
-          ),
           a: (props) => (
             <Link
               href={props.href ?? "#"}
@@ -107,12 +60,6 @@ export const MarkdownRenderer: React.FC<{
               className="mt-4 text-blue-600 underline visited:text-purple-600 hover:text-blue-800" // Example portal link style
             />
           ),
-          hr: (props) => (
-            <hr
-              {...cleanedProps(props)}
-              className="my-5 border-border bg-border"
-            /> // Consider portal styles
-          ),
           code: ({ className: inheritedClassName, children, ...props }) => {
             const codeStr = onlyText(children);
 
@@ -127,8 +74,8 @@ export const MarkdownRenderer: React.FC<{
                   <div className="my-4">
                     <PlainTextCodeBlock
                       {...cleanedProps(props)}
-                      code={codeStr.trim()}
                       className={markdownProps.code?.className}
+                      code={codeStr.trim()}
                       onCopy={(code) => {
                         navigator.clipboard.writeText(code);
                       }}
@@ -145,8 +92,8 @@ export const MarkdownRenderer: React.FC<{
                   <CodeClient
                     lang={language}
                     {...cleanedProps(props)}
-                    code={codeStr.trim()}
                     className={markdownProps.code?.className}
+                    code={codeStr.trim()}
                     loader={<CodeLoading />} // Basic loader
                   />
                 </div>
@@ -155,11 +102,79 @@ export const MarkdownRenderer: React.FC<{
             // Inline code
             return (
               <InlineCode
-                code={codeStr.trim()}
                 className={markdownProps.inlineCode?.className}
+                code={codeStr.trim()}
               />
             );
           },
+          h1: (props) => (
+            <h2
+              className={cn(
+                commonHeadingClassName,
+                "mb-3 border-border border-b pb-2 text-xl md:text-2xl", // Sorted
+              )}
+              {...cleanedProps(props)}
+            />
+          ),
+          h2: (props) => (
+            <h3
+              {...cleanedProps(props)}
+              className={cn(
+                commonHeadingClassName,
+                "mt-8 mb-3 border-border border-b pb-2 text-lg md:text-xl", // Sorted
+              )}
+            />
+          ),
+          h3: (props) => (
+            <h4
+              {...cleanedProps(props)}
+              className={cn(
+                commonHeadingClassName,
+                "mt-4 text-base md:text-lg", // Consider portal styles
+              )}
+            />
+          ),
+          h4: (props) => (
+            <h5
+              {...cleanedProps(props)}
+              className={cn(commonHeadingClassName, "mt-4 text-lg")} // Consider portal styles
+            />
+          ),
+          h5: (props) => (
+            <h6
+              {...cleanedProps(props)}
+              className={cn(commonHeadingClassName, "mt-4 text-lg")} // Consider portal styles
+            />
+          ),
+          h6: (props) => (
+            <p
+              {...cleanedProps(props)}
+              className={cn(commonHeadingClassName, "mt-4 text-lg")} // Consider portal styles
+            />
+          ),
+          hr: (props) => (
+            <hr
+              {...cleanedProps(props)}
+              className="my-5 border-border bg-border"
+            /> // Consider portal styles
+          ),
+          li: ({ children: c, ...props }) => (
+            <li
+              className={cn(
+                "mb-1.5 text-muted-foreground leading-loose [&>p]:m-0",
+                markdownProps.li?.className,
+              )}
+              {...cleanedProps(props)}
+            >
+              {c}
+            </li>
+          ),
+          ol: (props) => (
+            <ol
+              className="mb-4 list-outside list-decimal pl-5 [&_ol_li:first-of-type]:mt-1.5 [&_ul_li:first-of-type]:mt-1.5"
+              {...cleanedProps(props)}
+            />
+          ),
           p: (props) => (
             <p
               className={cn(
@@ -169,6 +184,9 @@ export const MarkdownRenderer: React.FC<{
               {...cleanedProps(props)}
             />
           ),
+          strong(props) {
+            return <strong className="font-medium" {...cleanedProps(props)} />;
+          },
           table: (props) => (
             <div className="mb-6">
               <TableContainer>
@@ -176,6 +194,10 @@ export const MarkdownRenderer: React.FC<{
               </TableContainer>
             </div>
           ),
+          tbody: (props) => <TableBody {...cleanedProps(props)} />,
+          td: (props) => (
+            <TableCell {...cleanedProps(props)} className="text-left" />
+          ),
           th: ({ children: c, ...props }) => (
             <TableHead
               {...cleanedProps(props)}
@@ -184,11 +206,7 @@ export const MarkdownRenderer: React.FC<{
               {c}
             </TableHead>
           ),
-          td: (props) => (
-            <TableCell {...cleanedProps(props)} className="text-left" />
-          ),
           thead: (props) => <TableHeader {...cleanedProps(props)} />,
-          tbody: (props) => <TableBody {...cleanedProps(props)} />,
           tr: (props) => <TableRow {...cleanedProps(props)} />,
           ul: (props) => (
             <ul
@@ -196,27 +214,9 @@ export const MarkdownRenderer: React.FC<{
               {...cleanedProps(props)}
             />
           ),
-          ol: (props) => (
-            <ol
-              className="mb-4 list-outside list-decimal pl-5 [&_ol_li:first-of-type]:mt-1.5 [&_ul_li:first-of-type]:mt-1.5"
-              {...cleanedProps(props)}
-            />
-          ),
-          li: ({ children: c, ...props }) => (
-            <li
-              className={cn(
-                "mb-1.5 text-muted-foreground leading-loose [&>p]:m-0",
-                markdownProps.li?.className,
-              )}
-              {...cleanedProps(props)}
-            >
-              {c}
-            </li>
-          ),
-          strong(props) {
-            return <strong className="font-medium" {...cleanedProps(props)} />;
-          },
         }}
+        remarkPlugins={[remarkGfm]}
+        skipHtml={markdownProps.skipHtml}
       >
         {markdownText}
       </ReactMarkdown>
diff --git a/apps/portal/src/components/others/AllSupportedWallets.tsx b/apps/portal/src/components/others/AllSupportedWallets.tsx
index ce63eab434a..0848dbd665d 100644
--- a/apps/portal/src/components/others/AllSupportedWallets.tsx
+++ b/apps/portal/src/components/others/AllSupportedWallets.tsx
@@ -1,17 +1,17 @@
 import Image from "next/image";
 import {
-  type WalletId,
   getAllWalletsList,
   getWalletInfo,
+  type WalletId,
 } from "thirdweb/wallets";
 import { DocLink, InlineCode } from "../Document";
-import { TBody, Table, Td, Th, Tr } from "../Document/Table";
+import { Table, TBody, Td, Th, Tr } from "../Document/Table";
 
 const specialWallets: {
   [key in WalletId]?: boolean;
 } = {
-  smart: true,
   inApp: true,
+  smart: true,
 };
 
 export async function AllSupportedWallets() {
@@ -32,8 +32,8 @@ export async function AllSupportedWallets() {
               <Tr key={w.id}>
                 <Td>
                   <DocLink
-                    href={`/typescript/v5/supported-wallets/${w.id}`}
                     className="flex flex-nowrap items-center gap-4 whitespace-nowrap"
+                    href={`/typescript/v5/supported-wallets/${w.id}`}
                   >
                     <WalletImage id={w.id} />
                     {w.name}
@@ -53,6 +53,6 @@ export async function AllSupportedWallets() {
 async function WalletImage(props: { id: WalletId }) {
   const img = await getWalletInfo(props.id, true);
   return (
-    <Image src={img} width={44} height={44} alt="" className="rounded-lg" />
+    <Image alt="" className="rounded-lg" height={44} src={img} width={44} />
   );
 }
diff --git a/apps/portal/src/components/others/Banner.tsx b/apps/portal/src/components/others/Banner.tsx
index 9409b7b4612..14fc21f1994 100644
--- a/apps/portal/src/components/others/Banner.tsx
+++ b/apps/portal/src/components/others/Banner.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 import { useEffect, useState } from "react";
 import { Button } from "../ui/button";
 
-export function Banner(props: { text: string; href: string; id: string }) {
+export function Banner(props: { text: string; href: string }) {
   const [showBanner, setShowBanner] = useState(false);
 
   const bannerCancelledKey = `banner-cancelled${props.href}`;
@@ -32,12 +32,12 @@ export function Banner(props: { text: string; href: string; id: string }) {
       }}
     >
       <Link
-        href={props.href}
-        target={props.href.startsWith("http") ? "_blank" : undefined}
         className="font-bold hover:underline"
+        href={props.href}
         style={{
           color: "white",
         }}
+        target={props.href.startsWith("http") ? "_blank" : undefined}
       >
         {props.text}
       </Link>
diff --git a/apps/portal/src/components/others/CopyButton.tsx b/apps/portal/src/components/others/CopyButton.tsx
index 857b076beb5..bf1268d4215 100644
--- a/apps/portal/src/components/others/CopyButton.tsx
+++ b/apps/portal/src/components/others/CopyButton.tsx
@@ -17,9 +17,9 @@ export function CopyButton(props: { text: string }) {
 
   return (
     <Button
-      variant="outline"
-      onClick={copyToClipboard}
       className="size-auto bg-background p-2"
+      onClick={copyToClipboard}
+      variant="outline"
     >
       <Icon className="size-3 text-muted-foreground" />
     </Button>
diff --git a/apps/portal/src/components/others/CustomAccordion.tsx b/apps/portal/src/components/others/CustomAccordion.tsx
index 2af6788f6a3..5b353ae9b1d 100644
--- a/apps/portal/src/components/others/CustomAccordion.tsx
+++ b/apps/portal/src/components/others/CustomAccordion.tsx
@@ -1,13 +1,13 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { ChevronDownIcon } from "lucide-react";
 import { useEffect, useId, useRef, useState } from "react";
+import { cn } from "@/lib/utils";
 import { Anchor } from "../ui/Anchor";
 import { DynamicHeight } from "./DynamicHeight";
 
 type CustomAccordionProps = {
-  id?: string;
+  anchorId?: string;
   chevronPosition?: "left" | "right";
   trigger: React.ReactNode;
   children: React.ReactNode;
@@ -22,8 +22,6 @@ export function CustomAccordion(props: CustomAccordionProps) {
   const buttonId = useId();
   const accordionContentRef = useRef<HTMLDivElement>(null);
 
-  const accordionAnchorId = props.id;
-
   // if window hash matches current accordion's id, open it
   const accordionIdMatchChecked = useRef(false);
   useEffect(() => {
@@ -32,7 +30,7 @@ export function CustomAccordion(props: CustomAccordionProps) {
     }
     accordionIdMatchChecked.current = true;
     const hash = window.location.hash;
-    if (hash && hash === `#${accordionAnchorId}`) {
+    if (hash && hash === `#${props.anchorId}`) {
       setTimeout(() => {
         setIsOpen(true);
         setTimeout(() => {
@@ -43,7 +41,7 @@ export function CustomAccordion(props: CustomAccordionProps) {
         }, 500);
       }, 500);
     }
-  }, [accordionAnchorId]);
+  }, [props.anchorId]);
 
   // if window hash matches any child accordion's id, open it
   const accordionContentChecked = useRef(false);
@@ -87,14 +85,8 @@ export function CustomAccordion(props: CustomAccordionProps) {
       data-custom-accordion
     >
       <button
-        type="button"
-        data-open={isOpen}
-        id={buttonId}
         aria-controls={contentId}
         aria-expanded={isOpen}
-        onClick={() => {
-          setIsOpen((c) => !c);
-        }}
         className={cn(
           "flex w-full flex-1 cursor-pointer items-center gap-3",
           props.triggerContainerClassName,
@@ -102,6 +94,12 @@ export function CustomAccordion(props: CustomAccordionProps) {
             ? "flex-row-reverse justify-between"
             : "",
         )}
+        data-open={isOpen}
+        id={buttonId}
+        onClick={() => {
+          setIsOpen((c) => !c);
+        }}
+        type="button"
       >
         <ChevronDownIcon
           className={cn(
@@ -110,20 +108,15 @@ export function CustomAccordion(props: CustomAccordionProps) {
           )}
         />
 
-        {props.id ? (
-          <Anchor id={props.id}> {props.trigger} </Anchor>
+        {props.anchorId ? (
+          <Anchor id={props.anchorId}> {props.trigger} </Anchor>
         ) : (
           props.trigger
         )}
       </button>
 
       <DynamicHeight>
-        <div
-          id={contentId}
-          aria-labelledby={buttonId}
-          data-open={isOpen}
-          className="overflow-hidden"
-        >
+        <div className="overflow-hidden" data-open={isOpen} id={contentId}>
           <div
             className={cn(
               "fade-in-0 animate-in duration-500",
diff --git a/apps/portal/src/components/others/DocSearch.tsx b/apps/portal/src/components/others/DocSearch.tsx
index 872ba908f73..a07fff3ce42 100644
--- a/apps/portal/src/components/others/DocSearch.tsx
+++ b/apps/portal/src/components/others/DocSearch.tsx
@@ -1,44 +1,42 @@
 "use client";
 
 import {
+  keepPreviousData,
   QueryClient,
   QueryClientProvider,
-  keepPreviousData,
   useQuery,
 } from "@tanstack/react-query";
-
+import { CommandIcon, FileTextIcon, SearchIcon } from "lucide-react";
+import Link from "next/link";
 import { useEffect, useRef, useState } from "react";
-import { Button } from "../ui/button";
-
 import type { SearchResult } from "@/app/api/search/types";
 import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
 import { cn } from "@/lib/utils";
-import { CommandIcon, FileTextIcon, SearchIcon } from "lucide-react";
-import Link from "next/link";
-import { Spinner } from "../ui/Spinner/Spinner";
+import { Button } from "../ui/button";
 import { Input } from "../ui/input";
+import { Spinner } from "../ui/Spinner/Spinner";
 import { DynamicHeight } from "./DynamicHeight";
 
 const suggestedLinks: { title: string; href: string }[] = [
   {
-    title: "TypeScript SDK",
     href: "/typescript/v5",
+    title: "TypeScript SDK",
   },
   {
-    title: "Connect",
     href: "/connect",
+    title: "Connect",
   },
   {
-    title: "Contracts",
     href: "/contracts",
+    title: "Contracts",
   },
   {
-    title: "Engine",
     href: "/engine",
+    title: "Engine",
   },
   {
-    title: "Payments",
     href: "/payments",
+    title: "Payments",
   },
 ];
 
@@ -72,7 +70,8 @@ function SearchModalContent(props: { closeModal: () => void }) {
   const scrollableElement = useRef<HTMLDivElement | null>(null);
 
   const searchQuery = useQuery({
-    queryKey: ["search-index", debouncedInput],
+    enabled: debouncedInput.length > 0,
+    placeholderData: keepPreviousData,
     queryFn: async () => {
       const res = await fetch(`/api/search?q=${encodeURI(debouncedInput)}`);
       const { results } = (await res.json()) as SearchResult;
@@ -104,8 +103,7 @@ function SearchModalContent(props: { closeModal: () => void }) {
 
       return results;
     },
-    enabled: debouncedInput.length > 0,
-    placeholderData: keepPreviousData,
+    queryKey: ["search-index", debouncedInput],
   });
 
   const data = searchQuery.data;
@@ -127,6 +125,10 @@ function SearchModalContent(props: { closeModal: () => void }) {
         )}
 
         <Input
+          className={cn(
+            "h-auto flex-1 border-none bg-transparent p-4 px-0 text-base placeholder:text-base placeholder:text-muted-foreground",
+            "focus-visible:ring-0 focus-visible:ring-transparent focus-visible:ring-offset-transparent",
+          )}
           onChange={(e) => {
             setInput(e.target.value);
           }}
@@ -136,10 +138,6 @@ function SearchModalContent(props: { closeModal: () => void }) {
             }
           }}
           placeholder="Search docs"
-          className={cn(
-            "h-auto flex-1 border-none bg-transparent p-4 px-0 text-base placeholder:text-base placeholder:text-muted-foreground",
-            "focus-visible:ring-0 focus-visible:ring-transparent focus-visible:ring-offset-transparent",
-          )}
         />
       </div>
 
@@ -150,14 +148,13 @@ function SearchModalContent(props: { closeModal: () => void }) {
             <div className="flex flex-wrap gap-2 border-b p-4">
               {enabledTags.map((tag) => (
                 <Button
-                  variant="ghost"
-                  key={tag}
                   className={cn(
                     "rounded-lg border px-3 py-1 text-sm ",
                     selectedTags[tag]
                       ? "!bg-muted !text-foreground border-foreground"
                       : "!bg-card !text-muted-foreground",
                   )}
+                  key={tag}
                   onClick={() => {
                     // do not allow removing the last remaining tag
                     const enabledTags = Object.keys(selectedTags).filter(
@@ -190,6 +187,7 @@ function SearchModalContent(props: { closeModal: () => void }) {
                       };
                     });
                   }}
+                  variant="ghost"
                 >
                   {tag}
                 </Button>
@@ -222,13 +220,13 @@ function SearchModalContent(props: { closeModal: () => void }) {
                   .slice(0, 2);
 
                 return (
-                  <div key={result.pageHref} className="flex flex-col gap-2">
+                  <div className="flex flex-col gap-2" key={result.pageHref}>
                     <SearchResultItem
-                      type="page"
                       href={result.pageHref}
-                      title={result.pageTitle}
-                      tags={tags}
                       onClick={handleLinkClick}
+                      tags={tags}
+                      title={result.pageTitle}
+                      type="page"
                     />
 
                     {sections && sections.length > 0 && (
@@ -236,16 +234,16 @@ function SearchModalContent(props: { closeModal: () => void }) {
                         {sections.map((sectionData) => {
                           return (
                             <SearchResultItem
-                              type="section"
-                              href={result.pageHref + sectionData.href}
-                              key={sectionData.href}
-                              title={sectionData.title}
                               content={
                                 sectionData.content.length < 100
                                   ? sectionData.content
                                   : `${sectionData.content.slice(0, 100)} ...`
                               }
+                              href={result.pageHref + sectionData.href}
+                              key={sectionData.href}
                               onClick={handleLinkClick}
+                              title={sectionData.title}
+                              type="section"
                             />
                           );
                         })}
@@ -279,11 +277,11 @@ function NoSearchLinks(props: { onClick?: () => void }) {
       {suggestedLinks.map((link) => {
         return (
           <SearchResultItem
-            type="page"
             href={link.href}
-            title={link.title}
             key={link.href}
             onClick={props.onClick}
+            title={link.title}
+            type="page"
           />
         );
       })}
@@ -350,14 +348,14 @@ export function DocSearch(props: { variant: "icon" | "search" }) {
 
   return (
     <QueryClientProvider client={queryClient}>
-      <Dialog open={open} onOpenChange={setOpen}>
+      <Dialog onOpenChange={setOpen} open={open}>
         {/* Desktop */}
 
         {forDesktop && (
           <DialogTrigger asChild>
             <Button
-              variant="outline"
               className="flex w-64 justify-between gap-6 px-3 text-muted-foreground"
+              variant="outline"
             >
               Search Docs
               <div className="flex items-center gap-1 rounded-sm border bg-background px-2 py-1 text-muted-foreground text-xs">
@@ -369,7 +367,7 @@ export function DocSearch(props: { variant: "icon" | "search" }) {
 
         {!forDesktop && (
           <DialogTrigger asChild>
-            <Button variant="ghost" className="px-3">
+            <Button className="px-3" variant="ghost">
               <SearchIcon className="size-6 text-foreground" />
             </Button>
           </DialogTrigger>
@@ -484,10 +482,10 @@ function SearchResultItem(props: {
                 {props.tags.map((tag) => {
                   return (
                     <span
-                      key={tag}
                       className={cn(
                         "shrink-0 rounded-lg border bg-muted px-1.5 py-1 text-muted-foreground text-xs",
                       )}
+                      key={tag}
                     >
                       {tag}
                     </span>
diff --git a/apps/portal/src/components/others/DynamicHeight.tsx b/apps/portal/src/components/others/DynamicHeight.tsx
index 7690de0d834..bd862e86b00 100644
--- a/apps/portal/src/components/others/DynamicHeight.tsx
+++ b/apps/portal/src/components/others/DynamicHeight.tsx
@@ -13,12 +13,12 @@ export function DynamicHeight(props: {
   return (
     <div
       style={{
+        boxSizing: "border-box",
         height: typeof height === "number" ? `${height}px` : "auto",
+        overflow: "hidden",
         transition:
           props.transition ||
           "height 210ms cubic-bezier(0.175, 0.885, 0.32, 1.1)",
-        overflow: "hidden",
-        boxSizing: "border-box",
       }}
     >
       <div
@@ -54,5 +54,5 @@ function useHeightObserver() {
     };
   }, []);
 
-  return { height, elementRef: elementRef };
+  return { elementRef: elementRef, height };
 }
diff --git a/apps/portal/src/components/others/EngineVersionSelector.tsx b/apps/portal/src/components/others/EngineVersionSelector.tsx
index 12d43ff254b..9cab862b5a4 100644
--- a/apps/portal/src/components/others/EngineVersionSelector.tsx
+++ b/apps/portal/src/components/others/EngineVersionSelector.tsx
@@ -1,30 +1,28 @@
 "use client";
 
+import clsx from "clsx";
+import { ChevronDownIcon } from "lucide-react";
+import Link from "next/link";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import clsx from "clsx";
-import { ChevronDownIcon } from "lucide-react";
-import Link from "next/link";
 
 type Version = "v2" | "v3";
 const engineLinks = [
   {
-    name: "v2",
     href: "/engine/v2",
+    name: "v2",
   },
   {
-    name: "v3",
     href: "/engine/v3",
+    name: "v3",
   },
 ];
 
-export function EngineVersionSelector(props: {
-  selected: Version;
-}) {
+export function EngineVersionSelector(props: { selected: Version }) {
   // biome-ignore lint/style/noNonNullAssertion: guaranteed
   const platform = engineLinks.find((p) => p.name === props.selected)!;
   return (
@@ -54,8 +52,8 @@ export function EngineVersionSelector(props: {
               >
                 <div className="flex gap-2">
                   <Link
-                    href={version.href}
                     className="before:absolute before:inset-0"
+                    href={version.href}
                   >
                     {version.name}
                   </Link>
diff --git a/apps/portal/src/components/others/Feedback.tsx b/apps/portal/src/components/others/Feedback.tsx
index 468a393d8a3..c91b1ae0eee 100644
--- a/apps/portal/src/components/others/Feedback.tsx
+++ b/apps/portal/src/components/others/Feedback.tsx
@@ -1,10 +1,10 @@
 "use client";
 
+import { BadgeCheckIcon, ThumbsDownIcon, ThumbsUpIcon } from "lucide-react";
+import { useState } from "react";
 import { reportFeedback } from "@/analytics/report";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
-import { BadgeCheckIcon, ThumbsDownIcon, ThumbsUpIcon } from "lucide-react";
-import { useState } from "react";
 
 export function Feedback() {
   const [isSubmitted, setIsSubmitted] = useState(false);
@@ -17,12 +17,12 @@ export function Feedback() {
 
         <div className="flex gap-3">
           <Button
-            variant="outline"
             className="gap-2 bg-card"
             onClick={() => {
               setIsSubmitted(true);
               reportFeedback({ helpful: true });
             }}
+            variant="outline"
           >
             Yes
             <ThumbsUpIcon className="size-4 text-muted-foreground" />
@@ -30,7 +30,7 @@ export function Feedback() {
 
           <Dialog>
             <DialogTrigger asChild>
-              <Button variant="outline" className="gap-2 bg-card">
+              <Button className="gap-2 bg-card" variant="outline">
                 No
                 <ThumbsDownIcon className="size-4 text-muted-foreground" />
               </Button>
@@ -46,17 +46,17 @@ export function Feedback() {
               </p>
               <textarea
                 className="mb-2 h-32 w-full rounded-sm border bg-card p-2 font-medium text-foreground outline-none placeholder:font-semibold"
-                value={feedback}
-                placeholder="Your feedback..."
                 onChange={(e) => {
                   setFeedback(e.target.value);
                 }}
+                placeholder="Your feedback..."
+                value={feedback}
               />
               <div className="mt-3 flex flex-row-reverse">
                 <Button
                   onClick={() => {
                     setIsSubmitted(true);
-                    reportFeedback({ helpful: false, feedback });
+                    reportFeedback({ feedback, helpful: false });
                   }}
                 >
                   Submit
diff --git a/apps/portal/src/components/others/PlatformSelector.tsx b/apps/portal/src/components/others/PlatformSelector.tsx
index 7e0b3676c16..893139ceef8 100644
--- a/apps/portal/src/components/others/PlatformSelector.tsx
+++ b/apps/portal/src/components/others/PlatformSelector.tsx
@@ -1,21 +1,19 @@
 "use client";
 
+import clsx from "clsx";
+import { ChevronDownIcon } from "lucide-react";
+import Link from "next/link";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import clsx from "clsx";
-import { ChevronDownIcon } from "lucide-react";
-import Link from "next/link";
 import { connectLinks } from "../../app/Header";
 
 type Platform = (typeof connectLinks)[number]["name"];
 
-export function PlatformSelector(props: {
-  selected: Platform;
-}) {
+export function PlatformSelector(props: { selected: Platform }) {
   // biome-ignore lint/style/noNonNullAssertion: guaranteed
   const platform = connectLinks.find((p) => p.name === props.selected)!;
   return (
@@ -48,8 +46,8 @@ export function PlatformSelector(props: {
                 <div className="flex gap-2">
                   <platform.icon className="size-5 text-foreground" />
                   <Link
-                    href={platform.href}
                     className="before:absolute before:inset-0"
+                    href={platform.href}
                   >
                     {platform.name}
                   </Link>
diff --git a/apps/portal/src/components/others/ScrollShadow/ScrollShadow.tsx b/apps/portal/src/components/others/ScrollShadow/ScrollShadow.tsx
index b9ebac181b6..1f4c89ded3c 100644
--- a/apps/portal/src/components/others/ScrollShadow/ScrollShadow.tsx
+++ b/apps/portal/src/components/others/ScrollShadow/ScrollShadow.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { useEffect, useRef } from "react";
+import { cn } from "@/lib/utils";
 import styles from "./ScrollShadow.module.css";
 
 export function ScrollShadow(props: {
@@ -101,8 +101,8 @@ export function ScrollShadow(props: {
         )}
         ref={shadowTopEl}
         style={{
-          opacity: "0",
           display: props.disableTopShadow ? "none" : "block",
+          opacity: "0",
         }}
       />
       <div
@@ -143,8 +143,8 @@ export function ScrollShadow(props: {
           "hide-scrollbar overflow-auto",
           props.scrollableClassName,
         )}
-        ref={scrollableEl}
         data-scrollable
+        ref={scrollableEl}
       >
         {props.children}
       </div>
diff --git a/apps/portal/src/components/others/Sidebar.tsx b/apps/portal/src/components/others/Sidebar.tsx
index 7ea4ca06448..49a098bd9c4 100644
--- a/apps/portal/src/components/others/Sidebar.tsx
+++ b/apps/portal/src/components/others/Sidebar.tsx
@@ -1,11 +1,5 @@
 "use client";
 
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { cn } from "@/lib/utils";
 import clsx from "clsx";
 import { ChevronDownIcon } from "lucide-react";
 import type { StaticImport } from "next/dist/shared/lib/get-img-props";
@@ -13,6 +7,12 @@ import Image from "next/image";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useRef, useState } from "react";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { cn } from "@/lib/utils";
 import { Button } from "../ui/button";
 import { CustomAccordion } from "./CustomAccordion";
 
@@ -108,14 +108,14 @@ function SidebarItem(props: { link: SidebarLink; onLinkClick?: () => void }) {
   if (link.icon) {
     return (
       <Link
-        href={link.href}
-        onClick={props.onLinkClick}
-        target={link.href.startsWith("http") ? "_blank" : undefined}
         className={clsx(
           "overflow-hidden text-ellipsis py-1.5 font-medium text-base transition-colors duration-300 hover:text-foreground",
           isActive ? "font-medium text-foreground" : "text-muted-foreground",
           "flex flex-row items-center gap-2",
         )}
+        href={link.href}
+        onClick={props.onLinkClick}
+        target={link.href.startsWith("http") ? "_blank" : undefined}
       >
         {(link.icon as React.ReactElement) ? (
           <SidebarIcon icon={link.icon} />
@@ -127,13 +127,13 @@ function SidebarItem(props: { link: SidebarLink; onLinkClick?: () => void }) {
 
   return (
     <Link
-      href={link.href}
-      target={link.href.startsWith("http") ? "_blank" : undefined}
-      onClick={props.onLinkClick}
       className={clsx(
         "block overflow-hidden text-ellipsis py-1.5 font-medium text-base transition-colors duration-300 hover:text-foreground",
         isActive ? "font-medium text-foreground" : "text-muted-foreground",
       )}
+      href={link.href}
+      onClick={props.onLinkClick}
+      target={link.href.startsWith("http") ? "_blank" : undefined}
     >
       {link.name}
     </Link>
@@ -190,9 +190,9 @@ function DocSidebarCategory(props: {
 
   const hasActiveHref = containsActiveHref(
     {
-      name: name,
-      links: links,
       href: href,
+      links: links,
+      name: name,
     },
     pathname,
   );
@@ -215,7 +215,7 @@ function DocSidebarCategory(props: {
   );
 
   const triggerEl = href ? (
-    <Link href={href} className={cn("block w-full text-left font-medium")}>
+    <Link className={cn("block w-full text-left font-medium")} href={href}>
       {triggerElContent}
     </Link>
   ) : (
@@ -224,11 +224,11 @@ function DocSidebarCategory(props: {
 
   return (
     <CustomAccordion
-      defaultOpen={defaultOpen}
+      chevronPosition="right"
       containerClassName="border-none"
-      triggerContainerClassName="text-base"
+      defaultOpen={defaultOpen}
       trigger={triggerEl}
-      chevronPosition="right"
+      triggerContainerClassName="text-base"
     >
       <ul className="flex flex-col border-l-2 pl-4">
         {links.map((link, i) => {
@@ -248,7 +248,7 @@ export function DocSidebarMobile(props: ReferenceSideBarProps) {
   const [open, setOpen] = useState(false);
 
   return (
-    <DropdownMenu open={open} onOpenChange={setOpen}>
+    <DropdownMenu onOpenChange={setOpen} open={open}>
       <DropdownMenuTrigger asChild>
         <Button className="w-full justify-between border bg-card py-3 text-left font-medium text-foreground xl:hidden">
           {props.name}
@@ -261,17 +261,17 @@ export function DocSidebarMobile(props: ReferenceSideBarProps) {
         </Button>
       </DropdownMenuTrigger>
 
-      <DropdownMenuContent asChild sideOffset={10} align="center" side="bottom">
+      <DropdownMenuContent align="center" asChild side="bottom" sideOffset={10}>
         <div className="max-h-[70vh] w-[calc(100vw-32px)] overflow-y-auto rounded-lg border bg-card px-4">
           <DocSidebar
             {...props}
+            header={props.header}
             onLinkClick={() => {
               setOpen(false);
               if (props.onLinkClick) {
                 props.onLinkClick();
               }
             }}
-            header={props.header}
           />
         </div>
       </DropdownMenuContent>
@@ -300,7 +300,7 @@ function containsActiveHref(
 
 function SidebarIcon(props: { icon: StaticImport | React.ReactElement }) {
   if (isStaticImport(props.icon)) {
-    return <Image src={props.icon} alt="" className="size-4" />;
+    return <Image alt="" className="size-4" src={props.icon} />;
   }
   return (
     <div className="flex items-center justify-center [&>*]:size-4">
diff --git a/apps/portal/src/components/others/Subscribe.tsx b/apps/portal/src/components/others/Subscribe.tsx
index 75fad8ba46f..3945711bfd8 100644
--- a/apps/portal/src/components/others/Subscribe.tsx
+++ b/apps/portal/src/components/others/Subscribe.tsx
@@ -19,21 +19,21 @@ export function Subscribe() {
   }
   return (
     <form
+      className="group"
       onSubmit={async (e) => {
         e.preventDefault();
         setIsSubmitted(true);
 
         try {
           await fetch("/api/email-signup", {
-            method: "POST",
             body: JSON.stringify({ email }),
+            method: "POST",
           });
         } catch (e) {
           console.debug("Error subscribing");
           console.error(e);
         }
       }}
-      className="group"
     >
       <p className="mb-3 font-semibold text-base text-foreground">
         Subscribe for the latest dev updates
@@ -41,25 +41,25 @@ export function Subscribe() {
       <div className="flex">
         <Input
           className="h-12 border bg-background font-semibold duration-200 placeholder:font-semibold focus-visible:outline-none focus-visible:ring-offset-0 group-focus-within:border-foreground md:w-[230px]"
-          placeholder="Email"
-          type="email"
-          value={email}
           onChange={(e) => {
             setEmail(e.target.value);
           }}
+          placeholder="Email"
           style={{
-            borderTopRightRadius: 0,
             borderBottomRightRadius: 0,
+            borderTopRightRadius: 0,
           }}
+          type="email"
+          value={email}
         />
 
         <Button
-          type="submit"
           className="h-12 bg-muted font-semibold text-foreground duration-200 group-focus-within:bg-foreground group-focus-within:text-background"
           style={{
-            borderTopLeftRadius: 0,
             borderBottomLeftRadius: 0,
+            borderTopLeftRadius: 0,
           }}
+          type="submit"
         >
           Subscribe
         </Button>
diff --git a/apps/portal/src/components/others/TableOfContents.tsx b/apps/portal/src/components/others/TableOfContents.tsx
index 9918573a721..d3c4470a149 100644
--- a/apps/portal/src/components/others/TableOfContents.tsx
+++ b/apps/portal/src/components/others/TableOfContents.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useEffect, useRef, useState } from "react";
+import { cn } from "@/lib/utils";
 
 /**
  * Automatically query all the heading anchors inside the <main> and creates a table of contents
@@ -101,9 +101,9 @@ export function TableOfContentsSideBar(props: {
       }
 
       anchorNodes.push({
-        name: heading?.textContent || "",
         href: anchorEl.getAttribute("href") || "",
         level: Number.parseInt(heading?.tagName.slice(1) || "6"),
+        name: heading?.textContent || "",
       });
     }
 
@@ -131,7 +131,7 @@ export function TableOfContentsSideBar(props: {
           transition: "opacity 0.5s ease",
         }}
       >
-        <TableOfContents nodes={nodes} linkClassName={props.linkClassName} />
+        <TableOfContents linkClassName={props.linkClassName} nodes={nodes} />
       </div>
     </nav>
   );
@@ -147,9 +147,9 @@ function TableOfContents(props: {
         if (node.children.length > 0) {
           return (
             <li key={node.href}>
-              <TOCLink name={node.name} href={node.href} />
+              <TOCLink href={node.href} name={node.name} />
               <div className="pt-3 pl-3">
-                <TableOfContents nodes={node.children} key={node.href} />
+                <TableOfContents key={node.href} nodes={node.children} />
               </div>
             </li>
           );
@@ -158,9 +158,9 @@ function TableOfContents(props: {
         return (
           <li key={node.href}>
             <TOCLink
-              name={node.name}
               href={node.href}
               linkClassName={props.linkClassName}
+              name={node.name}
             />
           </li>
         );
diff --git a/apps/portal/src/components/others/WalletCard.tsx b/apps/portal/src/components/others/WalletCard.tsx
index 35870a37538..3f79fbb7500 100644
--- a/apps/portal/src/components/others/WalletCard.tsx
+++ b/apps/portal/src/components/others/WalletCard.tsx
@@ -1,7 +1,7 @@
-import { Heading } from "@/components/Document";
 import type { StaticImport } from "next/dist/shared/lib/get-img-props";
 import Image from "next/image";
 import Link from "next/link";
+import { Heading } from "@/components/Document";
 
 type WalletInfo = { href: string; label: string; icon: StaticImport };
 
@@ -10,19 +10,19 @@ export function WalletCard(props: WalletInfo) {
     <div className="group/wallet-card relative rounded-[26px] border bg-card px-5 py-2 transition-colors hover:border-active-border">
       <div className="mt-[-30px] flex flex-col justify-center gap-1">
         <Link
-          href={props.href}
-          className="absolute inset-0"
           aria-label={props.label}
+          className="absolute inset-0"
+          href={props.href}
         />
         <Image
-          src={props.icon}
           alt=""
           className="size-20 rounded-[16px] border bg-background p-2 transition-transform duration-300 group-hover/wallet-card:scale-110 group-hover/wallet-card:border-foreground"
+          src={props.icon}
         />
         <Heading
-          id={props.label}
-          level={3}
+          anchorId={props.label}
           className="font-medium text-base text-foreground group-hover/wallet-card:text-foreground md:text-base"
+          level={3}
         >
           {props.label}
         </Heading>
diff --git a/apps/portal/src/components/others/theme/ThemeSwitcher.tsx b/apps/portal/src/components/others/theme/ThemeSwitcher.tsx
index 1cc93be2fe7..a129c96fcc2 100644
--- a/apps/portal/src/components/others/theme/ThemeSwitcher.tsx
+++ b/apps/portal/src/components/others/theme/ThemeSwitcher.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
-import { Skeleton } from "@/components/ui/skeleton";
-import { cn } from "@/lib/utils";
 import { MoonIcon, SunIcon } from "lucide-react";
 import { useTheme } from "next-themes";
 import { useEffect, useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Skeleton } from "@/components/ui/skeleton";
+import { cn } from "@/lib/utils";
 
 export function ThemeSwitcher(props: { className?: string }) {
   const { theme, setTheme } = useTheme();
@@ -14,12 +14,12 @@ export function ThemeSwitcher(props: { className?: string }) {
   return (
     <Button
       aria-label="Toggle theme"
+      className={cn("p-2", props.className)}
       onClick={() => {
         const newTheme = theme === "light" ? "dark" : "light";
         setTheme(newTheme);
       }}
       variant="outline"
-      className={cn("p-2", props.className)}
     >
       {!hasMounted ? (
         <Skeleton className="size-6 lg:size-5" />
diff --git a/apps/portal/src/components/ui/Anchor.tsx b/apps/portal/src/components/ui/Anchor.tsx
index a13f3f7bff5..7b52036a6b2 100644
--- a/apps/portal/src/components/ui/Anchor.tsx
+++ b/apps/portal/src/components/ui/Anchor.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { LinkIcon } from "lucide-react";
+import { cn } from "@/lib/utils";
 
 export function Anchor(props: {
   id: string;
@@ -19,8 +19,8 @@ export function Anchor(props: {
       {props.children}
       {props.id && (
         <a
-          href={`#${props.id}`}
           className="text-muted-foreground no-underline opacity-0 transition-opacity group-hover/anchor:opacity-100"
+          href={`#${props.id}`}
           onClick={(e) => {
             e.stopPropagation();
           }}
diff --git a/apps/portal/src/components/ui/CopyButton.tsx b/apps/portal/src/components/ui/CopyButton.tsx
index 8cbd2592a8a..933ded9f6c9 100644
--- a/apps/portal/src/components/ui/CopyButton.tsx
+++ b/apps/portal/src/components/ui/CopyButton.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { CheckIcon, CopyIcon } from "lucide-react";
+import { cn } from "@/lib/utils";
 import { useClipboard } from "../../hooks/useClipboard";
 import { Button } from "./button";
 import { ToolTipLabel } from "./tooltip";
@@ -16,10 +16,10 @@ export function CopyButton(props: {
   return (
     <ToolTipLabel label="Copy">
       <Button
-        variant={props.variant || "ghost"}
         aria-label="Copy"
         className={cn("h-auto w-auto p-1", props.className)}
         onClick={onCopy}
+        variant={props.variant || "ghost"}
       >
         {hasCopied ? (
           <CheckIcon
diff --git a/apps/portal/src/components/ui/ScrollShadow/ScrollShadow.tsx b/apps/portal/src/components/ui/ScrollShadow/ScrollShadow.tsx
index 85f605ce09a..360a258a433 100644
--- a/apps/portal/src/components/ui/ScrollShadow/ScrollShadow.tsx
+++ b/apps/portal/src/components/ui/ScrollShadow/ScrollShadow.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import { useRef } from "react";
 import { useIsomorphicLayoutEffect } from "@/lib/useIsomorphicLayoutEffect";
 import { cn } from "@/lib/utils";
-import { useRef } from "react";
 import styles from "./ScrollShadow.module.css";
 
 export function ScrollShadow(props: {
@@ -102,8 +102,8 @@ export function ScrollShadow(props: {
         )}
         ref={shadowTopEl}
         style={{
-          opacity: "0",
           display: props.disableTopShadow ? "none" : "block",
+          opacity: "0",
         }}
       />
       <div
@@ -141,8 +141,8 @@ export function ScrollShadow(props: {
       />
       <div
         className={cn("no-scrollbar overflow-auto", props.scrollableClassName)}
-        ref={scrollableEl}
         data-scrollable
+        ref={scrollableEl}
       >
         {props.children}
       </div>
diff --git a/apps/portal/src/components/ui/Spinner/Spinner.module.css b/apps/portal/src/components/ui/Spinner/Spinner.module.css
index 622a43a8a79..0367a2f3d33 100644
--- a/apps/portal/src/components/ui/Spinner/Spinner.module.css
+++ b/apps/portal/src/components/ui/Spinner/Spinner.module.css
@@ -1,7 +1,6 @@
 .loader {
   border-radius: 50%;
   position: relative;
-  animation: rotate 1s linear infinite;
   animation: rotate 2s linear infinite;
 }
 
diff --git a/apps/portal/src/components/ui/Spinner/Spinner.tsx b/apps/portal/src/components/ui/Spinner/Spinner.tsx
index df65bf05d7a..b15ce7b546a 100644
--- a/apps/portal/src/components/ui/Spinner/Spinner.tsx
+++ b/apps/portal/src/components/ui/Spinner/Spinner.tsx
@@ -3,13 +3,13 @@ import style from "./Spinner.module.css";
 
 export function Spinner(props: { className?: string }) {
   return (
-    <svg viewBox="0 0 50 50" className={cn(style.loader, props.className)}>
+    <svg className={cn(style.loader, props.className)} viewBox="0 0 50 50">
       <title>Loading</title>
       <circle
         cx="25"
         cy="25"
-        r="20"
         fill="none"
+        r="20"
         stroke="currentColor"
         strokeWidth="4"
       />
diff --git a/apps/portal/src/components/ui/badge.tsx b/apps/portal/src/components/ui/badge.tsx
index 078708826de..c1f5874fe11 100644
--- a/apps/portal/src/components/ui/badge.tsx
+++ b/apps/portal/src/components/ui/badge.tsx
@@ -1,4 +1,4 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import type * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -6,23 +6,23 @@ import { cn } from "@/lib/utils";
 const badgeVariants = cva(
   "inline-flex items-center rounded-full border border-border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 leading-4",
   {
+    defaultVariants: {
+      variant: "default",
+    },
     variants: {
       variant: {
         default: "border-transparent bg-primary/20 text-primary",
-        secondary:
-          "border-transparent bg-accent text-accent-foreground hover:bg-accent/80",
         destructive:
           "border-transparent dark:bg-red-950 dark:text-red-400 bg-red-500/20 text-red-800",
-        warning:
-          "border-transparent dark:bg-yellow-600/20 dark:text-yellow-500 bg-yellow-500/20 text-yellow-900",
         outline: "text-foreground",
+        secondary:
+          "border-transparent bg-accent text-accent-foreground hover:bg-accent/80",
         success:
           "border-transparent dark:bg-green-950/50 dark:text-green-400 bg-green-200 text-green-950",
+        warning:
+          "border-transparent dark:bg-yellow-600/20 dark:text-yellow-500 bg-yellow-500/20 text-yellow-900",
       },
     },
-    defaultVariants: {
-      variant: "default",
-    },
   },
 );
 
diff --git a/apps/portal/src/components/ui/button.tsx b/apps/portal/src/components/ui/button.tsx
index 61614702b1c..719e1a8ff3d 100644
--- a/apps/portal/src/components/ui/button.tsx
+++ b/apps/portal/src/components/ui/button.tsx
@@ -1,5 +1,5 @@
 import { Slot } from "@radix-ui/react-slot";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -7,31 +7,31 @@ import { cn } from "@/lib/utils";
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
   {
+    defaultVariants: {
+      size: "default",
+      variant: "default",
+    },
     variants: {
+      size: {
+        default: "h-10 px-4 py-2",
+        icon: "size-10",
+        lg: "h-11 rounded-md px-8",
+        sm: "h-9 rounded-md px-3",
+      },
       variant: {
-        primary: "bg-primary hover:bg-primary/90 text-primary-foreground ",
         default: "bg-foreground text-background hover:bg-foreground/90",
         destructive:
           "bg-destructive hover:bg-destructive/90 text-destructive-foreground ",
+        ghost: "hover:bg-accent hover:text-accent-foreground",
+        link: "text-primary underline-offset-4 hover:underline",
         outline:
           "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground",
+        primary: "bg-primary hover:bg-primary/90 text-primary-foreground ",
         secondary:
           "bg-secondary hover:bg-secondary/80 text-secondary-foreground ",
-        ghost: "hover:bg-accent hover:text-accent-foreground",
-        link: "text-primary underline-offset-4 hover:underline",
         upsell:
           "bg-gradient-to-r from-purple-500 to-pink-500 text-white hover:from-purple-600 hover:to-pink-600 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5 transition-all duration-200",
       },
-      size: {
-        default: "h-10 px-4 py-2",
-        sm: "h-9 rounded-md px-3",
-        lg: "h-11 rounded-md px-8",
-        icon: "size-10",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
     },
   },
 );
@@ -49,7 +49,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
       Comp === "button" ? { type: "button" as const } : undefined;
     return (
       <Comp
-        className={cn(buttonVariants({ variant, size, className }))}
+        className={cn(buttonVariants({ className, size, variant }))}
         ref={ref}
         {...btnOnlyProps}
         {...props}
diff --git a/apps/portal/src/components/ui/dialog.tsx b/apps/portal/src/components/ui/dialog.tsx
index 6bdaf2092da..855fe552887 100644
--- a/apps/portal/src/components/ui/dialog.tsx
+++ b/apps/portal/src/components/ui/dialog.tsx
@@ -19,11 +19,11 @@ const DialogOverlay = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Overlay
-    ref={ref}
     className={cn(
       "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-modalOverlay bg-black/80 backdrop-blur-md data-[state=closed]:animate-out data-[state=open]:animate-in",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -36,7 +36,6 @@ const DialogContent = React.forwardRef<
   <DialogPortal>
     <DialogOverlay />
     <DialogPrimitive.Content
-      ref={ref}
       className={cn(
         "fixed top-[40px] left-[50%] z-modal w-[calc(100vw-40px)] max-w-lg rounded-lg border bg-card shadow-lg md:top-[250px] md:bottom-auto",
         "translate-x-[-50%] md:translate-y-[-20%]",
@@ -44,6 +43,7 @@ const DialogContent = React.forwardRef<
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 md:data-[state=closed]:slide-out-to-top-[28%] data-[state=open]:slide-in-from-left-1/2 md:data-[state=open]:slide-in-from-top-[28%] md:w-full",
         className,
       )}
+      ref={ref}
       {...props}
     >
       {children}
@@ -89,11 +89,11 @@ const DialogTitle = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Title
-    ref={ref}
     className={cn(
       "font-semibold text-lg leading-none tracking-tight",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -104,8 +104,8 @@ const DialogDescription = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Description
-    ref={ref}
     className={cn("text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/portal/src/components/ui/dropdown-menu.tsx b/apps/portal/src/components/ui/dropdown-menu.tsx
index dbf9282e09c..36be360a144 100644
--- a/apps/portal/src/components/ui/dropdown-menu.tsx
+++ b/apps/portal/src/components/ui/dropdown-menu.tsx
@@ -25,12 +25,12 @@ const DropdownMenuSubTrigger = React.forwardRef<
   }
 >(({ className, inset, children, ...props }, ref) => (
   <DropdownMenuPrimitive.SubTrigger
-    ref={ref}
     className={cn(
       "flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent",
       inset && "pl-8",
       className,
     )}
+    ref={ref}
     {...props}
   >
     {children}
@@ -45,11 +45,11 @@ const DropdownMenuSubContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
 >(({ className, ...props }, ref) => (
   <DropdownMenuPrimitive.SubContent
-    ref={ref}
     className={cn(
       "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-dropdownMenu min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=closed]:animate-out data-[state=open]:animate-in",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -62,12 +62,12 @@ const DropdownMenuContent = React.forwardRef<
 >(({ className, sideOffset = 4, ...props }, ref) => (
   <DropdownMenuPrimitive.Portal>
     <DropdownMenuPrimitive.Content
-      ref={ref}
-      sideOffset={sideOffset}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-dropdownMenu min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
         className,
       )}
+      ref={ref}
+      sideOffset={sideOffset}
       {...props}
     />
   </DropdownMenuPrimitive.Portal>
@@ -81,12 +81,12 @@ const DropdownMenuItem = React.forwardRef<
   }
 >(({ className, inset, ...props }, ref) => (
   <DropdownMenuPrimitive.Item
-    ref={ref}
     className={cn(
       "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       inset && "pl-8",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -97,12 +97,12 @@ const DropdownMenuCheckboxItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
 >(({ className, children, checked, ...props }, ref) => (
   <DropdownMenuPrimitive.CheckboxItem
-    ref={ref}
+    checked={checked}
     className={cn(
       "relative flex cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
-    checked={checked}
+    ref={ref}
     {...props}
   >
     <span className="absolute left-2 flex size-3.5 items-center justify-center">
@@ -121,11 +121,11 @@ const DropdownMenuRadioItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
 >(({ className, children, ...props }, ref) => (
   <DropdownMenuPrimitive.RadioItem
-    ref={ref}
     className={cn(
       "relative flex cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <span className="absolute left-2 flex size-3.5 items-center justify-center">
@@ -145,12 +145,12 @@ const DropdownMenuLabel = React.forwardRef<
   }
 >(({ className, inset, ...props }, ref) => (
   <DropdownMenuPrimitive.Label
-    ref={ref}
     className={cn(
       "px-2 py-1.5 font-semibold text-sm",
       inset && "pl-8",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -161,8 +161,8 @@ const DropdownMenuSeparator = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
 >(({ className, ...props }, ref) => (
   <DropdownMenuPrimitive.Separator
-    ref={ref}
     className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/portal/src/components/ui/inline-code.tsx b/apps/portal/src/components/ui/inline-code.tsx
index 3a7f1888b34..70b0048d02b 100644
--- a/apps/portal/src/components/ui/inline-code.tsx
+++ b/apps/portal/src/components/ui/inline-code.tsx
@@ -3,7 +3,10 @@ import { cn } from "@/lib/utils"; // Adjusted path for portal
 export function InlineCode({
   code,
   className,
-}: { code: string; className?: string }) {
+}: {
+  code: string;
+  className?: string;
+}) {
   return (
     <code
       className={cn(
diff --git a/apps/portal/src/components/ui/input.tsx b/apps/portal/src/components/ui/input.tsx
index 9c07c53ae06..70f09d16b3a 100644
--- a/apps/portal/src/components/ui/input.tsx
+++ b/apps/portal/src/components/ui/input.tsx
@@ -9,12 +9,12 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
   ({ className, type, ...props }, ref) => {
     return (
       <input
-        type={type}
         className={cn(
           "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background selection:bg-foreground selection:text-background file:border-0 file:bg-transparent file:font-medium file:text-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
           className,
         )}
         ref={ref}
+        type={type}
         {...props}
       />
     );
diff --git a/apps/portal/src/components/ui/select.tsx b/apps/portal/src/components/ui/select.tsx
index 77cf314d482..9660ab07245 100644
--- a/apps/portal/src/components/ui/select.tsx
+++ b/apps/portal/src/components/ui/select.tsx
@@ -19,11 +19,11 @@ const SelectTrigger = React.forwardRef<
   }
 >(({ className, children, chevronClassName, ...props }, ref) => (
   <SelectPrimitive.Trigger
-    ref={ref}
     className={cn(
       "flex h-10 w-full items-center justify-between gap-2 rounded-md border border-border bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
       className,
     )}
+    ref={ref}
     {...props}
   >
     {children}
@@ -39,11 +39,11 @@ const SelectScrollUpButton = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.ScrollUpButton
-    ref={ref}
     className={cn(
       "flex cursor-default items-center justify-center py-1",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <ChevronUpIcon className="size-4" />
@@ -56,11 +56,11 @@ const SelectScrollDownButton = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.ScrollDownButton
-    ref={ref}
     className={cn(
       "flex cursor-default items-center justify-center py-1",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <ChevronDownIcon className="size-4" />
@@ -75,7 +75,6 @@ const SelectContent = React.forwardRef<
 >(({ className, children, position = "popper", ...props }, ref) => (
   <SelectPrimitive.Portal>
     <SelectPrimitive.Content
-      ref={ref}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-border bg-background text-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
         position === "popper" &&
@@ -83,6 +82,7 @@ const SelectContent = React.forwardRef<
         className,
       )}
       position={position}
+      ref={ref}
       {...props}
     >
       {/* <SelectScrollUpButton /> */}
@@ -106,8 +106,8 @@ const SelectLabel = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.Label
-    ref={ref}
     className={cn("py-1.5 pr-2 pl-8 font-semibold text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -118,11 +118,11 @@ const SelectItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
 >(({ className, children, ...props }, ref) => (
   <SelectPrimitive.Item
-    ref={ref}
     className={cn(
       "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm outline-none focus:bg-muted focus:text-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
+    ref={ref}
     {...props}
   >
     <span className="absolute left-2 flex size-3.5 items-center justify-center">
@@ -141,8 +141,8 @@ const SelectSeparator = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.Separator
-    ref={ref}
     className={cn("-mx-1 my-1 h-px bg-card", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/portal/src/components/ui/table.tsx b/apps/portal/src/components/ui/table.tsx
index f01616d3c45..ca1b6289c52 100644
--- a/apps/portal/src/components/ui/table.tsx
+++ b/apps/portal/src/components/ui/table.tsx
@@ -8,11 +8,11 @@ const Table = React.forwardRef<
   React.HTMLAttributes<HTMLTableElement>
 >(({ className, ...props }, ref) => (
   <table
-    ref={ref}
     className={cn(
       "w-full caption-bottom border-collapse align-top text-sm lining-nums tabular-nums",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -23,8 +23,8 @@ const TableHeader = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <thead
-    ref={ref}
     className={cn("relative border-b bg-background", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -36,8 +36,8 @@ const TableBody = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <tbody
-    ref={ref}
     className={cn("[&_tr:last-child]:border-0", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -48,11 +48,11 @@ const TableFooter = React.forwardRef<
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <tfoot
-    ref={ref}
     className={cn(
       "border-border border-t bg-card font-medium [&>tr]:last:border-b-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -65,12 +65,12 @@ const TableRow = React.forwardRef<
   }
 >(({ className, linkBox, ...props }, ref) => (
   <tr
-    ref={ref}
     className={cn(
       "border-border border-b last:border-0 data-[state=selected]:bg-muted",
       linkBox && "relative translate-x-0 translate-y-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -81,11 +81,11 @@ const TableHead = React.forwardRef<
   React.ThHTMLAttributes<HTMLTableCellElement>
 >(({ className, ...props }, ref) => (
   <th
-    ref={ref}
     className={cn(
       "px-6 py-4 text-left align-middle font-medium text-muted-foreground text-xs uppercase tracking-wider [&:has([role=checkbox])]:pr-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -96,11 +96,11 @@ const TableCell = React.forwardRef<
   React.TdHTMLAttributes<HTMLTableCellElement>
 >(({ className, ...props }, ref) => (
   <td
-    ref={ref}
     className={cn(
       "px-6 py-4 text-start align-middle text-sm [&:has([role=checkbox])]:pr-0",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -111,8 +111,8 @@ const TableCaption = React.forwardRef<
   React.HTMLAttributes<HTMLTableCaptionElement>
 >(({ className, ...props }, ref) => (
   <caption
-    ref={ref}
     className={cn("py-4 text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -125,13 +125,13 @@ function TableContainer(props: {
 }) {
   return (
     <ScrollShadow
-      shadowClassName="z-30"
-      disableTopShadow
       className={cn(
         "relative whitespace-nowrap rounded-lg border border-border bg-card",
         props.className,
       )}
+      disableTopShadow
       scrollableClassName={props.scrollableContainerClassName}
+      shadowClassName="z-30"
       shadowColor="hsl(var(--muted))"
     >
       {props.children}
diff --git a/apps/portal/src/components/ui/tabs.tsx b/apps/portal/src/components/ui/tabs.tsx
index d53d6fab52f..375031f2e46 100644
--- a/apps/portal/src/components/ui/tabs.tsx
+++ b/apps/portal/src/components/ui/tabs.tsx
@@ -12,8 +12,8 @@ const TabsList = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
 >(({ className, ...props }, ref) => (
   <TabsPrimitive.List
-    ref={ref}
     className={cn("flex w-100 items-center justify-start border-b", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -24,7 +24,6 @@ const TabsTrigger = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
 >(({ className, ...props }, ref) => (
   <TabsPrimitive.Trigger
-    ref={ref}
     className={cn(
       "mb-[-2px] flex items-center whitespace-nowrap px-4 py-3",
       "border-transparent border-b-2 font-semibold text-base text-muted-foreground ring-offset-700 transition-all",
@@ -32,6 +31,7 @@ const TabsTrigger = React.forwardRef<
       "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -42,11 +42,11 @@ const TabsContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
 >(({ className, ...props }, ref) => (
   <TabsPrimitive.Content
-    ref={ref}
     className={cn(
       "mt-4 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/portal/src/components/ui/tooltip.tsx b/apps/portal/src/components/ui/tooltip.tsx
index 392c1740796..28ab2e10b6b 100644
--- a/apps/portal/src/components/ui/tooltip.tsx
+++ b/apps/portal/src/components/ui/tooltip.tsx
@@ -16,12 +16,12 @@ const TooltipContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
 >(({ className, sideOffset = 4, ...props }, ref) => (
   <TooltipPrimitive.Content
-    ref={ref}
-    sideOffset={sideOffset}
     className={cn(
       "fade-in-0 zoom-in-95 data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 animate-in overflow-hidden rounded-md border border-border bg-popover px-3 py-1.5 text-popover-foreground text-sm shadow-md data-[state=closed]:animate-out",
       className,
     )}
+    ref={ref}
+    sideOffset={sideOffset}
     {...props}
   />
 ));
@@ -50,13 +50,13 @@ export function ToolTipLabel(props: {
           {props.children}
         </TooltipTrigger>
         <TooltipContent
-          side={props.side}
           align={props.align}
-          sideOffset={10}
           className={cn(
             "max-w-[400px] whitespace-normal leading-relaxed",
             props.contentClassName,
           )}
+          side={props.side}
+          sideOffset={10}
         >
           <div className="flex items-center gap-1.5 p-2 text-sm">
             {props.leftIcon}
diff --git a/apps/portal/src/contexts/slugger.ts b/apps/portal/src/contexts/slugger.ts
index 5d3a8e8bb4f..9832bda4c36 100644
--- a/apps/portal/src/contexts/slugger.ts
+++ b/apps/portal/src/contexts/slugger.ts
@@ -1,4 +1,4 @@
-import { serverContext } from "@/lib/serverContext";
 import type GithubSlugger from "github-slugger";
+import { serverContext } from "@/lib/serverContext";
 
 export const sluggerContext = serverContext<GithubSlugger>();
diff --git a/apps/portal/src/hooks/useClipboard.ts b/apps/portal/src/hooks/useClipboard.ts
index 909f3619635..4b78dfc79d6 100644
--- a/apps/portal/src/hooks/useClipboard.ts
+++ b/apps/portal/src/hooks/useClipboard.ts
@@ -32,5 +32,5 @@ export function useClipboard(text: string, delay = 1500) {
     };
   }, [hasCopied, delay]);
 
-  return { onCopy, hasCopied };
+  return { hasCopied, onCopy };
 }
diff --git a/apps/portal/src/icons/ExternalLinkIcon.tsx b/apps/portal/src/icons/ExternalLinkIcon.tsx
index 8972158a66c..913dcc1f163 100644
--- a/apps/portal/src/icons/ExternalLinkIcon.tsx
+++ b/apps/portal/src/icons/ExternalLinkIcon.tsx
@@ -1,27 +1,27 @@
 export function ExternalLinkIcon({ className }: { className: string }) {
   return (
     <svg
-      width="24"
+      className={className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={className}
     >
       <title>external link</title>
       <path
         d="M7 7H17V17"
         stroke="#777777"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
       <path
         d="M7 17L17 7"
         stroke="#777777"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/index.ts b/apps/portal/src/icons/index.ts
index 0fca6590c9b..e5d69021b09 100644
--- a/apps/portal/src/icons/index.ts
+++ b/apps/portal/src/icons/index.ts
@@ -1,14 +1,12 @@
 // sdks
-export { ReactIcon } from "./sdks/ReactIcon";
-export { TypeScriptIcon } from "./sdks/TypeScriptIcon";
-export { UnityIcon } from "./sdks/UnityIcon";
-export { DotNetIcon } from "./sdks/DotNetIcon";
-export { UnrealEngineIcon } from "./sdks/UnrealEngineIcon";
-// contracts
-export { ContractModularContractIcon } from "./products/contracts/ContractModularContractIcon";
+
+// general purposes
+export { ExternalLinkIcon } from "./ExternalLinkIcon";
 export { ContractDeployIcon } from "./products/contracts/ContractDeployIcon";
 export { ContractExploreIcon } from "./products/contracts/ContractExploreIcon";
 export { ContractInteractIcon } from "./products/contracts/ContractInteractIcon";
+// contracts
+export { ContractModularContractIcon } from "./products/contracts/ContractModularContractIcon";
 export { ContractPublishIcon } from "./products/contracts/ContractPublishIcon";
 // infra
 export { InfraRPCIcon } from "./products/infra/InfraRPCIcon";
@@ -18,9 +16,10 @@ export { EcosystemWalletsIcon } from "./products/wallets/EcosystemWalletsIcon";
 export { WalletsAuthIcon } from "./products/wallets/WalletsAuthIcon";
 export { WalletsConnectIcon } from "./products/wallets/WalletsConnectIcon";
 export { WalletsSmartIcon } from "./products/wallets/WalletsSmartIcon";
-
+export { DotNetIcon } from "./sdks/DotNetIcon";
+export { ReactIcon } from "./sdks/ReactIcon";
+export { TypeScriptIcon } from "./sdks/TypeScriptIcon";
+export { UnityIcon } from "./sdks/UnityIcon";
+export { UnrealEngineIcon } from "./sdks/UnrealEngineIcon";
 //sidebar
 export { NebulaSideIcon } from "./sidebar/NebulaSideIcon";
-
-// general purposes
-export { ExternalLinkIcon } from "./ExternalLinkIcon";
diff --git a/apps/portal/src/icons/products/BridgeIcon.tsx b/apps/portal/src/icons/products/BridgeIcon.tsx
index 00f88f67e48..53dc46580a6 100644
--- a/apps/portal/src/icons/products/BridgeIcon.tsx
+++ b/apps/portal/src/icons/products/BridgeIcon.tsx
@@ -1,23 +1,23 @@
 export function BridgeIcon({ className }: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
-      className={className}
     >
       <path
         d="M13.8939 12.5808L16.5342 13.7124C16.6642 13.768 16.8143 13.8323 16.9397 13.8995C17.0808 13.9751 17.2866 14.1025 17.4539 14.3273C17.6655 14.6116 17.7696 14.9617 17.7477 15.3155C17.7304 15.5951 17.6276 15.8143 17.5506 15.9547C17.4823 16.0795 17.3917 16.2153 17.3132 16.3329C16.8225 17.0692 16.381 18.0866 15.6848 18.6588C15.5325 18.784 15.357 18.878 15.1683 18.9353C14.2961 19.2002 12.7076 19.2484 11.8114 18.8959C11.5777 18.804 11.3708 18.6549 11.2097 18.4623C10.6052 17.7393 10.4447 16.4969 10.1561 15.6306L10.1484 15.6079C10.12 15.5246 10.0614 15.3527 10.0454 15.1674C10.0318 15.0106 10.0431 14.8526 10.0787 14.6993C10.2262 14.0637 10.6368 13.4001 10.9664 12.8503C11.0351 12.7356 11.1415 12.581 11.3119 12.4437C11.5359 12.2631 11.8071 12.1507 12.0932 12.12C12.3108 12.0967 12.4953 12.1308 12.625 12.1633C13.051 12.2699 13.4916 12.4084 13.8939 12.5808Z"
         fill="currentColor"
       />
       <path
-        fillRule="evenodd"
         clipRule="evenodd"
         d="M12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1ZM3.50553 9.01869C3.17808 9.95174 3 10.9551 3 12C3 16.9706 7.02944 21 12 21C16.9706 21 21 16.9706 21 12C21 8.1675 18.6045 4.89451 15.2291 3.59664C15.1462 4.84217 15.5812 6.80831 14.5371 7.76943C13.4421 8.77736 11.4822 9.2136 10.1439 9.8083L9.25538 10.993C9.18549 11.0863 9.10167 11.1981 9.01972 11.2908C8.92445 11.3984 8.77813 11.544 8.56315 11.6514C8.284 11.7907 7.96834 11.8396 7.66013 11.7911C7.42276 11.7538 7.23928 11.6592 7.11593 11.5854C7.00979 11.5218 6.89611 11.4406 6.80129 11.3728L3.50553 9.01869Z"
         fill="currentColor"
+        fillRule="evenodd"
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/products/ConnectIcon.tsx b/apps/portal/src/icons/products/ConnectIcon.tsx
index d17a2f8fcb9..946ab8781d6 100644
--- a/apps/portal/src/icons/products/ConnectIcon.tsx
+++ b/apps/portal/src/icons/products/ConnectIcon.tsx
@@ -1,20 +1,20 @@
 export function ConnectIcon(props: React.SVGProps<SVGSVGElement>) {
   return (
     <svg
-      width="24"
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
       {...props}
     >
       <path
         d="M16 7.99983V4.50048C16 3.66874 16 3.25287 15.8248 2.9973C15.6717 2.77401 15.4346 2.62232 15.1678 2.57691C14.8623 2.52493 14.4847 2.6992 13.7295 3.04775L4.85901 7.14182C4.18551 7.45267 3.84875 7.6081 3.60211 7.84915C3.38406 8.06225 3.21762 8.32238 3.1155 8.60966C3 8.93462 3 9.30551 3 10.0473V14.9998M16.5 14.4998H16.51M3 11.1998L3 17.7998C3 18.9199 3 19.48 3.21799 19.9078C3.40973 20.2841 3.71569 20.5901 4.09202 20.7818C4.51984 20.9998 5.07989 20.9998 6.2 20.9998H17.8C18.9201 20.9998 19.4802 20.9998 19.908 20.7818C20.2843 20.5901 20.5903 20.2841 20.782 19.9078C21 19.48 21 18.9199 21 17.7998V11.1998C21 10.0797 21 9.51967 20.782 9.09185C20.5903 8.71552 20.2843 8.40956 19.908 8.21782C19.4802 7.99983 18.9201 7.99983 17.8 7.99983L6.2 7.99983C5.0799 7.99983 4.51984 7.99983 4.09202 8.21781C3.7157 8.40956 3.40973 8.71552 3.21799 9.09185C3 9.51967 3 10.0797 3 11.1998ZM17 14.4998C17 14.776 16.7761 14.9998 16.5 14.9998C16.2239 14.9998 16 14.776 16 14.4998C16 14.2237 16.2239 13.9998 16.5 13.9998C16.7761 13.9998 17 14.2237 17 14.4998Z"
         stroke="currentColor"
-        strokeWidth={2}
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth={2}
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/products/EngineIcon.tsx b/apps/portal/src/icons/products/EngineIcon.tsx
index 7e99d6b3c68..b39c1ab3c9c 100644
--- a/apps/portal/src/icons/products/EngineIcon.tsx
+++ b/apps/portal/src/icons/products/EngineIcon.tsx
@@ -1,20 +1,20 @@
 export function EngineIcon(props: React.SVGProps<SVGSVGElement>) {
   return (
     <svg
-      width="24"
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
       {...props}
     >
       <path
         d="M6.5 19C4.01472 19 2 16.9853 2 14.5C2 12.1564 3.79151 10.2313 6.07974 10.0194C6.54781 7.17213 9.02024 5 12 5C14.9798 5 17.4522 7.17213 17.9203 10.0194C20.2085 10.2313 22 12.1564 22 14.5C22 16.9853 19.9853 19 17.5 19C13.1102 19 10.3433 19 6.5 19Z"
         stroke="currentColor"
-        strokeWidth={2}
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth={2}
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/products/InsightIcon.tsx b/apps/portal/src/icons/products/InsightIcon.tsx
index bdea8080daf..b477dcb9267 100644
--- a/apps/portal/src/icons/products/InsightIcon.tsx
+++ b/apps/portal/src/icons/products/InsightIcon.tsx
@@ -1,20 +1,20 @@
 export function InsightIcon({ className }: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
-      className={className}
     >
       <path
         d="M20.5 7.27783L12 12.0001M12 12.0001L3.49997 7.27783M12 12.0001L12 21.5001M21 12.0001V7.94153C21 7.59889 21 7.42757 20.9495 7.27477C20.9049 7.13959 20.8318 7.01551 20.7354 6.91082C20.6263 6.79248 20.4766 6.70928 20.177 6.54288L12.777 2.43177C12.4934 2.27421 12.3516 2.19543 12.2015 2.16454C12.0685 2.13721 11.9315 2.13721 11.7986 2.16454C11.6484 2.19543 11.5066 2.27421 11.223 2.43177L3.82297 6.54288C3.52345 6.70928 3.37368 6.79248 3.26463 6.91082C3.16816 7.01551 3.09515 7.13959 3.05048 7.27477C3 7.42757 3 7.59889 3 7.94153V16.0586C3 16.4013 3 16.5726 3.05048 16.7254C3.09515 16.8606 3.16816 16.9847 3.26463 17.0893C3.37368 17.2077 3.52346 17.2909 3.82297 17.4573L11.223 21.5684C11.5066 21.726 11.6484 21.8047 11.7986 21.8356C11.9315 21.863 12.0685 21.863 12.2015 21.8356C12.3516 21.8047 12.4934 21.726 12.777 21.5684L13 21.4445M7.5 4.50008L16.5 9.50008M22 21.5001L21 20.5001M22 18.0001C22 19.6569 20.6569 21.0001 19 21.0001C17.3431 21.0001 16 19.6569 16 18.0001C16 16.3432 17.3431 15.0001 19 15.0001C20.6569 15.0001 22 16.3432 22 18.0001Z"
         stroke="currentColor"
-        strokeWidth={2}
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth={2}
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/products/NebulaIcon.tsx b/apps/portal/src/icons/products/NebulaIcon.tsx
index a66ec07c35b..a1cb30ba209 100644
--- a/apps/portal/src/icons/products/NebulaIcon.tsx
+++ b/apps/portal/src/icons/products/NebulaIcon.tsx
@@ -1,23 +1,23 @@
 export function NebulaIcon({ className }: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={className}
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
-      className={className}
     >
       <path
         d="M12.0005 10.4661C12.8477 10.4661 13.5344 11.1529 13.5344 12C13.5344 12.8472 12.8477 13.5339 12.0005 13.5339C11.1534 13.5339 10.4666 12.8472 10.4666 12C10.4666 11.1529 11.1534 10.4661 12.0005 10.4661Z"
         fill="currentColor"
       />
       <path
-        fillRule="evenodd"
         clipRule="evenodd"
         d="M6.37637 9.10092C6.76715 8.60917 7.19621 8.12726 7.66198 7.6615C11.6555 3.66799 16.8353 2.37304 19.2314 4.76914C20.3274 5.86517 20.6512 7.54363 20.2976 9.42458C21.1404 9.97137 21.6979 10.9206 21.6979 12C21.6979 13.6943 20.3244 15.0678 18.6301 15.0678C18.2779 15.0678 17.9396 15.0085 17.6246 14.8993C17.2338 15.391 16.8048 15.8728 16.339 16.3386C12.3455 20.3321 7.16573 21.627 4.76963 19.2309C3.67365 18.1349 3.34989 16.4566 3.70338 14.5757C2.8604 14.029 2.30273 13.0796 2.30273 12C2.30273 10.3057 3.67624 8.93223 5.37054 8.93223C5.72284 8.93223 6.06127 8.99161 6.37637 9.10092ZM8.74661 8.74613C10.5806 6.91216 12.6367 5.75258 14.4177 5.30732C16.2333 4.85342 17.4794 5.18639 18.1468 5.85377C18.732 6.43903 19.0601 7.46927 18.8259 8.93838C18.7611 8.9343 18.6958 8.93223 18.6301 8.93223C16.9358 8.93223 15.5622 10.3057 15.5622 12C15.5622 12.7857 15.8576 13.5024 16.3434 14.0452C16.0118 14.4551 15.6487 14.8596 15.2544 15.2539C13.4204 17.0879 11.3643 18.2475 9.58328 18.6927C7.76768 19.1466 6.52164 18.8137 5.85426 18.1463C5.26901 17.561 4.94093 16.5308 5.17513 15.0617C5.23974 15.0658 5.3049 15.0678 5.37054 15.0678C7.06484 15.0678 8.43835 13.6943 8.43835 12C8.43835 11.2145 8.14307 10.4978 7.65744 9.95512C7.98905 9.54515 8.35224 9.1405 8.74661 8.74613ZM5.37076 13.5339C4.87982 13.5339 4.44277 13.3032 4.16205 12.9443C4.16201 12.9444 4.1621 12.9441 4.16205 12.9443C3.95826 12.6839 3.83664 12.3563 3.83664 12C3.83664 11.1529 4.52339 10.4661 5.37054 10.4661C6.21769 10.4661 6.90444 11.1529 6.90444 12C6.90444 12.8391 6.23074 13.5208 5.39476 13.5338C5.38685 13.5339 5.3787 13.5339 5.37076 13.5339ZM18.5973 13.5336C18.6082 13.5338 18.6191 13.5339 18.6301 13.5339C19.4772 13.5339 20.164 12.8472 20.164 12C20.164 11.6439 20.0426 11.3161 19.839 11.0558C19.5758 10.7193 19.1751 10.4955 18.7215 10.4688C18.6912 10.467 18.6607 10.4661 18.63 10.4661C18.5574 10.4661 18.486 10.4712 18.416 10.4809C17.6702 10.5851 17.0962 11.2255 17.0962 12C17.0962 12.2677 17.1647 12.5194 17.2853 12.7384C17.5412 13.2037 18.0316 13.5218 18.5973 13.5336Z"
         fill="currentColor"
+        fillRule="evenodd"
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/products/PlaygroundIcon.tsx b/apps/portal/src/icons/products/PlaygroundIcon.tsx
index 129bd4e3bd3..858a7f08d66 100644
--- a/apps/portal/src/icons/products/PlaygroundIcon.tsx
+++ b/apps/portal/src/icons/products/PlaygroundIcon.tsx
@@ -1,20 +1,20 @@
 export function PlaygroundIcon(props: React.SVGProps<SVGSVGElement>) {
   return (
     <svg
-      width="24"
+      fill="none"
       height="24"
+      role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
       {...props}
     >
       <path
         d="M4.5 22V17M4.5 7V2M2 4.5H7M2 19.5H7M13 3L11.2658 7.50886C10.9838 8.24209 10.8428 8.60871 10.6235 8.91709C10.4292 9.1904 10.1904 9.42919 9.91709 9.62353C9.60871 9.84281 9.24209 9.98381 8.50886 10.2658L4 12L8.50886 13.7342C9.24209 14.0162 9.60871 14.1572 9.91709 14.3765C10.1904 14.5708 10.4292 14.8096 10.6235 15.0829C10.8428 15.3913 10.9838 15.7579 11.2658 16.4911L13 21L14.7342 16.4911C15.0162 15.7579 15.1572 15.3913 15.3765 15.0829C15.5708 14.8096 15.8096 14.5708 16.0829 14.3765C16.3913 14.1572 16.7579 14.0162 17.4911 13.7342L22 12L17.4911 10.2658C16.7579 9.98381 16.3913 9.8428 16.0829 9.62353C15.8096 9.42919 15.5708 9.1904 15.3765 8.91709C15.1572 8.60871 15.0162 8.24209 14.7342 7.50886L13 3Z"
         stroke="currentColor"
-        strokeWidth={2}
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth={2}
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/products/contracts/ContractDeployIcon.tsx b/apps/portal/src/icons/products/contracts/ContractDeployIcon.tsx
index 5168cac1f57..34e139d4d50 100644
--- a/apps/portal/src/icons/products/contracts/ContractDeployIcon.tsx
+++ b/apps/portal/src/icons/products/contracts/ContractDeployIcon.tsx
@@ -1,15 +1,20 @@
+import { useId } from "react";
+
 export function ContractDeployIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>deploy</title>
-      <g filter="url(#filter0_i_195_4030)">
+      <g filter={`url(#${filterId})`}>
         <path
           d="M4.96973 4.5C4.96973 3.67157 5.6413 3 6.46973 3H17.0755C17.9039 3 18.5755 3.67157 18.5755 4.5V19.5C18.5755 20.3284 17.9039 21 17.0755 21H6.46973C5.6413 21 4.96973 20.3284 4.96973 19.5V4.5Z"
           fill="#EBA4D2"
@@ -18,63 +23,63 @@ export function ContractDeployIcon(props: { className?: string }) {
       </g>
       <path
         d="M21.5778 13.6275C22.2445 14.0124 22.2445 14.9747 21.5778 15.3596L15.6488 18.7827C14.9822 19.1676 14.1488 18.6865 14.1488 17.9167L14.1488 11.0705C14.1488 10.3007 14.9822 9.81952 15.6488 10.2044L21.5778 13.6275Z"
-        fill="url(#paint0_linear_195_4030)"
+        fill={`url(#${linearGradientId})`}
       />
       <path
         d="M8.77258 7L14.7726 7.0001"
         stroke="white"
-        strokeWidth="1.5"
         strokeLinecap="round"
+        strokeWidth="1.5"
       />
       <path
         d="M8.77258 10L11.7726 10.0001"
         stroke="white"
-        strokeWidth="1.5"
         strokeLinecap="round"
+        strokeWidth="1.5"
       />
       <defs>
         <filter
-          id="filter0_i_195_4030"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="18.1"
+          id={filterId}
+          width="13.6058"
           x="4.96973"
           y="3"
-          width="13.6058"
-          height="18.1"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="BackgroundImageFix"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect1_innerShadow_195_4030"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_4030"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="12.9991"
-          y1="3.95568"
           x2="26.0167"
+          y1="3.95568"
           y2="19.3104"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F4009F" />
           <stop offset="1" stopColor="#F856C8" />
diff --git a/apps/portal/src/icons/products/contracts/ContractExploreIcon.tsx b/apps/portal/src/icons/products/contracts/ContractExploreIcon.tsx
index 9747a413eaa..754a3e60603 100644
--- a/apps/portal/src/icons/products/contracts/ContractExploreIcon.tsx
+++ b/apps/portal/src/icons/products/contracts/ContractExploreIcon.tsx
@@ -1,38 +1,44 @@
+import { useId } from "react";
+
 export function ContractExploreIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+  const clipPathId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>explore</title>
-      <g clipPath="url(#clip0_195_3911)">
+      <g clipPath={`url(#${clipPathId})`}>
         <path
           d="M10.9709 11.527C11.4283 10.7348 12.5718 10.7348 13.0292 11.527L17.4763 19.2296C17.9337 20.0218 17.3619 21.0121 16.4471 21.0121H7.55296C6.63816 21.0121 6.06641 20.0218 6.52381 19.2296L10.9709 11.527Z"
-          fill="url(#paint0_linear_195_3911)"
+          fill={`url(#${linearGradientId})`}
         />
-        <g filter="url(#filter0_bi_195_3911)">
+        <g filter={`url(#${filterId})`}>
           <circle
             cx="12.0001"
             cy="10.25"
-            r="7.25"
             fill="#EBA4D2"
             fillOpacity="0.8"
+            r="7.25"
           />
         </g>
       </g>
       <defs>
         <filter
-          id="filter0_bi_195_3911"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="18.5"
+          id={filterId}
+          width="18.5"
           x="2.75006"
           y="1"
-          width="18.5"
-          height="18.5"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feGaussianBlur in="BackgroundImageFix" stdDeviation="1" />
@@ -42,43 +48,43 @@ export function ContractExploreIcon(props: { className?: string }) {
             result="effect1_backgroundBlur_195_3911"
           />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="effect1_backgroundBlur_195_3911"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect2_innerShadow_195_3911"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_3911"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="-1.29787"
-          y1="22.463"
           x2="18.0785"
+          y1="22.463"
           y2="6.03583"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F4009F" />
           <stop offset="1" stopColor="#F856C8" />
         </linearGradient>
-        <clipPath id="clip0_195_3911">
-          <rect width="24" height="24" fill="white" />
+        <clipPath id={clipPathId}>
+          <rect fill="white" height="24" width="24" />
         </clipPath>
       </defs>
     </svg>
diff --git a/apps/portal/src/icons/products/contracts/ContractInteractIcon.tsx b/apps/portal/src/icons/products/contracts/ContractInteractIcon.tsx
index bd55595646e..56437554d13 100644
--- a/apps/portal/src/icons/products/contracts/ContractInteractIcon.tsx
+++ b/apps/portal/src/icons/products/contracts/ContractInteractIcon.tsx
@@ -1,19 +1,24 @@
+import { useId } from "react";
+
 export function ContractInteractIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>contract interaction</title>
       <path
         d="M3.66284 8.02624V4.9941C3.66284 3.30429 5.62864 2.37603 6.93354 3.44965L19.6081 13.8777C20.0698 14.2576 20.3374 14.8242 20.3374 15.4221V18.8923C20.3374 20.6011 18.3329 21.5229 17.0356 20.4107L4.36111 9.54463C3.91791 9.16466 3.66284 8.61002 3.66284 8.02624Z"
-        fill="url(#paint0_linear_195_4132)"
+        fill={`url(#${linearGradientId})`}
       />
-      <g filter="url(#filter0_bi_195_4132)">
+      <g filter={`url(#${filterId})`}>
         <path
           d="M20.3372 8.02624V4.9941C20.3372 3.30429 18.3714 2.37603 17.0665 3.44965L4.39195 13.8777C3.93019 14.2576 3.66265 14.8242 3.66265 15.4221V18.8923C3.66265 20.6011 5.66708 21.5229 6.96439 20.4107L19.6389 9.54463C20.0821 9.16466 20.3372 8.61002 20.3372 8.02624Z"
           fill="#EBA4D2"
@@ -22,13 +27,13 @@ export function ContractInteractIcon(props: { className?: string }) {
       </g>
       <defs>
         <filter
-          id="filter0_bi_195_4132"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="21.9059"
+          id={filterId}
+          width="20.6745"
           x="1.66265"
           y="0.990295"
-          width="20.6745"
-          height="21.9059"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feGaussianBlur in="BackgroundImageFix" stdDeviation="1" />
@@ -38,37 +43,37 @@ export function ContractInteractIcon(props: { className?: string }) {
             result="effect1_backgroundBlur_195_4132"
           />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="effect1_backgroundBlur_195_4132"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect2_innerShadow_195_4132"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_4132"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="-2.75917"
-          y1="19.7919"
           x2="23.7308"
+          y1="19.7919"
           y2="3.1356"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F4009F" />
           <stop offset="1" stopColor="#F856C8" />
diff --git a/apps/portal/src/icons/products/contracts/ContractModularContractIcon.tsx b/apps/portal/src/icons/products/contracts/ContractModularContractIcon.tsx
index 2938c7746aa..167255a7613 100644
--- a/apps/portal/src/icons/products/contracts/ContractModularContractIcon.tsx
+++ b/apps/portal/src/icons/products/contracts/ContractModularContractIcon.tsx
@@ -1,42 +1,47 @@
+import { useId } from "react";
+
 export function ContractModularContractIcon(props: { className?: string }) {
+  const linearGradientId = useId();
+  const filterId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>modular contracts</title>
       <rect
-        x="7"
-        y="3"
-        width="10"
+        fill={`url(#${linearGradientId})`}
         height="10"
         rx="1.5"
-        fill="url(#paint0_linear_195_4064)"
+        width="10"
+        x="7"
+        y="3"
       />
-      <g filter="url(#filter0_bi_195_4064)">
+      <g filter={`url(#${filterId})`}>
         <rect
-          x="3"
-          y="11"
-          width="18"
-          height="10"
-          rx="1.5"
           fill="#EBA4D2"
           fillOpacity="0.8"
+          height="10"
+          rx="1.5"
+          width="18"
+          x="3"
+          y="11"
         />
       </g>
       <defs>
         <filter
-          id="filter0_bi_195_4064"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="14"
+          id={filterId}
+          width="22"
           x="1"
           y="9"
-          width="22"
-          height="14"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feGaussianBlur in="BackgroundImageFix" stdDeviation="1" />
@@ -46,37 +51,37 @@ export function ContractModularContractIcon(props: { className?: string }) {
             result="effect1_backgroundBlur_195_4064"
           />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="effect1_backgroundBlur_195_4064"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect2_innerShadow_195_4064"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_4064"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="3.1486"
-          y1="11.4658"
           x2="16.0459"
+          y1="11.4658"
           y2="0.531421"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F4009F" />
           <stop offset="1" stopColor="#F856C8" />
diff --git a/apps/portal/src/icons/products/contracts/ContractPublishIcon.tsx b/apps/portal/src/icons/products/contracts/ContractPublishIcon.tsx
index 99d8ad04a91..9b4f8efa1cd 100644
--- a/apps/portal/src/icons/products/contracts/ContractPublishIcon.tsx
+++ b/apps/portal/src/icons/products/contracts/ContractPublishIcon.tsx
@@ -1,12 +1,17 @@
+import { useId } from "react";
+
 export function ContractPublishIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>publish contract</title>
       <path
@@ -22,13 +27,13 @@ export function ContractPublishIcon(props: { className?: string }) {
       </g>
       <defs>
         <filter
-          id="filter0_bi_195_3964"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="22.0037"
+          id={filterId}
+          width="16.6952"
           x="3.65643"
           y="1"
-          width="16.6952"
-          height="22.0037"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feGaussianBlur in="BackgroundImageFix" stdDeviation="1" />
@@ -38,37 +43,37 @@ export function ContractPublishIcon(props: { className?: string }) {
             result="effect1_backgroundBlur_195_3964"
           />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="effect1_backgroundBlur_195_3964"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect2_innerShadow_195_3964"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_3964"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="0.758951"
-          y1="18.2415"
           x2="21.4914"
+          y1="18.2415"
           y2="5.84722"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F4009F" />
           <stop offset="1" stopColor="#F856C8" />
diff --git a/apps/portal/src/icons/products/infra/InfraRPCIcon.tsx b/apps/portal/src/icons/products/infra/InfraRPCIcon.tsx
index cc5d89b6fc4..2d7b8307c0a 100644
--- a/apps/portal/src/icons/products/infra/InfraRPCIcon.tsx
+++ b/apps/portal/src/icons/products/infra/InfraRPCIcon.tsx
@@ -1,23 +1,28 @@
+import { useId } from "react";
+
 export function InfraRPCIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>rpc</title>
       <rect
-        x="12.0015"
-        y="12.5007"
-        width="8.99854"
+        fill={`url(#${linearGradientId})`}
         height="8.99854"
         rx="1.5"
-        fill="url(#paint0_linear_195_3994)"
+        width="8.99854"
+        x="12.0015"
+        y="12.5007"
       />
-      <g filter="url(#filter0_i_195_3994)">
+      <g filter={`url(#${filterId})`}>
         <path
           d="M5 18C3.89543 18 3 17.1046 3 16L3 5C3 3.89543 3.89543 3 5 3L16 3C17.1046 3 18 3.89543 18 5L18 16C18 17.1046 17.1046 18 16 18L5 18Z"
           fill="#BFB5FF"
@@ -27,67 +32,67 @@ export function InfraRPCIcon(props: { className?: string }) {
       <path
         d="M6.10608 9.20007C7.27946 8.04993 8.85702 7.4057 10.5001 7.4057C12.1431 7.4057 13.7207 8.04993 14.8941 9.20007"
         stroke="white"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <path
         d="M8.30289 11.3971C8.88958 10.822 9.67836 10.4999 10.4999 10.4999C11.3214 10.4999 12.1102 10.822 12.6969 11.3971"
         stroke="white"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <path
         d="M10.5 13.5941H10.5058"
         stroke="white"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
       <defs>
         <filter
-          id="filter0_i_195_3994"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="15.2764"
+          id={filterId}
+          width="15"
           x="3"
           y="3"
-          width="15"
-          height="15.2764"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="BackgroundImageFix"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.276368" />
           <feGaussianBlur stdDeviation="0.138184" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect1_innerShadow_195_3994"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_3994"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="13.5087"
-          y1="19.8752"
           x2="30.3227"
+          y1="19.8752"
           y2="14.0648"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#3F2DAF" />
           <stop offset="1" stopColor="#917FFB" />
diff --git a/apps/portal/src/icons/products/infra/InfraStorageIcon.tsx b/apps/portal/src/icons/products/infra/InfraStorageIcon.tsx
index fa0e898b27b..f24c7a14fdd 100644
--- a/apps/portal/src/icons/products/infra/InfraStorageIcon.tsx
+++ b/apps/portal/src/icons/products/infra/InfraStorageIcon.tsx
@@ -1,52 +1,57 @@
+import { useId } from "react";
+
 export function InfraStorageIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>storage</title>
       <circle
         cx="7.60706"
         cy="12.5001"
+        fill={`url(#${linearGradientId})`}
         r="4.60706"
-        fill="url(#paint0_linear_195_4078)"
       />
-      <g filter="url(#filter0_bi_195_4078)">
+      <g filter={`url(#${filterId})`}>
         <path
-          fillRule="evenodd"
           clipRule="evenodd"
           d="M21 7.36067C20.9998 4.95232 18.2081 3 14.7644 3C11.3206 3 8.52887 4.95242 8.52887 7.36085C8.52887 7.36402 8.52887 7.36718 8.52888 7.37035V16.639C8.52888 16.6391 8.52888 16.6391 8.52888 16.6392C8.52888 19.0476 11.3206 21 14.7644 21C18.2082 21 21 19.0476 21 16.6392C21 16.6391 21 16.6391 21 16.639V7.36067H21Z"
           fill="#BFB5FF"
           fillOpacity="0.8"
+          fillRule="evenodd"
         />
       </g>
       <path
         d="M10.6782 9.802V9.802C13.1432 11.482 16.3855 11.482 18.8505 9.80197V9.80197"
         stroke="white"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <path
         d="M10.6782 14.5669V14.5669C13.1432 16.2469 16.3855 16.2469 18.8505 14.5669V14.5669"
         stroke="white"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <defs>
         <filter
-          id="filter0_bi_195_4078"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="22"
+          id={filterId}
+          width="16.4711"
           x="6.52887"
           y="1"
-          width="16.4711"
-          height="22"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feGaussianBlur in="BackgroundImageFix" stdDeviation="1" />
@@ -56,37 +61,37 @@ export function InfraStorageIcon(props: { className?: string }) {
             result="effect1_backgroundBlur_195_4078"
           />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="effect1_backgroundBlur_195_4078"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect2_innerShadow_195_4078"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_4078"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="4.5433"
-          y1="15.4442"
           x2="21.7601"
+          y1="15.4442"
           y2="9.49462"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#3F2DAF" />
           <stop offset="1" stopColor="#917FFB" />
diff --git a/apps/portal/src/icons/products/wallets/EcosystemWalletsIcon.tsx b/apps/portal/src/icons/products/wallets/EcosystemWalletsIcon.tsx
index 50cc588f727..389809fdfbc 100644
--- a/apps/portal/src/icons/products/wallets/EcosystemWalletsIcon.tsx
+++ b/apps/portal/src/icons/products/wallets/EcosystemWalletsIcon.tsx
@@ -1,21 +1,26 @@
+import { useId } from "react";
+
 export function EcosystemWalletsIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>ecosystem wallet</title>
       <path
-        fillRule="evenodd"
         clipRule="evenodd"
         d="M3 10.5289C3 11.2556 3.58914 11.8448 4.31589 11.8448L9.68471 11.8448C10.4115 11.8448 11.0006 11.2556 11.0006 10.5289V5.16065C11.0006 4.4339 10.4115 3.84476 9.68471 3.84476H4.31589C3.58914 3.84476 3 4.4339 3 5.16065L3 10.5289ZM12.9995 10.5289C12.9995 11.2556 13.5886 11.8448 14.3154 11.8448L19.6842 11.8448C20.4109 11.8448 21.0001 11.2556 21.0001 10.5289V5.16065C21.0001 4.4339 20.4109 3.84476 19.6842 3.84476H14.3154C13.5886 3.84476 12.9995 4.4339 12.9995 5.16065V10.5289Z"
-        fill="url(#paint0_linear_754_51)"
+        fill={`url(#${linearGradientId})`}
+        fillRule="evenodd"
       />
-      <g filter="url(#filter0_bi_754_51)">
+      <g filter={`url(#${filterId})`}>
         <path
           d="M4.75208 10.9797C4.75208 10.0438 5.51071 9.28522 6.44653 9.28522H17.551C18.4868 9.28522 19.2454 10.0438 19.2454 10.9797V18.4608C19.2454 19.3966 18.4868 20.1552 17.551 20.1552H6.44653C5.51071 20.1552 4.75208 19.3966 4.75208 18.4608V10.9797Z"
           fill="#B9DDFF"
@@ -25,19 +30,19 @@ export function EcosystemWalletsIcon(props: { className?: string }) {
       <path
         d="M6.55145 12.0597H9.38006C9.9118 12.0597 10.4078 12.3273 10.6998 12.7717V12.7717C11.3235 13.7211 12.7155 13.7211 13.3392 12.7717V12.7717C13.6312 12.3273 14.1272 12.0597 14.659 12.0597H17.4466"
         stroke="white"
-        strokeWidth="0.905836"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="0.905836"
       />
       <defs>
         <filter
-          id="filter0_bi_754_51"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="14.4934"
+          id={filterId}
+          width="18.1167"
           x="2.9404"
           y="7.47355"
-          width="18.1167"
-          height="14.4934"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feGaussianBlur in="BackgroundImageFix" stdDeviation="0.905836" />
@@ -47,37 +52,37 @@ export function EcosystemWalletsIcon(props: { className?: string }) {
             result="effect1_backgroundBlur_754_51"
           />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="effect1_backgroundBlur_754_51"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.181167" />
           <feGaussianBlur stdDeviation="0.0452918" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect2_innerShadow_754_51"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_754_51"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="17.4325"
-          y1="7.19611"
           x2="6.4966"
+          y1="7.19611"
           y2="14.6568"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#2567FF" />
           <stop offset="1" stopColor="#22A7FF" />
diff --git a/apps/portal/src/icons/products/wallets/WalletsAuthIcon.tsx b/apps/portal/src/icons/products/wallets/WalletsAuthIcon.tsx
index 9e281a8707e..13830a3403f 100644
--- a/apps/portal/src/icons/products/wallets/WalletsAuthIcon.tsx
+++ b/apps/portal/src/icons/products/wallets/WalletsAuthIcon.tsx
@@ -1,20 +1,26 @@
+import { useId } from "react";
+
 export function WalletsAuthIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+  const clipPathId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>auth</title>
-      <g clipPath="url(#clip0_195_4118)">
+      <g clipPath={`url(#${clipPathId})`}>
         <path
           d="M10.2679 4.7887C11.0377 3.45536 12.9622 3.45536 13.732 4.7887L20.7756 16.9886C21.5454 18.3219 20.5832 19.9886 19.0436 19.9886H4.95635C3.41675 19.9886 2.4545 18.3219 3.2243 16.9886L10.2679 4.7887Z"
-          fill="url(#paint0_linear_195_4118)"
+          fill={`url(#${linearGradientId})`}
         />
-        <g filter="url(#filter0_i_195_4118)">
+        <g filter={`url(#${filterId})`}>
           <path
             d="M11.1341 13.3799C11.519 12.7132 12.4812 12.7132 12.8661 13.3799L15.811 18.4806C16.1959 19.1473 15.7148 19.9806 14.945 19.9806H9.05519C8.28539 19.9806 7.80426 19.1473 8.18916 18.4806L11.1341 13.3799Z"
             fill="#B9DDFF"
@@ -24,53 +30,53 @@ export function WalletsAuthIcon(props: { className?: string }) {
       </g>
       <defs>
         <filter
-          id="filter0_i_195_4118"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="7.20072"
+          id={filterId}
+          width="7.89278"
           x="8.0537"
           y="12.8799"
-          width="7.89278"
-          height="7.20072"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="BackgroundImageFix"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect1_innerShadow_195_4118"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_4118"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="3.35198"
-          y1="20.82"
           x2="21.8618"
+          y1="20.82"
           y2="12.4792"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#2567FF" />
           <stop offset="1" stopColor="#22A7FF" />
         </linearGradient>
-        <clipPath id="clip0_195_4118">
-          <rect width="24" height="24" fill="white" />
+        <clipPath id={clipPathId}>
+          <rect fill="white" height="24" width="24" />
         </clipPath>
       </defs>
     </svg>
diff --git a/apps/portal/src/icons/products/wallets/WalletsConnectIcon.tsx b/apps/portal/src/icons/products/wallets/WalletsConnectIcon.tsx
index 4b04702af93..839dcc186ee 100644
--- a/apps/portal/src/icons/products/wallets/WalletsConnectIcon.tsx
+++ b/apps/portal/src/icons/products/wallets/WalletsConnectIcon.tsx
@@ -1,24 +1,29 @@
+import { useId } from "react";
+
 export function WalletsConnectIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>connect wallet</title>
       <rect
-        x="3"
-        y="17.9988"
-        width="14.9988"
+        fill={`url(#${linearGradientId})`}
         height="10.6499"
         rx="2"
         transform="rotate(-90 3 17.9988)"
-        fill="url(#paint0_linear_195_4047)"
+        width="14.9988"
+        x="3"
+        y="17.9988"
       />
-      <g filter="url(#filter0_bi_195_4047)">
+      <g filter={`url(#${filterId})`}>
         <path
           d="M3 9C3 7.89543 3.89543 7 5 7H19C20.1046 7 21 7.89543 21 9V19C21 20.1046 20.1046 21 19 21H5C3.89543 21 3 20.1046 3 19V9Z"
           fill="#B9DDFF"
@@ -28,19 +33,19 @@ export function WalletsConnectIcon(props: { className?: string }) {
       <path
         d="M18.3004 12.6995V12.6995C17.5822 13.4177 17.5822 14.5822 18.3004 15.3004V15.3004"
         stroke="white"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <defs>
         <filter
-          id="filter0_bi_195_4047"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="18"
+          id={filterId}
+          width="22"
           x="1"
           y="5"
-          width="22"
-          height="18"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feGaussianBlur in="BackgroundImageFix" stdDeviation="1" />
@@ -50,37 +55,37 @@ export function WalletsConnectIcon(props: { className?: string }) {
             result="effect1_backgroundBlur_195_4047"
           />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="effect1_backgroundBlur_195_4047"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect2_innerShadow_195_4047"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_4047"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="15.026"
-          y1="22.4602"
           x2="3.73188"
+          y1="22.4602"
           y2="27.2831"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#2567FF" />
           <stop offset="1" stopColor="#22A7FF" />
diff --git a/apps/portal/src/icons/products/wallets/WalletsSmartIcon.tsx b/apps/portal/src/icons/products/wallets/WalletsSmartIcon.tsx
index 712e2724882..b6131029663 100644
--- a/apps/portal/src/icons/products/wallets/WalletsSmartIcon.tsx
+++ b/apps/portal/src/icons/products/wallets/WalletsSmartIcon.tsx
@@ -1,24 +1,29 @@
+import { useId } from "react";
+
 export function WalletsSmartIcon(props: { className?: string }) {
+  const filterId = useId();
+  const linearGradientId = useId();
+
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 24 24"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>Smart Wallet</title>
       <rect
-        x="11.6693"
-        y="16.9566"
-        width="13.4583"
+        fill={`url(#${linearGradientId})`}
         height="9.33069"
         rx="1.49536"
         transform="rotate(-90 11.6693 16.9566)"
-        fill="url(#paint0_linear_195_3925)"
+        width="13.4583"
+        x="11.6693"
+        y="16.9566"
       />
-      <g filter="url(#filter0_bi_195_3925)">
+      <g filter={`url(#${filterId})`}>
         <path
           d="M8.18321 21.2503C8.7189 21.581 9.37914 21.581 9.91484 21.2503C11.5871 20.2182 15.098 17.6396 15.098 14.1832V10.2763C15.098 9.44263 14.5809 8.69639 13.8003 8.40366L9.75127 6.88528C9.2985 6.71549 8.79955 6.71549 8.34678 6.88528L4.29775 8.40366C3.51715 8.69639 3 9.44263 3 10.2763V14.1832C3 17.6396 6.51095 20.2182 8.18321 21.2503Z"
           fill="#B9DDFF"
@@ -35,13 +40,13 @@ export function WalletsSmartIcon(props: { className?: string }) {
       />
       <defs>
         <filter
-          id="filter0_bi_195_3925"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+          height="18.7404"
+          id={filterId}
+          width="16.098"
           x="1"
           y="4.75793"
-          width="16.098"
-          height="18.7404"
-          filterUnits="userSpaceOnUse"
-          colorInterpolationFilters="sRGB"
         >
           <feFlood floodOpacity="0" result="BackgroundImageFix" />
           <feGaussianBlur in="BackgroundImageFix" stdDeviation="1" />
@@ -51,37 +56,37 @@ export function WalletsSmartIcon(props: { className?: string }) {
             result="effect1_backgroundBlur_195_3925"
           />
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="effect1_backgroundBlur_195_3925"
+            mode="normal"
             result="shape"
           />
           <feColorMatrix
             in="SourceAlpha"
+            result="hardAlpha"
             type="matrix"
             values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-            result="hardAlpha"
           />
           <feOffset dy="0.2" />
           <feGaussianBlur stdDeviation="0.05" />
-          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic" />
           <feColorMatrix
             type="matrix"
             values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
           />
           <feBlend
-            mode="normal"
             in2="shape"
+            mode="normal"
             result="effect2_innerShadow_195_3925"
           />
         </filter>
         <linearGradient
-          id="paint0_linear_195_3925"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="22.4602"
-          y1="20.8654"
           x2="12.4019"
+          y1="20.8654"
           y2="25.2643"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#2567FF" />
           <stop offset="1" stopColor="#22A7FF" />
diff --git a/apps/portal/src/icons/sdks/DotNetIcon.tsx b/apps/portal/src/icons/sdks/DotNetIcon.tsx
index 241760dfcce..6b76ee883ed 100644
--- a/apps/portal/src/icons/sdks/DotNetIcon.tsx
+++ b/apps/portal/src/icons/sdks/DotNetIcon.tsx
@@ -1,16 +1,16 @@
 export function DotNetIcon(props: { className?: string }) {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      x="0px"
-      y="0px"
-      width="24"
+      className={props.className}
       height="24"
       viewBox="0 0 456 456"
-      className={props.className}
+      width="24"
+      x="0px"
+      xmlns="http://www.w3.org/2000/svg"
+      y="0px"
     >
       <title>.NET</title>
-      <rect width="456" height="456" fill="currentColor" />
+      <rect fill="currentColor" height="456" width="456" />
       <path
         d="M81.2738 291.333C78.0496 291.333 75.309 290.259 73.052 288.11C70.795 285.906 69.6665 283.289 69.6665 280.259C69.6665 277.173 70.795 274.529 73.052 272.325C75.309 270.121 78.0496 269.019 81.2738 269.019C84.5518 269.019 87.3193 270.121 89.5763 272.325C91.887 274.529 93.0424 277.173 93.0424 280.259C93.0424 283.289 91.887 285.906 89.5763 288.11C87.3193 290.259 84.5518 291.333 81.2738 291.333Z"
         fill="hsl(var(--background))"
diff --git a/apps/portal/src/icons/sdks/ReactIcon.tsx b/apps/portal/src/icons/sdks/ReactIcon.tsx
index fe6b03644bb..11277d054b0 100644
--- a/apps/portal/src/icons/sdks/ReactIcon.tsx
+++ b/apps/portal/src/icons/sdks/ReactIcon.tsx
@@ -1,12 +1,12 @@
 export function ReactIcon(props: { className?: string }) {
   return (
     <svg
-      width="24"
+      className={props.className}
+      fill="none"
       height="24"
       viewBox="0 0 21 18"
-      fill="none"
+      width="24"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>React</title>
       <path
diff --git a/apps/portal/src/icons/sdks/TypeScriptIcon.tsx b/apps/portal/src/icons/sdks/TypeScriptIcon.tsx
index 753d8e99241..cb619c21139 100644
--- a/apps/portal/src/icons/sdks/TypeScriptIcon.tsx
+++ b/apps/portal/src/icons/sdks/TypeScriptIcon.tsx
@@ -1,23 +1,23 @@
 export function TypeScriptIcon(props: { className?: string }) {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      x="0px"
-      y="0px"
-      width="24"
+      className={props.className}
       height="24"
       viewBox="0 0 48 48"
-      className={props.className}
+      width="24"
+      x="0px"
+      xmlns="http://www.w3.org/2000/svg"
+      y="0px"
     >
       <title>TypeScript</title>
-      <rect width="36" height="36" x="6" y="6" fill="currentColor" />
+      <rect fill="currentColor" height="36" width="36" x="6" y="6" />
       <polygon
         fill="hsl(var(--background))"
         points="27.49,22 14.227,22 14.227,25.264 18.984,25.264 18.984,40 22.753,40 22.753,25.264 27.49,25.264"
       />
       <path
-        fill="hsl(var(--background))"
         d="M39.194,26.084c0,0-1.787-1.192-3.807-1.192s-2.747,0.96-2.747,1.986 c0,2.648,7.381,2.383,7.381,7.712c0,8.209-11.254,4.568-11.254,4.568V35.22c0,0,2.152,1.622,4.733,1.622s2.483-1.688,2.483-1.92 c0-2.449-7.315-2.449-7.315-7.878c0-7.381,10.658-4.469,10.658-4.469L39.194,26.084z"
+        fill="hsl(var(--background))"
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/sdks/UnityIcon.tsx b/apps/portal/src/icons/sdks/UnityIcon.tsx
index 42350d8144c..d46eebb18ff 100644
--- a/apps/portal/src/icons/sdks/UnityIcon.tsx
+++ b/apps/portal/src/icons/sdks/UnityIcon.tsx
@@ -1,18 +1,18 @@
 export function UnityIcon(props: { className?: string }) {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      x="0px"
-      y="0px"
-      width="24"
+      className={props.className}
       height="24"
       viewBox="0 0 48 48"
-      className={props.className}
+      width="24"
+      x="0px"
+      xmlns="http://www.w3.org/2000/svg"
+      y="0px"
     >
       <title>Unity</title>
       <path
-        fill="currentColor"
         d="M36.272,36.185l-7.243-12.184l7.243-12.221l3.502,12.221L36.272,36.185z M20.126,34.994l-9.115-8.991	H25.52l7.254,12.153L20.126,34.994z M20.126,12.934l12.611-3.162l-7.254,12.231H10.975L20.126,12.934z M38.653,3.782L22.172,8.061	l-2.455,4.204l-4.947-0.037L2.75,24.001l12.019,11.737l4.948-0.037l2.455,4.204l16.481,4.315l4.426-16.176l-2.478-4.04l2.477-4.047	L38.653,3.782z"
+        fill="currentColor"
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/sdks/UnrealEngineIcon.tsx b/apps/portal/src/icons/sdks/UnrealEngineIcon.tsx
index 4dcc5b22286..dc61c23a9d6 100644
--- a/apps/portal/src/icons/sdks/UnrealEngineIcon.tsx
+++ b/apps/portal/src/icons/sdks/UnrealEngineIcon.tsx
@@ -1,12 +1,12 @@
 export function UnrealEngineIcon(props: { className?: string }) {
   return (
     <svg
+      className={props.className}
       fill="currentColor"
-      width="24px"
       height="25px"
       viewBox="0 0 32 32"
+      width="24px"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>Unreal Engine</title>
       <path d="M16 0c-8.766 0-15.865 7.161-15.865 16s7.099 16 15.865 16c8.76 0 15.865-7.161 15.865-16s-7.104-16-15.87-16zM16 0.703c4.047 0 7.859 1.594 10.724 4.479 2.859 2.875 4.453 6.766 4.443 10.818 0 4.083-1.578 7.927-4.443 10.818-2.828 2.87-6.693 4.484-10.724 4.479-4.031 0.005-7.896-1.609-10.724-4.479-2.859-2.875-4.458-6.766-4.448-10.818 0-4.083 1.583-7.927 4.443-10.818 2.828-2.875 6.698-4.49 10.729-4.479zM15.203 6.333c-2.583 0.693-4.974 2.021-8.161 5.677s-2.583 6.677-2.583 6.677c0 0 0.88-2.078 2.995-4.266 1.005-1.036 1.75-1.385 2.266-1.385 0.458-0.026 0.844 0.344 0.844 0.802v7.422c0 0.734-0.474 0.896-0.911 0.885-0.37-0.005-0.714-0.135-0.714-0.135 2.172 3.156 7.37 3.599 7.37 3.599l2.281-2.438 0.052 0.047 2.089 1.781c3.823-2.271 5.667-6.479 5.667-6.479-1.708 1.802-2.792 2.224-3.438 2.224-0.573-0.005-0.797-0.339-0.797-0.339-0.031-0.156-0.083-2.417-0.104-4.677-0.021-2.339 0-4.682 0.115-4.688 0.661-1.24 2.766-3.74 2.766-3.74-3.932 0.776-6.073 3.354-6.073 3.354-0.635-0.5-1.927-0.417-1.927-0.417 0.604 0.333 1.208 1.302 1.208 2.104v7.896c0 0-1.318 1.161-2.333 1.161-0.604 0-0.974-0.328-1.177-0.599-0.078-0.104-0.146-0.219-0.198-0.344v-9.75c-0.141 0.104-0.313 0.161-0.484 0.167-0.219 0-0.443-0.109-0.594-0.427-0.115-0.24-0.188-0.599-0.188-1.125 0-1.797 2.031-2.99 2.031-2.99z" />
diff --git a/apps/portal/src/icons/sidebar/NebulaSideIcon.tsx b/apps/portal/src/icons/sidebar/NebulaSideIcon.tsx
index 1017ddfcfab..2463f2fd982 100644
--- a/apps/portal/src/icons/sidebar/NebulaSideIcon.tsx
+++ b/apps/portal/src/icons/sidebar/NebulaSideIcon.tsx
@@ -1,19 +1,19 @@
 export function NebulaSideIcon(props: { className?: string }) {
   return (
     <svg
-      width="26"
+      className={props.className}
+      fill="none"
       height="23"
       viewBox="0 0 26 23"
-      fill="none"
+      width="26"
       xmlns="http://www.w3.org/2000/svg"
-      className={props.className}
     >
       <title>Nebula Side Icon</title>
       <path
-        fillRule="evenodd"
         clipRule="evenodd"
         d="M8.59184 6.90662C11.0371 4.46133 13.7786 2.91523 16.1533 2.32154C18.5742 1.71634 20.2355 2.1603 21.1254 3.05015C21.9057 3.83049 22.3432 5.20416 22.0309 7.163C21.9445 7.15756 21.8575 7.1548 21.7698 7.1548C19.5107 7.1548 17.6794 8.98613 17.6794 11.2452C17.6794 12.2928 18.0732 13.2484 18.7208 13.9721C18.2788 14.5186 17.7946 15.058 17.2689 15.5837C14.8236 18.029 12.0822 19.5751 9.7074 20.1688C7.2866 20.774 5.62522 20.33 4.73537 19.4402C3.95504 18.6598 3.5176 17.2862 3.82985 15.3274C3.91601 15.3329 4.00289 15.3356 4.09041 15.3356C6.34948 15.3356 8.18082 13.5043 8.18082 11.2452C8.18082 10.1978 7.7871 9.24226 7.1396 8.51864C7.58174 7.972 8.066 7.43246 8.59184 6.90662ZM4.13457 9.20047C4.13455 9.2005 4.13454 9.20053 4.13452 9.20056C4.22553 9.20245 4.31509 9.21029 4.4028 9.22371C5.38406 9.3741 6.13561 10.2219 6.13561 11.2452C6.13561 12.3747 5.21994 13.2904 4.09041 13.2904C3.98625 13.2904 3.88392 13.2826 3.78395 13.2676C3.25576 13.188 2.79374 12.9065 2.4791 12.5041C2.47903 12.5043 2.47896 12.5045 2.4789 12.5047C2.20717 12.1575 2.0452 11.7203 2.0452 11.2452C2.0452 10.1157 2.96087 9.2 4.09041 9.2C4.10517 9.2 4.11989 9.20016 4.13457 9.20047ZM5.43149 7.37971C5.95254 6.72404 6.52463 6.08148 7.14567 5.46044C12.4703 0.135767 19.3767 -1.59084 22.5716 1.60397C24.0329 3.06534 24.4646 5.30331 23.9931 7.81126C25.1168 8.54032 25.8602 9.80595 25.8602 11.2452C25.8602 13.5043 24.0288 15.3356 21.7698 15.3356C21.3002 15.3356 20.8491 15.2565 20.4291 15.1108C19.9081 15.7664 19.336 16.4089 18.7151 17.0299C13.3904 22.3545 6.484 24.0811 3.28919 20.8863C1.8279 19.425 1.39622 17.1872 1.86752 14.6795C0.743549 13.9505 6.29225e-08 12.6847 0 11.2452C-9.8742e-08 8.98613 1.83134 7.1548 4.09041 7.1548C4.56013 7.1548 5.01137 7.23397 5.43149 7.37971ZM21.4844 9.21976C21.4843 9.2198 21.4843 9.21984 21.4843 9.21988C21.5776 9.20684 21.6729 9.20011 21.7698 9.20011C22.4245 9.20011 23.0073 9.50769 23.3816 9.98623C23.3816 9.98622 23.3816 9.98621 23.3816 9.98621C23.6532 10.3333 23.815 10.7704 23.815 11.2452C23.815 12.3747 22.8993 13.2904 21.7698 13.2904C20.6402 13.2904 19.7246 12.3747 19.7246 11.2452C19.7246 10.2125 20.4899 9.35861 21.4844 9.21976ZM12.9303 9.19996C14.0598 9.19996 14.9755 10.1156 14.9755 11.2452C14.9755 12.3747 14.0598 13.2904 12.9303 13.2904C11.8008 13.2904 10.8851 12.3747 10.8851 11.2452C10.8851 10.1156 11.8008 9.19996 12.9303 9.19996Z"
         fill="currentColor"
+        fillRule="evenodd"
       />
     </svg>
   );
diff --git a/apps/portal/src/icons/thirdweb.tsx b/apps/portal/src/icons/thirdweb.tsx
index d1a8ec57c75..450e8fb58df 100644
--- a/apps/portal/src/icons/thirdweb.tsx
+++ b/apps/portal/src/icons/thirdweb.tsx
@@ -1,29 +1,36 @@
+import { useId } from "react";
+
 export function ThirdwebIcon(props: { className?: string }) {
+  const gradientOne = useId();
+  const gradientTwo = useId();
+  const gradientThree = useId();
+  const clipPath = useId();
+
   return (
-    <svg viewBox="0 0 516 321" fill="none" className={props.className}>
+    <svg className={props.className} fill="none" viewBox="0 0 516 321">
       <title>thirdweb</title>
-      <g clipPath="url(#clip0_3:35)">
+      <g clipPath={`url(#${clipPath})`}>
         <path
           d="M1.40497 27.0011C-3.73633 14.022 5.84519 0 19.8669 0H106.919C115.098 0 122.342 4.86715 125.381 12.3996L194.671 185.299C196.541 189.935 196.541 195.149 194.671 199.901L151.087 308.484C144.427 325.056 120.823 325.056 114.163 308.484L1.40497 27.0011Z"
-          fill="url(#paint0_linear_3:35)"
+          fill={`url(#${gradientOne})`}
         />
         <path
           d="M169.547 26.4217C164.873 13.5585 174.454 0 188.242 0H264.077C272.49 0 279.968 5.2148 282.772 12.9791L345.753 185.879C347.272 190.166 347.272 194.918 345.753 199.321L307.894 303.27C301.585 320.652 276.813 320.652 270.503 303.27L169.547 26.4217Z"
-          fill="url(#paint1_linear_3:35)"
+          fill={`url(#${gradientTwo})`}
         />
         <path
           d="M321.331 27.0011C316.19 14.022 325.771 0 339.793 0H426.845C435.024 0 442.269 4.86715 445.307 12.3996L514.597 185.299C516.467 189.935 516.467 195.149 514.597 199.901L471.013 308.484C464.353 325.056 440.75 325.056 434.089 308.484L321.331 27.0011Z"
-          fill="url(#paint2_linear_3:35)"
+          fill={`url(#${gradientThree})`}
         />
       </g>
       <defs>
         <linearGradient
-          id="paint0_linear_3:35"
+          gradientUnits="userSpaceOnUse"
+          id={gradientOne}
           x1="7.40492"
-          y1="55.24"
           x2="260.485"
+          y1="55.24"
           y2="164.437"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -32,12 +39,12 @@ export function ThirdwebIcon(props: { className?: string }) {
           <stop offset="1" stopColor="#5204BF" />
         </linearGradient>
         <linearGradient
-          id="paint1_linear_3:35"
+          gradientUnits="userSpaceOnUse"
+          id={gradientTwo}
           x1="175.093"
-          y1="54.447"
           x2="410.968"
+          y1="54.447"
           y2="148.471"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -46,12 +53,12 @@ export function ThirdwebIcon(props: { className?: string }) {
           <stop offset="1" stopColor="#5204BF" />
         </linearGradient>
         <linearGradient
-          id="paint2_linear_3:35"
+          gradientUnits="userSpaceOnUse"
+          id={gradientThree}
           x1="327.331"
-          y1="55.24"
           x2="580.411"
+          y1="55.24"
           y2="164.437"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="#F213A4" />
           <stop offset="0.1517" stopColor="#E011A7" />
@@ -59,8 +66,8 @@ export function ThirdwebIcon(props: { className?: string }) {
           <stop offset="0.8789" stopColor="#6806BB" />
           <stop offset="1" stopColor="#5204BF" />
         </linearGradient>
-        <clipPath id="clip0_3:35">
-          <rect width="516" height="321" fill="white" />
+        <clipPath id={clipPath}>
+          <rect fill="white" height="321" width="516" />
         </clipPath>
       </defs>
     </svg>
diff --git a/apps/portal/src/instrumentation-client.ts b/apps/portal/src/instrumentation-client.ts
index fd21d85797c..256e0475857 100644
--- a/apps/portal/src/instrumentation-client.ts
+++ b/apps/portal/src/instrumentation-client.ts
@@ -5,13 +5,13 @@ const NEXT_PUBLIC_POSTHOG_KEY = process.env.NEXT_PUBLIC_POSTHOG_KEY;
 if (NEXT_PUBLIC_POSTHOG_KEY) {
   posthog.init(NEXT_PUBLIC_POSTHOG_KEY, {
     api_host: "/_ph",
-    ui_host: "https://us.posthog.com",
-    capture_pageview: "history_change",
-    capture_pageleave: "if_capture_pageview",
-    // disable exception capture (for now)
-    capture_exceptions: false,
     // specifically disable autocapture (does not affect pageview capture)
     autocapture: false,
+    // disable exception capture (for now)
+    capture_exceptions: false,
+    capture_pageleave: "if_capture_pageview",
+    capture_pageview: "history_change",
     debug: process.env.NODE_ENV === "development",
+    ui_host: "https://us.posthog.com",
   });
 }
diff --git a/apps/portal/tailwind.config.ts b/apps/portal/tailwind.config.ts
index 081e1250c07..32638a4aa4e 100644
--- a/apps/portal/tailwind.config.ts
+++ b/apps/portal/tailwind.config.ts
@@ -1,12 +1,20 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  darkMode: ["class"],
   content: [
     "./components/**/*.{ts,tsx}",
     "./app/**/*.{ts,tsx,mdx}",
     "./src/**/*.{ts,tsx,mdx}",
   ],
+  darkMode: ["class"],
+  plugins: [require("tailwindcss-animate")],
   theme: {
+    borderRadius: {
+      full: "9999px",
+      lg: "var(--radius)",
+      md: "calc(var(--radius) - 2px)",
+      none: "0",
+      sm: "calc(var(--radius) - 4px)",
+    },
     container: {
       center: true,
       padding: "1rem",
@@ -14,54 +22,25 @@ module.exports = {
         "2xl": "1400px",
       },
     },
-
-    zIndex: {
-      modal: 1400,
-      modalOverlay: 1300,
-      dropdownMenu: 1200,
-      menu: 1100,
-      //
-      stickyTop: 1000,
-      floatingButton: 1000,
-      stickyMobileSidebar: 500,
-      //
-      copyCodeButton: 20,
-      //
-      codeToken: 5,
-      codeTokenHighlight: 1,
-      // base
-      base: 0,
-    },
-    borderRadius: {
-      lg: "var(--radius)",
-      md: "calc(var(--radius) - 2px)",
-      sm: "calc(var(--radius) - 4px)",
-      full: "9999px",
-      none: "0",
-    },
-    fontFamily: {
-      sans: ["var(--font-sans)", "sans-serif"],
-      mono: ["var(--font-mono)", "monospace"],
-    },
     extend: {
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+        "animate-in-slow": "animate-in 0.4s ease",
+      },
       colors: {
-        border: "hsl(var(--border))",
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
         "active-border": "hsl(var(--active-border))",
-        current: "currentColor",
-        input: "hsl(var(--input))",
-        ring: "hsl(var(--ring))",
-        transparent: "transparent",
-        overlay: "hsl(var(--overlay))",
         background: "hsl(var(--background))",
-        foreground: "hsl(var(--foreground))",
-        primary: {
-          DEFAULT: "hsl(var(--primary))",
-          foreground: "hsl(var(--primary-foreground))",
-        },
-        secondary: {
-          DEFAULT: "hsl(var(--secondary))",
-          foreground: "hsl(var(--secondary-foreground))",
+        border: "hsl(var(--border))",
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
         },
+        current: "currentColor",
         destructive: {
           DEFAULT: "hsl(var(--destructive))",
           // destructive-foreground should only be used on destructive bg
@@ -69,42 +48,41 @@ module.exports = {
           // destructive-text can be used on neutral bg - it's red-ish
           text: "hsl(var(--destructive-text))",
         },
-        success: {
-          // success-text can be used on neutral bg, it's green-ish
-          text: "hsl(var(--success-text))",
+        foreground: "hsl(var(--foreground))",
+        input: "hsl(var(--input))",
+        inverted: {
+          DEFAULT: "hsl(var(--inverted))",
+          foreground: "hsl(var(--inverted-foreground))",
+        },
+        link: {
+          foreground: "hsl(var(--link-foreground))",
         },
         muted: {
           DEFAULT: "hsl(var(--muted))",
           foreground: "hsl(var(--muted-foreground))",
         },
-        accent: {
-          DEFAULT: "hsl(var(--accent))",
-          foreground: "hsl(var(--accent-foreground))",
-        },
+        overlay: "hsl(var(--overlay))",
         popover: {
           DEFAULT: "hsl(var(--popover))",
           foreground: "hsl(var(--popover-foreground))",
         },
-        card: {
-          DEFAULT: "hsl(var(--card))",
-          foreground: "hsl(var(--card-foreground))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
         },
-        inverted: {
-          DEFAULT: "hsl(var(--inverted))",
-          foreground: "hsl(var(--inverted-foreground))",
+        ring: "hsl(var(--ring))",
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
+        },
+        success: {
+          // success-text can be used on neutral bg, it's green-ish
+          text: "hsl(var(--success-text))",
         },
+        transparent: "transparent",
         warning: {
           text: "hsl(var(--warning-text))",
         },
-        link: {
-          foreground: "hsl(var(--link-foreground))",
-        },
-      },
-      spacing: {
-        "sticky-top-height": "var(--sticky-top-height)",
-        "sidebar-height": "calc(100vh - var(--sticky-top-height))",
-        "offset-top": "calc(var(--sticky-top-height) + 18px)",
-        "offset-top-mobile": "calc(var(--sticky-top-height) + 100px)",
       },
       keyframes: {
         "accordion-down": {
@@ -116,12 +94,34 @@ module.exports = {
           to: { height: 0, opacity: 0 },
         },
       },
-      animation: {
-        "accordion-down": "accordion-down 0.2s ease-out",
-        "accordion-up": "accordion-up 0.2s ease-out",
-        "animate-in-slow": "animate-in 0.4s ease",
+      spacing: {
+        "offset-top": "calc(var(--sticky-top-height) + 18px)",
+        "offset-top-mobile": "calc(var(--sticky-top-height) + 100px)",
+        "sidebar-height": "calc(100vh - var(--sticky-top-height))",
+        "sticky-top-height": "var(--sticky-top-height)",
       },
     },
+    fontFamily: {
+      mono: ["var(--font-mono)", "monospace"],
+      sans: ["var(--font-sans)", "sans-serif"],
+    },
+
+    zIndex: {
+      // base
+      base: 0,
+      //
+      codeToken: 5,
+      codeTokenHighlight: 1,
+      //
+      copyCodeButton: 20,
+      dropdownMenu: 1200,
+      floatingButton: 1000,
+      menu: 1100,
+      modal: 1400,
+      modalOverlay: 1300,
+      stickyMobileSidebar: 500,
+      //
+      stickyTop: 1000,
+    },
   },
-  plugins: [require("tailwindcss-animate")],
 };
diff --git a/apps/portal/tsconfig.json b/apps/portal/tsconfig.json
index 1a2c1be029e..d48b95a4901 100644
--- a/apps/portal/tsconfig.json
+++ b/apps/portal/tsconfig.json
@@ -1,33 +1,34 @@
 {
   "compilerOptions": {
-    "target": "es2020",
-    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
+    "forceConsistentCasingInFileNames": true,
+    "incremental": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "noEmit": true,
     "noUncheckedIndexedAccess": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
     "paths": {
       "@/*": ["./src/*"],
+      "@doc": ["./src/components/Document"],
       "@public/*": ["./public/*"],
-      "flexsearch": ["./node_modules/@types/flexsearch"],
       "@root/*": ["./*"],
-      "@doc": ["./src/components/Document"]
+      "flexsearch": ["./node_modules/@types/flexsearch"]
     },
-    "forceConsistentCasingInFileNames": true
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "es2020"
   },
+  "exclude": ["node_modules", ".next", "lib/__generated__"],
   "include": [
     "lucide-env.d.ts",
     "next-env.d.ts",
@@ -35,7 +36,6 @@
     "**/*.tsx",
     ".next/types/**/*.ts"
   ],
-  "exclude": ["node_modules"],
   "ts-node": {
     "compilerOptions": {
       "module": "commonjs"
diff --git a/apps/wallet-ui/.eslintrc.js b/apps/wallet-ui/.eslintrc.js
index f0a1be98074..26234ee14c7 100644
--- a/apps/wallet-ui/.eslintrc.js
+++ b/apps/wallet-ui/.eslintrc.js
@@ -1,47 +1,65 @@
 module.exports = {
+  env: {
+    browser: true,
+    node: true,
+  },
   extends: [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:@next/next/recommended",
   ],
-  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.',
+  overrides: [
+    // enable rule specifically for TypeScript files
+    {
+      files: ["*.ts", "*.tsx"],
+      rules: {
+        "@typescript-eslint/explicit-module-boundary-types": ["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: {
     "no-restricted-imports": [
       "error",
       {
         paths: [
           {
-            name: "next/navigation",
             importNames: ["useRouter"],
             message:
               'Use `import { useRouter } from "@/lib/useRouter";` instead',
+            name: "next/navigation",
           },
         ],
       },
     ],
-  },
-  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']",
+      },
+    ],
+    "react-compiler/react-compiler": "error",
   },
   settings: {
     react: {
@@ -50,22 +68,4 @@ module.exports = {
       version: "detect",
     },
   },
-  overrides: [
-    // enable rule specifically for TypeScript files
-    {
-      files: ["*.ts", "*.tsx"],
-      rules: {
-        "@typescript-eslint/explicit-module-boundary-types": ["off"],
-      },
-    },
-    // THIS NEEDS TO GO LAST!
-    {
-      files: ["*.ts", "*.js", "*.tsx", "*.jsx"],
-      extends: ["biome"],
-    },
-  ],
-  env: {
-    browser: true,
-    node: true,
-  },
 };
diff --git a/apps/wallet-ui/biome.json b/apps/wallet-ui/biome.json
index b287b3aca79..780bbdcd1af 100644
--- a/apps/wallet-ui/biome.json
+++ b/apps/wallet-ui/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.0/schema.json",
+  "extends": "//"
 }
diff --git a/apps/wallet-ui/components.json b/apps/wallet-ui/components.json
index cb0d435b416..05b99a14c4e 100644
--- a/apps/wallet-ui/components.json
+++ b/apps/wallet-ui/components.json
@@ -1,17 +1,17 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils"
+  },
   "rsc": true,
-  "tsx": true,
+  "style": "default",
   "tailwind": {
+    "baseColor": "gray",
     "config": "tailwind.config.ts",
     "css": "src/app/globals.css",
-    "baseColor": "gray",
     "cssVariables": true,
     "prefix": ""
   },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils"
-  }
-}
\ No newline at end of file
+  "tsx": true
+}
diff --git a/apps/wallet-ui/knip.json b/apps/wallet-ui/knip.json
index 34399e5e665..c7bb2c555ad 100644
--- a/apps/wallet-ui/knip.json
+++ b/apps/wallet-ui/knip.json
@@ -1,8 +1,7 @@
 {
   "$schema": "https://unpkg.com/knip@latest/schema.json",
-  "next": true,
   "ignore": ["src/components/ui/**"],
-  "ignoreBinaries": ["biome"],
   "ignoreDependencies": ["thirdweb"],
+  "next": true,
   "project": ["src/**"]
 }
diff --git a/apps/wallet-ui/next.config.mjs b/apps/wallet-ui/next.config.mjs
index 682c960c426..67e8badbfd2 100644
--- a/apps/wallet-ui/next.config.mjs
+++ b/apps/wallet-ui/next.config.mjs
@@ -38,8 +38,8 @@ const securityHeaders = [
 export async function headers() {
   return [
     {
-      source: "/(.*)",
       headers: securityHeaders,
+      source: "/(.*)",
     },
   ];
 }
@@ -49,25 +49,28 @@ const nextConfig = {
   eslint: {
     ignoreDuringBuilds: true,
   },
-  productionBrowserSourceMaps: false,
   experimental: {
+    serverSourceMaps: false,
     webpackBuildWorker: true,
     webpackMemoryOptimizations: true,
-    serverSourceMaps: false,
   },
+  images: {
+    dangerouslyAllowSVG: true,
+  },
+  productionBrowserSourceMaps: false,
   async rewrites() {
     return [
       {
-        source: "/_ph/static/:path*",
         destination: "https://us-assets.i.posthog.com/static/:path*",
+        source: "/_ph/static/:path*",
       },
       {
-        source: "/_ph/:path*",
         destination: "https://us.i.posthog.com/:path*",
+        source: "/_ph/:path*",
       },
       {
-        source: "/_ph/decide",
         destination: "https://us.i.posthog.com/decide",
+        source: "/_ph/decide",
       },
     ];
   },
@@ -75,9 +78,6 @@ const nextConfig = {
     config.externals.push("pino-pretty", "lokijs", "encoding");
     return config;
   },
-  images: {
-    dangerouslyAllowSVG: true,
-  },
 };
 
 export default nextConfig;
diff --git a/apps/wallet-ui/package.json b/apps/wallet-ui/package.json
index 20b1cac6bd1..b155adf9c81 100644
--- a/apps/wallet-ui/package.json
+++ b/apps/wallet-ui/package.json
@@ -1,14 +1,4 @@
 {
-  "name": "wallet-ui",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "dev": "next dev --turbopack",
-    "build": "next build",
-    "start": "next start",
-    "lint": "biome check ./src && knip && eslint ./src",
-    "fix": "biome check ./src --fix && knip --fix --allow-remove-files && eslint ./src --fix"
-  },
   "dependencies": {
     "@hookform/resolvers": "^3.9.1",
     "@radix-ui/react-dialog": "1.1.14",
@@ -34,6 +24,7 @@
     "zod": "3.25.62"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.0",
     "@next/eslint-plugin-next": "15.3.3",
     "@types/node": "22.14.1",
     "@types/react": "19.1.8",
@@ -48,5 +39,15 @@
     "postcss-load-config": "^6.0.1",
     "tailwindcss": "3.4.17",
     "typescript": "5.8.3"
-  }
+  },
+  "name": "wallet-ui",
+  "private": true,
+  "scripts": {
+    "build": "next build",
+    "dev": "next dev --turbopack",
+    "fix": "biome check ./src --fix && knip --fix --allow-remove-files && eslint ./src --fix",
+    "lint": "biome check ./src && knip && eslint ./src",
+    "start": "next start"
+  },
+  "version": "0.1.0"
 }
diff --git a/apps/wallet-ui/postcss.config.mjs b/apps/wallet-ui/postcss.config.mjs
index cf6b86a905a..1a69fd2a450 100644
--- a/apps/wallet-ui/postcss.config.mjs
+++ b/apps/wallet-ui/postcss.config.mjs
@@ -5,4 +5,4 @@ const config = {
   },
 };
 
-export default config;
\ No newline at end of file
+export default config;
diff --git a/apps/wallet-ui/src/app/[ecosystem]/(authed)/layout.tsx b/apps/wallet-ui/src/app/[ecosystem]/(authed)/layout.tsx
index 8a2f53189b8..654038bf750 100644
--- a/apps/wallet-ui/src/app/[ecosystem]/(authed)/layout.tsx
+++ b/apps/wallet-ui/src/app/[ecosystem]/(authed)/layout.tsx
@@ -1,8 +1,8 @@
+import { resolveScheme } from "thirdweb/storage";
 import ConnectButton from "@/components/ConnectButton";
 import { Image } from "@/components/ui/image";
 import { authedOnly } from "@/lib/auth";
 import { getEcosystemInfo } from "@/lib/ecosystems";
-import { resolveScheme } from "thirdweb/storage";
 import { client } from "../../../lib/client";
 
 export default async function Layout(props: {
@@ -21,11 +21,11 @@ export default async function Layout(props: {
         <div className="container mx-auto flex justify-between">
           <div className="flex items-center gap-2">
             <Image
-              className="h-8 w-8"
-              src={resolveScheme({ uri: ecosystem.imageUrl, client })}
               alt={ecosystem.name}
-              width={100}
+              className="h-8 w-8"
               height={100}
+              src={resolveScheme({ client, uri: ecosystem.imageUrl })}
+              width={100}
             />
             <h1 className="font-semibold text-xl">{ecosystem.name}</h1>
           </div>
diff --git a/apps/wallet-ui/src/app/[ecosystem]/(authed)/wallet/[address]/layout.tsx b/apps/wallet-ui/src/app/[ecosystem]/(authed)/wallet/[address]/layout.tsx
index eb74f42cf64..252d49c6c6a 100644
--- a/apps/wallet-ui/src/app/[ecosystem]/(authed)/wallet/[address]/layout.tsx
+++ b/apps/wallet-ui/src/app/[ecosystem]/(authed)/wallet/[address]/layout.tsx
@@ -1,11 +1,11 @@
+import type { Metadata, ResolvingMetadata } from "next";
+import { resolveName } from "thirdweb/extensions/ens";
+import { shortenAddress } from "thirdweb/utils";
 import { ChainCombobox } from "@/components/ChainCombobox";
 import { getChains } from "@/lib/chains";
 import { client } from "@/lib/client";
 import { getEcosystemInfo } from "@/lib/ecosystems";
 import { SIMPLEHASH_NFT_SUPPORTED_CHAIN_IDS } from "@/util/simplehash";
-import type { Metadata, ResolvingMetadata } from "next";
-import { resolveName } from "thirdweb/extensions/ens";
-import { shortenAddress } from "thirdweb/utils";
 
 export async function generateMetadata(
   props: { params: Promise<{ ecosystem: string; address: string }> },
@@ -19,10 +19,10 @@ export async function generateMetadata(
   const previousImages = parentMetadata.openGraph?.images || [];
 
   return {
-    title: `${ecosystem.name} | ${shortenAddress(params.address)}`,
     openGraph: {
       images: [ecosystem.imageUrl, ...previousImages],
     },
+    title: `${ecosystem.name} | ${shortenAddress(params.address)}`,
   };
 }
 
@@ -35,8 +35,8 @@ export default async function Layout(props: {
   const { children } = props;
 
   const ensPromise = resolveName({
-    client,
     address: params.address,
+    client,
   });
   const thirdwebChainsPromise = getChains();
 
diff --git a/apps/wallet-ui/src/app/[ecosystem]/(authed)/wallet/[address]/page.tsx b/apps/wallet-ui/src/app/[ecosystem]/(authed)/wallet/[address]/page.tsx
index 4049c37790d..9097e388cbd 100644
--- a/apps/wallet-ui/src/app/[ecosystem]/(authed)/wallet/[address]/page.tsx
+++ b/apps/wallet-ui/src/app/[ecosystem]/(authed)/wallet/[address]/page.tsx
@@ -1,6 +1,6 @@
+import { getAddress } from "thirdweb";
 import { AutoConnectWalletConnect } from "@/components/AutoConnectWalletConnect";
 import NftGallery from "@/components/NftGallery";
-import { getAddress } from "thirdweb";
 
 export default async function Page(props: {
   params: Promise<{ address: string }>;
@@ -17,7 +17,7 @@ export default async function Page(props: {
   return (
     <>
       <AutoConnectWalletConnect uri={uri} />
-      <NftGallery owner={getAddress(address)} chainId={Number(chainId)} />
+      <NftGallery chainId={Number(chainId)} owner={getAddress(address)} />
     </>
   );
 }
diff --git a/apps/wallet-ui/src/app/[ecosystem]/layout.tsx b/apps/wallet-ui/src/app/[ecosystem]/layout.tsx
index 94f5d23a745..b3407f5e091 100644
--- a/apps/wallet-ui/src/app/[ecosystem]/layout.tsx
+++ b/apps/wallet-ui/src/app/[ecosystem]/layout.tsx
@@ -1,5 +1,5 @@
-import { getEcosystemInfo } from "@/lib/ecosystems";
 import type { Metadata, ResolvingMetadata } from "next";
+import { getEcosystemInfo } from "@/lib/ecosystems";
 
 export async function generateMetadata(
   props: { params: Promise<{ ecosystem: string }> },
@@ -13,14 +13,14 @@ export async function generateMetadata(
   const previousImages = parentMetadata.openGraph?.images || [];
 
   return {
-    title: ecosystem.name,
     description: `Access your ${ecosystem.name} wallet.`,
-    openGraph: {
-      images: [ecosystem.imageUrl, ...previousImages],
-    },
     icons: {
       icon: ecosystem.imageUrl,
     },
+    openGraph: {
+      images: [ecosystem.imageUrl, ...previousImages],
+    },
+    title: ecosystem.name,
   };
 }
 
diff --git a/apps/wallet-ui/src/app/[ecosystem]/login/layout.tsx b/apps/wallet-ui/src/app/[ecosystem]/login/layout.tsx
index 91aeef71333..7470947345c 100644
--- a/apps/wallet-ui/src/app/[ecosystem]/login/layout.tsx
+++ b/apps/wallet-ui/src/app/[ecosystem]/login/layout.tsx
@@ -4,7 +4,10 @@ import { redirect } from "@/lib/redirect";
 export default async function Layout({
   children,
   params,
-}: { children: React.ReactNode; params: Promise<{ ecosystem: string }> }) {
+}: {
+  children: React.ReactNode;
+  params: Promise<{ ecosystem: string }>;
+}) {
   const { ecosystem } = await params;
 
   const userAddress = await getCurrentUser();
diff --git a/apps/wallet-ui/src/app/[ecosystem]/page.tsx b/apps/wallet-ui/src/app/[ecosystem]/page.tsx
index 8cf3cc56e81..346aca74811 100644
--- a/apps/wallet-ui/src/app/[ecosystem]/page.tsx
+++ b/apps/wallet-ui/src/app/[ecosystem]/page.tsx
@@ -3,7 +3,9 @@ import { redirect } from "@/lib/redirect";
 
 export default async function Page({
   params,
-}: { params: Promise<{ ecosystem: string }> }) {
+}: {
+  params: Promise<{ ecosystem: string }>;
+}) {
   const { ecosystem } = await params;
   const user = await getCurrentUser();
   if (user) {
diff --git a/apps/wallet-ui/src/app/globals.css b/apps/wallet-ui/src/app/globals.css
index 08b23b67e39..ee06ab3b0f0 100644
--- a/apps/wallet-ui/src/app/globals.css
+++ b/apps/wallet-ui/src/app/globals.css
@@ -16,7 +16,6 @@
     /* bg - colorful */
     --primary: 220.9 39.3% 11%;
     --destructive: 0 84.2% 60.2%;
-    --destructive-foreground: 0 0% 98%;
 
     /* Text */
     --foreground: 0 0% 3.9%;
diff --git a/apps/wallet-ui/src/app/layout.tsx b/apps/wallet-ui/src/app/layout.tsx
index 3b0f489cf66..fc4eff27ac1 100644
--- a/apps/wallet-ui/src/app/layout.tsx
+++ b/apps/wallet-ui/src/app/layout.tsx
@@ -1,6 +1,6 @@
+import { Inter } from "next/font/google";
 import Providers from "@/components/Providers";
 import { cn } from "@/lib/utils";
-import { Inter } from "next/font/google";
 import "./globals.css";
 
 const inter = Inter({ subsets: ["latin"] });
diff --git a/apps/wallet-ui/src/app/not-found.tsx b/apps/wallet-ui/src/app/not-found.tsx
index 7e2f2654e1d..3a0c6e2cbd6 100644
--- a/apps/wallet-ui/src/app/not-found.tsx
+++ b/apps/wallet-ui/src/app/not-found.tsx
@@ -3,7 +3,7 @@
 export default function NotFound() {
   return (
     <div className="flex h-screen w-screen items-center justify-center">
-      <img src="./thirdweb.png" alt="thirdweb" className="h-64 w-auto" />
+      <img alt="thirdweb" className="h-64 w-auto" src="./thirdweb.png" />
       <div>
         <h1 className="mb-1 font-bold text-7xl">404</h1>
         <h3 className="text-lg opacity-50">Page Not Found</h3>
diff --git a/apps/wallet-ui/src/components/ChainCombobox.tsx b/apps/wallet-ui/src/components/ChainCombobox.tsx
index 95e29042e95..f4a980528d0 100644
--- a/apps/wallet-ui/src/components/ChainCombobox.tsx
+++ b/apps/wallet-ui/src/components/ChainCombobox.tsx
@@ -1,5 +1,9 @@
 "use client";
 
+import { ChevronsUpDown } from "lucide-react";
+import { useParams, usePathname, useSearchParams } from "next/navigation";
+import React from "react";
+import type { ChainMetadata } from "thirdweb/chains";
 import { Button } from "@/components/ui/button";
 import {
   Command,
@@ -16,10 +20,6 @@ import {
 } from "@/components/ui/popover";
 import { useRouter } from "@/hooks/useRouter";
 import { cn } from "@/lib/utils";
-import { ChevronsUpDown } from "lucide-react";
-import { useParams, usePathname, useSearchParams } from "next/navigation";
-import React from "react";
-import type { ChainMetadata } from "thirdweb/chains";
 import { ChainIcon } from "./ChainIcon";
 
 export function ChainCombobox({ chains }: { chains: ChainMetadata[] }) {
@@ -49,24 +49,25 @@ export function ChainCombobox({ chains }: { chains: ChainMetadata[] }) {
   };
 
   return (
-    <Popover open={open} onOpenChange={setOpen}>
+    <Popover onOpenChange={setOpen} open={open}>
       <PopoverTrigger asChild>
         <Button
-          variant="outline"
-          role="combobox"
           aria-expanded={open}
           className="h-full max-w-[250px] justify-between"
+          // biome-ignore lint/a11y/useSemanticElements: TODO
+          role="combobox"
+          variant="outline"
         >
           {value === "0" ? (
             "Select chain..."
           ) : (
             <div className="flex items-center truncate">
               <ChainIcon
+                className="mr-2 h-4 w-auto"
                 iconUrl={
                   chains.find((chain) => chain.chainId.toString() === value)
                     ?.icon?.url
                 }
-                className="mr-2 h-4 w-auto"
               />
               {value
                 ? chains.find((chain) => chain.chainId.toString() === value)
@@ -92,7 +93,6 @@ export function ChainCombobox({ chains }: { chains: ChainMetadata[] }) {
                       : "opacity-75",
                   )}
                   key={chain.chainId}
-                  value={chain.name}
                   onSelect={(currentValue) => {
                     const chainId =
                       chains.find((chain) => chain.name === currentValue)
@@ -101,10 +101,11 @@ export function ChainCombobox({ chains }: { chains: ChainMetadata[] }) {
                       chainId.toString() === value ? "0" : chainId?.toString(),
                     );
                   }}
+                  value={chain.name}
                 >
                   <ChainIcon
-                    iconUrl={chain.icon?.url}
                     className={cn("mr-3 h-4 w-auto")}
+                    iconUrl={chain.icon?.url}
                   />
                   {chain.name}
                 </CommandItem>
diff --git a/apps/wallet-ui/src/components/ChainIcon.tsx b/apps/wallet-ui/src/components/ChainIcon.tsx
index 6ba308ec1aa..d9a2314c935 100644
--- a/apps/wallet-ui/src/components/ChainIcon.tsx
+++ b/apps/wallet-ui/src/components/ChainIcon.tsx
@@ -1,18 +1,15 @@
 "use client";
-import { Image } from "@/components/ui/image";
-import { client } from "@/lib/client";
 import { useQuery } from "@tanstack/react-query";
 import { resolveScheme } from "thirdweb/storage";
+import { Image } from "@/components/ui/image";
+import { client } from "@/lib/client";
 
 const fallbackChainIcon =
   "data:image/svg+xml;charset=UTF-8,%3csvg width='15' height='14' viewBox='0 0 15 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M7 8.04238e-07C5.1435 8.04238e-07 3.36301 0.737501 2.05025 2.05025C0.7375 3.36301 0 5.1435 0 7C0 7.225 -1.52737e-07 7.445 0.0349998 7.665C0.16385 9.0151 0.68213 10.2988 1.52686 11.3598C2.37158 12.4209 3.50637 13.2137 4.79326 13.642C6.0801 14.0702 7.4637 14.1153 8.7758 13.7719C10.0879 13.4285 11.2719 12.7113 12.184 11.7075C13.0961 10.7038 13.6969 9.4567 13.9135 8.1178C14.1301 6.7789 13.9531 5.406 13.4039 4.16587C12.8548 2.92574 11.9573 1.87184 10.8204 1.13228C9.6835 0.392721 8.3563 -0.000649196 7 8.04238e-07ZM7 1C8.581 1.00137 10.0975 1.62668 11.22 2.74V3.24C9.2438 2.55991 7.0956 2.56872 5.125 3.265C4.96758 3.1116 4.76997 3.00586 4.555 2.96H4.43C4.37 2.75 4.315 2.54 4.27 2.325C4.225 2.11 4.2 1.92 4.175 1.715C5.043 1.24658 6.0137 1.00091 7 1ZM5.5 3.935C7.3158 3.32693 9.2838 3.34984 11.085 4C10.8414 5.2703 10.3094 6.4677 9.53 7.5C9.312 7.4077 9.0707 7.3855 8.8395 7.4366C8.6083 7.4877 8.3988 7.6094 8.24 7.785C8.065 7.685 7.89 7.585 7.74 7.47C6.7307 6.7966 5.8877 5.9023 5.275 4.855C5.374 4.73221 5.4461 4.58996 5.4866 4.43749C5.5271 4.28502 5.5351 4.12575 5.51 3.97L5.5 3.935ZM3.5 2.135C3.5 2.24 3.53 2.35 3.55 2.455C3.595 2.675 3.655 2.89 3.715 3.105C3.52353 3.21838 3.36943 3.38531 3.2717 3.58522C3.17397 3.78513 3.13688 4.00927 3.165 4.23C2.37575 4.7454 1.67078 5.3795 1.075 6.11C1.19455 5.3189 1.47112 4.55966 1.88843 3.87701C2.30575 3.19437 2.85539 2.60208 3.505 2.135H3.5ZM3.5 9.99C3.30481 10.0555 3.13037 10.1714 2.9943 10.3259C2.85822 10.4804 2.76533 10.6681 2.725 10.87H2.405C1.59754 9.9069 1.1146 8.7136 1.025 7.46L1.08 7.365C1.70611 6.3942 2.52463 5.562 3.485 4.92C3.62899 5.0704 3.81094 5.179 4.01162 5.2345C4.2123 5.2899 4.42423 5.2901 4.625 5.235C5.2938 6.3652 6.208 7.3306 7.3 8.06C7.505 8.195 7.715 8.32 7.925 8.44C7.9082 8.6312 7.9391 8.8237 8.015 9C7.1 9.7266 6.0445 10.256 4.915 10.555C4.78401 10.3103 4.57028 10.1201 4.31199 10.0184C4.05369 9.9167 3.76766 9.9102 3.505 10L3.5 9.99ZM7 12.99C5.9831 12.9903 4.98307 12.7304 4.095 12.235L4.235 12.205C4.43397 12.1397 4.61176 12.0222 4.74984 11.8648C4.88792 11.7074 4.98122 11.5158 5.02 11.31C6.2985 10.984 7.4921 10.3872 8.52 9.56C8.7642 9.7027 9.0525 9.75 9.3295 9.6927C9.6064 9.6355 9.8524 9.4778 10.02 9.25C10.7254 9.4334 11.4511 9.5275 12.18 9.53H12.445C11.9626 10.5673 11.1938 11.4451 10.2291 12.0599C9.2643 12.6747 8.144 13.0009 7 13V12.99ZM10.255 8.54C10.2545 8.3304 10.1975 8.1249 10.09 7.945C10.9221 6.8581 11.5012 5.5991 11.785 4.26C12.035 4.37667 12.2817 4.50667 12.525 4.65C13.0749 5.9495 13.1493 7.4012 12.735 8.75C11.9049 8.8142 11.0698 8.7484 10.26 8.555L10.255 8.54Z' fill='%23646D7A'/%3e%3c/svg%3e";
 
-export function ChainIcon(props: {
-  iconUrl?: string;
-  className?: string;
-}) {
+export function ChainIcon(props: { iconUrl?: string; className?: string }) {
   const { data: iconUrl, isLoading } = useQuery({
-    queryKey: ["chain-icon", props.iconUrl],
+    enabled: !!props.iconUrl,
     queryFn: async () => {
       if (!props.iconUrl) return fallbackChainIcon;
       const resolved = resolveScheme({
@@ -20,25 +17,25 @@ export function ChainIcon(props: {
         uri: props.iconUrl,
       });
       const res = await fetch(resolved, {
-        // revalidate every hour
-        next: { revalidate: 60 * 60 },
-        method: "HEAD",
         headers: {
           "x-client-id": process.env.NEXT_PUBLIC_THIRDWEB_CLIENT_ID as string,
         },
+        method: "HEAD",
+        // revalidate every hour
+        next: { revalidate: 60 * 60 },
       }).catch(() => null);
       return res?.status === 200 ? resolved : fallbackChainIcon;
     },
-    enabled: !!props.iconUrl,
+    queryKey: ["chain-icon", props.iconUrl],
   });
 
   return (
     <Image
       alt=""
-      width={100}
+      className={props.className}
       height={100}
       src={isLoading || !iconUrl ? fallbackChainIcon : iconUrl}
-      className={props.className}
+      width={100}
     />
   );
 }
diff --git a/apps/wallet-ui/src/components/ConnectButton.tsx b/apps/wallet-ui/src/components/ConnectButton.tsx
index 7555439bbc5..118a52ed9d6 100644
--- a/apps/wallet-ui/src/components/ConnectButton.tsx
+++ b/apps/wallet-ui/src/components/ConnectButton.tsx
@@ -1,19 +1,21 @@
 "use client";
-import { client } from "@/lib/client";
 import { useTheme } from "next-themes";
 import { ConnectButton as ThirdwebConnectButton } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
+import { client } from "@/lib/client";
 
 export default function ConnectButton({
   ecosystem,
-}: { ecosystem: `ecosystem.${string}` }) {
+}: {
+  ecosystem: `ecosystem.${string}`;
+}) {
   const { theme } = useTheme();
 
   return (
     <ThirdwebConnectButton
-      wallets={[ecosystemWallet(ecosystem)]}
       client={client}
       theme={theme === "light" ? "light" : "dark"}
+      wallets={[ecosystemWallet(ecosystem)]}
     />
   );
 }
diff --git a/apps/wallet-ui/src/components/ConnectEmbed.tsx b/apps/wallet-ui/src/components/ConnectEmbed.tsx
index ff4c04405a3..81bd2a800be 100644
--- a/apps/wallet-ui/src/components/ConnectEmbed.tsx
+++ b/apps/wallet-ui/src/components/ConnectEmbed.tsx
@@ -1,13 +1,13 @@
 "use client";
-import { useRouter } from "@/hooks/useRouter";
-import { generatePayload, getCurrentUser, login, logout } from "@/lib/auth";
-import { client } from "@/lib/client";
 import { useQuery } from "@tanstack/react-query";
-import { useTheme } from "next-themes";
 import { useParams, useSearchParams } from "next/navigation";
+import { useTheme } from "next-themes";
 import type { VerifyLoginPayloadParams } from "thirdweb/auth";
 import { ConnectEmbed as ThirdwebConnectEmbed } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
+import { useRouter } from "@/hooks/useRouter";
+import { generatePayload, getCurrentUser, login, logout } from "@/lib/auth";
+import { client } from "@/lib/client";
 
 export function ConnectEmbed() {
   const { theme } = useTheme();
@@ -16,8 +16,8 @@ export function ConnectEmbed() {
   const searchParams = useSearchParams();
 
   const { data: userAddress } = useQuery({
-    queryKey: ["userAddress"],
     queryFn: getCurrentUser,
+    queryKey: ["userAddress"],
   });
 
   if (userAddress) {
@@ -29,12 +29,7 @@ export function ConnectEmbed() {
 
   return (
     <ThirdwebConnectEmbed
-      theme={theme === "light" ? "light" : "dark"}
-      autoConnect={true}
-      wallets={[ecosystemWallet(`ecosystem.${params.ecosystem}`)]}
-      client={client}
       auth={{
-        getLoginPayload: generatePayload,
         doLogin: async (loginParams: VerifyLoginPayloadParams) => {
           const success = await login(loginParams);
           if (success) {
@@ -44,9 +39,14 @@ export function ConnectEmbed() {
             );
           }
         },
-        isLoggedIn: async () => !!(await getCurrentUser()),
         doLogout: logout,
+        getLoginPayload: generatePayload,
+        isLoggedIn: async () => !!(await getCurrentUser()),
       }}
+      autoConnect={true}
+      client={client}
+      theme={theme === "light" ? "light" : "dark"}
+      wallets={[ecosystemWallet(`ecosystem.${params.ecosystem}`)]}
     />
   );
 }
diff --git a/apps/wallet-ui/src/components/NftCard.tsx b/apps/wallet-ui/src/components/NftCard.tsx
index 9c3fb552e4f..cb0022f5f1e 100644
--- a/apps/wallet-ui/src/components/NftCard.tsx
+++ b/apps/wallet-ui/src/components/NftCard.tsx
@@ -1,6 +1,6 @@
+import { shortenAddress } from "thirdweb/utils";
 import { Image } from "@/components/ui/image";
 import type { Erc721Token } from "@/types/Erc721Token";
-import { shortenAddress } from "thirdweb/utils";
 import { getChain } from "../lib/chains";
 import { ChainIcon } from "./ChainIcon";
 import { NftModal } from "./NftModal";
@@ -14,25 +14,29 @@ export function NftLoadingCard() {
 
 export default async function NftCard({
   data,
-}: { data: Erc721Token; width?: number; height?: number }) {
+}: {
+  data: Erc721Token;
+  width?: number;
+  height?: number;
+}) {
   const chainData = await getChain(data.chainId.toString());
 
   return (
-    <NftModal data={data} chainData={chainData}>
+    <NftModal chainData={chainData} data={data}>
       <Card className="group h-[400px] w-full md:h-[350px] xl:h-[300px]">
         <div className="absolute inset-0 h-full w-full bg-accent object-cover">
           {(data.image_url || data.collection.image_url) && (
             <Image
-              src={data.image_url || data.collection.image_url}
               alt={data.name}
               className="h-full w-full object-cover object-center"
+              src={data.image_url || data.collection.image_url}
             />
           )}
         </div>
         <div className="relative z-10 flex h-full w-full flex-col items-stretch justify-between">
           <div className="-translate-y-6 flex w-full items-center justify-end opacity-0 transition-all group-hover:translate-y-0 group-hover:opacity-100">
             {chainData && (
-              <ChainIcon iconUrl={chainData.icon?.url} className="h-7 w-7" />
+              <ChainIcon className="h-7 w-7" iconUrl={chainData.icon?.url} />
             )}
           </div>
           <div className="flex w-full translate-y-6 items-center justify-end opacity-0 transition-all group-hover:translate-y-0 group-hover:opacity-100">
diff --git a/apps/wallet-ui/src/components/NftGallery.tsx b/apps/wallet-ui/src/components/NftGallery.tsx
index 0e9297d3b10..fe569bf9485 100644
--- a/apps/wallet-ui/src/components/NftGallery.tsx
+++ b/apps/wallet-ui/src/components/NftGallery.tsx
@@ -1,8 +1,8 @@
-import { getErc721Tokens } from "@/lib/assets/erc721";
-import { SIMPLEHASH_NFT_SUPPORTED_CHAIN_IDS } from "@/util/simplehash";
 import type { Address } from "thirdweb";
 import { defineChain } from "thirdweb";
 import { getChainMetadata } from "thirdweb/chains";
+import { getErc721Tokens } from "@/lib/assets/erc721";
+import { SIMPLEHASH_NFT_SUPPORTED_CHAIN_IDS } from "@/util/simplehash";
 import { ChainIcon } from "./ChainIcon";
 import NftCard, { NftLoadingCard } from "./NftCard";
 
@@ -20,11 +20,15 @@ export function NftGalleryLoading() {
 export default async function NftGallery({
   owner,
   chainId,
-}: { owner: Address; chainId?: number; page?: number }) {
+}: {
+  owner: Address;
+  chainId?: number;
+  page?: number;
+}) {
   const erc721TokensResult = await getErc721Tokens({
-    owner,
     chainIds: chainId ? [Number(chainId)] : SIMPLEHASH_NFT_SUPPORTED_CHAIN_IDS,
     limit: 36,
+    owner,
   });
 
   if (erc721TokensResult.tokens.length === 0) {
@@ -35,8 +39,8 @@ export default async function NftGallery({
     <NftGalleryLayout>
       {erc721TokensResult.tokens.map((token) => (
         <NftCard
-          key={token.contractAddress + token.tokenId + token.chainId}
           data={token}
+          key={token.contractAddress + token.tokenId + token.chainId}
         />
       ))}
     </NftGalleryLayout>
@@ -48,10 +52,10 @@ async function NftGalleryEmpty({ chainId }: { chainId?: number }) {
 
   return (
     <div
-      key="empty"
       className="flex h-full min-h-[300px] flex-col items-center justify-center gap-5 rounded-md border text-center opacity-50"
+      key="empty"
     >
-      {chain && <ChainIcon iconUrl={chain.icon?.url} className="h-24 w-24" />}
+      {chain && <ChainIcon className="h-24 w-24" iconUrl={chain.icon?.url} />}
       <div className="font-medium text-xl">No NFTs found</div>
     </div>
   );
@@ -60,8 +64,8 @@ async function NftGalleryEmpty({ chainId }: { chainId?: number }) {
 function NftGalleryLayout({ children }: { children: React.ReactNode }) {
   return (
     <div
-      key="layout"
       className="grid w-full grid-cols-1 justify-between gap-6 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4"
+      key="layout"
     >
       {children}
     </div>
diff --git a/apps/wallet-ui/src/components/NftModal.tsx b/apps/wallet-ui/src/components/NftModal.tsx
index 197c1ad80bb..fd7ef89f002 100644
--- a/apps/wallet-ui/src/components/NftModal.tsx
+++ b/apps/wallet-ui/src/components/NftModal.tsx
@@ -1,12 +1,10 @@
 "use client";
-import { Image } from "@/components/ui/image";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
 import { Loader2, OctagonXIcon } from "lucide-react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
-import { useMemo } from "react";
-import React from "react";
+import React, { useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import type { Address } from "thirdweb";
@@ -17,6 +15,7 @@ import { useActiveAccount } from "thirdweb/react";
 import { shortenAddress } from "thirdweb/utils";
 import invariant from "tiny-invariant";
 import { z } from "zod";
+import { Image } from "@/components/ui/image";
 import { client } from "../lib/client";
 import { revalidate } from "../lib/revalidate";
 import type { Erc721Token } from "../types/Erc721Token";
@@ -56,9 +55,9 @@ export function NftModal({
   const contract = useMemo(
     () =>
       getContract({
-        client,
         address: data.contractAddress,
         chain: defineChain(data.chainId),
+        client,
       }),
     [data.chainId, data.contractAddress],
   );
@@ -77,14 +76,10 @@ export function NftModal({
         tokenId: BigInt(data.tokenId),
       });
 
-      return sendTransaction({ transaction, account });
+      return sendTransaction({ account, transaction });
     },
     onError: (e, { recipient }) => {
       toast.error("Transaction failed", {
-        id: "fail",
-        description: e.message,
-        icon: <OctagonXIcon className="h-4 w-4" />,
-        duration: 5000,
         action: (
           <Button
             onClick={() => {
@@ -95,15 +90,19 @@ export function NftModal({
             Retry
           </Button>
         ),
+        description: e.message,
+        duration: 5000,
+        icon: <OctagonXIcon className="h-4 w-4" />,
+        id: "fail",
       });
     },
   });
 
   const form = useForm<z.infer<typeof TransferFormSchema>>({
-    resolver: zodResolver(TransferFormSchema),
     defaultValues: {
       recipient: "" as Address,
     },
+    resolver: zodResolver(TransferFormSchema),
   });
 
   async function onSubmit(values: z.infer<typeof TransferFormSchema>) {
@@ -115,16 +114,16 @@ export function NftModal({
   }
 
   return (
-    <Dialog open={open} onOpenChange={setIsOpen}>
+    <Dialog onOpenChange={setIsOpen} open={open}>
       <DialogTrigger asChild>
         <button type="button">{children}</button>
       </DialogTrigger>
       <DialogContent className="gap-0 overflow-hidden rounded-xl p-0 sm:w-[425px] md:rounded-xl">
         <div className="relative h-[425px] w-full">
           <Image
-            src={data.image_url || data.collection.image_url}
             alt={data.name}
             className="h-full w-full object-cover object-center"
+            src={data.image_url || data.collection.image_url}
           />
         </div>
 
@@ -137,9 +136,9 @@ export function NftModal({
               <DialogDescription>
                 {chainData?.explorers?.length ? (
                   <Link
-                    target="_blank"
                     className="hover:underline"
                     href={`${chainData.explorers[0].url}/address/${data.contractAddress}`}
+                    target="_blank"
                   >
                     {shortenAddress(data.contractAddress)}
                   </Link>
@@ -156,8 +155,8 @@ export function NftModal({
             <DialogFooter>
               <Form {...form}>
                 <form
-                  onSubmit={form.handleSubmit(onSubmit)}
                   className="flex w-full flex-col space-y-4"
+                  onSubmit={form.handleSubmit(onSubmit)}
                 >
                   <FormField
                     control={form.control}
diff --git a/apps/wallet-ui/src/components/TransactionToastProvider.tsx b/apps/wallet-ui/src/components/TransactionToastProvider.tsx
index 05078fd0dd6..5f34688b43e 100644
--- a/apps/wallet-ui/src/components/TransactionToastProvider.tsx
+++ b/apps/wallet-ui/src/components/TransactionToastProvider.tsx
@@ -4,7 +4,7 @@ import { CheckIcon, Loader2, OctagonXIcon } from "lucide-react";
 import Link from "next/link";
 import { useCallback, useMemo, useSyncExternalStore } from "react";
 import { Toaster, toast } from "sonner";
-import { type Hex, ZERO_ADDRESS, defineChain, waitForReceipt } from "thirdweb";
+import { defineChain, type Hex, waitForReceipt, ZERO_ADDRESS } from "thirdweb";
 import { useActiveAccount } from "thirdweb/react";
 import { getTransactionStore } from "thirdweb/transaction";
 import { shortenHex } from "thirdweb/utils";
@@ -30,42 +30,45 @@ export function TransactionToastProvider() {
     async ({
       transactionHash,
       chainId,
-    }: { transactionHash: Hex; chainId: number }) => {
+    }: {
+      transactionHash: Hex;
+      chainId: number;
+    }) => {
       const chainData = await getChain(chainId.toString());
       toast("Transaction pending", {
-        id: toast(transactionHash),
-        description: shortenHex(transactionHash),
-        duration: Number.POSITIVE_INFINITY,
-        icon: <Loader2 className="h-4 w-4 animate-spin" />,
         action: chainData.explorers?.length ? (
           <Link
-            target="_blank"
             href={`${chainData.explorers[0].url}/tx/${transactionHash}`}
+            target="_blank"
           >
             <Button>View</Button>
           </Link>
         ) : undefined,
+        description: shortenHex(transactionHash),
+        duration: Number.POSITIVE_INFINITY,
+        icon: <Loader2 className="h-4 w-4 animate-spin" />,
+        id: toast(transactionHash),
       });
 
       waitForReceipt({
-        client,
         chain: defineChain(chainId),
+        client,
         transactionHash,
       })
         .then((receipt) => {
           toast.success("Transaction confirmed", {
-            id: toast(transactionHash),
-            description: shortenHex(receipt.transactionHash),
-            duration: 5000,
-            icon: <CheckIcon className="h-4 w-4" />,
             action: chainData.explorers?.length ? (
               <Link
-                target="_blank"
                 href={`${chainData.explorers[0].url}/tx/${receipt.transactionHash}`}
+                target="_blank"
               >
                 <Button>View</Button>
               </Link>
             ) : undefined,
+            description: shortenHex(receipt.transactionHash),
+            duration: 5000,
+            icon: <CheckIcon className="h-4 w-4" />,
+            id: toast(transactionHash),
           });
           setTimeout(() => {
             // Wait a minute for the indexer to catch up
@@ -74,18 +77,18 @@ export function TransactionToastProvider() {
         })
         .catch((e) => {
           toast.error("Transaction failed", {
-            id: toast(transactionHash),
-            description: e.message,
-            icon: <OctagonXIcon className="h-4 w-4" />,
-            duration: 5000,
             action: chainData.explorers?.length ? (
               <Link
-                target="_blank"
                 href={`${chainData.explorers[0].url}/tx/${transactionHash}`}
+                target="_blank"
               >
                 <Button>View</Button>
               </Link>
             ) : undefined,
+            description: e.message,
+            duration: 5000,
+            icon: <OctagonXIcon className="h-4 w-4" />,
+            id: toast(transactionHash),
           });
         });
     },
@@ -93,7 +96,7 @@ export function TransactionToastProvider() {
   );
 
   useQuery({
-    queryKey: [snapshot],
+    enabled: !!account?.address,
     queryFn: async () => {
       if (!account?.address) return false;
       if (snapshot.length === 0) return false;
@@ -104,11 +107,11 @@ export function TransactionToastProvider() {
 
       for (const { transactionHash, chainId } of newTransactions) {
         transactionQueue.add(transactionHash);
-        handleTransactionToast({ transactionHash, chainId });
+        handleTransactionToast({ chainId, transactionHash });
       }
       return true;
     },
-    enabled: !!account?.address,
+    queryKey: [snapshot],
     staleTime: Number.POSITIVE_INFINITY,
   });
 
diff --git a/apps/wallet-ui/src/components/ui/badge.tsx b/apps/wallet-ui/src/components/ui/badge.tsx
index 18a2fcb3a14..3ece19cd785 100644
--- a/apps/wallet-ui/src/components/ui/badge.tsx
+++ b/apps/wallet-ui/src/components/ui/badge.tsx
@@ -1,24 +1,24 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 
 import { cn } from "@/lib/utils";
 
 const badgeVariants = cva(
   "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
   {
+    defaultVariants: {
+      variant: "default",
+    },
     variants: {
       variant: {
         default:
           "border-transparent bg-primary text-primary-foreground hover:bg-primary/80",
-        secondary:
-          "border-primary/30 bg-secondary text-secondary-foreground hover:bg-secondary/80",
         destructive:
           "border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80",
         outline: "text-foreground",
+        secondary:
+          "border-primary/30 bg-secondary text-secondary-foreground hover:bg-secondary/80",
       },
     },
-    defaultVariants: {
-      variant: "default",
-    },
   },
 );
 
diff --git a/apps/wallet-ui/src/components/ui/button.tsx b/apps/wallet-ui/src/components/ui/button.tsx
index 165aa584004..a20d2f85311 100644
--- a/apps/wallet-ui/src/components/ui/button.tsx
+++ b/apps/wallet-ui/src/components/ui/button.tsx
@@ -1,5 +1,5 @@
 import { Slot } from "@radix-ui/react-slot";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -7,29 +7,29 @@ import { cn } from "@/lib/utils";
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
   {
+    defaultVariants: {
+      size: "default",
+      variant: "default",
+    },
     variants: {
+      size: {
+        default: "h-10 px-4 py-2",
+        icon: "h-10 w-10",
+        lg: "h-11 rounded-md px-8",
+        sm: "h-9 rounded-md px-3",
+      },
       variant: {
         default: "bg-primary text-primary-foreground hover:bg-primary/90",
         destructive:
           "bg-destructive text-destructive-foreground hover:bg-destructive/90",
+        ghost: "hover:bg-accent hover:text-accent-foreground",
+        link: "text-primary underline-offset-4 hover:underline",
         outline:
           "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
         secondary:
           "bg-secondary text-secondary-foreground hover:bg-secondary/80",
-        ghost: "hover:bg-accent hover:text-accent-foreground",
-        link: "text-primary underline-offset-4 hover:underline",
-      },
-      size: {
-        default: "h-10 px-4 py-2",
-        sm: "h-9 rounded-md px-3",
-        lg: "h-11 rounded-md px-8",
-        icon: "h-10 w-10",
       },
     },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
-    },
   },
 );
 
@@ -44,7 +44,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
     const Comp = asChild ? Slot : "button";
     return (
       <Comp
-        className={cn(buttonVariants({ variant, size, className }))}
+        className={cn(buttonVariants({ className, size, variant }))}
         ref={ref}
         {...props}
       />
diff --git a/apps/wallet-ui/src/components/ui/card.tsx b/apps/wallet-ui/src/components/ui/card.tsx
index 76cca3f0d3f..dc3642fbdaa 100644
--- a/apps/wallet-ui/src/components/ui/card.tsx
+++ b/apps/wallet-ui/src/components/ui/card.tsx
@@ -3,7 +3,10 @@ import { cn } from "@/lib/utils";
 export default function Card({
   children,
   className,
-}: { children: React.ReactNode; className?: string }) {
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) {
   return (
     <div
       className={cn(
diff --git a/apps/wallet-ui/src/components/ui/command.tsx b/apps/wallet-ui/src/components/ui/command.tsx
index 9ee081db7df..93fc5a3e57c 100644
--- a/apps/wallet-ui/src/components/ui/command.tsx
+++ b/apps/wallet-ui/src/components/ui/command.tsx
@@ -13,11 +13,11 @@ const Command = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CommandPrimitive>
 >(({ className, ...props }, ref) => (
   <CommandPrimitive
-    ref={ref}
     className={cn(
       "flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -44,11 +44,11 @@ const CommandInput = React.forwardRef<
   <div className="flex items-center border-b px-3" cmdk-input-wrapper="">
     <Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
     <CommandPrimitive.Input
-      ref={ref}
       className={cn(
         "flex h-11 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
         className,
       )}
+      ref={ref}
       {...props}
     />
   </div>
@@ -61,8 +61,8 @@ const CommandList = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CommandPrimitive.List>
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.List
-    ref={ref}
     className={cn("max-h-[300px] overflow-y-auto overflow-x-hidden", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -74,8 +74,8 @@ const CommandEmpty = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CommandPrimitive.Empty>
 >((props, ref) => (
   <CommandPrimitive.Empty
-    ref={ref}
     className="py-6 text-center text-sm"
+    ref={ref}
     {...props}
   />
 ));
@@ -87,11 +87,11 @@ const CommandGroup = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CommandPrimitive.Group>
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.Group
-    ref={ref}
     className={cn(
       "overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group-heading]]:text-xs",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -103,8 +103,8 @@ const CommandSeparator = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CommandPrimitive.Separator>
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.Separator
-    ref={ref}
     className={cn("-mx-1 h-px bg-border", className)}
+    ref={ref}
     {...props}
   />
 ));
@@ -115,11 +115,11 @@ const CommandItem = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CommandPrimitive.Item>
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.Item
-    ref={ref}
     className={cn(
       "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled=true]:pointer-events-none data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground data-[disabled=true]:opacity-50",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/wallet-ui/src/components/ui/dialog.tsx b/apps/wallet-ui/src/components/ui/dialog.tsx
index e76b27f1260..ee693a5561e 100644
--- a/apps/wallet-ui/src/components/ui/dialog.tsx
+++ b/apps/wallet-ui/src/components/ui/dialog.tsx
@@ -19,11 +19,11 @@ const DialogOverlay = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Overlay
-    ref={ref}
     className={cn(
       "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80 data-[state=closed]:animate-out data-[state=open]:animate-in",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -36,11 +36,11 @@ const DialogContent = React.forwardRef<
   <DialogPortal>
     <DialogOverlay />
     <DialogPrimitive.Content
-      ref={ref}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-bottom-[48%] sm:data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-bottom-[48%] sm:data-[state=open]:slide-in-from-top-[48%] fixed bottom-0 left-[50%] z-50 grid w-full translate-x-[-50%] gap-4 rounded-t-xl bg-background p-6 shadow-lg duration-200 data-[state=closed]:animate-out data-[state=open]:animate-in sm:top-[50%] sm:bottom-auto sm:translate-y-[-50%] sm:rounded-xl md:max-w-lg",
         className,
       )}
+      ref={ref}
       {...props}
     >
       {children}
@@ -86,11 +86,11 @@ const DialogTitle = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Title
-    ref={ref}
     className={cn(
       "text-left font-semibold text-lg leading-none tracking-tight",
       className,
     )}
+    ref={ref}
     {...props}
   />
 ));
@@ -101,8 +101,8 @@ const DialogDescription = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Description
-    ref={ref}
     className={cn("text-left text-muted-foreground text-sm", className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/wallet-ui/src/components/ui/form.tsx b/apps/wallet-ui/src/components/ui/form.tsx
index 6bd1c59e6c2..a4928b917be 100644
--- a/apps/wallet-ui/src/components/ui/form.tsx
+++ b/apps/wallet-ui/src/components/ui/form.tsx
@@ -53,11 +53,11 @@ const useFormField = () => {
   const { id } = itemContext;
 
   return {
-    id,
-    name: fieldContext.name,
-    formItemId: `${id}-form-item`,
     formDescriptionId: `${id}-form-item-description`,
+    formItemId: `${id}-form-item`,
     formMessageId: `${id}-form-item-message`,
+    id,
+    name: fieldContext.name,
     ...fieldState,
   };
 };
@@ -78,7 +78,7 @@ const FormItem = React.forwardRef<
 
   return (
     <FormItemContext.Provider value={{ id }}>
-      <div ref={ref} className={cn("space-y-2", className)} {...props} />
+      <div className={cn("space-y-2", className)} ref={ref} {...props} />
     </FormItemContext.Provider>
   );
 });
@@ -92,9 +92,9 @@ const FormLabel = React.forwardRef<
 
   return (
     <Label
-      ref={ref}
       className={cn(error && "text-destructive", className)}
       htmlFor={formItemId}
+      ref={ref}
       {...props}
     />
   );
@@ -110,14 +110,14 @@ const FormControl = React.forwardRef<
 
   return (
     <Slot
-      ref={ref}
-      id={formItemId}
       aria-describedby={
         !error
           ? `${formDescriptionId}`
           : `${formDescriptionId} ${formMessageId}`
       }
       aria-invalid={!!error}
+      id={formItemId}
+      ref={ref}
       {...props}
     />
   );
@@ -132,9 +132,9 @@ const FormDescription = React.forwardRef<
 
   return (
     <p
-      ref={ref}
-      id={formDescriptionId}
       className={cn("text-muted-foreground text-sm", className)}
+      id={formDescriptionId}
+      ref={ref}
       {...props}
     />
   );
@@ -154,9 +154,9 @@ const FormMessage = React.forwardRef<
 
   return (
     <p
-      ref={ref}
-      id={formMessageId}
       className={cn("font-medium text-destructive text-sm", className)}
+      id={formMessageId}
+      ref={ref}
       {...props}
     >
       {body}
diff --git a/apps/wallet-ui/src/components/ui/image.tsx b/apps/wallet-ui/src/components/ui/image.tsx
index b180c3e0748..89f43bad400 100644
--- a/apps/wallet-ui/src/components/ui/image.tsx
+++ b/apps/wallet-ui/src/components/ui/image.tsx
@@ -7,7 +7,6 @@ interface ImageProps extends ImgHTMLAttributes<HTMLImageElement> {
 }
 
 export const Image = ({ alt, ...props }: ImageProps) => {
-  // biome-ignore lint/a11y/useAltText: alt is required
   return (
     <img
       alt={alt}
diff --git a/apps/wallet-ui/src/components/ui/input.tsx b/apps/wallet-ui/src/components/ui/input.tsx
index a33119d81d4..3fbf555829e 100644
--- a/apps/wallet-ui/src/components/ui/input.tsx
+++ b/apps/wallet-ui/src/components/ui/input.tsx
@@ -9,12 +9,12 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
   ({ className, type, ...props }, ref) => {
     return (
       <input
-        type={type}
         className={cn(
           "flex h-10 w-full rounded-md border border-input bg-card px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:font-medium file:text-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
           className,
         )}
         ref={ref}
+        type={type}
         {...props}
       />
     );
diff --git a/apps/wallet-ui/src/components/ui/label.tsx b/apps/wallet-ui/src/components/ui/label.tsx
index 663ca2319ef..e00b6b9e3eb 100644
--- a/apps/wallet-ui/src/components/ui/label.tsx
+++ b/apps/wallet-ui/src/components/ui/label.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as LabelPrimitive from "@radix-ui/react-label";
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -16,8 +16,8 @@ const Label = React.forwardRef<
     VariantProps<typeof labelVariants>
 >(({ className, ...props }, ref) => (
   <LabelPrimitive.Root
-    ref={ref}
     className={cn(labelVariants(), className)}
+    ref={ref}
     {...props}
   />
 ));
diff --git a/apps/wallet-ui/src/components/ui/popover.tsx b/apps/wallet-ui/src/components/ui/popover.tsx
index 8b6355dc66b..eb6640e3864 100644
--- a/apps/wallet-ui/src/components/ui/popover.tsx
+++ b/apps/wallet-ui/src/components/ui/popover.tsx
@@ -15,13 +15,13 @@ const PopoverContent = React.forwardRef<
 >(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
   <PopoverPrimitive.Portal>
     <PopoverPrimitive.Content
-      ref={ref}
       align={align}
-      sideOffset={sideOffset}
       className={cn(
         "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=closed]:animate-out data-[state=open]:animate-in",
         className,
       )}
+      ref={ref}
+      sideOffset={sideOffset}
       {...props}
     />
   </PopoverPrimitive.Portal>
diff --git a/apps/wallet-ui/src/components/ui/sonner.tsx b/apps/wallet-ui/src/components/ui/sonner.tsx
index 549cf8413d9..b53c38a3887 100644
--- a/apps/wallet-ui/src/components/ui/sonner.tsx
+++ b/apps/wallet-ui/src/components/ui/sonner.tsx
@@ -10,17 +10,17 @@ const Toaster = ({ ...props }: ToasterProps) => {
 
   return (
     <Sonner
-      theme={theme as ToasterProps["theme"]}
       className="toaster group"
+      theme={theme as ToasterProps["theme"]}
       toastOptions={{
         classNames: {
-          toast:
-            "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",
-          description: "group-[.toast]:text-muted-foreground",
           actionButton:
             "group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",
           cancelButton:
             "group-[.toast]:bg-muted group-[.toast]:text-muted-foreground",
+          description: "group-[.toast]:text-muted-foreground",
+          toast:
+            "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",
         },
       }}
       {...props}
diff --git a/apps/wallet-ui/src/hooks/useRouter.ts b/apps/wallet-ui/src/hooks/useRouter.ts
index 11247271ec7..c74e401ca6f 100644
--- a/apps/wallet-ui/src/hooks/useRouter.ts
+++ b/apps/wallet-ui/src/hooks/useRouter.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-restricted-imports */
 
-import { isMultiTenant } from "@/lib/utils";
 import { useRouter as useNextRouter } from "next/navigation";
+import { isMultiTenant } from "@/lib/utils";
 
 export function useRouter() {
   const router = useNextRouter();
diff --git a/apps/wallet-ui/src/hooks/useWalletConnect.tsx b/apps/wallet-ui/src/hooks/useWalletConnect.tsx
index e064e4111ca..8065f51bd78 100644
--- a/apps/wallet-ui/src/hooks/useWalletConnect.tsx
+++ b/apps/wallet-ui/src/hooks/useWalletConnect.tsx
@@ -1,4 +1,3 @@
-import { client } from "@/lib/client";
 import { useQuery } from "@tanstack/react-query";
 import { CheckIcon } from "lucide-react";
 import { toast } from "sonner";
@@ -7,33 +6,34 @@ import {
   createWalletConnectClient,
   createWalletConnectSession,
 } from "thirdweb/wallets";
+import { client } from "@/lib/client";
 
 export function useWalletConnect({ uri }: { uri?: string }) {
   const wallet = useActiveWallet();
 
   useQuery({
-    queryKey: ["wallet-connect", uri],
+    enabled: !!uri || !!wallet,
     queryFn: async () => {
       if (!wallet || !uri) throw new Error("Unreachable");
       const wcClient = await createWalletConnectClient({
-        wallet: wallet,
         client: client,
+        wallet: wallet,
       });
 
       createWalletConnectSession({
-        walletConnectClient: wcClient,
         uri,
+        walletConnectClient: wcClient,
       });
 
       toast.success("Wallet connected.", {
-        id: "wallet-connect",
-        icon: <CheckIcon className="h-4 w-4" />,
         duration: 5000,
+        icon: <CheckIcon className="h-4 w-4" />,
+        id: "wallet-connect",
       });
 
       return true;
     },
-    enabled: !!uri || !!wallet,
+    queryKey: ["wallet-connect", uri],
   });
 
   return;
diff --git a/apps/wallet-ui/src/lib/assets/erc721.ts b/apps/wallet-ui/src/lib/assets/erc721.ts
index d8c212e6b80..e3060fa9a06 100644
--- a/apps/wallet-ui/src/lib/assets/erc721.ts
+++ b/apps/wallet-ui/src/lib/assets/erc721.ts
@@ -1,7 +1,7 @@
 import "server-only";
+import type { Address } from "thirdweb";
 import type { Erc721Token } from "@/types/Erc721Token";
 import { chainIdToName, nameToChainId } from "@/util/simplehash";
-import type { Address } from "thirdweb";
 
 type GetErc721TokensParams = {
   owner: Address;
@@ -31,11 +31,11 @@ export async function getErc721Tokens({
     .slice(0, -1); // remove trailing comma
 
   const queryParams = new URLSearchParams({
-    wallet_addresses: owner,
-    limit: limit.toString(),
     chains: chainlist,
-    order_by: "floor_price__desc",
     filters: "spam_score__lte=80",
+    limit: limit.toString(),
+    order_by: "floor_price__desc",
+    wallet_addresses: owner,
   });
 
   if (cursor) {
@@ -43,11 +43,11 @@ export async function getErc721Tokens({
   }
 
   const options = {
-    method: "GET",
     headers: {
       accept: "application/json",
       "X-API-KEY": process.env.SIMPLEHASH_API_KEY as string,
     },
+    method: "GET",
     next: {
       cache: "no-store",
       tags: chainIds.map((id) => `transactions-${id}-${owner}`),
@@ -81,13 +81,13 @@ export async function getErc721Tokens({
       // biome-ignore lint/suspicious/noExplicitAny: false
       .map((token: any) => ({
         chainId: nameToChainId(token.chain),
-        contract: token.contract,
         collection: token.collection,
+        contract: token.contract,
         contractAddress: token.contract_address,
-        tokenId: Number(token.token_id),
-        name: token.name,
         description: token.description,
         image_url: token.image_url,
+        name: token.name,
+        tokenId: Number(token.token_id),
       })),
   };
 }
diff --git a/apps/wallet-ui/src/lib/auth.ts b/apps/wallet-ui/src/lib/auth.ts
index 7cc4a513423..fca47a1036a 100644
--- a/apps/wallet-ui/src/lib/auth.ts
+++ b/apps/wallet-ui/src/lib/auth.ts
@@ -1,25 +1,25 @@
 "use server";
 import "server-only";
-import { redirect } from "@/lib/redirect";
 import { cookies } from "next/headers";
 import {
+  createAuth,
   type GenerateLoginPayloadParams,
   type VerifyLoginPayloadParams,
-  createAuth,
 } from "thirdweb/auth";
 import { privateKeyToAccount, randomPrivateKey } from "thirdweb/wallets";
+import { redirect } from "@/lib/redirect";
 import { client } from "./client";
 
 const privateKey = process.env.THIRDWEB_ADMIN_PRIVATE_KEY;
 
 const thirdwebAuth = createAuth({
-  domain: process.env.NEXT_PUBLIC_THIRDWEB_AUTH_DOMAIN || "",
-  client,
   // Fun little hack to make vercel happy at build time
   adminAccount: privateKeyToAccount({
     client,
     privateKey: privateKey || randomPrivateKey(),
   }),
+  client,
+  domain: process.env.NEXT_PUBLIC_THIRDWEB_AUTH_DOMAIN || "",
 });
 
 // We force this to be async so it can be a server action
@@ -33,13 +33,13 @@ export async function login(payload: VerifyLoginPayloadParams) {
       payload: verifiedPayload.payload,
     });
     (await cookies()).set({
-      name: "jwt",
-      value: jwt,
       httpOnly: true,
-      secure: process.env.NODE_ENV !== "development",
-      sameSite: "strict",
       maxAge: 3600,
+      name: "jwt",
       path: "/",
+      sameSite: "strict",
+      secure: process.env.NODE_ENV !== "development",
+      value: jwt,
     });
     return true;
   }
diff --git a/apps/wallet-ui/src/lib/ecosystems.ts b/apps/wallet-ui/src/lib/ecosystems.ts
index 147c741e71f..9c08e7707b1 100644
--- a/apps/wallet-ui/src/lib/ecosystems.ts
+++ b/apps/wallet-ui/src/lib/ecosystems.ts
@@ -1,5 +1,5 @@
-import type { Ecosystem } from "@/types/Ecosystem";
 import { notFound } from "next/navigation";
+import type { Ecosystem } from "@/types/Ecosystem";
 
 export async function getEcosystemInfo(
   ecosystemId: string,
diff --git a/apps/wallet-ui/src/util/simplehash.ts b/apps/wallet-ui/src/util/simplehash.ts
index 79d7a15c819..725904a1588 100644
--- a/apps/wallet-ui/src/util/simplehash.ts
+++ b/apps/wallet-ui/src/util/simplehash.ts
@@ -1,39 +1,39 @@
 const chainIdNameMap = [
-  { id: 1, name: "ethereum", label: "Ethereum" },
-  { id: 137, name: "polygon", label: "Polygon" },
-  { id: 42161, name: "arbitrum", label: "Arbitrum" },
-  { id: 42170, name: "arbitrum-nova", label: "Arbitrum Nova" },
-  { id: 43114, name: "avalanche", label: "Avalanche" },
-  { id: 8453, name: "base", label: "Base" },
-  { id: 81457, name: "blast", label: "Blast" },
-  { id: 42220, name: "celo", label: "Celo" },
-  { id: 6666666666, name: "degen", label: "Degen" },
-  { id: 250, name: "fantom", label: "Fantom" },
-  { id: 100, name: "gnosis", label: "Gnosis" },
-  { id: 71402, name: "godwoken", label: "Godwoken" },
-  { id: 13371, name: "immutable-zkevm", label: "Immutable zkEVM" },
-  { id: 59144, name: "linea", label: "Linea" },
-  { id: 5151706, name: "loot", label: "Loot" },
-  { id: 169, name: "manta", label: "Manta" },
-  { id: 1284, name: "moonbeam", label: "Moonbeam" },
-  { id: 10, name: "optimism", label: "Optimism" },
-  { id: 11297108109, name: "palm", label: "Palm" },
-  { id: 1442, name: "polygon-zkevm", label: "Polygon zkEVM" },
-  { id: 70700, name: "proof-of-play", label: "Proof of Play" },
-  { id: 1380012617, name: "rari", label: "Rari" },
-  { id: 534352, name: "scroll", label: "Scroll" },
-  { id: 1329, name: "sei", label: "Sei" },
-  { id: 660279, name: "xai", label: "Xai" },
-  { id: 324, name: "zksync-era", label: "zkSync Era" },
-  { id: 7777777, name: "zora", label: "Zora" },
-  { id: 61166, name: "treasure", label: "Treasure" },
+  { id: 1, label: "Ethereum", name: "ethereum" },
+  { id: 137, label: "Polygon", name: "polygon" },
+  { id: 42161, label: "Arbitrum", name: "arbitrum" },
+  { id: 42170, label: "Arbitrum Nova", name: "arbitrum-nova" },
+  { id: 43114, label: "Avalanche", name: "avalanche" },
+  { id: 8453, label: "Base", name: "base" },
+  { id: 81457, label: "Blast", name: "blast" },
+  { id: 42220, label: "Celo", name: "celo" },
+  { id: 6666666666, label: "Degen", name: "degen" },
+  { id: 250, label: "Fantom", name: "fantom" },
+  { id: 100, label: "Gnosis", name: "gnosis" },
+  { id: 71402, label: "Godwoken", name: "godwoken" },
+  { id: 13371, label: "Immutable zkEVM", name: "immutable-zkevm" },
+  { id: 59144, label: "Linea", name: "linea" },
+  { id: 5151706, label: "Loot", name: "loot" },
+  { id: 169, label: "Manta", name: "manta" },
+  { id: 1284, label: "Moonbeam", name: "moonbeam" },
+  { id: 10, label: "Optimism", name: "optimism" },
+  { id: 11297108109, label: "Palm", name: "palm" },
+  { id: 1442, label: "Polygon zkEVM", name: "polygon-zkevm" },
+  { id: 70700, label: "Proof of Play", name: "proof-of-play" },
+  { id: 1380012617, label: "Rari", name: "rari" },
+  { id: 534352, label: "Scroll", name: "scroll" },
+  { id: 1329, label: "Sei", name: "sei" },
+  { id: 660279, label: "Xai", name: "xai" },
+  { id: 324, label: "zkSync Era", name: "zksync-era" },
+  { id: 7777777, label: "Zora", name: "zora" },
+  { id: 61166, label: "Treasure", name: "treasure" },
 ];
 
 if (process.env.NEXT_PUBLIC_INCLUDE_TESTNETS) {
   chainIdNameMap.push({
     id: 11155111,
-    name: "ethereum-sepolia",
     label: "Ethereum Sepolia",
+    name: "ethereum-sepolia",
   });
 }
 
diff --git a/apps/wallet-ui/tailwind.config.ts b/apps/wallet-ui/tailwind.config.ts
index c43e55a555c..1e2cc338b30 100644
--- a/apps/wallet-ui/tailwind.config.ts
+++ b/apps/wallet-ui/tailwind.config.ts
@@ -1,8 +1,9 @@
 import type { Config } from "tailwindcss";
 
 const config = {
-  darkMode: ["class"],
   content: ["./src/**/*.{ts,tsx}"],
+  darkMode: ["class"],
+  plugins: [require("tailwindcss-animate")],
   prefix: "",
   theme: {
     container: {
@@ -13,45 +14,49 @@ const config = {
       },
     },
     extend: {
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+      },
+      borderRadius: {
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
+      },
       colors: {
-        border: "hsl(var(--border))",
-        input: "hsl(var(--input))",
-        ring: "hsl(var(--ring))",
-        background: "hsl(var(--background))",
-        foreground: "hsl(var(--foreground))",
-        primary: {
-          DEFAULT: "hsl(var(--primary))",
-          foreground: "hsl(var(--primary-foreground))",
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
         },
-        secondary: {
-          DEFAULT: "hsl(var(--secondary))",
-          foreground: "hsl(var(--secondary-foreground))",
+        background: "hsl(var(--background))",
+        border: "hsl(var(--border))",
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
         },
         destructive: {
           DEFAULT: "hsl(var(--destructive))",
           foreground: "hsl(var(--destructive-foreground))",
         },
+        foreground: "hsl(var(--foreground))",
+        input: "hsl(var(--input))",
         muted: {
           DEFAULT: "hsl(var(--muted))",
           foreground: "hsl(var(--muted-foreground))",
         },
-        accent: {
-          DEFAULT: "hsl(var(--accent))",
-          foreground: "hsl(var(--accent-foreground))",
-        },
         popover: {
           DEFAULT: "hsl(var(--popover))",
           foreground: "hsl(var(--popover-foreground))",
         },
-        card: {
-          DEFAULT: "hsl(var(--card))",
-          foreground: "hsl(var(--card-foreground))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
+        },
+        ring: "hsl(var(--ring))",
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
         },
-      },
-      borderRadius: {
-        lg: "var(--radius)",
-        md: "calc(var(--radius) - 2px)",
-        sm: "calc(var(--radius) - 4px)",
       },
       keyframes: {
         "accordion-down": {
@@ -63,13 +68,8 @@ const config = {
           to: { height: "0" },
         },
       },
-      animation: {
-        "accordion-down": "accordion-down 0.2s ease-out",
-        "accordion-up": "accordion-up 0.2s ease-out",
-      },
     },
   },
-  plugins: [require("tailwindcss-animate")],
 } satisfies Config;
 
 export default config;
diff --git a/apps/wallet-ui/tsconfig.json b/apps/wallet-ui/tsconfig.json
index f48e7ee6f92..1fd36c8ecb0 100644
--- a/apps/wallet-ui/tsconfig.json
+++ b/apps/wallet-ui/tsconfig.json
@@ -1,40 +1,27 @@
 {
   "compilerOptions": {
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
     "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
+    "incremental": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "noEmit": true,
+    "paths": {
+      "@/*": ["./src/*"]
+    },
     "plugins": [
       {
         "name": "next"
       }
     ],
-    "paths": {
-      "@/*": [
-        "./src/*"
-      ]
-    },
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
     "target": "ES2017"
   },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
+  "exclude": ["node_modules"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"]
 }
diff --git a/biome.json b/biome.json
index 86371fcc3be..4ff11ff4f01 100644
--- a/biome.json
+++ b/biome.json
@@ -1,55 +1,42 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
-  "organizeImports": {
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "assist": {
+    "actions": {
+      "source": {
+        "organizeImports": "on",
+        "useSortedAttributes": "on",
+        "useSortedKeys": "on"
+      }
+    },
     "enabled": true
   },
+  "formatter": {
+    "enabled": true,
+    "indentStyle": "space"
+  },
   "linter": {
     "enabled": true,
     "rules": {
-      "recommended": true,
-      "nursery": {
-        "noEnum": "warn",
-        "noDuplicateElseIf": "error",
-        "noDynamicNamespaceImportAccess": "error",
-        "noExportedImports": "error",
-        "noMissingVarFunction": "error",
-        "useSortedClasses": "error"
-      },
       "correctness": {
-        "useHookAtTopLevel": "error",
-        "noNewSymbol": "error",
-        "noUnusedImports": "error",
-        "noUnusedVariables": "error",
-        "useArrayLiterals": "error"
+        "noUnusedImports": "error"
       },
-      "a11y": {
-        "useSemanticElements": "off"
+      "performance": {
+        "noImgElement": "off"
       },
-      "style": {
-        "noRestrictedGlobals": {
-          "options": { "deniedGlobals": ["Buffer"] },
-          "level": "error"
-        },
-        "noUselessElse": "off"
-      }
+      "recommended": true
     }
   },
-  "formatter": {
-    "enabled": true,
-    "indentStyle": "space"
-  },
   "overrides": [
     {
-      "include": [
-        "packages/thirdweb/src/crypto/aes/lib/md5.ts",
-        "packages/thirdweb/src/utils/promise/p-limit.ts",
-        "packages/thirdweb/src/utils/bytecode/cbor-decode.ts",
-        "packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sss.ts",
-        "packages/thirdweb/src/**/__generated__/**"
-      ],
-      "linter": {
-        "enabled": false
-      }
+      "assist": {
+        "actions": {
+          "source": {
+            "useSortedAttributes": "off",
+            "useSortedKeys": "off"
+          }
+        }
+      },
+      "includes": ["packages/**/package.json"]
     }
   ]
 }
diff --git a/package.json b/package.json
index 083ba452993..0e780159c7b 100644
--- a/package.json
+++ b/package.json
@@ -1,45 +1,7 @@
 {
-  "name": "@thirdweb-dev/js",
-  "version": "1.0.0",
-  "main": "index.js",
-  "repository": "https://github.com/thirdweb-dev/js",
   "author": "thirdweb eng <eng@thirdweb.com>",
-  "license": "MIT",
-  "private": true,
-  "engines": {
-    "node": ">=20",
-    "pnpm": ">=9"
-  },
-  "scripts": {
-    "preinstall": "npx only-allow pnpm",
-    "lint": "pnpm dlx sherif@latest -i remark-gfm -i eslint && turbo run lint",
-    "storybook:react": "turbo run storybook --filter=./packages/*",
-    "prefix": "pnpm dlx sherif@latest -i remark-gfm -i eslint --fix",
-    "fix": "turbo run fix",
-    "wallet-ui": "turbo run dev --filter=./apps/wallet-ui --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/engine",
-    "wallet-ui:build": "turbo run build --filter=./apps/wallet-ui --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/engine",
-    "playground": "turbo run dev --filter=./apps/playground-web --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/engine",
-    "playground:build": "turbo run build --filter=./apps/playground-web",
-    "portal": "turbo run dev --filter=./apps/portal --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/engine",
-    "portal:build": "turbo run build --filter=./apps/portal",
-    "dashboard": "turbo run dev --filter=./apps/dashboard --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/vault-sdk --filter=./packages/engine",
-    "dashboard:build": "turbo run build --filter=./apps/dashboard",
-    "build": "turbo run build --filter=./packages/*",
-    "build:release": "turbo run build --filter=./packages/* --force",
-    "test": "turbo run test --filter=./packages/*",
-    "e2e": "turbo run e2e --filter=./packages/*",
-    "bench": "turbo run bench",
-    "typedoc": "turbo run typedoc",
-    "changeset": "changeset",
-    "version-packages": "changeset version",
-    "release": "turbo run update-version && pnpm build:release && changeset publish",
-    "version-packages:nightly": "node scripts/pre-nightly.mjs && changeset version --snapshot nightly",
-    "release:nightly": "turbo run update-version && pnpm build && changeset publish --tag nightly",
-    "hotlink-init": "node ./scripts/hotlink/hotlink-init.mjs",
-    "hotlink-revert": "node ./scripts/hotlink/hotlink-revert.mjs"
-  },
   "devDependencies": {
-    "@biomejs/biome": "1.9.4",
+    "@biomejs/biome": "2.0.0",
     "@changesets/changelog-github": "0.5.1",
     "@changesets/cli": "2.29.4",
     "@manypkg/get-packages": "2.2.2",
@@ -47,36 +9,74 @@
     "turbo": "2.5.4",
     "typescript": "5.8.3"
   },
+  "engines": {
+    "node": ">=20",
+    "pnpm": ">=9"
+  },
+  "license": "MIT",
+  "main": "index.js",
+  "name": "@thirdweb-dev/js",
+  "packageManager": "pnpm@9.11.0",
   "pnpm": {
     "overrides": {
-      "got@<11.8.5": ">=11.8.5",
-      "glob-parent@<5.1.2": ">=5.1.2",
-      "nth-check@<2.0.1": ">=2.0.1",
-      "socket.io-parser@>=4.0.4 <4.2.3": ">=4.2.3",
-      "fast-xml-parser@<=4.2.4": ">4.2.4",
+      "@ethereumjs/util@<9.0.0": ">=9.0.0",
+      "@grpc/grpc-js@<1.10.9": "1.10.9",
       "@openzeppelin/contracts@>=4.3.0 <4.9.1": ">=4.9.1",
       "@openzeppelin/contracts@>=4.7.0 <4.9.2": ">=4.9.2",
-      "xml2js@<0.5.0": ">=0.5.0",
+      "axios@<0.28.0": ">=0.28.0",
+      "axios@<1.7.4": "^1.7.4",
+      "braces@<3.0.3": "3.0.3",
+      "cookie@<0.7.0": "^0.7.0",
+      "cross-spawn@<6.0.6": "^6.0.6",
+      "elliptic@<6.5.7": "^6.5.7",
+      "elliptic@<6.6.0": "^6.6.0",
       "engine.io@>=5.1.0 <6.4.2": ">=6.4.2",
-      "semver@<7.5.2": ">=7.5.2",
+      "fast-xml-parser@<=4.2.4": ">4.2.4",
+      "glob-parent@<5.1.2": ">=5.1.2",
+      "got@<11.8.5": ">=11.8.5",
       "json5@<1.0.2": ">=1.0.2",
+      "nth-check@<2.0.1": ">=2.0.1",
       "protobufjs@>=6.10.0 <7.2.4": ">=7.2.4",
+      "semver@<7.5.2": ">=7.5.2",
+      "send@<0.19.0": "^0.19.0",
+      "smol-toml@<1.3.1": "^1.3.1",
+      "socket.io-parser@>=4.0.4 <4.2.3": ">=4.2.3",
       "tough-cookie@<4.1.3": ">=4.1.3",
-      "@ethereumjs/util@<9.0.0": ">=9.0.0",
-      "axios@<0.28.0": ">=0.28.0",
-      "@grpc/grpc-js@<1.10.9": "1.10.9",
-      "braces@<3.0.3": "3.0.3",
-      "ws@>=8.0.0 <8.17.1": "8.17.1",
-      "ws@>=7.0.0 <7.5.10": "7.5.10",
       "ws@>=6.0.0 <6.2.3": "6.2.3",
-      "axios@<1.7.4": "^1.7.4",
-      "send@<0.19.0": "^0.19.0",
-      "elliptic@<6.5.7": "^6.5.7",
-      "cookie@<0.7.0": "^0.7.0",
-      "elliptic@<6.6.0": "^6.6.0",
-      "cross-spawn@<6.0.6": "^6.0.6",
-      "smol-toml@<1.3.1": "^1.3.1"
+      "ws@>=7.0.0 <7.5.10": "7.5.10",
+      "ws@>=8.0.0 <8.17.1": "8.17.1",
+      "xml2js@<0.5.0": ">=0.5.0"
     }
   },
-  "packageManager": "pnpm@9.11.0"
+  "private": true,
+  "repository": "https://github.com/thirdweb-dev/js",
+  "scripts": {
+    "bench": "turbo run bench",
+    "build": "turbo run build --filter=./packages/*",
+    "build:release": "turbo run build --filter=./packages/* --force",
+    "changeset": "changeset",
+    "dashboard": "turbo run dev --filter=./apps/dashboard --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/vault-sdk --filter=./packages/engine",
+    "dashboard:build": "turbo run build --filter=./apps/dashboard",
+    "e2e": "turbo run e2e --filter=./packages/*",
+    "fix": "turbo run fix",
+    "hotlink-init": "node ./scripts/hotlink/hotlink-init.mjs",
+    "hotlink-revert": "node ./scripts/hotlink/hotlink-revert.mjs",
+    "lint": "pnpm dlx sherif@latest -i remark-gfm -i eslint && turbo run lint",
+    "playground": "turbo run dev --filter=./apps/playground-web --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/engine",
+    "playground:build": "turbo run build --filter=./apps/playground-web",
+    "portal": "turbo run dev --filter=./apps/portal --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/engine",
+    "portal:build": "turbo run build --filter=./apps/portal",
+    "prefix": "pnpm dlx sherif@latest -i remark-gfm -i eslint --fix",
+    "preinstall": "npx only-allow pnpm",
+    "release": "turbo run update-version && pnpm build:release && changeset publish",
+    "release:nightly": "turbo run update-version && pnpm build && changeset publish --tag nightly",
+    "storybook:react": "turbo run storybook --filter=./packages/*",
+    "test": "turbo run test --filter=./packages/*",
+    "typedoc": "turbo run typedoc",
+    "version-packages": "changeset version",
+    "version-packages:nightly": "node scripts/pre-nightly.mjs && changeset version --snapshot nightly",
+    "wallet-ui": "turbo run dev --filter=./apps/wallet-ui --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/engine",
+    "wallet-ui:build": "turbo run build --filter=./apps/wallet-ui --filter=./packages/thirdweb --filter=./packages/insight --filter=./packages/engine"
+  },
+  "version": "1.0.0"
 }
diff --git a/packages/engine/biome.json b/packages/engine/biome.json
index aad1b5fabcf..780bbdcd1af 100644
--- a/packages/engine/biome.json
+++ b/packages/engine/biome.json
@@ -1,4 +1,4 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
-  "extends": ["../../biome.json"]
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
 }
diff --git a/packages/engine/openapi-ts.config.ts b/packages/engine/openapi-ts.config.ts
index e1873082942..385d7ac7cb9 100644
--- a/packages/engine/openapi-ts.config.ts
+++ b/packages/engine/openapi-ts.config.ts
@@ -2,6 +2,6 @@ import { defineConfig } from "@hey-api/openapi-ts";
 
 export default defineConfig({
   input: "https://engine.thirdweb.com/openapi",
-  output: { path: "src/client", lint: "biome", format: "biome" },
+  output: { format: "biome", lint: "biome", path: "src/client" },
   plugins: ["@hey-api/client-fetch"],
 });
diff --git a/packages/engine/package.json b/packages/engine/package.json
index f23caf7ad18..288e7f0507d 100644
--- a/packages/engine/package.json
+++ b/packages/engine/package.json
@@ -1,60 +1,61 @@
 {
-  "name": "@thirdweb-dev/engine",
-  "version": "3.0.3",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/thirdweb-dev/js.git#main"
-  },
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/thirdweb-dev/js/issues"
-  },
-  "author": "thirdweb eng <eng@thirdweb.com>",
-  "type": "module",
-  "main": "./dist/cjs/exports/thirdweb.js",
-  "module": "./dist/esm/exports/thirdweb.js",
-  "types": "./dist/types/exports/thirdweb.d.ts",
-  "typings": "./dist/types/exports/thirdweb.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/types/exports/thirdweb.d.ts",
-      "import": "./dist/esm/exports/thirdweb.js",
-      "default": "./dist/cjs/exports/thirdweb.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "dist/*",
-    "src/*"
-  ],
-  "dependencies": {
-    "@hey-api/client-fetch": "0.10.0"
-  },
-  "devDependencies": {
-    "@hey-api/openapi-ts": "0.72.1",
-    "rimraf": "6.0.1",
-    "tslib": "^2.8.1"
-  },
-  "peerDependencies": {
-    "typescript": ">=5.0.4"
-  },
-  "peerDependenciesMeta": {
-    "typescript": {
-      "optional": true
-    }
-  },
-  "scripts": {
-    "format": "biome format ./src --write",
-    "lint": "biome check ./src",
-    "fix": "biome check ./src --fix",
-    "build": "pnpm clean && pnpm build:cjs && pnpm build:esm && pnpm build:types",
-    "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
-    "build:esm": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
-    "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
-    "clean": "rimraf dist",
-    "build:generate": "openapi-ts && pnpm format"
-  },
-  "engines": {
-    "node": ">=18"
-  }
+	"name": "@thirdweb-dev/engine",
+	"version": "3.0.3",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/thirdweb-dev/js.git#main"
+	},
+	"license": "Apache-2.0",
+	"bugs": {
+		"url": "https://github.com/thirdweb-dev/js/issues"
+	},
+	"author": "thirdweb eng <eng@thirdweb.com>",
+	"type": "module",
+	"main": "./dist/cjs/exports/thirdweb.js",
+	"module": "./dist/esm/exports/thirdweb.js",
+	"types": "./dist/types/exports/thirdweb.d.ts",
+	"typings": "./dist/types/exports/thirdweb.d.ts",
+	"exports": {
+		".": {
+			"types": "./dist/types/exports/thirdweb.d.ts",
+			"import": "./dist/esm/exports/thirdweb.js",
+			"default": "./dist/cjs/exports/thirdweb.js"
+		},
+		"./package.json": "./package.json"
+	},
+	"files": [
+		"dist/*",
+		"src/*"
+	],
+	"dependencies": {
+		"@hey-api/client-fetch": "0.10.0"
+	},
+	"devDependencies": {
+		"@biomejs/biome": "2.0.0",
+		"@hey-api/openapi-ts": "0.72.1",
+		"rimraf": "6.0.1",
+		"tslib": "^2.8.1"
+	},
+	"peerDependencies": {
+		"typescript": ">=5.0.4"
+	},
+	"peerDependenciesMeta": {
+		"typescript": {
+			"optional": true
+		}
+	},
+	"scripts": {
+		"format": "biome format ./src --write",
+		"lint": "biome check ./src",
+		"fix": "biome check ./src --fix",
+		"build": "pnpm clean && pnpm build:cjs && pnpm build:esm && pnpm build:types",
+		"build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
+		"build:esm": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
+		"build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
+		"clean": "rimraf dist",
+		"build:generate": "openapi-ts && pnpm format"
+	},
+	"engines": {
+		"node": ">=18"
+	}
 }
diff --git a/packages/engine/src/client/client.gen.ts b/packages/engine/src/client/client.gen.ts
index 3dca3c31b50..2a1dfa5d7a9 100644
--- a/packages/engine/src/client/client.gen.ts
+++ b/packages/engine/src/client/client.gen.ts
@@ -2,9 +2,9 @@
 
 import {
   type Config,
-  type ClientOptions as DefaultClientOptions,
   createClient,
   createConfig,
+  type ClientOptions as DefaultClientOptions,
 } from "@hey-api/client-fetch";
 import type { ClientOptions } from "./types.gen.js";
 
diff --git a/packages/engine/src/client/index.ts b/packages/engine/src/client/index.ts
index 65f317569c2..58ea430d932 100644
--- a/packages/engine/src/client/index.ts
+++ b/packages/engine/src/client/index.ts
@@ -1,3 +1,4 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from "./types.gen.js";
+
 export * from "./sdk.gen.js";
+export * from "./types.gen.js";
diff --git a/packages/engine/src/configure.ts b/packages/engine/src/configure.ts
index ea14537a5fc..edc7316dc82 100644
--- a/packages/engine/src/configure.ts
+++ b/packages/engine/src/configure.ts
@@ -10,11 +10,11 @@ export function configure(
   options: EngineClientOptions & { override?: Config },
 ) {
   client.setConfig({
+    bodySerializer: stringify,
     headers: {
       ...(options.clientId && { "x-client-id": options.clientId }),
       ...(options.secretKey && { "x-secret-key": options.secretKey }),
     },
-    bodySerializer: stringify,
     ...(options.override ?? {}),
   });
 }
diff --git a/packages/engine/src/exports/thirdweb.ts b/packages/engine/src/exports/thirdweb.ts
index 1165d980d84..6bce866bcc7 100644
--- a/packages/engine/src/exports/thirdweb.ts
+++ b/packages/engine/src/exports/thirdweb.ts
@@ -1,3 +1,3 @@
-export * from "../client/index.js";
 export type { CreateClientConfig } from "../client/client.gen.js";
+export * from "../client/index.js";
 export { configure, type EngineClientOptions } from "../configure.js";
diff --git a/packages/engine/tsconfig.base.json b/packages/engine/tsconfig.base.json
index 2b519cac7ea..1dfe1e7b2ce 100644
--- a/packages/engine/tsconfig.base.json
+++ b/packages/engine/tsconfig.base.json
@@ -1,47 +1,47 @@
 {
   // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
-  "include": [],
   "compilerOptions": {
     // Incremental builds
     // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
-    "incremental": false,
-
-    // Type checking
-    "strict": true,
-    "useDefineForClassFields": true, // Not enabled by default in `strict` mode unless we bump `target` to ES2022.
-    "noFallthroughCasesInSwitch": true, // Not enabled by default in `strict` mode.
-    "noImplicitReturns": true, // Not enabled by default in `strict` mode.
-    "useUnknownInCatchVariables": true, // TODO: This would normally be enabled in `strict` mode but would require some adjustments to the codebase.
-    "noImplicitOverride": true, // Not enabled by default in `strict` mode.
-    "noUnusedLocals": true, // Not enabled by default in `strict` mode.
-    "noUnusedParameters": true, // Not enabled by default in `strict` mode.
-    "exactOptionalPropertyTypes": false, // Not enabled by default in `strict` mode.
-    "noUncheckedIndexedAccess": true, // Not enabled by default in `strict` mode.
-
-    // JavaScript support
     "allowJs": false,
+    "allowSyntheticDefaultImports": true,
     "checkJs": false,
 
     // Interop constraints
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
+    "exactOptionalPropertyTypes": false,
     "forceConsistentCasingInFileNames": true,
-    "verbatimModuleSyntax": true,
-    "importHelpers": true, // This is only used for build validation. Since we do not have `tslib` installed, this will fail if we accidentally make use of anything that'd require injection of helpers.
+    "importHelpers": true,
+    // Incremental builds
+    // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
+    "incremental": false,
 
-    // Language and environment
-    "moduleResolution": "NodeNext",
-    "module": "NodeNext",
-    "target": "ES2021", // Setting this to `ES2021` enables native support for `Node v16+`: https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping.
+    // jsx for "/react" portion
+    "jsx": "react-jsx",
     "lib": [
       "ES2022", // By using ES2022 we get access to the `.cause` property on `Error` instances.
       "DOM" // We are adding `DOM` here to get the `fetch`, etc. types. This should be removed once these types are available via DefinitelyTyped.
     ],
+    "module": "NodeNext",
+
+    // Language and environment
+    "moduleResolution": "NodeNext",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
 
     // Skip type checking for node modules
     "skipLibCheck": true,
 
-    // jsx for "/react" portion
-    "jsx": "react-jsx"
-  }
+    // Type checking
+    "strict": true,
+    "target": "ES2021",
+    "useDefineForClassFields": true,
+    "useUnknownInCatchVariables": true,
+    "verbatimModuleSyntax": true
+  },
+  "include": []
 }
diff --git a/packages/engine/tsconfig.build.json b/packages/engine/tsconfig.build.json
index 3ae3943df87..63325457c67 100644
--- a/packages/engine/tsconfig.build.json
+++ b/packages/engine/tsconfig.build.json
@@ -1,6 +1,9 @@
 {
-  "extends": "./tsconfig.base.json",
-  "include": ["src"],
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "rootDir": "./src",
+    "sourceMap": true
+  },
   "exclude": [
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
@@ -8,9 +11,6 @@
     "src/**/*.bench.ts",
     "src/**/*.macro.ts"
   ],
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.base.json",
+  "include": ["src"]
 }
diff --git a/packages/engine/tsconfig.json b/packages/engine/tsconfig.json
index f8b525d0c97..ce67da4c61d 100644
--- a/packages/engine/tsconfig.json
+++ b/packages/engine/tsconfig.json
@@ -1,13 +1,12 @@
 {
   // This configuration is used for local development and type checking.
-  "extends": "./tsconfig.base.json",
-  "include": ["src", "test"],
-  "exclude": [],
-  // "references": [{ "path": "./scripts/tsconfig.json" }],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
       "~test/*": ["./test/src/*"]
     }
-  }
+  },
+  "exclude": [],
+  "extends": "./tsconfig.base.json",
+  "include": ["src", "test"]
 }
diff --git a/packages/insight/biome.json b/packages/insight/biome.json
index 7520ee9c4d2..780bbdcd1af 100644
--- a/packages/insight/biome.json
+++ b/packages/insight/biome.json
@@ -1,7 +1,4 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
-  "extends": ["../../biome.json"],
-  "files": {
-    "ignore": ["src/client/**"]
-  }
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
 }
diff --git a/packages/insight/package.json b/packages/insight/package.json
index 5ff7f6d9cbc..fa5bc54bb20 100644
--- a/packages/insight/package.json
+++ b/packages/insight/package.json
@@ -31,6 +31,7 @@
     "@hey-api/client-fetch": "0.10.0"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.0",
     "@hey-api/openapi-ts": "0.72.1",
     "rimraf": "6.0.1",
     "tslib": "^2.8.1"
diff --git a/packages/insight/src/client/client.gen.ts b/packages/insight/src/client/client.gen.ts
index 109987a0539..0da7c63fefd 100644
--- a/packages/insight/src/client/client.gen.ts
+++ b/packages/insight/src/client/client.gen.ts
@@ -2,9 +2,9 @@
 
 import {
   type Config,
-  type ClientOptions as DefaultClientOptions,
   createClient,
   createConfig,
+  type ClientOptions as DefaultClientOptions,
 } from "@hey-api/client-fetch";
 import type { ClientOptions } from "./types.gen.js";
 
diff --git a/packages/insight/src/client/index.ts b/packages/insight/src/client/index.ts
index 65f317569c2..58ea430d932 100644
--- a/packages/insight/src/client/index.ts
+++ b/packages/insight/src/client/index.ts
@@ -1,3 +1,4 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from "./types.gen.js";
+
 export * from "./sdk.gen.js";
+export * from "./types.gen.js";
diff --git a/packages/insight/src/client/types.gen.ts b/packages/insight/src/client/types.gen.ts
index 4f159bf880d..f69d267481d 100644
--- a/packages/insight/src/client/types.gen.ts
+++ b/packages/insight/src/client/types.gen.ts
@@ -1,4742 +1,4868 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 export type GetV1WebhooksData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * The webhook ID to request the data for
-         */
-        webhook_id?: string;
-    };
-    url: '/v1/webhooks';
+  body?: never;
+  path?: never;
+  query?: {
+    /**
+     * The webhook ID to request the data for
+     */
+    webhook_id?: string;
+  };
+  url: "/v1/webhooks";
 };
 
 export type GetV1WebhooksErrors = {
-    /**
-     * Bad request
-     */
-    400: {
-        error: string;
-    };
-    /**
-     * Internal server error
-     */
-    500: {
-        error: string;
-    };
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
 export type GetV1WebhooksError = GetV1WebhooksErrors[keyof GetV1WebhooksErrors];
 
 export type GetV1WebhooksResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: Array<{
-            id: string;
-            team_id: string;
-            project_id: string;
-            name: string | null;
-            webhook_url: string;
-            webhook_secret: string;
-            filters: string | number | boolean | unknown | {
-                [key: string]: unknown;
-            } | Array<unknown>;
-            suspended_at: string | null;
-            suspended_reason: string | null;
-            disabled: boolean;
-            created_at: string;
-            updated_at: string | null;
-        }>;
-    };
+  /**
+   * Successful response
+   */
+  200: {
+    data: Array<{
+      id: string;
+      team_id: string;
+      project_id: string;
+      name: string | null;
+      webhook_url: string;
+      webhook_secret: string;
+      filters:
+        | string
+        | number
+        | boolean
+        | unknown
+        | {
+            [key: string]: unknown;
+          }
+        | Array<unknown>;
+      suspended_at: string | null;
+      suspended_reason: string | null;
+      disabled: boolean;
+      created_at: string;
+      updated_at: string | null;
+    }>;
+  };
 };
 
-export type GetV1WebhooksResponse = GetV1WebhooksResponses[keyof GetV1WebhooksResponses];
+export type GetV1WebhooksResponse =
+  GetV1WebhooksResponses[keyof GetV1WebhooksResponses];
 
 export type PostV1WebhooksData = {
-    body?: {
-        webhook_url: string;
-        filters: {
-            'v1.events'?: {
-                chain_ids?: Array<string>;
-                addresses?: Array<string>;
-                signatures?: Array<{
-                    sig_hash: string;
-                    abi?: string;
-                    params?: {
-                        [key: string]: string | number;
-                    };
-                }>;
-            };
-            'v1.transactions'?: {
-                chain_ids?: Array<string>;
-                from_addresses?: Array<string>;
-                to_addresses?: Array<string>;
-                signatures?: Array<{
-                    sig_hash: string;
-                    abi?: string;
-                    params?: {
-                        [key: string]: string | number;
-                    };
-                }>;
-            };
-        };
-        name?: string;
+  body?: {
+    webhook_url: string;
+    filters: {
+      "v1.events"?: {
+        chain_ids?: Array<string>;
+        addresses?: Array<string>;
+        signatures?: Array<{
+          sig_hash: string;
+          abi?: string;
+          params?: {
+            [key: string]: string | number;
+          };
+        }>;
+      };
+      "v1.transactions"?: {
+        chain_ids?: Array<string>;
+        from_addresses?: Array<string>;
+        to_addresses?: Array<string>;
+        signatures?: Array<{
+          sig_hash: string;
+          abi?: string;
+          params?: {
+            [key: string]: string | number;
+          };
+        }>;
+      };
     };
-    path?: never;
-    query?: never;
-    url: '/v1/webhooks';
+    name?: string;
+  };
+  path?: never;
+  query?: never;
+  url: "/v1/webhooks";
 };
 
 export type PostV1WebhooksErrors = {
-    /**
-     * Bad request
-     */
-    400: {
-        error: string;
-    };
-    /**
-     * Forbidden
-     */
-    403: {
-        error: string;
-    };
-    /**
-     * Internal server error
-     */
-    500: {
-        error: string;
-    };
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Forbidden
+   */
+  403: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type PostV1WebhooksError = PostV1WebhooksErrors[keyof PostV1WebhooksErrors];
+export type PostV1WebhooksError =
+  PostV1WebhooksErrors[keyof PostV1WebhooksErrors];
 
 export type PostV1WebhooksResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: {
-            id: string;
-            team_id: string;
-            project_id: string;
-            name: string | null;
-            webhook_url: string;
-            webhook_secret: string;
-            filters: string | number | boolean | unknown | {
-                [key: string]: unknown;
-            } | Array<unknown>;
-            suspended_at: string | null;
-            suspended_reason: string | null;
-            disabled: boolean;
-            created_at: string;
-            updated_at: string | null;
-        };
-    };
+  /**
+   * Successful response
+   */
+  200: {
+    data: {
+      id: string;
+      team_id: string;
+      project_id: string;
+      name: string | null;
+      webhook_url: string;
+      webhook_secret: string;
+      filters:
+        | string
+        | number
+        | boolean
+        | unknown
+        | {
+            [key: string]: unknown;
+          }
+        | Array<unknown>;
+      suspended_at: string | null;
+      suspended_reason: string | null;
+      disabled: boolean;
+      created_at: string;
+      updated_at: string | null;
+    };
+  };
 };
 
-export type PostV1WebhooksResponse = PostV1WebhooksResponses[keyof PostV1WebhooksResponses];
+export type PostV1WebhooksResponse =
+  PostV1WebhooksResponses[keyof PostV1WebhooksResponses];
 
 export type DeleteV1WebhooksByWebhookIdData = {
-    body?: never;
-    path: {
-        webhook_id: string;
-    };
-    query?: never;
-    url: '/v1/webhooks/{webhook_id}';
+  body?: never;
+  path: {
+    webhook_id: string;
+  };
+  query?: never;
+  url: "/v1/webhooks/{webhook_id}";
 };
 
 export type DeleteV1WebhooksByWebhookIdErrors = {
-    /**
-     * Bad request
-     */
-    400: {
-        error: string;
-    };
-    /**
-     * Webhook not found
-     */
-    404: {
-        error: string;
-    };
-    /**
-     * Internal server error
-     */
-    500: {
-        error: string;
-    };
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Webhook not found
+   */
+  404: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type DeleteV1WebhooksByWebhookIdError = DeleteV1WebhooksByWebhookIdErrors[keyof DeleteV1WebhooksByWebhookIdErrors];
+export type DeleteV1WebhooksByWebhookIdError =
+  DeleteV1WebhooksByWebhookIdErrors[keyof DeleteV1WebhooksByWebhookIdErrors];
 
 export type DeleteV1WebhooksByWebhookIdResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: {
-            id: string;
-            team_id: string;
-            project_id: string;
-            name: string | null;
-            webhook_url: string;
-            webhook_secret: string;
-            filters: string | number | boolean | unknown | {
-                [key: string]: unknown;
-            } | Array<unknown>;
-            suspended_at: string | null;
-            suspended_reason: string | null;
-            disabled: boolean;
-            created_at: string;
-            updated_at: string | null;
-        };
-    };
+  /**
+   * Successful response
+   */
+  200: {
+    data: {
+      id: string;
+      team_id: string;
+      project_id: string;
+      name: string | null;
+      webhook_url: string;
+      webhook_secret: string;
+      filters:
+        | string
+        | number
+        | boolean
+        | unknown
+        | {
+            [key: string]: unknown;
+          }
+        | Array<unknown>;
+      suspended_at: string | null;
+      suspended_reason: string | null;
+      disabled: boolean;
+      created_at: string;
+      updated_at: string | null;
+    };
+  };
 };
 
-export type DeleteV1WebhooksByWebhookIdResponse = DeleteV1WebhooksByWebhookIdResponses[keyof DeleteV1WebhooksByWebhookIdResponses];
+export type DeleteV1WebhooksByWebhookIdResponse =
+  DeleteV1WebhooksByWebhookIdResponses[keyof DeleteV1WebhooksByWebhookIdResponses];
 
 export type PatchV1WebhooksByWebhookIdData = {
-    body?: {
-        webhook_url?: string;
-        filters?: {
-            'v1.events'?: {
-                chain_ids?: Array<string>;
-                addresses?: Array<string>;
-                signatures?: Array<{
-                    sig_hash: string;
-                    abi?: string;
-                    params?: {
-                        [key: string]: string | number;
-                    };
-                }>;
-            };
-            'v1.transactions'?: {
-                chain_ids?: Array<string>;
-                from_addresses?: Array<string>;
-                to_addresses?: Array<string>;
-                signatures?: Array<{
-                    sig_hash: string;
-                    abi?: string;
-                    params?: {
-                        [key: string]: string | number;
-                    };
-                }>;
-            };
-        };
-        name?: string;
-        disabled?: boolean;
-    };
-    path: {
-        webhook_id: string;
-    };
-    query?: never;
-    url: '/v1/webhooks/{webhook_id}';
+  body?: {
+    webhook_url?: string;
+    filters?: {
+      "v1.events"?: {
+        chain_ids?: Array<string>;
+        addresses?: Array<string>;
+        signatures?: Array<{
+          sig_hash: string;
+          abi?: string;
+          params?: {
+            [key: string]: string | number;
+          };
+        }>;
+      };
+      "v1.transactions"?: {
+        chain_ids?: Array<string>;
+        from_addresses?: Array<string>;
+        to_addresses?: Array<string>;
+        signatures?: Array<{
+          sig_hash: string;
+          abi?: string;
+          params?: {
+            [key: string]: string | number;
+          };
+        }>;
+      };
+    };
+    name?: string;
+    disabled?: boolean;
+  };
+  path: {
+    webhook_id: string;
+  };
+  query?: never;
+  url: "/v1/webhooks/{webhook_id}";
 };
 
 export type PatchV1WebhooksByWebhookIdErrors = {
-    /**
-     * Bad request
-     */
-    400: {
-        error: string;
-    };
-    /**
-     * Webhook not found
-     */
-    404: {
-        error: string;
-    };
-    /**
-     * Internal server error
-     */
-    500: {
-        error: string;
-    };
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Webhook not found
+   */
+  404: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type PatchV1WebhooksByWebhookIdError = PatchV1WebhooksByWebhookIdErrors[keyof PatchV1WebhooksByWebhookIdErrors];
+export type PatchV1WebhooksByWebhookIdError =
+  PatchV1WebhooksByWebhookIdErrors[keyof PatchV1WebhooksByWebhookIdErrors];
 
 export type PatchV1WebhooksByWebhookIdResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: {
-            id: string;
-            team_id: string;
-            project_id: string;
-            name: string | null;
-            webhook_url: string;
-            webhook_secret: string;
-            filters: string | number | boolean | unknown | {
-                [key: string]: unknown;
-            } | Array<unknown>;
-            suspended_at: string | null;
-            suspended_reason: string | null;
-            disabled: boolean;
-            created_at: string;
-            updated_at: string | null;
-        };
-    };
+  /**
+   * Successful response
+   */
+  200: {
+    data: {
+      id: string;
+      team_id: string;
+      project_id: string;
+      name: string | null;
+      webhook_url: string;
+      webhook_secret: string;
+      filters:
+        | string
+        | number
+        | boolean
+        | unknown
+        | {
+            [key: string]: unknown;
+          }
+        | Array<unknown>;
+      suspended_at: string | null;
+      suspended_reason: string | null;
+      disabled: boolean;
+      created_at: string;
+      updated_at: string | null;
+    };
+  };
 };
 
-export type PatchV1WebhooksByWebhookIdResponse = PatchV1WebhooksByWebhookIdResponses[keyof PatchV1WebhooksByWebhookIdResponses];
+export type PatchV1WebhooksByWebhookIdResponse =
+  PatchV1WebhooksByWebhookIdResponses[keyof PatchV1WebhooksByWebhookIdResponses];
 
 export type PostV1WebhooksTestData = {
-    body?: {
-        webhook_url: string;
-        type?: 'event' | 'transaction';
-    };
-    path?: never;
-    query?: never;
-    url: '/v1/webhooks/test';
+  body?: {
+    webhook_url: string;
+    type?: "event" | "transaction";
+  };
+  path?: never;
+  query?: never;
+  url: "/v1/webhooks/test";
 };
 
 export type PostV1WebhooksTestErrors = {
-    /**
-     * Bad request
-     */
-    400: {
-        error: string;
-    };
-    /**
-     * Rate limit exceeded
-     */
-    429: {
-        error: string;
-    };
-    /**
-     * Internal server error
-     */
-    500: {
-        error: string;
-    };
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Rate limit exceeded
+   */
+  429: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type PostV1WebhooksTestError = PostV1WebhooksTestErrors[keyof PostV1WebhooksTestErrors];
+export type PostV1WebhooksTestError =
+  PostV1WebhooksTestErrors[keyof PostV1WebhooksTestErrors];
 
 export type PostV1WebhooksTestResponses = {
-    /**
-     * Test event sent successfully
-     */
-    200: {
-        success: boolean;
-    };
+  /**
+   * Test event sent successfully
+   */
+  200: {
+    success: boolean;
+  };
 };
 
-export type PostV1WebhooksTestResponse = PostV1WebhooksTestResponses[keyof PostV1WebhooksTestResponses];
+export type PostV1WebhooksTestResponse =
+  PostV1WebhooksTestResponses[keyof PostV1WebhooksTestResponses];
 
 export type GetV1EventsData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Filter by block number
-         */
-        filter_block_number?: number | null;
-        /**
-         * Filter by block number greater than or equal to
-         */
-        filter_block_number_gte?: number | null;
-        /**
-         * Filter by block number greater than
-         */
-        filter_block_number_gt?: number | null;
-        /**
-         * Filter by block number less than or equal to
-         */
-        filter_block_number_lte?: number | null;
-        /**
-         * Filter by block number less than
-         */
-        filter_block_number_lt?: number | null;
-        /**
-         * Filter by block hash
-         */
-        filter_block_hash?: string;
-        /**
-         * Filter by block timestamp
-         */
-        filter_block_timestamp?: number | null;
-        /**
-         * Filter by block timestamp greater than or equal to
-         */
-        filter_block_timestamp_gte?: number | null;
-        /**
-         * Filter by block timestamp greater than
-         */
-        filter_block_timestamp_gt?: number | null;
-        /**
-         * Filter by block timestamp less than or equal to
-         */
-        filter_block_timestamp_lte?: number | null;
-        /**
-         * Filter by block timestamp less than
-         */
-        filter_block_timestamp_lt?: number | null;
-        /**
-         * Field to sort results by
-         */
-        sort_by?: 'block_number' | string;
-        /**
-         * Sort order (asc or desc)
-         */
-        sort_order?: 'asc' | 'desc';
-        /**
-         * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
-         */
-        group_by?: unknown;
-        /**
-         * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
-         */
-        aggregate?: unknown;
-        /**
-         * Filter by transaction index
-         */
-        filter_transaction_index?: number | null;
-        /**
-         * Filter by transaction index greater than or equal to
-         */
-        filter_transaction_index_gte?: number | null;
-        /**
-         * Filter by transaction index greater than
-         */
-        filter_transaction_index_gt?: number | null;
-        /**
-         * Filter by transaction index less than or equal to
-         */
-        filter_transaction_index_lte?: number | null;
-        /**
-         * Filter by transaction index less than
-         */
-        filter_transaction_index_lt?: number | null;
-        /**
-         * Enable ABI decoding of the transactions/events data
-         */
-        decode?: boolean | null;
-        /**
-         * Filter by transaction hash
-         */
-        filter_transaction_hash?: string;
-        /**
-         * Filter by log index
-         */
-        filter_log_index?: number | null;
-        /**
-         * Filter by log index greater than or equal to
-         */
-        filter_log_index_gte?: number | null;
-        /**
-         * Filter by log index greater than
-         */
-        filter_log_index_gt?: number | null;
-        /**
-         * Filter by log index less than or equal to
-         */
-        filter_log_index_lte?: number | null;
-        /**
-         * Filter by log index less than
-         */
-        filter_log_index_lt?: number | null;
-        /**
-         * Filter by topic 1
-         */
-        filter_topic_1?: string;
-        /**
-         * Filter by topic 2
-         */
-        filter_topic_2?: string;
-        /**
-         * Filter by topic 3
-         */
-        filter_topic_3?: string;
-        /**
-         * Filter by topic 0
-         */
-        filter_topic_0?: string;
-        /**
-         * Filter by address
-         */
-        filter_address?: string;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-    };
-    url: '/v1/events';
-};
-
-export type GetV1EventsErrors = {
+  body?: never;
+  path?: never;
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * Filter by block number
+     */
+    filter_block_number?: number | null;
+    /**
+     * Filter by block number greater than or equal to
+     */
+    filter_block_number_gte?: number | null;
+    /**
+     * Filter by block number greater than
+     */
+    filter_block_number_gt?: number | null;
+    /**
+     * Filter by block number less than or equal to
+     */
+    filter_block_number_lte?: number | null;
+    /**
+     * Filter by block number less than
+     */
+    filter_block_number_lt?: number | null;
+    /**
+     * Filter by block hash
+     */
+    filter_block_hash?: string;
+    /**
+     * Filter by block timestamp
+     */
+    filter_block_timestamp?: number | null;
+    /**
+     * Filter by block timestamp greater than or equal to
+     */
+    filter_block_timestamp_gte?: number | null;
+    /**
+     * Filter by block timestamp greater than
+     */
+    filter_block_timestamp_gt?: number | null;
+    /**
+     * Filter by block timestamp less than or equal to
+     */
+    filter_block_timestamp_lte?: number | null;
+    /**
+     * Filter by block timestamp less than
+     */
+    filter_block_timestamp_lt?: number | null;
+    /**
+     * Field to sort results by
+     */
+    sort_by?: "block_number" | string;
+    /**
+     * Sort order (asc or desc)
+     */
+    sort_order?: "asc" | "desc";
+    /**
+     * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
+     */
+    group_by?: unknown;
+    /**
+     * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
+     */
+    aggregate?: unknown;
+    /**
+     * Filter by transaction index
+     */
+    filter_transaction_index?: number | null;
+    /**
+     * Filter by transaction index greater than or equal to
+     */
+    filter_transaction_index_gte?: number | null;
+    /**
+     * Filter by transaction index greater than
+     */
+    filter_transaction_index_gt?: number | null;
+    /**
+     * Filter by transaction index less than or equal to
+     */
+    filter_transaction_index_lte?: number | null;
+    /**
+     * Filter by transaction index less than
+     */
+    filter_transaction_index_lt?: number | null;
+    /**
+     * Enable ABI decoding of the transactions/events data
+     */
+    decode?: boolean | null;
+    /**
+     * Filter by transaction hash
+     */
+    filter_transaction_hash?: string;
+    /**
+     * Filter by log index
+     */
+    filter_log_index?: number | null;
+    /**
+     * Filter by log index greater than or equal to
+     */
+    filter_log_index_gte?: number | null;
+    /**
+     * Filter by log index greater than
+     */
+    filter_log_index_gt?: number | null;
+    /**
+     * Filter by log index less than or equal to
+     */
+    filter_log_index_lte?: number | null;
+    /**
+     * Filter by log index less than
+     */
+    filter_log_index_lt?: number | null;
+    /**
+     * Filter by topic 1
+     */
+    filter_topic_1?: string;
+    /**
+     * Filter by topic 2
+     */
+    filter_topic_2?: string;
+    /**
+     * Filter by topic 3
+     */
+    filter_topic_3?: string;
+    /**
+     * Filter by topic 0
+     */
+    filter_topic_0?: string;
+    /**
+     * Filter by address
+     */
+    filter_address?: string;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+  };
+  url: "/v1/events";
+};
+
+export type GetV1EventsErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
 export type GetV1EventsError = GetV1EventsErrors[keyof GetV1EventsErrors];
 
 export type GetV1EventsResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data?: Array<{
-            chain_id: number;
-            block_number: string;
-            block_hash: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            transaction_index: number;
-            log_index: number;
-            address: string;
-            data: string;
-            topics: Array<string>;
-            decoded?: {
-                name: string;
-                signature: string;
-                indexed_params: {
-                    [key: string]: unknown;
-                };
-                non_indexed_params: {
-                    [key: string]: unknown;
-                };
-            };
-        }>;
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
+  /**
+   * Successful response
+   */
+  200: {
+    data?: Array<{
+      chain_id: number;
+      block_number: string;
+      block_hash: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      transaction_index: number;
+      log_index: number;
+      address: string;
+      data: string;
+      topics: Array<string>;
+      decoded?: {
+        name: string;
+        signature: string;
+        indexed_params: {
+          [key: string]: unknown;
         };
-    };
+        non_indexed_params: {
+          [key: string]: unknown;
+        };
+      };
+    }>;
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
 };
 
-export type GetV1EventsResponse = GetV1EventsResponses[keyof GetV1EventsResponses];
+export type GetV1EventsResponse =
+  GetV1EventsResponses[keyof GetV1EventsResponses];
 
 export type GetV1EventsByContractAddressData = {
-    body?: never;
-    path: {
-        contractAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Filter by block number
-         */
-        filter_block_number?: number | null;
-        /**
-         * Filter by block number greater than or equal to
-         */
-        filter_block_number_gte?: number | null;
-        /**
-         * Filter by block number greater than
-         */
-        filter_block_number_gt?: number | null;
-        /**
-         * Filter by block number less than or equal to
-         */
-        filter_block_number_lte?: number | null;
-        /**
-         * Filter by block number less than
-         */
-        filter_block_number_lt?: number | null;
-        /**
-         * Filter by block hash
-         */
-        filter_block_hash?: string;
-        /**
-         * Filter by block timestamp
-         */
-        filter_block_timestamp?: number | null;
-        /**
-         * Filter by block timestamp greater than or equal to
-         */
-        filter_block_timestamp_gte?: number | null;
-        /**
-         * Filter by block timestamp greater than
-         */
-        filter_block_timestamp_gt?: number | null;
-        /**
-         * Filter by block timestamp less than or equal to
-         */
-        filter_block_timestamp_lte?: number | null;
-        /**
-         * Filter by block timestamp less than
-         */
-        filter_block_timestamp_lt?: number | null;
-        /**
-         * Field to sort results by
-         */
-        sort_by?: 'block_number' | string;
-        /**
-         * Sort order (asc or desc)
-         */
-        sort_order?: 'asc' | 'desc';
-        /**
-         * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
-         */
-        group_by?: unknown;
-        /**
-         * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
-         */
-        aggregate?: unknown;
-        /**
-         * Filter by transaction index
-         */
-        filter_transaction_index?: number | null;
-        /**
-         * Filter by transaction index greater than or equal to
-         */
-        filter_transaction_index_gte?: number | null;
-        /**
-         * Filter by transaction index greater than
-         */
-        filter_transaction_index_gt?: number | null;
-        /**
-         * Filter by transaction index less than or equal to
-         */
-        filter_transaction_index_lte?: number | null;
-        /**
-         * Filter by transaction index less than
-         */
-        filter_transaction_index_lt?: number | null;
-        /**
-         * Enable ABI decoding of the transactions/events data
-         */
-        decode?: boolean | null;
-        /**
-         * Filter by transaction hash
-         */
-        filter_transaction_hash?: string;
-        /**
-         * Filter by log index
-         */
-        filter_log_index?: number | null;
-        /**
-         * Filter by log index greater than or equal to
-         */
-        filter_log_index_gte?: number | null;
-        /**
-         * Filter by log index greater than
-         */
-        filter_log_index_gt?: number | null;
-        /**
-         * Filter by log index less than or equal to
-         */
-        filter_log_index_lte?: number | null;
-        /**
-         * Filter by log index less than
-         */
-        filter_log_index_lt?: number | null;
-        /**
-         * Filter by topic 1
-         */
-        filter_topic_1?: string;
-        /**
-         * Filter by topic 2
-         */
-        filter_topic_2?: string;
-        /**
-         * Filter by topic 3
-         */
-        filter_topic_3?: string;
-        /**
-         * Filter by topic 0
-         */
-        filter_topic_0?: string;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-    };
-    url: '/v1/events/{contractAddress}';
-};
-
-export type GetV1EventsByContractAddressErrors = {
+  body?: never;
+  path: {
+    contractAddress: string;
+  };
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * Filter by block number
+     */
+    filter_block_number?: number | null;
+    /**
+     * Filter by block number greater than or equal to
+     */
+    filter_block_number_gte?: number | null;
+    /**
+     * Filter by block number greater than
+     */
+    filter_block_number_gt?: number | null;
+    /**
+     * Filter by block number less than or equal to
+     */
+    filter_block_number_lte?: number | null;
+    /**
+     * Filter by block number less than
+     */
+    filter_block_number_lt?: number | null;
+    /**
+     * Filter by block hash
+     */
+    filter_block_hash?: string;
+    /**
+     * Filter by block timestamp
+     */
+    filter_block_timestamp?: number | null;
+    /**
+     * Filter by block timestamp greater than or equal to
+     */
+    filter_block_timestamp_gte?: number | null;
+    /**
+     * Filter by block timestamp greater than
+     */
+    filter_block_timestamp_gt?: number | null;
+    /**
+     * Filter by block timestamp less than or equal to
+     */
+    filter_block_timestamp_lte?: number | null;
+    /**
+     * Filter by block timestamp less than
+     */
+    filter_block_timestamp_lt?: number | null;
+    /**
+     * Field to sort results by
+     */
+    sort_by?: "block_number" | string;
+    /**
+     * Sort order (asc or desc)
+     */
+    sort_order?: "asc" | "desc";
+    /**
+     * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
+     */
+    group_by?: unknown;
+    /**
+     * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
+     */
+    aggregate?: unknown;
+    /**
+     * Filter by transaction index
+     */
+    filter_transaction_index?: number | null;
+    /**
+     * Filter by transaction index greater than or equal to
+     */
+    filter_transaction_index_gte?: number | null;
+    /**
+     * Filter by transaction index greater than
+     */
+    filter_transaction_index_gt?: number | null;
+    /**
+     * Filter by transaction index less than or equal to
+     */
+    filter_transaction_index_lte?: number | null;
+    /**
+     * Filter by transaction index less than
+     */
+    filter_transaction_index_lt?: number | null;
+    /**
+     * Enable ABI decoding of the transactions/events data
+     */
+    decode?: boolean | null;
+    /**
+     * Filter by transaction hash
+     */
+    filter_transaction_hash?: string;
+    /**
+     * Filter by log index
+     */
+    filter_log_index?: number | null;
+    /**
+     * Filter by log index greater than or equal to
+     */
+    filter_log_index_gte?: number | null;
+    /**
+     * Filter by log index greater than
+     */
+    filter_log_index_gt?: number | null;
+    /**
+     * Filter by log index less than or equal to
+     */
+    filter_log_index_lte?: number | null;
+    /**
+     * Filter by log index less than
+     */
+    filter_log_index_lt?: number | null;
+    /**
+     * Filter by topic 1
+     */
+    filter_topic_1?: string;
+    /**
+     * Filter by topic 2
+     */
+    filter_topic_2?: string;
+    /**
+     * Filter by topic 3
+     */
+    filter_topic_3?: string;
+    /**
+     * Filter by topic 0
+     */
+    filter_topic_0?: string;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+  };
+  url: "/v1/events/{contractAddress}";
+};
+
+export type GetV1EventsByContractAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1EventsByContractAddressError = GetV1EventsByContractAddressErrors[keyof GetV1EventsByContractAddressErrors];
+export type GetV1EventsByContractAddressError =
+  GetV1EventsByContractAddressErrors[keyof GetV1EventsByContractAddressErrors];
 
 export type GetV1EventsByContractAddressResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data?: Array<{
-            chain_id: number;
-            block_number: string;
-            block_hash: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            transaction_index: number;
-            log_index: number;
-            address: string;
-            data: string;
-            topics: Array<string>;
-            decoded?: {
-                name: string;
-                signature: string;
-                indexed_params: {
-                    [key: string]: unknown;
-                };
-                non_indexed_params: {
-                    [key: string]: unknown;
-                };
-            };
-        }>;
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
+  /**
+   * Successful response
+   */
+  200: {
+    data?: Array<{
+      chain_id: number;
+      block_number: string;
+      block_hash: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      transaction_index: number;
+      log_index: number;
+      address: string;
+      data: string;
+      topics: Array<string>;
+      decoded?: {
+        name: string;
+        signature: string;
+        indexed_params: {
+          [key: string]: unknown;
         };
-    };
+        non_indexed_params: {
+          [key: string]: unknown;
+        };
+      };
+    }>;
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
 };
 
-export type GetV1EventsByContractAddressResponse = GetV1EventsByContractAddressResponses[keyof GetV1EventsByContractAddressResponses];
+export type GetV1EventsByContractAddressResponse =
+  GetV1EventsByContractAddressResponses[keyof GetV1EventsByContractAddressResponses];
 
 export type GetV1EventsByContractAddressBySignatureData = {
-    body?: never;
-    path: {
-        contractAddress: string;
-        signature: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Filter by block number
-         */
-        filter_block_number?: number | null;
-        /**
-         * Filter by block number greater than or equal to
-         */
-        filter_block_number_gte?: number | null;
-        /**
-         * Filter by block number greater than
-         */
-        filter_block_number_gt?: number | null;
-        /**
-         * Filter by block number less than or equal to
-         */
-        filter_block_number_lte?: number | null;
-        /**
-         * Filter by block number less than
-         */
-        filter_block_number_lt?: number | null;
-        /**
-         * Filter by block hash
-         */
-        filter_block_hash?: string;
-        /**
-         * Filter by block timestamp
-         */
-        filter_block_timestamp?: number | null;
-        /**
-         * Filter by block timestamp greater than or equal to
-         */
-        filter_block_timestamp_gte?: number | null;
-        /**
-         * Filter by block timestamp greater than
-         */
-        filter_block_timestamp_gt?: number | null;
-        /**
-         * Filter by block timestamp less than or equal to
-         */
-        filter_block_timestamp_lte?: number | null;
-        /**
-         * Filter by block timestamp less than
-         */
-        filter_block_timestamp_lt?: number | null;
-        /**
-         * Field to sort results by
-         */
-        sort_by?: 'block_number' | string;
-        /**
-         * Sort order (asc or desc)
-         */
-        sort_order?: 'asc' | 'desc';
-        /**
-         * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
-         */
-        group_by?: unknown;
-        /**
-         * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
-         */
-        aggregate?: unknown;
-        /**
-         * Filter by transaction index
-         */
-        filter_transaction_index?: number | null;
-        /**
-         * Filter by transaction index greater than or equal to
-         */
-        filter_transaction_index_gte?: number | null;
-        /**
-         * Filter by transaction index greater than
-         */
-        filter_transaction_index_gt?: number | null;
-        /**
-         * Filter by transaction index less than or equal to
-         */
-        filter_transaction_index_lte?: number | null;
-        /**
-         * Filter by transaction index less than
-         */
-        filter_transaction_index_lt?: number | null;
-        /**
-         * Enable ABI decoding of the transactions/events data
-         */
-        decode?: boolean | null;
-        /**
-         * Filter by transaction hash
-         */
-        filter_transaction_hash?: string;
-        /**
-         * Filter by log index
-         */
-        filter_log_index?: number | null;
-        /**
-         * Filter by log index greater than or equal to
-         */
-        filter_log_index_gte?: number | null;
-        /**
-         * Filter by log index greater than
-         */
-        filter_log_index_gt?: number | null;
-        /**
-         * Filter by log index less than or equal to
-         */
-        filter_log_index_lte?: number | null;
-        /**
-         * Filter by log index less than
-         */
-        filter_log_index_lt?: number | null;
-        /**
-         * Filter by topic 1
-         */
-        filter_topic_1?: string;
-        /**
-         * Filter by topic 2
-         */
-        filter_topic_2?: string;
-        /**
-         * Filter by topic 3
-         */
-        filter_topic_3?: string;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-    };
-    url: '/v1/events/{contractAddress}/{signature}';
-};
-
-export type GetV1EventsByContractAddressBySignatureErrors = {
+  body?: never;
+  path: {
+    contractAddress: string;
+    signature: string;
+  };
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
-};
-
-export type GetV1EventsByContractAddressBySignatureError = GetV1EventsByContractAddressBySignatureErrors[keyof GetV1EventsByContractAddressBySignatureErrors];
-
-export type GetV1EventsByContractAddressBySignatureResponses = {
+    chain_id?: Array<number>;
     /**
-     * Successful response
-     */
-    200: {
-        data?: Array<{
-            chain_id: number;
-            block_number: string;
-            block_hash: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            transaction_index: number;
-            log_index: number;
-            address: string;
-            data: string;
-            topics: Array<string>;
-            decoded?: {
-                name: string;
-                signature: string;
-                indexed_params: {
-                    [key: string]: unknown;
-                };
-                non_indexed_params: {
-                    [key: string]: unknown;
-                };
-            };
-        }>;
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
-        };
-    };
-};
-
-export type GetV1EventsByContractAddressBySignatureResponse = GetV1EventsByContractAddressBySignatureResponses[keyof GetV1EventsByContractAddressBySignatureResponses];
-
-export type GetV1TransactionsData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Filter by block number
-         */
-        filter_block_number?: number | null;
-        /**
-         * Filter by block number greater than or equal to
-         */
-        filter_block_number_gte?: number | null;
-        /**
-         * Filter by block number greater than
-         */
-        filter_block_number_gt?: number | null;
-        /**
-         * Filter by block number less than or equal to
-         */
-        filter_block_number_lte?: number | null;
-        /**
-         * Filter by block number less than
-         */
-        filter_block_number_lt?: number | null;
-        /**
-         * Filter by block hash
-         */
-        filter_block_hash?: string;
-        /**
-         * Filter by block timestamp
-         */
-        filter_block_timestamp?: number | null;
-        /**
-         * Filter by block timestamp greater than or equal to
-         */
-        filter_block_timestamp_gte?: number | null;
-        /**
-         * Filter by block timestamp greater than
-         */
-        filter_block_timestamp_gt?: number | null;
-        /**
-         * Filter by block timestamp less than or equal to
-         */
-        filter_block_timestamp_lte?: number | null;
-        /**
-         * Filter by block timestamp less than
-         */
-        filter_block_timestamp_lt?: number | null;
-        /**
-         * Field to sort results by
-         */
-        sort_by?: 'block_number' | string;
-        /**
-         * Sort order (asc or desc)
-         */
-        sort_order?: 'asc' | 'desc';
-        /**
-         * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
-         */
-        group_by?: unknown;
-        /**
-         * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
-         */
-        aggregate?: unknown;
-        /**
-         * Filter by transaction index
-         */
-        filter_transaction_index?: number | null;
-        /**
-         * Filter by transaction index greater than or equal to
-         */
-        filter_transaction_index_gte?: number | null;
-        /**
-         * Filter by transaction index greater than
-         */
-        filter_transaction_index_gt?: number | null;
-        /**
-         * Filter by transaction index less than or equal to
-         */
-        filter_transaction_index_lte?: number | null;
-        /**
-         * Filter by transaction index less than
-         */
-        filter_transaction_index_lt?: number | null;
-        /**
-         * Enable ABI decoding of the transactions/events data
-         */
-        decode?: boolean | null;
-        /**
-         * Filter by transaction hash
-         */
-        filter_hash?: string;
-        /**
-         * Filter by from address
-         */
-        filter_from_address?: string;
-        /**
-         * Filter by value
-         */
-        filter_value?: number | null;
-        /**
-         * Filter by value greater than or equal to
-         */
-        filter_value_gte?: number | null;
-        /**
-         * Filter by value greater than
-         */
-        filter_value_gt?: number | null;
-        /**
-         * Filter by value less than or equal to
-         */
-        filter_value_lte?: number | null;
-        /**
-         * Filter by value less than
-         */
-        filter_value_lt?: number | null;
-        /**
-         * Filter by gas price
-         */
-        filter_gas_price?: number | null;
-        /**
-         * Filter by gas price greater than or equal to
-         */
-        filter_gas_price_gte?: number | null;
-        /**
-         * Filter by gas price greater than
-         */
-        filter_gas_price_gt?: number | null;
-        /**
-         * Filter by gas price less than or equal to
-         */
-        filter_gas_price_lte?: number | null;
-        /**
-         * Filter by gas price less than
-         */
-        filter_gas_price_lt?: number | null;
-        /**
-         * Filter by gas
-         */
-        filter_gas?: number | null;
-        /**
-         * Filter by gas greater than or equal to
-         */
-        filter_gas_gte?: number | null;
-        /**
-         * Filter by gas greater than
-         */
-        filter_gas_gt?: number | null;
-        /**
-         * Filter by gas less than or equal to
-         */
-        filter_gas_lte?: number | null;
-        /**
-         * Filter by gas less than
-         */
-        filter_gas_lt?: number | null;
-        /**
-         * Filter by function selector
-         */
-        filter_function_selector?: string;
-        /**
-         * Filter by to address
-         */
-        filter_to_address?: string;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-    };
-    url: '/v1/transactions';
+     * Filter by block number
+     */
+    filter_block_number?: number | null;
+    /**
+     * Filter by block number greater than or equal to
+     */
+    filter_block_number_gte?: number | null;
+    /**
+     * Filter by block number greater than
+     */
+    filter_block_number_gt?: number | null;
+    /**
+     * Filter by block number less than or equal to
+     */
+    filter_block_number_lte?: number | null;
+    /**
+     * Filter by block number less than
+     */
+    filter_block_number_lt?: number | null;
+    /**
+     * Filter by block hash
+     */
+    filter_block_hash?: string;
+    /**
+     * Filter by block timestamp
+     */
+    filter_block_timestamp?: number | null;
+    /**
+     * Filter by block timestamp greater than or equal to
+     */
+    filter_block_timestamp_gte?: number | null;
+    /**
+     * Filter by block timestamp greater than
+     */
+    filter_block_timestamp_gt?: number | null;
+    /**
+     * Filter by block timestamp less than or equal to
+     */
+    filter_block_timestamp_lte?: number | null;
+    /**
+     * Filter by block timestamp less than
+     */
+    filter_block_timestamp_lt?: number | null;
+    /**
+     * Field to sort results by
+     */
+    sort_by?: "block_number" | string;
+    /**
+     * Sort order (asc or desc)
+     */
+    sort_order?: "asc" | "desc";
+    /**
+     * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
+     */
+    group_by?: unknown;
+    /**
+     * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
+     */
+    aggregate?: unknown;
+    /**
+     * Filter by transaction index
+     */
+    filter_transaction_index?: number | null;
+    /**
+     * Filter by transaction index greater than or equal to
+     */
+    filter_transaction_index_gte?: number | null;
+    /**
+     * Filter by transaction index greater than
+     */
+    filter_transaction_index_gt?: number | null;
+    /**
+     * Filter by transaction index less than or equal to
+     */
+    filter_transaction_index_lte?: number | null;
+    /**
+     * Filter by transaction index less than
+     */
+    filter_transaction_index_lt?: number | null;
+    /**
+     * Enable ABI decoding of the transactions/events data
+     */
+    decode?: boolean | null;
+    /**
+     * Filter by transaction hash
+     */
+    filter_transaction_hash?: string;
+    /**
+     * Filter by log index
+     */
+    filter_log_index?: number | null;
+    /**
+     * Filter by log index greater than or equal to
+     */
+    filter_log_index_gte?: number | null;
+    /**
+     * Filter by log index greater than
+     */
+    filter_log_index_gt?: number | null;
+    /**
+     * Filter by log index less than or equal to
+     */
+    filter_log_index_lte?: number | null;
+    /**
+     * Filter by log index less than
+     */
+    filter_log_index_lt?: number | null;
+    /**
+     * Filter by topic 1
+     */
+    filter_topic_1?: string;
+    /**
+     * Filter by topic 2
+     */
+    filter_topic_2?: string;
+    /**
+     * Filter by topic 3
+     */
+    filter_topic_3?: string;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+  };
+  url: "/v1/events/{contractAddress}/{signature}";
 };
 
-export type GetV1TransactionsErrors = {
+export type GetV1EventsByContractAddressBySignatureErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
+};
+
+export type GetV1EventsByContractAddressBySignatureError =
+  GetV1EventsByContractAddressBySignatureErrors[keyof GetV1EventsByContractAddressBySignatureErrors];
+
+export type GetV1EventsByContractAddressBySignatureResponses = {
+  /**
+   * Successful response
+   */
+  200: {
+    data?: Array<{
+      chain_id: number;
+      block_number: string;
+      block_hash: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      transaction_index: number;
+      log_index: number;
+      address: string;
+      data: string;
+      topics: Array<string>;
+      decoded?: {
+        name: string;
+        signature: string;
+        indexed_params: {
+          [key: string]: unknown;
+        };
+        non_indexed_params: {
+          [key: string]: unknown;
+        };
+      };
+    }>;
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
+};
+
+export type GetV1EventsByContractAddressBySignatureResponse =
+  GetV1EventsByContractAddressBySignatureResponses[keyof GetV1EventsByContractAddressBySignatureResponses];
+
+export type GetV1TransactionsData = {
+  body?: never;
+  path?: never;
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * Filter by block number
+     */
+    filter_block_number?: number | null;
+    /**
+     * Filter by block number greater than or equal to
+     */
+    filter_block_number_gte?: number | null;
+    /**
+     * Filter by block number greater than
+     */
+    filter_block_number_gt?: number | null;
+    /**
+     * Filter by block number less than or equal to
+     */
+    filter_block_number_lte?: number | null;
+    /**
+     * Filter by block number less than
+     */
+    filter_block_number_lt?: number | null;
+    /**
+     * Filter by block hash
+     */
+    filter_block_hash?: string;
+    /**
+     * Filter by block timestamp
+     */
+    filter_block_timestamp?: number | null;
+    /**
+     * Filter by block timestamp greater than or equal to
+     */
+    filter_block_timestamp_gte?: number | null;
+    /**
+     * Filter by block timestamp greater than
+     */
+    filter_block_timestamp_gt?: number | null;
+    /**
+     * Filter by block timestamp less than or equal to
+     */
+    filter_block_timestamp_lte?: number | null;
+    /**
+     * Filter by block timestamp less than
+     */
+    filter_block_timestamp_lt?: number | null;
+    /**
+     * Field to sort results by
+     */
+    sort_by?: "block_number" | string;
+    /**
+     * Sort order (asc or desc)
+     */
+    sort_order?: "asc" | "desc";
+    /**
+     * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
+     */
+    group_by?: unknown;
+    /**
+     * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
+     */
+    aggregate?: unknown;
+    /**
+     * Filter by transaction index
+     */
+    filter_transaction_index?: number | null;
+    /**
+     * Filter by transaction index greater than or equal to
+     */
+    filter_transaction_index_gte?: number | null;
+    /**
+     * Filter by transaction index greater than
+     */
+    filter_transaction_index_gt?: number | null;
+    /**
+     * Filter by transaction index less than or equal to
+     */
+    filter_transaction_index_lte?: number | null;
+    /**
+     * Filter by transaction index less than
+     */
+    filter_transaction_index_lt?: number | null;
+    /**
+     * Enable ABI decoding of the transactions/events data
+     */
+    decode?: boolean | null;
+    /**
+     * Filter by transaction hash
+     */
+    filter_hash?: string;
+    /**
+     * Filter by from address
+     */
+    filter_from_address?: string;
+    /**
+     * Filter by value
+     */
+    filter_value?: number | null;
+    /**
+     * Filter by value greater than or equal to
+     */
+    filter_value_gte?: number | null;
+    /**
+     * Filter by value greater than
+     */
+    filter_value_gt?: number | null;
+    /**
+     * Filter by value less than or equal to
+     */
+    filter_value_lte?: number | null;
+    /**
+     * Filter by value less than
+     */
+    filter_value_lt?: number | null;
+    /**
+     * Filter by gas price
+     */
+    filter_gas_price?: number | null;
+    /**
+     * Filter by gas price greater than or equal to
+     */
+    filter_gas_price_gte?: number | null;
+    /**
+     * Filter by gas price greater than
+     */
+    filter_gas_price_gt?: number | null;
+    /**
+     * Filter by gas price less than or equal to
+     */
+    filter_gas_price_lte?: number | null;
+    /**
+     * Filter by gas price less than
+     */
+    filter_gas_price_lt?: number | null;
+    /**
+     * Filter by gas
+     */
+    filter_gas?: number | null;
+    /**
+     * Filter by gas greater than or equal to
+     */
+    filter_gas_gte?: number | null;
+    /**
+     * Filter by gas greater than
+     */
+    filter_gas_gt?: number | null;
+    /**
+     * Filter by gas less than or equal to
+     */
+    filter_gas_lte?: number | null;
+    /**
+     * Filter by gas less than
+     */
+    filter_gas_lt?: number | null;
+    /**
+     * Filter by function selector
+     */
+    filter_function_selector?: string;
+    /**
+     * Filter by to address
+     */
+    filter_to_address?: string;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+  };
+  url: "/v1/transactions";
+};
+
+export type GetV1TransactionsErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1TransactionsError = GetV1TransactionsErrors[keyof GetV1TransactionsErrors];
+export type GetV1TransactionsError =
+  GetV1TransactionsErrors[keyof GetV1TransactionsErrors];
 
 export type GetV1TransactionsResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data?: Array<{
-            chain_id: number;
-            block_number: string;
-            block_hash: string;
-            block_timestamp: string;
-            hash: string;
-            nonce: number;
-            transaction_index: number;
-            from_address: string;
-            to_address: string;
-            value: number;
-            gas_price: number;
-            gas: number;
-            function_selector: string;
-            data: string;
-            max_fee_per_gas: number;
-            max_priority_fee_per_gas: number;
-            transaction_type: number;
-            r: number;
-            s: number;
-            v: number;
-            access_list_json?: string;
-            contract_address?: string;
-            gas_used?: number;
-            cumulative_gas_used?: number;
-            effective_gas_price?: number;
-            blob_gas_used?: number;
-            blob_gas_price?: number;
-            logs_bloom?: string;
-            status?: number;
-            decoded?: {
-                name: string;
-                signature: string;
-                inputs?: {
-                    [key: string]: unknown;
-                };
-            };
-            /**
-             * @deprecated
-             */
-            decodedData?: {
-                name: string;
-                signature: string;
-                inputs?: {
-                    [key: string]: unknown;
-                };
-            };
-        }>;
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
+  /**
+   * Successful response
+   */
+  200: {
+    data?: Array<{
+      chain_id: number;
+      block_number: string;
+      block_hash: string;
+      block_timestamp: string;
+      hash: string;
+      nonce: number;
+      transaction_index: number;
+      from_address: string;
+      to_address: string;
+      value: number;
+      gas_price: number;
+      gas: number;
+      function_selector: string;
+      data: string;
+      max_fee_per_gas: number;
+      max_priority_fee_per_gas: number;
+      transaction_type: number;
+      r: number;
+      s: number;
+      v: number;
+      access_list_json?: string;
+      contract_address?: string;
+      gas_used?: number;
+      cumulative_gas_used?: number;
+      effective_gas_price?: number;
+      blob_gas_used?: number;
+      blob_gas_price?: number;
+      logs_bloom?: string;
+      status?: number;
+      decoded?: {
+        name: string;
+        signature: string;
+        inputs?: {
+          [key: string]: unknown;
         };
-    };
+      };
+      /**
+       * @deprecated
+       */
+      decodedData?: {
+        name: string;
+        signature: string;
+        inputs?: {
+          [key: string]: unknown;
+        };
+      };
+    }>;
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
 };
 
-export type GetV1TransactionsResponse = GetV1TransactionsResponses[keyof GetV1TransactionsResponses];
+export type GetV1TransactionsResponse =
+  GetV1TransactionsResponses[keyof GetV1TransactionsResponses];
 
 export type GetV1TransactionsByContractAddressData = {
-    body?: never;
-    path: {
-        contractAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Filter by block number
-         */
-        filter_block_number?: number | null;
-        /**
-         * Filter by block number greater than or equal to
-         */
-        filter_block_number_gte?: number | null;
-        /**
-         * Filter by block number greater than
-         */
-        filter_block_number_gt?: number | null;
-        /**
-         * Filter by block number less than or equal to
-         */
-        filter_block_number_lte?: number | null;
-        /**
-         * Filter by block number less than
-         */
-        filter_block_number_lt?: number | null;
-        /**
-         * Filter by block hash
-         */
-        filter_block_hash?: string;
-        /**
-         * Filter by block timestamp
-         */
-        filter_block_timestamp?: number | null;
-        /**
-         * Filter by block timestamp greater than or equal to
-         */
-        filter_block_timestamp_gte?: number | null;
-        /**
-         * Filter by block timestamp greater than
-         */
-        filter_block_timestamp_gt?: number | null;
-        /**
-         * Filter by block timestamp less than or equal to
-         */
-        filter_block_timestamp_lte?: number | null;
-        /**
-         * Filter by block timestamp less than
-         */
-        filter_block_timestamp_lt?: number | null;
-        /**
-         * Field to sort results by
-         */
-        sort_by?: 'block_number' | string;
-        /**
-         * Sort order (asc or desc)
-         */
-        sort_order?: 'asc' | 'desc';
-        /**
-         * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
-         */
-        group_by?: unknown;
-        /**
-         * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
-         */
-        aggregate?: unknown;
-        /**
-         * Filter by transaction index
-         */
-        filter_transaction_index?: number | null;
-        /**
-         * Filter by transaction index greater than or equal to
-         */
-        filter_transaction_index_gte?: number | null;
-        /**
-         * Filter by transaction index greater than
-         */
-        filter_transaction_index_gt?: number | null;
-        /**
-         * Filter by transaction index less than or equal to
-         */
-        filter_transaction_index_lte?: number | null;
-        /**
-         * Filter by transaction index less than
-         */
-        filter_transaction_index_lt?: number | null;
-        /**
-         * Enable ABI decoding of the transactions/events data
-         */
-        decode?: boolean | null;
-        /**
-         * Filter by transaction hash
-         */
-        filter_hash?: string;
-        /**
-         * Filter by from address
-         */
-        filter_from_address?: string;
-        /**
-         * Filter by value
-         */
-        filter_value?: number | null;
-        /**
-         * Filter by value greater than or equal to
-         */
-        filter_value_gte?: number | null;
-        /**
-         * Filter by value greater than
-         */
-        filter_value_gt?: number | null;
-        /**
-         * Filter by value less than or equal to
-         */
-        filter_value_lte?: number | null;
-        /**
-         * Filter by value less than
-         */
-        filter_value_lt?: number | null;
-        /**
-         * Filter by gas price
-         */
-        filter_gas_price?: number | null;
-        /**
-         * Filter by gas price greater than or equal to
-         */
-        filter_gas_price_gte?: number | null;
-        /**
-         * Filter by gas price greater than
-         */
-        filter_gas_price_gt?: number | null;
-        /**
-         * Filter by gas price less than or equal to
-         */
-        filter_gas_price_lte?: number | null;
-        /**
-         * Filter by gas price less than
-         */
-        filter_gas_price_lt?: number | null;
-        /**
-         * Filter by gas
-         */
-        filter_gas?: number | null;
-        /**
-         * Filter by gas greater than or equal to
-         */
-        filter_gas_gte?: number | null;
-        /**
-         * Filter by gas greater than
-         */
-        filter_gas_gt?: number | null;
-        /**
-         * Filter by gas less than or equal to
-         */
-        filter_gas_lte?: number | null;
-        /**
-         * Filter by gas less than
-         */
-        filter_gas_lt?: number | null;
-        /**
-         * Filter by function selector
-         */
-        filter_function_selector?: string;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-    };
-    url: '/v1/transactions/{contractAddress}';
-};
-
-export type GetV1TransactionsByContractAddressErrors = {
+  body?: never;
+  path: {
+    contractAddress: string;
+  };
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * Filter by block number
+     */
+    filter_block_number?: number | null;
+    /**
+     * Filter by block number greater than or equal to
+     */
+    filter_block_number_gte?: number | null;
+    /**
+     * Filter by block number greater than
+     */
+    filter_block_number_gt?: number | null;
+    /**
+     * Filter by block number less than or equal to
+     */
+    filter_block_number_lte?: number | null;
+    /**
+     * Filter by block number less than
+     */
+    filter_block_number_lt?: number | null;
+    /**
+     * Filter by block hash
+     */
+    filter_block_hash?: string;
+    /**
+     * Filter by block timestamp
+     */
+    filter_block_timestamp?: number | null;
+    /**
+     * Filter by block timestamp greater than or equal to
+     */
+    filter_block_timestamp_gte?: number | null;
+    /**
+     * Filter by block timestamp greater than
+     */
+    filter_block_timestamp_gt?: number | null;
+    /**
+     * Filter by block timestamp less than or equal to
+     */
+    filter_block_timestamp_lte?: number | null;
+    /**
+     * Filter by block timestamp less than
+     */
+    filter_block_timestamp_lt?: number | null;
+    /**
+     * Field to sort results by
+     */
+    sort_by?: "block_number" | string;
+    /**
+     * Sort order (asc or desc)
+     */
+    sort_order?: "asc" | "desc";
+    /**
+     * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
+     */
+    group_by?: unknown;
+    /**
+     * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
+     */
+    aggregate?: unknown;
+    /**
+     * Filter by transaction index
+     */
+    filter_transaction_index?: number | null;
+    /**
+     * Filter by transaction index greater than or equal to
+     */
+    filter_transaction_index_gte?: number | null;
+    /**
+     * Filter by transaction index greater than
+     */
+    filter_transaction_index_gt?: number | null;
+    /**
+     * Filter by transaction index less than or equal to
+     */
+    filter_transaction_index_lte?: number | null;
+    /**
+     * Filter by transaction index less than
+     */
+    filter_transaction_index_lt?: number | null;
+    /**
+     * Enable ABI decoding of the transactions/events data
+     */
+    decode?: boolean | null;
+    /**
+     * Filter by transaction hash
+     */
+    filter_hash?: string;
+    /**
+     * Filter by from address
+     */
+    filter_from_address?: string;
+    /**
+     * Filter by value
+     */
+    filter_value?: number | null;
+    /**
+     * Filter by value greater than or equal to
+     */
+    filter_value_gte?: number | null;
+    /**
+     * Filter by value greater than
+     */
+    filter_value_gt?: number | null;
+    /**
+     * Filter by value less than or equal to
+     */
+    filter_value_lte?: number | null;
+    /**
+     * Filter by value less than
+     */
+    filter_value_lt?: number | null;
+    /**
+     * Filter by gas price
+     */
+    filter_gas_price?: number | null;
+    /**
+     * Filter by gas price greater than or equal to
+     */
+    filter_gas_price_gte?: number | null;
+    /**
+     * Filter by gas price greater than
+     */
+    filter_gas_price_gt?: number | null;
+    /**
+     * Filter by gas price less than or equal to
+     */
+    filter_gas_price_lte?: number | null;
+    /**
+     * Filter by gas price less than
+     */
+    filter_gas_price_lt?: number | null;
+    /**
+     * Filter by gas
+     */
+    filter_gas?: number | null;
+    /**
+     * Filter by gas greater than or equal to
+     */
+    filter_gas_gte?: number | null;
+    /**
+     * Filter by gas greater than
+     */
+    filter_gas_gt?: number | null;
+    /**
+     * Filter by gas less than or equal to
+     */
+    filter_gas_lte?: number | null;
+    /**
+     * Filter by gas less than
+     */
+    filter_gas_lt?: number | null;
+    /**
+     * Filter by function selector
+     */
+    filter_function_selector?: string;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+  };
+  url: "/v1/transactions/{contractAddress}";
 };
 
-export type GetV1TransactionsByContractAddressError = GetV1TransactionsByContractAddressErrors[keyof GetV1TransactionsByContractAddressErrors];
+export type GetV1TransactionsByContractAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
+};
+
+export type GetV1TransactionsByContractAddressError =
+  GetV1TransactionsByContractAddressErrors[keyof GetV1TransactionsByContractAddressErrors];
 
 export type GetV1TransactionsByContractAddressResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data?: Array<{
-            chain_id: number;
-            block_number: string;
-            block_hash: string;
-            block_timestamp: string;
-            hash: string;
-            nonce: number;
-            transaction_index: number;
-            from_address: string;
-            to_address: string;
-            value: number;
-            gas_price: number;
-            gas: number;
-            function_selector: string;
-            data: string;
-            max_fee_per_gas: number;
-            max_priority_fee_per_gas: number;
-            transaction_type: number;
-            r: number;
-            s: number;
-            v: number;
-            access_list_json?: string;
-            contract_address?: string;
-            gas_used?: number;
-            cumulative_gas_used?: number;
-            effective_gas_price?: number;
-            blob_gas_used?: number;
-            blob_gas_price?: number;
-            logs_bloom?: string;
-            status?: number;
-        }>;
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
-        };
-    };
+  /**
+   * Successful response
+   */
+  200: {
+    data?: Array<{
+      chain_id: number;
+      block_number: string;
+      block_hash: string;
+      block_timestamp: string;
+      hash: string;
+      nonce: number;
+      transaction_index: number;
+      from_address: string;
+      to_address: string;
+      value: number;
+      gas_price: number;
+      gas: number;
+      function_selector: string;
+      data: string;
+      max_fee_per_gas: number;
+      max_priority_fee_per_gas: number;
+      transaction_type: number;
+      r: number;
+      s: number;
+      v: number;
+      access_list_json?: string;
+      contract_address?: string;
+      gas_used?: number;
+      cumulative_gas_used?: number;
+      effective_gas_price?: number;
+      blob_gas_used?: number;
+      blob_gas_price?: number;
+      logs_bloom?: string;
+      status?: number;
+    }>;
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
 };
 
-export type GetV1TransactionsByContractAddressResponse = GetV1TransactionsByContractAddressResponses[keyof GetV1TransactionsByContractAddressResponses];
+export type GetV1TransactionsByContractAddressResponse =
+  GetV1TransactionsByContractAddressResponses[keyof GetV1TransactionsByContractAddressResponses];
 
 export type GetV1TransactionsByContractAddressBySignatureData = {
-    body?: never;
-    path: {
-        contractAddress: string;
-        signature: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Filter by block number
-         */
-        filter_block_number?: number | null;
-        /**
-         * Filter by block number greater than or equal to
-         */
-        filter_block_number_gte?: number | null;
-        /**
-         * Filter by block number greater than
-         */
-        filter_block_number_gt?: number | null;
-        /**
-         * Filter by block number less than or equal to
-         */
-        filter_block_number_lte?: number | null;
-        /**
-         * Filter by block number less than
-         */
-        filter_block_number_lt?: number | null;
-        /**
-         * Filter by block hash
-         */
-        filter_block_hash?: string;
-        /**
-         * Filter by block timestamp
-         */
-        filter_block_timestamp?: number | null;
-        /**
-         * Filter by block timestamp greater than or equal to
-         */
-        filter_block_timestamp_gte?: number | null;
-        /**
-         * Filter by block timestamp greater than
-         */
-        filter_block_timestamp_gt?: number | null;
-        /**
-         * Filter by block timestamp less than or equal to
-         */
-        filter_block_timestamp_lte?: number | null;
-        /**
-         * Filter by block timestamp less than
-         */
-        filter_block_timestamp_lt?: number | null;
-        /**
-         * Field to sort results by
-         */
-        sort_by?: 'block_number' | string;
-        /**
-         * Sort order (asc or desc)
-         */
-        sort_order?: 'asc' | 'desc';
-        /**
-         * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
-         */
-        group_by?: unknown;
-        /**
-         * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
-         */
-        aggregate?: unknown;
-        /**
-         * Filter by transaction index
-         */
-        filter_transaction_index?: number | null;
-        /**
-         * Filter by transaction index greater than or equal to
-         */
-        filter_transaction_index_gte?: number | null;
-        /**
-         * Filter by transaction index greater than
-         */
-        filter_transaction_index_gt?: number | null;
-        /**
-         * Filter by transaction index less than or equal to
-         */
-        filter_transaction_index_lte?: number | null;
-        /**
-         * Filter by transaction index less than
-         */
-        filter_transaction_index_lt?: number | null;
-        /**
-         * Enable ABI decoding of the transactions/events data
-         */
-        decode?: boolean | null;
-        /**
-         * Filter by transaction hash
-         */
-        filter_hash?: string;
-        /**
-         * Filter by from address
-         */
-        filter_from_address?: string;
-        /**
-         * Filter by value
-         */
-        filter_value?: number | null;
-        /**
-         * Filter by value greater than or equal to
-         */
-        filter_value_gte?: number | null;
-        /**
-         * Filter by value greater than
-         */
-        filter_value_gt?: number | null;
-        /**
-         * Filter by value less than or equal to
-         */
-        filter_value_lte?: number | null;
-        /**
-         * Filter by value less than
-         */
-        filter_value_lt?: number | null;
-        /**
-         * Filter by gas price
-         */
-        filter_gas_price?: number | null;
-        /**
-         * Filter by gas price greater than or equal to
-         */
-        filter_gas_price_gte?: number | null;
-        /**
-         * Filter by gas price greater than
-         */
-        filter_gas_price_gt?: number | null;
-        /**
-         * Filter by gas price less than or equal to
-         */
-        filter_gas_price_lte?: number | null;
-        /**
-         * Filter by gas price less than
-         */
-        filter_gas_price_lt?: number | null;
-        /**
-         * Filter by gas
-         */
-        filter_gas?: number | null;
-        /**
-         * Filter by gas greater than or equal to
-         */
-        filter_gas_gte?: number | null;
-        /**
-         * Filter by gas greater than
-         */
-        filter_gas_gt?: number | null;
-        /**
-         * Filter by gas less than or equal to
-         */
-        filter_gas_lte?: number | null;
-        /**
-         * Filter by gas less than
-         */
-        filter_gas_lt?: number | null;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-    };
-    url: '/v1/transactions/{contractAddress}/{signature}';
-};
-
-export type GetV1TransactionsByContractAddressBySignatureErrors = {
+  body?: never;
+  path: {
+    contractAddress: string;
+    signature: string;
+  };
+  query?: {
+    /**
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+    /**
+     * Filter by block number
+     */
+    filter_block_number?: number | null;
+    /**
+     * Filter by block number greater than or equal to
+     */
+    filter_block_number_gte?: number | null;
+    /**
+     * Filter by block number greater than
+     */
+    filter_block_number_gt?: number | null;
+    /**
+     * Filter by block number less than or equal to
+     */
+    filter_block_number_lte?: number | null;
+    /**
+     * Filter by block number less than
+     */
+    filter_block_number_lt?: number | null;
     /**
-     * Bad request
+     * Filter by block hash
      */
-    400: {
-        error: string;
-    };
+    filter_block_hash?: string;
     /**
-     * Internal server error
+     * Filter by block timestamp
      */
-    500: {
-        error: string;
-    };
+    filter_block_timestamp?: number | null;
+    /**
+     * Filter by block timestamp greater than or equal to
+     */
+    filter_block_timestamp_gte?: number | null;
+    /**
+     * Filter by block timestamp greater than
+     */
+    filter_block_timestamp_gt?: number | null;
+    /**
+     * Filter by block timestamp less than or equal to
+     */
+    filter_block_timestamp_lte?: number | null;
+    /**
+     * Filter by block timestamp less than
+     */
+    filter_block_timestamp_lt?: number | null;
+    /**
+     * Field to sort results by
+     */
+    sort_by?: "block_number" | string;
+    /**
+     * Sort order (asc or desc)
+     */
+    sort_order?: "asc" | "desc";
+    /**
+     * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
+     */
+    group_by?: unknown;
+    /**
+     * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
+     */
+    aggregate?: unknown;
+    /**
+     * Filter by transaction index
+     */
+    filter_transaction_index?: number | null;
+    /**
+     * Filter by transaction index greater than or equal to
+     */
+    filter_transaction_index_gte?: number | null;
+    /**
+     * Filter by transaction index greater than
+     */
+    filter_transaction_index_gt?: number | null;
+    /**
+     * Filter by transaction index less than or equal to
+     */
+    filter_transaction_index_lte?: number | null;
+    /**
+     * Filter by transaction index less than
+     */
+    filter_transaction_index_lt?: number | null;
+    /**
+     * Enable ABI decoding of the transactions/events data
+     */
+    decode?: boolean | null;
+    /**
+     * Filter by transaction hash
+     */
+    filter_hash?: string;
+    /**
+     * Filter by from address
+     */
+    filter_from_address?: string;
+    /**
+     * Filter by value
+     */
+    filter_value?: number | null;
+    /**
+     * Filter by value greater than or equal to
+     */
+    filter_value_gte?: number | null;
+    /**
+     * Filter by value greater than
+     */
+    filter_value_gt?: number | null;
+    /**
+     * Filter by value less than or equal to
+     */
+    filter_value_lte?: number | null;
+    /**
+     * Filter by value less than
+     */
+    filter_value_lt?: number | null;
+    /**
+     * Filter by gas price
+     */
+    filter_gas_price?: number | null;
+    /**
+     * Filter by gas price greater than or equal to
+     */
+    filter_gas_price_gte?: number | null;
+    /**
+     * Filter by gas price greater than
+     */
+    filter_gas_price_gt?: number | null;
+    /**
+     * Filter by gas price less than or equal to
+     */
+    filter_gas_price_lte?: number | null;
+    /**
+     * Filter by gas price less than
+     */
+    filter_gas_price_lt?: number | null;
+    /**
+     * Filter by gas
+     */
+    filter_gas?: number | null;
+    /**
+     * Filter by gas greater than or equal to
+     */
+    filter_gas_gte?: number | null;
+    /**
+     * Filter by gas greater than
+     */
+    filter_gas_gt?: number | null;
+    /**
+     * Filter by gas less than or equal to
+     */
+    filter_gas_lte?: number | null;
+    /**
+     * Filter by gas less than
+     */
+    filter_gas_lt?: number | null;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+  };
+  url: "/v1/transactions/{contractAddress}/{signature}";
+};
+
+export type GetV1TransactionsByContractAddressBySignatureErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1TransactionsByContractAddressBySignatureError = GetV1TransactionsByContractAddressBySignatureErrors[keyof GetV1TransactionsByContractAddressBySignatureErrors];
+export type GetV1TransactionsByContractAddressBySignatureError =
+  GetV1TransactionsByContractAddressBySignatureErrors[keyof GetV1TransactionsByContractAddressBySignatureErrors];
 
 export type GetV1TransactionsByContractAddressBySignatureResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data?: Array<{
-            chain_id: number;
-            block_number: string;
-            block_hash: string;
-            block_timestamp: string;
-            hash: string;
-            nonce: number;
-            transaction_index: number;
-            from_address: string;
-            to_address: string;
-            value: number;
-            gas_price: number;
-            gas: number;
-            function_selector: string;
-            data: string;
-            max_fee_per_gas: number;
-            max_priority_fee_per_gas: number;
-            transaction_type: number;
-            r: number;
-            s: number;
-            v: number;
-            access_list_json?: string;
-            contract_address?: string;
-            gas_used?: number;
-            cumulative_gas_used?: number;
-            effective_gas_price?: number;
-            blob_gas_used?: number;
-            blob_gas_price?: number;
-            logs_bloom?: string;
-            status?: number;
-            decoded?: {
-                name: string;
-                signature: string;
-                inputs?: {
-                    [key: string]: unknown;
-                };
-            };
-            /**
-             * @deprecated
-             */
-            decodedData?: {
-                name: string;
-                signature: string;
-                inputs?: {
-                    [key: string]: unknown;
-                };
-            };
-        }>;
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
+  /**
+   * Successful response
+   */
+  200: {
+    data?: Array<{
+      chain_id: number;
+      block_number: string;
+      block_hash: string;
+      block_timestamp: string;
+      hash: string;
+      nonce: number;
+      transaction_index: number;
+      from_address: string;
+      to_address: string;
+      value: number;
+      gas_price: number;
+      gas: number;
+      function_selector: string;
+      data: string;
+      max_fee_per_gas: number;
+      max_priority_fee_per_gas: number;
+      transaction_type: number;
+      r: number;
+      s: number;
+      v: number;
+      access_list_json?: string;
+      contract_address?: string;
+      gas_used?: number;
+      cumulative_gas_used?: number;
+      effective_gas_price?: number;
+      blob_gas_used?: number;
+      blob_gas_price?: number;
+      logs_bloom?: string;
+      status?: number;
+      decoded?: {
+        name: string;
+        signature: string;
+        inputs?: {
+          [key: string]: unknown;
         };
-    };
+      };
+      /**
+       * @deprecated
+       */
+      decodedData?: {
+        name: string;
+        signature: string;
+        inputs?: {
+          [key: string]: unknown;
+        };
+      };
+    }>;
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
 };
 
-export type GetV1TransactionsByContractAddressBySignatureResponse = GetV1TransactionsByContractAddressBySignatureResponses[keyof GetV1TransactionsByContractAddressBySignatureResponses];
+export type GetV1TransactionsByContractAddressBySignatureResponse =
+  GetV1TransactionsByContractAddressBySignatureResponses[keyof GetV1TransactionsByContractAddressBySignatureResponses];
 
 export type GetV1TokensOwnersData = {
-    body?: never;
-    path?: never;
-    query: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        contract_address: string;
-    };
-    url: '/v1/tokens/owners';
-};
-
-export type GetV1TokensOwnersErrors = {
+  body?: never;
+  path?: never;
+  query: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Not found
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    404: unknown;
+    chain_id?: Array<number>;
     /**
-     * Internal server error
+     * The number of items to return
      */
-    500: {
-        error: string;
-    };
+    limit?: number;
+    page?: number | null;
+    contract_address: string;
+  };
+  url: "/v1/tokens/owners";
+};
+
+export type GetV1TokensOwnersErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1TokensOwnersError = GetV1TokensOwnersErrors[keyof GetV1TokensOwnersErrors];
+export type GetV1TokensOwnersError =
+  GetV1TokensOwnersErrors[keyof GetV1TokensOwnersErrors];
 
 export type GetV1TokensOwnersResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            chain_id: string;
-            token_address: string;
-            owner_address: string;
-            balance: string;
-        }>;
-    };
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      chain_id: string;
+      token_address: string;
+      owner_address: string;
+      balance: string;
+    }>;
+  };
 };
 
-export type GetV1TokensOwnersResponse = GetV1TokensOwnersResponses[keyof GetV1TokensOwnersResponses];
+export type GetV1TokensOwnersResponse =
+  GetV1TokensOwnersResponses[keyof GetV1TokensOwnersResponses];
 
 export type GetV1TokensTransfersTransactionByTransactionHashData = {
-    body?: never;
-    path: {
-        transaction_hash: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to include sale details for NFT transfers
-         */
-        sales?: 'true' | 'false';
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-        /**
-         * The types of tokens to include in the response. Can be an empty array to include all types
-         */
-        token_types?: Array<'erc1155' | 'erc721' | 'erc20'>;
-    };
-    url: '/v1/tokens/transfers/transaction/{transaction_hash}';
+  body?: never;
+  path: {
+    transaction_hash: string;
+  };
+  query?: {
+    /**
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to include sale details for NFT transfers
+     */
+    sales?: "true" | "false";
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+    /**
+     * The types of tokens to include in the response. Can be an empty array to include all types
+     */
+    token_types?: Array<"erc1155" | "erc721" | "erc20">;
+  };
+  url: "/v1/tokens/transfers/transaction/{transaction_hash}";
 };
 
 export type GetV1TokensTransfersTransactionByTransactionHashErrors = {
-    /**
-     * Not found
-     */
-    404: unknown;
-    /**
-     * Internal server error
-     */
-    500: {
-        data: Array<{
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc20';
-            amount: string;
-            chain_id: number;
-            token_metadata?: {
-                name?: string;
-                symbol?: string;
-                decimals?: number;
-            };
-        }>;
-    };
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    data: Array<{
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc20";
+      amount: string;
+      chain_id: number;
+      token_metadata?: {
+        name?: string;
+        symbol?: string;
+        decimals?: number;
+      };
+    }>;
+  };
 };
 
-export type GetV1TokensTransfersTransactionByTransactionHashError = GetV1TokensTransfersTransactionByTransactionHashErrors[keyof GetV1TokensTransfersTransactionByTransactionHashErrors];
+export type GetV1TokensTransfersTransactionByTransactionHashError =
+  GetV1TokensTransfersTransactionByTransactionHashErrors[keyof GetV1TokensTransfersTransactionByTransactionHashErrors];
 
 export type GetV1TokensTransfersTransactionByTransactionHashResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc20';
-            amount: string;
-            chain_id: number;
-            token_metadata?: {
-                name?: string;
-                symbol?: string;
-                decimals?: number;
-            };
-        }>;
-    };
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc20";
+      amount: string;
+      chain_id: number;
+      token_metadata?: {
+        name?: string;
+        symbol?: string;
+        decimals?: number;
+      };
+    }>;
+  };
 };
 
-export type GetV1TokensTransfersTransactionByTransactionHashResponse = GetV1TokensTransfersTransactionByTransactionHashResponses[keyof GetV1TokensTransfersTransactionByTransactionHashResponses];
+export type GetV1TokensTransfersTransactionByTransactionHashResponse =
+  GetV1TokensTransfersTransactionByTransactionHashResponses[keyof GetV1TokensTransfersTransactionByTransactionHashResponses];
 
 export type GetV1TokensTransfersByContractAddressData = {
-    body?: never;
-    path: {
-        contract_address: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to include sale details for NFT transfers
-         */
-        sales?: 'true' | 'false';
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-    };
-    url: '/v1/tokens/transfers/{contract_address}';
+  body?: never;
+  path: {
+    contract_address: string;
+  };
+  query?: {
+    /**
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to include sale details for NFT transfers
+     */
+    sales?: "true" | "false";
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+  };
+  url: "/v1/tokens/transfers/{contract_address}";
 };
 
 export type GetV1TokensTransfersByContractAddressErrors = {
-    /**
-     * Not found
-     */
-    404: unknown;
-    /**
-     * Internal server error
-     */
-    500: {
-        data: Array<{
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc20';
-            amount: string;
-            chain_id: number;
-            token_metadata?: {
-                name?: string;
-                symbol?: string;
-                decimals?: number;
-            };
-        }>;
-    };
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    data: Array<{
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc20";
+      amount: string;
+      chain_id: number;
+      token_metadata?: {
+        name?: string;
+        symbol?: string;
+        decimals?: number;
+      };
+    }>;
+  };
 };
 
-export type GetV1TokensTransfersByContractAddressError = GetV1TokensTransfersByContractAddressErrors[keyof GetV1TokensTransfersByContractAddressErrors];
+export type GetV1TokensTransfersByContractAddressError =
+  GetV1TokensTransfersByContractAddressErrors[keyof GetV1TokensTransfersByContractAddressErrors];
 
 export type GetV1TokensTransfersByContractAddressResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc20';
-            amount: string;
-            chain_id: number;
-            token_metadata?: {
-                name?: string;
-                symbol?: string;
-                decimals?: number;
-            };
-        }>;
-    };
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc20";
+      amount: string;
+      chain_id: number;
+      token_metadata?: {
+        name?: string;
+        symbol?: string;
+        decimals?: number;
+      };
+    }>;
+  };
 };
 
-export type GetV1TokensTransfersByContractAddressResponse = GetV1TokensTransfersByContractAddressResponses[keyof GetV1TokensTransfersByContractAddressResponses];
+export type GetV1TokensTransfersByContractAddressResponse =
+  GetV1TokensTransfersByContractAddressResponses[keyof GetV1TokensTransfersByContractAddressResponses];
 
 export type GetV1TokensTransfersData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to include sale details for NFT transfers
-         */
-        sales?: 'true' | 'false';
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-        /**
-         * Filter by block number greater than or equal to
-         */
-        block_number_from?: number | string;
-        /**
-         * Filter by block number less than or equal to
-         */
-        block_number_to?: number | string;
-        /**
-         * The types of tokens to include in the response. Can be an empty array to include all types
-         */
-        token_types?: Array<'erc1155' | 'erc721' | 'erc20'>;
-        owner_address?: string;
-    };
-    url: '/v1/tokens/transfers';
-};
-
-export type GetV1TokensTransfersErrors = {
+  body?: never;
+  path?: never;
+  query?: {
     /**
-     * Not found
-     */
-    404: unknown;
-    /**
-     * Internal server error
-     */
-    500: {
-        data: Array<{
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc20';
-            amount: string;
-            chain_id: number;
-            token_metadata?: {
-                name?: string;
-                symbol?: string;
-                decimals?: number;
-            };
-        }>;
-    };
-};
-
-export type GetV1TokensTransfersError = GetV1TokensTransfersErrors[keyof GetV1TokensTransfersErrors];
-
-export type GetV1TokensTransfersResponses = {
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
     /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc20';
-            amount: string;
-            chain_id: number;
-            token_metadata?: {
-                name?: string;
-                symbol?: string;
-                decimals?: number;
-            };
-        }>;
-    };
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to include sale details for NFT transfers
+     */
+    sales?: "true" | "false";
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+    /**
+     * Filter by block number greater than or equal to
+     */
+    block_number_from?: number | string;
+    /**
+     * Filter by block number less than or equal to
+     */
+    block_number_to?: number | string;
+    /**
+     * The types of tokens to include in the response. Can be an empty array to include all types
+     */
+    token_types?: Array<"erc1155" | "erc721" | "erc20">;
+    owner_address?: string;
+  };
+  url: "/v1/tokens/transfers";
 };
 
-export type GetV1TokensTransfersResponse = GetV1TokensTransfersResponses[keyof GetV1TokensTransfersResponses];
-
-export type GetV1TokensErc20ByOwnerAddressData = {
-    body?: never;
-    path: {
-        ownerAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-        /**
-         * Whether to include spam tokens
-         */
-        include_spam?: 'true' | 'false';
-    };
-    url: '/v1/tokens/erc20/{ownerAddress}';
+export type GetV1TokensTransfersErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    data: Array<{
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc20";
+      amount: string;
+      chain_id: number;
+      token_metadata?: {
+        name?: string;
+        symbol?: string;
+        decimals?: number;
+      };
+    }>;
+  };
 };
 
-export type GetV1TokensErc20ByOwnerAddressErrors = {
+export type GetV1TokensTransfersError =
+  GetV1TokensTransfersErrors[keyof GetV1TokensTransfersErrors];
+
+export type GetV1TokensTransfersResponses = {
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc20";
+      amount: string;
+      chain_id: number;
+      token_metadata?: {
+        name?: string;
+        symbol?: string;
+        decimals?: number;
+      };
+    }>;
+  };
+};
+
+export type GetV1TokensTransfersResponse =
+  GetV1TokensTransfersResponses[keyof GetV1TokensTransfersResponses];
+
+export type GetV1TokensErc20ByOwnerAddressData = {
+  body?: never;
+  path: {
+    ownerAddress: string;
+  };
+  query?: {
+    /**
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
     /**
-     * Bad request
+     * Whether to resolve metadata IPFS or Arweave links
      */
-    400: unknown;
+    resolve_metadata_links?: "true" | "false";
     /**
-     * Internal server error
+     * Whether to include spam tokens
      */
-    500: unknown;
+    include_spam?: "true" | "false";
+  };
+  url: "/v1/tokens/erc20/{ownerAddress}";
+};
+
+export type GetV1TokensErc20ByOwnerAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: unknown;
+  /**
+   * Internal server error
+   */
+  500: unknown;
 };
 
 export type GetV1TokensErc20ByOwnerAddressResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: Array<{
-            /**
-             * The chain ID of a relevant entry
-             */
-            chain_id: number;
-            token_address: string;
-            balance: string;
-            name?: string;
-            symbol?: string;
-            decimals?: number;
-        }>;
-    };
+  /**
+   * Successful response
+   */
+  200: {
+    data: Array<{
+      /**
+       * The chain ID of a relevant entry
+       */
+      chain_id: number;
+      token_address: string;
+      balance: string;
+      name?: string;
+      symbol?: string;
+      decimals?: number;
+    }>;
+  };
 };
 
-export type GetV1TokensErc20ByOwnerAddressResponse = GetV1TokensErc20ByOwnerAddressResponses[keyof GetV1TokensErc20ByOwnerAddressResponses];
+export type GetV1TokensErc20ByOwnerAddressResponse =
+  GetV1TokensErc20ByOwnerAddressResponses[keyof GetV1TokensErc20ByOwnerAddressResponses];
 
 export type GetV1TokensData = {
-    body?: never;
-    path?: never;
-    query: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-        /**
-         * Whether to include spam tokens
-         */
-        include_spam?: 'true' | 'false';
-        owner_address: string;
-        /**
-         * Whether to include native tokens
-         */
-        include_native?: 'true' | 'false';
-    };
-    url: '/v1/tokens';
-};
-
-export type GetV1TokensErrors = {
+  body?: never;
+  path?: never;
+  query: {
+    /**
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
     /**
-     * Bad request
+     * Whether to include spam tokens
      */
-    400: unknown;
+    include_spam?: "true" | "false";
+    owner_address: string;
     /**
-     * Internal server error
+     * Whether to include native tokens
      */
-    500: unknown;
+    include_native?: "true" | "false";
+  };
+  url: "/v1/tokens";
+};
+
+export type GetV1TokensErrors = {
+  /**
+   * Bad request
+   */
+  400: unknown;
+  /**
+   * Internal server error
+   */
+  500: unknown;
 };
 
 export type GetV1TokensResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: Array<{
-            /**
-             * The chain ID of a relevant entry
-             */
-            chain_id: number;
-            token_address: string;
-            balance: string;
-            name?: string;
-            symbol?: string;
-            decimals?: number;
-        }>;
-    };
+  /**
+   * Successful response
+   */
+  200: {
+    data: Array<{
+      /**
+       * The chain ID of a relevant entry
+       */
+      chain_id: number;
+      token_address: string;
+      balance: string;
+      name?: string;
+      symbol?: string;
+      decimals?: number;
+    }>;
+  };
 };
 
-export type GetV1TokensResponse = GetV1TokensResponses[keyof GetV1TokensResponses];
+export type GetV1TokensResponse =
+  GetV1TokensResponses[keyof GetV1TokensResponses];
 
 export type GetV1TokensErc721ByOwnerAddressData = {
-    body?: never;
-    path: {
-        ownerAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-    };
-    url: '/v1/tokens/erc721/{ownerAddress}';
-};
-
-export type GetV1TokensErc721ByOwnerAddressErrors = {
+  body?: never;
+  path: {
+    ownerAddress: string;
+  };
+  query?: {
+    /**
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
     /**
-     * Bad request
+     * Whether to include metadata for the tokens
      */
-    400: unknown;
+    metadata?: "true" | "false";
     /**
-     * Internal server error
+     * Whether to resolve metadata IPFS or Arweave links
      */
-    500: unknown;
+    resolve_metadata_links?: "true" | "false";
+  };
+  url: "/v1/tokens/erc721/{ownerAddress}";
+};
+
+export type GetV1TokensErc721ByOwnerAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: unknown;
+  /**
+   * Internal server error
+   */
+  500: unknown;
 };
 
 export type GetV1TokensErc721ByOwnerAddressResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: Array<{
-            /**
-             * The chain ID of a relevant entry
-             */
-            chain_id: number;
-            token_address: string;
-            token_id: string;
-            balance: string;
-            name?: string;
-            description?: string;
-            image_url?: string;
-            video_url?: string;
-            animation_url?: string;
-            background_color?: string;
-            external_url?: string;
-            status?: string;
-            metadata_url?: string;
-            owner_addresses?: Array<string>;
-            extra_metadata?: {
-                [key: string]: unknown;
-            } & {
-                attributes?: Array<{
-                    trait_type: string;
-                    value: string | number;
-                    display_type?: string;
-                }> | {
-                    [key: string]: unknown;
-                };
-                properties?: {
-                    [key: string]: unknown;
-                };
-            };
-            collection?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                banner_image_url?: string;
-                featured_image_url?: string;
-                external_link?: string;
-            };
-            contract?: {
-                /**
-                 * The chain ID of a relevant entry
-                 */
-                chain_id: number;
-                address: string;
-                name?: string;
-                symbol?: string;
-                type?: 'erc721' | 'erc1155';
+  /**
+   * Successful response
+   */
+  200: {
+    data: Array<{
+      /**
+       * The chain ID of a relevant entry
+       */
+      chain_id: number;
+      token_address: string;
+      token_id: string;
+      balance: string;
+      name?: string;
+      description?: string;
+      image_url?: string;
+      video_url?: string;
+      animation_url?: string;
+      background_color?: string;
+      external_url?: string;
+      status?: string;
+      metadata_url?: string;
+      owner_addresses?: Array<string>;
+      extra_metadata?: {
+        [key: string]: unknown;
+      } & {
+        attributes?:
+          | Array<{
+              trait_type: string;
+              value: string | number;
+              display_type?: string;
+            }>
+          | {
+              [key: string]: unknown;
             };
-        }>;
-    };
+        properties?: {
+          [key: string]: unknown;
+        };
+      };
+      collection?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        banner_image_url?: string;
+        featured_image_url?: string;
+        external_link?: string;
+      };
+      contract?: {
+        /**
+         * The chain ID of a relevant entry
+         */
+        chain_id: number;
+        address: string;
+        name?: string;
+        symbol?: string;
+        type?: "erc721" | "erc1155";
+      };
+    }>;
+  };
 };
 
-export type GetV1TokensErc721ByOwnerAddressResponse = GetV1TokensErc721ByOwnerAddressResponses[keyof GetV1TokensErc721ByOwnerAddressResponses];
+export type GetV1TokensErc721ByOwnerAddressResponse =
+  GetV1TokensErc721ByOwnerAddressResponses[keyof GetV1TokensErc721ByOwnerAddressResponses];
 
 export type GetV1TokensErc1155ByOwnerAddressData = {
-    body?: never;
-    path: {
-        ownerAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-    };
-    url: '/v1/tokens/erc1155/{ownerAddress}';
-};
-
-export type GetV1TokensErc1155ByOwnerAddressErrors = {
+  body?: never;
+  path: {
+    ownerAddress: string;
+  };
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: unknown;
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+  };
+  url: "/v1/tokens/erc1155/{ownerAddress}";
+};
+
+export type GetV1TokensErc1155ByOwnerAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: unknown;
+  /**
+   * Internal server error
+   */
+  500: unknown;
 };
 
 export type GetV1TokensErc1155ByOwnerAddressResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: Array<{
-            /**
-             * The chain ID of a relevant entry
-             */
-            chain_id: number;
-            token_address: string;
-            token_id: string;
-            balance: string;
-            name?: string;
-            description?: string;
-            image_url?: string;
-            video_url?: string;
-            animation_url?: string;
-            background_color?: string;
-            external_url?: string;
-            status?: string;
-            metadata_url?: string;
-            owner_addresses?: Array<string>;
-            extra_metadata?: {
-                [key: string]: unknown;
-            } & {
-                attributes?: Array<{
-                    trait_type: string;
-                    value: string | number;
-                    display_type?: string;
-                }> | {
-                    [key: string]: unknown;
-                };
-                properties?: {
-                    [key: string]: unknown;
-                };
-            };
-            collection?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                banner_image_url?: string;
-                featured_image_url?: string;
-                external_link?: string;
-            };
-            contract?: {
-                /**
-                 * The chain ID of a relevant entry
-                 */
-                chain_id: number;
-                address: string;
-                name?: string;
-                symbol?: string;
-                type?: 'erc721' | 'erc1155';
+  /**
+   * Successful response
+   */
+  200: {
+    data: Array<{
+      /**
+       * The chain ID of a relevant entry
+       */
+      chain_id: number;
+      token_address: string;
+      token_id: string;
+      balance: string;
+      name?: string;
+      description?: string;
+      image_url?: string;
+      video_url?: string;
+      animation_url?: string;
+      background_color?: string;
+      external_url?: string;
+      status?: string;
+      metadata_url?: string;
+      owner_addresses?: Array<string>;
+      extra_metadata?: {
+        [key: string]: unknown;
+      } & {
+        attributes?:
+          | Array<{
+              trait_type: string;
+              value: string | number;
+              display_type?: string;
+            }>
+          | {
+              [key: string]: unknown;
             };
-        }>;
-    };
+        properties?: {
+          [key: string]: unknown;
+        };
+      };
+      collection?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        banner_image_url?: string;
+        featured_image_url?: string;
+        external_link?: string;
+      };
+      contract?: {
+        /**
+         * The chain ID of a relevant entry
+         */
+        chain_id: number;
+        address: string;
+        name?: string;
+        symbol?: string;
+        type?: "erc721" | "erc1155";
+      };
+    }>;
+  };
 };
 
-export type GetV1TokensErc1155ByOwnerAddressResponse = GetV1TokensErc1155ByOwnerAddressResponses[keyof GetV1TokensErc1155ByOwnerAddressResponses];
+export type GetV1TokensErc1155ByOwnerAddressResponse =
+  GetV1TokensErc1155ByOwnerAddressResponses[keyof GetV1TokensErc1155ByOwnerAddressResponses];
 
 export type GetV1TokensPriceSupportedData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-    };
-    url: '/v1/tokens/price/supported';
-};
-
-export type GetV1TokensPriceSupportedErrors = {
+  body?: never;
+  path?: never;
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: unknown;
+    chain_id?: Array<number>;
+  };
+  url: "/v1/tokens/price/supported";
+};
+
+export type GetV1TokensPriceSupportedErrors = {
+  /**
+   * Bad request
+   */
+  400: unknown;
+  /**
+   * Internal server error
+   */
+  500: unknown;
 };
 
 export type GetV1TokensPriceSupportedResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: Array<{
-            /**
-             * The chain ID of a relevant entry
-             */
-            chain_id: number;
-            address: string;
-            symbol?: string;
-        }>;
-    };
+  /**
+   * Successful response
+   */
+  200: {
+    data: Array<{
+      /**
+       * The chain ID of a relevant entry
+       */
+      chain_id: number;
+      address: string;
+      symbol?: string;
+    }>;
+  };
 };
 
-export type GetV1TokensPriceSupportedResponse = GetV1TokensPriceSupportedResponses[keyof GetV1TokensPriceSupportedResponses];
+export type GetV1TokensPriceSupportedResponse =
+  GetV1TokensPriceSupportedResponses[keyof GetV1TokensPriceSupportedResponses];
 
 export type GetV1TokensPriceData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The address of the token to get the price for
-         */
-        address?: Array<string> | string;
-        /**
-         * The symbol of the token to get the price for
-         */
-        symbol?: Array<string> | (string | null) | unknown;
-        /**
-         * Timestamp in seconds or milliseconds
-         */
-        timestamp?: number;
-        /**
-         * Whether to include historical token prices
-         */
-        include_historical_prices?: 'true' | 'false';
-        /**
-         * Whether to include the number of holders
-         */
-        include_holders?: 'true' | 'false';
-    };
-    url: '/v1/tokens/price';
-};
-
-export type GetV1TokensPriceErrors = {
+  body?: never;
+  path?: never;
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: unknown;
-};
-
-export type GetV1TokensPriceResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: Array<{
-            /**
-             * The chain ID of a relevant entry
-             */
-            chain_id: number;
-            address: string;
-            symbol?: string;
-            /**
-             * Precise price in USD
-             */
-            price_usd: number;
-            /**
-             * Price in USD cents
-             */
-            price_usd_cents: number;
-            /**
-             * Percent change in price over the last 24 hours
-             */
-            percent_change_24h: number;
-            /**
-             * Volume in USD over the last 24 hours
-             */
-            volume_24h_usd: number;
-            /**
-             * Percent change in volume over the last 24 hours
-             */
-            volume_change_24h: number;
-            /**
-             * Market cap in USD
-             */
-            market_cap_usd: number;
-            historical_prices?: Array<{
-                /**
-                 * Date of price
-                 */
-                date: string;
-                /**
-                 * Price in USD
-                 */
-                price_usd: number;
-                /**
-                 * Price in USD cents
-                 */
-                price_usd_cents: number;
-            }>;
-            /**
-             * Number of holders
-             */
-            holders?: number;
-        }>;
-    };
-};
-
-export type GetV1TokensPriceResponse = GetV1TokensPriceResponses[keyof GetV1TokensPriceResponses];
-
-export type GetV1TokensLookupData = {
-    body?: never;
-    path?: never;
-    query: {
-        /**
-         * The symbol(s) of the token to lookup. You can specify multiple symbols, up to a maximum of 10.
-         * Use repeated query parameters, e.g., `?symbol=ETH&symbol=USDC`.
-         */
-        symbol: Array<string> | string;
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-    };
-    url: '/v1/tokens/lookup';
-};
-
-export type GetV1TokensLookupErrors = {
+    chain_id?: Array<number>;
     /**
-     * Bad request
+     * The address of the token to get the price for
      */
-    400: unknown;
+    address?: Array<string> | string;
     /**
-     * Internal server error
+     * The symbol of the token to get the price for
      */
-    500: unknown;
-};
-
-export type GetV1TokensLookupResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data: Array<{
-            /**
-             * The chain ID of a relevant entry
-             */
-            chain_id: number;
-            token_address: string;
-            name?: string;
-            symbol?: string;
-            decimals?: number;
-        }>;
-    };
-};
-
-export type GetV1TokensLookupResponse = GetV1TokensLookupResponses[keyof GetV1TokensLookupResponses];
-
-export type GetV1ResolveByInputData = {
-    body?: never;
-    path: {
-        /**
-         * Can be a block number, transaction or block hash, address, event signature or function selector
-         */
-        input: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-    };
-    url: '/v1/resolve/{input}';
-};
-
-export type GetV1ResolveByInputErrors = {
+    symbol?: Array<string> | (string | null) | unknown;
     /**
-     * Bad request
+     * Timestamp in seconds or milliseconds
      */
-    400: {
-        error: string;
-    };
+    timestamp?: number;
     /**
-     * Internal server error
+     * Whether to include historical token prices
      */
-    500: {
-        error: string;
-    };
-};
-
-export type GetV1ResolveByInputError = GetV1ResolveByInputErrors[keyof GetV1ResolveByInputErrors];
-
-export type GetV1ResolveByInputResponses = {
+    include_historical_prices?: "true" | "false";
     /**
-     * Successful response
-     */
-    200: {
-        data?: {
-            blocks?: Array<{
-                chain_id: number;
-                block_number: number;
-                block_hash: string;
-                parent_hash: string;
-                block_timestamp: number;
-                nonce: string;
-                sha3_uncles: string;
-                mix_hash: string;
-                miner: string;
-                state_root: string;
-                transactions_root: string;
-                receipts_root: string;
-                logs_bloom: string;
-                size: number;
-                extra_data: string;
-                difficulty: string;
-                total_difficulty: string;
-                transaction_count: number;
-                gas_limit: number;
-                gas_used: number;
-                withdrawals_root: string;
-                base_fee_per_gas: number;
-            }>;
-            transactions?: Array<{
-                chain_id: number;
-                block_number: string;
-                block_hash: string;
-                block_timestamp: string;
-                hash: string;
-                nonce: number;
-                transaction_index: number;
-                from_address: string;
-                to_address: string;
-                value: number;
-                gas_price: number;
-                gas: number;
-                function_selector: string;
-                data: string;
-                max_fee_per_gas: number;
-                max_priority_fee_per_gas: number;
-                transaction_type: number;
-                r: number;
-                s: number;
-                v: number;
-                access_list_json?: string;
-                contract_address?: string;
-                gas_used?: number;
-                cumulative_gas_used?: number;
-                effective_gas_price?: number;
-                blob_gas_used?: number;
-                blob_gas_price?: number;
-                logs_bloom?: string;
-                status?: number;
-            }>;
-            events?: Array<{
-                chain_id: number;
-                block_number: string;
-                block_hash: string;
-                block_timestamp: string;
-                transaction_hash: string;
-                transaction_index: number;
-                log_index: number;
-                address: string;
-                data: string;
-                topics: Array<string>;
-            }>;
-            address?: string;
-            type: 'block' | 'transaction' | 'event_signature' | 'function_signature' | 'address' | 'contract' | 'unknown';
-        };
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
-        };
-    };
+     * Whether to include the number of holders
+     */
+    include_holders?: "true" | "false";
+  };
+  url: "/v1/tokens/price";
 };
 
-export type GetV1ResolveByInputResponse = GetV1ResolveByInputResponses[keyof GetV1ResolveByInputResponses];
-
-export type GetV1BlocksData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Filter by block number
-         */
-        filter_block_number?: number | null;
-        /**
-         * Filter by block number greater than or equal to
-         */
-        filter_block_number_gte?: number | null;
-        /**
-         * Filter by block number greater than
-         */
-        filter_block_number_gt?: number | null;
-        /**
-         * Filter by block number less than or equal to
-         */
-        filter_block_number_lte?: number | null;
-        /**
-         * Filter by block number less than
-         */
-        filter_block_number_lt?: number | null;
-        /**
-         * Filter by block timestamp
-         */
-        filter_block_timestamp?: number | null;
-        /**
-         * Filter by block timestamp greater than or equal to
-         */
-        filter_block_timestamp_gte?: number | null;
-        /**
-         * Filter by block timestamp greater than
-         */
-        filter_block_timestamp_gt?: number | null;
-        /**
-         * Filter by block timestamp less than or equal to
-         */
-        filter_block_timestamp_lte?: number | null;
-        /**
-         * Filter by block timestamp less than
-         */
-        filter_block_timestamp_lt?: number | null;
-        /**
-         * Field to sort results by
-         */
-        sort_by?: 'block_number' | string;
-        /**
-         * Sort order (asc or desc)
-         */
-        sort_order?: 'asc' | 'desc';
-        /**
-         * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
-         */
-        group_by?: unknown;
-        /**
-         * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
-         */
-        aggregate?: unknown;
-        /**
-         * Filter by hash
-         */
-        filter_hash?: string;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-    };
-    url: '/v1/blocks';
+export type GetV1TokensPriceErrors = {
+  /**
+   * Bad request
+   */
+  400: unknown;
+  /**
+   * Internal server error
+   */
+  500: unknown;
 };
 
-export type GetV1BlocksErrors = {
+export type GetV1TokensPriceResponses = {
+  /**
+   * Successful response
+   */
+  200: {
+    data: Array<{
+      /**
+       * The chain ID of a relevant entry
+       */
+      chain_id: number;
+      address: string;
+      symbol?: string;
+      /**
+       * Precise price in USD
+       */
+      price_usd: number;
+      /**
+       * Price in USD cents
+       */
+      price_usd_cents: number;
+      /**
+       * Percent change in price over the last 24 hours
+       */
+      percent_change_24h: number;
+      /**
+       * Volume in USD over the last 24 hours
+       */
+      volume_24h_usd: number;
+      /**
+       * Percent change in volume over the last 24 hours
+       */
+      volume_change_24h: number;
+      /**
+       * Market cap in USD
+       */
+      market_cap_usd: number;
+      historical_prices?: Array<{
+        /**
+         * Date of price
+         */
+        date: string;
+        /**
+         * Price in USD
+         */
+        price_usd: number;
+        /**
+         * Price in USD cents
+         */
+        price_usd_cents: number;
+      }>;
+      /**
+       * Number of holders
+       */
+      holders?: number;
+    }>;
+  };
+};
+
+export type GetV1TokensPriceResponse =
+  GetV1TokensPriceResponses[keyof GetV1TokensPriceResponses];
+
+export type GetV1TokensLookupData = {
+  body?: never;
+  path?: never;
+  query: {
     /**
-     * Bad request
+     * The symbol(s) of the token to lookup. You can specify multiple symbols, up to a maximum of 10.
+     * Use repeated query parameters, e.g., `?symbol=ETH&symbol=USDC`.
      */
-    400: {
-        error: string;
-    };
+    symbol: Array<string> | string;
     /**
-     * Internal server error
+     * Use chain_id instead
+     * @deprecated
      */
-    500: {
-        error: string;
-    };
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+  };
+  url: "/v1/tokens/lookup";
 };
 
-export type GetV1BlocksError = GetV1BlocksErrors[keyof GetV1BlocksErrors];
+export type GetV1TokensLookupErrors = {
+  /**
+   * Bad request
+   */
+  400: unknown;
+  /**
+   * Internal server error
+   */
+  500: unknown;
+};
 
-export type GetV1BlocksResponses = {
+export type GetV1TokensLookupResponses = {
+  /**
+   * Successful response
+   */
+  200: {
+    data: Array<{
+      /**
+       * The chain ID of a relevant entry
+       */
+      chain_id: number;
+      token_address: string;
+      name?: string;
+      symbol?: string;
+      decimals?: number;
+    }>;
+  };
+};
+
+export type GetV1TokensLookupResponse =
+  GetV1TokensLookupResponses[keyof GetV1TokensLookupResponses];
+
+export type GetV1ResolveByInputData = {
+  body?: never;
+  path: {
     /**
-     * Successful response
-     */
-    200: {
-        data?: Array<{
-            chain_id: number;
-            block_number: number;
-            block_hash: string;
-            parent_hash: string;
-            block_timestamp: number;
-            nonce: string;
-            sha3_uncles: string;
-            mix_hash: string;
-            miner: string;
-            state_root: string;
-            transactions_root: string;
-            receipts_root: string;
-            logs_bloom: string;
-            size: number;
-            extra_data: string;
-            difficulty: string;
-            total_difficulty: string;
-            transaction_count: number;
-            gas_limit: number;
-            gas_used: number;
-            withdrawals_root: string;
-            base_fee_per_gas: number;
-        }>;
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
-        };
-    };
+     * Can be a block number, transaction or block hash, address, event signature or function selector
+     */
+    input: string;
+  };
+  query?: {
+    /**
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+  };
+  url: "/v1/resolve/{input}";
+};
+
+export type GetV1ResolveByInputErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1BlocksResponse = GetV1BlocksResponses[keyof GetV1BlocksResponses];
+export type GetV1ResolveByInputError =
+  GetV1ResolveByInputErrors[keyof GetV1ResolveByInputErrors];
 
-export type GetV1ContractsAbiByContractAddressData = {
-    body?: never;
-    path: {
-        contractAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-    };
-    url: '/v1/contracts/abi/{contractAddress}';
+export type GetV1ResolveByInputResponses = {
+  /**
+   * Successful response
+   */
+  200: {
+    data?: {
+      blocks?: Array<{
+        chain_id: number;
+        block_number: number;
+        block_hash: string;
+        parent_hash: string;
+        block_timestamp: number;
+        nonce: string;
+        sha3_uncles: string;
+        mix_hash: string;
+        miner: string;
+        state_root: string;
+        transactions_root: string;
+        receipts_root: string;
+        logs_bloom: string;
+        size: number;
+        extra_data: string;
+        difficulty: string;
+        total_difficulty: string;
+        transaction_count: number;
+        gas_limit: number;
+        gas_used: number;
+        withdrawals_root: string;
+        base_fee_per_gas: number;
+      }>;
+      transactions?: Array<{
+        chain_id: number;
+        block_number: string;
+        block_hash: string;
+        block_timestamp: string;
+        hash: string;
+        nonce: number;
+        transaction_index: number;
+        from_address: string;
+        to_address: string;
+        value: number;
+        gas_price: number;
+        gas: number;
+        function_selector: string;
+        data: string;
+        max_fee_per_gas: number;
+        max_priority_fee_per_gas: number;
+        transaction_type: number;
+        r: number;
+        s: number;
+        v: number;
+        access_list_json?: string;
+        contract_address?: string;
+        gas_used?: number;
+        cumulative_gas_used?: number;
+        effective_gas_price?: number;
+        blob_gas_used?: number;
+        blob_gas_price?: number;
+        logs_bloom?: string;
+        status?: number;
+      }>;
+      events?: Array<{
+        chain_id: number;
+        block_number: string;
+        block_hash: string;
+        block_timestamp: string;
+        transaction_hash: string;
+        transaction_index: number;
+        log_index: number;
+        address: string;
+        data: string;
+        topics: Array<string>;
+      }>;
+      address?: string;
+      type:
+        | "block"
+        | "transaction"
+        | "event_signature"
+        | "function_signature"
+        | "address"
+        | "contract"
+        | "unknown";
+    };
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
 };
 
-export type GetV1ContractsAbiByContractAddressErrors = {
+export type GetV1ResolveByInputResponse =
+  GetV1ResolveByInputResponses[keyof GetV1ResolveByInputResponses];
+
+export type GetV1BlocksData = {
+  body?: never;
+  path?: never;
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Not found
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    404: unknown;
+    chain_id?: Array<number>;
     /**
-     * Internal server error
+     * Filter by block number
      */
-    500: {
-        error: string;
-    };
+    filter_block_number?: number | null;
+    /**
+     * Filter by block number greater than or equal to
+     */
+    filter_block_number_gte?: number | null;
+    /**
+     * Filter by block number greater than
+     */
+    filter_block_number_gt?: number | null;
+    /**
+     * Filter by block number less than or equal to
+     */
+    filter_block_number_lte?: number | null;
+    /**
+     * Filter by block number less than
+     */
+    filter_block_number_lt?: number | null;
+    /**
+     * Filter by block timestamp
+     */
+    filter_block_timestamp?: number | null;
+    /**
+     * Filter by block timestamp greater than or equal to
+     */
+    filter_block_timestamp_gte?: number | null;
+    /**
+     * Filter by block timestamp greater than
+     */
+    filter_block_timestamp_gt?: number | null;
+    /**
+     * Filter by block timestamp less than or equal to
+     */
+    filter_block_timestamp_lte?: number | null;
+    /**
+     * Filter by block timestamp less than
+     */
+    filter_block_timestamp_lt?: number | null;
+    /**
+     * Field to sort results by
+     */
+    sort_by?: "block_number" | string;
+    /**
+     * Sort order (asc or desc)
+     */
+    sort_order?: "asc" | "desc";
+    /**
+     * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
+     */
+    group_by?: unknown;
+    /**
+     * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
+     */
+    aggregate?: unknown;
+    /**
+     * Filter by hash
+     */
+    filter_hash?: string;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+  };
+  url: "/v1/blocks";
 };
 
-export type GetV1ContractsAbiByContractAddressError = GetV1ContractsAbiByContractAddressErrors[keyof GetV1ContractsAbiByContractAddressErrors];
+export type GetV1BlocksErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
+};
 
-export type GetV1ContractsAbiByContractAddressResponses = {
+export type GetV1BlocksError = GetV1BlocksErrors[keyof GetV1BlocksErrors];
+
+export type GetV1BlocksResponses = {
+  /**
+   * Successful response
+   */
+  200: {
+    data?: Array<{
+      chain_id: number;
+      block_number: number;
+      block_hash: string;
+      parent_hash: string;
+      block_timestamp: number;
+      nonce: string;
+      sha3_uncles: string;
+      mix_hash: string;
+      miner: string;
+      state_root: string;
+      transactions_root: string;
+      receipts_root: string;
+      logs_bloom: string;
+      size: number;
+      extra_data: string;
+      difficulty: string;
+      total_difficulty: string;
+      transaction_count: number;
+      gas_limit: number;
+      gas_used: number;
+      withdrawals_root: string;
+      base_fee_per_gas: number;
+    }>;
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
+};
+
+export type GetV1BlocksResponse =
+  GetV1BlocksResponses[keyof GetV1BlocksResponses];
+
+export type GetV1ContractsAbiByContractAddressData = {
+  body?: never;
+  path: {
+    contractAddress: string;
+  };
+  query?: {
     /**
-     * Success
+     * Use chain_id instead
+     * @deprecated
      */
-    200: {
-        [key: string]: unknown;
-    };
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+  };
+  url: "/v1/contracts/abi/{contractAddress}";
 };
 
-export type GetV1ContractsAbiByContractAddressResponse = GetV1ContractsAbiByContractAddressResponses[keyof GetV1ContractsAbiByContractAddressResponses];
+export type GetV1ContractsAbiByContractAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
+};
 
-export type GetV1ContractsMetadataByContractAddressData = {
-    body?: never;
-    path: {
-        contractAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-    };
-    url: '/v1/contracts/metadata/{contractAddress}';
+export type GetV1ContractsAbiByContractAddressError =
+  GetV1ContractsAbiByContractAddressErrors[keyof GetV1ContractsAbiByContractAddressErrors];
+
+export type GetV1ContractsAbiByContractAddressResponses = {
+  /**
+   * Success
+   */
+  200: {
+    [key: string]: unknown;
+  };
 };
 
-export type GetV1ContractsMetadataByContractAddressErrors = {
+export type GetV1ContractsAbiByContractAddressResponse =
+  GetV1ContractsAbiByContractAddressResponses[keyof GetV1ContractsAbiByContractAddressResponses];
+
+export type GetV1ContractsMetadataByContractAddressData = {
+  body?: never;
+  path: {
+    contractAddress: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+  };
+  url: "/v1/contracts/metadata/{contractAddress}";
+};
+
+export type GetV1ContractsMetadataByContractAddressErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1ContractsMetadataByContractAddressError = GetV1ContractsMetadataByContractAddressErrors[keyof GetV1ContractsMetadataByContractAddressErrors];
+export type GetV1ContractsMetadataByContractAddressError =
+  GetV1ContractsMetadataByContractAddressErrors[keyof GetV1ContractsMetadataByContractAddressErrors];
 
 export type GetV1ContractsMetadataByContractAddressResponses = {
-    /**
-     * Success
-     */
-    200: {
-        [key: string]: unknown;
-    };
+  /**
+   * Success
+   */
+  200: {
+    [key: string]: unknown;
+  };
 };
 
-export type GetV1ContractsMetadataByContractAddressResponse = GetV1ContractsMetadataByContractAddressResponses[keyof GetV1ContractsMetadataByContractAddressResponses];
+export type GetV1ContractsMetadataByContractAddressResponse =
+  GetV1ContractsMetadataByContractAddressResponses[keyof GetV1ContractsMetadataByContractAddressResponses];
 
 export type PostV1DecodeByContractAddressData = {
-    body?: {
-        transactions?: Array<{
-            data: string;
-        }>;
-        logs?: Array<{
-            data?: string;
-            topics: Array<string>;
-        }>;
-    };
-    path: {
-        contractAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-    };
-    url: '/v1/decode/{contractAddress}';
-};
-
-export type PostV1DecodeByContractAddressErrors = {
-    /**
-     * Bad request
-     */
-    400: {
-        error: string;
-    };
+  body?: {
+    transactions?: Array<{
+      data: string;
+    }>;
+    logs?: Array<{
+      data?: string;
+      topics: Array<string>;
+    }>;
+  };
+  path: {
+    contractAddress: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+  };
+  url: "/v1/decode/{contractAddress}";
 };
 
-export type PostV1DecodeByContractAddressError = PostV1DecodeByContractAddressErrors[keyof PostV1DecodeByContractAddressErrors];
+export type PostV1DecodeByContractAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
+};
+
+export type PostV1DecodeByContractAddressError =
+  PostV1DecodeByContractAddressErrors[keyof PostV1DecodeByContractAddressErrors];
 
 export type PostV1DecodeByContractAddressResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data?: {
-            transactions?: Array<{
-                data: string;
-                function_name?: string;
-                args?: Array<unknown>;
-            }>;
-            logs?: Array<{
-                data?: string;
-                topics: Array<string>;
-                event_name?: string;
-                args?: Array<unknown>;
-            }>;
-        };
-    };
+  /**
+   * Success
+   */
+  200: {
+    data?: {
+      transactions?: Array<{
+        data: string;
+        function_name?: string;
+        args?: Array<unknown>;
+      }>;
+      logs?: Array<{
+        data?: string;
+        topics: Array<string>;
+        event_name?: string;
+        args?: Array<unknown>;
+      }>;
+    };
+  };
 };
 
-export type PostV1DecodeByContractAddressResponse = PostV1DecodeByContractAddressResponses[keyof PostV1DecodeByContractAddressResponses];
+export type PostV1DecodeByContractAddressResponse =
+  PostV1DecodeByContractAddressResponses[keyof PostV1DecodeByContractAddressResponses];
 
 export type GetV1NftsBalanceByOwnerAddressData = {
-    body?: never;
-    path: {
-        ownerAddress: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-        /**
-         * The types of NFTs to include in the response
-         */
-        token_types?: Array<'erc1155' | 'erc721'>;
-    };
-    url: '/v1/nfts/balance/{ownerAddress}';
-};
-
-export type GetV1NftsBalanceByOwnerAddressErrors = {
+  body?: never;
+  path: {
+    ownerAddress: string;
+  };
+  query?: {
+    /**
+     * Use chain_id instead
+     * @deprecated
+     */
+    chain?: Array<number>;
+    /**
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
+     */
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
     /**
-     * Bad request
+     * Whether to resolve metadata IPFS or Arweave links
      */
-    400: unknown;
+    resolve_metadata_links?: "true" | "false";
     /**
-     * Internal server error
+     * The types of NFTs to include in the response
      */
-    500: unknown;
+    token_types?: Array<"erc1155" | "erc721">;
+  };
+  url: "/v1/nfts/balance/{ownerAddress}";
+};
+
+export type GetV1NftsBalanceByOwnerAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: unknown;
+  /**
+   * Internal server error
+   */
+  500: unknown;
 };
 
 export type GetV1NftsBalanceByOwnerAddressResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            /**
-             * The chain ID of a relevant entry
-             */
-            chain_id: number;
-            token_address: string;
-            token_id: string;
-            balance: string;
-            name?: string;
-            description?: string;
-            image_url?: string;
-            video_url?: string;
-            animation_url?: string;
-            background_color?: string;
-            external_url?: string;
-            status?: string;
-            metadata_url?: string;
-            owner_addresses?: Array<string>;
-            extra_metadata?: {
-                [key: string]: unknown;
-            } & {
-                attributes?: Array<{
-                    trait_type: string;
-                    value: string | number;
-                    display_type?: string;
-                }> | {
-                    [key: string]: unknown;
-                };
-                properties?: {
-                    [key: string]: unknown;
-                };
-            };
-            collection?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                banner_image_url?: string;
-                featured_image_url?: string;
-                external_link?: string;
-            };
-            contract?: {
-                /**
-                 * The chain ID of a relevant entry
-                 */
-                chain_id: number;
-                address: string;
-                name?: string;
-                symbol?: string;
-                type?: 'erc721' | 'erc1155';
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      /**
+       * The chain ID of a relevant entry
+       */
+      chain_id: number;
+      token_address: string;
+      token_id: string;
+      balance: string;
+      name?: string;
+      description?: string;
+      image_url?: string;
+      video_url?: string;
+      animation_url?: string;
+      background_color?: string;
+      external_url?: string;
+      status?: string;
+      metadata_url?: string;
+      owner_addresses?: Array<string>;
+      extra_metadata?: {
+        [key: string]: unknown;
+      } & {
+        attributes?:
+          | Array<{
+              trait_type: string;
+              value: string | number;
+              display_type?: string;
+            }>
+          | {
+              [key: string]: unknown;
             };
-        }>;
-    };
+        properties?: {
+          [key: string]: unknown;
+        };
+      };
+      collection?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        banner_image_url?: string;
+        featured_image_url?: string;
+        external_link?: string;
+      };
+      contract?: {
+        /**
+         * The chain ID of a relevant entry
+         */
+        chain_id: number;
+        address: string;
+        name?: string;
+        symbol?: string;
+        type?: "erc721" | "erc1155";
+      };
+    }>;
+  };
 };
 
-export type GetV1NftsBalanceByOwnerAddressResponse = GetV1NftsBalanceByOwnerAddressResponses[keyof GetV1NftsBalanceByOwnerAddressResponses];
+export type GetV1NftsBalanceByOwnerAddressResponse =
+  GetV1NftsBalanceByOwnerAddressResponses[keyof GetV1NftsBalanceByOwnerAddressResponses];
 
 export type GetV1NftsCollectionsByContractAddressData = {
-    body?: never;
-    path: {
-        contract_address: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Whether to include stats for the collection
-         */
-        include_stats?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-    };
-    url: '/v1/nfts/collections/{contract_address}';
-};
-
-export type GetV1NftsCollectionsByContractAddressErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+  };
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * Whether to include stats for the collection
+     */
+    include_stats?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+  };
+  url: "/v1/nfts/collections/{contract_address}";
 };
 
-export type GetV1NftsCollectionsByContractAddressError = GetV1NftsCollectionsByContractAddressErrors[keyof GetV1NftsCollectionsByContractAddressErrors];
+export type GetV1NftsCollectionsByContractAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
+};
+
+export type GetV1NftsCollectionsByContractAddressError =
+  GetV1NftsCollectionsByContractAddressErrors[keyof GetV1NftsCollectionsByContractAddressErrors];
 
 export type GetV1NftsCollectionsByContractAddressResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            name?: string;
-            description?: string;
-            image_url?: string;
-            banner_image_url?: string;
-            featured_image_url?: string;
-            external_link?: string;
-            stats?: {
-                owner_count: number;
-                token_count: number;
-                mint_count: number;
-                total_quantity: number;
-            };
-        }>;
-    };
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      name?: string;
+      description?: string;
+      image_url?: string;
+      banner_image_url?: string;
+      featured_image_url?: string;
+      external_link?: string;
+      stats?: {
+        owner_count: number;
+        token_count: number;
+        mint_count: number;
+        total_quantity: number;
+      };
+    }>;
+  };
 };
 
-export type GetV1NftsCollectionsByContractAddressResponse = GetV1NftsCollectionsByContractAddressResponses[keyof GetV1NftsCollectionsByContractAddressResponses];
+export type GetV1NftsCollectionsByContractAddressResponse =
+  GetV1NftsCollectionsByContractAddressResponses[keyof GetV1NftsCollectionsByContractAddressResponses];
 
 export type GetV1NftsData = {
-    body?: never;
-    path?: never;
-    query: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-        owner_address: string;
-    };
-    url: '/v1/nfts';
-};
-
-export type GetV1NftsErrors = {
+  body?: never;
+  path?: never;
+  query: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+    owner_address: string;
+  };
+  url: "/v1/nfts";
+};
+
+export type GetV1NftsErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
 export type GetV1NftsError = GetV1NftsErrors[keyof GetV1NftsErrors];
 
 export type GetV1NftsResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            name?: string;
-            description?: string;
-            image_url?: string;
-            video_url?: string;
-            animation_url?: string;
-            background_color?: string;
-            external_url?: string;
-            status?: string;
-            metadata_url?: string;
-            extra_metadata?: {
-                [key: string]: unknown;
-            } & {
-                attributes?: Array<{
-                    trait_type: string;
-                    value: string | number;
-                    display_type?: string;
-                }> | {
-                    [key: string]: unknown;
-                };
-                properties?: {
-                    [key: string]: unknown;
-                };
-            };
-            collection?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                banner_image_url?: string;
-                featured_image_url?: string;
-                external_link?: string;
-            };
-            contract?: {
-                /**
-                 * The chain ID of a relevant entry
-                 */
-                chain_id: number;
-                address: string;
-                name?: string;
-                symbol?: string;
-                type?: 'erc721' | 'erc1155';
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      name?: string;
+      description?: string;
+      image_url?: string;
+      video_url?: string;
+      animation_url?: string;
+      background_color?: string;
+      external_url?: string;
+      status?: string;
+      metadata_url?: string;
+      extra_metadata?: {
+        [key: string]: unknown;
+      } & {
+        attributes?:
+          | Array<{
+              trait_type: string;
+              value: string | number;
+              display_type?: string;
+            }>
+          | {
+              [key: string]: unknown;
             };
-            chain_id: number;
-            contract_address: string;
-            token_id: string;
-            token_type: string;
-            balance?: string;
-        }>;
-    };
+        properties?: {
+          [key: string]: unknown;
+        };
+      };
+      collection?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        banner_image_url?: string;
+        featured_image_url?: string;
+        external_link?: string;
+      };
+      contract?: {
+        /**
+         * The chain ID of a relevant entry
+         */
+        chain_id: number;
+        address: string;
+        name?: string;
+        symbol?: string;
+        type?: "erc721" | "erc1155";
+      };
+      chain_id: number;
+      contract_address: string;
+      token_id: string;
+      token_type: string;
+      balance?: string;
+    }>;
+  };
 };
 
 export type GetV1NftsResponse = GetV1NftsResponses[keyof GetV1NftsResponses];
 
 export type GetV1NftsOwnersByContractAddressData = {
-    body?: never;
-    path: {
-        contract_address: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Control if the result is an array of addresses only or an array of objects containing the address and balance
-         */
-        include_balances?: 'true' | 'false';
-    };
-    url: '/v1/nfts/owners/{contract_address}';
-};
-
-export type GetV1NftsOwnersByContractAddressErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Control if the result is an array of addresses only or an array of objects containing the address and balance
+     */
+    include_balances?: "true" | "false";
+  };
+  url: "/v1/nfts/owners/{contract_address}";
+};
+
+export type GetV1NftsOwnersByContractAddressErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsOwnersByContractAddressError = GetV1NftsOwnersByContractAddressErrors[keyof GetV1NftsOwnersByContractAddressErrors];
+export type GetV1NftsOwnersByContractAddressError =
+  GetV1NftsOwnersByContractAddressErrors[keyof GetV1NftsOwnersByContractAddressErrors];
 
 export type GetV1NftsOwnersByContractAddressResponses = {
-    /**
-     * Success
-     */
-    200: Array<{
+  /**
+   * Success
+   */
+  200: Array<
+    | {
         chain_id: string;
         token_address: string;
         owner_address: string;
         token_id: string;
         balance: string;
-    } | {
+      }
+    | {
         chain_id: string;
         owner_addresses: Array<string>;
-    }>;
+      }
+  >;
 };
 
-export type GetV1NftsOwnersByContractAddressResponse = GetV1NftsOwnersByContractAddressResponses[keyof GetV1NftsOwnersByContractAddressResponses];
+export type GetV1NftsOwnersByContractAddressResponse =
+  GetV1NftsOwnersByContractAddressResponses[keyof GetV1NftsOwnersByContractAddressResponses];
 
 export type GetV1NftsOwnersByContractAddressByTokenIdData = {
-    body?: never;
-    path: {
-        contract_address: string;
-        token_id: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Control if the result is an array of addresses only or an array of objects containing the address and balance
-         */
-        include_balances?: 'true' | 'false';
-    };
-    url: '/v1/nfts/owners/{contract_address}/{token_id}';
-};
-
-export type GetV1NftsOwnersByContractAddressByTokenIdErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+    token_id: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Control if the result is an array of addresses only or an array of objects containing the address and balance
+     */
+    include_balances?: "true" | "false";
+  };
+  url: "/v1/nfts/owners/{contract_address}/{token_id}";
+};
+
+export type GetV1NftsOwnersByContractAddressByTokenIdErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsOwnersByContractAddressByTokenIdError = GetV1NftsOwnersByContractAddressByTokenIdErrors[keyof GetV1NftsOwnersByContractAddressByTokenIdErrors];
+export type GetV1NftsOwnersByContractAddressByTokenIdError =
+  GetV1NftsOwnersByContractAddressByTokenIdErrors[keyof GetV1NftsOwnersByContractAddressByTokenIdErrors];
 
 export type GetV1NftsOwnersByContractAddressByTokenIdResponses = {
-    /**
-     * Success
-     */
-    200: Array<{
+  /**
+   * Success
+   */
+  200: Array<
+    | {
         chain_id: string;
         token_address: string;
         owner_address: string;
         token_id: string;
         balance: string;
-    } | {
+      }
+    | {
         chain_id: string;
         owner_addresses: Array<string>;
-    }>;
+      }
+  >;
 };
 
-export type GetV1NftsOwnersByContractAddressByTokenIdResponse = GetV1NftsOwnersByContractAddressByTokenIdResponses[keyof GetV1NftsOwnersByContractAddressByTokenIdResponses];
+export type GetV1NftsOwnersByContractAddressByTokenIdResponse =
+  GetV1NftsOwnersByContractAddressByTokenIdResponses[keyof GetV1NftsOwnersByContractAddressByTokenIdResponses];
 
 export type GetV1NftsTransfersData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to include sale details for NFT transfers
-         */
-        sales?: 'true' | 'false';
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-        /**
-         * Filter by block number greater than or equal to
-         */
-        block_number_from?: number | string;
-        /**
-         * Filter by block number less than or equal to
-         */
-        block_number_to?: number | string;
-        /**
-         * The types of tokens to include in the response. Can be an empty array to include all types
-         */
-        token_types?: Array<'erc1155' | 'erc721' | 'erc20'>;
-        owner_address?: string;
-    };
-    url: '/v1/nfts/transfers';
-};
-
-export type GetV1NftsTransfersErrors = {
+  body?: never;
+  path?: never;
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to include sale details for NFT transfers
+     */
+    sales?: "true" | "false";
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+    /**
+     * Filter by block number greater than or equal to
+     */
+    block_number_from?: number | string;
+    /**
+     * Filter by block number less than or equal to
+     */
+    block_number_to?: number | string;
+    /**
+     * The types of tokens to include in the response. Can be an empty array to include all types
+     */
+    token_types?: Array<"erc1155" | "erc721" | "erc20">;
+    owner_address?: string;
+  };
+  url: "/v1/nfts/transfers";
+};
+
+export type GetV1NftsTransfersErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsTransfersError = GetV1NftsTransfersErrors[keyof GetV1NftsTransfersErrors];
+export type GetV1NftsTransfersError =
+  GetV1NftsTransfersErrors[keyof GetV1NftsTransfersErrors];
 
 export type GetV1NftsTransfersResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            token_id: string;
-            chain_id: number;
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc721' | 'erc1155';
-            amount: string;
-            nft_metadata?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                video_url?: string;
-                animation_url?: string;
-                background_color?: string;
-                external_url?: string;
-                status?: string;
-                metadata_url?: string;
-                owner_addresses?: Array<string>;
-                extra_metadata?: {
-                    [key: string]: unknown;
-                } & {
-                    attributes?: Array<{
-                        trait_type: string;
-                        value: string | number;
-                        display_type?: string;
-                    }> | {
-                        [key: string]: unknown;
-                    };
-                    properties?: {
-                        [key: string]: unknown;
-                    };
-                };
-                collection?: {
-                    name?: string;
-                    description?: string;
-                    image_url?: string;
-                    banner_image_url?: string;
-                    featured_image_url?: string;
-                    external_link?: string;
-                };
-                contract?: {
-                    /**
-                     * The chain ID of a relevant entry
-                     */
-                    chain_id: number;
-                    address: string;
-                    name?: string;
-                    symbol?: string;
-                    type?: 'erc721' | 'erc1155';
-                };
-            };
-            nft_sale?: {
-                transaction_hash: string;
-                items_sold: Array<{
-                    token_address: string;
-                    token_id: string;
-                    amount: string;
-                    token_type: string;
-                    from_address?: string;
-                    to_address?: string;
-                }>;
-                payment: Array<{
-                    token_address: string;
-                    token_id: string;
-                    amount: string;
-                    token_type: string;
-                    from_address?: string;
-                    to_address?: string;
-                }>;
-                marketplace_address: string;
-                marketplace_name: string;
-            };
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      token_id: string;
+      chain_id: number;
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc721" | "erc1155";
+      amount: string;
+      nft_metadata?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        video_url?: string;
+        animation_url?: string;
+        background_color?: string;
+        external_url?: string;
+        status?: string;
+        metadata_url?: string;
+        owner_addresses?: Array<string>;
+        extra_metadata?: {
+          [key: string]: unknown;
+        } & {
+          attributes?:
+            | Array<{
+                trait_type: string;
+                value: string | number;
+                display_type?: string;
+              }>
+            | {
+                [key: string]: unknown;
+              };
+          properties?: {
+            [key: string]: unknown;
+          };
+        };
+        collection?: {
+          name?: string;
+          description?: string;
+          image_url?: string;
+          banner_image_url?: string;
+          featured_image_url?: string;
+          external_link?: string;
+        };
+        contract?: {
+          /**
+           * The chain ID of a relevant entry
+           */
+          chain_id: number;
+          address: string;
+          name?: string;
+          symbol?: string;
+          type?: "erc721" | "erc1155";
+        };
+      };
+      nft_sale?: {
+        transaction_hash: string;
+        items_sold: Array<{
+          token_address: string;
+          token_id: string;
+          amount: string;
+          token_type: string;
+          from_address?: string;
+          to_address?: string;
         }>;
-    };
+        payment: Array<{
+          token_address: string;
+          token_id: string;
+          amount: string;
+          token_type: string;
+          from_address?: string;
+          to_address?: string;
+        }>;
+        marketplace_address: string;
+        marketplace_name: string;
+      };
+    }>;
+  };
 };
 
-export type GetV1NftsTransfersResponse = GetV1NftsTransfersResponses[keyof GetV1NftsTransfersResponses];
+export type GetV1NftsTransfersResponse =
+  GetV1NftsTransfersResponses[keyof GetV1NftsTransfersResponses];
 
 export type GetV1NftsTransfersTransactionByTransactionHashData = {
-    body?: never;
-    path: {
-        transaction_hash: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to include sale details for NFT transfers
-         */
-        sales?: 'true' | 'false';
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-        /**
-         * The types of tokens to include in the response. Can be an empty array to include all types
-         */
-        token_types?: Array<'erc1155' | 'erc721' | 'erc20'>;
-    };
-    url: '/v1/nfts/transfers/transaction/{transaction_hash}';
-};
-
-export type GetV1NftsTransfersTransactionByTransactionHashErrors = {
+  body?: never;
+  path: {
+    transaction_hash: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to include sale details for NFT transfers
+     */
+    sales?: "true" | "false";
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+    /**
+     * The types of tokens to include in the response. Can be an empty array to include all types
+     */
+    token_types?: Array<"erc1155" | "erc721" | "erc20">;
+  };
+  url: "/v1/nfts/transfers/transaction/{transaction_hash}";
 };
 
-export type GetV1NftsTransfersTransactionByTransactionHashError = GetV1NftsTransfersTransactionByTransactionHashErrors[keyof GetV1NftsTransfersTransactionByTransactionHashErrors];
+export type GetV1NftsTransfersTransactionByTransactionHashErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
+};
+
+export type GetV1NftsTransfersTransactionByTransactionHashError =
+  GetV1NftsTransfersTransactionByTransactionHashErrors[keyof GetV1NftsTransfersTransactionByTransactionHashErrors];
 
 export type GetV1NftsTransfersTransactionByTransactionHashResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            token_id: string;
-            chain_id: number;
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc721' | 'erc1155';
-            amount: string;
-            nft_metadata?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                video_url?: string;
-                animation_url?: string;
-                background_color?: string;
-                external_url?: string;
-                status?: string;
-                metadata_url?: string;
-                owner_addresses?: Array<string>;
-                extra_metadata?: {
-                    [key: string]: unknown;
-                } & {
-                    attributes?: Array<{
-                        trait_type: string;
-                        value: string | number;
-                        display_type?: string;
-                    }> | {
-                        [key: string]: unknown;
-                    };
-                    properties?: {
-                        [key: string]: unknown;
-                    };
-                };
-                collection?: {
-                    name?: string;
-                    description?: string;
-                    image_url?: string;
-                    banner_image_url?: string;
-                    featured_image_url?: string;
-                    external_link?: string;
-                };
-                contract?: {
-                    /**
-                     * The chain ID of a relevant entry
-                     */
-                    chain_id: number;
-                    address: string;
-                    name?: string;
-                    symbol?: string;
-                    type?: 'erc721' | 'erc1155';
-                };
-            };
-            nft_sale?: {
-                transaction_hash: string;
-                items_sold: Array<{
-                    token_address: string;
-                    token_id: string;
-                    amount: string;
-                    token_type: string;
-                    from_address?: string;
-                    to_address?: string;
-                }>;
-                payment: Array<{
-                    token_address: string;
-                    token_id: string;
-                    amount: string;
-                    token_type: string;
-                    from_address?: string;
-                    to_address?: string;
-                }>;
-                marketplace_address: string;
-                marketplace_name: string;
-            };
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      token_id: string;
+      chain_id: number;
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc721" | "erc1155";
+      amount: string;
+      nft_metadata?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        video_url?: string;
+        animation_url?: string;
+        background_color?: string;
+        external_url?: string;
+        status?: string;
+        metadata_url?: string;
+        owner_addresses?: Array<string>;
+        extra_metadata?: {
+          [key: string]: unknown;
+        } & {
+          attributes?:
+            | Array<{
+                trait_type: string;
+                value: string | number;
+                display_type?: string;
+              }>
+            | {
+                [key: string]: unknown;
+              };
+          properties?: {
+            [key: string]: unknown;
+          };
+        };
+        collection?: {
+          name?: string;
+          description?: string;
+          image_url?: string;
+          banner_image_url?: string;
+          featured_image_url?: string;
+          external_link?: string;
+        };
+        contract?: {
+          /**
+           * The chain ID of a relevant entry
+           */
+          chain_id: number;
+          address: string;
+          name?: string;
+          symbol?: string;
+          type?: "erc721" | "erc1155";
+        };
+      };
+      nft_sale?: {
+        transaction_hash: string;
+        items_sold: Array<{
+          token_address: string;
+          token_id: string;
+          amount: string;
+          token_type: string;
+          from_address?: string;
+          to_address?: string;
         }>;
-    };
+        payment: Array<{
+          token_address: string;
+          token_id: string;
+          amount: string;
+          token_type: string;
+          from_address?: string;
+          to_address?: string;
+        }>;
+        marketplace_address: string;
+        marketplace_name: string;
+      };
+    }>;
+  };
 };
 
-export type GetV1NftsTransfersTransactionByTransactionHashResponse = GetV1NftsTransfersTransactionByTransactionHashResponses[keyof GetV1NftsTransfersTransactionByTransactionHashResponses];
+export type GetV1NftsTransfersTransactionByTransactionHashResponse =
+  GetV1NftsTransfersTransactionByTransactionHashResponses[keyof GetV1NftsTransfersTransactionByTransactionHashResponses];
 
 export type GetV1NftsTransfersByContractAddressData = {
-    body?: never;
-    path: {
-        contract_address: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to include sale details for NFT transfers
-         */
-        sales?: 'true' | 'false';
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-    };
-    url: '/v1/nfts/transfers/{contract_address}';
-};
-
-export type GetV1NftsTransfersByContractAddressErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to include sale details for NFT transfers
+     */
+    sales?: "true" | "false";
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+  };
+  url: "/v1/nfts/transfers/{contract_address}";
+};
+
+export type GetV1NftsTransfersByContractAddressErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsTransfersByContractAddressError = GetV1NftsTransfersByContractAddressErrors[keyof GetV1NftsTransfersByContractAddressErrors];
+export type GetV1NftsTransfersByContractAddressError =
+  GetV1NftsTransfersByContractAddressErrors[keyof GetV1NftsTransfersByContractAddressErrors];
 
 export type GetV1NftsTransfersByContractAddressResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            token_id: string;
-            chain_id: number;
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc721' | 'erc1155';
-            amount: string;
-            nft_metadata?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                video_url?: string;
-                animation_url?: string;
-                background_color?: string;
-                external_url?: string;
-                status?: string;
-                metadata_url?: string;
-                owner_addresses?: Array<string>;
-                extra_metadata?: {
-                    [key: string]: unknown;
-                } & {
-                    attributes?: Array<{
-                        trait_type: string;
-                        value: string | number;
-                        display_type?: string;
-                    }> | {
-                        [key: string]: unknown;
-                    };
-                    properties?: {
-                        [key: string]: unknown;
-                    };
-                };
-                collection?: {
-                    name?: string;
-                    description?: string;
-                    image_url?: string;
-                    banner_image_url?: string;
-                    featured_image_url?: string;
-                    external_link?: string;
-                };
-                contract?: {
-                    /**
-                     * The chain ID of a relevant entry
-                     */
-                    chain_id: number;
-                    address: string;
-                    name?: string;
-                    symbol?: string;
-                    type?: 'erc721' | 'erc1155';
-                };
-            };
-            nft_sale?: {
-                transaction_hash: string;
-                items_sold: Array<{
-                    token_address: string;
-                    token_id: string;
-                    amount: string;
-                    token_type: string;
-                    from_address?: string;
-                    to_address?: string;
-                }>;
-                payment: Array<{
-                    token_address: string;
-                    token_id: string;
-                    amount: string;
-                    token_type: string;
-                    from_address?: string;
-                    to_address?: string;
-                }>;
-                marketplace_address: string;
-                marketplace_name: string;
-            };
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      token_id: string;
+      chain_id: number;
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc721" | "erc1155";
+      amount: string;
+      nft_metadata?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        video_url?: string;
+        animation_url?: string;
+        background_color?: string;
+        external_url?: string;
+        status?: string;
+        metadata_url?: string;
+        owner_addresses?: Array<string>;
+        extra_metadata?: {
+          [key: string]: unknown;
+        } & {
+          attributes?:
+            | Array<{
+                trait_type: string;
+                value: string | number;
+                display_type?: string;
+              }>
+            | {
+                [key: string]: unknown;
+              };
+          properties?: {
+            [key: string]: unknown;
+          };
+        };
+        collection?: {
+          name?: string;
+          description?: string;
+          image_url?: string;
+          banner_image_url?: string;
+          featured_image_url?: string;
+          external_link?: string;
+        };
+        contract?: {
+          /**
+           * The chain ID of a relevant entry
+           */
+          chain_id: number;
+          address: string;
+          name?: string;
+          symbol?: string;
+          type?: "erc721" | "erc1155";
+        };
+      };
+      nft_sale?: {
+        transaction_hash: string;
+        items_sold: Array<{
+          token_address: string;
+          token_id: string;
+          amount: string;
+          token_type: string;
+          from_address?: string;
+          to_address?: string;
         }>;
-    };
+        payment: Array<{
+          token_address: string;
+          token_id: string;
+          amount: string;
+          token_type: string;
+          from_address?: string;
+          to_address?: string;
+        }>;
+        marketplace_address: string;
+        marketplace_name: string;
+      };
+    }>;
+  };
 };
 
-export type GetV1NftsTransfersByContractAddressResponse = GetV1NftsTransfersByContractAddressResponses[keyof GetV1NftsTransfersByContractAddressResponses];
+export type GetV1NftsTransfersByContractAddressResponse =
+  GetV1NftsTransfersByContractAddressResponses[keyof GetV1NftsTransfersByContractAddressResponses];
 
 export type GetV1NftsByContractAddressData = {
-    body?: never;
-    path: {
-        contract_address: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-    };
-    url: '/v1/nfts/{contract_address}';
-};
-
-export type GetV1NftsByContractAddressErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+  };
+  url: "/v1/nfts/{contract_address}";
+};
+
+export type GetV1NftsByContractAddressErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsByContractAddressError = GetV1NftsByContractAddressErrors[keyof GetV1NftsByContractAddressErrors];
+export type GetV1NftsByContractAddressError =
+  GetV1NftsByContractAddressErrors[keyof GetV1NftsByContractAddressErrors];
 
 export type GetV1NftsByContractAddressResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            name?: string;
-            description?: string;
-            image_url?: string;
-            video_url?: string;
-            animation_url?: string;
-            background_color?: string;
-            external_url?: string;
-            status?: string;
-            metadata_url?: string;
-            owner_addresses: Array<string>;
-            extra_metadata?: {
-                [key: string]: unknown;
-            } & {
-                attributes?: Array<{
-                    trait_type: string;
-                    value: string | number;
-                    display_type?: string;
-                }> | {
-                    [key: string]: unknown;
-                };
-                properties?: {
-                    [key: string]: unknown;
-                };
-            };
-            collection?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                banner_image_url?: string;
-                featured_image_url?: string;
-                external_link?: string;
-            };
-            contract?: {
-                /**
-                 * The chain ID of a relevant entry
-                 */
-                chain_id: number;
-                address: string;
-                name?: string;
-                symbol?: string;
-                type?: 'erc721' | 'erc1155';
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      name?: string;
+      description?: string;
+      image_url?: string;
+      video_url?: string;
+      animation_url?: string;
+      background_color?: string;
+      external_url?: string;
+      status?: string;
+      metadata_url?: string;
+      owner_addresses: Array<string>;
+      extra_metadata?: {
+        [key: string]: unknown;
+      } & {
+        attributes?:
+          | Array<{
+              trait_type: string;
+              value: string | number;
+              display_type?: string;
+            }>
+          | {
+              [key: string]: unknown;
             };
-            chain_id: number;
-            contract_address: string;
-            token_id: string;
-            token_type: string;
-            balance?: string;
-        }>;
-    };
+        properties?: {
+          [key: string]: unknown;
+        };
+      };
+      collection?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        banner_image_url?: string;
+        featured_image_url?: string;
+        external_link?: string;
+      };
+      contract?: {
+        /**
+         * The chain ID of a relevant entry
+         */
+        chain_id: number;
+        address: string;
+        name?: string;
+        symbol?: string;
+        type?: "erc721" | "erc1155";
+      };
+      chain_id: number;
+      contract_address: string;
+      token_id: string;
+      token_type: string;
+      balance?: string;
+    }>;
+  };
 };
 
-export type GetV1NftsByContractAddressResponse = GetV1NftsByContractAddressResponses[keyof GetV1NftsByContractAddressResponses];
+export type GetV1NftsByContractAddressResponse =
+  GetV1NftsByContractAddressResponses[keyof GetV1NftsByContractAddressResponses];
 
 export type GetV1NftsTransfersByContractAddressByTokenIdData = {
-    body?: never;
-    path: {
-        contract_address: string;
-        token_id: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-        /**
-         * Whether to include metadata for the tokens
-         */
-        metadata?: 'true' | 'false';
-        /**
-         * Whether to include sale details for NFT transfers
-         */
-        sales?: 'true' | 'false';
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-    };
-    url: '/v1/nfts/transfers/{contract_address}/{token_id}';
-};
-
-export type GetV1NftsTransfersByContractAddressByTokenIdErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+    token_id: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+    /**
+     * Whether to include metadata for the tokens
+     */
+    metadata?: "true" | "false";
+    /**
+     * Whether to include sale details for NFT transfers
+     */
+    sales?: "true" | "false";
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+  };
+  url: "/v1/nfts/transfers/{contract_address}/{token_id}";
+};
+
+export type GetV1NftsTransfersByContractAddressByTokenIdErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsTransfersByContractAddressByTokenIdError = GetV1NftsTransfersByContractAddressByTokenIdErrors[keyof GetV1NftsTransfersByContractAddressByTokenIdErrors];
+export type GetV1NftsTransfersByContractAddressByTokenIdError =
+  GetV1NftsTransfersByContractAddressByTokenIdErrors[keyof GetV1NftsTransfersByContractAddressByTokenIdErrors];
 
 export type GetV1NftsTransfersByContractAddressByTokenIdResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            token_id: string;
-            chain_id: number;
-            block_number: string;
-            block_hash?: string;
-            block_timestamp: string;
-            transaction_hash: string;
-            from_address: string;
-            to_address: string;
-            log_index: number;
-            contract_address: string;
-            transfer_type: 'mint' | 'sale' | 'transfer';
-            token_type: 'erc721' | 'erc1155';
-            amount: string;
-            nft_metadata?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                video_url?: string;
-                animation_url?: string;
-                background_color?: string;
-                external_url?: string;
-                status?: string;
-                metadata_url?: string;
-                owner_addresses?: Array<string>;
-                extra_metadata?: {
-                    [key: string]: unknown;
-                } & {
-                    attributes?: Array<{
-                        trait_type: string;
-                        value: string | number;
-                        display_type?: string;
-                    }> | {
-                        [key: string]: unknown;
-                    };
-                    properties?: {
-                        [key: string]: unknown;
-                    };
-                };
-                collection?: {
-                    name?: string;
-                    description?: string;
-                    image_url?: string;
-                    banner_image_url?: string;
-                    featured_image_url?: string;
-                    external_link?: string;
-                };
-                contract?: {
-                    /**
-                     * The chain ID of a relevant entry
-                     */
-                    chain_id: number;
-                    address: string;
-                    name?: string;
-                    symbol?: string;
-                    type?: 'erc721' | 'erc1155';
-                };
-            };
-            nft_sale?: {
-                transaction_hash: string;
-                items_sold: Array<{
-                    token_address: string;
-                    token_id: string;
-                    amount: string;
-                    token_type: string;
-                    from_address?: string;
-                    to_address?: string;
-                }>;
-                payment: Array<{
-                    token_address: string;
-                    token_id: string;
-                    amount: string;
-                    token_type: string;
-                    from_address?: string;
-                    to_address?: string;
-                }>;
-                marketplace_address: string;
-                marketplace_name: string;
-            };
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      token_id: string;
+      chain_id: number;
+      block_number: string;
+      block_hash?: string;
+      block_timestamp: string;
+      transaction_hash: string;
+      from_address: string;
+      to_address: string;
+      log_index: number;
+      contract_address: string;
+      transfer_type: "mint" | "sale" | "transfer";
+      token_type: "erc721" | "erc1155";
+      amount: string;
+      nft_metadata?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        video_url?: string;
+        animation_url?: string;
+        background_color?: string;
+        external_url?: string;
+        status?: string;
+        metadata_url?: string;
+        owner_addresses?: Array<string>;
+        extra_metadata?: {
+          [key: string]: unknown;
+        } & {
+          attributes?:
+            | Array<{
+                trait_type: string;
+                value: string | number;
+                display_type?: string;
+              }>
+            | {
+                [key: string]: unknown;
+              };
+          properties?: {
+            [key: string]: unknown;
+          };
+        };
+        collection?: {
+          name?: string;
+          description?: string;
+          image_url?: string;
+          banner_image_url?: string;
+          featured_image_url?: string;
+          external_link?: string;
+        };
+        contract?: {
+          /**
+           * The chain ID of a relevant entry
+           */
+          chain_id: number;
+          address: string;
+          name?: string;
+          symbol?: string;
+          type?: "erc721" | "erc1155";
+        };
+      };
+      nft_sale?: {
+        transaction_hash: string;
+        items_sold: Array<{
+          token_address: string;
+          token_id: string;
+          amount: string;
+          token_type: string;
+          from_address?: string;
+          to_address?: string;
         }>;
-    };
+        payment: Array<{
+          token_address: string;
+          token_id: string;
+          amount: string;
+          token_type: string;
+          from_address?: string;
+          to_address?: string;
+        }>;
+        marketplace_address: string;
+        marketplace_name: string;
+      };
+    }>;
+  };
 };
 
-export type GetV1NftsTransfersByContractAddressByTokenIdResponse = GetV1NftsTransfersByContractAddressByTokenIdResponses[keyof GetV1NftsTransfersByContractAddressByTokenIdResponses];
+export type GetV1NftsTransfersByContractAddressByTokenIdResponse =
+  GetV1NftsTransfersByContractAddressByTokenIdResponses[keyof GetV1NftsTransfersByContractAddressByTokenIdResponses];
 
 export type GetV1NftsByContractAddressByTokenIdData = {
-    body?: never;
-    path: {
-        contract_address: string;
-        token_id: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
-         */
-        include_owners?: 'true' | 'false';
-        /**
-         * Whether to resolve metadata IPFS or Arweave links
-         */
-        resolve_metadata_links?: 'true' | 'false';
-    };
-    url: '/v1/nfts/{contract_address}/{token_id}';
-};
-
-export type GetV1NftsByContractAddressByTokenIdErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+    token_id: string;
+  };
+  query?: {
     /**
-     * Not found
+     * Use chain_id instead
+     * @deprecated
      */
-    404: unknown;
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * Whether to include owner addresses in the NFT metadata (only if metadata is requested)
+     */
+    include_owners?: "true" | "false";
+    /**
+     * Whether to resolve metadata IPFS or Arweave links
+     */
+    resolve_metadata_links?: "true" | "false";
+  };
+  url: "/v1/nfts/{contract_address}/{token_id}";
+};
+
+export type GetV1NftsByContractAddressByTokenIdErrors = {
+  /**
+   * Not found
+   */
+  404: unknown;
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsByContractAddressByTokenIdError = GetV1NftsByContractAddressByTokenIdErrors[keyof GetV1NftsByContractAddressByTokenIdErrors];
+export type GetV1NftsByContractAddressByTokenIdError =
+  GetV1NftsByContractAddressByTokenIdErrors[keyof GetV1NftsByContractAddressByTokenIdErrors];
 
 export type GetV1NftsByContractAddressByTokenIdResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: Array<{
-            name?: string;
-            description?: string;
-            image_url?: string;
-            video_url?: string;
-            animation_url?: string;
-            background_color?: string;
-            external_url?: string;
-            status?: string;
-            metadata_url?: string;
-            owner_addresses: Array<string>;
-            extra_metadata?: {
-                [key: string]: unknown;
-            } & {
-                attributes?: Array<{
-                    trait_type: string;
-                    value: string | number;
-                    display_type?: string;
-                }> | {
-                    [key: string]: unknown;
-                };
-                properties?: {
-                    [key: string]: unknown;
-                };
-            };
-            collection?: {
-                name?: string;
-                description?: string;
-                image_url?: string;
-                banner_image_url?: string;
-                featured_image_url?: string;
-                external_link?: string;
-            };
-            contract?: {
-                /**
-                 * The chain ID of a relevant entry
-                 */
-                chain_id: number;
-                address: string;
-                name?: string;
-                symbol?: string;
-                type?: 'erc721' | 'erc1155';
+  /**
+   * Success
+   */
+  200: {
+    data: Array<{
+      name?: string;
+      description?: string;
+      image_url?: string;
+      video_url?: string;
+      animation_url?: string;
+      background_color?: string;
+      external_url?: string;
+      status?: string;
+      metadata_url?: string;
+      owner_addresses: Array<string>;
+      extra_metadata?: {
+        [key: string]: unknown;
+      } & {
+        attributes?:
+          | Array<{
+              trait_type: string;
+              value: string | number;
+              display_type?: string;
+            }>
+          | {
+              [key: string]: unknown;
             };
-            chain_id: number;
-            contract_address: string;
-            token_id: string;
-            token_type: string;
-            balance?: string;
-        }>;
-    };
+        properties?: {
+          [key: string]: unknown;
+        };
+      };
+      collection?: {
+        name?: string;
+        description?: string;
+        image_url?: string;
+        banner_image_url?: string;
+        featured_image_url?: string;
+        external_link?: string;
+      };
+      contract?: {
+        /**
+         * The chain ID of a relevant entry
+         */
+        chain_id: number;
+        address: string;
+        name?: string;
+        symbol?: string;
+        type?: "erc721" | "erc1155";
+      };
+      chain_id: number;
+      contract_address: string;
+      token_id: string;
+      token_type: string;
+      balance?: string;
+    }>;
+  };
 };
 
-export type GetV1NftsByContractAddressByTokenIdResponse = GetV1NftsByContractAddressByTokenIdResponses[keyof GetV1NftsByContractAddressByTokenIdResponses];
+export type GetV1NftsByContractAddressByTokenIdResponse =
+  GetV1NftsByContractAddressByTokenIdResponses[keyof GetV1NftsByContractAddressByTokenIdResponses];
 
 export type GetV1NftsMetadataRefreshByContractAddressData = {
-    body?: never;
-    path: {
-        contract_address: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-    };
-    url: '/v1/nfts/metadata/refresh/{contract_address}';
-};
-
-export type GetV1NftsMetadataRefreshByContractAddressErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+  };
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+  };
+  url: "/v1/nfts/metadata/refresh/{contract_address}";
+};
+
+export type GetV1NftsMetadataRefreshByContractAddressErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsMetadataRefreshByContractAddressError = GetV1NftsMetadataRefreshByContractAddressErrors[keyof GetV1NftsMetadataRefreshByContractAddressErrors];
+export type GetV1NftsMetadataRefreshByContractAddressError =
+  GetV1NftsMetadataRefreshByContractAddressErrors[keyof GetV1NftsMetadataRefreshByContractAddressErrors];
 
 export type GetV1NftsMetadataRefreshByContractAddressResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: {
-            success: boolean;
-            message: string;
-        };
-    };
+  /**
+   * Success
+   */
+  200: {
+    data: {
+      success: boolean;
+      message: string;
+    };
+  };
 };
 
-export type GetV1NftsMetadataRefreshByContractAddressResponse = GetV1NftsMetadataRefreshByContractAddressResponses[keyof GetV1NftsMetadataRefreshByContractAddressResponses];
+export type GetV1NftsMetadataRefreshByContractAddressResponse =
+  GetV1NftsMetadataRefreshByContractAddressResponses[keyof GetV1NftsMetadataRefreshByContractAddressResponses];
 
 export type GetV1NftsMetadataRefreshByContractAddressByTokenIdData = {
-    body?: never;
-    path: {
-        contract_address: string;
-        token_id: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-    };
-    url: '/v1/nfts/metadata/refresh/{contract_address}/{token_id}';
-};
-
-export type GetV1NftsMetadataRefreshByContractAddressByTokenIdErrors = {
+  body?: never;
+  path: {
+    contract_address: string;
+    token_id: string;
+  };
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+  };
+  url: "/v1/nfts/metadata/refresh/{contract_address}/{token_id}";
+};
+
+export type GetV1NftsMetadataRefreshByContractAddressByTokenIdErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1NftsMetadataRefreshByContractAddressByTokenIdError = GetV1NftsMetadataRefreshByContractAddressByTokenIdErrors[keyof GetV1NftsMetadataRefreshByContractAddressByTokenIdErrors];
+export type GetV1NftsMetadataRefreshByContractAddressByTokenIdError =
+  GetV1NftsMetadataRefreshByContractAddressByTokenIdErrors[keyof GetV1NftsMetadataRefreshByContractAddressByTokenIdErrors];
 
 export type GetV1NftsMetadataRefreshByContractAddressByTokenIdResponses = {
-    /**
-     * Success
-     */
-    200: {
-        data: {
-            success: boolean;
-            message: string;
-        };
-    };
+  /**
+   * Success
+   */
+  200: {
+    data: {
+      success: boolean;
+      message: string;
+    };
+  };
 };
 
-export type GetV1NftsMetadataRefreshByContractAddressByTokenIdResponse = GetV1NftsMetadataRefreshByContractAddressByTokenIdResponses[keyof GetV1NftsMetadataRefreshByContractAddressByTokenIdResponses];
+export type GetV1NftsMetadataRefreshByContractAddressByTokenIdResponse =
+  GetV1NftsMetadataRefreshByContractAddressByTokenIdResponses[keyof GetV1NftsMetadataRefreshByContractAddressByTokenIdResponses];
 
 export type GetV1WalletsByWalletAddressTransactionsData = {
-    body?: never;
-    path: {
-        wallet_address: string;
-    };
-    query?: {
-        /**
-         * Use chain_id instead
-         * @deprecated
-         */
-        chain?: Array<number>;
-        /**
-         * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
-         * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
-         * Optional, because a single chain can as well be specified as a subdomain
-         */
-        chain_id?: Array<number>;
-        /**
-         * Filter by block number
-         */
-        filter_block_number?: number | null;
-        /**
-         * Filter by block number greater than or equal to
-         */
-        filter_block_number_gte?: number | null;
-        /**
-         * Filter by block number greater than
-         */
-        filter_block_number_gt?: number | null;
-        /**
-         * Filter by block number less than or equal to
-         */
-        filter_block_number_lte?: number | null;
-        /**
-         * Filter by block number less than
-         */
-        filter_block_number_lt?: number | null;
-        /**
-         * Filter by block hash
-         */
-        filter_block_hash?: string;
-        /**
-         * Filter by block timestamp
-         */
-        filter_block_timestamp?: number | null;
-        /**
-         * Filter by block timestamp greater than or equal to
-         */
-        filter_block_timestamp_gte?: number | null;
-        /**
-         * Filter by block timestamp greater than
-         */
-        filter_block_timestamp_gt?: number | null;
-        /**
-         * Filter by block timestamp less than or equal to
-         */
-        filter_block_timestamp_lte?: number | null;
-        /**
-         * Filter by block timestamp less than
-         */
-        filter_block_timestamp_lt?: number | null;
-        /**
-         * Field to sort results by
-         */
-        sort_by?: 'block_number' | string;
-        /**
-         * Sort order (asc or desc)
-         */
-        sort_order?: 'asc' | 'desc';
-        /**
-         * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
-         */
-        group_by?: unknown;
-        /**
-         * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
-         */
-        aggregate?: unknown;
-        /**
-         * Filter by transaction index
-         */
-        filter_transaction_index?: number | null;
-        /**
-         * Filter by transaction index greater than or equal to
-         */
-        filter_transaction_index_gte?: number | null;
-        /**
-         * Filter by transaction index greater than
-         */
-        filter_transaction_index_gt?: number | null;
-        /**
-         * Filter by transaction index less than or equal to
-         */
-        filter_transaction_index_lte?: number | null;
-        /**
-         * Filter by transaction index less than
-         */
-        filter_transaction_index_lt?: number | null;
-        /**
-         * Enable ABI decoding of the transactions/events data
-         */
-        decode?: boolean | null;
-        /**
-         * Filter by transaction hash
-         */
-        filter_hash?: string;
-        /**
-         * Filter by value
-         */
-        filter_value?: number | null;
-        /**
-         * Filter by value greater than or equal to
-         */
-        filter_value_gte?: number | null;
-        /**
-         * Filter by value greater than
-         */
-        filter_value_gt?: number | null;
-        /**
-         * Filter by value less than or equal to
-         */
-        filter_value_lte?: number | null;
-        /**
-         * Filter by value less than
-         */
-        filter_value_lt?: number | null;
-        /**
-         * Filter by gas price
-         */
-        filter_gas_price?: number | null;
-        /**
-         * Filter by gas price greater than or equal to
-         */
-        filter_gas_price_gte?: number | null;
-        /**
-         * Filter by gas price greater than
-         */
-        filter_gas_price_gt?: number | null;
-        /**
-         * Filter by gas price less than or equal to
-         */
-        filter_gas_price_lte?: number | null;
-        /**
-         * Filter by gas price less than
-         */
-        filter_gas_price_lt?: number | null;
-        /**
-         * Filter by gas
-         */
-        filter_gas?: number | null;
-        /**
-         * Filter by gas greater than or equal to
-         */
-        filter_gas_gte?: number | null;
-        /**
-         * Filter by gas greater than
-         */
-        filter_gas_gt?: number | null;
-        /**
-         * Filter by gas less than or equal to
-         */
-        filter_gas_lte?: number | null;
-        /**
-         * Filter by gas less than
-         */
-        filter_gas_lt?: number | null;
-        /**
-         * Filter by function selector
-         */
-        filter_function_selector?: string;
-        /**
-         * The number of items to return
-         */
-        limit?: number;
-        page?: number | null;
-    };
-    url: '/v1/wallets/{wallet_address}/transactions';
-};
-
-export type GetV1WalletsByWalletAddressTransactionsErrors = {
+  body?: never;
+  path: {
+    wallet_address: string;
+  };
+  query?: {
     /**
-     * Bad request
+     * Use chain_id instead
+     * @deprecated
      */
-    400: {
-        error: string;
-    };
+    chain?: Array<number>;
     /**
-     * Internal server error
+     * The chain ID(s) to request the data for. You can specify multiple chain IDs, up to a maximum of 50.
+     * Use repeated query parameters, e.g., `?chain_id=20&chain_id=56`.
+     * Optional, because a single chain can as well be specified as a subdomain
      */
-    500: {
-        error: string;
-    };
+    chain_id?: Array<number>;
+    /**
+     * Filter by block number
+     */
+    filter_block_number?: number | null;
+    /**
+     * Filter by block number greater than or equal to
+     */
+    filter_block_number_gte?: number | null;
+    /**
+     * Filter by block number greater than
+     */
+    filter_block_number_gt?: number | null;
+    /**
+     * Filter by block number less than or equal to
+     */
+    filter_block_number_lte?: number | null;
+    /**
+     * Filter by block number less than
+     */
+    filter_block_number_lt?: number | null;
+    /**
+     * Filter by block hash
+     */
+    filter_block_hash?: string;
+    /**
+     * Filter by block timestamp
+     */
+    filter_block_timestamp?: number | null;
+    /**
+     * Filter by block timestamp greater than or equal to
+     */
+    filter_block_timestamp_gte?: number | null;
+    /**
+     * Filter by block timestamp greater than
+     */
+    filter_block_timestamp_gt?: number | null;
+    /**
+     * Filter by block timestamp less than or equal to
+     */
+    filter_block_timestamp_lte?: number | null;
+    /**
+     * Filter by block timestamp less than
+     */
+    filter_block_timestamp_lt?: number | null;
+    /**
+     * Field to sort results by
+     */
+    sort_by?: "block_number" | string;
+    /**
+     * Sort order (asc or desc)
+     */
+    sort_order?: "asc" | "desc";
+    /**
+     * Field(s) to group by. You can specify multiple with repeated query parameters, e.g., ?group_by=chain_id&group_by=block_number
+     */
+    group_by?: unknown;
+    /**
+     * Aggregation(s). You can specify multiple with repeated query parameters, e.g., ?aggregate=count()&aggregate=sum(gas_used)
+     */
+    aggregate?: unknown;
+    /**
+     * Filter by transaction index
+     */
+    filter_transaction_index?: number | null;
+    /**
+     * Filter by transaction index greater than or equal to
+     */
+    filter_transaction_index_gte?: number | null;
+    /**
+     * Filter by transaction index greater than
+     */
+    filter_transaction_index_gt?: number | null;
+    /**
+     * Filter by transaction index less than or equal to
+     */
+    filter_transaction_index_lte?: number | null;
+    /**
+     * Filter by transaction index less than
+     */
+    filter_transaction_index_lt?: number | null;
+    /**
+     * Enable ABI decoding of the transactions/events data
+     */
+    decode?: boolean | null;
+    /**
+     * Filter by transaction hash
+     */
+    filter_hash?: string;
+    /**
+     * Filter by value
+     */
+    filter_value?: number | null;
+    /**
+     * Filter by value greater than or equal to
+     */
+    filter_value_gte?: number | null;
+    /**
+     * Filter by value greater than
+     */
+    filter_value_gt?: number | null;
+    /**
+     * Filter by value less than or equal to
+     */
+    filter_value_lte?: number | null;
+    /**
+     * Filter by value less than
+     */
+    filter_value_lt?: number | null;
+    /**
+     * Filter by gas price
+     */
+    filter_gas_price?: number | null;
+    /**
+     * Filter by gas price greater than or equal to
+     */
+    filter_gas_price_gte?: number | null;
+    /**
+     * Filter by gas price greater than
+     */
+    filter_gas_price_gt?: number | null;
+    /**
+     * Filter by gas price less than or equal to
+     */
+    filter_gas_price_lte?: number | null;
+    /**
+     * Filter by gas price less than
+     */
+    filter_gas_price_lt?: number | null;
+    /**
+     * Filter by gas
+     */
+    filter_gas?: number | null;
+    /**
+     * Filter by gas greater than or equal to
+     */
+    filter_gas_gte?: number | null;
+    /**
+     * Filter by gas greater than
+     */
+    filter_gas_gt?: number | null;
+    /**
+     * Filter by gas less than or equal to
+     */
+    filter_gas_lte?: number | null;
+    /**
+     * Filter by gas less than
+     */
+    filter_gas_lt?: number | null;
+    /**
+     * Filter by function selector
+     */
+    filter_function_selector?: string;
+    /**
+     * The number of items to return
+     */
+    limit?: number;
+    page?: number | null;
+  };
+  url: "/v1/wallets/{wallet_address}/transactions";
+};
+
+export type GetV1WalletsByWalletAddressTransactionsErrors = {
+  /**
+   * Bad request
+   */
+  400: {
+    error: string;
+  };
+  /**
+   * Internal server error
+   */
+  500: {
+    error: string;
+  };
 };
 
-export type GetV1WalletsByWalletAddressTransactionsError = GetV1WalletsByWalletAddressTransactionsErrors[keyof GetV1WalletsByWalletAddressTransactionsErrors];
+export type GetV1WalletsByWalletAddressTransactionsError =
+  GetV1WalletsByWalletAddressTransactionsErrors[keyof GetV1WalletsByWalletAddressTransactionsErrors];
 
 export type GetV1WalletsByWalletAddressTransactionsResponses = {
-    /**
-     * Successful response
-     */
-    200: {
-        data?: Array<{
-            chain_id: number;
-            block_number: string;
-            block_hash: string;
-            block_timestamp: string;
-            hash: string;
-            nonce: number;
-            transaction_index: number;
-            from_address: string;
-            to_address: string;
-            value: number;
-            gas_price: number;
-            gas: number;
-            function_selector: string;
-            data: string;
-            max_fee_per_gas: number;
-            max_priority_fee_per_gas: number;
-            transaction_type: number;
-            r: number;
-            s: number;
-            v: number;
-            access_list_json?: string;
-            contract_address?: string;
-            gas_used?: number;
-            cumulative_gas_used?: number;
-            effective_gas_price?: number;
-            blob_gas_used?: number;
-            blob_gas_price?: number;
-            logs_bloom?: string;
-            status?: number;
-            decoded?: {
-                name: string;
-                signature: string;
-                inputs?: {
-                    [key: string]: unknown;
-                };
-            };
-            /**
-             * @deprecated
-             */
-            decodedData?: {
-                name: string;
-                signature: string;
-                inputs?: {
-                    [key: string]: unknown;
-                };
-            };
-        }>;
-        aggregations?: unknown;
-        meta: {
-            chain_ids: Array<number>;
-            address?: string;
-            signature?: string;
-            page: number;
-            limit_per_chain: number;
-            total_items: number;
-            total_pages: number;
+  /**
+   * Successful response
+   */
+  200: {
+    data?: Array<{
+      chain_id: number;
+      block_number: string;
+      block_hash: string;
+      block_timestamp: string;
+      hash: string;
+      nonce: number;
+      transaction_index: number;
+      from_address: string;
+      to_address: string;
+      value: number;
+      gas_price: number;
+      gas: number;
+      function_selector: string;
+      data: string;
+      max_fee_per_gas: number;
+      max_priority_fee_per_gas: number;
+      transaction_type: number;
+      r: number;
+      s: number;
+      v: number;
+      access_list_json?: string;
+      contract_address?: string;
+      gas_used?: number;
+      cumulative_gas_used?: number;
+      effective_gas_price?: number;
+      blob_gas_used?: number;
+      blob_gas_price?: number;
+      logs_bloom?: string;
+      status?: number;
+      decoded?: {
+        name: string;
+        signature: string;
+        inputs?: {
+          [key: string]: unknown;
         };
-    };
+      };
+      /**
+       * @deprecated
+       */
+      decodedData?: {
+        name: string;
+        signature: string;
+        inputs?: {
+          [key: string]: unknown;
+        };
+      };
+    }>;
+    aggregations?: unknown;
+    meta: {
+      chain_ids: Array<number>;
+      address?: string;
+      signature?: string;
+      page: number;
+      limit_per_chain: number;
+      total_items: number;
+      total_pages: number;
+    };
+  };
 };
 
-export type GetV1WalletsByWalletAddressTransactionsResponse = GetV1WalletsByWalletAddressTransactionsResponses[keyof GetV1WalletsByWalletAddressTransactionsResponses];
+export type GetV1WalletsByWalletAddressTransactionsResponse =
+  GetV1WalletsByWalletAddressTransactionsResponses[keyof GetV1WalletsByWalletAddressTransactionsResponses];
 
 export type ClientOptions = {
-    baseUrl: 'https://{chainId}.insight.thirdweb.com/' | (string & {});
-};
\ No newline at end of file
+  baseUrl: "https://{chainId}.insight.thirdweb.com/" | (string & {});
+};
diff --git a/packages/insight/src/exports/thirdweb.ts b/packages/insight/src/exports/thirdweb.ts
index c25ad75083b..c3339d73b5e 100644
--- a/packages/insight/src/exports/thirdweb.ts
+++ b/packages/insight/src/exports/thirdweb.ts
@@ -1,3 +1,3 @@
-export * from "../client/index.js";
 export type { CreateClientConfig } from "../client/client.gen.js";
+export * from "../client/index.js";
 export { configure, type InsightClientOptions } from "../configure.js";
diff --git a/packages/insight/tsconfig.base.json b/packages/insight/tsconfig.base.json
index 2b519cac7ea..25c55988d49 100644
--- a/packages/insight/tsconfig.base.json
+++ b/packages/insight/tsconfig.base.json
@@ -1,47 +1,48 @@
 {
   // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
-  "include": [],
   "compilerOptions": {
     // Incremental builds
     // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
-    "incremental": false,
-
-    // Type checking
-    "strict": true,
-    "useDefineForClassFields": true, // Not enabled by default in `strict` mode unless we bump `target` to ES2022.
-    "noFallthroughCasesInSwitch": true, // Not enabled by default in `strict` mode.
-    "noImplicitReturns": true, // Not enabled by default in `strict` mode.
-    "useUnknownInCatchVariables": true, // TODO: This would normally be enabled in `strict` mode but would require some adjustments to the codebase.
-    "noImplicitOverride": true, // Not enabled by default in `strict` mode.
-    "noUnusedLocals": true, // Not enabled by default in `strict` mode.
-    "noUnusedParameters": true, // Not enabled by default in `strict` mode.
-    "exactOptionalPropertyTypes": false, // Not enabled by default in `strict` mode.
-    "noUncheckedIndexedAccess": true, // Not enabled by default in `strict` mode.
-
-    // JavaScript support
     "allowJs": false,
+    "allowSyntheticDefaultImports": true,
     "checkJs": false,
 
     // Interop constraints
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
+    "exactOptionalPropertyTypes": false,
     "forceConsistentCasingInFileNames": true,
-    "verbatimModuleSyntax": true,
-    "importHelpers": true, // This is only used for build validation. Since we do not have `tslib` installed, this will fail if we accidentally make use of anything that'd require injection of helpers.
+    "importHelpers": true,
+    // Incremental builds
+    // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
+    "incremental": false,
 
-    // Language and environment
-    "moduleResolution": "NodeNext",
-    "module": "NodeNext",
-    "target": "ES2021", // Setting this to `ES2021` enables native support for `Node v16+`: https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping.
+    // jsx for "/react" portion
+    "jsx": "react-jsx",
     "lib": [
       "ES2022", // By using ES2022 we get access to the `.cause` property on `Error` instances.
       "DOM" // We are adding `DOM` here to get the `fetch`, etc. types. This should be removed once these types are available via DefinitelyTyped.
     ],
+    "module": "NodeNext",
+
+    // Language and environment
+    "moduleResolution": "NodeNext",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
 
     // Skip type checking for node modules
     "skipLibCheck": true,
 
-    // jsx for "/react" portion
-    "jsx": "react-jsx"
-  }
+    // Type checking
+    "strict": true,
+    "target": "ES2021",
+    "useDefineForClassFields": true,
+    "useUnknownInCatchVariables": true,
+    "verbatimModuleSyntax": true
+  },
+  // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
+  "include": []
 }
diff --git a/packages/insight/tsconfig.build.json b/packages/insight/tsconfig.build.json
index 3ae3943df87..63325457c67 100644
--- a/packages/insight/tsconfig.build.json
+++ b/packages/insight/tsconfig.build.json
@@ -1,6 +1,9 @@
 {
-  "extends": "./tsconfig.base.json",
-  "include": ["src"],
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "rootDir": "./src",
+    "sourceMap": true
+  },
   "exclude": [
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
@@ -8,9 +11,6 @@
     "src/**/*.bench.ts",
     "src/**/*.macro.ts"
   ],
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.base.json",
+  "include": ["src"]
 }
diff --git a/packages/insight/tsconfig.json b/packages/insight/tsconfig.json
index f8b525d0c97..ce67da4c61d 100644
--- a/packages/insight/tsconfig.json
+++ b/packages/insight/tsconfig.json
@@ -1,13 +1,12 @@
 {
   // This configuration is used for local development and type checking.
-  "extends": "./tsconfig.base.json",
-  "include": ["src", "test"],
-  "exclude": [],
-  // "references": [{ "path": "./scripts/tsconfig.json" }],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
       "~test/*": ["./test/src/*"]
     }
-  }
+  },
+  "exclude": [],
+  "extends": "./tsconfig.base.json",
+  "include": ["src", "test"]
 }
diff --git a/packages/react-native-adapter/biome.json b/packages/react-native-adapter/biome.json
new file mode 100644
index 00000000000..780bbdcd1af
--- /dev/null
+++ b/packages/react-native-adapter/biome.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
+}
diff --git a/packages/react-native-adapter/package.json b/packages/react-native-adapter/package.json
index 307ce6cf53c..1156f762d9a 100644
--- a/packages/react-native-adapter/package.json
+++ b/packages/react-native-adapter/package.json
@@ -1,29 +1,8 @@
 {
-  "name": "@thirdweb-dev/react-native-adapter",
-  "version": "1.5.4",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/thirdweb-dev/js.git#main"
-  },
-  "license": "Apache-2.0",
+  "author": "thirdweb eng <eng@thirdweb.com>",
   "bugs": {
     "url": "https://github.com/thirdweb-dev/js/issues"
   },
-  "author": "thirdweb eng <eng@thirdweb.com>",
-  "type": "module",
-  "main": "./dist/cjs/exports/thirdweb.js",
-  "module": "./dist/esm/exports/thirdweb.js",
-  "types": "./dist/types/exports/thirdweb.d.ts",
-  "typings": "./dist/types/exports/thirdweb.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/types/exports/thirdweb.d.ts",
-      "import": "./dist/esm/exports/thirdweb.js",
-      "default": "./dist/cjs/exports/thirdweb.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": ["dist/*", "src/*"],
   "dependencies": {
     "@aws-sdk/client-kms": "3.592.0",
     "@aws-sdk/client-lambda": "3.592.0",
@@ -33,7 +12,27 @@
   "devDependencies": {
     "rimraf": "6.0.1"
   },
+  "engines": {
+    "node": ">=18"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/types/exports/thirdweb.d.ts",
+      "import": "./dist/esm/exports/thirdweb.js",
+      "default": "./dist/cjs/exports/thirdweb.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "dist/*",
+    "src/*"
+  ],
+  "license": "Apache-2.0",
+  "main": "./dist/cjs/exports/thirdweb.js",
+  "module": "./dist/esm/exports/thirdweb.js",
+  "name": "@thirdweb-dev/react-native-adapter",
   "peerDependencies": {
+    "@biomejs/biome": "2.0.0",
     "@coinbase/wallet-mobile-sdk": "^1",
     "@react-native-async-storage/async-storage": "^1 || ^2",
     "@react-native-community/netinfo": "^11",
@@ -53,17 +52,22 @@
       "optional": true
     }
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thirdweb-dev/js.git#main"
+  },
   "scripts": {
-    "format": "biome format ./src --write",
-    "lint": "biome check ./src",
-    "fix": "biome check ./src --fix",
     "build": "pnpm clean && pnpm build:cjs && pnpm build:esm && pnpm build:types",
     "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
     "build:esm": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
     "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
-    "clean": "rimraf dist"
+    "clean": "rimraf dist",
+    "fix": "biome check ./src --fix",
+    "format": "biome format ./src --write",
+    "lint": "biome check ./src"
   },
-  "engines": {
-    "node": ">=18"
-  }
+  "type": "module",
+  "types": "./dist/types/exports/thirdweb.d.ts",
+  "typings": "./dist/types/exports/thirdweb.d.ts",
+  "version": "1.5.4"
 }
diff --git a/packages/react-native-adapter/src/shims.ts b/packages/react-native-adapter/src/shims.ts
index 0a972bced90..925a7338f06 100644
--- a/packages/react-native-adapter/src/shims.ts
+++ b/packages/react-native-adapter/src/shims.ts
@@ -1,4 +1,5 @@
 import "@walletconnect/react-native-compat";
 // crypto polyfill
 import { install } from "react-native-quick-crypto";
+
 install();
diff --git a/packages/react-native-adapter/tsconfig.base.json b/packages/react-native-adapter/tsconfig.base.json
index 2b519cac7ea..25c55988d49 100644
--- a/packages/react-native-adapter/tsconfig.base.json
+++ b/packages/react-native-adapter/tsconfig.base.json
@@ -1,47 +1,48 @@
 {
   // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
-  "include": [],
   "compilerOptions": {
     // Incremental builds
     // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
-    "incremental": false,
-
-    // Type checking
-    "strict": true,
-    "useDefineForClassFields": true, // Not enabled by default in `strict` mode unless we bump `target` to ES2022.
-    "noFallthroughCasesInSwitch": true, // Not enabled by default in `strict` mode.
-    "noImplicitReturns": true, // Not enabled by default in `strict` mode.
-    "useUnknownInCatchVariables": true, // TODO: This would normally be enabled in `strict` mode but would require some adjustments to the codebase.
-    "noImplicitOverride": true, // Not enabled by default in `strict` mode.
-    "noUnusedLocals": true, // Not enabled by default in `strict` mode.
-    "noUnusedParameters": true, // Not enabled by default in `strict` mode.
-    "exactOptionalPropertyTypes": false, // Not enabled by default in `strict` mode.
-    "noUncheckedIndexedAccess": true, // Not enabled by default in `strict` mode.
-
-    // JavaScript support
     "allowJs": false,
+    "allowSyntheticDefaultImports": true,
     "checkJs": false,
 
     // Interop constraints
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
+    "exactOptionalPropertyTypes": false,
     "forceConsistentCasingInFileNames": true,
-    "verbatimModuleSyntax": true,
-    "importHelpers": true, // This is only used for build validation. Since we do not have `tslib` installed, this will fail if we accidentally make use of anything that'd require injection of helpers.
+    "importHelpers": true,
+    // Incremental builds
+    // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
+    "incremental": false,
 
-    // Language and environment
-    "moduleResolution": "NodeNext",
-    "module": "NodeNext",
-    "target": "ES2021", // Setting this to `ES2021` enables native support for `Node v16+`: https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping.
+    // jsx for "/react" portion
+    "jsx": "react-jsx",
     "lib": [
       "ES2022", // By using ES2022 we get access to the `.cause` property on `Error` instances.
       "DOM" // We are adding `DOM` here to get the `fetch`, etc. types. This should be removed once these types are available via DefinitelyTyped.
     ],
+    "module": "NodeNext",
+
+    // Language and environment
+    "moduleResolution": "NodeNext",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
 
     // Skip type checking for node modules
     "skipLibCheck": true,
 
-    // jsx for "/react" portion
-    "jsx": "react-jsx"
-  }
+    // Type checking
+    "strict": true,
+    "target": "ES2021",
+    "useDefineForClassFields": true,
+    "useUnknownInCatchVariables": true,
+    "verbatimModuleSyntax": true
+  },
+  // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
+  "include": []
 }
diff --git a/packages/react-native-adapter/tsconfig.build.json b/packages/react-native-adapter/tsconfig.build.json
index 3ae3943df87..63325457c67 100644
--- a/packages/react-native-adapter/tsconfig.build.json
+++ b/packages/react-native-adapter/tsconfig.build.json
@@ -1,6 +1,9 @@
 {
-  "extends": "./tsconfig.base.json",
-  "include": ["src"],
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "rootDir": "./src",
+    "sourceMap": true
+  },
   "exclude": [
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
@@ -8,9 +11,6 @@
     "src/**/*.bench.ts",
     "src/**/*.macro.ts"
   ],
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.base.json",
+  "include": ["src"]
 }
diff --git a/packages/react-native-adapter/tsconfig.json b/packages/react-native-adapter/tsconfig.json
index f8b525d0c97..ce67da4c61d 100644
--- a/packages/react-native-adapter/tsconfig.json
+++ b/packages/react-native-adapter/tsconfig.json
@@ -1,13 +1,12 @@
 {
   // This configuration is used for local development and type checking.
-  "extends": "./tsconfig.base.json",
-  "include": ["src", "test"],
-  "exclude": [],
-  // "references": [{ "path": "./scripts/tsconfig.json" }],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
       "~test/*": ["./test/src/*"]
     }
-  }
+  },
+  "exclude": [],
+  "extends": "./tsconfig.base.json",
+  "include": ["src", "test"]
 }
diff --git a/packages/service-utils/biome.json b/packages/service-utils/biome.json
new file mode 100644
index 00000000000..780bbdcd1af
--- /dev/null
+++ b/packages/service-utils/biome.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
+}
diff --git a/packages/service-utils/package.json b/packages/service-utils/package.json
index b32ef49a75e..b250289c1e4 100644
--- a/packages/service-utils/package.json
+++ b/packages/service-utils/package.json
@@ -1,71 +1,72 @@
 {
-  "name": "@thirdweb-dev/service-utils",
-  "version": "0.9.13",
-  "type": "module",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
-  "typings": "dist/types/index.d.ts",
+  "author": "thirdweb eng <eng@thirdweb.com>",
+  "bugs": {
+    "url": "https://github.com/thirdweb-dev/js/issues"
+  },
+  "dependencies": {
+    "@confluentinc/kafka-javascript": "1.3.2",
+    "aws4fetch": "1.0.20",
+    "zod": "3.25.62"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "2.0.0",
+    "@cloudflare/workers-types": "4.20250612.0",
+    "@types/node": "22.14.1",
+    "@vitest/coverage-v8": "3.2.3",
+    "typescript": "5.8.3",
+    "vitest": "3.2.3"
+  },
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
       "import": "./dist/esm/index.js",
       "default": "./dist/cjs/index.js"
     },
-    "./node": {
-      "types": "./dist/types/node/index.d.ts",
-      "import": "./dist/esm/node/index.js",
-      "default": "./dist/cjs/node/index.js"
-    },
     "./cf-worker": {
       "types": "./dist/types/cf-worker/index.d.ts",
       "import": "./dist/esm/cf-worker/index.js",
       "default": "./dist/cjs/cf-worker/index.js"
     },
+    "./node": {
+      "types": "./dist/types/node/index.d.ts",
+      "import": "./dist/esm/node/index.js",
+      "default": "./dist/cjs/node/index.js"
+    },
     "./package.json": "./package.json"
   },
-  "typesVersions": {
-    "*": {
-      "node": [
-        "./dist/types/node/index.d.ts"
-      ],
-      "cf-worker": [
-        "./dist/types/cf-worker/index.d.ts"
-      ]
-    }
-  },
-  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/pay",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/thirdweb-dev/js/issues"
-  },
-  "author": "thirdweb eng <eng@thirdweb.com>",
   "files": [
     "dist/"
   ],
-  "sideEffects": false,
-  "dependencies": {
-    "@confluentinc/kafka-javascript": "1.3.2",
-    "aws4fetch": "1.0.20",
-    "zod": "3.25.62"
-  },
-  "devDependencies": {
-    "@cloudflare/workers-types": "4.20250612.0",
-    "@types/node": "22.14.1",
-    "@vitest/coverage-v8": "3.2.3",
-    "typescript": "5.8.3",
-    "vitest": "3.2.3"
-  },
+  "license": "Apache-2.0",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "name": "@thirdweb-dev/service-utils",
+  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/pay",
   "scripts": {
-    "format": "biome format ./src --write",
-    "lint": "biome check ./src && tsc --project ./tsconfig.build.json --module esnext --noEmit",
-    "fix": "biome check ./src --fix",
-    "clean": "rm -rf dist/",
     "build": "pnpm clean && pnpm build:types && pnpm build:cjs && pnpm build:esm",
     "build:cjs": "tsc --noCheck --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
     "build:esm": "tsc --noCheck --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
     "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
-    "test": "vitest run",
-    "coverage": "vitest run --coverage"
-  }
+    "clean": "rm -rf dist/",
+    "coverage": "vitest run --coverage",
+    "fix": "biome check ./src --fix",
+    "format": "biome format ./src --write",
+    "lint": "biome check ./src && tsc --project ./tsconfig.build.json --module esnext --noEmit",
+    "test": "vitest run"
+  },
+  "sideEffects": false,
+  "type": "module",
+  "types": "dist/types/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "cf-worker": [
+        "./dist/types/cf-worker/index.d.ts"
+      ],
+      "node": [
+        "./dist/types/node/index.d.ts"
+      ]
+    }
+  },
+  "typings": "dist/types/index.d.ts",
+  "version": "0.9.13"
 }
diff --git a/packages/service-utils/src/cf-worker/index.ts b/packages/service-utils/src/cf-worker/index.ts
index 9c835528915..5df7a88eb8d 100644
--- a/packages/service-utils/src/cf-worker/index.ts
+++ b/packages/service-utils/src/cf-worker/index.ts
@@ -5,19 +5,19 @@ import type {
   Response,
 } from "@cloudflare/workers-types";
 import type { CoreServiceConfig, TeamAndProjectResponse } from "../core/api.js";
-import { authorize } from "../core/authorize/index.js";
 import type {
   AuthorizationInput,
   TeamAndProjectCacheWithPossibleTTL,
 } from "../core/authorize/index.js";
+import { authorize } from "../core/authorize/index.js";
 import type { AuthorizationResult } from "../core/authorize/types.js";
 import type { CoreAuthInput } from "../core/types.js";
 
+export * from "../core/rateLimit/index.js";
+export * from "../core/services.js";
+export * from "../core/usageV2.js";
 export * from "./usage.js";
 export * from "./usageV2.js";
-export * from "../core/usageV2.js";
-export * from "../core/services.js";
-export * from "../core/rateLimit/index.js";
 
 export type WorkerServiceConfig = CoreServiceConfig & {
   kvStore: KVNamespace;
@@ -42,28 +42,29 @@ export async function authorizeWorker(
     if (e instanceof Error && e.message === "KEY_CONFLICT") {
       return {
         authorized: false,
-        status: 400,
-        errorMessage: "Please pass either a client id or a secret key.",
         errorCode: "KEY_CONFLICT",
+        errorMessage: "Please pass either a client id or a secret key.",
+        status: 400,
       };
     }
     return {
       authorized: false,
-      status: 500,
-      errorMessage: "Internal Server Error",
       errorCode: "INTERNAL_SERVER_ERROR",
+      errorMessage: "Internal Server Error",
+      status: 500,
     };
   }
 
   return await authorize(authData, serviceConfig, {
+    cacheTtlSeconds: serviceConfig.cacheTtlSeconds ?? DEFAULT_CACHE_TTL_SECONDS,
     get: async (clientId: string) => serviceConfig.kvStore.get(clientId),
     put: (clientId: string, teamAndProjectResponse: TeamAndProjectResponse) =>
       serviceConfig.ctx.waitUntil(
         serviceConfig.kvStore.put(
           clientId,
           JSON.stringify({
-            updatedAt: Date.now(),
             teamAndProjectResponse,
+            updatedAt: Date.now(),
           } satisfies TeamAndProjectCacheWithPossibleTTL),
           {
             expirationTtl:
@@ -74,7 +75,6 @@ export async function authorizeWorker(
           },
         ),
       ),
-    cacheTtlSeconds: serviceConfig.cacheTtlSeconds ?? DEFAULT_CACHE_TTL_SECONDS,
   });
 }
 
@@ -162,19 +162,19 @@ export async function extractAuthorizationData(
   }
 
   return {
-    incomingServiceApiKey,
-    incomingServiceApiKeyHash,
-    jwt,
-    hashedJWT: jwt ? await hashSecretKey(jwt) : null,
-    secretKey,
+    bundleId,
     clientId,
     ecosystemId,
     ecosystemPartnerId,
+    hashedJWT: jwt ? await hashSecretKey(jwt) : null,
+    incomingServiceApiKey,
+    incomingServiceApiKeyHash,
+    jwt,
     origin,
-    bundleId,
+    secretKey,
     secretKeyHash,
-    teamId: authInput.teamId ?? teamId ?? undefined,
     targetAddress: authInput.targetAddress,
+    teamId: authInput.teamId ?? teamId ?? undefined,
   };
 }
 
@@ -206,24 +206,24 @@ export async function logHttpRequest({
   latencyMs?: number;
 }) {
   try {
-    const authorizationData = await extractAuthorizationData({ req, clientId });
+    const authorizationData = await extractAuthorizationData({ clientId, req });
     const headers = req.headers;
 
     console.log(
       JSON.stringify({
-        method: req.method,
-        pathname: req.url,
-        hasSecretKey: !!authorizationData.secretKey,
+        clientId: authorizationData.clientId,
         hasClientId: !!authorizationData.clientId,
         hasJwt: !!authorizationData.jwt,
-        clientId: authorizationData.clientId,
+        hasSecretKey: !!authorizationData.secretKey,
         isAuthed,
-        status: res.status,
+        latencyMs,
+        method: req.method,
+        os: headers.get("x-sdk-os") ?? undefined,
+        pathname: req.url,
+        platform: headers.get("x-sdk-platform") ?? undefined,
         sdkName: headers.get("x-sdk-name") ?? undefined,
         sdkVersion: headers.get("x-sdk-version") ?? undefined,
-        platform: headers.get("x-sdk-platform") ?? undefined,
-        os: headers.get("x-sdk-os") ?? undefined,
-        latencyMs,
+        status: res.status,
       }),
     );
     if (statusMessage) {
diff --git a/packages/service-utils/src/cf-worker/usage.ts b/packages/service-utils/src/cf-worker/usage.ts
index 84e30c9bfaa..a9f5e5884cd 100644
--- a/packages/service-utils/src/cf-worker/usage.ts
+++ b/packages/service-utils/src/cf-worker/usage.ts
@@ -1,5 +1,6 @@
 import { AwsClient } from "aws4fetch";
 import { type UsageEvent, usageEventSchema } from "../core/usage.js";
+
 export type { UsageEvent } from "../core/usage.js";
 
 // Initialize a singleton for AWS usage.
@@ -52,19 +53,19 @@ async function publishUsageEvents(
 
   const aws = getAws({
     accessKeyId,
-    secretAccessKey,
     region,
+    secretAccessKey,
   });
   await aws.fetch(`https://sqs.${region}.amazonaws.com`, {
-    headers: {
-      "X-Amz-Target": "AmazonSQS.SendMessageBatch",
-      "X-Amz-Date": new Date().toISOString(),
-      "Content-Type": "application/x-amz-json-1.0",
-    },
     body: JSON.stringify({
-      QueueUrl: queueUrl,
       Entries: entries,
+      QueueUrl: queueUrl,
     }),
+    headers: {
+      "Content-Type": "application/x-amz-json-1.0",
+      "X-Amz-Date": new Date().toISOString(),
+      "X-Amz-Target": "AmazonSQS.SendMessageBatch",
+    },
   });
 }
 
diff --git a/packages/service-utils/src/cf-worker/usageV2.ts b/packages/service-utils/src/cf-worker/usageV2.ts
index d30cf57945b..b4d7079fa1b 100644
--- a/packages/service-utils/src/cf-worker/usageV2.ts
+++ b/packages/service-utils/src/cf-worker/usageV2.ts
@@ -63,9 +63,9 @@ export async function sendUsageV2Events<T extends UsageV2Options>(
   }
 
   const resp = await fetch(url, {
-    method: "POST",
-    headers,
     body: JSON.stringify({ events }),
+    headers,
+    method: "POST",
   });
   if (!resp.ok) {
     throw new Error(
diff --git a/packages/service-utils/src/core/api.ts b/packages/service-utils/src/core/api.ts
index 8f88e37d6cb..4dce9d35ae6 100644
--- a/packages/service-utils/src/core/api.ts
+++ b/packages/service-utils/src/core/api.ts
@@ -285,11 +285,11 @@ export async function fetchTeamAndProject(
   for (let i = 0; i < retryCount; i++) {
     try {
       const response = await fetch(url, {
-        method: "GET",
         headers: {
           ...authHeaders,
           "content-type": "application/json",
         },
+        method: "GET",
       });
 
       // TODO: if the response is a well understood status code (401, 402, etc), we should skip retry logic
diff --git a/packages/service-utils/src/core/authorize/authorize.test.ts b/packages/service-utils/src/core/authorize/authorize.test.ts
index e92651285bf..d53558ee798 100644
--- a/packages/service-utils/src/core/authorize/authorize.test.ts
+++ b/packages/service-utils/src/core/authorize/authorize.test.ts
@@ -4,25 +4,25 @@ import { authorize } from "./index.js";
 
 const validServiceConfig: CoreServiceConfig = {
   apiUrl: "https://api.example.com",
-  serviceScope: "storage",
   serviceApiKey: "service key",
+  serviceScope: "storage",
 };
 
 describe("authorizeClient", () => {
   it("should not authorize if auth not enforced and no credentials", async () => {
     const result = (await authorize(
       {
-        secretKey: null,
-        clientId: null,
-        origin: null,
         bundleId: null,
-        secretKeyHash: null,
+        clientId: null,
+        ecosystemId: null,
+        ecosystemPartnerId: null,
         hashedJWT: null,
-        jwt: null,
         incomingServiceApiKey: null,
         incomingServiceApiKeyHash: null,
-        ecosystemId: null,
-        ecosystemPartnerId: null,
+        jwt: null,
+        origin: null,
+        secretKey: null,
+        secretKeyHash: null,
       },
       validServiceConfig,
       // biome-ignore lint/suspicious/noExplicitAny: test only
diff --git a/packages/service-utils/src/core/authorize/client.test.ts b/packages/service-utils/src/core/authorize/client.test.ts
index 6039300817b..645103327c5 100644
--- a/packages/service-utils/src/core/authorize/client.test.ts
+++ b/packages/service-utils/src/core/authorize/client.test.ts
@@ -3,14 +3,14 @@ import {
   validProjectResponse,
   validTeamAndProjectResponse,
 } from "../../mocks.js";
-import { type ClientAuthorizationPayload, authorizeClient } from "./client.js";
+import { authorizeClient, type ClientAuthorizationPayload } from "./client.js";
 
 describe("authorizeClient", () => {
   const validAuthOptions: ClientAuthorizationPayload = {
-    secretKeyHash: "secret-hash",
     bundleId: null,
-    origin: "example.com",
     incomingServiceApiKey: null,
+    origin: "example.com",
+    secretKeyHash: "secret-hash",
   };
 
   it("should authorize client with valid secret key", () => {
@@ -25,10 +25,10 @@ describe("authorizeClient", () => {
 
   it("should authorize client with matching wildcard domain", () => {
     const authOptionsWithWildcardDomain: ClientAuthorizationPayload = {
-      secretKeyHash: null,
       bundleId: null,
-      origin: "sub.example.com",
       incomingServiceApiKey: null,
+      origin: "sub.example.com",
+      secretKeyHash: null,
     };
 
     const result = authorizeClient(
@@ -42,10 +42,10 @@ describe("authorizeClient", () => {
 
   it("should authorize client with any domain w/o origin check", () => {
     const authOptionsWithAnyDomain: ClientAuthorizationPayload = {
-      secretKeyHash: null,
       bundleId: null,
-      origin: null,
       incomingServiceApiKey: null,
+      origin: null,
+      secretKeyHash: null,
     };
 
     const validProjectResponseAnyDomain = {
@@ -67,10 +67,10 @@ describe("authorizeClient", () => {
 
   it("should not authorize client with non-matching bundle id", () => {
     const authOptionsWithBundleId: ClientAuthorizationPayload = {
-      secretKeyHash: null,
       bundleId: "com.foo.bar",
-      origin: null,
       incomingServiceApiKey: null,
+      origin: null,
+      secretKeyHash: null,
     };
 
     const result = authorizeClient(
@@ -88,10 +88,10 @@ describe("authorizeClient", () => {
 
   it("should not authorize client with unauthorized origin", () => {
     const authOptionsWithUnauthorizedOrigin: ClientAuthorizationPayload = {
-      secretKeyHash: null,
       bundleId: null,
-      origin: "unauthorized.com",
       incomingServiceApiKey: null,
+      origin: "unauthorized.com",
+      secretKeyHash: null,
     };
 
     const result = authorizeClient(
@@ -109,10 +109,10 @@ describe("authorizeClient", () => {
 
   it("should authorize client with incoming service api key", () => {
     const authOptionsWithServiceKey: ClientAuthorizationPayload = {
-      secretKeyHash: null,
       bundleId: null,
-      origin: "unauthorized.com", // Even unauthorized origin should work with service key
       incomingServiceApiKey: "test-service-key",
+      origin: "unauthorized.com", // Even unauthorized origin should work with service key
+      secretKeyHash: null,
     };
 
     const result = authorizeClient(
diff --git a/packages/service-utils/src/core/authorize/client.ts b/packages/service-utils/src/core/authorize/client.ts
index d0858416d9d..5594e47de01 100644
--- a/packages/service-utils/src/core/authorize/client.ts
+++ b/packages/service-utils/src/core/authorize/client.ts
@@ -16,10 +16,10 @@ export function authorizeClient(
   const { team, project, authMethod } = teamAndProjectResponse;
 
   const authResult: AuthorizationResult = {
+    authMethod,
     authorized: true,
-    team,
     project,
-    authMethod,
+    team,
   };
 
   if (authMethod === "jwt") {
@@ -61,8 +61,8 @@ export function authorizeClient(
 
     return {
       authorized: false,
-      errorMessage: `Invalid request: Unauthorized domain: ${origin}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
       errorCode: "ORIGIN_UNAUTHORIZED",
+      errorMessage: `Invalid request: Unauthorized domain: ${origin}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
       status: 401,
     };
   }
@@ -71,8 +71,8 @@ export function authorizeClient(
   if (bundleId) {
     if (
       authorizeBundleId({
-        bundleIds: project.bundleIds,
         bundleId,
+        bundleIds: project.bundleIds,
       })
     ) {
       return authResult;
@@ -80,17 +80,17 @@ export function authorizeClient(
 
     return {
       authorized: false,
-      errorMessage: `Invalid request: Unauthorized Bundle ID: ${bundleId}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
       errorCode: "BUNDLE_UNAUTHORIZED",
+      errorMessage: `Invalid request: Unauthorized Bundle ID: ${bundleId}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
       status: 401,
     };
   }
 
   return {
     authorized: false,
+    errorCode: "UNAUTHORIZED",
     errorMessage:
       "The keys are invalid. Please check the secret-key/clientId and try again.",
-    errorCode: "UNAUTHORIZED",
     status: 401,
   };
 }
@@ -99,7 +99,10 @@ export function authorizeClient(
 export function authorizeDomain({
   domains,
   origin,
-}: { domains: string[]; origin: string }): boolean {
+}: {
+  domains: string[];
+  origin: string;
+}): boolean {
   // find matching domain, or if all domains allowed
   // embedded-wallet.thirdweb(-dev).com is automatically allowed
   // because the rpc is passed from user's domain to embedded-wallet.thirdweb.com iframe for use.
@@ -136,7 +139,10 @@ export function authorizeDomain({
 export function authorizeBundleId({
   bundleIds,
   bundleId,
-}: { bundleIds: string[]; bundleId: string }): boolean {
+}: {
+  bundleIds: string[];
+  bundleId: string;
+}): boolean {
   // find matching bundle id, or if all bundles allowed
   return !!bundleIds.find((b) => {
     if (b === "*") {
diff --git a/packages/service-utils/src/core/authorize/index.ts b/packages/service-utils/src/core/authorize/index.ts
index a63cd1ea5fe..39407a14461 100644
--- a/packages/service-utils/src/core/authorize/index.ts
+++ b/packages/service-utils/src/core/authorize/index.ts
@@ -1,8 +1,8 @@
 import {
   type CoreServiceConfig,
+  fetchTeamAndProject,
   type TeamAndProjectResponse,
   type TeamResponse,
-  fetchTeamAndProject,
 } from "../api.js";
 import { authorizeClient } from "./client.js";
 import { authorizeService } from "./service.js";
@@ -123,19 +123,19 @@ export async function authorize(
       console.warn("failed to fetch key metadata from api", err);
       return {
         authorized: false,
-        status: 500,
+        errorCode: "FAILED_TO_FETCH_KEY",
         errorMessage:
           "Failed to fetch key metadata. Please check your secret-key/clientId.",
-        errorCode: "FAILED_TO_FETCH_KEY",
+        status: 500,
       };
     }
   }
   if (!teamAndProjectResponse) {
     return {
       authorized: false,
-      status: 401,
-      errorMessage: "Key is invalid. Please check your secret-key/clientId.",
       errorCode: "INVALID_KEY",
+      errorMessage: "Key is invalid. Please check your secret-key/clientId.",
+      status: 401,
     };
   }
   // check if the service is maybe disabled for the team (usually due to a billing issue / exceeding the free plan limit)
@@ -147,10 +147,10 @@ export async function authorize(
   ) {
     return {
       authorized: false,
-      status: 403,
+      errorCode: "SERVICE_TEMPORARILY_DISABLED",
       errorMessage:
         "You currently do not have access to this service. Please check if your subscription includes this service and is active.",
-      errorCode: "SERVICE_TEMPORARILY_DISABLED",
+      status: 403,
     };
   }
   // now we can validate the key itself
@@ -158,10 +158,10 @@ export async function authorize(
 
   if (!clientAuth.authorized) {
     return {
-      errorCode: clientAuth.errorCode,
       authorized: false,
-      status: 401,
+      errorCode: clientAuth.errorCode,
       errorMessage: clientAuth.errorMessage,
+      status: 401,
     };
   }
 
@@ -170,19 +170,19 @@ export async function authorize(
 
   if (!serviceAuth.authorized) {
     return {
-      errorCode: serviceAuth.errorCode,
       authorized: false,
-      status: 403,
+      errorCode: serviceAuth.errorCode,
       errorMessage: serviceAuth.errorMessage,
+      status: 403,
     };
   }
 
   // if we reach this point we are authorized!
   return {
+    authMethod: clientAuth.authMethod,
     authorized: true,
-    team: teamAndProjectResponse.team,
     project: teamAndProjectResponse.project,
-    authMethod: clientAuth.authMethod,
+    team: teamAndProjectResponse.team,
   };
 }
 
diff --git a/packages/service-utils/src/core/authorize/service.test.ts b/packages/service-utils/src/core/authorize/service.test.ts
index 092c5e9a8d7..1ab2839acf2 100644
--- a/packages/service-utils/src/core/authorize/service.test.ts
+++ b/packages/service-utils/src/core/authorize/service.test.ts
@@ -21,8 +21,8 @@ describe("authorizeService", () => {
   it("should not authorize service with unauthorized service scope", () => {
     const invalidServiceConfig: CoreServiceConfig = {
       apiUrl: "https://api.example.com",
-      serviceScope: "nebula",
       serviceApiKey: "service-api-key",
+      serviceScope: "nebula",
     };
 
     const result = authorizeService(
@@ -41,9 +41,9 @@ describe("authorizeService", () => {
   it("should not authorize service with unauthorized service action", () => {
     const invalidServiceConfig: CoreServiceConfig = {
       apiUrl: "https://api.example.com",
-      serviceScope: "storage",
-      serviceApiKey: "service-api-key",
       serviceAction: "unauthorized-action",
+      serviceApiKey: "service-api-key",
+      serviceScope: "storage",
     };
 
     const result = authorizeService(
diff --git a/packages/service-utils/src/core/authorize/service.ts b/packages/service-utils/src/core/authorize/service.ts
index 8bd686ce75f..f95fe83da55 100644
--- a/packages/service-utils/src/core/authorize/service.ts
+++ b/packages/service-utils/src/core/authorize/service.ts
@@ -10,17 +10,17 @@ export function authorizeService(
   if (serviceConfig.serviceScope === null) {
     // if explicitly set to null, we do not want to check for service level authorization
     return {
+      authMethod,
       authorized: true,
       team,
-      authMethod,
     };
   }
 
   if (!team.enabledScopes.includes(serviceConfig.serviceScope)) {
     return {
       authorized: false,
-      errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope} for team: ${team.name} (${team.id}). You can view the restrictions for this team in your dashboard: https://thirdweb.com`,
       errorCode: "SERVICE_UNAUTHORIZED",
+      errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope} for team: ${team.name} (${team.id}). You can view the restrictions for this team in your dashboard: https://thirdweb.com`,
       status: 403,
     };
   }
@@ -28,9 +28,9 @@ export function authorizeService(
   if (!project) {
     // acting on behalf of the team (ie. coming from dashboard), authorize
     return {
+      authMethod,
       authorized: true,
       team,
-      authMethod,
     };
   }
 
@@ -42,8 +42,8 @@ export function authorizeService(
   if (!service) {
     return {
       authorized: false,
-      errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope} for project: ${project.name} (${project.publishableKey}). You can view the restrictions on this project in your dashboard: https://thirdweb.com`,
       errorCode: "SERVICE_UNAUTHORIZED",
+      errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope} for project: ${project.name} (${project.publishableKey}). You can view the restrictions on this project in your dashboard: https://thirdweb.com`,
       status: 403,
     };
   }
@@ -56,17 +56,17 @@ export function authorizeService(
     if (!isActionAllowed) {
       return {
         authorized: false,
-        errorMessage: `Invalid request: Unauthorized action: ${serviceConfig.serviceScope} ${serviceConfig.serviceAction} for project: ${project.name} (${project.publishableKey}). You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key`,
         errorCode: "SERVICE_ACTION_UNAUTHORIZED",
+        errorMessage: `Invalid request: Unauthorized action: ${serviceConfig.serviceScope} ${serviceConfig.serviceAction} for project: ${project.name} (${project.publishableKey}). You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key`,
         status: 403,
       };
     }
   }
 
   return {
+    authMethod,
     authorized: true,
-    team,
     project,
-    authMethod,
+    team,
   };
 }
diff --git a/packages/service-utils/src/core/get-auth-headers.test.ts b/packages/service-utils/src/core/get-auth-headers.test.ts
index df6042f06eb..fe0d8a378f5 100644
--- a/packages/service-utils/src/core/get-auth-headers.test.ts
+++ b/packages/service-utils/src/core/get-auth-headers.test.ts
@@ -6,17 +6,17 @@ import { getAuthHeaders } from "./get-auth-headers.js";
 describe("getAuthHeaders", () => {
   const mockServiceApiKey = "test-service-api-key";
   const defaultAuthData: AuthorizationInput = {
-    incomingServiceApiKey: null,
-    incomingServiceApiKeyHash: null,
-    secretKey: null,
+    bundleId: null,
     clientId: null,
     ecosystemId: null,
     ecosystemPartnerId: null,
+    hashedJWT: null,
+    incomingServiceApiKey: null,
+    incomingServiceApiKeyHash: null,
+    jwt: null,
     origin: null,
-    bundleId: null,
+    secretKey: null,
     secretKeyHash: null,
-    jwt: null,
-    hashedJWT: null,
   };
 
   it("should use secret key when provided", () => {
@@ -49,8 +49,8 @@ describe("getAuthHeaders", () => {
   it("should use JWT when both JWT and clientId are provided", () => {
     const authData: AuthorizationInput = {
       ...defaultAuthData,
-      jwt: "test-jwt",
       clientId: "test-client-id",
+      jwt: "test-jwt",
     };
 
     const headers = getAuthHeaders(authData, mockServiceApiKey);
@@ -84,10 +84,10 @@ describe("getAuthHeaders", () => {
   it("should prioritize secret key over other auth methods", () => {
     const authData: AuthorizationInput = {
       ...defaultAuthData,
-      secretKey: "test-secret-key",
+      incomingServiceApiKey: "test-incoming-service-api-key",
       jwt: "test-jwt",
+      secretKey: "test-secret-key",
       teamId: "test-team-id",
-      incomingServiceApiKey: "test-incoming-service-api-key",
     };
 
     const headers = getAuthHeaders(authData, mockServiceApiKey);
@@ -100,9 +100,9 @@ describe("getAuthHeaders", () => {
   it("should prioritize JWT over incoming service api key when teamId is present", () => {
     const authData: AuthorizationInput = {
       ...defaultAuthData,
+      incomingServiceApiKey: "test-incoming-service-api-key",
       jwt: "test-jwt",
       teamId: "test-team-id",
-      incomingServiceApiKey: "test-incoming-service-api-key",
     };
 
     const headers = getAuthHeaders(authData, mockServiceApiKey);
diff --git a/packages/service-utils/src/core/rateLimit/index.ts b/packages/service-utils/src/core/rateLimit/index.ts
index dd1b98e7504..23d0c15ac88 100644
--- a/packages/service-utils/src/core/rateLimit/index.ts
+++ b/packages/service-utils/src/core/rateLimit/index.ts
@@ -26,28 +26,28 @@ export async function rateLimit(args: {
   const { serviceScope } = serviceConfig;
 
   const rateLimitResult = await rateLimitSlidingWindow({
-    redis,
-    limitPerSecond,
-    key: `rate-limit:${serviceScope}:${team.id}`,
     increment,
+    key: `rate-limit:${serviceScope}:${team.id}`,
+    limitPerSecond,
+    redis,
     windowSeconds: SLIDING_WINDOW_SECONDS,
   });
 
   // if the request is rate limited, return the rate limit result.
   if (rateLimitResult.rateLimited) {
     return {
+      errorCode: "RATE_LIMIT_EXCEEDED",
+      errorMessage: `You've exceeded your ${serviceScope} rate limit at ${limitPerSecond} requests per second. Please upgrade your plan to increase your limits: https://thirdweb.com/team/${team.slug}/~/settings/billing`,
+      rateLimit: rateLimitResult.rateLimit,
       rateLimited: true,
       requestCount: rateLimitResult.requestCount,
-      rateLimit: rateLimitResult.rateLimit,
       status: 429,
-      errorMessage: `You've exceeded your ${serviceScope} rate limit at ${limitPerSecond} requests per second. Please upgrade your plan to increase your limits: https://thirdweb.com/team/${team.slug}/~/settings/billing`,
-      errorCode: "RATE_LIMIT_EXCEEDED",
     };
   }
   // otherwise, the request is not rate limited.
   return {
+    rateLimit: rateLimitResult.rateLimit,
     rateLimited: false,
     requestCount: rateLimitResult.requestCount,
-    rateLimit: rateLimitResult.rateLimit,
   };
 }
diff --git a/packages/service-utils/src/core/rateLimit/rateLimit.test.ts b/packages/service-utils/src/core/rateLimit/rateLimit.test.ts
index 2f5bd40de09..4ea64ed1b21 100644
--- a/packages/service-utils/src/core/rateLimit/rateLimit.test.ts
+++ b/packages/service-utils/src/core/rateLimit/rateLimit.test.ts
@@ -5,9 +5,9 @@ import { rateLimit } from "./index.js";
 const SLIDING_WINDOW_SECONDS = 10;
 
 const mockRedis = {
-  mget: vi.fn(),
   expire: vi.fn(),
   incrby: vi.fn(),
+  mget: vi.fn(),
 };
 
 describe("rateLimit", () => {
@@ -23,16 +23,16 @@ describe("rateLimit", () => {
 
   it("should not rate limit if limitPerSecond is 0", async () => {
     const result = await rateLimit({
-      team: validTeamResponse,
       limitPerSecond: 0,
-      serviceConfig: validServiceConfig,
       redis: mockRedis,
+      serviceConfig: validServiceConfig,
+      team: validTeamResponse,
     });
 
     expect(result).toEqual({
+      rateLimit: 0,
       rateLimited: false,
       requestCount: 1,
-      rateLimit: 0,
     });
     expect(mockRedis.mget).not.toHaveBeenCalled();
   });
@@ -53,10 +53,10 @@ describe("rateLimit", () => {
     ]);
 
     const result = await rateLimit({
-      team: validTeamResponse,
       limitPerSecond: 10,
-      serviceConfig: validServiceConfig,
       redis: mockRedis,
+      serviceConfig: validServiceConfig,
+      team: validTeamResponse,
     });
 
     // Verify correct keys are checked
@@ -76,18 +76,18 @@ describe("rateLimit", () => {
     mockRedis.mget.mockResolvedValue(["50", "51"]);
 
     const result = await rateLimit({
-      team: validTeamResponse,
       limitPerSecond: 10,
-      serviceConfig: validServiceConfig,
       redis: mockRedis,
+      serviceConfig: validServiceConfig,
+      team: validTeamResponse,
     });
 
     expect(result).toMatchObject({
+      errorCode: "RATE_LIMIT_EXCEEDED",
+      rateLimit: 100,
       rateLimited: true,
       requestCount: 101,
-      rateLimit: 100,
       status: 429,
-      errorCode: "RATE_LIMIT_EXCEEDED",
     });
   });
 
@@ -95,10 +95,10 @@ describe("rateLimit", () => {
     // First case: current second has no requests
     mockRedis.mget.mockResolvedValueOnce([null, ...Array(9).fill("5")]);
     await rateLimit({
-      team: validTeamResponse,
       limitPerSecond: 10,
-      serviceConfig: validServiceConfig,
       redis: mockRedis,
+      serviceConfig: validServiceConfig,
+      team: validTeamResponse,
     });
     expect(mockRedis.expire).toHaveBeenCalled();
 
@@ -107,10 +107,10 @@ describe("rateLimit", () => {
     // Second case: current second already has requests
     mockRedis.mget.mockResolvedValueOnce(["5", ...Array(9).fill("5")]);
     await rateLimit({
-      team: validTeamResponse,
       limitPerSecond: 10,
-      serviceConfig: validServiceConfig,
       redis: mockRedis,
+      serviceConfig: validServiceConfig,
+      team: validTeamResponse,
     });
     expect(mockRedis.expire).not.toHaveBeenCalled();
   });
@@ -118,11 +118,11 @@ describe("rateLimit", () => {
   it("should increment by the amount provided", async () => {
     mockRedis.mget.mockResolvedValueOnce(["5"]);
     const result = await rateLimit({
-      team: validTeamResponse,
+      increment: 3,
       limitPerSecond: 10,
-      serviceConfig: validServiceConfig,
       redis: mockRedis,
-      increment: 3,
+      serviceConfig: validServiceConfig,
+      team: validTeamResponse,
     });
     expect(mockRedis.incrby).toHaveBeenCalledWith(expect.anything(), 3);
     expect(result.requestCount).toBe(8);
diff --git a/packages/service-utils/src/core/rateLimit/strategies/sliding-window.ts b/packages/service-utils/src/core/rateLimit/strategies/sliding-window.ts
index eba6372e1f7..a2feed7c3e5 100644
--- a/packages/service-utils/src/core/rateLimit/strategies/sliding-window.ts
+++ b/packages/service-utils/src/core/rateLimit/strategies/sliding-window.ts
@@ -25,9 +25,9 @@ export async function rateLimitSlidingWindow(
   // No rate limit is provided. Assume the request is not rate limited.
   if (options.limitPerSecond <= 0) {
     return {
+      rateLimit: 0,
       rateLimited: false,
       requestCount: INCREMENT_BY,
-      rateLimit: 0,
     };
   }
 
@@ -46,9 +46,9 @@ export async function rateLimitSlidingWindow(
 
   if (totalCount > limitPerWindow) {
     return {
+      rateLimit: limitPerWindow,
       rateLimited: true,
       requestCount: totalCount,
-      rateLimit: limitPerWindow,
     };
   }
 
@@ -70,9 +70,9 @@ export async function rateLimitSlidingWindow(
   })();
 
   return {
+    rateLimit: limitPerWindow,
     rateLimited: false,
     requestCount: totalCount + INCREMENT_BY,
-    rateLimit: limitPerWindow,
   };
 }
 
diff --git a/packages/service-utils/src/core/services.ts b/packages/service-utils/src/core/services.ts
index 928a59731c8..098f5975560 100644
--- a/packages/service-utils/src/core/services.ts
+++ b/packages/service-utils/src/core/services.ts
@@ -1,86 +1,86 @@
 export const SERVICE_DEFINITIONS = {
-  storage: {
-    name: "storage",
-    title: "Storage",
-    description: "IPFS Upload and Download",
-    actions: [
-      {
-        name: "read",
-        title: "Download",
-        description: "Download a file from Storage",
-      },
-      {
-        name: "write",
-        title: "Upload",
-        description: "Upload a file to Storage",
-      },
-    ],
-  },
-  rpc: {
-    name: "rpc",
-    title: "RPC",
-    description: "Accelerated RPC Edge",
+  bundler: {
     // all actions allowed
     actions: [],
-  },
-  bundler: {
+    description: "Bundler & Paymaster services",
     name: "bundler",
     title: "Account Abstraction",
-    description: "Bundler & Paymaster services",
-    // all actions allowed
-    actions: [],
   },
-  relayer: {
-    name: "relayer",
-    title: "Gasless Relayer",
-    description: "Enable gasless transactions",
+  chainsaw: {
     // all actions allowed
     actions: [],
+    description: "Indexed data for any EVM chain",
+    name: "chainsaw",
+    title: "Chainsaw",
   },
   embeddedWallets: {
-    name: "embeddedWallets",
-    title: "In-App Wallets",
-    description: "E-mail and social login wallets for easy web3 onboarding",
     // all actions allowed
     actions: [],
+    description: "E-mail and social login wallets for easy web3 onboarding",
+    name: "embeddedWallets",
+    title: "In-App Wallets",
   },
-  pay: {
-    name: "pay",
-    title: "Universal Bridge",
-    description:
-      "Bridge, swap, and purchase cryptocurrencies and execute transactions with any fiat or tokens via cross-chain routing",
+  engineCloud: {
     // all actions allowed
     actions: [],
+    description:
+      "Transaction API and Server wallets with high transaction throughput and low latency",
+    name: "engineCloud",
+    title: "Engine Cloud",
   },
-  chainsaw: {
-    name: "chainsaw",
-    title: "Chainsaw",
-    description: "Indexed data for any EVM chain",
+  insight: {
     // all actions allowed
     actions: [],
-  },
-  insight: {
+    description: "Indexed data for any EVM chain",
     name: "insight",
     title: "Insight",
-    description: "Indexed data for any EVM chain",
-    // all actions allowed
-    actions: [],
   },
   nebula: {
+    // all actions allowed
+    actions: [],
+    description:
+      "Advanced blockchain reasoning and execution capabilities with AI",
     name: "nebula",
     title: "Nebula",
+  },
+  pay: {
+    // all actions allowed
+    actions: [],
     description:
-      "Advanced blockchain reasoning and execution capabilities with AI",
+      "Bridge, swap, and purchase cryptocurrencies and execute transactions with any fiat or tokens via cross-chain routing",
+    name: "pay",
+    title: "Universal Bridge",
+  },
+  relayer: {
     // all actions allowed
     actions: [],
+    description: "Enable gasless transactions",
+    name: "relayer",
+    title: "Gasless Relayer",
   },
-  engineCloud: {
-    name: "engineCloud",
-    title: "Engine Cloud",
-    description:
-      "Transaction API and Server wallets with high transaction throughput and low latency",
+  rpc: {
     // all actions allowed
     actions: [],
+    description: "Accelerated RPC Edge",
+    name: "rpc",
+    title: "RPC",
+  },
+  storage: {
+    actions: [
+      {
+        description: "Download a file from Storage",
+        name: "read",
+        title: "Download",
+      },
+      {
+        description: "Upload a file to Storage",
+        name: "write",
+        title: "Upload",
+      },
+    ],
+    description: "IPFS Upload and Download",
+    name: "storage",
+    title: "Storage",
   },
 } as const;
 
diff --git a/packages/service-utils/src/core/usage.ts b/packages/service-utils/src/core/usage.ts
index 1c4372ab703..05b75382c34 100644
--- a/packages/service-utils/src/core/usage.ts
+++ b/packages/service-utils/src/core/usage.ts
@@ -1,52 +1,38 @@
 import { z } from "zod";
 
 export const usageEventSchema = z.object({
-  source: z.string(),
-  action: z.string(),
-
   /**
    * The following fields are optional.
    */
 
   accountId: z.string().optional(),
-  isClientEvent: z.boolean().optional(),
+  action: z.string(),
+  amountUSDCents: z.number().nonnegative().optional(),
+  amountWei: z.string().optional(),
   apiKeyId: z.string().optional(),
-  creatorWalletAddress: z.string().optional(),
-  clientId: z.string().optional(),
-  walletAddress: z.string().optional(),
-  walletType: z.string().optional(),
+  authenticationMethod: z.string().optional(),
   chainId: z.number().int().positive().optional(),
-  provider: z.string().optional(),
-  mimeType: z.string().optional(),
-  fileSize: z.number().int().nonnegative().optional(),
-  fileCid: z.string().optional(),
-  evmMethod: z.string().optional(),
-  userOpHash: z.string().optional(),
-  gasLimit: z.number().nonnegative().optional(),
-  gasPricePerUnit: z.string().optional(),
-  transactionFeeUsd: z.number().optional(),
-  transactionHash: z.string().optional(),
-  sdkName: z.string().optional(),
-  sdkVersion: z.string().optional(),
-  sdkPlatform: z.string().optional(),
-  sdkOS: z.string().optional(),
-  productName: z.string().optional(),
-  transactionValue: z.string().optional(),
-  pathname: z.string().optional(),
+  chainName: z.string().optional(),
+  clientId: z.string().optional(),
+  completionTokens: z.number().int().nonnegative().optional(),
   contractAddress: z.string().optional(),
+  creatorWalletAddress: z.string().optional(),
+  dstChainId: z.number().optional(),
+  dstChainName: z.string().optional(),
+  dstTokenAddress: z.string().optional(),
+  dstTokenSymbol: z.string().optional(),
+  // Used to identify the ecosystem that the an ecosystem wallet belongs too
+  ecosystemId: z.string().optional(),
+  ecosystemPartnerId: z.string().optional(),
   errorCode: z.string().optional(),
-  httpStatusCode: z.number().int().nonnegative().optional(),
-  functionName: z.string().optional(),
+  evmMethod: z.string().optional(),
+  evmRequestParams: z.string().optional(),
   extension: z.string().optional(),
-  retryCount: z.number().int().nonnegative().optional(),
-  policyId: z.string().optional(),
-  msSinceQueue: z.number().nonnegative().optional(),
-  msSinceSend: z.number().nonnegative().optional(),
-  msTotalDuration: z.number().nonnegative().optional(),
-  swapId: z.string().optional(),
-  tokenAddress: z.string().optional(),
-  amountWei: z.string().optional(),
-  amountUSDCents: z.number().nonnegative().optional(),
+  fileCid: z.string().optional(),
+  fileSize: z.number().int().nonnegative().optional(),
+  functionName: z.string().optional(),
+  gasLimit: z.number().nonnegative().optional(),
+  gasPricePerUnit: z.string().optional(),
   httpMethod: z
     .enum([
       "GET",
@@ -60,26 +46,39 @@ export const usageEventSchema = z.object({
       "TRACE",
     ])
     .optional(),
-  // Used to identify the ecosystem that the an ecosystem wallet belongs too
-  ecosystemId: z.string().optional(),
-  ecosystemPartnerId: z.string().optional(),
-  authenticationMethod: z.string().optional(),
-  chainName: z.string().optional(),
-  tokenSymbol: z.string().optional(),
-  dstChainId: z.number().optional(),
-  dstTokenAddress: z.string().optional(),
-  dstChainName: z.string().optional(),
-  dstTokenSymbol: z.string().optional(),
+  httpStatusCode: z.number().int().nonnegative().optional(),
+  isClientEvent: z.boolean().optional(),
+  mimeType: z.string().optional(),
+  modelName: z.string().optional(),
   msLatency: z.number().optional(),
-  toAmountUSDCents: z.number().optional(),
-  secondaryProvider: z.string().optional(),
+  msSinceQueue: z.number().nonnegative().optional(),
+  msSinceSend: z.number().nonnegative().optional(),
+  msTotalDuration: z.number().nonnegative().optional(),
   onRampId: z.string().optional(),
-  evmRequestParams: z.string().optional(),
-  providerIp: z.string().optional(),
+  pathname: z.string().optional(),
+  policyId: z.string().optional(),
+  productName: z.string().optional(),
   promptTokens: z.number().int().nonnegative().optional(),
-  completionTokens: z.number().int().nonnegative().optional(),
-  modelName: z.string().optional(),
-  sessionId: z.string().optional(),
+  provider: z.string().optional(),
+  providerIp: z.string().optional(),
   requestId: z.string().optional(),
+  retryCount: z.number().int().nonnegative().optional(),
+  sdkName: z.string().optional(),
+  sdkOS: z.string().optional(),
+  sdkPlatform: z.string().optional(),
+  sdkVersion: z.string().optional(),
+  secondaryProvider: z.string().optional(),
+  sessionId: z.string().optional(),
+  source: z.string(),
+  swapId: z.string().optional(),
+  toAmountUSDCents: z.number().optional(),
+  tokenAddress: z.string().optional(),
+  tokenSymbol: z.string().optional(),
+  transactionFeeUsd: z.number().optional(),
+  transactionHash: z.string().optional(),
+  transactionValue: z.string().optional(),
+  userOpHash: z.string().optional(),
+  walletAddress: z.string().optional(),
+  walletType: z.string().optional(),
 });
 export type UsageEvent = z.infer<typeof usageEventSchema>;
diff --git a/packages/service-utils/src/index.ts b/packages/service-utils/src/index.ts
index 5595ad0f6bb..d32c3d55ff5 100644
--- a/packages/service-utils/src/index.ts
+++ b/packages/service-utils/src/index.ts
@@ -1,22 +1,21 @@
 // Exports the public service definitions.
-export * from "./core/services.js";
+
 export type {
   ApiResponse,
   CoreServiceConfig,
   PolicyResult,
-  UserOpData,
+  ProjectBundlerService,
+  ProjectEmbeddedWalletsService,
   ProjectResponse,
   ProjectSecretKey,
-  ProjectBundlerService,
   ProjectService,
   TeamAndProjectResponse,
   TeamResponse,
-  ProjectEmbeddedWalletsService,
+  UserOpData,
 } from "./core/api.js";
-
 export { fetchTeamAndProject } from "./core/api.js";
-
 export { authorizeBundleId, authorizeDomain } from "./core/authorize/client.js";
+export { rateLimit } from "./core/rateLimit/index.js";
 
 export { rateLimitSlidingWindow } from "./core/rateLimit/strategies/sliding-window.js";
-export { rateLimit } from "./core/rateLimit/index.js";
+export * from "./core/services.js";
diff --git a/packages/service-utils/src/mocks.ts b/packages/service-utils/src/mocks.ts
index bbfa2c8944b..071e6bdfe8e 100644
--- a/packages/service-utils/src/mocks.ts
+++ b/packages/service-utils/src/mocks.ts
@@ -6,91 +6,58 @@ import type {
 } from "./core/api.js";
 
 export const validProjectResponse: ProjectResponse = {
+  bundleIds: [],
+  createdAt: new Date("2024-06-01").toISOString(),
+  domains: ["example.com", "*.example.com"],
   id: "1",
+  image: "https://example.com/image.png",
+  lastAccessedAt: new Date("2024-06-01").toISOString(),
+  name: "test-project",
   publishableKey: "your-api-key",
-  walletAddresses: ["creator-address"],
-  domains: ["example.com", "*.example.com"],
-  bundleIds: [],
+  secretKeys: [
+    {
+      createdAt: new Date("2024-06-01").toISOString(),
+      hash: "1234567890123456789012345678901234567890123456789012345678901234",
+      masked: "foo...lorem",
+      updatedAt: new Date("2024-06-01").toISOString(),
+    },
+  ],
   services: [
     {
-      name: "storage",
       actions: ["read", "write"],
+      name: "storage",
     },
     {
-      name: "rpc",
       actions: [],
+      name: "rpc",
     },
     {
-      name: "bundler",
       actions: [],
       allowedChainIds: [1, 2, 3],
+      name: "bundler",
     },
   ],
+  slug: "test-project",
   teamId: "1",
-  createdAt: new Date("2024-06-01").toISOString(),
   updatedAt: new Date("2024-06-01").toISOString(),
-  lastAccessedAt: new Date("2024-06-01").toISOString(),
-  name: "test-project",
-  slug: "test-project",
-  image: "https://example.com/image.png",
-  secretKeys: [
-    {
-      hash: "1234567890123456789012345678901234567890123456789012345678901234",
-      masked: "foo...lorem",
-      createdAt: new Date("2024-06-01").toISOString(),
-      updatedAt: new Date("2024-06-01").toISOString(),
-    },
-  ],
+  walletAddresses: ["creator-address"],
 };
 
 export const validTeamResponse: TeamResponse = {
-  id: "1",
-  name: "test-team",
-  slug: "test-team",
-  image: "https://example.com/image.png",
-  createdAt: new Date("2024-06-01").toISOString(),
-  updatedAt: new Date("2024-06-01").toISOString(),
-  billingPlan: "free",
-  supportPlan: "free",
   billingEmail: "test@example.com",
+  billingPlan: "free",
   billingStatus: "noPayment",
   canCreatePublicChains: false,
-  enabledScopes: ["storage", "rpc", "bundler"],
-  isOnboarded: true,
-  verifiedDomain: null,
   capabilities: {
-    rpc: {
-      enabled: true,
-      rateLimit: 1000,
-    },
-    insight: {
-      enabled: true,
-      rateLimit: 1000,
-      webhooks: true,
-    },
-    storage: {
-      enabled: true,
-      download: {
-        rateLimit: 1000,
-      },
-      upload: {
-        totalFileSizeBytesLimit: 1_000_000_000,
-        rateLimit: 1000,
-      },
-    },
-    nebula: {
-      enabled: true,
-      rateLimit: 1000,
-    },
     bundler: {
       enabled: true,
       mainnetEnabled: true,
       rateLimit: 1000,
     },
     embeddedWallets: {
-      enabled: true,
       customAuth: true,
       customBranding: true,
+      enabled: true,
       sms: {
         domestic: true,
         international: true,
@@ -101,6 +68,15 @@ export const validTeamResponse: TeamResponse = {
       mainnetEnabled: true,
       rateLimit: 100,
     },
+    insight: {
+      enabled: true,
+      rateLimit: 1000,
+      webhooks: true,
+    },
+    nebula: {
+      enabled: true,
+      rateLimit: 1000,
+    },
     pay: {
       enabled: true,
       rateLimit: 1000,
@@ -110,27 +86,51 @@ export const validTeamResponse: TeamResponse = {
       ecosystemWallets: true,
       seats: true,
     },
+    rpc: {
+      enabled: true,
+      rateLimit: 1000,
+    },
+    storage: {
+      download: {
+        rateLimit: 1000,
+      },
+      enabled: true,
+      upload: {
+        rateLimit: 1000,
+        totalFileSizeBytesLimit: 1_000_000_000,
+      },
+    },
   },
+  createdAt: new Date("2024-06-01").toISOString(),
+  dedicatedSupportChannel: null,
+  enabledScopes: ["storage", "rpc", "bundler"],
+  id: "1",
+  image: "https://example.com/image.png",
+  isOnboarded: true,
+  name: "test-team",
   planCancellationDate: null,
+  slug: "test-team",
+  supportPlan: "free",
   unthreadCustomerId: null,
-  dedicatedSupportChannel: null,
+  updatedAt: new Date("2024-06-01").toISOString(),
+  verifiedDomain: null,
 };
 
 export const validTeamAndProjectResponse: TeamAndProjectResponse = {
-  team: validTeamResponse,
-  project: validProjectResponse,
   authMethod: "publishableKey",
+  project: validProjectResponse,
+  team: validTeamResponse,
 };
 
 export const validServiceConfig: CoreServiceConfig = {
   apiUrl: "https://api.example.com",
-  serviceScope: "storage",
-  serviceApiKey: "service-api-key",
   serviceAction: "read",
+  serviceApiKey: "service-api-key",
+  serviceScope: "storage",
 };
 
 export const validBundlerServiceConfig: CoreServiceConfig = {
   apiUrl: "https://api.example.com",
-  serviceScope: "bundler",
   serviceApiKey: "service-api-key",
+  serviceScope: "bundler",
 };
diff --git a/packages/service-utils/src/node/index.ts b/packages/service-utils/src/node/index.ts
index 66618952f85..cb381fcd94d 100644
--- a/packages/service-utils/src/node/index.ts
+++ b/packages/service-utils/src/node/index.ts
@@ -5,20 +5,20 @@ import type {
   ServerResponse,
 } from "node:http";
 import type { CoreServiceConfig } from "../core/api.js";
-import { authorize } from "../core/authorize/index.js";
 import type {
   AuthorizationInput,
   CacheOptions,
 } from "../core/authorize/index.js";
+import { authorize } from "../core/authorize/index.js";
 import type { AuthorizationResult } from "../core/authorize/types.js";
 import type { CoreAuthInput } from "../core/types.js";
 
-export * from "./kafka.js";
-export * from "./usageV2.js";
-export * from "../core/usage.js";
-export * from "../core/usageV2.js";
 export * from "../core/rateLimit/index.js";
 export * from "../core/services.js";
+export * from "../core/usage.js";
+export * from "../core/usageV2.js";
+export * from "./kafka.js";
+export * from "./usageV2.js";
 
 type NodeServiceConfig = CoreServiceConfig;
 
@@ -38,16 +38,16 @@ export async function authorizeNode(
     if (e instanceof Error && e.message === "KEY_CONFLICT") {
       return {
         authorized: false,
-        status: 400,
-        errorMessage: "Please pass either a client id or a secret key.",
         errorCode: "KEY_CONFLICT",
+        errorMessage: "Please pass either a client id or a secret key.",
+        status: 400,
       };
     }
     return {
       authorized: false,
-      status: 500,
-      errorMessage: "Internal Server Error",
       errorCode: "INTERNAL_SERVER_ERROR",
+      errorMessage: "Internal Server Error",
+      status: 500,
     };
   }
 
@@ -166,17 +166,17 @@ export function extractAuthorizationData(
   }
 
   return {
-    incomingServiceApiKey,
-    incomingServiceApiKeyHash,
-    jwt,
-    hashedJWT: jwt ? hashSecretKey(jwt) : null,
-    secretKeyHash,
-    secretKey,
+    bundleId,
     clientId,
     ecosystemId,
     ecosystemPartnerId,
+    hashedJWT: jwt ? hashSecretKey(jwt) : null,
+    incomingServiceApiKey,
+    incomingServiceApiKeyHash,
+    jwt,
     origin,
-    bundleId,
+    secretKey,
+    secretKeyHash,
     targetAddress: authInput.targetAddress,
     teamId: authInput.teamId ?? teamId ?? undefined,
     useWalletAuth,
@@ -203,25 +203,25 @@ export function logHttpRequest({
   latencyMs?: number;
 }) {
   try {
-    const authorizationData = extractAuthorizationData({ req, clientId });
+    const authorizationData = extractAuthorizationData({ clientId, req });
     const headers = req.headers;
 
     console.log(
       JSON.stringify({
-        method: req.method,
-        pathname: req.url,
-        hasSecretKey: !!authorizationData.secretKey,
+        clientId: authorizationData.clientId,
         hasClientId: !!authorizationData.clientId,
         hasJwt: !!authorizationData.jwt,
-        clientId: authorizationData.clientId,
+        hasSecretKey: !!authorizationData.secretKey,
         isAuthed,
-        status: res.statusCode,
-        statusMessage,
+        latencyMs,
+        method: req.method,
+        os: getHeader(headers, "x-sdk-os"),
+        pathname: req.url,
+        platform: getHeader(headers, "x-sdk-platform"),
         sdkName: getHeader(headers, "x-sdk-name"),
         sdkVersion: getHeader(headers, "x-sdk-version"),
-        platform: getHeader(headers, "x-sdk-platform"),
-        os: getHeader(headers, "x-sdk-os"),
-        latencyMs,
+        status: res.statusCode,
+        statusMessage,
       }),
     );
   } catch {}
diff --git a/packages/service-utils/src/node/kafka.ts b/packages/service-utils/src/node/kafka.ts
index d3d1f75fcb4..37f06bfc578 100644
--- a/packages/service-utils/src/node/kafka.ts
+++ b/packages/service-utils/src/node/kafka.ts
@@ -54,14 +54,14 @@ export class KafkaProducer {
     const { producerName, kafkaServers, username, password, config } = options;
 
     this.producer = new KafkaJS.Kafka({}).producer({
-      "client.id": producerName,
+      "allow.auto.create.topics": true,
       "bootstrap.servers": kafkaServers,
-      "security.protocol": "sasl_ssl",
+      "client.id": producerName,
+      "compression.codec": "lz4",
       "sasl.mechanisms": "PLAIN",
-      "sasl.username": username,
       "sasl.password": password,
-      "compression.codec": "lz4",
-      "allow.auto.create.topics": true,
+      "sasl.username": username,
+      "security.protocol": "sasl_ssl",
       // All configuration can be overridden.
       ...config,
     });
@@ -99,10 +99,10 @@ export class KafkaProducer {
     await this.connect();
 
     await this.producer.send({
-      topic,
       messages: messages.map((m) => ({
         value: JSON.stringify(m),
       })),
+      topic,
     });
   }
 
diff --git a/packages/service-utils/src/node/usageV2.ts b/packages/service-utils/src/node/usageV2.ts
index ed2d158c6b1..546029fcd3c 100644
--- a/packages/service-utils/src/node/usageV2.ts
+++ b/packages/service-utils/src/node/usageV2.ts
@@ -1,8 +1,8 @@
 import { randomUUID } from "node:crypto";
 import {
+  getTopicName,
   type UsageV2Event,
   type UsageV2Source,
-  getTopicName,
 } from "../core/usageV2.js";
 import { KafkaProducer } from "./kafka.js";
 
@@ -43,10 +43,10 @@ export class UsageV2Producer {
     password: string;
   }) {
     this.kafkaProducer = new KafkaProducer({
-      producerName: config.producerName,
       kafkaServers: config.kafkaServers,
-      username: config.username,
       password: config.password,
+      producerName: config.producerName,
+      username: config.username,
     });
     this.topic = getTopicName(config.source);
   }
@@ -63,18 +63,18 @@ export class UsageV2Producer {
   async sendEvents(events: UsageV2Event[]): Promise<void> {
     const parsedEvents = events.map((event) => ({
       ...event,
-      // Default to a generated UUID.
-      id: event.id ?? randomUUID(),
       // Default to now.
       created_at: event.created_at ?? new Date(),
-      // Remove the "team_" prefix, if any.
-      team_id: event.team_id.startsWith(TEAM_ID_PREFIX)
-        ? event.team_id.slice(TEAM_ID_PREFIX.length)
-        : event.team_id,
+      // Default to a generated UUID.
+      id: event.id ?? randomUUID(),
       // Remove the "prj_" prefix, if any.
       project_id: event.project_id?.startsWith(PROJECT_ID_PREFIX)
         ? event.project_id.slice(PROJECT_ID_PREFIX.length)
         : event.project_id,
+      // Remove the "team_" prefix, if any.
+      team_id: event.team_id.startsWith(TEAM_ID_PREFIX)
+        ? event.team_id.slice(TEAM_ID_PREFIX.length)
+        : event.team_id,
     }));
     await this.kafkaProducer.send(this.topic, parsedEvents);
   }
diff --git a/packages/service-utils/tsconfig.base.json b/packages/service-utils/tsconfig.base.json
index 2b519cac7ea..25c55988d49 100644
--- a/packages/service-utils/tsconfig.base.json
+++ b/packages/service-utils/tsconfig.base.json
@@ -1,47 +1,48 @@
 {
   // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
-  "include": [],
   "compilerOptions": {
     // Incremental builds
     // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
-    "incremental": false,
-
-    // Type checking
-    "strict": true,
-    "useDefineForClassFields": true, // Not enabled by default in `strict` mode unless we bump `target` to ES2022.
-    "noFallthroughCasesInSwitch": true, // Not enabled by default in `strict` mode.
-    "noImplicitReturns": true, // Not enabled by default in `strict` mode.
-    "useUnknownInCatchVariables": true, // TODO: This would normally be enabled in `strict` mode but would require some adjustments to the codebase.
-    "noImplicitOverride": true, // Not enabled by default in `strict` mode.
-    "noUnusedLocals": true, // Not enabled by default in `strict` mode.
-    "noUnusedParameters": true, // Not enabled by default in `strict` mode.
-    "exactOptionalPropertyTypes": false, // Not enabled by default in `strict` mode.
-    "noUncheckedIndexedAccess": true, // Not enabled by default in `strict` mode.
-
-    // JavaScript support
     "allowJs": false,
+    "allowSyntheticDefaultImports": true,
     "checkJs": false,
 
     // Interop constraints
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
+    "exactOptionalPropertyTypes": false,
     "forceConsistentCasingInFileNames": true,
-    "verbatimModuleSyntax": true,
-    "importHelpers": true, // This is only used for build validation. Since we do not have `tslib` installed, this will fail if we accidentally make use of anything that'd require injection of helpers.
+    "importHelpers": true,
+    // Incremental builds
+    // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
+    "incremental": false,
 
-    // Language and environment
-    "moduleResolution": "NodeNext",
-    "module": "NodeNext",
-    "target": "ES2021", // Setting this to `ES2021` enables native support for `Node v16+`: https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping.
+    // jsx for "/react" portion
+    "jsx": "react-jsx",
     "lib": [
       "ES2022", // By using ES2022 we get access to the `.cause` property on `Error` instances.
       "DOM" // We are adding `DOM` here to get the `fetch`, etc. types. This should be removed once these types are available via DefinitelyTyped.
     ],
+    "module": "NodeNext",
+
+    // Language and environment
+    "moduleResolution": "NodeNext",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
 
     // Skip type checking for node modules
     "skipLibCheck": true,
 
-    // jsx for "/react" portion
-    "jsx": "react-jsx"
-  }
+    // Type checking
+    "strict": true,
+    "target": "ES2021",
+    "useDefineForClassFields": true,
+    "useUnknownInCatchVariables": true,
+    "verbatimModuleSyntax": true
+  },
+  // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
+  "include": []
 }
diff --git a/packages/service-utils/tsconfig.build.json b/packages/service-utils/tsconfig.build.json
index 3ae3943df87..63325457c67 100644
--- a/packages/service-utils/tsconfig.build.json
+++ b/packages/service-utils/tsconfig.build.json
@@ -1,6 +1,9 @@
 {
-  "extends": "./tsconfig.base.json",
-  "include": ["src"],
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "rootDir": "./src",
+    "sourceMap": true
+  },
   "exclude": [
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
@@ -8,9 +11,6 @@
     "src/**/*.bench.ts",
     "src/**/*.macro.ts"
   ],
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.base.json",
+  "include": ["src"]
 }
diff --git a/packages/service-utils/tsconfig.json b/packages/service-utils/tsconfig.json
index bc683d70754..b9912d33c04 100644
--- a/packages/service-utils/tsconfig.json
+++ b/packages/service-utils/tsconfig.json
@@ -1,14 +1,13 @@
 {
   // This configuration is used for local development and type checking.
-  "extends": "./tsconfig.base.json",
-  "include": ["src", "test"],
-  "exclude": [],
-  // "references": [{ "path": "./scripts/tsconfig.json" }],
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "./dist",
     "paths": {
       "~test/*": ["./test/src/*"]
     }
-  }
+  },
+  "exclude": [],
+  "extends": "./tsconfig.base.json",
+  "include": ["src", "test"]
 }
diff --git a/packages/thirdweb/.eslintrc.cjs b/packages/thirdweb/.eslintrc.cjs
index 22c409e6540..919a7aa1443 100644
--- a/packages/thirdweb/.eslintrc.cjs
+++ b/packages/thirdweb/.eslintrc.cjs
@@ -1,54 +1,54 @@
 module.exports = {
+  env: {
+    browser: true,
+    node: true,
+  },
+  overrides: [
+    // 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: false,
+  },
+  plugins: ["@typescript-eslint", "eslint-plugin-tsdoc"],
   rules: {
     "no-restricted-syntax": [
       "warn",
       {
-        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='useEffect']",
       },
       {
-        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='createContext']",
       },
       {
-        selector: "CallExpression[callee.name='defineChain']",
         message: "Use getCachedChain instead for all internal usage",
+        selector: "CallExpression[callee.name='defineChain']",
       },
     ],
     "no-unused-vars": [
       "warn",
       {
+        args: "none",
         argsIgnorePattern: "^_",
-        varsIgnorePattern: "^_",
         caughtErrorsIgnorePattern: "^_",
         destructuredArrayIgnorePattern: "^_",
         ignoreRestSiblings: true,
-        args: "none", // Ignore variables used in type definitions
+        varsIgnorePattern: "^_", // Ignore variables used in type definitions
       },
     ],
     "tsdoc/syntax": "warn",
   },
-  parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint", "eslint-plugin-tsdoc"],
-  parserOptions: {
-    ecmaVersion: 2019,
-    ecmaFeatures: {
-      impliedStrict: true,
-      jsx: true,
-    },
-    warnOnUnsupportedTypeScriptVersion: false,
-  },
-  overrides: [
-    // THIS NEEDS TO GO LAST!
-    {
-      files: ["*.ts", "*.js", "*.tsx", "*.jsx"],
-      extends: ["biome"],
-    },
-  ],
-  env: {
-    browser: true,
-    node: true,
-  },
 };
diff --git a/packages/thirdweb/.size-limit.json b/packages/thirdweb/.size-limit.json
index ac36eb81402..2d3d5c9f839 100644
--- a/packages/thirdweb/.size-limit.json
+++ b/packages/thirdweb/.size-limit.json
@@ -1,31 +1,31 @@
 [
   {
-    "name": "thirdweb (esm)",
-    "path": "./dist/esm/exports/thirdweb.js",
+    "import": "*",
     "limit": "65 kB",
-    "import": "*"
+    "name": "thirdweb (esm)",
+    "path": "./dist/esm/exports/thirdweb.js"
   },
   {
+    "limit": "375 kB",
     "name": "thirdweb (cjs)",
-    "path": "./dist/cjs/exports/thirdweb.js",
-    "limit": "375 kB"
+    "path": "./dist/cjs/exports/thirdweb.js"
   },
   {
-    "name": "thirdweb (minimal + tree-shaking)",
-    "path": "./dist/esm/exports/thirdweb.js",
+    "import": "{ createThirdwebClient, getRpcClient, defineChain }",
     "limit": "7.5 kB",
-    "import": "{ createThirdwebClient, getRpcClient, defineChain }"
+    "name": "thirdweb (minimal + tree-shaking)",
+    "path": "./dist/esm/exports/thirdweb.js"
   },
   {
-    "name": "thirdweb/chains (tree-shaking)",
-    "path": "./dist/esm/exports/chains.js",
+    "import": "{ ethereum }",
     "limit": "650 B",
-    "import": "{ ethereum }"
+    "name": "thirdweb/chains (tree-shaking)",
+    "path": "./dist/esm/exports/chains.js"
   },
   {
-    "name": "thirdweb/react (minimal + tree-shaking)",
-    "path": "./dist/esm/exports/react.js",
+    "import": "{ ThirdwebProvider, useConnect }",
     "limit": "25 kB",
-    "import": "{ ThirdwebProvider, useConnect }"
+    "name": "thirdweb/react (minimal + tree-shaking)",
+    "path": "./dist/esm/exports/react.js"
   }
 ]
diff --git a/packages/thirdweb/biome.json b/packages/thirdweb/biome.json
index f716c23a59b..780bbdcd1af 100644
--- a/packages/thirdweb/biome.json
+++ b/packages/thirdweb/biome.json
@@ -1,53 +1,4 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
-  "extends": ["../../biome.json"],
-  "linter": {
-    "rules": {
-      "nursery": {
-        "noProcessEnv": "warn"
-      },
-      "suspicious": {
-        "noConsole": {
-          "level": "error",
-          "options": {
-            "allow": ["error", "warn"]
-          }
-        }
-      }
-    }
-  },
-  "overrides": [
-    {
-      "include": ["src/**/*.test.ts", "src/**/*.test.tsx", "src/stories/**"],
-      "linter": {
-        "rules": {
-          "nursery": {
-            "noProcessEnv": "off"
-          },
-          "style": {
-            "noUnusedTemplateLiteral": "off"
-          }
-        }
-      }
-    },
-    {
-      "include": ["src/cli/bin.ts", "src/cli/commands/**"],
-      "linter": {
-        "rules": {
-          "suspicious": {
-            "noConsole": "off"
-          }
-        }
-      }
-    }
-  ],
-  "files": {
-    "ignore": [
-      "src/crypto/aes/lib/md5.ts",
-      "src/utils/promise/p-limit.ts",
-      "src/utils/bytecode/cbor-decode.ts",
-      "src/wallets/in-app/native/helpers/wallet/sss.ts",
-      "src/**/__generated__/**"
-    ]
-  }
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
 }
diff --git a/packages/thirdweb/knip.json b/packages/thirdweb/knip.json
index 169c184d892..d038587413d 100644
--- a/packages/thirdweb/knip.json
+++ b/packages/thirdweb/knip.json
@@ -6,7 +6,6 @@
     "src/cli/bin.ts",
     "src/transaction/actions/send-batch-transaction.ts"
   ],
-  "project": ["src/**/*.{ts,tsx}", "scripts/**/*.mjs"],
   "ignore": ["src/**/__generated__/**", "**/*.bench.ts"],
   "ignoreBinaries": ["printf"],
   "ignoreDependencies": [
@@ -15,8 +14,9 @@
     "@thirdweb-dev/insight",
     "@thirdweb-dev/engine"
   ],
+  "project": ["src/**/*.{ts,tsx}", "scripts/**/*.mjs"],
   "rules": {
-    "optionalPeerDependencies": "off",
-    "enumMembers": "off"
+    "enumMembers": "off",
+    "optionalPeerDependencies": "off"
   }
 }
diff --git a/packages/thirdweb/package.json b/packages/thirdweb/package.json
index a55e8470dd2..3c379b5a874 100644
--- a/packages/thirdweb/package.json
+++ b/packages/thirdweb/package.json
@@ -1,24 +1,100 @@
 {
-  "name": "thirdweb",
-  "version": "5.103.1",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/thirdweb-dev/js.git#main"
-  },
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/thirdweb-dev/js/issues"
-  },
   "author": "thirdweb eng <eng@thirdweb.com>",
-  "type": "module",
   "bin": {
     "thirdweb": "./dist/esm/cli/bin.js",
     "thirdweb-cli": "./dist/esm/cli/bin.js"
   },
-  "main": "./dist/cjs/exports/thirdweb.js",
-  "module": "./dist/esm/exports/thirdweb.js",
-  "types": "./dist/types/exports/thirdweb.d.ts",
-  "typings": "./dist/types/exports/thirdweb.d.ts",
+  "browser": {
+    "crypto": false
+  },
+  "bugs": {
+    "url": "https://github.com/thirdweb-dev/js/issues"
+  },
+  "dependencies": {
+    "@coinbase/wallet-sdk": "4.3.0",
+    "@emotion/react": "11.14.0",
+    "@emotion/styled": "11.14.0",
+    "@noble/curves": "1.8.2",
+    "@noble/hashes": "1.7.2",
+    "@passwordless-id/webauthn": "^2.1.2",
+    "@radix-ui/react-dialog": "1.1.14",
+    "@radix-ui/react-focus-scope": "1.1.7",
+    "@radix-ui/react-icons": "1.3.2",
+    "@radix-ui/react-tooltip": "1.2.7",
+    "@storybook/react": "9.0.8",
+    "@tanstack/react-query": "5.80.7",
+    "@thirdweb-dev/engine": "workspace:*",
+    "@thirdweb-dev/insight": "workspace:*",
+    "@walletconnect/ethereum-provider": "2.20.1",
+    "@walletconnect/sign-client": "2.20.1",
+    "abitype": "1.0.8",
+    "cross-spawn": "7.0.6",
+    "fuse.js": "7.1.0",
+    "input-otp": "^1.4.1",
+    "mipd": "0.0.7",
+    "open": "10.1.1",
+    "ora": "8.2.0",
+    "ox": "0.7.0",
+    "prompts": "2.4.2",
+    "toml": "3.0.0",
+    "uqr": "0.1.2",
+    "viem": "2.28.1",
+    "zod": "3.25.62"
+  },
+  "devDependencies": {
+    "@aws-sdk/client-kms": "3.592.0",
+    "@aws-sdk/client-lambda": "3.592.0",
+    "@aws-sdk/credential-providers": "3.592.0",
+    "@biomejs/biome": "2.0.0",
+    "@chromatic-com/storybook": "4.0.0",
+    "@codspeed/vitest-plugin": "4.0.1",
+    "@coinbase/wallet-mobile-sdk": "1.1.2",
+    "@mobile-wallet-protocol/client": "1.0.0",
+    "@react-native-async-storage/async-storage": "2.2.0",
+    "@size-limit/preset-big-lib": "11.2.0",
+    "@storybook/addon-docs": "9.0.8",
+    "@storybook/addon-links": "9.0.8",
+    "@storybook/addon-onboarding": "9.0.8",
+    "@storybook/react-vite": "9.0.8",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.3.0",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/cross-spawn": "^6.0.6",
+    "@types/prompts": "2.4.9",
+    "@types/react": "19.1.8",
+    "@viem/anvil": "0.0.10",
+    "@vitejs/plugin-react": "^4.5.2",
+    "@vitest/coverage-v8": "3.2.3",
+    "@vitest/ui": "3.2.3",
+    "dotenv-mono": "^1.3.14",
+    "ethers5": "npm:ethers@5",
+    "ethers6": "npm:ethers@6",
+    "expo-linking": "7.0.5",
+    "expo-web-browser": "14.0.2",
+    "happy-dom": "17.4.4",
+    "knip": "5.60.2",
+    "msw": "2.7.5",
+    "prettier": "3.5.3",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "react-native": "0.78.1",
+    "react-native-aes-gcm-crypto": "0.2.2",
+    "react-native-passkey": "3.1.0",
+    "react-native-quick-crypto": "0.7.14",
+    "react-native-svg": "15.12.0",
+    "rimraf": "6.0.1",
+    "sharp": "^0.33.5",
+    "size-limit": "11.2.0",
+    "storybook": "9.0.8",
+    "typedoc": "0.27.9",
+    "typedoc-better-json": "0.9.4",
+    "typescript": "5.8.3",
+    "vite": "6.3.5",
+    "vitest": "3.2.3"
+  },
+  "engines": {
+    "node": ">=18"
+  },
   "exports": {
     ".": {
       "types": "./dist/types/exports/thirdweb.d.ts",
@@ -30,11 +106,21 @@
       "import": "./dist/esm/exports/adapters/*.js",
       "default": "./dist/cjs/exports/adapters/*.js"
     },
+    "./ai": {
+      "types": "./dist/types/exports/ai.d.ts",
+      "import": "./dist/esm/exports/ai.js",
+      "default": "./dist/cjs/exports/ai.js"
+    },
     "./auth": {
       "types": "./dist/types/exports/auth.d.ts",
       "import": "./dist/esm/exports/auth.js",
       "default": "./dist/cjs/exports/auth.js"
     },
+    "./bridge": {
+      "types": "./dist/types/exports/bridge.d.ts",
+      "import": "./dist/esm/exports/bridge.js",
+      "default": "./dist/cjs/exports/bridge.js"
+    },
     "./chains": {
       "types": "./dist/types/exports/chains.d.ts",
       "import": "./dist/esm/exports/chains.js",
@@ -50,6 +136,11 @@
       "import": "./dist/esm/exports/deploys.js",
       "default": "./dist/cjs/exports/deploys.js"
     },
+    "./engine": {
+      "types": "./dist/types/exports/engine.d.ts",
+      "import": "./dist/esm/exports/engine.js",
+      "default": "./dist/cjs/exports/engine.js"
+    },
     "./event": {
       "types": "./dist/types/exports/event.d.ts",
       "import": "./dist/esm/exports/event.js",
@@ -60,6 +151,17 @@
       "import": "./dist/esm/exports/extensions/*.js",
       "default": "./dist/cjs/exports/extensions/*.js"
     },
+    "./insight": {
+      "types": "./dist/types/exports/insight.d.ts",
+      "import": "./dist/esm/exports/insight.js",
+      "default": "./dist/cjs/exports/insight.js"
+    },
+    "./modules": {
+      "types": "./dist/types/exports/modules.d.ts",
+      "import": "./dist/esm/exports/modules.js",
+      "default": "./dist/cjs/exports/modules.js"
+    },
+    "./package.json": "./package.json",
     "./pay": {
       "types": "./dist/types/exports/pay.d.ts",
       "import": "./dist/esm/exports/pay.js",
@@ -81,6 +183,11 @@
       "import": "./dist/esm/exports/rpc.js",
       "default": "./dist/cjs/exports/rpc.js"
     },
+    "./social": {
+      "types": "./dist/types/exports/social.d.ts",
+      "import": "./dist/esm/exports/social.js",
+      "default": "./dist/cjs/exports/social.js"
+    },
     "./storage": {
       "types": "./dist/types/exports/storage.d.ts",
       "import": "./dist/esm/exports/storage.js",
@@ -102,117 +209,18 @@
       "import": "./dist/esm/exports/wallets.js",
       "default": "./dist/cjs/exports/wallets.js"
     },
-    "./wallets/in-app": {
-      "types": "./dist/types/exports/wallets/in-app.d.ts",
-      "react-native": "./dist/esm/exports/wallets/in-app.native.js",
-      "import": "./dist/esm/exports/wallets/in-app.js",
-      "default": "./dist/cjs/exports/wallets/in-app.js"
-    },
     "./wallets/*": {
       "types": "./dist/types/exports/wallets/*.d.ts",
       "import": "./dist/esm/exports/wallets/*.js",
       "default": "./dist/cjs/exports/wallets/*.js"
     },
-    "./modules": {
-      "types": "./dist/types/exports/modules.d.ts",
-      "import": "./dist/esm/exports/modules.js",
-      "default": "./dist/cjs/exports/modules.js"
-    },
-    "./social": {
-      "types": "./dist/types/exports/social.d.ts",
-      "import": "./dist/esm/exports/social.js",
-      "default": "./dist/cjs/exports/social.js"
-    },
-    "./ai": {
-      "types": "./dist/types/exports/ai.d.ts",
-      "import": "./dist/esm/exports/ai.js",
-      "default": "./dist/cjs/exports/ai.js"
-    },
-    "./bridge": {
-      "types": "./dist/types/exports/bridge.d.ts",
-      "import": "./dist/esm/exports/bridge.js",
-      "default": "./dist/cjs/exports/bridge.js"
-    },
-    "./insight": {
-      "types": "./dist/types/exports/insight.d.ts",
-      "import": "./dist/esm/exports/insight.js",
-      "default": "./dist/cjs/exports/insight.js"
-    },
-    "./engine": {
-      "types": "./dist/types/exports/engine.d.ts",
-      "import": "./dist/esm/exports/engine.js",
-      "default": "./dist/cjs/exports/engine.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "typesVersions": {
-    "*": {
-      "adapters/*": [
-        "./dist/types/exports/adapters/*.d.ts"
-      ],
-      "auth": [
-        "./dist/types/exports/auth.d.ts"
-      ],
-      "chains": [
-        "./dist/types/exports/chains.d.ts"
-      ],
-      "contract": [
-        "./dist/types/exports/contract.d.ts"
-      ],
-      "deploys": [
-        "./dist/types/exports/deploys.d.ts"
-      ],
-      "event": [
-        "./dist/types/exports/event.d.ts"
-      ],
-      "extensions/*": [
-        "./dist/types/exports/extensions/*.d.ts"
-      ],
-      "pay": [
-        "./dist/types/exports/pay.d.ts"
-      ],
-      "react": [
-        "./dist/types/exports/react.d.ts"
-      ],
-      "react-native": [
-        "./dist/types/exports/react.native.d.ts"
-      ],
-      "rpc": [
-        "./dist/types/exports/rpc.d.ts"
-      ],
-      "storage": [
-        "./dist/types/exports/storage.d.ts"
-      ],
-      "transaction": [
-        "./dist/types/exports/transaction.d.ts"
-      ],
-      "utils": [
-        "./dist/types/exports/utils.d.ts"
-      ],
-      "wallets": [
-        "./dist/types/exports/wallets.d.ts"
-      ],
-      "wallets/*": [
-        "./dist/types/exports/wallets/*.d.ts"
-      ],
-      "modules": [
-        "./dist/types/exports/modules.d.ts"
-      ],
-      "social": [
-        "./dist/types/exports/social.d.ts"
-      ],
-      "ai": [
-        "./dist/types/exports/ai.d.ts"
-      ],
-      "bridge": [
-        "./dist/types/exports/bridge.d.ts"
-      ]
+    "./wallets/in-app": {
+      "types": "./dist/types/exports/wallets/in-app.d.ts",
+      "react-native": "./dist/esm/exports/wallets/in-app.native.js",
+      "import": "./dist/esm/exports/wallets/in-app.js",
+      "default": "./dist/cjs/exports/wallets/in-app.js"
     }
   },
-  "browser": {
-    "crypto": false
-  },
-  "sideEffects": false,
   "files": [
     "dist/*",
     "src/*",
@@ -224,37 +232,10 @@
     "!**/*.bench.ts",
     "!tsconfig.build.json"
   ],
-  "dependencies": {
-    "@coinbase/wallet-sdk": "4.3.0",
-    "@emotion/react": "11.14.0",
-    "@emotion/styled": "11.14.0",
-    "@noble/curves": "1.8.2",
-    "@noble/hashes": "1.7.2",
-    "@passwordless-id/webauthn": "^2.1.2",
-    "@radix-ui/react-dialog": "1.1.14",
-    "@radix-ui/react-focus-scope": "1.1.7",
-    "@radix-ui/react-icons": "1.3.2",
-    "@radix-ui/react-tooltip": "1.2.7",
-    "@storybook/react": "9.0.8",
-    "@tanstack/react-query": "5.80.7",
-    "@thirdweb-dev/engine": "workspace:*",
-    "@thirdweb-dev/insight": "workspace:*",
-    "@walletconnect/ethereum-provider": "2.20.1",
-    "@walletconnect/sign-client": "2.20.1",
-    "abitype": "1.0.8",
-    "cross-spawn": "7.0.6",
-    "fuse.js": "7.1.0",
-    "input-otp": "^1.4.1",
-    "mipd": "0.0.7",
-    "open": "10.1.1",
-    "ora": "8.2.0",
-    "ox": "0.7.0",
-    "prompts": "2.4.2",
-    "toml": "3.0.0",
-    "uqr": "0.1.2",
-    "viem": "2.28.1",
-    "zod": "3.25.62"
-  },
+  "license": "Apache-2.0",
+  "main": "./dist/cjs/exports/thirdweb.js",
+  "module": "./dist/esm/exports/thirdweb.js",
+  "name": "thirdweb",
   "peerDependencies": {
     "@aws-sdk/client-lambda": "^3",
     "@aws-sdk/credential-providers": "^3",
@@ -273,136 +254,155 @@
     "typescript": ">=5.0.4"
   },
   "peerDependenciesMeta": {
-    "react": {
+    "@aws-sdk/client-kms": {
       "optional": true
     },
-    "react-native": {
+    "@aws-sdk/client-lambda": {
       "optional": true
     },
-    "ethers": {
+    "@aws-sdk/credential-providers": {
       "optional": true
     },
-    "typescript": {
+    "@coinbase/wallet-mobile-sdk": {
       "optional": true
     },
-    "react-native-aes-gcm-crypto": {
+    "@mobile-wallet-protocol/client": {
       "optional": true
     },
-    "expo-linking": {
+    "@react-native-async-storage/async-storage": {
       "optional": true
     },
-    "expo-web-browser": {
+    "ethers": {
       "optional": true
     },
-    "react-native-quick-crypto": {
+    "expo-linking": {
       "optional": true
     },
-    "react-native-passkey": {
+    "expo-web-browser": {
       "optional": true
     },
-    "react-native-svg": {
+    "react": {
       "optional": true
     },
-    "@aws-sdk/client-lambda": {
+    "react-native": {
       "optional": true
     },
-    "@aws-sdk/client-kms": {
+    "react-native-aes-gcm-crypto": {
       "optional": true
     },
-    "@aws-sdk/credential-providers": {
+    "react-native-passkey": {
       "optional": true
     },
-    "@react-native-async-storage/async-storage": {
+    "react-native-quick-crypto": {
       "optional": true
     },
-    "@coinbase/wallet-mobile-sdk": {
+    "react-native-svg": {
       "optional": true
     },
-    "@mobile-wallet-protocol/client": {
+    "typescript": {
       "optional": true
     }
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thirdweb-dev/js.git#main"
+  },
   "scripts": {
-    "bench:compare": "bun run ./benchmarks/run.ts",
     "bench": "vitest -c ./test/vitest.config.ts bench",
-    "format": "biome format ./src --write",
-    "lint": "knip && biome check ./src && tsc --project ./tsconfig.build.json --module nodenext --moduleResolution nodenext --noEmit",
-    "fix": "biome check ./src --fix",
-    "knip": "knip",
-    "build:generate": "bun scripts/generate/generate.ts",
-    "build:generate-wallets": "bun scripts/wallets/generate.ts",
-    "dev": "tsc --project ./tsconfig.build.json --module nodenext --moduleResolution nodenext --outDir ./dist/esm --watch",
-    "dev:cjs": "printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json && tsc --noCheck --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false --watch",
-    "dev:esm": "printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json && tsc --noCheck --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm --watch",
+    "bench:compare": "bun run ./benchmarks/run.ts",
     "build": "pnpm clean && pnpm build:types && pnpm build:cjs && pnpm build:esm",
+    "build-storybook": "storybook build",
     "build:cjs": "tsc --noCheck --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
     "build:esm": "tsc --noCheck --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
+    "build:generate": "bun scripts/generate/generate.ts",
+    "build:generate-wallets": "bun scripts/wallets/generate.ts",
     "build:types": "tsc --project ./tsconfig.build.json --module nodenext --moduleResolution nodenext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "clean": "rimraf dist",
+    "dev": "tsc --project ./tsconfig.build.json --module nodenext --moduleResolution nodenext --outDir ./dist/esm --watch",
+    "dev:cjs": "printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json && tsc --noCheck --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false --watch",
+    "dev:esm": "printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json && tsc --noCheck --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm --watch",
+    "fix": "biome check ./src --fix",
+    "format": "biome format ./src --write",
+    "knip": "knip",
+    "lint": "knip && biome check ./src && tsc --project ./tsconfig.build.json --module nodenext --moduleResolution nodenext --noEmit",
     "size": "size-limit",
-    "test:watch": "vitest -c ./test/vitest.config.ts dev",
+    "storybook": "storybook dev -p 6006",
     "test": "NODE_OPTIONS=--max-old-space-size=8192 vitest run -c ./test/vitest.config.ts --coverage",
     "test:cov": "NODE_OPTIONS=--max-old-space-size=8192 vitest dev -c ./test/vitest.config.ts --coverage",
-    "test:ui": "NODE_OPTIONS=--max-old-space-size=8192 vitest dev -c ./test/vitest.config.ts --coverage --ui",
     "test:dev": "NODE_OPTIONS=--max-old-space-size=8192 vitest run -c ./test/vitest.config.ts",
     "test:react": "vitest run -c ./test/vitest.config.ts dev --ui src/react",
+    "test:ui": "NODE_OPTIONS=--max-old-space-size=8192 vitest dev -c ./test/vitest.config.ts --coverage --ui",
+    "test:watch": "vitest -c ./test/vitest.config.ts dev",
     "typedoc": "node scripts/typedoc.mjs && node scripts/parse.mjs",
-    "update-version": "node scripts/version.mjs",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
+    "update-version": "node scripts/version.mjs"
   },
-  "engines": {
-    "node": ">=18"
+  "sideEffects": false,
+  "type": "module",
+  "types": "./dist/types/exports/thirdweb.d.ts",
+  "typesVersions": {
+    "*": {
+      "adapters/*": [
+        "./dist/types/exports/adapters/*.d.ts"
+      ],
+      "ai": [
+        "./dist/types/exports/ai.d.ts"
+      ],
+      "auth": [
+        "./dist/types/exports/auth.d.ts"
+      ],
+      "bridge": [
+        "./dist/types/exports/bridge.d.ts"
+      ],
+      "chains": [
+        "./dist/types/exports/chains.d.ts"
+      ],
+      "contract": [
+        "./dist/types/exports/contract.d.ts"
+      ],
+      "deploys": [
+        "./dist/types/exports/deploys.d.ts"
+      ],
+      "event": [
+        "./dist/types/exports/event.d.ts"
+      ],
+      "extensions/*": [
+        "./dist/types/exports/extensions/*.d.ts"
+      ],
+      "modules": [
+        "./dist/types/exports/modules.d.ts"
+      ],
+      "pay": [
+        "./dist/types/exports/pay.d.ts"
+      ],
+      "react": [
+        "./dist/types/exports/react.d.ts"
+      ],
+      "react-native": [
+        "./dist/types/exports/react.native.d.ts"
+      ],
+      "rpc": [
+        "./dist/types/exports/rpc.d.ts"
+      ],
+      "social": [
+        "./dist/types/exports/social.d.ts"
+      ],
+      "storage": [
+        "./dist/types/exports/storage.d.ts"
+      ],
+      "transaction": [
+        "./dist/types/exports/transaction.d.ts"
+      ],
+      "utils": [
+        "./dist/types/exports/utils.d.ts"
+      ],
+      "wallets": [
+        "./dist/types/exports/wallets.d.ts"
+      ],
+      "wallets/*": [
+        "./dist/types/exports/wallets/*.d.ts"
+      ]
+    }
   },
-  "devDependencies": {
-    "@aws-sdk/client-kms": "3.592.0",
-    "@aws-sdk/client-lambda": "3.592.0",
-    "@aws-sdk/credential-providers": "3.592.0",
-    "@biomejs/biome": "1.9.4",
-    "@chromatic-com/storybook": "4.0.0",
-    "@codspeed/vitest-plugin": "4.0.1",
-    "@coinbase/wallet-mobile-sdk": "1.1.2",
-    "@mobile-wallet-protocol/client": "1.0.0",
-    "@react-native-async-storage/async-storage": "2.2.0",
-    "@size-limit/preset-big-lib": "11.2.0",
-    "@storybook/addon-docs": "9.0.8",
-    "@storybook/addon-links": "9.0.8",
-    "@storybook/addon-onboarding": "9.0.8",
-    "@storybook/react-vite": "9.0.8",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.3.0",
-    "@testing-library/user-event": "^14.6.1",
-    "@types/cross-spawn": "^6.0.6",
-    "@types/prompts": "2.4.9",
-    "@types/react": "19.1.8",
-    "@viem/anvil": "0.0.10",
-    "@vitejs/plugin-react": "^4.5.2",
-    "@vitest/coverage-v8": "3.2.3",
-    "@vitest/ui": "3.2.3",
-    "dotenv-mono": "^1.3.14",
-    "ethers5": "npm:ethers@5",
-    "ethers6": "npm:ethers@6",
-    "expo-linking": "7.0.5",
-    "expo-web-browser": "14.0.2",
-    "happy-dom": "17.4.4",
-    "knip": "5.60.2",
-    "msw": "2.7.5",
-    "prettier": "3.5.3",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
-    "react-native": "0.78.1",
-    "react-native-aes-gcm-crypto": "0.2.2",
-    "react-native-passkey": "3.1.0",
-    "react-native-quick-crypto": "0.7.14",
-    "react-native-svg": "15.12.0",
-    "rimraf": "6.0.1",
-    "sharp": "^0.33.5",
-    "size-limit": "11.2.0",
-    "storybook": "9.0.8",
-    "typedoc": "0.27.9",
-    "typedoc-better-json": "0.9.4",
-    "typescript": "5.8.3",
-    "vite": "6.3.5",
-    "vitest": "3.2.3"
-  }
+  "typings": "./dist/types/exports/thirdweb.d.ts",
+  "version": "5.103.1"
 }
diff --git a/packages/thirdweb/scripts/wallets/generate.ts b/packages/thirdweb/scripts/wallets/generate.ts
index 001f5949902..6c88666fca6 100644
--- a/packages/thirdweb/scripts/wallets/generate.ts
+++ b/packages/thirdweb/scripts/wallets/generate.ts
@@ -1,182 +1,181 @@
-import { writeFile } from "node:fs/promises";
-import { mkdir, readFile, rm } from "node:fs/promises";
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { format } from "prettier";
 import sharp from "sharp";
 
 const EXCLUDED_WALLETS = [
-  "co.lobstr", // Not EVM compatible
+	"co.lobstr", // Not EVM compatible
 ];
 
 const walletConnectWallets = await fetch(
-  "https://explorer-api.walletconnect.com/w3m/v1/getAllListings?projectId=145769e410f16970a79ff77b2d89a1e0",
+	"https://explorer-api.walletconnect.com/w3m/v1/getAllListings?projectId=145769e410f16970a79ff77b2d89a1e0",
 ).then(async (res) => {
-  const wallets: { listings: Record<string, Wallet> } = await res.json();
-
-  // Remove duplicated wallets by wallet RDNS
-  const filteredWallets: Wallet[] = [];
-  for (const _w of Object.values(wallets.listings)) {
-    if (_w.rdns && filteredWallets.find((w) => w.rdns === _w.rdns)) {
-      continue;
-    }
-    filteredWallets.push(_w);
-  }
-
-  return filteredWallets;
+	const wallets: { listings: Record<string, Wallet> } = await res.json();
+
+	// Remove duplicated wallets by wallet RDNS
+	const filteredWallets: Wallet[] = [];
+	for (const _w of Object.values(wallets.listings)) {
+		if (_w.rdns && filteredWallets.find((w) => w.rdns === _w.rdns)) {
+			continue;
+		}
+		filteredWallets.push(_w);
+	}
+
+	return filteredWallets;
 });
 
 const extraWalletsJson = JSON.parse(
-  await readFile(join(__dirname, "./extra-wallets.json"), "utf-8"),
+	await readFile(join(__dirname, "./extra-wallets.json"), "utf-8"),
 );
 
 const deepLinkSupportedWalletsRecord: Record<
-  string,
-  {
-    mobile: string;
-  }
+	string,
+	{
+		mobile: string;
+	}
 > = {
-  "io.metamask": {
-    mobile: "https://metamask.app.link/dapp/",
-  },
-  "app.phantom": {
-    mobile: "https://phantom.app/ul/browse/",
-  },
+	"io.metamask": {
+		mobile: "https://metamask.app.link/dapp/",
+	},
+	"app.phantom": {
+		mobile: "https://phantom.app/ul/browse/",
+	},
 };
 
 type Wallet = {
-  id: string;
-  name: string;
-  homepage: string;
-  image_id: string;
-  order: number;
-  app: {
-    browser: string | null;
-    ios: string | null;
-    android: string | null;
-    mac: string | null;
-    windows: string | null;
-    linux: string | null;
-    chrome: string | null;
-    firefox: string | null;
-    safari: string | null;
-    edge: string | null;
-    opera: string | null;
-  };
-  injected: Array<{
-    injected_id: string;
-    namespace: string;
-  }> | null;
-  rdns: string | null;
-  mobile: {
-    native: string | null;
-    universal: string | null;
-  };
-  desktop: {
-    native: string | null;
-    universal: string | null;
-  };
-  _type: "wc" | "extra";
-  deepLink?: {
-    mobile: string;
-  };
+	id: string;
+	name: string;
+	homepage: string;
+	image_id: string;
+	order: number;
+	app: {
+		browser: string | null;
+		ios: string | null;
+		android: string | null;
+		mac: string | null;
+		windows: string | null;
+		linux: string | null;
+		chrome: string | null;
+		firefox: string | null;
+		safari: string | null;
+		edge: string | null;
+		opera: string | null;
+	};
+	injected: Array<{
+		injected_id: string;
+		namespace: string;
+	}> | null;
+	rdns: string | null;
+	mobile: {
+		native: string | null;
+		universal: string | null;
+	};
+	desktop: {
+		native: string | null;
+		universal: string | null;
+	};
+	_type: "wc" | "extra";
+	deepLink?: {
+		mobile: string;
+	};
 };
 
 const allWalletsArray = Object.values(walletConnectWallets)
-  .map((w) => ({ ...(w as Omit<Wallet, "type">), _type: "wc" }))
-  .concat(
-    extraWalletsJson.map((w: Wallet) => ({
-      ...(w as Omit<Wallet, "type">),
-      _type: "extra",
-    })),
-  ) as Wallet[];
+	.map((w) => ({ ...(w as Omit<Wallet, "type">), _type: "wc" }))
+	.concat(
+		extraWalletsJson.map((w: Wallet) => ({
+			...(w as Omit<Wallet, "type">),
+			_type: "extra",
+		})),
+	) as Wallet[];
 
 function rdns(wallet: Wallet) {
-  // prefer the rdns if it exists
-  if (wallet.rdns) {
-    return wallet.rdns;
-  }
-  // otherwise compute it from the homepage
-  return new URL(wallet.homepage).hostname
-    .split(".")
-    .filter((s) => s !== "www")
-    .reverse()
-    .join(".");
+	// prefer the rdns if it exists
+	if (wallet.rdns) {
+		return wallet.rdns;
+	}
+	// otherwise compute it from the homepage
+	return new URL(wallet.homepage).hostname
+		.split(".")
+		.filter((s) => s !== "www")
+		.reverse()
+		.join(".");
 }
 
 const allWalletsWithIds = allWalletsArray
-  .map((wallet) => {
-    // biome-ignore lint/performance/noDelete: aware it's bad but it's OK in generate script
-    // biome-ignore lint/suspicious/noExplicitAny: aware it's bad but it's OK in generate script
-    delete (wallet as any).order;
-    // biome-ignore lint/performance/noDelete: aware it's bad but it's OK in generate script
-    // biome-ignore lint/suspicious/noExplicitAny: aware it's bad but it's OK in generate script
-    delete (wallet as any).injected;
-
-    const id = rdns(wallet);
-
-    if (id && id in deepLinkSupportedWalletsRecord) {
-      wallet.deepLink = {
-        mobile: deepLinkSupportedWalletsRecord[id].mobile,
-      };
-    }
-
-    return { ...wallet, id: id };
-  })
-  .filter((w) => !EXCLUDED_WALLETS.includes(w.id));
+	.map((wallet) => {
+		// biome-ignore lint/performance/noDelete: aware it's bad but it's OK in generate script
+		// biome-ignore lint/suspicious/noExplicitAny: aware it's bad but it's OK in generate script
+		delete (wallet as any).order;
+		// biome-ignore lint/performance/noDelete: aware it's bad but it's OK in generate script
+		// biome-ignore lint/suspicious/noExplicitAny: aware it's bad but it's OK in generate script
+		delete (wallet as any).injected;
+
+		const id = rdns(wallet);
+
+		if (id && id in deepLinkSupportedWalletsRecord) {
+			wallet.deepLink = {
+				mobile: deepLinkSupportedWalletsRecord[id].mobile,
+			};
+		}
+
+		return { ...wallet, id: id };
+	})
+	.filter((w) => !EXCLUDED_WALLETS.includes(w.id));
 
 // filter duplicate ids, we'll keep the first ones
 
 // generate walletInfos
 
 const walletConnectSupportedWallets = allWalletsWithIds.filter((w) => {
-  // TODO bring back desktop wallets once supported
-  return w.mobile.universal || w.mobile.native;
+	// TODO bring back desktop wallets once supported
+	return w.mobile.universal || w.mobile.native;
 });
 
 const injectedSupportedWallets = allWalletsWithIds.filter((w) => {
-  return !!(w.rdns || w.injected);
+	return !!(w.rdns || w.injected);
 });
 
 const deepLinkSupportedWallets = allWalletsWithIds.filter((w) => {
-  return !!w.deepLink;
+	return !!w.deepLink;
 });
 
 const allSupportedWallets = walletConnectSupportedWallets
-  .concat(injectedSupportedWallets)
-  .filter(
-    (wallet, index, self) =>
-      index === self.findIndex((t) => t.id === wallet.id),
-  );
+	.concat(injectedSupportedWallets)
+	.filter(
+		(wallet, index, self) =>
+			index === self.findIndex((t) => t.id === wallet.id),
+	);
 
 const walletInfos = allSupportedWallets.map((wallet) => {
-  return {
-    id: wallet.id,
-    name: wallet.name,
-    hasMobileSupport: !!wallet.mobile.universal || !!wallet.mobile.native,
-  };
+	return {
+		id: wallet.id,
+		name: wallet.name,
+		hasMobileSupport: !!wallet.mobile.universal || !!wallet.mobile.native,
+	};
 });
 
 const customWalletInfos = [
-  {
-    id: "smart",
-    name: "Smart Wallet",
-    hasMobileSupport: true,
-  },
-  {
-    id: "inApp",
-    name: "In-App Wallet",
-    hasMobileSupport: true,
-  },
-  {
-    id: "embedded",
-    name: "In-App Wallet",
-    hasMobileSupport: true,
-  },
-  {
-    id: "walletConnect",
-    name: "WalletConnect",
-    hasMobileSupport: false,
-  },
+	{
+		id: "smart",
+		name: "Smart Wallet",
+		hasMobileSupport: true,
+	},
+	{
+		id: "inApp",
+		name: "In-App Wallet",
+		hasMobileSupport: true,
+	},
+	{
+		id: "embedded",
+		name: "In-App Wallet",
+		hasMobileSupport: true,
+	},
+	{
+		id: "walletConnect",
+		name: "WalletConnect",
+		hasMobileSupport: false,
+	},
 ];
 
 // clean the __geneated__ folder within `src/wallets/` directory
@@ -188,42 +187,43 @@ await mkdir(OUT_PATH, { recursive: true });
 // generate a typescript file with all the wallet ids
 
 await writeFile(
-  join(OUT_PATH, "wallet-ids.ts"),
-  await format(
-    `// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
+	join(OUT_PATH, "wallet-ids.ts"),
+	await format(
+		`/* biome-ignore-all lint: IGNORED */
+// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
 // Do not modify this file manually.
 
 // ${walletConnectSupportedWallets.length} wallets
 export type WCSupportedWalletIds = ${walletConnectSupportedWallets
-      .map((w) => {
-        return `"${w.id}"`;
-      })
-      .join(" | ")};
+			.map((w) => {
+				return `"${w.id}"`;
+			})
+			.join(" | ")};
 
 // ${injectedSupportedWallets.length} wallets
 export type InjectedSupportedWalletIds = ${injectedSupportedWallets
-      .map((w) => {
-        return `"${w.id}"`;
-      })
-      .join(" | ")};
+			.map((w) => {
+				return `"${w.id}"`;
+			})
+			.join(" | ")};
 
 export type DeepLinkSupportedWalletIds = ${deepLinkSupportedWallets
-      .map((w) => {
-        return `"${w.id}"`;
-      })
-      .join(" | ")};
+			.map((w) => {
+				return `"${w.id}"`;
+			})
+			.join(" | ")};
 `,
-    {
-      parser: "babel-ts",
-    },
-  ),
+		{
+			parser: "babel-ts",
+		},
+	),
 );
 
 // write wallet infos to a typescript file
 await writeFile(
-  join(OUT_PATH, "wallet-infos.ts"),
-  await format(
-    `// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
+	join(OUT_PATH, "wallet-infos.ts"),
+	await format(
+		`// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
 // Do not modify this file manually.
 
 /**
@@ -239,24 +239,24 @@ export type MinimalWalletInfo = {
  * @internal
  */
 const ALL_MINIMAL_WALLET_INFOS = ${JSON.stringify(
-      [...walletInfos, ...customWalletInfos],
-      null,
-      2,
-    )} as const satisfies MinimalWalletInfo[];
+			[...walletInfos, ...customWalletInfos],
+			null,
+			2,
+		)} as const satisfies MinimalWalletInfo[];
 
 export default ALL_MINIMAL_WALLET_INFOS;
 `,
-    {
-      parser: "babel-ts",
-    },
-  ),
+		{
+			parser: "babel-ts",
+		},
+	),
 );
 function stripType(wallet: Wallet) {
-  const copy = { ...wallet };
-  // biome-ignore lint/performance/noDelete: aware it's bad but it's OK in generate script
-  // biome-ignore lint/suspicious/noExplicitAny: aware it's bad but it's OK in generate script
-  delete (copy as any)._type;
-  return copy;
+	const copy = { ...wallet };
+	// biome-ignore lint/performance/noDelete: aware it's bad but it's OK in generate script
+	// biome-ignore lint/suspicious/noExplicitAny: aware it's bad but it's OK in generate script
+	delete (copy as any)._type;
+	return copy;
 }
 
 // for each wallet, generate a folder within the `src/wallets/__generated__` directory
@@ -264,74 +264,74 @@ function stripType(wallet: Wallet) {
 // biome-ignore lint/suspicious/noExplicitAny: is ok in this script
 const p: Promise<any>[] = [];
 for (const wallet of allSupportedWallets) {
-  p.push(
-    (async () => {
-      const walletDir = join(OUT_PATH, "wallet", wallet.id);
-      await mkdir(walletDir, { recursive: true });
-      await writeFile(
-        join(walletDir, "index.ts"),
-        await format(
-          `// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
+	p.push(
+		(async () => {
+			const walletDir = join(OUT_PATH, "wallet", wallet.id);
+			await mkdir(walletDir, { recursive: true });
+			await writeFile(
+				join(walletDir, "index.ts"),
+				await format(
+					`// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
 // Do not modify this file manually.
 
 export const wallet = ${JSON.stringify(stripType(wallet), null, 2)} as const;
 `,
-          {
-            parser: "babel-ts",
-          },
-        ),
-      );
-
-      // download the wallet's image
-      let resized: Buffer;
-      if (wallet._type === "extra") {
-        // directly fetch, this will be a URL always
-
-        resized = await sharp(
-          await readFile(
-            join(__dirname, `./extra-wallet-icons/${wallet.image_id}`),
-          ),
-        )
-          .resize(128, 128)
-          .webp()
-          .toBuffer();
-      } else {
-        // fetch from the explorer api
-        const imageRes = await fetch(
-          `https://explorer-api.walletconnect.com/w3m/v1/getWalletImage/${wallet.image_id}?projectId=145769e410f16970a79ff77b2d89a1e0&`,
-        );
-        if (!imageRes.ok) {
-          console.error(`Failed to fetch image for ${wallet.id}`);
-          return;
-        }
-        resized = await sharp(await imageRes.arrayBuffer())
-          .resize(128, 128)
-          .webp()
-          .toBuffer();
-      }
-
-      // arrayBuffer to base64 webp
-
-      const base64Flag = "data:image/webp;base64,";
-
-      // write the image to the wallet's folder in a typescript file
-      await writeFile(
-        join(walletDir, "image.ts"),
-        await format(
-          `// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
+					{
+						parser: "babel-ts",
+					},
+				),
+			);
+
+			// download the wallet's image
+			let resized: Buffer;
+			if (wallet._type === "extra") {
+				// directly fetch, this will be a URL always
+
+				resized = await sharp(
+					await readFile(
+						join(__dirname, `./extra-wallet-icons/${wallet.image_id}`),
+					),
+				)
+					.resize(128, 128)
+					.webp()
+					.toBuffer();
+			} else {
+				// fetch from the explorer api
+				const imageRes = await fetch(
+					`https://explorer-api.walletconnect.com/w3m/v1/getWalletImage/${wallet.image_id}?projectId=145769e410f16970a79ff77b2d89a1e0&`,
+				);
+				if (!imageRes.ok) {
+					console.error(`Failed to fetch image for ${wallet.id}`);
+					return;
+				}
+				resized = await sharp(await imageRes.arrayBuffer())
+					.resize(128, 128)
+					.webp()
+					.toBuffer();
+			}
+
+			// arrayBuffer to base64 webp
+
+			const base64Flag = "data:image/webp;base64,";
+
+			// write the image to the wallet's folder in a typescript file
+			await writeFile(
+				join(walletDir, "image.ts"),
+				await format(
+					`// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
   // Do not modify this file manually.
 
   const image = "${base64Flag}${resized.toString("base64")}";
 
   export default image;
   `,
-          {
-            parser: "babel-ts",
-          },
-        ),
-      );
-    })(),
-  );
+					{
+						parser: "babel-ts",
+					},
+				),
+			);
+		})(),
+	);
 }
 
 await Promise.all(p);
@@ -339,41 +339,41 @@ await Promise.all(p);
 // generate a switch case file of lazy imports
 
 const walletImports = allSupportedWallets
-  .map(
-    (wallet) =>
-      `case "${wallet.id}": {
+	.map(
+		(wallet) =>
+			`case "${wallet.id}": {
         return (
           image
             ? import("./wallet/${wallet.id}/image.js").then((img) => img.default)
             : import("./wallet/${wallet.id}/index.js").then((w) => w.wallet)
         ) as Promise<[TImage] extends [true] ? string : any>;
 }`,
-  )
-  .join("\n");
+	)
+	.join("\n");
 
 const customWalletImports = [
-  "smart",
-  "inApp",
-  "walletConnect",
-  "embedded",
-  "adapter",
+	"smart",
+	"inApp",
+	"walletConnect",
+	"embedded",
+	"adapter",
 ]
-  .map(
-    (walletId) =>
-      `case "${walletId}": {
+	.map(
+		(walletId) =>
+			`case "${walletId}": {
         return (
           image
             ? import("../custom/${walletId}/image.js").then((img) => img.default)
             : import("../custom/${walletId}/index.js").then((w) => w.wallet)
         ) as Promise<[TImage] extends [true] ? string : any>;
 }`,
-  )
-  .join("\n");
+	)
+	.join("\n");
 
 await writeFile(
-  join(OUT_PATH, "getWalletInfo.ts"),
-  await format(
-    `// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
+	join(OUT_PATH, "getWalletInfo.ts"),
+	await format(
+		`// This file is auto-generated by the \`scripts/wallets/generate.ts\` script.
 // Do not modify this file manually.
 import { isEcosystemWallet } from "../ecosystem/is-ecosystem-wallet.js"
 import type { WalletInfo } from "../wallet-info.js";
@@ -402,8 +402,8 @@ export async function getWalletInfo<TImage extends boolean>(id: WalletId, image?
   }
 }
 `,
-    {
-      parser: "babel-ts",
-    },
-  ),
+		{
+			parser: "babel-ts",
+		},
+	),
 );
diff --git a/packages/thirdweb/src/adapters/eip1193/from-eip1193.test.ts b/packages/thirdweb/src/adapters/eip1193/from-eip1193.test.ts
index 7e938545e2b..90228a7ffc9 100644
--- a/packages/thirdweb/src/adapters/eip1193/from-eip1193.test.ts
+++ b/packages/thirdweb/src/adapters/eip1193/from-eip1193.test.ts
@@ -70,15 +70,15 @@ describe("fromProvider", () => {
     wallet.subscribe("onConnect", onConnectSpy);
 
     await wallet.connect({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     expect(onConnectSpy).toHaveBeenCalled();
     expect(trackConnect).toHaveBeenCalledWith({
       client: TEST_CLIENT,
-      walletType: "adapter",
       walletAddress: mockAccount.address,
+      walletType: "adapter",
     });
   });
 
@@ -107,8 +107,8 @@ describe("fromProvider", () => {
     wallet.subscribe("chainChanged", onChainChangedSpy);
 
     await wallet.connect({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     const chain = wallet.getChain();
@@ -124,12 +124,12 @@ describe("fromProvider", () => {
     });
 
     await wallet.connect({
-      client: TEST_CLIENT,
       chain: {
         ...ANVIL_CHAIN,
         id: undefined,
         // biome-ignore lint/suspicious/noExplicitAny: Testing unexpected input data
       } as any,
+      client: TEST_CLIENT,
     });
   });
 
@@ -144,8 +144,8 @@ describe("fromProvider", () => {
     mockProvider.request = vi.fn().mockResolvedValueOnce([mockAccount.address]);
 
     await wallet.connect({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     await wallet.disconnect();
diff --git a/packages/thirdweb/src/adapters/eip1193/from-eip1193.ts b/packages/thirdweb/src/adapters/eip1193/from-eip1193.ts
index 21c2c301e7d..89a6149328c 100644
--- a/packages/thirdweb/src/adapters/eip1193/from-eip1193.ts
+++ b/packages/thirdweb/src/adapters/eip1193/from-eip1193.ts
@@ -62,9 +62,9 @@ export type FromEip1193AdapterOptions = {
 export function fromProvider(options: FromEip1193AdapterOptions): Wallet {
   const id: WalletId = options.walletId ?? "adapter";
   const emitter = createWalletEmitter();
-  let account: Account | undefined = undefined;
-  let chain: Chain | undefined = undefined;
-  let provider: EIP1193Provider | undefined = undefined;
+  let account: Account | undefined;
+  let chain: Chain | undefined;
+  let provider: EIP1193Provider | undefined;
   const getProvider = async (params?: { chainId?: number }) => {
     provider =
       typeof options.provider === "function"
@@ -102,26 +102,14 @@ export function fromProvider(options: FromEip1193AdapterOptions): Wallet {
   };
 
   return {
-    id,
-    subscribe: emitter.subscribe,
-    getConfig: () => undefined,
-    getChain() {
-      if (!chain) {
-        return undefined;
-      }
-
-      chain = getCachedChainIfExists(chain.id) || chain;
-      return chain;
-    },
-    getAccount: () => account,
-    connect: async (connectOptions) => {
+    autoConnect: async (connectOptions) => {
       const [connectedAccount, connectedChain, doDisconnect, doSwitchChain] =
-        await connectEip1193Wallet({
-          id,
-          provider: await getProvider({ chainId: connectOptions.chain?.id }),
-          client: connectOptions.client,
+        await autoConnectEip1193Wallet({
           chain: connectOptions.chain,
+          client: connectOptions.client,
           emitter,
+          id,
+          provider: await getProvider({ chainId: connectOptions.chain?.id }),
         });
       // set the states
       account = connectedAccount;
@@ -131,20 +119,20 @@ export function fromProvider(options: FromEip1193AdapterOptions): Wallet {
       emitter.emit("onConnect", connectOptions);
       trackConnect({
         client: connectOptions.client,
-        walletType: id,
         walletAddress: account.address,
+        walletType: id,
       });
       // return account
       return account;
     },
-    autoConnect: async (connectOptions) => {
+    connect: async (connectOptions) => {
       const [connectedAccount, connectedChain, doDisconnect, doSwitchChain] =
-        await autoConnectEip1193Wallet({
-          id,
-          provider: await getProvider({ chainId: connectOptions.chain?.id }),
-          emitter,
+        await connectEip1193Wallet({
           chain: connectOptions.chain,
           client: connectOptions.client,
+          emitter,
+          id,
+          provider: await getProvider({ chainId: connectOptions.chain?.id }),
         });
       // set the states
       account = connectedAccount;
@@ -154,8 +142,8 @@ export function fromProvider(options: FromEip1193AdapterOptions): Wallet {
       emitter.emit("onConnect", connectOptions);
       trackConnect({
         client: connectOptions.client,
-        walletType: id,
         walletAddress: account.address,
+        walletType: id,
       });
       // return account
       return account;
@@ -165,6 +153,18 @@ export function fromProvider(options: FromEip1193AdapterOptions): Wallet {
       await handleDisconnect();
       emitter.emit("disconnect", undefined);
     },
+    getAccount: () => account,
+    getChain() {
+      if (!chain) {
+        return undefined;
+      }
+
+      chain = getCachedChainIfExists(chain.id) || chain;
+      return chain;
+    },
+    getConfig: () => undefined,
+    id,
+    subscribe: emitter.subscribe,
     switchChain: async (c) => {
       await handleSwitchChain(c);
       emitter.emit("chainChanged", c);
diff --git a/packages/thirdweb/src/adapters/eip1193/to-eip1193.test.ts b/packages/thirdweb/src/adapters/eip1193/to-eip1193.test.ts
index 711f635b17c..26852846992 100644
--- a/packages/thirdweb/src/adapters/eip1193/to-eip1193.test.ts
+++ b/packages/thirdweb/src/adapters/eip1193/to-eip1193.test.ts
@@ -17,22 +17,22 @@ describe("toProvider", () => {
   const emitter = createWalletEmitter();
 
   const mockWallet: Wallet = {
-    id: "io.metamask",
-    subscribe: emitter.subscribe,
-    connect: vi.fn().mockResolvedValue(mockAccount),
     autoConnect: vi.fn().mockResolvedValue(mockAccount),
+    connect: vi.fn().mockResolvedValue(mockAccount),
     disconnect: vi.fn(),
     getAccount: () => mockAccount,
     getChain: () => ANVIL_CHAIN,
     getConfig: () => undefined,
+    id: "io.metamask",
+    subscribe: emitter.subscribe,
     switchChain: vi.fn(),
   };
 
   test("should create a provider with the correct interface", () => {
     const provider = toProvider({
-      wallet: mockWallet,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      wallet: mockWallet,
     });
 
     expect(provider.on).toBeDefined();
@@ -42,9 +42,9 @@ describe("toProvider", () => {
 
   test("should handle eth_requestAccounts", async () => {
     const provider = toProvider({
-      wallet: mockWallet,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      wallet: mockWallet,
     });
 
     const accounts = await provider.request({
@@ -57,9 +57,9 @@ describe("toProvider", () => {
 
   test("should handle eth_accounts", async () => {
     const provider = toProvider({
-      wallet: mockWallet,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      wallet: mockWallet,
     });
 
     const accounts = await provider.request({
@@ -72,9 +72,9 @@ describe("toProvider", () => {
 
   test("should handle personal_sign", async () => {
     const provider = toProvider({
-      wallet: mockWallet,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      wallet: mockWallet,
     });
 
     const message = "0x48656c6c6f20776f726c64";
@@ -90,9 +90,9 @@ describe("toProvider", () => {
 
   test("should handle eth_signTypedData_v4", async () => {
     const provider = toProvider({
-      wallet: mockWallet,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      wallet: mockWallet,
     });
 
     const result = await provider.request({
@@ -107,22 +107,22 @@ describe("toProvider", () => {
 
   test("should handle eth_sendTransaction", async () => {
     const provider = toProvider({
-      wallet: mockWallet,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      wallet: mockWallet,
     });
 
     const tx = prepareTransaction({
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      value: 100n,
       to: TEST_WALLET_B,
+      value: 100n,
     });
 
     const balanceBefore = await getWalletBalance({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address: mockAccount.address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     const result = await provider.request({
@@ -132,17 +132,17 @@ describe("toProvider", () => {
 
     expect(ox__Hex.validate(result)).toBe(true);
     const receipt = await waitForReceipt({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       transactionHash: result,
     });
 
     expect(receipt.status).toBe("success");
 
     const balanceAfter = await getWalletBalance({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address: mockAccount.address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     expect(balanceAfter.value).toBeLessThan(balanceBefore.value);
@@ -150,16 +150,16 @@ describe("toProvider", () => {
 
   test("should handle eth_estimateGas", async () => {
     const provider = toProvider({
-      wallet: mockWallet,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      wallet: mockWallet,
     });
 
     const tx = prepareTransaction({
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      value: 100n,
       to: TEST_WALLET_B,
+      value: 100n,
     });
 
     const result = await provider.request({
@@ -177,9 +177,9 @@ describe("toProvider", () => {
     };
 
     const provider = toProvider({
-      wallet: walletWithoutAccount,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      wallet: walletWithoutAccount,
     });
 
     await expect(
@@ -194,10 +194,10 @@ describe("toProvider", () => {
     const customConnect = vi.fn().mockResolvedValue(mockAccount);
 
     const provider = toProvider({
-      wallet: mockWallet,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       connectOverride: customConnect,
+      wallet: mockWallet,
     });
 
     await provider.request({
diff --git a/packages/thirdweb/src/adapters/eip1193/to-eip1193.ts b/packages/thirdweb/src/adapters/eip1193/to-eip1193.ts
index 7d40a22feda..15d8b5e2bca 100644
--- a/packages/thirdweb/src/adapters/eip1193/to-eip1193.ts
+++ b/packages/thirdweb/src/adapters/eip1193/to-eip1193.ts
@@ -57,7 +57,7 @@ export type ToEip1193ProviderOptions = {
  */
 export function toProvider(options: ToEip1193ProviderOptions): EIP1193Provider {
   const { chain, client, wallet, connectOverride } = options;
-  const rpcClient = getRpcClient({ client, chain });
+  const rpcClient = getRpcClient({ chain, client });
   return {
     on: wallet.subscribe,
     removeListener: () => {
@@ -70,12 +70,12 @@ export function toProvider(options: ToEip1193ProviderOptions): EIP1193Provider {
           throw new Error("Account not connected");
         }
         const result = await sendTransaction({
+          account: account,
           transaction: prepareTransaction({
             ...request.params[0],
             chain,
             client,
           }),
-          account: account,
         });
         return result.transactionHash;
       }
@@ -85,12 +85,12 @@ export function toProvider(options: ToEip1193ProviderOptions): EIP1193Provider {
           throw new Error("Account not connected");
         }
         return estimateGas({
+          account,
           transaction: prepareTransaction({
             ...request.params[0],
             chain,
             client,
           }),
-          account,
         });
       }
       if (request.method === "personal_sign") {
diff --git a/packages/thirdweb/src/adapters/eip1193/types.ts b/packages/thirdweb/src/adapters/eip1193/types.ts
index f9d06505711..bbfe16d5c4f 100644
--- a/packages/thirdweb/src/adapters/eip1193/types.ts
+++ b/packages/thirdweb/src/adapters/eip1193/types.ts
@@ -1,9 +1,9 @@
 // loose interface on purpose to adapt to any version of viem, ethers, ox, web3js, etc
 export type EIP1193Provider = {
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // biome-ignore lint/suspicious/noExplicitAny: allowed here
   on(event: any, listener: (params: any) => any): void;
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // biome-ignore lint/suspicious/noExplicitAny: allowed here
   removeListener(event: any, listener: (params: any) => any): void;
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // biome-ignore lint/suspicious/noExplicitAny: allowed here
   request: (params: any) => Promise<any>;
 };
diff --git a/packages/thirdweb/src/adapters/ethers5.test.ts b/packages/thirdweb/src/adapters/ethers5.test.ts
index d041829c01f..5b7ccf93ee7 100644
--- a/packages/thirdweb/src/adapters/ethers5.test.ts
+++ b/packages/thirdweb/src/adapters/ethers5.test.ts
@@ -20,8 +20,8 @@ import {
 } from "./ethers5.js";
 
 const account = privateKeyToAccount({
-  privateKey: ANVIL_PKEY_A,
   client: TEST_CLIENT,
+  privateKey: ANVIL_PKEY_A,
 });
 
 describe("ethers5 adapter", () => {
@@ -72,27 +72,28 @@ describe("ethers5 adapter", () => {
 
     // All properties on a domain are optional
     const domain = {
-      name: "Ether Mail",
-      version: "1",
       chainId: 1,
+      name: "Ether Mail",
       verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+      version: "1",
     };
 
     // The named list of all type definitions
     const types = {
-      Person: [
-        { name: "name", type: "string" },
-        { name: "wallet", type: "address" },
-      ],
       Mail: [
         { name: "from", type: "Person" },
         { name: "to", type: "Person" },
         { name: "contents", type: "string" },
       ],
+      Person: [
+        { name: "name", type: "string" },
+        { name: "wallet", type: "address" },
+      ],
     };
 
     // The data to sign
     const value = {
+      contents: "Hello, Bob!",
       from: {
         name: "Cow",
         wallet: "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
@@ -101,7 +102,6 @@ describe("ethers5 adapter", () => {
         name: "Bob",
         wallet: "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
       },
-      contents: "Hello, Bob!",
     };
 
     const signature = await signer._signTypedData(domain, types, value);
@@ -145,9 +145,9 @@ describe("ethers5 adapter", () => {
     );
 
     const thirdwebContract = await fromEthersContract({
+      chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
       ethersContract,
-      chain: FORKED_ETHEREUM_CHAIN,
     });
 
     const _decimals = await decimals({ contract: thirdwebContract });
@@ -219,13 +219,13 @@ describe("fromEthersSigner", () => {
     const account = await fromEthersSigner(wallet);
 
     const transaction = prepareTransaction({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       to: TEST_ACCOUNT_B.address,
       value: 1n,
     });
 
-    const txResponse = await sendTransaction({ transaction, account });
+    const txResponse = await sendTransaction({ account, transaction });
 
     expect(txResponse.transactionHash.length).toBe(66);
   });
@@ -235,10 +235,10 @@ describe("fromEthersSigner", () => {
     const account = await fromEthersSigner(wallet);
 
     const domain = {
-      name: "Ether Mail",
-      version: "1",
       chainId: 1,
+      name: "Ether Mail",
       verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+      version: "1",
     };
 
     const types = {
@@ -254,10 +254,10 @@ describe("fromEthersSigner", () => {
     };
 
     const signature = await account.signTypedData({
-      primaryType: "Person",
       domain,
-      types,
       message: value,
+      primaryType: "Person",
+      types,
     });
 
     expect(signature).toBeDefined();
diff --git a/packages/thirdweb/src/adapters/ethers5.ts b/packages/thirdweb/src/adapters/ethers5.ts
index 2af761ead4b..8df6eb5c738 100644
--- a/packages/thirdweb/src/adapters/ethers5.ts
+++ b/packages/thirdweb/src/adapters/ethers5.ts
@@ -6,7 +6,7 @@ import type { AccessList, Hex } from "viem";
 import type { Chain } from "../chains/types.js";
 import { getRpcUrlForChain } from "../chains/utils.js";
 import type { ThirdwebClient } from "../client/client.js";
-import { type ThirdwebContract, getContract } from "../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../contract/contract.js";
 import { toSerializableTransaction } from "../transaction/actions/to-serializable-transaction.js";
 import { waitForReceipt } from "../transaction/actions/wait-for-tx-receipt.js";
 import {
@@ -80,48 +80,6 @@ function assertEthers5(
 export const ethers5Adapter = /* @__PURE__ */ (() => {
   const ethers = universalethers;
   return {
-    /**
-     * Converts a Thirdweb client and chain ID into an ethers.js provider.
-     * @param options - The options for converting the Thirdweb client and chain ID into an ethers.js provider.
-     * @param options.client - The Thirdweb client.
-     * @param options.chain - The chain.
-     * @returns The ethers.js provider.
-     * @example
-     * ```ts
-     * import { ethers5Adapter } from "thirdweb/adapters/ethers5";
-     * const provider = ethers5Adapter.provider.toEthers({ client, chainId });
-     * ```
-     *
-     * Once you have converted a thirdweb Client to ethers Provider,
-     * you can use it like any other ethers provider:
-     * ```ts
-     * const blockNumber = await provider.getBlockNumber();
-     * ```
-     */
-    provider: {
-      /**
-       * Converts a Thirdweb client and chain ID into an ethers.js provider.
-       * @param options - The options for converting the Thirdweb client and chain ID into an ethers.js provider.
-       * @param options.client - The Thirdweb client.
-       * @param options.chain - The chain.
-       * @returns The ethers.js provider.
-       * @example
-       * ```ts
-       * import { ethers5Adapter } from "thirdweb/adapters/ethers5";
-       * const provider = ethers5Adapter.provider.toEthers({ client, chainId });
-       * ```
-       *
-       * Once you have converted a thirdweb Client to ethers Provider,
-       * you can use it like any other ethers provider:
-       * ```ts
-       * const blockNumber = await provider.getBlockNumber();
-       * ```
-       */
-      toEthers: (options: { client: ThirdwebClient; chain: Chain }) => {
-        assertEthers5(ethers);
-        return toEthersProvider(ethers, options.client, options.chain);
-      },
-    },
     /**
      * Converts a ThirdwebContract to an ethers.js Contract or the other way around.
      * @example
@@ -147,6 +105,25 @@ export const ethers5Adapter = /* @__PURE__ */ (() => {
      *
      */
     contract: {
+      /**
+       * Creates a ThirdwebContract instance from an ethers.js contract.
+       * @param options - The options for creating the ThirdwebContract instance.
+       * @returns A promise that resolves to a ThirdwebContract instance.
+       * @example
+       * ```ts
+       * import { ethers5Adapter } from "thirdweb/adapters/ethers5";
+       *
+       * const twContract = await ethers5Adapter.contract.fromEthers({
+       *  client,
+       *  ethersContract,
+       *  chain: defineChain(1), // Replace with your chain
+       * });
+       * ```
+       */
+      fromEthers: (options: FromEthersContractOptions) => {
+        assertEthers5(ethers);
+        return fromEthersContract(options);
+      },
       /**
        * Converts a ThirdwebContract to an ethers.js Contract.
        * @param options - The options for converting the ThirdwebContract to an ethers.js Contract.
@@ -177,25 +154,47 @@ export const ethers5Adapter = /* @__PURE__ */ (() => {
         assertEthers5(ethers);
         return toEthersContract(ethers, options.thirdwebContract);
       },
-
+    },
+    /**
+     * Converts a Thirdweb client and chain ID into an ethers.js provider.
+     * @param options - The options for converting the Thirdweb client and chain ID into an ethers.js provider.
+     * @param options.client - The Thirdweb client.
+     * @param options.chain - The chain.
+     * @returns The ethers.js provider.
+     * @example
+     * ```ts
+     * import { ethers5Adapter } from "thirdweb/adapters/ethers5";
+     * const provider = ethers5Adapter.provider.toEthers({ client, chainId });
+     * ```
+     *
+     * Once you have converted a thirdweb Client to ethers Provider,
+     * you can use it like any other ethers provider:
+     * ```ts
+     * const blockNumber = await provider.getBlockNumber();
+     * ```
+     */
+    provider: {
       /**
-       * Creates a ThirdwebContract instance from an ethers.js contract.
-       * @param options - The options for creating the ThirdwebContract instance.
-       * @returns A promise that resolves to a ThirdwebContract instance.
+       * Converts a Thirdweb client and chain ID into an ethers.js provider.
+       * @param options - The options for converting the Thirdweb client and chain ID into an ethers.js provider.
+       * @param options.client - The Thirdweb client.
+       * @param options.chain - The chain.
+       * @returns The ethers.js provider.
        * @example
        * ```ts
        * import { ethers5Adapter } from "thirdweb/adapters/ethers5";
+       * const provider = ethers5Adapter.provider.toEthers({ client, chainId });
+       * ```
        *
-       * const twContract = await ethers5Adapter.contract.fromEthers({
-       *  client,
-       *  ethersContract,
-       *  chain: defineChain(1), // Replace with your chain
-       * });
+       * Once you have converted a thirdweb Client to ethers Provider,
+       * you can use it like any other ethers provider:
+       * ```ts
+       * const blockNumber = await provider.getBlockNumber();
        * ```
        */
-      fromEthers: (options: FromEthersContractOptions) => {
+      toEthers: (options: { client: ThirdwebClient; chain: Chain }) => {
         assertEthers5(ethers);
-        return fromEthersContract(options);
+        return toEthersProvider(ethers, options.client, options.chain);
       },
     },
     /**
@@ -293,8 +292,8 @@ export function toEthersProvider(
     headers["x-secret-key"] = client.secretKey;
   }
   return new ethers.providers.JsonRpcProvider({
-    url,
     headers: headers,
+    url,
   });
 }
 
@@ -346,11 +345,11 @@ export async function fromEthersContract<abi extends Abi>(
   options: FromEthersContractOptions,
 ): Promise<ThirdwebContract<abi>> {
   return getContract({
-    client: options.client,
     address:
       options.ethersContract.address ||
       (await options.ethersContract.getAddress()),
     chain: options.chain,
+    client: options.client,
   });
 }
 
@@ -366,6 +365,12 @@ export async function fromEthersSigner(
   const address = await signer.getAddress();
   const account: Account = {
     address: getAddress(address),
+    sendTransaction: async (tx) => {
+      const result = await signer.sendTransaction(alignTxToEthers(tx));
+      return {
+        transactionHash: result.hash as Hex,
+      };
+    },
     signMessage: async ({ message }) => {
       return signer.signMessage(
         typeof message === "string" ? message : message.raw,
@@ -374,12 +379,6 @@ export async function fromEthersSigner(
     signTransaction: async (tx) => {
       return signer.signTransaction(alignTxToEthers(tx)) as Promise<Hex>;
     },
-    sendTransaction: async (tx) => {
-      const result = await signer.sendTransaction(alignTxToEthers(tx));
-      return {
-        transactionHash: result.hash as Hex,
-      };
-    },
     signTypedData: async (data) => {
       return (await (signer as ethers5.providers.JsonRpcSigner)._signTypedData(
         data.domain as ethers5.TypedDataDomain,
@@ -454,8 +453,8 @@ export async function toEthersSigner(
         ethers,
       );
       const serialized = await toSerializableTransaction({
-        transaction: alignedTx,
         from: account.address,
+        transaction: alignedTx,
       });
       return account.signTransaction(serialized);
     }
@@ -480,66 +479,66 @@ export async function toEthersSigner(
         ethers,
       );
       const serialized = await toSerializableTransaction({
-        transaction: alignedTx,
         from: account.address,
+        transaction: alignedTx,
       });
       const result = await account.sendTransaction(serialized);
 
       const response: ethers5.ethers.providers.TransactionResponse = {
         ...serialized,
-        type: serialized.type ? TransactionTypeMap[serialized.type] : undefined,
-        nonce: Number(serialized.nonce ?? 0),
+        accessList: serialized.accessList as ethers5.ethers.utils.AccessList,
+        confirmations: 0,
         from: account.address,
+        gasLimit: ethers.BigNumber.from(alignedTx.gas ?? 0),
+        gasPrice: serialized.gasPrice
+          ? ethers.BigNumber.from(serialized.gasPrice)
+          : undefined,
+        // biome-ignore lint/style/noNonNullAssertion: TODO: fix later
+        hash: result.transactionHash!,
         maxFeePerGas: serialized.maxFeePerGas
           ? ethers.BigNumber.from(serialized.maxFeePerGas)
           : undefined,
         maxPriorityFeePerGas: serialized.maxPriorityFeePerGas
           ? ethers.BigNumber.from(serialized.maxPriorityFeePerGas)
           : undefined,
-        gasPrice: serialized.gasPrice
-          ? ethers.BigNumber.from(serialized.gasPrice)
-          : undefined,
-        accessList: serialized.accessList as ethers5.ethers.utils.AccessList,
+        nonce: Number(serialized.nonce ?? 0),
+        type: serialized.type ? TransactionTypeMap[serialized.type] : undefined,
         value: ethers.BigNumber.from(alignedTx.value ?? 0),
-        gasLimit: ethers.BigNumber.from(alignedTx.gas ?? 0),
-        // biome-ignore lint/style/noNonNullAssertion: TODO: fix later
-        hash: result.transactionHash!,
-        confirmations: 0,
         wait: async () => {
           const receipt = await waitForReceipt({
-            transactionHash: result.transactionHash,
             chain,
             client,
+            transactionHash: result.transactionHash,
           });
           return {
             ...receipt,
-            type:
-              receipt.type === "legacy"
-                ? 0
-                : receipt.type === "eip2930"
-                  ? 1
-                  : receipt.type === "eip1559"
-                    ? 2
-                    : 3,
-            status: receipt.status === "success" ? 1 : 0,
             blockNumber: Number(receipt.blockNumber),
-            to: receipt.to ?? "",
+            byzantium: true,
             confirmations: 1,
             contractAddress: receipt.contractAddress ?? "",
-            transactionIndex: receipt.transactionIndex,
-            gasUsed: ethers.BigNumber.from(receipt.gasUsed),
-            logsBloom: receipt.logsBloom,
-            transactionHash: receipt.transactionHash,
-            logs: receipt.logs.map((log) => ({
-              ...log,
-              blockNumber: Number(log.blockNumber),
-            })),
             cumulativeGasUsed: ethers.BigNumber.from(receipt.cumulativeGasUsed),
             effectiveGasPrice:
               receipt.effectiveGasPrice !== null
                 ? ethers.BigNumber.from(receipt.effectiveGasPrice)
                 : receipt.effectiveGasPrice,
-            byzantium: true,
+            gasUsed: ethers.BigNumber.from(receipt.gasUsed),
+            logs: receipt.logs.map((log) => ({
+              ...log,
+              blockNumber: Number(log.blockNumber),
+            })),
+            logsBloom: receipt.logsBloom,
+            status: receipt.status === "success" ? 1 : 0,
+            to: receipt.to ?? "",
+            transactionHash: receipt.transactionHash,
+            transactionIndex: receipt.transactionIndex,
+            type:
+              receipt.type === "legacy"
+                ? 0
+                : receipt.type === "eip2930"
+                  ? 1
+                  : receipt.type === "eip1559"
+                    ? 2
+                    : 3,
           };
         },
       };
@@ -559,7 +558,6 @@ export async function toEthersSigner(
       const typedDataEncoder = new ethers.utils._TypedDataEncoder(types);
 
       const typedData = {
-        primaryType: typedDataEncoder.primaryType,
         domain: {
           chainId: domain.chainId
             ? bigNumberIshToNumber(domain.chainId)
@@ -570,8 +568,9 @@ export async function toEthersSigner(
           verifyingContract: domain.verifyingContract ?? undefined,
           version: domain.version ?? undefined,
         },
-        types,
         message: value,
+        primaryType: typedDataEncoder.primaryType,
+        types,
       };
 
       return account.signTypedData(typedData);
@@ -625,7 +624,6 @@ function alignTxToEthers(
     }
   }
 
-  // biome-ignore lint/performance/noDelete: ethers5 doesn't support authorizationList
   delete rest.authorizationList;
 
   return {
@@ -662,17 +660,17 @@ async function alignTxFromEthers(
         throw new Error("ChainId is required for EIP-2930 transactions");
       }
       return {
-        client,
+        accessList: accessList as AccessList,
         chain,
-        to,
+        client,
         data: (data ?? undefined) as Hex | undefined,
-        nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,
-        value: value ? ethers.BigNumber.from(value).toBigInt() : undefined,
+        gas: gasLimit ? ethers.BigNumber.from(gasLimit).toBigInt() : undefined,
         gasPrice: gasPrice
           ? ethers.BigNumber.from(gasPrice).toBigInt()
           : undefined,
-        gas: gasLimit ? ethers.BigNumber.from(gasLimit).toBigInt() : undefined,
-        accessList: accessList as AccessList,
+        nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,
+        to,
+        value: value ? ethers.BigNumber.from(value).toBigInt() : undefined,
       };
     }
     case 2: {
@@ -680,33 +678,33 @@ async function alignTxFromEthers(
         throw new Error("ChainId is required for EIP-1559 transactions");
       }
       return {
-        client,
+        accessList: accessList as AccessList,
         chain,
-        to,
+        client,
         data: (data ?? undefined) as Hex | undefined,
-        nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,
-        value: value ? ethers.BigNumber.from(value).toBigInt() : undefined,
         gas: gasLimit ? ethers.BigNumber.from(gasLimit).toBigInt() : undefined,
         maxFeePerGas: maxFeePerGas
           ? ethers.BigNumber.from(maxFeePerGas).toBigInt()
           : undefined,
         maxPriorityFeePerGas:
           ethers.BigNumber.from(maxPriorityFeePerGas).toBigInt(),
-        accessList: accessList as AccessList,
+        nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,
+        to,
+        value: value ? ethers.BigNumber.from(value).toBigInt() : undefined,
       };
     }
     default: {
       return {
-        client,
         chain,
-        to,
+        client,
         data: (data ?? undefined) as Hex | undefined,
-        nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,
-        value: value ? ethers.BigNumber.from(value).toBigInt() : undefined,
+        gas: gasLimit ? ethers.BigNumber.from(gasLimit).toBigInt() : undefined,
         gasPrice: gasPrice
           ? ethers.BigNumber.from(gasPrice).toBigInt()
           : undefined,
-        gas: gasLimit ? ethers.BigNumber.from(gasLimit).toBigInt() : undefined,
+        nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,
+        to,
+        value: value ? ethers.BigNumber.from(value).toBigInt() : undefined,
       };
     }
   }
diff --git a/packages/thirdweb/src/adapters/ethers6.test.ts b/packages/thirdweb/src/adapters/ethers6.test.ts
index 5ad1914c2c3..25ea5f07d57 100644
--- a/packages/thirdweb/src/adapters/ethers6.test.ts
+++ b/packages/thirdweb/src/adapters/ethers6.test.ts
@@ -10,8 +10,8 @@ import { privateKeyToAccount } from "../wallets/private-key.js";
 import { fromEthersSigner, toEthersSigner } from "./ethers6.js";
 
 const account = privateKeyToAccount({
-  privateKey: ANVIL_PKEY_A,
   client: TEST_CLIENT,
+  privateKey: ANVIL_PKEY_A,
 });
 
 describe("toEthersSigner", () => {
@@ -42,27 +42,28 @@ describe("toEthersSigner", () => {
 
     // All properties on a domain are optional
     const domain = {
-      name: "Ether Mail",
-      version: "1",
       chainId: 1,
+      name: "Ether Mail",
       verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+      version: "1",
     };
 
     // The named list of all type definitions
     const types = {
-      Person: [
-        { name: "name", type: "string" },
-        { name: "wallet", type: "address" },
-      ],
       Mail: [
         { name: "from", type: "Person" },
         { name: "to", type: "Person" },
         { name: "contents", type: "string" },
       ],
+      Person: [
+        { name: "name", type: "string" },
+        { name: "wallet", type: "address" },
+      ],
     };
 
     // The data to sign
     const value = {
+      contents: "Hello, Bob!",
       from: {
         name: "Cow",
         wallet: "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
@@ -71,7 +72,6 @@ describe("toEthersSigner", () => {
         name: "Bob",
         wallet: "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
       },
-      contents: "Hello, Bob!",
     };
 
     const signature = await signer.signTypedData(domain, types, value);
@@ -133,13 +133,13 @@ describe("fromEthersSigner", () => {
     const account = await fromEthersSigner(wallet);
 
     const transaction = prepareTransaction({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       to: TEST_ACCOUNT_B.address,
       value: 1n,
     });
 
-    const txResponse = await sendTransaction({ transaction, account });
+    const txResponse = await sendTransaction({ account, transaction });
 
     expect(txResponse.transactionHash.length).toBe(66);
   });
@@ -149,10 +149,10 @@ describe("fromEthersSigner", () => {
     const account = await fromEthersSigner(wallet);
 
     const domain = {
-      name: "Ether Mail",
-      version: "1",
       chainId: 1,
+      name: "Ether Mail",
       verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+      version: "1",
     };
 
     const types = {
@@ -168,10 +168,10 @@ describe("fromEthersSigner", () => {
     };
 
     const signature = await account.signTypedData({
-      primaryType: "Person",
       domain,
-      types,
       message: value,
+      primaryType: "Person",
+      types,
     });
 
     expect(signature).toBeDefined();
diff --git a/packages/thirdweb/src/adapters/ethers6.ts b/packages/thirdweb/src/adapters/ethers6.ts
index 6bd1f471e92..760ba1e16a1 100644
--- a/packages/thirdweb/src/adapters/ethers6.ts
+++ b/packages/thirdweb/src/adapters/ethers6.ts
@@ -6,7 +6,7 @@ import type { AccessList, Hex } from "viem";
 import type { Chain } from "../chains/types.js";
 import { getRpcUrlForChain } from "../chains/utils.js";
 import type { ThirdwebClient } from "../client/client.js";
-import { type ThirdwebContract, getContract } from "../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../contract/contract.js";
 import { toSerializableTransaction } from "../transaction/actions/to-serializable-transaction.js";
 import type { PreparedTransaction } from "../transaction/prepare-transaction.js";
 import type { SerializableTransaction } from "../transaction/serialize-transaction.js";
@@ -79,36 +79,6 @@ export const ethers6Adapter = /* @__PURE__ */ (() => {
   const ethers = universalethers;
 
   return {
-    /**
-     * Converts a Thirdweb client and chain ID into an ethers.js provider.
-     * @param options - The options for converting the Thirdweb client and chain ID into an ethers.js provider.
-     * @param options.client - The Thirdweb client.
-     * @param options.chain - The chain.
-     * @returns The ethers.js provider.
-     * @example
-     * ```ts
-     * import { ethers6Adapter } from "thirdweb/adapters/ethers6";
-     * const provider = ethers6Adapter.provider.toEthers({ client, chain });
-     * ```
-     */
-    provider: {
-      /**
-       * Converts a Thirdweb client and chain ID into an ethers.js provider.
-       * @param options - The options for converting the Thirdweb client and chain ID into an ethers.js provider.
-       * @param options.client - The Thirdweb client.
-       * @param options.chain - The chain.
-       * @returns The ethers.js provider.
-       * @example
-       * ```ts
-       * import { ethers6Adapter } from "thirdweb/adapters/ethers6";
-       * const provider = ethers6Adapter.provider.toEthers({ client, chain });
-       * ```
-       */
-      toEthers: (options: { client: ThirdwebClient; chain: Chain }) => {
-        assertEthers6(ethers);
-        return toEthersProvider(ethers, options.client, options.chain);
-      },
-    },
     /**
      * Converts a ThirdwebContract to an ethers.js Contract or the other way around.
      * @example
@@ -126,6 +96,22 @@ export const ethers6Adapter = /* @__PURE__ */ (() => {
      * ```
      */
     contract: {
+      /**
+       * Creates a ThirdwebContract from an ethers.js Contract.
+       * @param options - The options for creating a ThirdwebContract from an ethers.js Contract.
+       * @param options.ethersContract - The ethers.js Contract to convert.
+       * @param options.chain - The chain.
+       * @returns The ThirdwebContract.
+       * @example
+       * ```ts
+       * import { ethers6Adapter } from "thirdweb/adapters/ethers6";
+       * const contract = ethers6Adapter.contract.fromEthers({ ethersContract, chain });
+       * ```
+       */
+      fromEthers: (options: FromEthersContractOptions) => {
+        assertEthers6(ethers);
+        return fromEthersContract(options);
+      },
       /**
        * Converts a ThirdwebContract to an ethers.js Contract.
        * @param options - The options for converting a ThirdwebContract to an ethers.js Contract.
@@ -149,21 +135,35 @@ export const ethers6Adapter = /* @__PURE__ */ (() => {
           options.account,
         );
       },
+    },
+    /**
+     * Converts a Thirdweb client and chain ID into an ethers.js provider.
+     * @param options - The options for converting the Thirdweb client and chain ID into an ethers.js provider.
+     * @param options.client - The Thirdweb client.
+     * @param options.chain - The chain.
+     * @returns The ethers.js provider.
+     * @example
+     * ```ts
+     * import { ethers6Adapter } from "thirdweb/adapters/ethers6";
+     * const provider = ethers6Adapter.provider.toEthers({ client, chain });
+     * ```
+     */
+    provider: {
       /**
-       * Creates a ThirdwebContract from an ethers.js Contract.
-       * @param options - The options for creating a ThirdwebContract from an ethers.js Contract.
-       * @param options.ethersContract - The ethers.js Contract to convert.
+       * Converts a Thirdweb client and chain ID into an ethers.js provider.
+       * @param options - The options for converting the Thirdweb client and chain ID into an ethers.js provider.
+       * @param options.client - The Thirdweb client.
        * @param options.chain - The chain.
-       * @returns The ThirdwebContract.
+       * @returns The ethers.js provider.
        * @example
        * ```ts
        * import { ethers6Adapter } from "thirdweb/adapters/ethers6";
-       * const contract = ethers6Adapter.contract.fromEthers({ ethersContract, chain });
+       * const provider = ethers6Adapter.provider.toEthers({ client, chain });
        * ```
        */
-      fromEthers: (options: FromEthersContractOptions) => {
+      toEthers: (options: { client: ThirdwebClient; chain: Chain }) => {
         assertEthers6(ethers);
-        return fromEthersContract(options);
+        return toEthersProvider(ethers, options.client, options.chain);
       },
     },
     /**
@@ -242,7 +242,7 @@ export function toEthersProvider(
   client: ThirdwebClient,
   chain: Chain,
 ) {
-  const url = getRpcUrlForChain({ client, chain });
+  const url = getRpcUrlForChain({ chain, client });
 
   const fetchRequest = new ethers.FetchRequest(url);
   if (client.secretKey) {
@@ -310,10 +310,10 @@ export async function fromEthersContract<abi extends Abi>({
   chain,
 }: FromEthersContractOptions): Promise<ThirdwebContract<abi>> {
   return getContract({
-    client,
-    address: await ethersContract.getAddress(),
     abi: JSON.parse(ethersContract.interface.formatJson()) as abi,
+    address: await ethersContract.getAddress(),
     chain,
+    client,
   });
 }
 
@@ -329,14 +329,6 @@ export async function fromEthersSigner(
   const address = await signer.getAddress();
   const account: Account = {
     address: getAddress(address),
-    signMessage: async ({ message }) => {
-      return signer.signMessage(
-        typeof message === "string" ? message : message.raw,
-      ) as Promise<Hex>;
-    },
-    signTransaction: async (tx) => {
-      return signer.signTransaction(alignTxToEthers(tx)) as Promise<Hex>;
-    },
     sendTransaction: async (tx) => {
       const transactionHash = (
         await signer.sendTransaction(alignTxToEthers(tx))
@@ -345,6 +337,14 @@ export async function fromEthersSigner(
         transactionHash,
       };
     },
+    signMessage: async ({ message }) => {
+      return signer.signMessage(
+        typeof message === "string" ? message : message.raw,
+      ) as Promise<Hex>;
+    },
+    signTransaction: async (tx) => {
+      return signer.signTransaction(alignTxToEthers(tx)) as Promise<Hex>;
+    },
     signTypedData: async (data) => {
       return (await signer.signTypedData(
         data.domain as ethers6.TypedDataDomain,
@@ -402,19 +402,19 @@ export function toEthersSigner(
         tx,
       });
       const serializableTx = await toSerializableTransaction({
-        transaction: ethersTx,
         from: account.address,
+        transaction: ethersTx,
       });
       const result = await account.sendTransaction(serializableTx);
 
       const txResponseParams: ethers6.TransactionResponseParams = {
         ...serializableTx,
         blockHash: null,
+        blockNumber: null,
         from: this.address,
+        gasLimit: serializableTx.gas as bigint,
         hash: result.transactionHash as string,
-        blockNumber: null,
         index: 0,
-        gasLimit: serializableTx.gas as bigint,
         // @ts-expect-error - we don't have this reliably so we'll just not include it
         signature: null,
       };
@@ -437,8 +437,8 @@ export function toEthersSigner(
         tx,
       });
       const serializableTx = await toSerializableTransaction({
-        transaction: ethersTx,
         from: account.address,
+        transaction: ethersTx,
       });
       return account.signTransaction(serializableTx);
     }
@@ -464,7 +464,6 @@ export function toEthersSigner(
       const typedDataEncoder = new ethers.TypedDataEncoder(types);
 
       const typedData = {
-        primaryType: typedDataEncoder.primaryType,
         domain: {
           chainId: domain.chainId
             ? bigNumberIshToNumber(domain.chainId)
@@ -474,8 +473,9 @@ export function toEthersSigner(
           verifyingContract: domain.verifyingContract ?? undefined,
           version: domain.version ?? undefined,
         },
-        types,
         message: value,
+        primaryType: typedDataEncoder.primaryType,
+        types,
       };
 
       return account.signTypedData(typedData);
@@ -555,14 +555,14 @@ async function alignTxFromEthers(options: {
         throw new Error("ChainId is required for EIP-2930 transactions");
       }
       return {
-        client,
-        chain,
         accessList: accessList as AccessList,
-        to: (to ?? undefined) as string | undefined,
+        chain,
+        client,
         data: (data ?? undefined) as Hex | undefined,
-        gasPrice: gasPrice ? bigNumberIshToBigint(gasPrice) : undefined,
         gas: gasLimit ? bigNumberIshToBigint(gasLimit) : undefined,
+        gasPrice: gasPrice ? bigNumberIshToBigint(gasPrice) : undefined,
         nonce: nonce ?? undefined,
+        to: (to ?? undefined) as string | undefined,
         value: value ? bigNumberIshToBigint(value) : undefined,
       };
     }
@@ -571,33 +571,33 @@ async function alignTxFromEthers(options: {
         throw new Error("ChainId is required for EIP-1559 transactions");
       }
       return {
-        client,
-        chain,
         accessList: accessList as AccessList,
-        to: (to ?? undefined) as string | undefined,
+        chain,
+        client,
         data: (data ?? undefined) as Hex | undefined,
         gas: gasLimit ? bigNumberIshToBigint(gasLimit) : undefined,
-        nonce: nonce ?? undefined,
-        value: value ? bigNumberIshToBigint(value) : undefined,
         maxFeePerGas: maxFeePerGas
           ? bigNumberIshToBigint(maxFeePerGas)
           : undefined,
         maxPriorityFeePerGas: maxPriorityFeePerGas
           ? bigNumberIshToBigint(maxPriorityFeePerGas)
           : undefined,
+        nonce: nonce ?? undefined,
+        to: (to ?? undefined) as string | undefined,
+        value: value ? bigNumberIshToBigint(value) : undefined,
       };
     }
     default: {
       // fall back to legacy
       return {
-        client,
         chain,
-        to: (to ?? undefined) as string | undefined,
+        client,
         data: (data ?? undefined) as Hex | undefined,
+        gas: gasLimit ? bigNumberIshToBigint(gasLimit) : undefined,
+        gasPrice: gasPrice ? bigNumberIshToBigint(gasPrice) : undefined,
         nonce: nonce ?? undefined,
+        to: (to ?? undefined) as string | undefined,
         value: value ? bigNumberIshToBigint(value) : undefined,
-        gasPrice: gasPrice ? bigNumberIshToBigint(gasPrice) : undefined,
-        gas: gasLimit ? bigNumberIshToBigint(gasLimit) : undefined,
       };
     }
   }
diff --git a/packages/thirdweb/src/adapters/viem-legacy.test.ts b/packages/thirdweb/src/adapters/viem-legacy.test.ts
index 6b386ec025a..309867b3bd0 100644
--- a/packages/thirdweb/src/adapters/viem-legacy.test.ts
+++ b/packages/thirdweb/src/adapters/viem-legacy.test.ts
@@ -16,8 +16,8 @@ import { privateKeyToAccount } from "../wallets/private-key.js";
 import { toViemContract, viemAdapter } from "./viem.js";
 
 const account = privateKeyToAccount({
-  privateKey: ANVIL_PKEY_A,
   client: TEST_CLIENT,
+  privateKey: ANVIL_PKEY_A,
 });
 
 describe("walletClient.toViem", () => {
@@ -25,9 +25,9 @@ describe("walletClient.toViem", () => {
 
   beforeAll(() => {
     walletClient = viemAdapter.walletClient.toViem({
-      client: TEST_CLIENT,
       account,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
   });
 
@@ -70,8 +70,8 @@ describe("walletClient.toViem", () => {
 
     const signature = await walletClient.signTypedData({
       ...typedData.basic,
-      primaryType: "Mail",
       account: walletClient.account,
+      primaryType: "Mail",
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -93,13 +93,13 @@ describe("walletClient.toViem", () => {
       chain: {
         id: ANVIL_CHAIN.id,
         name: ANVIL_CHAIN.name || "",
-        rpcUrls: {
-          default: { http: [ANVIL_CHAIN.rpc] },
-        },
         nativeCurrency: {
+          decimals: ANVIL_CHAIN.nativeCurrency?.decimals || 18,
           name: ANVIL_CHAIN.nativeCurrency?.name || "Ether",
           symbol: ANVIL_CHAIN.nativeCurrency?.symbol || "ETH",
-          decimals: ANVIL_CHAIN.nativeCurrency?.decimals || 18,
+        },
+        rpcUrls: {
+          default: { http: [ANVIL_CHAIN.rpc] },
         },
       },
       to: TEST_ACCOUNT_B.address,
@@ -111,9 +111,9 @@ describe("walletClient.toViem", () => {
 
   test("should get address on live chain", async () => {
     walletClient = viemAdapter.walletClient.toViem({
-      client: TEST_CLIENT,
       account,
       chain: FORKED_ETHEREUM_CHAIN,
+      client: TEST_CLIENT,
     });
 
     const address = await walletClient.getAddresses();
@@ -127,8 +127,8 @@ describe("walletClient.toViem", () => {
     const rawViemAccount = viemPrivateKeyToAccount(ANVIL_PKEY_A);
     const twSignature = await account.signMessage({ message });
     const viemTwSignature = await walletClient.signMessage({
-      message,
       account: walletClient.account as ViemAccount,
+      message,
     });
     const viemSignature = await rawViemAccount.signMessage({ message });
 
diff --git a/packages/thirdweb/src/adapters/viem.test.ts b/packages/thirdweb/src/adapters/viem.test.ts
index 8e6779febce..6bc7070c208 100644
--- a/packages/thirdweb/src/adapters/viem.test.ts
+++ b/packages/thirdweb/src/adapters/viem.test.ts
@@ -24,9 +24,9 @@ describe("walletClient.toViem", () => {
 
   beforeAll(() => {
     walletClient = viemAdapter.wallet.toViem({
+      chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       wallet,
-      chain: ANVIL_CHAIN,
     });
   });
 
@@ -71,8 +71,8 @@ describe("walletClient.toViem", () => {
 
     const signature = await walletClient.signTypedData({
       ...typedData.basic,
-      primaryType: "Mail",
       account: walletClient.account,
+      primaryType: "Mail",
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -94,13 +94,13 @@ describe("walletClient.toViem", () => {
       chain: {
         id: ANVIL_CHAIN.id,
         name: ANVIL_CHAIN.name || "",
-        rpcUrls: {
-          default: { http: [ANVIL_CHAIN.rpc] },
-        },
         nativeCurrency: {
+          decimals: ANVIL_CHAIN.nativeCurrency?.decimals || 18,
           name: ANVIL_CHAIN.nativeCurrency?.name || "Ether",
           symbol: ANVIL_CHAIN.nativeCurrency?.symbol || "ETH",
-          decimals: ANVIL_CHAIN.nativeCurrency?.decimals || 18,
+        },
+        rpcUrls: {
+          default: { http: [ANVIL_CHAIN.rpc] },
         },
       },
       to: TEST_ACCOUNT_B.address,
@@ -112,9 +112,9 @@ describe("walletClient.toViem", () => {
 
   test("should get address on live chain", async () => {
     walletClient = viemAdapter.wallet.toViem({
+      chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
       wallet,
-      chain: FORKED_ETHEREUM_CHAIN,
     });
 
     const account = wallet.getAccount();
@@ -136,8 +136,8 @@ describe("walletClient.toViem", () => {
     const rawViemAccount = viemPrivateKeyToAccount(ANVIL_PKEY_A);
     const twSignature = await account.signMessage({ message });
     const viemTwSignature = await walletClient.signMessage({
-      message,
       account: walletClient.account as ViemAccount,
+      message,
     });
     const viemSignature = await rawViemAccount.signMessage({ message });
 
diff --git a/packages/thirdweb/src/adapters/viem.ts b/packages/thirdweb/src/adapters/viem.ts
index 58382bb8032..328bbfa4f12 100644
--- a/packages/thirdweb/src/adapters/viem.ts
+++ b/packages/thirdweb/src/adapters/viem.ts
@@ -1,20 +1,20 @@
 import type { Abi } from "abitype";
 import {
-  http,
+  createPublicClient,
+  createWalletClient,
+  custom,
   type GetContractReturnType,
+  http,
   type PublicClient,
   type TransactionSerializableEIP1559,
   type Chain as ViemChain,
   type WalletClient,
-  createPublicClient,
-  createWalletClient,
-  custom,
 } from "viem";
 import type { Chain } from "../chains/types.js";
 import { getRpcUrlForChain } from "../chains/utils.js";
 import type { ThirdwebClient } from "../client/client.js";
 import { resolveContractAbi } from "../contract/actions/resolve-abi.js";
-import { type ThirdwebContract, getContract } from "../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../contract/contract.js";
 import { getRpcClient } from "../rpc/rpc.js";
 import { estimateGas } from "../transaction/actions/estimate-gas.js";
 import { sendTransaction } from "../transaction/actions/send-transaction.js";
@@ -125,7 +125,6 @@ export const viemAdapter = {
   publicClient: {
     toViem: toViemPublicClient,
   },
-
   /**
    * Converts a thirdweb account to a Viem Wallet client or the other way around.
    * @param options - The options for creating the Viem Wallet client.
@@ -136,8 +135,8 @@ export const viemAdapter = {
    * ```ts
    * import { viemAdapter } from "thirdweb/adapters/viem";
    *
-   * const walletClient = viemAdapter.walletClient.toViem({
-   *  account,
+   * const walletClient = viemAdapter.wallet.toViem({
+   *  wallet,
    *  client,
    *  chain: ethereum,
    * });
@@ -147,40 +146,38 @@ export const viemAdapter = {
    * ```ts
    * import { viemAdapter } from "thirdweb/adapters";
    *
-   * const account = viemAdapter.walletClient.fromViem({
+   * const wallet = viemAdapter.wallet.fromViem({
    *   walletClient,
    * });
    * ```
-   * @deprecated use viemAdapter.wallet instead
    */
-  walletClient: {
+  wallet: {
     /**
-     * Converts a Thirdweb wallet to a Viem wallet client.
-     * @param options - The options for converting a Thirdweb wallet to a Viem wallet client.
-     * @param options.account - The Thirdweb wallet to convert.
-     * @returns A Promise that resolves to a Viem wallet client.
+     * Converts a Viem wallet client to a Thirdweb wallet.
+     * @param options - The options for converting a Viem wallet client to a Thirdweb wallet.
+     * @param options.walletClient - The Viem wallet client to convert.
+     * @returns A Promise that resolves to a Thirdweb wallet.
      * @example
      * ```ts
      * import { viemAdapter } from "thirdweb/adapters";
-     * const walletClient = viemAdapter.walletClient.toViem({ account, client, chain });
+     * const wallet = viemAdapter.wallet.fromViem({ walletClient });
      * ```
-     * @deprecated use viemAdapter.wallet instead
      */
-    toViem: toViemWalletClient,
+    fromViem: walletFromViem,
     /**
-     * Converts a Viem wallet client to a Thirdweb wallet.
-     * @param options - The options for converting a Viem wallet client to a Thirdweb wallet.
-     * @param options.walletClient - The Viem wallet client to convert.
-     * @returns A Promise that resolves to a Thirdweb wallet.
+     * Converts a Thirdweb wallet to a Viem wallet client.
+     * @param options - The options for converting a Thirdweb wallet to a Viem wallet client.
+     * @param options.wallet - The Thirdweb wallet to convert.
+     * @returns A Promise that resolves to a Viem wallet client.
      * @example
      * ```ts
      * import { viemAdapter } from "thirdweb/adapters";
-     * const account = viemAdapter.walletClient.fromViem({ walletClient });
+     * const walletClient = viemAdapter.wallet.toViem({ wallet, client, chain });
      * ```
-     * @deprecated use viemAdapter.wallet instead
      */
-    fromViem: fromViemWalletClient,
+    toViem: walletToViem,
   },
+
   /**
    * Converts a thirdweb account to a Viem Wallet client or the other way around.
    * @param options - The options for creating the Viem Wallet client.
@@ -191,8 +188,8 @@ export const viemAdapter = {
    * ```ts
    * import { viemAdapter } from "thirdweb/adapters/viem";
    *
-   * const walletClient = viemAdapter.wallet.toViem({
-   *  wallet,
+   * const walletClient = viemAdapter.walletClient.toViem({
+   *  account,
    *  client,
    *  chain: ethereum,
    * });
@@ -202,36 +199,39 @@ export const viemAdapter = {
    * ```ts
    * import { viemAdapter } from "thirdweb/adapters";
    *
-   * const wallet = viemAdapter.wallet.fromViem({
+   * const account = viemAdapter.walletClient.fromViem({
    *   walletClient,
    * });
    * ```
+   * @deprecated use viemAdapter.wallet instead
    */
-  wallet: {
+  walletClient: {
     /**
-     * Converts a Thirdweb wallet to a Viem wallet client.
-     * @param options - The options for converting a Thirdweb wallet to a Viem wallet client.
-     * @param options.wallet - The Thirdweb wallet to convert.
-     * @returns A Promise that resolves to a Viem wallet client.
+     * Converts a Viem wallet client to a Thirdweb wallet.
+     * @param options - The options for converting a Viem wallet client to a Thirdweb wallet.
+     * @param options.walletClient - The Viem wallet client to convert.
+     * @returns A Promise that resolves to a Thirdweb wallet.
      * @example
      * ```ts
      * import { viemAdapter } from "thirdweb/adapters";
-     * const walletClient = viemAdapter.wallet.toViem({ wallet, client, chain });
+     * const account = viemAdapter.walletClient.fromViem({ walletClient });
      * ```
+     * @deprecated use viemAdapter.wallet instead
      */
-    toViem: walletToViem,
+    fromViem: fromViemWalletClient,
     /**
-     * Converts a Viem wallet client to a Thirdweb wallet.
-     * @param options - The options for converting a Viem wallet client to a Thirdweb wallet.
-     * @param options.walletClient - The Viem wallet client to convert.
-     * @returns A Promise that resolves to a Thirdweb wallet.
+     * Converts a Thirdweb wallet to a Viem wallet client.
+     * @param options - The options for converting a Thirdweb wallet to a Viem wallet client.
+     * @param options.account - The Thirdweb wallet to convert.
+     * @returns A Promise that resolves to a Viem wallet client.
      * @example
      * ```ts
      * import { viemAdapter } from "thirdweb/adapters";
-     * const wallet = viemAdapter.wallet.fromViem({ walletClient });
+     * const walletClient = viemAdapter.walletClient.toViem({ account, client, chain });
      * ```
+     * @deprecated use viemAdapter.wallet instead
      */
-    fromViem: walletFromViem,
+    toViem: toViemWalletClient,
   },
 };
 
@@ -245,8 +245,8 @@ function fromViemContract<const TAbi extends Abi>(
   options: FromViemContractOptions<TAbi>,
 ): ThirdwebContract<TAbi> {
   return getContract({
-    address: options.viemContract.address,
     abi: options.viemContract.abi,
+    address: options.viemContract.address,
     chain: options.chain,
     client: options.client,
   });
@@ -259,8 +259,8 @@ export async function toViemContract<const TAbi extends Abi>(options: {
   thirdwebContract: ThirdwebContract<TAbi>;
 }): Promise<GetContractReturnType<TAbi>> {
   return {
-    address: getAddress(options.thirdwebContract.address),
     abi: await resolveContractAbi(options.thirdwebContract),
+    address: getAddress(options.thirdwebContract.address),
   };
 }
 
@@ -275,16 +275,17 @@ function toViemPublicClient(options: ToViemPublicClientOptions): PublicClient {
   const viemChain: ViemChain = {
     id: chain.id,
     name: chain.name || "",
-    rpcUrls: {
-      default: { http: [rpcUrl] },
-    },
     nativeCurrency: {
+      decimals: chain.nativeCurrency?.decimals || 18,
       name: chain.nativeCurrency?.name || "Ether",
       symbol: chain.nativeCurrency?.symbol || "ETH",
-      decimals: chain.nativeCurrency?.decimals || 18,
+    },
+    rpcUrls: {
+      default: { http: [rpcUrl] },
     },
   };
   return createPublicClient({
+    chain: viemChain,
     transport: http(rpcUrl, {
       fetchOptions: client.secretKey
         ? {
@@ -294,7 +295,6 @@ function toViemPublicClient(options: ToViemPublicClientOptions): PublicClient {
           }
         : undefined,
     }),
-    chain: viemChain,
   });
 }
 
@@ -315,38 +315,38 @@ function toViemWalletClient(options: ToViemWalletClientOptions): WalletClient {
   const viemChain: ViemChain = {
     id: chain.id,
     name: chain.name || "",
-    rpcUrls: {
-      default: { http: [rpcUrl] },
-    },
     nativeCurrency: {
+      decimals: chain.nativeCurrency?.decimals || 18,
       name: chain.nativeCurrency?.name || "Ether",
       symbol: chain.nativeCurrency?.symbol || "ETH",
-      decimals: chain.nativeCurrency?.decimals || 18,
+    },
+    rpcUrls: {
+      default: { http: [rpcUrl] },
     },
   };
 
-  const rpcClient = getRpcClient({ client, chain });
+  const rpcClient = getRpcClient({ chain, client });
   const transport = custom({
     request: async (request) => {
       if (request.method === "eth_sendTransaction") {
         const result = await sendTransaction({
+          account: account,
           transaction: prepareTransaction({
             ...request.params[0],
             chain,
             client,
           }),
-          account: account,
         });
         return result.transactionHash;
       }
       if (request.method === "eth_estimateGas") {
         return estimateGas({
+          account: account,
           transaction: prepareTransaction({
             ...request.params[0],
             chain,
             client,
           }),
-          account: account,
         });
       }
       if (request.method === "personal_sign") {
@@ -376,10 +376,10 @@ function toViemWalletClient(options: ToViemWalletClientOptions): WalletClient {
   });
 
   return createWalletClient({
-    transport,
     account: getAddress(account.address),
     chain: viemChain,
     key: "thirdweb-wallet",
+    transport,
   });
 }
 
@@ -395,12 +395,6 @@ function fromViemWalletClient(options: {
   }
   return {
     address: viemAccount.address,
-    signMessage: async (msg) => {
-      return options.walletClient.signMessage({
-        account: viemAccount,
-        ...msg,
-      });
-    },
     sendTransaction: async (tx) => {
       const tx1559 = tx as TransactionSerializableEIP1559; // TODO check other txTypes
       const txHash = await options.walletClient.sendTransaction({
@@ -413,6 +407,12 @@ function fromViemWalletClient(options: {
         transactionHash: txHash,
       };
     },
+    signMessage: async (msg) => {
+      return options.walletClient.signMessage({
+        account: viemAccount,
+        ...msg,
+      });
+    },
     signTypedData(_typedData) {
       if (!_typedData) {
         throw new Error("Typed data is required to signTypedData");
@@ -440,13 +440,13 @@ function walletToViem(options: WalletToViemOptions): WalletClient {
   const viemChain: ViemChain = {
     id: chain.id,
     name: chain.name || "",
-    rpcUrls: {
-      default: { http: [rpcUrl] },
-    },
     nativeCurrency: {
+      decimals: chain.nativeCurrency?.decimals || 18,
       name: chain.nativeCurrency?.name || "Ether",
       symbol: chain.nativeCurrency?.symbol || "ETH",
-      decimals: chain.nativeCurrency?.decimals || 18,
+    },
+    rpcUrls: {
+      default: { http: [rpcUrl] },
     },
   };
 
@@ -456,18 +456,16 @@ function walletToViem(options: WalletToViemOptions): WalletClient {
     wallet,
   });
   return createWalletClient({
-    transport: custom({
-      request: (request) => eip1193Provider.request(request),
-    }),
     account: wallet.getAccount()?.address,
     chain: viemChain,
     key: "thirdweb-wallet",
+    transport: custom({
+      request: (request) => eip1193Provider.request(request),
+    }),
   });
 }
 
-function walletFromViem(options: {
-  walletClient: WalletClient;
-}): Wallet {
+function walletFromViem(options: { walletClient: WalletClient }): Wallet {
   const viemAccount = options.walletClient.account;
   if (!viemAccount) {
     throw new Error(
@@ -477,9 +475,9 @@ function walletFromViem(options: {
 
   const wallet = fromProvider({
     provider: {
-      request: (request) => options.walletClient.request(request),
       on: () => {},
       removeListener: () => {},
+      request: (request) => options.walletClient.request(request),
     },
     walletId: "adapter",
   });
diff --git a/packages/thirdweb/src/adapters/wallet-adapter.ts b/packages/thirdweb/src/adapters/wallet-adapter.ts
index 5df6a4405c7..5520d666624 100644
--- a/packages/thirdweb/src/adapters/wallet-adapter.ts
+++ b/packages/thirdweb/src/adapters/wallet-adapter.ts
@@ -52,13 +52,11 @@ export function createWalletAdapter(
   const emitter = createWalletEmitter<"adapter">();
   let _chain = options.chain;
   return {
-    id: "adapter",
-    subscribe: emitter.subscribe,
-    connect: async () => {
+    autoConnect: async () => {
       emitter.emit("onConnect", options);
       return options.adaptedAccount;
     },
-    autoConnect: async () => {
+    connect: async () => {
       emitter.emit("onConnect", options);
       return options.adaptedAccount;
     },
@@ -77,6 +75,8 @@ export function createWalletAdapter(
     getConfig() {
       return options;
     },
+    id: "adapter",
+    subscribe: emitter.subscribe,
     switchChain: async (chain) => {
       await options.switchChain(chain);
       _chain = chain;
diff --git a/packages/thirdweb/src/ai/chat.test.ts b/packages/thirdweb/src/ai/chat.test.ts
index eafc1dc5aa6..d9e0489083f 100644
--- a/packages/thirdweb/src/ai/chat.test.ts
+++ b/packages/thirdweb/src/ai/chat.test.ts
@@ -9,33 +9,33 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("chat", () => {
   it("should respond with a message", async () => {
     const response = await Nebula.chat({
       client: TEST_CLIENT,
+      contextFilter: {
+        chains: [sepolia],
+      },
       messages: [
         {
-          role: "user",
           content: `What's the symbol of this contract: 0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8`,
+          role: "user",
         },
       ],
-      contextFilter: {
-        chains: [sepolia],
-      },
     });
     expect(response.message).toContain("CAT");
   });
 
   it("should respond with a transaction", async () => {
     const response = await Nebula.chat({
+      account: TEST_ACCOUNT_A,
       client: TEST_CLIENT,
+      contextFilter: {
+        chains: [sepolia],
+        walletAddresses: [TEST_ACCOUNT_A.address],
+      },
       messages: [
         {
-          role: "user",
           content: `send 0.0001 ETH on sepolia to ${TEST_ACCOUNT_B.address}`,
+          role: "user",
         },
       ],
-      account: TEST_ACCOUNT_A,
-      contextFilter: {
-        chains: [sepolia],
-        walletAddresses: [TEST_ACCOUNT_A.address],
-      },
     });
     expect(response.transactions.length).toBe(1);
   });
diff --git a/packages/thirdweb/src/ai/chat.ts b/packages/thirdweb/src/ai/chat.ts
index 3c89e0f4925..cddcfdd5a10 100644
--- a/packages/thirdweb/src/ai/chat.ts
+++ b/packages/thirdweb/src/ai/chat.ts
@@ -1,4 +1,4 @@
-import { type Input, type Output, nebulaFetch } from "./common.js";
+import { type Input, nebulaFetch, type Output } from "./common.js";
 
 /**
  * Chat with Nebula.
diff --git a/packages/thirdweb/src/ai/common.ts b/packages/thirdweb/src/ai/common.ts
index f3effc6060f..4e161d89f87 100644
--- a/packages/thirdweb/src/ai/common.ts
+++ b/packages/thirdweb/src/ai/common.ts
@@ -56,10 +56,6 @@ export async function nebulaFetch(
 ): Promise<Output> {
   const fetch = getClientFetch(input.client);
   const response = await fetch(`${NEBULA_API_URL}/${mode}`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: JSON.stringify({
       ...("messages" in input
         ? {
@@ -82,14 +78,18 @@ export async function nebulaFetch(
             context_filter: {
               chain_ids:
                 input.contextFilter.chains?.map((c) => c.id.toString()) || [],
+              contract_addresses: input.contextFilter.contractAddresses || [],
               wallet_addresses:
                 input.contextFilter.walletAddresses ||
                 (input.account ? [input.account.address] : []),
-              contract_addresses: input.contextFilter.contractAddresses || [],
             },
           }
         : {}),
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
   if (!response.ok) {
     const error = await response.text();
@@ -113,9 +113,9 @@ export async function nebulaFetch(
           return prepareTransaction({
             chain: getCachedChain(tx.chainId),
             client: input.client,
+            data: tx.data,
             to: tx.to,
             value: tx.value ? toBigInt(tx.value) : undefined,
-            data: tx.data,
           });
         }
         return undefined;
diff --git a/packages/thirdweb/src/ai/execute.test.ts b/packages/thirdweb/src/ai/execute.test.ts
index ca48a376ea0..2c971a3eefb 100644
--- a/packages/thirdweb/src/ai/execute.test.ts
+++ b/packages/thirdweb/src/ai/execute.test.ts
@@ -10,13 +10,13 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("execute", () => {
   it("should execute a tx", async () => {
     await expect(
       Nebula.execute({
-        client: TEST_CLIENT,
-        message: `send 0.0001 ETH to ${TEST_ACCOUNT_B.address}`,
         account: TEST_ACCOUNT_A,
+        client: TEST_CLIENT,
         contextFilter: {
           chains: [sepolia],
           walletAddresses: [TEST_ACCOUNT_A.address],
         },
+        message: `send 0.0001 ETH to ${TEST_ACCOUNT_B.address}`,
       }),
     ).rejects.toThrow(/insufficient funds for gas/); // shows that the tx was sent
   });
@@ -24,24 +24,24 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("execute", () => {
   // TODO make this work reliably
   it("should execute a contract call", async () => {
     const nftContract = getContract({
-      client: TEST_CLIENT,
-      chain: sepolia,
       address: "0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8",
+      chain: sepolia,
+      client: TEST_CLIENT,
     });
 
     const response = await Nebula.execute({
+      account: TEST_ACCOUNT_A,
       client: TEST_CLIENT,
+      contextFilter: {
+        chains: [nftContract.chain],
+        contractAddresses: [nftContract.address],
+      },
       messages: [
         {
-          role: "user",
           content: `approve 1 token of token id 0 to ${TEST_ACCOUNT_B.address} using the approve function`,
+          role: "user",
         },
       ],
-      account: TEST_ACCOUNT_A,
-      contextFilter: {
-        chains: [nftContract.chain],
-        contractAddresses: [nftContract.address],
-      },
     });
     expect(response.transactionHash).toBeDefined();
   });
diff --git a/packages/thirdweb/src/ai/execute.ts b/packages/thirdweb/src/ai/execute.ts
index c9a02282cdf..9229347211c 100644
--- a/packages/thirdweb/src/ai/execute.ts
+++ b/packages/thirdweb/src/ai/execute.ts
@@ -62,7 +62,7 @@ export async function execute(
     throw new Error(result.message);
   }
   return sendTransaction({
-    transaction: tx,
     account: input.account,
+    transaction: tx,
   });
 }
diff --git a/packages/thirdweb/src/ai/index.ts b/packages/thirdweb/src/ai/index.ts
index a735a029ab3..3c29963362d 100644
--- a/packages/thirdweb/src/ai/index.ts
+++ b/packages/thirdweb/src/ai/index.ts
@@ -1,3 +1,3 @@
 export { chat } from "./chat.js";
-export { execute } from "./execute.js";
 export type { Input, Output } from "./common.js";
+export { execute } from "./execute.js";
diff --git a/packages/thirdweb/src/analytics/track/connect.test.ts b/packages/thirdweb/src/analytics/track/connect.test.ts
index 9f60ab0a3a8..97a21141ce0 100644
--- a/packages/thirdweb/src/analytics/track/connect.test.ts
+++ b/packages/thirdweb/src/analytics/track/connect.test.ts
@@ -1,4 +1,4 @@
-import { http, HttpResponse } from "msw";
+import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -31,15 +31,15 @@ describe("trackConnect", () => {
 
     await trackConnect({
       client: mockClient,
-      walletType: "metamask",
       walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "metamask",
     });
 
     expect(requestBody).toEqual({
-      source: "connectWallet",
       action: "connect",
-      walletType: "metamask",
+      source: "connectWallet",
       walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "metamask",
     });
   });
 
@@ -63,8 +63,8 @@ describe("trackConnect", () => {
         id: "ecosystem.test-ecosystem-id",
         partnerId: "test-partner-id",
       },
-      walletType: "metamask",
       walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "metamask",
     });
 
     expect(requestHeaders?.get("x-client-id")).toEqual("test-client-id");
diff --git a/packages/thirdweb/src/analytics/track/connect.ts b/packages/thirdweb/src/analytics/track/connect.ts
index 8ba786d3d69..181bb6a9b4c 100644
--- a/packages/thirdweb/src/analytics/track/connect.ts
+++ b/packages/thirdweb/src/analytics/track/connect.ts
@@ -15,13 +15,13 @@ export async function trackConnect(args: {
   const { client, ecosystem, walletType, walletAddress, chainId } = args;
   return track({
     client,
-    ecosystem,
     data: {
-      source: "connectWallet",
       action: "connect",
-      walletType,
-      walletAddress,
       chainId,
+      source: "connectWallet",
+      walletAddress,
+      walletType,
     },
+    ecosystem,
   });
 }
diff --git a/packages/thirdweb/src/analytics/track/helpers.test.ts b/packages/thirdweb/src/analytics/track/helpers.test.ts
index 3a63413ff5e..42bfbd639a3 100644
--- a/packages/thirdweb/src/analytics/track/helpers.test.ts
+++ b/packages/thirdweb/src/analytics/track/helpers.test.ts
@@ -36,8 +36,8 @@ describe("isInsufficientFundsError", () => {
 
   it("should detect reason field", () => {
     const error = {
-      reason: "insufficient funds",
       message: "Transaction failed",
+      reason: "insufficient funds",
     };
     expect(isInsufficientFundsError(error)).toBe(true);
   });
@@ -76,7 +76,7 @@ describe("getErrorDetails", () => {
   });
 
   it("should extract message and code from error object", () => {
-    const error = { message: "Test message", code: "TEST_CODE" };
+    const error = { code: "TEST_CODE", message: "Test message" };
     const details = getErrorDetails(error);
     expect(details.message).toBe("Test message");
     expect(details.code).toBe("TEST_CODE");
diff --git a/packages/thirdweb/src/analytics/track/helpers.ts b/packages/thirdweb/src/analytics/track/helpers.ts
index 7b1036470e5..1c41f0552f7 100644
--- a/packages/thirdweb/src/analytics/track/helpers.ts
+++ b/packages/thirdweb/src/analytics/track/helpers.ts
@@ -45,5 +45,5 @@ export function getErrorDetails(error: Error | unknown): {
     (error as { code?: string | number })?.code ||
     (error as { reason?: string })?.reason;
 
-  return { message, code };
+  return { code, message };
 }
diff --git a/packages/thirdweb/src/analytics/track/index.ts b/packages/thirdweb/src/analytics/track/index.ts
index 5b6875f75ca..d25208947b0 100644
--- a/packages/thirdweb/src/analytics/track/index.ts
+++ b/packages/thirdweb/src/analytics/track/index.ts
@@ -23,7 +23,7 @@ export async function track({
   };
 
   return fetch(`${getThirdwebBaseUrl("analytics")}/event`, {
-    method: "POST",
     body: stringify(event),
+    method: "POST",
   }).catch(() => {});
 }
diff --git a/packages/thirdweb/src/analytics/track/pay.test.ts b/packages/thirdweb/src/analytics/track/pay.test.ts
index a2990a0f50c..d17fe233421 100644
--- a/packages/thirdweb/src/analytics/track/pay.test.ts
+++ b/packages/thirdweb/src/analytics/track/pay.test.ts
@@ -1,4 +1,4 @@
-import { http, HttpResponse } from "msw";
+import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -30,28 +30,28 @@ describe("trackPayEvent", () => {
     );
 
     await trackPayEvent({
+      amountWei: "1000000",
+      chainId: 1,
       client: mockClient,
       event: "test-event",
-      walletAddress: "0x1234567890123456789012345678901234567890",
-      walletType: "io.metamask",
       fromToken: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      amountWei: "1000000",
-      toToken: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
       toChainId: 137,
-      chainId: 1,
+      toToken: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
     });
 
     expect(requestBody).toEqual({
-      source: "pay",
       action: "test-event",
-      clientId: "test-client-id",
+      amountWei: "1000000",
       chainId: 1,
+      clientId: "test-client-id",
+      dstChainId: 137,
+      dstTokenAddress: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+      source: "pay",
+      tokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       walletAddress: "0x1234567890123456789012345678901234567890",
       walletType: "io.metamask",
-      tokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      amountWei: "1000000",
-      dstTokenAddress: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-      dstChainId: 137,
     });
   });
 
@@ -70,19 +70,19 @@ describe("trackPayEvent", () => {
     );
 
     await trackPayEvent({
+      amountWei: "1000000",
+      chainId: 1,
       client: mockClient,
       ecosystem: {
         id: "ecosystem.test-ecosystem-id",
         partnerId: "test-partner-id",
       },
       event: "test-event",
-      walletAddress: "0x1234567890123456789012345678901234567890",
-      walletType: "io.metamask",
       fromToken: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      amountWei: "1000000",
-      toToken: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
       toChainId: 137,
-      chainId: 1,
+      toToken: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
     });
 
     expect(requestHeaders?.get("x-client-id")).toEqual("test-client-id");
diff --git a/packages/thirdweb/src/analytics/track/pay.ts b/packages/thirdweb/src/analytics/track/pay.ts
index 5667407113f..b4ffdc33274 100644
--- a/packages/thirdweb/src/analytics/track/pay.ts
+++ b/packages/thirdweb/src/analytics/track/pay.ts
@@ -19,21 +19,21 @@ export async function trackPayEvent(args: {
   error?: string;
 }) {
   const data = {
-    source: "pay",
     action: args.event,
-    clientId: args.client.clientId,
-    chainId: args.chainId,
-    walletAddress: args.walletAddress,
-    walletType: args.walletType,
-    tokenAddress: args.fromToken,
     amountWei: args.amountWei,
-    dstTokenAddress: args.toToken,
+    chainId: args.chainId,
+    clientId: args.client.clientId,
     dstChainId: args.toChainId,
+    dstTokenAddress: args.toToken,
     errorCode: args.error,
+    source: "pay",
+    tokenAddress: args.fromToken,
+    walletAddress: args.walletAddress,
+    walletType: args.walletType,
   };
   return track({
     client: args.client,
-    ecosystem: args.ecosystem,
     data,
+    ecosystem: args.ecosystem,
   });
 }
diff --git a/packages/thirdweb/src/analytics/track/siwe.test.ts b/packages/thirdweb/src/analytics/track/siwe.test.ts
index 881053f7e1d..5a4bf2cc73d 100644
--- a/packages/thirdweb/src/analytics/track/siwe.test.ts
+++ b/packages/thirdweb/src/analytics/track/siwe.test.ts
@@ -1,4 +1,4 @@
-import { http, HttpResponse } from "msw";
+import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -30,20 +30,20 @@ describe("SIWE tracking", () => {
     );
 
     await trackLogin({
+      chainId: 1,
       client: mockClient,
       walletAddress: "0x1234567890123456789012345678901234567890",
       walletType: "metamask",
-      chainId: 1,
     });
 
     expect(requestBody).toEqual({
-      source: "sdk",
       action: "login:attempt",
+      chainId: 1,
       clientId: "test-client-id",
+      errorCode: undefined,
+      source: "sdk",
       walletAddress: "0x1234567890123456789012345678901234567890",
       walletType: "metamask",
-      chainId: 1,
-      errorCode: undefined,
     });
   });
 
@@ -57,25 +57,25 @@ describe("SIWE tracking", () => {
     );
 
     await trackLogin({
-      client: mockClient,
-      walletAddress: "0x1234567890123456789012345678901234567890",
-      walletType: "metamask",
       chainId: 1,
+      client: mockClient,
       error: {
-        message: "Signature verification failed",
         code: "SIGNATURE_VERIFICATION_FAILED",
+        message: "Signature verification failed",
       },
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "metamask",
     });
 
     expect(requestBody).toEqual({
-      source: "sdk",
       action: "login:attempt",
+      chainId: 1,
       clientId: "test-client-id",
+      errorCode:
+        '{"code":"SIGNATURE_VERIFICATION_FAILED","message":"Signature verification failed"}',
+      source: "sdk",
       walletAddress: "0x1234567890123456789012345678901234567890",
       walletType: "metamask",
-      chainId: 1,
-      errorCode:
-        '{"message":"Signature verification failed","code":"SIGNATURE_VERIFICATION_FAILED"}',
     });
   });
 
@@ -89,6 +89,7 @@ describe("SIWE tracking", () => {
     );
 
     await trackLogin({
+      chainId: 1,
       client: mockClient,
       ecosystem: {
         id: "ecosystem.test-ecosystem-id",
@@ -96,7 +97,6 @@ describe("SIWE tracking", () => {
       },
       walletAddress: "0x1234567890123456789012345678901234567890",
       walletType: "metamask",
-      chainId: 1,
     });
 
     expect(requestHeaders?.get("x-client-id")).toEqual("test-client-id");
diff --git a/packages/thirdweb/src/analytics/track/siwe.ts b/packages/thirdweb/src/analytics/track/siwe.ts
index bbea84dbb87..6474e709c3a 100644
--- a/packages/thirdweb/src/analytics/track/siwe.ts
+++ b/packages/thirdweb/src/analytics/track/siwe.ts
@@ -35,14 +35,14 @@ async function trackSiweEvent(
 ) {
   return track({
     client: event.client,
-    ecosystem: event.ecosystem,
     data: {
       action: event.action,
-      clientId: event.client.clientId,
       chainId: event.chainId,
+      clientId: event.client.clientId,
+      errorCode: stringify(event.error),
       walletAddress: event.walletAddress,
       walletType: event.walletType,
-      errorCode: stringify(event.error),
     },
+    ecosystem: event.ecosystem,
   });
 }
diff --git a/packages/thirdweb/src/analytics/track/track.test.ts b/packages/thirdweb/src/analytics/track/track.test.ts
index f5e726f7c1b..03d262b453a 100644
--- a/packages/thirdweb/src/analytics/track/track.test.ts
+++ b/packages/thirdweb/src/analytics/track/track.test.ts
@@ -1,4 +1,4 @@
-import { http, HttpResponse } from "msw";
+import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -38,9 +38,9 @@ describe("track", () => {
     });
 
     expect(requestBody).toEqual({
-      source: "sdk",
       action: "test-action",
       data: "test-data",
+      source: "sdk",
     });
   });
 
@@ -86,14 +86,14 @@ describe("track", () => {
 
     await track({
       client: mockClient,
-      ecosystem: {
-        id: "ecosystem.test-ecosystem-id",
-        partnerId: "test-partner-id",
-      },
       data: {
         action: "test-action",
         data: "test-data",
       },
+      ecosystem: {
+        id: "ecosystem.test-ecosystem-id",
+        partnerId: "test-partner-id",
+      },
     });
 
     expect(requestHeaders?.get("x-client-id")).toEqual("test-client-id");
diff --git a/packages/thirdweb/src/analytics/track/transaction.test.ts b/packages/thirdweb/src/analytics/track/transaction.test.ts
index 16d6d8f2cfc..228070f3ad7 100644
--- a/packages/thirdweb/src/analytics/track/transaction.test.ts
+++ b/packages/thirdweb/src/analytics/track/transaction.test.ts
@@ -1,4 +1,4 @@
-import { http, HttpResponse } from "msw";
+import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -33,28 +33,28 @@ describe("transaction tracking", () => {
     );
 
     await trackTransaction({
-      client: mockClient,
-      transactionHash: "0xabcdef1234567890",
-      walletAddress: "0x1234567890123456789012345678901234567890",
-      walletType: "io.metamask",
       chainId: 1,
+      client: mockClient,
       contractAddress: "0x0987654321098765432109876543210987654321",
       functionName: "transfer",
       gasPrice: BigInt(20000000000),
+      transactionHash: "0xabcdef1234567890",
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
     });
 
     expect(requestBody).toEqual({
-      source: "sdk",
       action: "transaction:sent",
-      clientId: "test-client-id",
-      transactionHash: "0xabcdef1234567890",
-      walletAddress: "0x1234567890123456789012345678901234567890",
-      walletType: "io.metamask",
       chainId: 1,
+      clientId: "test-client-id",
       contractAddress: "0x0987654321098765432109876543210987654321",
+      errorCode: undefined,
       functionName: "transfer",
       gasPrice: "20000000000",
-      errorCode: undefined,
+      source: "sdk",
+      transactionHash: "0xabcdef1234567890",
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
     });
   });
 
@@ -68,28 +68,24 @@ describe("transaction tracking", () => {
     );
 
     await trackTransaction({
-      client: mockClient,
-      walletAddress: "0x1234567890123456789012345678901234567890",
-      walletType: "io.metamask",
       chainId: 1,
+      client: mockClient,
       error: {
-        message: "Insufficient funds",
         code: "INSUFFICIENT_FUNDS",
+        message: "Insufficient funds",
       },
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
     });
 
     expect(requestBody).toEqual({
-      source: "sdk",
       action: "transaction:sent",
+      chainId: 1,
       clientId: "test-client-id",
+      errorCode: '{"code":"INSUFFICIENT_FUNDS","message":"Insufficient funds"}',
+      source: "sdk",
       walletAddress: "0x1234567890123456789012345678901234567890",
       walletType: "io.metamask",
-      chainId: 1,
-      errorCode: '{"message":"Insufficient funds","code":"INSUFFICIENT_FUNDS"}',
-      transactionHash: undefined,
-      contractAddress: undefined,
-      functionName: undefined,
-      gasPrice: undefined,
     });
   });
 
@@ -108,18 +104,18 @@ describe("transaction tracking", () => {
     );
 
     await trackTransaction({
+      chainId: 1,
       client: mockClient,
+      contractAddress: "0x0987654321098765432109876543210987654321",
       ecosystem: {
         id: "ecosystem.test-ecosystem-id",
         partnerId: "test-partner-id",
       },
+      functionName: "transfer",
+      gasPrice: BigInt(20000000000),
       transactionHash: "0xabcdef1234567890",
       walletAddress: "0x1234567890123456789012345678901234567890",
       walletType: "io.metamask",
-      chainId: 1,
-      contractAddress: "0x0987654321098765432109876543210987654321",
-      functionName: "transfer",
-      gasPrice: BigInt(20000000000),
     });
 
     expect(requestHeaders?.get("x-client-id")).toEqual("test-client-id");
@@ -148,26 +144,26 @@ describe("transaction tracking", () => {
     const mockError = new Error("Insufficient funds for gas * price + value");
 
     await trackInsufficientFundsError({
-      client: mockClient,
-      error: mockError,
-      walletAddress: "0x1234567890123456789012345678901234567890",
       chainId: 1,
+      client: mockClient,
       contractAddress: "0xcontract",
+      error: mockError,
       transactionValue: 1000000000000000000n,
+      walletAddress: "0x1234567890123456789012345678901234567890",
     });
 
     expect(requestBody).toEqual({
-      source: "sdk",
       action: "transaction:insufficient_funds",
-      clientId: "test-client-id",
       chainId: 1,
-      walletAddress: "0x1234567890123456789012345678901234567890",
+      clientId: "test-client-id",
       contractAddress: "0xcontract",
-      transactionValue: "1000000000000000000",
+      errorCode: undefined,
+      errorMessage: "Insufficient funds for gas * price + value",
       requiredAmount: undefined,
+      source: "sdk",
+      transactionValue: "1000000000000000000",
       userBalance: undefined,
-      errorMessage: "Insufficient funds for gas * price + value",
-      errorCode: undefined,
+      walletAddress: "0x1234567890123456789012345678901234567890",
     });
   });
 
@@ -187,10 +183,10 @@ describe("transaction tracking", () => {
 
     expect(() =>
       trackInsufficientFundsError({
+        chainId: 137,
         client: mockClient,
         error: mockError,
         walletAddress: "0x1234567890123456789012345678901234567890",
-        chainId: 137,
       }),
     ).not.toThrowError();
 
@@ -215,25 +211,25 @@ describe("transaction tracking", () => {
     const mockError = new Error("insufficient funds for gas");
 
     await trackInsufficientFundsError({
+      chainId: 42,
       client: mockClient,
+      contractAddress: "0x0987654321098765432109876543210987654321",
       error: mockError,
       walletAddress: "0xabcdef1234567890abcdef1234567890abcdef12",
-      chainId: 42,
-      contractAddress: "0x0987654321098765432109876543210987654321",
     });
 
     expect(requestBody).toEqual({
-      source: "sdk",
       action: "transaction:insufficient_funds",
-      clientId: "test-client-id",
       chainId: 42,
-      walletAddress: "0xabcdef1234567890abcdef1234567890abcdef12",
+      clientId: "test-client-id",
       contractAddress: "0x0987654321098765432109876543210987654321",
-      transactionValue: undefined,
+      errorCode: undefined,
+      errorMessage: "insufficient funds for gas",
       requiredAmount: undefined,
+      source: "sdk",
+      transactionValue: undefined,
       userBalance: undefined,
-      errorMessage: "insufficient funds for gas",
-      errorCode: undefined,
+      walletAddress: "0xabcdef1234567890abcdef1234567890abcdef12",
     });
   });
 });
diff --git a/packages/thirdweb/src/analytics/track/transaction.ts b/packages/thirdweb/src/analytics/track/transaction.ts
index 8e820754370..431e66c9c55 100644
--- a/packages/thirdweb/src/analytics/track/transaction.ts
+++ b/packages/thirdweb/src/analytics/track/transaction.ts
@@ -41,19 +41,19 @@ function trackTransactionEvent(
 ) {
   return track({
     client: args.client,
-    ecosystem: args.ecosystem,
     data: {
       action: args.action,
-      clientId: args.client.clientId,
       chainId: args.chainId,
-      transactionHash: args.transactionHash,
-      walletAddress: args.walletAddress,
-      walletType: args.walletType,
+      clientId: args.client.clientId,
       contractAddress: args.contractAddress,
+      errorCode: stringify(args.error),
       functionName: args.functionName,
       gasPrice: args.gasPrice,
-      errorCode: stringify(args.error),
+      transactionHash: args.transactionHash,
+      walletAddress: args.walletAddress,
+      walletType: args.walletType,
     },
+    ecosystem: args.ecosystem,
   });
 }
 
@@ -76,19 +76,19 @@ export async function trackInsufficientFundsError(args: {
 
   return track({
     client: args.client,
-    ecosystem: args.ecosystem,
     data: {
       action: "transaction:insufficient_funds",
-      clientId: args.client.clientId,
       chainId: args.chainId,
-      walletAddress: args.walletAddress,
+      clientId: args.client.clientId,
       contractAddress: args.contractAddress,
+      errorCode: errorDetails.code ? stringify(errorDetails.code) : undefined,
+      errorMessage: errorDetails.message,
       functionName: args.functionName,
-      transactionValue: args.transactionValue?.toString(),
       requiredAmount: args.requiredAmount?.toString(),
+      transactionValue: args.transactionValue?.toString(),
       userBalance: args.userBalance?.toString(),
-      errorMessage: errorDetails.message,
-      errorCode: errorDetails.code ? stringify(errorDetails.code) : undefined,
+      walletAddress: args.walletAddress,
     },
+    ecosystem: args.ecosystem,
   });
 }
diff --git a/packages/thirdweb/src/auth/auth.ts b/packages/thirdweb/src/auth/auth.ts
index 07f4a7e6240..2aef3b33168 100644
--- a/packages/thirdweb/src/auth/auth.ts
+++ b/packages/thirdweb/src/auth/auth.ts
@@ -35,9 +35,9 @@ import { verifyLoginPayload } from "./core/verify-login-payload.js";
  */
 export function createAuth(options: AuthOptions) {
   return {
-    generatePayload: generateLoginPayload(options),
-    verifyPayload: verifyLoginPayload(options),
     generateJWT: generateJWT(options),
+    generatePayload: generateLoginPayload(options),
     verifyJWT: verifyJWT(options),
+    verifyPayload: verifyLoginPayload(options),
   };
 }
diff --git a/packages/thirdweb/src/auth/core/create-login-message.test.ts b/packages/thirdweb/src/auth/core/create-login-message.test.ts
index 1f731a8ee92..306557caeb1 100644
--- a/packages/thirdweb/src/auth/core/create-login-message.test.ts
+++ b/packages/thirdweb/src/auth/core/create-login-message.test.ts
@@ -13,17 +13,17 @@ describe("createLoginMessage", () => {
   });
   test("should generate the login message correctly", () => {
     const payload = {
-      domain: "example.com",
       address: "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B",
-      statement: "This is a statement",
-      uri: "https://example.com",
-      version: "1.0",
       chain_id: "1",
-      nonce: "123456",
-      issued_at: "1634567890",
+      domain: "example.com",
       expiration_time: "1634567990",
       invalid_before: "1634567800",
+      issued_at: "1634567890",
+      nonce: "123456",
       resources: ["resource1", "resource2"],
+      statement: "This is a statement",
+      uri: "https://example.com",
+      version: "1.0",
     };
 
     const result = createLoginMessage(payload);
@@ -48,14 +48,14 @@ describe("createLoginMessage", () => {
 
   test("should generate the login message correctly without optional fields", () => {
     const payload = {
-      domain: "example.com",
       address: "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B",
-      statement: "This is a statement",
-      version: "1.0",
-      nonce: "123456",
-      issued_at: "1634567890",
+      domain: "example.com",
       expiration_time: "1634567990",
       invalid_before: "1634567800",
+      issued_at: "1634567890",
+      nonce: "123456",
+      statement: "This is a statement",
+      version: "1.0",
     };
 
     const result = createLoginMessage(payload);
diff --git a/packages/thirdweb/src/auth/core/generate-jwt.test.ts b/packages/thirdweb/src/auth/core/generate-jwt.test.ts
index 846b0f5a10a..2282241d0c6 100644
--- a/packages/thirdweb/src/auth/core/generate-jwt.test.ts
+++ b/packages/thirdweb/src/auth/core/generate-jwt.test.ts
@@ -10,18 +10,8 @@ import type { AuthOptions } from "./types.js";
 import { verifyLoginPayload } from "./verify-login-payload.js";
 
 const options: AuthOptions = {
-  domain: "example.com",
   adminAccount: TEST_ACCOUNT_A,
-  login: {
-    nonce: {
-      generate() {
-        return "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
-      },
-      validate(uuid: string) {
-        return uuid === "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
-      },
-    },
-  },
+  domain: "example.com",
   jwt: {
     jwtId: {
       generate() {
@@ -32,6 +22,16 @@ const options: AuthOptions = {
       },
     },
   },
+  login: {
+    nonce: {
+      generate() {
+        return "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
+      },
+      validate(uuid: string) {
+        return uuid === "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
+      },
+    },
+  },
 };
 
 describe("generateJWT", async () => {
@@ -51,8 +51,8 @@ describe("generateJWT", async () => {
       address: TEST_ACCOUNT_B.address,
     });
     const signedPayload = await signLoginPayload({
-      payload: generatedPayload,
       account: TEST_ACCOUNT_B,
+      payload: generatedPayload,
     });
     const verifiedPayload = await verifyLoginPayload(options)({
       payload: signedPayload.payload,
@@ -65,7 +65,7 @@ describe("generateJWT", async () => {
       payload: verifiedPayload.payload,
     });
     expect(jwt).toMatchInlineSnapshot(
-      `"eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIweGYzOUZkNmU1MWFhZDg4RjZGNGNlNmFCODgyNzI3OWNmZkZiOTIyNjYiLCJzdWIiOiIweDcwOTk3OTcwQzUxODEyZGMzQTAxMEM3ZDAxYjUwZTBkMTdkYzc5QzgiLCJhdWQiOiJleGFtcGxlLmNvbSIsImV4cCI6ODY0MDAsIm5iZiI6LTYwMCwiaWF0IjowLCJqdGkiOiI4YmNlZWMwZC0zN2Y3LTQ4YjQtYTQ0MC03YmUzMzRiNGRmZDMiLCJjdHgiOnt9fQ.MHhjODllZWU5Yzg2MDI5MTJlNGRmZGFjYTAwMjAxZDJkODY5MWQyY2JlNjQ4NDAzMjE1OTg5YjNlMTY2MThkZTgwNjQ3YzQyZjZlZDQ1ZjhmODdlYTgzYzFmZDBjNzMwN2YwZjM0NjNlZDFkMDZkNTdlMTY5MTYyM2M0ZjU1MDE0OTFi"`,
+      `"eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJleGFtcGxlLmNvbSIsImN0eCI6e30sImV4cCI6ODY0MDAsImlhdCI6MCwiaXNzIjoiMHhmMzlGZDZlNTFhYWQ4OEY2RjRjZTZhQjg4MjcyNzljZmZGYjkyMjY2IiwianRpIjoiOGJjZWVjMGQtMzdmNy00OGI0LWE0NDAtN2JlMzM0YjRkZmQzIiwibmJmIjotNjAwLCJzdWIiOiIweDcwOTk3OTcwQzUxODEyZGMzQTAxMEM3ZDAxYjUwZTBkMTdkYzc5QzgifQ.MHhhMDBhYjYyOTZhMDM3ZWQ1NmE0NzRmODM5ODFhNWRmZTgxYjRkMzU0ODAyOTIwMTE5YWYyYmQyNjE1YmI0ZjM1MzE5ZWY3YWVhYTYyYWQyZmViZTczNzA3Yzk0YWNkZTcxMmQ5M2JjMDg3ZmIwMjlmYWJlYjIxZmZkNDVkNzEwYTFi"`,
     );
   });
 
@@ -74,8 +74,8 @@ describe("generateJWT", async () => {
       address: TEST_ACCOUNT_B.address,
     });
     const signedPayload = await signLoginPayload({
-      payload: generatedPayload,
       account: TEST_ACCOUNT_B,
+      payload: generatedPayload,
     });
     const verifiedPayload = await verifyLoginPayload(options)({
       payload: signedPayload.payload,
diff --git a/packages/thirdweb/src/auth/core/generate-jwt.ts b/packages/thirdweb/src/auth/core/generate-jwt.ts
index a13a6f01cd9..984f9483192 100644
--- a/packages/thirdweb/src/auth/core/generate-jwt.ts
+++ b/packages/thirdweb/src/auth/core/generate-jwt.ts
@@ -28,11 +28,10 @@ export function generateJWT(options: AuthOptions) {
     const now = Date.now();
 
     return await encodeJWT({
+      account: options.adminAccount,
       payload: {
-        iss: options.adminAccount.address,
-        sub: payload.address,
         aud: payload.domain,
-        nbf: new Date(payload.invalid_before || now),
+        ctx: context || {},
         exp: new Date(
           now +
             (options.jwt?.expirationTimeSeconds ||
@@ -40,11 +39,12 @@ export function generateJWT(options: AuthOptions) {
               1000,
         ),
         iat: new Date(),
+        iss: options.adminAccount.address,
         // if there is a jwtID generator, use it to generate a unique JWT ID
         jti: await options.jwt?.jwtId?.generate?.(),
-        ctx: context || {},
+        nbf: new Date(payload.invalid_before || now),
+        sub: payload.address,
       },
-      account: options.adminAccount,
     });
   };
 }
diff --git a/packages/thirdweb/src/auth/core/generate-login-payload.test.ts b/packages/thirdweb/src/auth/core/generate-login-payload.test.ts
index 758cd54c4a6..a3e98d48475 100644
--- a/packages/thirdweb/src/auth/core/generate-login-payload.test.ts
+++ b/packages/thirdweb/src/auth/core/generate-login-payload.test.ts
@@ -17,11 +17,6 @@ describe("generateLoginPayload", () => {
       client: TEST_CLIENT,
       domain: "example.com",
       login: {
-        payloadExpirationTimeSeconds: 3600,
-        statement: "This is a statement",
-        version: "1.0",
-        resources: ["resource1", "resource2"],
-        uri: "https://example.com",
         nonce: {
           generate() {
             return "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
@@ -30,6 +25,11 @@ describe("generateLoginPayload", () => {
             return uuid === "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
           },
         },
+        payloadExpirationTimeSeconds: 3600,
+        resources: ["resource1", "resource2"],
+        statement: "This is a statement",
+        uri: "https://example.com",
+        version: "1.0",
       },
     };
 
diff --git a/packages/thirdweb/src/auth/core/generate-login-payload.ts b/packages/thirdweb/src/auth/core/generate-login-payload.ts
index 1447823d1cb..5debd48a04a 100644
--- a/packages/thirdweb/src/auth/core/generate-login-payload.ts
+++ b/packages/thirdweb/src/auth/core/generate-login-payload.ts
@@ -43,10 +43,10 @@ export function generateLoginPayload(options: AuthOptions) {
             randomBytesHex(),
           ))
       )(),
-      statement: options.login?.statement || DEFAULT_LOGIN_STATEMENT,
-      version: options.login?.version || DEFAULT_LOGIN_VERSION,
       resources: options.login?.resources,
+      statement: options.login?.statement || DEFAULT_LOGIN_STATEMENT,
       uri: options.login?.uri || options.domain,
+      version: options.login?.version || DEFAULT_LOGIN_VERSION,
     };
   };
 }
diff --git a/packages/thirdweb/src/auth/core/sign-login-payload.ts b/packages/thirdweb/src/auth/core/sign-login-payload.ts
index f9a63b63bee..7270921abba 100644
--- a/packages/thirdweb/src/auth/core/sign-login-payload.ts
+++ b/packages/thirdweb/src/auth/core/sign-login-payload.ts
@@ -31,7 +31,7 @@ export async function signLoginPayload(options: SignLoginPayloadParams) {
     message: createLoginMessage(payload),
   });
   return {
-    signature,
     payload,
+    signature,
   };
 }
diff --git a/packages/thirdweb/src/auth/core/verify-jwt.test.ts b/packages/thirdweb/src/auth/core/verify-jwt.test.ts
index 0b37fde6d67..4c1f2cd7adb 100644
--- a/packages/thirdweb/src/auth/core/verify-jwt.test.ts
+++ b/packages/thirdweb/src/auth/core/verify-jwt.test.ts
@@ -11,18 +11,8 @@ import { verifyJWT } from "./verify-jwt.js";
 import { verifyLoginPayload } from "./verify-login-payload.js";
 
 const options: AuthOptions = {
-  domain: "example.com",
   adminAccount: TEST_ACCOUNT_A,
-  login: {
-    nonce: {
-      generate() {
-        return "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
-      },
-      validate(uuid: string) {
-        return uuid === "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
-      },
-    },
-  },
+  domain: "example.com",
   jwt: {
     jwtId: {
       generate() {
@@ -33,6 +23,16 @@ const options: AuthOptions = {
       },
     },
   },
+  login: {
+    nonce: {
+      generate() {
+        return "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
+      },
+      validate(uuid: string) {
+        return uuid === "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
+      },
+    },
+  },
 };
 
 describe("verifyJWT", () => {
@@ -52,8 +52,8 @@ describe("verifyJWT", () => {
       address: TEST_ACCOUNT_B.address,
     });
     const signedPayload = await signLoginPayload({
-      payload: generatedPayload,
       account: TEST_ACCOUNT_B,
+      payload: generatedPayload,
     });
     const verifiedPayload = await verifyLoginPayload(options)({
       payload: signedPayload.payload,
@@ -91,8 +91,8 @@ describe("verifyJWT", () => {
       address: TEST_ACCOUNT_B.address,
     });
     const signedPayload = await signLoginPayload({
-      payload: generatedPayload,
       account: TEST_ACCOUNT_B,
+      payload: generatedPayload,
     });
     const verifiedPayload = await verifyLoginPayload(options)({
       payload: signedPayload.payload,
diff --git a/packages/thirdweb/src/auth/core/verify-jwt.ts b/packages/thirdweb/src/auth/core/verify-jwt.ts
index 33e451402b9..b6d7c165007 100644
--- a/packages/thirdweb/src/auth/core/verify-jwt.ts
+++ b/packages/thirdweb/src/auth/core/verify-jwt.ts
@@ -43,8 +43,8 @@ export function verifyJWT(options: AuthOptions) {
       const valid = await options.jwt.jwtId.validate(payload.jti);
       if (!valid) {
         return {
-          valid: false,
           error: "Invalid JWT ID",
+          valid: false,
         };
       }
     }
@@ -52,52 +52,52 @@ export function verifyJWT(options: AuthOptions) {
     // check that the token audience matches the domain
     if (payload.aud !== options.domain) {
       return {
-        valid: false,
         error: `Expected token to be for the domain '${options.domain}', but found token with domain '${payload.aud}'`,
+        valid: false,
       };
     }
 
     // Check that the token is past the invalid before time
-    const currentTime = Math.floor(new Date().getTime() / 1000);
+    const currentTime = Math.floor(Date.now() / 1000);
     if (currentTime < payload.nbf) {
       return {
-        valid: false,
         error: `This token is invalid before epoch time '${payload.nbf}', current epoch time is '${currentTime}'`,
+        valid: false,
       };
     }
 
     // Check that the token hasn't expired
     if (currentTime > payload.exp) {
       return {
-        valid: false,
         error: `This token expired at epoch time '${payload.exp}', current epoch time is '${currentTime}'`,
+        valid: false,
       };
     }
 
     const issuerAddress = options.adminAccount.address;
     if (issuerAddress.toLowerCase() !== payload.iss.toLowerCase()) {
       return {
-        valid: false,
         error: `The expected issuer address '${issuerAddress}' did not match the token issuer address '${payload.iss}'`,
+        valid: false,
       };
     }
 
     const verified = await verifyEOASignature({
+      address: issuerAddress,
       message: stringify(payload),
       signature,
-      address: issuerAddress,
     });
 
     if (!verified) {
       return {
-        valid: false,
         error: `The expected issuer address '${issuerAddress}' did not sign this token.`,
+        valid: false,
       };
     }
 
     return {
-      valid: true,
       parsedJWT: payload,
+      valid: true,
     };
   };
 }
diff --git a/packages/thirdweb/src/auth/core/verify-login-payload.test.ts b/packages/thirdweb/src/auth/core/verify-login-payload.test.ts
index d2bf3100206..429f0fd05a3 100644
--- a/packages/thirdweb/src/auth/core/verify-login-payload.test.ts
+++ b/packages/thirdweb/src/auth/core/verify-login-payload.test.ts
@@ -24,11 +24,6 @@ describe("verifyLoginPayload", () => {
       client: TEST_CLIENT,
       domain: "example.com",
       login: {
-        payloadExpirationTimeSeconds: 3600,
-        statement: "This is a statement",
-        version: "1.0",
-        resources: ["resource1", "resource2"],
-        uri: "https://example.com",
         nonce: {
           generate() {
             return "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
@@ -37,6 +32,11 @@ describe("verifyLoginPayload", () => {
             return uuid === "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
           },
         },
+        payloadExpirationTimeSeconds: 3600,
+        resources: ["resource1", "resource2"],
+        statement: "This is a statement",
+        uri: "https://example.com",
+        version: "1.0",
       },
     };
 
@@ -47,8 +47,8 @@ describe("verifyLoginPayload", () => {
 
     // sign the payload
     const signatureResult = await signLoginPayload({
-      payload: payloadToSign,
       account: TEST_ACCOUNT_A,
+      payload: payloadToSign,
     });
 
     // verify the payload
@@ -67,11 +67,6 @@ describe("verifyLoginPayload", () => {
       client: TEST_CLIENT,
       domain: "example.com",
       login: {
-        payloadExpirationTime: 3600000,
-        statement: "This is a statement",
-        version: "1.0",
-        resources: ["resource1", "resource2"],
-        uri: "https://example.com",
         nonce: {
           generate() {
             return "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
@@ -80,6 +75,11 @@ describe("verifyLoginPayload", () => {
             return uuid === "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
           },
         },
+        payloadExpirationTime: 3600000,
+        resources: ["resource1", "resource2"],
+        statement: "This is a statement",
+        uri: "https://example.com",
+        version: "1.0",
       },
     };
 
@@ -90,8 +90,8 @@ describe("verifyLoginPayload", () => {
 
     // sign the payload
     const signatureResult = await signLoginPayload({
-      payload: payloadToSign,
       account: TEST_ACCOUNT_A,
+      payload: payloadToSign,
     });
 
     // verify the payload
@@ -110,11 +110,6 @@ describe("verifyLoginPayload", () => {
       client: TEST_CLIENT,
       domain: "example.com",
       login: {
-        payloadExpirationTime: 3600000,
-        statement: "This is a statement",
-        version: "1.0",
-        resources: ["resource1", "resource2"],
-        uri: "https://example.com",
         nonce: {
           generate() {
             return "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
@@ -123,6 +118,11 @@ describe("verifyLoginPayload", () => {
             return uuid === "20cd4ddb-6857-4d36-8e44-9f6e026b8de9";
           },
         },
+        payloadExpirationTime: 3600000,
+        resources: ["resource1", "resource2"],
+        statement: "This is a statement",
+        uri: "https://example.com",
+        version: "1.0",
       },
     };
 
@@ -133,9 +133,9 @@ describe("verifyLoginPayload", () => {
 
     // sign the payload
     const signatureResult = await signLoginPayload({
-      payload: payloadToSign,
       // this is the wrong account!
       account: TEST_ACCOUNT_B,
+      payload: payloadToSign,
     });
 
     // verify the payload
diff --git a/packages/thirdweb/src/auth/core/verify-login-payload.ts b/packages/thirdweb/src/auth/core/verify-login-payload.ts
index 7bd89707e46..6eaac5b5880 100644
--- a/packages/thirdweb/src/auth/core/verify-login-payload.ts
+++ b/packages/thirdweb/src/auth/core/verify-login-payload.ts
@@ -50,8 +50,8 @@ export function verifyLoginPayload(options: AuthOptions) {
     // check that the intended domain matches the domain of the payload
     if (payload.domain !== options.domain) {
       return {
-        valid: false,
         error: `Expected domain '${options.domain}' does not match domain on payload '${payload.domain}'`,
+        valid: false,
       };
     }
 
@@ -59,24 +59,24 @@ export function verifyLoginPayload(options: AuthOptions) {
     // check that the payload statement matches the expected statement
     if (statement !== payload.statement) {
       return {
-        valid: false,
         error: `Expected statement '${statement}' does not match statement on payload '${payload.statement}'`,
+        valid: false,
       };
     }
 
     // compare uri if it is defined
     if (options.login?.uri && options.login.uri !== payload.uri) {
       return {
-        valid: false,
         error: `Expected uri '${options.login.uri}' does not match uri on payload '${payload.uri}'`,
+        valid: false,
       };
     }
 
     const version = options.login?.version || DEFAULT_LOGIN_VERSION;
     if (version !== payload.version) {
       return {
-        valid: false,
         error: `Expected version '${version}' does not match version on payload '${payload.version}'`,
+        valid: false,
       };
     }
 
@@ -86,14 +86,14 @@ export function verifyLoginPayload(options: AuthOptions) {
         const isValid = await options.login.nonce.validate(payload.nonce);
         if (!isValid) {
           return {
-            valid: false,
             error: `Invalid nonce '${payload.nonce}'`,
+            valid: false,
           };
         }
       } catch {
         return {
-          valid: false,
           error: `Vailed to validate nonce '${payload.nonce}'`,
+          valid: false,
         };
       }
     }
@@ -102,15 +102,15 @@ export function verifyLoginPayload(options: AuthOptions) {
 
     if (currentDate < new Date(payload.invalid_before)) {
       return {
-        valid: false,
         error: "Payload is not yet valid",
+        valid: false,
       };
     }
 
     if (currentDate > new Date(payload.expiration_time)) {
       return {
-        valid: false,
         error: "Payload has expired",
+        valid: false,
       };
     }
 
@@ -120,10 +120,10 @@ export function verifyLoginPayload(options: AuthOptions) {
       );
       if (missingResources.length > 0) {
         return {
-          valid: false,
           error: `Login request is missing required resources: ${missingResources.join(
             ", ",
           )}`,
+          valid: false,
         };
       }
     }
@@ -132,25 +132,25 @@ export function verifyLoginPayload(options: AuthOptions) {
     const computedMessage = createLoginMessage(payload);
 
     const signatureIsValid = await verifySignature({
-      message: computedMessage,
-      signature: signature,
       address: payload.address,
       chain: payload.chain_id
         ? getCachedChain(Number.parseInt(payload.chain_id))
         : undefined,
       client: options.client,
+      message: computedMessage,
+      signature: signature,
     });
 
     if (!signatureIsValid) {
       return {
-        valid: false,
         error: "Invalid signature",
+        valid: false,
       };
     }
 
     return {
-      valid: true,
       payload: { ...payload, [VERIFIED_SYMBOL]: true },
+      valid: true,
     };
   };
 
@@ -163,14 +163,14 @@ export function verifyLoginPayload(options: AuthOptions) {
     // We can only track logins if the client is provided
     if (options.client) {
       trackLogin({
-        client: options.client,
-        walletAddress: payload.address,
         chainId: payload.chain_id
           ? Number.parseInt(payload.chain_id)
           : undefined,
+        client: options.client,
         error: !result.valid
-          ? { message: result.error, code: "401" }
+          ? { code: "401", message: result.error }
           : undefined,
+        walletAddress: payload.address,
       });
     }
 
diff --git a/packages/thirdweb/src/auth/verify-hash.test.ts b/packages/thirdweb/src/auth/verify-hash.test.ts
index 5d7259ce880..a78811fa9db 100644
--- a/packages/thirdweb/src/auth/verify-hash.test.ts
+++ b/packages/thirdweb/src/auth/verify-hash.test.ts
@@ -19,10 +19,10 @@ describe("verifyHash", async () => {
       await expect(
         verifyHash({
           address: TEST_ACCOUNT_A.address,
+          chain: FORKED_ETHEREUM_CHAIN,
+          client: TEST_CLIENT,
           hash: hashMessage("hello world"),
           signature,
-          client: TEST_CLIENT,
-          chain: FORKED_ETHEREUM_CHAIN,
         }),
       ).resolves.toBe(true);
     });
@@ -36,10 +36,10 @@ describe("verifyHash", async () => {
       await expect(
         verifyHash({
           address: TEST_ACCOUNT_A.address,
+          chain: FORKED_ETHEREUM_CHAIN,
+          client: TEST_CLIENT,
           hash: hashMessage("hello world"),
           signature: toBytes(signature),
-          client: TEST_CLIENT,
-          chain: FORKED_ETHEREUM_CHAIN,
         }),
       ).resolves.toBe(true);
     });
@@ -53,10 +53,10 @@ describe("verifyHash", async () => {
       await expect(
         verifyHash({
           address: TEST_ACCOUNT_A.address,
+          chain: FORKED_ETHEREUM_CHAIN,
+          client: TEST_CLIENT,
           hash: hashMessage("hello world"),
           signature: parseSignature(signature),
-          client: TEST_CLIENT,
-          chain: FORKED_ETHEREUM_CHAIN,
         }),
       ).resolves.toBe(true);
     });
diff --git a/packages/thirdweb/src/auth/verify-hash.ts b/packages/thirdweb/src/auth/verify-hash.ts
index 7f6adf14787..fca613671b6 100644
--- a/packages/thirdweb/src/auth/verify-hash.ts
+++ b/packages/thirdweb/src/auth/verify-hash.ts
@@ -1,11 +1,11 @@
 import * as ox__Abi from "ox/Abi";
 import * as ox__AbiConstructor from "ox/AbiConstructor";
 import * as ox__AbiFunction from "ox/AbiFunction";
-import * as ox__Signature from "ox/Signature";
 import { WrappedSignature as ox__WrappedSignature } from "ox/erc6492";
+import * as ox__Signature from "ox/Signature";
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
-import { type ThirdwebContract, getContract } from "../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../contract/contract.js";
 import { isValidSignature } from "../extensions/erc1271/__generated__/isValidSignature/read/isValidSignature.js";
 import { eth_call } from "../rpc/actions/eth_call.js";
 import { getRpcClient } from "../rpc/rpc.js";
@@ -81,20 +81,20 @@ export async function verifyHash({
   const isDeployed = await isContractDeployed(
     getContract({
       address,
-      client,
       chain,
+      client,
     }),
   );
 
   if (isDeployed) {
     const validEip1271 = await verifyEip1271Signature({
-      hash,
-      signature: signatureHex,
       contract: getContract({
-        chain,
         address,
+        chain,
         client,
       }),
+      hash,
+      signature: signatureHex,
     }).catch((err) => {
       console.error("Error verifying EIP-1271 signature", err);
       return false;
@@ -132,11 +132,11 @@ export async function verifyHash({
     // zksync chains dont support deploying code with eth_call
     // need to call a deployed contract instead
     verificationData = {
-      to: ZKSYNC_VALIDATOR_ADDRESS,
       data: ox__AbiFunction.encodeData(
         ox__AbiFunction.fromAbi(abi, "isValidSig"),
         [address, hash, wrappedSignature],
       ),
+      to: ZKSYNC_VALIDATOR_ADDRESS,
     };
   } else {
     const validatorConstructor = ox__AbiConstructor.fromAbi(abi);
@@ -159,13 +159,13 @@ export async function verifyHash({
   } catch {
     // Some chains do not support the eth_call simulation and will fail, so we fall back to regular EIP1271 validation
     const validEip1271 = await verifyEip1271Signature({
-      hash,
-      signature: signatureHex,
       contract: getContract({
-        chain,
         address,
+        chain,
         client,
       }),
+      hash,
+      signature: signatureHex,
     }).catch((err) => {
       console.error("Error verifying EIP-1271 signature", err);
       return false;
@@ -191,9 +191,9 @@ export async function verifyEip1271Signature({
 }): Promise<boolean> {
   try {
     const result = await isValidSignature({
+      contract,
       hash,
       signature,
-      contract,
     });
     return result === EIP_1271_MAGIC_VALUE;
   } catch (err) {
diff --git a/packages/thirdweb/src/auth/verify-signature.test.ts b/packages/thirdweb/src/auth/verify-signature.test.ts
index ea6c7793ff3..0e7215733a0 100644
--- a/packages/thirdweb/src/auth/verify-signature.test.ts
+++ b/packages/thirdweb/src/auth/verify-signature.test.ts
@@ -29,9 +29,9 @@ describe("verifyEOASignature", () => {
 
   test("should return false for an invalid signature", async () => {
     const options = {
+      address: "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B",
       message: "Hello, world!",
       signature: "invalid",
-      address: "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B",
     };
 
     const result = await verifyEOASignature(options);
@@ -70,11 +70,11 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(
         await verifySignature({
           address: "0x087517aA5153361d5b51B3a062D895443A28458b",
+          chain: sepolia,
+          client: TEST_CLIENT,
           message: "Hakuna matata",
           signature:
             "0xbc667c1a98b1e5a347944dc6c62d2f8b9669aa05927b8dc39f500ce94fa75ce967a4903869d85eaeea40aaf29642c5152da56bad3bbe5026fb6b9249e234fa7d1b",
-          client: TEST_CLIENT,
-          chain: sepolia,
         }),
       ).toBe(true);
     });
@@ -83,10 +83,10 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(
         await verifySignature({
           address: "0x087517aA5153361d5b51B3a062D895443A28458b",
-          message: "Hakuna matata",
-          signature: "0xthirdweb",
           chain: FORKED_ETHEREUM_CHAIN,
           client: TEST_CLIENT,
+          message: "Hakuna matata",
+          signature: "0xthirdweb",
         }),
       ).toBe(false);
     });
@@ -95,11 +95,11 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(
         await verifySignature({
           address: "0x0b1e353DDcec71a94AC76ad6b7e75618E3A9CA81",
+          chain: mainnet,
+          client: TEST_CLIENT,
           message: "Hakuna matata",
           signature:
-            "0x0000000000000000000000000ba5ed0c6aa8c49038f819e587e2633c4a9f428a0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000e43ffba36f000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000406e033e8bd44ba8d7fe309535da2dcf38bbf6aa0144937adf2b4851e506a8afe10e8d53896201a64512e72414c2aa3b626b18b2a9931d5dd09d57e147662af7530000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000001dadf7562d6e80ba80295ba01e7a749623df8e204ca7109bcda8fbfee67497a1f084be7126e8f59a3b4ffd09dd14804b203bc29c82d6f0e987396f3b825b2549c0000000000000000000000000000000000000000000000000000000000000025f198086b2db17256731bc456673b96bcef23f51d1fbacdd7c4379ef65465572f1900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008a7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a226c66723934623767656d7249515936623061523253456d417445356a337162716d335a454765625f563338222c226f726967696e223a2268747470733a2f2f6b6579732e636f696e626173652e636f6d222c2263726f73734f726967696e223a66616c73657d000000000000000000000000000000000000000000006492649264926492649264926492649264926492649264926492649264926492",
-          client: TEST_CLIENT,
-          chain: mainnet, // The CBSW factory was deployed more recently than our fork, it's only an eth_call so live mainnet is okay
+            "0x0000000000000000000000000ba5ed0c6aa8c49038f819e587e2633c4a9f428a0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000e43ffba36f000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000406e033e8bd44ba8d7fe309535da2dcf38bbf6aa0144937adf2b4851e506a8afe10e8d53896201a64512e72414c2aa3b626b18b2a9931d5dd09d57e147662af7530000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000001dadf7562d6e80ba80295ba01e7a749623df8e204ca7109bcda8fbfee67497a1f084be7126e8f59a3b4ffd09dd14804b203bc29c82d6f0e987396f3b825b2549c0000000000000000000000000000000000000000000000000000000000000025f198086b2db17256731bc456673b96bcef23f51d1fbacdd7c4379ef65465572f1900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008a7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a226c66723934623767656d7249515936623061523253456d417445356a337162716d335a454765625f563338222c226f726967696e223a2268747470733a2f2f6b6579732e636f696e626173652e636f6d222c2263726f73734f726967696e223a66616c73657d000000000000000000000000000000000000000000006492649264926492649264926492649264926492649264926492649264926492", // The CBSW factory was deployed more recently than our fork, it's only an eth_call so live mainnet is okay
         }),
       ).toBe(true);
     });
@@ -126,11 +126,11 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     test("should verify a smart account signature", async () => {
       const rawSignature = await smartAccount.signMessage({ message });
       const result = await verifyContractWalletSignature({
-        signature: rawSignature,
-        message,
         address: smartAccount.address,
         chain: ethereum,
         client: TEST_CLIENT,
+        message,
+        signature: rawSignature,
       });
       expect(result).toBe(true);
     });
@@ -139,11 +139,11 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       const rawSignature = await smartAccount.signMessage({ message });
       const bytesSignature = ox__Bytes.fromHex(rawSignature);
       const result = await verifyContractWalletSignature({
-        signature: bytesSignature,
-        message,
         address: smartAccount.address,
         chain: ethereum,
         client: TEST_CLIENT,
+        message,
+        signature: bytesSignature,
       });
       expect(result).toBe(true);
     });
diff --git a/packages/thirdweb/src/auth/verify-signature.ts b/packages/thirdweb/src/auth/verify-signature.ts
index 5cdd10acce6..87c7920d3ee 100644
--- a/packages/thirdweb/src/auth/verify-signature.ts
+++ b/packages/thirdweb/src/auth/verify-signature.ts
@@ -121,12 +121,12 @@ export async function verifyContractWalletSignature({
   })();
 
   return verifyHash({
-    hash: messageHash,
-    signature: parsedSignature,
+    accountFactory,
     address,
-    client,
     chain,
-    accountFactory,
+    client,
+    hash: messageHash,
+    signature: parsedSignature,
   });
 }
 
diff --git a/packages/thirdweb/src/auth/verify-typed-data.test.ts b/packages/thirdweb/src/auth/verify-typed-data.test.ts
index b091e4d4966..99ab91db584 100644
--- a/packages/thirdweb/src/auth/verify-typed-data.test.ts
+++ b/packages/thirdweb/src/auth/verify-typed-data.test.ts
@@ -18,11 +18,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
     expect(
       await verifyTypedData({
         ...typedData.basic,
-        primaryType: "Mail",
         address: TEST_ACCOUNT_A.address,
-        signature,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
+        primaryType: "Mail",
+        signature,
       }),
     ).toBe(true);
   });
@@ -31,11 +31,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
     expect(
       await verifyTypedData({
         ...typedData.basic,
-        primaryType: "Mail",
         address: TEST_ACCOUNT_A.address,
-        signature: "0xdead",
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
+        primaryType: "Mail",
+        signature: "0xdead",
       }),
     ).toBe(false);
   });
@@ -44,12 +44,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
     expect(
       await verifyTypedData({
         ...typedData.basic,
-        primaryType: "Mail",
         address: "0x3FCf42e10CC70Fe75A62EB3aDD6D305Aa840d145",
-        signature:
-          "0x79d756d805073dc97b7bc885b0d56ddf319a2599530fe1e178c2a7de5be88980068d24f20a79b318ea0a84d33ae06f93db77e4235e5d9eeb8b1d7a63922ada3e1c",
         chain: mainnet,
         client: TEST_CLIENT,
+        primaryType: "Mail",
+        signature:
+          "0x79d756d805073dc97b7bc885b0d56ddf319a2599530fe1e178c2a7de5be88980068d24f20a79b318ea0a84d33ae06f93db77e4235e5d9eeb8b1d7a63922ada3e1c",
       }),
     ).toBe(true);
   });
@@ -58,11 +58,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
     expect(
       await verifyTypedData({
         ...typedData.basic,
-        primaryType: "Mail",
         address: "0x3FCf42e10CC70Fe75A62EB3aDD6D305Aa840d145",
-        signature: "0xdead",
         chain: mainnet,
         client: TEST_CLIENT,
+        primaryType: "Mail",
+        signature: "0xdead",
       }),
     ).toBe(false);
   });
@@ -71,12 +71,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
     expect(
       await verifyTypedData({
         ...typedData.basic,
-        primaryType: "Mail",
         address: "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
-        signature:
-          "0x79d756d805073dc97b7bc885b0d56ddf319a2599530fe1e178c2a7de5be88980068d24f20a79b318ea0a84d33ae06f93db77e4235e5d9eeb8b1d7a63922ada3e1c",
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
+        primaryType: "Mail",
+        signature:
+          "0x79d756d805073dc97b7bc885b0d56ddf319a2599530fe1e178c2a7de5be88980068d24f20a79b318ea0a84d33ae06f93db77e4235e5d9eeb8b1d7a63922ada3e1c",
       }),
     ).toBe(false);
   });
diff --git a/packages/thirdweb/src/auth/verify-typed-data.ts b/packages/thirdweb/src/auth/verify-typed-data.ts
index 22340ce336a..101b583febb 100644
--- a/packages/thirdweb/src/auth/verify-typed-data.ts
+++ b/packages/thirdweb/src/auth/verify-typed-data.ts
@@ -96,17 +96,17 @@ export async function verifyTypedData<
   types,
 }: VerifyTypedDataParams<typedData, primaryType>): Promise<boolean> {
   const messageHash = ox__TypedData.getSignPayload({
-    message,
     domain,
+    message,
     primaryType,
     types,
   } as HashTypedDataParams);
   return verifyHash({
-    hash: messageHash,
-    signature,
+    accountFactory,
     address,
     chain,
     client,
-    accountFactory,
+    hash: messageHash,
+    signature,
   });
 }
diff --git a/packages/thirdweb/src/bridge/Buy.test.ts b/packages/thirdweb/src/bridge/Buy.test.ts
index 917561a4872..5744ae61dca 100644
--- a/packages/thirdweb/src/bridge/Buy.test.ts
+++ b/packages/thirdweb/src/bridge/Buy.test.ts
@@ -6,12 +6,12 @@ import * as Buy from "./Buy.js";
 describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Buy.quote", () => {
   it("should get a valid quote", async () => {
     const quote = await Buy.quote({
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      destinationChainId: 10,
-      destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       amount: toWei("0.01"),
       client: TEST_CLIENT,
+      destinationChainId: 10,
+      destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     });
 
     expect(quote).toBeDefined();
@@ -23,25 +23,25 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Buy.quote", () => {
   it("should surface any errors", async () => {
     await expect(
       Buy.quote({
-        originChainId: 1,
-        originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-        destinationChainId: 444,
-        destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
         amount: toWei("1000000000"),
         client: TEST_CLIENT,
+        destinationChainId: 444,
+        destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+        originChainId: 1,
+        originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       }),
     ).rejects.toThrowError();
   });
 
   it("should limit quotes to routes with a certain number of steps", async () => {
     const quote = await Buy.quote({
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      amount: toWei("0.01"),
+      client: TEST_CLIENT,
       destinationChainId: 10,
       destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      amount: toWei("0.01"),
       maxSteps: 2,
-      client: TEST_CLIENT,
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     });
 
     expect(quote).toBeDefined();
@@ -54,17 +54,17 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Buy.quote", () => {
 describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Buy.prepare", () => {
   it("should get a valid prepared quote", async () => {
     const quote = await Buy.prepare({
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      destinationChainId: 10,
-      destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       amount: toWei("0.01"),
-      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
       client: TEST_CLIENT,
+      destinationChainId: 10,
+      destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       purchaseData: {
         foo: "bar",
       },
+      receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
     });
 
     expect(quote).toBeDefined();
@@ -78,29 +78,29 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Buy.prepare", () => {
   it("should surface any errors", async () => {
     await expect(
       Buy.prepare({
-        originChainId: 1,
-        originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+        amount: toWei("1000000000"),
+        client: TEST_CLIENT,
         destinationChainId: 444,
         destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-        amount: toWei("1000000000"),
-        sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+        originChainId: 1,
+        originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
         receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-        client: TEST_CLIENT,
+        sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
       }),
     ).rejects.toThrowError();
   });
 
   it("should limit quotes to routes with a certain number of steps", async () => {
     const quote = await Buy.prepare({
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      amount: toWei("0.01"),
+      client: TEST_CLIENT,
       destinationChainId: 10,
       destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      amount: toWei("0.01"),
       maxSteps: 2,
-      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      client: TEST_CLIENT,
+      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
     });
 
     expect(quote).toBeDefined();
diff --git a/packages/thirdweb/src/bridge/Buy.ts b/packages/thirdweb/src/bridge/Buy.ts
index 07d1b8c79a1..5c383db576b 100644
--- a/packages/thirdweb/src/bridge/Buy.ts
+++ b/packages/thirdweb/src/bridge/Buy.ts
@@ -130,28 +130,28 @@ export async function quote(options: quote.Options): Promise<quote.Result> {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
 
   const { data }: { data: Quote } = await response.json();
   return {
-    originAmount: BigInt(data.originAmount),
-    destinationAmount: BigInt(data.destinationAmount),
     blockNumber: data.blockNumber ? BigInt(data.blockNumber) : undefined,
-    timestamp: data.timestamp,
+    destinationAmount: BigInt(data.destinationAmount),
     estimatedExecutionTimeMs: data.estimatedExecutionTimeMs,
-    steps: data.steps,
     intent: {
-      originChainId,
-      originTokenAddress,
+      amount,
+      buyAmountWei: amount,
       destinationChainId,
       destinationTokenAddress,
-      buyAmountWei: amount,
-      amount,
+      originChainId,
+      originTokenAddress,
     },
+    originAmount: BigInt(data.originAmount),
+    steps: data.steps,
+    timestamp: data.timestamp,
   };
 }
 
@@ -349,59 +349,59 @@ export async function prepare(
   const url = new URL(`${getThirdwebBaseUrl("bridge")}/v1/buy/prepare`);
 
   const response = await clientFetch(url.toString(), {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
-      buyAmountWei: amount.toString(), // legacy
-      amount: amount.toString(),
-      originChainId: originChainId.toString(),
-      originTokenAddress,
+      amount: amount.toString(), // legacy
+      buyAmountWei: amount.toString(),
       destinationChainId: destinationChainId.toString(),
       destinationTokenAddress,
-      sender,
-      receiver,
-      purchaseData,
       maxSteps,
+      originChainId: originChainId.toString(),
+      originTokenAddress,
       paymentLinkId,
+      purchaseData,
+      receiver,
+      sender,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
   if (!response.ok) {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
 
   const { data }: { data: PreparedQuote } = await response.json();
   return {
-    originAmount: BigInt(data.originAmount),
-    destinationAmount: BigInt(data.destinationAmount),
     blockNumber: data.blockNumber ? BigInt(data.blockNumber) : undefined,
-    timestamp: data.timestamp,
+    destinationAmount: BigInt(data.destinationAmount),
     estimatedExecutionTimeMs: data.estimatedExecutionTimeMs,
+    intent: {
+      amount,
+      destinationChainId,
+      destinationTokenAddress,
+      originChainId,
+      originTokenAddress,
+      receiver,
+      sender,
+    },
+    originAmount: BigInt(data.originAmount),
     steps: data.steps.map((step) => ({
       ...step,
       transactions: step.transactions.map((transaction) => ({
         ...transaction,
-        value: transaction.value ? BigInt(transaction.value) : undefined,
-        client,
         chain: defineChain(transaction.chainId),
+        client,
+        value: transaction.value ? BigInt(transaction.value) : undefined,
       })),
     })),
-    intent: {
-      originChainId,
-      originTokenAddress,
-      destinationChainId,
-      destinationTokenAddress,
-      amount,
-      sender,
-      receiver,
-    },
+    timestamp: data.timestamp,
   };
 }
 
diff --git a/packages/thirdweb/src/bridge/Chains.ts b/packages/thirdweb/src/bridge/Chains.ts
index 9e9a1dea1ff..51a3142eef3 100644
--- a/packages/thirdweb/src/bridge/Chains.ts
+++ b/packages/thirdweb/src/bridge/Chains.ts
@@ -62,8 +62,8 @@ export async function chains(options: chains.Options): Promise<chains.Result> {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
diff --git a/packages/thirdweb/src/bridge/Onramp.test.ts b/packages/thirdweb/src/bridge/Onramp.test.ts
index 17f61014017..73870489cfd 100644
--- a/packages/thirdweb/src/bridge/Onramp.test.ts
+++ b/packages/thirdweb/src/bridge/Onramp.test.ts
@@ -15,12 +15,12 @@ const NATIVE_TOKEN_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Onramp.prepare", () => {
   it("should prepare an onramp successfully", async () => {
     const prepared = await Onramp.prepare({
+      amount: toWei("0.01"),
+      chainId: 1,
       client: TEST_CLIENT,
       onramp: "stripe",
-      chainId: 1,
-      tokenAddress: NATIVE_TOKEN_ADDRESS,
       receiver: RECEIVER_ADDRESS,
-      amount: toWei("0.01"),
+      tokenAddress: NATIVE_TOKEN_ADDRESS,
     });
 
     expect(prepared).toBeDefined();
@@ -46,24 +46,24 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Onramp.prepare", () => {
   it("should surface any errors", async () => {
     await expect(
       Onramp.prepare({
-        client: TEST_CLIENT,
+        amount: toWei("0.01"),
+        chainId: 444,
+        client: TEST_CLIENT, // Unsupported chain ID
         onramp: "stripe",
-        chainId: 444, // Unsupported chain ID
-        tokenAddress: NATIVE_TOKEN_ADDRESS,
         receiver: RECEIVER_ADDRESS,
-        amount: toWei("0.01"),
+        tokenAddress: NATIVE_TOKEN_ADDRESS,
       }),
     ).rejects.toThrowError();
   });
 
   it("should prepare a Coinbase onramp successfully", async () => {
     const prepared = await Onramp.prepare({
+      amount: toWei("0.01"),
+      chainId: 1,
       client: TEST_CLIENT,
       onramp: "coinbase",
-      chainId: 1,
-      tokenAddress: NATIVE_TOKEN_ADDRESS,
       receiver: RECEIVER_ADDRESS,
-      amount: toWei("0.01"),
+      tokenAddress: NATIVE_TOKEN_ADDRESS,
     });
 
     expect(prepared).toBeDefined();
@@ -88,12 +88,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Onramp.prepare", () => {
 
   it("should prepare a Transak onramp successfully", async () => {
     const prepared = await Onramp.prepare({
+      amount: toWei("0.01"),
+      chainId: 1,
       client: TEST_CLIENT,
       onramp: "transak",
-      chainId: 1,
-      tokenAddress: NATIVE_TOKEN_ADDRESS,
       receiver: RECEIVER_ADDRESS,
-      amount: toWei("0.01"),
+      tokenAddress: NATIVE_TOKEN_ADDRESS,
     });
 
     expect(prepared).toBeDefined();
diff --git a/packages/thirdweb/src/bridge/Onramp.ts b/packages/thirdweb/src/bridge/Onramp.ts
index a3b5dbc2f9e..e56aba9b738 100644
--- a/packages/thirdweb/src/bridge/Onramp.ts
+++ b/packages/thirdweb/src/bridge/Onramp.ts
@@ -170,10 +170,10 @@ export async function prepare(
   const url = `${getThirdwebBaseUrl("bridge")}/v1/onramp/prepare`;
 
   const apiRequestBody: OnrampApiRequestBody = {
-    onramp,
     chainId: Number(chainId),
-    tokenAddress,
+    onramp,
     receiver,
+    tokenAddress,
   };
 
   if (amount !== undefined) {
@@ -210,19 +210,19 @@ export async function prepare(
   }
 
   const response = await clientFetch(url, {
-    method: "POST",
+    body: stringify(apiRequestBody),
     headers: {
       "Content-Type": "application/json",
     },
-    body: stringify(apiRequestBody),
+    method: "POST",
   });
 
   if (!response.ok) {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
@@ -233,8 +233,8 @@ export async function prepare(
   // Transform amounts from string to bigint where appropriate
   const transformedSteps = data.steps.map((step) => ({
     ...step,
-    originAmount: BigInt(step.originAmount),
     destinationAmount: BigInt(step.destinationAmount),
+    originAmount: BigInt(step.originAmount),
     transactions: step.transactions.map((tx) => ({
       ...tx,
       value: tx.value ? BigInt(tx.value) : undefined,
@@ -249,8 +249,8 @@ export async function prepare(
   return {
     ...data,
     destinationAmount: BigInt(data.destinationAmount),
-    steps: transformedSteps,
     intent: intentFromResponse,
+    steps: transformedSteps,
   };
 }
 
diff --git a/packages/thirdweb/src/bridge/OnrampStatus.ts b/packages/thirdweb/src/bridge/OnrampStatus.ts
index b576fde40fd..312d8fea57c 100644
--- a/packages/thirdweb/src/bridge/OnrampStatus.ts
+++ b/packages/thirdweb/src/bridge/OnrampStatus.ts
@@ -75,8 +75,8 @@ export async function status(options: status.Options): Promise<status.Result> {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
diff --git a/packages/thirdweb/src/bridge/Routes.test.ts b/packages/thirdweb/src/bridge/Routes.test.ts
index 9917707710f..0b0ce4b4335 100644
--- a/packages/thirdweb/src/bridge/Routes.test.ts
+++ b/packages/thirdweb/src/bridge/Routes.test.ts
@@ -87,10 +87,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.routes", () => {
   it("should combine filters", async () => {
     const filteredRoutes = await routes({
       client: TEST_CLIENT,
-      originChainId: 1,
       destinationChainId: 10,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     });
 
     expect(filteredRoutes).toBeDefined();
diff --git a/packages/thirdweb/src/bridge/Routes.ts b/packages/thirdweb/src/bridge/Routes.ts
index 012a9fb42fc..2e2f27ff3c0 100644
--- a/packages/thirdweb/src/bridge/Routes.ts
+++ b/packages/thirdweb/src/bridge/Routes.ts
@@ -169,8 +169,8 @@ export async function routes(options: routes.Options): Promise<routes.Result> {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
diff --git a/packages/thirdweb/src/bridge/Sell.test.ts b/packages/thirdweb/src/bridge/Sell.test.ts
index 67d8b37fabb..2a35b411489 100644
--- a/packages/thirdweb/src/bridge/Sell.test.ts
+++ b/packages/thirdweb/src/bridge/Sell.test.ts
@@ -6,12 +6,12 @@ import * as Sell from "./Sell.js";
 describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Sell.quote", () => {
   it("should get a valid quote", async () => {
     const quote = await Sell.quote({
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      destinationChainId: 10,
-      destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       amount: toWei("0.01"),
       client: TEST_CLIENT,
+      destinationChainId: 10,
+      destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     });
 
     expect(quote).toBeDefined();
@@ -23,25 +23,25 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Sell.quote", () => {
   it("should surface any errors", async () => {
     await expect(
       Sell.quote({
-        originChainId: 1,
-        originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-        destinationChainId: 444,
-        destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
         amount: toWei("1000000000"),
         client: TEST_CLIENT,
+        destinationChainId: 444,
+        destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+        originChainId: 1,
+        originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       }),
     ).rejects.toThrowError();
   });
 
   it("should limit quotes to routes with a certain number of steps", async () => {
     const quote = await Sell.quote({
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      amount: toWei("0.01"),
+      client: TEST_CLIENT,
       destinationChainId: 10,
       destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      amount: toWei("0.01"),
       maxSteps: 2,
-      client: TEST_CLIENT,
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     });
 
     expect(quote).toBeDefined();
@@ -54,14 +54,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Sell.quote", () => {
 describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Sell.prepare", () => {
   it("should get a valid prepared quote", async () => {
     const quote = await Sell.prepare({
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      amount: toWei("0.01"),
+      client: TEST_CLIENT,
       destinationChainId: 10,
       destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      amount: toWei("0.01"),
-      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      client: TEST_CLIENT,
+      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
     });
 
     expect(quote).toBeDefined();
@@ -75,29 +75,29 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Sell.prepare", () => {
   it("should surface any errors", async () => {
     await expect(
       Sell.prepare({
-        originChainId: 1,
-        originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+        amount: toWei("1000000000"),
+        client: TEST_CLIENT,
         destinationChainId: 444,
         destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-        amount: toWei("1000000000"),
-        sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+        originChainId: 1,
+        originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
         receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-        client: TEST_CLIENT,
+        sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
       }),
     ).rejects.toThrowError();
   });
 
   it("should limit quotes to routes with a certain number of steps", async () => {
     const quote = await Sell.prepare({
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      amount: toWei("0.01"),
+      client: TEST_CLIENT,
       destinationChainId: 10,
       destinationTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      amount: toWei("0.01"),
       maxSteps: 2,
-      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      client: TEST_CLIENT,
+      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
     });
 
     expect(quote).toBeDefined();
diff --git a/packages/thirdweb/src/bridge/Sell.ts b/packages/thirdweb/src/bridge/Sell.ts
index 5f1a1233522..6f57c50ef36 100644
--- a/packages/thirdweb/src/bridge/Sell.ts
+++ b/packages/thirdweb/src/bridge/Sell.ts
@@ -129,27 +129,27 @@ export async function quote(options: quote.Options): Promise<quote.Result> {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
 
   const { data }: { data: Quote } = await response.json();
   return {
-    originAmount: BigInt(data.originAmount),
-    destinationAmount: BigInt(data.destinationAmount),
     blockNumber: data.blockNumber ? BigInt(data.blockNumber) : undefined,
-    timestamp: data.timestamp,
+    destinationAmount: BigInt(data.destinationAmount),
     estimatedExecutionTimeMs: data.estimatedExecutionTimeMs,
-    steps: data.steps,
     intent: {
-      originChainId,
-      originTokenAddress,
+      amount,
       destinationChainId,
       destinationTokenAddress,
-      amount,
+      originChainId,
+      originTokenAddress,
     },
+    originAmount: BigInt(data.originAmount),
+    steps: data.steps,
+    timestamp: data.timestamp,
   };
 }
 
@@ -334,61 +334,61 @@ export async function prepare(
   const url = new URL(`${getThirdwebBaseUrl("bridge")}/v1/sell/prepare`);
 
   const response = await clientFetch(url.toString(), {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
-      sellAmountWei: amount.toString(),
       amount: amount.toString(),
-      originChainId: originChainId.toString(),
-      originTokenAddress,
       destinationChainId: destinationChainId.toString(),
       destinationTokenAddress,
-      sender,
-      receiver,
-      purchaseData,
       maxSteps,
+      originChainId: originChainId.toString(),
+      originTokenAddress,
       paymentLinkId,
+      purchaseData,
+      receiver,
+      sellAmountWei: amount.toString(),
+      sender,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
   if (!response.ok) {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
 
   const { data }: { data: PreparedQuote } = await response.json();
   return {
-    originAmount: BigInt(data.originAmount),
-    destinationAmount: BigInt(data.destinationAmount),
     blockNumber: data.blockNumber ? BigInt(data.blockNumber) : undefined,
-    timestamp: data.timestamp,
+    destinationAmount: BigInt(data.destinationAmount),
     estimatedExecutionTimeMs: data.estimatedExecutionTimeMs,
+    expiration: data.expiration,
+    intent: {
+      amount,
+      destinationChainId,
+      destinationTokenAddress,
+      originChainId,
+      originTokenAddress,
+      purchaseData,
+      receiver,
+      sender,
+    },
+    originAmount: BigInt(data.originAmount),
     steps: data.steps.map((step) => ({
       ...step,
       transactions: step.transactions.map((transaction) => ({
         ...transaction,
-        value: transaction.value ? BigInt(transaction.value) : undefined,
-        client,
         chain: defineChain(transaction.chainId),
+        client,
+        value: transaction.value ? BigInt(transaction.value) : undefined,
       })),
     })),
-    expiration: data.expiration,
-    intent: {
-      originChainId,
-      originTokenAddress,
-      destinationChainId,
-      destinationTokenAddress,
-      amount,
-      sender,
-      receiver,
-      purchaseData,
-    },
+    timestamp: data.timestamp,
   };
 }
 
diff --git a/packages/thirdweb/src/bridge/Status.test.ts b/packages/thirdweb/src/bridge/Status.test.ts
index 6593c94c70a..2f7b6b7ef74 100644
--- a/packages/thirdweb/src/bridge/Status.test.ts
+++ b/packages/thirdweb/src/bridge/Status.test.ts
@@ -7,10 +7,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.status", () => {
   // TODO: flaky test
   it.skip("should handle successful status", async () => {
     const result = await status({
-      transactionHash:
-        "0x5959b9321ec581640db531b80bac53cbd968f3d34fc6cb1d5f4ea75f26df2ad7",
       chainId: 137,
       client: TEST_CLIENT,
+      transactionHash:
+        "0x5959b9321ec581640db531b80bac53cbd968f3d34fc6cb1d5f4ea75f26df2ad7",
     });
 
     expect(result).toBeDefined();
@@ -43,10 +43,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.status", () => {
 
   it("should handle successful status with chain", async () => {
     const result = await status({
-      transactionHash:
-        "0x06ac91479b3ea4c6507f9b7bff1f2d5f553253fa79af9a7db3755563b60f7dfb",
       chain: defineChain(8453),
       client: TEST_CLIENT,
+      transactionHash:
+        "0x06ac91479b3ea4c6507f9b7bff1f2d5f553253fa79af9a7db3755563b60f7dfb",
     });
 
     expect(result).toBeDefined();
diff --git a/packages/thirdweb/src/bridge/Status.ts b/packages/thirdweb/src/bridge/Status.ts
index 47027f6baf0..0a893f6a98c 100644
--- a/packages/thirdweb/src/bridge/Status.ts
+++ b/packages/thirdweb/src/bridge/Status.ts
@@ -118,8 +118,8 @@ export async function status(options: status.Options): Promise<status.Result> {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
@@ -127,53 +127,53 @@ export async function status(options: status.Options): Promise<status.Result> {
   const { data }: { data: Status } = await response.json();
   if (data.status === "FAILED") {
     return {
-      status: "FAILED",
       paymentId: data.paymentId,
+      status: "FAILED",
       transactions: data.transactions,
     };
   }
 
   if (data.status === "PENDING") {
     return {
-      status: "PENDING",
-      originAmount: BigInt(data.originAmount),
-      originChainId: data.originChainId,
       destinationChainId: data.destinationChainId,
-      originTokenAddress: data.originTokenAddress,
+      destinationToken: data.destinationToken,
       destinationTokenAddress: data.destinationTokenAddress,
-      transactions: data.transactions,
+      originAmount: BigInt(data.originAmount),
+      originChainId: data.originChainId,
       originToken: data.originToken,
-      destinationToken: data.destinationToken,
-      sender: data.sender,
-      receiver: data.receiver,
+      originTokenAddress: data.originTokenAddress,
       paymentId: data.paymentId,
       purchaseData: data.purchaseData,
+      receiver: data.receiver,
+      sender: data.sender,
+      status: "PENDING",
+      transactions: data.transactions,
     };
   }
 
   if (data.status === "NOT_FOUND") {
     return {
-      status: "NOT_FOUND",
       paymentId: data.paymentId,
+      status: "NOT_FOUND",
       transactions: [],
     };
   }
 
   return {
-    status: "COMPLETED",
-    originAmount: BigInt(data.originAmount),
     destinationAmount: BigInt(data.destinationAmount),
-    originChainId: data.originChainId,
     destinationChainId: data.destinationChainId,
-    originTokenAddress: data.originTokenAddress,
+    destinationToken: data.destinationToken,
     destinationTokenAddress: data.destinationTokenAddress,
-    transactions: data.transactions,
+    originAmount: BigInt(data.originAmount),
+    originChainId: data.originChainId,
     originToken: data.originToken,
-    destinationToken: data.destinationToken,
-    sender: data.sender,
-    receiver: data.receiver,
+    originTokenAddress: data.originTokenAddress,
     paymentId: data.paymentId,
     purchaseData: data.purchaseData,
+    receiver: data.receiver,
+    sender: data.sender,
+    status: "COMPLETED",
+    transactions: data.transactions,
   };
 }
 
diff --git a/packages/thirdweb/src/bridge/Token.test.ts b/packages/thirdweb/src/bridge/Token.test.ts
index f54d8847aa3..d149d18aff1 100644
--- a/packages/thirdweb/src/bridge/Token.test.ts
+++ b/packages/thirdweb/src/bridge/Token.test.ts
@@ -41,8 +41,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("tokens", () => {
 
     // Test
     const result = await tokens({
-      client,
       chainId: 1,
+      client,
     });
 
     // Verify
diff --git a/packages/thirdweb/src/bridge/Token.ts b/packages/thirdweb/src/bridge/Token.ts
index 29a67e8d45f..11b7316b254 100644
--- a/packages/thirdweb/src/bridge/Token.ts
+++ b/packages/thirdweb/src/bridge/Token.ts
@@ -146,8 +146,8 @@ export async function tokens(options: tokens.Options): Promise<tokens.Result> {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
@@ -224,19 +224,19 @@ export async function add(options: add.Options): Promise<add.Result> {
   };
 
   const response = await clientFetch(url, {
-    method: "POST",
+    body: JSON.stringify(requestBody),
     headers: {
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(requestBody),
+    method: "POST",
   });
 
   if (!response.ok) {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
diff --git a/packages/thirdweb/src/bridge/Transfer.test.ts b/packages/thirdweb/src/bridge/Transfer.test.ts
index a505d71714b..ba0c21daa92 100644
--- a/packages/thirdweb/src/bridge/Transfer.test.ts
+++ b/packages/thirdweb/src/bridge/Transfer.test.ts
@@ -6,15 +6,15 @@ import * as Transfer from "./Transfer.js";
 describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Transfer.prepare", () => {
   it("should get a valid prepared quote", async () => {
     const quote = await Transfer.prepare({
-      chainId: 1,
-      tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       amount: toWei("0.01"),
-      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      chainId: 1,
       client: TEST_CLIENT,
       purchaseData: {
         reference: "test-transfer",
       },
+      receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     });
 
     expect(quote).toBeDefined();
@@ -28,38 +28,38 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Transfer.prepare", () => {
   it("should surface any errors", async () => {
     await expect(
       Transfer.prepare({
-        chainId: 444, // Invalid chain ID
-        tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-        amount: toWei("1000000000"),
-        sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-        receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+        amount: toWei("1000000000"), // Invalid chain ID
+        chainId: 444,
         client: TEST_CLIENT,
+        receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+        sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+        tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       }),
     ).rejects.toThrowError();
   });
 
   it("should support the feePayer option", async () => {
     const senderQuote = await Transfer.prepare({
-      chainId: 1,
-      tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       amount: toWei("0.01"),
-      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      feePayer: "sender",
+      chainId: 1,
       client: TEST_CLIENT,
+      feePayer: "sender",
+      receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     });
 
     expect(senderQuote).toBeDefined();
     expect(senderQuote.intent.feePayer).toBe("sender");
 
     const receiverQuote = await Transfer.prepare({
-      chainId: 1,
-      tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       amount: toWei("0.01"),
-      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      feePayer: "receiver",
+      chainId: 1,
       client: TEST_CLIENT,
+      feePayer: "receiver",
+      receiver: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      sender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
+      tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     });
 
     expect(receiverQuote).toBeDefined();
diff --git a/packages/thirdweb/src/bridge/Transfer.ts b/packages/thirdweb/src/bridge/Transfer.ts
index 1b7e0eb2a54..19f3951ecf8 100644
--- a/packages/thirdweb/src/bridge/Transfer.ts
+++ b/packages/thirdweb/src/bridge/Transfer.ts
@@ -197,56 +197,56 @@ export async function prepare(
   const url = new URL(`${getThirdwebBaseUrl("bridge")}/v1/transfer/prepare`);
 
   const response = await clientFetch(url.toString(), {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
-      transferAmountWei: amount.toString(), // legacy
-      amount: amount.toString(),
+      amount: amount.toString(), // legacy
       chainId: chainId.toString(),
-      tokenAddress,
-      sender,
-      receiver,
-      purchaseData,
       feePayer,
       paymentLinkId,
+      purchaseData,
+      receiver,
+      sender,
+      tokenAddress,
+      transferAmountWei: amount.toString(),
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
   if (!response.ok) {
     const errorJson = await response.json();
     throw new ApiError({
       code: errorJson.code || "UNKNOWN_ERROR",
-      message: errorJson.message || response.statusText,
       correlationId: errorJson.correlationId || undefined,
+      message: errorJson.message || response.statusText,
       statusCode: response.status,
     });
   }
 
   const { data }: { data: PreparedQuote } = await response.json();
   return {
-    originAmount: BigInt(data.originAmount),
-    destinationAmount: BigInt(data.destinationAmount),
     blockNumber: data.blockNumber ? BigInt(data.blockNumber) : undefined,
-    timestamp: data.timestamp,
+    destinationAmount: BigInt(data.destinationAmount),
     estimatedExecutionTimeMs: data.estimatedExecutionTimeMs,
+    intent: {
+      amount,
+      chainId,
+      feePayer,
+      receiver,
+      sender,
+      tokenAddress,
+    },
+    originAmount: BigInt(data.originAmount),
     steps: data.steps.map((step) => ({
       ...step,
       transactions: step.transactions.map((transaction) => ({
         ...transaction,
-        value: transaction.value ? BigInt(transaction.value) : undefined,
-        client,
         chain: defineChain(transaction.chainId),
+        client,
+        value: transaction.value ? BigInt(transaction.value) : undefined,
       })),
     })),
-    intent: {
-      chainId,
-      tokenAddress,
-      amount,
-      sender,
-      receiver,
-      feePayer,
-    },
+    timestamp: data.timestamp,
   };
 }
 
diff --git a/packages/thirdweb/src/bridge/Webhook.test.ts b/packages/thirdweb/src/bridge/Webhook.test.ts
index 37f5f8b38b5..ac5d21d6d6b 100644
--- a/packages/thirdweb/src/bridge/Webhook.test.ts
+++ b/packages/thirdweb/src/bridge/Webhook.test.ts
@@ -1,6 +1,6 @@
 import crypto from "node:crypto";
 import { describe, expect, it } from "vitest";
-import { type WebhookPayload, parse } from "./Webhook.js";
+import { parse, type WebhookPayload } from "./Webhook.js";
 
 const secret = "test-secret";
 
@@ -22,35 +22,36 @@ const generateSignature = async (
 describe("parseIncomingWebhook", () => {
   const testTimestamp = Math.floor(Date.now() / 1000).toString();
   const validPayload: WebhookPayload = {
-    version: 2,
     data: {
-      paymentId: "pay123",
-      clientId: "client123",
       action: "TRANSFER",
-      status: "COMPLETED",
-      originToken: {
-        chainId: 1,
+      clientId: "client123",
+      destinationAmount: "1.0",
+      destinationToken: {
         address: "0x1234567890123456789012345678901234567890" as const,
-        name: "Token",
-        symbol: "TKN",
+        chainId: 1,
         decimals: 18,
-        priceUsd: 1.0,
         iconUri: "https://example.com/icon.png",
+        name: "Token",
+        priceUsd: 1.0,
+        symbol: "TKN",
       },
+      developerFeeBps: 100,
+      developerFeeRecipient: "0x1234567890123456789012345678901234567890",
       originAmount: "1.0",
-      destinationToken: {
-        chainId: 1,
+      originToken: {
         address: "0x1234567890123456789012345678901234567890" as const,
-        name: "Token",
-        symbol: "TKN",
+        chainId: 1,
         decimals: 18,
-        priceUsd: 1.0,
         iconUri: "https://example.com/icon.png",
+        name: "Token",
+        priceUsd: 1.0,
+        symbol: "TKN",
       },
-      destinationAmount: "1.0",
-      sender: "0x1234567890123456789012345678901234567890",
+      paymentId: "pay123",
+      purchaseData: {},
       receiver: "0x1234567890123456789012345678901234567890",
-      type: "transfer",
+      sender: "0x1234567890123456789012345678901234567890",
+      status: "COMPLETED",
       transactions: [
         {
           chainId: 1,
@@ -61,10 +62,9 @@ describe("parseIncomingWebhook", () => {
           transactionHash: "0x1234567890123456789012345678901234567890",
         },
       ],
-      developerFeeBps: 100,
-      developerFeeRecipient: "0x1234567890123456789012345678901234567890",
-      purchaseData: {},
+      type: "transfer",
     },
+    version: 2,
   };
 
   it("should successfully verify a valid webhook", async () => {
@@ -146,10 +146,10 @@ describe("parseIncomingWebhook", () => {
 
   it("should throw error for version 1 payload", async () => {
     const v1Payload = {
-      version: 1,
       data: {
         someField: "value",
       },
+      version: 1,
     };
     const v1PayloadString = JSON.stringify(v1Payload);
     const signature = await generateSignature(testTimestamp, v1PayloadString);
@@ -233,11 +233,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for missing required fields", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           transactionId: "tx123",
           // Missing other required fields
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -253,11 +253,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid action type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           action: "INVALID_ACTION", // Invalid action type
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -273,11 +273,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid status type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           status: "INVALID_STATUS", // Invalid status type
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -293,11 +293,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid hex address", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           destinationToken: "invalid-address", // Invalid hex address
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -313,11 +313,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid transactions array", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           transactions: "not-an-array", // Invalid transactions type
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -333,11 +333,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid developerFeeBps type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           developerFeeBps: "not-a-number", // Invalid value (cannot coerce to number)
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -353,11 +353,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid purchaseData type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           purchaseData: null, // Invalid purchaseData type
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -375,11 +375,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid paymentId type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           paymentId: 123, // number instead of string
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -395,11 +395,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid paymentLinkId type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           paymentLinkId: 123, // number instead of string
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -415,11 +415,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid clientId type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           clientId: 123, // number instead of string
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -435,11 +435,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid originToken type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           originToken: 123, // number instead of string
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -455,11 +455,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid originAmount type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           originAmount: 123, // number instead of string
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -475,11 +475,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid destinationAmount type", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           destinationAmount: 123, // number instead of string
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -495,11 +495,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid sender address", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           sender: "invalid-address", // not 0x-prefixed
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -515,11 +515,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid receiver address", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           receiver: "invalid-address", // not 0x-prefixed
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -535,11 +535,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid type field", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           type: 123, // number instead of string
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -555,11 +555,11 @@ describe("parseIncomingWebhook", () => {
 
     it("should throw error for invalid developerFeeRecipient address", async () => {
       const invalidPayload = {
-        version: 2,
         data: {
           ...validPayload.data,
           developerFeeRecipient: "invalid-address", // not 0x-prefixed
         },
+        version: 2,
       };
       const payloadString = JSON.stringify(invalidPayload);
       const signature = await generateSignature(testTimestamp, payloadString);
@@ -593,8 +593,8 @@ describe("parseIncomingWebhook", () => {
 
   it("should throw error for unsupported webhook version", async () => {
     const invalidPayload = {
-      version: 3,
       data: {},
+      version: 3,
     };
     const payloadString = JSON.stringify(invalidPayload);
     const signature = await generateSignature(testTimestamp, payloadString);
diff --git a/packages/thirdweb/src/bridge/Webhook.ts b/packages/thirdweb/src/bridge/Webhook.ts
index 7bf379ad974..1c9927c3a13 100644
--- a/packages/thirdweb/src/bridge/Webhook.ts
+++ b/packages/thirdweb/src/bridge/Webhook.ts
@@ -11,51 +11,51 @@ const addressSchema = z
 
 const webhookSchema = z.union([
   z.object({
-    version: z.literal(1),
     data: z.object({}),
+    version: z.literal(1),
   }),
   z.object({
-    version: z.literal(2),
     data: z.object({
-      paymentId: z.string(),
-      // only exists when the payment was triggered from a developer specified payment link
-      paymentLinkId: z.optional(z.string()),
-      clientId: z.string(),
       action: z.enum(["TRANSFER", "BUY", "SELL"]),
-      status: z.enum(["PENDING", "FAILED", "COMPLETED"]),
-      originToken: z.object({
-        chainId: z.coerce.number(),
+      clientId: z.string(),
+      destinationAmount: z.string(),
+      destinationToken: z.object({
         address: addressSchema,
-        name: z.string(),
-        symbol: z.string(),
+        chainId: z.coerce.number(),
         decimals: z.coerce.number(),
-        priceUsd: z.coerce.number(),
         iconUri: z.optional(z.string()),
+        name: z.string(),
+        priceUsd: z.coerce.number(),
+        symbol: z.string(),
       }),
+      developerFeeBps: z.coerce.number(),
+      developerFeeRecipient: addressSchema,
       originAmount: z.string(),
-      destinationToken: z.object({
-        chainId: z.coerce.number(),
+      originToken: z.object({
         address: addressSchema,
-        name: z.string(),
-        symbol: z.string(),
+        chainId: z.coerce.number(),
         decimals: z.coerce.number(),
-        priceUsd: z.coerce.number(),
         iconUri: z.optional(z.string()),
+        name: z.string(),
+        priceUsd: z.coerce.number(),
+        symbol: z.string(),
       }),
-      destinationAmount: z.string(),
-      sender: addressSchema,
+      paymentId: z.string(),
+      // only exists when the payment was triggered from a developer specified payment link
+      paymentLinkId: z.optional(z.string()),
+      purchaseData: z.optional(z.record(z.string(), z.unknown())),
       receiver: addressSchema,
-      type: z.string(),
+      sender: addressSchema,
+      status: z.enum(["PENDING", "FAILED", "COMPLETED"]),
       transactions: z.array(
         z.object({
           chainId: z.coerce.number(),
           transactionHash: hexSchema,
         }),
       ),
-      developerFeeBps: z.coerce.number(),
-      developerFeeRecipient: addressSchema,
-      purchaseData: z.optional(z.record(z.string(), z.unknown())),
+      type: z.string(),
     }),
+    version: z.literal(2),
   }),
 ]);
 
@@ -120,7 +120,7 @@ export async function parse(
   const key = await crypto.subtle.importKey(
     "raw",
     encoder.encode(secret),
-    { name: "HMAC", hash: "SHA-256" },
+    { hash: "SHA-256", name: "HMAC" },
     false,
     ["sign"],
   );
diff --git a/packages/thirdweb/src/bridge/index.ts b/packages/thirdweb/src/bridge/index.ts
index 83b0fe868b9..d1103f2f941 100644
--- a/packages/thirdweb/src/bridge/index.ts
+++ b/packages/thirdweb/src/bridge/index.ts
@@ -1,16 +1,15 @@
 export * as Buy from "./Buy.js";
-export * as Sell from "./Sell.js";
-export * as Transfer from "./Transfer.js";
+export { chains } from "./Chains.js";
 export * as Onramp from "./Onramp.js";
-export * as Webhook from "./Webhook.js";
-export { status } from "./Status.js";
 export { routes } from "./Routes.js";
-export { chains } from "./Chains.js";
+export * as Sell from "./Sell.js";
+export { status } from "./Status.js";
 export { tokens } from "./Token.js";
-export { parse } from "./Webhook.js";
-
+export * as Transfer from "./Transfer.js";
+export type { Action } from "./types/BridgeAction.js";
 export type { Chain } from "./types/Chain.js";
-export type { Quote, PreparedQuote } from "./types/Quote.js";
+export type { ApiError } from "./types/Errors.js";
+export type { PreparedQuote, Quote } from "./types/Quote.js";
 export type {
   Route,
   RouteQuoteStep,
@@ -19,6 +18,6 @@ export type {
 } from "./types/Route.js";
 export type { Status } from "./types/Status.js";
 export type { Token } from "./types/Token.js";
-export type { ApiError } from "./types/Errors.js";
-export type { Action } from "./types/BridgeAction.js";
 export type { WebhookPayload } from "./Webhook.js";
+export * as Webhook from "./Webhook.js";
+export { parse } from "./Webhook.js";
diff --git a/packages/thirdweb/src/bridge/types/Errors.ts b/packages/thirdweb/src/bridge/types/Errors.ts
index f7f2074da20..27b7400123b 100644
--- a/packages/thirdweb/src/bridge/types/Errors.ts
+++ b/packages/thirdweb/src/bridge/types/Errors.ts
@@ -28,9 +28,9 @@ export class ApiError extends Error {
   override toString() {
     return stringify({
       code: this.code,
+      correlationId: this.correlationId,
       message: this.message,
       statusCode: this.statusCode,
-      correlationId: this.correlationId,
     });
   }
 }
diff --git a/packages/thirdweb/src/chains/chain-definitions/abstract-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/abstract-testnet.ts
index c16f1d4edc8..1c51d167cca 100644
--- a/packages/thirdweb/src/chains/chain-definitions/abstract-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/abstract-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const abstractTestnet = /* @__PURE__ */ defineChain({
-  id: 11124,
-  name: "Abstract Testnet",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Abstract Testnet Block Explorer",
       url: "https://explorer.testnet.abs.xyz",
     },
   ],
+  id: 11124,
+  name: "Abstract Testnet",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/abstract.ts b/packages/thirdweb/src/chains/chain-definitions/abstract.ts
index 3735e6fc912..319eb3ba5ba 100644
--- a/packages/thirdweb/src/chains/chain-definitions/abstract.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/abstract.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const abstract = /* @__PURE__ */ defineChain({
-  id: 2741,
-  name: "Abstract",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Abstract Block Explorer",
       url: "https://explorer.abs.xyz",
     },
   ],
+  id: 2741,
+  name: "Abstract",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/anvil.ts b/packages/thirdweb/src/chains/chain-definitions/anvil.ts
index 0d3b898f661..ee0e48e736a 100644
--- a/packages/thirdweb/src/chains/chain-definitions/anvil.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/anvil.ts
@@ -6,11 +6,11 @@ import { defineChain } from "../utils.js";
 export const anvil = /* @__PURE__ */ defineChain({
   id: 31337,
   name: "Anvil",
-  rpc: "http://127.0.0.1:8545",
-  testnet: true,
   nativeCurrency: {
+    decimals: 18,
     name: "Anvil Ether",
     symbol: "ETH",
-    decimals: 18,
   },
+  rpc: "http://127.0.0.1:8545",
+  testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/arbitrum-nova.ts b/packages/thirdweb/src/chains/chain-definitions/arbitrum-nova.ts
index 79bf4ac2624..4c2a9401ee4 100644
--- a/packages/thirdweb/src/chains/chain-definitions/arbitrum-nova.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/arbitrum-nova.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const arbitrumNova = /* @__PURE__ */ defineChain({
-  id: 42170,
-  name: "Arbitrum Nova",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Arbiscan",
       url: "https://nova.arbiscan.io/",
     },
   ],
+  id: 42170,
+  name: "Arbitrum Nova",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/arbitrum-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/arbitrum-sepolia.ts
index dd8b7f3714e..07333e30e5f 100644
--- a/packages/thirdweb/src/chains/chain-definitions/arbitrum-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/arbitrum-sepolia.ts
@@ -4,19 +4,19 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const arbitrumSepolia = /* @__PURE__ */ defineChain({
-  id: 421614,
-  name: "Arbitrum Sepolia",
-  nativeCurrency: {
-    name: "Arbitrum Sepolia Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
+      apiUrl: "https://sepolia.arbiscan.io/api",
       name: "Arbiscan",
       url: "https://sepolia.arbiscan.io",
-      apiUrl: "https://sepolia.arbiscan.io/api",
     },
   ],
+  id: 421614,
+  name: "Arbitrum Sepolia",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Arbitrum Sepolia Ether",
+    symbol: "ETH",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/arbitrum.ts b/packages/thirdweb/src/chains/chain-definitions/arbitrum.ts
index bfa2f117be0..edbeeee2b03 100644
--- a/packages/thirdweb/src/chains/chain-definitions/arbitrum.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/arbitrum.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const arbitrum = /* @__PURE__ */ defineChain({
-  id: 42161,
-  name: "Arbitrum One",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api.arbiscan.io/api",
       name: "Arbiscan",
       url: "https://arbiscan.io",
-      apiUrl: "https://api.arbiscan.io/api",
     },
   ],
+  id: 42161,
+  name: "Arbitrum One",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/assetchain-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/assetchain-testnet.ts
index 0586c5df12e..6dcb5bc5deb 100644
--- a/packages/thirdweb/src/chains/chain-definitions/assetchain-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/assetchain-testnet.ts
@@ -4,19 +4,19 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const assetChainTestnet = /* @__PURE__ */ defineChain({
-  id: 42421,
-  name: "AssetChain Testnet",
-  nativeCurrency: {
-    name: "Real World Asset",
-    symbol: "RWA",
-    decimals: 18,
-  },
   blockExplorers: [
     {
+      apiUrl: "https://scan-testnet.assetchain.org/api",
       name: "Asset Chain Testnet Explorer",
       url: "https://scan-testnet.assetchain.org",
-      apiUrl: "https://scan-testnet.assetchain.org/api",
     },
   ],
+  id: 42421,
+  name: "AssetChain Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Real World Asset",
+    symbol: "RWA",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/astria-evm-dusknet.ts b/packages/thirdweb/src/chains/chain-definitions/astria-evm-dusknet.ts
index f2aa859590c..3a5770d7251 100644
--- a/packages/thirdweb/src/chains/chain-definitions/astria-evm-dusknet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/astria-evm-dusknet.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const astriaEvmDusknet = /* @__PURE__ */ defineChain({
-  id: 912559,
-  name: "Astria EVM Dusknet",
-  nativeCurrency: { name: "RIA", symbol: "RIA", decimals: 18 },
   blockExplorers: [
     {
       name: "Astria EVM Dusknet Explorer",
       url: "https://explorer.evm.dusk-3.devnet.astria.org/",
     },
   ],
+  id: 912559,
+  name: "Astria EVM Dusknet",
+  nativeCurrency: { decimals: 18, name: "RIA", symbol: "RIA" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/avalanche-fuji.ts b/packages/thirdweb/src/chains/chain-definitions/avalanche-fuji.ts
index ce830b0ac45..b937dbb5768 100644
--- a/packages/thirdweb/src/chains/chain-definitions/avalanche-fuji.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/avalanche-fuji.ts
@@ -4,6 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const avalancheFuji = /* @__PURE__ */ defineChain({
+  blockExplorers: [
+    {
+      apiUrl: "https://api-testnet.snowtrace.io/api",
+      name: "SnowTrace",
+      url: "https://testnet.snowtrace.io",
+    },
+  ],
   id: 43113,
   name: "Avalanche Fuji",
   nativeCurrency: {
@@ -11,12 +18,5 @@ export const avalancheFuji = /* @__PURE__ */ defineChain({
     name: "Avalanche Fuji",
     symbol: "AVAX",
   },
-  blockExplorers: [
-    {
-      name: "SnowTrace",
-      url: "https://testnet.snowtrace.io",
-      apiUrl: "https://api-testnet.snowtrace.io/api",
-    },
-  ],
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/avalanche.ts b/packages/thirdweb/src/chains/chain-definitions/avalanche.ts
index 4e36f6d9891..9af37d00346 100644
--- a/packages/thirdweb/src/chains/chain-definitions/avalanche.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/avalanche.ts
@@ -4,6 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const avalanche = /* @__PURE__ */ defineChain({
+  blockExplorers: [
+    {
+      apiUrl: "https://api.snowtrace.io/api",
+      name: "SnowTrace",
+      url: "https://snowtrace.io",
+    },
+  ],
   id: 43114,
   name: "Avalanche",
   nativeCurrency: {
@@ -11,11 +18,4 @@ export const avalanche = /* @__PURE__ */ defineChain({
     name: "Avalanche",
     symbol: "AVAX",
   },
-  blockExplorers: [
-    {
-      name: "SnowTrace",
-      url: "https://snowtrace.io",
-      apiUrl: "https://api.snowtrace.io/api",
-    },
-  ],
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/base-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/base-sepolia.ts
index d4d502a2b59..b09e2a361a4 100644
--- a/packages/thirdweb/src/chains/chain-definitions/base-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/base-sepolia.ts
@@ -4,15 +4,15 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const baseSepolia = /* @__PURE__ */ defineChain({
-  id: 84532,
-  name: "Base Sepolia",
-  nativeCurrency: { name: "Sepolia Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api-sepolia.basescan.org/api",
       name: "Basescan",
       url: "https://sepolia.basescan.org",
-      apiUrl: "https://api-sepolia.basescan.org/api",
     },
   ],
+  id: 84532,
+  name: "Base Sepolia",
+  nativeCurrency: { decimals: 18, name: "Sepolia Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/base.ts b/packages/thirdweb/src/chains/chain-definitions/base.ts
index bbda5123ef2..9b45acd3bda 100644
--- a/packages/thirdweb/src/chains/chain-definitions/base.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/base.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const base = /* @__PURE__ */ defineChain({
-  id: 8453,
-  name: "Base",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api.basescan.org/api",
       name: "Basescan",
       url: "https://basescan.org",
-      apiUrl: "https://api.basescan.org/api",
     },
   ],
+  id: 8453,
+  name: "Base",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/berachain-bepolia.ts b/packages/thirdweb/src/chains/chain-definitions/berachain-bepolia.ts
index 5d6a8fd83ef..728b73dbaa7 100644
--- a/packages/thirdweb/src/chains/chain-definitions/berachain-bepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/berachain-bepolia.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const berachainBepolia = /* @__PURE__ */ defineChain({
-  id: 80069,
-  name: "Berachain Bepolia",
-  nativeCurrency: { name: "BERA", symbol: "BERA", decimals: 18 },
   blockExplorers: [
     {
       name: "beratrail",
       url: "https://bepolia.beratrail.io/",
     },
   ],
+  id: 80069,
+  name: "Berachain Bepolia",
+  nativeCurrency: { decimals: 18, name: "BERA", symbol: "BERA" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/berachain.ts b/packages/thirdweb/src/chains/chain-definitions/berachain.ts
index b86af27b83f..b53238858c7 100644
--- a/packages/thirdweb/src/chains/chain-definitions/berachain.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/berachain.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const berachain = /* @__PURE__ */ defineChain({
-  id: 80094,
-  name: "Berachain",
-  nativeCurrency: { name: "BERA", symbol: "BERA", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api.berascan.com/api",
       name: "berascan",
       url: "https://berascan.com/",
-      apiUrl: "https://api.berascan.com/api",
     },
   ],
+  id: 80094,
+  name: "Berachain",
+  nativeCurrency: { decimals: 18, name: "BERA", symbol: "BERA" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/blast-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/blast-sepolia.ts
index ea2c44c7338..d535c1d955f 100644
--- a/packages/thirdweb/src/chains/chain-definitions/blast-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/blast-sepolia.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const blastSepolia = /* @__PURE__ */ defineChain({
-  id: 168587773,
-  name: "Blast Sepolia Testnet",
-  nativeCurrency: { name: "Sepolia Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Blast Sepolia Explorer",
       url: "https://testnet.blastscan.io",
     },
   ],
+  id: 168587773,
+  name: "Blast Sepolia Testnet",
+  nativeCurrency: { decimals: 18, name: "Sepolia Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/blast.ts b/packages/thirdweb/src/chains/chain-definitions/blast.ts
index ea520e31b51..001baa4b2f9 100644
--- a/packages/thirdweb/src/chains/chain-definitions/blast.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/blast.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const blast = /* @__PURE__ */ defineChain({
-  id: 81457,
-  name: "Blast",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api.blastscan.io/api",
       name: "Blastscan",
       url: "https://blastscan.io",
-      apiUrl: "https://api.blastscan.io/api",
     },
   ],
+  id: 81457,
+  name: "Blast",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/bsc-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/bsc-testnet.ts
index 2727bebcf88..e088398ac23 100644
--- a/packages/thirdweb/src/chains/chain-definitions/bsc-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/bsc-testnet.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const bscTestnet = /* @__PURE__ */ defineChain({
-  id: 97,
-  name: "BNB Smart Chain Testnet",
-  nativeCurrency: {
-    name: "BNB Chain Native Token",
-    symbol: "tBNB",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "bscscan-testnet",
       url: "https://testnet.bscscan.com",
     },
   ],
+  id: 97,
+  name: "BNB Smart Chain Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "BNB Chain Native Token",
+    symbol: "tBNB",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/bsc.ts b/packages/thirdweb/src/chains/chain-definitions/bsc.ts
index ecbae3c33dd..b7f6e709e17 100644
--- a/packages/thirdweb/src/chains/chain-definitions/bsc.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/bsc.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const bsc = /* @__PURE__ */ defineChain({
-  id: 56,
-  name: "BNB Smart Chain Mainnet",
-  nativeCurrency: {
-    name: "BNB Chain Native Token",
-    symbol: "BNB",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "bscscan",
       url: "https://bscscan.com",
     },
   ],
+  id: 56,
+  name: "BNB Smart Chain Mainnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "BNB Chain Native Token",
+    symbol: "BNB",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/celo-alfajores-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/celo-alfajores-testnet.ts
index daca54d505f..776e91b5c60 100644
--- a/packages/thirdweb/src/chains/chain-definitions/celo-alfajores-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/celo-alfajores-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const celoAlfajoresTestnet = /* @__PURE__ */ defineChain({
-  id: 44787,
-  name: "Celo Alfajores Testnet",
-  nativeCurrency: { name: "CELO", symbol: "CELO", decimals: 18 },
   blockExplorers: [
     {
       name: "Alfajoresscan",
       url: "https://alfajores.celoscan.io",
     },
   ],
+  id: 44787,
+  name: "Celo Alfajores Testnet",
+  nativeCurrency: { decimals: 18, name: "CELO", symbol: "CELO" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/celo.ts b/packages/thirdweb/src/chains/chain-definitions/celo.ts
index 47bacb76157..36d01fdf5a4 100644
--- a/packages/thirdweb/src/chains/chain-definitions/celo.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/celo.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const celo = /* @__PURE__ */ defineChain({
-  id: 42220,
-  name: "Celo Mainnet",
-  nativeCurrency: {
-    name: "CELO",
-    symbol: "CELO",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "blockscout",
       url: "https://explorer.celo.org",
     },
   ],
+  id: 42220,
+  name: "Celo Mainnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "CELO",
+    symbol: "CELO",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/cronos.ts b/packages/thirdweb/src/chains/chain-definitions/cronos.ts
index 791d8477089..1cbf8451150 100644
--- a/packages/thirdweb/src/chains/chain-definitions/cronos.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/cronos.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const cronos = /* @__PURE__ */ defineChain({
-  id: 25,
-  name: "Cronos Mainnet",
-  nativeCurrency: {
-    name: "Cronos",
-    symbol: "CRO",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Cronos Explorer",
       url: "https://explorer.cronos.org",
     },
   ],
+  id: 25,
+  name: "Cronos Mainnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Cronos",
+    symbol: "CRO",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/degen.ts b/packages/thirdweb/src/chains/chain-definitions/degen.ts
index f23424e3333..d2f2a4cc94f 100644
--- a/packages/thirdweb/src/chains/chain-definitions/degen.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/degen.ts
@@ -4,12 +4,12 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const degen = /* @__PURE__ */ defineChain({
+  blockExplorers: [],
   id: 666666666,
   name: "Degen Chain",
   nativeCurrency: {
+    decimals: 18,
     name: "DEGEN",
     symbol: "DEGEN",
-    decimals: 18,
   },
-  blockExplorers: [],
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/ethereum.ts b/packages/thirdweb/src/chains/chain-definitions/ethereum.ts
index 55a17e5fa35..befaeed170b 100644
--- a/packages/thirdweb/src/chains/chain-definitions/ethereum.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/ethereum.ts
@@ -4,19 +4,19 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const ethereum = /* @__PURE__ */ defineChain({
-  id: 1,
-  name: "Ethereum",
-  nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Etherscan",
       url: "https://etherscan.io",
     },
   ],
+  id: 1,
+  name: "Ethereum",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
 });
 
 /**
diff --git a/packages/thirdweb/src/chains/chain-definitions/fantom-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/fantom-testnet.ts
index d3fcc46dc1f..0ae1dc64a12 100644
--- a/packages/thirdweb/src/chains/chain-definitions/fantom-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/fantom-testnet.ts
@@ -4,18 +4,18 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const fantomTestnet = /* @__PURE__ */ defineChain({
-  id: 4002,
-  name: "Fantom Testnet",
-  nativeCurrency: {
-    name: "Fantom",
-    symbol: "FTM",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "ftmscan",
       url: "https://testnet.ftmscan.com",
     },
   ],
+  id: 4002,
+  name: "Fantom Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Fantom",
+    symbol: "FTM",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/fantom.ts b/packages/thirdweb/src/chains/chain-definitions/fantom.ts
index 9583a66e4e1..bc9d10c6a07 100644
--- a/packages/thirdweb/src/chains/chain-definitions/fantom.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/fantom.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const fantom = /* @__PURE__ */ defineChain({
-  id: 250,
-  name: "Fantom Opera",
-  nativeCurrency: {
-    name: "Fantom",
-    symbol: "FTM",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "ftmscan",
       url: "https://ftmscan.com",
     },
   ],
+  id: 250,
+  name: "Fantom Opera",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Fantom",
+    symbol: "FTM",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/frame-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/frame-testnet.ts
index 11cb1c0d12b..1ca51e160e7 100644
--- a/packages/thirdweb/src/chains/chain-definitions/frame-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/frame-testnet.ts
@@ -4,18 +4,18 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const frameTestnet = /*@__PURE__*/ defineChain({
-  id: 68840142,
-  name: "Frame Testnet",
-  nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Frame Testnet Explorer",
       url: "https://explorer.testnet.frame.xyz",
     },
   ],
+  id: 68840142,
+  name: "Frame Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/fraxtal-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/fraxtal-testnet.ts
index 838c8ee49db..cdf9f44f11a 100644
--- a/packages/thirdweb/src/chains/chain-definitions/fraxtal-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/fraxtal-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const fraxtalTestnet = /* @__PURE__ */ defineChain({
-  id: 2522,
-  name: "Fraxtal Testnet",
-  nativeCurrency: { name: "Frax Ether", symbol: "frxETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Fraxscan",
       url: "https://holesky.fraxscan.com/",
     },
   ],
+  id: 2522,
+  name: "Fraxtal Testnet",
+  nativeCurrency: { decimals: 18, name: "Frax Ether", symbol: "frxETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/gnosis-chiado-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/gnosis-chiado-testnet.ts
index 2b53b653b70..9eb34a416a6 100644
--- a/packages/thirdweb/src/chains/chain-definitions/gnosis-chiado-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/gnosis-chiado-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const gnosisChiadoTestnet = /* @__PURE__ */ defineChain({
-  id: 10200,
-  name: "Gnosis Chiado Testnet",
-  nativeCurrency: { name: "xDAI", symbol: "XDAI", decimals: 18 },
   blockExplorers: [
     {
       name: "blockscout",
       url: "https://gnosis-chiado.blockscout.com",
     },
   ],
+  id: 10200,
+  name: "Gnosis Chiado Testnet",
+  nativeCurrency: { decimals: 18, name: "xDAI", symbol: "XDAI" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/gnosis.ts b/packages/thirdweb/src/chains/chain-definitions/gnosis.ts
index d2649427735..750482ca2fb 100644
--- a/packages/thirdweb/src/chains/chain-definitions/gnosis.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/gnosis.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const gnosis = /* @__PURE__ */ defineChain({
-  id: 100,
-  name: "Gnosis",
-  nativeCurrency: { name: "xDAI", symbol: "XDAI", decimals: 18 },
   blockExplorers: [
     {
       name: "blockscout",
       url: "https://gnosis.blockscout.com",
     },
   ],
+  id: 100,
+  name: "Gnosis",
+  nativeCurrency: { decimals: 18, name: "xDAI", symbol: "XDAI" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/god-woken-testnet-v1.ts b/packages/thirdweb/src/chains/chain-definitions/god-woken-testnet-v1.ts
index 65e067ab8ef..d7e63e2836b 100644
--- a/packages/thirdweb/src/chains/chain-definitions/god-woken-testnet-v1.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/god-woken-testnet-v1.ts
@@ -4,18 +4,18 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const godWokenTestnetV1 = /*@__PURE__*/ defineChain({
-  id: 71401,
-  name: "Godwoken Testnet v1",
-  nativeCurrency: {
-    name: "pCKB",
-    symbol: "pCKB",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "GWScan Block Explorer",
       url: "https://v1.testnet.gwscan.com",
     },
   ],
+  id: 71401,
+  name: "Godwoken Testnet v1",
+  nativeCurrency: {
+    decimals: 18,
+    name: "pCKB",
+    symbol: "pCKB",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/god-woken.ts b/packages/thirdweb/src/chains/chain-definitions/god-woken.ts
index 2ac09e277a4..967db3b4a20 100644
--- a/packages/thirdweb/src/chains/chain-definitions/god-woken.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/god-woken.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const godWoken = /* @__PURE__ */ defineChain({
-  id: 71402,
-  name: "Godwoken Mainnet",
-  nativeCurrency: {
-    name: "pCKB",
-    symbol: "pCKB",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "GWScan Block Explorer",
       url: "https://v1.gwscan.com",
     },
   ],
+  id: 71402,
+  name: "Godwoken Mainnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "pCKB",
+    symbol: "pCKB",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/hardhat.ts b/packages/thirdweb/src/chains/chain-definitions/hardhat.ts
index 17d25d4f029..b3926523b66 100644
--- a/packages/thirdweb/src/chains/chain-definitions/hardhat.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/hardhat.ts
@@ -6,11 +6,11 @@ import { defineChain } from "../utils.js";
 export const hardhat = /* @__PURE__ */ defineChain({
   id: 31337,
   name: "Hardhat",
-  rpc: "http://127.0.0.1:8545",
-  testnet: true,
   nativeCurrency: {
+    decimals: 18,
     name: "Hardhat Ether",
     symbol: "ETH",
-    decimals: 18,
   },
+  rpc: "http://127.0.0.1:8545",
+  testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/hokum-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/hokum-testnet.ts
index 10dd72ad9ee..643a5e0f3e2 100644
--- a/packages/thirdweb/src/chains/chain-definitions/hokum-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/hokum-testnet.ts
@@ -4,18 +4,18 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const hokumTestnet = /*@__PURE__*/ defineChain({
-  id: 20482050,
-  name: "Hokum Testnet",
-  nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Hokum Explorer",
       url: "https://testnet-explorer.hokum.gg",
     },
   ],
+  id: 20482050,
+  name: "Hokum Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/linea-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/linea-sepolia.ts
index 51b18cad3cc..01d5e07cf35 100644
--- a/packages/thirdweb/src/chains/chain-definitions/linea-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/linea-sepolia.ts
@@ -4,15 +4,15 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const lineaSepolia = /* @__PURE__ */ defineChain({
-  id: 59141,
-  name: "Linea Sepolia",
-  nativeCurrency: { name: "Sepolia Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api-sepolia.lineascan.build/api",
       name: "LineaScan",
       url: "https://sepolia.lineascan.build",
-      apiUrl: "https://api-sepolia.lineascan.build/api",
     },
   ],
+  id: 59141,
+  name: "Linea Sepolia",
+  nativeCurrency: { decimals: 18, name: "Sepolia Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/linea.ts b/packages/thirdweb/src/chains/chain-definitions/linea.ts
index 7adaa609fbf..954ddb899be 100644
--- a/packages/thirdweb/src/chains/chain-definitions/linea.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/linea.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const linea = /* @__PURE__ */ defineChain({
-  id: 59144,
-  name: "Linea",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api.lineascan.build/api",
       name: "LineaScan",
       url: "https://lineascan.build",
-      apiUrl: "https://api.lineascan.build/api",
     },
   ],
+  id: 59144,
+  name: "Linea",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/localhost.ts b/packages/thirdweb/src/chains/chain-definitions/localhost.ts
index 061eec49e5a..27ddd2e7a4e 100644
--- a/packages/thirdweb/src/chains/chain-definitions/localhost.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/localhost.ts
@@ -6,11 +6,11 @@ import { defineChain } from "../utils.js";
 export const localhost = /* @__PURE__ */ defineChain({
   id: 1337,
   name: "Localhost",
-  rpc: "http://127.0.0.1:8545",
-  testnet: true,
   nativeCurrency: {
+    decimals: 18,
     name: "Ether",
     symbol: "ETH",
-    decimals: 18,
   },
+  rpc: "http://127.0.0.1:8545",
+  testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/loot.ts b/packages/thirdweb/src/chains/chain-definitions/loot.ts
index fcff70d5ef1..36e8085c9c5 100644
--- a/packages/thirdweb/src/chains/chain-definitions/loot.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/loot.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const loot = /* @__PURE__ */ defineChain({
-  id: 5151706,
-  name: "Loot Chain Mainnet",
-  nativeCurrency: {
-    name: "AGLD",
-    symbol: "AGLD",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Explorer",
       url: "https://explorer.lootchain.com/",
     },
   ],
+  id: 5151706,
+  name: "Loot Chain Mainnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "AGLD",
+    symbol: "AGLD",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/manta-pacific-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/manta-pacific-testnet.ts
index 1b065a6adca..9ed574f9ef7 100644
--- a/packages/thirdweb/src/chains/chain-definitions/manta-pacific-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/manta-pacific-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const mantaPacificTestnet = /* @__PURE__ */ defineChain({
-  id: 3441005,
-  name: "Manta Pacific Testnet",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "manta-testnet Explorer",
       url: "https://manta-testnet.calderaexplorer.xyz",
     },
   ],
+  id: 3441005,
+  name: "Manta Pacific Testnet",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/manta-pacific.ts b/packages/thirdweb/src/chains/chain-definitions/manta-pacific.ts
index bfee6209029..cf2e354d96c 100644
--- a/packages/thirdweb/src/chains/chain-definitions/manta-pacific.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/manta-pacific.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const mantaPacific = /* @__PURE__ */ defineChain({
-  id: 169,
-  name: "Manta Pacific Mainnet",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "manta-pacific Explorer",
       url: "https://pacific-explorer.manta.network",
     },
   ],
+  id: 169,
+  name: "Manta Pacific Mainnet",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/metal-l2-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/metal-l2-testnet.ts
index 3a5ffc5fccd..c8dbb7f4b0a 100644
--- a/packages/thirdweb/src/chains/chain-definitions/metal-l2-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/metal-l2-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const metalL2Testnet = /* @__PURE__ */ defineChain({
-  id: 1740,
-  name: "Metal L2 Testnet",
-  nativeCurrency: { name: "ETH", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Blockscout",
       url: "https://testnet.explorer.metall2.com",
     },
   ],
+  id: 1740,
+  name: "Metal L2 Testnet",
+  nativeCurrency: { decimals: 18, name: "ETH", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/mode-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/mode-testnet.ts
index 1ab69c57882..0dd5b6da702 100644
--- a/packages/thirdweb/src/chains/chain-definitions/mode-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/mode-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const modeTestnet = /* @__PURE__ */ defineChain({
-  id: 919,
-  name: "Mode Testnet",
-  nativeCurrency: { name: "Sepolia Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Modescout",
       url: "https://sepolia.explorer.mode.network/",
     },
   ],
+  id: 919,
+  name: "Mode Testnet",
+  nativeCurrency: { decimals: 18, name: "Sepolia Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/mode.ts b/packages/thirdweb/src/chains/chain-definitions/mode.ts
index 76940840fb7..664d0f96575 100644
--- a/packages/thirdweb/src/chains/chain-definitions/mode.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/mode.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const mode = /* @__PURE__ */ defineChain({
-  id: 919,
-  name: "Mode",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Modescout",
       url: "https://explorer.mode.network/",
     },
   ],
+  id: 919,
+  name: "Mode",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/monad-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/monad-testnet.ts
index d1a845090a5..c36601450e0 100644
--- a/packages/thirdweb/src/chains/chain-definitions/monad-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/monad-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const monadTestnet = /*@__PURE__*/ defineChain({
-  id: 10143,
-  name: "Monad Testnet",
-  nativeCurrency: { name: "Mon", symbol: "MON", decimals: 18 },
   blockExplorers: [
     {
       name: "Monad Explorer",
       url: "https://testnet.monadexplorer.com/",
     },
   ],
+  id: 10143,
+  name: "Monad Testnet",
+  nativeCurrency: { decimals: 18, name: "Mon", symbol: "MON" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/moonbeam.ts b/packages/thirdweb/src/chains/chain-definitions/moonbeam.ts
index 1e206e637c7..f583f616259 100644
--- a/packages/thirdweb/src/chains/chain-definitions/moonbeam.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/moonbeam.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const moonbeam = /* @__PURE__ */ defineChain({
-  id: 1284,
-  name: "Moonbeam",
-  nativeCurrency: {
-    name: "Glimmer",
-    symbol: "GLMR",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "moonscan",
       url: "https://moonbeam.moonscan.io",
     },
   ],
+  id: 1284,
+  name: "Moonbeam",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Glimmer",
+    symbol: "GLMR",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/optimism-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/optimism-sepolia.ts
index 59927967d5c..4695c50a29a 100644
--- a/packages/thirdweb/src/chains/chain-definitions/optimism-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/optimism-sepolia.ts
@@ -4,15 +4,15 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const optimismSepolia = /* @__PURE__ */ defineChain({
-  id: 11155420,
-  name: "OP Sepolia",
-  nativeCurrency: { name: "Sepolia Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://optimism-sepolia.blockscout.com/api",
       name: "Blockscout",
       url: "https://optimism-sepolia.blockscout.com",
-      apiUrl: "https://optimism-sepolia.blockscout.com/api",
     },
   ],
+  id: 11155420,
+  name: "OP Sepolia",
+  nativeCurrency: { decimals: 18, name: "Sepolia Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/optimism.ts b/packages/thirdweb/src/chains/chain-definitions/optimism.ts
index 900e6498d43..18f180cfaf7 100644
--- a/packages/thirdweb/src/chains/chain-definitions/optimism.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/optimism.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const optimism = /* @__PURE__ */ defineChain({
-  id: 10,
-  name: "OP Mainnet",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api-optimistic.etherscan.io",
       name: "Optimism Explorer",
       url: "https://optimistic.etherscan.io",
-      apiUrl: "https://api-optimistic.etherscan.io",
     },
   ],
+  id: 10,
+  name: "OP Mainnet",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/palm-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/palm-testnet.ts
index 005d475f68d..030f7c58860 100644
--- a/packages/thirdweb/src/chains/chain-definitions/palm-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/palm-testnet.ts
@@ -4,18 +4,18 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const palmTestnet = /* @__PURE__ */ defineChain({
-  id: 11297108099,
-  name: "Palm Testnet",
-  nativeCurrency: {
-    name: "PALM",
-    symbol: "PALM",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Chainlens",
       url: "https://testnet.palm.chainlens.com",
     },
   ],
+  id: 11297108099,
+  name: "Palm Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "PALM",
+    symbol: "PALM",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/palm.ts b/packages/thirdweb/src/chains/chain-definitions/palm.ts
index 39200213ecf..87dbf900a70 100644
--- a/packages/thirdweb/src/chains/chain-definitions/palm.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/palm.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const palm = /* @__PURE__ */ defineChain({
-  id: 11297108109,
-  name: "Palm",
-  nativeCurrency: {
-    name: "PALM",
-    symbol: "PALM",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Chainlens",
       url: "https://palm.chainlens.com",
     },
   ],
+  id: 11297108109,
+  name: "Palm",
+  nativeCurrency: {
+    decimals: 18,
+    name: "PALM",
+    symbol: "PALM",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/polygon-amoy.ts b/packages/thirdweb/src/chains/chain-definitions/polygon-amoy.ts
index cf0017b4ecf..af953317599 100644
--- a/packages/thirdweb/src/chains/chain-definitions/polygon-amoy.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/polygon-amoy.ts
@@ -4,15 +4,15 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const polygonAmoy = /*@__PURE__*/ defineChain({
-  id: 80002,
-  name: "Polygon Amoy",
-  nativeCurrency: { name: "MATIC", symbol: "MATIC", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api-amoy.polygonscan.com/api",
       name: "PolygonScan",
       url: "https://amoy.polygonscan.com",
-      apiUrl: "https://api-amoy.polygonscan.com/api",
     },
   ],
+  id: 80002,
+  name: "Polygon Amoy",
+  nativeCurrency: { decimals: 18, name: "MATIC", symbol: "MATIC" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/polygon-mumbai.ts b/packages/thirdweb/src/chains/chain-definitions/polygon-mumbai.ts
index 793d898ed2c..706cabc90c6 100644
--- a/packages/thirdweb/src/chains/chain-definitions/polygon-mumbai.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/polygon-mumbai.ts
@@ -4,16 +4,16 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const polygonMumbai = /*@__PURE__*/ defineChain({
-  id: 80001,
-  name: "Polygon Mumbai",
-  nativeCurrency: { name: "MATIC", symbol: "MATIC", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://mumbai.polygonscan.com/api",
       name: "PolygonScan",
       url: "https://mumbai.polygonscan.com",
-      apiUrl: "https://mumbai.polygonscan.com/api",
     },
   ],
+  id: 80001,
+  name: "Polygon Mumbai",
+  nativeCurrency: { decimals: 18, name: "MATIC", symbol: "MATIC" },
   testnet: true,
 });
 
diff --git a/packages/thirdweb/src/chains/chain-definitions/polygon-zkevm-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/polygon-zkevm-testnet.ts
index d26d9570955..d6a6610a02b 100644
--- a/packages/thirdweb/src/chains/chain-definitions/polygon-zkevm-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/polygon-zkevm-testnet.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const polygonZkEvmTestnet = /*@__PURE__*/ defineChain({
-  id: 1442,
-  name: "Polygon zkEVM Testnet",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Polygon zkEVM explorer",
       url: "https://explorer.public.zkevm-test.net",
     },
   ],
+  id: 1442,
+  name: "Polygon zkEVM Testnet",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/polygon-zkevm.ts b/packages/thirdweb/src/chains/chain-definitions/polygon-zkevm.ts
index 8be1a49a580..c2f2fb7ae23 100644
--- a/packages/thirdweb/src/chains/chain-definitions/polygon-zkevm.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/polygon-zkevm.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const polygonZkEvm = /*@__PURE__*/ defineChain({
-  id: 1101,
-  name: "Polygon zkEVM",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "blockscout",
       url: "https://zkevm.polygonscan.com",
     },
   ],
+  id: 1101,
+  name: "Polygon zkEVM",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/polygon.ts b/packages/thirdweb/src/chains/chain-definitions/polygon.ts
index 6ad3213f93e..71b83a7863c 100644
--- a/packages/thirdweb/src/chains/chain-definitions/polygon.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/polygon.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const polygon = /*@__PURE__*/ defineChain({
-  id: 137,
-  name: "Polygon",
-  nativeCurrency: { name: "POL", symbol: "POL", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api.polygonscan.com/api",
       name: "PolygonScan",
       url: "https://polygonscan.com",
-      apiUrl: "https://api.polygonscan.com/api",
     },
   ],
+  id: 137,
+  name: "Polygon",
+  nativeCurrency: { decimals: 18, name: "POL", symbol: "POL" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/rari-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/rari-testnet.ts
index f61bffd0ccd..ac2e8cc8322 100644
--- a/packages/thirdweb/src/chains/chain-definitions/rari-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/rari-testnet.ts
@@ -4,18 +4,18 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const rariTestnet = /*@__PURE__*/ defineChain({
-  id: 1918988905,
-  name: "RARIchain Testnet",
-  nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "rarichain-testnet-explorer",
       url: "https://explorer.rarichain.org",
     },
   ],
+  id: 1918988905,
+  name: "RARIchain Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/rari.ts b/packages/thirdweb/src/chains/chain-definitions/rari.ts
index 9644f003827..417e38f8e1b 100644
--- a/packages/thirdweb/src/chains/chain-definitions/rari.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/rari.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const rari = /* @__PURE__ */ defineChain({
-  id: 1380012617,
-  name: "Rarichain",
-  nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "rarichain-explorer",
       url: "https://mainnet.explorer.rarichain.org",
     },
   ],
+  id: 1380012617,
+  name: "Rarichain",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/scroll-alpha-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/scroll-alpha-testnet.ts
index 69c392133cf..3681c52c0df 100644
--- a/packages/thirdweb/src/chains/chain-definitions/scroll-alpha-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/scroll-alpha-testnet.ts
@@ -4,18 +4,18 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const scrollAlphaTestnet = /*@__PURE__*/ defineChain({
-  id: 534353,
-  name: "Scroll Alpha Testnet",
-  nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Scroll Alpha Testnet Block Explorer",
       url: "https://alpha-blockscout.scroll.io",
     },
   ],
+  id: 534353,
+  name: "Scroll Alpha Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/scroll-sepolia-testnet.ts b/packages/thirdweb/src/chains/chain-definitions/scroll-sepolia-testnet.ts
index e3a3d168224..da13aa87141 100644
--- a/packages/thirdweb/src/chains/chain-definitions/scroll-sepolia-testnet.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/scroll-sepolia-testnet.ts
@@ -4,18 +4,18 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const scrollSepoliaTestnet = /*@__PURE__*/ defineChain({
-  id: 534353,
-  name: "Scroll Sepolia Testnet",
-  nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Scroll Sepolia Etherscan",
       url: "https://sepolia.scrollscan.com",
     },
   ],
+  id: 534353,
+  name: "Scroll Sepolia Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/scroll.ts b/packages/thirdweb/src/chains/chain-definitions/scroll.ts
index f83163b228d..a7b72621797 100644
--- a/packages/thirdweb/src/chains/chain-definitions/scroll.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/scroll.ts
@@ -4,17 +4,17 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const scroll = /*@__PURE__*/ defineChain({
-  id: 534352,
-  name: "Scroll",
-  nativeCurrency: {
-    name: "Ether",
-    symbol: "ETH",
-    decimals: 18,
-  },
   blockExplorers: [
     {
       name: "Scrollscan",
       url: "https://scrollscan.com",
     },
   ],
+  id: 534352,
+  name: "Scroll",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/sepolia.ts
index d83d0116f39..8cc9ec53125 100644
--- a/packages/thirdweb/src/chains/chain-definitions/sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/sepolia.ts
@@ -4,15 +4,15 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const sepolia = /*@__PURE__*/ defineChain({
-  id: 11155111,
-  name: "Sepolia",
-  nativeCurrency: { name: "Sepolia Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
+      apiUrl: "https://api-sepolia.etherscan.io/api",
       name: "Etherscan",
       url: "https://sepolia.etherscan.io",
-      apiUrl: "https://api-sepolia.etherscan.io/api",
     },
   ],
+  id: 11155111,
+  name: "Sepolia",
+  nativeCurrency: { decimals: 18, name: "Sepolia Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/soneium-minato.ts b/packages/thirdweb/src/chains/chain-definitions/soneium-minato.ts
index f3d9106d4c3..cebc9af1388 100644
--- a/packages/thirdweb/src/chains/chain-definitions/soneium-minato.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/soneium-minato.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const soneiumMinato = /* @__PURE__ */ defineChain({
-  id: 1946,
-  name: "Soneium Minato",
-  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   blockExplorers: [
     {
       name: "Minato Explorer",
       url: "https://explorer-testnet.soneium.org/",
     },
   ],
+  id: 1946,
+  name: "Soneium Minato",
+  nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/treasure.ts b/packages/thirdweb/src/chains/chain-definitions/treasure.ts
index d6060483b96..63b1d38c987 100644
--- a/packages/thirdweb/src/chains/chain-definitions/treasure.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/treasure.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const treasure = /* @__PURE__ */ defineChain({
-  id: 61166,
-  name: "Treasure",
-  nativeCurrency: { name: "MAGIC", symbol: "MAGIC", decimals: 18 },
   blockExplorers: [
     {
       name: "Treasure Block Explorer",
       url: "https://treasurescan.io",
     },
   ],
+  id: 61166,
+  name: "Treasure",
+  nativeCurrency: { decimals: 18, name: "MAGIC", symbol: "MAGIC" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/treasureTopaz.ts b/packages/thirdweb/src/chains/chain-definitions/treasureTopaz.ts
index 06a3645a6dd..60313bc4490 100644
--- a/packages/thirdweb/src/chains/chain-definitions/treasureTopaz.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/treasureTopaz.ts
@@ -4,13 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const treasureTopaz = /* @__PURE__ */ defineChain({
-  id: 978658,
-  name: "Treasure Topaz",
-  nativeCurrency: { name: "MAGIC", symbol: "MAGIC", decimals: 18 },
   blockExplorers: [
     {
       name: "Treasure Topaz Block Explorer",
       url: "https://topaz.treasurescan.io",
     },
   ],
+  id: 978658,
+  name: "Treasure Topaz",
+  nativeCurrency: { decimals: 18, name: "MAGIC", symbol: "MAGIC" },
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/xai-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/xai-sepolia.ts
index f0c16f34375..6594cb66520 100644
--- a/packages/thirdweb/src/chains/chain-definitions/xai-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/xai-sepolia.ts
@@ -4,14 +4,14 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const xaiSepolia = /* @__PURE__ */ defineChain({
-  id: 37714555429,
-  name: "Xai Sepolia",
-  nativeCurrency: { name: "sXAI", symbol: "sXAI", decimals: 18 },
   blockExplorers: [
     {
       name: "Blockscout",
       url: "https://testnet-explorer-v2.xai-chain.net",
     },
   ],
+  id: 37714555429,
+  name: "Xai Sepolia",
+  nativeCurrency: { decimals: 18, name: "sXAI", symbol: "sXAI" },
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/xai.ts b/packages/thirdweb/src/chains/chain-definitions/xai.ts
index a32c59cd0fd..577bd86bbb7 100644
--- a/packages/thirdweb/src/chains/chain-definitions/xai.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/xai.ts
@@ -4,6 +4,12 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const xai = /*@__PURE__*/ defineChain({
+  blockExplorers: [
+    {
+      name: "Blockscout",
+      url: "https://explorer.xai-chain.net",
+    },
+  ],
   id: 660279,
   name: "Xai Mainnet",
   nativeCurrency: {
@@ -11,10 +17,4 @@ export const xai = /*@__PURE__*/ defineChain({
     name: "XAI token",
     symbol: "XAI",
   },
-  blockExplorers: [
-    {
-      name: "Blockscout",
-      url: "https://explorer.xai-chain.net",
-    },
-  ],
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/zk-candy-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/zk-candy-sepolia.ts
index 054af3dd104..9eb8e106168 100644
--- a/packages/thirdweb/src/chains/chain-definitions/zk-candy-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/zk-candy-sepolia.ts
@@ -4,6 +4,12 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const zkCandySepolia = /*@__PURE__*/ defineChain({
+  blockExplorers: [
+    {
+      name: "zkCandy Block Explorer",
+      url: "https://sepolia.explorer.zkcandy.io",
+    },
+  ],
   id: 302,
   name: "zkCandy Sepolia Testnet",
   nativeCurrency: {
@@ -11,11 +17,5 @@ export const zkCandySepolia = /*@__PURE__*/ defineChain({
     name: "Ether",
     symbol: "ETH",
   },
-  blockExplorers: [
-    {
-      name: "zkCandy Block Explorer",
-      url: "https://sepolia.explorer.zkcandy.io",
-    },
-  ],
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/zksync-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/zksync-sepolia.ts
index effc59e262c..a7e13e29032 100644
--- a/packages/thirdweb/src/chains/chain-definitions/zksync-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/zksync-sepolia.ts
@@ -4,6 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const zkSyncSepolia = /*@__PURE__*/ defineChain({
+  blockExplorers: [
+    {
+      apiUrl: "https://block-explorer-api.sepolia.zksync.dev/api",
+      name: "zkSync Sepolia Block Explorer",
+      url: "https://sepolia.explorer.zksync.io",
+    },
+  ],
   id: 300,
   name: "ZkSync Sepolia",
   nativeCurrency: {
@@ -11,11 +18,4 @@ export const zkSyncSepolia = /*@__PURE__*/ defineChain({
     name: "Ether",
     symbol: "ETH",
   },
-  blockExplorers: [
-    {
-      name: "zkSync Sepolia Block Explorer",
-      url: "https://sepolia.explorer.zksync.io",
-      apiUrl: "https://block-explorer-api.sepolia.zksync.dev/api",
-    },
-  ],
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/zksync.ts b/packages/thirdweb/src/chains/chain-definitions/zksync.ts
index 3781d835661..992da55a90a 100644
--- a/packages/thirdweb/src/chains/chain-definitions/zksync.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/zksync.ts
@@ -4,6 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const zkSync = /*@__PURE__*/ defineChain({
+  blockExplorers: [
+    {
+      apiUrl: "https://block-explorer-api.zksync.dev/api",
+      name: "zkSync Era Block Explorer",
+      url: "https://explorer.zksync.io",
+    },
+  ],
   id: 324,
   name: "ZkSync Era",
   nativeCurrency: {
@@ -11,11 +18,4 @@ export const zkSync = /*@__PURE__*/ defineChain({
     name: "Ether",
     symbol: "ETH",
   },
-  blockExplorers: [
-    {
-      name: "zkSync Era Block Explorer",
-      url: "https://explorer.zksync.io",
-      apiUrl: "https://block-explorer-api.zksync.dev/api",
-    },
-  ],
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/zora-sepolia.ts b/packages/thirdweb/src/chains/chain-definitions/zora-sepolia.ts
index 51bc5f8a43d..94bf7af2fa5 100644
--- a/packages/thirdweb/src/chains/chain-definitions/zora-sepolia.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/zora-sepolia.ts
@@ -4,6 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const zoraSepolia = /*@__PURE__*/ defineChain({
+  blockExplorers: [
+    {
+      apiUrl: "https://sepolia.explorer.zora.energy/api",
+      name: "Zora Sepolia Explorer",
+      url: "https://sepolia.explorer.zora.energy/",
+    },
+  ],
   id: 999999999,
   name: "Zora Sepolia",
 
@@ -12,12 +19,5 @@ export const zoraSepolia = /*@__PURE__*/ defineChain({
     name: "Zora Sepolia",
     symbol: "ETH",
   },
-  blockExplorers: [
-    {
-      name: "Zora Sepolia Explorer",
-      url: "https://sepolia.explorer.zora.energy/",
-      apiUrl: "https://sepolia.explorer.zora.energy/api",
-    },
-  ],
   testnet: true,
 });
diff --git a/packages/thirdweb/src/chains/chain-definitions/zora.ts b/packages/thirdweb/src/chains/chain-definitions/zora.ts
index cfecaff975a..b61f78c7bfb 100644
--- a/packages/thirdweb/src/chains/chain-definitions/zora.ts
+++ b/packages/thirdweb/src/chains/chain-definitions/zora.ts
@@ -4,6 +4,13 @@ import { defineChain } from "../utils.js";
  * @chain
  */
 export const zora = /*@__PURE__*/ defineChain({
+  blockExplorers: [
+    {
+      apiUrl: "https://explorer.zora.energy/api",
+      name: "Explorer",
+      url: "https://explorer.zora.energy",
+    },
+  ],
   id: 7777777,
   name: "Zora",
   nativeCurrency: {
@@ -11,11 +18,4 @@ export const zora = /*@__PURE__*/ defineChain({
     name: "Ether",
     symbol: "ETH",
   },
-  blockExplorers: [
-    {
-      name: "Explorer",
-      url: "https://explorer.zora.energy",
-      apiUrl: "https://explorer.zora.energy/api",
-    },
-  ],
 });
diff --git a/packages/thirdweb/src/chains/constants.ts b/packages/thirdweb/src/chains/constants.ts
index b6e8756ec82..5f21e7c3f53 100644
--- a/packages/thirdweb/src/chains/constants.ts
+++ b/packages/thirdweb/src/chains/constants.ts
@@ -1,9 +1,9 @@
-import { baseSepolia } from "./chain-definitions/base-sepolia.js";
 import { base } from "./chain-definitions/base.js";
-import { optimismSepolia } from "./chain-definitions/optimism-sepolia.js";
+import { baseSepolia } from "./chain-definitions/base-sepolia.js";
 import { optimism } from "./chain-definitions/optimism.js";
-import { zoraSepolia } from "./chain-definitions/zora-sepolia.js";
+import { optimismSepolia } from "./chain-definitions/optimism-sepolia.js";
 import { zora } from "./chain-definitions/zora.js";
+import { zoraSepolia } from "./chain-definitions/zora-sepolia.js";
 import type { Chain } from "./types.js";
 
 const opChains = [
diff --git a/packages/thirdweb/src/chains/utils.test.ts b/packages/thirdweb/src/chains/utils.test.ts
index f8f36db1eb0..6844114ef02 100644
--- a/packages/thirdweb/src/chains/utils.test.ts
+++ b/packages/thirdweb/src/chains/utils.test.ts
@@ -1,4 +1,6 @@
+/** biome-ignore-all lint/suspicious/noTemplateCurlyInString: expected here */
 import { defineChain as viemChain } from "viem";
+import { base } from "viem/chains";
 import { describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../test/src/chains.js";
 import { TEST_CLIENT } from "../../test/src/test-clients.js";
@@ -10,8 +12,6 @@ import { privateKeyToAccount } from "../wallets/private-key.js";
 import { avalanche } from "./chain-definitions/avalanche.js";
 import { ethereum } from "./chain-definitions/ethereum.js";
 import type { ChainMetadata, LegacyChain } from "./types.js";
-
-import { base } from "viem/chains";
 import {
   CUSTOM_CHAIN_MAP,
   cacheChains,
@@ -35,8 +35,8 @@ const legacyChain: LegacyChain = {
   explorers: [
     {
       name: "etherscan",
-      url: "https://etherscan.io",
       standard: "EIP3091",
+      url: "https://etherscan.io",
     },
   ],
   faucets: [],
@@ -49,17 +49,17 @@ const legacyChain: LegacyChain = {
     },
   ],
   icon: {
+    format: "png",
+    height: 512,
     url: "ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/ethereum/512.png",
     width: 512,
-    height: 512,
-    format: "png",
   },
   infoURL: "https://ethereum.org",
   name: "Ethereum Mainnet",
   nativeCurrency: {
+    decimals: 18,
     name: "Ether",
     symbol: "ETH",
-    decimals: 18,
   },
   networkId: 1,
   redFlags: [],
@@ -73,6 +73,9 @@ const legacyChain: LegacyChain = {
 describe("defineChain", () => {
   it("should convert viem chain to thirdweb chain", () => {
     const zoraViem = viemChain({
+      blockExplorers: {
+        default: { name: "Explorer", url: "https://explorer.zora.energy" },
+      },
       id: 7777777,
       name: "Zora",
       nativeCurrency: {
@@ -86,9 +89,6 @@ describe("defineChain", () => {
           webSocket: ["wss://rpc.zora.energy"],
         },
       },
-      blockExplorers: {
-        default: { name: "Explorer", url: "https://explorer.zora.energy" },
-      },
     });
     const thirdwebViem = defineChain(zoraViem);
 
@@ -116,8 +116,8 @@ describe("defineChain", () => {
     getRpcClient({ chain: oldChain, client: TEST_CLIENT });
 
     const account = privateKeyToAccount({
-      privateKey: ANVIL_PKEY_A,
       client: TEST_CLIENT,
+      privateKey: ANVIL_PKEY_A,
     });
     const chain2 = defineChain({
       id: ANVIL_CHAIN.id,
@@ -126,15 +126,15 @@ describe("defineChain", () => {
     }); // this should be the rpc used
 
     const tx = prepareTransaction({
-      to: TEST_ACCOUNT_B.address,
-      value: 100n,
       chain: chain2,
       client: TEST_CLIENT,
+      to: TEST_ACCOUNT_B.address,
+      value: 100n,
     });
 
     const serializableTransaction = await toSerializableTransaction({
-      transaction: tx,
       from: account.address,
+      transaction: tx,
     });
 
     await account.sendTransaction(serializableTransaction);
@@ -191,48 +191,48 @@ describe("defineChain", () => {
 
   it("should convert LegacyChain", () => {
     expect(convertLegacyChain(legacyChain)).toStrictEqual({
-      id: 1,
-      name: "Ethereum Mainnet",
-      rpc: "https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
       blockExplorers: [
         {
+          apiUrl: "https://etherscan.io",
           name: "etherscan",
           url: "https://etherscan.io",
-          apiUrl: "https://etherscan.io",
         },
       ],
-      nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
       faucets: [],
       icon: {
+        format: "png",
+        height: 512,
         url: "ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/ethereum/512.png",
         width: 512,
-        height: 512,
-        format: "png",
       },
+      id: 1,
+      name: "Ethereum Mainnet",
+      nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
+      rpc: "https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
       testnet: undefined,
     });
   });
 
   it("`defineChain` should work with Legacy chain", () => {
     expect(defineChain(legacyChain)).toStrictEqual({
-      id: 1,
-      name: "Ethereum Mainnet",
-      rpc: "https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
       blockExplorers: [
         {
+          apiUrl: "https://etherscan.io",
           name: "etherscan",
           url: "https://etherscan.io",
-          apiUrl: "https://etherscan.io",
         },
       ],
-      nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
       faucets: [],
       icon: {
+        format: "png",
+        height: 512,
         url: "ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/ethereum/512.png",
         width: 512,
-        height: 512,
-        format: "png",
       },
+      id: 1,
+      name: "Ethereum Mainnet",
+      nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
+      rpc: "https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
       testnet: undefined,
     });
   });
@@ -248,37 +248,37 @@ describe("defineChain", () => {
 
   it("convertApiChainToChain should work", () => {
     const ethChain: ChainMetadata = {
-      chainId: 1,
-      name: "Ethereum Mainnet",
       chain: "ETH",
-      shortName: "eth",
-      icon: {
-        url: "ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/ethereum/512.png",
-        width: 512,
-        height: 512,
-        format: "png",
-      },
-      nativeCurrency: {
-        name: "Ether",
-        symbol: "ETH",
-        decimals: 18,
-      },
+      chainId: 1,
       ens: {
         registry: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
       },
       explorers: [
         {
           name: "etherscan",
-          url: "https://etherscan.io",
           standard: "EIP3091",
+          url: "https://etherscan.io",
         },
       ],
-      rpc: ["https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}"],
-      testnet: false,
+      icon: {
+        format: "png",
+        height: 512,
+        url: "ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/ethereum/512.png",
+        width: 512,
+      },
       infoURL: "https://ethereum.org",
-      slug: "ethereum",
+      name: "Ethereum Mainnet",
+      nativeCurrency: {
+        decimals: 18,
+        name: "Ether",
+        symbol: "ETH",
+      },
       networkId: 1,
+      rpc: ["https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}"],
+      shortName: "eth",
+      slug: "ethereum",
       stackType: "l1",
+      testnet: false,
     };
 
     expect(convertApiChainToChain(ethChain)).toStrictEqual({
@@ -311,8 +311,8 @@ describe("defineChain", () => {
   describe("getRpcUrlForChain", () => {
     it("should construct RPC URL using chain ID and client ID when chain is a number", () => {
       const options = {
-        client: { ...TEST_CLIENT, clientId: "test-client-id" },
         chain: 1,
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
       };
       const result = getRpcUrlForChain(options);
       expect(result).toBe("https://1.rpc.thirdweb.com/test-client-id");
@@ -320,11 +320,11 @@ describe("defineChain", () => {
 
     it("should return the custom RPC URL if provided", () => {
       const options = {
-        client: { ...TEST_CLIENT, clientId: "test-client-id" },
         chain: {
           id: 1,
           rpc: "https://custom-rpc.com",
         },
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
       };
       const result = getRpcUrlForChain(options);
       expect(result).toBe("https://custom-rpc.com");
@@ -332,11 +332,11 @@ describe("defineChain", () => {
 
     it("should add client ID to thirdweb RPC URL", () => {
       const options = {
-        client: { ...TEST_CLIENT, clientId: "test-client-id" },
         chain: {
           id: 1,
           rpc: "https://1.rpc.thirdweb.com",
         },
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
       };
       const result = getRpcUrlForChain(options);
       expect(result).toBe("https://1.rpc.thirdweb.com/test-client-id");
@@ -344,11 +344,11 @@ describe("defineChain", () => {
 
     it("should honor client ID passed directly in rpc field", () => {
       const options = {
-        client: { ...TEST_CLIENT, clientId: "test-client-id" },
         chain: {
           id: 1,
           rpc: "https://1.rpc.thirdweb.com/abc",
         },
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
       };
       const result = getRpcUrlForChain(options);
       expect(result).toBe("https://1.rpc.thirdweb.com/abc");
@@ -356,11 +356,11 @@ describe("defineChain", () => {
 
     it("should replace template string in rpc url", () => {
       const options = {
-        client: { ...TEST_CLIENT, clientId: "test-client-id" },
         chain: {
           id: 1,
           rpc: "https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
         },
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
       };
       const result = getRpcUrlForChain(options);
       expect(result).toBe("https://1.rpc.thirdweb.com/test-client-id");
@@ -368,11 +368,11 @@ describe("defineChain", () => {
 
     it("should return the RPC URL without modification if it's not a thirdweb URL", () => {
       const options = {
-        client: { ...TEST_CLIENT, clientId: "test-client-id" },
         chain: {
           id: 1,
           rpc: "https://custom-rpc.com",
         },
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
       };
       const result = getRpcUrlForChain(options);
       expect(result).toBe("https://custom-rpc.com");
diff --git a/packages/thirdweb/src/chains/utils.ts b/packages/thirdweb/src/chains/utils.ts
index dfb4fe9372a..d93cda57413 100644
--- a/packages/thirdweb/src/chains/utils.ts
+++ b/packages/thirdweb/src/chains/utils.ts
@@ -108,21 +108,21 @@ function isLegacyChain(
 export function convertLegacyChain(legacyChain: LegacyChain): Chain {
   const RPC_URL = getThirdwebDomains().rpc;
   return {
-    id: legacyChain.chainId,
-    name: legacyChain.name,
-    rpc: legacyChain.rpc[0] ?? `https://${legacyChain.chainId}.${RPC_URL}`,
     blockExplorers: legacyChain?.explorers?.map((explorer) => ({
+      apiUrl: explorer.url,
       name: explorer.name,
       url: explorer.url,
-      apiUrl: explorer.url,
     })),
+    faucets: legacyChain.faucets ? [...legacyChain.faucets] : undefined,
+    icon: legacyChain.icon,
+    id: legacyChain.chainId,
+    name: legacyChain.name,
     nativeCurrency: {
+      decimals: legacyChain.nativeCurrency.decimals,
       name: legacyChain.nativeCurrency.name,
       symbol: legacyChain.nativeCurrency.symbol,
-      decimals: legacyChain.nativeCurrency.decimals,
     },
-    faucets: legacyChain.faucets ? [...legacyChain.faucets] : undefined,
-    icon: legacyChain.icon,
+    rpc: legacyChain.rpc[0] ?? `https://${legacyChain.chainId}.${RPC_URL}`,
     testnet: legacyChain.testnet ? true : undefined,
   };
 }
@@ -139,24 +139,24 @@ function isViemChain(
 export function convertViemChain(viemChain: ViemChain): Chain {
   const RPC_URL = getThirdwebDomains().rpc;
   return {
-    id: viemChain.id,
-    name: viemChain.name,
-    nativeCurrency: {
-      name: viemChain.nativeCurrency.name,
-      symbol: viemChain.nativeCurrency.symbol,
-      decimals: viemChain.nativeCurrency.decimals,
-    },
-    rpc:
-      viemChain.rpcUrls.default.http[0] ?? `https://${viemChain.id}.${RPC_URL}`,
     blockExplorers: viemChain?.blockExplorers
       ? Object.values(viemChain?.blockExplorers).map((explorer) => {
           return {
+            apiUrl: explorer.apiUrl,
             name: explorer.name,
             url: explorer.url,
-            apiUrl: explorer.apiUrl,
           };
         })
       : [],
+    id: viemChain.id,
+    name: viemChain.name,
+    nativeCurrency: {
+      decimals: viemChain.nativeCurrency.decimals,
+      name: viemChain.nativeCurrency.name,
+      symbol: viemChain.nativeCurrency.symbol,
+    },
+    rpc:
+      viemChain.rpcUrls.default.http[0] ?? `https://${viemChain.id}.${RPC_URL}`,
     testnet: viemChain.testnet ? true : undefined,
   };
 }
@@ -390,20 +390,20 @@ export function getChainServices(chain: Chain): Promise<ChainService[]> {
  */
 export function convertApiChainToChain(apiChain: ChainMetadata): Chain {
   return {
-    id: apiChain.chainId,
-    name: apiChain.name,
-    rpc: apiChain.rpc[0] || "",
-    testnet: apiChain.testnet === true ? true : undefined,
-    nativeCurrency: apiChain.nativeCurrency,
     blockExplorers: apiChain.explorers?.map((explorer) => {
       return {
+        apiUrl: explorer.url,
         name: explorer.name,
         url: explorer.url,
-        apiUrl: explorer.url,
       };
     }),
     faucets: apiChain.faucets ? [...apiChain.faucets] : undefined,
     icon: apiChain.icon,
+    id: apiChain.chainId,
+    name: apiChain.name,
+    nativeCurrency: apiChain.nativeCurrency,
+    rpc: apiChain.rpc[0] || "",
+    testnet: apiChain.testnet === true ? true : undefined,
   };
 }
 
@@ -420,25 +420,25 @@ function createChainMetadata(
 
   return {
     ...data,
-    name: chain.name || data?.name || "",
+    chain: data?.chain || chain.name || "",
     chainId: chain.id || data?.chainId || -1,
-    rpc: chain.rpc ? [chain.rpc] : data?.rpc || [""],
-    testnet: chain.testnet || data?.testnet || false,
+    explorers:
+      chain.blockExplorers?.map((e) => ({
+        name: e.name,
+        standard: "EIP3091",
+        url: e.url,
+      })) || data?.explorers,
+    icon: chain.icon || data?.icon,
+    name: chain.name || data?.name || "",
     nativeCurrency: {
+      decimals: nativeCurrency?.decimals || 18,
       name: nativeCurrency?.name || "",
       symbol: nativeCurrency?.symbol || "",
-      decimals: nativeCurrency?.decimals || 18,
     },
-    icon: chain.icon || data?.icon,
-    chain: data?.chain || chain.name || "",
+    rpc: chain.rpc ? [chain.rpc] : data?.rpc || [""],
     shortName: data?.shortName || chain.name || "",
     slug: data?.slug || chain.name || "",
-    explorers:
-      chain.blockExplorers?.map((e) => ({
-        name: e.name,
-        url: e.url,
-        standard: "EIP3091",
-      })) || data?.explorers,
     stackType: data?.stackType || "",
+    testnet: chain.testnet || data?.testnet || false,
   };
 }
diff --git a/packages/thirdweb/src/cli/commands/generate/generate.ts b/packages/thirdweb/src/cli/commands/generate/generate.ts
index d835a431700..cb77d5fa36b 100644
--- a/packages/thirdweb/src/cli/commands/generate/generate.ts
+++ b/packages/thirdweb/src/cli/commands/generate/generate.ts
@@ -1,3 +1,6 @@
+import { existsSync } from "node:fs";
+import { mkdir, writeFile } from "node:fs/promises";
+import { join } from "node:path";
 import {
   type Abi,
   type AbiEvent,
@@ -5,15 +8,11 @@ import {
   formatAbiItem,
   parseAbiItem,
 } from "abitype";
+import type { Options } from "prettier";
 import { getCachedChain } from "../../../chains/utils.js";
 import { createThirdwebClient } from "../../../client/client.js";
 import { resolveAbiFromContractApi } from "../../../contract/actions/resolve-abi.js";
 import { getContract } from "../../../contract/contract.js";
-
-import { existsSync } from "node:fs";
-import { mkdir, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import type { Options } from "prettier";
 import { prepareMethod } from "../../../utils/abi/prepare-method.js";
 import { packageDirectory } from "./utils.js";
 
@@ -25,9 +24,9 @@ export async function generate(input: ChainIdAndContract) {
     throw new Error("Invalid chainId and contractAddress");
   }
   const contract = getContract({
-    client,
-    chain: getCachedChain(Number.parseInt(chainId)),
     address: contractAddress,
+    chain: getCachedChain(Number.parseInt(chainId)),
+    client,
   });
   const abi = await resolveAbiFromContractApi(contract);
 
@@ -74,7 +73,6 @@ export function isValidChainIdAndContractAddress(
 
 async function generateFromAbi(abi: Abi | string[]) {
   // turn any human readable abi into a proper abi object
-  // biome-ignore lint/style/noParameterAssign: TODO: fix later
   abi = abi.map((x) => (typeof x === "string" ? parseAbiItem(x) : x)) as Abi;
 
   const events = abi.filter((x) => x.type === "event") as AbiEvent[];
diff --git a/packages/thirdweb/src/cli/commands/generate/utils.ts b/packages/thirdweb/src/cli/commands/generate/utils.ts
index a2c7cdbcd8d..f7ef90aaf20 100644
--- a/packages/thirdweb/src/cli/commands/generate/utils.ts
+++ b/packages/thirdweb/src/cli/commands/generate/utils.ts
@@ -1,9 +1,7 @@
 import fsPromises from "node:fs/promises";
-import process from "node:process";
-import { fileURLToPath } from "node:url";
-
 import path from "node:path";
-import { URL } from "node:url";
+import process from "node:process";
+import { fileURLToPath, URL } from "node:url";
 
 const toPath = (urlOrPath: string | URL) =>
   urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
diff --git a/packages/thirdweb/src/cli/commands/stylus/builder.ts b/packages/thirdweb/src/cli/commands/stylus/builder.ts
index 39616213eb6..6a12fc29c19 100644
--- a/packages/thirdweb/src/cli/commands/stylus/builder.ts
+++ b/packages/thirdweb/src/cli/commands/stylus/builder.ts
@@ -107,13 +107,13 @@ async function buildStylus(spinner: Ora, secretKey?: string) {
       selectedAbiContent = parts[0];
     } else {
       const response = await prompts({
-        type: "select",
-        name: "contract",
-        message: "Select entrypoint:",
         choices: contractNames.map((name, idx) => ({
           title: name,
           value: idx,
         })),
+        message: "Select entrypoint:",
+        name: "contract",
+        type: "select",
       });
 
       const selectedIndex = response.contract;
@@ -187,20 +187,20 @@ async function buildStylus(spinner: Ora, secretKey?: string) {
       client,
       files: [
         {
-          name: selectedContractName,
-          metadataUri,
-          bytecodeUri,
           analytics: {
+            cli_version: "",
             command: "publish-stylus",
             contract_name: selectedContractName,
-            cli_version: "",
             project_type: "stylus",
           },
+          bytecodeUri,
           compilers: {
             stylus: [
-              { compilerVersion: "", evmVersion: "", metadataUri, bytecodeUri },
+              { bytecodeUri, compilerVersion: "", evmVersion: "", metadataUri },
             ],
           },
+          metadataUri,
+          name: selectedContractName,
         },
       ],
     });
diff --git a/packages/thirdweb/src/cli/commands/stylus/create.ts b/packages/thirdweb/src/cli/commands/stylus/create.ts
index d632fd06010..23c40804ac3 100644
--- a/packages/thirdweb/src/cli/commands/stylus/create.ts
+++ b/packages/thirdweb/src/cli/commands/stylus/create.ts
@@ -32,21 +32,21 @@ export async function createStylusProject() {
 
   // Step 3: Create the project
   const { projectName } = await prompts({
-    type: "text",
-    name: "projectName",
-    message: "Project name:",
     initial: "my-stylus-project",
+    message: "Project name:",
+    name: "projectName",
+    type: "text",
   });
 
   // Step 4: Select project type
   const { projectType } = await prompts({
-    type: "select",
-    name: "projectType",
-    message: "Select a template:",
     choices: [
       { title: "Default", value: "default" },
       { title: "ERC20", value: "erc20" },
     ],
+    message: "Select a template:",
+    name: "projectType",
+    type: "select",
   });
 
   // Step 5: Create the project
diff --git a/packages/thirdweb/src/contract/actions/compiler-metadata.ts b/packages/thirdweb/src/contract/actions/compiler-metadata.ts
index ed15561a7e5..ba0e16933bd 100644
--- a/packages/thirdweb/src/contract/actions/compiler-metadata.ts
+++ b/packages/thirdweb/src/contract/actions/compiler-metadata.ts
@@ -44,10 +44,10 @@ export function formatCompilerMetadata(
   const targets = Object.keys(compilationTarget);
   const name = compilationTarget[targets[0] as keyof typeof compilationTarget];
   const info = {
-    title: meta.output.devdoc.title,
     author: meta.output.devdoc.author,
     details: meta.output.devdoc.detail,
     notice: meta.output.userdoc.notice,
+    title: meta.output.devdoc.title,
   };
   const licenses: string[] = [
     ...new Set(
@@ -56,12 +56,12 @@ export function formatCompilerMetadata(
     ),
   ];
   return {
-    name,
     abi: meta?.output?.abi || [],
-    metadata: meta,
     info,
-    licenses,
     isPartialAbi: meta.isPartialAbi,
+    licenses,
+    metadata: meta,
+    name,
     zk_version: metadata.zk_version,
   };
 }
diff --git a/packages/thirdweb/src/contract/actions/get-compiler-metadata.ts b/packages/thirdweb/src/contract/actions/get-compiler-metadata.ts
index c60d33fe478..c412116b541 100644
--- a/packages/thirdweb/src/contract/actions/get-compiler-metadata.ts
+++ b/packages/thirdweb/src/contract/actions/get-compiler-metadata.ts
@@ -24,10 +24,10 @@ export async function getCompilerMetadata(contract: ThirdwebContract) {
   const response = await fetch(
     `https://contract.thirdweb.com/metadata/${chain.id}/${address}`,
     {
-      method: "GET",
       headers: {
         "Content-Type": "application/json",
       },
+      method: "GET",
     },
   );
   if (!response.ok) {
diff --git a/packages/thirdweb/src/contract/actions/resolve-abi.test.ts b/packages/thirdweb/src/contract/actions/resolve-abi.test.ts
index c5a96ba830e..da222575e66 100644
--- a/packages/thirdweb/src/contract/actions/resolve-abi.test.ts
+++ b/packages/thirdweb/src/contract/actions/resolve-abi.test.ts
@@ -58,8 +58,8 @@ it("should throw error if contract bytecode is 0x", async () => {
     // This is a wallet address so the bytecode should be "0x"
     // and it should throw the expected error
     address: VITALIK_WALLET,
-    client: TEST_CLIENT,
     chain: FORKED_ETHEREUM_CHAIN,
+    client: TEST_CLIENT,
   });
   await expect(resolveAbiFromBytecode(wrongContract)).rejects.toThrowError(
     "Failed to load contract bytecode",
diff --git a/packages/thirdweb/src/contract/actions/resolve-abi.ts b/packages/thirdweb/src/contract/actions/resolve-abi.ts
index d1d93d26478..6a21184f583 100644
--- a/packages/thirdweb/src/contract/actions/resolve-abi.ts
+++ b/packages/thirdweb/src/contract/actions/resolve-abi.ts
@@ -3,7 +3,7 @@ import { sepolia } from "viem/chains";
 import { download } from "../../storage/download.js";
 import { getClientFetch } from "../../utils/fetch.js";
 import { withCache } from "../../utils/promise/withCache.js";
-import { type ThirdwebContract, getContract } from "../contract.js";
+import { getContract, type ThirdwebContract } from "../contract.js";
 
 /**
  * Resolves the ABI (Application Binary Interface) for a given contract.
@@ -146,7 +146,7 @@ export async function resolveAbiFromBytecode(
     return [];
   }
   try {
-    const res = await download({ uri: ipfsUri, client: contract.client });
+    const res = await download({ client: contract.client, uri: ipfsUri });
     const json = await res.json();
     // ABI is at `json.output.abi`
     return json.output.abi;
@@ -331,7 +331,7 @@ export async function resolveCompositeAbi(
   });
 
   // join them together
-  return joinAbis({ rootAbi: rootAbi_, pluginAbis });
+  return joinAbis({ pluginAbis, rootAbi: rootAbi_ });
 }
 
 async function resolvePluginPatternAddresses(
diff --git a/packages/thirdweb/src/contract/contract.test.ts b/packages/thirdweb/src/contract/contract.test.ts
index 4c8c128db3f..adca3e579bc 100644
--- a/packages/thirdweb/src/contract/contract.test.ts
+++ b/packages/thirdweb/src/contract/contract.test.ts
@@ -33,9 +33,9 @@ describe("Contract - getContract", () => {
     expect(() =>
       getContract({
         address: USDT_CONTRACT_ADDRESS,
-        client: TEST_CLIENT,
         // @ts-ignore Test
         chain: {},
+        client: TEST_CLIENT,
       }),
     ).toThrowError(`getContract validation error - invalid chain: ${{}}`);
   });
diff --git a/packages/thirdweb/src/contract/deployment/deploy-deterministic.test.ts b/packages/thirdweb/src/contract/deployment/deploy-deterministic.test.ts
index 97834f3e773..887e2c46ec1 100644
--- a/packages/thirdweb/src/contract/deployment/deploy-deterministic.test.ts
+++ b/packages/thirdweb/src/contract/deployment/deploy-deterministic.test.ts
@@ -19,20 +19,20 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
     const tx1 = prepareDeterministicDeployTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
-      contractId: "AccountFactory",
       constructorParams: {
         defaultAdmin: TEST_ACCOUNT_A.address,
         entrypoint: ENTRYPOINT_ADDRESS_v0_6,
       },
+      contractId: "AccountFactory",
     });
     const tx2 = prepareDeterministicDeployTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
-      contractId: "AccountFactory",
       constructorParams: {
         defaultAdmin: TEST_ACCOUNT_A.address,
         entrypoint: ENTRYPOINT_ADDRESS_v0_6,
       },
+      contractId: "AccountFactory",
     });
     const [tx1Result, tx2Result] = await Promise.all([
       simulateTransaction({ transaction: tx1 }),
@@ -45,31 +45,31 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
     const tx1 = prepareDeterministicDeployTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
-      contractId: "AccountFactory",
       constructorParams: {
         defaultAdmin: TEST_ACCOUNT_A.address,
         entrypoint: ENTRYPOINT_ADDRESS_v0_6,
       },
+      contractId: "AccountFactory",
       salt: "some-salt",
     });
     const tx2 = prepareDeterministicDeployTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
-      contractId: "AccountFactory",
       constructorParams: {
         defaultAdmin: TEST_ACCOUNT_A.address,
         entrypoint: ENTRYPOINT_ADDRESS_v0_6,
       },
+      contractId: "AccountFactory",
       salt: keccakId("some-salt"),
     });
     const tx3 = prepareDeterministicDeployTransaction({
       chain: FORKED_OPTIMISM_CHAIN,
       client: TEST_CLIENT,
-      contractId: "AccountFactory",
       constructorParams: {
         defaultAdmin: TEST_ACCOUNT_A.address,
         entrypoint: ENTRYPOINT_ADDRESS_v0_6,
       },
+      contractId: "AccountFactory",
     });
     const [tx1Result, tx2Result, tx3Result] = await Promise.all([
       simulateTransaction({ transaction: tx1 }),
@@ -84,21 +84,21 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
     const computedPromise = computePublishedContractAddress({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
-      contractId: "AccountFactory",
       constructorParams: {
         defaultAdmin: TEST_ACCOUNT_A.address,
         entrypoint: ENTRYPOINT_ADDRESS_v0_6,
       },
+      contractId: "AccountFactory",
       salt: keccakId("some-salt"),
     });
     const tx = prepareDeterministicDeployTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
-      contractId: "AccountFactory",
       constructorParams: {
         defaultAdmin: TEST_ACCOUNT_A.address,
         entrypoint: ENTRYPOINT_ADDRESS_v0_6,
       },
+      contractId: "AccountFactory",
       salt: keccakId("some-salt"),
     });
 
@@ -111,8 +111,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
   // TODO: Replace these tests' live contracts with mocks
   it("should deploy a published contract with no constructor", async () => {
     const tx = prepareDeterministicDeployTransaction({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       contractId: "Counter",
       publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
     });
diff --git a/packages/thirdweb/src/contract/deployment/deploy-deterministic.ts b/packages/thirdweb/src/contract/deployment/deploy-deterministic.ts
index 8e63fc8e5a9..24097d834d5 100644
--- a/packages/thirdweb/src/contract/deployment/deploy-deterministic.ts
+++ b/packages/thirdweb/src/contract/deployment/deploy-deterministic.ts
@@ -42,17 +42,17 @@ export function prepareDeterministicDeployTransaction(
 ) {
   const { client, chain } = options;
   return prepareTransaction({
-    client,
     chain,
-    to: () =>
-      computeCreate2FactoryAddress({
-        client,
-        chain,
-      }),
+    client,
     data: async () => {
       const infraContractInfo =
         await computeDeploymentInfoFromContractId(options);
       return infraContractInfo.initCalldata;
     },
+    to: () =>
+      computeCreate2FactoryAddress({
+        chain,
+        client,
+      }),
   });
 }
diff --git a/packages/thirdweb/src/contract/deployment/deploy-dynamic.test.ts b/packages/thirdweb/src/contract/deployment/deploy-dynamic.test.ts
index b72747a4b91..feb8a637e22 100644
--- a/packages/thirdweb/src/contract/deployment/deploy-dynamic.test.ts
+++ b/packages/thirdweb/src/contract/deployment/deploy-dynamic.test.ts
@@ -11,34 +11,34 @@ import { deployCloneFactory } from "./utils/bootstrap.js";
 describe.runIf(process.env.TW_SECRET_KEY)("deploy dynamic", () => {
   it.sequential("should deploy dynamic contract with extensions", async () => {
     await deployCloneFactory({
+      account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      account: TEST_ACCOUNT_A,
     });
 
     const deployed = await deployPublishedContract({
+      account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      account: TEST_ACCOUNT_A,
       contractId: "EvolvingNFT",
       contractParams: {
-        name: "Evolving nft",
-        symbol: "ENFT",
+        contractURI: "",
         defaultAdmin: TEST_ACCOUNT_A.address,
+        name: "Evolving nft",
         royaltyBps: 0n,
         royaltyRecipient: TEST_ACCOUNT_A.address,
         saleRecipient: TEST_ACCOUNT_A.address,
+        symbol: "ENFT",
         trustedForwarders: [],
-        contractURI: "",
       },
     });
 
     expect(deployed).toBeDefined();
 
     const contract = getContract({
-      client: TEST_CLIENT,
       address: deployed,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     const extensions = await readContract({
diff --git a/packages/thirdweb/src/contract/deployment/deploy-via-autofactory.test.ts b/packages/thirdweb/src/contract/deployment/deploy-via-autofactory.test.ts
index 6b3b1d5580c..19ce1ae06f7 100644
--- a/packages/thirdweb/src/contract/deployment/deploy-via-autofactory.test.ts
+++ b/packages/thirdweb/src/contract/deployment/deploy-via-autofactory.test.ts
@@ -23,14 +23,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
     async () => {
       // bootstrap infra and implementation
       await deployCloneFactory({
+        account: TEST_ACCOUNT_A,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_A,
       });
       await deployImplementation({
+        account: TEST_ACCOUNT_A,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_A,
         contractId: "DropERC721",
       });
 
@@ -52,16 +52,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
 
       const initializeTransaction = initialize({
         contract: implementationContract,
-        name: "NFTDrop unified",
-        symbol: "NFTD",
+        contractURI: "",
         defaultAdmin: TEST_ACCOUNT_A.address,
+        name: "NFTDrop unified",
         platformFeeBps: 0n,
         platformFeeRecipient: TEST_ACCOUNT_A.address,
         royaltyBps: 0n,
         royaltyRecipient: TEST_ACCOUNT_A.address,
         saleRecipient: TEST_ACCOUNT_A.address,
+        symbol: "NFTD",
         trustedForwarders: [],
-        contractURI: "",
       });
 
       const transaction = prepareAutoFactoryDeployTransaction({
@@ -71,8 +71,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
         initializeTransaction,
       });
       const hash = await sendTransaction({
-        transaction,
         account: TEST_ACCOUNT_A,
+        transaction,
       });
       expect(hash.transactionHash).toBeDefined();
     },
@@ -99,16 +99,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
 
       const initializeTransaction = initialize({
         contract: implementationContract,
-        name: "NFTDrop unified",
-        symbol: "NFTD",
+        contractURI: "",
         defaultAdmin: TEST_ACCOUNT_A.address,
+        name: "NFTDrop unified",
         platformFeeBps: 0n,
         platformFeeRecipient: TEST_ACCOUNT_A.address,
         royaltyBps: 0n,
         royaltyRecipient: TEST_ACCOUNT_A.address,
         saleRecipient: TEST_ACCOUNT_A.address,
+        symbol: "NFTD",
         trustedForwarders: [],
-        contractURI: "",
       });
 
       const transaction = prepareAutoFactoryDeployTransaction({
@@ -118,8 +118,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
         initializeTransaction,
       });
       const hash = await sendTransaction({
-        transaction,
         account: TEST_ACCOUNT_A,
+        transaction,
       });
       expect(hash.transactionHash).toBeDefined();
     },
@@ -144,16 +144,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
 
     const initializeTransaction = initialize({
       contract: implementationContract,
-      name: "NFTDrop unified",
-      symbol: "NFTD",
+      contractURI: "",
       defaultAdmin: TEST_ACCOUNT_A.address,
+      name: "NFTDrop unified",
       platformFeeBps: 0n,
       platformFeeRecipient: TEST_ACCOUNT_A.address,
       royaltyBps: 0n,
       royaltyRecipient: TEST_ACCOUNT_A.address,
       saleRecipient: TEST_ACCOUNT_A.address,
+      symbol: "NFTD",
       trustedForwarders: [],
-      contractURI: "",
     });
 
     const transaction = prepareAutoFactoryDeployTransaction({
@@ -163,8 +163,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
       initializeTransaction,
     });
     const receipt = await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     const proxyEvent = proxyDeployedV2Event();
     const decodedEvent = parseEventLogs({
@@ -181,8 +181,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       deployMetadata,
-      isCrosschain: true,
       initializeData: decodedEvent[0]?.args.data,
+      isCrosschain: true,
     });
 
     expect(deployed).toBeDefined();
@@ -207,16 +207,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
 
     const initializeTransaction = initialize({
       contract: implementationContract,
-      name: "NFTDrop unified",
-      symbol: "NFTD",
+      contractURI: "",
       defaultAdmin: TEST_ACCOUNT_A.address,
+      name: "NFTDrop unified",
       platformFeeBps: 0n,
       platformFeeRecipient: TEST_ACCOUNT_A.address,
       royaltyBps: 0n,
       royaltyRecipient: TEST_ACCOUNT_A.address,
       saleRecipient: TEST_ACCOUNT_A.address,
+      symbol: "NFTD",
       trustedForwarders: [],
-      contractURI: "",
     });
 
     let salt = "test";
@@ -228,8 +228,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
       salt,
     });
     let receipt = await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     let proxyEvent = proxyDeployedV2Event();
     let decodedEvent = parseEventLogs({
@@ -248,8 +248,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
       salt,
     });
     receipt = await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     proxyEvent = proxyDeployedV2Event();
     decodedEvent = parseEventLogs({
@@ -264,14 +264,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       cloneFactoryContract,
-      initializeData: decodedEvent[0]?.args.data,
       implementationAddress: implementationContract.address,
+      initializeData: decodedEvent[0]?.args.data,
       isCrosschain: true,
       salt: keccakId("test2"),
     });
     receipt = await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     proxyEvent = proxyDeployedV2Event();
     decodedEvent = parseEventLogs({
diff --git a/packages/thirdweb/src/contract/deployment/deploy-via-autofactory.ts b/packages/thirdweb/src/contract/deployment/deploy-via-autofactory.ts
index b77e4871fd0..28625abe3b9 100644
--- a/packages/thirdweb/src/contract/deployment/deploy-via-autofactory.ts
+++ b/packages/thirdweb/src/contract/deployment/deploy-via-autofactory.ts
@@ -31,7 +31,6 @@ export function prepareAutoFactoryDeployTransaction(
   },
 ) {
   return deployProxyByImplementationV2({
-    contract: args.cloneFactoryContract,
     async asyncParams() {
       const rpcRequest = getRpcClient({
         ...args,
@@ -54,9 +53,9 @@ export function prepareAutoFactoryDeployTransaction(
 
         return {
           data: args.initializeData,
+          extraData: "0x",
           implementation: args.implementationAddress,
           salt,
-          extraData: "0x",
         } as const;
       }
 
@@ -72,11 +71,12 @@ export function prepareAutoFactoryDeployTransaction(
       }
       return {
         data: await encode(args.initializeTransaction),
+        extraData: "0x",
         implementation,
         salt,
-        extraData: "0x",
       } as const;
     },
+    contract: args.cloneFactoryContract,
   });
 }
 
@@ -110,9 +110,9 @@ export async function deployViaAutoFactory(
       throw new Error("initializeTransaction can't be undefined");
     }
     return zkDeployProxy({
+      account,
       chain,
       client,
-      account,
       cloneFactoryContract,
       initializeTransaction,
       salt,
@@ -123,15 +123,15 @@ export async function deployViaAutoFactory(
     chain,
     client,
     cloneFactoryContract,
-    initializeTransaction,
-    initializeData,
     implementationAddress,
+    initializeData,
+    initializeTransaction,
     isCrosschain,
     salt,
   });
   const receipt = await sendAndConfirmTransaction({
-    transaction: tx,
     account,
+    transaction: tx,
   });
 
   const proxyEvent = proxyDeployedV2Event();
diff --git a/packages/thirdweb/src/contract/deployment/deploy-with-abi.ts b/packages/thirdweb/src/contract/deployment/deploy-with-abi.ts
index fea0c687e61..0c409874981 100644
--- a/packages/thirdweb/src/contract/deployment/deploy-with-abi.ts
+++ b/packages/thirdweb/src/contract/deployment/deploy-with-abi.ts
@@ -131,11 +131,11 @@ export async function deployContract(
 ) {
   if (await isZkSyncChain(options.chain)) {
     return zkDeployContract({
+      abi: options.abi,
       account: options.account,
-      client: options.client,
-      chain: options.chain,
       bytecode: options.bytecode,
-      abi: options.abi,
+      chain: options.chain,
+      client: options.client,
       params: options.constructorParams,
       salt: options.salt,
     });
@@ -147,16 +147,16 @@ export async function deployContract(
     const info = await computeDeploymentInfoFromBytecode(options);
     address = computeDeploymentAddress({
       bytecode: options.bytecode,
-      encodedArgs: info.encodedArgs,
       create2FactoryAddress: info.create2FactoryAddress,
-      salt: options.salt,
+      encodedArgs: info.encodedArgs,
       extraDataWithUri: options.extraDataWithUri,
+      salt: options.salt,
     });
     const isDeployed = await isContractDeployed(
       getContract({
-        client: options.client,
-        chain: options.chain,
         address,
+        chain: options.chain,
+        client: options.client,
       }),
     );
     if (isDeployed) {
@@ -167,8 +167,8 @@ export async function deployContract(
       transaction: prepareTransaction({
         chain: options.chain,
         client: options.client,
-        to: info.create2FactoryAddress,
         data: info.initCalldata,
+        to: info.create2FactoryAddress,
       }),
     });
   } else {
@@ -194,8 +194,8 @@ export async function deployContract(
       });
 
       await sendTransaction({
-        transaction: activationTransaction,
         account: options.account,
+        transaction: activationTransaction,
       });
     } catch {
       console.error("Error: Contract could not be activated.");
diff --git a/packages/thirdweb/src/contract/deployment/publisher.test.ts b/packages/thirdweb/src/contract/deployment/publisher.test.ts
index dd92974feff..347d4f1f799 100644
--- a/packages/thirdweb/src/contract/deployment/publisher.test.ts
+++ b/packages/thirdweb/src/contract/deployment/publisher.test.ts
@@ -10,9 +10,9 @@ vi.mock("../../../storage/download");
 describe.runIf(process.env.TW_SECRET_KEY)("fetchPublishedContract", () => {
   it("fetches the latest published contract when no version is specified", async () => {
     const result = await fetchPublishedContractMetadata({
-      publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
-      contractId: "Counter",
       client: TEST_CLIENT,
+      contractId: "Counter",
+      publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
     });
 
     expect(result?.version).toEqual("1.0.2");
@@ -20,9 +20,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("fetchPublishedContract", () => {
 
   it("fetches a specific version when specified", async () => {
     const result = await fetchPublishedContractMetadata({
-      publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
-      contractId: "Counter",
       client: TEST_CLIENT,
+      contractId: "Counter",
+      publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
       version: "1.0.1",
     });
 
@@ -31,9 +31,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("fetchPublishedContract", () => {
 
   it("throws an error when an invalid version is specified", async () => {
     const result = fetchPublishedContractMetadata({
-      publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
-      contractId: "Counter",
       client: TEST_CLIENT,
+      contractId: "Counter",
+      publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
       version: "1.2.3",
     });
 
diff --git a/packages/thirdweb/src/contract/deployment/publisher.ts b/packages/thirdweb/src/contract/deployment/publisher.ts
index d0c79a868cb..762063da3e6 100644
--- a/packages/thirdweb/src/contract/deployment/publisher.ts
+++ b/packages/thirdweb/src/contract/deployment/publisher.ts
@@ -10,7 +10,7 @@ import { extractIPFSUri } from "../../utils/bytecode/extractIPFS.js";
 import { resolveImplementation } from "../../utils/bytecode/resolveImplementation.js";
 import { withCache } from "../../utils/promise/withCache.js";
 
-import { type ThirdwebContract, getContract } from "../contract.js";
+import { getContract, type ThirdwebContract } from "../contract.js";
 
 export const CONTRACT_PUBLISHER_ADDRESS =
   "0xf5b896Ddb5146D5dA77efF4efBb3Eae36E300808"; // Polygon only
@@ -30,8 +30,8 @@ export async function fetchPublishedContractMetadata(options: {
     async () => {
       const publishedContract = await fetchPublishedContract({
         client: options.client,
-        publisherAddress: options.publisher || THIRDWEB_DEPLOYER,
         contractId: options.contractId,
+        publisherAddress: options.publisher || THIRDWEB_DEPLOYER,
         version: options.version,
       });
       if (!publishedContract.publishMetadataUri) {
@@ -66,9 +66,9 @@ export async function fetchDeployBytecodeFromPublishedContractMetadata(
     return undefined;
   }
   const contractPublisher = getContract({
-    client: contract.client,
-    chain: polygon,
     address: CONTRACT_PUBLISHER_ADDRESS,
+    chain: polygon,
+    client: contract.client,
   });
   const publishedMetadataUri = await readContract({
     contract: contractPublisher,
@@ -86,7 +86,7 @@ export async function fetchDeployBytecodeFromPublishedContractMetadata(
     publishedMetadataUri
       .filter((uri) => uri.length > 0)
       .map((uri) =>
-        download({ uri, client: contract.client })
+        download({ client: contract.client, uri })
           .then((res) => res.text())
           .then(JSON.parse),
       ),
@@ -94,7 +94,7 @@ export async function fetchDeployBytecodeFromPublishedContractMetadata(
 
   return pubmeta.length > 0
     ? await (
-        await download({ uri: pubmeta[0].bytecodeUri, client: contract.client })
+        await download({ client: contract.client, uri: pubmeta[0].bytecodeUri })
       ).text()
     : undefined;
 }
@@ -233,9 +233,9 @@ export async function fetchPublishedContract(
   options: FetchPublishedContractOptions,
 ) {
   const contractPublisher = getContract({
-    client: options.client,
-    chain: polygon,
     address: CONTRACT_PUBLISHER_ADDRESS,
+    chain: polygon,
+    client: options.client,
   });
   if (!options.version || options.version === "latest") {
     return await readContract({
@@ -254,16 +254,16 @@ export async function fetchPublishedContract(
     await Promise.all(
       allVersions.map((version) => {
         return download({
-          uri: version.publishMetadataUri,
           client: options.client,
+          uri: version.publishMetadataUri,
         }).then((res) => res.json());
       }),
     )
   ).map((item, index) => {
     return {
       name: allVersions[index]?.contractId,
-      publishedTimestamp: allVersions[index]?.publishTimestamp,
       publishedMetadata: item,
+      publishedTimestamp: allVersions[index]?.publishTimestamp,
     };
   });
 
diff --git a/packages/thirdweb/src/contract/deployment/utils/bootstrap.test.ts b/packages/thirdweb/src/contract/deployment/utils/bootstrap.test.ts
index 87d185ef3bd..1748a00a4c1 100644
--- a/packages/thirdweb/src/contract/deployment/utils/bootstrap.test.ts
+++ b/packages/thirdweb/src/contract/deployment/utils/bootstrap.test.ts
@@ -17,9 +17,9 @@ import { getDeployedInfraContract } from "./infra.js";
 describe.runIf(process.env.TW_SECRET_KEY)("bootstrap", () => {
   it("should bootstrap onchain infra", async () => {
     await deployCloneFactory({
+      account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      account: TEST_ACCOUNT_A,
     });
 
     // verify all contracts are deployed
@@ -40,19 +40,19 @@ describe.runIf(process.env.TW_SECRET_KEY)("bootstrap", () => {
     const cloneFactory = await getDeployedInfraContract({
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      contractId: "TWCloneFactory",
       constructorParams: {
         _trustedForwarder: forwarder.address,
       },
+      contractId: "TWCloneFactory",
     });
     expect(cloneFactory).not.toBeNull();
   });
 
   it("should return saved implementations for zksync chains", async () => {
     let infra = await getOrDeployInfraForPublishedContract({
-      client: TEST_CLIENT,
-      chain: defineChain(300),
       account: TEST_ACCOUNT_A,
+      chain: defineChain(300),
+      client: TEST_CLIENT,
       contractId: "MarketplaceV3",
     });
 
@@ -64,9 +64,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("bootstrap", () => {
     );
 
     infra = await getOrDeployInfraForPublishedContract({
-      client: TEST_CLIENT,
-      chain: defineChain(300),
       account: TEST_ACCOUNT_A,
+      chain: defineChain(300),
+      client: TEST_CLIENT,
       contractId: "DropERC721",
       version: "5.0.4",
     });
@@ -77,9 +77,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("bootstrap", () => {
     expect(infra.implementationContract.address).toBeDefined();
 
     const weth = await getOrDeployInfraContract({
-      client: TEST_CLIENT,
-      chain: defineChain(300),
       account: TEST_ACCOUNT_A,
+      chain: defineChain(300),
+      client: TEST_CLIENT,
       contractId: "WETH9",
     });
 
diff --git a/packages/thirdweb/src/contract/deployment/utils/bootstrap.ts b/packages/thirdweb/src/contract/deployment/utils/bootstrap.ts
index 3aa9c7af5b2..ff3e635f273 100644
--- a/packages/thirdweb/src/contract/deployment/utils/bootstrap.ts
+++ b/packages/thirdweb/src/contract/deployment/utils/bootstrap.ts
@@ -7,7 +7,7 @@ import {
 } from "../../../utils/any-evm/deploy-metadata.js";
 import { isZkSyncChain } from "../../../utils/any-evm/zksync/isZkSyncChain.js";
 import type { ClientAndChainAndAccount } from "../../../utils/types.js";
-import { type ThirdwebContract, getContract } from "../../contract.js";
+import { getContract, type ThirdwebContract } from "../../contract.js";
 import { fetchPublishedContractMetadata } from "../publisher.js";
 import {
   ZKSYNC_IMPLEMENTATIONS,
@@ -21,9 +21,9 @@ import {
   getDeployedCreate2Factory,
 } from "./create-2-factory.js";
 import {
-  type InfraContractId,
   getDeployedInfraContract,
   getDeployedInfraContractFromMetadata,
+  type InfraContractId,
   prepareInfraContractDeployTransactionFromMetadata,
 } from "./infra.js";
 
@@ -65,9 +65,9 @@ export async function getOrDeployInfraForPublishedContract(
 
   if (await isZkSyncChain(chain)) {
     const cloneFactoryContract = await zkDeployCreate2Factory({
+      account,
       chain,
       client,
-      account,
     });
     const compilerMetadata = await fetchPublishedContractMetadata({
       client,
@@ -85,15 +85,15 @@ export async function getOrDeployInfraForPublishedContract(
 
     if (!implementationContract) {
       implementationContract = await zkDeployContractDeterministic({
-        chain,
-        client,
-        account,
         abi: compilerMetadata.abi,
+        account,
         bytecode: await fetchBytecodeFromCompilerMetadata({
-          compilerMetadata,
-          client,
           chain,
+          client,
+          compilerMetadata,
         }),
+        chain,
+        client,
         params: constructorParams,
       });
     }
@@ -120,8 +120,8 @@ export async function getOrDeployInfraForPublishedContract(
     getDeployedInfraContract({
       chain,
       client,
-      contractId,
       constructorParams,
+      contractId,
       publisher,
       version,
     }),
@@ -130,16 +130,16 @@ export async function getOrDeployInfraForPublishedContract(
   if (!implementationContract || !cloneFactoryContract) {
     // deploy the infra and implementation contracts if not found
     cloneFactoryContract = await deployCloneFactory({
-      client,
-      chain,
       account,
+      chain,
+      client,
     });
     implementationContract = await deployImplementation({
-      client,
-      chain,
       account,
-      contractId,
+      chain,
+      client,
       constructorParams,
+      contractId,
       publisher,
       version,
     });
@@ -171,8 +171,8 @@ export async function deployCloneFactory(options: ClientAndChainAndAccount) {
   // clone factory
   return getOrDeployInfraContract({
     ...options,
-    contractId: "TWCloneFactory",
     constructorParams: { _trustedForwarder: forwarder.address },
+    contractId: "TWCloneFactory",
   });
 }
 
@@ -190,8 +190,8 @@ export async function deployImplementation(
 ) {
   return getOrDeployInfraContract({
     ...options,
-    contractId: options.contractId,
     constructorParams: options.constructorParams,
+    contractId: options.contractId,
     publisher: options.publisher,
     version: options.version,
   });
@@ -214,9 +214,9 @@ export async function getOrDeployInfraContract(
 
     if (weth) {
       return getContract({
-        client: options.client,
-        chain: options.chain,
         address: weth,
+        chain: options.chain,
+        client: options.client,
       });
     }
   }
@@ -249,8 +249,8 @@ async function getOrDeployInfraContractFromMetadata(
   const transaction =
     prepareInfraContractDeployTransactionFromMetadata(options);
   await sendAndConfirmTransaction({
-    transaction,
     account: options.account,
+    transaction,
   });
   const deployedInfraContract =
     await getDeployedInfraContractFromMetadata(options);
@@ -268,8 +268,8 @@ async function getOrDeployInfraContractFromMetadata(
       });
 
       await sendTransaction({
-        transaction: activationTransaction,
         account: options.account,
+        transaction: activationTransaction,
       });
     } catch {
       console.error("Error: Contract could not be activated.");
diff --git a/packages/thirdweb/src/contract/deployment/utils/clone-factory.ts b/packages/thirdweb/src/contract/deployment/utils/clone-factory.ts
index 48410da5505..1b33d56c391 100644
--- a/packages/thirdweb/src/contract/deployment/utils/clone-factory.ts
+++ b/packages/thirdweb/src/contract/deployment/utils/clone-factory.ts
@@ -21,8 +21,8 @@ export async function getDeployedCloneFactoryContract(args: ClientAndChain) {
   // check if clone factory is deployed
   const cloneFactory = await getDeployedInfraContract({
     ...args,
-    contractId: "TWCloneFactory",
     constructorParams: { _trustedForwarder: forwarder.address },
+    contractId: "TWCloneFactory",
   });
   if (!cloneFactory) {
     return null;
diff --git a/packages/thirdweb/src/contract/deployment/utils/create-2-factory.test.ts b/packages/thirdweb/src/contract/deployment/utils/create-2-factory.test.ts
index ad5d95d5830..d0bd0587003 100644
--- a/packages/thirdweb/src/contract/deployment/utils/create-2-factory.test.ts
+++ b/packages/thirdweb/src/contract/deployment/utils/create-2-factory.test.ts
@@ -12,8 +12,8 @@ import {
 describe.runIf(process.env.TW_SECRET_KEY)("create2 factory tests", () => {
   it("should compute create2 factory address", async () => {
     const addr = await computeCreate2FactoryAddress({
-      client: TEST_CLIENT,
       chain: defineChain(1),
+      client: TEST_CLIENT,
     });
 
     expect(addr).to.eq("0x4e59b44847b379578588920cA78FbF26c0B4956C");
@@ -21,8 +21,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("create2 factory tests", () => {
 
   it("should compute create2 factory address with custom gas", async () => {
     const addr = await computeCreate2FactoryAddress({
-      client: TEST_CLIENT,
       chain: defineChain(1564830818),
+      client: TEST_CLIENT,
     });
 
     expect(addr).to.eq("0x50620b64D9524aC7dC8c967123E87e5b6dB98f0c");
@@ -30,9 +30,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("create2 factory tests", () => {
 
   it("should deploy create2 factory", async () => {
     await deployCreate2Factory({
-      client: TEST_CLIENT,
       account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     const create2Factory = await getDeployedCreate2Factory({
diff --git a/packages/thirdweb/src/contract/deployment/utils/create-2-factory.ts b/packages/thirdweb/src/contract/deployment/utils/create-2-factory.ts
index d346b6cd38f..9be25e25768 100644
--- a/packages/thirdweb/src/contract/deployment/utils/create-2-factory.ts
+++ b/packages/thirdweb/src/contract/deployment/utils/create-2-factory.ts
@@ -28,9 +28,9 @@ const CREATE2_FACTORY_BYTECODE =
  * @internal
  */
 const SIGNATURE = {
-  v: 27n,
   r: "0x2222222222222222222222222222222222222222222222222222222222222222",
   s: "0x2222222222222222222222222222222222222222222222222222222222222222",
+  v: 27n,
 } as const;
 
 type Create2FactoryDeploymentInfo = {
@@ -66,8 +66,8 @@ export async function computeCreate2FactoryAddress(
         const deploymentInfo = await _getCreate2FactoryDeploymentInfo(
           eipChain,
           {
-            gasPrice,
             gasLimit,
+            gasPrice,
           },
         );
 
@@ -162,8 +162,8 @@ export async function deployCreate2Factory(options: ClientAndChainAndAccount) {
   const eipChain = enforceEip155 ? chainId : 0;
 
   const rpcRequest = getRpcClient({
-    client: client,
     chain,
+    client: client,
   });
 
   let gasPrice: bigint | undefined;
@@ -178,8 +178,8 @@ export async function deployCreate2Factory(options: ClientAndChainAndAccount) {
   }
 
   const deploymentInfo = await _getCreate2FactoryDeploymentInfo(eipChain, {
-    gasPrice,
     gasLimit,
+    gasPrice,
   });
 
   const balance = await eth_getBalance(rpcRequest, {
@@ -193,7 +193,7 @@ export async function deployCreate2Factory(options: ClientAndChainAndAccount) {
       to: deploymentInfo.signerAddress,
       value: deploymentInfo.valueToSend,
     });
-    const res = await sendTransaction({ transaction, account });
+    const res = await sendTransaction({ account, transaction });
     await waitForReceipt(res);
   }
   const transactionHash = await eth_sendRawTransaction(
@@ -221,14 +221,14 @@ async function _getCreate2FactoryDeploymentInfo(
   const gasPrice = gasOptions.gasPrice ? gasOptions.gasPrice : 100n * 10n ** 9n;
   const gas = gasOptions.gasLimit ? gasOptions.gasLimit : 100000n;
   const deploymentTransaction = await getKeylessTransaction({
+    signature: SIGNATURE,
     transaction: {
-      gasPrice,
+      chainId: chainId !== 0 ? Number(chainId) : undefined,
+      data: CREATE2_FACTORY_BYTECODE,
       gas,
+      gasPrice,
       nonce: 0,
-      data: CREATE2_FACTORY_BYTECODE,
-      chainId: chainId !== 0 ? Number(chainId) : undefined,
     },
-    signature: SIGNATURE,
   });
   const create2FactoryAddress = ox__ContractAddress.from({
     from: deploymentTransaction.signerAddress,
@@ -237,8 +237,8 @@ async function _getCreate2FactoryDeploymentInfo(
 
   return {
     ...deploymentTransaction,
-    valueToSend: gasPrice * gas,
     predictedAddress: getAddress(create2FactoryAddress),
+    valueToSend: gasPrice * gas,
   };
 }
 
@@ -254,75 +254,75 @@ type CustomChain = {
 };
 
 const CUSTOM_GAS_FOR_CHAIN: Record<string, CustomChain> = {
-  "5001": {
-    name: "Mantle Testnet",
-    gasPrice: 1n,
-  },
-  "71402": {
-    name: "Godwoken Mainnet",
-    gasPrice: 40000n * 10n ** 9n,
+  "199": {
+    gasPrice: 300000n * 10n ** 9n,
+    name: "BitTorrent Chain",
   },
-  "1351057110": {
-    name: "Chaos (SKALE Testnet)",
-    gasPrice: 100000n,
+  "338": {
+    gasPrice: 2000n * 10n ** 9n,
+    name: "Cronos Testnet",
   },
   "361": {
-    name: "Theta Mainnet",
     gasPrice: 4000n * 10n ** 9n,
+    name: "Theta Mainnet",
   },
   "365": {
-    name: "Theta Testnet",
     gasPrice: 4000n * 10n ** 9n,
+    name: "Theta Testnet",
+  },
+  "5001": {
+    gasPrice: 1n,
+    name: "Mantle Testnet",
   },
   "7700": {
-    name: "Canto",
     gasPrice: 1000n * 10n ** 9n,
+    name: "Canto",
   },
   "7701": {
-    name: "Canto Testnet",
     gasPrice: 1000n * 10n ** 9n,
+    name: "Canto Testnet",
   },
-  "338": {
-    name: "Cronos Testnet",
-    gasPrice: 2000n * 10n ** 9n,
-  },
-  "199": {
-    name: "BitTorrent Chain",
-    gasPrice: 300000n * 10n ** 9n,
+  "71402": {
+    gasPrice: 40000n * 10n ** 9n,
+    name: "Godwoken Mainnet",
   },
   "88882": {
-    name: "Spicy Chain",
-    gasPrice: 2500n * 10n ** 9n,
     gasLimit: 200000n,
+    gasPrice: 2500n * 10n ** 9n,
+    name: "Spicy Chain",
   },
   "88888": {
-    name: "Chiliz Chain",
-    gasPrice: 2500n * 10n ** 9n,
     gasLimit: 200000n,
+    gasPrice: 2500n * 10n ** 9n,
+    name: "Chiliz Chain",
   },
   // SKALE chains
   "1350216234": {
-    name: "Titan",
     gasPrice: 110000n,
+    name: "Titan",
+  },
+  "1351057110": {
+    gasPrice: 100000n,
+    name: "Chaos (SKALE Testnet)",
   },
   "1482601649": {
-    name: "Nebula",
     gasPrice: 110000n,
+    name: "Nebula",
   },
   "1564830818": {
-    name: "Calypso",
     gasPrice: 110000n,
+    name: "Calypso",
   },
   "2046399126": {
-    name: "Europa",
     gasPrice: 110000n,
+    name: "Europa",
   },
 };
 
 const FACTORIES: Record<string, string> = {
+  "88888": "0xc501b9abf5540de1dd24f66633b1ecf35ff7101f",
   "420120000": COMMON_FACTORY_ADDRESS,
-  "420120001": COMMON_FACTORY_ADDRESS,
-  "88888": "0xc501b9abf5540de1dd24f66633b1ecf35ff7101f", // EIP155 is enforced, but the check fails, hence we hardcode the address here instead of computing dynamically
+  "420120001": COMMON_FACTORY_ADDRESS, // EIP155 is enforced, but the check fails, hence we hardcode the address here instead of computing dynamically
 };
 
 const CUSTOM_GAS_BINS = [
diff --git a/packages/thirdweb/src/contract/deployment/utils/infra.ts b/packages/thirdweb/src/contract/deployment/utils/infra.ts
index 932a060566a..5c9ba468651 100644
--- a/packages/thirdweb/src/contract/deployment/utils/infra.ts
+++ b/packages/thirdweb/src/contract/deployment/utils/infra.ts
@@ -7,7 +7,7 @@ import type { FetchDeployMetadataResult } from "../../../utils/any-evm/deploy-me
 import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
 import type { Prettify } from "../../../utils/type-utils.js";
 import type { ClientAndChain } from "../../../utils/types.js";
-import { type ThirdwebContract, getContract } from "../../contract.js";
+import { getContract, type ThirdwebContract } from "../../contract.js";
 import { fetchPublishedContractMetadata } from "../publisher.js";
 import { computeCreate2FactoryAddress } from "./create-2-factory.js";
 
@@ -50,10 +50,10 @@ export async function getDeployedInfraContract(
     version: options.version,
   });
   return getDeployedInfraContractFromMetadata({
-    client: options.client,
     chain: options.chain,
-    contractMetadata,
+    client: options.client,
     constructorParams: options.constructorParams,
+    contractMetadata,
   });
 }
 
@@ -90,17 +90,17 @@ export function prepareInfraContractDeployTransactionFromMetadata(options: {
 }) {
   const { client, chain } = options;
   return prepareTransaction({
-    client,
     chain,
-    to: () =>
-      computeCreate2FactoryAddress({
-        client,
-        chain,
-      }),
+    client,
     data: async () => {
       const infraContractInfo =
         await computeDeploymentInfoFromMetadata(options);
       return infraContractInfo.initCalldata;
     },
+    to: () =>
+      computeCreate2FactoryAddress({
+        chain,
+        client,
+      }),
   });
 }
diff --git a/packages/thirdweb/src/contract/deployment/zksync/implementations.ts b/packages/thirdweb/src/contract/deployment/zksync/implementations.ts
index b529d339810..3e6f806acda 100644
--- a/packages/thirdweb/src/contract/deployment/zksync/implementations.ts
+++ b/packages/thirdweb/src/contract/deployment/zksync/implementations.ts
@@ -1,44 +1,44 @@
 export const ZKSYNC_IMPLEMENTATIONS: Record<number, Record<string, string>> = {
-  [300]: {
+  232: {
+    MarketplaceV3: "0x9742f5ac11958cFAd151eBF0Fc31302fA409036E",
+  },
+  300: {
     MarketplaceV3: "0x58e0F289C7dD2025eBd0696d913ECC0fdc1CC8bc",
   },
-  [302]: {
+  302: {
     MarketplaceV3: "0x8b0DBCf5b7D01eBB0F24525CE8AB72F16CE4F8C8",
   },
-  [324]: {
+  324: {
     MarketplaceV3: "0xFD5663B3Ed316aEB79c9b5c4A242172273cA3395",
   },
-  [11124]: {
+  2741: {
+    MarketplaceV3: "0x9Fdf34f552cdA8E2B0cD64e2EddcB732a5Ff8455",
+  },
+  11124: {
     MarketplaceV3: "0x2dA4Dd326A6482679547071be21f74685d730504",
   },
-  [37111]: {
+  37111: {
     MarketplaceV3: "0x56Abb6a3f25DCcdaDa106191053b1CC54C196DEE",
   },
-  [555271]: {
-    MarketplaceV3: "0x9EB0830B0b10010F2a53383517A7D0B75531Bb1b",
-  },
-  [2741]: {
-    MarketplaceV3: "0x9Fdf34f552cdA8E2B0cD64e2EddcB732a5Ff8455",
-  },
-  [232]: {
-    MarketplaceV3: "0x9742f5ac11958cFAd151eBF0Fc31302fA409036E",
-  },
-  [531050104]: {
+  50104: {
     MarketplaceV3: "0x292c324920d4120F928dA6f04548442fa10B8B0f",
   },
-  [50104]: {
+  555271: {
+    MarketplaceV3: "0x9EB0830B0b10010F2a53383517A7D0B75531Bb1b",
+  },
+  531050104: {
     MarketplaceV3: "0x292c324920d4120F928dA6f04548442fa10B8B0f",
   },
 };
 
 export const ZKSYNC_WETH: Record<number, string> = {
-  [300]: "0x0462C05457Fed440740Ff3696bDd2D0577411e34",
-  [324]: "0x5AEa5775959fBC2557Cc8789bC1bf90A239D9a91",
-  [11124]: "0x9EDCde0257F2386Ce177C3a7FCdd97787F0D841d",
-  [37111]: "0xaA91D645D7a6C1aeaa5988e0547267B77d33fe16",
-  [555271]: "0xb0b8b267d44c64BA6dD1Daf442949887c85199f6",
-  [2741]: "0x3439153EB7AF838Ad19d56E1571FBD09333C2809",
-  [232]: "0xE5ecd226b3032910CEaa43ba92EE8232f8237553",
-  [531050104]: "0x9B7EA63EF5062661570afe548e3AD691D5652527",
-  [50104]: "0x2b1A859dE6A55c553520D7780Bc5805712B128F9",
+  232: "0xE5ecd226b3032910CEaa43ba92EE8232f8237553",
+  300: "0x0462C05457Fed440740Ff3696bDd2D0577411e34",
+  324: "0x5AEa5775959fBC2557Cc8789bC1bf90A239D9a91",
+  2741: "0x3439153EB7AF838Ad19d56E1571FBD09333C2809",
+  11124: "0x9EDCde0257F2386Ce177C3a7FCdd97787F0D841d",
+  37111: "0xaA91D645D7a6C1aeaa5988e0547267B77d33fe16",
+  50104: "0x2b1A859dE6A55c553520D7780Bc5805712B128F9",
+  555271: "0xb0b8b267d44c64BA6dD1Daf442949887c85199f6",
+  531050104: "0x9B7EA63EF5062661570afe548e3AD691D5652527",
 };
diff --git a/packages/thirdweb/src/contract/deployment/zksync/zkDeployContract.ts b/packages/thirdweb/src/contract/deployment/zksync/zkDeployContract.ts
index 5ba9133688e..8f7fa0300ef 100644
--- a/packages/thirdweb/src/contract/deployment/zksync/zkDeployContract.ts
+++ b/packages/thirdweb/src/contract/deployment/zksync/zkDeployContract.ts
@@ -32,12 +32,12 @@ export async function zkDeployContract(
 
   const data = encodeDeployData({
     abi: options.abi,
-    bytecode,
-    deploymentType: options.deploymentType ?? "create",
     args: normalizeFunctionParams(
       options.abi.find((abi) => abi.type === "constructor"),
       options.params,
     ),
+    bytecode,
+    deploymentType: options.deploymentType ?? "create",
   });
 
   const receipt = await sendAndConfirmTransaction({
@@ -45,18 +45,18 @@ export async function zkDeployContract(
     transaction: prepareTransaction({
       chain: options.chain,
       client: options.client,
-      to: CONTRACT_DEPLOYER_ADDRESS,
       data,
       eip712: {
         factoryDeps: [bytecode],
         // TODO (zksync): allow passing in a paymaster
       },
+      to: CONTRACT_DEPLOYER_ADDRESS,
     }),
   });
 
   const events = parseEventLogs({
-    logs: receipt.logs,
     events: [contractDeployedEvent()],
+    logs: receipt.logs,
   });
 
   const contractAddress = events[0]?.args.contractAddress;
diff --git a/packages/thirdweb/src/contract/deployment/zksync/zkDeployCreate2Factory.ts b/packages/thirdweb/src/contract/deployment/zksync/zkDeployCreate2Factory.ts
index 0aebba6ff7b..c4e169634ec 100644
--- a/packages/thirdweb/src/contract/deployment/zksync/zkDeployCreate2Factory.ts
+++ b/packages/thirdweb/src/contract/deployment/zksync/zkDeployCreate2Factory.ts
@@ -3,9 +3,9 @@ import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and
 import { prepareTransaction } from "../../../transaction/prepare-transaction.js";
 import {
   PUBLISHED_PRIVATE_KEY,
-  ZKSYNC_SINGLETON_FACTORY,
   singletonFactoryAbi,
   singletonFactoryBytecode,
+  ZKSYNC_SINGLETON_FACTORY,
 } from "../../../utils/any-evm/zksync/constants.js";
 import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
 import type { ClientAndChainAndAccount } from "../../../utils/types.js";
@@ -61,11 +61,11 @@ export async function zkDeployCreate2Factory(
   }
 
   await zkDeployContract({
-    client: options.client,
-    chain: options.chain,
-    account: create2Signer,
     abi: parseAbi(singletonFactoryAbi),
+    account: create2Signer,
     bytecode: singletonFactoryBytecode,
+    chain: options.chain,
+    client: options.client,
     deploymentType: "create2",
   });
 
diff --git a/packages/thirdweb/src/contract/deployment/zksync/zkDeployDeterministic.ts b/packages/thirdweb/src/contract/deployment/zksync/zkDeployDeterministic.ts
index 9524590d20b..1a07f5bf913 100644
--- a/packages/thirdweb/src/contract/deployment/zksync/zkDeployDeterministic.ts
+++ b/packages/thirdweb/src/contract/deployment/zksync/zkDeployDeterministic.ts
@@ -42,16 +42,16 @@ export async function zkDeployContractDeterministic(
     normalizeFunctionParams(constructorAbi as AbiConstructor, options.params),
   );
   const create2FactoryAddress = await zkDeployCreate2Factory({
-    client: options.client,
-    chain: options.chain,
     account: options.account,
+    chain: options.chain,
+    client: options.client,
   });
   const bytecode = ensureBytecodePrefix(options.bytecode);
   const bytecodeHash = uint8ArrayToHex(hashBytecode(bytecode));
   const predictedAddress = computeDeploymentAddress({
     bytecodeHash,
-    encodedArgs,
     create2FactoryAddress,
+    encodedArgs,
     salt: options.salt,
   });
   const deployed = await isContractDeployed(
@@ -76,21 +76,21 @@ export async function zkDeployContractDeterministic(
     // if not known, publish the bytecodehash
     if (marker !== 1n) {
       await zkDeployContract({
-        client: options.client,
-        chain: options.chain,
-        account: options.account,
         abi: options.abi,
+        account: options.account,
         bytecode,
+        chain: options.chain,
+        client: options.client,
         params: options.params,
       });
     }
 
     // deploy with create2 factory
     const factory = getContract({
+      abi: parseAbi(singletonFactoryAbi),
       address: create2FactoryAddress,
       chain: options.chain,
       client: options.client,
-      abi: parseAbi(singletonFactoryAbi),
     });
 
     const salt = options?.salt
diff --git a/packages/thirdweb/src/contract/deployment/zksync/zkDeployProxy.ts b/packages/thirdweb/src/contract/deployment/zksync/zkDeployProxy.ts
index 37c6c8c7c91..e330e5e1bf3 100644
--- a/packages/thirdweb/src/contract/deployment/zksync/zkDeployProxy.ts
+++ b/packages/thirdweb/src/contract/deployment/zksync/zkDeployProxy.ts
@@ -8,7 +8,7 @@ import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed
 import { resolvePromisedValue } from "../../../utils/promise/resolve-promised-value.js";
 import { randomBytesHex } from "../../../utils/random.js";
 import type { ClientAndChainAndAccount } from "../../../utils/types.js";
-import { type ThirdwebContract, getContract } from "../../contract.js";
+import { getContract, type ThirdwebContract } from "../../contract.js";
 import { zkDeployContractDeterministic } from "./zkDeployDeterministic.js";
 
 /**
@@ -42,14 +42,14 @@ export async function zkDeployProxy(
   }
   // deploy tw proxy of the implementation
   const proxyAddress = await zkDeployContractDeterministic({
-    client: options.client,
-    chain: options.chain,
-    account: options.account,
     abi: twProxyAbi,
+    account: options.account,
     bytecode: twProxyBytecode,
+    chain: options.chain,
+    client: options.client,
     params: {
-      _logic: implementationAddress,
       _data: await encode(options.initializeTransaction),
+      _logic: implementationAddress,
     },
     salt: options.salt || randomBytesHex(32),
   });
diff --git a/packages/thirdweb/src/contract/verification/constructor-params.ts b/packages/thirdweb/src/contract/verification/constructor-params.ts
index c2c85014322..cd9380a24c2 100644
--- a/packages/thirdweb/src/contract/verification/constructor-params.ts
+++ b/packages/thirdweb/src/contract/verification/constructor-params.ts
@@ -15,8 +15,8 @@ type FetchConstructorParamsOptions = {
 };
 
 const RequestStatus = {
-  OK: "1",
   NOTOK: "0",
+  OK: "1",
 };
 
 /**
diff --git a/packages/thirdweb/src/contract/verification/index.ts b/packages/thirdweb/src/contract/verification/index.ts
index 4c80f911143..d6ae811eca6 100644
--- a/packages/thirdweb/src/contract/verification/index.ts
+++ b/packages/thirdweb/src/contract/verification/index.ts
@@ -7,8 +7,8 @@ import { fetchConstructorParams } from "./constructor-params.js";
 import { fetchSourceFilesFromMetadata } from "./source-files.js";
 
 const RequestStatus = {
-  OK: "1",
   NOTOK: "0",
+  OK: "1",
 };
 
 /**
@@ -60,8 +60,8 @@ export async function verifyContract(
     );
   }
   const res = await download({
-    uri: ipfsUri,
     client: options.contract.client,
+    uri: ipfsUri,
   });
   const compilerMetadata = formatCompilerMetadata(await res.json());
 
@@ -84,13 +84,12 @@ export async function verifyContract(
 
   const compilerInput = {
     language: "Solidity",
-    sources: sourcesWithContents,
     settings: {
-      optimizer: compilerMetadata.metadata.settings.optimizer,
       evmVersion: compilerMetadata.metadata.settings.evmVersion,
-      remappings: compilerMetadata.metadata.settings.remappings,
+      optimizer: compilerMetadata.metadata.settings.optimizer,
       outputSelection: {
         "*": {
+          "": ["ast"],
           "*": [
             "abi",
             "evm.bytecode",
@@ -98,10 +97,11 @@ export async function verifyContract(
             "evm.methodIdentifiers",
             "metadata",
           ],
-          "": ["ast"],
         },
       },
+      remappings: compilerMetadata.metadata.settings.remappings,
     },
+    sources: sourcesWithContents,
   };
 
   const compilationTarget =
@@ -129,8 +129,8 @@ export async function verifyContract(
     const result = await fetch(
       `${options.explorerApiUrl}/v2/smart-contracts/${options.contract.address.toLowerCase()}/verification/via/standard-input`,
       {
-        method: "POST",
         body: formData,
+        method: "POST",
       },
     );
     const data = await result.json();
@@ -145,27 +145,27 @@ export async function verifyContract(
     : await fetchConstructorParams({
         abi: compilerMetadata?.metadata?.output?.abi || [],
         contract: options.contract,
-        explorerApiUrl: options.explorerApiUrl,
         explorerApiKey: options.explorerApiKey,
+        explorerApiUrl: options.explorerApiUrl,
       });
 
   const requestBody: Record<string, string> = {
-    apikey: options.explorerApiKey,
-    module: "contract",
     action: "verifysourcecode",
-    contractaddress: options.contract.address,
-    sourceCode: JSON.stringify(compilerInput),
+    apikey: options.explorerApiKey,
     codeformat: "solidity-standard-json-input",
-    contractname: `${contractPath}:${compilerMetadata.name}`,
     compilerversion: `v${compilerMetadata.metadata.compiler.version}`,
     constructorArguements: encodedArgs,
+    contractaddress: options.contract.address,
+    contractname: `${contractPath}:${compilerMetadata.name}`,
+    module: "contract",
+    sourceCode: JSON.stringify(compilerInput),
   };
 
   const parameters = new URLSearchParams({ ...requestBody });
   const result = await fetch(options.explorerApiUrl, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
     body: parameters.toString(),
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    method: "POST",
   });
   const data = await result.json();
   if (data.status === RequestStatus.OK) {
@@ -175,12 +175,12 @@ export async function verifyContract(
 }
 
 const VerificationStatus = {
-  FAILED: "Fail - Unable to verify",
-  SUCCESS: "Pass - Verified",
-  PENDING: "Pending in queue",
-  IN_PROGRESS: "In progress",
   ALREADY_VERIFIED: "Contract source code already verified",
   AUTOMATICALLY_VERIFIED: "Already Verified",
+  FAILED: "Fail - Unable to verify",
+  IN_PROGRESS: "In progress",
+  PENDING: "Pending in queue",
+  SUCCESS: "Pass - Verified",
 };
 
 type CheckVerificationStatusOptions = {
diff --git a/packages/thirdweb/src/contract/verification/source-files.ts b/packages/thirdweb/src/contract/verification/source-files.ts
index d79bc84d815..c6b0aeaca0f 100644
--- a/packages/thirdweb/src/contract/verification/source-files.ts
+++ b/packages/thirdweb/src/contract/verification/source-files.ts
@@ -43,9 +43,9 @@ export async function fetchSourceFilesFromMetadata(
         const ipfsHash = ipfsLink.split("ipfs/")[1];
         return download({
           client: options.client,
-          uri: `ipfs://${ipfsHash}`,
           // 3 sec timeout for sources that haven't been uploaded to ipfs
           requestTimeoutMs: 3000,
+          uri: `ipfs://${ipfsHash}`,
         })
           .then((res) => res.text())
           .then((source) => ({ filename: path, source }));
diff --git a/packages/thirdweb/src/engine/create-server-wallet.ts b/packages/thirdweb/src/engine/create-server-wallet.ts
index 8ce9131c1ef..c410b47e9cd 100644
--- a/packages/thirdweb/src/engine/create-server-wallet.ts
+++ b/packages/thirdweb/src/engine/create-server-wallet.ts
@@ -32,11 +32,11 @@ export async function createServerWallet(params: CreateServerWalletArgs) {
   const { client, label } = params;
   const result = await createAccount({
     baseUrl: getThirdwebBaseUrl("engineCloud"),
-    bodySerializer: stringify,
-    fetch: getClientFetch(client),
     body: {
       label,
     },
+    bodySerializer: stringify,
+    fetch: getClientFetch(client),
   });
 
   if (result.error) {
diff --git a/packages/thirdweb/src/engine/get-status.ts b/packages/thirdweb/src/engine/get-status.ts
index b821de2bbf0..88e15459769 100644
--- a/packages/thirdweb/src/engine/get-status.ts
+++ b/packages/thirdweb/src/engine/get-status.ts
@@ -78,17 +78,17 @@ export async function getTransactionStatus(args: {
   const { client, transactionId } = args;
   const searchResult = await searchTransactions({
     baseUrl: getThirdwebBaseUrl("engineCloud"),
-    bodySerializer: stringify,
-    fetch: getClientFetch(client),
     body: {
       filters: [
         {
           field: "id",
-          values: [transactionId],
           operation: "OR",
+          values: [transactionId],
         },
       ],
     },
+    bodySerializer: stringify,
+    fetch: getClientFetch(client),
   });
 
   if (searchResult.error) {
@@ -108,10 +108,10 @@ export async function getTransactionStatus(args: {
   const executionResult = data.executionResult as ExecutionResult4337Serialized;
   return {
     ...executionResult,
-    createdAt: data.createdAt,
-    confirmedAt: data.confirmedAt,
     cancelledAt: data.cancelledAt,
     chain: getCachedChain(Number(data.chainId)),
+    confirmedAt: data.confirmedAt,
+    createdAt: data.createdAt,
     from: data.from ?? undefined,
     id: data.id,
   };
diff --git a/packages/thirdweb/src/engine/index.ts b/packages/thirdweb/src/engine/index.ts
index 4948f53e98c..bbb1c4f3741 100644
--- a/packages/thirdweb/src/engine/index.ts
+++ b/packages/thirdweb/src/engine/index.ts
@@ -1,23 +1,23 @@
 export {
-  serverWallet,
-  type ServerWalletOptions,
-  type ServerWallet,
-} from "./server-wallet.js";
+  type CreateServerWalletArgs,
+  createServerWallet,
+} from "./create-server-wallet.js";
 export {
-  getTransactionStatus,
   type ExecutionResult,
+  getTransactionStatus,
   type RevertData,
 } from "./get-status.js";
-export { waitForTransactionHash } from "./wait-for-tx-hash.js";
 export {
-  searchTransactions,
+  type GetServerWalletsArgs,
+  getServerWallets,
+} from "./list-server-wallets.js";
+export {
   type SearchTransactionsArgs,
+  searchTransactions,
 } from "./search-transactions.js";
 export {
-  createServerWallet,
-  type CreateServerWalletArgs,
-} from "./create-server-wallet.js";
-export {
-  getServerWallets,
-  type GetServerWalletsArgs,
-} from "./list-server-wallets.js";
+  type ServerWallet,
+  type ServerWalletOptions,
+  serverWallet,
+} from "./server-wallet.js";
+export { waitForTransactionHash } from "./wait-for-tx-hash.js";
diff --git a/packages/thirdweb/src/engine/search-transactions.ts b/packages/thirdweb/src/engine/search-transactions.ts
index 798dc621b7b..be92534bfb7 100644
--- a/packages/thirdweb/src/engine/search-transactions.ts
+++ b/packages/thirdweb/src/engine/search-transactions.ts
@@ -1,7 +1,7 @@
 import {
+  searchTransactions as engineSearchTransactions,
   type TransactionsFilterNested,
   type TransactionsFilterValue,
-  searchTransactions as engineSearchTransactions,
 } from "@thirdweb-dev/engine";
 import type { ThirdwebClient } from "../client/client.js";
 import { getThirdwebBaseUrl } from "../utils/domains.js";
@@ -105,13 +105,13 @@ export async function searchTransactions(args: SearchTransactionsArgs) {
   const { client, filters, pageSize = 100, page = 1 } = args;
   const searchResult = await engineSearchTransactions({
     baseUrl: getThirdwebBaseUrl("engineCloud"),
-    bodySerializer: stringify,
-    fetch: getClientFetch(client),
     body: {
       filters,
       limit: pageSize,
       page,
     },
+    bodySerializer: stringify,
+    fetch: getClientFetch(client),
   });
 
   if (searchResult.error) {
diff --git a/packages/thirdweb/src/engine/server-wallet.test.ts b/packages/thirdweb/src/engine/server-wallet.test.ts
index b032f21ed62..ebed81b59b9 100644
--- a/packages/thirdweb/src/engine/server-wallet.test.ts
+++ b/packages/thirdweb/src/engine/server-wallet.test.ts
@@ -40,10 +40,10 @@ describe.runIf(
       //   engineCloud: "engine.thirdweb-dev.com",
       // });
       serverWallet = Engine.serverWallet({
-        client: TEST_CLIENT,
-        vaultAccessToken: process.env.VAULT_TOKEN as string,
         address: process.env.ENGINE_CLOUD_WALLET_ADDRESS as string,
         chain: arbitrumSepolia,
+        client: TEST_CLIENT,
+        vaultAccessToken: process.env.VAULT_TOKEN as string,
       });
     });
 
@@ -82,8 +82,8 @@ describe.runIf(
       const tx = await sendTransaction({
         account: serverWallet,
         transaction: {
-          client: TEST_CLIENT,
           chain: arbitrumSepolia,
+          client: TEST_CLIENT,
           to: TEST_ACCOUNT_B.address,
           value: 0n,
         },
@@ -93,15 +93,15 @@ describe.runIf(
 
     it("should enqueue a tx", async () => {
       const nftContract = getContract({
-        client: TEST_CLIENT,
-        chain: sepolia,
         address: "0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8",
+        chain: sepolia,
+        client: TEST_CLIENT,
       });
       const claimTx = claimTo({
         contract: nftContract,
+        quantity: 1n,
         to: serverWallet.address,
         tokenId: 0n,
-        quantity: 1n,
       });
       const result = await serverWallet.enqueueTransaction({
         transaction: claimTx,
@@ -116,7 +116,7 @@ describe.runIf(
       const res = await Engine.searchTransactions({
         client: TEST_CLIENT,
         filters: [
-          { field: "id", values: [result.transactionId], operation: "OR" },
+          { field: "id", operation: "OR", values: [result.transactionId] },
         ],
       });
       expect(res).toBeDefined();
@@ -126,14 +126,14 @@ describe.runIf(
 
     it("should send a extension tx", async () => {
       const tokenContract = getContract({
-        client: TEST_CLIENT,
-        chain: baseSepolia,
         address: "0x87C52295891f208459F334975a3beE198fE75244",
+        chain: baseSepolia,
+        client: TEST_CLIENT,
       });
       const claimTx = mintTo({
+        amount: "0.001",
         contract: tokenContract,
         to: serverWallet.address,
-        amount: "0.001",
       });
       const tx = await sendTransaction({
         account: serverWallet,
@@ -144,19 +144,19 @@ describe.runIf(
 
     it("should enqueue a batch of txs", async () => {
       const tokenContract = getContract({
-        client: TEST_CLIENT,
-        chain: baseSepolia,
         address: "0x87C52295891f208459F334975a3beE198fE75244",
+        chain: baseSepolia,
+        client: TEST_CLIENT,
       });
       const claimTx1 = mintTo({
+        amount: "0.001",
         contract: tokenContract,
         to: serverWallet.address,
-        amount: "0.001",
       });
       const claimTx2 = mintTo({
+        amount: "0.002",
         contract: tokenContract,
         to: serverWallet.address,
-        amount: "0.002",
       });
       const tx = await serverWallet.enqueueBatchTransaction({
         transactions: [claimTx1, claimTx2],
@@ -171,16 +171,16 @@ describe.runIf(
 
     it("should get revert reason", async () => {
       const nftContract = getContract({
-        client: TEST_CLIENT,
-        chain: sepolia,
         address: "0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8",
+        chain: sepolia,
+        client: TEST_CLIENT,
       });
       const transaction = setContractURI({
         contract: nftContract,
-        uri: "https://example.com",
         overrides: {
           gas: 1000000n, // skip simulation
         },
+        uri: "https://example.com",
       });
       await expect(
         sendTransaction({
@@ -198,13 +198,13 @@ describe.runIf(
       });
       const smart = smartWallet({
         chain: sepolia,
-        sponsorGas: true,
         sessionKey: {
           address: sessionKeyAccountAddress,
           permissions: {
             approvedTargets: "*",
           },
         },
+        sponsorGas: true,
       });
       const smartAccount = await smart.connect({
         client: TEST_CLIENT,
@@ -214,32 +214,32 @@ describe.runIf(
 
       const signers = await getAllActiveSigners({
         contract: getContract({
-          client: TEST_CLIENT,
-          chain: sepolia,
           address: smartAccount.address,
+          chain: sepolia,
+          client: TEST_CLIENT,
         }),
       });
       expect(signers.map((s) => s.signer)).toContain(sessionKeyAccountAddress);
 
       const serverWallet = Engine.serverWallet({
-        client: TEST_CLIENT,
-        vaultAccessToken: process.env.VAULT_TOKEN as string,
         address: sessionKeyAccountAddress,
         chain: sepolia,
+        client: TEST_CLIENT,
         executionOptions: {
-          type: "ERC4337",
+          entrypointAddress: ENTRYPOINT_ADDRESS_v0_6,
+          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
           signerAddress: sessionKeyAccountAddress,
           smartAccountAddress: smartAccount.address,
-          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
-          entrypointAddress: ENTRYPOINT_ADDRESS_v0_6,
+          type: "ERC4337",
         },
+        vaultAccessToken: process.env.VAULT_TOKEN as string,
       });
 
       const tx = await sendTransaction({
         account: serverWallet,
         transaction: {
-          client: TEST_CLIENT,
           chain: sepolia,
+          client: TEST_CLIENT,
           to: TEST_ACCOUNT_B.address,
           value: 0n,
         },
diff --git a/packages/thirdweb/src/engine/server-wallet.ts b/packages/thirdweb/src/engine/server-wallet.ts
index 20eeec0f0d7..17f5b1a9836 100644
--- a/packages/thirdweb/src/engine/server-wallet.ts
+++ b/packages/thirdweb/src/engine/server-wallet.ts
@@ -159,8 +159,8 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
           chainId: chainId.toString(),
         }
       : {
-          from: address,
           chainId: chainId.toString(),
+          from: address,
         };
   };
 
@@ -184,18 +184,18 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
     const body = {
       executionOptions: getExecutionOptions(chainId),
       params: transaction.map((t) => ({
-        to: t.to ?? undefined,
         data: t.data,
+        to: t.to ?? undefined,
         value: t.value?.toString(),
       })),
     };
 
     const result = await sendTransaction({
       baseUrl: getThirdwebBaseUrl("engineCloud"),
+      body,
       bodySerializer: stringify,
       fetch: getClientFetch(client),
       headers,
-      body,
     });
 
     if (result.error) {
@@ -211,6 +211,30 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
 
   return {
     address,
+    enqueueBatchTransaction: async (args: {
+      transactions: PreparedTransaction[];
+    }) => {
+      const serializedTransactions: SendTransactionOption[] = [];
+      for (const transaction of args.transactions) {
+        const [to, data, value] = await Promise.all([
+          transaction.to ? resolvePromisedValue(transaction.to) : null,
+          encode(transaction),
+          transaction.value ? resolvePromisedValue(transaction.value) : null,
+        ]);
+        serializedTransactions.push({
+          chainId: transaction.chain.id,
+          data,
+          to: to ?? undefined,
+          value: value ?? undefined,
+        });
+      }
+      const transactionIds = await enqueueTx(serializedTransactions);
+      const transactionId = transactionIds[0];
+      if (!transactionId) {
+        throw new Error("No transactionId returned from engine");
+      }
+      return { transactionId };
+    },
     enqueueTransaction: async (args: {
       transaction: PreparedTransaction;
       simulate?: boolean;
@@ -244,32 +268,8 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
       }
       return { transactionId };
     },
-    enqueueBatchTransaction: async (args: {
-      transactions: PreparedTransaction[];
-    }) => {
-      const serializedTransactions: SendTransactionOption[] = [];
-      for (const transaction of args.transactions) {
-        const [to, data, value] = await Promise.all([
-          transaction.to ? resolvePromisedValue(transaction.to) : null,
-          encode(transaction),
-          transaction.value ? resolvePromisedValue(transaction.value) : null,
-        ]);
-        serializedTransactions.push({
-          chainId: transaction.chain.id,
-          data,
-          to: to ?? undefined,
-          value: value ?? undefined,
-        });
-      }
-      const transactionIds = await enqueueTx(serializedTransactions);
-      const transactionId = transactionIds[0];
-      if (!transactionId) {
-        throw new Error("No transactionId returned from engine");
-      }
-      return { transactionId };
-    },
-    sendTransaction: async (transaction: SendTransactionOption) => {
-      const transactionIds = await enqueueTx([transaction]);
+    sendBatchTransaction: async (transactions: SendTransactionOption[]) => {
+      const transactionIds = await enqueueTx(transactions);
       const transactionId = transactionIds[0];
       if (!transactionId) {
         throw new Error("No transactionId returned from engine");
@@ -279,8 +279,8 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
         transactionId,
       });
     },
-    sendBatchTransaction: async (transactions: SendTransactionOption[]) => {
-      const transactionIds = await enqueueTx(transactions);
+    sendTransaction: async (transaction: SendTransactionOption) => {
+      const transactionIds = await enqueueTx([transaction]);
       const transactionId = transactionIds[0];
       if (!transactionId) {
         throw new Error("No transactionId returned from engine");
@@ -308,9 +308,6 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
 
       const signResult = await signMessage({
         baseUrl: getThirdwebBaseUrl("engineCloud"),
-        bodySerializer: stringify,
-        fetch: getClientFetch(client),
-        headers,
         body: {
           executionOptions: getExecutionOptions(signingChainId),
           params: [
@@ -320,6 +317,9 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
             },
           ],
         },
+        bodySerializer: stringify,
+        fetch: getClientFetch(client),
+        headers,
       });
 
       if (signResult.error) {
@@ -345,14 +345,14 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
 
       const signResult = await signTypedData({
         baseUrl: getThirdwebBaseUrl("engineCloud"),
-        bodySerializer: stringify,
-        fetch: getClientFetch(client),
-        headers,
         body: {
           executionOptions: getExecutionOptions(signingChainId),
           // biome-ignore lint/suspicious/noExplicitAny: TODO: fix ts / hey-api type clash
           params: [typedData as any],
         },
+        bodySerializer: stringify,
+        fetch: getClientFetch(client),
+        headers,
       });
 
       if (signResult.error) {
diff --git a/packages/thirdweb/src/engine/wait-for-tx-hash.ts b/packages/thirdweb/src/engine/wait-for-tx-hash.ts
index d04d7e06915..dea317879ee 100644
--- a/packages/thirdweb/src/engine/wait-for-tx-hash.ts
+++ b/packages/thirdweb/src/engine/wait-for-tx-hash.ts
@@ -1,9 +1,7 @@
 import { stringify } from "viem";
-
-import type { Hex } from "../utils/encoding/hex.js";
-
 import type { ThirdwebClient } from "../client/client.js";
 import type { WaitForReceiptOptions } from "../transaction/actions/wait-for-tx-receipt.js";
+import type { Hex } from "../utils/encoding/hex.js";
 import { getTransactionStatus } from "./get-status.js";
 
 /**
@@ -58,9 +56,9 @@ export async function waitForTransactionHash(args: {
           );
         }
         return {
-          transactionHash: executionResult.transactionHash as Hex,
-          client: args.client,
           chain: executionResult.chain,
+          client: args.client,
+          transactionHash: executionResult.transactionHash as Hex,
         };
       }
       default: {
diff --git a/packages/thirdweb/src/event/actions/get-events.test.ts b/packages/thirdweb/src/event/actions/get-events.test.ts
index 1e696b78a26..e00856e8d14 100644
--- a/packages/thirdweb/src/event/actions/get-events.test.ts
+++ b/packages/thirdweb/src/event/actions/get-events.test.ts
@@ -25,8 +25,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
     const BLOCK_HASH =
       "0xb0ad5ee7b4912b50e5a2d7993796944653a4c0632c57740fe4a7a1c61e426324";
     const events = await getContractEvents({
-      contract: USDT_CONTRACT,
       blockHash: BLOCK_HASH,
+      contract: USDT_CONTRACT,
     });
 
     expect(events.length).toBe(14);
@@ -34,8 +34,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
 
   it("should get events for blockRange", async () => {
     const events = await getContractEvents({
-      contract: USDT_CONTRACT,
       blockRange: 10n,
+      contract: USDT_CONTRACT,
       useIndexer: false,
     });
     expect(events.length).toBe(241);
@@ -51,17 +51,17 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
 
   it("should get events for blockRange using fromBlock and toBlock", async () => {
     const eventsFromBlock = await getContractEvents({
+      blockRange: 20n,
       contract: USDT_CONTRACT,
       fromBlock: FORK_BLOCK_NUMBER - 49n,
-      blockRange: 20n,
       useIndexer: false,
     });
     expect(eventsFromBlock.length).toBe(412);
 
     const eventsToBlock = await getContractEvents({
+      blockRange: 20n,
       contract: USDT_CONTRACT,
       toBlock: FORK_BLOCK_NUMBER - 30n,
-      blockRange: 20n,
       useIndexer: false,
     });
     expect(eventsToBlock.length).toBe(eventsFromBlock.length);
@@ -78,13 +78,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
   it("should get individual events with signature", async () => {
     const events = await getContractEvents({
       contract: USDT_CONTRACT,
-      fromBlock: FORK_BLOCK_NUMBER - 100n,
-      useIndexer: false,
       events: [
         prepareEvent({
           signature: "event Burn(address indexed burner, uint256 amount)",
         }),
       ],
+      fromBlock: FORK_BLOCK_NUMBER - 100n,
+      useIndexer: false,
     });
     expect(events.length).toMatchInlineSnapshot("0");
   });
@@ -92,9 +92,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
   it("should get specified events", async () => {
     const events = await getContractEvents({
       contract: USDT_CONTRACT,
-      fromBlock: FORK_BLOCK_NUMBER - 10n,
-      toBlock: FORK_BLOCK_NUMBER,
-      useIndexer: false,
       events: [
         prepareEvent({
           signature: "event Burn(address indexed burner, uint256 amount)",
@@ -127,6 +124,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
           },
         }),
       ],
+      fromBlock: FORK_BLOCK_NUMBER - 10n,
+      toBlock: FORK_BLOCK_NUMBER,
+      useIndexer: false,
     });
     expect(events.length).toMatchInlineSnapshot("9");
   });
@@ -134,10 +134,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
   it("should get individual events with extension", async () => {
     const events = await getContractEvents({
       contract: DOODLES_CONTRACT,
+      events: [transferEvent()],
       fromBlock: FORK_BLOCK_NUMBER - 1000n,
       toBlock: FORK_BLOCK_NUMBER,
       useIndexer: false,
-      events: [transferEvent()],
     });
     expect(events.length).toBe(38);
   });
@@ -145,14 +145,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
   it("should get individual events with filters", async () => {
     const events = await getContractEvents({
       contract: DOODLES_CONTRACT,
-      fromBlock: FORK_BLOCK_NUMBER - 1000n,
-      toBlock: FORK_BLOCK_NUMBER,
-      useIndexer: false,
       events: [
         transferEvent({
           from: "0xB81965DdFdDA3923f292a47A1be83ba3A36B5133",
         }),
       ],
+      fromBlock: FORK_BLOCK_NUMBER - 1000n,
+      toBlock: FORK_BLOCK_NUMBER,
+      useIndexer: false,
     });
     expect(events.length).toBe(2);
   });
@@ -163,8 +163,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
     const BLOCK_HASH =
       "0xb0ad5ee7b4912b50e5a2d7993796944653a4c0632c57740fe4a7a1c61e426324";
     const events = await getContractEvents({
-      contract: USDT_CONTRACT,
       blockHash: BLOCK_HASH,
+      contract: USDT_CONTRACT,
       useIndexer: true,
     });
 
@@ -174,9 +174,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
   it("should get individual events with extension no filter using indexer", async () => {
     const events = await getContractEvents({
       contract: DOODLES_CONTRACT,
+      events: [transferEvent()],
       fromBlock: FORK_BLOCK_NUMBER - 1000n,
       toBlock: FORK_BLOCK_NUMBER,
-      events: [transferEvent()],
       useIndexer: true,
     });
     expect(events.length).toBe(38);
@@ -185,13 +185,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
   it("should get events for signature using indexer", async () => {
     const events = await getContractEvents({
       contract: DOODLES_CONTRACT,
-      fromBlock: FORK_BLOCK_NUMBER - 1000n,
-      toBlock: FORK_BLOCK_NUMBER,
       events: [
         transferEvent({
           from: "0xB81965DdFdDA3923f292a47A1be83ba3A36B5133",
         }),
       ],
+      fromBlock: FORK_BLOCK_NUMBER - 1000n,
+      toBlock: FORK_BLOCK_NUMBER,
       useIndexer: true,
     });
 
@@ -201,9 +201,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
   it("should get specified events using indexer", async () => {
     const events = await getContractEvents({
       contract: USDT_CONTRACT,
-      fromBlock: FORK_BLOCK_NUMBER - 10n,
-      toBlock: FORK_BLOCK_NUMBER,
-      useIndexer: true,
       events: [
         prepareEvent({
           signature: "event Burn(address indexed burner, uint256 amount)",
@@ -236,6 +233,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
           },
         }),
       ],
+      fromBlock: FORK_BLOCK_NUMBER - 10n,
+      toBlock: FORK_BLOCK_NUMBER,
+      useIndexer: true,
     });
     expect(events.length).toMatchInlineSnapshot("9");
   });
diff --git a/packages/thirdweb/src/event/actions/get-events.ts b/packages/thirdweb/src/event/actions/get-events.ts
index 52fd4292676..8143f5e609a 100644
--- a/packages/thirdweb/src/event/actions/get-events.ts
+++ b/packages/thirdweb/src/event/actions/get-events.ts
@@ -4,7 +4,7 @@ import type {
   ExtractAbiEvent,
   ExtractAbiEventNames,
 } from "abitype";
-import { type Log, formatLog } from "viem";
+import { formatLog, type Log } from "viem";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import {
@@ -13,9 +13,9 @@ import {
 } from "../../insight/get-events.js";
 import { eth_blockNumber } from "../../rpc/actions/eth_blockNumber.js";
 import {
+  eth_getLogs,
   type GetLogsBlockParams,
   type GetLogsParams,
-  eth_getLogs,
 } from "../../rpc/actions/eth_getLogs.js";
 import { getRpcClient } from "../../rpc/rpc.js";
 import { getAddress } from "../../utils/address.js";
@@ -162,15 +162,15 @@ export async function getContractEvents<
     if (useIndexer) {
       // fetch all events from the indexer, no need to get events from ABI
       const events = await getContractEventsInsight({
-        client: contract.client,
         chains: [contract.chain],
+        client: contract.client,
         contractAddress: contract.address,
         decodeLogs: true,
         queryOptions: {
-          limit: 500,
           filter_block_hash: restParams.blockHash,
           filter_block_number_gte: restParams.fromBlock,
           filter_block_number_lte: restParams.toBlock,
+          limit: 500,
         },
       }).catch(() => {
         // chain might not support indexer
@@ -215,8 +215,8 @@ export async function getContractEvents<
       logs = await Promise.all(
         logsParams.map((p) =>
           getLogsFromInsight({
-            params: p,
             contract,
+            params: p,
           }),
         ),
       );
@@ -238,8 +238,8 @@ export async function getContractEvents<
     .flat()
     .sort((a, b) => Number((a.blockNumber ?? 0n) - (b.blockNumber ?? 0n)));
   return parseEventLogs({
-    logs: flattenLogs,
     events: resolvedEvents,
+    logs: flattenLogs,
   });
 }
 
@@ -256,11 +256,10 @@ async function getLogsFromInsight(options: {
     typeof params.toBlock === "bigint" ? Number(params.toBlock) : undefined;
 
   const r = await getContractEventsInsight({
-    client: contract.client,
     chains: [contract.chain],
+    client: contract.client,
     contractAddress: contract.address,
     queryOptions: {
-      limit: 500,
       filter_block_hash: params.blockHash,
       filter_block_number_gte: fromBlock,
       filter_block_number_lte: toBlock,
@@ -268,6 +267,7 @@ async function getLogsFromInsight(options: {
       filter_topic_1: params.topics?.[1] as Hex | undefined,
       filter_topic_2: params.topics?.[2] as Hex | undefined,
       filter_topic_3: params.topics?.[3] as Hex | undefined,
+      limit: 500,
     },
   });
 
@@ -276,23 +276,23 @@ async function getLogsFromInsight(options: {
 
 function toLog(r: ContractEvent[]) {
   const cleanedEventData = r.map((tx) => ({
-    chainId: tx.chain_id,
-    blockNumber: numberToHex(Number(tx.block_number)),
+    address: tx.address,
     blockHash: tx.block_hash as Hex,
+    blockNumber: numberToHex(Number(tx.block_number)),
     blockTimestamp: tx.block_timestamp,
-    transactionHash: tx.transaction_hash as Hex,
-    transactionIndex: numberToHex(tx.transaction_index),
-    logIndex: numberToHex(tx.log_index),
-    address: tx.address,
+    chainId: tx.chain_id,
     data: tx.data as Hex,
+    logIndex: numberToHex(tx.log_index),
     topics: tx.topics as [`0x${string}`, ...`0x${string}`[]] | [] | undefined,
+    transactionHash: tx.transaction_hash as Hex,
+    transactionIndex: numberToHex(tx.transaction_index),
     ...(tx.decoded
       ? {
-          eventName: tx.decoded.name,
           args: {
             ...tx.decoded.indexed_params,
             ...tx.decoded.non_indexed_params,
           },
+          eventName: tx.decoded.name,
         }
       : {}),
   }));
diff --git a/packages/thirdweb/src/event/actions/parse-logs.test.ts b/packages/thirdweb/src/event/actions/parse-logs.test.ts
index 63a878d34ac..6874ed385a0 100644
--- a/packages/thirdweb/src/event/actions/parse-logs.test.ts
+++ b/packages/thirdweb/src/event/actions/parse-logs.test.ts
@@ -6,53 +6,53 @@ import { parseEventLogs } from "./parse-logs.js";
 const LOGS = [
   {
     address: "0x06450dee7fd2fb8e39061434babcfc05599a6fb8",
+    blockHash:
+      "0x2a26c203c100c58404d58abfb340920647e6ce962f1669c4e5c2d1741d5cdb1f",
+    blockNumber: "0x125544b",
+    data: "0x0000000000000000000000000000000000000000000000000000000000000000",
+    logIndex: "0xd8",
+    removed: false,
     topics: [
       "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
       "0x0000000000000000000000000000000000000000000000000000000000000000",
       "0x00000000000000000000000080f0d7c215ea4067609bd8f410b130d10cafa817",
     ],
-    data: "0x0000000000000000000000000000000000000000000000000000000000000000",
-    blockNumber: "0x125544b",
     transactionHash:
       "0x7d674c4a6b17eae2b0490dfc007bdb345e5046da3815e91ef5a4e252f81c3e19",
     transactionIndex: "0x59",
-    blockHash:
-      "0x2a26c203c100c58404d58abfb340920647e6ce962f1669c4e5c2d1741d5cdb1f",
-    logIndex: "0xd8",
-    removed: false,
   },
   {
     address: "0x06450dee7fd2fb8e39061434babcfc05599a6fb8",
+    blockHash:
+      "0x2a26c203c100c58404d58abfb340920647e6ce962f1669c4e5c2d1741d5cdb1f",
+    blockNumber: "0x125544b",
+    data: "0x0000000000000000000000000000000000000000001a7a608c0cd81965d40000",
+    logIndex: "0xd9",
+    removed: false,
     topics: [
       "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
       "0x0000000000000000000000000000000000000000000000000000000000000000",
       "0x000000000000000000000000e5c232f3fd62f104db6f2a05aa6b5d1db15a20f7",
     ],
-    data: "0x0000000000000000000000000000000000000000001a7a608c0cd81965d40000",
-    blockNumber: "0x125544b",
     transactionHash:
       "0x7d674c4a6b17eae2b0490dfc007bdb345e5046da3815e91ef5a4e252f81c3e19",
     transactionIndex: "0x59",
-    blockHash:
-      "0x2a26c203c100c58404d58abfb340920647e6ce962f1669c4e5c2d1741d5cdb1f",
-    logIndex: "0xd9",
-    removed: false,
   },
   {
     address: "0x06450dee7fd2fb8e39061434babcfc05599a6fb8",
+    blockHash:
+      "0x2a26c203c100c58404d58abfb340920647e6ce962f1669c4e5c2d1741d5cdb1f",
+    blockNumber: "0x125544b",
+    data: "0x0000000000000000000000000000000000000000001a7a608c0cd81965d40000",
+    logIndex: "0xda",
+    removed: false,
     topics: [
       "0xd74752b13281df13701575f3a507e9b1242e0b5fb040143211c481c1fce573a6",
       "0x00000000000000000000000080f0d7c215ea4067609bd8f410b130d10cafa817",
     ],
-    data: "0x0000000000000000000000000000000000000000001a7a608c0cd81965d40000",
-    blockNumber: "0x125544b",
     transactionHash:
       "0x7d674c4a6b17eae2b0490dfc007bdb345e5046da3815e91ef5a4e252f81c3e19",
     transactionIndex: "0x59",
-    blockHash:
-      "0x2a26c203c100c58404d58abfb340920647e6ce962f1669c4e5c2d1741d5cdb1f",
-    logIndex: "0xda",
-    removed: false,
   },
 ] satisfies RpcLog[];
 
@@ -62,7 +62,7 @@ describe("parseLogs", () => {
       signature:
         "event Transfer(address indexed from, address indexed to, uint256 value)",
     });
-    const result = parseEventLogs({ logs: LOGS, events: [event] });
+    const result = parseEventLogs({ events: [event], logs: LOGS });
     // there's 3 logs but only 2 match the event
     expect(result.length).toBe(2);
     expect(result).toMatchInlineSnapshot(`
diff --git a/packages/thirdweb/src/event/actions/parse-logs.ts b/packages/thirdweb/src/event/actions/parse-logs.ts
index 54a38e0aa3f..de136f42ee2 100644
--- a/packages/thirdweb/src/event/actions/parse-logs.ts
+++ b/packages/thirdweb/src/event/actions/parse-logs.ts
@@ -43,8 +43,8 @@ export function parseEventLogs<
 ): ParseEventLogsResult<abiEvents, TStrict> {
   const { logs, events, strict } = options;
   return viem_parseEventLogs({
-    logs,
     abi: events.map((e) => e.abiEvent),
+    logs,
     strict,
   }) as unknown as ParseEventLogsResult<abiEvents, TStrict>;
 }
diff --git a/packages/thirdweb/src/event/actions/watch-events.ts b/packages/thirdweb/src/event/actions/watch-events.ts
index ca703e9e068..85ed6011ebf 100644
--- a/packages/thirdweb/src/event/actions/watch-events.ts
+++ b/packages/thirdweb/src/event/actions/watch-events.ts
@@ -1,13 +1,12 @@
 import type { Abi, AbiEvent } from "abitype";
-import {
-  type GetContractEventsOptionsDirect,
-  getContractEvents,
-} from "./get-events.js";
-
 import { watchBlockNumber } from "../../rpc/watchBlockNumber.js";
 import { retry } from "../../utils/retry.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { PreparedEvent } from "../prepare-event.js";
+import {
+  type GetContractEventsOptionsDirect,
+  getContractEvents,
+} from "./get-events.js";
 import type { ParseEventLogsResult } from "./parse-logs.js";
 
 export type WatchContractEventsOptions<
@@ -61,6 +60,7 @@ export function watchContractEvents<
   // returning this returns the underlying "unwatch" function
   return watchBlockNumber({
     ...options.contract,
+    latestBlockNumber: options.latestBlockNumber,
 
     /**
      * This function is called every time a new block is mined.
@@ -80,8 +80,8 @@ export function watchContractEvents<
             useIndexer: false,
           }),
         {
-          retries: 3,
           delay: 500,
+          retries: 3,
         },
       );
       // if there were any logs associated with our event(s)
@@ -89,6 +89,5 @@ export function watchContractEvents<
         options.onEvents(logs);
       }
     },
-    latestBlockNumber: options.latestBlockNumber,
   });
 }
diff --git a/packages/thirdweb/src/event/prepare-event.test.ts b/packages/thirdweb/src/event/prepare-event.test.ts
index 7092133f03b..0eb337c772e 100644
--- a/packages/thirdweb/src/event/prepare-event.test.ts
+++ b/packages/thirdweb/src/event/prepare-event.test.ts
@@ -40,12 +40,12 @@ describe("prepareEvent", () => {
 
   it("should prepare event with params", () => {
     const event = prepareEvent({
-      signature:
-        "event Transfer(address indexed from, address indexed to, uint256 value)",
       filters: {
         from: "0x80f0d7c215ea4067609bd8f410b130d10cafa817",
         to: "0xe5c232f3fd62f104db6f2a05aa6b5d1db15a20f7",
       },
+      signature:
+        "event Transfer(address indexed from, address indexed to, uint256 value)",
     });
 
     expect(event).toMatchInlineSnapshot(`
diff --git a/packages/thirdweb/src/event/prepare-event.ts b/packages/thirdweb/src/event/prepare-event.ts
index 83f8432fcb8..a87f94b6c1d 100644
--- a/packages/thirdweb/src/event/prepare-event.ts
+++ b/packages/thirdweb/src/event/prepare-event.ts
@@ -1,5 +1,5 @@
 import { type AbiEvent, type ParseAbiItem, parseAbiItem } from "abitype";
-import { type Hex, encodeEventTopics, toEventHash } from "viem";
+import { encodeEventTopics, type Hex, toEventHash } from "viem";
 import type { AbiEventParametersToPrimitiveTypes } from "./types.js";
 import { isAbiEvent } from "./utils.js";
 
diff --git a/packages/thirdweb/src/exports/adapters/ethers5.ts b/packages/thirdweb/src/exports/adapters/ethers5.ts
index 9916987b318..1de6a8a98e9 100644
--- a/packages/thirdweb/src/exports/adapters/ethers5.ts
+++ b/packages/thirdweb/src/exports/adapters/ethers5.ts
@@ -1,8 +1,8 @@
 export {
   ethers5Adapter,
   fromEthersContract,
+  fromEthersSigner,
   toEthersContract,
   toEthersProvider,
   toEthersSigner,
-  fromEthersSigner,
 } from "../../adapters/ethers5.js";
diff --git a/packages/thirdweb/src/exports/adapters/ethers6.ts b/packages/thirdweb/src/exports/adapters/ethers6.ts
index 50403166e37..c9829e81d2e 100644
--- a/packages/thirdweb/src/exports/adapters/ethers6.ts
+++ b/packages/thirdweb/src/exports/adapters/ethers6.ts
@@ -1,8 +1,8 @@
 export {
   ethers6Adapter,
-  toEthersSigner,
   fromEthersContract,
   fromEthersSigner,
   toEthersContract,
   toEthersProvider,
+  toEthersSigner,
 } from "../../adapters/ethers6.js";
diff --git a/packages/thirdweb/src/exports/auth.ts b/packages/thirdweb/src/exports/auth.ts
index 2e3459fbf59..a7ac573b0d4 100644
--- a/packages/thirdweb/src/exports/auth.ts
+++ b/packages/thirdweb/src/exports/auth.ts
@@ -1,30 +1,27 @@
+export { createAuth } from "../auth/auth.js";
+export type { GenerateLoginPayloadParams } from "../auth/core/generate-login-payload.js";
+// meant to be used on the "client" side to sign the login payload with a given account
 export {
-  verifySignature,
-  type VerifySignatureParams,
-  verifyEOASignature,
-  type VerifyEOASignatureParams,
-  verifyContractWalletSignature,
-  type VerifyContractWalletSignatureParams,
-} from "../auth/verify-signature.js";
-
+  type SignLoginPayloadParams,
+  signLoginPayload,
+} from "../auth/core/sign-login-payload.js";
+export type { AuthOptions, LoginPayload } from "../auth/core/types.js";
+export type {
+  VerifyLoginPayloadParams,
+  VerifyLoginPayloadResult,
+} from "../auth/core/verify-login-payload.js";
 export { isErc6492Signature } from "../auth/is-erc6492-signature.js";
-export { serializeErc6492Signature } from "../auth/serialize-erc6492-signature.js";
 export {
-  parseErc6492Signature,
   type ParseErc6492SignatureReturnType,
+  parseErc6492Signature,
 } from "../auth/parse-erc6492-signature.js";
+export { serializeErc6492Signature } from "../auth/serialize-erc6492-signature.js";
 export type { Erc6492Signature } from "../auth/types.js";
-
-export { createAuth } from "../auth/auth.js";
-export type {
-  VerifyLoginPayloadParams,
-  VerifyLoginPayloadResult,
-} from "../auth/core/verify-login-payload.js";
-export type { GenerateLoginPayloadParams } from "../auth/core/generate-login-payload.js";
-export type { AuthOptions, LoginPayload } from "../auth/core/types.js";
-
-// meant to be used on the "client" side to sign the login payload with a given account
 export {
-  signLoginPayload,
-  type SignLoginPayloadParams,
-} from "../auth/core/sign-login-payload.js";
+  type VerifyContractWalletSignatureParams,
+  type VerifyEOASignatureParams,
+  type VerifySignatureParams,
+  verifyContractWalletSignature,
+  verifyEOASignature,
+  verifySignature,
+} from "../auth/verify-signature.js";
diff --git a/packages/thirdweb/src/exports/chains.ts b/packages/thirdweb/src/exports/chains.ts
index 8c4271be4c4..8a73ef5962b 100644
--- a/packages/thirdweb/src/exports/chains.ts
+++ b/packages/thirdweb/src/exports/chains.ts
@@ -1,87 +1,87 @@
 // chain types
-export type { Chain, ChainOptions, ChainMetadata } from "../chains/types.js";
-// define chain, chainMetadata
-export {
-  defineChain,
-  getChainMetadata,
-  getRpcUrlForChain,
-} from "../chains/utils.js";
+
+export { abstract } from "../chains/chain-definitions/abstract.js";
+export { abstractTestnet } from "../chains/chain-definitions/abstract-testnet.js";
 
 /**
  * PRE_DEFINED CHAINS
  */
 export { anvil } from "../chains/chain-definitions/anvil.js";
-export { hardhat } from "../chains/chain-definitions/hardhat.js";
+export { arbitrum } from "../chains/chain-definitions/arbitrum.js";
 export { arbitrumNova } from "../chains/chain-definitions/arbitrum-nova.js";
 export { arbitrumSepolia } from "../chains/chain-definitions/arbitrum-sepolia.js";
-export { arbitrum } from "../chains/chain-definitions/arbitrum.js";
-export { avalancheFuji } from "../chains/chain-definitions/avalanche-fuji.js";
+export { assetChainTestnet } from "../chains/chain-definitions/assetchain-testnet.js";
+export { astriaEvmDusknet } from "../chains/chain-definitions/astria-evm-dusknet.js";
 export { avalanche } from "../chains/chain-definitions/avalanche.js";
-export { baseSepolia } from "../chains/chain-definitions/base-sepolia.js";
+export { avalancheFuji } from "../chains/chain-definitions/avalanche-fuji.js";
 export { base } from "../chains/chain-definitions/base.js";
+export { baseSepolia } from "../chains/chain-definitions/base-sepolia.js";
+export { berachain } from "../chains/chain-definitions/berachain.js";
+export { berachainBepolia } from "../chains/chain-definitions/berachain-bepolia.js";
+export { blast } from "../chains/chain-definitions/blast.js";
+export { blastSepolia } from "../chains/chain-definitions/blast-sepolia.js";
+export { bsc } from "../chains/chain-definitions/bsc.js";
+export { bscTestnet } from "../chains/chain-definitions/bsc-testnet.js";
+export { celo } from "../chains/chain-definitions/celo.js";
+export { celoAlfajoresTestnet } from "../chains/chain-definitions/celo-alfajores-testnet.js";
+export { cronos } from "../chains/chain-definitions/cronos.js";
+export { degen } from "../chains/chain-definitions/degen.js";
 // mainnet = alias for ethereum
 export { ethereum, mainnet } from "../chains/chain-definitions/ethereum.js";
-export { blast } from "../chains/chain-definitions/blast.js";
-export { optimismSepolia } from "../chains/chain-definitions/optimism-sepolia.js";
-export { optimism } from "../chains/chain-definitions/optimism.js";
-export { lineaSepolia } from "../chains/chain-definitions/linea-sepolia.js";
-export { linea } from "../chains/chain-definitions/linea.js";
-export { astriaEvmDusknet } from "../chains/chain-definitions/astria-evm-dusknet.js";
 export { fantom } from "../chains/chain-definitions/fantom.js";
-export { polygonZkEvm } from "../chains/chain-definitions/polygon-zkevm.js";
+export { fantomTestnet } from "../chains/chain-definitions/fantom-testnet.js";
+export { frameTestnet } from "../chains/chain-definitions/frame-testnet.js";
+export { fraxtalTestnet } from "../chains/chain-definitions/fraxtal-testnet.js";
 export { gnosis } from "../chains/chain-definitions/gnosis.js";
+export { gnosisChiadoTestnet } from "../chains/chain-definitions/gnosis-chiado-testnet.js";
+export { godWoken } from "../chains/chain-definitions/god-woken.js";
+export { godWokenTestnetV1 } from "../chains/chain-definitions/god-woken-testnet-v1.js";
+export { hardhat } from "../chains/chain-definitions/hardhat.js";
+export { hokumTestnet } from "../chains/chain-definitions/hokum-testnet.js";
+export { linea } from "../chains/chain-definitions/linea.js";
+export { lineaSepolia } from "../chains/chain-definitions/linea-sepolia.js";
+export { localhost } from "../chains/chain-definitions/localhost.js";
+export { loot } from "../chains/chain-definitions/loot.js";
 export { mantaPacific } from "../chains/chain-definitions/manta-pacific.js";
-export { xai } from "../chains/chain-definitions/xai.js";
-export { celo } from "../chains/chain-definitions/celo.js";
-export { cronos } from "../chains/chain-definitions/cronos.js";
-export { degen } from "../chains/chain-definitions/degen.js";
-export { scroll } from "../chains/chain-definitions/scroll.js";
+export { mantaPacificTestnet } from "../chains/chain-definitions/manta-pacific-testnet.js";
+export { metalL2Testnet } from "../chains/chain-definitions/metal-l2-testnet.js";
+export { mode } from "../chains/chain-definitions/mode.js";
+export { modeTestnet } from "../chains/chain-definitions/mode-testnet.js";
+export { monadTestnet } from "../chains/chain-definitions/monad-testnet.js";
 export { moonbeam } from "../chains/chain-definitions/moonbeam.js";
-export { loot } from "../chains/chain-definitions/loot.js";
+export { optimism } from "../chains/chain-definitions/optimism.js";
+export { optimismSepolia } from "../chains/chain-definitions/optimism-sepolia.js";
 export { palm } from "../chains/chain-definitions/palm.js";
-export { rari } from "../chains/chain-definitions/rari.js";
-export { godWoken } from "../chains/chain-definitions/god-woken.js";
-
+export { palmTestnet } from "../chains/chain-definitions/palm-testnet.js";
+export { polygon } from "../chains/chain-definitions/polygon.js";
+export { polygonAmoy } from "../chains/chain-definitions/polygon-amoy.js";
 // mumbai = alias for polygonMumbai
 export {
-  polygonMumbai,
   mumbai,
+  polygonMumbai,
 } from "../chains/chain-definitions/polygon-mumbai.js";
-export { polygonAmoy } from "../chains/chain-definitions/polygon-amoy.js";
-export { polygon } from "../chains/chain-definitions/polygon.js";
-export { sepolia } from "../chains/chain-definitions/sepolia.js";
-export { zoraSepolia } from "../chains/chain-definitions/zora-sepolia.js";
-export { zora } from "../chains/chain-definitions/zora.js";
-export { bsc } from "../chains/chain-definitions/bsc.js";
-export { bscTestnet } from "../chains/chain-definitions/bsc-testnet.js";
-export { zkSync } from "../chains/chain-definitions/zksync.js";
-export { zkSyncSepolia } from "../chains/chain-definitions/zksync-sepolia.js";
-export { localhost } from "../chains/chain-definitions/localhost.js";
-export { zkCandySepolia } from "../chains/chain-definitions/zk-candy-sepolia.js";
-export { fantomTestnet } from "../chains/chain-definitions/fantom-testnet.js";
+export { polygonZkEvm } from "../chains/chain-definitions/polygon-zkevm.js";
 export { polygonZkEvmTestnet } from "../chains/chain-definitions/polygon-zkevm-testnet.js";
-export { gnosisChiadoTestnet } from "../chains/chain-definitions/gnosis-chiado-testnet.js";
-export { blastSepolia } from "../chains/chain-definitions/blast-sepolia.js";
-export { mantaPacificTestnet } from "../chains/chain-definitions/manta-pacific-testnet.js";
-export { xaiSepolia } from "../chains/chain-definitions/xai-sepolia.js";
+export { rari } from "../chains/chain-definitions/rari.js";
+export { rariTestnet } from "../chains/chain-definitions/rari-testnet.js";
+export { scroll } from "../chains/chain-definitions/scroll.js";
 export { scrollAlphaTestnet } from "../chains/chain-definitions/scroll-alpha-testnet.js";
 export { scrollSepoliaTestnet } from "../chains/chain-definitions/scroll-sepolia-testnet.js";
-export { palmTestnet } from "../chains/chain-definitions/palm-testnet.js";
-export { rariTestnet } from "../chains/chain-definitions/rari-testnet.js";
-export { frameTestnet } from "../chains/chain-definitions/frame-testnet.js";
-export { hokumTestnet } from "../chains/chain-definitions/hokum-testnet.js";
-export { godWokenTestnetV1 } from "../chains/chain-definitions/god-woken-testnet-v1.js";
-export { abstractTestnet } from "../chains/chain-definitions/abstract-testnet.js";
-export { abstract } from "../chains/chain-definitions/abstract.js";
-export { assetChainTestnet } from "../chains/chain-definitions/assetchain-testnet.js";
-export { celoAlfajoresTestnet } from "../chains/chain-definitions/celo-alfajores-testnet.js";
-export { fraxtalTestnet } from "../chains/chain-definitions/fraxtal-testnet.js";
-export { metalL2Testnet } from "../chains/chain-definitions/metal-l2-testnet.js";
-export { modeTestnet } from "../chains/chain-definitions/mode-testnet.js";
-export { mode } from "../chains/chain-definitions/mode.js";
+export { sepolia } from "../chains/chain-definitions/sepolia.js";
 export { soneiumMinato } from "../chains/chain-definitions/soneium-minato.js";
 export { treasure } from "../chains/chain-definitions/treasure.js";
 export { treasureTopaz } from "../chains/chain-definitions/treasureTopaz.js";
-export { monadTestnet } from "../chains/chain-definitions/monad-testnet.js";
-export { berachain } from "../chains/chain-definitions/berachain.js";
-export { berachainBepolia } from "../chains/chain-definitions/berachain-bepolia.js";
+export { xai } from "../chains/chain-definitions/xai.js";
+export { xaiSepolia } from "../chains/chain-definitions/xai-sepolia.js";
+export { zkCandySepolia } from "../chains/chain-definitions/zk-candy-sepolia.js";
+export { zkSync } from "../chains/chain-definitions/zksync.js";
+export { zkSyncSepolia } from "../chains/chain-definitions/zksync-sepolia.js";
+export { zora } from "../chains/chain-definitions/zora.js";
+export { zoraSepolia } from "../chains/chain-definitions/zora-sepolia.js";
+export type { Chain, ChainMetadata, ChainOptions } from "../chains/types.js";
+// define chain, chainMetadata
+export {
+  defineChain,
+  getChainMetadata,
+  getRpcUrlForChain,
+} from "../chains/utils.js";
diff --git a/packages/thirdweb/src/exports/contract.ts b/packages/thirdweb/src/exports/contract.ts
index cc0d614bb3d..e1ae724cbcc 100644
--- a/packages/thirdweb/src/exports/contract.ts
+++ b/packages/thirdweb/src/exports/contract.ts
@@ -1,46 +1,38 @@
+export { formatCompilerMetadata } from "../contract/actions/compiler-metadata.js";
+export { getBytecode } from "../contract/actions/get-bytecode.js";
+export { getCompilerMetadata } from "../contract/actions/get-compiler-metadata.js";
 export {
-  getContract,
-  type ContractOptions,
-  type ThirdwebContract,
-} from "../contract/contract.js";
-
-export {
-  resolveContractAbi,
   resolveAbiFromBytecode,
   resolveAbiFromContractApi,
   resolveCompositeAbi,
+  resolveContractAbi,
 } from "../contract/actions/resolve-abi.js";
-
-export { formatCompilerMetadata } from "../contract/actions/compiler-metadata.js";
-
-export { getBytecode } from "../contract/actions/get-bytecode.js";
-
-// verification
 export {
-  verifyContract,
-  checkVerificationStatus,
-} from "../contract/verification/index.js";
-
+  type ContractOptions,
+  getContract,
+  type ThirdwebContract,
+} from "../contract/contract.js";
+export { prepareAutoFactoryDeployTransaction } from "../contract/deployment/deploy-via-autofactory.js";
+// deployment - TODO: these end up looking more like extensions -> should they be?
+export {
+  type PrepareDirectDeployTransactionOptions,
+  prepareDirectDeployTransaction,
+} from "../contract/deployment/deploy-with-abi.js";
 // publisher
 export {
+  fetchDeployBytecodeFromPublishedContractMetadata,
   fetchPublishedContract,
   fetchPublishedContractMetadata,
-  fetchDeployBytecodeFromPublishedContractMetadata,
 } from "../contract/deployment/publisher.js";
-
+export { getDeployedCloneFactoryContract } from "../contract/deployment/utils/clone-factory.js";
+// verification
+export {
+  checkVerificationStatus,
+  verifyContract,
+} from "../contract/verification/index.js";
+export { prepareMethod } from "../utils/abi/prepare-method.js";
 // contract metadata
 export {
-  fetchDeployMetadata,
   type FetchDeployMetadataResult,
+  fetchDeployMetadata,
 } from "../utils/any-evm/deploy-metadata.js";
-
-// deployment - TODO: these end up looking more like extensions -> should they be?
-export {
-  prepareDirectDeployTransaction,
-  type PrepareDirectDeployTransactionOptions,
-} from "../contract/deployment/deploy-with-abi.js";
-export { prepareAutoFactoryDeployTransaction } from "../contract/deployment/deploy-via-autofactory.js";
-export { prepareMethod } from "../utils/abi/prepare-method.js";
-
-export { getCompilerMetadata } from "../contract/actions/get-compiler-metadata.js";
-export { getDeployedCloneFactoryContract } from "../contract/deployment/utils/clone-factory.js";
diff --git a/packages/thirdweb/src/exports/deploys.ts b/packages/thirdweb/src/exports/deploys.ts
index b5d2a2019e4..faf5bd1308f 100644
--- a/packages/thirdweb/src/exports/deploys.ts
+++ b/packages/thirdweb/src/exports/deploys.ts
@@ -1,59 +1,53 @@
+export { prepareDeterministicDeployTransaction } from "../contract/deployment/deploy-deterministic.js";
+export {
+  deployViaAutoFactory,
+  prepareAutoFactoryDeployTransaction,
+} from "../contract/deployment/deploy-via-autofactory.js";
+export {
+  deployContract,
+  type PrepareDirectDeployTransactionOptions,
+  prepareDirectDeployTransaction,
+} from "../contract/deployment/deploy-with-abi.js";
+export { getOrDeployInfraForPublishedContract } from "../contract/deployment/utils/bootstrap.js";
 export {
   type DeployERC20ContractOptions,
+  deployERC20Contract,
   type ERC20ContractParams,
   type ERC20ContractType,
-  deployERC20Contract,
 } from "../extensions/prebuilts/deploy-erc20.js";
-
 export {
   type DeployERC721ContractOptions,
+  deployERC721Contract,
   type ERC721ContractParams,
   type ERC721ContractType,
-  deployERC721Contract,
 } from "../extensions/prebuilts/deploy-erc721.js";
-
 export {
   type DeployERC1155ContractOptions,
+  deployERC1155Contract,
   type ERC1155ContractParams,
   type ERC1155ContractType,
-  deployERC1155Contract,
 } from "../extensions/prebuilts/deploy-erc1155.js";
-
-export {
-  deploySplitContract,
-  type SplitContractParams,
-  type DeploySplitContractOptions,
-} from "../extensions/prebuilts/deploy-split.js";
-
 export {
+  type DeployMarketplaceContractOptions,
   deployMarketplaceContract,
   type MarketplaceContractParams,
-  type DeployMarketplaceContractOptions,
 } from "../extensions/prebuilts/deploy-marketplace.js";
-
 export {
-  deployPublishedContract,
+  type DeployPackContractOptions,
+  deployPackContract,
+  type PackContractParams,
+} from "../extensions/prebuilts/deploy-pack.js";
+export {
+  type DeployContractfromDeployMetadataOptions,
   type DeployPublishedContractOptions,
   deployContractfromDeployMetadata,
-  type DeployContractfromDeployMetadataOptions,
+  deployPublishedContract,
+  getInitializeTransaction,
 } from "../extensions/prebuilts/deploy-published.js";
-
-export { prepareDirectDeployTransaction } from "../contract/deployment/deploy-with-abi.js";
-export { prepareAutoFactoryDeployTransaction } from "../contract/deployment/deploy-via-autofactory.js";
-export { prepareDeterministicDeployTransaction } from "../contract/deployment/deploy-deterministic.js";
-export { deployViaAutoFactory } from "../contract/deployment/deploy-via-autofactory.js";
 export {
-  deployContract,
-  type PrepareDirectDeployTransactionOptions,
-} from "../contract/deployment/deploy-with-abi.js";
-export { computePublishedContractAddress } from "../utils/any-evm/compute-published-contract-address.js";
+  type DeploySplitContractOptions,
+  deploySplitContract,
+  type SplitContractParams,
+} from "../extensions/prebuilts/deploy-split.js";
 export { getRequiredTransactions } from "../extensions/prebuilts/get-required-transactions.js";
-
-export {
-  type PackContractParams,
-  type DeployPackContractOptions,
-  deployPackContract,
-} from "../extensions/prebuilts/deploy-pack.js";
-
-export { getInitializeTransaction } from "../extensions/prebuilts/deploy-published.js";
-export { getOrDeployInfraForPublishedContract } from "../contract/deployment/utils/bootstrap.js";
+export { computePublishedContractAddress } from "../utils/any-evm/compute-published-contract-address.js";
diff --git a/packages/thirdweb/src/exports/event.ts b/packages/thirdweb/src/exports/event.ts
index 578ce2b1354..bb1e5d312cc 100644
--- a/packages/thirdweb/src/exports/event.ts
+++ b/packages/thirdweb/src/exports/event.ts
@@ -1,21 +1,21 @@
 export {
-  prepareEvent,
-  type PrepareEventOptions,
-  type PreparedEvent,
-} from "../event/prepare-event.js";
+  type GetContractEventsOptions,
+  type GetContractEventsResult,
+  getContractEvents,
+} from "../event/actions/get-events.js";
 
 // actions
 export {
-  parseEventLogs,
   type ParseEventLogsOptions,
   type ParseEventLogsResult,
+  parseEventLogs,
 } from "../event/actions/parse-logs.js";
 export {
-  watchContractEvents,
   type WatchContractEventsOptions,
+  watchContractEvents,
 } from "../event/actions/watch-events.js";
 export {
-  getContractEvents,
-  type GetContractEventsOptions,
-  type GetContractEventsResult,
-} from "../event/actions/get-events.js";
+  type PreparedEvent,
+  type PrepareEventOptions,
+  prepareEvent,
+} from "../event/prepare-event.js";
diff --git a/packages/thirdweb/src/exports/extensions/airdrop.ts b/packages/thirdweb/src/exports/extensions/airdrop.ts
index 6dfd3fa2cc5..b0f5dbd9943 100644
--- a/packages/thirdweb/src/exports/extensions/airdrop.ts
+++ b/packages/thirdweb/src/exports/extensions/airdrop.ts
@@ -2,84 +2,83 @@
  * READ
  */
 export {
-  isClaimed,
   type IsClaimedParams,
+  isClaimed,
 } from "../../extensions/airdrop/__generated__/Airdrop/read/isClaimed.js";
 export {
-  tokenConditionId,
   type TokenConditionIdParams,
+  tokenConditionId,
 } from "../../extensions/airdrop/__generated__/Airdrop/read/tokenConditionId.js";
 export {
-  tokenMerkleRoot,
   type TokenMerkleRootParams,
+  tokenMerkleRoot,
 } from "../../extensions/airdrop/__generated__/Airdrop/read/tokenMerkleRoot.js";
-export { fetchProofsERC721 } from "../../utils/extensions/airdrop/fetch-proofs-erc721.js";
-export { fetchProofsERC20 } from "../../utils/extensions/airdrop/fetch-proofs-erc20.js";
-export { fetchProofsERC1155 } from "../../utils/extensions/airdrop/fetch-proofs-erc1155.js";
-
 /**
  * Write
  */
 export {
-  airdropERC20,
   type AirdropERC20Params,
+  airdropERC20,
 } from "../../extensions/airdrop/__generated__/Airdrop/write/airdropERC20.js";
 export {
-  airdropERC721,
   type AirdropERC721Params,
+  airdropERC721,
 } from "../../extensions/airdrop/__generated__/Airdrop/write/airdropERC721.js";
 export {
-  airdropERC1155,
   type AirdropERC1155Params,
+  airdropERC1155,
 } from "../../extensions/airdrop/__generated__/Airdrop/write/airdropERC1155.js";
 export {
-  airdropNativeToken,
   type AirdropNativeTokenParams,
+  airdropNativeToken,
 } from "../../extensions/airdrop/__generated__/Airdrop/write/airdropNativeToken.js";
 export {
-  setMerkleRoot,
   type SetMerkleRootParams,
+  setMerkleRoot,
 } from "../../extensions/airdrop/__generated__/Airdrop/write/setMerkleRoot.js";
 export {
   airdropERC20WithSignature,
-  generateAirdropSignatureERC20,
   type GenerateAirdropERC20SignatureOptions,
+  generateAirdropSignatureERC20,
 } from "../../extensions/airdrop/write/airdropERC20WithSignature.js";
 export {
   airdropERC721WithSignature,
-  generateAirdropSignatureERC721,
   type GenerateAirdropERC721SignatureOptions,
+  generateAirdropSignatureERC721,
 } from "../../extensions/airdrop/write/airdropERC721WithSignature.js";
 export {
   airdropERC1155WithSignature,
-  generateAirdropSignatureERC1155,
   type GenerateAirdropERC1155SignatureOptions,
+  generateAirdropSignatureERC1155,
 } from "../../extensions/airdrop/write/airdropERC1155WithSignature.js";
 export {
-  claimERC20,
   type ClaimERC20Params,
+  claimERC20,
 } from "../../extensions/airdrop/write/claimERC20.js";
 export {
-  claimERC721,
   type ClaimERC721Params,
+  claimERC721,
 } from "../../extensions/airdrop/write/claimERC721.js";
 export {
-  claimERC1155,
   type ClaimERC1155Params,
+  claimERC1155,
 } from "../../extensions/airdrop/write/claimERC1155.js";
 export {
-  generateMerkleTreeInfoERC20,
   type GenerateMerkleTreeInfoERC20Params,
+  generateMerkleTreeInfoERC20,
 } from "../../extensions/airdrop/write/merkleInfoERC20.js";
 export {
-  generateMerkleTreeInfoERC721,
   type GenerateMerkleTreeInfoERC721Params,
+  generateMerkleTreeInfoERC721,
 } from "../../extensions/airdrop/write/merkleInfoERC721.js";
 export {
-  generateMerkleTreeInfoERC1155,
   type GenerateMerkleTreeInfoERC1155Params,
+  generateMerkleTreeInfoERC1155,
 } from "../../extensions/airdrop/write/merkleInfoERC1155.js";
 export {
-  saveSnapshot,
   type SaveSnapshotParams,
+  saveSnapshot,
 } from "../../extensions/airdrop/write/saveSnapshot.js";
+export { fetchProofsERC20 } from "../../utils/extensions/airdrop/fetch-proofs-erc20.js";
+export { fetchProofsERC721 } from "../../utils/extensions/airdrop/fetch-proofs-erc721.js";
+export { fetchProofsERC1155 } from "../../utils/extensions/airdrop/fetch-proofs-erc1155.js";
diff --git a/packages/thirdweb/src/exports/extensions/common.ts b/packages/thirdweb/src/exports/extensions/common.ts
index a4baf36bf33..ff78bbd4bb8 100644
--- a/packages/thirdweb/src/exports/extensions/common.ts
+++ b/packages/thirdweb/src/exports/extensions/common.ts
@@ -1,49 +1,46 @@
 // read
 export { contractURI } from "../../extensions/common/__generated__/IContractMetadata/read/contractURI.js";
-export {
-  getContractMetadata,
-  isGetContractMetadataSupported,
-} from "../../extensions/common/read/getContractMetadata.js";
-export {
-  owner,
-  isOwnerSupported,
-} from "../../extensions/common/__generated__/IOwnable/read/owner.js";
-export { name, isNameSupported } from "../../extensions/common/read/name.js";
-export {
-  symbol,
-  isSymbolSupported,
-} from "../../extensions/common/read/symbol.js";
-export { parseNftUri } from "../../utils/nft/parseNft.js";
-
 // write
 export {
-  setContractURI,
-  type SetContractURIParams,
   isSetContractURISupported,
+  type SetContractURIParams,
+  setContractURI,
 } from "../../extensions/common/__generated__/IContractMetadata/write/setContractURI.js";
-
 export {
-  setOwner,
+  isMulticallSupported,
+  type MulticallParams,
+  multicall,
+} from "../../extensions/common/__generated__/IMulticall/write/multicall.js";
+export {
+  isOwnerSupported,
+  owner,
+} from "../../extensions/common/__generated__/IOwnable/read/owner.js";
+export {
   type SetOwnerParams,
+  setOwner,
 } from "../../extensions/common/__generated__/IOwnable/write/setOwner.js";
+export {
+  getContractMetadata,
+  isGetContractMetadataSupported,
+} from "../../extensions/common/read/getContractMetadata.js";
+export { isNameSupported, name } from "../../extensions/common/read/name.js";
+export {
+  isSymbolSupported,
+  symbol,
+} from "../../extensions/common/read/symbol.js";
 
 export {
-  setContractMetadata,
-  type SetContractMetadataParams,
   isSetContractMetadataSupported,
+  type SetContractMetadataParams,
+  setContractMetadata,
 } from "../../extensions/common/write/setContractMetadata.js";
-
-export {
-  multicall,
-  type MulticallParams,
-  isMulticallSupported,
-} from "../../extensions/common/__generated__/IMulticall/write/multicall.js";
+export { parseNftUri } from "../../utils/nft/parseNft.js";
 
 // events
 
 export {
-  ownerUpdatedEvent,
   type OwnerUpdatedEventFilters,
+  ownerUpdatedEvent,
 } from "../../extensions/common/__generated__/IOwnable/events/OwnerUpdated.js";
 
 // --------------------------------------------------------
@@ -55,21 +52,21 @@ export {
   isGetDefaultRoyaltyInfoSupported,
 } from "../../extensions/common/__generated__/IRoyalty/read/getDefaultRoyaltyInfo.js";
 export {
-  getRoyaltyInfoForToken,
   type GetRoyaltyInfoForTokenParams,
+  getRoyaltyInfoForToken,
   isGetRoyaltyInfoForTokenSupported,
 } from "../../extensions/common/__generated__/IRoyalty/read/getRoyaltyInfoForToken.js";
 
 // write
 export {
-  setDefaultRoyaltyInfo,
-  type SetDefaultRoyaltyInfoParams,
   isSetDefaultRoyaltyInfoSupported,
+  type SetDefaultRoyaltyInfoParams,
+  setDefaultRoyaltyInfo,
 } from "../../extensions/common/__generated__/IRoyalty/write/setDefaultRoyaltyInfo.js";
 export {
-  setRoyaltyInfoForToken,
-  type SetRoyaltyInfoForTokenParams,
   isSetRoyaltyInfoForTokenSupported,
+  type SetRoyaltyInfoForTokenParams,
+  setRoyaltyInfoForToken,
 } from "../../extensions/common/__generated__/IRoyalty/write/setRoyaltyInfoForToken.js";
 
 // --------------------------------------------------------
@@ -81,20 +78,20 @@ export {
   isGetPlatformFeeInfoSupported,
 } from "../../extensions/common/__generated__/IPlatformFee/read/getPlatformFeeInfo.js";
 export {
-  setPlatformFeeInfo,
   isSetPlatformFeeInfoSupported,
   type SetPlatformFeeInfoParams,
+  setPlatformFeeInfo,
 } from "../../extensions/common/__generated__/IPlatformFee/write/setPlatformFeeInfo.js";
 
 // --------------------------------------------------------
 // Primary Sale
 // --------------------------------------------------------
 export {
-  primarySaleRecipient,
   isPrimarySaleRecipientSupported,
+  primarySaleRecipient,
 } from "../../extensions/common/__generated__/IPrimarySale/read/primarySaleRecipient.js";
 export {
-  setPrimarySaleRecipient,
-  type SetPrimarySaleRecipientParams,
   isSetPrimarySaleRecipientSupported,
+  type SetPrimarySaleRecipientParams,
+  setPrimarySaleRecipient,
 } from "../../extensions/common/__generated__/IPrimarySale/write/setPrimarySaleRecipient.js";
diff --git a/packages/thirdweb/src/exports/extensions/dynamic-contracts.ts b/packages/thirdweb/src/exports/extensions/dynamic-contracts.ts
index dadc5787150..c2ff127bcbb 100644
--- a/packages/thirdweb/src/exports/extensions/dynamic-contracts.ts
+++ b/packages/thirdweb/src/exports/extensions/dynamic-contracts.ts
@@ -2,10 +2,10 @@
  * Write
  */
 export {
-  installPublishedExtension,
   type InstallPublishedExtensionOptions,
+  installPublishedExtension,
 } from "../../extensions/dynamic-contracts/write/installPublishedExtension.js";
 export {
-  uninstallExtension,
   type UninstallExtensionOptions,
+  uninstallExtension,
 } from "../../extensions/dynamic-contracts/write/uninstallExtension.js";
diff --git a/packages/thirdweb/src/exports/extensions/ens.ts b/packages/thirdweb/src/exports/extensions/ens.ts
index d855ec36c44..50faca64ede 100644
--- a/packages/thirdweb/src/exports/extensions/ens.ts
+++ b/packages/thirdweb/src/exports/extensions/ens.ts
@@ -1,34 +1,29 @@
+export {
+  BASE_SEPOLIA_BASENAME_RESOLVER_ADDRESS,
+  BASENAME_RESOLVER_ADDRESS,
+} from "../../extensions/ens/constants.js";
 export {
   type ResolveAddressOptions,
   resolveAddress,
 } from "../../extensions/ens/resolve-address.js";
-
 export {
   type ResolveAvatarOptions,
   resolveAvatar,
 } from "../../extensions/ens/resolve-avatar.js";
-
-export {
-  parseAvatarRecord,
-  type ParseAvatarOptions,
-} from "../../utils/ens/avatar.js";
-
 export {
-  type ResolveTextOptions,
-  resolveText,
-} from "../../extensions/ens/resolve-text.js";
+  type ResolveL2NameOptions,
+  resolveL2Name,
+} from "../../extensions/ens/resolve-l2-name.js";
 
 export {
   type ResolveNameOptions,
   resolveName,
 } from "../../extensions/ens/resolve-name.js";
-
 export {
-  type ResolveL2NameOptions,
-  resolveL2Name,
-} from "../../extensions/ens/resolve-l2-name.js";
-
+  type ResolveTextOptions,
+  resolveText,
+} from "../../extensions/ens/resolve-text.js";
 export {
-  BASENAME_RESOLVER_ADDRESS,
-  BASE_SEPOLIA_BASENAME_RESOLVER_ADDRESS,
-} from "../../extensions/ens/constants.js";
+  type ParseAvatarOptions,
+  parseAvatarRecord,
+} from "../../utils/ens/avatar.js";
diff --git a/packages/thirdweb/src/exports/extensions/erc1155.ts b/packages/thirdweb/src/exports/extensions/erc1155.ts
index 7ba268de3c9..7c5fe4ac5ce 100644
--- a/packages/thirdweb/src/exports/extensions/erc1155.ts
+++ b/packages/thirdweb/src/exports/extensions/erc1155.ts
@@ -1,216 +1,208 @@
 // READ
-export { isERC1155 } from "../../extensions/erc1155/read/isERC1155.js";
+
+export {
+  type BalanceOfParams,
+  balanceOf,
+} from "../../extensions/erc1155/__generated__/IERC1155/read/balanceOf.js";
 export {
-  balanceOfBatch,
   type BalanceOfBatchParams,
+  balanceOfBatch,
 } from "../../extensions/erc1155/__generated__/IERC1155/read/balanceOfBatch.js";
 export {
+  type IsApprovedForAllParams,
+  isApprovedForAll,
+} from "../../extensions/erc1155/__generated__/IERC1155/read/isApprovedForAll.js";
+export {
+  isTotalSupplySupported,
+  type TotalSupplyParams,
+  totalSupply,
+} from "../../extensions/erc1155/__generated__/IERC1155/read/totalSupply.js";
+export {
+  type UriParams,
+  uri,
+  /**
+   * @alias for `uri`
+   */
+  uri as tokenUri,
+} from "../../extensions/erc1155/__generated__/IERC1155/read/uri.js";
+export {
+  isNextTokenIdToMintSupported,
+  nextTokenIdToMint,
+} from "../../extensions/erc1155/__generated__/IERC1155Enumerable/read/nextTokenIdToMint.js";
+export {
+  type GetNFTParams,
   getNFT,
   isGetNFTSupported,
-  type GetNFTParams,
 } from "../../extensions/erc1155/read/getNFT.js";
 export {
-  getNFTs,
   type GetNFTsParams,
+  getNFTs,
   isGetNFTsSupported,
 } from "../../extensions/erc1155/read/getNFTs.js";
 export {
-  getOwnedNFTs,
   type GetOwnedNFTsParams,
+  getOwnedNFTs,
 } from "../../extensions/erc1155/read/getOwnedNFTs.js";
 export {
-  nextTokenIdToMint,
-  isNextTokenIdToMintSupported,
-} from "../../extensions/erc1155/__generated__/IERC1155Enumerable/read/nextTokenIdToMint.js";
-export {
-  getOwnedTokenIds,
   type GetOwnedTokenIdsParams,
+  getOwnedTokenIds,
 } from "../../extensions/erc1155/read/getOwnedTokenIds.js";
-export {
-  uri,
-  /**
-   * @alias for `uri`
-   */
-  uri as tokenUri,
-  type UriParams,
-} from "../../extensions/erc1155/__generated__/IERC1155/read/uri.js";
-export {
-  totalSupply,
-  type TotalSupplyParams,
-  isTotalSupplySupported,
-} from "../../extensions/erc1155/__generated__/IERC1155/read/totalSupply.js";
-export {
-  balanceOf,
-  type BalanceOfParams,
-} from "../../extensions/erc1155/__generated__/IERC1155/read/balanceOf.js";
-export {
-  isApprovedForAll,
-  type IsApprovedForAllParams,
-} from "../../extensions/erc1155/__generated__/IERC1155/read/isApprovedForAll.js";
+export { isERC1155 } from "../../extensions/erc1155/read/isERC1155.js";
 
 //WRITE
 
 export {
-  burn,
   type BurnParams,
+  burn,
   isBurnSupported,
 } from "../../extensions/erc1155/__generated__/IBurnableERC1155/write/burn.js";
 export {
-  burnBatch,
   type BurnBatchParams,
+  burnBatch,
 } from "../../extensions/erc1155/__generated__/IBurnableERC1155/write/burnBatch.js";
+export { tokensClaimedEvent } from "../../extensions/erc1155/__generated__/IDrop1155/events/TokensClaimed.js";
 export {
-  setApprovalForAll,
-  type SetApprovalForAllParams,
-} from "../../extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.js";
+  type GetClaimConditionByIdParams,
+  getClaimConditionById,
+  isGetClaimConditionByIdSupported,
+} from "../../extensions/erc1155/__generated__/IDrop1155/read/getClaimConditionById.js";
+export { claimCondition } from "../../extensions/erc1155/__generated__/IDropSinglePhase1155/read/claimCondition.js";
 export {
-  safeTransferFrom,
-  encodeSafeTransferFrom,
-  type SafeTransferFromParams,
-} from "../../extensions/erc1155/__generated__/IERC1155/write/safeTransferFrom.js";
+  type ApprovalForAllEventFilters,
+  approvalForAllEvent,
+} from "../../extensions/erc1155/__generated__/IERC1155/events/ApprovalForAll.js";
+export {
+  type TransferBatchEventFilters,
+  transferBatchEvent,
+} from "../../extensions/erc1155/__generated__/IERC1155/events/TransferBatch.js";
+export {
+  type TransferSingleEventFilters,
+  transferSingleEvent,
+} from "../../extensions/erc1155/__generated__/IERC1155/events/TransferSingle.js";
 export {
-  safeBatchTransferFrom,
   type SafeBatchTransferFromParams,
+  safeBatchTransferFrom,
 } from "../../extensions/erc1155/__generated__/IERC1155/write/safeBatchTransferFrom.js";
 export {
-  mintTo,
-  type MintToParams,
-  isMintToSupported,
-} from "../../extensions/erc1155/write/mintTo.js";
+  encodeSafeTransferFrom,
+  type SafeTransferFromParams,
+  safeTransferFrom,
+} from "../../extensions/erc1155/__generated__/IERC1155/write/safeTransferFrom.js";
 export {
-  mintAdditionalSupplyTo,
-  type MintAdditionalSupplyToParams,
-  isMintAdditionalSupplyToSupported,
-} from "../../extensions/erc1155/write/mintAdditionalSupplyTo.js";
+  type SetApprovalForAllParams,
+  setApprovalForAll,
+} from "../../extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.js";
+// EVENTS
+export { tokensLazyMintedEvent } from "../../extensions/erc1155/__generated__/ILazyMint/events/TokensLazyMinted.js";
+export { batchMetadataUpdateEvent } from "../../extensions/erc1155/__generated__/INFTMetadata/events/BatchMetadataUpdate.js";
+export { metadataFrozenEvent } from "../../extensions/erc1155/__generated__/INFTMetadata/events/MetadataFrozen.js";
+export { metadataUpdateEvent } from "../../extensions/erc1155/__generated__/INFTMetadata/events/MetadataUpdate.js";
+export { freezeMetadata } from "../../extensions/erc1155/__generated__/INFTMetadata/write/freezeMetadata.js";
 export {
-  setTokenURI,
   type SetTokenURIParams,
+  setTokenURI,
 } from "../../extensions/erc1155/__generated__/INFTMetadata/write/setTokenURI.js";
-export { freezeMetadata } from "../../extensions/erc1155/__generated__/INFTMetadata/write/freezeMetadata.js";
-
+// Packs
+export {
+  type PackCreatedEventFilters,
+  packCreatedEvent,
+} from "../../extensions/erc1155/__generated__/IPack/events/PackCreated.js";
+export {
+  type PackOpenedEventFilters,
+  packOpenedEvent,
+} from "../../extensions/erc1155/__generated__/IPack/events/PackOpened.js";
+export {
+  type PackUpdatedEventFilters,
+  packUpdatedEvent,
+} from "../../extensions/erc1155/__generated__/IPack/events/PackUpdated.js";
+export {
+  type CreatePackParams,
+  createPack,
+} from "../../extensions/erc1155/__generated__/IPack/write/createPack.js";
+export {
+  type OpenPackParams,
+  openPack,
+} from "../../extensions/erc1155/__generated__/IPack/write/openPack.js";
+export {
+  type TokensMintedWithSignatureEventFilters,
+  tokensMintedWithSignatureEvent,
+} from "../../extensions/erc1155/__generated__/ISignatureMintERC1155/events/TokensMintedWithSignature.js";
+// Zora 1155 contract
+export { nextTokenId } from "../../extensions/erc1155/__generated__/Zora1155/read/nextTokenId.js";
+export {
+  type CanClaimParams,
+  type CanClaimResult,
+  canClaim,
+} from "../../extensions/erc1155/drops/read/canClaim.js";
 /**
  * DROPS extension for ERC1155
  */
 // READ
 export {
+  type GetActiveClaimConditionParams,
   getActiveClaimCondition,
   isGetActiveClaimConditionSupported,
-  type GetActiveClaimConditionParams,
 } from "../../extensions/erc1155/drops/read/getActiveClaimCondition.js";
 export {
-  getClaimConditionById,
-  type GetClaimConditionByIdParams,
-  isGetClaimConditionByIdSupported,
-} from "../../extensions/erc1155/__generated__/IDrop1155/read/getClaimConditionById.js";
-export {
-  getClaimConditions,
   type GetClaimConditionsParams,
+  getClaimConditions,
   isGetClaimConditionsSupported,
 } from "../../extensions/erc1155/drops/read/getClaimConditions.js";
-export {
-  canClaim,
-  type CanClaimParams,
-  type CanClaimResult,
-} from "../../extensions/erc1155/drops/read/canClaim.js";
-export { claimCondition } from "../../extensions/erc1155/__generated__/IDropSinglePhase1155/read/claimCondition.js";
-
 // WRITE
 export {
-  claimTo,
   type ClaimToParams,
+  claimTo,
   isClaimToSupported,
 } from "../../extensions/erc1155/drops/write/claimTo.js";
 export {
-  lazyMint,
-  type LazyMintParams,
-  isLazyMintSupported,
-} from "../../extensions/erc1155/write/lazyMint.js";
+  isResetClaimEligibilitySupported,
+  type ResetClaimEligibilityParams,
+  resetClaimEligibility,
+} from "../../extensions/erc1155/drops/write/resetClaimEligibility.js";
 export {
-  setClaimConditions,
-  type SetClaimConditionsParams,
   isSetClaimConditionsSupported,
+  type SetClaimConditionsParams,
+  setClaimConditions,
 } from "../../extensions/erc1155/drops/write/setClaimConditions.js";
-export {
-  resetClaimEligibility,
-  type ResetClaimEligibilityParams,
-  isResetClaimEligibilitySupported,
-} from "../../extensions/erc1155/drops/write/resetClaimEligibility.js";
-
 // METADATA
 export {
-  updateMetadata,
-  type UpdateMetadataParams,
   isUpdateMetadataSupported,
+  type UpdateMetadataParams,
+  updateMetadata,
 } from "../../extensions/erc1155/drops/write/updateMetadata.js";
 export {
-  updateTokenURI,
-  type UpdateTokenURIParams,
-  isUpdateTokenURISupported,
-} from "../../extensions/erc1155/write/updateTokenURI.js";
-
+  isLazyMintSupported,
+  type LazyMintParams,
+  lazyMint,
+} from "../../extensions/erc1155/write/lazyMint.js";
+export {
+  isMintAdditionalSupplyToSupported,
+  type MintAdditionalSupplyToParams,
+  mintAdditionalSupplyTo,
+} from "../../extensions/erc1155/write/mintAdditionalSupplyTo.js";
+export {
+  type MintAdditionalSupplyToBatchParams,
+  mintAdditionalSupplyToBatch,
+} from "../../extensions/erc1155/write/mintAdditionalSupplyToBatch.js";
+export {
+  isMintToSupported,
+  type MintToParams,
+  mintTo,
+} from "../../extensions/erc1155/write/mintTo.js";
+export {
+  type MintToBatchParams,
+  mintToBatch,
+} from "../../extensions/erc1155/write/mintToBatch.js";
 /**
  * SIGNATURE extension for ERC1155
  */
 export {
-  mintWithSignature,
   type GenerateMintSignatureOptions,
   generateMintSignature,
+  mintWithSignature,
 } from "../../extensions/erc1155/write/sigMint.js";
-
-// EVENTS
-export { tokensLazyMintedEvent } from "../../extensions/erc1155/__generated__/ILazyMint/events/TokensLazyMinted.js";
-export { tokensClaimedEvent } from "../../extensions/erc1155/__generated__/IDrop1155/events/TokensClaimed.js";
-export {
-  transferSingleEvent,
-  type TransferSingleEventFilters,
-} from "../../extensions/erc1155/__generated__/IERC1155/events/TransferSingle.js";
-export {
-  transferBatchEvent,
-  type TransferBatchEventFilters,
-} from "../../extensions/erc1155/__generated__/IERC1155/events/TransferBatch.js";
-export {
-  approvalForAllEvent,
-  type ApprovalForAllEventFilters,
-} from "../../extensions/erc1155/__generated__/IERC1155/events/ApprovalForAll.js";
-export { metadataUpdateEvent } from "../../extensions/erc1155/__generated__/INFTMetadata/events/MetadataUpdate.js";
-export { metadataFrozenEvent } from "../../extensions/erc1155/__generated__/INFTMetadata/events/MetadataFrozen.js";
-export { batchMetadataUpdateEvent } from "../../extensions/erc1155/__generated__/INFTMetadata/events/BatchMetadataUpdate.js";
-export {
-  tokensMintedWithSignatureEvent,
-  type TokensMintedWithSignatureEventFilters,
-} from "../../extensions/erc1155/__generated__/ISignatureMintERC1155/events/TokensMintedWithSignature.js";
-
-// Packs
-export {
-  packCreatedEvent,
-  type PackCreatedEventFilters,
-} from "../../extensions/erc1155/__generated__/IPack/events/PackCreated.js";
-export {
-  packOpenedEvent,
-  type PackOpenedEventFilters,
-} from "../../extensions/erc1155/__generated__/IPack/events/PackOpened.js";
-export {
-  packUpdatedEvent,
-  type PackUpdatedEventFilters,
-} from "../../extensions/erc1155/__generated__/IPack/events/PackUpdated.js";
 export {
-  createPack,
-  type CreatePackParams,
-} from "../../extensions/erc1155/__generated__/IPack/write/createPack.js";
-export {
-  openPack,
-  type OpenPackParams,
-} from "../../extensions/erc1155/__generated__/IPack/write/openPack.js";
-
-// Zora 1155 contract
-export { nextTokenId } from "../../extensions/erc1155/__generated__/Zora1155/read/nextTokenId.js";
-
-export {
-  mintToBatch,
-  type MintToBatchParams,
-} from "../../extensions/erc1155/write/mintToBatch.js";
-
-export {
-  mintAdditionalSupplyToBatch,
-  type MintAdditionalSupplyToBatchParams,
-} from "../../extensions/erc1155/write/mintAdditionalSupplyToBatch.js";
+  isUpdateTokenURISupported,
+  type UpdateTokenURIParams,
+  updateTokenURI,
+} from "../../extensions/erc1155/write/updateTokenURI.js";
diff --git a/packages/thirdweb/src/exports/extensions/erc20.ts b/packages/thirdweb/src/exports/extensions/erc20.ts
index 5f4865ba9e6..3437fb8f063 100644
--- a/packages/thirdweb/src/exports/extensions/erc20.ts
+++ b/packages/thirdweb/src/exports/extensions/erc20.ts
@@ -1,60 +1,22 @@
 // read
-export { isERC20 } from "../../extensions/erc20/read/isERC20.js";
-export {
-  getBalance,
-  type GetBalanceParams,
-  type GetBalanceResult,
-} from "../../extensions/erc20/read/getBalance.js";
-export {
-  balanceOf,
-  type BalanceOfParams,
-} from "../../extensions/erc20/__generated__/IERC20/read/balanceOf.js";
-export { decimals } from "../../extensions/erc20/read/decimals.js";
-export {
-  delegates,
-  type DelegatesParams,
-} from "../../extensions/erc20/__generated__/IVotes/read/delegates.js";
-export { totalSupply } from "../../extensions/erc20/__generated__/IERC20/read/totalSupply.js";
-export {
-  allowance,
-  type AllowanceParams,
-} from "../../extensions/erc20/__generated__/IERC20/read/allowance.js";
-export {
-  getCurrencyMetadata,
-  type GetCurrencyMetadataResult,
-} from "../../extensions/erc20/read/getCurrencyMetadata.js";
 
-// write
-export {
-  isMintToSupported,
-  mintTo,
-  type MintToParams,
-} from "../../extensions/erc20/write/mintTo.js";
-export {
-  transfer,
-  type TransferParams,
-} from "../../extensions/erc20/write/transfer.js";
-export {
-  transferFrom,
-  type TransferFromParams,
-} from "../../extensions/erc20/write/transferFrom.js";
-export {
-  transferBatch,
-  type TransferBatchParams,
-} from "../../extensions/erc20/write/transferBatch.js";
-export {
-  approve,
-  type ApproveParams,
-} from "../../extensions/erc20/write/approve.js";
 export {
-  burn,
   type BurnParams,
+  burn,
 } from "../../extensions/erc20/__generated__/IBurnableERC20/write/burn.js";
 export {
-  burnFrom,
   type BurnFromParams,
+  burnFrom,
 } from "../../extensions/erc20/__generated__/IBurnableERC20/write/burnFrom.js";
-
+export { claimConditionsUpdatedEvent } from "../../extensions/erc20/__generated__/IDropERC20/events/ClaimConditionsUpdated.js";
+export {
+  type TokensClaimedEventFilters,
+  tokensClaimedEvent,
+} from "../../extensions/erc20/__generated__/IDropERC20/events/TokensClaimed.js";
+export {
+  getActiveClaimConditionId,
+  isGetActiveClaimConditionIdSupported,
+} from "../../extensions/erc20/__generated__/IDropERC20/read/getActiveClaimConditionId.js";
 /**
  * DROPS extension for ERC20
  */
@@ -64,88 +26,120 @@ export {
   isGetClaimConditionByIdSupported,
 } from "../../extensions/erc20/__generated__/IDropERC20/read/getClaimConditionById.js";
 export {
-  getActiveClaimConditionId,
-  isGetActiveClaimConditionIdSupported,
-} from "../../extensions/erc20/__generated__/IDropERC20/read/getActiveClaimConditionId.js";
+  type ApprovalEventFilters,
+  approvalEvent,
+} from "../../extensions/erc20/__generated__/IERC20/events/Approval.js";
+// EVENTS
 export {
-  getClaimConditions,
-  isGetClaimConditionsSupported,
-} from "../../extensions/erc20/drops/read/getClaimConditions.js";
+  type TransferEventFilters,
+  transferEvent,
+} from "../../extensions/erc20/__generated__/IERC20/events/Transfer.js";
 export {
-  getActiveClaimCondition,
-  isGetActiveClaimConditionSupported,
-} from "../../extensions/erc20/drops/read/getActiveClaimCondition.js";
+  type AllowanceParams,
+  allowance,
+} from "../../extensions/erc20/__generated__/IERC20/read/allowance.js";
+export {
+  type BalanceOfParams,
+  balanceOf,
+} from "../../extensions/erc20/__generated__/IERC20/read/balanceOf.js";
+export { totalSupply } from "../../extensions/erc20/__generated__/IERC20/read/totalSupply.js";
+export {
+  type TokensMintedEventFilters,
+  tokensMintedEvent,
+} from "../../extensions/erc20/__generated__/IMintableERC20/events/TokensMinted.js";
+export {
+  type TokensMintedWithSignatureEventFilters,
+  tokensMintedWithSignatureEvent,
+} from "../../extensions/erc20/__generated__/ISignatureMintERC20/events/TokensMintedWithSignature.js";
+export {
+  type DelegatesParams,
+  delegates,
+} from "../../extensions/erc20/__generated__/IVotes/read/delegates.js";
+export {
+  type DelegateParams,
+  delegate,
+} from "../../extensions/erc20/__generated__/IVotes/write/delegate.js";
+export {
+  type WithdrawParams,
+  withdraw,
+} from "../../extensions/erc20/__generated__/IWETH/write/withdraw.js";
 export {
-  canClaim,
   type CanClaimParams,
   type CanClaimResult,
+  canClaim,
 } from "../../extensions/erc20/drops/read/canClaim.js";
-
+export {
+  getActiveClaimCondition,
+  isGetActiveClaimConditionSupported,
+} from "../../extensions/erc20/drops/read/getActiveClaimCondition.js";
+export {
+  getClaimConditions,
+  isGetClaimConditionsSupported,
+} from "../../extensions/erc20/drops/read/getClaimConditions.js";
 // WRITE
 export {
-  claimTo,
   type ClaimToParams,
+  claimTo,
   isClaimToSupported,
 } from "../../extensions/erc20/drops/write/claimTo.js";
 export {
-  setClaimConditions,
-  type SetClaimConditionsParams,
+  isResetClaimEligibilitySupported,
+  resetClaimEligibility,
+} from "../../extensions/erc20/drops/write/resetClaimEligibility.js";
+export {
   isSetClaimConditionsSupported,
+  type SetClaimConditionsParams,
+  setClaimConditions,
 } from "../../extensions/erc20/drops/write/setClaimConditions.js";
+export { decimals } from "../../extensions/erc20/read/decimals.js";
 export {
-  resetClaimEligibility,
-  isResetClaimEligibilitySupported,
-} from "../../extensions/erc20/drops/write/resetClaimEligibility.js";
-
-/**
- * SIGNATURE extension for ERC20
- */
+  type GetBalanceParams,
+  type GetBalanceResult,
+  getBalance,
+} from "../../extensions/erc20/read/getBalance.js";
 export {
-  mintWithSignature,
-  type GenerateMintSignatureOptions,
-  generateMintSignature,
-} from "../../extensions/erc20/write/sigMint.js";
-
+  type GetCurrencyMetadataResult,
+  getCurrencyMetadata,
+} from "../../extensions/erc20/read/getCurrencyMetadata.js";
+export { isERC20 } from "../../extensions/erc20/read/isERC20.js";
+export {
+  type ApproveParams,
+  approve,
+} from "../../extensions/erc20/write/approve.js";
 // ----------------------------
 // WETH
 // ----------------------------
 export {
-  deposit,
   type DepositParams,
+  deposit,
 } from "../../extensions/erc20/write/deposit.js";
 export {
-  withdraw,
-  type WithdrawParams,
-} from "../../extensions/erc20/__generated__/IWETH/write/withdraw.js";
-
-// EVENTS
-export {
-  transferEvent,
-  type TransferEventFilters,
-} from "../../extensions/erc20/__generated__/IERC20/events/Transfer.js";
-export {
-  approvalEvent,
-  type ApprovalEventFilters,
-} from "../../extensions/erc20/__generated__/IERC20/events/Approval.js";
+  type GetApprovalForTransactionParams,
+  getApprovalForTransaction,
+} from "../../extensions/erc20/write/getApprovalForTransaction.js";
+// write
 export {
-  tokensMintedEvent,
-  type TokensMintedEventFilters,
-} from "../../extensions/erc20/__generated__/IMintableERC20/events/TokensMinted.js";
+  isMintToSupported,
+  type MintToParams,
+  mintTo,
+} from "../../extensions/erc20/write/mintTo.js";
+/**
+ * SIGNATURE extension for ERC20
+ */
 export {
-  tokensClaimedEvent,
-  type TokensClaimedEventFilters,
-} from "../../extensions/erc20/__generated__/IDropERC20/events/TokensClaimed.js";
-export { claimConditionsUpdatedEvent } from "../../extensions/erc20/__generated__/IDropERC20/events/ClaimConditionsUpdated.js";
+  type GenerateMintSignatureOptions,
+  generateMintSignature,
+  mintWithSignature,
+} from "../../extensions/erc20/write/sigMint.js";
 export {
-  tokensMintedWithSignatureEvent,
-  type TokensMintedWithSignatureEventFilters,
-} from "../../extensions/erc20/__generated__/ISignatureMintERC20/events/TokensMintedWithSignature.js";
-
+  type TransferParams,
+  transfer,
+} from "../../extensions/erc20/write/transfer.js";
 export {
-  getApprovalForTransaction,
-  type GetApprovalForTransactionParams,
-} from "../../extensions/erc20/write/getApprovalForTransaction.js";
+  type TransferBatchParams,
+  transferBatch,
+} from "../../extensions/erc20/write/transferBatch.js";
 export {
-  delegate,
-  type DelegateParams,
-} from "../../extensions/erc20/__generated__/IVotes/write/delegate.js";
+  type TransferFromParams,
+  transferFrom,
+} from "../../extensions/erc20/write/transferFrom.js";
diff --git a/packages/thirdweb/src/exports/extensions/erc4337.ts b/packages/thirdweb/src/exports/extensions/erc4337.ts
index 8c27e4e1c3c..945b16e1ec1 100644
--- a/packages/thirdweb/src/exports/extensions/erc4337.ts
+++ b/packages/thirdweb/src/exports/extensions/erc4337.ts
@@ -1,42 +1,36 @@
 // ACCOUNT
 export { isValidateUserOpSupported } from "../../extensions/erc4337/__generated__/IAccount/write/validateUserOp.js";
 export {
-  type AddAdminOptions,
-  addAdmin,
-  isAddAdminSupported,
-} from "../../extensions/erc4337/account/addAdmin.js";
-
+  getAccounts,
+  isGetAccountsSupported,
+} from "../../extensions/erc4337/__generated__/IAccountFactory/read/getAccounts.js";
 export {
-  type RemoveAdminOptions,
-  removeAdmin,
-  isRemoveAdminSupported,
-} from "../../extensions/erc4337/account/removeAdmin.js";
-
+  type GetAccountsOfSignerParams,
+  getAccountsOfSigner,
+  isGetAccountsOfSignerSupported,
+} from "../../extensions/erc4337/__generated__/IAccountFactory/read/getAccountsOfSigner.js";
 export {
-  type AddSessionKeyOptions,
-  addSessionKey,
-  isAddSessionKeySupported,
-  shouldUpdateSessionKey,
-} from "../../extensions/erc4337/account/addSessionKey.js";
-
+  type GetAddressParams as PredictAccountAddressParams,
+  getAddress as predictAccountAddress,
+  isGetAddressSupported as isPredictAccountAddressSupported,
+} from "../../extensions/erc4337/__generated__/IAccountFactory/read/getAddress.js";
+// FACTORY
 export {
-  type RemoveSessionKeyOptions,
-  removeSessionKey,
-  isRemoveSessionKeySupported,
-} from "../../extensions/erc4337/account/removeSessionKey.js";
-
+  getAllAccounts,
+  isGetAllAccountsSupported,
+} from "../../extensions/erc4337/__generated__/IAccountFactory/read/getAllAccounts.js";
+export { isRegistered } from "../../extensions/erc4337/__generated__/IAccountFactory/read/isRegistered.js";
 export {
-  isAccountDeployed,
-  type IsAccountDeployedParams,
-  isIsAccountDeployedSupported,
-} from "../../extensions/erc4337/account/isAccountDeployed.js";
-
+  isTotalAccountsSupported,
+  totalAccounts,
+} from "../../extensions/erc4337/__generated__/IAccountFactory/read/totalAccounts.js";
 export {
-  createAccount,
   type CreateAccountParams,
+  createAccount,
   isCreateAccountSupported,
 } from "../../extensions/erc4337/__generated__/IAccountFactory/write/createAccount.js";
-
+export { adminUpdatedEvent } from "../../extensions/erc4337/__generated__/IAccountPermissions/events/AdminUpdated.js";
+export { signerPermissionsUpdatedEvent } from "../../extensions/erc4337/__generated__/IAccountPermissions/events/SignerPermissionsUpdated.js";
 export {
   getAllActiveSigners,
   isGetAllActiveSignersSupported,
@@ -50,45 +44,44 @@ export {
   isGetAllSignersSupported,
 } from "../../extensions/erc4337/__generated__/IAccountPermissions/read/getAllSigners.js";
 export {
-  getPermissionsForSigner,
   type GetPermissionsForSignerParams,
+  getPermissionsForSigner,
 } from "../../extensions/erc4337/__generated__/IAccountPermissions/read/getPermissionsForSigner.js";
 export {
+  type IsActiveSignerParams,
   isActiveSigner,
   isIsActiveSignerSupported,
-  type IsActiveSignerParams,
 } from "../../extensions/erc4337/__generated__/IAccountPermissions/read/isActiveSigner.js";
 export {
   isAdmin,
   isIsAdminSupported,
 } from "../../extensions/erc4337/__generated__/IAccountPermissions/read/isAdmin.js";
-export { adminUpdatedEvent } from "../../extensions/erc4337/__generated__/IAccountPermissions/events/AdminUpdated.js";
-export { signerPermissionsUpdatedEvent } from "../../extensions/erc4337/__generated__/IAccountPermissions/events/SignerPermissionsUpdated.js";
-
-// FACTORY
 export {
-  getAllAccounts,
-  isGetAllAccountsSupported,
-} from "../../extensions/erc4337/__generated__/IAccountFactory/read/getAllAccounts.js";
+  type AddAdminOptions,
+  addAdmin,
+  isAddAdminSupported,
+} from "../../extensions/erc4337/account/addAdmin.js";
 export {
-  getAccounts,
-  isGetAccountsSupported,
-} from "../../extensions/erc4337/__generated__/IAccountFactory/read/getAccounts.js";
+  type AddSessionKeyOptions,
+  addSessionKey,
+  isAddSessionKeySupported,
+  shouldUpdateSessionKey,
+} from "../../extensions/erc4337/account/addSessionKey.js";
 export {
-  totalAccounts,
-  isTotalAccountsSupported,
-} from "../../extensions/erc4337/__generated__/IAccountFactory/read/totalAccounts.js";
-export { isRegistered } from "../../extensions/erc4337/__generated__/IAccountFactory/read/isRegistered.js";
+  type IsAccountDeployedParams,
+  isAccountDeployed,
+  isIsAccountDeployedSupported,
+} from "../../extensions/erc4337/account/isAccountDeployed.js";
 export {
-  getAccountsOfSigner,
-  type GetAccountsOfSignerParams,
-  isGetAccountsOfSignerSupported,
-} from "../../extensions/erc4337/__generated__/IAccountFactory/read/getAccountsOfSigner.js";
+  isRemoveAdminSupported,
+  type RemoveAdminOptions,
+  removeAdmin,
+} from "../../extensions/erc4337/account/removeAdmin.js";
 export {
-  getAddress as predictAccountAddress,
-  type GetAddressParams as PredictAccountAddressParams,
-  isGetAddressSupported as isPredictAccountAddressSupported,
-} from "../../extensions/erc4337/__generated__/IAccountFactory/read/getAddress.js";
+  isRemoveSessionKeySupported,
+  type RemoveSessionKeyOptions,
+  removeSessionKey,
+} from "../../extensions/erc4337/account/removeSessionKey.js";
 
 // ENTRYPOINT
 
@@ -96,10 +89,10 @@ export { accountDeployedEvent } from "../../extensions/erc4337/__generated__/IEn
 export { userOperationEventEvent } from "../../extensions/erc4337/__generated__/IEntryPoint/events/UserOperationEvent.js";
 export { userOperationRevertReasonEvent } from "../../extensions/erc4337/__generated__/IEntryPoint/events/UserOperationRevertReason.js";
 export {
-  getUserOpHash,
   type GetUserOpHashParams,
+  getUserOpHash,
 } from "../../extensions/erc4337/__generated__/IEntryPoint/read/getUserOpHash.js";
 export {
-  simulateHandleOp,
   type SimulateHandleOpParams,
+  simulateHandleOp,
 } from "../../extensions/erc4337/__generated__/IEntryPoint/write/simulateHandleOp.js";
diff --git a/packages/thirdweb/src/exports/extensions/erc4626.ts b/packages/thirdweb/src/exports/extensions/erc4626.ts
index 0686b59c4ba..7ab18a55444 100644
--- a/packages/thirdweb/src/exports/extensions/erc4626.ts
+++ b/packages/thirdweb/src/exports/extensions/erc4626.ts
@@ -1,71 +1,70 @@
 // read
+
+// events
+export {
+  type DepositEventFilters,
+  depositEvent,
+} from "../../extensions/erc4626/__generated__/IERC4626/events/Deposit.js";
+export {
+  type WithdrawEventFilters,
+  withdrawEvent,
+} from "../../extensions/erc4626/__generated__/IERC4626/events/Withdraw.js";
 export { asset } from "../../extensions/erc4626/__generated__/IERC4626/read/asset.js";
 export {
-  convertToAssets,
   type ConvertToAssetsParams,
+  convertToAssets,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/convertToAssets.js";
 export {
-  convertToShares,
   type ConvertToSharesParams,
+  convertToShares,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/convertToShares.js";
 export {
-  maxDeposit,
   type MaxDepositParams,
+  maxDeposit,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/maxDeposit.js";
 export {
-  maxMint,
   type MaxMintParams,
+  maxMint,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/maxMint.js";
 export {
-  maxRedeem,
   type MaxRedeemParams,
+  maxRedeem,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/maxRedeem.js";
 export {
-  maxWithdraw,
   type MaxWithdrawParams,
+  maxWithdraw,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/maxWithdraw.js";
 export {
-  previewDeposit,
   type PreviewDepositParams,
+  previewDeposit,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/previewDeposit.js";
 export {
-  previewMint,
   type PreviewMintParams,
+  previewMint,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/previewMint.js";
 export {
-  previewRedeem,
   type PreviewRedeemParams,
+  previewRedeem,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/previewRedeem.js";
 export {
-  previewWithdraw,
   type PreviewWithdrawParams,
+  previewWithdraw,
 } from "../../extensions/erc4626/__generated__/IERC4626/read/previewWithdraw.js";
 export { totalAssets } from "../../extensions/erc4626/__generated__/IERC4626/read/totalAssets.js";
-
 // write
 export {
-  deposit,
   type DepositParams,
+  deposit,
 } from "../../extensions/erc4626/__generated__/IERC4626/write/deposit.js";
 export {
-  redeem,
-  type RedeemParams,
-} from "../../extensions/erc4626/__generated__/IERC4626/write/redeem.js";
-export {
-  mint,
   type MintParams,
+  mint,
 } from "../../extensions/erc4626/__generated__/IERC4626/write/mint.js";
 export {
-  withdraw,
+  type RedeemParams,
+  redeem,
+} from "../../extensions/erc4626/__generated__/IERC4626/write/redeem.js";
+export {
   type WithdrawParams,
+  withdraw,
 } from "../../extensions/erc4626/__generated__/IERC4626/write/withdraw.js";
-
-// events
-export {
-  depositEvent,
-  type DepositEventFilters,
-} from "../../extensions/erc4626/__generated__/IERC4626/events/Deposit.js";
-export {
-  withdrawEvent,
-  type WithdrawEventFilters,
-} from "../../extensions/erc4626/__generated__/IERC4626/events/Withdraw.js";
diff --git a/packages/thirdweb/src/exports/extensions/erc721.ts b/packages/thirdweb/src/exports/extensions/erc721.ts
index 826a30f8eba..f10857f4b89 100644
--- a/packages/thirdweb/src/exports/extensions/erc721.ts
+++ b/packages/thirdweb/src/exports/extensions/erc721.ts
@@ -1,203 +1,161 @@
 /**
  * READ extension for ERC721
  */
-export { isERC721 } from "../../extensions/erc721/read/isERC721.js";
+
 export {
-  getNFT,
-  type GetNFTParams,
-  isGetNFTSupported,
-} from "../../extensions/erc721/read/getNFT.js";
+  type BurnParams,
+  burn,
+  isBurnSupported,
+} from "../../extensions/erc721/__generated__/IBurnableERC721/write/burn.js";
 export {
-  getNFTs,
-  type GetNFTsParams,
-  isGetNFTsSupported,
-} from "../../extensions/erc721/read/getNFTs.js";
+  type TokenURIRevealedEventFilters,
+  tokenURIRevealedEvent,
+} from "../../extensions/erc721/__generated__/IDelayedReveal/events/TokenURIRevealed.js";
+export { claimConditionsUpdatedEvent } from "../../extensions/erc721/__generated__/IDrop/events/ClaimConditionsUpdated.js";
 export {
-  nextTokenIdToMint,
-  isNextTokenIdToMintSupported,
-} from "../../extensions/erc721/__generated__/IERC721Enumerable/read/nextTokenIdToMint.js";
-export { isTokenByIndexSupported } from "../../extensions/erc721/__generated__/IERC721Enumerable/read/tokenByIndex.js";
+  type TokensClaimedEventFilters,
+  tokensClaimedEvent,
+} from "../../extensions/erc721/__generated__/IDrop/events/TokensClaimed.js";
 export {
-  ownerOf,
-  type OwnerOfParams,
-} from "../../extensions/erc721/__generated__/IERC721A/read/ownerOf.js";
-export { startTokenId } from "../../extensions/erc721/__generated__/IERC721A/read/startTokenId.js";
+  getActiveClaimConditionId,
+  isGetActiveClaimConditionIdSupported,
+} from "../../extensions/erc721/__generated__/IDrop/read/getActiveClaimConditionId.js";
+/**
+ * DROPS extension for ERC721
+ */
+// READ
 export {
-  tokenURI,
-  type TokenURIParams,
-} from "../../extensions/erc721/__generated__/IERC721A/read/tokenURI.js";
+  getClaimConditionById,
+  isGetClaimConditionByIdSupported,
+} from "../../extensions/erc721/__generated__/IDrop/read/getClaimConditionById.js";
 export {
-  totalSupply,
-  isTotalSupplySupported,
-} from "../../extensions/erc721/__generated__/IERC721A/read/totalSupply.js";
+  type ApprovalEventFilters,
+  approvalEvent,
+} from "../../extensions/erc721/__generated__/IERC721A/events/Approval.js";
 export {
-  balanceOf,
-  type BalanceOfParams,
-} from "../../extensions/erc721/__generated__/IERC721A/read/balanceOf.js";
+  type ApprovalForAllEventFilters,
+  approvalForAllEvent,
+} from "../../extensions/erc721/__generated__/IERC721A/events/ApprovalForAll.js";
+/**
+ * EVENTS extension for ERC721
+ */
 export {
-  tokenOfOwnerByIndex,
-  type TokenOfOwnerByIndexParams,
-} from "../../extensions/erc721/__generated__/IERC721Enumerable/read/tokenOfOwnerByIndex.js";
+  type TransferEventFilters,
+  transferEvent,
+} from "../../extensions/erc721/__generated__/IERC721A/events/Transfer.js";
 export {
-  tokensOfOwner,
-  type TokensOfOwnerParams,
-} from "../../extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwner.js";
+  type BalanceOfParams,
+  balanceOf,
+} from "../../extensions/erc721/__generated__/IERC721A/read/balanceOf.js";
 export {
-  getAllOwners,
-  type GetAllOwnersParams,
-} from "../../extensions/erc721/read/getAllOwners.js";
+  type GetApprovedParams,
+  getApproved,
+  isGetApprovedSupported,
+} from "../../extensions/erc721/__generated__/IERC721A/read/getApproved.js";
 export {
-  isApprovedForAll,
   type IsApprovedForAllParams,
+  isApprovedForAll,
 } from "../../extensions/erc721/__generated__/IERC721A/read/isApprovedForAll.js";
 export {
-  type GetApprovedParams,
-  isGetApprovedSupported,
-  getApproved,
-} from "../../extensions/erc721/__generated__/IERC721A/read/getApproved.js";
-export { getTotalUnclaimedSupply } from "../../extensions/erc721/read/getTotalUnclaimedSupply.js";
-export { getTotalClaimedSupply } from "../../extensions/erc721/read/getTotalClaimedSupply.js";
+  type OwnerOfParams,
+  ownerOf,
+} from "../../extensions/erc721/__generated__/IERC721A/read/ownerOf.js";
+export { startTokenId } from "../../extensions/erc721/__generated__/IERC721A/read/startTokenId.js";
 export {
-  getOwnedTokenIds,
-  type GetOwnedTokenIdsParams,
-} from "../../extensions/erc721/read/getOwnedTokenIds.js";
+  type TokenURIParams,
+  tokenURI,
+} from "../../extensions/erc721/__generated__/IERC721A/read/tokenURI.js";
 export {
-  getOwnedNFTs,
-  type GetOwnedNFTsParams,
-} from "../../extensions/erc721/read/getOwnedNFTs.js";
-/**
- * WRITE extension for ERC721
- */
+  isTotalSupplySupported,
+  totalSupply,
+} from "../../extensions/erc721/__generated__/IERC721A/read/totalSupply.js";
 export {
-  mintTo,
-  type MintToParams,
-  isMintToSupported,
-} from "../../extensions/erc721/write/mintTo.js";
+  type ApproveParams,
+  approve,
+} from "../../extensions/erc721/__generated__/IERC721A/write/approve.js";
+export {
+  type SetApprovalForAllParams,
+  setApprovalForAll,
+} from "../../extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.js";
 export {
-  transferFrom,
   type TransferFromParams,
+  transferFrom,
 } from "../../extensions/erc721/__generated__/IERC721A/write/transferFrom.js";
 export {
-  burn,
-  type BurnParams,
-  isBurnSupported,
-} from "../../extensions/erc721/__generated__/IBurnableERC721/write/burn.js";
+  type TokensOfOwnerParams,
+  tokensOfOwner,
+} from "../../extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwner.js";
 export {
-  setApprovalForAll,
-  type SetApprovalForAllParams,
-} from "../../extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.js";
+  isNextTokenIdToMintSupported,
+  nextTokenIdToMint,
+} from "../../extensions/erc721/__generated__/IERC721Enumerable/read/nextTokenIdToMint.js";
+export { isTokenByIndexSupported } from "../../extensions/erc721/__generated__/IERC721Enumerable/read/tokenByIndex.js";
 export {
-  approve,
-  type ApproveParams,
-} from "../../extensions/erc721/__generated__/IERC721A/write/approve.js";
+  type TokenOfOwnerByIndexParams,
+  tokenOfOwnerByIndex,
+} from "../../extensions/erc721/__generated__/IERC721Enumerable/read/tokenOfOwnerByIndex.js";
+export {
+  type TokensLazyMintedEventFilters,
+  tokensLazyMintedEvent,
+} from "../../extensions/erc721/__generated__/ILazyMint/events/TokensLazyMinted.js";
 export {
-  setTokenURI,
   type SetTokenURIParams,
+  setTokenURI,
 } from "../../extensions/erc721/__generated__/INFTMetadata/write/setTokenURI.js";
-
+export { sharedMetadataUpdatedEvent } from "../../extensions/erc721/__generated__/ISharedMetadata/events/SharedMetadataUpdated.js";
 /**
- * DROPS extension for ERC721
+ * SHARED METADATA extension for ERC721
  */
-// READ
 export {
-  getClaimConditionById,
-  isGetClaimConditionByIdSupported,
-} from "../../extensions/erc721/__generated__/IDrop/read/getClaimConditionById.js";
+  isSharedMetadataSupported,
+  sharedMetadata,
+} from "../../extensions/erc721/__generated__/ISharedMetadata/read/sharedMetadata.js";
 export {
-  getActiveClaimConditionId,
-  isGetActiveClaimConditionIdSupported,
-} from "../../extensions/erc721/__generated__/IDrop/read/getActiveClaimConditionId.js";
+  type TokensMintedWithSignatureEventFilters,
+  tokensMintedWithSignatureEvent,
+} from "../../extensions/erc721/__generated__/ISignatureMintERC721/events/TokensMintedWithSignature.js";
 export {
-  getClaimConditions,
-  isGetClaimConditionsSupported,
-} from "../../extensions/erc721/drops/read/getClaimConditions.js";
+  type CanClaimParams,
+  type CanClaimResult,
+  canClaim,
+} from "../../extensions/erc721/drops/read/canClaim.js";
 export {
   getActiveClaimCondition,
   isGetActiveClaimConditionSupported,
 } from "../../extensions/erc721/drops/read/getActiveClaimCondition.js";
 export {
-  canClaim,
-  type CanClaimParams,
-  type CanClaimResult,
-} from "../../extensions/erc721/drops/read/canClaim.js";
-
+  getClaimConditions,
+  isGetClaimConditionsSupported,
+} from "../../extensions/erc721/drops/read/getClaimConditions.js";
 // WRITE
 export {
-  claimTo,
   type ClaimToParams,
+  claimTo,
   isClaimToSupported,
 } from "../../extensions/erc721/drops/write/claimTo.js";
 export {
-  lazyMint,
-  type LazyMintParams,
-  isLazyMintSupported,
-} from "../../extensions/erc721/write/lazyMint.js";
-export {
-  setClaimConditions,
-  type SetClaimConditionsParams,
-  isSetClaimConditionsSupported,
-} from "../../extensions/erc721/drops/write/setClaimConditions.js";
+  type ClaimToBatchParams,
+  claimToBatch,
+} from "../../extensions/erc721/drops/write/claimToBatch.js";
 export {
-  resetClaimEligibility,
   isResetClaimEligibilitySupported,
+  resetClaimEligibility,
 } from "../../extensions/erc721/drops/write/resetClaimEligibility.js";
-
-/**
- * SIGNATURE extension for ERC721
- */
-export {
-  mintWithSignature,
-  type GenerateMintSignatureOptions,
-  generateMintSignature,
-} from "../../extensions/erc721/write/sigMint.js";
-
-/**
- * SHARED METADATA extension for ERC721
- */
 export {
-  sharedMetadata,
-  isSharedMetadataSupported,
-} from "../../extensions/erc721/__generated__/ISharedMetadata/read/sharedMetadata.js";
-export {
-  setSharedMetadata,
-  type SetSharedMetadataParams,
-  isSetSharedMetadataSupported,
-} from "../../extensions/erc721/write/setSharedMetadata.js";
-
-/**
- * EVENTS extension for ERC721
- */
-export {
-  transferEvent,
-  type TransferEventFilters,
-} from "../../extensions/erc721/__generated__/IERC721A/events/Transfer.js";
-export {
-  tokensLazyMintedEvent,
-  type TokensLazyMintedEventFilters,
-} from "../../extensions/erc721/__generated__/ILazyMint/events/TokensLazyMinted.js";
-export {
-  approvalEvent,
-  type ApprovalEventFilters,
-} from "../../extensions/erc721/__generated__/IERC721A/events/Approval.js";
-export {
-  approvalForAllEvent,
-  type ApprovalForAllEventFilters,
-} from "../../extensions/erc721/__generated__/IERC721A/events/ApprovalForAll.js";
-export {
-  tokensMintedWithSignatureEvent,
-  type TokensMintedWithSignatureEventFilters,
-} from "../../extensions/erc721/__generated__/ISignatureMintERC721/events/TokensMintedWithSignature.js";
-export { claimConditionsUpdatedEvent } from "../../extensions/erc721/__generated__/IDrop/events/ClaimConditionsUpdated.js";
+  isSetClaimConditionsSupported,
+  type SetClaimConditionsParams,
+  setClaimConditions,
+} from "../../extensions/erc721/drops/write/setClaimConditions.js";
 export {
-  tokensClaimedEvent,
-  type TokensClaimedEventFilters,
-} from "../../extensions/erc721/__generated__/IDrop/events/TokensClaimed.js";
-export { sharedMetadataUpdatedEvent } from "../../extensions/erc721/__generated__/ISharedMetadata/events/SharedMetadataUpdated.js";
+  isUpdateMetadataSupported,
+  type UpdateMetadataParams,
+  updateMetadata,
+} from "../../extensions/erc721/drops/write/updateMetadata.js";
 export {
-  tokenURIRevealedEvent,
-  type TokenURIRevealedEventFilters,
-} from "../../extensions/erc721/__generated__/IDelayedReveal/events/TokenURIRevealed.js";
-
+  type BatchToReveal,
+  getBatchesToReveal,
+  isGetBatchesToRevealSupported,
+} from "../../extensions/erc721/lazyMinting/read/getBatchesToReveal.js";
 // Lazy Minting
 export {
   type CreateDelayedRevealBatchParams,
@@ -205,26 +163,63 @@ export {
   isCreateDelayedRevealBatchSupported,
 } from "../../extensions/erc721/lazyMinting/write/createDelayedRevealBatch.js";
 export {
+  isRevealSupported,
   type RevealParams,
   reveal,
-  isRevealSupported,
 } from "../../extensions/erc721/lazyMinting/write/reveal.js";
 export {
-  type BatchToReveal,
-  getBatchesToReveal,
-  isGetBatchesToRevealSupported,
-} from "../../extensions/erc721/lazyMinting/read/getBatchesToReveal.js";
+  type GetAllOwnersParams,
+  getAllOwners,
+} from "../../extensions/erc721/read/getAllOwners.js";
 export {
-  updateMetadata,
-  type UpdateMetadataParams,
-  isUpdateMetadataSupported,
-} from "../../extensions/erc721/drops/write/updateMetadata.js";
+  type GetNFTParams,
+  getNFT,
+  isGetNFTSupported,
+} from "../../extensions/erc721/read/getNFT.js";
+export {
+  type GetNFTsParams,
+  getNFTs,
+  isGetNFTsSupported,
+} from "../../extensions/erc721/read/getNFTs.js";
+export {
+  type GetOwnedNFTsParams,
+  getOwnedNFTs,
+} from "../../extensions/erc721/read/getOwnedNFTs.js";
+export {
+  type GetOwnedTokenIdsParams,
+  getOwnedTokenIds,
+} from "../../extensions/erc721/read/getOwnedTokenIds.js";
+export { getTotalClaimedSupply } from "../../extensions/erc721/read/getTotalClaimedSupply.js";
+export { getTotalUnclaimedSupply } from "../../extensions/erc721/read/getTotalUnclaimedSupply.js";
+export { isERC721 } from "../../extensions/erc721/read/isERC721.js";
+export {
+  isLazyMintSupported,
+  type LazyMintParams,
+  lazyMint,
+} from "../../extensions/erc721/write/lazyMint.js";
+/**
+ * WRITE extension for ERC721
+ */
+export {
+  isMintToSupported,
+  type MintToParams,
+  mintTo,
+} from "../../extensions/erc721/write/mintTo.js";
+export {
+  isSetSharedMetadataSupported,
+  type SetSharedMetadataParams,
+  setSharedMetadata,
+} from "../../extensions/erc721/write/setSharedMetadata.js";
+/**
+ * SIGNATURE extension for ERC721
+ */
+export {
+  type GenerateMintSignatureOptions,
+  generateMintSignature,
+  mintWithSignature,
+} from "../../extensions/erc721/write/sigMint.js";
 export {
-  updateTokenURI,
-  type UpdateTokenURIParams,
   isUpdateTokenURISupported,
+  type UpdateTokenURIParams,
+  updateTokenURI,
 } from "../../extensions/erc721/write/updateTokenURI.js";
-export {
-  claimToBatch,
-  type ClaimToBatchParams,
-} from "../../extensions/erc721/drops/write/claimToBatch.js";
diff --git a/packages/thirdweb/src/exports/extensions/farcaster.ts b/packages/thirdweb/src/exports/extensions/farcaster.ts
index 8ee78c317c0..91f08e2d4e2 100644
--- a/packages/thirdweb/src/exports/extensions/farcaster.ts
+++ b/packages/thirdweb/src/exports/extensions/farcaster.ts
@@ -3,41 +3,43 @@ export {
   ID_GATEWAY_ADDRESS,
   ID_REGISTRY_ADDRESS,
   KEY_GATEWAY_ADDRESS,
-  STORAGE_REGISTRY_ADDRESS,
   SIGNED_KEY_REQUEST_VALIDATOR_ADDRESS,
+  STORAGE_REGISTRY_ADDRESS,
 } from "../../extensions/farcaster/constants.js";
 
 // Contracts
 export type { FarcasterContractOptions } from "../../extensions/farcaster/contracts/contractOptions.js";
-export { getIdGateway } from "../../extensions/farcaster/contracts/getIdGateway.js";
-export { getKeyGateway } from "../../extensions/farcaster/contracts/getKeyGateway.js";
 export { getBundler } from "../../extensions/farcaster/contracts/getBundler.js";
+export { getIdGateway } from "../../extensions/farcaster/contracts/getIdGateway.js";
 export { getIdRegistry } from "../../extensions/farcaster/contracts/getIdRegistry.js";
+export { getKeyGateway } from "../../extensions/farcaster/contracts/getKeyGateway.js";
 export { getStorageRegistry } from "../../extensions/farcaster/contracts/getStorageRegistry.js";
-
-// EIP712 Signatures
 export {
-  type RegisterMessage,
-  type SignRegisterOptions,
-  signRegister,
-  getRegisterData,
-} from "../../extensions/farcaster/eip712Signatures/registerSignature.js";
+  createEd25519Keypair,
+  type Ed25519Keypair,
+} from "../../extensions/farcaster/ed25519.js";
+export {
+  type AddMessage,
+  getAddData,
+  type SignAddOptions,
+  signAdd,
+} from "../../extensions/farcaster/eip712Signatures/addSignature.js";
 export {
+  encodeSignedKeyRequestMetadata,
+  getKeyRequestData,
+  getSignedKeyRequestMetadata,
   type SignedKeyRequestMessage,
   type SignedKeyRequestMetadataOptions,
   type SignKeyRequestOptions,
   signKeyRequest,
-  getKeyRequestData,
-  encodeSignedKeyRequestMetadata,
-  getSignedKeyRequestMetadata,
 } from "../../extensions/farcaster/eip712Signatures/keyRequestSignature.js";
+// EIP712 Signatures
 export {
-  type AddMessage,
-  type SignAddOptions,
-  signAdd,
-  getAddData,
-} from "../../extensions/farcaster/eip712Signatures/addSignature.js";
-
+  getRegisterData,
+  type RegisterMessage,
+  type SignRegisterOptions,
+  signRegister,
+} from "../../extensions/farcaster/eip712Signatures/registerSignature.js";
 // Helper Functions
 export {
   type GetFidParams,
@@ -51,30 +53,18 @@ export {
   type GetRegistrationPriceParams,
   getRegistrationPrice,
 } from "../../extensions/farcaster/read/getRegistrationPrice.js";
-export {
-  type GetUsdRegistrationPriceParams,
-  getUsdRegistrationPrice,
-} from "../../extensions/farcaster/read/getUsdRegistrationPrice.js";
 export {
   type GetStoragePriceParams,
   getStoragePrice,
 } from "../../extensions/farcaster/read/getStoragePrice.js";
+export {
+  type GetUsdRegistrationPriceParams,
+  getUsdRegistrationPrice,
+} from "../../extensions/farcaster/read/getUsdRegistrationPrice.js";
 export {
   type GetUsdStoragePriceParams,
   getUsdStoragePrice,
 } from "../../extensions/farcaster/read/getUsdStoragePrice.js";
-export {
-  type RegisterFidParams,
-  registerFid,
-} from "../../extensions/farcaster/write/registerFid.js";
-export {
-  type RegisterFidAndSignerParams,
-  registerFidAndSigner,
-} from "../../extensions/farcaster/write/registerFidAndSigner.js";
-export {
-  type Ed25519Keypair,
-  createEd25519Keypair,
-} from "../../extensions/farcaster/ed25519.js";
 export {
   type AddSignerParams,
   addSigner,
@@ -83,6 +73,14 @@ export {
   type AddSignerForParams,
   addSignerFor,
 } from "../../extensions/farcaster/write/addSignerFor.js";
+export {
+  type RegisterFidParams,
+  registerFid,
+} from "../../extensions/farcaster/write/registerFid.js";
+export {
+  type RegisterFidAndSignerParams,
+  registerFidAndSigner,
+} from "../../extensions/farcaster/write/registerFidAndSigner.js";
 export {
   type RentStorageParams,
   rentStorage,
diff --git a/packages/thirdweb/src/exports/extensions/farcaster/idGateway.ts b/packages/thirdweb/src/exports/extensions/farcaster/idGateway.ts
index ec87033a069..12cff64216e 100644
--- a/packages/thirdweb/src/exports/extensions/farcaster/idGateway.ts
+++ b/packages/thirdweb/src/exports/extensions/farcaster/idGateway.ts
@@ -1,11 +1,11 @@
 export { setStorageRegistryEvent } from "../../../extensions/farcaster/__generated__/IIdGateway/events/SetStorageRegistry.js";
-export { REGISTER_TYPEHASH } from "../../../extensions/farcaster/__generated__/IIdGateway/read/REGISTER_TYPEHASH.js";
 export { idRegistry } from "../../../extensions/farcaster/__generated__/IIdGateway/read/idRegistry.js";
-export { storageRegistry } from "../../../extensions/farcaster/__generated__/IIdGateway/read/storageRegistry.js";
 export {
   type PriceParams,
   price,
 } from "../../../extensions/farcaster/__generated__/IIdGateway/read/price.js";
+export { REGISTER_TYPEHASH } from "../../../extensions/farcaster/__generated__/IIdGateway/read/REGISTER_TYPEHASH.js";
+export { storageRegistry } from "../../../extensions/farcaster/__generated__/IIdGateway/read/storageRegistry.js";
 export {
   type RegisterParams,
   register,
diff --git a/packages/thirdweb/src/exports/extensions/farcaster/idRegistry.ts b/packages/thirdweb/src/exports/extensions/farcaster/idRegistry.ts
index 94f75222de2..089f8e48570 100644
--- a/packages/thirdweb/src/exports/extensions/farcaster/idRegistry.ts
+++ b/packages/thirdweb/src/exports/extensions/farcaster/idRegistry.ts
@@ -1,47 +1,33 @@
-export { registerEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/Register.js";
-export { transferEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/Transfer.js";
-export { recoverEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/Recover.js";
+export { adminResetEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/AdminReset.js";
 export { changeRecoveryAddressEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/ChangeRecoveryAddress.js";
-export { setIdGatewayEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/SetIdGateway.js";
 export { freezeIdGatewayEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/FreezeIdGateway.js";
+export { recoverEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/Recover.js";
+export { registerEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/Register.js";
 export { setIdCounterEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/SetIdCounter.js";
-export { adminResetEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/AdminReset.js";
-
-export { TRANSFER_TYPEHASH } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_TYPEHASH.js";
-export { TRANSFER_AND_CHANGE_RECOVERY_TYPEHASH } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_AND_CHANGE_RECOVERY_TYPEHASH.js";
+export { setIdGatewayEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/SetIdGateway.js";
+export { transferEvent } from "../../../extensions/farcaster/__generated__/IIdRegistry/events/Transfer.js";
 export { CHANGE_RECOVERY_ADDRESS_TYPEHASH } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/CHANGE_RECOVERY_ADDRESS_TYPEHASH.js";
-export { idGateway } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/idGateway.js";
+export {
+  type CustodyOfParams,
+  custodyOf,
+} from "../../../extensions/farcaster/__generated__/IIdRegistry/read/custodyOf.js";
 export { gatewayFrozen } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/gatewayFrozen.js";
 export { idCounter } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/idCounter.js";
+export { idGateway } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/idGateway.js";
 export {
   type IdOfParams,
   idOf,
 } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/idOf.js";
-export {
-  type CustodyOfParams,
-  custodyOf,
-} from "../../../extensions/farcaster/__generated__/IIdRegistry/read/custodyOf.js";
 export {
   type RecoveryOfParams,
   recoveryOf,
 } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/recoveryOf.js";
+export { TRANSFER_AND_CHANGE_RECOVERY_TYPEHASH } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_AND_CHANGE_RECOVERY_TYPEHASH.js";
+export { TRANSFER_TYPEHASH } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_TYPEHASH.js";
 export {
   type VerifyFidSignatureParams,
   verifyFidSignature,
 } from "../../../extensions/farcaster/__generated__/IIdRegistry/read/verifyFidSignature.js";
-
-export {
-  type TransferParams,
-  transfer,
-} from "../../../extensions/farcaster/__generated__/IIdRegistry/write/transfer.js";
-export {
-  type TransferAndChangeRecoveryParams,
-  transferAndChangeRecovery,
-} from "../../../extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecovery.js";
-export {
-  type TransferForParams,
-  transferFor,
-} from "../../../extensions/farcaster/__generated__/IIdRegistry/write/transferFor.js";
 export {
   type ChangeRecoveryAddressParams,
   changeRecoveryAddress,
@@ -54,3 +40,15 @@ export {
   type RecoverForParams,
   recoverFor,
 } from "../../../extensions/farcaster/__generated__/IIdRegistry/write/recoverFor.js";
+export {
+  type TransferParams,
+  transfer,
+} from "../../../extensions/farcaster/__generated__/IIdRegistry/write/transfer.js";
+export {
+  type TransferAndChangeRecoveryParams,
+  transferAndChangeRecovery,
+} from "../../../extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecovery.js";
+export {
+  type TransferForParams,
+  transferFor,
+} from "../../../extensions/farcaster/__generated__/IIdRegistry/write/transferFor.js";
diff --git a/packages/thirdweb/src/exports/extensions/farcaster/keyGateway.ts b/packages/thirdweb/src/exports/extensions/farcaster/keyGateway.ts
index c3fb60a40ea..d8e3d98e815 100644
--- a/packages/thirdweb/src/exports/extensions/farcaster/keyGateway.ts
+++ b/packages/thirdweb/src/exports/extensions/farcaster/keyGateway.ts
@@ -1,5 +1,5 @@
 export { ADD_TYPEHASH } from "../../../extensions/farcaster/__generated__/IKeyGateway/read/ADD_TYPEHASH.js";
 export { keyRegistry } from "../../../extensions/farcaster/__generated__/IKeyGateway/read/keyRegistry.js";
+export { nonces } from "../../../extensions/farcaster/__generated__/IKeyGateway/read/nonces.js";
 export { add } from "../../../extensions/farcaster/__generated__/IKeyGateway/write/add.js";
 export { addFor } from "../../../extensions/farcaster/__generated__/IKeyGateway/write/addFor.js";
-export { nonces } from "../../../extensions/farcaster/__generated__/IKeyGateway/read/nonces.js";
diff --git a/packages/thirdweb/src/exports/extensions/farcaster/keyRegistry.ts b/packages/thirdweb/src/exports/extensions/farcaster/keyRegistry.ts
index 482a601044c..407e615f58a 100644
--- a/packages/thirdweb/src/exports/extensions/farcaster/keyRegistry.ts
+++ b/packages/thirdweb/src/exports/extensions/farcaster/keyRegistry.ts
@@ -1,19 +1,19 @@
 export { addEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/Add.js";
-export { removeEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/Remove.js";
 export { adminResetEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/AdminReset.js";
-export { setValidatorEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/SetValidator.js";
+export { freezeKeyGatewayEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/FreezeKeyGateway.js";
+export { removeEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/Remove.js";
 export { setIdRegistryEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/SetIdRegistry.js";
 export { setKeyGatewayEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/SetKeyGateway.js";
 export { setMaxKeysPerFidEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/SetMaxKeysPerFid.js";
-export { freezeKeyGatewayEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/FreezeKeyGateway.js";
-export { REMOVE_TYPEHASH } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/REMOVE_TYPEHASH.js";
+export { setValidatorEvent } from "../../../extensions/farcaster/__generated__/IKeyRegistry/events/SetValidator.js";
+export { gatewayFrozen } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/gatewayFrozen.js";
 export { idRegistry } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/idRegistry.js";
+export { keyAt } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/keyAt.js";
+export { keyDataOf } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/keyDataOf.js";
 export { keyGateway } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/keyGateway.js";
-export { gatewayFrozen } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/gatewayFrozen.js";
+export { keysOf } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/keysOf.js";
 export { maxKeysPerFid } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/maxKeysPerFid.js";
+export { REMOVE_TYPEHASH } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/REMOVE_TYPEHASH.js";
 export { totalKeys } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/totalKeys.js";
-export { keyAt } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/keyAt.js";
-export { keysOf } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/keysOf.js";
-export { keyDataOf } from "../../../extensions/farcaster/__generated__/IKeyRegistry/read/keyDataOf.js";
 export { remove } from "../../../extensions/farcaster/__generated__/IKeyRegistry/write/remove.js";
 export { removeFor } from "../../../extensions/farcaster/__generated__/IKeyRegistry/write/removeFor.js";
diff --git a/packages/thirdweb/src/exports/extensions/farcaster/storageRegistry.ts b/packages/thirdweb/src/exports/extensions/farcaster/storageRegistry.ts
index 0384d8de8e9..6c26e8f67cb 100644
--- a/packages/thirdweb/src/exports/extensions/farcaster/storageRegistry.ts
+++ b/packages/thirdweb/src/exports/extensions/farcaster/storageRegistry.ts
@@ -1,11 +1,11 @@
 export { deprecationTimestamp } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/deprecationTimestamp.js";
-export { usdUnitPrice } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/usdUnitPrice.js";
 export { maxUnits } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/maxUnits.js";
-export { rentedUnits } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/rentedUnits.js";
-export { rent } from "../../../extensions/farcaster/__generated__/IStorageRegistry/write/rent.js";
-export { batchRent } from "../../../extensions/farcaster/__generated__/IStorageRegistry/write/batchRent.js";
-export { unitPrice } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/unitPrice.js";
 export {
   type PriceParams,
   price,
 } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/price.js";
+export { rentedUnits } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/rentedUnits.js";
+export { unitPrice } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/unitPrice.js";
+export { usdUnitPrice } from "../../../extensions/farcaster/__generated__/IStorageRegistry/read/usdUnitPrice.js";
+export { batchRent } from "../../../extensions/farcaster/__generated__/IStorageRegistry/write/batchRent.js";
+export { rent } from "../../../extensions/farcaster/__generated__/IStorageRegistry/write/rent.js";
diff --git a/packages/thirdweb/src/exports/extensions/lens.ts b/packages/thirdweb/src/exports/extensions/lens.ts
index 009ad42a8f0..9d242ec6819 100644
--- a/packages/thirdweb/src/exports/extensions/lens.ts
+++ b/packages/thirdweb/src/exports/extensions/lens.ts
@@ -1,161 +1,157 @@
 /**
  * LensHub
  */
-export {
-  getProfile,
-  type GetProfileParams,
-} from "../../extensions/lens/__generated__/LensHub/read/getProfile.js";
-export {
-  exists,
-  type ExistsParams,
-} from "../../extensions/lens/__generated__/LensHub/read/exists.js";
-export {
-  getContentURI,
-  type GetContentURIParams,
-} from "../../extensions/lens/__generated__/LensHub/read/getContentURI.js";
-export {
-  getProfileIdByHandleHash,
-  type GetProfileIdByHandleHashParams,
-} from "../../extensions/lens/__generated__/LensHub/read/getProfileIdByHandleHash.js";
-export {
-  getPublication,
-  type GetPublicationParams,
-} from "../../extensions/lens/__generated__/LensHub/read/getPublication.js";
-export {
-  tokenDataOf,
-  type TokenDataOfParams,
-} from "../../extensions/lens/__generated__/LensHub/read/tokenDataOf.js";
-export {
-  mintTimestampOf,
-  type MintTimestampOfParams,
-} from "../../extensions/lens/__generated__/LensHub/read/mintTimestampOf.js";
-
-/**
- * LensHandle
- */
-export {
-  getHandle,
-  type GetHandleParams,
-} from "../../extensions/lens/__generated__/LensHandle/read/getHandle.js";
-export { getHandleTokenURIContract } from "../../extensions/lens/__generated__/LensHandle/read/getHandleTokenURIContract.js";
-export {
-  getLocalName,
-  type GetLocalNameParams,
-} from "../../extensions/lens/__generated__/LensHandle/read/getLocalName.js";
-export {
-  getTokenId,
-  type GetTokenIdParams,
-} from "../../extensions/lens/__generated__/LensHandle/read/getTokenId.js";
 
 /**
  * FollowNFT
  */
 export {
-  getFollowData,
   type GetFollowDataParams,
+  getFollowData,
 } from "../../extensions/lens/__generated__/FollowNFT/read/getFollowData.js";
 export { getFollowerCount } from "../../extensions/lens/__generated__/FollowNFT/read/getFollowerCount.js";
 export {
-  getFollowerProfileId,
   type GetFollowerProfileIdParams,
+  getFollowerProfileId,
 } from "../../extensions/lens/__generated__/FollowNFT/read/getFollowerProfileId.js";
 export {
-  getFollowTokenId,
   type GetFollowTokenIdParams,
+  getFollowTokenId,
 } from "../../extensions/lens/__generated__/FollowNFT/read/getFollowTokenId.js";
 export {
-  getOriginalFollowTimestamp,
   type GetOriginalFollowTimestampParams,
+  getOriginalFollowTimestamp,
 } from "../../extensions/lens/__generated__/FollowNFT/read/getOriginalFollowTimestamp.js";
 export {
-  getProfileIdAllowedToRecover,
   type GetProfileIdAllowedToRecoverParams,
+  getProfileIdAllowedToRecover,
 } from "../../extensions/lens/__generated__/FollowNFT/read/getProfileIdAllowedToRecover.js";
 export {
-  isFollowing,
   type IsFollowingParams,
+  isFollowing,
 } from "../../extensions/lens/__generated__/FollowNFT/read/isFollowing.js";
 export {
-  mintTimestampOf as mintTimestampOfFollowNFT,
   type MintTimestampOfParams as MintTimestampOfFollowNFTParams,
+  mintTimestampOf as mintTimestampOfFollowNFT,
 } from "../../extensions/lens/__generated__/FollowNFT/read/mintTimestampOf.js";
-
 /**
- * TokenHandleRegistry
+ * LensHandle
  */
 export {
-  getDefaultHandle,
-  type GetDefaultHandleParams,
-} from "../../extensions/lens/__generated__/TokenHandleRegistry/read/getDefaultHandle.js";
+  type GetHandleParams,
+  getHandle,
+} from "../../extensions/lens/__generated__/LensHandle/read/getHandle.js";
+export { getHandleTokenURIContract } from "../../extensions/lens/__generated__/LensHandle/read/getHandleTokenURIContract.js";
 export {
-  nonces,
-  type NoncesParams,
-} from "../../extensions/lens/__generated__/TokenHandleRegistry/read/nonces.js";
+  type GetLocalNameParams,
+  getLocalName,
+} from "../../extensions/lens/__generated__/LensHandle/read/getLocalName.js";
 export {
-  resolve,
-  type ResolveParams,
-} from "../../extensions/lens/__generated__/TokenHandleRegistry/read/resolve.js";
-
+  type GetTokenIdParams,
+  getTokenId,
+} from "../../extensions/lens/__generated__/LensHandle/read/getTokenId.js";
+export {
+  type ExistsParams,
+  exists,
+} from "../../extensions/lens/__generated__/LensHub/read/exists.js";
+export {
+  type GetContentURIParams,
+  getContentURI,
+} from "../../extensions/lens/__generated__/LensHub/read/getContentURI.js";
+export {
+  type GetProfileParams,
+  getProfile,
+} from "../../extensions/lens/__generated__/LensHub/read/getProfile.js";
+export {
+  type GetProfileIdByHandleHashParams,
+  getProfileIdByHandleHash,
+} from "../../extensions/lens/__generated__/LensHub/read/getProfileIdByHandleHash.js";
+export {
+  type GetPublicationParams,
+  getPublication,
+} from "../../extensions/lens/__generated__/LensHub/read/getPublication.js";
+export {
+  type MintTimestampOfParams,
+  mintTimestampOf,
+} from "../../extensions/lens/__generated__/LensHub/read/mintTimestampOf.js";
+export {
+  type TokenDataOfParams,
+  tokenDataOf,
+} from "../../extensions/lens/__generated__/LensHub/read/tokenDataOf.js";
 /**
  * ModuleRegistry
  */
 export {
-  getModuleTypes,
   type GetModuleTypesParams,
+  getModuleTypes,
 } from "../../extensions/lens/__generated__/ModuleRegistry/read/getModuleTypes.js";
 export {
-  isErc20CurrencyRegistered,
   type IsErc20CurrencyRegisteredParams,
+  isErc20CurrencyRegistered,
 } from "../../extensions/lens/__generated__/ModuleRegistry/read/isErc20CurrencyRegistered.js";
 export {
-  isModuleRegistered,
   type IsModuleRegisteredParams,
+  isModuleRegistered,
 } from "../../extensions/lens/__generated__/ModuleRegistry/read/isModuleRegistered.js";
 export {
-  isModuleRegisteredAs,
   type IsModuleRegisteredAsParams,
+  isModuleRegisteredAs,
 } from "../../extensions/lens/__generated__/ModuleRegistry/read/isModuleRegisteredAs.js";
-
 /**
- * Custom extension
+ * TokenHandleRegistry
  */
-
-// Read
-export {
-  getHandleFromProfileId,
-  type GetHandleFromProfileIdParams,
-} from "../../extensions/lens/read/getHandleFromProfileId.js";
 export {
-  getProfileMetadata,
-  type GetProfileMetadataParams,
-} from "../../extensions/lens/read/getProfileMetadata.js";
-export type { LensProfileSchema } from "../../extensions/lens/read/type.js";
+  type GetDefaultHandleParams,
+  getDefaultHandle,
+} from "../../extensions/lens/__generated__/TokenHandleRegistry/read/getDefaultHandle.js";
 export {
-  getFullProfile,
-  type GetFullProfileParams,
-  type FullProfileResponse,
-} from "../../extensions/lens/read/getFullProfile.js";
+  type NoncesParams,
+  nonces,
+} from "../../extensions/lens/__generated__/TokenHandleRegistry/read/nonces.js";
 export {
-  resolveAddress,
-  type ResolveLensAddressParams,
-} from "../../extensions/lens/read/resolveAddress.js";
+  type ResolveParams,
+  resolve,
+} from "../../extensions/lens/__generated__/TokenHandleRegistry/read/resolve.js";
+
+/**
+ * Custom extension
+ */
 
 /**
  * Contract addresses
  */
 export {
+  LENS_COLLECT_NFT_ADDRESS,
+  LENS_COLLECT_NFT_ADDRESS_TESTNET,
+  LENS_FOLLOW_NFT_ADDRESS,
+  LENS_FOLLOW_NFT_ADDRESS_TESTNET,
+  LENS_HANDLE_ADDRESS,
+  LENS_HANDLE_ADDRESS_TESTNET,
   // Mainnet
   LENS_HUB_ADDRESS,
-  LENS_HANDLE_ADDRESS,
-  LENS_TOKEN_HANDLE_REGISTRY_ADDRESS,
-  LENS_FOLLOW_NFT_ADDRESS,
-  LENS_COLLECT_NFT_ADDRESS,
-  LENS_MODULE_REGISTRY_ADDRESS,
   // Testnet
   LENS_HUB_ADDRESS_TESTNET,
-  LENS_HANDLE_ADDRESS_TESTNET,
-  LENS_TOKEN_HANDLE_REGISTRY_ADDRESS_TESTNET,
-  LENS_FOLLOW_NFT_ADDRESS_TESTNET,
-  LENS_COLLECT_NFT_ADDRESS_TESTNET,
+  LENS_MODULE_REGISTRY_ADDRESS,
   LENS_MODULE_REGISTRY_ADDRESS_TESTNET,
+  LENS_TOKEN_HANDLE_REGISTRY_ADDRESS,
+  LENS_TOKEN_HANDLE_REGISTRY_ADDRESS_TESTNET,
 } from "../../extensions/lens/consts.js";
+export {
+  type FullProfileResponse,
+  type GetFullProfileParams,
+  getFullProfile,
+} from "../../extensions/lens/read/getFullProfile.js";
+// Read
+export {
+  type GetHandleFromProfileIdParams,
+  getHandleFromProfileId,
+} from "../../extensions/lens/read/getHandleFromProfileId.js";
+export {
+  type GetProfileMetadataParams,
+  getProfileMetadata,
+} from "../../extensions/lens/read/getProfileMetadata.js";
+export {
+  type ResolveLensAddressParams,
+  resolveAddress,
+} from "../../extensions/lens/read/resolveAddress.js";
+export type { LensProfileSchema } from "../../extensions/lens/read/type.js";
diff --git a/packages/thirdweb/src/exports/extensions/marketplace.ts b/packages/thirdweb/src/exports/extensions/marketplace.ts
index b31408f1d29..78bd5b9ebac 100644
--- a/packages/thirdweb/src/exports/extensions/marketplace.ts
+++ b/packages/thirdweb/src/exports/extensions/marketplace.ts
@@ -2,218 +2,209 @@
 // DIRECT LISTINGS
 // ----------------------------
 
-export type { DirectListing } from "../../extensions/marketplace/direct-listings/types.js";
-
+// EVENTS
+export {
+  type BuyerApprovedForListingEventFilters,
+  buyerApprovedForListingEvent,
+} from "../../extensions/marketplace/__generated__/IDirectListings/events/BuyerApprovedForListing.js";
+export {
+  type CancelledListingEventFilters,
+  cancelledListingEvent,
+} from "../../extensions/marketplace/__generated__/IDirectListings/events/CancelledListing.js";
+export {
+  type CurrencyApprovedForListingEventFilters,
+  currencyApprovedForListingEvent,
+} from "../../extensions/marketplace/__generated__/IDirectListings/events/CurrencyApprovedForListing.js";
+export {
+  type NewListingEventFilters,
+  newListingEvent,
+} from "../../extensions/marketplace/__generated__/IDirectListings/events/NewListing.js";
+export {
+  type NewSaleEventFilters,
+  newSaleEvent,
+} from "../../extensions/marketplace/__generated__/IDirectListings/events/NewSale.js";
+export {
+  type UpdatedListingEventFilters,
+  updatedListingEvent,
+} from "../../extensions/marketplace/__generated__/IDirectListings/events/UpdatedListing.js";
+export {
+  type IsCurrencyApprovedForListingParams,
+  isCurrencyApprovedForListing,
+} from "../../extensions/marketplace/__generated__/IDirectListings/read/isCurrencyApprovedForListing.js";
 // READ
 export { totalListings } from "../../extensions/marketplace/__generated__/IDirectListings/read/totalListings.js";
 export {
-  getListing,
-  type GetListingParams,
-  isGetListingSupported,
-} from "../../extensions/marketplace/direct-listings/read/getListing.js";
+  type ApproveBuyerForListingParams,
+  approveBuyerForListing,
+} from "../../extensions/marketplace/__generated__/IDirectListings/write/approveBuyerForListing.js";
+export {
+  type ApproveCurrencyForListingParams,
+  approveCurrencyForListing,
+} from "../../extensions/marketplace/__generated__/IDirectListings/write/approveCurrencyForListing.js";
+export {
+  type CancelListingParams,
+  cancelListing,
+  isCancelListingSupported,
+} from "../../extensions/marketplace/__generated__/IDirectListings/write/cancelListing.js";
+export {
+  type CurrencyPriceForListingParams,
+  currencyPriceForListing,
+} from "../../extensions/marketplace/direct-listings/read/currencyPriceForListing.js";
 export {
-  getAllListings,
   type GetAllListingParams,
+  getAllListings,
 } from "../../extensions/marketplace/direct-listings/read/getAllListings.js";
 export {
-  getAllValidListings,
   type GetAllValidListingParams,
+  getAllValidListings,
 } from "../../extensions/marketplace/direct-listings/read/getAllValidListings.js";
 export {
-  isBuyerApprovedForListing,
+  type GetListingParams,
+  getListing,
+  isGetListingSupported,
+} from "../../extensions/marketplace/direct-listings/read/getListing.js";
+export {
   type IsBuyerApprovedForListingParams,
+  isBuyerApprovedForListing,
 } from "../../extensions/marketplace/direct-listings/read/isBuyerApprovedForListing.js";
+export type { DirectListing } from "../../extensions/marketplace/direct-listings/types.js";
 export {
-  isCurrencyApprovedForListing,
-  type IsCurrencyApprovedForListingParams,
-} from "../../extensions/marketplace/__generated__/IDirectListings/read/isCurrencyApprovedForListing.js";
-export {
-  currencyPriceForListing,
-  type CurrencyPriceForListingParams,
-} from "../../extensions/marketplace/direct-listings/read/currencyPriceForListing.js";
-
+  type BuyFromListingParams,
+  buyFromListing,
+  isBuyFromListingSupported,
+} from "../../extensions/marketplace/direct-listings/write/buyFromListing.js";
 // WRITE
 export {
-  createListing,
   type CreateListingParams,
+  createListing,
   isCreateListingSupported,
 } from "../../extensions/marketplace/direct-listings/write/createListing.js";
 export {
-  updateListing,
   type UpdateListingParams,
+  updateListing,
 } from "../../extensions/marketplace/direct-listings/write/updateListing.js";
-export {
-  cancelListing,
-  isCancelListingSupported,
-  type CancelListingParams,
-} from "../../extensions/marketplace/__generated__/IDirectListings/write/cancelListing.js";
-export {
-  buyFromListing,
-  type BuyFromListingParams,
-  isBuyFromListingSupported,
-} from "../../extensions/marketplace/direct-listings/write/buyFromListing.js";
-export {
-  approveBuyerForListing,
-  type ApproveBuyerForListingParams,
-} from "../../extensions/marketplace/__generated__/IDirectListings/write/approveBuyerForListing.js";
-export {
-  approveCurrencyForListing,
-  type ApproveCurrencyForListingParams,
-} from "../../extensions/marketplace/__generated__/IDirectListings/write/approveCurrencyForListing.js";
+
+// ----------------------------
+// ENGLISH AUCTIONS
+// ----------------------------
 
 // EVENTS
 export {
-  buyerApprovedForListingEvent,
-  type BuyerApprovedForListingEventFilters,
-} from "../../extensions/marketplace/__generated__/IDirectListings/events/BuyerApprovedForListing.js";
-export {
-  cancelledListingEvent,
-  type CancelledListingEventFilters,
-} from "../../extensions/marketplace/__generated__/IDirectListings/events/CancelledListing.js";
+  type AuctionClosedEventFilters,
+  auctionClosedEvent,
+} from "../../extensions/marketplace/__generated__/IEnglishAuctions/events/AuctionClosed.js";
 export {
-  currencyApprovedForListingEvent,
-  type CurrencyApprovedForListingEventFilters,
-} from "../../extensions/marketplace/__generated__/IDirectListings/events/CurrencyApprovedForListing.js";
+  type CancelledAuctionEventFilters,
+  cancelledAuctionEvent,
+} from "../../extensions/marketplace/__generated__/IEnglishAuctions/events/CancelledAuction.js";
 export {
-  newListingEvent,
-  type NewListingEventFilters,
-} from "../../extensions/marketplace/__generated__/IDirectListings/events/NewListing.js";
+  type NewAuctionEventFilters,
+  newAuctionEvent,
+} from "../../extensions/marketplace/__generated__/IEnglishAuctions/events/NewAuction.js";
 export {
-  newSaleEvent,
-  type NewSaleEventFilters,
-} from "../../extensions/marketplace/__generated__/IDirectListings/events/NewSale.js";
+  type NewBidEventFilters,
+  newBidEvent,
+} from "../../extensions/marketplace/__generated__/IEnglishAuctions/events/NewBid.js";
 export {
-  updatedListingEvent,
-  type UpdatedListingEventFilters,
-} from "../../extensions/marketplace/__generated__/IDirectListings/events/UpdatedListing.js";
-
-// ----------------------------
-// ENGLISH AUCTIONS
-// ----------------------------
-
-export type { EnglishAuction } from "../../extensions/marketplace/english-auctions/types.js";
-
+  type IsNewWinningBidParams,
+  isNewWinningBid,
+} from "../../extensions/marketplace/__generated__/IEnglishAuctions/read/isNewWinningBid.js";
 // READ
 export { totalAuctions } from "../../extensions/marketplace/__generated__/IEnglishAuctions/read/totalAuctions.js";
 export {
-  getAuction,
-  type GetAuctionParams,
-  isGetAuctionSupported,
-} from "../../extensions/marketplace/english-auctions/read/getAuction.js";
+  type CollectAuctionPayoutParams,
+  collectAuctionPayout,
+} from "../../extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionPayout.js";
+export {
+  type CollectAuctionTokensParams,
+  collectAuctionTokens,
+} from "../../extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionTokens.js";
 export {
-  getAllAuctions,
   type GetAllAuctionParams,
+  getAllAuctions,
 } from "../../extensions/marketplace/english-auctions/read/getAllAuctions.js";
 export {
-  getAllValidAuctions,
   type GetAllValidAuctionParams,
+  getAllValidAuctions,
 } from "../../extensions/marketplace/english-auctions/read/getAllValidAuctions.js";
 export {
-  getWinningBid,
+  type GetAuctionParams,
+  getAuction,
+  isGetAuctionSupported,
+} from "../../extensions/marketplace/english-auctions/read/getAuction.js";
+export {
   type GetWinningBidParams,
+  getWinningBid,
   isGetWinningBidSupported,
 } from "../../extensions/marketplace/english-auctions/read/getWinningBid.js";
+export type { EnglishAuction } from "../../extensions/marketplace/english-auctions/types.js";
 export {
-  isNewWinningBid,
-  type IsNewWinningBidParams,
-} from "../../extensions/marketplace/__generated__/IEnglishAuctions/read/isNewWinningBid.js";
-
-// WRITE
-export {
-  createAuction,
-  type CreateAuctionParams,
-  isCreateAuctionSupported,
-} from "../../extensions/marketplace/english-auctions/write/createAuction.js";
-export {
-  bidInAuction,
   type BidInAuctionParams,
+  bidInAuction,
   isBidInAuctionSupported,
 } from "../../extensions/marketplace/english-auctions/write/bidInAuction.js";
+export {
+  type BuyoutAuctionParams,
+  buyoutAuction,
+} from "../../extensions/marketplace/english-auctions/write/buyoutAuction.js";
 export {
   type CancelAuctionParams,
   cancelAuction,
   isCancelAuctionSupported,
 } from "../../extensions/marketplace/english-auctions/write/cancelAuction.js";
+// WRITE
 export {
-  buyoutAuction,
-  type BuyoutAuctionParams,
-} from "../../extensions/marketplace/english-auctions/write/buyoutAuction.js";
-export {
-  collectAuctionPayout,
-  type CollectAuctionPayoutParams,
-} from "../../extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionPayout.js";
-export {
-  collectAuctionTokens,
-  type CollectAuctionTokensParams,
-} from "../../extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionTokens.js";
+  type CreateAuctionParams,
+  createAuction,
+  isCreateAuctionSupported,
+} from "../../extensions/marketplace/english-auctions/write/createAuction.js";
 export {
-  executeSale,
   type ExecuteSaleParams,
+  executeSale,
 } from "../../extensions/marketplace/english-auctions/write/executeSale.js";
 
-// EVENTS
-export {
-  auctionClosedEvent,
-  type AuctionClosedEventFilters,
-} from "../../extensions/marketplace/__generated__/IEnglishAuctions/events/AuctionClosed.js";
-export {
-  cancelledAuctionEvent,
-  type CancelledAuctionEventFilters,
-} from "../../extensions/marketplace/__generated__/IEnglishAuctions/events/CancelledAuction.js";
-export {
-  newAuctionEvent,
-  type NewAuctionEventFilters,
-} from "../../extensions/marketplace/__generated__/IEnglishAuctions/events/NewAuction.js";
-export {
-  newBidEvent,
-  type NewBidEventFilters,
-} from "../../extensions/marketplace/__generated__/IEnglishAuctions/events/NewBid.js";
-
 // ----------------------------
 // OFFERS
 // ----------------------------
 
-export type { Offer } from "../../extensions/marketplace/offers/types.js";
-
+// EVENTS
+export {
+  type AcceptedOfferEventFilters,
+  acceptedOfferEvent,
+} from "../../extensions/marketplace/__generated__/IOffers/events/AcceptedOffer.js";
+export {
+  type CancelledOfferEventFilters,
+  cancelledOfferEvent,
+} from "../../extensions/marketplace/__generated__/IOffers/events/CancelledOffer.js";
+export {
+  type NewOfferEventFilters,
+  newOfferEvent,
+} from "../../extensions/marketplace/__generated__/IOffers/events/NewOffer.js";
 // READ
 export { totalOffers } from "../../extensions/marketplace/__generated__/IOffers/read/totalOffers.js";
 export {
-  getAllOffers,
+  type CancelOfferParams,
+  cancelOffer,
+} from "../../extensions/marketplace/__generated__/IOffers/write/cancelOffer.js";
+export {
   type GetAllOffersParams,
+  getAllOffers,
 } from "../../extensions/marketplace/offers/read/getAllOffers.js";
 export {
-  getAllValidOffers,
   type GetAllValidOffersParams,
+  getAllValidOffers,
 } from "../../extensions/marketplace/offers/read/getAllValidOffers.js";
 export {
-  getOffer,
   type GetOfferParams,
+  getOffer,
 } from "../../extensions/marketplace/offers/read/getOffer.js";
-
-// WRITE
-export {
-  makeOffer,
-  type MakeOfferParams,
-} from "../../extensions/marketplace/offers/write/makeOffer.js";
-export {
-  cancelOffer,
-  type CancelOfferParams,
-} from "../../extensions/marketplace/__generated__/IOffers/write/cancelOffer.js";
+export type { Offer } from "../../extensions/marketplace/offers/types.js";
 export {
-  acceptOffer,
   type AcceptOfferParams,
+  acceptOffer,
 } from "../../extensions/marketplace/offers/write/acceptOffer.js";
-
-// EVENTS
-export {
-  acceptedOfferEvent,
-  type AcceptedOfferEventFilters,
-} from "../../extensions/marketplace/__generated__/IOffers/events/AcceptedOffer.js";
-export {
-  cancelledOfferEvent,
-  type CancelledOfferEventFilters,
-} from "../../extensions/marketplace/__generated__/IOffers/events/CancelledOffer.js";
+// WRITE
 export {
-  newOfferEvent,
-  type NewOfferEventFilters,
-} from "../../extensions/marketplace/__generated__/IOffers/events/NewOffer.js";
+  type MakeOfferParams,
+  makeOffer,
+} from "../../extensions/marketplace/offers/write/makeOffer.js";
diff --git a/packages/thirdweb/src/exports/extensions/multicall3.ts b/packages/thirdweb/src/exports/extensions/multicall3.ts
index 3732a99c9c2..cae9116eefc 100644
--- a/packages/thirdweb/src/exports/extensions/multicall3.ts
+++ b/packages/thirdweb/src/exports/extensions/multicall3.ts
@@ -1,8 +1,8 @@
 // READ
 export { getBasefee } from "../../extensions/multicall3/__generated__/IMulticall3/read/getBasefee.js";
 export {
-  getBlockHash,
   type GetBlockHashParams,
+  getBlockHash,
 } from "../../extensions/multicall3/__generated__/IMulticall3/read/getBlockHash.js";
 export { getBlockNumber } from "../../extensions/multicall3/__generated__/IMulticall3/read/getBlockNumber.js";
 export { getChainId } from "../../extensions/multicall3/__generated__/IMulticall3/read/getChainId.js";
@@ -11,33 +11,33 @@ export { getCurrentBlockDifficulty } from "../../extensions/multicall3/__generat
 export { getCurrentBlockGasLimit } from "../../extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockGasLimit.js";
 export { getCurrentBlockTimestamp } from "../../extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockTimestamp.js";
 export {
-  getEthBalance,
   type GetEthBalanceParams,
+  getEthBalance,
 } from "../../extensions/multicall3/__generated__/IMulticall3/read/getEthBalance.js";
 export { getLastBlockHash } from "../../extensions/multicall3/__generated__/IMulticall3/read/getLastBlockHash.js";
 
 // WRITE
 export {
-  aggregate,
   type AggregateParams,
+  aggregate,
 } from "../../extensions/multicall3/__generated__/IMulticall3/write/aggregate.js";
 export {
-  aggregate3,
   type Aggregate3Params,
+  aggregate3,
 } from "../../extensions/multicall3/__generated__/IMulticall3/write/aggregate3.js";
 export {
-  aggregate3Value,
   type Aggregate3ValueParams,
+  aggregate3Value,
 } from "../../extensions/multicall3/__generated__/IMulticall3/write/aggregate3Value.js";
 export {
-  blockAndAggregate,
   type BlockAndAggregateParams,
+  blockAndAggregate,
 } from "../../extensions/multicall3/__generated__/IMulticall3/write/blockAndAggregate.js";
 export {
-  tryAggregate,
   type TryAggregateParams,
+  tryAggregate,
 } from "../../extensions/multicall3/__generated__/IMulticall3/write/tryAggregate.js";
 export {
-  tryBlockAndAggregate,
   type TryBlockAndAggregateParams,
+  tryBlockAndAggregate,
 } from "../../extensions/multicall3/__generated__/IMulticall3/write/tryBlockAndAggregate.js";
diff --git a/packages/thirdweb/src/exports/extensions/pack.ts b/packages/thirdweb/src/exports/extensions/pack.ts
index 531eacd33df..9109f922a13 100644
--- a/packages/thirdweb/src/exports/extensions/pack.ts
+++ b/packages/thirdweb/src/exports/extensions/pack.ts
@@ -1,42 +1,40 @@
 // Write
-export {
-  createPack,
-  type CreatePackParams,
-} from "../../extensions/pack/__generated__/IPack/write/createPack.js";
-export {
-  PACK_TOKEN_TYPE,
-  type ERC20Reward,
-  type ERC721Reward,
-  type ERC1155Reward,
-  type CreateNewPackParams,
-  createNewPack,
-} from "../../extensions/pack/createNewPack.js";
-
-export {
-  openPack,
-  type OpenPackParams,
-} from "../../extensions/pack/__generated__/IPack/write/openPack.js";
-
-// Read
-export {
-  getTokenCountOfBundle,
-  type GetTokenCountOfBundleParams,
-} from "../../extensions/pack/__generated__/IPack/read/getTokenCountOfBundle.js";
-export {
-  getPackContents,
-  type GetPackContentsParams,
-} from "../../extensions/pack/__generated__/IPack/read/getPackContents.js";
 
 // Events
 export {
-  packCreatedEvent,
   type PackCreatedEventFilters,
+  packCreatedEvent,
 } from "../../extensions/pack/__generated__/IPack/events/PackCreated.js";
 export {
-  packOpenedEvent,
   type PackOpenedEventFilters,
+  packOpenedEvent,
 } from "../../extensions/pack/__generated__/IPack/events/PackOpened.js";
 export {
-  packUpdatedEvent,
   type PackUpdatedEventFilters,
+  packUpdatedEvent,
 } from "../../extensions/pack/__generated__/IPack/events/PackUpdated.js";
+export {
+  type GetPackContentsParams,
+  getPackContents,
+} from "../../extensions/pack/__generated__/IPack/read/getPackContents.js";
+// Read
+export {
+  type GetTokenCountOfBundleParams,
+  getTokenCountOfBundle,
+} from "../../extensions/pack/__generated__/IPack/read/getTokenCountOfBundle.js";
+export {
+  type CreatePackParams,
+  createPack,
+} from "../../extensions/pack/__generated__/IPack/write/createPack.js";
+export {
+  type OpenPackParams,
+  openPack,
+} from "../../extensions/pack/__generated__/IPack/write/openPack.js";
+export {
+  type CreateNewPackParams,
+  createNewPack,
+  type ERC20Reward,
+  type ERC721Reward,
+  type ERC1155Reward,
+  PACK_TOKEN_TYPE,
+} from "../../extensions/pack/createNewPack.js";
diff --git a/packages/thirdweb/src/exports/extensions/permissions.ts b/packages/thirdweb/src/exports/extensions/permissions.ts
index 4c718222795..e32ba7e1f1e 100644
--- a/packages/thirdweb/src/exports/extensions/permissions.ts
+++ b/packages/thirdweb/src/exports/extensions/permissions.ts
@@ -2,71 +2,69 @@
 // Permissions
 // --------------------------------------------------------
 
-// READ
 export {
-  hasRole,
-  type HasRoleParams,
-  isHasRoleSupported,
-} from "../../extensions/permissions/read/hasRole.js";
+  type RoleAdminChangedEventFilters,
+  roleAdminChangedEvent,
+} from "../../extensions/permissions/__generated__/IPermissions/events/RoleAdminChanged.js";
+// EVENTS
+export {
+  type RoleGrantedEventFilters,
+  roleGrantedEvent,
+} from "../../extensions/permissions/__generated__/IPermissions/events/RoleGranted.js";
+export {
+  type RoleRevokedEventFilters,
+  roleRevokedEvent,
+} from "../../extensions/permissions/__generated__/IPermissions/events/RoleRevoked.js";
 export {
-  getRoleAdmin,
   type GetRoleAdminParams,
+  getRoleAdmin,
   isGetRoleAdminSupported,
 } from "../../extensions/permissions/read/getRoleAdmin.js";
-
+// READ
+export {
+  type HasRoleParams,
+  hasRole,
+  isHasRoleSupported,
+} from "../../extensions/permissions/read/hasRole.js";
 // WRITE
 export {
-  grantRole,
   type GrantRoleParams,
+  grantRole,
   isGrantRoleSupported,
 } from "../../extensions/permissions/write/grantRole.js";
 export {
-  revokeRole,
-  type RevokeRoleParams,
-  isRevokeRoleSupported,
-} from "../../extensions/permissions/write/revokeRole.js";
-export {
-  renounceRole,
-  type RenounceRoleParams,
   isRenounceRoleSupported,
+  type RenounceRoleParams,
+  renounceRole,
 } from "../../extensions/permissions/write/renounceRole.js";
-
-// EVENTS
-export {
-  roleGrantedEvent,
-  type RoleGrantedEventFilters,
-} from "../../extensions/permissions/__generated__/IPermissions/events/RoleGranted.js";
 export {
-  roleRevokedEvent,
-  type RoleRevokedEventFilters,
-} from "../../extensions/permissions/__generated__/IPermissions/events/RoleRevoked.js";
-export {
-  roleAdminChangedEvent,
-  type RoleAdminChangedEventFilters,
-} from "../../extensions/permissions/__generated__/IPermissions/events/RoleAdminChanged.js";
+  isRevokeRoleSupported,
+  type RevokeRoleParams,
+  revokeRole,
+} from "../../extensions/permissions/write/revokeRole.js";
 
 // --------------------------------------------------------
 // PermissionsEnumerable
 // --------------------------------------------------------
 
+export {
+  type GetAllRoleMembersParams,
+  getAllRoleMembers,
+  isGetAllRoleMembersSupported,
+} from "../../extensions/permissions/read/getAllMembers.js";
 // READ
 export {
-  getRoleMember,
   type GetRoleMemberParams,
+  getRoleMember,
   isGetRoleMemberSupported,
 } from "../../extensions/permissions/read/getRoleMember.js";
 export {
-  getRoleMemberCount,
   type GetRoleMemberCountParams,
+  getRoleMemberCount,
   isGetRoleMemberCountSupported,
 } from "../../extensions/permissions/read/getRoleMemberCount.js";
-export {
-  getAllRoleMembers,
-  type GetAllRoleMembersParams,
-  isGetAllRoleMembersSupported,
-} from "../../extensions/permissions/read/getAllMembers.js";
 
 // --------------------------------------------------------
 // Utils
 // --------------------------------------------------------
-export { roleMap, getRoleHash } from "../../extensions/permissions/utils.js";
+export { getRoleHash, roleMap } from "../../extensions/permissions/utils.js";
diff --git a/packages/thirdweb/src/exports/extensions/split.ts b/packages/thirdweb/src/exports/extensions/split.ts
index d97c818d2c9..8a82bb91c85 100644
--- a/packages/thirdweb/src/exports/extensions/split.ts
+++ b/packages/thirdweb/src/exports/extensions/split.ts
@@ -2,59 +2,48 @@
  * READ
  */
 export {
-  payee,
   type PayeeParams,
+  payee,
 } from "../../extensions/split/__generated__/Split/read/payee.js";
 
 export { payeeCount } from "../../extensions/split/__generated__/Split/read/payeeCount.js";
 
 export {
-  releasable,
   type ReleasableParams,
+  releasable,
 } from "../../extensions/split/__generated__/Split/read/releasable.js";
-
 export {
-  releasableByToken,
-  type ReleasableByTokenParams,
-} from "../../extensions/split/read/releasableByToken.js";
-
-export {
-  released,
   type ReleasedParams,
+  released,
 } from "../../extensions/split/__generated__/Split/read/released.js";
-
-export { releasedByToken } from "../../extensions/split/read/releasedByToken.js";
-
 export {
-  shares,
   type SharesParams,
+  shares,
 } from "../../extensions/split/__generated__/Split/read/shares.js";
-
 export { totalReleased } from "../../extensions/split/__generated__/Split/read/totalReleased.js";
-
-export { totalReleasedByToken } from "../../extensions/split/read/totalReleasedByToken.js";
-
-export { getAllRecipientsAddresses } from "../../extensions/split/read/getAllRecipientsAddresses.js";
-
-export { getAllRecipientsPercentages } from "../../extensions/split/read/getAllRecipientsPercentages.js";
-
-export {
-  getRecipientSplitPercentage,
-  type SplitRecipient,
-} from "../../extensions/split/read/getRecipientSplitPercentage.js";
 /**
  * WRITE
  */
 export { distribute } from "../../extensions/split/__generated__/Split/write/distribute.js";
-
-export { distributeByToken } from "../../extensions/split/write/distributeByToken.js";
-
 export {
-  release,
   type ReleaseParams,
+  release,
 } from "../../extensions/split/__generated__/Split/write/release.js";
+export { getAllRecipientsAddresses } from "../../extensions/split/read/getAllRecipientsAddresses.js";
+export { getAllRecipientsPercentages } from "../../extensions/split/read/getAllRecipientsPercentages.js";
+export {
+  getRecipientSplitPercentage,
+  type SplitRecipient,
+} from "../../extensions/split/read/getRecipientSplitPercentage.js";
+export {
+  type ReleasableByTokenParams,
+  releasableByToken,
+} from "../../extensions/split/read/releasableByToken.js";
+export { releasedByToken } from "../../extensions/split/read/releasedByToken.js";
+export { totalReleasedByToken } from "../../extensions/split/read/totalReleasedByToken.js";
+export { distributeByToken } from "../../extensions/split/write/distributeByToken.js";
 
 export {
-  releaseByToken,
   type ReleaseByTokenParams,
+  releaseByToken,
 } from "../../extensions/split/write/releaseByToken.js";
diff --git a/packages/thirdweb/src/exports/extensions/stylus.ts b/packages/thirdweb/src/exports/extensions/stylus.ts
index b4c9dd165dc..6579ad8c0e4 100644
--- a/packages/thirdweb/src/exports/extensions/stylus.ts
+++ b/packages/thirdweb/src/exports/extensions/stylus.ts
@@ -2,6 +2,6 @@
  * Write
  */
 export {
-  activateStylusContract,
   type ActivateStylusContractOptions,
+  activateStylusContract,
 } from "../../extensions/stylus/write/activateStylusContract.js";
diff --git a/packages/thirdweb/src/exports/extensions/thirdweb.ts b/packages/thirdweb/src/exports/extensions/thirdweb.ts
index 565a2783c56..10ce011fddd 100644
--- a/packages/thirdweb/src/exports/extensions/thirdweb.ts
+++ b/packages/thirdweb/src/exports/extensions/thirdweb.ts
@@ -12,76 +12,74 @@ export {
 // Publisher contract
 // --------------------------------------------------------
 
-// Read
-export {
-  getPublisherProfileUri,
-  type GetPublisherProfileUriParams,
-} from "../../extensions/thirdweb/__generated__/IContractPublisher/read/getPublisherProfileUri.js";
 export {
-  getPublishedUriFromCompilerUri,
-  type GetPublishedUriFromCompilerUriParams,
-} from "../../extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedUriFromCompilerUri.js";
-export {
-  getAllPublishedContracts,
   type GetAllPublishedContractsParams,
+  getAllPublishedContracts,
 } from "../../extensions/thirdweb/__generated__/IContractPublisher/read/getAllPublishedContracts.js";
 export {
-  getPublishedContract,
   type GetPublishedContractParams,
+  getPublishedContract,
 } from "../../extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContract.js";
 export {
-  getPublishedContractVersions,
   type GetPublishedContractVersionsParams,
+  getPublishedContractVersions,
 } from "../../extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContractVersions.js";
+export {
+  type GetPublishedUriFromCompilerUriParams,
+  getPublishedUriFromCompilerUri,
+} from "../../extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedUriFromCompilerUri.js";
+// Read
+export {
+  type GetPublisherProfileUriParams,
+  getPublisherProfileUri,
+} from "../../extensions/thirdweb/__generated__/IContractPublisher/read/getPublisherProfileUri.js";
 
 // Write
 export {
-  setPublisherProfileUri,
   type SetPublisherProfileUriParams,
+  setPublisherProfileUri,
 } from "../../extensions/thirdweb/__generated__/IContractPublisher/write/setPublisherProfileUri.js";
 export {
-  unpublishContract,
   type UnpublishContractParams,
+  unpublishContract,
 } from "../../extensions/thirdweb/__generated__/IContractPublisher/write/unpublishContract.js";
 
 export {
-  publishContract,
-  type PublishContractParams,
   getContractPublisher,
+  type PublishContractParams,
+  publishContract,
 } from "../../extensions/thirdweb/write/publish.js";
 
 // --------------------------------------------------------
 // Multichain Registry
 // --------------------------------------------------------
 
+// --------------------------------------------------------
+// Contract Factory
+// --------------------------------------------------------
+export {
+  type DeployProxyByImplementationParams,
+  deployProxyByImplementation,
+} from "../../extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.js";
 // Read
 export {
-  count,
   type CountParams,
+  count,
 } from "../../extensions/thirdweb/__generated__/ITWMultichainRegistry/read/count.js";
 export {
-  getAll,
   type GetAllParams,
+  getAll,
 } from "../../extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getAll.js";
 export {
-  getMetadataUri,
   type GetMetadataUriParams,
+  getMetadataUri,
 } from "../../extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getMetadataUri.js";
-
 // Write
 export {
-  add,
   type AddParams,
+  add,
 } from "../../extensions/thirdweb/__generated__/ITWMultichainRegistry/write/add.js";
 export {
-  remove,
   type RemoveParams,
+  remove,
 } from "../../extensions/thirdweb/__generated__/ITWMultichainRegistry/write/remove.js";
-
-// --------------------------------------------------------
-// Contract Factory
-// --------------------------------------------------------
-export {
-  deployProxyByImplementation,
-  type DeployProxyByImplementationParams,
-} from "../../extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.js";
diff --git a/packages/thirdweb/src/exports/extensions/uniswap.ts b/packages/thirdweb/src/exports/extensions/uniswap.ts
index 08c45048d23..c58d612e240 100644
--- a/packages/thirdweb/src/exports/extensions/uniswap.ts
+++ b/packages/thirdweb/src/exports/extensions/uniswap.ts
@@ -1,37 +1,37 @@
 // IQuoter
 export {
-  quoteExactInput,
   type QuoteExactInputParams,
+  quoteExactInput,
 } from "../../extensions/uniswap/__generated__/IQuoter/write/quoteExactInput.js";
 export {
-  quoteExactInputSingle,
   type QuoteExactInputSingleParams,
+  quoteExactInputSingle,
 } from "../../extensions/uniswap/__generated__/IQuoter/write/quoteExactInputSingle.js";
 export {
-  quoteExactOutput,
   type QuoteExactOutputParams,
+  quoteExactOutput,
 } from "../../extensions/uniswap/__generated__/IQuoter/write/quoteExactOutput.js";
 export {
-  quoteExactOutputSingle,
   type QuoteExactOutputSingleParams,
+  quoteExactOutputSingle,
 } from "../../extensions/uniswap/__generated__/IQuoter/write/quoteExactOutputSingle.js";
 
 // ISwapRouter
 export {
-  exactInput,
   type ExactInputParams,
+  exactInput,
 } from "../../extensions/uniswap/__generated__/ISwapRouter/write/exactInput.js";
 export {
-  exactInputSingle,
   type ExactInputSingleParams,
+  exactInputSingle,
 } from "../../extensions/uniswap/__generated__/ISwapRouter/write/exactInputSingle.js";
 export {
-  exactOutput,
   type ExactOutputParams,
+  exactOutput,
 } from "../../extensions/uniswap/__generated__/ISwapRouter/write/exactOutput.js";
 export {
-  exactOutputSingle,
   type ExactOutputSingleParams,
+  exactOutputSingle,
 } from "../../extensions/uniswap/__generated__/ISwapRouter/write/exactOutputSingle.js";
 
 // IUniswapFactory
@@ -39,29 +39,29 @@ export { feeAmountEnabledEvent } from "../../extensions/uniswap/__generated__/IU
 export { ownerChangedEvent } from "../../extensions/uniswap/__generated__/IUniswapV3Factory/events/OwnerChanged.js";
 export { poolCreatedEvent } from "../../extensions/uniswap/__generated__/IUniswapV3Factory/events/PoolCreated.js";
 export {
-  feeAmountTickSpacing,
   type FeeAmountTickSpacingParams,
+  feeAmountTickSpacing,
 } from "../../extensions/uniswap/__generated__/IUniswapV3Factory/read/feeAmountTickSpacing.js";
 export {
-  getPool,
   type GetPoolParams,
+  getPool,
 } from "../../extensions/uniswap/__generated__/IUniswapV3Factory/read/getPool.js";
 export { owner } from "../../extensions/uniswap/__generated__/IUniswapV3Factory/read/owner.js";
 export {
-  createPool,
   type CreatePoolParams,
+  createPool,
 } from "../../extensions/uniswap/__generated__/IUniswapV3Factory/write/createPool.js";
 export {
-  enableFeeAmount,
   type EnableFeeAmountParams,
+  enableFeeAmount,
 } from "../../extensions/uniswap/__generated__/IUniswapV3Factory/write/enableFeeAmount.js";
 export {
-  setOwner,
   type SetOwnerParams,
+  setOwner,
 } from "../../extensions/uniswap/__generated__/IUniswapV3Factory/write/setOwner.js";
 
 export {
-  getUniswapV3Pool,
   type GetUniswapV3PoolParams,
   type GetUniswapV3PoolResult,
+  getUniswapV3Pool,
 } from "../../extensions/uniswap/read/getUniswapV3Pools.js";
diff --git a/packages/thirdweb/src/exports/extensions/unstoppable-domains.ts b/packages/thirdweb/src/exports/extensions/unstoppable-domains.ts
index 96acc98db51..c8ea4d8cc28 100644
--- a/packages/thirdweb/src/exports/extensions/unstoppable-domains.ts
+++ b/packages/thirdweb/src/exports/extensions/unstoppable-domains.ts
@@ -1,18 +1,18 @@
-export { UD_POLYGON_MAINNET } from "../../extensions/unstoppable-domains/consts.js";
-export {
-  type ResolveUDNameOptions,
-  resolveName,
-} from "../../extensions/unstoppable-domains/read/resolveName.js";
-export {
-  type ResolveAddressOptions,
-  resolveAddress,
-} from "../../extensions/unstoppable-domains/read/resolveAddress.js";
 export {
+  type NamehashParams,
   // Need this to resolve the tokenId, so that Social SDK can fetch the owner's Avatar from it
   namehash,
-  type NamehashParams,
 } from "../../extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/namehash.js";
 export {
-  reverseNameOf,
   type ReverseNameOfParams,
+  reverseNameOf,
 } from "../../extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/reverseNameOf.js";
+export { UD_POLYGON_MAINNET } from "../../extensions/unstoppable-domains/consts.js";
+export {
+  type ResolveAddressOptions,
+  resolveAddress,
+} from "../../extensions/unstoppable-domains/read/resolveAddress.js";
+export {
+  type ResolveUDNameOptions,
+  resolveName,
+} from "../../extensions/unstoppable-domains/read/resolveName.js";
diff --git a/packages/thirdweb/src/exports/extensions/vote.ts b/packages/thirdweb/src/exports/extensions/vote.ts
index 2d9b7152b56..849b36d9495 100644
--- a/packages/thirdweb/src/exports/extensions/vote.ts
+++ b/packages/thirdweb/src/exports/extensions/vote.ts
@@ -4,142 +4,118 @@
 export { getAllProposals } from "../../extensions/vote/__generated__/Vote/read/getAllProposals.js";
 
 export {
-  getVotes,
   type GetVotesParams,
+  getVotes,
 } from "../../extensions/vote/__generated__/Vote/read/getVotes.js";
 
 export {
-  getVotesWithParams,
   type GetVotesWithParamsParams,
+  getVotesWithParams,
 } from "../../extensions/vote/__generated__/Vote/read/getVotesWithParams.js";
 
 export {
-  hashProposal,
   type HashProposalParams,
+  hashProposal,
 } from "../../extensions/vote/__generated__/Vote/read/hashProposal.js";
 
 export {
-  hasVoted,
   type HasVotedParams,
+  hasVoted,
 } from "../../extensions/vote/__generated__/Vote/read/hasVoted.js";
 
 export {
-  proposalDeadline,
   type ProposalDeadlineParams,
+  proposalDeadline,
 } from "../../extensions/vote/__generated__/Vote/read/proposalDeadline.js";
 
 export { proposalIndex } from "../../extensions/vote/__generated__/Vote/read/proposalIndex.js";
-
 export {
-  proposals,
-  type ProposalsParams,
-} from "../../extensions/vote/__generated__/Vote/read/proposals.js";
-
-export {
-  proposalSnapshot,
   type ProposalSnapshotParams,
+  proposalSnapshot,
 } from "../../extensions/vote/__generated__/Vote/read/proposalSnapshot.js";
+export {
+  type ProposalsParams,
+  proposals,
+} from "../../extensions/vote/__generated__/Vote/read/proposals.js";
 
 export { proposalThreshold } from "../../extensions/vote/__generated__/Vote/read/proposalThreshold.js";
 
 export {
-  proposalVotes,
   type ProposalVotesParams,
+  proposalVotes,
 } from "../../extensions/vote/__generated__/Vote/read/proposalVotes.js";
 
 export {
-  quorum,
   type QuorumParams,
+  quorum,
 } from "../../extensions/vote/__generated__/Vote/read/quorum.js";
 
 export { quorumDenominator } from "../../extensions/vote/__generated__/Vote/read/quorumDenominator.js";
-
-export { quorumNumeratorByBlockNumber } from "../../extensions/vote/read/quorumNumeratorByBlockNumber.js";
-
 export {
-  state,
   type StateParams,
+  state,
 } from "../../extensions/vote/__generated__/Vote/read/state.js";
-
 export { token } from "../../extensions/vote/__generated__/Vote/read/token.js";
-
 export { votingDelay } from "../../extensions/vote/__generated__/Vote/read/votingDelay.js";
-
 export { votingPeriod } from "../../extensions/vote/__generated__/Vote/read/votingPeriod.js";
-
-export { proposalExists } from "../../extensions/vote/read/proposalExists.js";
-
-export { VoteType, ProposalState } from "../../extensions/vote/types.js";
-
-export { getProposalVoteCounts } from "../../extensions/vote/read/getProposalVoteCounts.js";
-
-export {
-  getAll,
-  type ProposalItem,
-} from "../../extensions/vote/read/getAll.js";
-
-export { canExecute } from "../../extensions/vote/read/canExecute.js";
-
 /**
  * WRITE Methods
  */
 export {
-  castVote,
   type CastVoteParams,
+  castVote,
 } from "../../extensions/vote/__generated__/Vote/write/castVote.js";
-
 export {
-  castVoteBySig,
   type CastVoteBySigParams,
+  castVoteBySig,
 } from "../../extensions/vote/__generated__/Vote/write/castVoteBySig.js";
-
 export {
-  castVoteWithReason,
   type CastVoteWithReasonParams,
+  castVoteWithReason,
 } from "../../extensions/vote/__generated__/Vote/write/castVoteWithReason.js";
-
 export {
-  castVoteWithReasonAndParams,
   type CastVoteWithReasonAndParamsParams,
+  castVoteWithReasonAndParams,
 } from "../../extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParams.js";
-
 export {
-  castVoteWithReasonAndParamsBySig,
   type CastVoteWithReasonAndParamsBySigParams,
+  castVoteWithReasonAndParamsBySig,
 } from "../../extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParamsBySig.js";
-
 export {
-  execute,
   type ExecuteParams,
+  execute,
 } from "../../extensions/vote/__generated__/Vote/write/execute.js";
-
 export {
-  propose,
   type ProposeParams,
+  propose,
 } from "../../extensions/vote/__generated__/Vote/write/propose.js";
-
 export {
-  relay,
   type RelayParams,
+  relay,
 } from "../../extensions/vote/__generated__/Vote/write/relay.js";
-
 export {
-  setProposalThreshold,
   type SetProposalThresholdParams,
+  setProposalThreshold,
 } from "../../extensions/vote/__generated__/Vote/write/setProposalThreshold.js";
-
 export {
-  setVotingDelay,
   type SetVotingDelayParams,
+  setVotingDelay,
 } from "../../extensions/vote/__generated__/Vote/write/setVotingDelay.js";
-
 export {
-  setVotingPeriod,
   type SetVotingPeriodParams,
+  setVotingPeriod,
 } from "../../extensions/vote/__generated__/Vote/write/setVotingPeriod.js";
-
 export {
-  updateQuorumNumerator,
   type UpdateQuorumNumeratorParams,
+  updateQuorumNumerator,
 } from "../../extensions/vote/__generated__/Vote/write/updateQuorumNumerator.js";
+export { canExecute } from "../../extensions/vote/read/canExecute.js";
+export {
+  getAll,
+  type ProposalItem,
+} from "../../extensions/vote/read/getAll.js";
+export { getProposalVoteCounts } from "../../extensions/vote/read/getProposalVoteCounts.js";
+export { proposalExists } from "../../extensions/vote/read/proposalExists.js";
+export { quorumNumeratorByBlockNumber } from "../../extensions/vote/read/quorumNumeratorByBlockNumber.js";
+export { ProposalState, VoteType } from "../../extensions/vote/types.js";
 export { executeProposal } from "../../extensions/vote/write/executeProposal.js";
diff --git a/packages/thirdweb/src/exports/modules.ts b/packages/thirdweb/src/exports/modules.ts
index f101b748a63..98cc32615ee 100644
--- a/packages/thirdweb/src/exports/modules.ts
+++ b/packages/thirdweb/src/exports/modules.ts
@@ -3,17 +3,87 @@
  * All functions related to the MintableERC20 module.
  * @modules MintableERC20
  */
-export * as MintableERC20 from "../extensions/modules/MintableERC20/index.js";
+
+export { moduleInstalledEvent } from "../extensions/modules/__generated__/IModularCore/events/ModuleInstalled.js";
+// generated
 /**
- * All functions related to the MintableERC721 module.
- * @modules MintableERC721
+ * READ
  */
-export * as MintableERC721 from "../extensions/modules/MintableERC721/index.js";
+export {
+  getInstalledModules,
+  isGetInstalledModulesSupported,
+} from "../extensions/modules/__generated__/IModularCore/read/getInstalledModules.js";
+export {
+  getSupportedCallbackFunctions,
+  isGetSupportedCallbackFunctionsSupported,
+} from "../extensions/modules/__generated__/IModularCore/read/getSupportedCallbackFunctions.js";
+export {
+  type InstallModuleParams,
+  installModule,
+  isInstallModuleSupported,
+} from "../extensions/modules/__generated__/IModularCore/write/installModule.js";
+export {
+  isUninstallModuleSupported,
+  type UninstallModuleParams,
+  uninstallModule,
+} from "../extensions/modules/__generated__/IModularCore/write/uninstallModule.js";
+export {
+  getModuleConfig,
+  isGetModuleConfigSupported,
+} from "../extensions/modules/__generated__/IModule/read/getModuleConfig.js";
+export {
+  type HasAllRolesParams,
+  hasAllRoles,
+} from "../extensions/modules/__generated__/OwnableRoles/read/hasAllRoles.js";
+export {
+  type HasAnyRoleParams,
+  hasAnyRole,
+} from "../extensions/modules/__generated__/OwnableRoles/read/hasAnyRole.js";
+export { owner } from "../extensions/modules/__generated__/OwnableRoles/read/owner.js";
+export {
+  type OwnershipHandoverExpiresAtParams,
+  ownershipHandoverExpiresAt,
+} from "../extensions/modules/__generated__/OwnableRoles/read/ownershipHandoverExpiresAt.js";
+export {
+  type RolesOfParams,
+  rolesOf,
+} from "../extensions/modules/__generated__/OwnableRoles/read/rolesOf.js";
 /**
- * All functions related to the MintableERC1155 module.
- * @modules MintableERC1155
+ * Write
  */
-export * as MintableERC1155 from "../extensions/modules/MintableERC1155/index.js";
+export { cancelOwnershipHandover } from "../extensions/modules/__generated__/OwnableRoles/write/cancelOwnershipHandover.js";
+export {
+  type CompleteOwnershipHandoverParams,
+  completeOwnershipHandover,
+} from "../extensions/modules/__generated__/OwnableRoles/write/completeOwnershipHandover.js";
+export {
+  type GrantRolesParams,
+  grantRoles,
+} from "../extensions/modules/__generated__/OwnableRoles/write/grantRoles.js";
+export { renounceOwnership } from "../extensions/modules/__generated__/OwnableRoles/write/renounceOwnership.js";
+export {
+  type RenounceRolesParams,
+  renounceRoles,
+} from "../extensions/modules/__generated__/OwnableRoles/write/renounceRoles.js";
+export { requestOwnershipHandover } from "../extensions/modules/__generated__/OwnableRoles/write/requestOwnershipHandover.js";
+export {
+  type RevokeRolesParams,
+  revokeRoles,
+} from "../extensions/modules/__generated__/OwnableRoles/write/revokeRoles.js";
+export {
+  type TransferOwnershipParams,
+  transferOwnership,
+} from "../extensions/modules/__generated__/OwnableRoles/write/transferOwnership.js";
+/**
+ * All functions related to the BatchMetadataERC721 module.
+ * @modules BatchMetadataERC721
+ */
+export * as BatchMetadataERC721 from "../extensions/modules/BatchMetadataERC721/index.js";
+/**
+ * All functions related to the BatchMetadataERC1155 module.
+ * @modules BatchMetadataERC1155
+ */
+export * as BatchMetadataERC1155 from "../extensions/modules/BatchMetadataERC1155/index.js";
 /**
  * All functions related to the ClaimableERC20 module.
  * @modules ClaimableERC20
@@ -29,26 +99,44 @@ export * as ClaimableERC721 from "../extensions/modules/ClaimableERC721/index.js
  * @modules ClaimableERC1155
  */
 export * as ClaimableERC1155 from "../extensions/modules/ClaimableERC1155/index.js";
+export { checkModulesCompatibility } from "../extensions/modules/common/checkModulesCompatibility.js";
+export {
+  getDeployedModule,
+  getOrDeployModule,
+} from "../extensions/modules/common/getOrDeployModule.js";
+// Common
+export {
+  type GrantMinterRoleParams,
+  grantMinterRole,
+} from "../extensions/modules/common/grantMinterRole.js";
+export {
+  type InstallPublishedModuleOptions,
+  installPublishedModule,
+} from "../extensions/modules/common/installPublishedModule.js";
+export {
+  type UninstallModuleByProxyOptions,
+  uninstallModuleByProxy,
+} from "../extensions/modules/common/uninstallModuleByProxy.js";
+export {
+  type UninstallPublishedModuleOptions,
+  uninstallPublishedModule,
+} from "../extensions/modules/common/uninstallPublishedModule.js";
+export * as MintableERC20 from "../extensions/modules/MintableERC20/index.js";
 /**
- * All functions related to the OpenEditionMetadataERC721 module.
- * @modules OpenEditionMetadataERC721
- */
-export * as OpenEditionMetadataERC721 from "../extensions/modules/OpenEditionMetadataERC721/index.js";
-/**
- * All functions related to the BatchMetadataERC721 module.
- * @modules BatchMetadataERC721
+ * All functions related to the MintableERC721 module.
+ * @modules MintableERC721
  */
-export * as BatchMetadataERC721 from "../extensions/modules/BatchMetadataERC721/index.js";
+export * as MintableERC721 from "../extensions/modules/MintableERC721/index.js";
 /**
- * All functions related to the BatchMetadataERC1155 module.
- * @modules BatchMetadataERC1155
+ * All functions related to the MintableERC1155 module.
+ * @modules MintableERC1155
  */
-export * as BatchMetadataERC1155 from "../extensions/modules/BatchMetadataERC1155/index.js";
+export * as MintableERC1155 from "../extensions/modules/MintableERC1155/index.js";
 /**
- * All functions related to the SequentialTokenIdERC1155 module.
- * @modules SequentialTokenIdERC1155
+ * All functions related to the OpenEditionMetadataERC721 module.
+ * @modules OpenEditionMetadataERC721
  */
-export * as SequentialTokenIdERC1155 from "../extensions/modules/SequentialTokenIdERC1155/index.js";
+export * as OpenEditionMetadataERC721 from "../extensions/modules/OpenEditionMetadataERC721/index.js";
 /**
  * All functions related to the RoyaltyERC721 module.
  * @modules RoyaltyERC721
@@ -59,6 +147,11 @@ export * as RoyaltyERC721 from "../extensions/modules/RoyaltyERC721/index.js";
  * @modules RoyaltyERC1155
  */
 export * as RoyaltyERC1155 from "../extensions/modules/RoyaltyERC1155/index.js";
+/**
+ * All functions related to the SequentialTokenIdERC1155 module.
+ * @modules SequentialTokenIdERC1155
+ */
+export * as SequentialTokenIdERC1155 from "../extensions/modules/SequentialTokenIdERC1155/index.js";
 /**
  * All functions related to the TransferableERC20 module.
  * @modules TransferableERC20
@@ -74,108 +167,12 @@ export * as TransferableERC721 from "../extensions/modules/TransferableERC721/in
  * @modules TransferableERC1155
  */
 export * as TransferableERC1155 from "../extensions/modules/TransferableERC1155/index.js";
-
 // deploy
 export {
-  deployModularContract,
-  type DeployModularContractOptions,
   type CoreType,
+  type DeployModularContractOptions,
+  deployModularContract,
   type ModularContractParams,
   type ModuleInstallData,
   type ModuleInstaller,
 } from "../extensions/prebuilts/deploy-modular.js";
-
-// Common
-export {
-  grantMinterRole,
-  type GrantMinterRoleParams,
-} from "../extensions/modules/common/grantMinterRole.js";
-export {
-  getDeployedModule,
-  getOrDeployModule,
-} from "../extensions/modules/common/getOrDeployModule.js";
-
-// generated
-/**
- * READ
- */
-export {
-  getInstalledModules,
-  isGetInstalledModulesSupported,
-} from "../extensions/modules/__generated__/IModularCore/read/getInstalledModules.js";
-export {
-  getSupportedCallbackFunctions,
-  isGetSupportedCallbackFunctionsSupported,
-} from "../extensions/modules/__generated__/IModularCore/read/getSupportedCallbackFunctions.js";
-export {
-  hasAnyRole,
-  type HasAnyRoleParams,
-} from "../extensions/modules/__generated__/OwnableRoles/read/hasAnyRole.js";
-export {
-  hasAllRoles,
-  type HasAllRolesParams,
-} from "../extensions/modules/__generated__/OwnableRoles/read/hasAllRoles.js";
-export { owner } from "../extensions/modules/__generated__/OwnableRoles/read/owner.js";
-export {
-  ownershipHandoverExpiresAt,
-  type OwnershipHandoverExpiresAtParams,
-} from "../extensions/modules/__generated__/OwnableRoles/read/ownershipHandoverExpiresAt.js";
-export {
-  rolesOf,
-  type RolesOfParams,
-} from "../extensions/modules/__generated__/OwnableRoles/read/rolesOf.js";
-export { checkModulesCompatibility } from "../extensions/modules/common/checkModulesCompatibility.js";
-
-/**
- * Write
- */
-export { cancelOwnershipHandover } from "../extensions/modules/__generated__/OwnableRoles/write/cancelOwnershipHandover.js";
-export {
-  completeOwnershipHandover,
-  type CompleteOwnershipHandoverParams,
-} from "../extensions/modules/__generated__/OwnableRoles/write/completeOwnershipHandover.js";
-export {
-  grantRoles,
-  type GrantRolesParams,
-} from "../extensions/modules/__generated__/OwnableRoles/write/grantRoles.js";
-export {
-  installModule,
-  isInstallModuleSupported,
-  type InstallModuleParams,
-} from "../extensions/modules/__generated__/IModularCore/write/installModule.js";
-export { renounceOwnership } from "../extensions/modules/__generated__/OwnableRoles/write/renounceOwnership.js";
-export { requestOwnershipHandover } from "../extensions/modules/__generated__/OwnableRoles/write/requestOwnershipHandover.js";
-export {
-  renounceRoles,
-  type RenounceRolesParams,
-} from "../extensions/modules/__generated__/OwnableRoles/write/renounceRoles.js";
-export {
-  revokeRoles,
-  type RevokeRolesParams,
-} from "../extensions/modules/__generated__/OwnableRoles/write/revokeRoles.js";
-export {
-  transferOwnership,
-  type TransferOwnershipParams,
-} from "../extensions/modules/__generated__/OwnableRoles/write/transferOwnership.js";
-export {
-  uninstallModule,
-  isUninstallModuleSupported,
-  type UninstallModuleParams,
-} from "../extensions/modules/__generated__/IModularCore/write/uninstallModule.js";
-export {
-  getModuleConfig,
-  isGetModuleConfigSupported,
-} from "../extensions/modules/__generated__/IModule/read/getModuleConfig.js";
-export {
-  installPublishedModule,
-  type InstallPublishedModuleOptions,
-} from "../extensions/modules/common/installPublishedModule.js";
-export {
-  uninstallPublishedModule,
-  type UninstallPublishedModuleOptions,
-} from "../extensions/modules/common/uninstallPublishedModule.js";
-export {
-  uninstallModuleByProxy,
-  type UninstallModuleByProxyOptions,
-} from "../extensions/modules/common/uninstallModuleByProxy.js";
-export { moduleInstalledEvent } from "../extensions/modules/__generated__/IModularCore/events/ModuleInstalled.js";
diff --git a/packages/thirdweb/src/exports/pay.ts b/packages/thirdweb/src/exports/pay.ts
index f901ec55cd7..5b9067cd00c 100644
--- a/packages/thirdweb/src/exports/pay.ts
+++ b/packages/thirdweb/src/exports/pay.ts
@@ -1,78 +1,69 @@
-export {
-  getBuyWithCryptoQuote,
-  type BuyWithCryptoQuote,
-  type GetBuyWithCryptoQuoteParams,
-} from "../pay/buyWithCrypto/getQuote.js";
-
-export {
-  getBuyWithCryptoTransfer,
-  type BuyWithCryptoTransfer,
-  type GetBuyWithCryptoTransferParams,
-} from "../pay/buyWithCrypto/getTransfer.js";
-
 export type {
   QuoteApprovalParams,
   QuoteTokenInfo,
 } from "../pay/buyWithCrypto/commonTypes.js";
+export {
+  type BuyWithCryptoHistoryData,
+  type BuyWithCryptoHistoryParams,
+  getBuyWithCryptoHistory,
+} from "../pay/buyWithCrypto/getHistory.js";
+export {
+  type BuyWithCryptoQuote,
+  type GetBuyWithCryptoQuoteParams,
+  getBuyWithCryptoQuote,
+} from "../pay/buyWithCrypto/getQuote.js";
 
 export {
-  getBuyWithCryptoStatus,
   type BuyWithCryptoStatus,
   type BuyWithCryptoTransaction,
+  getBuyWithCryptoStatus,
 } from "../pay/buyWithCrypto/getStatus.js";
-
 export {
-  getBuyWithCryptoHistory,
-  type BuyWithCryptoHistoryData,
-  type BuyWithCryptoHistoryParams,
-} from "../pay/buyWithCrypto/getHistory.js";
+  type BuyWithCryptoTransfer,
+  type GetBuyWithCryptoTransferParams,
+  getBuyWithCryptoTransfer,
+} from "../pay/buyWithCrypto/getTransfer.js";
 
 // fiat ------------------------------------------------
 
 export {
-  getBuyWithFiatQuote,
+  type BuyWithFiatHistoryData,
+  type BuyWithFiatHistoryParams,
+  getBuyWithFiatHistory,
+} from "../pay/buyWithFiat/getHistory.js";
+export {
+  type GetPostOnRampQuoteParams,
+  getPostOnRampQuote,
+} from "../pay/buyWithFiat/getPostOnRampQuote.js";
+export {
   type BuyWithFiatQuote,
   type GetBuyWithFiatQuoteParams,
+  getBuyWithFiatQuote,
 } from "../pay/buyWithFiat/getQuote.js";
-
 export {
-  getBuyWithFiatStatus,
   type BuyWithFiatStatus,
   type GetBuyWithFiatStatusParams,
+  getBuyWithFiatStatus,
 } from "../pay/buyWithFiat/getStatus.js";
-
-export {
-  getBuyWithFiatHistory,
-  type BuyWithFiatHistoryData,
-  type BuyWithFiatHistoryParams,
-} from "../pay/buyWithFiat/getHistory.js";
-
-export {
-  getPostOnRampQuote,
-  type GetPostOnRampQuoteParams,
-} from "../pay/buyWithFiat/getPostOnRampQuote.js";
-
+export { isSwapRequiredPostOnramp } from "../pay/buyWithFiat/isSwapRequiredPostOnramp.js";
 export {
-  getBuyHistory,
   type BuyHistoryData,
   type BuyHistoryParams,
+  getBuyHistory,
 } from "../pay/getBuyHistory.js";
 
-export { isSwapRequiredPostOnramp } from "../pay/buyWithFiat/isSwapRequiredPostOnramp.js";
-
 // types ------------------------------------------------
 
-export type {
-  PayTokenInfo,
-  PayOnChainTransactionDetails,
-} from "../pay/utils/commonTypes.js";
+export {
+  type ConvertCryptoToFiatParams,
+  convertCryptoToFiat,
+} from "../pay/convert/cryptoToFiat.js";
 
 export {
-  convertFiatToCrypto,
   type ConvertFiatToCryptoParams,
+  convertFiatToCrypto,
 } from "../pay/convert/fiatToCrypto.js";
-
-export {
-  convertCryptoToFiat,
-  type ConvertCryptoToFiatParams,
-} from "../pay/convert/cryptoToFiat.js";
+export type {
+  PayOnChainTransactionDetails,
+  PayTokenInfo,
+} from "../pay/utils/commonTypes.js";
diff --git a/packages/thirdweb/src/exports/react.native.ts b/packages/thirdweb/src/exports/react.native.ts
index 2a63d4a9e21..5872285fc66 100644
--- a/packages/thirdweb/src/exports/react.native.ts
+++ b/packages/thirdweb/src/exports/react.native.ts
@@ -1,167 +1,151 @@
-export { ThirdwebProvider } from "../react/native/providers/thirdweb-provider.js";
-
-// theme
-export { darkTheme, lightTheme } from "../react/core/design-system/index.js";
+export {
+  AccountProvider,
+  type AccountProviderProps,
+} from "../react/core/account/provider.js";
 export type {
   Theme,
   ThemeOverrides,
 } from "../react/core/design-system/index.js";
-
-// wallet hooks
-export { useActiveWallet } from "../react/core/hooks/wallets/useActiveWallet.js";
-export { useActiveWalletChain } from "../react/core/hooks/wallets/useActiveWalletChain.js";
-export { useActiveWalletConnectionStatus } from "../react/core/hooks/wallets/useActiveWalletConnectionStatus.js";
-export { useActiveAccount } from "../react/core/hooks/wallets/useActiveAccount.js";
-export { useAdminWallet } from "../react/core/hooks/wallets/useAdminWallet.js";
-export { useAuthToken } from "../react/core/hooks/wallets/useAuthToken.js";
-export { useAutoConnect } from "../react/native/hooks/wallets/useAutoConnect.js";
-export { useConnect } from "../react/core/hooks/wallets/useConnect.js";
-export { useConnectedWallets } from "../react/core/hooks/wallets/useConnectedWallets.js";
-export { useDisconnect } from "../react/core/hooks/wallets/useDisconnect.js";
-export { useIsAutoConnecting } from "../react/core/hooks/wallets/useIsAutoConnecting.js";
-export { useSetActiveWallet } from "../react/core/hooks/wallets/useSetActiveWallet.js";
-export { useSetActiveWalletConnectionStatus } from "../react/core/hooks/wallets/useSetActiveWalletConnectionStatus.js";
-export { useSwitchActiveWalletChain } from "../react/core/hooks/wallets/useSwitchActiveWalletChain.js";
-export { useWalletBalance } from "../react/core/hooks/others/useWalletBalance.js";
-export { useProfiles } from "../react/native/hooks/wallets/useProfiles.js";
-export { useLinkProfile } from "../react/native/hooks/wallets/useLinkProfile.js";
-export { useUnlinkProfile } from "../react/native/hooks/wallets/useUnlinkProfile.js";
-
-// eip5792
-export { useCapabilities } from "../react/core/hooks/wallets/useCapabilities.js";
-export { useSendCalls } from "../react/core/hooks/wallets/useSendCalls.js";
-export { useSendAndConfirmCalls } from "../react/core/hooks/wallets/useSendAndConfirmCalls.js";
-export { useWaitForCallsReceipt } from "../react/core/hooks/wallets/useWaitForCallsReceipt.js";
-
+// theme
+export { darkTheme, lightTheme } from "../react/core/design-system/index.js";
+export type {
+  ConnectButton_connectButtonOptions,
+  ConnectButton_connectModalOptions,
+  ConnectButton_detailsButtonOptions,
+  ConnectButton_detailsModalOptions,
+  ConnectButtonProps,
+} from "../react/core/hooks/connection/ConnectButtonProps.js";
+export { useContractEvents } from "../react/core/hooks/contract/useContractEvents.js";
 // contract
 export { useReadContract } from "../react/core/hooks/contract/useReadContract.js";
 export { useWaitForReceipt } from "../react/core/hooks/contract/useWaitForReceipt.js";
-export { useContractEvents } from "../react/core/hooks/contract/useContractEvents.js";
-
-// transaction
-export type {
-  SendTransactionConfig,
-  SendTransactionPayModalConfig,
-} from "../react/core/hooks/transaction/useSendTransaction.js";
-export { useSimulateTransaction } from "../react/core/hooks/transaction/useSimulateTransaction.js";
-export { useSendTransaction } from "../react/native/hooks/transaction/useSendTransaction.js";
-export { useSendBatchTransaction } from "../react/core/hooks/transaction/useSendBatchTransaction.js";
-export { useSendAndConfirmTransaction } from "../react/core/hooks/transaction/useSendAndConfirmTransaction.js";
-export { useEstimateGas } from "../react/core/hooks/transaction/useEstimateGas.js";
-export { useEstimateGasCost } from "../react/core/hooks/transaction/useEstimateGasCost.js";
-
-// rpc related
-export {
-  useBlockNumber,
-  type UseBlockNumberOptions,
-} from "../react/core/hooks/rpc/useBlockNumber.js";
-
-// utils
-export { createContractQuery } from "../react/core/utils/createQuery.js";
 export { useInvalidateContractQuery } from "../react/core/hooks/others/useInvalidateQueries.js";
-
+export { useWalletBalance } from "../react/core/hooks/others/useWalletBalance.js";
+export {
+  type BuyHistoryQueryOptions,
+  useBuyHistory,
+} from "../react/core/hooks/pay/useBuyHistory.js";
+export {
+  type BuyWithCryptoHistoryQueryOptions,
+  useBuyWithCryptoHistory,
+} from "../react/core/hooks/pay/useBuyWithCryptoHistory.js";
 // pay
 export {
-  useBuyWithCryptoQuote,
   type BuyWithCryptoQuoteQueryOptions,
+  useBuyWithCryptoQuote,
 } from "../react/core/hooks/pay/useBuyWithCryptoQuote.js";
 export { useBuyWithCryptoStatus } from "../react/core/hooks/pay/useBuyWithCryptoStatus.js";
 export {
-  useBuyWithCryptoHistory,
-  type BuyWithCryptoHistoryQueryOptions,
-} from "../react/core/hooks/pay/useBuyWithCryptoHistory.js";
+  type BuyWithFiatHistoryQueryOptions,
+  useBuyWithFiatHistory,
+} from "../react/core/hooks/pay/useBuyWithFiatHistory.js";
 export {
-  useBuyWithFiatQuote,
   type BuyWithFiatQuoteQueryOptions,
+  useBuyWithFiatQuote,
 } from "../react/core/hooks/pay/useBuyWithFiatQuote.js";
 export { useBuyWithFiatStatus } from "../react/core/hooks/pay/useBuyWithFiatStatus.js";
 export {
-  useBuyWithFiatHistory,
-  type BuyWithFiatHistoryQueryOptions,
-} from "../react/core/hooks/pay/useBuyWithFiatHistory.js";
-export {
-  useBuyHistory,
-  type BuyHistoryQueryOptions,
-} from "../react/core/hooks/pay/useBuyHistory.js";
-export {
-  usePostOnRampQuote,
   type PostOnRampQuoteQueryOptions,
+  usePostOnRampQuote,
 } from "../react/core/hooks/pay/usePostOnrampQuote.js";
-
-// Components
-export { AutoConnect } from "../react/native/ui/AutoConnect/AutoConnect.js";
-export type { AutoConnectProps } from "../wallets/connection/types.js";
-
-export { TransactionButton } from "../react/native/ui/transaction/TransactionButton.js";
+// rpc related
+export {
+  type UseBlockNumberOptions,
+  useBlockNumber,
+} from "../react/core/hooks/rpc/useBlockNumber.js";
 export type { TransactionButtonProps } from "../react/core/hooks/transaction/transaction-button-utils.js";
-
+export { useEstimateGas } from "../react/core/hooks/transaction/useEstimateGas.js";
+export { useEstimateGasCost } from "../react/core/hooks/transaction/useEstimateGasCost.js";
+export { useSendAndConfirmTransaction } from "../react/core/hooks/transaction/useSendAndConfirmTransaction.js";
+export { useSendBatchTransaction } from "../react/core/hooks/transaction/useSendBatchTransaction.js";
+// transaction
 export type {
-  ConnectButtonProps,
-  ConnectButton_connectButtonOptions,
-  ConnectButton_connectModalOptions,
-  ConnectButton_detailsButtonOptions,
-  ConnectButton_detailsModalOptions,
-} from "../react/core/hooks/connection/ConnectButtonProps.js";
-export { ConnectButton } from "../react/native/ui/connect/ConnectButton.js";
-export { ConnectEmbed } from "../react/native/ui/connect/ConnectModal.js";
-
-// wallet info
-export { useWalletInfo, useWalletImage } from "../react/core/utils/wallet.js";
-
+  SendTransactionConfig,
+  SendTransactionPayModalConfig,
+} from "../react/core/hooks/transaction/useSendTransaction.js";
+export { useSimulateTransaction } from "../react/core/hooks/transaction/useSimulateTransaction.js";
+export { useActiveAccount } from "../react/core/hooks/wallets/useActiveAccount.js";
+// wallet hooks
+export { useActiveWallet } from "../react/core/hooks/wallets/useActiveWallet.js";
+export { useActiveWalletChain } from "../react/core/hooks/wallets/useActiveWalletChain.js";
+export { useActiveWalletConnectionStatus } from "../react/core/hooks/wallets/useActiveWalletConnectionStatus.js";
+export { useAdminWallet } from "../react/core/hooks/wallets/useAdminWallet.js";
+export { useAuthToken } from "../react/core/hooks/wallets/useAuthToken.js";
+// eip5792
+export { useCapabilities } from "../react/core/hooks/wallets/useCapabilities.js";
+export { useConnect } from "../react/core/hooks/wallets/useConnect.js";
+export { useConnectedWallets } from "../react/core/hooks/wallets/useConnectedWallets.js";
+export { useDisconnect } from "../react/core/hooks/wallets/useDisconnect.js";
+export { useIsAutoConnecting } from "../react/core/hooks/wallets/useIsAutoConnecting.js";
+export { useSendAndConfirmCalls } from "../react/core/hooks/wallets/useSendAndConfirmCalls.js";
+export { useSendCalls } from "../react/core/hooks/wallets/useSendCalls.js";
+export { useSetActiveWallet } from "../react/core/hooks/wallets/useSetActiveWallet.js";
+export { useSetActiveWalletConnectionStatus } from "../react/core/hooks/wallets/useSetActiveWalletConnectionStatus.js";
+export { useSwitchActiveWalletChain } from "../react/core/hooks/wallets/useSwitchActiveWalletChain.js";
+export { useWaitForCallsReceipt } from "../react/core/hooks/wallets/useWaitForCallsReceipt.js";
 export { useConnectionManager } from "../react/core/providers/connection-manager.js";
-
 // Social
 export { useSocialProfiles } from "../react/core/social/useSocialProfiles.js";
-export type {
-  SocialProfile,
-  EnsProfile,
-  FarcasterProfile,
-  LensProfile,
-} from "../social/types.js";
-
+// utils
+export { createContractQuery } from "../react/core/utils/createQuery.js";
+// wallet info
+export { useWalletImage, useWalletInfo } from "../react/core/utils/wallet.js";
 /**
- * Account
+ * Wallet
  */
 export {
-  Blobbie,
-  AccountBlobbie,
-  type BlobbieProps,
-} from "../react/native/ui/prebuilt/Account/blobbie.js";
-export {
-  AccountProvider,
-  type AccountProviderProps,
-} from "../react/core/account/provider.js";
-export {
-  AccountBalance,
-  type AccountBalanceProps,
-} from "../react/native/ui/prebuilt/Account/balance.js";
+  WalletProvider,
+  type WalletProviderProps,
+} from "../react/core/wallet/provider.js";
+export { useSendTransaction } from "../react/native/hooks/transaction/useSendTransaction.js";
+export { useAutoConnect } from "../react/native/hooks/wallets/useAutoConnect.js";
+export { useLinkProfile } from "../react/native/hooks/wallets/useLinkProfile.js";
+export { useProfiles } from "../react/native/hooks/wallets/useProfiles.js";
+export { useUnlinkProfile } from "../react/native/hooks/wallets/useUnlinkProfile.js";
+export { ThirdwebProvider } from "../react/native/providers/thirdweb-provider.js";
+// Components
+export { AutoConnect } from "../react/native/ui/AutoConnect/AutoConnect.js";
+export { ConnectButton } from "../react/native/ui/connect/ConnectButton.js";
+export { ConnectEmbed } from "../react/native/ui/connect/ConnectModal.js";
 export {
   AccountAddress,
   type AccountAddressProps,
 } from "../react/native/ui/prebuilt/Account/address.js";
-export {
-  AccountName,
-  type AccountNameProps,
-} from "../react/native/ui/prebuilt/Account/name.js";
 export {
   AccountAvatar,
   type AccountAvatarProps,
 } from "../react/native/ui/prebuilt/Account/avatar.js";
-
+export {
+  AccountBalance,
+  type AccountBalanceProps,
+} from "../react/native/ui/prebuilt/Account/balance.js";
 /**
- * Wallet
+ * Account
  */
 export {
-  WalletProvider,
-  type WalletProviderProps,
-} from "../react/core/wallet/provider.js";
+  AccountBlobbie,
+  Blobbie,
+  type BlobbieProps,
+} from "../react/native/ui/prebuilt/Account/blobbie.js";
+export {
+  AccountName,
+  type AccountNameProps,
+} from "../react/native/ui/prebuilt/Account/name.js";
 export {
-  WalletIcon,
   SocialIcon,
-  type WalletIconProps,
   type SocialIconProps,
+  WalletIcon,
+  type WalletIconProps,
 } from "../react/native/ui/prebuilt/Wallet/icon.js";
 export {
   WalletName,
   type WalletNameProps,
 } from "../react/native/ui/prebuilt/Wallet/name.js";
+export { TransactionButton } from "../react/native/ui/transaction/TransactionButton.js";
+export type {
+  EnsProfile,
+  FarcasterProfile,
+  LensProfile,
+  SocialProfile,
+} from "../social/types.js";
+export type { AutoConnectProps } from "../wallets/connection/types.js";
diff --git a/packages/thirdweb/src/exports/react.ts b/packages/thirdweb/src/exports/react.ts
index dc3a0fe36f5..3656d528b4b 100644
--- a/packages/thirdweb/src/exports/react.ts
+++ b/packages/thirdweb/src/exports/react.ts
@@ -1,134 +1,138 @@
-export { darkTheme, lightTheme } from "../react/core/design-system/index.js";
+export {
+  AccountProvider,
+  type AccountProviderProps,
+} from "../react/core/account/provider.js";
 export type {
   Theme,
   ThemeOverrides,
 } from "../react/core/design-system/index.js";
-
-export { ConnectButton } from "../react/web/ui/ConnectWallet/ConnectButton.js";
-export { ConnectEmbed } from "../react/web/ui/ConnectWallet/Modal/ConnectEmbed.js";
-export type { ConnectEmbedProps } from "../react/core/hooks/connection/ConnectEmbedProps.js";
-
+export { darkTheme, lightTheme } from "../react/core/design-system/index.js";
+// auth
+export type { SiweAuthOptions } from "../react/core/hooks/auth/useSiweAuth.js";
+export { useSiweAuth } from "../react/core/hooks/auth/useSiweAuth.js";
 export type {
-  ConnectButtonProps,
   ConnectButton_connectButtonOptions,
   ConnectButton_connectModalOptions,
   ConnectButton_detailsButtonOptions,
   ConnectButton_detailsModalOptions,
+  ConnectButtonProps,
+  DirectPaymentOptions,
+  FundWalletOptions,
+  PaymentInfo,
+  PayUIOptions,
+  TransactionOptions,
 } from "../react/core/hooks/connection/ConnectButtonProps.js";
-export type { NetworkSelectorProps } from "../react/web/ui/ConnectWallet/NetworkSelector.js";
-export type { WelcomeScreen } from "../react/web/ui/ConnectWallet/screens/types.js";
-export type { LocaleId } from "../react/web/ui/types.js";
-
-export { TransactionButton } from "../react/web/ui/TransactionButton/index.js";
+export type { ConnectEmbedProps } from "../react/core/hooks/connection/ConnectEmbedProps.js";
+export { useContractEvents } from "../react/core/hooks/contract/useContractEvents.js";
+// contract
+export { useReadContract } from "../react/core/hooks/contract/useReadContract.js";
+export { useWaitForReceipt } from "../react/core/hooks/contract/useWaitForReceipt.js";
+// chain hooks
+export { useChainMetadata } from "../react/core/hooks/others/useChainQuery.js";
+export { useInvalidateContractQuery } from "../react/core/hooks/others/useInvalidateQueries.js";
+export { useWalletBalance } from "../react/core/hooks/others/useWalletBalance.js";
+export {
+  type BuyHistoryQueryOptions,
+  useBuyHistory,
+} from "../react/core/hooks/pay/useBuyHistory.js";
+export {
+  type BuyWithCryptoHistoryQueryOptions,
+  useBuyWithCryptoHistory,
+} from "../react/core/hooks/pay/useBuyWithCryptoHistory.js";
+// pay
+export {
+  type BuyWithCryptoQuoteQueryOptions,
+  useBuyWithCryptoQuote,
+} from "../react/core/hooks/pay/useBuyWithCryptoQuote.js";
+export { useBuyWithCryptoStatus } from "../react/core/hooks/pay/useBuyWithCryptoStatus.js";
+export {
+  type BuyWithFiatHistoryQueryOptions,
+  useBuyWithFiatHistory,
+} from "../react/core/hooks/pay/useBuyWithFiatHistory.js";
+export {
+  type BuyWithFiatQuoteQueryOptions,
+  useBuyWithFiatQuote,
+} from "../react/core/hooks/pay/useBuyWithFiatQuote.js";
+export { useBuyWithFiatStatus } from "../react/core/hooks/pay/useBuyWithFiatStatus.js";
+export {
+  type PostOnRampQuoteQueryOptions,
+  usePostOnRampQuote,
+} from "../react/core/hooks/pay/usePostOnrampQuote.js";
+// rpc related
+export {
+  type UseBlockNumberOptions,
+  useBlockNumber,
+} from "../react/core/hooks/rpc/useBlockNumber.js";
 export type { TransactionButtonProps } from "../react/core/hooks/transaction/transaction-button-utils.js";
-
-export { ThirdwebProvider } from "../react/web/providers/thirdweb-provider.js";
-
-// tokens
+export { useEstimateGas } from "../react/core/hooks/transaction/useEstimateGas.js";
+export { useEstimateGasCost } from "../react/core/hooks/transaction/useEstimateGasCost.js";
+export { useSendAndConfirmTransaction } from "../react/core/hooks/transaction/useSendAndConfirmTransaction.js";
+export { useSendBatchTransaction } from "../react/core/hooks/transaction/useSendBatchTransaction.js";
+// transaction
 export type {
-  SupportedTokens,
-  TokenInfo,
-} from "../react/core/utils/defaultTokens.js";
+  SendTransactionConfig,
+  SendTransactionPayModalConfig,
+} from "../react/core/hooks/transaction/useSendTransaction.js";
+export { useSimulateTransaction } from "../react/core/hooks/transaction/useSimulateTransaction.js";
 export {
-  defaultTokens,
-  getDefaultToken,
-} from "../react/core/utils/defaultTokens.js";
-
-// Media Renderer
-export { MediaRenderer } from "../react/web/ui/MediaRenderer/MediaRenderer.js";
-export type { MediaRendererProps } from "../react/web/ui/MediaRenderer/types.js";
-
+  type UseBridgeRoutesParams,
+  useBridgeRoutes,
+} from "../react/core/hooks/useBridgeRoutes.js";
+export { useActiveAccount } from "../react/core/hooks/wallets/useActiveAccount.js";
 // wallet hooks
 export { useActiveWallet } from "../react/core/hooks/wallets/useActiveWallet.js";
 export { useActiveWalletChain } from "../react/core/hooks/wallets/useActiveWalletChain.js";
 export { useActiveWalletConnectionStatus } from "../react/core/hooks/wallets/useActiveWalletConnectionStatus.js";
-export { useActiveAccount } from "../react/core/hooks/wallets/useActiveAccount.js";
 export { useAdminWallet } from "../react/core/hooks/wallets/useAdminWallet.js";
 export { useAuthToken } from "../react/core/hooks/wallets/useAuthToken.js";
-export { useAutoConnect } from "../react/web/hooks/wallets/useAutoConnect.js";
+// eip5792
+export { useCapabilities } from "../react/core/hooks/wallets/useCapabilities.js";
 export { useConnect } from "../react/core/hooks/wallets/useConnect.js";
 export { useConnectedWallets } from "../react/core/hooks/wallets/useConnectedWallets.js";
 export { useDisconnect } from "../react/core/hooks/wallets/useDisconnect.js";
 export { useIsAutoConnecting } from "../react/core/hooks/wallets/useIsAutoConnecting.js";
+export { useSendAndConfirmCalls } from "../react/core/hooks/wallets/useSendAndConfirmCalls.js";
+export { useSendCalls } from "../react/core/hooks/wallets/useSendCalls.js";
 export { useSetActiveWallet } from "../react/core/hooks/wallets/useSetActiveWallet.js";
 export { useSetActiveWalletConnectionStatus } from "../react/core/hooks/wallets/useSetActiveWalletConnectionStatus.js";
 export { useSwitchActiveWalletChain } from "../react/core/hooks/wallets/useSwitchActiveWalletChain.js";
-export { useWalletBalance } from "../react/core/hooks/others/useWalletBalance.js";
-export { useProfiles } from "../react/web/hooks/wallets/useProfiles.js";
-export { useLinkProfile } from "../react/web/hooks/wallets/useLinkProfile.js";
-export { useUnlinkProfile } from "../react/web/hooks/wallets/useUnlinkProfile.js";
-
-// eip5792
-export { useCapabilities } from "../react/core/hooks/wallets/useCapabilities.js";
-export { useSendCalls } from "../react/core/hooks/wallets/useSendCalls.js";
-export { useSendAndConfirmCalls } from "../react/core/hooks/wallets/useSendAndConfirmCalls.js";
 export { useWaitForCallsReceipt } from "../react/core/hooks/wallets/useWaitForCallsReceipt.js";
-
-// chain hooks
-export { useChainMetadata } from "../react/core/hooks/others/useChainQuery.js";
-
-export type { ConnectManagerOptions } from "../wallets/manager/index.js";
-
-// contract
-export { useReadContract } from "../react/core/hooks/contract/useReadContract.js";
-export { useWaitForReceipt } from "../react/core/hooks/contract/useWaitForReceipt.js";
-export { useContractEvents } from "../react/core/hooks/contract/useContractEvents.js";
-
-// transaction
-export type {
-  SendTransactionConfig,
-  SendTransactionPayModalConfig,
-} from "../react/core/hooks/transaction/useSendTransaction.js";
-export { useSimulateTransaction } from "../react/core/hooks/transaction/useSimulateTransaction.js";
-export { useSendTransaction } from "../react/web/hooks/transaction/useSendTransaction.js";
-export { useSendBatchTransaction } from "../react/core/hooks/transaction/useSendBatchTransaction.js";
-export { useSendAndConfirmTransaction } from "../react/core/hooks/transaction/useSendAndConfirmTransaction.js";
-export { useEstimateGas } from "../react/core/hooks/transaction/useEstimateGas.js";
-export { useEstimateGasCost } from "../react/core/hooks/transaction/useEstimateGasCost.js";
-
-// rpc related
-export {
-  useBlockNumber,
-  type UseBlockNumberOptions,
-} from "../react/core/hooks/rpc/useBlockNumber.js";
+export { useConnectionManager } from "../react/core/providers/connection-manager.js";
+// Social
+export { useSocialProfiles } from "../react/core/social/useSocialProfiles.js";
+export type { AccountBalanceInfo } from "../react/core/utils/account.js";
 
 // utils
 export { createContractQuery } from "../react/core/utils/createQuery.js";
-export { useInvalidateContractQuery } from "../react/core/hooks/others/useInvalidateQueries.js";
-
-// pay
-export {
-  useBuyWithCryptoQuote,
-  type BuyWithCryptoQuoteQueryOptions,
-} from "../react/core/hooks/pay/useBuyWithCryptoQuote.js";
-export { useBuyWithCryptoStatus } from "../react/core/hooks/pay/useBuyWithCryptoStatus.js";
-export {
-  useBuyWithCryptoHistory,
-  type BuyWithCryptoHistoryQueryOptions,
-} from "../react/core/hooks/pay/useBuyWithCryptoHistory.js";
-export {
-  useBuyWithFiatQuote,
-  type BuyWithFiatQuoteQueryOptions,
-} from "../react/core/hooks/pay/useBuyWithFiatQuote.js";
-export { useBuyWithFiatStatus } from "../react/core/hooks/pay/useBuyWithFiatStatus.js";
+// tokens
+export type {
+  SupportedTokens,
+  TokenInfo,
+} from "../react/core/utils/defaultTokens.js";
 export {
-  useBuyWithFiatHistory,
-  type BuyWithFiatHistoryQueryOptions,
-} from "../react/core/hooks/pay/useBuyWithFiatHistory.js";
+  defaultTokens,
+  getDefaultToken,
+} from "../react/core/utils/defaultTokens.js";
+// wallet info
+// ens
 export {
-  useBuyHistory,
-  type BuyHistoryQueryOptions,
-} from "../react/core/hooks/pay/useBuyHistory.js";
+  useEnsAvatar,
+  useEnsName,
+  useWalletImage,
+  useWalletInfo,
+} from "../react/core/utils/wallet.js";
+// Wallet
 export {
-  usePostOnRampQuote,
-  type PostOnRampQuoteQueryOptions,
-} from "../react/core/hooks/pay/usePostOnrampQuote.js";
-
+  WalletProvider,
+  type WalletProviderProps,
+} from "../react/core/wallet/provider.js";
+export { useSendTransaction } from "../react/web/hooks/transaction/useSendTransaction.js";
+export { useAutoConnect } from "../react/web/hooks/wallets/useAutoConnect.js";
+export { useLinkProfile } from "../react/web/hooks/wallets/useLinkProfile.js";
+export { useProfiles } from "../react/web/hooks/wallets/useProfiles.js";
+export { useUnlinkProfile } from "../react/web/hooks/wallets/useUnlinkProfile.js";
+export { ThirdwebProvider } from "../react/web/providers/thirdweb-provider.js";
 export { AutoConnect } from "../react/web/ui/AutoConnect/AutoConnect.js";
-export type { AutoConnectProps } from "../wallets/connection/types.js";
-
-// auth
-export type { SiweAuthOptions } from "../react/core/hooks/auth/useSiweAuth.js";
 
 export {
   BuyWidget,
@@ -142,170 +146,136 @@ export {
   TransactionWidget,
   type TransactionWidgetProps,
 } from "../react/web/ui/Bridge/TransactionWidget.js";
+/**
+ * Blobbie
+ */
+export { Blobbie } from "../react/web/ui/ConnectWallet/Blobbie.js";
+export { ConnectButton } from "../react/web/ui/ConnectWallet/ConnectButton.js";
 export {
-  useBridgeRoutes,
-  type UseBridgeRoutesParams,
-} from "../react/core/hooks/useBridgeRoutes.js";
+  type UseWalletDetailsModalOptions,
+  useWalletDetailsModal,
+} from "../react/web/ui/ConnectWallet/Details.js";
+export { ConnectEmbed } from "../react/web/ui/ConnectWallet/Modal/ConnectEmbed.js";
+export type { NetworkSelectorProps } from "../react/web/ui/ConnectWallet/NetworkSelector.js";
+export {
+  type UseNetworkSwitcherModalOptions,
+  useNetworkSwitcherModal,
+} from "../react/web/ui/ConnectWallet/NetworkSelector.js";
+export type { WelcomeScreen } from "../react/web/ui/ConnectWallet/screens/types.js";
+export {
+  type UseConnectModalOptions,
+  useConnectModal,
+} from "../react/web/ui/ConnectWallet/useConnectModal.js";
+// Media Renderer
+export { MediaRenderer } from "../react/web/ui/MediaRenderer/MediaRenderer.js";
+export type { MediaRendererProps } from "../react/web/ui/MediaRenderer/types.js";
 export {
   PayEmbed,
-  type PayEmbedProps,
   type PayEmbedConnectOptions,
+  type PayEmbedProps,
 } from "../react/web/ui/PayEmbed.js";
-export type {
-  PayUIOptions,
-  PaymentInfo,
-  DirectPaymentOptions,
-  FundWalletOptions,
-  TransactionOptions,
-} from "../react/core/hooks/connection/ConnectButtonProps.js";
-
+// Account
 export {
-  useConnectModal,
-  type UseConnectModalOptions,
-} from "../react/web/ui/ConnectWallet/useConnectModal.js";
-
-// wallet info
-export { useWalletInfo, useWalletImage } from "../react/core/utils/wallet.js";
-
+  AccountAddress,
+  type AccountAddressProps,
+} from "../react/web/ui/prebuilt/Account/address.js";
 export {
-  useWalletDetailsModal,
-  type UseWalletDetailsModalOptions,
-} from "../react/web/ui/ConnectWallet/Details.js";
-
+  AccountAvatar,
+  type AccountAvatarProps,
+} from "../react/web/ui/prebuilt/Account/avatar.js";
 export {
-  useNetworkSwitcherModal,
-  type UseNetworkSwitcherModalOptions,
-} from "../react/web/ui/ConnectWallet/NetworkSelector.js";
-
-// ens
-export { useEnsName, useEnsAvatar } from "../react/core/utils/wallet.js";
-
-/**
- * Prebuilt UI components for thirdweb contracts
- */
-export { ClaimButton } from "../react/web/ui/prebuilt/thirdweb/ClaimButton/index.js";
-export type { ClaimButtonProps } from "../react/web/ui/prebuilt/thirdweb/ClaimButton/types.js";
+  AccountBalance,
+  type AccountBalanceProps,
+} from "../react/web/ui/prebuilt/Account/balance.js";
+export { AccountBlobbie } from "../react/web/ui/prebuilt/Account/blobbie.js";
 export {
-  BuyDirectListingButton,
-  type BuyDirectListingButtonProps,
-} from "../react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/index.js";
+  AccountName,
+  type AccountNameProps,
+} from "../react/web/ui/prebuilt/Account/name.js";
 export {
-  CreateDirectListingButton,
-  type CreateDirectListingButtonProps,
-} from "../react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/index.js";
-
-// NFT rendering components
+  ChainIcon,
+  type ChainIconProps,
+} from "../react/web/ui/prebuilt/Chain/icon.js";
 export {
-  NFTProvider,
-  type NFTProviderProps,
-} from "../react/web/ui/prebuilt/NFT/provider.js";
+  ChainName,
+  type ChainNameProps,
+} from "../react/web/ui/prebuilt/Chain/name.js";
+// Chain
 export {
-  NFTName,
-  type NFTNameProps,
-} from "../react/web/ui/prebuilt/NFT/name.js";
+  ChainProvider,
+  type ChainProviderProps,
+} from "../react/web/ui/prebuilt/Chain/provider.js";
 export {
   NFTDescription,
   type NFTDescriptionProps,
 } from "../react/web/ui/prebuilt/NFT/description.js";
 export {
   NFTMedia,
-  type NFTMediaProps,
   type NFTMediaInfo,
+  type NFTMediaProps,
 } from "../react/web/ui/prebuilt/NFT/media.js";
-
-export { useConnectionManager } from "../react/core/providers/connection-manager.js";
-
-/**
- * Blobbie
- */
-export { Blobbie } from "../react/web/ui/ConnectWallet/Blobbie.js";
-
-export { useSiweAuth } from "../react/core/hooks/auth/useSiweAuth.js";
-
-// Social
-export { useSocialProfiles } from "../react/core/social/useSocialProfiles.js";
-export type {
-  SocialProfile,
-  EnsProfile,
-  FarcasterProfile,
-  LensProfile,
-} from "../social/types.js";
-
-// Site Embed and Linking
-export { SiteEmbed } from "../react/web/ui/SiteEmbed.js";
-export { SiteLink } from "../react/web/ui/SiteLink.js";
-
-// Account
 export {
-  AccountAddress,
-  type AccountAddressProps,
-} from "../react/web/ui/prebuilt/Account/address.js";
-export {
-  AccountBalance,
-  type AccountBalanceProps,
-} from "../react/web/ui/prebuilt/Account/balance.js";
-export type { AccountBalanceInfo } from "../react/core/utils/account.js";
+  NFTName,
+  type NFTNameProps,
+} from "../react/web/ui/prebuilt/NFT/name.js";
+// NFT rendering components
 export {
-  AccountName,
-  type AccountNameProps,
-} from "../react/web/ui/prebuilt/Account/name.js";
-export { AccountBlobbie } from "../react/web/ui/prebuilt/Account/blobbie.js";
+  NFTProvider,
+  type NFTProviderProps,
+} from "../react/web/ui/prebuilt/NFT/provider.js";
 export {
-  AccountProvider,
-  type AccountProviderProps,
-} from "../react/core/account/provider.js";
+  TokenIcon,
+  type TokenIconProps,
+} from "../react/web/ui/prebuilt/Token/icon.js";
 export {
-  AccountAvatar,
-  type AccountAvatarProps,
-} from "../react/web/ui/prebuilt/Account/avatar.js";
-
+  TokenName,
+  type TokenNameProps,
+} from "../react/web/ui/prebuilt/Token/name.js";
 // Token
 export {
   TokenProvider,
   type TokenProviderProps,
 } from "../react/web/ui/prebuilt/Token/provider.js";
-export {
-  TokenName,
-  type TokenNameProps,
-} from "../react/web/ui/prebuilt/Token/name.js";
 export {
   TokenSymbol,
   type TokenSymbolProps,
 } from "../react/web/ui/prebuilt/Token/symbol.js";
 export {
-  TokenIcon,
-  type TokenIconProps,
-} from "../react/web/ui/prebuilt/Token/icon.js";
-
-// Chain
-export {
-  ChainProvider,
-  type ChainProviderProps,
-} from "../react/web/ui/prebuilt/Chain/provider.js";
-export {
-  ChainName,
-  type ChainNameProps,
-} from "../react/web/ui/prebuilt/Chain/name.js";
-export {
-  ChainIcon,
-  type ChainIconProps,
-} from "../react/web/ui/prebuilt/Chain/icon.js";
-
-// Utils
-export { getLastAuthProvider } from "../react/web/utils/storage.js";
-
-// Wallet
+  BuyDirectListingButton,
+  type BuyDirectListingButtonProps,
+} from "../react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/index.js";
+/**
+ * Prebuilt UI components for thirdweb contracts
+ */
+export { ClaimButton } from "../react/web/ui/prebuilt/thirdweb/ClaimButton/index.js";
+export type { ClaimButtonProps } from "../react/web/ui/prebuilt/thirdweb/ClaimButton/types.js";
 export {
-  WalletProvider,
-  type WalletProviderProps,
-} from "../react/core/wallet/provider.js";
+  CreateDirectListingButton,
+  type CreateDirectListingButtonProps,
+} from "../react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/index.js";
 export {
-  WalletIcon,
   SocialIcon,
   type SocialIconProps,
+  WalletIcon,
   type WalletIconProps,
 } from "../react/web/ui/prebuilt/Wallet/icon.js";
 export {
   WalletName,
   type WalletNameProps,
 } from "../react/web/ui/prebuilt/Wallet/name.js";
+// Site Embed and Linking
+export { SiteEmbed } from "../react/web/ui/SiteEmbed.js";
+export { SiteLink } from "../react/web/ui/SiteLink.js";
+export { TransactionButton } from "../react/web/ui/TransactionButton/index.js";
+export type { LocaleId } from "../react/web/ui/types.js";
+
+// Utils
+export { getLastAuthProvider } from "../react/web/utils/storage.js";
+export type {
+  EnsProfile,
+  FarcasterProfile,
+  LensProfile,
+  SocialProfile,
+} from "../social/types.js";
+export type { AutoConnectProps } from "../wallets/connection/types.js";
+export type { ConnectManagerOptions } from "../wallets/manager/index.js";
diff --git a/packages/thirdweb/src/exports/rpc.ts b/packages/thirdweb/src/exports/rpc.ts
index 61a4ef5eb9d..312945da357 100644
--- a/packages/thirdweb/src/exports/rpc.ts
+++ b/packages/thirdweb/src/exports/rpc.ts
@@ -1,24 +1,22 @@
-export { getRpcClient } from "../rpc/rpc.js";
-
-// blockNumber watcher
-export {
-  watchBlockNumber,
-  type WatchBlockNumberOptions,
-} from "../rpc/watchBlockNumber.js";
-
+export { eth_blockNumber } from "../rpc/actions/eth_blockNumber.js";
+export { eth_call } from "../rpc/actions/eth_call.js";
+export { eth_estimateGas } from "../rpc/actions/eth_estimateGas.js";
 // all the actions
 export { eth_gasPrice } from "../rpc/actions/eth_gasPrice.js";
-export { eth_getBlockByNumber } from "../rpc/actions/eth_getBlockByNumber.js";
+export { eth_getBalance } from "../rpc/actions/eth_getBalance.js";
 export { eth_getBlockByHash } from "../rpc/actions/eth_getBlockByHash.js";
+export { eth_getBlockByNumber } from "../rpc/actions/eth_getBlockByNumber.js";
+export { eth_getCode } from "../rpc/actions/eth_getCode.js";
+export { eth_getLogs } from "../rpc/actions/eth_getLogs.js";
+export { eth_getStorageAt } from "../rpc/actions/eth_getStorageAt.js";
+export { eth_getTransactionByHash } from "../rpc/actions/eth_getTransactionByHash.js";
 export { eth_getTransactionCount } from "../rpc/actions/eth_getTransactionCount.js";
 export { eth_getTransactionReceipt } from "../rpc/actions/eth_getTransactionReceipt.js";
 export { eth_maxPriorityFeePerGas } from "../rpc/actions/eth_maxPriorityFeePerGas.js";
-export { eth_blockNumber } from "../rpc/actions/eth_blockNumber.js";
-export { eth_estimateGas } from "../rpc/actions/eth_estimateGas.js";
-export { eth_call } from "../rpc/actions/eth_call.js";
-export { eth_getLogs } from "../rpc/actions/eth_getLogs.js";
 export { eth_sendRawTransaction } from "../rpc/actions/eth_sendRawTransaction.js";
-export { eth_getCode } from "../rpc/actions/eth_getCode.js";
-export { eth_getBalance } from "../rpc/actions/eth_getBalance.js";
-export { eth_getStorageAt } from "../rpc/actions/eth_getStorageAt.js";
-export { eth_getTransactionByHash } from "../rpc/actions/eth_getTransactionByHash.js";
+export { getRpcClient } from "../rpc/rpc.js";
+// blockNumber watcher
+export {
+  type WatchBlockNumberOptions,
+  watchBlockNumber,
+} from "../rpc/watchBlockNumber.js";
diff --git a/packages/thirdweb/src/exports/social.ts b/packages/thirdweb/src/exports/social.ts
index de543ffa0a1..9250cf31ce0 100644
--- a/packages/thirdweb/src/exports/social.ts
+++ b/packages/thirdweb/src/exports/social.ts
@@ -1,7 +1,7 @@
 export { getSocialProfiles } from "../social/profiles.js";
 export type {
-  SocialProfile,
   EnsProfile,
   FarcasterProfile,
   LensProfile,
+  SocialProfile,
 } from "../social/types.js";
diff --git a/packages/thirdweb/src/exports/storage.ts b/packages/thirdweb/src/exports/storage.ts
index 74284cf45c2..81c3224969f 100644
--- a/packages/thirdweb/src/exports/storage.ts
+++ b/packages/thirdweb/src/exports/storage.ts
@@ -1,14 +1,14 @@
-export { upload, type UploadOptions } from "../storage/upload.js";
+export { type DownloadOptions, download } from "../storage/download.js";
+export { type UnpinOptions, unpin } from "../storage/unpin.js";
+export { type UploadOptions, upload } from "../storage/upload.js";
 export {
-  uploadMobile,
   type UploadMobileOptions,
+  uploadMobile,
 } from "../storage/uploadMobile.js";
-export { download, type DownloadOptions } from "../storage/download.js";
-export { unpin, type UnpinOptions } from "../storage/unpin.js";
-export { resolveScheme, type ResolveSchemeOptions } from "../utils/ipfs.js";
 export {
-  resolveArweaveScheme,
   type ResolveArweaveSchemeOptions,
+  resolveArweaveScheme,
 } from "../utils/arweave.js";
+export { type ResolveSchemeOptions, resolveScheme } from "../utils/ipfs.js";
 export type { AsyncStorage } from "../utils/storage/AsyncStorage.js";
 export { inMemoryStorage } from "../utils/storage/inMemoryStorage.js";
diff --git a/packages/thirdweb/src/exports/thirdweb.ts b/packages/thirdweb/src/exports/thirdweb.ts
index 2e1b8f9e865..c3f3dd3cd13 100644
--- a/packages/thirdweb/src/exports/thirdweb.ts
+++ b/packages/thirdweb/src/exports/thirdweb.ts
@@ -5,46 +5,52 @@ declare module "abitype" {
   }
 }
 
+/**
+ * UNIVERSAL BRIDGE
+ */
+export * as Bridge from "../bridge/index.js";
+/**
+ * CHAIN
+ */
+// chain type
+export type { Chain } from "../chains/types.js";
+// define chain
+export { defineChain } from "../chains/utils.js";
+/**
+ * CLIENT
+ */
+export {
+  type CreateThirdwebClientOptions,
+  createThirdwebClient,
+  type ThirdwebClient,
+} from "../client/client.js";
 /**
  * CONSTANTS
  */
 export {
+  NATIVE_TOKEN_ADDRESS,
   /**
    * @deprecated Use {@link ZERO_ADDRESS}.
    */
   ZERO_ADDRESS as ADDRESS_ZERO,
   ZERO_ADDRESS,
-  NATIVE_TOKEN_ADDRESS,
 } from "../constants/addresses.js";
-
 /**
- * CLIENT
+ * CONTRACT
  */
 export {
-  createThirdwebClient,
-  type CreateThirdwebClientOptions,
-  type ThirdwebClient,
-} from "../client/client.js";
-
+  type ContractOptions,
+  getContract,
+  type ThirdwebContract,
+} from "../contract/contract.js";
 /**
- * CHAIN
+ * ENGINE
  */
-// chain type
-export type { Chain } from "../chains/types.js";
-// define chain
-export { defineChain } from "../chains/utils.js";
-
+export * as Engine from "../engine/index.js";
 /**
- * RPC
+ * INSIGHT
  */
-// rpc client
-export { getRpcClient } from "../rpc/rpc.js";
-// blockNumber watcher
-export {
-  watchBlockNumber,
-  type WatchBlockNumberOptions,
-} from "../rpc/watchBlockNumber.js";
-
+export * as Insight from "../insight/index.js";
 // all the actions
 export { eth_blockNumber } from "../rpc/actions/eth_blockNumber.js";
 export { eth_call } from "../rpc/actions/eth_call.js";
@@ -61,263 +67,215 @@ export { eth_getTransactionCount } from "../rpc/actions/eth_getTransactionCount.
 export { eth_getTransactionReceipt } from "../rpc/actions/eth_getTransactionReceipt.js";
 export { eth_maxPriorityFeePerGas } from "../rpc/actions/eth_maxPriorityFeePerGas.js";
 export { eth_sendRawTransaction } from "../rpc/actions/eth_sendRawTransaction.js";
-
 /**
- * CONTRACT
+ * RPC
  */
+// rpc client
+export { getRpcClient } from "../rpc/rpc.js";
+// blockNumber watcher
 export {
-  getContract,
-  type ContractOptions,
-  type ThirdwebContract,
-} from "../contract/contract.js";
-
-/**
- * UNIVERSAL BRIDGE
- */
-export * as Bridge from "../bridge/index.js";
-
-/**
- * INSIGHT
- */
-export * as Insight from "../insight/index.js";
-
-/**
- * ENGINE
- */
-export * as Engine from "../engine/index.js";
+  type WatchBlockNumberOptions,
+  watchBlockNumber,
+} from "../rpc/watchBlockNumber.js";
 
 /**
  * WALLETS
  */
 export {
-  getUser,
   type GetUserResult,
+  getUser,
 } from "../wallets/in-app/core/users/getUser.js";
 
 /**
  * TRANSACTIONS
  */
 
+// actions
 export {
-  prepareTransaction,
-  type PrepareTransactionOptions,
-  type PreparedTransaction,
-} from "../transaction/prepare-transaction.js";
-
+  type GetContractEventsOptions,
+  type GetContractEventsResult,
+  getContractEvents,
+} from "../event/actions/get-events.js";
 export {
-  isBaseTransactionOptions,
-  type BaseTransactionOptions,
-} from "../transaction/types.js";
-
+  type ParseEventLogsOptions,
+  type ParseEventLogsResult,
+  parseEventLogs,
+} from "../event/actions/parse-logs.js";
 export {
-  prepareContractCall,
-  type PrepareContractCallOptions,
-} from "../transaction/prepare-contract-call.js";
-
+  type WatchContractEventsOptions,
+  watchContractEvents,
+} from "../event/actions/watch-events.js";
+/**
+ * EVENTS
+ */
 export {
-  readContract,
-  type ReadContractOptions,
-} from "../transaction/read-contract.js";
-
-// method resolver
-export { resolveMethod } from "../transaction/resolve-method.js";
-
+  type PreparedEvent,
+  type PrepareEventOptions,
+  prepareEvent,
+} from "../event/prepare-event.js";
+export {
+  type GetGasPriceOptions,
+  getGasPrice,
+} from "../gas/get-gas-price.js";
+export type {
+  QuoteApprovalParams,
+  QuoteTokenInfo,
+} from "../pay/buyWithCrypto/commonTypes.js";
+export {
+  type BuyWithCryptoHistoryData,
+  type BuyWithCryptoHistoryParams,
+  getBuyWithCryptoHistory,
+} from "../pay/buyWithCrypto/getHistory.js";
+export {
+  type BuyWithCryptoQuote,
+  type GetBuyWithCryptoQuoteParams,
+  getBuyWithCryptoQuote,
+} from "../pay/buyWithCrypto/getQuote.js";
+export {
+  type BuyWithCryptoStatus,
+  type BuyWithCryptoTransaction,
+  getBuyWithCryptoStatus,
+} from "../pay/buyWithCrypto/getStatus.js";
+export {
+  type BuyWithCryptoTransfer,
+  type GetBuyWithCryptoTransferParams,
+  getBuyWithCryptoTransfer,
+} from "../pay/buyWithCrypto/getTransfer.js";
+export type {
+  PayOnChainTransactionDetails,
+  PayTokenInfo,
+} from "../pay/utils/commonTypes.js";
 // transaction actions
 export { encode } from "../transaction/actions/encode.js";
 export {
-  estimateGas,
   type EstimateGasOptions,
+  estimateGas,
 } from "../transaction/actions/estimate-gas.js";
 export { estimateGasCost } from "../transaction/actions/estimate-gas-cost.js";
-export {
-  getGasPrice,
-  type GetGasPriceOptions,
-} from "../gas/get-gas-price.js";
-export {
-  sendTransaction,
-  type SendTransactionOptions,
-} from "../transaction/actions/send-transaction.js";
 export { sendAndConfirmTransaction } from "../transaction/actions/send-and-confirm-transaction.js";
 export {
-  sendBatchTransaction,
   type SendBatchTransactionOptions,
+  sendBatchTransaction,
 } from "../transaction/actions/send-batch-transaction.js";
 export {
-  simulateTransaction,
+  type SendTransactionOptions,
+  sendTransaction,
+} from "../transaction/actions/send-transaction.js";
+export { signTransaction } from "../transaction/actions/sign-transaction.js";
+export {
   type SimulateOptions,
+  simulateTransaction,
 } from "../transaction/actions/simulate.js";
-export { waitForReceipt } from "../transaction/actions/wait-for-tx-receipt.js";
-export { signTransaction } from "../transaction/actions/sign-transaction.js";
-export { serializeTransaction } from "../transaction/serialize-transaction.js";
 export {
-  toSerializableTransaction,
   type ToSerializableTransactionOptions,
+  toSerializableTransaction,
 } from "../transaction/actions/to-serializable-transaction.js";
-
-/**
- * EVENTS
- */
+export { waitForReceipt } from "../transaction/actions/wait-for-tx-receipt.js";
 export {
-  prepareEvent,
-  type PrepareEventOptions,
-  type PreparedEvent,
-} from "../event/prepare-event.js";
-
-// actions
+  type PrepareContractCallOptions,
+  prepareContractCall,
+} from "../transaction/prepare-contract-call.js";
 export {
-  getContractEvents,
-  type GetContractEventsOptions,
-  type GetContractEventsResult,
-} from "../event/actions/get-events.js";
+  type PreparedTransaction,
+  type PrepareTransactionOptions,
+  prepareTransaction,
+} from "../transaction/prepare-transaction.js";
 export {
-  parseEventLogs,
-  type ParseEventLogsOptions,
-  type ParseEventLogsResult,
-} from "../event/actions/parse-logs.js";
+  type ReadContractOptions,
+  readContract,
+} from "../transaction/read-contract.js";
+// method resolver
+export { resolveMethod } from "../transaction/resolve-method.js";
+export { serializeTransaction } from "../transaction/serialize-transaction.js";
 export {
-  watchContractEvents,
-  type WatchContractEventsOptions,
-} from "../event/actions/watch-events.js";
-
+  type BaseTransactionOptions,
+  isBaseTransactionOptions,
+} from "../transaction/types.js";
 /**
  * TYPES
  */
 export type { NFT } from "../utils/nft/parseNft.js";
-
 /**
  * UNITS
  */
-export { toEther, toTokens, toUnits, toWei, fromGwei } from "../utils/units.js";
-
-export {
-  getBuyWithCryptoQuote,
-  type BuyWithCryptoQuote,
-  type GetBuyWithCryptoQuoteParams,
-} from "../pay/buyWithCrypto/getQuote.js";
-
-export type {
-  QuoteApprovalParams,
-  QuoteTokenInfo,
-} from "../pay/buyWithCrypto/commonTypes.js";
-
-export {
-  getBuyWithCryptoStatus,
-  type BuyWithCryptoStatus,
-  type BuyWithCryptoTransaction,
-} from "../pay/buyWithCrypto/getStatus.js";
-
-export {
-  getBuyWithCryptoHistory,
-  type BuyWithCryptoHistoryData,
-  type BuyWithCryptoHistoryParams,
-} from "../pay/buyWithCrypto/getHistory.js";
-
-export {
-  getBuyWithCryptoTransfer,
-  type GetBuyWithCryptoTransferParams,
-  type BuyWithCryptoTransfer,
-} from "../pay/buyWithCrypto/getTransfer.js";
-
-export type {
-  PayOnChainTransactionDetails,
-  PayTokenInfo,
-} from "../pay/utils/commonTypes.js";
+export { fromGwei, toEther, toTokens, toUnits, toWei } from "../utils/units.js";
 
 // ------------------------------------------------
 // encoding
 // ------------------------------------------------
 
+// from
+export {
+  type BytesToBigIntOpts,
+  type BytesToBoolOpts,
+  type BytesToNumberOpts,
+  type BytesToStringOpts,
+  bytesToBigInt,
+  bytesToBool,
+  bytesToNumber,
+  bytesToString,
+  type FromBytesParameters,
+  type FromBytesReturnType,
+  fromBytes,
+} from "../utils/encoding/from-bytes.js";
+export { concatHex } from "../utils/encoding/helpers/concat-hex.js";
 // hex
 export {
+  type BoolToHexOpts,
   boolToHex,
+  type FromHexParameters,
+  type FromHexReturnType,
   // from
   fromHex,
+  type Hex,
+  type HexToBigIntOpts,
+  type HexToBoolOpts,
+  type HexToNumberOpts,
+  type HexToStringOpts,
+  type HexToUint8ArrayOpts,
   hexToBigInt,
   hexToBool,
   hexToNumber,
   hexToString,
   hexToUint8Array,
+  type IsHexOptions,
   // util
   isHex,
+  type NumberToHexOpts,
   numberToHex,
   padHex,
+  type StringToHexOpts,
   stringToHex,
+  type ToHexParameters,
   // to
   toHex,
-  uint8ArrayToHex,
-  type BoolToHexOpts,
-  type FromHexParameters,
-  type FromHexReturnType,
-  type HexToBigIntOpts,
-  type HexToBoolOpts,
-  type HexToNumberOpts,
-  type HexToStringOpts,
-  type HexToUint8ArrayOpts,
-  type IsHexOptions,
-  type NumberToHexOpts,
-  type StringToHexOpts,
-  type ToHexParameters,
   type Uint8ArrayToHexOpts,
-  type Hex,
+  uint8ArrayToHex,
 } from "../utils/encoding/hex.js";
-export { concatHex } from "../utils/encoding/helpers/concat-hex.js";
-
 // bytes
 // to
 export {
+  type BoolToBytesOpts,
   boolToBytes,
+  type HexToBytesOpts,
   hexToBytes,
   numberToBytes,
-  stringToBytes,
-  toBytes,
-  type BoolToBytesOpts,
-  type HexToBytesOpts,
   type StringToBytesOpts,
+  stringToBytes,
   type ToBytesParameters,
+  toBytes,
 } from "../utils/encoding/to-bytes.js";
-// from
-export {
-  bytesToBigInt,
-  bytesToBool,
-  bytesToNumber,
-  bytesToString,
-  fromBytes,
-  type BytesToBigIntOpts,
-  type BytesToBoolOpts,
-  type BytesToNumberOpts,
-  type BytesToStringOpts,
-  type FromBytesParameters,
-  type FromBytesReturnType,
-} from "../utils/encoding/from-bytes.js";
 
 // ------------------------------------------------
 // hashing
 // ------------------------------------------------
 
-// keccak256
-export { keccak256 } from "../utils/hashing/keccak256.js";
-
-// sha256
-export { sha256 } from "../utils/hashing/sha256.js";
-
-// ------------------------------------------------
-// address
-// ------------------------------------------------
-export {
-  getAddress,
-  isAddress,
-  type Address,
-  type AddressInput,
-} from "../utils/address.js";
-
 // re-exports of types
 export type { AbiParameterToPrimitiveType } from "abitype";
-
 export {
   type VerifyTypedDataParams,
   verifyTypedData,
 } from "../auth/verify-typed-data.js";
-
 /**
  * EIP-7702
  */
@@ -326,4 +284,17 @@ export type {
   SignedAuthorization,
 } from "../transaction/actions/eip7702/authorization.js";
 export { signAuthorization } from "../transaction/actions/eip7702/authorization.js";
+// ------------------------------------------------
+// address
+// ------------------------------------------------
+export {
+  type Address,
+  type AddressInput,
+  getAddress,
+  isAddress,
+} from "../utils/address.js";
+// keccak256
+export { keccak256 } from "../utils/hashing/keccak256.js";
+// sha256
+export { sha256 } from "../utils/hashing/sha256.js";
 export { deploySmartAccount } from "../wallets/smart/lib/signing.js";
diff --git a/packages/thirdweb/src/exports/transaction.ts b/packages/thirdweb/src/exports/transaction.ts
index 18d649a2bdc..7c5b74a99ba 100644
--- a/packages/thirdweb/src/exports/transaction.ts
+++ b/packages/thirdweb/src/exports/transaction.ts
@@ -1,89 +1,81 @@
 // transactions
-export {
-  prepareTransaction,
-  type PrepareTransactionOptions,
-  type PreparedTransaction,
-} from "../transaction/prepare-transaction.js";
-
-export {
-  prepareContractCall,
-  type PrepareContractCallOptions,
-} from "../transaction/prepare-contract-call.js";
-
-export {
-  readContract,
-  type ReadContractOptions,
-  type ReadContractResult,
-} from "../transaction/read-contract.js";
-
-// method resolver
-export { resolveMethod } from "../transaction/resolve-method.js";
 
+export type { TransactionReceipt } from "viem";
+/**
+ * EIP-7702
+ */
+export type {
+  AuthorizationRequest,
+  SignedAuthorization,
+} from "../transaction/actions/eip7702/authorization.js";
+export { signAuthorization } from "../transaction/actions/eip7702/authorization.js";
 // tx actions (write)
 export { encode } from "../transaction/actions/encode.js";
 export {
-  estimateGas,
   type EstimateGasResult,
+  estimateGas,
 } from "../transaction/actions/estimate-gas.js";
 export {
-  estimateGasCost,
   type EstimateGasCostResult,
+  estimateGasCost,
 } from "../transaction/actions/estimate-gas-cost.js";
-export { waitForReceipt } from "../transaction/actions/wait-for-tx-receipt.js";
-export {
-  sendTransaction,
-  type SendTransactionOptions,
-} from "../transaction/actions/send-transaction.js";
+export type { BiconomyOptions } from "../transaction/actions/gasless/providers/biconomy.js";
+export type { EngineOptions } from "../transaction/actions/gasless/providers/engine.js";
+export type { OpenZeppelinOptions } from "../transaction/actions/gasless/providers/openzeppelin.js";
+/**
+ * Gasless types
+ */
+export type { GaslessOptions } from "../transaction/actions/gasless/types.js";
 export { sendAndConfirmTransaction } from "../transaction/actions/send-and-confirm-transaction.js";
 export {
-  sendBatchTransaction,
   type SendBatchTransactionOptions,
+  sendBatchTransaction,
 } from "../transaction/actions/send-batch-transaction.js";
 export {
-  simulateTransaction,
-  type SimulateOptions,
-} from "../transaction/actions/simulate.js";
+  type SendTransactionOptions,
+  sendTransaction,
+} from "../transaction/actions/send-transaction.js";
 export {
-  signTransaction,
   type SignTransactionOptions,
+  signTransaction,
 } from "../transaction/actions/sign-transaction.js";
 export {
-  serializeTransaction,
-  type SerializeTransactionOptions,
-} from "../transaction/serialize-transaction.js";
+  type SimulateOptions,
+  simulateTransaction,
+} from "../transaction/actions/simulate.js";
 export {
-  toSerializableTransaction,
   type ToSerializableTransactionOptions,
+  toSerializableTransaction,
 } from "../transaction/actions/to-serializable-transaction.js";
+export type { WaitForReceiptOptions } from "../transaction/actions/wait-for-tx-receipt.js";
+export { waitForReceipt } from "../transaction/actions/wait-for-tx-receipt.js";
+export { populateEip712Transaction } from "../transaction/actions/zksync/send-eip712-transaction.js";
+export {
+  type PrepareContractCallOptions,
+  prepareContractCall,
+} from "../transaction/prepare-contract-call.js";
+export {
+  type PreparedTransaction,
+  type PrepareTransactionOptions,
+  prepareTransaction,
+} from "../transaction/prepare-transaction.js";
+export {
+  type ReadContractOptions,
+  type ReadContractResult,
+  readContract,
+} from "../transaction/read-contract.js";
+// method resolver
+export { resolveMethod } from "../transaction/resolve-method.js";
+export {
+  type SerializeTransactionOptions,
+  serializeTransaction,
+} from "../transaction/serialize-transaction.js";
 export {
-  type StoredTransaction,
   getTransactionStore,
+  type StoredTransaction,
 } from "../transaction/transaction-store.js";
-export { populateEip712Transaction } from "../transaction/actions/zksync/send-eip712-transaction.js";
-
 //types & utils
 export {
   type BaseTransactionOptions,
   isBaseTransactionOptions,
 } from "../transaction/types.js";
-
-export type { WaitForReceiptOptions } from "../transaction/actions/wait-for-tx-receipt.js";
-
-export type { TransactionReceipt } from "viem";
-
-/**
- * Gasless types
- */
-export type { GaslessOptions } from "../transaction/actions/gasless/types.js";
-export type { EngineOptions } from "../transaction/actions/gasless/providers/engine.js";
-export type { OpenZeppelinOptions } from "../transaction/actions/gasless/providers/openzeppelin.js";
-export type { BiconomyOptions } from "../transaction/actions/gasless/providers/biconomy.js";
-
-/**
- * EIP-7702
- */
-export type {
-  AuthorizationRequest,
-  SignedAuthorization,
-} from "../transaction/actions/eip7702/authorization.js";
-export { signAuthorization } from "../transaction/actions/eip7702/authorization.js";
diff --git a/packages/thirdweb/src/exports/utils.ts b/packages/thirdweb/src/exports/utils.ts
index 2bcdd6527c4..11fdf212f96 100644
--- a/packages/thirdweb/src/exports/utils.ts
+++ b/packages/thirdweb/src/exports/utils.ts
@@ -1,36 +1,31 @@
 // bytecode
-export { detectMethod } from "../utils/bytecode/detectExtension.js";
-export { extractIPFSUri } from "../utils/bytecode/extractIPFS.js";
-export { extractMinimalProxyImplementationAddress } from "../utils/bytecode/extractMinimalProxyImplementationAddress.js";
-export { isContractDeployed } from "../utils/bytecode/is-contract-deployed.js";
-export { ensureBytecodePrefix } from "../utils/bytecode/prefix.js";
-export { resolveImplementation } from "../utils/bytecode/resolveImplementation.js";
-
-// units
-export { toEther, toTokens, toUnits, toWei, fromGwei } from "../utils/units.js";
 
 // any-evm utils
 export {
+  computeCreate2FactoryAddress,
   deployCreate2Factory,
   getDeployedCreate2Factory,
-  computeCreate2FactoryAddress,
 } from "../contract/deployment/utils/create-2-factory.js";
 export { computeDeploymentAddress } from "../utils/any-evm/compute-deployment-address.js";
+export type { ExtendedMetadata } from "../utils/any-evm/deploy-metadata.js";
 export { getInitBytecodeWithSalt } from "../utils/any-evm/get-init-bytecode-with-salt.js";
 export { getSaltHash } from "../utils/any-evm/get-salt-hash.js";
 export { isEIP155Enforced } from "../utils/any-evm/is-eip155-enforced.js";
 export { keccakId } from "../utils/any-evm/keccak-id.js";
 export { getKeylessTransaction } from "../utils/any-evm/keyless-transaction.js";
-export type { ExtendedMetadata } from "../utils/any-evm/deploy-metadata.js";
 export { isZkSyncChain } from "../utils/any-evm/zksync/isZkSyncChain.js";
-
+export { detectMethod } from "../utils/bytecode/detectExtension.js";
+export { extractIPFSUri } from "../utils/bytecode/extractIPFS.js";
+export { extractMinimalProxyImplementationAddress } from "../utils/bytecode/extractMinimalProxyImplementationAddress.js";
+export { isContractDeployed } from "../utils/bytecode/is-contract-deployed.js";
+export { ensureBytecodePrefix } from "../utils/bytecode/prefix.js";
+export { resolveImplementation } from "../utils/bytecode/resolveImplementation.js";
 //signatures
 export {
   resolveSignature,
   resolveSignatures,
 } from "../utils/signatures/resolve-signature.js";
 export { type SignOptions, sign } from "../utils/signatures/sign.js";
-export { signatureToHex } from "../utils/signatures/signature-to-hex.js";
 export {
   type SignMessageOptions,
   signMessage,
@@ -39,175 +34,160 @@ export {
   type SignTypedDataOptions,
   signTypedData,
 } from "../utils/signatures/sign-typed-data.js";
+export { signatureToHex } from "../utils/signatures/signature-to-hex.js";
+// units
+export { fromGwei, toEther, toTokens, toUnits, toWei } from "../utils/units.js";
 
 // ------------------------------------------------
 // encoding
 // ------------------------------------------------
 
+// from
+export {
+  type BytesToBigIntOpts,
+  type BytesToBoolOpts,
+  type BytesToNumberOpts,
+  type BytesToStringOpts,
+  bytesToBigInt,
+  bytesToBool,
+  bytesToNumber,
+  bytesToString,
+  type FromBytesParameters,
+  type FromBytesReturnType,
+  fromBytes,
+} from "../utils/encoding/from-bytes.js";
+export { concatHex } from "../utils/encoding/helpers/concat-hex.js";
 // hex
 export {
+  type BoolToHexOpts,
   boolToHex,
+  type FromHexParameters,
+  type FromHexReturnType,
   // from
   fromHex,
+  type HexToBigIntOpts,
+  type HexToBoolOpts,
+  type HexToNumberOpts,
+  type HexToStringOpts,
+  type HexToUint8ArrayOpts,
   hexToBigInt,
   hexToBool,
   hexToNumber,
   hexToString,
   hexToUint8Array,
+  type IsHexOptions,
   // util
   isHex,
+  type NumberToHexOpts,
   numberToHex,
   padHex,
+  type StringToHexOpts,
   stringToHex,
+  type ToHexParameters,
   // to
   toHex,
-  uint8ArrayToHex,
-  type BoolToHexOpts,
-  type FromHexParameters,
-  type FromHexReturnType,
-  type HexToBigIntOpts,
-  type HexToBoolOpts,
-  type HexToNumberOpts,
-  type HexToStringOpts,
-  type HexToUint8ArrayOpts,
-  type IsHexOptions,
-  type NumberToHexOpts,
-  type StringToHexOpts,
-  type ToHexParameters,
   type Uint8ArrayToHexOpts,
+  uint8ArrayToHex,
 } from "../utils/encoding/hex.js";
-export { concatHex } from "../utils/encoding/helpers/concat-hex.js";
-
 // bytes
 // to
 export {
+  type BoolToBytesOpts,
   boolToBytes,
+  type HexToBytesOpts,
   hexToBytes,
   numberToBytes,
-  stringToBytes,
-  toBytes,
-  type BoolToBytesOpts,
-  type HexToBytesOpts,
   type StringToBytesOpts,
+  stringToBytes,
   type ToBytesParameters,
+  toBytes,
 } from "../utils/encoding/to-bytes.js";
-// from
-export {
-  bytesToBigInt,
-  bytesToBool,
-  bytesToNumber,
-  bytesToString,
-  fromBytes,
-  type BytesToBigIntOpts,
-  type BytesToBoolOpts,
-  type BytesToNumberOpts,
-  type BytesToStringOpts,
-  type FromBytesParameters,
-  type FromBytesReturnType,
-} from "../utils/encoding/from-bytes.js";
 
 // ------------------------------------------------
 // hashing
 // ------------------------------------------------
 
-// keccak256
-export { keccak256 } from "../utils/hashing/keccak256.js";
-
-// sha256
-export { sha256 } from "../utils/hashing/sha256.js";
-
-// Ethereum Signed Message hashing
-export { hashMessage } from "../utils/hashing/hashMessage.js";
-
+export type {
+  Abi,
+  AbiConstructor,
+  AbiError,
+  AbiEvent,
+  AbiFallback,
+  AbiFunction,
+  AbiReceive,
+} from "abitype";
+// ------------------------------------------------
+// values
+// ------------------------------------------------
+export { maxUint256 } from "ox/Solidity";
+/**
+ * @utils
+ */
+export {
+  decodeAbiParameters,
+  encodePacked,
+  isBytes,
+  toEventSelector,
+  toFunctionSelector,
+} from "viem";
+export { decodeError } from "../utils/abi/decodeError.js";
+export { decodeFunctionData } from "../utils/abi/decodeFunctionData.js";
+export { decodeFunctionResult } from "../utils/abi/decodeFunctionResult.js";
+// ------------------------------------------------
+// abi
+// ------------------------------------------------
+export { encodeAbiParameters } from "../utils/abi/encodeAbiParameters.js";
 // ------------------------------------------------
 // address
 // ------------------------------------------------
 export {
+  type Address,
+  type AddressInput,
   checksumAddress,
   getAddress,
   isAddress,
   shortenAddress,
   shortenHex,
-  type Address,
-  type AddressInput,
 } from "../utils/address.js";
-
-export { isBytes } from "viem";
-
 // ------------------------------------------------
-// abi
+// bigint
 // ------------------------------------------------
-export { encodeAbiParameters } from "../utils/abi/encodeAbiParameters.js";
-export { decodeError } from "../utils/abi/decodeError.js";
-export { decodeFunctionData } from "../utils/abi/decodeFunctionData.js";
-export { decodeFunctionResult } from "../utils/abi/decodeFunctionResult.js";
-
-/**
- * @utils
- */
-export {
-  encodePacked,
-  decodeAbiParameters,
-} from "viem";
-
-// Useful helpers
-export { setThirdwebDomains, setServiceKey } from "../utils/domains.js";
-export { resolvePromisedValue } from "../utils/promise/resolve-promised-value.js";
+export { max, min } from "../utils/bigint.js";
 export {
-  setTransactionDecorator,
-  getTransactionDecorator,
   clearTransactionDecorator,
+  getTransactionDecorator,
+  setTransactionDecorator,
 } from "../utils/config.js";
-
+export { parseAbiParams } from "../utils/contract/parse-abi-params.js";
+// Useful helpers
+export { setServiceKey, setThirdwebDomains } from "../utils/domains.js";
+// ENS
+export { isValidENSName } from "../utils/ens/isValidENSName.js";
 // ------------------------------------------------
-// json
+// thirdweb Drop contracts
 // ------------------------------------------------
-export { stringify } from "../utils/json.js";
-
+export {
+  type GetClaimParamsOptions,
+  getClaimParams,
+} from "../utils/extensions/drops/get-claim-params.js";
+export { formatNumber } from "../utils/formatNumber.js";
+// Ethereum Signed Message hashing
+export { hashMessage } from "../utils/hashing/hashMessage.js";
+// keccak256
+export { keccak256 } from "../utils/hashing/keccak256.js";
+// sha256
+export { sha256 } from "../utils/hashing/sha256.js";
 // ------------------------------------------------
-// values
+// json
 // ------------------------------------------------
-export { maxUint256 } from "ox/Solidity";
-
+export { stringify } from "../utils/json.js";
 // ------------------------------------------------
 // jwt
 // ------------------------------------------------
 export { decodeJWT } from "../utils/jwt/decode-jwt.js";
 export { encodeJWT, type JWTPayloadInput } from "../utils/jwt/encode-jwt.js";
-export { refreshJWT, type RefreshJWTParams } from "../utils/jwt/refresh-jwt.js";
+export { type RefreshJWTParams, refreshJWT } from "../utils/jwt/refresh-jwt.js";
 export type { JWTPayload } from "../utils/jwt/types.js";
-
-// ------------------------------------------------
-// thirdweb Drop contracts
-// ------------------------------------------------
-export {
-  getClaimParams,
-  type GetClaimParamsOptions,
-} from "../utils/extensions/drops/get-claim-params.js";
-
-export type { NFTMetadata, NFTInput } from "../utils/nft/parseNft.js";
-
-export { parseAbiParams } from "../utils/contract/parse-abi-params.js";
-
-// ------------------------------------------------
-// bigint
-// ------------------------------------------------
-export { max, min } from "../utils/bigint.js";
-
-export { toFunctionSelector } from "viem";
-export { toEventSelector } from "viem";
-export type {
-  Abi,
-  AbiFunction,
-  AbiReceive,
-  AbiError,
-  AbiEvent,
-  AbiConstructor,
-  AbiFallback,
-} from "abitype";
-
+export type { NFTInput, NFTMetadata } from "../utils/nft/parseNft.js";
+export { resolvePromisedValue } from "../utils/promise/resolve-promised-value.js";
 export { shortenLargeNumber } from "../utils/shortenLargeNumber.js";
-export { formatNumber } from "../utils/formatNumber.js";
-
-// ENS
-export { isValidENSName } from "../utils/ens/isValidENSName.js";
diff --git a/packages/thirdweb/src/exports/wallets.native.ts b/packages/thirdweb/src/exports/wallets.native.ts
index 09a7b8215db..7bcb82b9bcf 100644
--- a/packages/thirdweb/src/exports/wallets.native.ts
+++ b/packages/thirdweb/src/exports/wallets.native.ts
@@ -1,73 +1,19 @@
 // --- KEEEP IN SYNC with exports/wallets.ts ---
 
-export {
-  createWallet,
-  walletConnect,
-} from "../wallets/native/create-wallet.js";
-export { inAppWallet } from "../wallets/in-app/native/in-app.js";
-export { ecosystemWallet } from "../wallets/in-app/native/ecosystem.js";
-export type {
-  EcosystemWalletCreationOptions,
-  EcosystemWalletConnectionOptions,
-  EcosystemWalletAutoConnectOptions,
-} from "../wallets/ecosystem/types.js";
-export { smartWallet } from "../wallets/smart/smart-wallet.js";
-
-export type { Wallet, Account } from "../wallets/interfaces/wallet.js";
-export type { ConnectionStatus } from "../wallets/manager/index.js";
-
-// utils
-export {
-  getWalletBalance,
-  type GetWalletBalanceOptions,
-} from "../wallets/utils/getWalletBalance.js";
-export {
-  generateAccount,
-  type GenerateAccountOptions,
-} from "../wallets/utils/generateAccount.js";
-
-// private-key
-export {
-  privateKeyToAccount,
-  /**
-   * @internal
-   * @deprecated - use {@link privateKeyToAccount} instead
-   */
-  privateKeyToAccount as privateKeyAccount,
-  type PrivateKeyToAccountOptions,
-  /**
-   * @internal
-   * @deprecated - use {@link PrivateKeyToAccountOptions} instead
-   */
-  type PrivateKeyToAccountOptions as PrivateKeyAccountOptions,
-} from "../wallets/private-key.js";
-
 export type {
-  WalletId,
-  WalletAutoConnectionOption,
-  WalletCreationOptions,
-  WalletConnectionOption,
-  CreateWalletArgs,
-  InjectedConnectOptions,
-  DeepLinkSupportedWalletCreationOptions,
-  StandaloneWCConnectOptions,
-} from "../wallets/wallet-types.js";
-
-export type {
-  WCSupportedWalletIds,
   InjectedSupportedWalletIds,
+  WCSupportedWalletIds,
 } from "../wallets/__generated__/wallet-ids.js";
-
 export type {
-  WCConnectOptions,
-  WCAutoConnectOptions,
-} from "../wallets/wallet-connect/types.js";
-
+  EcosystemWalletAutoConnectOptions,
+  EcosystemWalletConnectionOptions,
+  EcosystemWalletCreationOptions,
+} from "../wallets/ecosystem/types.js";
 export type {
-  SmartWalletConnectionOptions,
-  SmartWalletOptions,
-} from "../wallets/smart/types.js";
-
+  MultiStepAuthArgsType,
+  Profile,
+  SingleStepAuthArgsType,
+} from "../wallets/in-app/core/authentication/types.js";
 export type {
   InAppWalletAuth,
   /**
@@ -84,65 +30,105 @@ export type {
    * @deprecated use InAppWalletConnectionOptions instead
    */
   InAppWalletConnectionOptions as EmbeddedWalletConnectionOptions,
+  InAppWalletCreationOptions,
   InAppWalletSocialAuth,
   /**
    * @deprecated use InAppWalletSocialAuth instead
    */
   InAppWalletSocialAuth as EmbeddedWalletSocialAuth,
-  InAppWalletCreationOptions,
 } from "../wallets/in-app/core/wallet/types.js";
-
-export type {
-  MultiStepAuthArgsType,
-  SingleStepAuthArgsType,
-} from "../wallets/in-app/core/authentication/types.js";
-
 export {
-  preAuthenticate,
   authenticate,
+  getProfiles,
   getUserEmail,
   getUserPhoneNumber,
-  getProfiles,
   linkProfile,
+  preAuthenticate,
   unlinkProfile,
 } from "../wallets/in-app/native/auth/index.js";
-export type { Profile } from "../wallets/in-app/core/authentication/types.js";
+export { ecosystemWallet } from "../wallets/in-app/native/ecosystem.js";
+export { inAppWallet } from "../wallets/in-app/native/in-app.js";
+export type { Account, Wallet } from "../wallets/interfaces/wallet.js";
+export type { ConnectionStatus } from "../wallets/manager/index.js";
+export {
+  createWallet,
+  walletConnect,
+} from "../wallets/native/create-wallet.js";
+// private-key
+export {
+  type PrivateKeyToAccountOptions,
+  /**
+   * @internal
+   * @deprecated - use {@link PrivateKeyToAccountOptions} instead
+   */
+  type PrivateKeyToAccountOptions as PrivateKeyAccountOptions,
+  privateKeyToAccount,
+  /**
+   * @internal
+   * @deprecated - use {@link privateKeyToAccount} instead
+   */
+  privateKeyToAccount as privateKeyAccount,
+} from "../wallets/private-key.js";
+export { smartWallet } from "../wallets/smart/smart-wallet.js";
+
+export type {
+  SmartWalletConnectionOptions,
+  SmartWalletOptions,
+} from "../wallets/smart/types.js";
+export {
+  type GenerateAccountOptions,
+  generateAccount,
+} from "../wallets/utils/generateAccount.js";
+// utils
+export {
+  type GetWalletBalanceOptions,
+  getWalletBalance,
+} from "../wallets/utils/getWalletBalance.js";
+export type {
+  WCAutoConnectOptions,
+  WCConnectOptions,
+} from "../wallets/wallet-connect/types.js";
+export type {
+  CreateWalletArgs,
+  DeepLinkSupportedWalletCreationOptions,
+  InjectedConnectOptions,
+  StandaloneWCConnectOptions,
+  WalletAutoConnectionOption,
+  WalletConnectionOption,
+  WalletCreationOptions,
+  WalletId,
+} from "../wallets/wallet-types.js";
 export const authenticateWithRedirect = () => {
   throw new Error("Not supported in native");
 };
 
+// eip1193
+export * as EIP1193 from "../adapters/eip1193/index.js";
+export type { AdapterWalletOptions } from "../adapters/wallet-adapter.js";
+export { createWalletAdapter } from "../adapters/wallet-adapter.js";
+export { getWalletInfo } from "../wallets/__generated__/getWalletInfo.js";
 export type {
-  CoinbaseWalletCreationOptions,
   CoinbaseSDKWalletConnectionOptions,
+  CoinbaseWalletCreationOptions,
 } from "../wallets/coinbase/coinbase-web.js";
-
-export type {
-  WalletEmitter,
-  WalletEmitterEvents,
-} from "../wallets/wallet-emitter.js";
-
 export { getAllWalletsList } from "../wallets/getAllWalletsList.js";
-export { getWalletInfo } from "../wallets/__generated__/getWalletInfo.js";
-export type { WalletInfo } from "../wallets/wallet-info.js";
-
-export { createWalletAdapter } from "../adapters/wallet-adapter.js";
-export type { AdapterWalletOptions } from "../adapters/wallet-adapter.js";
-
 // wallet connect
 export {
   createWalletConnectClient,
   createWalletConnectSession,
+  DefaultWalletConnectRequestHandlers,
   disconnectWalletConnectSession,
   getActiveWalletConnectSessions,
-  DefaultWalletConnectRequestHandlers,
 } from "../wallets/wallet-connect/receiver/index.js";
 export type {
   WalletConnectClient,
   WalletConnectSession,
 } from "../wallets/wallet-connect/receiver/types.js";
-
-// eip1193
-export * as EIP1193 from "../adapters/eip1193/index.js";
+export type {
+  WalletEmitter,
+  WalletEmitterEvents,
+} from "../wallets/wallet-emitter.js";
+export type { WalletInfo } from "../wallets/wallet-info.js";
 
 // NOT SUPPORTED
 
diff --git a/packages/thirdweb/src/exports/wallets.ts b/packages/thirdweb/src/exports/wallets.ts
index 72e9830c612..b69a10b6eef 100644
--- a/packages/thirdweb/src/exports/wallets.ts
+++ b/packages/thirdweb/src/exports/wallets.ts
@@ -1,83 +1,40 @@
 // --- KEEEP IN SYNC with exports/wallets.native.ts ---
 
+// generate a random private key
+export { randomPrivateKey } from "ox/Secp256k1";
+// eip1193
+export * as EIP1193 from "../adapters/eip1193/index.js";
+export type { AdapterWalletOptions } from "../adapters/wallet-adapter.js";
+export { createWalletAdapter } from "../adapters/wallet-adapter.js";
+export { getWalletInfo } from "../wallets/__generated__/getWalletInfo.js";
+export type {
+  InjectedSupportedWalletIds,
+  WCSupportedWalletIds,
+} from "../wallets/__generated__/wallet-ids.js";
+export type {
+  CoinbaseSDKWalletConnectionOptions,
+  CoinbaseWalletCreationOptions,
+} from "../wallets/coinbase/coinbase-web.js";
 export {
   createWallet,
   walletConnect,
 } from "../wallets/create-wallet.js";
-export {
-  inAppWallet,
-  /**
-   * @deprecated use inAppWallet instead
-   */
-  inAppWallet as embeddedWallet,
-} from "../wallets/in-app/web/in-app.js";
-export { ecosystemWallet } from "../wallets/in-app/web/ecosystem.js";
 export type {
-  EcosystemWalletCreationOptions,
-  EcosystemWalletConnectionOptions,
   EcosystemWalletAutoConnectOptions,
+  EcosystemWalletConnectionOptions,
+  EcosystemWalletCreationOptions,
 } from "../wallets/ecosystem/types.js";
-export { smartWallet } from "../wallets/smart/smart-wallet.js";
-
-export type { Wallet, Account } from "../wallets/interfaces/wallet.js";
-export type { ConnectionStatus } from "../wallets/manager/index.js";
-
-// utils
-export {
-  getWalletBalance,
-  type GetWalletBalanceOptions,
-} from "../wallets/utils/getWalletBalance.js";
-export {
-  generateAccount,
-  type GenerateAccountOptions,
-} from "../wallets/utils/generateAccount.js";
-
-// private-key
-export {
-  privateKeyToAccount,
-  /**
-   * @internal
-   * @deprecated - use {@link privateKeyToAccount} instead
-   */
-  privateKeyToAccount as privateKeyAccount,
-  type PrivateKeyToAccountOptions,
-  /**
-   * @internal
-   * @deprecated - use {@link PrivateKeyToAccountOptions} instead
-   */
-  type PrivateKeyToAccountOptions as PrivateKeyAccountOptions,
-} from "../wallets/private-key.js";
-// generate a random private key
-export { randomPrivateKey } from "ox/Secp256k1";
-
-export type {
-  WalletId,
-  WalletAutoConnectionOption,
-  WalletCreationOptions,
-  WalletConnectionOption,
-  CreateWalletArgs,
-  InjectedConnectOptions,
-  DeepLinkSupportedWalletCreationOptions,
-  StandaloneWCConnectOptions,
-} from "../wallets/wallet-types.js";
-
-export type {
-  WCSupportedWalletIds,
-  InjectedSupportedWalletIds,
-} from "../wallets/__generated__/wallet-ids.js";
-
-export type {
-  WCConnectOptions,
-  WCAutoConnectOptions,
-} from "../wallets/wallet-connect/types.js";
-
+export { getAllWalletsList } from "../wallets/getAllWalletsList.js";
 export type {
-  SmartWalletConnectionOptions,
-  SmartWalletOptions,
-} from "../wallets/smart/types.js";
-
+  MultiStepAuthArgsType,
+  Profile,
+  SingleStepAuthArgsType,
+} from "../wallets/in-app/core/authentication/types.js";
+export {
+  type GetUserResult,
+  getUser,
+} from "../wallets/in-app/core/users/getUser.js";
 export type {
-  WalletUser,
   InAppWalletAuth,
   /**
    * @deprecated use InAppWalletAuth instead
@@ -93,77 +50,103 @@ export type {
    * @deprecated use InAppWalletConnectionOptions instead
    */
   InAppWalletConnectionOptions as EmbeddedWalletConnectionOptions,
+  InAppWalletCreationOptions,
   InAppWalletSocialAuth,
   /**
    * @deprecated use InAppWalletSocialAuth instead
    */
   InAppWalletSocialAuth as EmbeddedWalletSocialAuth,
-  InAppWalletCreationOptions,
+  WalletUser,
 } from "../wallets/in-app/core/wallet/types.js";
-
-export type {
-  MultiStepAuthArgsType,
-  SingleStepAuthArgsType,
-} from "../wallets/in-app/core/authentication/types.js";
-
+export { ecosystemWallet } from "../wallets/in-app/web/ecosystem.js";
+export {
+  inAppWallet,
+  /**
+   * @deprecated use inAppWallet instead
+   */
+  inAppWallet as embeddedWallet,
+} from "../wallets/in-app/web/in-app.js";
 export {
-  preAuthenticate,
   authenticate,
   authenticateWithRedirect,
+  getProfiles,
   getUserEmail,
   getUserPhoneNumber,
-  getProfiles,
   linkProfile,
+  preAuthenticate,
   unlinkProfile,
 } from "../wallets/in-app/web/lib/auth/index.js";
-export type { Profile } from "../wallets/in-app/core/authentication/types.js";
-
+export type { Account, Wallet } from "../wallets/interfaces/wallet.js";
+export type { ConnectionStatus } from "../wallets/manager/index.js";
+// private-key
 export {
-  getUser,
-  type GetUserResult,
-} from "../wallets/in-app/core/users/getUser.js";
-
-export type {
-  CoinbaseWalletCreationOptions,
-  CoinbaseSDKWalletConnectionOptions,
-} from "../wallets/coinbase/coinbase-web.js";
-
+  type PrivateKeyToAccountOptions,
+  /**
+   * @internal
+   * @deprecated - use {@link PrivateKeyToAccountOptions} instead
+   */
+  type PrivateKeyToAccountOptions as PrivateKeyAccountOptions,
+  privateKeyToAccount,
+  /**
+   * @internal
+   * @deprecated - use {@link privateKeyToAccount} instead
+   */
+  privateKeyToAccount as privateKeyAccount,
+} from "../wallets/private-key.js";
+export { smartWallet } from "../wallets/smart/smart-wallet.js";
 export type {
-  WalletEmitter,
-  WalletEmitterEvents,
-} from "../wallets/wallet-emitter.js";
-
-export { getAllWalletsList } from "../wallets/getAllWalletsList.js";
-export { getWalletInfo } from "../wallets/__generated__/getWalletInfo.js";
-export type { WalletInfo } from "../wallets/wallet-info.js";
-
-export { createWalletAdapter } from "../adapters/wallet-adapter.js";
-export type { AdapterWalletOptions } from "../adapters/wallet-adapter.js";
-
+  SmartWalletConnectionOptions,
+  SmartWalletOptions,
+} from "../wallets/smart/types.js";
+export {
+  type GenerateAccountOptions,
+  generateAccount,
+} from "../wallets/utils/generateAccount.js";
+// utils
+export {
+  type GetWalletBalanceOptions,
+  getWalletBalance,
+} from "../wallets/utils/getWalletBalance.js";
 // wallet connect
 export {
   createWalletConnectClient,
   createWalletConnectSession,
+  DefaultWalletConnectRequestHandlers,
   disconnectWalletConnectSession,
   getActiveWalletConnectSessions,
-  DefaultWalletConnectRequestHandlers,
 } from "../wallets/wallet-connect/receiver/index.js";
 export type {
   WalletConnectClient,
   WalletConnectSession,
 } from "../wallets/wallet-connect/receiver/types.js";
-
-// eip1193
-export * as EIP1193 from "../adapters/eip1193/index.js";
+export type {
+  WCAutoConnectOptions,
+  WCConnectOptions,
+} from "../wallets/wallet-connect/types.js";
+export type {
+  WalletEmitter,
+  WalletEmitterEvents,
+} from "../wallets/wallet-emitter.js";
+export type { WalletInfo } from "../wallets/wallet-info.js";
+export type {
+  CreateWalletArgs,
+  DeepLinkSupportedWalletCreationOptions,
+  InjectedConnectOptions,
+  StandaloneWCConnectOptions,
+  WalletAutoConnectionOption,
+  WalletConnectionOption,
+  WalletCreationOptions,
+  WalletId,
+} from "../wallets/wallet-types.js";
 
 // WEB ONLY EXPORTS
 
+export { autoConnect } from "../wallets/connection/autoConnect.js";
+export type { AutoConnectProps } from "../wallets/connection/types.js";
 // injected
-export { injectedProvider } from "../wallets/injected/mipdStore.js";
-export { getInstalledWallets } from "../wallets/injected/mipdStore.js";
-
+export {
+  getInstalledWallets,
+  injectedProvider,
+} from "../wallets/injected/mipdStore.js";
 export type { ConnectionManager } from "../wallets/manager/index.js";
-
-export type { AutoConnectProps } from "../wallets/connection/types.js";
-export { autoConnect } from "../wallets/connection/autoConnect.js";
 export { deploySmartAccount } from "../wallets/smart/lib/signing.js";
diff --git a/packages/thirdweb/src/exports/wallets/eip5792.ts b/packages/thirdweb/src/exports/wallets/eip5792.ts
index 7a51aea6c2e..d23f79dadf1 100644
--- a/packages/thirdweb/src/exports/wallets/eip5792.ts
+++ b/packages/thirdweb/src/exports/wallets/eip5792.ts
@@ -1,30 +1,30 @@
-export { getCapabilities } from "../../wallets/eip5792/get-capabilities.js";
+export {
+  type GetCallsStatusOptions,
+  getCallsStatus,
+} from "../../wallets/eip5792/get-calls-status.js";
 export type {
   GetCapabilitiesOptions,
   GetCapabilitiesResult,
 } from "../../wallets/eip5792/get-capabilities.js";
-export { sendCalls } from "../../wallets/eip5792/send-calls.js";
+export { getCapabilities } from "../../wallets/eip5792/get-capabilities.js";
 export { sendAndConfirmCalls } from "../../wallets/eip5792/send-and-confirm-calls.js";
-export { showCallsStatus } from "../../wallets/eip5792/show-calls-status.js";
 export type {
+  PrepareCallOptions,
+  PreparedSendCall,
   SendCallsOptions,
   SendCallsResult,
-  PreparedSendCall,
-  PrepareCallOptions,
 } from "../../wallets/eip5792/send-calls.js";
-export {
-  type GetCallsStatusOptions,
-  getCallsStatus,
-} from "../../wallets/eip5792/get-calls-status.js";
-export {
-  waitForCallsReceipt,
-  type WaitForCallsReceiptOptions,
-} from "../../wallets/eip5792/wait-for-calls-receipt.js";
+export { sendCalls } from "../../wallets/eip5792/send-calls.js";
+export { showCallsStatus } from "../../wallets/eip5792/show-calls-status.js";
 export type {
+  GetCallsStatusResponse,
+  WalletCallReceipt,
   WalletCapabilities,
   WalletCapabilitiesRecord,
-  WalletSendCallsParameters,
   WalletSendCallsId,
-  GetCallsStatusResponse,
-  WalletCallReceipt,
+  WalletSendCallsParameters,
 } from "../../wallets/eip5792/types.js";
+export {
+  type WaitForCallsReceiptOptions,
+  waitForCallsReceipt,
+} from "../../wallets/eip5792/wait-for-calls-receipt.js";
diff --git a/packages/thirdweb/src/exports/wallets/embedded.ts b/packages/thirdweb/src/exports/wallets/embedded.ts
index b73dc92a1ab..3b71e49489a 100644
--- a/packages/thirdweb/src/exports/wallets/embedded.ts
+++ b/packages/thirdweb/src/exports/wallets/embedded.ts
@@ -1,3 +1,4 @@
+export type { GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
 export {
   inAppWallet,
   /**
@@ -5,11 +6,8 @@ export {
    */
   inAppWallet as embeddedWallet,
 } from "../../wallets/in-app/web/in-app.js";
-
 export {
-  preAuthenticate,
   authenticate,
   getUserEmail,
+  preAuthenticate,
 } from "../../wallets/in-app/web/lib/auth/index.js";
-
-export type { GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
diff --git a/packages/thirdweb/src/exports/wallets/in-app.native.ts b/packages/thirdweb/src/exports/wallets/in-app.native.ts
index e5de5a432b3..845ca991809 100644
--- a/packages/thirdweb/src/exports/wallets/in-app.native.ts
+++ b/packages/thirdweb/src/exports/wallets/in-app.native.ts
@@ -1,29 +1,25 @@
 // --- KEEEP IN SYNC with exports/wallets/in-app.ts ---
 
-export { inAppWallet } from "../../wallets/in-app/native/in-app.js";
-
+export type {
+  GetAuthenticatedUserParams,
+  MultiStepAuthArgsType,
+  SingleStepAuthArgsType,
+} from "../../wallets/in-app/core/authentication/types.js";
+export type {
+  InAppWalletAuth,
+  InAppWalletAutoConnectOptions,
+  InAppWalletConnectionOptions,
+  InAppWalletCreationOptions,
+  InAppWalletSocialAuth,
+} from "../../wallets/in-app/core/wallet/types.js";
 export {
-  preAuthenticate,
   authenticate,
+  getProfiles,
   getUserEmail,
   getUserPhoneNumber,
-  getProfiles,
   linkProfile,
+  preAuthenticate,
   unlinkProfile,
 } from "../../wallets/in-app/native/auth/index.js";
-
-export type { GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
-export type {
-  InAppWalletCreationOptions,
-  InAppWalletAuth,
-  InAppWalletSocialAuth,
-  InAppWalletConnectionOptions,
-  InAppWalletAutoConnectOptions,
-} from "../../wallets/in-app/core/wallet/types.js";
-
-export type {
-  MultiStepAuthArgsType,
-  SingleStepAuthArgsType,
-} from "../../wallets/in-app/core/authentication/types.js";
-
 export { hasStoredPasskey } from "../../wallets/in-app/native/auth/passkeys.js";
+export { inAppWallet } from "../../wallets/in-app/native/in-app.js";
diff --git a/packages/thirdweb/src/exports/wallets/in-app.ts b/packages/thirdweb/src/exports/wallets/in-app.ts
index 3a3812a6575..2524501ad8f 100644
--- a/packages/thirdweb/src/exports/wallets/in-app.ts
+++ b/packages/thirdweb/src/exports/wallets/in-app.ts
@@ -1,34 +1,29 @@
 // --- KEEEP IN SYNC with exports/wallets/in-app.native.ts ---
 
+export {
+  getSocialIcon,
+  socialIcons,
+} from "../../react/core/utils/walletIcon.js";
+export type {
+  GetAuthenticatedUserParams,
+  MultiStepAuthArgsType,
+  SingleStepAuthArgsType,
+} from "../../wallets/in-app/core/authentication/types.js";
+export type {
+  InAppWalletAuth,
+  InAppWalletAutoConnectOptions,
+  InAppWalletConnectionOptions,
+  InAppWalletCreationOptions,
+  InAppWalletSocialAuth,
+} from "../../wallets/in-app/core/wallet/types.js";
 export { inAppWallet } from "../../wallets/in-app/web/in-app.js";
-
 export {
-  preAuthenticate,
   authenticate,
+  getProfiles,
   getUserEmail,
   getUserPhoneNumber,
-  getProfiles,
   linkProfile,
+  preAuthenticate,
   unlinkProfile,
 } from "../../wallets/in-app/web/lib/auth/index.js";
-
-export type { GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
-export type {
-  InAppWalletCreationOptions,
-  InAppWalletAuth,
-  InAppWalletSocialAuth,
-  InAppWalletConnectionOptions,
-  InAppWalletAutoConnectOptions,
-} from "../../wallets/in-app/core/wallet/types.js";
-
-export type {
-  MultiStepAuthArgsType,
-  SingleStepAuthArgsType,
-} from "../../wallets/in-app/core/authentication/types.js";
-
 export { hasStoredPasskey } from "../../wallets/in-app/web/lib/auth/passkeys.js";
-
-export {
-  socialIcons,
-  getSocialIcon,
-} from "../../react/core/utils/walletIcon.js";
diff --git a/packages/thirdweb/src/exports/wallets/private-key.ts b/packages/thirdweb/src/exports/wallets/private-key.ts
index e44137e6f71..ee0184a7636 100644
--- a/packages/thirdweb/src/exports/wallets/private-key.ts
+++ b/packages/thirdweb/src/exports/wallets/private-key.ts
@@ -1,14 +1,14 @@
 export {
-  privateKeyToAccount,
-  /**
-   * @internal
-   * @deprecated - use {@link privateKeyToAccount} instead
-   */
-  privateKeyToAccount as privateKeyAccount,
   type PrivateKeyToAccountOptions,
   /**
    * @internal
    * @deprecated - use {@link PrivateKeyToAccountOptions} instead
    */
   type PrivateKeyToAccountOptions as PrivateKeyAccountOptions,
+  privateKeyToAccount,
+  /**
+   * @internal
+   * @deprecated - use {@link privateKeyToAccount} instead
+   */
+  privateKeyToAccount as privateKeyAccount,
 } from "../../wallets/private-key.js";
diff --git a/packages/thirdweb/src/exports/wallets/smart.ts b/packages/thirdweb/src/exports/wallets/smart.ts
index bd40d44cd14..6d93d84abe5 100644
--- a/packages/thirdweb/src/exports/wallets/smart.ts
+++ b/packages/thirdweb/src/exports/wallets/smart.ts
@@ -1,47 +1,41 @@
-export { smartWallet } from "../../wallets/smart/smart-wallet.js";
-
-export {
-  waitForUserOpReceipt,
-  createUnsignedUserOp,
-  signUserOp,
-  createAndSignUserOp,
-  prepareUserOp,
-  getUserOpHash,
-} from "../../wallets/smart/lib/userop.js";
-
+export { create7702MinimalAccount } from "../../wallets/in-app/core/eip7702/minimal-account.js";
 export {
-  getUserOpReceipt,
-  getUserOpReceiptRaw,
   bundleUserOp,
-  getUserOpGasFees,
   estimateUserOpGas,
   estimateUserOpGasCost,
+  getUserOpGasFees,
+  getUserOpReceipt,
+  getUserOpReceiptRaw,
+  getZkPaymasterData,
 } from "../../wallets/smart/lib/bundler.js";
 
 export {
   predictAddress,
   predictSmartAccountAddress,
 } from "../../wallets/smart/lib/calls.js";
-
+export {
+  DEFAULT_ACCOUNT_FACTORY_V0_6,
+  DEFAULT_ACCOUNT_FACTORY_V0_7,
+  ENTRYPOINT_ADDRESS_v0_6,
+  ENTRYPOINT_ADDRESS_v0_7,
+  TokenPaymaster,
+} from "../../wallets/smart/lib/constants.js";
 export { getPaymasterAndData } from "../../wallets/smart/lib/paymaster.js";
-export { getZkPaymasterData } from "../../wallets/smart/lib/bundler.js";
+export {
+  createAndSignUserOp,
+  createUnsignedUserOp,
+  getUserOpHash,
+  prepareUserOp,
+  signUserOp,
+  waitForUserOpReceipt,
+} from "../../wallets/smart/lib/userop.js";
 
+// all preset configs
+export * as Config from "../../wallets/smart/presets/index.js";
+export { smartWallet } from "../../wallets/smart/smart-wallet.js";
 export type {
+  PaymasterResult,
   SmartWalletConnectionOptions,
   SmartWalletOptions,
   UserOperationV06 as UserOperation,
-  PaymasterResult,
 } from "../../wallets/smart/types.js";
-
-// all preset configs
-export * as Config from "../../wallets/smart/presets/index.js";
-
-export {
-  ENTRYPOINT_ADDRESS_v0_6,
-  ENTRYPOINT_ADDRESS_v0_7,
-  DEFAULT_ACCOUNT_FACTORY_V0_6,
-  DEFAULT_ACCOUNT_FACTORY_V0_7,
-  TokenPaymaster,
-} from "../../wallets/smart/lib/constants.js";
-
-export { create7702MinimalAccount } from "../../wallets/in-app/core/eip7702/minimal-account.js";
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/events/OwnerUpdated.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/events/OwnerUpdated.ts
index f256c499527..0f9bbb7c89a 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/events/OwnerUpdated.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/events/OwnerUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "OwnerUpdated" event.
@@ -40,8 +40,8 @@ export type OwnerUpdatedEventFilters = Partial<{
  */
 export function ownerUpdatedEvent(filters: OwnerUpdatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event OwnerUpdated(address indexed prevOwner, address indexed newOwner)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/eip712Domain.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/eip712Domain.ts
index 0f3e6933df7..896cf83855c 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/eip712Domain.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/eip712Domain.ts
@@ -1,40 +1,39 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x84b0196e" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes1",
     name: "fields",
+    type: "bytes1",
   },
   {
-    type: "string",
     name: "name",
+    type: "string",
   },
   {
-    type: "string",
     name: "version",
+    type: "string",
   },
   {
-    type: "uint256",
     name: "chainId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "verifyingContract",
+    type: "address",
   },
   {
-    type: "bytes32",
     name: "salt",
+    type: "bytes32",
   },
   {
-    type: "uint256[]",
     name: "extensions",
+    type: "uint256[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/isClaimed.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/isClaimed.ts
index 4ead09e35b3..3bd9646dbe2 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/isClaimed.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/isClaimed.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isClaimed" function.
@@ -18,16 +18,16 @@ export type IsClaimedParams = {
 export const FN_SELECTOR = "0xd12acf73" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_receiver",
+    type: "address",
   },
   {
-    type: "address",
     name: "_token",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/owner.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/owner.ts
index eee9df78552..eb5900f0f41 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/owner.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/owner.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x8da5cb5b" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/tokenConditionId.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/tokenConditionId.ts
index fa0dfaf9998..2bd9a328687 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/tokenConditionId.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/tokenConditionId.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokenConditionId" function.
@@ -19,8 +19,8 @@ export type TokenConditionIdParams = {
 export const FN_SELECTOR = "0x3dc28d49" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenAddress",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/tokenMerkleRoot.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/tokenMerkleRoot.ts
index cf0f7ee9db1..770d310d660 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/tokenMerkleRoot.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/read/tokenMerkleRoot.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokenMerkleRoot" function.
@@ -19,8 +19,8 @@ export type TokenMerkleRootParams = {
 export const FN_SELECTOR = "0x95f5c120" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenAddress",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC1155.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC1155.ts
index e7d492f3570..bd6efbf659d 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC1155.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC1155.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC1155" function.
@@ -30,26 +30,26 @@ export type AirdropERC1155Params = WithOverrides<{
 export const FN_SELECTOR = "0x2d89e38b" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_tokenAddress",
+    type: "address",
   },
   {
-    type: "tuple[]",
-    name: "_contents",
     components: [
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amount",
+        type: "uint256",
       },
     ],
+    name: "_contents",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -153,23 +153,23 @@ export function airdropERC1155(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenAddress, resolvedOptions.contents] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenAddress, resolvedOptions.contents] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC1155WithSignature.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC1155WithSignature.ts
index f3dfb2d6509..5a726f92b7e 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC1155WithSignature.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC1155WithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC1155WithSignature" function.
@@ -36,44 +36,44 @@ export type AirdropERC1155WithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0xd0d4afd6" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
       {
-        type: "address",
         name: "tokenAddress",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "expirationTimestamp",
+        type: "uint256",
       },
       {
-        type: "tuple[]",
-        name: "contents",
         components: [
           {
-            type: "address",
             name: "recipient",
+            type: "address",
           },
           {
-            type: "uint256",
             name: "tokenId",
+            type: "uint256",
           },
           {
-            type: "uint256",
             name: "amount",
+            type: "uint256",
           },
         ],
+        name: "contents",
+        type: "tuple[]",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -180,23 +180,23 @@ export function airdropERC1155WithSignature(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.req, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.req, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC20.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC20.ts
index fa9bd57d7f7..941d0cbfc9a 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC20.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC20.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC20" function.
@@ -29,22 +29,22 @@ export type AirdropERC20Params = WithOverrides<{
 export const FN_SELECTOR = "0x56b0b449" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_tokenAddress",
+    type: "address",
   },
   {
-    type: "tuple[]",
-    name: "_contents",
     components: [
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "amount",
+        type: "uint256",
       },
     ],
+    name: "_contents",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -148,23 +148,23 @@ export function airdropERC20(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenAddress, resolvedOptions.contents] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenAddress, resolvedOptions.contents] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC20WithSignature.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC20WithSignature.ts
index 23bf45ea43f..e2c906fb5b6 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC20WithSignature.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC20WithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC20WithSignature" function.
@@ -35,40 +35,40 @@ export type AirdropERC20WithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0xaaba07f6" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
       {
-        type: "address",
         name: "tokenAddress",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "expirationTimestamp",
+        type: "uint256",
       },
       {
-        type: "tuple[]",
-        name: "contents",
         components: [
           {
-            type: "address",
             name: "recipient",
+            type: "address",
           },
           {
-            type: "uint256",
             name: "amount",
+            type: "uint256",
           },
         ],
+        name: "contents",
+        type: "tuple[]",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -175,23 +175,23 @@ export function airdropERC20WithSignature(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.req, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.req, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721.ts
index 0ee231575e2..9645483e334 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC721" function.
@@ -29,22 +29,22 @@ export type AirdropERC721Params = WithOverrides<{
 export const FN_SELECTOR = "0x6d582ebe" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_tokenAddress",
+    type: "address",
   },
   {
-    type: "tuple[]",
-    name: "_contents",
     components: [
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
     ],
+    name: "_contents",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -148,23 +148,23 @@ export function airdropERC721(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenAddress, resolvedOptions.contents] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenAddress, resolvedOptions.contents] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721WithSignature.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721WithSignature.ts
index 303a8d546b6..ac6a84f3ce4 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721WithSignature.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721WithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC721WithSignature" function.
@@ -35,40 +35,40 @@ export type AirdropERC721WithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0xb654a6f3" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
       {
-        type: "address",
         name: "tokenAddress",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "expirationTimestamp",
+        type: "uint256",
       },
       {
-        type: "tuple[]",
-        name: "contents",
         components: [
           {
-            type: "address",
             name: "recipient",
+            type: "address",
           },
           {
-            type: "uint256",
             name: "tokenId",
+            type: "uint256",
           },
         ],
+        name: "contents",
+        type: "tuple[]",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -175,23 +175,23 @@ export function airdropERC721WithSignature(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.req, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.req, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropNativeToken.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropNativeToken.ts
index 0f24fc95697..65534cf1849 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropNativeToken.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/airdropNativeToken.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropNativeToken" function.
@@ -25,18 +25,18 @@ export type AirdropNativeTokenParams = WithOverrides<{
 export const FN_SELECTOR = "0x0d5818f7" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "_contents",
     components: [
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "amount",
+        type: "uint256",
       },
     ],
+    name: "_contents",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -136,23 +136,23 @@ export function airdropNativeToken(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.contents] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.contents] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC1155.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC1155.ts
index 80eb7e26bc7..1ae536a592f 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC1155.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC1155.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claimERC1155" function.
@@ -22,24 +22,24 @@ export type ClaimERC1155Params = WithOverrides<{
 export const FN_SELECTOR = "0xc6fa26ab" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_token",
+    type: "address",
   },
   {
-    type: "address",
     name: "_receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
   {
-    type: "bytes32[]",
     name: "_proofs",
+    type: "bytes32[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -155,8 +155,19 @@ export function claimERC1155(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -168,16 +179,5 @@ export function claimERC1155(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC20.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC20.ts
index ba5895a0c69..a2c0c7bcb5e 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC20.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC20.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claimERC20" function.
@@ -21,20 +21,20 @@ export type ClaimERC20Params = WithOverrides<{
 export const FN_SELECTOR = "0xecf3d3d4" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_token",
+    type: "address",
   },
   {
-    type: "address",
     name: "_receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
   {
-    type: "bytes32[]",
     name: "_proofs",
+    type: "bytes32[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,8 +146,19 @@ export function claimERC20(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -158,16 +169,5 @@ export function claimERC20(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC721.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC721.ts
index c14bfa26737..49d0b1720f8 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC721.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/claimERC721.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claimERC721" function.
@@ -21,20 +21,20 @@ export type ClaimERC721Params = WithOverrides<{
 export const FN_SELECTOR = "0x1290be10" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_token",
+    type: "address",
   },
   {
-    type: "address",
     name: "_receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "bytes32[]",
     name: "_proofs",
+    type: "bytes32[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,8 +146,19 @@ export function claimERC721(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -158,16 +169,5 @@ export function claimERC721(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/initialize.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/initialize.ts
index f835779317c..32cb05823bb 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -21,8 +21,8 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xc4d66de8" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function initialize(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.defaultAdmin] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.defaultAdmin] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/setMerkleRoot.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/setMerkleRoot.ts
index a9efda55328..ade70c41f0c 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/setMerkleRoot.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/setMerkleRoot.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setMerkleRoot" function.
@@ -26,16 +26,16 @@ export type SetMerkleRootParams = WithOverrides<{
 export const FN_SELECTOR = "0x8259a87b" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_token",
+    type: "address",
   },
   {
-    type: "bytes32",
     name: "_tokenMerkleRoot",
+    type: "bytes32",
   },
   {
-    type: "bool",
     name: "_resetClaimStatus",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -143,8 +143,19 @@ export function setMerkleRoot(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -154,16 +165,5 @@ export function setMerkleRoot(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/setOwner.ts b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/setOwner.ts
index b432dc441f4..95f071a6d30 100644
--- a/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/setOwner.ts
+++ b/packages/thirdweb/src/extensions/airdrop/__generated__/Airdrop/write/setOwner.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setOwner" function.
@@ -18,8 +18,8 @@ export type SetOwnerParams = WithOverrides<{
 export const FN_SELECTOR = "0x13af4035" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_newOwner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function setOwner(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newOwner] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newOwner] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/write/airdropERC1155WithSignature.test.ts b/packages/thirdweb/src/extensions/airdrop/write/airdropERC1155WithSignature.test.ts
index e3bc4dab393..4759301ab31 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/airdropERC1155WithSignature.test.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/airdropERC1155WithSignature.test.ts
@@ -8,8 +8,8 @@ import {
   TEST_ACCOUNT_D,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import {
   balanceOf,
@@ -40,8 +40,8 @@ describe
           client: TEST_CLIENT,
           contractId: "Airdrop",
           contractParams: {
-            defaultAdmin: TEST_ACCOUNT_A.address,
             contractURI: "",
+            defaultAdmin: TEST_ACCOUNT_A.address,
           },
         }),
         chain: ANVIL_CHAIN,
@@ -66,52 +66,52 @@ describe
       const mintTransactions = [
         mintTo({
           contract: erc1155TokenContract,
-          to: TEST_ACCOUNT_A.address,
-          supply: 100000n,
           nft: {
             name: "Test 0",
           },
+          supply: 100000n,
+          to: TEST_ACCOUNT_A.address,
         }),
         mintTo({
           contract: erc1155TokenContract,
-          to: TEST_ACCOUNT_A.address,
-          supply: 100000n,
           nft: {
             name: "Test 1",
           },
+          supply: 100000n,
+          to: TEST_ACCOUNT_A.address,
         }),
       ];
 
       for (const tx of mintTransactions) {
         await sendAndConfirmTransaction({
-          transaction: tx,
           account: TEST_ACCOUNT_A,
+          transaction: tx,
         });
       }
 
       const approvalTx = setApprovalForAll({
+        approved: true,
         contract: erc1155TokenContract,
         operator: airdropContract.address,
-        approved: true,
       });
       await sendAndConfirmTransaction({
-        transaction: approvalTx,
         account: TEST_ACCOUNT_A,
+        transaction: approvalTx,
       });
     }, 60000);
 
     it("should send airdrop of ERC1155 tokens with signature", async () => {
       const contents = [
-        { recipient: TEST_ACCOUNT_B.address, tokenId: 0n, amount: 10n },
-        { recipient: TEST_ACCOUNT_C.address, tokenId: 0n, amount: 12n },
-        { recipient: TEST_ACCOUNT_D.address, tokenId: 1n, amount: 5n },
+        { amount: 10n, recipient: TEST_ACCOUNT_B.address, tokenId: 0n },
+        { amount: 12n, recipient: TEST_ACCOUNT_C.address, tokenId: 0n },
+        { amount: 5n, recipient: TEST_ACCOUNT_D.address, tokenId: 1n },
       ];
       const { req, signature } = await generateAirdropSignatureERC1155({
+        account: TEST_ACCOUNT_A,
         airdropRequest: {
-          tokenAddress: erc1155TokenContract.address,
           contents,
+          tokenAddress: erc1155TokenContract.address,
         },
-        account: TEST_ACCOUNT_A,
         contract: airdropContract,
       });
 
@@ -121,8 +121,8 @@ describe
         signature,
       });
       const { transactionHash } = await sendAndConfirmTransaction({
-        transaction,
         account: TEST_ACCOUNT_A,
+        transaction,
       });
 
       const balanceB = await balanceOf({
diff --git a/packages/thirdweb/src/extensions/airdrop/write/airdropERC1155WithSignature.ts b/packages/thirdweb/src/extensions/airdrop/write/airdropERC1155WithSignature.ts
index ea3507ca3ba..6c215860a61 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/airdropERC1155WithSignature.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/airdropERC1155WithSignature.ts
@@ -80,22 +80,22 @@ export async function generateAirdropSignatureERC1155(
   const endTime = airdropRequest.expirationTimestamp || tenYearsFromNow();
 
   const req: ReqType = {
-    uid,
-    tokenAddress,
-    expirationTimestamp: dateToSeconds(endTime),
     contents,
+    expirationTimestamp: dateToSeconds(endTime),
+    tokenAddress,
+    uid,
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: "Airdrop",
-      version: "1",
       chainId: contract.chain.id,
+      name: "Airdrop",
       verifyingContract: contract.address as Hex,
+      version: "1",
     },
-    types: { AirdropRequestERC1155, AirdropContentERC1155 },
-    primaryType: "AirdropRequestERC1155",
     message: req,
+    primaryType: "AirdropRequestERC1155",
+    types: { AirdropContentERC1155, AirdropRequestERC1155 },
   });
   return { req, signature };
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/write/airdropERC20WithSignature.test.ts b/packages/thirdweb/src/extensions/airdrop/write/airdropERC20WithSignature.test.ts
index 4ec55c54880..9eedd4e3f88 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/airdropERC20WithSignature.test.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/airdropERC20WithSignature.test.ts
@@ -8,8 +8,8 @@ import {
   TEST_ACCOUNT_D,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { getBalance } from "../../erc20/read/getBalance.js";
@@ -38,8 +38,8 @@ describe
           client: TEST_CLIENT,
           contractId: "Airdrop",
           contractParams: {
-            defaultAdmin: TEST_ACCOUNT_A.address,
             contractURI: "",
+            defaultAdmin: TEST_ACCOUNT_A.address,
           },
         }),
         chain: ANVIL_CHAIN,
@@ -61,38 +61,38 @@ describe
       });
 
       const mintTx = mintTo({
+        amountWei: 1000n,
         contract: erc20TokenContract,
         to: TEST_ACCOUNT_A.address,
-        amountWei: 1000n,
       });
       await sendAndConfirmTransaction({
-        transaction: mintTx,
         account: TEST_ACCOUNT_A,
+        transaction: mintTx,
       });
 
       const approvalTx = approve({
+        amountWei: 1000n,
         contract: erc20TokenContract,
         spender: airdropContract.address,
-        amountWei: 1000n,
       });
       await sendAndConfirmTransaction({
-        transaction: approvalTx,
         account: TEST_ACCOUNT_A,
+        transaction: approvalTx,
       });
     }, 60000);
 
     it("should send airdrop of ERC20 tokens with signature", async () => {
       const contents = [
-        { recipient: TEST_ACCOUNT_B.address, amount: 10n },
-        { recipient: TEST_ACCOUNT_C.address, amount: 15n },
-        { recipient: TEST_ACCOUNT_D.address, amount: 20n },
+        { amount: 10n, recipient: TEST_ACCOUNT_B.address },
+        { amount: 15n, recipient: TEST_ACCOUNT_C.address },
+        { amount: 20n, recipient: TEST_ACCOUNT_D.address },
       ];
       const { req, signature } = await generateAirdropSignatureERC20({
+        account: TEST_ACCOUNT_A,
         airdropRequest: {
-          tokenAddress: erc20TokenContract.address,
           contents,
+          tokenAddress: erc20TokenContract.address,
         },
-        account: TEST_ACCOUNT_A,
         contract: airdropContract,
       });
 
@@ -102,36 +102,36 @@ describe
         signature,
       });
       const { transactionHash } = await sendAndConfirmTransaction({
-        transaction,
         account: TEST_ACCOUNT_A,
+        transaction,
       });
 
       const balanceB = (
         await getBalance({
-          contract: erc20TokenContract,
           address: TEST_ACCOUNT_B.address,
+          contract: erc20TokenContract,
         })
       ).value;
 
       const balanceC = (
         await getBalance({
-          contract: erc20TokenContract,
           address: TEST_ACCOUNT_C.address,
+          contract: erc20TokenContract,
         })
       ).value;
 
       const balanceD = (
         await getBalance({
-          contract: erc20TokenContract,
           address: TEST_ACCOUNT_D.address,
+          contract: erc20TokenContract,
         })
       ).value;
 
       // admin balance
       const balanceA = (
         await getBalance({
-          contract: erc20TokenContract,
           address: TEST_ACCOUNT_A.address,
+          contract: erc20TokenContract,
         })
       ).value;
 
diff --git a/packages/thirdweb/src/extensions/airdrop/write/airdropERC20WithSignature.ts b/packages/thirdweb/src/extensions/airdrop/write/airdropERC20WithSignature.ts
index f6b9b8ebb2d..6e597639bf8 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/airdropERC20WithSignature.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/airdropERC20WithSignature.ts
@@ -81,22 +81,22 @@ export async function generateAirdropSignatureERC20(
   const endTime = airdropRequest.expirationTimestamp || tenYearsFromNow();
 
   const req: ReqType = {
-    uid,
-    tokenAddress,
-    expirationTimestamp: dateToSeconds(endTime),
     contents,
+    expirationTimestamp: dateToSeconds(endTime),
+    tokenAddress,
+    uid,
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: "Airdrop",
-      version: "1",
       chainId: contract.chain.id,
+      name: "Airdrop",
       verifyingContract: contract.address as Hex,
+      version: "1",
     },
-    types: { AirdropRequestERC20, AirdropContentERC20 },
-    primaryType: "AirdropRequestERC20",
     message: req,
+    primaryType: "AirdropRequestERC20",
+    types: { AirdropContentERC20, AirdropRequestERC20 },
   });
   return { req, signature };
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/write/airdropERC721WithSignature.test.ts b/packages/thirdweb/src/extensions/airdrop/write/airdropERC721WithSignature.test.ts
index 184970fb093..c4add6c8105 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/airdropERC721WithSignature.test.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/airdropERC721WithSignature.test.ts
@@ -8,8 +8,8 @@ import {
   TEST_ACCOUNT_D,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import {
   ownerOf,
@@ -40,8 +40,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           client: TEST_CLIENT,
           contractId: "Airdrop",
           contractParams: {
-            defaultAdmin: TEST_ACCOUNT_A.address,
             contractURI: "",
+            defaultAdmin: TEST_ACCOUNT_A.address,
           },
         }),
         chain: ANVIL_CHAIN,
@@ -66,49 +66,49 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       const mintTransactions = [
         mintTo({
           contract: erc721TokenContract,
-          to: TEST_ACCOUNT_A.address,
           nft: {
             name: "Test 0",
           },
+          to: TEST_ACCOUNT_A.address,
         }),
         mintTo({
           contract: erc721TokenContract,
-          to: TEST_ACCOUNT_A.address,
           nft: {
             name: "Test 1",
           },
+          to: TEST_ACCOUNT_A.address,
         }),
         mintTo({
           contract: erc721TokenContract,
-          to: TEST_ACCOUNT_A.address,
           nft: {
             name: "Test 2",
           },
+          to: TEST_ACCOUNT_A.address,
         }),
         mintTo({
           contract: erc721TokenContract,
-          to: TEST_ACCOUNT_A.address,
           nft: {
             name: "Test 3",
           },
+          to: TEST_ACCOUNT_A.address,
         }),
       ];
 
       for (const tx of mintTransactions) {
         await sendAndConfirmTransaction({
-          transaction: tx,
           account: TEST_ACCOUNT_A,
+          transaction: tx,
         });
       }
 
       const approvalTx = setApprovalForAll({
+        approved: true,
         contract: erc721TokenContract,
         operator: airdropContract.address,
-        approved: true,
       });
       await sendAndConfirmTransaction({
-        transaction: approvalTx,
         account: TEST_ACCOUNT_A,
+        transaction: approvalTx,
       });
     }, 60000);
 
@@ -119,11 +119,11 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         { recipient: TEST_ACCOUNT_D.address, tokenId: 2n },
       ];
       const { req, signature } = await generateAirdropSignatureERC721({
+        account: TEST_ACCOUNT_A,
         airdropRequest: {
-          tokenAddress: erc721TokenContract.address,
           contents,
+          tokenAddress: erc721TokenContract.address,
         },
-        account: TEST_ACCOUNT_A,
         contract: airdropContract,
       });
 
@@ -133,8 +133,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         signature,
       });
       const { transactionHash } = await sendAndConfirmTransaction({
-        transaction,
         account: TEST_ACCOUNT_A,
+        transaction,
       });
 
       const ownerZero = await ownerOf({
diff --git a/packages/thirdweb/src/extensions/airdrop/write/airdropERC721WithSignature.ts b/packages/thirdweb/src/extensions/airdrop/write/airdropERC721WithSignature.ts
index 6a28cf2644e..65b1d5c4a5f 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/airdropERC721WithSignature.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/airdropERC721WithSignature.ts
@@ -80,22 +80,22 @@ export async function generateAirdropSignatureERC721(
   const endTime = airdropRequest.expirationTimestamp || tenYearsFromNow();
 
   const req: ReqType = {
-    uid,
-    tokenAddress,
-    expirationTimestamp: dateToSeconds(endTime),
     contents,
+    expirationTimestamp: dateToSeconds(endTime),
+    tokenAddress,
+    uid,
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: "Airdrop",
-      version: "1",
       chainId: contract.chain.id,
+      name: "Airdrop",
       verifyingContract: contract.address as Hex,
+      version: "1",
     },
-    types: { AirdropRequestERC721, AirdropContentERC721 },
-    primaryType: "AirdropRequestERC721",
     message: req,
+    primaryType: "AirdropRequestERC721",
+    types: { AirdropContentERC721, AirdropRequestERC721 },
   });
   return { req, signature };
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/write/claimERC1155.test.ts b/packages/thirdweb/src/extensions/airdrop/write/claimERC1155.test.ts
index bbc1f12221a..39691a96a57 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/claimERC1155.test.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/claimERC1155.test.ts
@@ -8,8 +8,8 @@ import {
   TEST_ACCOUNT_D,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import {
   balanceOf,
@@ -37,11 +37,11 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC1155", () => {
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
         contractId: "Airdrop",
-        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
         contractParams: {
-          defaultAdmin: TEST_ACCOUNT_A.address,
           contractURI: "",
+          defaultAdmin: TEST_ACCOUNT_A.address,
         },
+        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
       }),
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
@@ -65,81 +65,81 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC1155", () => {
     const mintTransactions = [
       mintTo({
         contract: erc1155TokenContract,
-        to: TEST_ACCOUNT_A.address,
-        supply: 100000n,
         nft: {
           name: "Test 0",
         },
+        supply: 100000n,
+        to: TEST_ACCOUNT_A.address,
       }),
       mintTo({
         contract: erc1155TokenContract,
-        to: TEST_ACCOUNT_A.address,
-        supply: 100000n,
         nft: {
           name: "Test 1",
         },
+        supply: 100000n,
+        to: TEST_ACCOUNT_A.address,
       }),
     ];
 
     for (const tx of mintTransactions) {
       await sendAndConfirmTransaction({
-        transaction: tx,
         account: TEST_ACCOUNT_A,
+        transaction: tx,
       });
     }
 
     const approvalTx = setApprovalForAll({
+      approved: true,
       contract: erc1155TokenContract,
       operator: airdropContract.address,
-      approved: true,
     });
     await sendAndConfirmTransaction({
-      transaction: approvalTx,
       account: TEST_ACCOUNT_A,
+      transaction: approvalTx,
     });
   }, 60000);
 
   it("should send ERC1155 tokens to allowlisted claimer", async () => {
     const snapshot = [
-      { recipient: TEST_ACCOUNT_B.address, tokenId: 0, amount: 10 },
-      { recipient: TEST_ACCOUNT_C.address, tokenId: 0, amount: 12 },
-      { recipient: TEST_ACCOUNT_D.address, tokenId: 1, amount: 5 },
+      { amount: 10, recipient: TEST_ACCOUNT_B.address, tokenId: 0 },
+      { amount: 12, recipient: TEST_ACCOUNT_C.address, tokenId: 0 },
+      { amount: 5, recipient: TEST_ACCOUNT_D.address, tokenId: 1 },
     ];
 
     const { merkleRoot, snapshotUri } = await generateMerkleTreeInfoERC1155({
+      contract: airdropContract,
       snapshot,
       tokenAddress: erc1155TokenContract.address,
-      contract: airdropContract,
     });
     const saveSnapshotTransaction = saveSnapshot({
+      contract: airdropContract,
       merkleRoot,
       snapshotUri,
-      contract: airdropContract,
     });
     await sendAndConfirmTransaction({
-      transaction: saveSnapshotTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: saveSnapshotTransaction,
     });
 
     const setMerkleRootTransaction = setMerkleRoot({
+      contract: airdropContract,
+      resetClaimStatus: true,
       token: erc1155TokenContract.address,
       tokenMerkleRoot: merkleRoot as `0x${string}`,
-      resetClaimStatus: true,
-      contract: airdropContract,
     });
     await sendAndConfirmTransaction({
-      transaction: setMerkleRootTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: setMerkleRootTransaction,
     });
 
     const claimTransaction = claimERC1155({
-      tokenAddress: erc1155TokenContract.address,
-      recipient: TEST_ACCOUNT_B.address,
       contract: airdropContract,
+      recipient: TEST_ACCOUNT_B.address,
+      tokenAddress: erc1155TokenContract.address,
     });
     const { transactionHash } = await sendAndConfirmTransaction({
-      transaction: claimTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: claimTransaction,
     });
 
     const balanceB = await balanceOf({
diff --git a/packages/thirdweb/src/extensions/airdrop/write/claimERC1155.ts b/packages/thirdweb/src/extensions/airdrop/write/claimERC1155.ts
index d3b0425ce13..f73dd1a5cca 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/claimERC1155.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/claimERC1155.ts
@@ -39,7 +39,6 @@ export function claimERC1155(
   options: BaseTransactionOptions<ClaimERC1155Params>,
 ) {
   return generatedClaimERC1155({
-    contract: options.contract,
     asyncParams: async () => {
       const merkleRoot = await tokenMerkleRoot({
         contract: options.contract,
@@ -50,8 +49,8 @@ export function claimERC1155(
 
       const merkleProof = await fetchProofsERC1155({
         contract: options.contract,
-        recipient: options.recipient,
         merkleRoot,
+        recipient: options.recipient,
       });
 
       if (!merkleProof) {
@@ -59,12 +58,13 @@ export function claimERC1155(
       }
 
       return {
-        token: tokenAddress as Address,
+        proofs: merkleProof.proof,
+        quantity: merkleProof.quantity,
         receiver: merkleProof.recipient as Address,
+        token: tokenAddress as Address,
         tokenId: merkleProof.tokenId,
-        quantity: merkleProof.quantity,
-        proofs: merkleProof.proof,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/write/claimERC20.test.ts b/packages/thirdweb/src/extensions/airdrop/write/claimERC20.test.ts
index bd42b761bdd..0a4489fe5bb 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/claimERC20.test.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/claimERC20.test.ts
@@ -8,8 +8,8 @@ import {
   TEST_ACCOUNT_D,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { getBalance } from "../../erc20/read/getBalance.js";
@@ -35,11 +35,11 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC20", () => {
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
         contractId: "Airdrop",
-        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
         contractParams: {
-          defaultAdmin: TEST_ACCOUNT_A.address,
           contractURI: "",
+          defaultAdmin: TEST_ACCOUNT_A.address,
         },
+        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
       }),
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
@@ -60,73 +60,73 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC20", () => {
     });
 
     const mintTx = mintTo({
+      amount: 1000,
       contract: erc20TokenContract,
       to: TEST_ACCOUNT_A.address,
-      amount: 1000,
     });
     await sendAndConfirmTransaction({
-      transaction: mintTx,
       account: TEST_ACCOUNT_A,
+      transaction: mintTx,
     });
 
     const approvalTx = approve({
+      amount: 1000,
       contract: erc20TokenContract,
       spender: airdropContract.address,
-      amount: 1000,
     });
     await sendAndConfirmTransaction({
-      transaction: approvalTx,
       account: TEST_ACCOUNT_A,
+      transaction: approvalTx,
     });
   }, 60000);
 
   it("should send ERC20 tokens to allowlisted claimer", async () => {
     const snapshot = [
-      { recipient: TEST_ACCOUNT_B.address, amount: 10 },
-      { recipient: TEST_ACCOUNT_C.address, amount: 15 },
-      { recipient: TEST_ACCOUNT_D.address, amount: 20 },
+      { amount: 10, recipient: TEST_ACCOUNT_B.address },
+      { amount: 15, recipient: TEST_ACCOUNT_C.address },
+      { amount: 20, recipient: TEST_ACCOUNT_D.address },
     ];
     const { merkleRoot, snapshotUri } = await generateMerkleTreeInfoERC20({
+      contract: airdropContract,
       snapshot,
       tokenAddress: erc20TokenContract.address,
-      contract: airdropContract,
     });
 
     const saveSnapshotTransaction = saveSnapshot({
+      contract: airdropContract,
       merkleRoot,
       snapshotUri,
-      contract: airdropContract,
     });
     await sendAndConfirmTransaction({
-      transaction: saveSnapshotTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: saveSnapshotTransaction,
     });
 
     const setMerkleRootTransaction = setMerkleRoot({
+      contract: airdropContract,
+      resetClaimStatus: true,
       token: erc20TokenContract.address,
       tokenMerkleRoot: merkleRoot as `0x${string}`,
-      resetClaimStatus: true,
-      contract: airdropContract,
     });
     await sendAndConfirmTransaction({
-      transaction: setMerkleRootTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: setMerkleRootTransaction,
     });
 
     const claimTransaction = claimERC20({
-      tokenAddress: erc20TokenContract.address,
-      recipient: TEST_ACCOUNT_B.address,
       contract: airdropContract,
+      recipient: TEST_ACCOUNT_B.address,
+      tokenAddress: erc20TokenContract.address,
     });
     const { transactionHash } = await sendAndConfirmTransaction({
-      transaction: claimTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: claimTransaction,
     });
 
     const balanceB = (
       await getBalance({
-        contract: erc20TokenContract,
         address: TEST_ACCOUNT_B.address,
+        contract: erc20TokenContract,
       })
     ).value;
 
diff --git a/packages/thirdweb/src/extensions/airdrop/write/claimERC20.ts b/packages/thirdweb/src/extensions/airdrop/write/claimERC20.ts
index b142372b62b..d723b9a3428 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/claimERC20.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/claimERC20.ts
@@ -1,6 +1,6 @@
 import {
-  ZERO_ADDRESS,
   isNativeTokenAddress,
+  ZERO_ADDRESS,
 } from "../../../constants/addresses.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import type { Address } from "../../../utils/address.js";
@@ -41,7 +41,6 @@ export type ClaimERC20Params = {
  */
 export function claimERC20(options: BaseTransactionOptions<ClaimERC20Params>) {
   return generatedClaimERC20({
-    contract: options.contract,
     asyncParams: async () => {
       const merkleRoot = await tokenMerkleRoot({
         contract: options.contract,
@@ -72,8 +71,8 @@ export function claimERC20(options: BaseTransactionOptions<ClaimERC20Params>) {
 
       const merkleProof = await fetchProofsERC20({
         contract: options.contract,
-        recipient: options.recipient,
         merkleRoot,
+        recipient: options.recipient,
         tokenDecimals,
       });
 
@@ -82,11 +81,12 @@ export function claimERC20(options: BaseTransactionOptions<ClaimERC20Params>) {
       }
 
       return {
-        token: tokenAddress as Address,
-        receiver: merkleProof.recipient as Address,
-        quantity: merkleProof.quantity,
         proofs: merkleProof.proof,
+        quantity: merkleProof.quantity,
+        receiver: merkleProof.recipient as Address,
+        token: tokenAddress as Address,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/write/claimERC721.test.ts b/packages/thirdweb/src/extensions/airdrop/write/claimERC721.test.ts
index 8e9d11b212c..f059f69c9a1 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/claimERC721.test.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/claimERC721.test.ts
@@ -8,8 +8,8 @@ import {
   TEST_ACCOUNT_D,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import {
   ownerOf,
@@ -37,11 +37,11 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC721", () => {
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
         contractId: "Airdrop",
-        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
         contractParams: {
-          defaultAdmin: TEST_ACCOUNT_A.address,
           contractURI: "",
+          defaultAdmin: TEST_ACCOUNT_A.address,
         },
+        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
       }),
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
@@ -65,49 +65,49 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC721", () => {
     const mintTransactions = [
       mintTo({
         contract: erc721TokenContract,
-        to: TEST_ACCOUNT_A.address,
         nft: {
           name: "Test 0",
         },
+        to: TEST_ACCOUNT_A.address,
       }),
       mintTo({
         contract: erc721TokenContract,
-        to: TEST_ACCOUNT_A.address,
         nft: {
           name: "Test 1",
         },
+        to: TEST_ACCOUNT_A.address,
       }),
       mintTo({
         contract: erc721TokenContract,
-        to: TEST_ACCOUNT_A.address,
         nft: {
           name: "Test 2",
         },
+        to: TEST_ACCOUNT_A.address,
       }),
       mintTo({
         contract: erc721TokenContract,
-        to: TEST_ACCOUNT_A.address,
         nft: {
           name: "Test 3",
         },
+        to: TEST_ACCOUNT_A.address,
       }),
     ];
 
     for (const tx of mintTransactions) {
       await sendAndConfirmTransaction({
-        transaction: tx,
         account: TEST_ACCOUNT_A,
+        transaction: tx,
       });
     }
 
     const approvalTx = setApprovalForAll({
+      approved: true,
       contract: erc721TokenContract,
       operator: airdropContract.address,
-      approved: true,
     });
     await sendAndConfirmTransaction({
-      transaction: approvalTx,
       account: TEST_ACCOUNT_A,
+      transaction: approvalTx,
     });
   }, 60000);
 
@@ -119,39 +119,39 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC721", () => {
     ];
 
     const { merkleRoot, snapshotUri } = await generateMerkleTreeInfoERC721({
+      contract: airdropContract,
       snapshot,
       tokenAddress: erc721TokenContract.address,
-      contract: airdropContract,
     });
     const saveSnapshotTransaction = saveSnapshot({
+      contract: airdropContract,
       merkleRoot,
       snapshotUri,
-      contract: airdropContract,
     });
     await sendAndConfirmTransaction({
-      transaction: saveSnapshotTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: saveSnapshotTransaction,
     });
 
     const setMerkleRootTransaction = setMerkleRoot({
+      contract: airdropContract,
+      resetClaimStatus: true,
       token: erc721TokenContract.address,
       tokenMerkleRoot: merkleRoot as `0x${string}`,
-      resetClaimStatus: true,
-      contract: airdropContract,
     });
     await sendAndConfirmTransaction({
-      transaction: setMerkleRootTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: setMerkleRootTransaction,
     });
 
     const claimTransaction = claimERC721({
-      tokenAddress: erc721TokenContract.address,
-      recipient: TEST_ACCOUNT_B.address,
       contract: airdropContract,
+      recipient: TEST_ACCOUNT_B.address,
+      tokenAddress: erc721TokenContract.address,
     });
     const { transactionHash } = await sendAndConfirmTransaction({
-      transaction: claimTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: claimTransaction,
     });
 
     const ownerZero = await ownerOf({
diff --git a/packages/thirdweb/src/extensions/airdrop/write/claimERC721.ts b/packages/thirdweb/src/extensions/airdrop/write/claimERC721.ts
index 95215740b4c..49ce989635f 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/claimERC721.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/claimERC721.ts
@@ -39,7 +39,6 @@ export function claimERC721(
   options: BaseTransactionOptions<ClaimERC721Params>,
 ) {
   return generatedClaimERC721({
-    contract: options.contract,
     asyncParams: async () => {
       const merkleRoot = await tokenMerkleRoot({
         contract: options.contract,
@@ -50,8 +49,8 @@ export function claimERC721(
 
       const merkleProof = await fetchProofsERC721({
         contract: options.contract,
-        recipient: options.recipient,
         merkleRoot,
+        recipient: options.recipient,
       });
 
       if (!merkleProof) {
@@ -59,11 +58,12 @@ export function claimERC721(
       }
 
       return {
-        token: tokenAddress as Address,
+        proofs: merkleProof.proof,
         receiver: merkleProof.recipient as Address,
+        token: tokenAddress as Address,
         tokenId: merkleProof.tokenId,
-        proofs: merkleProof.proof,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC1155.ts b/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC1155.ts
index 13fdbd2c0ee..84a5f37d0d1 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC1155.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC1155.ts
@@ -47,8 +47,8 @@ export async function generateMerkleTreeInfoERC1155(
 
   // generate merkle tree from snapshot
   const { shardedMerkleInfo, uri } = await processSnapshotERC1155({
-    snapshot,
     client: contract.client,
+    snapshot,
   });
   return {
     merkleRoot: shardedMerkleInfo.merkleRoot,
diff --git a/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC20.ts b/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC20.ts
index 065ac5cef52..a367ef4c042 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC20.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC20.ts
@@ -1,6 +1,6 @@
 import {
-  ZERO_ADDRESS,
   isNativeTokenAddress,
+  ZERO_ADDRESS,
 } from "../../../constants/addresses.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { processSnapshotERC20 } from "../../../utils/extensions/airdrop/process-snapshot-erc20.js";
@@ -69,8 +69,8 @@ export async function generateMerkleTreeInfoERC20(
 
   // generate merkle tree from snapshot
   const { shardedMerkleInfo, uri } = await processSnapshotERC20({
-    snapshot,
     client: contract.client,
+    snapshot,
     tokenDecimals,
   });
   return {
diff --git a/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC721.ts b/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC721.ts
index 043e1e3278a..31cb37d674e 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC721.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/merkleInfoERC721.ts
@@ -47,8 +47,8 @@ export async function generateMerkleTreeInfoERC721(
 
   // generate merkle tree from snapshot
   const { shardedMerkleInfo, uri } = await processSnapshotERC721({
-    snapshot,
     client: contract.client,
+    snapshot,
   });
   return {
     merkleRoot: shardedMerkleInfo.merkleRoot,
diff --git a/packages/thirdweb/src/extensions/airdrop/write/saveSnapshot.ts b/packages/thirdweb/src/extensions/airdrop/write/saveSnapshot.ts
index ccef939c451..d97dcfcb226 100644
--- a/packages/thirdweb/src/extensions/airdrop/write/saveSnapshot.ts
+++ b/packages/thirdweb/src/extensions/airdrop/write/saveSnapshot.ts
@@ -59,7 +59,6 @@ export function saveSnapshot(
   options: BaseTransactionOptions<SaveSnapshotParams>,
 ) {
   return setContractURI({
-    contract: options.contract,
     asyncParams: async () => {
       const merkleInfos: Record<string, string> = {};
       // need to upload merkle tree info to the contract metadata
@@ -100,5 +99,6 @@ export function saveSnapshot(
         uri,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IClaimConditionsSinglePhase/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/common/__generated__/IClaimConditionsSinglePhase/write/setClaimConditions.ts
index 56c279e35ce..de478f3c8be 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IClaimConditionsSinglePhase/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IClaimConditionsSinglePhase/write/setClaimConditions.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimConditions" function.
@@ -35,46 +35,46 @@ export type SetClaimConditionsParams = WithOverrides<{
 export const FN_SELECTOR = "0x426cfaf3" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "phase",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "phase",
+    type: "tuple",
   },
   {
-    type: "bool",
     name: "resetClaimEligibility",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -180,8 +180,19 @@ export function setClaimConditions(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -190,16 +201,5 @@ export function setClaimConditions(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/contractURI.ts b/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/contractURI.ts
index 2ea7753de27..d50373e8312 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/contractURI.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/contractURI.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe8a3d485" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/name.ts b/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/name.ts
index 3ffea0690fc..1b93894ecfe 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/name.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/name.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x06fdde03" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/symbol.ts b/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/symbol.ts
index bb275da2f18..3ded3f5529b 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/symbol.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/read/symbol.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x95d89b41" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/write/setContractURI.ts b/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/write/setContractURI.ts
index da4fc19dbd4..b2bda000fe3 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/write/setContractURI.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IContractMetadata/write/setContractURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setContractURI" function.
@@ -18,8 +18,8 @@ export type SetContractURIParams = WithOverrides<{
 export const FN_SELECTOR = "0x938e3d7b" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function setContractURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IMulticall/write/multicall.ts b/packages/thirdweb/src/extensions/common/__generated__/IMulticall/write/multicall.ts
index 191addedb4a..74199738d5d 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IMulticall/write/multicall.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IMulticall/write/multicall.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "multicall" function.
@@ -18,14 +18,14 @@ export type MulticallParams = WithOverrides<{
 export const FN_SELECTOR = "0xac9650d8" as const;
 const FN_INPUTS = [
   {
-    type: "bytes[]",
     name: "data",
+    type: "bytes[]",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes[]",
     name: "results",
+    type: "bytes[]",
   },
 ] as const;
 
@@ -122,23 +122,23 @@ export function multicall(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.data] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.data] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IOwnable/events/OwnerUpdated.ts b/packages/thirdweb/src/extensions/common/__generated__/IOwnable/events/OwnerUpdated.ts
index b4114846977..dcbeaf28259 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IOwnable/events/OwnerUpdated.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IOwnable/events/OwnerUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "OwnerUpdated" event.
@@ -40,8 +40,8 @@ export type OwnerUpdatedEventFilters = Partial<{
  */
 export function ownerUpdatedEvent(filters: OwnerUpdatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event OwnerUpdated(address indexed prevOwner, address indexed newOwner)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IOwnable/read/owner.ts b/packages/thirdweb/src/extensions/common/__generated__/IOwnable/read/owner.ts
index 91c7d953571..e7d18e25f94 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IOwnable/read/owner.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IOwnable/read/owner.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x8da5cb5b" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IOwnable/write/setOwner.ts b/packages/thirdweb/src/extensions/common/__generated__/IOwnable/write/setOwner.ts
index ccd898be5ea..c6f3df7afa6 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IOwnable/write/setOwner.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IOwnable/write/setOwner.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setOwner" function.
@@ -18,8 +18,8 @@ export type SetOwnerParams = WithOverrides<{
 export const FN_SELECTOR = "0x13af4035" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_newOwner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function setOwner(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newOwner] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newOwner] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/events/PlatformFeeInfoUpdated.ts b/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/events/PlatformFeeInfoUpdated.ts
index 2db6b4f4412..f0d95180ea3 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/events/PlatformFeeInfoUpdated.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/events/PlatformFeeInfoUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PlatformFeeInfoUpdated" event.
@@ -36,8 +36,8 @@ export function platformFeeInfoUpdatedEvent(
   filters: PlatformFeeInfoUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event PlatformFeeInfoUpdated(address indexed platformFeeRecipient, uint256 platformFeeBps)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/read/getPlatformFeeInfo.ts b/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/read/getPlatformFeeInfo.ts
index 8a762797f05..8ea7d761d26 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/read/getPlatformFeeInfo.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/read/getPlatformFeeInfo.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xd45573f6" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/write/setPlatformFeeInfo.ts b/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/write/setPlatformFeeInfo.ts
index 4dd68636156..8de7bf51263 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/write/setPlatformFeeInfo.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IPlatformFee/write/setPlatformFeeInfo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setPlatformFeeInfo" function.
@@ -25,12 +25,12 @@ export type SetPlatformFeeInfoParams = WithOverrides<{
 export const FN_SELECTOR = "0x1e7ac488" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_platformFeeBps",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -136,8 +136,19 @@ export function setPlatformFeeInfo(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function setPlatformFeeInfo(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/events/PrimarySaleRecipientUpdated.ts b/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/events/PrimarySaleRecipientUpdated.ts
index 435c2f003e0..e247a3f1119 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/events/PrimarySaleRecipientUpdated.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/events/PrimarySaleRecipientUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PrimarySaleRecipientUpdated" event.
@@ -36,7 +36,7 @@ export function primarySaleRecipientUpdatedEvent(
   filters: PrimarySaleRecipientUpdatedEventFilters = {},
 ) {
   return prepareEvent({
-    signature: "event PrimarySaleRecipientUpdated(address indexed recipient)",
     filters,
+    signature: "event PrimarySaleRecipientUpdated(address indexed recipient)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/read/primarySaleRecipient.ts b/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/read/primarySaleRecipient.ts
index d5bc32a66fd..56a38752334 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/read/primarySaleRecipient.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/read/primarySaleRecipient.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x079fe40e" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/write/setPrimarySaleRecipient.ts b/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/write/setPrimarySaleRecipient.ts
index 1700a8c5103..b80fe119c12 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/write/setPrimarySaleRecipient.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IPrimarySale/write/setPrimarySaleRecipient.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setPrimarySaleRecipient" function.
@@ -21,8 +21,8 @@ export type SetPrimarySaleRecipientParams = WithOverrides<{
 export const FN_SELECTOR = "0x6f4f2837" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_saleRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -126,23 +126,23 @@ export function setPrimarySaleRecipient(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.saleRecipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.saleRecipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/events/DefaultRoyalty.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/events/DefaultRoyalty.ts
index bda5d833de1..e99421c5576 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/events/DefaultRoyalty.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/events/DefaultRoyalty.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "DefaultRoyalty" event.
@@ -34,8 +34,8 @@ export type DefaultRoyaltyEventFilters = Partial<{
  */
 export function defaultRoyaltyEvent(filters: DefaultRoyaltyEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event DefaultRoyalty(address indexed newRoyaltyRecipient, uint256 newRoyaltyBps)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/events/RoyaltyForToken.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/events/RoyaltyForToken.ts
index 4dea19eac28..435be15ef77 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/events/RoyaltyForToken.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/events/RoyaltyForToken.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RoyaltyForToken" event.
@@ -42,8 +42,8 @@ export function royaltyForTokenEvent(
   filters: RoyaltyForTokenEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event RoyaltyForToken(uint256 indexed tokenId, address indexed royaltyRecipient, uint256 royaltyBps)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/getDefaultRoyaltyInfo.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/getDefaultRoyaltyInfo.ts
index 35b885df948..586f785dd19 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/getDefaultRoyaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/getDefaultRoyaltyInfo.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xb24f2d39" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/getRoyaltyInfoForToken.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/getRoyaltyInfoForToken.ts
index df38082ccab..fd5e7a63dd9 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/getRoyaltyInfoForToken.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/getRoyaltyInfoForToken.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getRoyaltyInfoForToken" function.
@@ -16,8 +16,8 @@ export type GetRoyaltyInfoForTokenParams = {
 export const FN_SELECTOR = "0x4cc157df" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/royaltyInfo.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/royaltyInfo.ts
index 9b63a90861b..d697e3822da 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/royaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/royaltyInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "royaltyInfo" function.
@@ -20,22 +20,22 @@ export type RoyaltyInfoParams = {
 export const FN_SELECTOR = "0x2a55205a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "salePrice",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "royaltyAmount",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/supportsInterface.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/supportsInterface.ts
index 2ac55df9cbf..f24fc2d98c7 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceId",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/write/setDefaultRoyaltyInfo.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/write/setDefaultRoyaltyInfo.ts
index d50f9564b26..560af965e80 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/write/setDefaultRoyaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/write/setDefaultRoyaltyInfo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setDefaultRoyaltyInfo" function.
@@ -25,12 +25,12 @@ export type SetDefaultRoyaltyInfoParams = WithOverrides<{
 export const FN_SELECTOR = "0x600dd5ea" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_royaltyBps",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -138,8 +138,19 @@ export function setDefaultRoyaltyInfo(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -148,16 +159,5 @@ export function setDefaultRoyaltyInfo(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/write/setRoyaltyInfoForToken.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/write/setRoyaltyInfoForToken.ts
index 7ea6f0a96e3..a429c655018 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/write/setRoyaltyInfoForToken.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyalty/write/setRoyaltyInfoForToken.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setRoyaltyInfoForToken" function.
@@ -23,16 +23,16 @@ export type SetRoyaltyInfoForTokenParams = WithOverrides<{
 export const FN_SELECTOR = "0x9bcf7a15" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "recipient",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "bps",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,8 +146,19 @@ export function setRoyaltyInfoForToken(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -157,16 +168,5 @@ export function setRoyaltyInfoForToken(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/events/RoyaltyEngineUpdated.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/events/RoyaltyEngineUpdated.ts
index 4de63a5df08..9c938a8bc7c 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/events/RoyaltyEngineUpdated.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/events/RoyaltyEngineUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RoyaltyEngineUpdated" event.
@@ -42,8 +42,8 @@ export function royaltyEngineUpdatedEvent(
   filters: RoyaltyEngineUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event RoyaltyEngineUpdated(address indexed previousAddress, address indexed newAddress)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/read/supportsInterface.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/read/supportsInterface.ts
index 2ac55df9cbf..f24fc2d98c7 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceId",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/write/getRoyalty.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/write/getRoyalty.ts
index a2f63658455..10b2fa5dba7 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/write/getRoyalty.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/write/getRoyalty.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "getRoyalty" function.
@@ -23,26 +23,26 @@ export type GetRoyaltyParams = WithOverrides<{
 export const FN_SELECTOR = "0xf533b802" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenAddress",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address[]",
     name: "recipients",
+    type: "address[]",
   },
   {
-    type: "uint256[]",
     name: "amounts",
+    type: "uint256[]",
   },
 ] as const;
 
@@ -149,8 +149,19 @@ export function getRoyalty(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -160,16 +171,5 @@ export function getRoyalty(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/write/setRoyaltyEngine.ts b/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/write/setRoyaltyEngine.ts
index 6b3ae0a2749..fd34974caa0 100644
--- a/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/write/setRoyaltyEngine.ts
+++ b/packages/thirdweb/src/extensions/common/__generated__/IRoyaltyPayments/write/setRoyaltyEngine.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setRoyaltyEngine" function.
@@ -21,8 +21,8 @@ export type SetRoyaltyEngineParams = WithOverrides<{
 export const FN_SELECTOR = "0x21ede032" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_royaltyEngineAddress",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setRoyaltyEngine(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.royaltyEngineAddress] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.royaltyEngineAddress] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/common/write/setContractMetadata.ts b/packages/thirdweb/src/extensions/common/write/setContractMetadata.ts
index 3172a180f43..414ab562cd3 100644
--- a/packages/thirdweb/src/extensions/common/write/setContractMetadata.ts
+++ b/packages/thirdweb/src/extensions/common/write/setContractMetadata.ts
@@ -38,7 +38,6 @@ export function setContractMetadata({
   ...restParams
 }: BaseTransactionOptions<SetContractMetadataParams>) {
   return setContractURI({
-    contract,
     asyncParams: async () => {
       const uri = await upload({
         client: contract.client,
@@ -49,5 +48,6 @@ export function setContractMetadata({
         uri,
       };
     },
+    contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/read/getAllExtensions.ts b/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/read/getAllExtensions.ts
index e3a8808253c..ad7179fa3bb 100644
--- a/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/read/getAllExtensions.ts
+++ b/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/read/getAllExtensions.ts
@@ -1,49 +1,48 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x4a00cc48" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "tuple",
-        name: "metadata",
         components: [
           {
-            type: "string",
             name: "name",
+            type: "string",
           },
           {
-            type: "string",
             name: "metadataURI",
+            type: "string",
           },
           {
-            type: "address",
             name: "implementation",
+            type: "address",
           },
         ],
+        name: "metadata",
+        type: "tuple",
       },
       {
-        type: "tuple[]",
-        name: "functions",
         components: [
           {
-            type: "bytes4",
             name: "functionSelector",
+            type: "bytes4",
           },
           {
-            type: "string",
             name: "functionSignature",
+            type: "string",
           },
         ],
+        name: "functions",
+        type: "tuple[]",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/addExtension.ts b/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/addExtension.ts
index 6ad5e011e49..f5e348496b7 100644
--- a/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/addExtension.ts
+++ b/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/addExtension.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "addExtension" function.
@@ -40,42 +40,42 @@ export type AddExtensionParams = WithOverrides<{
 export const FN_SELECTOR = "0xe05688fe" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "extension",
     components: [
       {
-        type: "tuple",
-        name: "metadata",
         components: [
           {
-            type: "string",
             name: "name",
+            type: "string",
           },
           {
-            type: "string",
             name: "metadataURI",
+            type: "string",
           },
           {
-            type: "address",
             name: "implementation",
+            type: "address",
           },
         ],
+        name: "metadata",
+        type: "tuple",
       },
       {
-        type: "tuple[]",
-        name: "functions",
         components: [
           {
-            type: "bytes4",
             name: "functionSelector",
+            type: "bytes4",
           },
           {
-            type: "string",
             name: "functionSignature",
+            type: "string",
           },
         ],
+        name: "functions",
+        type: "tuple[]",
       },
     ],
+    name: "extension",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -173,23 +173,23 @@ export function addExtension(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.extension] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.extension] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/removeExtension.ts b/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/removeExtension.ts
index 34a7822686b..e44ffee9980 100644
--- a/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/removeExtension.ts
+++ b/packages/thirdweb/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/removeExtension.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "removeExtension" function.
@@ -21,8 +21,8 @@ export type RemoveExtensionParams = WithOverrides<{
 export const FN_SELECTOR = "0xee7d2adf" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "extensionName",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function removeExtension(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.extensionName] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.extensionName] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/dynamic-contracts/write/installPublishedExtension.test.ts b/packages/thirdweb/src/extensions/dynamic-contracts/write/installPublishedExtension.test.ts
index e6d4c0427ed..168c14d013e 100644
--- a/packages/thirdweb/src/extensions/dynamic-contracts/write/installPublishedExtension.test.ts
+++ b/packages/thirdweb/src/extensions/dynamic-contracts/write/installPublishedExtension.test.ts
@@ -1,7 +1,6 @@
-import { describe, expect, it } from "vitest";
-
 import { readContract } from "src/transaction/read-contract.js";
 import { resolveMethod } from "src/transaction/resolve-method.js";
+import { describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
 import { TEST_ACCOUNT_A } from "../../../../test/src/test-wallets.js";
@@ -14,32 +13,32 @@ import { installPublishedExtension } from "./installPublishedExtension.js";
 describe.runIf(process.env.TW_SECRET_KEY)("install extension", () => {
   it.sequential("should install extension to a dynamic contract", async () => {
     await deployCloneFactory({
+      account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      account: TEST_ACCOUNT_A,
     });
 
     const deployed = await deployPublishedContract({
+      account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      account: TEST_ACCOUNT_A,
       contractId: "EvolvingNFT",
       contractParams: {
-        name: "Evolving nft",
-        symbol: "ENFT",
+        contractURI: "",
         defaultAdmin: TEST_ACCOUNT_A.address,
+        name: "Evolving nft",
         royaltyBps: 0n,
         royaltyRecipient: TEST_ACCOUNT_A.address,
         saleRecipient: TEST_ACCOUNT_A.address,
+        symbol: "ENFT",
         trustedForwarders: [],
-        contractURI: "",
       },
     });
 
     const contract = getContract({
+      address: deployed,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      address: deployed,
     });
 
     const transaction = installPublishedExtension({
@@ -48,7 +47,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("install extension", () => {
       extensionName: "DirectListingsLogic",
     });
 
-    await sendTransaction({ transaction, account: TEST_ACCOUNT_A });
+    await sendTransaction({ account: TEST_ACCOUNT_A, transaction });
 
     const extensions = await readContract({
       contract,
diff --git a/packages/thirdweb/src/extensions/dynamic-contracts/write/installPublishedExtension.ts b/packages/thirdweb/src/extensions/dynamic-contracts/write/installPublishedExtension.ts
index f363462261f..bb7a60e40bf 100644
--- a/packages/thirdweb/src/extensions/dynamic-contracts/write/installPublishedExtension.ts
+++ b/packages/thirdweb/src/extensions/dynamic-contracts/write/installPublishedExtension.ts
@@ -48,13 +48,11 @@ export function installPublishedExtension(
   } = options;
 
   return addExtension({
-    contract,
     asyncParams: async () => {
       const deployedExtension = await getOrDeployInfraForPublishedContract({
+        account,
         chain: contract.chain,
         client: contract.client,
-        account,
-        contractId: extensionName,
         constructorParams:
           constructorParams ||
           (await getAllDefaultConstructorParamsForImplementation({
@@ -62,6 +60,7 @@ export function installPublishedExtension(
             client: contract.client,
             contractId: extensionName,
           })),
+        contractId: extensionName,
         publisher,
         version,
       });
@@ -72,14 +71,15 @@ export function installPublishedExtension(
       const functions = generateExtensionFunctionsFromAbi(abi);
       return {
         extension: {
+          functions,
           metadata: {
-            name: extensionName,
-            metadataURI: "",
             implementation: deployedExtension.implementationContract.address,
+            metadataURI: "",
+            name: extensionName,
           },
-          functions,
         },
       };
     },
+    contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/dynamic-contracts/write/uninstallExtension.test.ts b/packages/thirdweb/src/extensions/dynamic-contracts/write/uninstallExtension.test.ts
index 8949dacb55a..6f21bdd9397 100644
--- a/packages/thirdweb/src/extensions/dynamic-contracts/write/uninstallExtension.test.ts
+++ b/packages/thirdweb/src/extensions/dynamic-contracts/write/uninstallExtension.test.ts
@@ -1,7 +1,6 @@
-import { describe, expect, it } from "vitest";
-
 import { readContract } from "src/transaction/read-contract.js";
 import { resolveMethod } from "src/transaction/resolve-method.js";
+import { describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
 import { TEST_ACCOUNT_A } from "../../../../test/src/test-wallets.js";
@@ -16,32 +15,32 @@ describe.runIf(process.env.TW_SECRET_KEY)("uninstall extension", () => {
     "should uninstall extension from a dynamic contract",
     async () => {
       await deployCloneFactory({
+        account: TEST_ACCOUNT_A,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_A,
       });
 
       const deployed = await deployPublishedContract({
+        account: TEST_ACCOUNT_A,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_A,
         contractId: "EvolvingNFT",
         contractParams: {
-          name: "Evolving nft",
-          symbol: "ENFT",
+          contractURI: "",
           defaultAdmin: TEST_ACCOUNT_A.address,
+          name: "Evolving nft",
           royaltyBps: 0n,
           royaltyRecipient: TEST_ACCOUNT_A.address,
           saleRecipient: TEST_ACCOUNT_A.address,
+          symbol: "ENFT",
           trustedForwarders: [],
-          contractURI: "",
         },
       });
 
       const contract = getContract({
+        address: deployed,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        address: deployed,
       });
 
       const transaction = uninstallExtension({
@@ -50,7 +49,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("uninstall extension", () => {
         extensionName: "EvolvingNFTLogic",
       });
 
-      await sendTransaction({ transaction, account: TEST_ACCOUNT_A });
+      await sendTransaction({ account: TEST_ACCOUNT_A, transaction });
 
       const extensions = await readContract({
         contract,
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/ABI.ts b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/ABI.ts
index 73082960b11..5343718a58f 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/ABI.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/ABI.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "ABI" function.
@@ -20,12 +20,12 @@ export type ABIParams = {
 export const FN_SELECTOR = "0x2203ab56" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "name",
+    type: "bytes32",
   },
   {
-    type: "uint256",
     name: "contentTypes",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/addr.ts b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/addr.ts
index bad6f8ddea0..27820676373 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/addr.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/addr.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "addr" function.
@@ -16,8 +16,8 @@ export type AddrParams = {
 export const FN_SELECTOR = "0x3b3b57de" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "name",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/contenthash.ts b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/contenthash.ts
index dc86243a44a..9a1bd4f9e85 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/contenthash.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/contenthash.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "contenthash" function.
@@ -16,8 +16,8 @@ export type ContenthashParams = {
 export const FN_SELECTOR = "0xbc1c58d1" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "name",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/name.ts b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/name.ts
index 660beaf8001..7e785fe9ad3 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/name.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/name.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "name" function.
@@ -16,8 +16,8 @@ export type NameParams = {
 export const FN_SELECTOR = "0x691f3431" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "name",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/pubkey.ts b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/pubkey.ts
index 26356b9a164..0173ffa5d1c 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/pubkey.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/pubkey.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "pubkey" function.
@@ -16,18 +16,18 @@ export type PubkeyParams = {
 export const FN_SELECTOR = "0xc8690233" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "name",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes32",
     name: "x",
+    type: "bytes32",
   },
   {
-    type: "bytes32",
     name: "y",
+    type: "bytes32",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/text.ts b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/text.ts
index 48245cd713c..8e7eae1f029 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/text.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/AddressResolver/read/text.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "text" function.
@@ -17,12 +17,12 @@ export type TextParams = {
 export const FN_SELECTOR = "0x59d1d43c" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "name",
+    type: "bytes32",
   },
   {
-    type: "string",
     name: "key",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/L2Resolver/read/name.ts b/packages/thirdweb/src/extensions/ens/__generated__/L2Resolver/read/name.ts
index 578f2a95426..20af79874cb 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/L2Resolver/read/name.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/L2Resolver/read/name.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "name" function.
@@ -16,8 +16,8 @@ export type NameParams = {
 export const FN_SELECTOR = "0x691f3431" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "node",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/UniversalResolver/read/resolve.ts b/packages/thirdweb/src/extensions/ens/__generated__/UniversalResolver/read/resolve.ts
index 3fe798c55dd..2c9bcbb9fcb 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/UniversalResolver/read/resolve.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/UniversalResolver/read/resolve.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "resolve" function.
@@ -17,12 +17,12 @@ export type ResolveParams = {
 export const FN_SELECTOR = "0x9061b923" as const;
 const FN_INPUTS = [
   {
-    type: "bytes",
     name: "name",
+    type: "bytes",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/ens/__generated__/UniversalResolver/read/reverse.ts b/packages/thirdweb/src/extensions/ens/__generated__/UniversalResolver/read/reverse.ts
index 6fe4e4d1c1f..f9e4de7d1a1 100644
--- a/packages/thirdweb/src/extensions/ens/__generated__/UniversalResolver/read/reverse.ts
+++ b/packages/thirdweb/src/extensions/ens/__generated__/UniversalResolver/read/reverse.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "reverse" function.
@@ -19,8 +19,8 @@ export type ReverseParams = {
 export const FN_SELECTOR = "0xec11c823" as const;
 const FN_INPUTS = [
   {
-    type: "bytes",
     name: "reverseName",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/ens/resolve-address.test.ts b/packages/thirdweb/src/extensions/ens/resolve-address.test.ts
index 90cbb709fe4..3c5ab5e09c7 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-address.test.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-address.test.ts
@@ -30,8 +30,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-address", () => {
     const address = await resolveAddress({
       client: TEST_CLIENT,
       name,
-      resolverChain: base,
       resolverAddress: BASENAME_RESOLVER_ADDRESS,
+      resolverChain: base,
     });
     expect(address).toBe("0x653Ff253b0c7C1cc52f484e891b71f9f1F010Bfb");
   });
diff --git a/packages/thirdweb/src/extensions/ens/resolve-address.ts b/packages/thirdweb/src/extensions/ens/resolve-address.ts
index 37975a8697c..c12fe152f26 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-address.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-address.ts
@@ -55,15 +55,15 @@ export async function resolveAddress(options: ResolveAddressOptions) {
   return withCache(
     async () => {
       const contract = getContract({
-        client,
-        chain: resolverChain || ethereum,
         address: resolverAddress || UNIVERSAL_RESOLVER_ADDRESS,
+        chain: resolverChain || ethereum,
+        client,
       });
       const data = encodeAddr({ name: namehash(name) });
       const result = await resolve({
         contract,
-        name: toHex(packetToBytes(name)),
         data,
+        name: toHex(packetToBytes(name)),
       });
       const resolvedAddress = getAddress(`0x${result[0].slice(-40)}`);
 
diff --git a/packages/thirdweb/src/extensions/ens/resolve-avatar.ts b/packages/thirdweb/src/extensions/ens/resolve-avatar.ts
index 944d65a820b..0c2422b5775 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-avatar.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-avatar.ts
@@ -44,7 +44,7 @@ export async function resolveAvatar(options: ResolveAvatarOptions) {
         return null;
       }
       try {
-        return parseAvatarRecord({ uri: record, client });
+        return parseAvatarRecord({ client, uri: record });
       } catch (e) {
         console.error("Error parsing avatar record", e);
         return null;
diff --git a/packages/thirdweb/src/extensions/ens/resolve-l2-name.test.ts b/packages/thirdweb/src/extensions/ens/resolve-l2-name.test.ts
index 653fe55e4d4..04d0ab01cd1 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-l2-name.test.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-l2-name.test.ts
@@ -9,21 +9,21 @@ import { resolveL2Name } from "./resolve-l2-name.js";
 describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-l2-name", () => {
   it.skip("should resolve Basename", async () => {
     const ens = await resolveL2Name({
-      client: TEST_CLIENT,
       // myk.base.eth
       address: "0x653Ff253b0c7C1cc52f484e891b71f9f1F010Bfb",
-      resolverChain: base,
+      client: TEST_CLIENT,
       resolverAddress: BASENAME_RESOLVER_ADDRESS,
+      resolverChain: base,
     });
     expect(ens).toBe("myk.base.eth");
   });
 
   it("should return null if no Basename exists for the address", async () => {
     const ens = await resolveL2Name({
-      client: TEST_CLIENT,
       address: "0xc6248746A9CA5935ae722E2061347A5897548c03",
-      resolverChain: base,
+      client: TEST_CLIENT,
       resolverAddress: BASENAME_RESOLVER_ADDRESS,
+      resolverChain: base,
     });
     expect(ens).toBeNull();
   });
diff --git a/packages/thirdweb/src/extensions/ens/resolve-l2-name.ts b/packages/thirdweb/src/extensions/ens/resolve-l2-name.ts
index 060960de6ca..c007d87439f 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-l2-name.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-l2-name.ts
@@ -83,9 +83,9 @@ export async function resolveL2Name(options: ResolveL2NameOptions) {
   return withCache(
     async () => {
       const contract = getContract({
-        client,
-        chain: resolverChain,
         address: resolverAddress,
+        chain: resolverChain,
+        client,
       });
 
       const reverseName = convertReverseNodeToBytes(
diff --git a/packages/thirdweb/src/extensions/ens/resolve-name.test.ts b/packages/thirdweb/src/extensions/ens/resolve-name.test.ts
index 8f072b1c168..4a3a4f64b40 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-name.test.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-name.test.ts
@@ -7,17 +7,17 @@ import { resolveName } from "./resolve-name.js";
 describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-name", () => {
   it("should resolve ENS", async () => {
     const ens = await resolveName({
-      client: TEST_CLIENT,
       // vitalik.eth
       address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
+      client: TEST_CLIENT,
     });
     expect(ens).toBe("vitalik.eth");
   });
 
   it("should return null if no ENS exists for the address", async () => {
     const ens = await resolveName({
-      client: TEST_CLIENT,
       address: "0xc6248746A9CA5935ae722E2061347A5897548c03",
+      client: TEST_CLIENT,
     });
     expect(ens).toBeNull();
   });
diff --git a/packages/thirdweb/src/extensions/ens/resolve-name.ts b/packages/thirdweb/src/extensions/ens/resolve-name.ts
index c37f98ef786..0d9c8b70303 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-name.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-name.ts
@@ -39,9 +39,9 @@ export async function resolveName(options: ResolveNameOptions) {
   return withCache(
     async () => {
       const contract = getContract({
-        client,
-        chain: resolverChain || ethereum,
         address: resolverAddress || UNIVERSAL_RESOLVER_ADDRESS,
+        chain: resolverChain || ethereum,
+        client,
       });
 
       const reverseName = toHex(
diff --git a/packages/thirdweb/src/extensions/ens/resolve-text.test.ts b/packages/thirdweb/src/extensions/ens/resolve-text.test.ts
index 75e6394a513..8dc775113a9 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-text.test.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-text.test.ts
@@ -9,8 +9,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-text", () => {
   it("resolves record for name", async () => {
     const record = await resolveText({
       client: TEST_CLIENT,
-      name: "jns.eth",
       key: "com.twitter",
+      name: "jns.eth",
     });
     expect(record).toMatchInlineSnapshot(`"jnsdls"`);
   });
@@ -18,8 +18,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-text", () => {
   it("resolves name without text record to null", async () => {
     const record = await resolveText({
       client: TEST_CLIENT,
-      name: "unregistered-name.eth",
       key: "com.twitter",
+      name: "unregistered-name.eth",
     });
     expect(record).toBeNull();
   });
diff --git a/packages/thirdweb/src/extensions/ens/resolve-text.ts b/packages/thirdweb/src/extensions/ens/resolve-text.ts
index b2f199350df..5ca88c667f9 100644
--- a/packages/thirdweb/src/extensions/ens/resolve-text.ts
+++ b/packages/thirdweb/src/extensions/ens/resolve-text.ts
@@ -44,17 +44,17 @@ export async function resolveText(options: ResolveTextOptions) {
   return withCache(
     async () => {
       const contract = getContract({
-        client,
-        chain: resolverChain || ethereum,
         address: resolverAddress || UNIVERSAL_RESOLVER_ADDRESS,
+        chain: resolverChain || ethereum,
+        client,
       });
 
-      const data = encodeText({ name: namehash(name), key });
+      const data = encodeText({ key, name: namehash(name) });
 
       const result = await resolve({
         contract,
-        name: toHex(packetToBytes(name)),
         data,
+        name: toHex(packetToBytes(name)),
       });
 
       if (result[0] === "0x") {
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/BatchMintMetadata/read/getBaseURICount.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/BatchMintMetadata/read/getBaseURICount.ts
index c676d387afb..73f45348e7c 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/BatchMintMetadata/read/getBaseURICount.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/BatchMintMetadata/read/getBaseURICount.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x63b45e2d" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/BatchMintMetadata/read/getBatchIdAtIndex.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/BatchMintMetadata/read/getBatchIdAtIndex.ts
index 0c3088f8948..91ed4f0c74d 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/BatchMintMetadata/read/getBatchIdAtIndex.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/BatchMintMetadata/read/getBatchIdAtIndex.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getBatchIdAtIndex" function.
@@ -16,8 +16,8 @@ export type GetBatchIdAtIndexParams = {
 export const FN_SELECTOR = "0x2419f51b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.ts
index b4467275ef2..32684a2ec82 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verifyClaim" function.
@@ -37,56 +37,56 @@ export type VerifyClaimParams = {
 export const FN_SELECTOR = "0xea1def9c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_conditionId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_claimer",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_pricePerToken",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "_allowlistProof",
     components: [
       {
-        type: "bytes32[]",
         name: "proof",
+        type: "bytes32[]",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
     ],
+    name: "_allowlistProof",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "isOverride",
+    type: "bool",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/freezeBatchBaseURI.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/freezeBatchBaseURI.ts
index 6684c87c397..534892538b5 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/freezeBatchBaseURI.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/freezeBatchBaseURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "freezeBatchBaseURI" function.
@@ -18,8 +18,8 @@ export type FreezeBatchBaseURIParams = WithOverrides<{
 export const FN_SELECTOR = "0xa07ced9e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -119,23 +119,23 @@ export function freezeBatchBaseURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.index] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.index] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/setMaxTotalSupply.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/setMaxTotalSupply.ts
index 55a70ef2392..c7f10409d0f 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/setMaxTotalSupply.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/setMaxTotalSupply.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setMaxTotalSupply" function.
@@ -22,12 +22,12 @@ export type SetMaxTotalSupplyParams = WithOverrides<{
 export const FN_SELECTOR = "0x87198cf2" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_maxTotalSupply",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -133,23 +133,23 @@ export function setMaxTotalSupply(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.maxTotalSupply] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.maxTotalSupply] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/setSaleRecipientForToken.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/setSaleRecipientForToken.ts
index 5076f66c719..fca39ad0b4b 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/setSaleRecipientForToken.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/setSaleRecipientForToken.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSaleRecipientForToken" function.
@@ -22,12 +22,12 @@ export type SetSaleRecipientForTokenParams = WithOverrides<{
 export const FN_SELECTOR = "0x29c49b9b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_saleRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -137,23 +137,23 @@ export function setSaleRecipientForToken(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.saleRecipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.saleRecipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/updateBatchBaseURI.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/updateBatchBaseURI.ts
index 0c718deff5a..cf52797da62 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/updateBatchBaseURI.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/DropERC1155/write/updateBatchBaseURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "updateBatchBaseURI" function.
@@ -19,12 +19,12 @@ export type UpdateBatchBaseURIParams = WithOverrides<{
 export const FN_SELECTOR = "0xde903ddd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_index",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -127,23 +127,23 @@ export function updateBatchBaseURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.index, resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.index, resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155/events/AirdropFailed.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155/events/AirdropFailed.ts
index 2762fcdd17d..fdae53acdc8 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155/events/AirdropFailed.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155/events/AirdropFailed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AirdropFailed" event.
@@ -46,8 +46,8 @@ export type AirdropFailedEventFilters = Partial<{
  */
 export function airdropFailedEvent(filters: AirdropFailedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event AirdropFailed(address indexed tokenAddress, address indexed tokenOwner, address indexed recipient, uint256 tokenId, uint256 amount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155/write/airdropERC1155.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155/write/airdropERC1155.ts
index df9e69cfcfb..03a10e0d4e6 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155/write/airdropERC1155.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155/write/airdropERC1155.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC1155" function.
@@ -34,30 +34,30 @@ export type AirdropERC1155Params = WithOverrides<{
 export const FN_SELECTOR = "0x41444690" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenAddress",
+    type: "address",
   },
   {
-    type: "address",
     name: "tokenOwner",
+    type: "address",
   },
   {
-    type: "tuple[]",
-    name: "contents",
     components: [
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amount",
+        type: "uint256",
       },
     ],
+    name: "contents",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -165,8 +165,19 @@ export function airdropERC1155(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -176,16 +187,5 @@ export function airdropERC1155(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155Claimable/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155Claimable/events/TokensClaimed.ts
index fa7b986927c..a51a976cc27 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155Claimable/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155Claimable/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -46,8 +46,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(address indexed claimer, address indexed receiver, uint256 indexed tokenId, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155Claimable/write/claim.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155Claimable/write/claim.ts
index 7ec6e819a8d..6678253a7c9 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155Claimable/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IAirdropERC1155Claimable/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -25,24 +25,24 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x38524a10" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "quantity",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "bytes32[]",
     name: "proofs",
+    type: "bytes32[]",
   },
   {
-    type: "uint256",
     name: "proofMaxQuantityForWallet",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -156,8 +156,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -169,16 +180,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IBurnableERC1155/write/burn.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IBurnableERC1155/write/burn.ts
index f36a7e6d858..90310881fed 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IBurnableERC1155/write/burn.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IBurnableERC1155/write/burn.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "burn" function.
@@ -20,16 +20,16 @@ export type BurnParams = WithOverrides<{
 export const FN_SELECTOR = "0xf5298aca" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "id",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -135,8 +135,19 @@ export function burn(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function burn(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IBurnableERC1155/write/burnBatch.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IBurnableERC1155/write/burnBatch.ts
index 630fd7070d8..adf8783c218 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IBurnableERC1155/write/burnBatch.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IBurnableERC1155/write/burnBatch.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "burnBatch" function.
@@ -20,16 +20,16 @@ export type BurnBatchParams = WithOverrides<{
 export const FN_SELECTOR = "0x6b20c454" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
   {
-    type: "uint256[]",
     name: "ids",
+    type: "uint256[]",
   },
   {
-    type: "uint256[]",
     name: "values",
+    type: "uint256[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -137,8 +137,19 @@ export function burnBatch(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -148,16 +159,5 @@ export function burnBatch(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/events/TokensClaimed.ts
index fa7b986927c..a51a976cc27 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -46,8 +46,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(address indexed claimer, address indexed receiver, uint256 indexed tokenId, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/read/verifyClaim.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/read/verifyClaim.ts
index 8344ea32448..3a46dec6f77 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/read/verifyClaim.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/read/verifyClaim.ts
@@ -17,16 +17,16 @@ export type VerifyClaimParams = {
 export const FN_SELECTOR = "0x4bbb1abf" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_claimer",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/write/claim.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/write/claim.ts
index daeeb9564ec..c1bdd3f62e5 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IClaimableERC1155/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -20,16 +20,16 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x2bc43fd9" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -135,8 +135,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/events/ClaimConditionsUpdated.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/events/ClaimConditionsUpdated.ts
index 777715966d4..7a27f5af36d 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/events/ClaimConditionsUpdated.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/events/ClaimConditionsUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ClaimConditionsUpdated" event.
@@ -36,8 +36,8 @@ export function claimConditionsUpdatedEvent(
   filters: ClaimConditionsUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event ClaimConditionsUpdated(uint256 indexed tokenId, (uint256 startTimestamp, uint256 maxClaimableSupply, uint256 supplyClaimed, uint256 quantityLimitPerWallet, bytes32 merkleRoot, uint256 pricePerToken, address currency, string metadata)[] claimConditions, bool resetEligibility)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/events/TokensClaimed.ts
index e1accf0d244..84638a2129a 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -46,8 +46,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(uint256 indexed claimConditionIndex, address indexed claimer, address indexed receiver, uint256 tokenId, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/claimCondition.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/claimCondition.ts
index 64dd8ca345d..9c8220f9e29 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/claimCondition.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/claimCondition.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "claimCondition" function.
@@ -16,18 +16,18 @@ export type ClaimConditionParams = {
 export const FN_SELECTOR = "0xe9703d25" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "currentStartId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "count",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/getActiveClaimConditionId.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/getActiveClaimConditionId.ts
index 1684879b155..3a1a57e210c 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/getActiveClaimConditionId.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/getActiveClaimConditionId.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getActiveClaimConditionId" function.
@@ -16,8 +16,8 @@ export type GetActiveClaimConditionIdParams = {
 export const FN_SELECTOR = "0x5ab063e8" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/getClaimConditionById.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/getClaimConditionById.ts
index 7da28e54495..829a3eae7c0 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/getClaimConditionById.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/read/getClaimConditionById.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getClaimConditionById" function.
@@ -20,52 +20,52 @@ export type GetClaimConditionByIdParams = {
 export const FN_SELECTOR = "0xd45b28d7" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_conditionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "condition",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "condition",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/write/claim.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/write/claim.ts
index 8c3db1e8d27..68b510c857e 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -36,50 +36,50 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x57bc3d78" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "pricePerToken",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "allowlistProof",
     components: [
       {
-        type: "bytes32[]",
         name: "proof",
+        type: "bytes32[]",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
     ],
+    name: "allowlistProof",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -201,8 +201,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -216,16 +227,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/write/setClaimConditions.ts
index 36b0884c34c..ef17b4dacc7 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDrop1155/write/setClaimConditions.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimConditions" function.
@@ -36,50 +36,50 @@ export type SetClaimConditionsParams = WithOverrides<{
 export const FN_SELECTOR = "0x183718d1" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "tuple[]",
-    name: "phases",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "phases",
+    type: "tuple[]",
   },
   {
-    type: "bool",
     name: "resetClaimEligibility",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -189,8 +189,19 @@ export function setClaimConditions(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -200,16 +211,5 @@ export function setClaimConditions(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/events/ClaimConditionUpdated.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/events/ClaimConditionUpdated.ts
index 21040cdf986..a5e6a7e3072 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/events/ClaimConditionUpdated.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/events/ClaimConditionUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ClaimConditionUpdated" event.
@@ -36,8 +36,8 @@ export function claimConditionUpdatedEvent(
   filters: ClaimConditionUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event ClaimConditionUpdated(uint256 indexed tokenId, (uint256 startTimestamp, uint256 maxClaimableSupply, uint256 supplyClaimed, uint256 quantityLimitPerWallet, bytes32 merkleRoot, uint256 pricePerToken, address currency, string metadata) condition, bool resetEligibility)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/events/TokensClaimed.ts
index fa7b986927c..a51a976cc27 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -46,8 +46,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(address indexed claimer, address indexed receiver, uint256 indexed tokenId, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/read/claimCondition.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/read/claimCondition.ts
index 04b44c4486c..abbb7c6b067 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/read/claimCondition.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/read/claimCondition.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "claimCondition" function.
@@ -16,42 +16,42 @@ export type ClaimConditionParams = {
 export const FN_SELECTOR = "0xe9703d25" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "startTimestamp",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "maxClaimableSupply",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "supplyClaimed",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "quantityLimitPerWallet",
+    type: "uint256",
   },
   {
-    type: "bytes32",
     name: "merkleRoot",
+    type: "bytes32",
   },
   {
-    type: "uint256",
     name: "pricePerToken",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "currency",
+    type: "address",
   },
   {
-    type: "string",
     name: "metadata",
+    type: "string",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/write/claim.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/write/claim.ts
index 8c3db1e8d27..68b510c857e 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -36,50 +36,50 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x57bc3d78" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "pricePerToken",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "allowlistProof",
     components: [
       {
-        type: "bytes32[]",
         name: "proof",
+        type: "bytes32[]",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
     ],
+    name: "allowlistProof",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -201,8 +201,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -216,16 +227,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/write/setClaimConditions.ts
index 043ca48332c..3a872f85105 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IDropSinglePhase1155/write/setClaimConditions.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimConditions" function.
@@ -36,50 +36,50 @@ export type SetClaimConditionsParams = WithOverrides<{
 export const FN_SELECTOR = "0x8affb89f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "phase",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "phase",
+    type: "tuple",
   },
   {
-    type: "bool",
     name: "resetClaimEligibility",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -189,8 +189,19 @@ export function setClaimConditions(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -200,16 +211,5 @@ export function setClaimConditions(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/ApprovalForAll.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/ApprovalForAll.ts
index 96daa76e1c0..0812f02a604 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/ApprovalForAll.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/ApprovalForAll.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ApprovalForAll" event.
@@ -40,8 +40,8 @@ export type ApprovalForAllEventFilters = Partial<{
  */
 export function approvalForAllEvent(filters: ApprovalForAllEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event ApprovalForAll(address indexed _owner, address indexed _operator, bool _approved)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/TransferBatch.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/TransferBatch.ts
index e293e23488c..6bf4aef7795 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/TransferBatch.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/TransferBatch.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TransferBatch" event.
@@ -46,8 +46,8 @@ export type TransferBatchEventFilters = Partial<{
  */
 export function transferBatchEvent(filters: TransferBatchEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TransferBatch(address indexed _operator, address indexed _from, address indexed _to, uint256[] tokenIds, uint256[] _values)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/TransferSingle.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/TransferSingle.ts
index 43726f4eeea..fda95005b26 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/TransferSingle.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/TransferSingle.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TransferSingle" event.
@@ -46,8 +46,8 @@ export type TransferSingleEventFilters = Partial<{
  */
 export function transferSingleEvent(filters: TransferSingleEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TransferSingle(address indexed _operator, address indexed _from, address indexed _to, uint256 tokenId, uint256 _value)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/URI.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/URI.ts
index 4993d85f7ee..cc015d354d3 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/URI.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/events/URI.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "URI" event.
@@ -34,7 +34,7 @@ export type URIEventFilters = Partial<{
  */
 export function uRIEvent(filters: URIEventFilters = {}) {
   return prepareEvent({
-    signature: "event URI(string _value, uint256 indexed tokenId)",
     filters,
+    signature: "event URI(string _value, uint256 indexed tokenId)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/balanceOf.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/balanceOf.ts
index 06edf5575c1..b38f6b85e23 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/balanceOf.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/balanceOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "balanceOf" function.
@@ -17,12 +17,12 @@ export type BalanceOfParams = {
 export const FN_SELECTOR = "0x00fdd58e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_owner",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/balanceOfBatch.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/balanceOfBatch.ts
index ecfeac7aa8a..6f321bad1cd 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/balanceOfBatch.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/balanceOfBatch.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "balanceOfBatch" function.
@@ -20,12 +20,12 @@ export type BalanceOfBatchParams = {
 export const FN_SELECTOR = "0x4e1273f4" as const;
 const FN_INPUTS = [
   {
-    type: "address[]",
     name: "_owners",
+    type: "address[]",
   },
   {
-    type: "uint256[]",
     name: "tokenIds",
+    type: "uint256[]",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/isApprovedForAll.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/isApprovedForAll.ts
index ae49f338a36..91fd045ab17 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/isApprovedForAll.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/isApprovedForAll.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isApprovedForAll" function.
@@ -17,12 +17,12 @@ export type IsApprovedForAllParams = {
 export const FN_SELECTOR = "0xe985e9c5" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_owner",
+    type: "address",
   },
   {
-    type: "address",
     name: "_operator",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/totalSupply.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/totalSupply.ts
index 293d69ec291..349c73b8a2e 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/totalSupply.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/totalSupply.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "totalSupply" function.
@@ -16,8 +16,8 @@ export type TotalSupplyParams = {
 export const FN_SELECTOR = "0xbd85b039" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "id",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/uri.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/uri.ts
index 16c6c93fc3b..f98a426d732 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/uri.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/read/uri.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "uri" function.
@@ -16,8 +16,8 @@ export type UriParams = {
 export const FN_SELECTOR = "0x0e89341c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/safeBatchTransferFrom.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/safeBatchTransferFrom.ts
index 69941c9ab48..94ddf0ac95b 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/safeBatchTransferFrom.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/safeBatchTransferFrom.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "safeBatchTransferFrom" function.
@@ -25,24 +25,24 @@ export type SafeBatchTransferFromParams = WithOverrides<{
 export const FN_SELECTOR = "0x2eb2c2d6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_from",
+    type: "address",
   },
   {
-    type: "address",
     name: "_to",
+    type: "address",
   },
   {
-    type: "uint256[]",
     name: "tokenIds",
+    type: "uint256[]",
   },
   {
-    type: "uint256[]",
     name: "_values",
+    type: "uint256[]",
   },
   {
-    type: "bytes",
     name: "_data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -162,8 +162,19 @@ export function safeBatchTransferFrom(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -175,16 +186,5 @@ export function safeBatchTransferFrom(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/safeTransferFrom.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/safeTransferFrom.ts
index 31dc293f5dc..9ee70134846 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/safeTransferFrom.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/safeTransferFrom.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "safeTransferFrom" function.
@@ -22,24 +22,24 @@ export type SafeTransferFromParams = WithOverrides<{
 export const FN_SELECTOR = "0xf242432a" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_from",
+    type: "address",
   },
   {
-    type: "address",
     name: "_to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_value",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "_data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -155,8 +155,19 @@ export function safeTransferFrom(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -168,16 +179,5 @@ export function safeTransferFrom(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.ts
index 4d62b4b8e95..0d720b5aedb 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setApprovalForAll" function.
@@ -19,12 +19,12 @@ export type SetApprovalForAllParams = WithOverrides<{
 export const FN_SELECTOR = "0xa22cb465" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_operator",
+    type: "address",
   },
   {
-    type: "bool",
     name: "_approved",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -127,23 +127,23 @@ export function setApprovalForAll(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.operator, resolvedOptions.approved] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.operator, resolvedOptions.approved] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Enumerable/read/nextTokenIdToMint.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Enumerable/read/nextTokenIdToMint.ts
index 19dddf43c7c..edf264b16d5 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Enumerable/read/nextTokenIdToMint.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Enumerable/read/nextTokenIdToMint.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3b1475a7" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/read/supportsInterface.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/read/supportsInterface.ts
index 0a0627687ed..26d3510c06c 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceId",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/write/onERC1155BatchReceived.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/write/onERC1155BatchReceived.ts
index b21c1c5e90d..eaedd907454 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/write/onERC1155BatchReceived.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/write/onERC1155BatchReceived.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "onERC1155BatchReceived" function.
@@ -22,24 +22,24 @@ export type OnERC1155BatchReceivedParams = WithOverrides<{
 export const FN_SELECTOR = "0xbc197c81" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "operator",
+    type: "address",
   },
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "uint256[]",
     name: "ids",
+    type: "uint256[]",
   },
   {
-    type: "uint256[]",
     name: "values",
+    type: "uint256[]",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -165,8 +165,19 @@ export function onERC1155BatchReceived(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -178,16 +189,5 @@ export function onERC1155BatchReceived(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/write/onERC1155Received.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/write/onERC1155Received.ts
index cb3d27032ac..d84c3bb6dbc 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/write/onERC1155Received.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IERC1155Receiver/write/onERC1155Received.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "onERC1155Received" function.
@@ -22,24 +22,24 @@ export type OnERC1155ReceivedParams = WithOverrides<{
 export const FN_SELECTOR = "0xf23a6e61" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "operator",
+    type: "address",
   },
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "id",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -161,8 +161,19 @@ export function onERC1155Received(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -174,16 +185,5 @@ export function onERC1155Received(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IEditionStake/write/depositRewardTokens.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IEditionStake/write/depositRewardTokens.ts
index 4f7225de3d2..79359b01906 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IEditionStake/write/depositRewardTokens.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IEditionStake/write/depositRewardTokens.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "depositRewardTokens" function.
@@ -18,8 +18,8 @@ export type DepositRewardTokensParams = WithOverrides<{
 export const FN_SELECTOR = "0x16c621e0" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -119,23 +119,23 @@ export function depositRewardTokens(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IEditionStake/write/withdrawRewardTokens.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IEditionStake/write/withdrawRewardTokens.ts
index aab127edc73..24930ac8e9e 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IEditionStake/write/withdrawRewardTokens.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IEditionStake/write/withdrawRewardTokens.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdrawRewardTokens" function.
@@ -18,8 +18,8 @@ export type WithdrawRewardTokensParams = WithOverrides<{
 export const FN_SELECTOR = "0xcb43b2dd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -121,23 +121,23 @@ export function withdrawRewardTokens(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/ILazyMint/events/TokensLazyMinted.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/ILazyMint/events/TokensLazyMinted.ts
index dd2a413af02..b998658e49e 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/ILazyMint/events/TokensLazyMinted.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/ILazyMint/events/TokensLazyMinted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensLazyMinted" event.
@@ -36,8 +36,8 @@ export function tokensLazyMintedEvent(
   filters: TokensLazyMintedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensLazyMinted(uint256 indexed startTokenId, uint256 endTokenId, string baseURI, bytes encryptedBaseURI)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/ILazyMint/write/lazyMint.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/ILazyMint/write/lazyMint.ts
index 5a175f1a89f..90f6de754f4 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/ILazyMint/write/lazyMint.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/ILazyMint/write/lazyMint.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "lazyMint" function.
@@ -23,22 +23,22 @@ export type LazyMintParams = WithOverrides<{
 export const FN_SELECTOR = "0xd37c353b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "baseURIForTokens",
+    type: "string",
   },
   {
-    type: "bytes",
     name: "extraData",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "batchId",
+    type: "uint256",
   },
 ] as const;
 
@@ -143,8 +143,19 @@ export function lazyMint(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -154,16 +165,5 @@ export function lazyMint(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IMintableERC1155/events/TokensMinted.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IMintableERC1155/events/TokensMinted.ts
index 45a4d431a21..e86cc980365 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IMintableERC1155/events/TokensMinted.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IMintableERC1155/events/TokensMinted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMinted" event.
@@ -40,8 +40,8 @@ export type TokensMintedEventFilters = Partial<{
  */
 export function tokensMintedEvent(filters: TokensMintedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMinted(address indexed mintedTo, uint256 indexed tokenIdMinted, string uri, uint256 quantityMinted)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IMintableERC1155/write/mintTo.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IMintableERC1155/write/mintTo.ts
index b28be8d3f50..84a299fbe0b 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IMintableERC1155/write/mintTo.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IMintableERC1155/write/mintTo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintTo" function.
@@ -21,20 +21,20 @@ export type MintToParams = WithOverrides<{
 export const FN_SELECTOR = "0xb03f4528" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "uri",
+    type: "string",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -144,8 +144,19 @@ export function mintTo(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -156,16 +167,5 @@ export function mintTo(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/read/supportsInterface.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/read/supportsInterface.ts
index 0a0627687ed..26d3510c06c 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceId",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/write/freezeMetadata.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/write/freezeMetadata.ts
index 0ce21caab41..003e54a53cc 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/write/freezeMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/write/freezeMetadata.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/write/setTokenURI.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/write/setTokenURI.ts
index 3d42dad88ac..7bdae1392a5 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/write/setTokenURI.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/INFTMetadata/write/setTokenURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTokenURI" function.
@@ -19,12 +19,12 @@ export type SetTokenURIParams = WithOverrides<{
 export const FN_SELECTOR = "0x162094c4" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function setTokenURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackCreated.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackCreated.ts
index a2f1c1da7bb..285247a806b 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackCreated.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackCreated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackCreated" event.
@@ -34,8 +34,8 @@ export type PackCreatedEventFilters = Partial<{
  */
 export function packCreatedEvent(filters: PackCreatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event PackCreated(uint256 indexed packId, address recipient, uint256 totalPacksCreated)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackOpened.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackOpened.ts
index aa6b44b5de6..f06d0783ba6 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackOpened.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackOpened.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackOpened" event.
@@ -40,8 +40,8 @@ export type PackOpenedEventFilters = Partial<{
  */
 export function packOpenedEvent(filters: PackOpenedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event PackOpened(uint256 indexed packId, address indexed opener, uint256 numOfPacksOpened, (address assetContract, uint8 tokenType, uint256 tokenId, uint256 totalAmount)[] rewardUnitsDistributed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackUpdated.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackUpdated.ts
index 7b9a4ae3ada..2bac3df8ffe 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackUpdated.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/events/PackUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackUpdated" event.
@@ -34,8 +34,8 @@ export type PackUpdatedEventFilters = Partial<{
  */
 export function packUpdatedEvent(filters: PackUpdatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event PackUpdated(uint256 indexed packId, address recipient, uint256 totalPacksCreated)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/write/createPack.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/write/createPack.ts
index 651159cc31f..b76f966b0ff 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/write/createPack.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/write/createPack.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createPack" function.
@@ -44,56 +44,56 @@ export type CreatePackParams = WithOverrides<{
 export const FN_SELECTOR = "0x092e6075" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "contents",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    name: "contents",
+    type: "tuple[]",
   },
   {
-    type: "uint256[]",
     name: "numOfRewardUnits",
+    type: "uint256[]",
   },
   {
-    type: "string",
     name: "packUri",
+    type: "string",
   },
   {
-    type: "uint128",
     name: "openStartTimestamp",
+    type: "uint128",
   },
   {
-    type: "uint128",
     name: "amountDistributedPerOpen",
+    type: "uint128",
   },
   {
-    type: "address",
     name: "recipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "packId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "packTotalSupply",
+    type: "uint256",
   },
 ] as const;
 
@@ -212,8 +212,19 @@ export function createPack(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -226,16 +237,5 @@ export function createPack(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/write/openPack.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/write/openPack.ts
index b76754ccb3e..e5ff179ee6c 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/write/openPack.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPack/write/openPack.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "openPack" function.
@@ -22,35 +22,35 @@ export type OpenPackParams = WithOverrides<{
 export const FN_SELECTOR = "0x914e126a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "packId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "amountToOpen",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
@@ -148,23 +148,23 @@ export function openPack(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.packId, resolvedOptions.amountToOpen] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.packId, resolvedOptions.amountToOpen] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/events/PackOpenRequested.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/events/PackOpenRequested.ts
index 1700b14ae6d..d5bd6f7d865 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/events/PackOpenRequested.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/events/PackOpenRequested.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackOpenRequested" event.
@@ -42,8 +42,8 @@ export function packOpenRequestedEvent(
   filters: PackOpenRequestedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event PackOpenRequested(address indexed opener, uint256 indexed packId, uint256 amountToOpen, uint256 requestId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/events/PackRandomnessFulfilled.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/events/PackRandomnessFulfilled.ts
index 973a8afa50d..dee10b5c0bb 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/events/PackRandomnessFulfilled.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/events/PackRandomnessFulfilled.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackRandomnessFulfilled" event.
@@ -42,8 +42,8 @@ export function packRandomnessFulfilledEvent(
   filters: PackRandomnessFulfilledEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event PackRandomnessFulfilled(uint256 indexed packId, uint256 indexed requestId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/read/canClaimRewards.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/read/canClaimRewards.ts
index dad4ba854e1..7db5e93a362 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/read/canClaimRewards.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/read/canClaimRewards.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "canClaimRewards" function.
@@ -16,8 +16,8 @@ export type CanClaimRewardsParams = {
 export const FN_SELECTOR = "0xa9b47a66" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_opener",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/write/claimRewards.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/write/claimRewards.ts
index f27ff5f2568..2c5c67dcc1d 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/write/claimRewards.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/write/claimRewards.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
@@ -7,26 +7,26 @@ export const FN_SELECTOR = "0x372500ab" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "rewardUnits",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    name: "rewardUnits",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/write/openPackAndClaimRewards.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/write/openPackAndClaimRewards.ts
index a062fe62999..53eef2b87f1 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/write/openPackAndClaimRewards.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IPackVRFDirect/write/openPackAndClaimRewards.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "openPackAndClaimRewards" function.
@@ -26,16 +26,16 @@ export type OpenPackAndClaimRewardsParams = WithOverrides<{
 export const FN_SELECTOR = "0xac296b3f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_packId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_amountToOpen",
+    type: "uint256",
   },
   {
-    type: "uint32",
     name: "_callBackGasLimit",
+    type: "uint32",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -153,8 +153,19 @@ export function openPackAndClaimRewards(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -164,16 +175,5 @@ export function openPackAndClaimRewards(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/events/TokensMintedWithSignature.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/events/TokensMintedWithSignature.ts
index ca1f6d20821..fbe3d4fcabd 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/events/TokensMintedWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/events/TokensMintedWithSignature.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMintedWithSignature" event.
@@ -48,8 +48,8 @@ export function tokensMintedWithSignatureEvent(
   filters: TokensMintedWithSignatureEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, (address to, address royaltyRecipient, uint256 royaltyBps, address primarySaleRecipient, uint256 tokenId, string uri, uint256 quantity, uint256 pricePerToken, address currency, uint128 validityStartTimestamp, uint128 validityEndTimestamp, bytes32 uid) mintRequest)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/read/verify.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/read/verify.ts
index 09bb704a2ca..7d9b75e617f 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/read/verify.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/read/verify.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verify" function.
@@ -34,72 +34,72 @@ export type VerifyParams = {
 export const FN_SELECTOR = "0xb17cd86f" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "royaltyRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "royaltyBps",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "uri",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "success",
+    type: "bool",
   },
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/write/mintWithSignature.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/write/mintWithSignature.ts
index 6a85a154053..988aa78d23d 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/write/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/ISignatureMintERC1155/write/mintWithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintWithSignature" function.
@@ -36,62 +36,62 @@ export type MintWithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0x98a6e993" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "payload",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "royaltyRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "royaltyBps",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "uri",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "payload",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -194,23 +194,23 @@ export function mintWithSignature(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.payload, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.payload, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/RewardsClaimed.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/RewardsClaimed.ts
index 3caf37ca828..1a218d64ec6 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/RewardsClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/RewardsClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RewardsClaimed" event.
@@ -34,8 +34,8 @@ export type RewardsClaimedEventFilters = Partial<{
  */
 export function rewardsClaimedEvent(filters: RewardsClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RewardsClaimed(address indexed staker, uint256 rewardAmount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/TokensStaked.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/TokensStaked.ts
index 57cc777cc94..10b199d165b 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/TokensStaked.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/TokensStaked.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensStaked" event.
@@ -40,8 +40,8 @@ export type TokensStakedEventFilters = Partial<{
  */
 export function tokensStakedEvent(filters: TokensStakedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensStaked(address indexed staker, uint256 indexed tokenId, uint256 amount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/TokensWithdrawn.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/TokensWithdrawn.ts
index 93b50de0267..dfe8e2c7093 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/TokensWithdrawn.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/TokensWithdrawn.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensWithdrawn" event.
@@ -42,8 +42,8 @@ export function tokensWithdrawnEvent(
   filters: TokensWithdrawnEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensWithdrawn(address indexed staker, uint256 indexed tokenId, uint256 amount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/UpdatedRewardsPerUnitTime.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/UpdatedRewardsPerUnitTime.ts
index cc60bb803ec..ef17c6bf886 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/UpdatedRewardsPerUnitTime.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/UpdatedRewardsPerUnitTime.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "UpdatedRewardsPerUnitTime" event.
@@ -36,8 +36,8 @@ export function updatedRewardsPerUnitTimeEvent(
   filters: UpdatedRewardsPerUnitTimeEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event UpdatedRewardsPerUnitTime(uint256 indexed _tokenId, uint256 oldRewardsPerUnitTime, uint256 newRewardsPerUnitTime)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/UpdatedTimeUnit.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/UpdatedTimeUnit.ts
index 1bdc0e9edab..df51fd0eff5 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/UpdatedTimeUnit.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/events/UpdatedTimeUnit.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "UpdatedTimeUnit" event.
@@ -36,8 +36,8 @@ export function updatedTimeUnitEvent(
   filters: UpdatedTimeUnitEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event UpdatedTimeUnit(uint256 indexed _tokenId, uint256 oldTimeUnit, uint256 newTimeUnit)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/read/getStakeInfo.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/read/getStakeInfo.ts
index 381a97e4ac0..f8e34b3afa6 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/read/getStakeInfo.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/read/getStakeInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getStakeInfo" function.
@@ -16,22 +16,22 @@ export type GetStakeInfoParams = {
 export const FN_SELECTOR = "0xc3453153" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "staker",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256[]",
     name: "_tokensStaked",
+    type: "uint256[]",
   },
   {
-    type: "uint256[]",
     name: "_tokenAmounts",
+    type: "uint256[]",
   },
   {
-    type: "uint256",
     name: "_totalRewards",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/read/getStakeInfoForToken.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/read/getStakeInfoForToken.ts
index 95246a9bf77..9f1ebcdddc3 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/read/getStakeInfoForToken.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/read/getStakeInfoForToken.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getStakeInfoForToken" function.
@@ -17,22 +17,22 @@ export type GetStakeInfoForTokenParams = {
 export const FN_SELECTOR = "0x168fb5c5" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "staker",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "_tokensStaked",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_rewards",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/claimRewards.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/claimRewards.ts
index 72773f0c947..7a85cb7c3cb 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/claimRewards.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/claimRewards.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claimRewards" function.
@@ -18,8 +18,8 @@ export type ClaimRewardsParams = WithOverrides<{
 export const FN_SELECTOR = "0x0962ef79" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function claimRewards(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/stake.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/stake.ts
index 4640d2664d8..e33708310d0 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/stake.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/stake.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "stake" function.
@@ -19,12 +19,12 @@ export type StakeParams = WithOverrides<{
 export const FN_SELECTOR = "0x952e68cf" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint64",
     name: "amount",
+    type: "uint64",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -123,23 +123,23 @@ export function stake(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/withdraw.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/withdraw.ts
index 261bf72277e..564158e54ed 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/withdraw.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/IStaking1155/write/withdraw.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdraw" function.
@@ -19,12 +19,12 @@ export type WithdrawParams = WithOverrides<{
 export const FN_SELECTOR = "0xc434dcfe" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint64",
     name: "amount",
+    type: "uint64",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -123,23 +123,23 @@ export function withdraw(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/__generated__/Zora1155/read/nextTokenId.ts b/packages/thirdweb/src/extensions/erc1155/__generated__/Zora1155/read/nextTokenId.ts
index a1c7ae20ebc..9761a5cdbfa 100644
--- a/packages/thirdweb/src/extensions/erc1155/__generated__/Zora1155/read/nextTokenId.ts
+++ b/packages/thirdweb/src/extensions/erc1155/__generated__/Zora1155/read/nextTokenId.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x75794a3c" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc1155/customDrop1155.test.ts b/packages/thirdweb/src/extensions/erc1155/customDrop1155.test.ts
index 939e5a11581..90d9fc72556 100644
--- a/packages/thirdweb/src/extensions/erc1155/customDrop1155.test.ts
+++ b/packages/thirdweb/src/extensions/erc1155/customDrop1155.test.ts
@@ -1,5 +1,3 @@
-import { fetchDeployMetadata } from "../../utils/any-evm/deploy-metadata.js";
-
 import { beforeAll, describe, expect, it } from "vitest";
 import { VITALIK_WALLET } from "../../../test/src/addresses.js";
 import { ANVIL_CHAIN } from "../../../test/src/chains.js";
@@ -9,8 +7,9 @@ import {
   TEST_ACCOUNT_C,
   TEST_ACCOUNT_D,
 } from "../../../test/src/test-wallets.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
+import { fetchDeployMetadata } from "../../utils/any-evm/deploy-metadata.js";
 import { deployContractfromDeployMetadata } from "../prebuilts/deploy-published.js";
 import { balanceOf } from "./__generated__/IERC1155/read/balanceOf.js";
 import { nextTokenIdToMint } from "./__generated__/IERC1155Enumerable/read/nextTokenIdToMint.js";
@@ -35,9 +34,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         uri: "ipfs://QmaqFExXhU8kWkgAZCqxo8F3GZd8D2NJzCJWerfmFjujo8",
       });
       const contractAddress = await deployContractfromDeployMetadata({
+        account: TEST_ACCOUNT_C,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_C,
         deployMetadata: customDropDeployMetadata,
         initializeParams: {
           defaultAdmin: TEST_ACCOUNT_C.address,
@@ -67,8 +66,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         ],
       });
       await sendAndConfirmTransaction({
-        transaction: mintTx,
         account: TEST_ACCOUNT_C,
+        transaction: mintTx,
       });
 
       await expect(nextTokenIdToMint({ contract })).resolves.toBe(6n);
@@ -82,38 +81,38 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         balanceOf({ contract, owner: TEST_ACCOUNT_C.address, tokenId: 0n }),
       ).resolves.toBe(0n);
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
-              startTime: new Date(0),
               maxClaimableSupply: 10n,
+              startTime: new Date(0),
             },
           ],
-          tokenId: 0n,
           singlePhaseDrop: true,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       });
 
       const condition = await getClaimConditions({
         contract,
-        tokenId: 0n,
         singlePhaseDrop: true,
+        tokenId: 0n,
       });
       expect(condition.length).to.eq(1);
       expect(condition[0]?.maxClaimableSupply).to.eq(10n);
 
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_C.address,
-        tokenId: 0n,
         quantity: 1n,
         singlePhaseDrop: true,
+        to: TEST_ACCOUNT_C.address,
+        tokenId: 0n,
       });
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_C,
+        transaction: claimTx,
       });
       await expect(
         balanceOf({ contract, owner: TEST_ACCOUNT_C.address, tokenId: 0n }),
@@ -123,21 +122,21 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should allow to claim tokens with an allowlist", async () => {
       const tokenId = 1n;
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
+              maxClaimablePerWallet: 0n,
               overrideList: [
                 { address: TEST_ACCOUNT_C.address, maxClaimable: "100" },
                 { address: VITALIK_WALLET, maxClaimable: "100" },
               ],
-              maxClaimablePerWallet: 0n,
             },
           ],
-          tokenId,
           singlePhaseDrop: true,
+          tokenId,
         }),
-        account: TEST_ACCOUNT_C,
       });
 
       await expect(
@@ -149,10 +148,10 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         transaction: claimTo({
           contract,
           from: TEST_ACCOUNT_C.address,
-          to: TEST_ACCOUNT_B.address,
-          tokenId,
           quantity: 1n,
           singlePhaseDrop: true,
+          to: TEST_ACCOUNT_B.address,
+          tokenId,
         }),
       });
 
@@ -165,10 +164,10 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           account: TEST_ACCOUNT_B,
           transaction: claimTo({
             contract,
-            to: TEST_ACCOUNT_B.address,
-            tokenId,
             quantity: 1n,
             singlePhaseDrop: true,
+            to: TEST_ACCOUNT_B.address,
+            tokenId,
           }),
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
@@ -181,31 +180,31 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should reset claim eligibility", async () => {
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
-              startTime: new Date(0),
-              maxClaimableSupply: 10n,
               maxClaimablePerWallet: 1n,
+              maxClaimableSupply: 10n,
+              startTime: new Date(0),
             },
           ],
-          tokenId: 0n,
           singlePhaseDrop: true,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       });
       // claim one token
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_D.address,
-        tokenId: 0n,
         quantity: 1n,
         singlePhaseDrop: true,
+        to: TEST_ACCOUNT_D.address,
+        tokenId: 0n,
       });
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_D,
+        transaction: claimTx,
       });
       await expect(
         balanceOf({ contract, owner: TEST_ACCOUNT_D.address, tokenId: 0n }),
@@ -214,13 +213,13 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       // attempt to claim another token (this should fail)
       await expect(
         sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_D,
           transaction: claimTo({
-            tokenId: 0n,
             contract,
-            to: TEST_ACCOUNT_D.address,
             quantity: 1n,
+            to: TEST_ACCOUNT_D.address,
+            tokenId: 0n,
           }),
-          account: TEST_ACCOUNT_D,
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
         [TransactionError: Error - !Qty
@@ -231,26 +230,26 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       // reset claim eligibility
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: resetClaimEligibility({
-          tokenId: 0n,
           contract,
           singlePhaseDrop: true,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       });
       // attempt to claim another token (this should succeed)
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_D,
         transaction: claimTo({
-          tokenId: 0n,
           contract,
-          to: TEST_ACCOUNT_D.address,
           quantity: 1n,
+          to: TEST_ACCOUNT_D.address,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_D,
       });
       // check that the account has claimed two tokens
       await expect(
-        balanceOf({ tokenId: 0n, contract, owner: TEST_ACCOUNT_D.address }),
+        balanceOf({ contract, owner: TEST_ACCOUNT_D.address, tokenId: 0n }),
       ).resolves.toBe(2n);
     });
   },
diff --git a/packages/thirdweb/src/extensions/erc1155/drop1155.test.ts b/packages/thirdweb/src/extensions/erc1155/drop1155.test.ts
index ff8188f1c09..6d2b9655f00 100644
--- a/packages/thirdweb/src/extensions/erc1155/drop1155.test.ts
+++ b/packages/thirdweb/src/extensions/erc1155/drop1155.test.ts
@@ -11,7 +11,7 @@ import {
 } from "../../../test/src/test-wallets.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
 import { toEther } from "../../utils/units.js";
@@ -45,8 +45,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
         params: {
-          name: "EditionDrop",
           contractURI: TEST_CONTRACT_URI,
+          name: "EditionDrop",
         },
         type: "DropERC1155",
       });
@@ -54,9 +54,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(contractAddress).toBeDefined();
       const deployedName = await name({
         contract: getContract({
-          client: TEST_CLIENT,
-          chain: ANVIL_CHAIN,
           address: contractAddress,
+          chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
         }),
       });
       expect(deployedName).toBe("EditionDrop");
@@ -82,8 +82,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         ],
       });
       await sendAndConfirmTransaction({
-        transaction: mintTx,
         account: TEST_ACCOUNT_C,
+        transaction: mintTx,
       });
 
       await expect(nextTokenIdToMint({ contract })).resolves.toBe(6n);
@@ -95,12 +95,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should update metadata", async () => {
       const updateTx = updateMetadata({
         contract,
-        targetTokenId: 0n,
         newMetadata: { name: "Test NFT 1" },
+        targetTokenId: 0n,
       });
       await sendAndConfirmTransaction({
-        transaction: updateTx,
         account: TEST_ACCOUNT_C,
+        transaction: updateTx,
       });
       const token0 = await getNFT({ contract, tokenId: 0n });
       expect(token0.metadata.name).toBe("Test NFT 1");
@@ -111,18 +111,18 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         balanceOf({ contract, owner: TEST_ACCOUNT_C.address, tokenId: 0n }),
       ).resolves.toBe(0n);
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
           phases: [{}],
           tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       });
 
       expect(
         await canClaim({
-          contract,
           claimer: TEST_ACCOUNT_C.address,
+          contract,
           quantity: 1n,
           tokenId: 0n,
         }),
@@ -134,13 +134,13 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       const claimTx = claimTo({
         contract,
+        quantity: 1n,
         to: TEST_ACCOUNT_C.address,
         tokenId: 0n,
-        quantity: 1n,
       });
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_C,
+        transaction: claimTx,
       });
       await expect(
         balanceOf({ contract, owner: TEST_ACCOUNT_C.address, tokenId: 0n }),
@@ -152,6 +152,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         balanceOf({ contract, owner: TEST_ACCOUNT_C.address, tokenId: 0n }),
       ).resolves.toBe(1n);
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
           phases: [
@@ -161,13 +162,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           ],
           tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       });
       const claimTx = claimTo({
         contract,
+        quantity: 1n,
         to: TEST_ACCOUNT_C.address,
         tokenId: 0n,
-        quantity: 1n,
       });
       // assert value is set correctly
       const value = await resolvePromisedValue(claimTx.value);
@@ -175,8 +175,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       if (!value) throw new Error("value is undefined");
       expect(toEther(value)).toBe("0.001");
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_C,
+        transaction: claimTx,
       });
       await expect(
         balanceOf({ contract, owner: TEST_ACCOUNT_C.address, tokenId: 0n }),
@@ -187,20 +187,20 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       it("should allow to claim tokens with an allowlist", async () => {
         const tokenId = 1n;
         await sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_C,
           transaction: setClaimConditions({
             contract,
             phases: [
               {
+                maxClaimablePerWallet: 0n,
                 overrideList: [
                   { address: TEST_ACCOUNT_C.address, maxClaimable: "100" },
                   { address: VITALIK_WALLET, maxClaimable: "100" },
                 ],
-                maxClaimablePerWallet: 0n,
               },
             ],
             tokenId,
           }),
-          account: TEST_ACCOUNT_C,
         });
 
         await expect(
@@ -209,8 +209,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
         expect(
           await canClaim({
-            contract,
             claimer: TEST_ACCOUNT_C.address,
+            contract,
             quantity: 1n,
             tokenId,
           }),
@@ -222,8 +222,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
         expect(
           await canClaim({
-            contract,
             claimer: TEST_ACCOUNT_B.address,
+            contract,
             quantity: 1n,
             tokenId,
           }),
@@ -239,9 +239,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           transaction: claimTo({
             contract,
             from: TEST_ACCOUNT_C.address,
+            quantity: 1n,
             to: TEST_ACCOUNT_B.address,
             tokenId,
-            quantity: 1n,
           }),
         });
 
@@ -254,9 +254,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             account: TEST_ACCOUNT_B,
             transaction: claimTo({
               contract,
+              quantity: 1n,
               to: TEST_ACCOUNT_B.address,
               tokenId,
-              quantity: 1n,
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
@@ -270,20 +270,20 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       it("should respect max claimable", async () => {
         const tokenId = 2n;
         await sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_C,
           transaction: setClaimConditions({
             contract,
             phases: [
               {
+                maxClaimablePerWallet: 0n,
                 overrideList: [
                   { address: TEST_ACCOUNT_C.address, maxClaimable: "1" },
                   { address: VITALIK_WALLET, maxClaimable: "3" },
                 ],
-                maxClaimablePerWallet: 0n,
               },
             ],
             tokenId,
           }),
-          account: TEST_ACCOUNT_C,
         });
 
         await expect(
@@ -295,9 +295,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             account: TEST_ACCOUNT_C,
             transaction: claimTo({
               contract,
+              quantity: 2n,
               to: TEST_ACCOUNT_C.address,
               tokenId,
-              quantity: 2n,
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
@@ -311,9 +311,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           account: TEST_ACCOUNT_C,
           transaction: claimTo({
             contract,
+            quantity: 1n,
             to: TEST_ACCOUNT_C.address,
             tokenId,
-            quantity: 1n,
           }),
         });
 
@@ -326,10 +326,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should respect price", async () => {
       const tokenId = 3n;
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
+              maxClaimablePerWallet: 0n,
               overrideList: [
                 {
                   address: TEST_ACCOUNT_C.address,
@@ -337,13 +339,11 @@ describe.runIf(process.env.TW_SECRET_KEY)(
                   price: "0",
                 },
               ],
-              maxClaimablePerWallet: 0n,
               price: "1000",
             },
           ],
           tokenId,
         }),
-        account: TEST_ACCOUNT_C,
       });
 
       await expect(
@@ -354,9 +354,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         account: TEST_ACCOUNT_C,
         transaction: claimTo({
           contract,
+          quantity: 1n,
           to: TEST_ACCOUNT_C.address,
           tokenId,
-          quantity: 1n,
         }),
       });
 
@@ -367,9 +367,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should be able to retrieve multiple phases", async () => {
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
-          tokenId: 5n,
           phases: [
             {
               maxClaimablePerWallet: 1n,
@@ -380,8 +380,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
               startTime: new Date(),
             },
           ],
+          tokenId: 5n,
         }),
-        account: TEST_ACCOUNT_C,
       });
 
       const phases = await getClaimConditions({ contract, tokenId: 5n });
@@ -393,43 +393,43 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should be able to reset claim eligibility", async () => {
       // set claim conditions to only allow one claim
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
-          tokenId: 6n,
           phases: [
             {
               maxClaimablePerWallet: 1n,
             },
           ],
+          tokenId: 6n,
         }),
-        account: TEST_ACCOUNT_C,
       });
       // claim one token
       await sendAndConfirmTransaction({
+        // fresh account to avoid any previous claims
+        account: TEST_ACCOUNT_D,
         transaction: claimTo({
-          tokenId: 6n,
           contract,
+          quantity: 1n,
           // fresh account to avoid any previous claims
           to: TEST_ACCOUNT_D.address,
-          quantity: 1n,
+          tokenId: 6n,
         }),
-        // fresh account to avoid any previous claims
-        account: TEST_ACCOUNT_D,
       });
       // check that the account has claimed one token
       await expect(
-        balanceOf({ tokenId: 6n, contract, owner: TEST_ACCOUNT_D.address }),
+        balanceOf({ contract, owner: TEST_ACCOUNT_D.address, tokenId: 6n }),
       ).resolves.toBe(1n);
       // attempt to claim another token (this should fail)
       await expect(
         sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_D,
           transaction: claimTo({
-            tokenId: 6n,
             contract,
-            to: TEST_ACCOUNT_D.address,
             quantity: 1n,
+            to: TEST_ACCOUNT_D.address,
+            tokenId: 6n,
           }),
-          account: TEST_ACCOUNT_D,
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
         [TransactionError: DropClaimExceedLimit - 1,2
@@ -440,25 +440,25 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       // reset claim eligibility
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: resetClaimEligibility({
-          tokenId: 6n,
           contract,
+          tokenId: 6n,
         }),
-        account: TEST_ACCOUNT_C,
       });
       // attempt to claim another token (this should succeed)
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_D,
         transaction: claimTo({
-          tokenId: 6n,
           contract,
-          to: TEST_ACCOUNT_D.address,
           quantity: 1n,
+          to: TEST_ACCOUNT_D.address,
+          tokenId: 6n,
         }),
-        account: TEST_ACCOUNT_D,
       });
       // check that the account has claimed two tokens
       await expect(
-        balanceOf({ tokenId: 6n, contract, owner: TEST_ACCOUNT_D.address }),
+        balanceOf({ contract, owner: TEST_ACCOUNT_D.address, tokenId: 6n }),
       ).resolves.toBe(2n);
     });
 
@@ -474,42 +474,42 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       // Create a public allowlist claim phase
       const snapshot = [
         {
+          amount: 5,
           recipient: TEST_ACCOUNT_B.address,
           tokenId: 4,
-          amount: 5,
         },
         {
+          amount: 5,
           recipient: TEST_ACCOUNT_D.address,
           tokenId: 4,
-          amount: 5,
         },
       ];
 
       const { merkleRoot } = await generateMerkleTreeInfoERC1155({
         contract,
-        tokenAddress: NATIVE_TOKEN_ADDRESS,
         snapshot,
+        tokenAddress: NATIVE_TOKEN_ADDRESS,
       });
 
       const startTime = new Date();
       const setCC = setClaimConditions({
         contract,
-        tokenId: 4n,
         phases: [
           {
-            maxClaimableSupply: 100n,
-            maxClaimablePerWallet: 5n,
             currencyAddress: NATIVE_TOKEN_ADDRESS,
+            maxClaimablePerWallet: 5n,
+            maxClaimableSupply: 100n,
+            merkleRootHash: merkleRoot,
             price: 0.006,
             startTime,
-            merkleRootHash: merkleRoot,
           },
         ],
+        tokenId: 4n,
       });
 
       await sendAndConfirmTransaction({
-        transaction: setCC,
         account: TEST_ACCOUNT_C,
+        transaction: setCC,
       });
 
       const activeCC = await getActiveClaimCondition({ contract, tokenId: 4n });
diff --git a/packages/thirdweb/src/extensions/erc1155/drops/read/canClaim.ts b/packages/thirdweb/src/extensions/erc1155/drops/read/canClaim.ts
index aea37e7f36a..5835eefc7d2 100644
--- a/packages/thirdweb/src/extensions/erc1155/drops/read/canClaim.ts
+++ b/packages/thirdweb/src/extensions/erc1155/drops/read/canClaim.ts
@@ -45,22 +45,22 @@ export async function canClaim(
       }),
       getClaimParams({
         contract: options.contract,
+        from: options.from,
         quantity: options.quantity,
         to: options.claimer,
-        type: "erc1155",
         tokenId: options.tokenId,
-        from: options.from,
+        type: "erc1155",
       }),
     ]);
   try {
     await verifyClaim({
-      contract: options.contract,
+      allowlistProof,
       claimer: options.claimer,
-      quantity,
+      conditionId,
+      contract: options.contract,
       currency,
       pricePerToken,
-      allowlistProof,
-      conditionId,
+      quantity,
       tokenId: options.tokenId,
     });
     return {
@@ -68,8 +68,8 @@ export async function canClaim(
     };
   } catch (error) {
     return {
+      reason: await extractErrorResult({ contract: options.contract, error }),
       result: false,
-      reason: await extractErrorResult({ error, contract: options.contract }),
     };
   }
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/drops/read/getActiveClaimCondition.ts b/packages/thirdweb/src/extensions/erc1155/drops/read/getActiveClaimCondition.ts
index cc39b32044c..2a2c6c6b74f 100644
--- a/packages/thirdweb/src/extensions/erc1155/drops/read/getActiveClaimCondition.ts
+++ b/packages/thirdweb/src/extensions/erc1155/drops/read/getActiveClaimCondition.ts
@@ -48,14 +48,14 @@ export async function getActiveClaimCondition(
       metadata,
     ] = await claimCondition({ ...options, tokenId: options.tokenId });
     return {
-      startTimestamp,
+      currency,
       maxClaimableSupply,
-      supplyClaimed,
-      quantityLimitPerWallet,
       merkleRoot,
-      pricePerToken,
-      currency,
       metadata,
+      pricePerToken,
+      quantityLimitPerWallet,
+      startTimestamp,
+      supplyClaimed,
     };
   };
   const results = await Promise.allSettled([
diff --git a/packages/thirdweb/src/extensions/erc1155/drops/read/getClaimConditions.ts b/packages/thirdweb/src/extensions/erc1155/drops/read/getClaimConditions.ts
index 1240a547f8f..69c0bc90f91 100644
--- a/packages/thirdweb/src/extensions/erc1155/drops/read/getClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc1155/drops/read/getClaimConditions.ts
@@ -39,14 +39,14 @@ export async function getClaimConditions(
           metadata,
         ]) => [
           {
-            startTimestamp,
+            currency,
             maxClaimableSupply,
-            supplyClaimed,
-            quantityLimitPerWallet,
             merkleRoot,
-            pricePerToken,
-            currency,
             metadata,
+            pricePerToken,
+            quantityLimitPerWallet,
+            startTimestamp,
+            supplyClaimed,
           },
         ],
       );
diff --git a/packages/thirdweb/src/extensions/erc1155/drops/write/claimTo.ts b/packages/thirdweb/src/extensions/erc1155/drops/write/claimTo.ts
index 15fde4bc43e..b29d7a0c603 100644
--- a/packages/thirdweb/src/extensions/erc1155/drops/write/claimTo.ts
+++ b/packages/thirdweb/src/extensions/erc1155/drops/write/claimTo.ts
@@ -53,16 +53,15 @@ export type ClaimToParams = {
  */
 export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
   return GeneratedClaim.claim({
-    contract: options.contract,
     async asyncParams() {
       const params = await getClaimParams({
-        type: "erc1155",
         contract: options.contract,
-        to: options.to,
-        quantity: options.quantity,
         from: options.from,
-        tokenId: options.tokenId,
+        quantity: options.quantity,
         singlePhaseDrop: options.singlePhaseDrop,
+        to: options.to,
+        tokenId: options.tokenId,
+        type: "erc1155",
       });
 
       return {
@@ -70,6 +69,7 @@ export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
         tokenId: options.tokenId,
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc1155/drops/write/resetClaimEligibility.ts b/packages/thirdweb/src/extensions/erc1155/drops/write/resetClaimEligibility.ts
index 22d3d5669ed..935da6b3cbc 100644
--- a/packages/thirdweb/src/extensions/erc1155/drops/write/resetClaimEligibility.ts
+++ b/packages/thirdweb/src/extensions/erc1155/drops/write/resetClaimEligibility.ts
@@ -46,7 +46,6 @@ export function resetClaimEligibility(
 ) {
   if (options.singlePhaseDrop) {
     return setClaimConditionsSinglePhase({
-      contract: options.contract,
       asyncParams: async () => {
         // get existing condition
         const existingCondition = await claimConditionSinglePhase(options).then(
@@ -60,37 +59,36 @@ export function resetClaimEligibility(
             currency,
             metadata,
           ]) => ({
-            startTimestamp,
+            currency,
             maxClaimableSupply,
-            supplyClaimed,
-            quantityLimitPerWallet,
             merkleRoot,
-            pricePerToken,
-            currency,
             metadata,
+            pricePerToken,
+            quantityLimitPerWallet,
+            startTimestamp,
+            supplyClaimed,
           }),
         );
 
         // then simply return the exact same ones, but with the resetClaimEligibility flag set to true
         return {
-          tokenId: options.tokenId,
           // type is necessary because of viem hex shenanigans (strict vs non-strict `0x` prefix string)
           phase: existingCondition,
           resetClaimEligibility: true,
+          tokenId: options.tokenId,
         };
       },
+      contract: options.contract,
     });
   }
   // download existing conditions
   return setClaimConditionsMultiPhase({
-    contract: options.contract,
     asyncParams: async () => {
       // get existing conditions
       const existingConditions = await getClaimConditions(options);
 
       // then simply return the exact same ones, but with the resetClaimEligibility flag set to true
       return {
-        tokenId: options.tokenId,
         // type is necessary because of viem hex shenanigans (strict vs non-strict `0x` prefix string)
         phases: existingConditions as Array<
           ClaimCondition & {
@@ -99,8 +97,10 @@ export function resetClaimEligibility(
           }
         >,
         resetClaimEligibility: true,
+        tokenId: options.tokenId,
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc1155/drops/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/erc1155/drops/write/setClaimConditions.ts
index 171b2f5967e..1590c52dcbd 100644
--- a/packages/thirdweb/src/extensions/erc1155/drops/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc1155/drops/write/setClaimConditions.ts
@@ -52,19 +52,19 @@ export function setClaimConditions(
   options: BaseTransactionOptions<SetClaimConditionsParams>,
 ) {
   return multicall({
-    contract: options.contract,
     asyncParams: async () => {
       return {
         data: await getMulticallSetClaimConditionTransactions({
           contract: options.contract,
           phases: options.phases,
           resetClaimEligibility: options.resetClaimEligibility,
-          tokenId: options.tokenId,
-          tokenDecimals: 0,
           singlePhase: options.singlePhaseDrop,
+          tokenDecimals: 0,
+          tokenId: options.tokenId,
         }),
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc1155/drops/write/updateMetadata.ts b/packages/thirdweb/src/extensions/erc1155/drops/write/updateMetadata.ts
index 92b34859047..35b8e8f8685 100644
--- a/packages/thirdweb/src/extensions/erc1155/drops/write/updateMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc1155/drops/write/updateMetadata.ts
@@ -120,8 +120,8 @@ export function updateMetadata(
 ) {
   const { contract } = options;
   return BatchBaseURI.updateBatchBaseURI({
-    contract,
     asyncParams: async () => getUpdateMetadataParams(options),
+    contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc1155/read/getNFT.ts b/packages/thirdweb/src/extensions/erc1155/read/getNFT.ts
index ed9aa4fcd0d..9d7d9475955 100644
--- a/packages/thirdweb/src/extensions/erc1155/read/getNFT.ts
+++ b/packages/thirdweb/src/extensions/erc1155/read/getNFT.ts
@@ -4,6 +4,7 @@ import { fetchTokenMetadata } from "../../../utils/nft/fetchTokenMetadata.js";
 import { type NFT, parseNFT } from "../../../utils/nft/parseNft.js";
 import { totalSupply } from "../__generated__/IERC1155/read/totalSupply.js";
 import { uri } from "../__generated__/IERC1155/read/uri.js";
+
 export { isUriSupported as isGetNFTSupported } from "../__generated__/IERC1155/read/uri.js";
 
 /**
@@ -51,8 +52,8 @@ async function getNFTFromInsight(
   options: BaseTransactionOptions<GetNFTParams>,
 ): Promise<NFT> {
   const nft = await getNFTInsight({
-    client: options.contract.client,
     chain: options.contract.chain,
+    client: options.contract.client,
     contractAddress: options.contract.address,
     tokenId: options.tokenId,
   });
@@ -88,13 +89,13 @@ async function getNFTFromRPC(
       uri: tokenUri,
     })),
     {
-      tokenId: options.tokenId,
-      tokenUri,
-      type: "ERC1155",
+      chainId: options.contract.chain.id,
       owner: null,
       supply,
       tokenAddress: options.contract.address,
-      chainId: options.contract.chain.id,
+      tokenId: options.tokenId,
+      tokenUri,
+      type: "ERC1155",
     },
   );
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts b/packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts
index dcf7715d39c..5ee21d57249 100644
--- a/packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts
+++ b/packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts
@@ -67,8 +67,8 @@ async function getNFTsFromInsight(
 
   const [result, supply] = await Promise.all([
     getContractNFTs({
-      client: contract.client,
       chains: [contract.chain],
+      client: contract.client,
       contractAddress: contract.address,
       queryOptions: {
         limit: count,
diff --git a/packages/thirdweb/src/extensions/erc1155/read/getOwnedNFTs.test.ts b/packages/thirdweb/src/extensions/erc1155/read/getOwnedNFTs.test.ts
index 4b36938bd56..d113ba4430e 100644
--- a/packages/thirdweb/src/extensions/erc1155/read/getOwnedNFTs.test.ts
+++ b/packages/thirdweb/src/extensions/erc1155/read/getOwnedNFTs.test.ts
@@ -6,8 +6,8 @@ import { getOwnedNFTs } from "./getOwnedNFTs.js";
 describe.runIf(process.env.TW_SECRET_KEY)("erc1155.getOwnedNFTs", () => {
   it("with indexer", async () => {
     const nfts = await getOwnedNFTs({
-      contract: DROP1155_CONTRACT,
       address: "0x00d4da27dedce60f859471d8f595fdb4ae861557",
+      contract: DROP1155_CONTRACT,
     });
     expect(nfts.length).toBe(3);
     expect(nfts.find((nft) => nft.id === 4n)?.quantityOwned).toBe(411n);
@@ -15,8 +15,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc1155.getOwnedNFTs", () => {
 
   it("without indexer", async () => {
     const nfts = await getOwnedNFTs({
-      contract: DROP1155_CONTRACT,
       address: "0x00d4da27dedce60f859471d8f595fdb4ae861557",
+      contract: DROP1155_CONTRACT,
       useIndexer: false,
     });
     expect(nfts.length).toBe(3);
diff --git a/packages/thirdweb/src/extensions/erc1155/read/getOwnedNFTs.ts b/packages/thirdweb/src/extensions/erc1155/read/getOwnedNFTs.ts
index 85fa55dada6..a66b62a58dd 100644
--- a/packages/thirdweb/src/extensions/erc1155/read/getOwnedNFTs.ts
+++ b/packages/thirdweb/src/extensions/erc1155/read/getOwnedNFTs.ts
@@ -59,8 +59,8 @@ async function getOwnedNFTsFromInsight(
   // TODO (insight): add support for contract address filters
   while (hasMore) {
     const pageResults = await getInsightNFTs({
-      client: options.contract.client,
       chains: [options.contract.chain],
+      client: options.contract.client,
       ownerAddress: options.address,
       queryOptions: {
         limit,
diff --git a/packages/thirdweb/src/extensions/erc1155/read/getOwnedTokenIds.ts b/packages/thirdweb/src/extensions/erc1155/read/getOwnedTokenIds.ts
index a6c6374028f..fa436e1b980 100644
--- a/packages/thirdweb/src/extensions/erc1155/read/getOwnedTokenIds.ts
+++ b/packages/thirdweb/src/extensions/erc1155/read/getOwnedTokenIds.ts
@@ -74,8 +74,8 @@ export async function getOwnedTokenIds(
   let ownedBalances = balances
     .map((b, i) => {
       return {
-        tokenId: BigInt(i),
         balance: b,
+        tokenId: BigInt(i),
       };
     })
     .filter((b) => b.balance > 0);
diff --git a/packages/thirdweb/src/extensions/erc1155/token1155.test.ts b/packages/thirdweb/src/extensions/erc1155/token1155.test.ts
index 6658d4b8f42..170d15f7ef9 100644
--- a/packages/thirdweb/src/extensions/erc1155/token1155.test.ts
+++ b/packages/thirdweb/src/extensions/erc1155/token1155.test.ts
@@ -9,7 +9,7 @@ import {
   TEST_ACCOUNT_C,
 } from "../../../test/src/test-wallets.js";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { name } from "../common/read/name.js";
 import { deployERC1155Contract } from "../prebuilts/deploy-erc1155.js";
@@ -38,8 +38,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       params: {
-        name: "Edition",
         contractURI: TEST_CONTRACT_URI,
+        name: "Edition",
       },
       type: "TokenERC1155",
     });
@@ -47,9 +47,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
     expect(contractAddress).toBeDefined();
     const deployedName = await name({
       contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address: contractAddress,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       }),
     });
     expect(deployedName).toBe("Edition");
@@ -69,13 +69,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
     // mint 1 token
     const mintTx = mintTo({
       contract,
-      to: TEST_ACCOUNT_A.address,
-      supply: 10n,
       nft: { name: "Test NFT" },
+      supply: 10n,
+      to: TEST_ACCOUNT_A.address,
     });
     await sendAndConfirmTransaction({
-      transaction: mintTx,
       account: TEST_ACCOUNT_A,
+      transaction: mintTx,
     });
 
     // now 1 token minted
@@ -94,14 +94,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
     // mint additional supply
     const mintTx2 = mintAdditionalSupplyTo({
       contract,
-      to: TEST_ACCOUNT_A.address,
       supply: 5n,
+      to: TEST_ACCOUNT_A.address,
       tokenId: 0n,
     });
 
     await sendAndConfirmTransaction({
-      transaction: mintTx2,
       account: TEST_ACCOUNT_A,
+      transaction: mintTx2,
     });
 
     // still 1 token minted
@@ -120,14 +120,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
     // mint a second token
     const mintTx3 = mintTo({
       contract,
-      to: TEST_ACCOUNT_B.address,
-      supply: 5n,
       nft: { name: "Test NFT 2" },
+      supply: 5n,
+      to: TEST_ACCOUNT_B.address,
     });
 
     await sendAndConfirmTransaction({
-      transaction: mintTx3,
       account: TEST_ACCOUNT_A,
+      transaction: mintTx3,
     });
 
     // now 2 tokens minted
@@ -152,12 +152,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
   // tokenId #0 is updated in this test
   it("should update tokenURI", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: updateTokenURI({
         contract,
         newMetadata: { name: "Test1 Updated" },
         tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_A,
     });
     const nft = await getNFT({ contract, tokenId: 0n });
     expect(nft.metadata.name).toBe("Test1 Updated");
@@ -165,13 +165,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
 
   it("should mint with `nft` being declared as a string", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: mintTo({
         contract,
         nft: TEST_CONTRACT_URI,
-        to: TEST_ACCOUNT_A.address,
         supply: 1n,
+        to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     const tokenUri = await uri({ contract, tokenId: 2n });
@@ -191,12 +191,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
       account: TEST_ACCOUNT_A,
       transaction: mintToBatch({
         contract,
-        to: TEST_ACCOUNT_C.address,
         nfts: [
           { metadata: { name: "batch token 0" }, supply: 1n },
           { metadata: { name: "batch token 1" }, supply: 2n },
           { metadata: { name: "batch token 2" }, supply: 3n },
         ],
+        to: TEST_ACCOUNT_C.address,
       }),
     });
 
@@ -209,13 +209,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
 
   it("getOwnedTokenIds should work", async () => {
     const ownedTokenIds = await getOwnedTokenIds({
-      contract,
       address: TEST_ACCOUNT_C.address,
+      contract,
     });
     expect(ownedTokenIds).toStrictEqual([
-      { tokenId: 3n, balance: 1n },
-      { tokenId: 4n, balance: 2n },
-      { tokenId: 5n, balance: 3n },
+      { balance: 1n, tokenId: 3n },
+      { balance: 2n, tokenId: 4n },
+      { balance: 3n, tokenId: 5n },
     ]);
   });
 
@@ -225,23 +225,23 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
       transaction: mintAdditionalSupplyToBatch({
         contract,
         nfts: [
-          { tokenId: 3n, supply: 99n, to: TEST_ACCOUNT_C.address },
-          { tokenId: 4n, supply: 94n, to: TEST_ACCOUNT_C.address },
-          { tokenId: 5n, supply: 97n, to: TEST_ACCOUNT_C.address },
-          { tokenId: 3n, supply: 4n, to: TEST_ACCOUNT_C.address },
+          { supply: 99n, to: TEST_ACCOUNT_C.address, tokenId: 3n },
+          { supply: 94n, to: TEST_ACCOUNT_C.address, tokenId: 4n },
+          { supply: 97n, to: TEST_ACCOUNT_C.address, tokenId: 5n },
+          { supply: 4n, to: TEST_ACCOUNT_C.address, tokenId: 3n },
         ],
       }),
     });
 
     const ownedTokenIds = await getOwnedTokenIds({
-      contract,
       address: TEST_ACCOUNT_C.address,
+      contract,
     });
 
     expect(ownedTokenIds).toStrictEqual([
-      { tokenId: 3n, balance: 104n },
-      { tokenId: 4n, balance: 96n },
-      { tokenId: 5n, balance: 100n },
+      { balance: 104n, tokenId: 3n },
+      { balance: 96n, tokenId: 4n },
+      { balance: 100n, tokenId: 5n },
     ]);
   });
 });
diff --git a/packages/thirdweb/src/extensions/erc1155/write/lazyMint.ts b/packages/thirdweb/src/extensions/erc1155/write/lazyMint.ts
index 572598c6ab9..d9227917f83 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/lazyMint.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/lazyMint.ts
@@ -62,7 +62,6 @@ export type LazyMintParams = {
  */
 export function lazyMint(options: BaseTransactionOptions<LazyMintParams>) {
   return LazyMint.lazyMint({
-    contract: options.contract,
     asyncParams: async () => {
       const startFileNumber = await nextTokenIdToMint({
         contract: options.contract,
@@ -83,6 +82,7 @@ export function lazyMint(options: BaseTransactionOptions<LazyMintParams>) {
         extraData: "0x",
       } as const;
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyTo.ts b/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyTo.ts
index c5c046de9fb..29316f4cec5 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyTo.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyTo.ts
@@ -37,15 +37,15 @@ export function mintAdditionalSupplyTo(
   options: BaseTransactionOptions<MintAdditionalSupplyToParams>,
 ) {
   return MintTo.mintTo({
-    contract: options.contract,
     asyncParams: async () => {
       return {
-        to: options.to,
-        tokenId: options.tokenId,
-        uri: "", // contract will maintain the existing token URI
         amount: options.supply,
+        to: options.to,
+        tokenId: options.tokenId, // contract will maintain the existing token URI
+        uri: "",
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyToBatch.test.ts b/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyToBatch.test.ts
index bcd87076aaa..4a49a3f90e8 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyToBatch.test.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyToBatch.test.ts
@@ -8,13 +8,13 @@ describe("ERC1155 Edition: mintToBatch", () => {
   it("should optimize the mint content", () => {
     expect(
       optimizeMintBatchContent([
-        { tokenId: 0n, supply: 99n, to: account.address },
-        { tokenId: 1n, supply: 49n, to: account.address },
-        { tokenId: 1n, supply: 51n, to: account.address },
+        { supply: 99n, to: account.address, tokenId: 0n },
+        { supply: 49n, to: account.address, tokenId: 1n },
+        { supply: 51n, to: account.address, tokenId: 1n },
       ]),
     ).toStrictEqual([
-      { tokenId: 0n, supply: 99n, to: account.address },
-      { tokenId: 1n, supply: 100n, to: account.address },
+      { supply: 99n, to: account.address, tokenId: 0n },
+      { supply: 100n, to: account.address, tokenId: 1n },
     ]);
   });
 });
diff --git a/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyToBatch.ts b/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyToBatch.ts
index 09a9c64da29..391765d3544 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyToBatch.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/mintAdditionalSupplyToBatch.ts
@@ -40,7 +40,6 @@ export function mintAdditionalSupplyToBatch(
   options: BaseTransactionOptions<MintAdditionalSupplyToBatchParams>,
 ) {
   return multicall({
-    contract: options.contract,
     asyncParams: async () => {
       const nfts = optimizeMintBatchContent(options.nfts);
       const data = await Promise.all(
@@ -50,15 +49,16 @@ export function mintAdditionalSupplyToBatch(
             tokenId: nft.tokenId,
           });
           return encodeMintTo({
+            amount: nft.supply,
             to: nft.to,
             tokenId: nft.tokenId,
-            amount: nft.supply,
             uri: tokenUri,
           });
         }),
       );
       return { data };
     },
+    contract: options.contract,
     overrides: options.overrides,
   });
 }
@@ -94,9 +94,9 @@ export function optimizeMintBatchContent(
     );
     if (matchingIndex !== -1) {
       results[matchingIndex] = {
+        supply: item.supply + (results[matchingIndex]?.supply || 0n),
         to: item.to,
         tokenId: item.tokenId,
-        supply: item.supply + (results[matchingIndex]?.supply || 0n),
       };
     } else {
       results.push(item);
diff --git a/packages/thirdweb/src/extensions/erc1155/write/mintTo.ts b/packages/thirdweb/src/extensions/erc1155/write/mintTo.ts
index 1823730e43a..37e3d01a15f 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/mintTo.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/mintTo.ts
@@ -46,7 +46,6 @@ export type MintToParams = WithOverrides<{
  */
 export function mintTo(options: BaseTransactionOptions<MintToParams>) {
   return generatedMintTo({
-    contract: options.contract,
     asyncParams: async () => {
       let tokenUri: string;
 
@@ -64,13 +63,14 @@ export function mintTo(options: BaseTransactionOptions<MintToParams>) {
         });
       }
       return {
+        amount: options.supply,
+        overrides: options.overrides,
         to: options.to,
         // maxUint256 is used to indicate that this is a NEW token!
         tokenId: maxUint256,
         uri: tokenUri,
-        amount: options.supply,
-        overrides: options.overrides,
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/write/mintToBatch.ts b/packages/thirdweb/src/extensions/erc1155/write/mintToBatch.ts
index 459acd3c475..7dfb2cfcd5a 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/mintToBatch.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/mintToBatch.ts
@@ -82,7 +82,6 @@ export function mintToBatch(
   options: BaseTransactionOptions<MintToBatchParams>,
 ) {
   return multicall({
-    contract: options.contract,
     asyncParams: async () => {
       const data = await Promise.all(
         options.nfts.map(async (nft) => {
@@ -94,16 +93,17 @@ export function mintToBatch(
                   files: [nft.metadata],
                 });
           return encodeMintTo({
+            amount: nft.supply,
             to: options.to,
             // maxUint256 is used to indicate that this is a NEW token!
             tokenId: maxUint256,
             uri,
-            amount: nft.supply,
           });
         }),
       );
       return { data };
     },
+    contract: options.contract,
     overrides: options.overrides,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/write/sigMint.ts b/packages/thirdweb/src/extensions/erc1155/write/sigMint.ts
index aaa605777e2..98e394c407c 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/sigMint.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/sigMint.ts
@@ -1,8 +1,8 @@
 import type { AbiParameterToPrimitiveType, Address } from "abitype";
 import { maxUint256 } from "ox/Solidity";
 import {
-  NATIVE_TOKEN_ADDRESS,
   isNativeTokenAddress,
+  NATIVE_TOKEN_ADDRESS,
 } from "../../../constants/addresses.js";
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
@@ -13,8 +13,8 @@ import type { NFTInput } from "../../../utils/nft/parseNft.js";
 import { randomBytesHex } from "../../../utils/random.js";
 import type { Account } from "../../../wallets/interfaces/wallet.js";
 import {
-  type MintWithSignatureParams,
   mintWithSignature as generatedMintWithSignature,
+  type MintWithSignatureParams,
 } from "../__generated__/ISignatureMintERC1155/write/mintWithSignature.js";
 
 /**
@@ -112,8 +112,8 @@ export async function generateMintSignature(
         );
         return await convertErc20Amount({
           amount: mintRequest.pricePerToken,
-          client: contract.client,
           chain: contract.chain,
+          client: contract.client,
           erc20Address: currency,
         });
       }
@@ -150,33 +150,33 @@ export async function generateMintSignature(
   const endTime = mintRequest.validityEndTimestamp || tenYearsFromNow();
 
   const payload: PayloadType = {
-    uri,
     currency,
-    uid,
     pricePerToken,
+    primarySaleRecipient: mintRequest.primarySaleRecipient || account.address,
+    quantity: mintRequest.quantity,
+    royaltyBps: toBigInt(mintRequest.royaltyBps || 0),
+    royaltyRecipient: mintRequest.royaltyRecipient || account.address,
+    to: mintRequest.to,
     tokenId:
       "tokenId" in mintRequest && mintRequest.tokenId !== undefined
         ? mintRequest.tokenId
         : maxUint256,
-    quantity: mintRequest.quantity,
-    to: mintRequest.to,
-    royaltyRecipient: mintRequest.royaltyRecipient || account.address,
-    royaltyBps: toBigInt(mintRequest.royaltyBps || 0),
-    primarySaleRecipient: mintRequest.primarySaleRecipient || account.address,
-    validityStartTimestamp: dateToSeconds(startTime),
+    uid,
+    uri,
     validityEndTimestamp: dateToSeconds(endTime),
+    validityStartTimestamp: dateToSeconds(startTime),
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: options.contractType || "TokenERC1155",
-      version: "1",
       chainId: contract.chain.id,
+      name: options.contractType || "TokenERC1155",
       verifyingContract: contract.address as Hex,
+      version: "1",
     },
-    types: { MintRequest: MintRequest1155 },
-    primaryType: "MintRequest",
     message: payload,
+    primaryType: "MintRequest",
+    types: { MintRequest: MintRequest1155 },
   });
   return { payload, signature };
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/write/sigMint1155.test.ts b/packages/thirdweb/src/extensions/erc1155/write/sigMint1155.test.ts
index 91585902271..15ab9956562 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/sigMint1155.test.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/sigMint1155.test.ts
@@ -8,8 +8,8 @@ import {
 } from "../../../../test/src/test-wallets.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { toHex } from "../../../utils/encoding/hex.js";
@@ -58,18 +58,18 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature1155", () => {
 
   it("should generate a mint signature and mint an NFT", async () => {
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc1155Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
-        quantity: 10n,
-        pricePerToken: "0.1",
         metadata: {
-          name: "My NFT",
           description: "This is my NFT",
           image: "https://example.com/image.png",
+          name: "My NFT",
         },
+        pricePerToken: "0.1",
+        quantity: 10n,
+        to: TEST_ACCOUNT_B.address,
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc1155Contract,
     });
     const transaction = mintWithSignature({
       contract: erc1155Contract,
@@ -77,8 +77,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature1155", () => {
       signature,
     });
     const { transactionHash } = await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     expect(transactionHash.length).toBe(66);
     const nft = await getNFT({
@@ -94,13 +94,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature1155", () => {
 
   it("should mint additional supply", async () => {
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc1155Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
         quantity: 5n,
+        to: TEST_ACCOUNT_B.address,
         tokenId: 0n,
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc1155Contract,
     });
     const transaction = mintWithSignature({
       contract: erc1155Contract,
@@ -108,8 +108,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature1155", () => {
       signature,
     });
     const { transactionHash } = await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     expect(transactionHash.length).toBe(66);
     const nft = await getNFT({
@@ -125,13 +125,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature1155", () => {
 
   it("should generate a mint signature with default values", async () => {
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc1155Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
-        quantity: 10n,
         metadata: "https://example.com/token",
+        quantity: 10n,
+        to: TEST_ACCOUNT_B.address,
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc1155Contract,
     });
 
     expect(payload.to).toBe(TEST_ACCOUNT_B.address);
@@ -154,8 +154,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature1155", () => {
       signature,
     });
     const { transactionHash } = await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     expect(transactionHash.length).toBe(66);
   });
@@ -163,21 +163,21 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature1155", () => {
   it("should generate a mint signature with custom values", async () => {
     const uid = toHex("abcdef1234567890", { size: 32 });
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc1155Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
+        currency: erc20TokenContract.address,
+        pricePerToken: "0.2",
+        primarySaleRecipient: TEST_ACCOUNT_A.address,
         quantity: 10n,
-        royaltyRecipient: TEST_ACCOUNT_B.address,
         royaltyBps: 500,
-        primarySaleRecipient: TEST_ACCOUNT_A.address,
+        royaltyRecipient: TEST_ACCOUNT_B.address,
+        to: TEST_ACCOUNT_B.address,
         tokenId: 0n,
-        pricePerToken: "0.2",
-        currency: erc20TokenContract.address,
-        validityStartTimestamp: new Date(1635724800),
-        validityEndTimestamp: new Date(1867260800),
         uid,
+        validityEndTimestamp: new Date(1867260800),
+        validityStartTimestamp: new Date(1635724800),
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc1155Contract,
     });
 
     expect(payload.to).toBe(TEST_ACCOUNT_B.address);
@@ -197,21 +197,21 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature1155", () => {
 
   it("should generate a mint signature with custom values", async () => {
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc1155Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
+        currency: erc20TokenContract.address,
+        pricePerToken: "0.2",
+        primarySaleRecipient: TEST_ACCOUNT_A.address,
         quantity: 10n,
-        royaltyRecipient: TEST_ACCOUNT_B.address,
         royaltyBps: 500,
-        primarySaleRecipient: TEST_ACCOUNT_A.address,
+        royaltyRecipient: TEST_ACCOUNT_B.address,
+        to: TEST_ACCOUNT_B.address,
         tokenId: 0n,
-        pricePerToken: "0.2",
-        currency: erc20TokenContract.address,
-        validityStartTimestamp: new Date(1635724800),
-        validityEndTimestamp: new Date(1867260800),
         uid: "abcdef1234567890",
+        validityEndTimestamp: new Date(1867260800),
+        validityStartTimestamp: new Date(1635724800),
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc1155Contract,
     });
 
     expect(payload.to).toBe(TEST_ACCOUNT_B.address);
diff --git a/packages/thirdweb/src/extensions/erc1155/write/updateTokenURI.ts b/packages/thirdweb/src/extensions/erc1155/write/updateTokenURI.ts
index 7ffafbb2905..78656291eea 100644
--- a/packages/thirdweb/src/extensions/erc1155/write/updateTokenURI.ts
+++ b/packages/thirdweb/src/extensions/erc1155/write/updateTokenURI.ts
@@ -45,8 +45,8 @@ export function updateTokenURI(
 ) {
   const { contract } = options;
   return setTokenURI({
-    contract,
     asyncParams: async () => getUpdateTokenParams(options),
+    contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc1271/__generated__/isValidSignature/read/isValidSignature.ts b/packages/thirdweb/src/extensions/erc1271/__generated__/isValidSignature/read/isValidSignature.ts
index b276e41eaab..cfc9abc6131 100644
--- a/packages/thirdweb/src/extensions/erc1271/__generated__/isValidSignature/read/isValidSignature.ts
+++ b/packages/thirdweb/src/extensions/erc1271/__generated__/isValidSignature/read/isValidSignature.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isValidSignature" function.
@@ -17,12 +17,12 @@ export type IsValidSignatureParams = {
 export const FN_SELECTOR = "0x1626ba7e" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "hash",
+    type: "bytes32",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1271/checkContractWalletSignature.ts b/packages/thirdweb/src/extensions/erc1271/checkContractWalletSignature.ts
index 70bf60d8c33..48e080adf35 100644
--- a/packages/thirdweb/src/extensions/erc1271/checkContractWalletSignature.ts
+++ b/packages/thirdweb/src/extensions/erc1271/checkContractWalletSignature.ts
@@ -1,4 +1,4 @@
-import { type SignableMessage, hashMessage } from "viem";
+import { hashMessage, type SignableMessage } from "viem";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import { isHex } from "../../utils/encoding/hex.js";
 import { isValidSignature } from "./__generated__/isValidSignature/read/isValidSignature.js";
diff --git a/packages/thirdweb/src/extensions/erc1271/checkContractWalletSignedTypedData.ts b/packages/thirdweb/src/extensions/erc1271/checkContractWalletSignedTypedData.ts
index ded7a836a8d..6b5b8bbc5f7 100644
--- a/packages/thirdweb/src/extensions/erc1271/checkContractWalletSignedTypedData.ts
+++ b/packages/thirdweb/src/extensions/erc1271/checkContractWalletSignedTypedData.ts
@@ -51,8 +51,8 @@ export async function checkContractWalletSignedTypedData<
   const result = await isValidSignature({
     contract: options.contract,
     hash: ox__TypedData.hashStruct({
-      primaryType: options.data.primaryType,
       data: options.data.message as Record<string, unknown>,
+      primaryType: options.data.primaryType,
       types: options.data.types as ox__TypedData.Definition["types"],
     }),
     signature: options.signature,
diff --git a/packages/thirdweb/src/extensions/erc165/__generated__/IERC165/read/supportsInterface.ts b/packages/thirdweb/src/extensions/erc165/__generated__/IERC165/read/supportsInterface.ts
index da351e0658d..15c9f31dc9b 100644
--- a/packages/thirdweb/src/extensions/erc165/__generated__/IERC165/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/erc165/__generated__/IERC165/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceId",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc1822/__generated__/IERC1822Proxiable/read/proxiableUUID.ts b/packages/thirdweb/src/extensions/erc1822/__generated__/IERC1822Proxiable/read/proxiableUUID.ts
index e3d2a786c0f..e2032fab9d0 100644
--- a/packages/thirdweb/src/extensions/erc1822/__generated__/IERC1822Proxiable/read/proxiableUUID.ts
+++ b/packages/thirdweb/src/extensions/erc1822/__generated__/IERC1822Proxiable/read/proxiableUUID.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x52d1902d" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/DropERC20/read/verifyClaim.ts b/packages/thirdweb/src/extensions/erc20/__generated__/DropERC20/read/verifyClaim.ts
index 5033086ff1f..22b945be9c4 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/DropERC20/read/verifyClaim.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/DropERC20/read/verifyClaim.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verifyClaim" function.
@@ -36,52 +36,52 @@ export type VerifyClaimParams = {
 export const FN_SELECTOR = "0x23a2902b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_conditionId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_claimer",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_pricePerToken",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "_allowlistProof",
     components: [
       {
-        type: "bytes32[]",
         name: "proof",
+        type: "bytes32[]",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
     ],
+    name: "_allowlistProof",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "isOverride",
+    type: "bool",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20/events/AirdropFailed.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20/events/AirdropFailed.ts
index cd60467baae..b84ff753d85 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20/events/AirdropFailed.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20/events/AirdropFailed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AirdropFailed" event.
@@ -46,8 +46,8 @@ export type AirdropFailedEventFilters = Partial<{
  */
 export function airdropFailedEvent(filters: AirdropFailedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event AirdropFailed(address indexed tokenAddress, address indexed tokenOwner, address indexed recipient, uint256 amount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20/write/airdropERC20.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20/write/airdropERC20.ts
index 9499d363326..78ffaebbb8c 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20/write/airdropERC20.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20/write/airdropERC20.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC20" function.
@@ -33,26 +33,26 @@ export type AirdropERC20Params = WithOverrides<{
 export const FN_SELECTOR = "0x0670b2b3" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenAddress",
+    type: "address",
   },
   {
-    type: "address",
     name: "tokenOwner",
+    type: "address",
   },
   {
-    type: "tuple[]",
-    name: "contents",
     components: [
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "amount",
+        type: "uint256",
       },
     ],
+    name: "contents",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -160,8 +160,19 @@ export function airdropERC20(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -171,16 +182,5 @@ export function airdropERC20(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20Claimable/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20Claimable/events/TokensClaimed.ts
index 980f90c08d6..051402a467d 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20Claimable/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20Claimable/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -40,8 +40,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(address indexed claimer, address indexed receiver, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20Claimable/write/claim.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20Claimable/write/claim.ts
index 315fd89acb6..ede95cd288e 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20Claimable/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IAirdropERC20Claimable/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -24,20 +24,20 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x3b4b57b0" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "quantity",
+    type: "uint256",
   },
   {
-    type: "bytes32[]",
     name: "proofs",
+    type: "bytes32[]",
   },
   {
-    type: "uint256",
     name: "proofMaxQuantityForWallet",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -147,8 +147,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -159,16 +170,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IBurnableERC20/write/burn.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IBurnableERC20/write/burn.ts
index 14e6c3521f6..023c029e5a1 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IBurnableERC20/write/burn.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IBurnableERC20/write/burn.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "burn" function.
@@ -18,8 +18,8 @@ export type BurnParams = WithOverrides<{
 export const FN_SELECTOR = "0x42966c68" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function burn(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IBurnableERC20/write/burnFrom.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IBurnableERC20/write/burnFrom.ts
index 0a39df5ef61..bdf88fcc32f 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IBurnableERC20/write/burnFrom.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IBurnableERC20/write/burnFrom.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "burnFrom" function.
@@ -19,12 +19,12 @@ export type BurnFromParams = WithOverrides<{
 export const FN_SELECTOR = "0x79cc6790" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -123,23 +123,23 @@ export function burnFrom(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.account, resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.account, resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/events/TokensClaimed.ts
index 32ae497829f..82f026e2b60 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -46,8 +46,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(uint256 indexed claimConditionIndex, address indexed claimer, address indexed receiver, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/claimCondition.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/claimCondition.ts
index 543ca00aeb3..76f6e75d5cc 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/claimCondition.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/claimCondition.ts
@@ -1,20 +1,19 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xd637ed59" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "currentStartId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "count",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/getActiveClaimConditionId.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/getActiveClaimConditionId.ts
index 8874f1f8b77..d05c49e0642 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/getActiveClaimConditionId.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/getActiveClaimConditionId.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xc68907de" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/getClaimConditionById.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/getClaimConditionById.ts
index a0bff681c08..2230db5b8b9 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/getClaimConditionById.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/read/getClaimConditionById.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getClaimConditionById" function.
@@ -19,48 +19,48 @@ export type GetClaimConditionByIdParams = {
 export const FN_SELECTOR = "0x6f8934f4" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_conditionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "condition",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "condition",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/write/claim.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/write/claim.ts
index 2c1aabd1066..0a71bc9edcb 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -35,46 +35,46 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x84bb1e42" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "pricePerToken",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "allowlistProof",
     components: [
       {
-        type: "bytes32[]",
         name: "proof",
+        type: "bytes32[]",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
     ],
+    name: "allowlistProof",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -192,8 +192,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -206,16 +217,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/write/setClaimConditions.ts
index dbfd5398c08..1409455f1aa 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IDropERC20/write/setClaimConditions.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimConditions" function.
@@ -35,46 +35,46 @@ export type SetClaimConditionsParams = WithOverrides<{
 export const FN_SELECTOR = "0x74bc7db7" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "phases",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "phases",
+    type: "tuple[]",
   },
   {
-    type: "bool",
     name: "resetClaimEligibility",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -180,8 +180,19 @@ export function setClaimConditions(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -190,16 +201,5 @@ export function setClaimConditions(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/events/Approval.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/events/Approval.ts
index 83c90ba1373..5f51e60e237 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/events/Approval.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/events/Approval.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Approval" event.
@@ -40,8 +40,8 @@ export type ApprovalEventFilters = Partial<{
  */
 export function approvalEvent(filters: ApprovalEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Approval(address indexed owner, address indexed spender, uint256 value)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/events/Transfer.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/events/Transfer.ts
index 392798f0938..ca3bdadb5e5 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/events/Transfer.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/events/Transfer.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Transfer" event.
@@ -40,8 +40,8 @@ export type TransferEventFilters = Partial<{
  */
 export function transferEvent(filters: TransferEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Transfer(address indexed from, address indexed to, uint256 value)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/allowance.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/allowance.ts
index 90f936573ff..64452c82fa1 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/allowance.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/allowance.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "allowance" function.
@@ -17,12 +17,12 @@ export type AllowanceParams = {
 export const FN_SELECTOR = "0xdd62ed3e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
   {
-    type: "address",
     name: "spender",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/balanceOf.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/balanceOf.ts
index 05bfa99e8b9..4a5e362ea45 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/balanceOf.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/balanceOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "balanceOf" function.
@@ -16,8 +16,8 @@ export type BalanceOfParams = {
 export const FN_SELECTOR = "0x70a08231" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_address",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/decimals.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/decimals.ts
index e713101a8f2..7c6f025f370 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/decimals.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/decimals.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x313ce567" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/totalSupply.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/totalSupply.ts
index a40ddadb5ea..315fc80ca09 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/totalSupply.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/read/totalSupply.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x18160ddd" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/approve.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/approve.ts
index c3071082e4e..1e297ba3bdf 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/approve.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/approve.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "approve" function.
@@ -19,12 +19,12 @@ export type ApproveParams = WithOverrides<{
 export const FN_SELECTOR = "0x095ea7b3" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "spender",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -127,23 +127,23 @@ export function approve(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.spender, resolvedOptions.value] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.spender, resolvedOptions.value] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/transfer.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/transfer.ts
index bb688023945..409dcfe395b 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/transfer.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/transfer.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transfer" function.
@@ -19,12 +19,12 @@ export type TransferParams = WithOverrides<{
 export const FN_SELECTOR = "0xa9059cbb" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -127,23 +127,23 @@ export function transfer(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.to, resolvedOptions.value] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.to, resolvedOptions.value] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/transferFrom.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/transferFrom.ts
index 84e581ee5d0..a1283faf7e1 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/transferFrom.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20/write/transferFrom.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transferFrom" function.
@@ -20,16 +20,16 @@ export type TransferFromParams = WithOverrides<{
 export const FN_SELECTOR = "0x23b872dd" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -141,8 +141,19 @@ export function transferFrom(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -152,16 +163,5 @@ export function transferFrom(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/read/DOMAIN_SEPARATOR.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/read/DOMAIN_SEPARATOR.ts
index f3088be371b..77488bf42f4 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/read/DOMAIN_SEPARATOR.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/read/DOMAIN_SEPARATOR.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3644e515" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/read/nonces.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/read/nonces.ts
index 0785785f1cf..62a9e4df4ca 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/read/nonces.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/read/nonces.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "nonces" function.
@@ -16,8 +16,8 @@ export type NoncesParams = {
 export const FN_SELECTOR = "0x7ecebe00" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/write/permit.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/write/permit.ts
index 196dae6e56c..67ffe7a6329 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/write/permit.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IERC20Permit/write/permit.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "permit" function.
@@ -24,32 +24,32 @@ export type PermitParams = WithOverrides<{
 export const FN_SELECTOR = "0xd505accf" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
   {
-    type: "address",
     name: "spender",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "deadline",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "v",
+    type: "uint8",
   },
   {
-    type: "bytes32",
     name: "r",
+    type: "bytes32",
   },
   {
-    type: "bytes32",
     name: "s",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -171,8 +171,19 @@ export function permit(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -186,16 +197,5 @@ export function permit(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IMintableERC20/events/TokensMinted.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IMintableERC20/events/TokensMinted.ts
index 6b64f961507..b1453037bfc 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IMintableERC20/events/TokensMinted.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IMintableERC20/events/TokensMinted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMinted" event.
@@ -34,8 +34,8 @@ export type TokensMintedEventFilters = Partial<{
  */
 export function tokensMintedEvent(filters: TokensMintedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMinted(address indexed mintedTo, uint256 quantityMinted)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IMintableERC20/write/mintTo.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IMintableERC20/write/mintTo.ts
index e0db2221abd..b975e1f1ded 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IMintableERC20/write/mintTo.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IMintableERC20/write/mintTo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintTo" function.
@@ -19,12 +19,12 @@ export type MintToParams = WithOverrides<{
 export const FN_SELECTOR = "0x449a52f8" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -123,23 +123,23 @@ export function mintTo(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.to, resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.to, resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/events/TokensMintedWithSignature.ts b/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/events/TokensMintedWithSignature.ts
index edb03b78b32..77164157de7 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/events/TokensMintedWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/events/TokensMintedWithSignature.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMintedWithSignature" event.
@@ -42,8 +42,8 @@ export function tokensMintedWithSignatureEvent(
   filters: TokensMintedWithSignatureEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, (address to, address primarySaleRecipient, uint256 quantity, uint256 price, address currency, uint128 validityStartTimestamp, uint128 validityEndTimestamp, bytes32 uid) mintRequest)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/read/verify.ts b/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/read/verify.ts
index 3d910a7024d..bf47fbaaf53 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/read/verify.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/read/verify.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verify" function.
@@ -30,56 +30,56 @@ export type VerifyParams = {
 export const FN_SELECTOR = "0xc1b606e2" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "price",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "success",
+    type: "bool",
   },
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/write/mintWithSignature.ts b/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/write/mintWithSignature.ts
index 42821808bda..1fd20177ab2 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/write/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/ISignatureMintERC20/write/mintWithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintWithSignature" function.
@@ -32,46 +32,46 @@ export type MintWithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0x8f0fefbb" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "payload",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "price",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "payload",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -174,23 +174,23 @@ export function mintWithSignature(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.payload, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.payload, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/RewardsClaimed.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/RewardsClaimed.ts
index b727ca0d9b2..969fd654e5c 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/RewardsClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/RewardsClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RewardsClaimed" event.
@@ -34,8 +34,8 @@ export type RewardsClaimedEventFilters = Partial<{
  */
 export function rewardsClaimedEvent(filters: RewardsClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RewardsClaimed(address indexed staker, uint256 rewardAmount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/TokensStaked.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/TokensStaked.ts
index 481bb8eb721..583547e8918 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/TokensStaked.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/TokensStaked.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensStaked" event.
@@ -34,7 +34,7 @@ export type TokensStakedEventFilters = Partial<{
  */
 export function tokensStakedEvent(filters: TokensStakedEventFilters = {}) {
   return prepareEvent({
-    signature: "event TokensStaked(address indexed staker, uint256 amount)",
     filters,
+    signature: "event TokensStaked(address indexed staker, uint256 amount)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/TokensWithdrawn.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/TokensWithdrawn.ts
index bdcc3f2ca69..53b02e8bc67 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/TokensWithdrawn.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/events/TokensWithdrawn.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensWithdrawn" event.
@@ -36,7 +36,7 @@ export function tokensWithdrawnEvent(
   filters: TokensWithdrawnEventFilters = {},
 ) {
   return prepareEvent({
-    signature: "event TokensWithdrawn(address indexed staker, uint256 amount)",
     filters,
+    signature: "event TokensWithdrawn(address indexed staker, uint256 amount)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/read/getStakeInfo.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/read/getStakeInfo.ts
index 6e8274dfa05..4ec3e9363f7 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/read/getStakeInfo.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/read/getStakeInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getStakeInfo" function.
@@ -16,18 +16,18 @@ export type GetStakeInfoParams = {
 export const FN_SELECTOR = "0xc3453153" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "staker",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "_tokensStaked",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_rewards",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/claimRewards.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/claimRewards.ts
index 57d0a77dff7..1704b169c28 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/claimRewards.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/claimRewards.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/stake.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/stake.ts
index 408f9cd07a8..e3480d1c5df 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/stake.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/stake.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "stake" function.
@@ -18,8 +18,8 @@ export type StakeParams = WithOverrides<{
 export const FN_SELECTOR = "0xa694fc3a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function stake(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/withdraw.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/withdraw.ts
index c1c69ea396d..4b2e17a7852 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/withdraw.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IStaking20/write/withdraw.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdraw" function.
@@ -18,8 +18,8 @@ export type WithdrawParams = WithOverrides<{
 export const FN_SELECTOR = "0x2e1a7d4d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function withdraw(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/ITokenStake/write/depositRewardTokens.ts b/packages/thirdweb/src/extensions/erc20/__generated__/ITokenStake/write/depositRewardTokens.ts
index 0c3048d17f9..4f9d27bd8b6 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/ITokenStake/write/depositRewardTokens.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/ITokenStake/write/depositRewardTokens.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "depositRewardTokens" function.
@@ -18,8 +18,8 @@ export type DepositRewardTokensParams = WithOverrides<{
 export const FN_SELECTOR = "0x16c621e0" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -119,23 +119,23 @@ export function depositRewardTokens(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/ITokenStake/write/withdrawRewardTokens.ts b/packages/thirdweb/src/extensions/erc20/__generated__/ITokenStake/write/withdrawRewardTokens.ts
index 6fdc7ac02c8..20eac341e3f 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/ITokenStake/write/withdrawRewardTokens.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/ITokenStake/write/withdrawRewardTokens.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdrawRewardTokens" function.
@@ -18,8 +18,8 @@ export type WithdrawRewardTokensParams = WithOverrides<{
 export const FN_SELECTOR = "0xcb43b2dd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -121,23 +121,23 @@ export function withdrawRewardTokens(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/events/DelegateChanged.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/events/DelegateChanged.ts
index 6ac50c18b65..c3acecb27ce 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/events/DelegateChanged.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/events/DelegateChanged.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "DelegateChanged" event.
@@ -48,8 +48,8 @@ export function delegateChangedEvent(
   filters: DelegateChangedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event DelegateChanged(address indexed delegator, address indexed fromDelegate, address indexed toDelegate)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/events/DelegateVotesChanged.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/events/DelegateVotesChanged.ts
index 3dee0b93a04..2edeed797af 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/events/DelegateVotesChanged.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/events/DelegateVotesChanged.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "DelegateVotesChanged" event.
@@ -36,8 +36,8 @@ export function delegateVotesChangedEvent(
   filters: DelegateVotesChangedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event DelegateVotesChanged(address indexed delegate, uint256 previousBalance, uint256 newBalance)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/delegates.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/delegates.ts
index c571722679d..ea655ae1b0c 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/delegates.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/delegates.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "delegates" function.
@@ -16,8 +16,8 @@ export type DelegatesParams = {
 export const FN_SELECTOR = "0x587cde1e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getPastTotalSupply.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getPastTotalSupply.ts
index e3441230e1e..7d1d44e1552 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getPastTotalSupply.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getPastTotalSupply.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPastTotalSupply" function.
@@ -19,8 +19,8 @@ export type GetPastTotalSupplyParams = {
 export const FN_SELECTOR = "0x8e539e8c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getPastVotes.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getPastVotes.ts
index ae46edb8b0c..2c200dbfc9f 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getPastVotes.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getPastVotes.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPastVotes" function.
@@ -20,12 +20,12 @@ export type GetPastVotesParams = {
 export const FN_SELECTOR = "0x3a46b1a8" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getVotes.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getVotes.ts
index cff1749bd6b..4e8e527637e 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getVotes.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/read/getVotes.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getVotes" function.
@@ -16,8 +16,8 @@ export type GetVotesParams = {
 export const FN_SELECTOR = "0x9ab24eb0" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/write/delegate.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/write/delegate.ts
index 7cef71ff61a..21bbcf173b3 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/write/delegate.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/write/delegate.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "delegate" function.
@@ -21,8 +21,8 @@ export type DelegateParams = WithOverrides<{
 export const FN_SELECTOR = "0x5c19a95c" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "delegatee",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -118,23 +118,23 @@ export function delegate(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.delegatee] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.delegatee] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/write/delegateBySig.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/write/delegateBySig.ts
index d4ccd48cc5a..63ae89d2acf 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/write/delegateBySig.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IVotes/write/delegateBySig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "delegateBySig" function.
@@ -26,28 +26,28 @@ export type DelegateBySigParams = WithOverrides<{
 export const FN_SELECTOR = "0xc3cda520" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "delegatee",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "nonce",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "expiry",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "v",
+    type: "uint8",
   },
   {
-    type: "bytes32",
     name: "r",
+    type: "bytes32",
   },
   {
-    type: "bytes32",
     name: "s",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -167,8 +167,19 @@ export function delegateBySig(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -181,16 +192,5 @@ export function delegateBySig(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/deposit.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/deposit.ts
index 71983157230..08a9dede108 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/deposit.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/deposit.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/transfer.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/transfer.ts
index bb688023945..409dcfe395b 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/transfer.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/transfer.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transfer" function.
@@ -19,12 +19,12 @@ export type TransferParams = WithOverrides<{
 export const FN_SELECTOR = "0xa9059cbb" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -127,23 +127,23 @@ export function transfer(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.to, resolvedOptions.value] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.to, resolvedOptions.value] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/withdraw.ts b/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/withdraw.ts
index c1c69ea396d..4b2e17a7852 100644
--- a/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/withdraw.ts
+++ b/packages/thirdweb/src/extensions/erc20/__generated__/IWETH/write/withdraw.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdraw" function.
@@ -18,8 +18,8 @@ export type WithdrawParams = WithOverrides<{
 export const FN_SELECTOR = "0x2e1a7d4d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function withdraw(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/customDrop20.test.ts b/packages/thirdweb/src/extensions/erc20/customDrop20.test.ts
index 023274748b6..42e613ddf3a 100644
--- a/packages/thirdweb/src/extensions/erc20/customDrop20.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/customDrop20.test.ts
@@ -1,11 +1,10 @@
-import { fetchDeployMetadata } from "../../utils/any-evm/deploy-metadata.js";
-
 import { beforeAll, describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { TEST_ACCOUNT_C } from "../../../test/src/test-wallets.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
+import { fetchDeployMetadata } from "../../utils/any-evm/deploy-metadata.js";
 import { toWei } from "../../utils/units.js";
 import { deployContractfromDeployMetadata } from "../prebuilts/deploy-published.js";
 import { balanceOf } from "./__generated__/IERC20/read/balanceOf.js";
@@ -26,9 +25,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         uri: "ipfs://QmT6h6gZztc2G83gWkJBkNFeq1b9gKrFKnYwgagXMBHV1d",
       });
       const contractAddress = await deployContractfromDeployMetadata({
+        account: TEST_ACCOUNT_C,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_C,
         deployMetadata: customDropDeployMetadata,
         initializeParams: {
           defaultAdmin: TEST_ACCOUNT_C.address,
@@ -47,33 +46,33 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should allow to claim tokens", async () => {
       await expect(
-        balanceOf({ contract, address: TEST_ACCOUNT_C.address }),
+        balanceOf({ address: TEST_ACCOUNT_C.address, contract }),
       ).resolves.toBe(0n);
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
-              startTime: new Date(0),
               maxClaimableSupply: toWei("10"),
+              startTime: new Date(0),
             },
           ],
           singlePhaseDrop: true,
         }),
-        account: TEST_ACCOUNT_C,
       });
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_C.address,
         quantity: "1",
         singlePhaseDrop: true,
+        to: TEST_ACCOUNT_C.address,
       });
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_C,
+        transaction: claimTx,
       });
       await expect(
-        balanceOf({ contract, address: TEST_ACCOUNT_C.address }),
+        balanceOf({ address: TEST_ACCOUNT_C.address, contract }),
       ).resolves.toBe(toWei("1"));
     });
   },
diff --git a/packages/thirdweb/src/extensions/erc20/drop20.test.ts b/packages/thirdweb/src/extensions/erc20/drop20.test.ts
index f059d6abb72..019319dd018 100644
--- a/packages/thirdweb/src/extensions/erc20/drop20.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/drop20.test.ts
@@ -8,7 +8,7 @@ import {
   TEST_ACCOUNT_C,
   TEST_ACCOUNT_D,
 } from "../../../test/src/test-wallets.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
 import { toEther, toWei } from "../../utils/units.js";
@@ -45,9 +45,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(contractAddress).toBeDefined();
       const deployedName = await name({
         contract: getContract({
-          client: TEST_CLIENT,
-          chain: ANVIL_CHAIN,
           address: contractAddress,
+          chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
         }),
       });
       expect(deployedName).toBe("Test DropERC20");
@@ -62,21 +62,21 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should allow to claim tokens", async () => {
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_A.address }))
+        (await getBalance({ address: TEST_ACCOUNT_A.address, contract }))
           .displayValue,
       ).toBe("0");
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [{}],
         }),
-        account: TEST_ACCOUNT_A,
       });
 
       expect(
         await canClaim({
-          contract,
           claimer: TEST_ACCOUNT_A.address,
+          contract,
           quantity: "1",
         }),
       ).toMatchInlineSnapshot(`
@@ -86,26 +86,27 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       `);
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_A.address,
         quantity: "1",
+        to: TEST_ACCOUNT_A.address,
       });
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_A,
+        transaction: claimTx,
       });
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_A.address }))
+        (await getBalance({ address: TEST_ACCOUNT_A.address, contract }))
           .displayValue,
       ).toBe("1");
     });
 
     it("should allow to claim tokens with value", async () => {
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_C.address }))
+        (await getBalance({ address: TEST_ACCOUNT_C.address, contract }))
           .displayValue,
       ).toBe("0");
       // set cc with price
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
@@ -114,12 +115,11 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_C.address,
         quantity: "2",
+        to: TEST_ACCOUNT_C.address,
       });
       // assert value is set correctly
       const value = await resolvePromisedValue(claimTx.value);
@@ -128,28 +128,28 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(toEther(value)).toBe("0.02");
       // claim
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_C,
+        transaction: claimTx,
       });
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_C.address }))
+        (await getBalance({ address: TEST_ACCOUNT_C.address, contract }))
           .displayValue,
       ).toBe("2");
     });
 
     it("should allow to claim tokens with erc20 price", async () => {
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_C.address }))
+        (await getBalance({ address: TEST_ACCOUNT_C.address, contract }))
           .displayValue,
       ).toBe("2");
       const erc20ContractAddres = await deployERC20Contract({
         account: TEST_ACCOUNT_A,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        type: "TokenERC20",
         params: {
           name: "Test DropERC20",
         },
+        type: "TokenERC20",
       });
       const erc20Contract = getContract({
         address: erc20ContractAddres,
@@ -157,39 +157,39 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         client: TEST_CLIENT,
       });
       const mintToTx = mintTo({
+        amount: "0.02",
         contract: erc20Contract,
         to: TEST_ACCOUNT_C.address,
-        amount: "0.02",
       });
       await sendAndConfirmTransaction({
-        transaction: mintToTx,
         account: TEST_ACCOUNT_A,
+        transaction: mintToTx,
       });
       expect(
         (
           await getBalance({
-            contract: erc20Contract,
             address: TEST_ACCOUNT_C.address,
+            contract: erc20Contract,
           })
         ).displayValue,
       ).toBe("0.02");
       // set cc with price
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
-              price: "0.01",
               currencyAddress: erc20ContractAddres,
+              price: "0.01",
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_C.address,
         quantity: "2",
+        to: TEST_ACCOUNT_C.address,
       });
       // assert value is set correctly
       const value = await resolvePromisedValue(claimTx.erc20Value);
@@ -197,29 +197,29 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       if (!value) throw new Error("value is undefined");
       expect(value.amountWei).toBe(toWei("0.02"));
       const approve = await getApprovalForTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_C,
+        transaction: claimTx,
       });
       if (approve) {
         await sendAndConfirmTransaction({
-          transaction: approve,
           account: TEST_ACCOUNT_C,
+          transaction: approve,
         });
       }
       // claim
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_C,
+        transaction: claimTx,
       });
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_C.address }))
+        (await getBalance({ address: TEST_ACCOUNT_C.address, contract }))
           .displayValue,
       ).toBe("4");
       expect(
         (
           await getBalance({
-            contract: erc20Contract,
             address: TEST_ACCOUNT_C.address,
+            contract: erc20Contract,
           })
         ).displayValue,
       ).toBe("0");
@@ -228,30 +228,30 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     describe("Allowlists", () => {
       it("should allow to claim tokens with an allowlist", async () => {
         await sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_A,
           transaction: setClaimConditions({
             contract,
             phases: [
               {
+                maxClaimablePerWallet: 0n,
                 overrideList: [
                   { address: TEST_ACCOUNT_A.address, maxClaimable: "100" },
                   { address: VITALIK_WALLET, maxClaimable: "100" },
                 ],
-                maxClaimablePerWallet: 0n,
               },
             ],
           }),
-          account: TEST_ACCOUNT_A,
         });
 
         expect(
-          (await getBalance({ contract, address: TEST_ACCOUNT_B.address }))
+          (await getBalance({ address: TEST_ACCOUNT_B.address, contract }))
             .displayValue,
         ).toBe("0");
 
         expect(
           await canClaim({
-            contract,
             claimer: TEST_ACCOUNT_A.address,
+            contract,
             quantity: "1",
           }),
         ).toMatchInlineSnapshot(`
@@ -262,8 +262,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
         expect(
           await canClaim({
-            contract,
             claimer: TEST_ACCOUNT_B.address,
+            contract,
             quantity: "1",
           }),
         ).toMatchInlineSnapshot(`
@@ -278,13 +278,13 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           transaction: claimTo({
             contract,
             from: TEST_ACCOUNT_A.address,
-            to: TEST_ACCOUNT_B.address,
             quantity: "1",
+            to: TEST_ACCOUNT_B.address,
           }),
         });
 
         expect(
-          (await getBalance({ contract, address: TEST_ACCOUNT_B.address }))
+          (await getBalance({ address: TEST_ACCOUNT_B.address, contract }))
             .displayValue,
         ).toBe("1");
 
@@ -293,8 +293,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             account: TEST_ACCOUNT_B,
             transaction: claimTo({
               contract,
-              to: TEST_ACCOUNT_B.address,
               quantity: "1",
+              to: TEST_ACCOUNT_B.address,
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
@@ -307,23 +307,23 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       it("should respect max claimable", async () => {
         await sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_A,
           transaction: setClaimConditions({
             contract,
             phases: [
               {
+                maxClaimablePerWallet: 0n,
                 overrideList: [
                   { address: TEST_ACCOUNT_A.address, maxClaimable: "3" },
                   { address: VITALIK_WALLET, maxClaimable: "3" },
                 ],
-                maxClaimablePerWallet: 0n,
               },
             ],
           }),
-          account: TEST_ACCOUNT_A,
         });
 
         expect(
-          (await getBalance({ contract, address: TEST_ACCOUNT_A.address }))
+          (await getBalance({ address: TEST_ACCOUNT_A.address, contract }))
             .displayValue,
         ).toBe("1");
 
@@ -336,8 +336,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             account: TEST_ACCOUNT_A,
             transaction: claimTo({
               contract,
-              to: TEST_ACCOUNT_A.address,
               quantity: "2",
+              to: TEST_ACCOUNT_A.address,
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
@@ -354,13 +354,13 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           account: TEST_ACCOUNT_A,
           transaction: claimTo({
             contract,
-            to: TEST_ACCOUNT_A.address,
             quantity: "1",
+            to: TEST_ACCOUNT_A.address,
           }),
         });
 
         expect(
-          (await getBalance({ contract, address: TEST_ACCOUNT_A.address }))
+          (await getBalance({ address: TEST_ACCOUNT_A.address, contract }))
             .displayValue,
         ).toBe("2");
       });
@@ -368,10 +368,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should respect price", async () => {
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
+              maxClaimablePerWallet: 0n,
               overrideList: [
                 {
                   address: TEST_ACCOUNT_A.address,
@@ -379,16 +381,14 @@ describe.runIf(process.env.TW_SECRET_KEY)(
                   price: "0",
                 },
               ],
-              maxClaimablePerWallet: 0n,
               price: "1000",
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
 
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_A.address }))
+        (await getBalance({ address: TEST_ACCOUNT_A.address, contract }))
           .displayValue,
       ).toBe("2");
 
@@ -396,19 +396,20 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         account: TEST_ACCOUNT_A,
         transaction: claimTo({
           contract,
-          to: TEST_ACCOUNT_A.address,
           quantity: "1",
+          to: TEST_ACCOUNT_A.address,
         }),
       });
 
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_A.address }))
+        (await getBalance({ address: TEST_ACCOUNT_A.address, contract }))
           .displayValue,
       ).toBe("3");
     });
 
     it("should be able to retrieve multiple phases", async () => {
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
@@ -422,7 +423,6 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
 
       const phases = await getClaimConditions({ contract });
@@ -434,6 +434,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should be able to reset claim eligibility", async () => {
       // set claim conditions to only allow one claim
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
@@ -442,34 +443,33 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
       // claim one token
       await sendAndConfirmTransaction({
+        // fresh account to avoid any previous claims
+        account: TEST_ACCOUNT_D,
         transaction: claimTo({
           contract,
+          quantityInWei: 1n,
           // fresh account to avoid any previous claims
           to: TEST_ACCOUNT_D.address,
-          quantityInWei: 1n,
         }),
-        // fresh account to avoid any previous claims
-        account: TEST_ACCOUNT_D,
       });
       // check that the account has claimed one token
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_D.address }))
+        (await getBalance({ address: TEST_ACCOUNT_D.address, contract }))
           .displayValue,
       ).toBe("0.000000000000000001");
 
       // attempt to claim another token (this should fail)
       await expect(
         sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_D,
           transaction: claimTo({
             contract,
-            to: TEST_ACCOUNT_D.address,
             quantityInWei: 1n,
+            to: TEST_ACCOUNT_D.address,
           }),
-          account: TEST_ACCOUNT_D,
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
         [TransactionError: DropClaimExceedLimit - 1,2
@@ -480,23 +480,23 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       // reset claim eligibility
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: resetClaimEligibility({
           contract,
         }),
-        account: TEST_ACCOUNT_A,
       });
       // attempt to claim another token (this should succeed)
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_D,
         transaction: claimTo({
           contract,
-          to: TEST_ACCOUNT_D.address,
           quantityInWei: 1n,
+          to: TEST_ACCOUNT_D.address,
         }),
-        account: TEST_ACCOUNT_D,
       });
       // check that the account has claimed two tokens
       expect(
-        (await getBalance({ contract, address: TEST_ACCOUNT_D.address }))
+        (await getBalance({ address: TEST_ACCOUNT_D.address, contract }))
           .displayValue,
       ).toBe("0.000000000000000002");
     });
diff --git a/packages/thirdweb/src/extensions/erc20/drops/read/canClaim.ts b/packages/thirdweb/src/extensions/erc20/drops/read/canClaim.ts
index 768bdbc2e63..12e70197796 100644
--- a/packages/thirdweb/src/extensions/erc20/drops/read/canClaim.ts
+++ b/packages/thirdweb/src/extensions/erc20/drops/read/canClaim.ts
@@ -53,30 +53,30 @@ export async function canClaim(
       }),
       getClaimParams({
         contract: options.contract,
+        from: options.from,
         quantity: quantityWei,
         to: options.claimer,
-        type: "erc20",
-        from: options.from,
         tokenDecimals: await decimals({ contract: options.contract }),
+        type: "erc20",
       }),
     ]);
   try {
     await verifyClaim({
-      contract: options.contract,
+      allowlistProof,
       claimer: options.claimer,
-      quantity,
+      conditionId,
+      contract: options.contract,
       currency,
       pricePerToken,
-      allowlistProof,
-      conditionId,
+      quantity,
     });
     return {
       result: true,
     };
   } catch (error) {
     return {
+      reason: await extractErrorResult({ contract: options.contract, error }),
       result: false,
-      reason: await extractErrorResult({ error, contract: options.contract }),
     };
   }
 }
diff --git a/packages/thirdweb/src/extensions/erc20/drops/write/claimTo.ts b/packages/thirdweb/src/extensions/erc20/drops/write/claimTo.ts
index 071149a261b..3f96a42e11a 100644
--- a/packages/thirdweb/src/extensions/erc20/drops/write/claimTo.ts
+++ b/packages/thirdweb/src/extensions/erc20/drops/write/claimTo.ts
@@ -53,7 +53,6 @@ export type ClaimToParams = {
  */
 export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
   return GeneratedClaim.claim({
-    contract: options.contract,
     asyncParams: async () => {
       const quantity = await (async () => {
         if ("quantityInWei" in options) {
@@ -68,15 +67,16 @@ export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
       })();
 
       return getClaimParams({
-        type: "erc20",
         contract: options.contract,
-        to: options.to,
-        quantity,
         from: options.from,
-        tokenDecimals: await decimals({ contract: options.contract }),
+        quantity,
         singlePhaseDrop: options.singlePhaseDrop,
+        to: options.to,
+        tokenDecimals: await decimals({ contract: options.contract }),
+        type: "erc20",
       });
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc20/drops/write/resetClaimEligibility.ts b/packages/thirdweb/src/extensions/erc20/drops/write/resetClaimEligibility.ts
index e07db7079c8..4b97666c941 100644
--- a/packages/thirdweb/src/extensions/erc20/drops/write/resetClaimEligibility.ts
+++ b/packages/thirdweb/src/extensions/erc20/drops/write/resetClaimEligibility.ts
@@ -31,7 +31,6 @@ import {
 export function resetClaimEligibility(options: BaseTransactionOptions) {
   // download existing conditions
   return setClaimConditions({
-    contract: options.contract,
     asyncParams: async () => {
       // get existing conditions
       const existingConditions = await getClaimConditions(options);
@@ -48,6 +47,7 @@ export function resetClaimEligibility(options: BaseTransactionOptions) {
         resetClaimEligibility: true,
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc20/drops/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/erc20/drops/write/setClaimConditions.ts
index 6681079ec47..9ed258943f2 100644
--- a/packages/thirdweb/src/extensions/erc20/drops/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc20/drops/write/setClaimConditions.ts
@@ -50,18 +50,18 @@ export function setClaimConditions(
   options: BaseTransactionOptions<SetClaimConditionsParams>,
 ) {
   return multicall({
-    contract: options.contract,
     asyncParams: async () => {
       return {
         data: await getMulticallSetClaimConditionTransactions({
           contract: options.contract,
           phases: options.phases,
           resetClaimEligibility: options.resetClaimEligibility,
-          tokenDecimals: await decimals({ contract: options.contract }),
           singlePhase: options.singlePhaseDrop,
+          tokenDecimals: await decimals({ contract: options.contract }),
         }),
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc20/read/getBalance.test.ts b/packages/thirdweb/src/extensions/erc20/read/getBalance.test.ts
index 805f360d608..57f224126b9 100644
--- a/packages/thirdweb/src/extensions/erc20/read/getBalance.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/read/getBalance.test.ts
@@ -7,8 +7,8 @@ import { getBalance } from "./getBalance.js";
 describe.runIf(process.env.TW_SECRET_KEY)("erc20.getBalance", () => {
   it("should return the getBalance result", async () => {
     const balance = await getBalance({
-      contract: USDT_CONTRACT,
       address: VITALIK_WALLET,
+      contract: USDT_CONTRACT,
     });
     expect(balance.displayValue).toBe("1544.900798");
     expect(balance.name).toBe("Tether USD");
diff --git a/packages/thirdweb/src/extensions/erc20/read/getBalance.ts b/packages/thirdweb/src/extensions/erc20/read/getBalance.ts
index a35e26c54d5..00fd9b1520f 100644
--- a/packages/thirdweb/src/extensions/erc20/read/getBalance.ts
+++ b/packages/thirdweb/src/extensions/erc20/read/getBalance.ts
@@ -48,9 +48,9 @@ export async function getBalance(
   ]);
   return {
     ...currencyMetadata,
-    value: balanceWei,
+    chainId: options.contract.chain.id,
     displayValue: toTokens(balanceWei, currencyMetadata.decimals),
     tokenAddress: options.contract.address,
-    chainId: options.contract.chain.id,
+    value: balanceWei,
   };
 }
diff --git a/packages/thirdweb/src/extensions/erc20/read/getCurrencyMetadata.test.ts b/packages/thirdweb/src/extensions/erc20/read/getCurrencyMetadata.test.ts
index 8e9611b3e58..bf1ad6650fe 100644
--- a/packages/thirdweb/src/extensions/erc20/read/getCurrencyMetadata.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/read/getCurrencyMetadata.test.ts
@@ -12,9 +12,9 @@ describe("getCurrencyMetadata", () => {
   it("should return valid result if the contract is ERC20", async () => {
     const result = await getCurrencyMetadata({ contract: USDT_CONTRACT });
     expect(result).toStrictEqual({
+      decimals: 6,
       name: "Tether USD",
       symbol: "USDT",
-      decimals: 6,
     });
   });
 });
diff --git a/packages/thirdweb/src/extensions/erc20/read/getCurrencyMetadata.ts b/packages/thirdweb/src/extensions/erc20/read/getCurrencyMetadata.ts
index 44f731ad3b1..367a64e1ee1 100644
--- a/packages/thirdweb/src/extensions/erc20/read/getCurrencyMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc20/read/getCurrencyMetadata.ts
@@ -31,9 +31,9 @@ export async function getCurrencyMetadata(
   // if the contract is the native token, return the native currency metadata
   if (isNativeTokenAddress(options.contract.address)) {
     return {
+      decimals: 18,
       name: "Ether",
       symbol: "ETH",
-      decimals: 18,
       // overwrite with native currency of the chain if available
       ...options.contract.chain.nativeCurrency,
     };
@@ -47,9 +47,9 @@ export async function getCurrencyMetadata(
     ]);
 
     return {
+      decimals: decimals_,
       name: name_,
       symbol: symbol_,
-      decimals: decimals_,
     };
   } catch (e) {
     throw new Error(`Invalid currency token: ${e}`);
diff --git a/packages/thirdweb/src/extensions/erc20/write/approve.test.ts b/packages/thirdweb/src/extensions/erc20/write/approve.test.ts
index d53f4cae121..dd0a6629f01 100644
--- a/packages/thirdweb/src/extensions/erc20/write/approve.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/approve.test.ts
@@ -8,13 +8,13 @@ it.runIf(process.env.TW_SECRET_KEY)(
   "estimates erc20 approval gas correctly",
   async () => {
     const transaction = approve({
-      contract: USDT_CONTRACT,
       amount: 100,
+      contract: USDT_CONTRACT,
       spender: VITALIK_WALLET,
     });
     const result = await estimateGas({
-      transaction,
       from: VITALIK_WALLET,
+      transaction,
     });
     expect(result).toMatchInlineSnapshot("48549n");
   },
diff --git a/packages/thirdweb/src/extensions/erc20/write/approve.ts b/packages/thirdweb/src/extensions/erc20/write/approve.ts
index a906e5b98a1..b001eba4bdb 100644
--- a/packages/thirdweb/src/extensions/erc20/write/approve.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/approve.ts
@@ -40,7 +40,6 @@ export type ApproveParams = Prettify<
  */
 export function approve(options: BaseTransactionOptions<ApproveParams>) {
   return generatedApprove({
-    contract: options.contract,
     asyncParams: async () => {
       let amount: bigint;
       if ("amount" in options) {
@@ -54,15 +53,16 @@ export function approve(options: BaseTransactionOptions<ApproveParams>) {
         amount = options.amountWei;
       }
       return {
-        spender: options.spender,
-        value: amount,
         overrides: {
           erc20Value: {
             amountWei: amount,
             tokenAddress: options.contract.address,
           },
         },
+        spender: options.spender,
+        value: amount,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/write/deposit.ts b/packages/thirdweb/src/extensions/erc20/write/deposit.ts
index 91dc7c11985..225bc984416 100644
--- a/packages/thirdweb/src/extensions/erc20/write/deposit.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/deposit.ts
@@ -32,11 +32,11 @@ export function deposit(options: BaseTransactionOptions<DepositParams>) {
     "amountWei" in options ? options.amountWei : toWei(options.amount);
   return prepareContractCall({
     contract: options.contract,
-    method: [FN_SELECTOR, [], []] as const,
-    value,
     erc20Value: {
       amountWei: value,
       tokenAddress: options.contract.address,
     },
+    method: [FN_SELECTOR, [], []] as const,
+    value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/write/getApprovalForTransaction.test.ts b/packages/thirdweb/src/extensions/erc20/write/getApprovalForTransaction.test.ts
index 06bf0738781..c23c9aa25a9 100644
--- a/packages/thirdweb/src/extensions/erc20/write/getApprovalForTransaction.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/getApprovalForTransaction.test.ts
@@ -21,49 +21,49 @@ describe.runIf(process.env.TW_SECRET_KEY)(
   () => {
     it("should return an approval tx", async () => {
       const currencyAddress = await deployERC20Contract({
+        account,
         chain,
         client,
-        account,
+        params: { contractURI: TEST_CONTRACT_URI, name: "erc20token" },
         type: "TokenERC20",
-        params: { name: "erc20token", contractURI: TEST_CONTRACT_URI },
       });
       const contract = getContract({
         address: await deployERC721Contract({
-          client,
-          chain,
           account,
+          chain,
+          client,
+          params: { contractURI: TEST_CONTRACT_URI, name: "" },
           type: "DropERC721",
-          params: { name: "", contractURI: TEST_CONTRACT_URI },
         }),
         chain,
         client,
       });
       await sendAndConfirmTransaction({
-        transaction: lazyMint({ contract, nfts: [{ name: "token 0" }] }),
         account,
+        transaction: lazyMint({ contract, nfts: [{ name: "token 0" }] }),
       });
       await sendAndConfirmTransaction({
+        account,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
-              maxClaimableSupply: 100n,
-              maxClaimablePerWallet: 1n,
               currencyAddress,
+              maxClaimablePerWallet: 1n,
+              maxClaimableSupply: 100n,
               price: 1,
               startTime: new Date(),
             },
           ],
         }),
-        account,
       });
       const approveTx = await getApprovalForTransaction({
+        account,
         transaction: claimTo({
           contract,
-          to: TEST_ACCOUNT_B.address,
           quantity: 1n,
+          to: TEST_ACCOUNT_B.address,
         }),
-        account,
       });
       expect(approveTx?.to).toBe(currencyAddress);
     });
@@ -71,40 +71,40 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should return NULL", async () => {
       const contract = getContract({
         address: await deployERC721Contract({
-          client,
-          chain,
           account,
+          chain,
+          client,
+          params: { contractURI: TEST_CONTRACT_URI, name: "" },
           type: "DropERC721",
-          params: { name: "", contractURI: TEST_CONTRACT_URI },
         }),
         chain,
         client,
       });
       await sendAndConfirmTransaction({
-        transaction: lazyMint({ contract, nfts: [{ name: "token 0" }] }),
         account,
+        transaction: lazyMint({ contract, nfts: [{ name: "token 0" }] }),
       });
       await sendAndConfirmTransaction({
+        account,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
-              maxClaimableSupply: 100n,
               maxClaimablePerWallet: 1n,
+              maxClaimableSupply: 100n,
               price: 1,
               startTime: new Date(),
             },
           ],
         }),
-        account,
       });
       const approveTx = await getApprovalForTransaction({
+        account,
         transaction: claimTo({
           contract,
-          to: TEST_ACCOUNT_B.address,
           quantity: 1n,
+          to: TEST_ACCOUNT_B.address,
         }),
-        account,
       });
       expect(approveTx).toBe(null);
     });
diff --git a/packages/thirdweb/src/extensions/erc20/write/getApprovalForTransaction.ts b/packages/thirdweb/src/extensions/erc20/write/getApprovalForTransaction.ts
index 2dac9e27a5c..c1b404fad93 100644
--- a/packages/thirdweb/src/extensions/erc20/write/getApprovalForTransaction.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/getApprovalForTransaction.ts
@@ -93,8 +93,8 @@ export async function getApprovalForTransaction(
 
     return approve({
       contract,
-      value: erc20Value.amountWei,
       spender: target,
+      value: erc20Value.amountWei,
     });
   }
 
diff --git a/packages/thirdweb/src/extensions/erc20/write/mintTo.test.ts b/packages/thirdweb/src/extensions/erc20/write/mintTo.test.ts
index 6ada8c0d88e..d6fb7ab96db 100644
--- a/packages/thirdweb/src/extensions/erc20/write/mintTo.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/mintTo.test.ts
@@ -6,8 +6,8 @@ import {
   TEST_ACCOUNT_B,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { deployERC20Contract } from "../../prebuilts/deploy-erc20.js";
@@ -39,31 +39,31 @@ describe.runIf(process.env.TW_SECRET_KEY)("ERC20.mintTo", () => {
   describe("mintTo", () => {
     it("should mint tokens to an address", async () => {
       const transaction = mintTo({
+        amount: 100,
         contract: erc20Contract,
         to: TEST_ACCOUNT_A.address,
-        amount: 100,
       });
 
-      await sendAndConfirmTransaction({ transaction, account: TEST_ACCOUNT_A });
+      await sendAndConfirmTransaction({ account: TEST_ACCOUNT_A, transaction });
 
       const balance = await getBalance({
-        contract: erc20Contract,
         address: TEST_ACCOUNT_A.address,
+        contract: erc20Contract,
       });
       expect(balance.displayValue).toBe("100");
     });
 
     it("should mint tokens to an address with a specified amount in wei", async () => {
       const transaction = mintTo({
+        amountWei: 100n,
         contract: erc20Contract,
         to: TEST_ACCOUNT_B.address,
-        amountWei: 100n,
       });
-      await sendAndConfirmTransaction({ transaction, account: TEST_ACCOUNT_A });
+      await sendAndConfirmTransaction({ account: TEST_ACCOUNT_A, transaction });
 
       const balance = await getBalance({
-        contract: erc20Contract,
         address: TEST_ACCOUNT_B.address,
+        contract: erc20Contract,
       });
 
       expect(balance.value).toBe(100n);
diff --git a/packages/thirdweb/src/extensions/erc20/write/mintTo.ts b/packages/thirdweb/src/extensions/erc20/write/mintTo.ts
index 0967d7a7a85..2def2ce22ba 100644
--- a/packages/thirdweb/src/extensions/erc20/write/mintTo.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/mintTo.ts
@@ -47,7 +47,6 @@ export type MintToParams = Prettify<
  */
 export function mintTo(options: BaseTransactionOptions<MintToParams>) {
   return generatedMintTo({
-    contract: options.contract,
     asyncParams: async () => {
       let amount: bigint;
       if ("amount" in options) {
@@ -61,10 +60,11 @@ export function mintTo(options: BaseTransactionOptions<MintToParams>) {
         amount = options.amountWei;
       }
       return {
-        to: options.to,
         amount: amount,
         overrides: options.overrides,
+        to: options.to,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/write/sigMint.ts b/packages/thirdweb/src/extensions/erc20/write/sigMint.ts
index 813d3a4e817..9c328ebe2db 100644
--- a/packages/thirdweb/src/extensions/erc20/write/sigMint.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/sigMint.ts
@@ -1,7 +1,7 @@
 import type { AbiParameterToPrimitiveType, Address } from "abitype";
 import {
-  NATIVE_TOKEN_ADDRESS,
   isNativeTokenAddress,
+  NATIVE_TOKEN_ADDRESS,
 } from "../../../constants/addresses.js";
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
@@ -11,8 +11,8 @@ import { randomBytesHex } from "../../../utils/random.js";
 import type { Account } from "../../../wallets/interfaces/wallet.js";
 import { name } from "../../common/read/name.js";
 import {
-  type MintWithSignatureParams,
   mintWithSignature as generatedMintWithSignature,
+  type MintWithSignatureParams,
 } from "../__generated__/ISignatureMintERC20/write/mintWithSignature.js";
 
 /**
@@ -55,8 +55,8 @@ export function mintWithSignature(
   return generatedMintWithSignature({
     ...options,
     overrides: {
-      value,
       erc20Value,
+      value,
     },
   });
 }
@@ -115,8 +115,8 @@ export async function generateMintSignature(
         );
         return await convertErc20Amount({
           amount: mintRequest.price,
-          client: contract.client,
           chain: contract.chain,
+          client: contract.client,
           erc20Address: currency,
         });
       }
@@ -135,8 +135,8 @@ export async function generateMintSignature(
       );
       return await convertErc20Amount({
         amount: mintRequest.quantity,
-        client: contract.client,
         chain: contract.chain,
+        client: contract.client,
         erc20Address: contract.address,
       });
     })(),
@@ -159,26 +159,26 @@ export async function generateMintSignature(
   const endTime = mintRequest.validityEndTimestamp || tenYearsFromNow();
 
   const payload: PayloadType = {
+    currency,
     price,
+    primarySaleRecipient: mintRequest.primarySaleRecipient || account.address,
     quantity,
-    uid,
-    currency,
     to: mintRequest.to,
-    primarySaleRecipient: mintRequest.primarySaleRecipient || account.address,
-    validityStartTimestamp: dateToSeconds(startTime),
+    uid,
     validityEndTimestamp: dateToSeconds(endTime),
+    validityStartTimestamp: dateToSeconds(startTime),
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: tokenName,
-      version: "1",
       chainId: contract.chain.id,
+      name: tokenName,
       verifyingContract: contract.address as Hex,
+      version: "1",
     },
-    types: { MintRequest: MintRequest20 },
-    primaryType: "MintRequest",
     message: payload,
+    primaryType: "MintRequest",
+    types: { MintRequest: MintRequest20 },
   });
   return { payload, signature };
 }
diff --git a/packages/thirdweb/src/extensions/erc20/write/sigMint20.test.ts b/packages/thirdweb/src/extensions/erc20/write/sigMint20.test.ts
index 9248a482a8f..a135947ad3e 100644
--- a/packages/thirdweb/src/extensions/erc20/write/sigMint20.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/sigMint20.test.ts
@@ -7,8 +7,8 @@ import {
 } from "../../../../test/src/test-wallets.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendTransaction } from "../../../transaction/actions/send-transaction.js";
 import { toHex } from "../../../utils/encoding/hex.js";
@@ -54,12 +54,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature20", () => {
 
   it("should generate a mint signature and mint an NFT", async () => {
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc20Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
         quantity: "0.1",
+        to: TEST_ACCOUNT_B.address,
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc20Contract,
     });
     const transaction = mintWithSignature({
       contract: erc20Contract,
@@ -67,20 +67,20 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature20", () => {
       signature,
     });
     const { transactionHash } = await sendTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     expect(transactionHash.length).toBe(66);
   });
 
   it("should generate a mint signature with default values", async () => {
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc20Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
         quantity: "0.1",
+        to: TEST_ACCOUNT_B.address,
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc20Contract,
     });
 
     expect(payload.to).toBe("0x70997970C51812dc3A010C7d01b50e0d17dc79C8");
@@ -101,26 +101,26 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature20", () => {
       signature,
     });
     const { transactionHash } = await sendTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     expect(transactionHash.length).toBe(66);
   });
 
   it("should generate a mint signature with custom values", async () => {
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc20Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
-        quantity: "0.005",
-        primarySaleRecipient: TEST_ACCOUNT_A.address,
-        price: "0.2",
         currency: erc20TokenContract.address,
-        validityStartTimestamp: new Date(1635724800),
-        validityEndTimestamp: new Date(1867260800),
+        price: "0.2",
+        primarySaleRecipient: TEST_ACCOUNT_A.address,
+        quantity: "0.005",
+        to: TEST_ACCOUNT_B.address,
         uid: toHex("abcdef1234567890", { size: 32 }),
+        validityEndTimestamp: new Date(1867260800),
+        validityStartTimestamp: new Date(1635724800),
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc20Contract,
     });
 
     expect(payload.to).toBe("0x70997970C51812dc3A010C7d01b50e0d17dc79C8");
@@ -140,18 +140,18 @@ describe.runIf(process.env.TW_SECRET_KEY)("generateMintSignature20", () => {
 
   it("should automatically encode a provided string uid", async () => {
     const { payload, signature } = await generateMintSignature({
+      account: TEST_ACCOUNT_A,
+      contract: erc20Contract,
       mintRequest: {
-        to: TEST_ACCOUNT_B.address,
-        quantity: "0.005",
-        primarySaleRecipient: TEST_ACCOUNT_A.address,
-        price: "0.2",
         currency: erc20TokenContract.address,
-        validityStartTimestamp: new Date(1635724800),
-        validityEndTimestamp: new Date(1867260800),
+        price: "0.2",
+        primarySaleRecipient: TEST_ACCOUNT_A.address,
+        quantity: "0.005",
+        to: TEST_ACCOUNT_B.address,
         uid: "abcdef1234567890",
+        validityEndTimestamp: new Date(1867260800),
+        validityStartTimestamp: new Date(1635724800),
       },
-      account: TEST_ACCOUNT_A,
-      contract: erc20Contract,
     });
 
     expect(payload.to).toBe("0x70997970C51812dc3A010C7d01b50e0d17dc79C8");
diff --git a/packages/thirdweb/src/extensions/erc20/write/transfer.ts b/packages/thirdweb/src/extensions/erc20/write/transfer.ts
index 6338def25d5..5ad721f893c 100644
--- a/packages/thirdweb/src/extensions/erc20/write/transfer.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/transfer.ts
@@ -44,7 +44,6 @@ export type TransferParams = Prettify<
  */
 export function transfer(options: BaseTransactionOptions<TransferParams>) {
   return generatedTransfer({
-    contract: options.contract,
     asyncParams: async () => {
       let amount: bigint;
       if ("amount" in options) {
@@ -58,8 +57,6 @@ export function transfer(options: BaseTransactionOptions<TransferParams>) {
         amount = options.amountWei;
       }
       return {
-        to: options.to,
-        value: amount,
         overrides: {
           erc20Value: {
             amountWei: amount,
@@ -67,7 +64,10 @@ export function transfer(options: BaseTransactionOptions<TransferParams>) {
           },
           ...options.overrides,
         },
+        to: options.to,
+        value: amount,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/write/transferBatch.test.ts b/packages/thirdweb/src/extensions/erc20/write/transferBatch.test.ts
index 9f8efca7f5c..55725d46734 100644
--- a/packages/thirdweb/src/extensions/erc20/write/transferBatch.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/transferBatch.test.ts
@@ -9,8 +9,8 @@ import {
   TEST_ACCOUNT_D,
 } from "~test/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { deployERC20Contract } from "../../../extensions/prebuilts/deploy-erc20.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
@@ -26,14 +26,14 @@ let contract: ThirdwebContract;
 describe.runIf(process.env.TW_SECRET_KEY)("erc20: transferBatch", () => {
   beforeAll(async () => {
     const address = await deployERC20Contract({
-      type: "TokenERC20",
       account,
       chain,
       client,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "TokenERC20",
     });
     contract = getContract({
       address,
@@ -44,46 +44,46 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc20: transferBatch", () => {
   it("should transfer tokens to multiple recipients", async () => {
     // Mint 200 tokens
     await sendAndConfirmTransaction({
-      transaction: mintTo({ contract, to: account.address, amount: 200 }),
       account,
+      transaction: mintTo({ amount: 200, contract, to: account.address }),
     });
 
     // Send 25 tokens to each account B, C and D
     await sendAndConfirmTransaction({
       account,
       transaction: transferBatch({
-        contract,
         batch: [
           {
-            to: TEST_ACCOUNT_B.address,
             amount: 25,
+            to: TEST_ACCOUNT_B.address,
           },
           {
-            to: TEST_ACCOUNT_C.address,
             amount: 25,
+            to: TEST_ACCOUNT_C.address,
           },
           {
-            to: TEST_ACCOUNT_D.address,
             amount: 25,
+            to: TEST_ACCOUNT_D.address,
           },
           {
-            to: TEST_ACCOUNT_B.address.toLowerCase(),
             amount: 25,
+            to: TEST_ACCOUNT_B.address.toLowerCase(),
           },
           {
-            to: TEST_ACCOUNT_B.address,
             amountWei: 25n * 10n ** 18n,
+            to: TEST_ACCOUNT_B.address,
           },
         ],
+        contract,
       }),
     });
 
     // After that, each address A, B, C and D should have 25 tokens
     const [balanceA, balanceB, balanceC, balanceD] = await Promise.all([
-      balanceOf({ contract, address: TEST_ACCOUNT_A.address }),
-      balanceOf({ contract, address: TEST_ACCOUNT_B.address }),
-      balanceOf({ contract, address: TEST_ACCOUNT_C.address }),
-      balanceOf({ contract, address: TEST_ACCOUNT_D.address }),
+      balanceOf({ address: TEST_ACCOUNT_A.address, contract }),
+      balanceOf({ address: TEST_ACCOUNT_B.address, contract }),
+      balanceOf({ address: TEST_ACCOUNT_C.address, contract }),
+      balanceOf({ address: TEST_ACCOUNT_D.address, contract }),
     ]);
 
     expect(balanceA).toBe(75n * 10n ** 18n);
@@ -94,79 +94,79 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc20: transferBatch", () => {
 
   it("should optimize the transfer content", async () => {
     const content = await optimizeTransferContent({
-      contract,
       batch: [
         {
-          to: TEST_ACCOUNT_B.address,
           amount: 25,
+          to: TEST_ACCOUNT_B.address,
         },
         {
-          to: TEST_ACCOUNT_C.address,
           amount: 25,
+          to: TEST_ACCOUNT_C.address,
         },
         {
-          to: TEST_ACCOUNT_D.address,
           amount: 25,
+          to: TEST_ACCOUNT_D.address,
         },
         {
+          amount: 25,
           // Should work
           to: TEST_ACCOUNT_B.address.toLowerCase(),
-          amount: 25,
         },
         {
-          to: TEST_ACCOUNT_B.address,
           amountWei: 25n * 10n ** 18n,
+          to: TEST_ACCOUNT_B.address,
         },
       ],
+      contract,
     });
 
     expect(content).toStrictEqual([
       {
-        to: TEST_ACCOUNT_B.address,
         amountWei: 75n * 10n ** 18n,
+        to: TEST_ACCOUNT_B.address,
       },
       {
-        to: TEST_ACCOUNT_C.address,
         amountWei: 25n * 10n ** 18n,
+        to: TEST_ACCOUNT_C.address,
       },
       {
-        to: TEST_ACCOUNT_D.address,
         amountWei: 25n * 10n ** 18n,
+        to: TEST_ACCOUNT_D.address,
       },
     ]);
   });
 
   it("an already-optimized content should not be changed", async () => {
     const content = await optimizeTransferContent({
-      contract,
       batch: [
         {
-          to: TEST_ACCOUNT_B.address,
           amountWei: 25n * 10n ** 18n,
+          to: TEST_ACCOUNT_B.address,
         },
         {
-          to: TEST_ACCOUNT_C.address,
           amount: 25,
+          to: TEST_ACCOUNT_C.address,
         },
         {
-          to: TEST_ACCOUNT_D.address,
           amount: 25,
+          to: TEST_ACCOUNT_D.address,
         },
       ],
+      contract,
     });
 
     expect(content).toStrictEqual([
       {
-        to: TEST_ACCOUNT_B.address,
         amountWei: 25n * 10n ** 18n,
+        to: TEST_ACCOUNT_B.address,
       },
       {
-        to: TEST_ACCOUNT_C.address,
         amountWei: 25n * 10n ** 18n,
+        to: TEST_ACCOUNT_C.address,
       },
       {
-        to: TEST_ACCOUNT_D.address,
         amountWei: 25n * 10n ** 18n,
+        to: TEST_ACCOUNT_D.address,
       },
     ]);
   });
diff --git a/packages/thirdweb/src/extensions/erc20/write/transferBatch.ts b/packages/thirdweb/src/extensions/erc20/write/transferBatch.ts
index d5891e1d872..1cc28c6943f 100644
--- a/packages/thirdweb/src/extensions/erc20/write/transferBatch.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/transferBatch.ts
@@ -51,24 +51,24 @@ export function transferBatch(
   options: BaseTransactionOptions<TransferBatchParams>,
 ) {
   return multicall({
-    contract: options.contract,
     asyncParams: async () => {
       const content = await optimizeTransferContent(options);
       return {
         data: content.map((item) => {
           return encodeTransfer({
-            to: item.to,
-            value: item.amountWei,
             overrides: {
               erc20Value: {
                 amountWei: item.amountWei,
                 tokenAddress: options.contract.address,
               },
             },
+            to: item.to,
+            value: item.amountWei,
           });
         }),
       };
     },
+    contract: options.contract,
   });
 }
 
@@ -127,8 +127,8 @@ export async function optimizeTransferContent(
         existingRecord.amountWei = existingRecord.amountWei + amountInWei;
       } else {
         acc.push({
-          to: record.to,
           amountWei: amountInWei,
+          to: record.to,
         });
       }
 
diff --git a/packages/thirdweb/src/extensions/erc20/write/transferFrom.test.ts b/packages/thirdweb/src/extensions/erc20/write/transferFrom.test.ts
index 4e00e83eb92..e83712a1fb5 100644
--- a/packages/thirdweb/src/extensions/erc20/write/transferFrom.test.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/transferFrom.test.ts
@@ -19,42 +19,42 @@ describe.runIf(process.env.TW_SECRET_KEY)("ERC20 transferFrom", () => {
   it("should work with `amount`", async () => {
     const contract = getContract({
       address: await deployERC20Contract({
+        account,
         chain,
         client,
-        account,
         params: {
-          name: "erc20token",
           contractURI: TEST_CONTRACT_URI,
+          name: "erc20token",
         },
         type: "TokenERC20",
       }),
-      client,
       chain,
+      client,
     });
 
     await sendAndConfirmTransaction({
-      transaction: mintTo({ contract, to: account.address, amount: 1000 }),
       account,
+      transaction: mintTo({ amount: 1000, contract, to: account.address }),
     });
 
     await sendAndConfirmTransaction({
-      transaction: approve({ contract, amount: 999, spender: account.address }),
       account,
+      transaction: approve({ amount: 999, contract, spender: account.address }),
     });
 
     await sendAndConfirmTransaction({
+      account,
       transaction: transferFrom({
-        contract,
         amount: 999,
-        to: TEST_ACCOUNT_B.address,
+        contract,
         from: account.address,
+        to: TEST_ACCOUNT_B.address,
       }),
-      account,
     });
 
     const balance = await balanceOf({
-      contract,
       address: TEST_ACCOUNT_B.address,
+      contract,
     });
     expect(balance).toBe(999n * 10n ** 18n);
   });
@@ -62,42 +62,42 @@ describe.runIf(process.env.TW_SECRET_KEY)("ERC20 transferFrom", () => {
   it("should work with `amountWei`", async () => {
     const contract = getContract({
       address: await deployERC20Contract({
+        account,
         chain,
         client,
-        account,
         params: {
-          name: "erc20token",
           contractURI: TEST_CONTRACT_URI,
+          name: "erc20token",
         },
         type: "TokenERC20",
       }),
-      client,
       chain,
+      client,
     });
 
     await sendAndConfirmTransaction({
-      transaction: mintTo({ contract, to: account.address, amount: 1000 }),
       account,
+      transaction: mintTo({ amount: 1000, contract, to: account.address }),
     });
 
     await sendAndConfirmTransaction({
-      transaction: approve({ contract, amount: 999, spender: account.address }),
       account,
+      transaction: approve({ amount: 999, contract, spender: account.address }),
     });
 
     await sendAndConfirmTransaction({
+      account,
       transaction: transferFrom({
-        contract,
         amountWei: 999n * 10n ** 18n,
-        to: TEST_ACCOUNT_B.address,
+        contract,
         from: account.address,
+        to: TEST_ACCOUNT_B.address,
       }),
-      account,
     });
 
     const balance = await balanceOf({
-      contract,
       address: TEST_ACCOUNT_B.address,
+      contract,
     });
     expect(balance).toBe(999n * 10n ** 18n);
   });
diff --git a/packages/thirdweb/src/extensions/erc20/write/transferFrom.ts b/packages/thirdweb/src/extensions/erc20/write/transferFrom.ts
index 0bb6ba6f66b..be39c702604 100644
--- a/packages/thirdweb/src/extensions/erc20/write/transferFrom.ts
+++ b/packages/thirdweb/src/extensions/erc20/write/transferFrom.ts
@@ -3,9 +3,8 @@ import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../transaction/types.js";
-import { toUnits } from "../../../utils/units.js";
-
 import type { Prettify } from "../../../utils/type-utils.js";
+import { toUnits } from "../../../utils/units.js";
 import { transferFrom as generatedTransferFrom } from "../__generated__/IERC20/write/transferFrom.js";
 
 /**
@@ -49,7 +48,6 @@ export function transferFrom(
   options: BaseTransactionOptions<TransferFromParams>,
 ) {
   return generatedTransferFrom({
-    contract: options.contract,
     asyncParams: async () => {
       let amount: bigint;
       if ("amount" in options) {
@@ -64,8 +62,6 @@ export function transferFrom(
       }
       return {
         from: options.from,
-        to: options.to,
-        value: amount,
         overrides: {
           erc20Value: {
             amountWei: amount,
@@ -73,7 +69,10 @@ export function transferFrom(
           },
           ...options.overrides,
         },
+        to: options.to,
+        value: amount,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc2771/__generated__/IERC2771Context/read/isTrustedForwarder.ts b/packages/thirdweb/src/extensions/erc2771/__generated__/IERC2771Context/read/isTrustedForwarder.ts
index 64ca336631f..8f413a85ce8 100644
--- a/packages/thirdweb/src/extensions/erc2771/__generated__/IERC2771Context/read/isTrustedForwarder.ts
+++ b/packages/thirdweb/src/extensions/erc2771/__generated__/IERC2771Context/read/isTrustedForwarder.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isTrustedForwarder" function.
@@ -19,8 +19,8 @@ export type IsTrustedForwarderParams = {
 export const FN_SELECTOR = "0x572b6c05" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "forwarder",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc2981/__generated__/IERC2981/read/royaltyInfo.ts b/packages/thirdweb/src/extensions/erc2981/__generated__/IERC2981/read/royaltyInfo.ts
index af103446eff..fc39904bb62 100644
--- a/packages/thirdweb/src/extensions/erc2981/__generated__/IERC2981/read/royaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/erc2981/__generated__/IERC2981/read/royaltyInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "royaltyInfo" function.
@@ -20,22 +20,22 @@ export type RoyaltyInfoParams = {
 export const FN_SELECTOR = "0x2a55205a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "salePrice",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "royaltyAmount",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccount/write/validateUserOp.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccount/write/validateUserOp.ts
index 61732d4c768..f87b2c21692 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccount/write/validateUserOp.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccount/write/validateUserOp.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "validateUserOp" function.
@@ -42,68 +42,68 @@ export type ValidateUserOpParams = WithOverrides<{
 export const FN_SELECTOR = "0x3a871cdd" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "userOp",
     components: [
       {
-        type: "address",
         name: "sender",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "nonce",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "initCode",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
       {
-        type: "uint256",
         name: "callGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "verificationGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "preVerificationGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxFeePerGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxPriorityFeePerGas",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "paymasterAndData",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "signature",
+        type: "bytes",
       },
     ],
+    name: "userOp",
+    type: "tuple",
   },
   {
-    type: "bytes32",
     name: "userOpHash",
+    type: "bytes32",
   },
   {
-    type: "uint256",
     name: "missingAccountFunds",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "validationData",
+    type: "uint256",
   },
 ] as const;
 
@@ -210,8 +210,19 @@ export function validateUserOp(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -221,16 +232,5 @@ export function validateUserOp(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/AccountCreated.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/AccountCreated.ts
index 9704d1c60fa..3919789bd3c 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/AccountCreated.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/AccountCreated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AccountCreated" event.
@@ -40,8 +40,8 @@ export type AccountCreatedEventFilters = Partial<{
  */
 export function accountCreatedEvent(filters: AccountCreatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event AccountCreated(address indexed account, address indexed accountAdmin)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/SignerAdded.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/SignerAdded.ts
index 29ba1977797..f96231b08cf 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/SignerAdded.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/SignerAdded.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "SignerAdded" event.
@@ -40,8 +40,8 @@ export type SignerAddedEventFilters = Partial<{
  */
 export function signerAddedEvent(filters: SignerAddedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event SignerAdded(address indexed account, address indexed signer)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/SignerRemoved.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/SignerRemoved.ts
index ee49f539f23..c6cf3b98d23 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/SignerRemoved.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/events/SignerRemoved.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "SignerRemoved" event.
@@ -40,8 +40,8 @@ export type SignerRemovedEventFilters = Partial<{
  */
 export function signerRemovedEvent(filters: SignerRemovedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event SignerRemoved(address indexed account, address indexed signer)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/accountImplementation.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/accountImplementation.ts
index 88b5f01391a..31f9d6e64c0 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/accountImplementation.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/accountImplementation.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x11464fbe" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAccounts.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAccounts.ts
index e442c9ebe15..26429c67036 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAccounts.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAccounts.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAccounts" function.
@@ -17,12 +17,12 @@ export type GetAccountsParams = {
 export const FN_SELECTOR = "0xe68a7c3b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "start",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "end",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAccountsOfSigner.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAccountsOfSigner.ts
index f0bac129833..9d328ef60b2 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAccountsOfSigner.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAccountsOfSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAccountsOfSigner" function.
@@ -16,14 +16,14 @@ export type GetAccountsOfSignerParams = {
 export const FN_SELECTOR = "0x0e6254fd" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address[]",
     name: "accounts",
+    type: "address[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAddress.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAddress.ts
index 07d3c8f0a19..7793bc2c85e 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAddress.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAddress.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAddress" function.
@@ -20,12 +20,12 @@ export type GetAddressParams = {
 export const FN_SELECTOR = "0x8878ed33" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "adminSigner",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAllAccounts.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAllAccounts.ts
index 49004ff07df..93cf2387dff 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAllAccounts.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/getAllAccounts.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x08e93d0a" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/isRegistered.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/isRegistered.ts
index 4213342788a..56ac9b61de6 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/isRegistered.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/isRegistered.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isRegistered" function.
@@ -16,8 +16,8 @@ export type IsRegisteredParams = {
 export const FN_SELECTOR = "0xc3c5a547" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/totalAccounts.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/totalAccounts.ts
index d13cf94c6b5..213525ca085 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/totalAccounts.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/read/totalAccounts.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x58451f97" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/createAccount.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/createAccount.ts
index d71e0c7bbee..cd71a3487a1 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/createAccount.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/createAccount.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createAccount" function.
@@ -19,18 +19,18 @@ export type CreateAccountParams = WithOverrides<{
 export const FN_SELECTOR = "0xd8fd8f44" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "admin",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "_data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 
@@ -130,23 +130,23 @@ export function createAccount(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.admin, resolvedOptions.data] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.admin, resolvedOptions.data] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/onSignerAdded.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/onSignerAdded.ts
index 58b1f104269..72b25239083 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/onSignerAdded.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/onSignerAdded.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "onSignerAdded" function.
@@ -23,16 +23,16 @@ export type OnSignerAddedParams = WithOverrides<{
 export const FN_SELECTOR = "0x9ddbb9d8" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
   {
-    type: "address",
     name: "creatorAdmin",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -140,8 +140,19 @@ export function onSignerAdded(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -151,16 +162,5 @@ export function onSignerAdded(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/onSignerRemoved.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/onSignerRemoved.ts
index eeb95bb3887..1b1a5d20e4f 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/onSignerRemoved.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountFactory/write/onSignerRemoved.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "onSignerRemoved" function.
@@ -23,16 +23,16 @@ export type OnSignerRemovedParams = WithOverrides<{
 export const FN_SELECTOR = "0x0db33003" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
   {
-    type: "address",
     name: "creatorAdmin",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -140,8 +140,19 @@ export function onSignerRemoved(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -151,16 +162,5 @@ export function onSignerRemoved(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/events/AdminUpdated.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/events/AdminUpdated.ts
index 3c4cdb022dc..e1cb6933d25 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/events/AdminUpdated.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/events/AdminUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AdminUpdated" event.
@@ -34,7 +34,7 @@ export type AdminUpdatedEventFilters = Partial<{
  */
 export function adminUpdatedEvent(filters: AdminUpdatedEventFilters = {}) {
   return prepareEvent({
-    signature: "event AdminUpdated(address indexed signer, bool isAdmin)",
     filters,
+    signature: "event AdminUpdated(address indexed signer, bool isAdmin)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/events/SignerPermissionsUpdated.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/events/SignerPermissionsUpdated.ts
index 49b12b5e7ca..0e331399365 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/events/SignerPermissionsUpdated.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/events/SignerPermissionsUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "SignerPermissionsUpdated" event.
@@ -42,8 +42,8 @@ export function signerPermissionsUpdatedEvent(
   filters: SignerPermissionsUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event SignerPermissionsUpdated(address indexed authorizingSigner, address indexed targetSigner, (address signer, uint8 isAdmin, address[] approvedTargets, uint256 nativeTokenLimitPerTransaction, uint128 permissionStartTimestamp, uint128 permissionEndTimestamp, uint128 reqValidityStartTimestamp, uint128 reqValidityEndTimestamp, bytes32 uid) permissions)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllActiveSigners.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllActiveSigners.ts
index b25927d7f3e..2e47c5cf525 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllActiveSigners.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllActiveSigners.ts
@@ -1,38 +1,37 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x8b52d723" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "signers",
     components: [
       {
-        type: "address",
         name: "signer",
+        type: "address",
       },
       {
-        type: "address[]",
         name: "approvedTargets",
+        type: "address[]",
       },
       {
-        type: "uint256",
         name: "nativeTokenLimitPerTransaction",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "startTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "endTimestamp",
+        type: "uint128",
       },
     ],
+    name: "signers",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllAdmins.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllAdmins.ts
index 340e8e2b338..4f5f26e99c5 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllAdmins.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllAdmins.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe9523c97" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address[]",
     name: "admins",
+    type: "address[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllSigners.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllSigners.ts
index 473f22cee70..b6031dc3105 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllSigners.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getAllSigners.ts
@@ -1,38 +1,37 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xd42f2f35" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "signers",
     components: [
       {
-        type: "address",
         name: "signer",
+        type: "address",
       },
       {
-        type: "address[]",
         name: "approvedTargets",
+        type: "address[]",
       },
       {
-        type: "uint256",
         name: "nativeTokenLimitPerTransaction",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "startTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "endTimestamp",
+        type: "uint128",
       },
     ],
+    name: "signers",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getPermissionsForSigner.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getPermissionsForSigner.ts
index 6f91832c4d4..ccae2c07226 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getPermissionsForSigner.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/getPermissionsForSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPermissionsForSigner" function.
@@ -16,36 +16,36 @@ export type GetPermissionsForSignerParams = {
 export const FN_SELECTOR = "0xf15d424e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "permissions",
     components: [
       {
-        type: "address",
         name: "signer",
+        type: "address",
       },
       {
-        type: "address[]",
         name: "approvedTargets",
+        type: "address[]",
       },
       {
-        type: "uint256",
         name: "nativeTokenLimitPerTransaction",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "startTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "endTimestamp",
+        type: "uint128",
       },
     ],
+    name: "permissions",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/isActiveSigner.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/isActiveSigner.ts
index f70ae69ae27..3bdebf0400d 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/isActiveSigner.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/isActiveSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isActiveSigner" function.
@@ -16,8 +16,8 @@ export type IsActiveSignerParams = {
 export const FN_SELECTOR = "0x7dff5a79" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/isAdmin.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/isAdmin.ts
index 421e3fb9b05..b30b9ba947c 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/isAdmin.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/isAdmin.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isAdmin" function.
@@ -16,8 +16,8 @@ export type IsAdminParams = {
 export const FN_SELECTOR = "0x24d7806c" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/verifySignerPermissionRequest.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/verifySignerPermissionRequest.ts
index 13c9660d679..6078893f412 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/verifySignerPermissionRequest.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/read/verifySignerPermissionRequest.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verifySignerPermissionRequest" function.
@@ -31,60 +31,60 @@ export type VerifySignerPermissionRequestParams = {
 export const FN_SELECTOR = "0xa9082d84" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "address",
         name: "signer",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "isAdmin",
+        type: "uint8",
       },
       {
-        type: "address[]",
         name: "approvedTargets",
+        type: "address[]",
       },
       {
-        type: "uint256",
         name: "nativeTokenLimitPerTransaction",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "permissionStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "permissionEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "reqValidityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "reqValidityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "success",
+    type: "bool",
   },
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/write/setPermissionsForSigner.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/write/setPermissionsForSigner.ts
index 0dfecdfe3e3..99f03a9d50e 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/write/setPermissionsForSigner.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IAccountPermissions/write/setPermissionsForSigner.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setPermissionsForSigner" function.
@@ -33,50 +33,50 @@ export type SetPermissionsForSignerParams = WithOverrides<{
 export const FN_SELECTOR = "0x5892e236" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "address",
         name: "signer",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "isAdmin",
+        type: "uint8",
       },
       {
-        type: "address[]",
         name: "approvedTargets",
+        type: "address[]",
       },
       {
-        type: "uint256",
         name: "nativeTokenLimitPerTransaction",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "permissionStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "permissionEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "reqValidityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "reqValidityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -183,23 +183,23 @@ export function setPermissionsForSigner(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.req, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.req, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/AccountDeployed.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/AccountDeployed.ts
index aefeda70d1f..c5c76a6a19d 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/AccountDeployed.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/AccountDeployed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AccountDeployed" event.
@@ -42,8 +42,8 @@ export function accountDeployedEvent(
   filters: AccountDeployedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event AccountDeployed(bytes32 indexed userOpHash, address indexed sender, address factory, address paymaster)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/Deposited.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/Deposited.ts
index 979246b3a32..5a3d67beffe 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/Deposited.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/Deposited.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Deposited" event.
@@ -34,7 +34,7 @@ export type DepositedEventFilters = Partial<{
  */
 export function depositedEvent(filters: DepositedEventFilters = {}) {
   return prepareEvent({
-    signature: "event Deposited(address indexed account, uint256 totalDeposit)",
     filters,
+    signature: "event Deposited(address indexed account, uint256 totalDeposit)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/SignatureAggregatorChanged.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/SignatureAggregatorChanged.ts
index 408f596d1b3..be1fef18557 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/SignatureAggregatorChanged.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/SignatureAggregatorChanged.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "SignatureAggregatorChanged" event.
@@ -36,7 +36,7 @@ export function signatureAggregatorChangedEvent(
   filters: SignatureAggregatorChangedEventFilters = {},
 ) {
   return prepareEvent({
-    signature: "event SignatureAggregatorChanged(address indexed aggregator)",
     filters,
+    signature: "event SignatureAggregatorChanged(address indexed aggregator)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeLocked.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeLocked.ts
index cdb5cb7718a..238cfb9053f 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeLocked.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeLocked.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "StakeLocked" event.
@@ -34,8 +34,8 @@ export type StakeLockedEventFilters = Partial<{
  */
 export function stakeLockedEvent(filters: StakeLockedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event StakeLocked(address indexed account, uint256 totalStaked, uint256 unstakeDelaySec)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeUnlocked.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeUnlocked.ts
index 2c2a521b3e8..30b473ab2b2 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeUnlocked.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeUnlocked.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "StakeUnlocked" event.
@@ -34,8 +34,8 @@ export type StakeUnlockedEventFilters = Partial<{
  */
 export function stakeUnlockedEvent(filters: StakeUnlockedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event StakeUnlocked(address indexed account, uint256 withdrawTime)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeWithdrawn.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeWithdrawn.ts
index d6baaadd015..3f3e8d02b33 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeWithdrawn.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/StakeWithdrawn.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "StakeWithdrawn" event.
@@ -34,8 +34,8 @@ export type StakeWithdrawnEventFilters = Partial<{
  */
 export function stakeWithdrawnEvent(filters: StakeWithdrawnEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event StakeWithdrawn(address indexed account, address withdrawAddress, uint256 amount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/UserOperationEvent.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/UserOperationEvent.ts
index e7361b8f242..0dcf93c6e9c 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/UserOperationEvent.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/UserOperationEvent.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "UserOperationEvent" event.
@@ -48,8 +48,8 @@ export function userOperationEventEvent(
   filters: UserOperationEventEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event UserOperationEvent(bytes32 indexed userOpHash, address indexed sender, address indexed paymaster, uint256 nonce, bool success, uint256 actualGasCost, uint256 actualGasUsed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/UserOperationRevertReason.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/UserOperationRevertReason.ts
index 651ba8f699d..4ae291a64af 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/UserOperationRevertReason.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/UserOperationRevertReason.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "UserOperationRevertReason" event.
@@ -42,8 +42,8 @@ export function userOperationRevertReasonEvent(
   filters: UserOperationRevertReasonEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event UserOperationRevertReason(bytes32 indexed userOpHash, address indexed sender, uint256 nonce, bytes revertReason)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/Withdrawn.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/Withdrawn.ts
index ba6086ca941..2d59fcb2fe8 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/Withdrawn.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/events/Withdrawn.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Withdrawn" event.
@@ -34,8 +34,8 @@ export type WithdrawnEventFilters = Partial<{
  */
 export function withdrawnEvent(filters: WithdrawnEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Withdrawn(address indexed account, address withdrawAddress, uint256 amount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/balanceOf.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/balanceOf.ts
index b7ff3081b0c..55e6ca4003f 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/balanceOf.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/balanceOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "balanceOf" function.
@@ -16,8 +16,8 @@ export type BalanceOfParams = {
 export const FN_SELECTOR = "0x70a08231" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getDepositInfo.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getDepositInfo.ts
index ef2dd86df6b..08cce1e0335 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getDepositInfo.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getDepositInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getDepositInfo" function.
@@ -16,36 +16,36 @@ export type GetDepositInfoParams = {
 export const FN_SELECTOR = "0x5287ce12" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "info",
     components: [
       {
-        type: "uint112",
         name: "deposit",
+        type: "uint112",
       },
       {
-        type: "bool",
         name: "staked",
+        type: "bool",
       },
       {
-        type: "uint112",
         name: "stake",
+        type: "uint112",
       },
       {
-        type: "uint32",
         name: "unstakeDelaySec",
+        type: "uint32",
       },
       {
-        type: "uint48",
         name: "withdrawTime",
+        type: "uint48",
       },
     ],
+    name: "info",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getNonce.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getNonce.ts
index 4047aff1316..78d6bd5f232 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getNonce.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getNonce.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getNonce" function.
@@ -17,18 +17,18 @@ export type GetNonceParams = {
 export const FN_SELECTOR = "0x35567e1a" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "sender",
+    type: "address",
   },
   {
-    type: "uint192",
     name: "key",
+    type: "uint192",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "nonce",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getUserOpHash.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getUserOpHash.ts
index 035be155152..df7cd5a0476 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getUserOpHash.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/read/getUserOpHash.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getUserOpHash" function.
@@ -32,54 +32,54 @@ export type GetUserOpHashParams = {
 export const FN_SELECTOR = "0xa6193531" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "userOp",
     components: [
       {
-        type: "address",
         name: "sender",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "nonce",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "initCode",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
       {
-        type: "uint256",
         name: "callGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "verificationGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "preVerificationGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxFeePerGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxPriorityFeePerGas",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "paymasterAndData",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "signature",
+        type: "bytes",
       },
     ],
+    name: "userOp",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/addStake.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/addStake.ts
index 9dadba06162..5ee1b30c191 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/addStake.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/addStake.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "addStake" function.
@@ -21,8 +21,8 @@ export type AddStakeParams = WithOverrides<{
 export const FN_SELECTOR = "0x0396cb60" as const;
 const FN_INPUTS = [
   {
-    type: "uint32",
     name: "_unstakeDelaySec",
+    type: "uint32",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -118,23 +118,23 @@ export function addStake(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.unstakeDelaySec] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.unstakeDelaySec] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/depositTo.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/depositTo.ts
index b401e7ffe20..a680c985f9f 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/depositTo.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/depositTo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "depositTo" function.
@@ -18,8 +18,8 @@ export type DepositToParams = WithOverrides<{
 export const FN_SELECTOR = "0xb760faf9" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function depositTo(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.account] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.account] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/getSenderAddress.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/getSenderAddress.ts
index 824cf867b60..3c156b207e1 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/getSenderAddress.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/getSenderAddress.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "getSenderAddress" function.
@@ -18,8 +18,8 @@ export type GetSenderAddressParams = WithOverrides<{
 export const FN_SELECTOR = "0x9b249f69" as const;
 const FN_INPUTS = [
   {
-    type: "bytes",
     name: "initCode",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function getSenderAddress(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.initCode] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.initCode] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/handleAggregatedOps.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/handleAggregatedOps.ts
index 5ec1fb8864c..d3600668bd4 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/handleAggregatedOps.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/handleAggregatedOps.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "handleAggregatedOps" function.
@@ -46,72 +46,72 @@ export type HandleAggregatedOpsParams = WithOverrides<{
 export const FN_SELECTOR = "0x4b1d7cf5" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "opsPerAggregator",
     components: [
       {
-        type: "tuple[]",
-        name: "userOps",
         components: [
           {
-            type: "address",
             name: "sender",
+            type: "address",
           },
           {
-            type: "uint256",
             name: "nonce",
+            type: "uint256",
           },
           {
-            type: "bytes",
             name: "initCode",
+            type: "bytes",
           },
           {
-            type: "bytes",
             name: "callData",
+            type: "bytes",
           },
           {
-            type: "uint256",
             name: "callGasLimit",
+            type: "uint256",
           },
           {
-            type: "uint256",
             name: "verificationGasLimit",
+            type: "uint256",
           },
           {
-            type: "uint256",
             name: "preVerificationGas",
+            type: "uint256",
           },
           {
-            type: "uint256",
             name: "maxFeePerGas",
+            type: "uint256",
           },
           {
-            type: "uint256",
             name: "maxPriorityFeePerGas",
+            type: "uint256",
           },
           {
-            type: "bytes",
             name: "paymasterAndData",
+            type: "bytes",
           },
           {
-            type: "bytes",
             name: "signature",
+            type: "bytes",
           },
         ],
+        name: "userOps",
+        type: "tuple[]",
       },
       {
-        type: "address",
         name: "aggregator",
+        type: "address",
       },
       {
-        type: "bytes",
         name: "signature",
+        type: "bytes",
       },
     ],
+    name: "opsPerAggregator",
+    type: "tuple[]",
   },
   {
-    type: "address",
     name: "beneficiary",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -217,8 +217,19 @@ export function handleAggregatedOps(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -227,16 +238,5 @@ export function handleAggregatedOps(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/handleOps.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/handleOps.ts
index 5021df6b320..9ba76421223 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/handleOps.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/handleOps.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "handleOps" function.
@@ -38,58 +38,58 @@ export type HandleOpsParams = WithOverrides<{
 export const FN_SELECTOR = "0x1fad948c" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "ops",
     components: [
       {
-        type: "address",
         name: "sender",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "nonce",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "initCode",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
       {
-        type: "uint256",
         name: "callGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "verificationGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "preVerificationGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxFeePerGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxPriorityFeePerGas",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "paymasterAndData",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "signature",
+        type: "bytes",
       },
     ],
+    name: "ops",
+    type: "tuple[]",
   },
   {
-    type: "address",
     name: "beneficiary",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -190,23 +190,23 @@ export function handleOps(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.ops, resolvedOptions.beneficiary] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.ops, resolvedOptions.beneficiary] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/incrementNonce.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/incrementNonce.ts
index 66aeaeb26ac..f302d500846 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/incrementNonce.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/incrementNonce.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "incrementNonce" function.
@@ -18,8 +18,8 @@ export type IncrementNonceParams = WithOverrides<{
 export const FN_SELECTOR = "0x0bd28e3b" as const;
 const FN_INPUTS = [
   {
-    type: "uint192",
     name: "key",
+    type: "uint192",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function incrementNonce(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.key] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.key] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/simulateHandleOp.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/simulateHandleOp.ts
index 8ad17a56ed6..2cbf03a7c47 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/simulateHandleOp.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/simulateHandleOp.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "simulateHandleOp" function.
@@ -39,62 +39,62 @@ export type SimulateHandleOpParams = WithOverrides<{
 export const FN_SELECTOR = "0xd6383f94" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "op",
     components: [
       {
-        type: "address",
         name: "sender",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "nonce",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "initCode",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
       {
-        type: "uint256",
         name: "callGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "verificationGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "preVerificationGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxFeePerGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxPriorityFeePerGas",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "paymasterAndData",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "signature",
+        type: "bytes",
       },
     ],
+    name: "op",
+    type: "tuple",
   },
   {
-    type: "address",
     name: "target",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "targetCallData",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -202,8 +202,19 @@ export function simulateHandleOp(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -213,16 +224,5 @@ export function simulateHandleOp(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/simulateValidation.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/simulateValidation.ts
index be82ffcd830..219eb9561dc 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/simulateValidation.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/simulateValidation.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "simulateValidation" function.
@@ -34,54 +34,54 @@ export type SimulateValidationParams = WithOverrides<{
 export const FN_SELECTOR = "0xee219423" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "userOp",
     components: [
       {
-        type: "address",
         name: "sender",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "nonce",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "initCode",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
       {
-        type: "uint256",
         name: "callGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "verificationGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "preVerificationGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxFeePerGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxPriorityFeePerGas",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "paymasterAndData",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "signature",
+        type: "bytes",
       },
     ],
+    name: "userOp",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -181,23 +181,23 @@ export function simulateValidation(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.userOp] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.userOp] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/unlockStake.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/unlockStake.ts
index c136fb4c701..3506e68345a 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/unlockStake.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/unlockStake.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/withdrawStake.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/withdrawStake.ts
index 10668f3080d..14e3ed95f92 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/withdrawStake.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/withdrawStake.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdrawStake" function.
@@ -21,8 +21,8 @@ export type WithdrawStakeParams = WithOverrides<{
 export const FN_SELECTOR = "0xc23a5cea" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "withdrawAddress",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function withdrawStake(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.withdrawAddress] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.withdrawAddress] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/withdrawTo.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/withdrawTo.ts
index 8d0e04b7655..4cdfea7260f 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/withdrawTo.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint/write/withdrawTo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdrawTo" function.
@@ -25,12 +25,12 @@ export type WithdrawToParams = WithOverrides<{
 export const FN_SELECTOR = "0x205c2878" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "withdrawAddress",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "withdrawAmount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -134,8 +134,19 @@ export function withdrawTo(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -144,16 +155,5 @@ export function withdrawTo(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.ts
index b8d5ff51605..991f9320412 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PostOpRevertReason" event.
@@ -42,8 +42,8 @@ export function postOpRevertReasonEvent(
   filters: PostOpRevertReasonEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event PostOpRevertReason(bytes32 indexed userOpHash, address indexed sender, uint256 nonce, bytes revertReason)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.ts
index deff206f64d..0fdce243df6 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getUserOpHash" function.
@@ -30,46 +30,46 @@ export type GetUserOpHashParams = {
 export const FN_SELECTOR = "0x22cdde4c" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "userOp",
     components: [
       {
-        type: "address",
         name: "sender",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "nonce",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "initCode",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
       {
-        type: "bytes32",
         name: "accountGasLimits",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "preVerificationGas",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "gasFees",
+        type: "bytes32",
       },
       {
-        type: "bytes",
         name: "paymasterAndData",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "signature",
+        type: "bytes",
       },
     ],
+    name: "userOp",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IPaymaster/write/postOp.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IPaymaster/write/postOp.ts
index cdb00c1cd44..dc71be29b9d 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IPaymaster/write/postOp.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IPaymaster/write/postOp.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "postOp" function.
@@ -23,16 +23,16 @@ export type PostOpParams = WithOverrides<{
 export const FN_SELECTOR = "0xa9a23409" as const;
 const FN_INPUTS = [
   {
-    type: "uint8",
     name: "mode",
+    type: "uint8",
   },
   {
-    type: "bytes",
     name: "context",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "actualGasCost",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -138,8 +138,19 @@ export function postOp(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -149,16 +160,5 @@ export function postOp(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/__generated__/IPaymaster/write/validatePaymasterUserOp.ts b/packages/thirdweb/src/extensions/erc4337/__generated__/IPaymaster/write/validatePaymasterUserOp.ts
index ce0e1b226f6..e5e33c429c0 100644
--- a/packages/thirdweb/src/extensions/erc4337/__generated__/IPaymaster/write/validatePaymasterUserOp.ts
+++ b/packages/thirdweb/src/extensions/erc4337/__generated__/IPaymaster/write/validatePaymasterUserOp.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "validatePaymasterUserOp" function.
@@ -39,72 +39,72 @@ export type ValidatePaymasterUserOpParams = WithOverrides<{
 export const FN_SELECTOR = "0xf465c77e" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "userOp",
     components: [
       {
-        type: "address",
         name: "sender",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "nonce",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "initCode",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
       {
-        type: "uint256",
         name: "callGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "verificationGasLimit",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "preVerificationGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxFeePerGas",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxPriorityFeePerGas",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "paymasterAndData",
+        type: "bytes",
       },
       {
-        type: "bytes",
         name: "signature",
+        type: "bytes",
       },
     ],
+    name: "userOp",
+    type: "tuple",
   },
   {
-    type: "bytes32",
     name: "userOpHash",
+    type: "bytes32",
   },
   {
-    type: "uint256",
     name: "maxCost",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes",
     name: "context",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "validationData",
+    type: "uint256",
   },
 ] as const;
 
@@ -217,8 +217,19 @@ export function validatePaymasterUserOp(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -228,16 +239,5 @@ export function validatePaymasterUserOp(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/account/addAdmin.ts b/packages/thirdweb/src/extensions/erc4337/account/addAdmin.ts
index e324c08923c..0c84ee28095 100644
--- a/packages/thirdweb/src/extensions/erc4337/account/addAdmin.ts
+++ b/packages/thirdweb/src/extensions/erc4337/account/addAdmin.ts
@@ -42,18 +42,18 @@ export type AddAdminOptions = {
 export function addAdmin(options: BaseTransactionOptions<AddAdminOptions>) {
   const { contract, account, adminAddress } = options;
   return setPermissionsForSigner({
-    contract,
     async asyncParams() {
       const { req, signature } = await signPermissionRequest({
         account,
         contract,
         req: await defaultPermissionsForAdmin({
-          target: adminAddress,
           action: "add-admin",
+          target: adminAddress,
         }),
       });
-      return { signature, req };
+      return { req, signature };
     },
+    contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc4337/account/addSessionKey.ts b/packages/thirdweb/src/extensions/erc4337/account/addSessionKey.ts
index c4e712b4432..206357199a5 100644
--- a/packages/thirdweb/src/extensions/erc4337/account/addSessionKey.ts
+++ b/packages/thirdweb/src/extensions/erc4337/account/addSessionKey.ts
@@ -61,18 +61,18 @@ export function addSessionKey(
 ) {
   const { contract, sessionKeyAddress, account, permissions } = options;
   return setPermissionsForSigner({
-    contract,
     async asyncParams() {
       const { req, signature } = await signPermissionRequest({
         account,
         contract,
         req: await toContractPermissions({
-          target: sessionKeyAddress,
           permissions,
+          target: sessionKeyAddress,
         }),
       });
-      return { signature, req };
+      return { req, signature };
     },
+    contract,
   });
 }
 
@@ -126,7 +126,7 @@ export async function shouldUpdateSessionKey(args: {
   // check end time validity
   if (
     currentPermissions.endTimestamp &&
-    currentPermissions.endTimestamp < Math.floor(new Date().getTime() / 1000)
+    currentPermissions.endTimestamp < Math.floor(Date.now() / 1000)
   ) {
     return true;
   }
diff --git a/packages/thirdweb/src/extensions/erc4337/account/common.ts b/packages/thirdweb/src/extensions/erc4337/account/common.ts
index b271988138c..87d0d0d6ed2 100644
--- a/packages/thirdweb/src/extensions/erc4337/account/common.ts
+++ b/packages/thirdweb/src/extensions/erc4337/account/common.ts
@@ -18,14 +18,14 @@ export async function signPermissionRequest(options: {
   const { account, contract, req } = options;
   const signature = await account.signTypedData({
     domain: {
+      chainId: contract.chain.id,
       name: "Account",
-      version: "1",
       verifyingContract: contract.address,
-      chainId: contract.chain.id,
+      version: "1",
     },
+    message: req,
     primaryType: "SignerPermissionRequest",
     types: { SignerPermissionRequest },
-    message: req,
   });
   return { req, signature };
 }
@@ -43,20 +43,20 @@ export async function toContractPermissions(options: {
       permissions.approvedTargets === "*"
         ? [ZERO_ADDRESS]
         : permissions.approvedTargets,
+    isAdmin: 0,
     nativeTokenLimitPerTransaction: toWei(
       permissions.nativeTokenLimitPerTransaction?.toString() || "0",
     ),
-    permissionStartTimestamp: dateToSeconds(
-      permissions.permissionStartTimestamp || new Date(0),
-    ),
     permissionEndTimestamp: dateToSeconds(
       permissions.permissionEndTimestamp || tenYearsFromNow(),
     ),
-    reqValidityStartTimestamp: 0n,
+    permissionStartTimestamp: dateToSeconds(
+      permissions.permissionStartTimestamp || new Date(0),
+    ),
     reqValidityEndTimestamp: dateToSeconds(tenYearsFromNow()),
+    reqValidityStartTimestamp: 0n,
+    signer: target, // session key flag
     uid: await randomBytesHex(),
-    isAdmin: 0, // session key flag
-    signer: target,
   };
 }
 
@@ -70,13 +70,13 @@ export async function defaultPermissionsForAdmin(options: {
   const { target, action } = options;
   return {
     approvedTargets: [],
+    isAdmin: action === "add-admin" ? 1 : action === "remove-admin" ? 2 : 0,
     nativeTokenLimitPerTransaction: 0n,
-    permissionStartTimestamp: 0n,
     permissionEndTimestamp: 0n,
-    reqValidityStartTimestamp: 0n,
+    permissionStartTimestamp: 0n,
     reqValidityEndTimestamp: dateToSeconds(tenYearsFromNow()),
-    uid: await randomBytesHex(),
-    isAdmin: action === "add-admin" ? 1 : action === "remove-admin" ? 2 : 0,
+    reqValidityStartTimestamp: 0n,
     signer: target,
+    uid: await randomBytesHex(),
   };
 }
diff --git a/packages/thirdweb/src/extensions/erc4337/account/isAccountDeployed.ts b/packages/thirdweb/src/extensions/erc4337/account/isAccountDeployed.ts
index 30525e04e03..63e0633aee9 100644
--- a/packages/thirdweb/src/extensions/erc4337/account/isAccountDeployed.ts
+++ b/packages/thirdweb/src/extensions/erc4337/account/isAccountDeployed.ts
@@ -4,8 +4,8 @@ import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed
 import * as PredictAddress from "../__generated__/IAccountFactory/read/getAddress.js";
 
 export {
-  isGetAddressSupported as isIsAccountDeployedSupported,
   type GetAddressParams as IsAccountDeployedParams,
+  isGetAddressSupported as isIsAccountDeployedSupported,
 } from "../__generated__/IAccountFactory/read/getAddress.js";
 
 /**
diff --git a/packages/thirdweb/src/extensions/erc4337/account/permissions.test.ts b/packages/thirdweb/src/extensions/erc4337/account/permissions.test.ts
index b8eb359803a..c922dc13f0b 100644
--- a/packages/thirdweb/src/extensions/erc4337/account/permissions.test.ts
+++ b/packages/thirdweb/src/extensions/erc4337/account/permissions.test.ts
@@ -9,8 +9,8 @@ import {
 } from "../../../../test/src/test-wallets.js";
 import { ZERO_ADDRESS } from "../../../constants/addresses.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { getOrDeployInfraContract } from "../../../contract/deployment/utils/bootstrap.js";
 import { parseEventLogs } from "../../../event/actions/parse-logs.js";
@@ -35,24 +35,24 @@ describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
       account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      contractId: "AccountFactory",
       constructorParams: {
         defaultAdmin: TEST_ACCOUNT_A.address,
         entrypoint: ENTRYPOINT_ADDRESS_v0_6,
       },
+      contractId: "AccountFactory",
     });
     const transaction = createAccount({
-      contract: accountFactoryContract,
       admin: TEST_ACCOUNT_A.address,
+      contract: accountFactoryContract,
       data: "0x",
     });
     const accountAddress = await simulateTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
     accountContract = getContract({
       address: accountAddress,
@@ -67,12 +67,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
     });
     expect(admins).toEqual([TEST_ACCOUNT_A.address]);
     let receipt = await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: addAdmin({
         account: TEST_ACCOUNT_A,
-        contract: accountContract,
         adminAddress: TEST_ACCOUNT_B.address,
+        contract: accountContract,
       }),
-      account: TEST_ACCOUNT_A,
     });
     let logs = parseEventLogs({
       events: [adminUpdatedEvent()],
@@ -90,12 +90,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
       TEST_ACCOUNT_B.address,
     ]);
     receipt = await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_B,
       transaction: removeAdmin({
         account: TEST_ACCOUNT_B,
-        contract: accountContract,
         adminAddress: TEST_ACCOUNT_A.address,
+        contract: accountContract,
       }),
-      account: TEST_ACCOUNT_B,
     });
     logs = parseEventLogs({
       events: [adminUpdatedEvent()],
@@ -112,15 +112,15 @@ describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
 
   it("should allow adding session keys", async () => {
     const receipt = await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_B,
       transaction: addSessionKey({
         account: TEST_ACCOUNT_B,
         contract: accountContract,
-        sessionKeyAddress: TEST_ACCOUNT_A.address,
         permissions: {
           approvedTargets: "*",
         },
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_B,
     });
     const logs = parseEventLogs({
       events: [signerPermissionsUpdatedEvent()],
@@ -135,42 +135,42 @@ describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
     expect(
       await shouldUpdateSessionKey({
         accountContract,
-        sessionKeyAddress: TEST_ACCOUNT_A.address,
         newPermissions: {
           approvedTargets: "*",
         },
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
       }),
     ).toBe(false);
 
     expect(
       await shouldUpdateSessionKey({
         accountContract,
-        sessionKeyAddress: TEST_ACCOUNT_A.address,
         newPermissions: {
           approvedTargets: "*",
           nativeTokenLimitPerTransaction: 0,
         },
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
       }),
     ).toBe(false);
 
     expect(
       await shouldUpdateSessionKey({
         accountContract,
-        sessionKeyAddress: TEST_ACCOUNT_A.address,
         newPermissions: {
           approvedTargets: [USDT_CONTRACT_ADDRESS],
         },
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
       }),
     ).toBe(true);
 
     expect(
       await shouldUpdateSessionKey({
         accountContract,
-        sessionKeyAddress: TEST_ACCOUNT_A.address,
         newPermissions: {
           approvedTargets: "*",
           nativeTokenLimitPerTransaction: 0.1,
         },
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
       }),
     ).toBe(true);
   });
@@ -182,10 +182,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
       }),
-      sessionKeyAddress: TEST_ACCOUNT_A.address,
       newPermissions: {
         approvedTargets: "*",
       },
+      sessionKeyAddress: TEST_ACCOUNT_A.address,
     });
     expect(shouldUpdate).toBe(true);
   });
diff --git a/packages/thirdweb/src/extensions/erc4337/account/removeAdmin.ts b/packages/thirdweb/src/extensions/erc4337/account/removeAdmin.ts
index 792b5da3e39..7955ce02703 100644
--- a/packages/thirdweb/src/extensions/erc4337/account/removeAdmin.ts
+++ b/packages/thirdweb/src/extensions/erc4337/account/removeAdmin.ts
@@ -44,21 +44,21 @@ export function removeAdmin(
 ) {
   const { contract, account, adminAddress } = options;
   return setPermissionsForSigner({
-    contract,
     async asyncParams() {
       const { req, signature } = await signPermissionRequest({
         account,
         contract,
         req: await defaultPermissionsForAdmin({
-          target: adminAddress,
           action: "remove-admin",
+          target: adminAddress,
         }),
       });
       return {
-        signature,
         req,
+        signature,
       };
     },
+    contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc4337/account/removeSessionKey.ts b/packages/thirdweb/src/extensions/erc4337/account/removeSessionKey.ts
index c3a5afef566..e7c988ca474 100644
--- a/packages/thirdweb/src/extensions/erc4337/account/removeSessionKey.ts
+++ b/packages/thirdweb/src/extensions/erc4337/account/removeSessionKey.ts
@@ -44,23 +44,23 @@ export function removeSessionKey(
 ) {
   const { contract, account, sessionKeyAddress } = options;
   return setPermissionsForSigner({
-    contract,
     async asyncParams() {
       const { req, signature } = await signPermissionRequest({
         account,
         contract,
         req: await toContractPermissions({
-          target: sessionKeyAddress,
           permissions: {
             approvedTargets: [],
             nativeTokenLimitPerTransaction: 0,
-            permissionStartTimestamp: new Date(0),
             permissionEndTimestamp: new Date(0),
+            permissionStartTimestamp: new Date(0),
           },
+          target: sessionKeyAddress,
         }),
       });
-      return { signature, req };
+      return { req, signature };
     },
+    contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/events/Deposit.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/events/Deposit.ts
index dc44d6e24ab..753a8961fff 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/events/Deposit.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/events/Deposit.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Deposit" event.
@@ -40,8 +40,8 @@ export type DepositEventFilters = Partial<{
  */
 export function depositEvent(filters: DepositEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Deposit(address indexed caller, address indexed owner, uint256 assets, uint256 shares)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/events/Withdraw.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/events/Withdraw.ts
index 702a6b214e0..8450bb95731 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/events/Withdraw.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/events/Withdraw.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Withdraw" event.
@@ -46,8 +46,8 @@ export type WithdrawEventFilters = Partial<{
  */
 export function withdrawEvent(filters: WithdrawEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Withdraw(address indexed caller, address indexed receiver, address indexed owner, uint256 assets, uint256 shares)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/asset.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/asset.ts
index c6aa2cf4a8f..06812146334 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/asset.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/asset.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x38d52e0f" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "assetTokenAddress",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/convertToAssets.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/convertToAssets.ts
index a336a3ba71d..7288d41eabb 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/convertToAssets.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/convertToAssets.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "convertToAssets" function.
@@ -16,14 +16,14 @@ export type ConvertToAssetsParams = {
 export const FN_SELECTOR = "0x07a2d13a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/convertToShares.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/convertToShares.ts
index 19adbec5d30..75ac99b846e 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/convertToShares.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/convertToShares.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "convertToShares" function.
@@ -16,14 +16,14 @@ export type ConvertToSharesParams = {
 export const FN_SELECTOR = "0xc6e6f592" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxDeposit.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxDeposit.ts
index c381e4e07ce..a79217d1108 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxDeposit.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxDeposit.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "maxDeposit" function.
@@ -16,14 +16,14 @@ export type MaxDepositParams = {
 export const FN_SELECTOR = "0x402d267d" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "maxAssets",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxMint.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxMint.ts
index 31d838daa75..be7362591b6 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxMint.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxMint.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "maxMint" function.
@@ -16,14 +16,14 @@ export type MaxMintParams = {
 export const FN_SELECTOR = "0xc63d75b6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "maxShares",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxRedeem.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxRedeem.ts
index c87d5ca24be..fdf9a9bd349 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxRedeem.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxRedeem.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "maxRedeem" function.
@@ -16,14 +16,14 @@ export type MaxRedeemParams = {
 export const FN_SELECTOR = "0xd905777e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "maxShares",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxWithdraw.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxWithdraw.ts
index 5d2194959f1..2f5cb5760df 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxWithdraw.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/maxWithdraw.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "maxWithdraw" function.
@@ -16,14 +16,14 @@ export type MaxWithdrawParams = {
 export const FN_SELECTOR = "0xce96cb77" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "maxAssets",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewDeposit.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewDeposit.ts
index 55bd138d5c8..fc50a5d5b2e 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewDeposit.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewDeposit.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "previewDeposit" function.
@@ -16,14 +16,14 @@ export type PreviewDepositParams = {
 export const FN_SELECTOR = "0xef8b30f7" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewMint.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewMint.ts
index 1c77082a6d4..0c11d728319 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewMint.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewMint.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "previewMint" function.
@@ -16,8 +16,8 @@ export type PreviewMintParams = {
 export const FN_SELECTOR = "0xb3d7f6b9" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewRedeem.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewRedeem.ts
index d22c9fc5c1c..1ffa9dd1327 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewRedeem.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewRedeem.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "previewRedeem" function.
@@ -16,14 +16,14 @@ export type PreviewRedeemParams = {
 export const FN_SELECTOR = "0x4cdad506" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewWithdraw.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewWithdraw.ts
index 0b48678535b..d66508de4a0 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewWithdraw.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/previewWithdraw.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "previewWithdraw" function.
@@ -16,14 +16,14 @@ export type PreviewWithdrawParams = {
 export const FN_SELECTOR = "0x0a28a477" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/totalAssets.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/totalAssets.ts
index 13444d4de6f..1801c0053ff 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/totalAssets.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/read/totalAssets.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x01e1d114" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "totalManagedAssets",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/deposit.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/deposit.ts
index f987f82b52f..d37c26b12d0 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/deposit.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/deposit.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "deposit" function.
@@ -19,18 +19,18 @@ export type DepositParams = WithOverrides<{
 export const FN_SELECTOR = "0x6e553f65" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
 ] as const;
 
@@ -128,23 +128,23 @@ export function deposit(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.assets, resolvedOptions.receiver] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.assets, resolvedOptions.receiver] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/mint.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/mint.ts
index 21674a7ae44..9499cfff6f9 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/mint.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/mint.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mint" function.
@@ -19,18 +19,18 @@ export type MintParams = WithOverrides<{
 export const FN_SELECTOR = "0x94bf804d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
 ] as const;
 
@@ -128,23 +128,23 @@ export function mint(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.shares, resolvedOptions.receiver] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.shares, resolvedOptions.receiver] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/redeem.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/redeem.ts
index df351f6ff7b..dcc70c39d48 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/redeem.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/redeem.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "redeem" function.
@@ -20,22 +20,22 @@ export type RedeemParams = WithOverrides<{
 export const FN_SELECTOR = "0xba087652" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
 ] as const;
 
@@ -140,8 +140,19 @@ export function redeem(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -151,16 +162,5 @@ export function redeem(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/withdraw.ts b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/withdraw.ts
index f9d36616418..70362e7237b 100644
--- a/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/withdraw.ts
+++ b/packages/thirdweb/src/extensions/erc4626/__generated__/IERC4626/write/withdraw.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdraw" function.
@@ -20,22 +20,22 @@ export type WithdrawParams = WithOverrides<{
 export const FN_SELECTOR = "0xb460af94" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "assets",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "shares",
+    type: "uint256",
   },
 ] as const;
 
@@ -140,8 +140,19 @@ export function withdraw(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -151,16 +162,5 @@ export function withdraw(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/isValidSigner.ts b/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/isValidSigner.ts
index f48782ca657..26a270ebb9f 100644
--- a/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/isValidSigner.ts
+++ b/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/isValidSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isValidSigner" function.
@@ -17,18 +17,18 @@ export type IsValidSignerParams = {
 export const FN_SELECTOR = "0x523e3260" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "context",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes4",
     name: "magicValue",
+    type: "bytes4",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/state.ts b/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/state.ts
index 366fa324ff1..4a94d5ca5f4 100644
--- a/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/state.ts
+++ b/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/state.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xc19d93fb" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/token.ts b/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/token.ts
index 5b0fd38dc2d..758898583c1 100644
--- a/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/token.ts
+++ b/packages/thirdweb/src/extensions/erc6551/__generated__/IERC6551Account/read/token.ts
@@ -1,24 +1,23 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfc0c546a" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "chainId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "tokenContract",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/read/verifyClaim.ts b/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/read/verifyClaim.ts
index d6fbe26258f..9547268a917 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/read/verifyClaim.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/read/verifyClaim.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verifyClaim" function.
@@ -36,52 +36,52 @@ export type VerifyClaimParams = {
 export const FN_SELECTOR = "0x23a2902b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_conditionId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_claimer",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_pricePerToken",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "_allowlistProof",
     components: [
       {
-        type: "bytes32[]",
         name: "proof",
+        type: "bytes32[]",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
     ],
+    name: "_allowlistProof",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "isOverride",
+    type: "bool",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/freezeBatchBaseURI.ts b/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/freezeBatchBaseURI.ts
index 5a98dee8f1b..529ea40cad5 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/freezeBatchBaseURI.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/freezeBatchBaseURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "freezeBatchBaseURI" function.
@@ -18,8 +18,8 @@ export type FreezeBatchBaseURIParams = WithOverrides<{
 export const FN_SELECTOR = "0xa07ced9e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -119,23 +119,23 @@ export function freezeBatchBaseURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.index] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.index] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/setMaxTotalSupply.ts b/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/setMaxTotalSupply.ts
index fef30ba5b5b..fa6e333d998 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/setMaxTotalSupply.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/setMaxTotalSupply.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setMaxTotalSupply" function.
@@ -21,8 +21,8 @@ export type SetMaxTotalSupplyParams = WithOverrides<{
 export const FN_SELECTOR = "0x3f3e4c11" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_maxTotalSupply",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -122,23 +122,23 @@ export function setMaxTotalSupply(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.maxTotalSupply] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.maxTotalSupply] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/updateBatchBaseURI.ts b/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/updateBatchBaseURI.ts
index 80e7ca4d58c..0368737cc6c 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/updateBatchBaseURI.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/DropERC721/write/updateBatchBaseURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "updateBatchBaseURI" function.
@@ -19,12 +19,12 @@ export type UpdateBatchBaseURIParams = WithOverrides<{
 export const FN_SELECTOR = "0xde903ddd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_index",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -127,23 +127,23 @@ export function updateBatchBaseURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.index, resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.index, resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721/events/AirdropFailed.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721/events/AirdropFailed.ts
index f4caa50a316..074ba92c517 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721/events/AirdropFailed.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721/events/AirdropFailed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AirdropFailed" event.
@@ -46,8 +46,8 @@ export type AirdropFailedEventFilters = Partial<{
  */
 export function airdropFailedEvent(filters: AirdropFailedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event AirdropFailed(address indexed tokenAddress, address indexed tokenOwner, address indexed recipient, uint256 tokenId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721/write/airdropERC721.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721/write/airdropERC721.ts
index 2f96fcc6574..9ab804ed1ce 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721/write/airdropERC721.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721/write/airdropERC721.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "airdropERC721" function.
@@ -33,26 +33,26 @@ export type AirdropERC721Params = WithOverrides<{
 export const FN_SELECTOR = "0x7c2c059d" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenAddress",
+    type: "address",
   },
   {
-    type: "address",
     name: "tokenOwner",
+    type: "address",
   },
   {
-    type: "tuple[]",
-    name: "contents",
     components: [
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
     ],
+    name: "contents",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -160,8 +160,19 @@ export function airdropERC721(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -171,16 +182,5 @@ export function airdropERC721(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721Claimable/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721Claimable/events/TokensClaimed.ts
index 6713f907a04..b40aec40e59 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721Claimable/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721Claimable/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -40,8 +40,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(address indexed claimer, address indexed receiver, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721Claimable/write/claim.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721Claimable/write/claim.ts
index c8242f26ff7..f20c344b892 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721Claimable/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IAirdropERC721Claimable/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -24,20 +24,20 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x3b4b57b0" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "quantity",
+    type: "uint256",
   },
   {
-    type: "bytes32[]",
     name: "proofs",
+    type: "bytes32[]",
   },
   {
-    type: "uint256",
     name: "proofMaxQuantityForWallet",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -147,8 +147,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -159,16 +170,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IBatchMintMetadata/read/getBaseURICount.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IBatchMintMetadata/read/getBaseURICount.ts
index 05c14805732..28715bb477e 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IBatchMintMetadata/read/getBaseURICount.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IBatchMintMetadata/read/getBaseURICount.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x63b45e2d" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IBatchMintMetadata/read/getBatchIdAtIndex.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IBatchMintMetadata/read/getBatchIdAtIndex.ts
index 0c742164d79..2ab79d4d7e5 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IBatchMintMetadata/read/getBatchIdAtIndex.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IBatchMintMetadata/read/getBatchIdAtIndex.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getBatchIdAtIndex" function.
@@ -16,8 +16,8 @@ export type GetBatchIdAtIndexParams = {
 export const FN_SELECTOR = "0x2419f51b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IBurnableERC721/write/burn.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IBurnableERC721/write/burn.ts
index 1f66b6a3b03..b544f973801 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IBurnableERC721/write/burn.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IBurnableERC721/write/burn.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "burn" function.
@@ -18,8 +18,8 @@ export type BurnParams = WithOverrides<{
 export const FN_SELECTOR = "0x42966c68" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function burn(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/events/TokensClaimed.ts
index 96d8aeb4491..fd159360a2f 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -46,8 +46,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(address indexed claimer, address indexed receiver, uint256 indexed startTokenId, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/read/verifyClaim.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/read/verifyClaim.ts
index 2696773d0ab..fcd6bff6605 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/read/verifyClaim.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/read/verifyClaim.ts
@@ -16,12 +16,12 @@ export type VerifyClaimParams = {
 export const FN_SELECTOR = "0x2f92023a" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_claimer",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/write/claim.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/write/claim.ts
index b6d15533e0c..58e59b6eb27 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IClaimableERC721/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -19,12 +19,12 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0xaad3ec96" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -123,23 +123,23 @@ export function claim(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.receiver, resolvedOptions.quantity] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.receiver, resolvedOptions.quantity] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/events/TokenURIRevealed.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/events/TokenURIRevealed.ts
index 80887b4834b..1fecec5b724 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/events/TokenURIRevealed.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/events/TokenURIRevealed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokenURIRevealed" event.
@@ -36,8 +36,8 @@ export function tokenURIRevealedEvent(
   filters: TokenURIRevealedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokenURIRevealed(uint256 indexed index, string revealedURI)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/read/encryptDecrypt.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/read/encryptDecrypt.ts
index 72fec8c3c7a..c1f1a999672 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/read/encryptDecrypt.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/read/encryptDecrypt.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "encryptDecrypt" function.
@@ -17,18 +17,18 @@ export type EncryptDecryptParams = {
 export const FN_SELECTOR = "0xe7150322" as const;
 const FN_INPUTS = [
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
   {
-    type: "bytes",
     name: "key",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes",
     name: "result",
+    type: "bytes",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/read/encryptedData.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/read/encryptedData.ts
index 6c8d4a2dca7..b1cc0015030 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/read/encryptedData.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/read/encryptedData.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "encryptedData" function.
@@ -16,8 +16,8 @@ export type EncryptedDataParams = {
 export const FN_SELECTOR = "0xa05112fc" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/write/reveal.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/write/reveal.ts
index d458a71158e..72c6e0dfd22 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/write/reveal.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDelayedReveal/write/reveal.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "reveal" function.
@@ -22,18 +22,18 @@ export type RevealParams = WithOverrides<{
 export const FN_SELECTOR = "0xce805642" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "identifier",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "key",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "string",
     name: "revealedURI",
+    type: "string",
   },
 ] as const;
 
@@ -131,23 +131,23 @@ export function reveal(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.identifier, resolvedOptions.key] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.identifier, resolvedOptions.key] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/events/TokensClaimed.ts
index f9323d3861e..50e2640a789 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -46,8 +46,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(uint256 indexed claimConditionIndex, address indexed claimer, address indexed receiver, uint256 startTokenId, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/baseURIIndices.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/baseURIIndices.ts
index 15d51107b1f..3f13709afb6 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/baseURIIndices.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/baseURIIndices.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "baseURIIndices" function.
@@ -16,8 +16,8 @@ export type BaseURIIndicesParams = {
 export const FN_SELECTOR = "0xd860483f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/claimCondition.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/claimCondition.ts
index bdd2144fb09..c209f44db85 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/claimCondition.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/claimCondition.ts
@@ -1,20 +1,19 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xd637ed59" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "currentStartId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "count",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/getActiveClaimConditionId.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/getActiveClaimConditionId.ts
index 5e4f78b73ee..05fc620d047 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/getActiveClaimConditionId.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/getActiveClaimConditionId.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xc68907de" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/getClaimConditionById.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/getClaimConditionById.ts
index 4c03e0387d5..efe91824b1c 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/getClaimConditionById.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/getClaimConditionById.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getClaimConditionById" function.
@@ -19,48 +19,48 @@ export type GetClaimConditionByIdParams = {
 export const FN_SELECTOR = "0x6f8934f4" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_conditionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "condition",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "condition",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/nextTokenIdToClaim.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/nextTokenIdToClaim.ts
index 409a4030ce4..a3a6212cb9a 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/nextTokenIdToClaim.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/read/nextTokenIdToClaim.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xacd083f8" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/write/claim.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/write/claim.ts
index bd199d831e0..3939be3ce53 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -35,46 +35,46 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x84bb1e42" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "pricePerToken",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "allowlistProof",
     components: [
       {
-        type: "bytes32[]",
         name: "proof",
+        type: "bytes32[]",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
     ],
+    name: "allowlistProof",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -192,8 +192,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -206,16 +217,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/write/setClaimConditions.ts
index 59a01bbc213..ecdcd810f2d 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDrop/write/setClaimConditions.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimConditions" function.
@@ -35,46 +35,46 @@ export type SetClaimConditionsParams = WithOverrides<{
 export const FN_SELECTOR = "0x74bc7db7" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "phases",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "phases",
+    type: "tuple[]",
   },
   {
-    type: "bool",
     name: "resetClaimEligibility",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -180,8 +180,19 @@ export function setClaimConditions(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -190,16 +201,5 @@ export function setClaimConditions(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/events/TokensClaimed.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/events/TokensClaimed.ts
index 96d8aeb4491..fd159360a2f 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/events/TokensClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/events/TokensClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensClaimed" event.
@@ -46,8 +46,8 @@ export type TokensClaimedEventFilters = Partial<{
  */
 export function tokensClaimedEvent(filters: TokensClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensClaimed(address indexed claimer, address indexed receiver, uint256 indexed startTokenId, uint256 quantityClaimed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/read/claimCondition.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/read/claimCondition.ts
index 60f4078f4d2..5b1917ac2ec 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/read/claimCondition.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/read/claimCondition.ts
@@ -1,50 +1,49 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xd637ed59" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "condition",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "condition",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/write/claim.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/write/claim.ts
index bd199d831e0..3939be3ce53 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/write/claim.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/write/claim.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "claim" function.
@@ -35,46 +35,46 @@ export type ClaimParams = WithOverrides<{
 export const FN_SELECTOR = "0x84bb1e42" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "pricePerToken",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "allowlistProof",
     components: [
       {
-        type: "bytes32[]",
         name: "proof",
+        type: "bytes32[]",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
     ],
+    name: "allowlistProof",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -192,8 +192,19 @@ export function claim(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -206,16 +217,5 @@ export function claim(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/write/setClaimConditions.ts
index d07fd8efc8e..27f4ce8cc9e 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IDropSinglePhase/write/setClaimConditions.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimConditions" function.
@@ -35,46 +35,46 @@ export type SetClaimConditionsParams = WithOverrides<{
 export const FN_SELECTOR = "0x426cfaf3" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "phase",
     components: [
       {
-        type: "uint256",
         name: "startTimestamp",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "maxClaimableSupply",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "supplyClaimed",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityLimitPerWallet",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "merkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "string",
         name: "metadata",
+        type: "string",
       },
     ],
+    name: "phase",
+    type: "tuple",
   },
   {
-    type: "bool",
     name: "resetClaimEligibility",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -180,8 +180,19 @@ export function setClaimConditions(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -190,16 +201,5 @@ export function setClaimConditions(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/Approval.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/Approval.ts
index c1f8b0cb939..cd341395868 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/Approval.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/Approval.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Approval" event.
@@ -46,8 +46,8 @@ export type ApprovalEventFilters = Partial<{
  */
 export function approvalEvent(filters: ApprovalEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/ApprovalForAll.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/ApprovalForAll.ts
index da4f0dfc8d7..b2735569c9e 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/ApprovalForAll.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/ApprovalForAll.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ApprovalForAll" event.
@@ -40,8 +40,8 @@ export type ApprovalForAllEventFilters = Partial<{
  */
 export function approvalForAllEvent(filters: ApprovalForAllEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event ApprovalForAll(address indexed owner, address indexed operator, bool approved)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/Transfer.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/Transfer.ts
index b0d19bab766..4163cf5363a 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/Transfer.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/events/Transfer.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Transfer" event.
@@ -46,8 +46,8 @@ export type TransferEventFilters = Partial<{
  */
 export function transferEvent(filters: TransferEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Transfer(address indexed from, address indexed to, uint256 indexed tokenId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/balanceOf.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/balanceOf.ts
index 0a97dbe010d..c75d7c35b12 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/balanceOf.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/balanceOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "balanceOf" function.
@@ -16,8 +16,8 @@ export type BalanceOfParams = {
 export const FN_SELECTOR = "0x70a08231" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/getApproved.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/getApproved.ts
index e6e6c742b20..3b08cf7171d 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/getApproved.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/getApproved.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getApproved" function.
@@ -16,8 +16,8 @@ export type GetApprovedParams = {
 export const FN_SELECTOR = "0x081812fc" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/isApprovedForAll.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/isApprovedForAll.ts
index 48aae344fd6..518585e4966 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/isApprovedForAll.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/isApprovedForAll.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isApprovedForAll" function.
@@ -17,12 +17,12 @@ export type IsApprovedForAllParams = {
 export const FN_SELECTOR = "0xe985e9c5" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
   {
-    type: "address",
     name: "operator",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/name.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/name.ts
index 7f2ee48afd1..977eb71775a 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/name.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/name.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x06fdde03" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/ownerOf.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/ownerOf.ts
index 725b42cb89c..d47f48285ab 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/ownerOf.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/ownerOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "ownerOf" function.
@@ -16,8 +16,8 @@ export type OwnerOfParams = {
 export const FN_SELECTOR = "0x6352211e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/startTokenId.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/startTokenId.ts
index 44320640e09..a7437962276 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/startTokenId.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/startTokenId.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe6798baa" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/symbol.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/symbol.ts
index 2541453f1fa..09032ae8d6a 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/symbol.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/symbol.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x95d89b41" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/tokenURI.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/tokenURI.ts
index cdd424d3861..1088ee3775c 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/tokenURI.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/tokenURI.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokenURI" function.
@@ -16,8 +16,8 @@ export type TokenURIParams = {
 export const FN_SELECTOR = "0xc87b56dd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/totalSupply.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/totalSupply.ts
index a19be2e4323..08c6748815e 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/totalSupply.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/read/totalSupply.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x18160ddd" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/approve.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/approve.ts
index 35b4af6555e..d8980b43c68 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/approve.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/approve.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "approve" function.
@@ -19,12 +19,12 @@ export type ApproveParams = WithOverrides<{
 export const FN_SELECTOR = "0x095ea7b3" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -123,23 +123,23 @@ export function approve(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.to, resolvedOptions.tokenId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.to, resolvedOptions.tokenId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/safeTransferFrom.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/safeTransferFrom.ts
index 6a39c3be5ca..e05e5fcaca5 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/safeTransferFrom.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/safeTransferFrom.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "safeTransferFrom" function.
@@ -20,16 +20,16 @@ export type SafeTransferFromParams = WithOverrides<{
 export const FN_SELECTOR = "0x42842e0e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -137,8 +137,19 @@ export function safeTransferFrom(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -148,16 +159,5 @@ export function safeTransferFrom(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.ts
index b2a383dd006..9096c337621 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setApprovalForAll" function.
@@ -19,12 +19,12 @@ export type SetApprovalForAllParams = WithOverrides<{
 export const FN_SELECTOR = "0xa22cb465" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "operator",
+    type: "address",
   },
   {
-    type: "bool",
     name: "_approved",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -127,23 +127,23 @@ export function setApprovalForAll(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.operator, resolvedOptions.approved] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.operator, resolvedOptions.approved] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/transferFrom.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/transferFrom.ts
index 7eda6c94dfe..bd1283d5c04 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/transferFrom.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721A/write/transferFrom.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transferFrom" function.
@@ -20,16 +20,16 @@ export type TransferFromParams = WithOverrides<{
 export const FN_SELECTOR = "0x23b872dd" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -137,8 +137,19 @@ export function transferFrom(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -148,16 +159,5 @@ export function transferFrom(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/events/ConsecutiveTransfer.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/events/ConsecutiveTransfer.ts
index 09dbce48836..f2b6876432f 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/events/ConsecutiveTransfer.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/events/ConsecutiveTransfer.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ConsecutiveTransfer" event.
@@ -48,8 +48,8 @@ export function consecutiveTransferEvent(
   filters: ConsecutiveTransferEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event ConsecutiveTransfer(uint256 indexed fromTokenId, uint256 toTokenId, address indexed from, address indexed to)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwner.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwner.ts
index c57aff8f227..345073d1a33 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwner.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokensOfOwner" function.
@@ -16,8 +16,8 @@ export type TokensOfOwnerParams = {
 export const FN_SELECTOR = "0x8462151c" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwnerIn.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwnerIn.ts
index fae3b29b1eb..3ab75e3ee86 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwnerIn.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721AQueryable/read/tokensOfOwnerIn.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokensOfOwnerIn" function.
@@ -18,16 +18,16 @@ export type TokensOfOwnerInParams = {
 export const FN_SELECTOR = "0x99a2557a" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "start",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "stop",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/nextTokenIdToMint.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/nextTokenIdToMint.ts
index abab41a1765..2bb30b6fa3b 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/nextTokenIdToMint.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/nextTokenIdToMint.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3b1475a7" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/tokenByIndex.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/tokenByIndex.ts
index a2194155e72..e3ec8eac5f0 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/tokenByIndex.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/tokenByIndex.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokenByIndex" function.
@@ -16,8 +16,8 @@ export type TokenByIndexParams = {
 export const FN_SELECTOR = "0x4f6ccce7" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/tokenOfOwnerByIndex.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/tokenOfOwnerByIndex.ts
index 317ffdcd06e..260539c27a7 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/tokenOfOwnerByIndex.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Enumerable/read/tokenOfOwnerByIndex.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokenOfOwnerByIndex" function.
@@ -17,12 +17,12 @@ export type TokenOfOwnerByIndexParams = {
 export const FN_SELECTOR = "0x2f745c59" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_owner",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Receiver/write/onERC721Received.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Receiver/write/onERC721Received.ts
index 4e89a7ec99f..68ff8a10a2b 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Receiver/write/onERC721Received.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IERC721Receiver/write/onERC721Received.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "onERC721Received" function.
@@ -21,20 +21,20 @@ export type OnERC721ReceivedParams = WithOverrides<{
 export const FN_SELECTOR = "0x150b7a02" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "operator",
+    type: "address",
   },
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -150,8 +150,19 @@ export function onERC721Received(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -162,16 +173,5 @@ export function onERC721Received(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ILazyMint/events/TokensLazyMinted.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ILazyMint/events/TokensLazyMinted.ts
index eb69059bee4..6fe312990fc 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ILazyMint/events/TokensLazyMinted.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ILazyMint/events/TokensLazyMinted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensLazyMinted" event.
@@ -36,8 +36,8 @@ export function tokensLazyMintedEvent(
   filters: TokensLazyMintedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensLazyMinted(uint256 indexed startTokenId, uint256 endTokenId, string baseURI, bytes encryptedBaseURI)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ILazyMint/write/lazyMint.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ILazyMint/write/lazyMint.ts
index 9889bbbb726..1eeb18fc85e 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ILazyMint/write/lazyMint.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ILazyMint/write/lazyMint.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "lazyMint" function.
@@ -23,22 +23,22 @@ export type LazyMintParams = WithOverrides<{
 export const FN_SELECTOR = "0xd37c353b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "baseURIForTokens",
+    type: "string",
   },
   {
-    type: "bytes",
     name: "extraData",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "batchId",
+    type: "uint256",
   },
 ] as const;
 
@@ -143,8 +143,19 @@ export function lazyMint(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -154,16 +165,5 @@ export function lazyMint(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IMintableERC721/events/TokensMinted.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IMintableERC721/events/TokensMinted.ts
index 667cd89e059..b4e26aa7184 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IMintableERC721/events/TokensMinted.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IMintableERC721/events/TokensMinted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMinted" event.
@@ -40,8 +40,8 @@ export type TokensMintedEventFilters = Partial<{
  */
 export function tokensMintedEvent(filters: TokensMintedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMinted(address indexed mintedTo, uint256 indexed tokenIdMinted, string uri)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IMintableERC721/write/mintTo.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IMintableERC721/write/mintTo.ts
index 5541d6823a5..722f0bace6a 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IMintableERC721/write/mintTo.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IMintableERC721/write/mintTo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintTo" function.
@@ -19,12 +19,12 @@ export type MintToParams = WithOverrides<{
 export const FN_SELECTOR = "0x0075a317" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "string",
     name: "uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -127,23 +127,23 @@ export function mintTo(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.to, resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.to, resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/read/supportsInterface.ts b/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/read/supportsInterface.ts
index 0f6b2f9089d..8ead51593eb 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceId",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/write/freezeMetadata.ts b/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/write/freezeMetadata.ts
index 072e98db461..4bc2551a316 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/write/freezeMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/write/freezeMetadata.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/write/setTokenURI.ts b/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/write/setTokenURI.ts
index 2ae9e83a539..e6fafb0e530 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/write/setTokenURI.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/INFTMetadata/write/setTokenURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTokenURI" function.
@@ -19,12 +19,12 @@ export type SetTokenURIParams = WithOverrides<{
 export const FN_SELECTOR = "0x162094c4" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function setTokenURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/INFTStake/write/depositRewardTokens.ts b/packages/thirdweb/src/extensions/erc721/__generated__/INFTStake/write/depositRewardTokens.ts
index bee2ca42a4e..d434b122090 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/INFTStake/write/depositRewardTokens.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/INFTStake/write/depositRewardTokens.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "depositRewardTokens" function.
@@ -18,8 +18,8 @@ export type DepositRewardTokensParams = WithOverrides<{
 export const FN_SELECTOR = "0x16c621e0" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -119,23 +119,23 @@ export function depositRewardTokens(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/INFTStake/write/withdrawRewardTokens.ts b/packages/thirdweb/src/extensions/erc721/__generated__/INFTStake/write/withdrawRewardTokens.ts
index ed1eccc08f6..66cec30444f 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/INFTStake/write/withdrawRewardTokens.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/INFTStake/write/withdrawRewardTokens.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdrawRewardTokens" function.
@@ -18,8 +18,8 @@ export type WithdrawRewardTokensParams = WithOverrides<{
 export const FN_SELECTOR = "0xcb43b2dd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -121,23 +121,23 @@ export function withdrawRewardTokens(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadata/read/sharedMetadata.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadata/read/sharedMetadata.ts
index 19270af23a0..430d0358c54 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadata/read/sharedMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadata/read/sharedMetadata.ts
@@ -1,28 +1,27 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xb280f703" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "string",
     name: "name",
+    type: "string",
   },
   {
-    type: "string",
     name: "description",
+    type: "string",
   },
   {
-    type: "string",
     name: "imageURI",
+    type: "string",
   },
   {
-    type: "string",
     name: "animationURI",
+    type: "string",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadata/write/setSharedMetadata.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadata/write/setSharedMetadata.ts
index cce5712e655..d3213e60abd 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadata/write/setSharedMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadata/write/setSharedMetadata.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSharedMetadata" function.
@@ -27,26 +27,26 @@ export type SetSharedMetadataParams = WithOverrides<{
 export const FN_SELECTOR = "0xa7d27d9d" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_metadata",
     components: [
       {
-        type: "string",
         name: "name",
+        type: "string",
       },
       {
-        type: "string",
         name: "description",
+        type: "string",
       },
       {
-        type: "string",
         name: "imageURI",
+        type: "string",
       },
       {
-        type: "string",
         name: "animationURI",
+        type: "string",
       },
     ],
+    name: "_metadata",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,23 +146,23 @@ export function setSharedMetadata(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.metadata] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.metadata] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/events/SharedMetadataDeleted.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/events/SharedMetadataDeleted.ts
index c60a5c32c2e..a96c36cd312 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/events/SharedMetadataDeleted.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/events/SharedMetadataDeleted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "SharedMetadataDeleted" event.
@@ -36,7 +36,7 @@ export function sharedMetadataDeletedEvent(
   filters: SharedMetadataDeletedEventFilters = {},
 ) {
   return prepareEvent({
-    signature: "event SharedMetadataDeleted(bytes32 indexed id)",
     filters,
+    signature: "event SharedMetadataDeleted(bytes32 indexed id)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/events/SharedMetadataUpdated.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/events/SharedMetadataUpdated.ts
index 57d4bb484fb..3b3f5625eda 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/events/SharedMetadataUpdated.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/events/SharedMetadataUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "SharedMetadataUpdated" event.
@@ -36,8 +36,8 @@ export function sharedMetadataUpdatedEvent(
   filters: SharedMetadataUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event SharedMetadataUpdated(bytes32 indexed id, string name, string description, string imageURI, string animationURI)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/read/getAllSharedMetadata.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/read/getAllSharedMetadata.ts
index af641d83093..da31f2a43bc 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/read/getAllSharedMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/read/getAllSharedMetadata.ts
@@ -1,44 +1,43 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfc3c2a73" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "metadata",
     components: [
       {
-        type: "bytes32",
         name: "id",
+        type: "bytes32",
       },
       {
-        type: "tuple",
-        name: "metadata",
         components: [
           {
-            type: "string",
             name: "name",
+            type: "string",
           },
           {
-            type: "string",
             name: "description",
+            type: "string",
           },
           {
-            type: "string",
             name: "imageURI",
+            type: "string",
           },
           {
-            type: "string",
             name: "animationURI",
+            type: "string",
           },
         ],
+        name: "metadata",
+        type: "tuple",
       },
     ],
+    name: "metadata",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/write/deleteSharedMetadata.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/write/deleteSharedMetadata.ts
index 2c361c8dad4..53289cc2231 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/write/deleteSharedMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/write/deleteSharedMetadata.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "deleteSharedMetadata" function.
@@ -18,8 +18,8 @@ export type DeleteSharedMetadataParams = WithOverrides<{
 export const FN_SELECTOR = "0x1ebb2422" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "id",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -121,23 +121,23 @@ export function deleteSharedMetadata(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.id] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.id] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/write/setSharedMetadata.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/write/setSharedMetadata.ts
index da44ced507e..a0f31717dc7 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/write/setSharedMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISharedMetadataBatch/write/setSharedMetadata.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSharedMetadata" function.
@@ -28,30 +28,30 @@ export type SetSharedMetadataParams = WithOverrides<{
 export const FN_SELECTOR = "0x696b0c1a" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "metadata",
     components: [
       {
-        type: "string",
         name: "name",
+        type: "string",
       },
       {
-        type: "string",
         name: "description",
+        type: "string",
       },
       {
-        type: "string",
         name: "imageURI",
+        type: "string",
       },
       {
-        type: "string",
         name: "animationURI",
+        type: "string",
       },
     ],
+    name: "metadata",
+    type: "tuple",
   },
   {
-    type: "bytes32",
     name: "id",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -154,23 +154,23 @@ export function setSharedMetadata(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.metadata, resolvedOptions.id] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.metadata, resolvedOptions.id] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/events/TokensMintedWithSignature.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/events/TokensMintedWithSignature.ts
index 9da306f14a9..ca29a0a1af8 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/events/TokensMintedWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/events/TokensMintedWithSignature.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMintedWithSignature" event.
@@ -48,8 +48,8 @@ export function tokensMintedWithSignatureEvent(
   filters: TokensMintedWithSignatureEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, (address to, address royaltyRecipient, uint256 royaltyBps, address primarySaleRecipient, string uri, uint256 price, address currency, uint128 validityStartTimestamp, uint128 validityEndTimestamp, bytes32 uid) mintpayload)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/read/verify.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/read/verify.ts
index c1389c23da5..7fe7800d736 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/read/verify.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/read/verify.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verify" function.
@@ -32,64 +32,64 @@ export type VerifyParams = {
 export const FN_SELECTOR = "0xde903774" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "payload",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "royaltyRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "royaltyBps",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "string",
         name: "uri",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "price",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "payload",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "success",
+    type: "bool",
   },
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/write/mintWithSignature.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/write/mintWithSignature.ts
index d2d2e11439a..25d1533f72c 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/write/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721/write/mintWithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintWithSignature" function.
@@ -34,60 +34,60 @@ export type MintWithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0x2c4510f8" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "payload",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "royaltyRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "royaltyBps",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "string",
         name: "uri",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "price",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "payload",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "tokenIdMinted",
+    type: "uint256",
   },
 ] as const;
 
@@ -189,23 +189,23 @@ export function mintWithSignature(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.payload, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.payload, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/events/TokensMintedWithSignature.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/events/TokensMintedWithSignature.ts
index e51025efeaf..6070f21cb48 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/events/TokensMintedWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/events/TokensMintedWithSignature.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMintedWithSignature" event.
@@ -48,8 +48,8 @@ export function tokensMintedWithSignatureEvent(
   filters: TokensMintedWithSignatureEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, (address to, address royaltyRecipient, uint256 royaltyBps, address primarySaleRecipient, string uri, uint256 quantity, uint256 pricePerToken, address currency, uint128 validityStartTimestamp, uint128 validityEndTimestamp, bytes32 uid) mintRequest)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/read/verify.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/read/verify.ts
index 271dd56a03a..eea0742e752 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/read/verify.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/read/verify.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verify" function.
@@ -33,68 +33,68 @@ export type VerifyParams = {
 export const FN_SELECTOR = "0x252e82e8" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "royaltyRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "royaltyBps",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "string",
         name: "uri",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "success",
+    type: "bool",
   },
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/write/mintWithSignature.ts b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/write/mintWithSignature.ts
index 43d69ee4691..d3a242538bf 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/write/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/ISignatureMintERC721_v2/write/mintWithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintWithSignature" function.
@@ -35,64 +35,64 @@ export type MintWithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0x439c7be5" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "payload",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "royaltyRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "royaltyBps",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "string",
         name: "uri",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "payload",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 
@@ -194,23 +194,23 @@ export function mintWithSignature(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.payload, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.payload, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/RewardsClaimed.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/RewardsClaimed.ts
index 691150f4d6b..88248c5ecbd 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/RewardsClaimed.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/RewardsClaimed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RewardsClaimed" event.
@@ -34,8 +34,8 @@ export type RewardsClaimedEventFilters = Partial<{
  */
 export function rewardsClaimedEvent(filters: RewardsClaimedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RewardsClaimed(address indexed staker, uint256 rewardAmount)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/TokensStaked.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/TokensStaked.ts
index 85cbbd5ce3f..69c85b925fe 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/TokensStaked.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/TokensStaked.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensStaked" event.
@@ -40,8 +40,8 @@ export type TokensStakedEventFilters = Partial<{
  */
 export function tokensStakedEvent(filters: TokensStakedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensStaked(address indexed staker, uint256[] indexed tokenIds)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/TokensWithdrawn.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/TokensWithdrawn.ts
index 0955ed53001..398986435e3 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/TokensWithdrawn.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/events/TokensWithdrawn.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensWithdrawn" event.
@@ -42,8 +42,8 @@ export function tokensWithdrawnEvent(
   filters: TokensWithdrawnEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensWithdrawn(address indexed staker, uint256[] indexed tokenIds)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/read/getStakeInfo.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/read/getStakeInfo.ts
index 8cb89434077..6865a02efdb 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/read/getStakeInfo.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/read/getStakeInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getStakeInfo" function.
@@ -16,18 +16,18 @@ export type GetStakeInfoParams = {
 export const FN_SELECTOR = "0xc3453153" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "staker",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256[]",
     name: "_tokensStaked",
+    type: "uint256[]",
   },
   {
-    type: "uint256",
     name: "_rewards",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/claimRewards.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/claimRewards.ts
index c8304c9c6af..5971444a1c1 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/claimRewards.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/claimRewards.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/stake.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/stake.ts
index e15d31e6f1e..af616913fd7 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/stake.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/stake.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "stake" function.
@@ -21,8 +21,8 @@ export type StakeParams = WithOverrides<{
 export const FN_SELECTOR = "0x0fbf0a93" as const;
 const FN_INPUTS = [
   {
-    type: "uint256[]",
     name: "tokenIds",
+    type: "uint256[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -118,23 +118,23 @@ export function stake(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenIds] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenIds] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/withdraw.ts b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/withdraw.ts
index 3f20b599377..49b00b8d192 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/withdraw.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/IStaking721/write/withdraw.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdraw" function.
@@ -21,8 +21,8 @@ export type WithdrawParams = WithOverrides<{
 export const FN_SELECTOR = "0x983d95ce" as const;
 const FN_INPUTS = [
   {
-    type: "uint256[]",
     name: "tokenIds",
+    type: "uint256[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -118,23 +118,23 @@ export function withdraw(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenIds] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenIds] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/events/TokensMinted.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/events/TokensMinted.ts
index 667cd89e059..b4e26aa7184 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/events/TokensMinted.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/events/TokensMinted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMinted" event.
@@ -40,8 +40,8 @@ export type TokensMintedEventFilters = Partial<{
  */
 export function tokensMintedEvent(filters: TokensMintedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMinted(address indexed mintedTo, uint256 indexed tokenIdMinted, string uri)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/events/TokensMintedWithSignature.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/events/TokensMintedWithSignature.ts
index 9b1685e557a..38f41c7c98b 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/events/TokensMintedWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/events/TokensMintedWithSignature.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensMintedWithSignature" event.
@@ -48,8 +48,8 @@ export function tokensMintedWithSignatureEvent(
   filters: TokensMintedWithSignatureEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, (address to, address royaltyRecipient, uint256 royaltyBps, address primarySaleRecipient, uint256 quantity, uint256 pricePerToken, address currency, uint128 validityStartTimestamp, uint128 validityEndTimestamp, string uri) mintRequest)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/nextTokenIdToMint.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/nextTokenIdToMint.ts
index abab41a1765..2bb30b6fa3b 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/nextTokenIdToMint.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/nextTokenIdToMint.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3b1475a7" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/supportsInterface.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/supportsInterface.ts
index 0f6b2f9089d..8ead51593eb 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceId",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/tokenURI.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/tokenURI.ts
index cdd424d3861..1088ee3775c 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/tokenURI.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/tokenURI.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokenURI" function.
@@ -16,8 +16,8 @@ export type TokenURIParams = {
 export const FN_SELECTOR = "0xc87b56dd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/totalMinted.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/totalMinted.ts
index 121dc3577cd..d9344309eea 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/totalMinted.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/read/totalMinted.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa2309ff8" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/cancel.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/cancel.ts
index 2ffb88f2541..0c2e0f3e9ba 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/cancel.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/cancel.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "cancel" function.
@@ -18,8 +18,8 @@ export type CancelParams = WithOverrides<{
 export const FN_SELECTOR = "0x40e58ee5" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function cancel(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/initialize.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/initialize.ts
index 54ee1fb1625..ae9acd0a859 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -51,44 +51,44 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xe1591634" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_saleRecipient",
+    type: "address",
   },
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint128",
     name: "_royaltyBps",
+    type: "uint128",
   },
   {
-    type: "uint128",
     name: "_platformFeeBps",
+    type: "uint128",
   },
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -224,8 +224,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -242,16 +253,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/mintTo.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/mintTo.ts
index 266759ba60d..9cc6dc7e5fe 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/mintTo.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/mintTo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintTo" function.
@@ -19,18 +19,18 @@ export type MintToParams = WithOverrides<{
 export const FN_SELECTOR = "0x0075a317" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_to",
+    type: "address",
   },
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "tokenIdMinted",
+    type: "uint256",
   },
 ] as const;
 
@@ -128,23 +128,23 @@ export function mintTo(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.to, resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.to, resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/mintWithSignature.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/mintWithSignature.ts
index 7a7692db51d..127443b9598 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/mintWithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintWithSignature" function.
@@ -34,60 +34,60 @@ export type MintWithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0x91c5ee92" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_req",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "royaltyRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "royaltyBps",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "primarySaleRecipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "string",
         name: "uri",
+        type: "string",
       },
     ],
+    name: "_req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "_signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 
@@ -189,23 +189,23 @@ export function mintWithSignature(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.req, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.req, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/revoke.ts b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/revoke.ts
index 76f13dfcba5..b9e637a13fc 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/revoke.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/LoyaltyCard/write/revoke.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "revoke" function.
@@ -18,8 +18,8 @@ export type RevokeParams = WithOverrides<{
 export const FN_SELECTOR = "0x20c5429b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function revoke(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/events/TokensUnwrapped.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/events/TokensUnwrapped.ts
index 1c2e257586d..ce08d0e6a20 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/events/TokensUnwrapped.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/events/TokensUnwrapped.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensUnwrapped" event.
@@ -48,8 +48,8 @@ export function tokensUnwrappedEvent(
   filters: TokensUnwrappedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensUnwrapped(address indexed unwrapper, address indexed recipientOfWrappedContents, uint256 indexed tokenIdOfWrappedToken)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/events/TokensWrapped.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/events/TokensWrapped.ts
index 476e907ad6d..6752b8171c0 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/events/TokensWrapped.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/events/TokensWrapped.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokensWrapped" event.
@@ -46,8 +46,8 @@ export type TokensWrappedEventFilters = Partial<{
  */
 export function tokensWrappedEvent(filters: TokensWrappedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event TokensWrapped(address indexed wrapper, address indexed recipientOfWrappedToken, uint256 indexed tokenIdOfWrappedToken, (address assetContract, uint8 tokenType, uint256 tokenId, uint256 amount)[] wrappedContents)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/contractType.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/contractType.ts
index 1ea0195f972..3299d46f932 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/contractType.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/contractType.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcb2ef6f7" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/contractVersion.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/contractVersion.ts
index c8d50c84091..d4d1cac88b2 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/contractVersion.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/contractVersion.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa0a8e460" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/getWrappedContents.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/getWrappedContents.ts
index 4b768cdca11..0f0e7c0e59f 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/getWrappedContents.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/getWrappedContents.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getWrappedContents" function.
@@ -16,32 +16,32 @@ export type GetWrappedContentsParams = {
 export const FN_SELECTOR = "0xd5576d26" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "contents",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amount",
+        type: "uint256",
       },
     ],
+    name: "contents",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/nextTokenIdToMint.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/nextTokenIdToMint.ts
index abab41a1765..2bb30b6fa3b 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/nextTokenIdToMint.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/nextTokenIdToMint.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3b1475a7" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/supportsInterface.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/supportsInterface.ts
index 0f6b2f9089d..8ead51593eb 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceId",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/tokenURI.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/tokenURI.ts
index cdd424d3861..1088ee3775c 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/tokenURI.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/read/tokenURI.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokenURI" function.
@@ -16,8 +16,8 @@ export type TokenURIParams = {
 export const FN_SELECTOR = "0xc87b56dd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/initialize.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/initialize.ts
index 1b88232e138..705cfeb456e 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -39,32 +39,32 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0x754b8fe7" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_royaltyBps",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -188,8 +188,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -203,16 +214,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/unwrap.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/unwrap.ts
index 2ea813d8f3f..e1bd6b38d57 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/unwrap.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/unwrap.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "unwrap" function.
@@ -22,12 +22,12 @@ export type UnwrapParams = WithOverrides<{
 export const FN_SELECTOR = "0x7647691d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_recipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -126,23 +126,23 @@ export function unwrap(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.recipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.recipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/wrap.ts b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/wrap.ts
index 03582322e9c..78026fa445b 100644
--- a/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/wrap.ts
+++ b/packages/thirdweb/src/extensions/erc721/__generated__/Multiwrap/write/wrap.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "wrap" function.
@@ -35,40 +35,40 @@ export type WrapParams = WithOverrides<{
 export const FN_SELECTOR = "0x29e471dd" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "_tokensToWrap",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amount",
+        type: "uint256",
       },
     ],
+    name: "_tokensToWrap",
+    type: "tuple[]",
   },
   {
-    type: "string",
     name: "_uriForWrappedToken",
+    type: "string",
   },
   {
-    type: "address",
     name: "_recipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 
@@ -173,8 +173,19 @@ export function wrap(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -184,16 +195,5 @@ export function wrap(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/customDrop721.test.ts b/packages/thirdweb/src/extensions/erc721/customDrop721.test.ts
index c99a494f9c6..8a5aba4d35b 100644
--- a/packages/thirdweb/src/extensions/erc721/customDrop721.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/customDrop721.test.ts
@@ -1,11 +1,10 @@
-import { fetchDeployMetadata } from "../../utils/any-evm/deploy-metadata.js";
-
 import { beforeAll, describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { TEST_ACCOUNT_C } from "../../../test/src/test-wallets.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
+import { fetchDeployMetadata } from "../../utils/any-evm/deploy-metadata.js";
 import { deployContractfromDeployMetadata } from "../prebuilts/deploy-published.js";
 import { balanceOf } from "./__generated__/IERC721A/read/balanceOf.js";
 import { nextTokenIdToMint } from "./__generated__/IERC721Enumerable/read/nextTokenIdToMint.js";
@@ -28,9 +27,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         uri: "ipfs://QmY6CHFuhDpQzuv3y3NyQBPdAa7cYjZGJgFeFcw9BfSMQx",
       });
       const contractAddress = await deployContractfromDeployMetadata({
+        account: TEST_ACCOUNT_C,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_C,
         deployMetadata: customDropDeployMetadata,
         initializeParams: {
           defaultAdmin: TEST_ACCOUNT_C.address,
@@ -60,8 +59,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         ],
       });
       await sendAndConfirmTransaction({
-        transaction: mintTx,
         account: TEST_ACCOUNT_C,
+        transaction: mintTx,
       });
 
       await expect(nextTokenIdToMint({ contract })).resolves.toBe(6n);
@@ -75,27 +74,27 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         balanceOf({ contract, owner: TEST_ACCOUNT_C.address }),
       ).resolves.toBe(0n);
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
-              startTime: new Date(0),
               maxClaimableSupply: 10n,
+              startTime: new Date(0),
             },
           ],
           singlePhaseDrop: true,
         }),
-        account: TEST_ACCOUNT_C,
       });
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_C.address,
         quantity: 1n,
         singlePhaseDrop: true,
+        to: TEST_ACCOUNT_C.address,
       });
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_C,
+        transaction: claimTx,
       });
       await expect(
         balanceOf({ contract, owner: TEST_ACCOUNT_C.address }),
diff --git a/packages/thirdweb/src/extensions/erc721/drop721.test.ts b/packages/thirdweb/src/extensions/erc721/drop721.test.ts
index ef943042973..9b3ce499684 100644
--- a/packages/thirdweb/src/extensions/erc721/drop721.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/drop721.test.ts
@@ -9,7 +9,7 @@ import {
   TEST_ACCOUNT_C,
   TEST_ACCOUNT_D,
 } from "../../../test/src/test-wallets.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
 import { toEther } from "../../utils/units.js";
@@ -18,6 +18,7 @@ import { deployERC20Contract } from "../prebuilts/deploy-erc20.js";
 import { deployERC721Contract } from "../prebuilts/deploy-erc721.js";
 import { balanceOf } from "./__generated__/IERC721A/read/balanceOf.js";
 import { nextTokenIdToMint } from "./__generated__/IERC721Enumerable/read/nextTokenIdToMint.js";
+import { canClaim } from "./drops/read/canClaim.js";
 import { getClaimConditions } from "./drops/read/getClaimConditions.js";
 import { claimTo } from "./drops/write/claimTo.js";
 import { resetClaimEligibility } from "./drops/write/resetClaimEligibility.js";
@@ -25,7 +26,6 @@ import { setClaimConditions } from "./drops/write/setClaimConditions.js";
 import { getNFT } from "./read/getNFT.js";
 import { lazyMint } from "./write/lazyMint.js";
 
-import { canClaim } from "./drops/read/canClaim.js";
 describe.runIf(process.env.TW_SECRET_KEY)(
   "DropERC721",
   {
@@ -60,8 +60,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
         params: {
-          name: "Test ERC20",
           contractURI: TEST_CONTRACT_URI,
+          name: "Test ERC20",
         },
         type: "TokenERC20",
       });
@@ -91,8 +91,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         ],
       });
       await sendAndConfirmTransaction({
-        transaction: mintTx,
         account: TEST_ACCOUNT_A,
+        transaction: mintTx,
       });
 
       await expect(nextTokenIdToMint({ contract })).resolves.toBe(10n);
@@ -106,17 +106,17 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         balanceOf({ contract, owner: TEST_ACCOUNT_A.address }),
       ).resolves.toBe(0n);
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [{}],
         }),
-        account: TEST_ACCOUNT_A,
       });
 
       expect(
         await canClaim({
-          contract,
           claimer: TEST_ACCOUNT_A.address,
+          contract,
           quantity: 1n,
         }),
       ).toMatchInlineSnapshot(`
@@ -127,12 +127,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_A.address,
         quantity: 1n,
+        to: TEST_ACCOUNT_A.address,
       });
       await sendAndConfirmTransaction({
-        transaction: claimTx,
         account: TEST_ACCOUNT_A,
+        transaction: claimTx,
       });
       await expect(
         balanceOf({ contract, owner: TEST_ACCOUNT_A.address }),
@@ -142,6 +142,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should allow to claim tokens with value", async () => {
       // set cc with price
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
@@ -150,12 +151,11 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_C.address,
         quantity: 2n,
+        to: TEST_ACCOUNT_C.address,
       });
       // assert value is set correctly
       const value = await resolvePromisedValue(claimTx.value);
@@ -167,21 +167,21 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should allow to claim tokens with erc20 value", async () => {
       // set cc with price
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
-              price: "0.01",
               currencyAddress: erc20Contract.address,
+              price: "0.01",
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
       const claimTx = claimTo({
         contract,
-        to: TEST_ACCOUNT_C.address,
         quantity: 2n,
+        to: TEST_ACCOUNT_C.address,
       });
       // assert value is set correctly
       const value = await resolvePromisedValue(claimTx.erc20Value);
@@ -193,19 +193,19 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     describe("Allowlists", () => {
       it("should allow to claim tokens with an allowlist", async () => {
         await sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_A,
           transaction: setClaimConditions({
             contract,
             phases: [
               {
+                maxClaimablePerWallet: 0n,
                 overrideList: [
                   { address: TEST_ACCOUNT_A.address, maxClaimable: "100" },
                   { address: VITALIK_WALLET, maxClaimable: "100" },
                 ],
-                maxClaimablePerWallet: 0n,
               },
             ],
           }),
-          account: TEST_ACCOUNT_A,
         });
 
         await expect(
@@ -214,8 +214,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
         expect(
           await canClaim({
-            contract,
             claimer: TEST_ACCOUNT_A.address,
+            contract,
             quantity: 1n,
           }),
         ).toMatchInlineSnapshot(`
@@ -226,8 +226,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
         expect(
           await canClaim({
-            contract,
             claimer: TEST_ACCOUNT_B.address,
+            contract,
             quantity: 1n,
           }),
         ).toMatchInlineSnapshot(`
@@ -242,8 +242,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           transaction: claimTo({
             contract,
             from: TEST_ACCOUNT_A.address,
-            to: TEST_ACCOUNT_B.address,
             quantity: 1n,
+            to: TEST_ACCOUNT_B.address,
           }),
         });
 
@@ -256,8 +256,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             account: TEST_ACCOUNT_B,
             transaction: claimTo({
               contract,
-              to: TEST_ACCOUNT_B.address,
               quantity: 1n,
+              to: TEST_ACCOUNT_B.address,
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
@@ -270,19 +270,19 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       it("should respect max claimable", async () => {
         await sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_A,
           transaction: setClaimConditions({
             contract,
             phases: [
               {
+                maxClaimablePerWallet: 0n,
                 overrideList: [
                   { address: TEST_ACCOUNT_A.address, maxClaimable: "3" },
                   { address: VITALIK_WALLET, maxClaimable: "3" },
                 ],
-                maxClaimablePerWallet: 0n,
               },
             ],
           }),
-          account: TEST_ACCOUNT_A,
         });
 
         await expect(
@@ -298,8 +298,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             account: TEST_ACCOUNT_A,
             transaction: claimTo({
               contract,
-              to: TEST_ACCOUNT_A.address,
               quantity: 2n,
+              to: TEST_ACCOUNT_A.address,
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
@@ -316,8 +316,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           account: TEST_ACCOUNT_A,
           transaction: claimTo({
             contract,
-            to: TEST_ACCOUNT_A.address,
             quantity: 1n,
+            to: TEST_ACCOUNT_A.address,
           }),
         });
 
@@ -329,10 +329,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should respect price", async () => {
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
             {
+              maxClaimablePerWallet: 0n,
               overrideList: [
                 {
                   address: TEST_ACCOUNT_A.address,
@@ -340,12 +342,10 @@ describe.runIf(process.env.TW_SECRET_KEY)(
                   price: "0",
                 },
               ],
-              maxClaimablePerWallet: 0n,
               price: "1000",
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
 
       await expect(
@@ -356,8 +356,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         account: TEST_ACCOUNT_A,
         transaction: claimTo({
           contract,
-          to: TEST_ACCOUNT_A.address,
           quantity: 1n,
+          to: TEST_ACCOUNT_A.address,
         }),
       });
 
@@ -368,6 +368,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should be able to retrieve multiple phases", async () => {
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
@@ -381,7 +382,6 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
 
       const phases = await getClaimConditions({ contract });
@@ -393,6 +393,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should be able to reset claim eligibility", async () => {
       // set claim conditions to only allow one claim
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: setClaimConditions({
           contract,
           phases: [
@@ -401,18 +402,17 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             },
           ],
         }),
-        account: TEST_ACCOUNT_A,
       });
       // claim one token
       await sendAndConfirmTransaction({
+        // fresh account to avoid any previous claims
+        account: TEST_ACCOUNT_D,
         transaction: claimTo({
           contract,
+          quantity: 1n,
           // fresh account to avoid any previous claims
           to: TEST_ACCOUNT_D.address,
-          quantity: 1n,
         }),
-        // fresh account to avoid any previous claims
-        account: TEST_ACCOUNT_D,
       });
       // check that the account has claimed one token
       await expect(
@@ -421,12 +421,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       // attempt to claim another token (this should fail)
       await expect(
         sendAndConfirmTransaction({
+          account: TEST_ACCOUNT_D,
           transaction: claimTo({
             contract,
-            to: TEST_ACCOUNT_D.address,
             quantity: 1n,
+            to: TEST_ACCOUNT_D.address,
           }),
-          account: TEST_ACCOUNT_D,
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
         [TransactionError: DropClaimExceedLimit - 1,2
@@ -437,19 +437,19 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       // reset claim eligibility
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: resetClaimEligibility({
           contract,
         }),
-        account: TEST_ACCOUNT_A,
       });
       // attempt to claim another token (this should succeed)
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_D,
         transaction: claimTo({
           contract,
-          to: TEST_ACCOUNT_D.address,
           quantity: 1n,
+          to: TEST_ACCOUNT_D.address,
         }),
-        account: TEST_ACCOUNT_D,
       });
       // check that the account has claimed two tokens
       await expect(
diff --git a/packages/thirdweb/src/extensions/erc721/drops/read/canClaim.ts b/packages/thirdweb/src/extensions/erc721/drops/read/canClaim.ts
index c058fa9f2aa..90283c55895 100644
--- a/packages/thirdweb/src/extensions/erc721/drops/read/canClaim.ts
+++ b/packages/thirdweb/src/extensions/erc721/drops/read/canClaim.ts
@@ -44,29 +44,29 @@ export async function canClaim(
       }),
       getClaimParams({
         contract: options.contract,
+        from: options.from,
         quantity: options.quantity,
         to: options.claimer,
         type: "erc721",
-        from: options.from,
       }),
     ]);
   try {
     await verifyClaim({
-      contract: options.contract,
+      allowlistProof,
       claimer: options.claimer,
-      quantity,
+      conditionId,
+      contract: options.contract,
       currency,
       pricePerToken,
-      allowlistProof,
-      conditionId,
+      quantity,
     });
     return {
       result: true,
     };
   } catch (error) {
     return {
+      reason: await extractErrorResult({ contract: options.contract, error }),
       result: false,
-      reason: await extractErrorResult({ error, contract: options.contract }),
     };
   }
 }
diff --git a/packages/thirdweb/src/extensions/erc721/drops/write/claimTo.ts b/packages/thirdweb/src/extensions/erc721/drops/write/claimTo.ts
index 9ecf5565806..afaa1b7ab4e 100644
--- a/packages/thirdweb/src/extensions/erc721/drops/write/claimTo.ts
+++ b/packages/thirdweb/src/extensions/erc721/drops/write/claimTo.ts
@@ -56,16 +56,16 @@ export type ClaimToParams = {
  */
 export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
   return claim({
-    contract: options.contract,
     asyncParams: () =>
       getClaimParams({
-        type: "erc721",
         contract: options.contract,
-        to: options.to,
-        quantity: options.quantity,
         from: options.from,
+        quantity: options.quantity,
         singlePhaseDrop: options.singlePhaseDrop,
+        to: options.to,
+        type: "erc721",
       }),
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc721/drops/write/claimToBatch.test.ts b/packages/thirdweb/src/extensions/erc721/drops/write/claimToBatch.test.ts
index 0cf318ee4f8..e20d51efa0f 100644
--- a/packages/thirdweb/src/extensions/erc721/drops/write/claimToBatch.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/drops/write/claimToBatch.test.ts
@@ -25,27 +25,27 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721: claimToBatch", () => {
     expect(
       optimizeClaimContent([
         {
-          to: account.address,
           quantity: 1n,
+          to: account.address,
         },
         {
-          to: TEST_ACCOUNT_B.address,
           quantity: 2n,
+          to: TEST_ACCOUNT_B.address,
         },
         {
-          to: TEST_ACCOUNT_B.address,
           quantity: 3n,
+          to: TEST_ACCOUNT_B.address,
         },
-        { to: TEST_ACCOUNT_C.address, quantity: 2n },
-        { to: TEST_ACCOUNT_D.address, quantity: 2n },
-        { to: account.address, quantity: 1n },
+        { quantity: 2n, to: TEST_ACCOUNT_C.address },
+        { quantity: 2n, to: TEST_ACCOUNT_D.address },
+        { quantity: 1n, to: account.address },
       ]),
     ).toStrictEqual([
-      { to: account.address, quantity: 1n },
-      { to: TEST_ACCOUNT_B.address, quantity: 5n },
-      { to: TEST_ACCOUNT_C.address, quantity: 2n },
-      { to: TEST_ACCOUNT_D.address, quantity: 2n },
-      { to: account.address, quantity: 1n },
+      { quantity: 1n, to: account.address },
+      { quantity: 5n, to: TEST_ACCOUNT_B.address },
+      { quantity: 2n, to: TEST_ACCOUNT_C.address },
+      { quantity: 2n, to: TEST_ACCOUNT_D.address },
+      { quantity: 1n, to: account.address },
     ]);
   });
 
@@ -55,8 +55,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721: claimToBatch", () => {
       chain,
       client,
       params: {
-        name: "Test DropERC721",
         contractURI: TEST_CONTRACT_URI,
+        name: "Test DropERC721",
       },
       type: "DropERC721",
     });
@@ -68,6 +68,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721: claimToBatch", () => {
     });
 
     await sendAndConfirmTransaction({
+      account,
       transaction: lazyMint({
         contract,
         nfts: [
@@ -84,37 +85,36 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721: claimToBatch", () => {
           { name: "Test NFT 10" },
         ],
       }),
-      account,
     });
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: setClaimConditions({
         contract,
         phases: [{}],
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     const transaction = claimToBatch({
-      contract,
-      from: account.address,
       content: [
         {
-          to: account.address,
           quantity: 1n,
+          to: account.address,
         },
         {
-          to: TEST_ACCOUNT_B.address,
           quantity: 2n,
+          to: TEST_ACCOUNT_B.address,
         },
         {
-          to: TEST_ACCOUNT_B.address,
           quantity: 3n,
+          to: TEST_ACCOUNT_B.address,
         },
-        { to: TEST_ACCOUNT_C.address, quantity: 2n },
-        { to: TEST_ACCOUNT_D.address, quantity: 2n },
-        { to: account.address, quantity: 1n },
+        { quantity: 2n, to: TEST_ACCOUNT_C.address },
+        { quantity: 2n, to: TEST_ACCOUNT_D.address },
+        { quantity: 1n, to: account.address },
       ],
+      contract,
+      from: account.address,
     });
 
     await sendAndConfirmTransaction({ account, transaction });
diff --git a/packages/thirdweb/src/extensions/erc721/drops/write/claimToBatch.ts b/packages/thirdweb/src/extensions/erc721/drops/write/claimToBatch.ts
index 8edbfe59b2a..fa0f42ea202 100644
--- a/packages/thirdweb/src/extensions/erc721/drops/write/claimToBatch.ts
+++ b/packages/thirdweb/src/extensions/erc721/drops/write/claimToBatch.ts
@@ -48,8 +48,8 @@ export function claimToBatch(
   options: BaseTransactionOptions<ClaimToBatchParams>,
 ) {
   return multicall({
-    contract: options.contract,
     asyncParams: () => getClaimToBatchParams(options),
+    contract: options.contract,
     overrides: options.overrides,
   });
 }
@@ -74,21 +74,21 @@ async function getClaimToBatchParams(
   const data = await Promise.all(
     content.map(async (item) => {
       const claimParams = await getClaimParams({
-        type: "erc721",
         contract: options.contract,
-        to: item.to,
         from: options.from,
         quantity: item.quantity,
+        to: item.to,
+        type: "erc721",
       });
 
       return encodeClaim({
-        receiver: claimParams.receiver,
-        quantity: claimParams.quantity,
-        currency: claimParams.currency,
-        pricePerToken: claimParams.pricePerToken,
         allowlistProof: claimParams.allowlistProof,
+        currency: claimParams.currency,
         data: claimParams.data,
         overrides: claimParams.overrides,
+        pricePerToken: claimParams.pricePerToken,
+        quantity: claimParams.quantity,
+        receiver: claimParams.receiver,
       });
     }),
   );
@@ -133,8 +133,8 @@ export function optimizeClaimContent(
       item.to.toLowerCase() === previousItem.to.toLowerCase()
     ) {
       results[results.length - 1] = {
-        to: item.to,
         quantity: item.quantity + previousItem.quantity,
+        to: item.to,
       };
     } else {
       results.push(item);
diff --git a/packages/thirdweb/src/extensions/erc721/drops/write/resetClaimEligibility.ts b/packages/thirdweb/src/extensions/erc721/drops/write/resetClaimEligibility.ts
index b2f22f22094..3c03f6fa57d 100644
--- a/packages/thirdweb/src/extensions/erc721/drops/write/resetClaimEligibility.ts
+++ b/packages/thirdweb/src/extensions/erc721/drops/write/resetClaimEligibility.ts
@@ -31,7 +31,6 @@ import {
 export function resetClaimEligibility(options: BaseTransactionOptions) {
   // download existing conditions
   return setClaimConditions({
-    contract: options.contract,
     asyncParams: async () => {
       // get existing conditions
       const existingConditions = await getClaimConditions(options);
@@ -48,6 +47,7 @@ export function resetClaimEligibility(options: BaseTransactionOptions) {
         resetClaimEligibility: true,
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc721/drops/write/setClaimConditions.ts b/packages/thirdweb/src/extensions/erc721/drops/write/setClaimConditions.ts
index d9b4f1103b2..c787b52e58d 100644
--- a/packages/thirdweb/src/extensions/erc721/drops/write/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/erc721/drops/write/setClaimConditions.ts
@@ -50,18 +50,18 @@ export function setClaimConditions(
   options: BaseTransactionOptions<SetClaimConditionsParams>,
 ) {
   return multicall({
-    contract: options.contract,
     asyncParams: async () => {
       return {
         data: await getMulticallSetClaimConditionTransactions({
           contract: options.contract,
           phases: options.phases,
           resetClaimEligibility: options.resetClaimEligibility,
-          tokenDecimals: 0,
           singlePhase: options.singlePhaseDrop,
+          tokenDecimals: 0,
         }),
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc721/drops/write/updateMetadata.test.ts b/packages/thirdweb/src/extensions/erc721/drops/write/updateMetadata.test.ts
index 9dbe0c15424..6309ec43253 100644
--- a/packages/thirdweb/src/extensions/erc721/drops/write/updateMetadata.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/drops/write/updateMetadata.test.ts
@@ -1,9 +1,8 @@
 import { describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "~test/chains.js";
+import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
 import { TEST_CLIENT } from "~test/test-clients.js";
 import { TEST_ACCOUNT_C } from "~test/test-wallets.js";
-
-import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
 import { getContract } from "../../../../contract/contract.js";
 import { deployERC721Contract } from "../../../../extensions/prebuilts/deploy-erc721.js";
 import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
@@ -18,32 +17,32 @@ const chain = ANVIL_CHAIN;
 describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC721", () => {
   it("should update metadata", async () => {
     const address = await deployERC721Contract({
-      client,
-      chain,
       account,
-      type: "DropERC721",
+      chain,
+      client,
       params: {
-        name: "NFT Drop",
         contractURI: TEST_CONTRACT_URI,
+        name: "NFT Drop",
       },
+      type: "DropERC721",
     });
     const contract = getContract({
       address,
-      client,
       chain,
+      client,
     });
     const lazyMintTx = lazyMint({
       contract,
       nfts: [{ name: "token 0" }, { name: "token 1" }, { name: "token 2" }],
     });
-    await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
+    await sendAndConfirmTransaction({ account, transaction: lazyMintTx });
 
     const updateTx = updateMetadata({
       contract,
-      targetTokenId: 1n,
       newMetadata: { name: "token 1 - updated" },
+      targetTokenId: 1n,
     });
-    await sendAndConfirmTransaction({ transaction: updateTx, account });
+    await sendAndConfirmTransaction({ account, transaction: updateTx });
 
     const nfts = await getNFTs({ contract });
 
@@ -55,27 +54,27 @@ describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC721", () => {
 
   it("should throw if no nft uploaded", async () => {
     const address = await deployERC721Contract({
-      client,
-      chain,
       account,
-      type: "DropERC721",
+      chain,
+      client,
       params: {
-        name: "NFT Drop",
         contractURI: TEST_CONTRACT_URI,
+        name: "NFT Drop",
       },
+      type: "DropERC721",
     });
     const contract = getContract({
       address,
-      client,
       chain,
+      client,
     });
     const updateTx = updateMetadata({
       contract,
-      targetTokenId: 0n,
       newMetadata: { name: "token 1 - updated" },
+      targetTokenId: 0n,
     });
     await expect(
-      sendAndConfirmTransaction({ transaction: updateTx, account }),
+      sendAndConfirmTransaction({ account, transaction: updateTx }),
     ).rejects.toThrowError(
       "No base URI set. Please set a base URI before updating metadata",
     );
@@ -88,19 +87,19 @@ describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC721", () => {
     },
     async () => {
       const address = await deployERC721Contract({
-        client,
-        chain,
         account,
-        type: "DropERC721",
+        chain,
+        client,
         params: {
-          name: "NFT Drop",
           contractURI: TEST_CONTRACT_URI,
+          name: "NFT Drop",
         },
+        type: "DropERC721",
       });
       const contract = getContract({
         address,
-        client,
         chain,
+        client,
       });
       const lazyMintTx = lazyMint({
         contract,
@@ -108,13 +107,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC721", () => {
           name: `token ${i}`,
         })),
       });
-      await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
+      await sendAndConfirmTransaction({ account, transaction: lazyMintTx });
       const updateTx = updateMetadata({
         contract,
-        targetTokenId: 1n,
         newMetadata: { name: "token 1 - updated" },
+        targetTokenId: 1n,
       });
-      await sendAndConfirmTransaction({ transaction: updateTx, account });
+      await sendAndConfirmTransaction({ account, transaction: updateTx });
       const nfts = await getNFTs({ contract });
 
       expect(nfts.length).toBe(100); // first page
diff --git a/packages/thirdweb/src/extensions/erc721/drops/write/updateMetadata.ts b/packages/thirdweb/src/extensions/erc721/drops/write/updateMetadata.ts
index e223ecfe1fa..0e61d24d1b1 100644
--- a/packages/thirdweb/src/extensions/erc721/drops/write/updateMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc721/drops/write/updateMetadata.ts
@@ -56,8 +56,8 @@ async function getUpdateMetadataParams(
       chunk.map((id) =>
         GetNFT.getNFT({
           contract,
-          tokenId: id,
           includeOwner: false,
+          tokenId: id,
           useIndexer: false,
         }),
       ),
@@ -132,8 +132,8 @@ export function updateMetadata(
 ) {
   const { contract } = options;
   return BatchBaseURI.updateBatchBaseURI({
-    contract,
     asyncParams: async () => getUpdateMetadataParams(options),
+    contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc721/lazyMinting/read/getBatchesToReveal.test.ts b/packages/thirdweb/src/extensions/erc721/lazyMinting/read/getBatchesToReveal.test.ts
index fcd786b0c16..4fea2c56464 100644
--- a/packages/thirdweb/src/extensions/erc721/lazyMinting/read/getBatchesToReveal.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/lazyMinting/read/getBatchesToReveal.test.ts
@@ -2,19 +2,19 @@ import { beforeAll, describe, expect, it, vi } from "vitest";
 import { ANVIL_CHAIN } from "../../../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../../../test/src/test-clients.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../../contract/contract.js";
 import { getBatchesToReveal } from "./getBatchesToReveal.js";
 
 const mocks = vi.hoisted(() => ({
+  baseURIIndices: vi.fn(),
+  decodeAbiParameters: vi.fn(),
+  encryptedData: vi.fn(),
+  fetchTokenMetadata: vi.fn(),
   getBaseURICount: vi.fn(),
   getBatchIdAtIndex: vi.fn(),
-  baseURIIndices: vi.fn(),
   tokenURI: vi.fn(),
-  fetchTokenMetadata: vi.fn(),
-  encryptedData: vi.fn(),
-  decodeAbiParameters: vi.fn(),
 }));
 
 vi.mock(
@@ -56,8 +56,8 @@ describe("getBatchesToReveal", () => {
 
   beforeAll(() => {
     contract = getContract({
-      chain: ANVIL_CHAIN,
       address: "0x708781BAE850faA490cB5b5b16b4687Ec0A8D65D",
+      chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
     });
   });
diff --git a/packages/thirdweb/src/extensions/erc721/lazyMinting/read/getBatchesToReveal.ts b/packages/thirdweb/src/extensions/erc721/lazyMinting/read/getBatchesToReveal.ts
index f38e168e449..93681562eda 100644
--- a/packages/thirdweb/src/extensions/erc721/lazyMinting/read/getBatchesToReveal.ts
+++ b/packages/thirdweb/src/extensions/erc721/lazyMinting/read/getBatchesToReveal.ts
@@ -79,9 +79,9 @@ export async function getBatchesToReveal(
         tokenId: BigInt(i),
       });
       return await fetchTokenMetadata({
+        client: options.contract.client,
         tokenId: BigInt(i),
         tokenUri: uri,
-        client: options.contract.client,
       }).catch(() => undefined);
     }),
   );
diff --git a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createAndReveal.test.ts b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createAndReveal.test.ts
index 476af43956e..10023244b0f 100644
--- a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createAndReveal.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createAndReveal.test.ts
@@ -1,12 +1,11 @@
-import { beforeAll, describe, it } from "vitest";
-import { expect } from "vitest";
+import { beforeAll, describe, expect, it } from "vitest";
 import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
 import { ANVIL_CHAIN } from "../../../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../../../test/src/test-clients.js";
 import { TEST_ACCOUNT_A } from "../../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
 import { deployERC721Contract } from "../../../prebuilts/deploy-erc721.js";
@@ -15,18 +14,18 @@ import { createDelayedRevealBatch } from "./createDelayedRevealBatch.js";
 import { reveal } from "./reveal.js";
 
 const placeholderNFT = {
-  name: "Hidden NFT",
   description: "Will be revealed next week!",
+  name: "Hidden NFT",
 };
 
 const realNFTs = [
   {
-    name: "Common NFT #1",
     description: "Common NFT, one of many.",
+    name: "Common NFT #1",
   },
   {
-    name: "Super Rare NFT #2",
     description: "You got a Super Rare NFT!",
+    name: "Super Rare NFT #2",
   },
 ];
 
@@ -34,18 +33,18 @@ describe.runIf(process.env.TW_SECRET_KEY)("createAndReveal", () => {
   let contract: ThirdwebContract;
   beforeAll(async () => {
     const address = await deployERC721Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
-      type: "DropERC721",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
-        name: "Test NFT",
         contractURI: TEST_CONTRACT_URI,
+        name: "Test NFT",
       },
+      type: "DropERC721",
     });
     contract = getContract({
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
     });
   });
@@ -58,8 +57,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("createAndReveal", () => {
       placeholderMetadata: placeholderNFT,
     });
     await sendAndConfirmTransaction({
-      transaction: tx,
       account: TEST_ACCOUNT_A,
+      transaction: tx,
     });
     const nft = await getNFT({
       contract,
@@ -67,13 +66,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("createAndReveal", () => {
     });
     expect(nft.metadata.name).toBe(placeholderNFT.name);
     const revealTx = reveal({
-      contract,
       batchId: 0n,
+      contract,
       password: "password",
     });
     await sendAndConfirmTransaction({
-      transaction: revealTx,
       account: TEST_ACCOUNT_A,
+      transaction: revealTx,
     });
     const nftAfterReveal = await getNFT({
       contract,
diff --git a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.test.ts b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.test.ts
index f7835827456..b893455bbf5 100644
--- a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.test.ts
@@ -11,8 +11,8 @@ import { createDelayedRevealBatch } from "./createDelayedRevealBatch.js";
 import { reveal } from "./reveal.js";
 
 const placeholderMetadata = {
-  name: "Hidden NFT",
   description: "Will be revealed next week!",
+  name: "Hidden NFT",
 };
 const account = TEST_ACCOUNT_D;
 const chain = ANVIL_CHAIN;
@@ -26,11 +26,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("createDelayedRevealedBatch", () => {
         account,
         chain,
         client,
-        type: "DropERC721",
         params: {
-          name: "nftdrop",
           contractURI: TEST_CONTRACT_URI,
+          name: "nftdrop",
         },
+        type: "DropERC721",
       }),
       chain,
       client,
@@ -41,9 +41,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("createDelayedRevealedBatch", () => {
       account,
       transaction: createDelayedRevealBatch({
         contract,
-        placeholderMetadata,
-        password: "1234",
         metadata: [{ name: "token 0" }, { name: "token 1" }],
+        password: "1234",
+        placeholderMetadata,
       }),
     });
 
@@ -52,21 +52,21 @@ describe.runIf(process.env.TW_SECRET_KEY)("createDelayedRevealedBatch", () => {
       account,
       transaction: createDelayedRevealBatch({
         contract,
-        placeholderMetadata,
-        password,
         metadata: [{ name: "token 2" }, { name: "token 3" }],
+        password,
+        placeholderMetadata,
       }),
     });
 
     // Reveal batch #0
     await sendAndConfirmTransaction({
       account,
-      transaction: reveal({ contract, batchId: 0n, password }),
+      transaction: reveal({ batchId: 0n, contract, password }),
     });
     // Reveal batch #1
     await sendAndConfirmTransaction({
       account,
-      transaction: reveal({ contract, batchId: 1n, password }),
+      transaction: reveal({ batchId: 1n, contract, password }),
     });
 
     /**
diff --git a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.ts b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.ts
index 4f9dfe10e7a..7e777a18175 100644
--- a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.ts
+++ b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.ts
@@ -80,7 +80,6 @@ export function createDelayedRevealBatch(
   }
 
   return generatedLazyMint({
-    contract: options.contract,
     asyncParams: async () => {
       const [placeholderUris, startFileNumber] = await Promise.all([
         upload({
@@ -145,6 +144,7 @@ export function createDelayedRevealBatch(
         extraData: data,
       } as const;
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/reveal.test.ts b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/reveal.test.ts
index 17a98fa3d76..75563d6c1f6 100644
--- a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/reveal.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/reveal.test.ts
@@ -2,8 +2,8 @@ import { beforeAll, describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../../../test/src/test-clients.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../../contract/contract.js";
 import { reveal } from "./reveal.js";
 
@@ -11,16 +11,16 @@ describe("reveal", () => {
   let contract: ThirdwebContract;
   beforeAll(() => {
     contract = getContract({
-      chain: ANVIL_CHAIN,
       address: "0x708781BAE850faA490cB5b5b16b4687Ec0A8D65D",
+      chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
     });
   });
 
   it("should throw an error if password is missing", async () => {
     const options = {
-      contract,
       batchId: 1n,
+      contract,
       password: "",
     };
 
diff --git a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/reveal.ts b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/reveal.ts
index f38db7c7014..da5c5d86a17 100644
--- a/packages/thirdweb/src/extensions/erc721/lazyMinting/write/reveal.ts
+++ b/packages/thirdweb/src/extensions/erc721/lazyMinting/write/reveal.ts
@@ -38,7 +38,6 @@ export function reveal(options: BaseTransactionOptions<RevealParams>) {
   }
 
   return generatedReveal({
-    contract: options.contract,
     asyncParams: async () => {
       const key = await hashDelayedRevealPassword(
         options.batchId,
@@ -50,5 +49,6 @@ export function reveal(options: BaseTransactionOptions<RevealParams>) {
         key,
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/read/getAllOwners.ts b/packages/thirdweb/src/extensions/erc721/read/getAllOwners.ts
index f74441ef2b6..f0156b8abf3 100644
--- a/packages/thirdweb/src/extensions/erc721/read/getAllOwners.ts
+++ b/packages/thirdweb/src/extensions/erc721/read/getAllOwners.ts
@@ -80,8 +80,8 @@ export async function getAllOwners(
       ownerOf({ contract: options.contract, tokenId: i })
         .catch(() => ZERO_ADDRESS)
         .then((owner) => ({
-          tokenId: i,
           owner,
+          tokenId: i,
         })),
     );
   }
diff --git a/packages/thirdweb/src/extensions/erc721/read/getNFT.test.ts b/packages/thirdweb/src/extensions/erc721/read/getNFT.test.ts
index fb4e0edb6f1..bbc140f8de0 100644
--- a/packages/thirdweb/src/extensions/erc721/read/getNFT.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/read/getNFT.test.ts
@@ -6,8 +6,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFT", () => {
   it("without owner using indexer", async () => {
     const nft = await getNFT({
       contract: DOODLES_CONTRACT,
-      tokenId: 1n,
       includeOwner: false,
+      tokenId: 1n,
     });
     expect(nft.metadata.name).toBe("Doodle #1");
     expect(nft).toMatchInlineSnapshot(`
@@ -54,8 +54,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFT", () => {
   it("with owner using indexer", async () => {
     const nft = await getNFT({
       contract: { ...DOODLES_CONTRACT },
-      tokenId: 1n,
       includeOwner: true,
+      tokenId: 1n,
     });
     expect(nft.metadata.name).toBe("Doodle #1");
     expect(nft.owner).toBeDefined();
@@ -103,8 +103,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFT", () => {
   it("without owner", async () => {
     const nft = await getNFT({
       contract: { ...DOODLES_CONTRACT },
-      tokenId: 1n,
       includeOwner: false,
+      tokenId: 1n,
       useIndexer: false,
     });
     expect(nft).toMatchInlineSnapshot(`
@@ -149,8 +149,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFT", () => {
   it("with owner", async () => {
     const nft = await getNFT({
       contract: { ...DOODLES_CONTRACT },
-      tokenId: 1n,
       includeOwner: true,
+      tokenId: 1n,
       useIndexer: false,
     });
     expect(nft).toMatchInlineSnapshot(`
diff --git a/packages/thirdweb/src/extensions/erc721/read/getNFT.ts b/packages/thirdweb/src/extensions/erc721/read/getNFT.ts
index e37061fe2b7..cd281c5261a 100644
--- a/packages/thirdweb/src/extensions/erc721/read/getNFT.ts
+++ b/packages/thirdweb/src/extensions/erc721/read/getNFT.ts
@@ -7,7 +7,9 @@ import {
   tokenURI,
 } from "../__generated__/IERC721A/read/tokenURI.js";
 import { tokenByIndex } from "../__generated__/IERC721Enumerable/read/tokenByIndex.js";
+
 export { isTokenURISupported as isGetNFTSupported } from "../__generated__/IERC721A/read/tokenURI.js";
+
 import { getNFT as getNFTInsight } from "../../../insight/index.js";
 
 /**
@@ -79,11 +81,11 @@ async function getNFTFromInsight(
   options: BaseTransactionOptions<GetNFTParams>,
 ): Promise<NFT> {
   const nft = await getNFTInsight({
-    client: options.contract.client,
     chain: options.contract.chain,
+    client: options.contract.client,
     contractAddress: options.contract.address,
-    tokenId: options.tokenId,
     includeOwners: options.includeOwner,
+    tokenId: options.tokenId,
   });
   if (!nft) {
     // fresh contracts might be delayed in indexing, so we fallback to RPC
@@ -122,12 +124,12 @@ async function getNFTFromRPC(
         uri: "",
       },
       {
+        chainId: options.contract.chain.id,
+        owner,
+        tokenAddress: options.contract.address,
         tokenId,
         tokenUri: "",
         type: "ERC721",
-        owner,
-        tokenAddress: options.contract.address,
-        chainId: options.contract.chain.id,
       },
     );
   }
@@ -143,12 +145,12 @@ async function getNFTFromRPC(
       uri,
     })),
     {
+      chainId: options.contract.chain.id,
+      owner,
+      tokenAddress: options.contract.address,
       tokenId: tokenId,
       tokenUri: uri,
       type: "ERC721",
-      owner,
-      tokenAddress: options.contract.address,
-      chainId: options.contract.chain.id,
     },
   );
 }
diff --git a/packages/thirdweb/src/extensions/erc721/read/getNFTs.ts b/packages/thirdweb/src/extensions/erc721/read/getNFTs.ts
index dd6a8c26558..a46d54e8265 100644
--- a/packages/thirdweb/src/extensions/erc721/read/getNFTs.ts
+++ b/packages/thirdweb/src/extensions/erc721/read/getNFTs.ts
@@ -106,8 +106,8 @@ async function getNFTsFromInsight(
 
   const [result, supplyInfo] = await Promise.all([
     getContractNFTs({
-      client: contract.client,
       chains: [contract.chain],
+      client: contract.client,
       contractAddress: contract.address,
       includeOwners: options.includeOwners ?? false,
       queryOptions: {
@@ -158,8 +158,8 @@ async function getNFTsFromRPC(
     promises.push(
       getNFT({
         ...options,
-        tokenId: i,
         includeOwner: options.includeOwners ?? false,
+        tokenId: i,
         useIndexer: false,
       }),
     );
@@ -195,7 +195,7 @@ async function getSupplyInfo(options: BaseTransactionOptions<GetNFTsParams>) {
   });
 
   return {
-    startTokenId: startTokenId_,
     maxSupply,
+    startTokenId: startTokenId_,
   };
 }
diff --git a/packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.test.ts b/packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.test.ts
index 16c51054311..edc880e3776 100644
--- a/packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.test.ts
@@ -20,9 +20,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getOwnedNFTs", () => {
 
   it("should detect ownership functions using indexer", async () => {
     const contract = getContract({
-      client: TEST_CLIENT,
-      chain: defineChain(421614),
       address: "0x90450885977EE8F8F21AC79Fc2Dd51a18B13123E",
+      chain: defineChain(421614),
+      client: TEST_CLIENT,
     });
 
     const ownedNFTs = await getOwnedNFTs({
@@ -50,9 +50,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getOwnedNFTs", () => {
 
   it("should detect ownership functions using RPC", async () => {
     const contract = getContract({
-      client: TEST_CLIENT,
-      chain: defineChain(421614),
       address: "0x90450885977EE8F8F21AC79Fc2Dd51a18B13123E",
+      chain: defineChain(421614),
+      client: TEST_CLIENT,
     });
 
     const ownedNFTs = await getOwnedNFTs({
diff --git a/packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.ts b/packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.ts
index 4a81f9b365d..f8b9657c30a 100644
--- a/packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.ts
+++ b/packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.ts
@@ -75,8 +75,8 @@ async function getOwnedNFTsFromInsight(
   // TODO (insight): add support for contract address filters
   while (hasMore) {
     const pageResults = await getInsightNFTs({
-      client: options.contract.client,
       chains: [options.contract.chain],
+      client: options.contract.client,
       ownerAddress: options.owner,
       queryOptions: {
         limit,
diff --git a/packages/thirdweb/src/extensions/erc721/read/getTotalClaimedSupply.test.ts b/packages/thirdweb/src/extensions/erc721/read/getTotalClaimedSupply.test.ts
index 9eeb02e6b36..36b713a3e5a 100644
--- a/packages/thirdweb/src/extensions/erc721/read/getTotalClaimedSupply.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/read/getTotalClaimedSupply.test.ts
@@ -5,8 +5,8 @@ import { TEST_CLIENT } from "~test/test-clients.js";
 import { TEST_ACCOUNT_B } from "~test/test-wallets.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { deployERC721Contract } from "../../prebuilts/deploy-erc721.js";
@@ -23,19 +23,19 @@ describe.runIf(process.env.TW_SECRET_KEY)(
   () => {
     beforeEach(async () => {
       const address = await deployERC721Contract({
-        client: TEST_CLIENT,
         account,
-        type: "DropERC721",
         chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         params: {
-          name: "",
           contractURI: TEST_CONTRACT_URI,
+          name: "",
         },
+        type: "DropERC721",
       });
 
       contract = getContract({
-        chain: ANVIL_CHAIN,
         address,
+        chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
       });
 
@@ -49,15 +49,15 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         ],
       });
 
-      await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
+      await sendAndConfirmTransaction({ account, transaction: lazyMintTx });
 
       const setClaimTx = setClaimConditions({
         contract,
         phases: [
           {
-            maxClaimableSupply: 100n,
-            maxClaimablePerWallet: 100n,
             currencyAddress: NATIVE_TOKEN_ADDRESS,
+            maxClaimablePerWallet: 100n,
+            maxClaimableSupply: 100n,
             price: 0,
             startTime: new Date(),
           },
@@ -65,18 +65,18 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       });
 
       await sendAndConfirmTransaction({
-        transaction: setClaimTx,
         account,
+        transaction: setClaimTx,
       });
     });
 
     it("should return the correct claimed amount", async () => {
       const tx = claimTo({
         contract,
-        to: account.address,
         quantity: 1n,
+        to: account.address,
       });
-      await sendAndConfirmTransaction({ transaction: tx, account });
+      await sendAndConfirmTransaction({ account, transaction: tx });
       const result = await getTotalClaimedSupply({ contract });
       expect(result).toBe(1n);
     });
diff --git a/packages/thirdweb/src/extensions/erc721/read/getTotalUnclaimedSupply.test.ts b/packages/thirdweb/src/extensions/erc721/read/getTotalUnclaimedSupply.test.ts
index a95f6984e48..a5f08678b06 100644
--- a/packages/thirdweb/src/extensions/erc721/read/getTotalUnclaimedSupply.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/read/getTotalUnclaimedSupply.test.ts
@@ -5,8 +5,8 @@ import { TEST_CLIENT } from "~test/test-clients.js";
 import { TEST_ACCOUNT_D } from "~test/test-wallets.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { deployERC721Contract } from "../../prebuilts/deploy-erc721.js";
@@ -23,19 +23,19 @@ describe.runIf(process.env.TW_SECRET_KEY)(
   () => {
     beforeEach(async () => {
       const address = await deployERC721Contract({
-        client: TEST_CLIENT,
         account,
-        type: "DropERC721",
         chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         params: {
-          name: "",
           contractURI: TEST_CONTRACT_URI,
+          name: "",
         },
+        type: "DropERC721",
       });
 
       contract = getContract({
-        chain: ANVIL_CHAIN,
         address,
+        chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
       });
 
@@ -49,15 +49,15 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         ],
       });
 
-      await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
+      await sendAndConfirmTransaction({ account, transaction: lazyMintTx });
 
       const setClaimTx = setClaimConditions({
         contract,
         phases: [
           {
-            maxClaimableSupply: 100n,
-            maxClaimablePerWallet: 100n,
             currencyAddress: NATIVE_TOKEN_ADDRESS,
+            maxClaimablePerWallet: 100n,
+            maxClaimableSupply: 100n,
             price: 0,
             startTime: new Date(),
           },
@@ -65,18 +65,18 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       });
 
       await sendAndConfirmTransaction({
-        transaction: setClaimTx,
         account,
+        transaction: setClaimTx,
       });
     });
 
     it("should return the correct un-claimed amount", async () => {
       const tx = claimTo({
         contract,
-        to: account.address,
         quantity: 1n,
+        to: account.address,
       });
-      await sendAndConfirmTransaction({ transaction: tx, account });
+      await sendAndConfirmTransaction({ account, transaction: tx });
       const result = await getTotalUnclaimedSupply({ contract });
       expect(result).toBe(2n);
     });
diff --git a/packages/thirdweb/src/extensions/erc721/token721.test.ts b/packages/thirdweb/src/extensions/erc721/token721.test.ts
index a59d9777ac9..b28f8c18e80 100644
--- a/packages/thirdweb/src/extensions/erc721/token721.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/token721.test.ts
@@ -5,7 +5,7 @@ import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
 import { TEST_CLIENT } from "~test/test-clients.js";
 import { TEST_ACCOUNT_B } from "~test/test-wallets.js";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { name } from "../../extensions/common/read/name.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { parseNFT } from "../../utils/nft/parseNft.js";
@@ -24,20 +24,20 @@ let token721Contract: ThirdwebContract;
 describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
   it("should deploy ERC721 token", async () => {
     const address = await deployERC721Contract({
-      client,
-      chain,
       account,
-      type: "TokenERC721",
+      chain,
+      client,
       params: {
-        name: "NFTCollection",
         contractURI: TEST_CONTRACT_URI,
+        name: "NFTCollection",
       },
+      type: "TokenERC721",
     });
     expect(address).toBeDefined();
     token721Contract = getContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
     const deployedName = await name({ contract: token721Contract });
     expect(deployedName).toBe("NFTCollection");
@@ -50,8 +50,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
       to: account.address,
     });
     await sendAndConfirmTransaction({
-      transaction,
       account,
+      transaction,
     });
 
     const nft = await getNFT({ contract: token721Contract, tokenId: 0n });
@@ -65,8 +65,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
       to: account.address,
     });
     await sendAndConfirmTransaction({
-      transaction,
       account,
+      transaction,
     });
     const _uri = await tokenURI({ contract: token721Contract, tokenId: 1n });
     expect(_uri).toBe("ipfs://fake-token-uri");
@@ -85,13 +85,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
      * mint a token, then purposefully change that token's URI to an empty string, using setTokenURI
      */
     await sendAndConfirmTransaction({
+      account,
       transaction: setTokenURI({
         contract: token721Contract,
         tokenId: 1n,
         // Need to have some spaces because NFTMetadata.sol does not allow to update an empty value
         uri: "  ",
       }),
-      account,
     });
 
     expect(
@@ -104,12 +104,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
           uri: "",
         },
         {
+          chainId: token721Contract.chain.id,
+          owner: null,
+          tokenAddress: token721Contract.address,
           tokenId: 1n,
           tokenUri: "",
           type: "ERC721",
-          owner: null,
-          tokenAddress: token721Contract.address,
-          chainId: token721Contract.chain.id,
         },
       ),
     );
diff --git a/packages/thirdweb/src/extensions/erc721/write/lazyMint.ts b/packages/thirdweb/src/extensions/erc721/write/lazyMint.ts
index 15ad3e21c09..5d1d86a65a7 100644
--- a/packages/thirdweb/src/extensions/erc721/write/lazyMint.ts
+++ b/packages/thirdweb/src/extensions/erc721/write/lazyMint.ts
@@ -45,7 +45,6 @@ export type LazyMintParams = {
  */
 export function lazyMint(options: BaseTransactionOptions<LazyMintParams>) {
   return LazyMint.lazyMint({
-    contract: options.contract,
     asyncParams: async () => {
       const startFileNumber = await nextTokenIdToMint({
         contract: options.contract,
@@ -66,6 +65,7 @@ export function lazyMint(options: BaseTransactionOptions<LazyMintParams>) {
         extraData: "0x",
       } as const;
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc721/write/mintTo.ts b/packages/thirdweb/src/extensions/erc721/write/mintTo.ts
index 32eee1c3476..60adc3888c9 100644
--- a/packages/thirdweb/src/extensions/erc721/write/mintTo.ts
+++ b/packages/thirdweb/src/extensions/erc721/write/mintTo.ts
@@ -44,7 +44,6 @@ export type MintToParams = WithOverrides<{
  */
 export function mintTo(options: BaseTransactionOptions<MintToParams>) {
   return generatedMintTo({
-    contract: options.contract,
     asyncParams: async () => {
       let tokenUri: string;
 
@@ -62,10 +61,11 @@ export function mintTo(options: BaseTransactionOptions<MintToParams>) {
         });
       }
       return {
+        overrides: options.overrides,
         to: options.to,
         uri: tokenUri,
-        overrides: options.overrides,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/write/setSharedMetadata.ts b/packages/thirdweb/src/extensions/erc721/write/setSharedMetadata.ts
index ed41058bfc0..33ac2366b50 100644
--- a/packages/thirdweb/src/extensions/erc721/write/setSharedMetadata.ts
+++ b/packages/thirdweb/src/extensions/erc721/write/setSharedMetadata.ts
@@ -21,7 +21,6 @@ export function setSharedMetadata(
   options: BaseTransactionOptions<SetSharedMetadataParams>,
 ) {
   return generatedSharedMetadata({
-    contract: options.contract,
     asyncParams: async () => {
       if (!options.nft.name) {
         throw new Error("NFT name is required");
@@ -62,13 +61,14 @@ export function setSharedMetadata(
 
       return {
         metadata: {
-          name: options.nft.name,
+          animationURI: animationURI ?? "",
           description: sanitizeJSONString(options.nft.description) ?? "",
           imageURI: imageURI ?? "",
-          animationURI: animationURI ?? "",
+          name: options.nft.name,
         },
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc721/write/sigMint.ts b/packages/thirdweb/src/extensions/erc721/write/sigMint.ts
index c3b63939225..a65173a230f 100644
--- a/packages/thirdweb/src/extensions/erc721/write/sigMint.ts
+++ b/packages/thirdweb/src/extensions/erc721/write/sigMint.ts
@@ -1,8 +1,8 @@
 import type { AbiParameterToPrimitiveType, Address } from "abitype";
 import { type Hex, isHex, stringToHex } from "viem";
 import {
-  NATIVE_TOKEN_ADDRESS,
   isNativeTokenAddress,
+  NATIVE_TOKEN_ADDRESS,
 } from "../../../constants/addresses.js";
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
@@ -12,12 +12,12 @@ import type { NFTInput } from "../../../utils/nft/parseNft.js";
 import { randomBytesHex } from "../../../utils/random.js";
 import type { Account } from "../../../wallets/interfaces/wallet.js";
 import {
-  type MintWithSignatureParams,
   mintWithSignature as generatedMintWithSignature,
+  type MintWithSignatureParams,
 } from "../__generated__/ISignatureMintERC721/write/mintWithSignature.js";
 import {
-  type MintWithSignatureParams as MintWithSignatureParamsV2,
   mintWithSignature as generatedMintWithSignatureV2,
+  type MintWithSignatureParams as MintWithSignatureParamsV2,
 } from "../__generated__/ISignatureMintERC721_v2/write/mintWithSignature.js";
 
 /**
@@ -147,8 +147,8 @@ export async function generateMintSignature<
         );
         return await convertErc20Amount({
           amount: mintRequest.price,
-          client: contract.client,
           chain: contract.chain,
+          client: contract.client,
           erc20Address: currency,
         });
       }
@@ -217,31 +217,31 @@ export async function generateMintSignature<
 
   if (contractType === "LoyaltyCard") {
     return signPayloadV2({
-      mintRequest,
       account,
       contract,
-      uri,
       currency,
-      uid,
+      endTime,
+      mintRequest,
       price,
-      royaltyRecipient,
       primarySaleRecipient: saleRecipient,
+      royaltyRecipient,
       startTime,
-      endTime,
+      uid,
+      uri,
     }) as Promise<SignPayloadResult<T>>;
   }
   return signPayloadV1({
-    mintRequest,
     account,
     contract,
-    uri,
     currency,
-    uid,
+    endTime,
+    mintRequest,
     price,
-    royaltyRecipient,
     primarySaleRecipient: saleRecipient,
+    royaltyRecipient,
     startTime,
-    endTime,
+    uid,
+    uri,
   }) as Promise<SignPayloadResult<T>>;
 }
 
@@ -271,30 +271,30 @@ async function signPayloadV1({
   endTime: Date;
 }): Promise<{ payload: PayloadType; signature: Hex }> {
   const payload: PayloadType = {
-    uri,
     currency,
-    uid,
     price,
-    to: mintRequest.to,
-    royaltyRecipient,
-    royaltyBps: toBigInt(mintRequest.royaltyBps || 0),
     primarySaleRecipient,
-    validityStartTimestamp: dateToSeconds(startTime),
+    royaltyBps: toBigInt(mintRequest.royaltyBps || 0),
+    royaltyRecipient,
+    to: mintRequest.to,
+    uid,
+    uri,
     validityEndTimestamp: dateToSeconds(endTime),
+    validityStartTimestamp: dateToSeconds(startTime),
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: "TokenERC721",
-      version: "1",
       chainId: contract.chain.id,
+      name: "TokenERC721",
       verifyingContract: contract.address,
+      version: "1",
     },
+    message: payload,
+    primaryType: "MintRequest",
     types: {
       MintRequest: MintRequest721,
     },
-    primaryType: "MintRequest",
-    message: payload,
   });
   return { payload, signature };
 }
@@ -325,31 +325,31 @@ async function signPayloadV2({
   endTime: Date;
 }): Promise<{ payload: PayloadTypeV2; signature: Hex }> {
   const payload: PayloadTypeV2 = {
-    uri,
     currency,
-    uid,
-    quantity: toBigInt(1), // always 1 for 721 NFTs
     pricePerToken: price,
-    to: mintRequest.to,
-    royaltyRecipient,
-    royaltyBps: toBigInt(mintRequest.royaltyBps || 0),
     primarySaleRecipient,
-    validityStartTimestamp: dateToSeconds(startTime),
+    quantity: toBigInt(1), // always 1 for 721 NFTs
+    royaltyBps: toBigInt(mintRequest.royaltyBps || 0),
+    royaltyRecipient,
+    to: mintRequest.to,
+    uid,
+    uri,
     validityEndTimestamp: dateToSeconds(endTime),
+    validityStartTimestamp: dateToSeconds(startTime),
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: "SignatureMintERC721",
-      version: "1",
       chainId: contract.chain.id,
+      name: "SignatureMintERC721",
       verifyingContract: contract.address,
+      version: "1",
     },
+    message: payload,
+    primaryType: "MintRequest",
     types: {
       MintRequest: MintRequest721_V2,
     },
-    primaryType: "MintRequest",
-    message: payload,
   });
   return { payload, signature };
 }
diff --git a/packages/thirdweb/src/extensions/erc721/write/sigMint721.test.ts b/packages/thirdweb/src/extensions/erc721/write/sigMint721.test.ts
index 091b8735326..a8afd9e6865 100644
--- a/packages/thirdweb/src/extensions/erc721/write/sigMint721.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/write/sigMint721.test.ts
@@ -8,8 +8,8 @@ import {
 } from "../../../../test/src/test-wallets.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendTransaction } from "../../../transaction/actions/send-transaction.js";
 import { toHex } from "../../../utils/encoding/hex.js";
@@ -34,9 +34,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           client: TEST_CLIENT,
           params: {
             name: "Test",
-            symbol: "TST",
             royaltyRecipient: TEST_ACCOUNT_C.address,
             saleRecipient: TEST_ACCOUNT_B.address,
+            symbol: "TST",
           },
           type: "TokenERC721",
         }),
@@ -68,9 +68,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           client: TEST_CLIENT,
           params: {
             name: "Test",
-            symbol: "TST",
             royaltyRecipient: TEST_ACCOUNT_C.address,
             saleRecipient: TEST_ACCOUNT_B.address,
+            symbol: "TST",
           },
           type: "LoyaltyCard",
         }),
@@ -78,17 +78,17 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         client: TEST_CLIENT,
       });
       const { payload, signature } = await generateMintSignature({
+        account: TEST_ACCOUNT_A,
+        contract: loyaltyContract,
+        contractType: "LoyaltyCard",
         mintRequest: {
-          to: TEST_ACCOUNT_B.address,
           metadata: {
-            name: "My NFT",
             description: "This is my NFT",
             image: "https://example.com/image.png",
+            name: "My NFT",
           },
+          to: TEST_ACCOUNT_B.address,
         },
-        account: TEST_ACCOUNT_A,
-        contract: loyaltyContract,
-        contractType: "LoyaltyCard",
       });
       const transaction = mintWithSignature({
         contract: loyaltyContract,
@@ -96,24 +96,24 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         signature,
       });
       const { transactionHash } = await sendTransaction({
-        transaction,
         account: TEST_ACCOUNT_A,
+        transaction,
       });
       expect(transactionHash.length).toBe(66);
     });
 
     it("should generate a mint signature and mint an NFT", async () => {
       const { payload, signature } = await generateMintSignature({
+        account: TEST_ACCOUNT_A,
+        contract: erc721Contract,
         mintRequest: {
-          to: TEST_ACCOUNT_B.address,
           metadata: {
-            name: "My NFT",
             description: "This is my NFT",
             image: "https://example.com/image.png",
+            name: "My NFT",
           },
+          to: TEST_ACCOUNT_B.address,
         },
-        account: TEST_ACCOUNT_A,
-        contract: erc721Contract,
       });
       const transaction = mintWithSignature({
         contract: erc721Contract,
@@ -121,20 +121,20 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         signature,
       });
       const { transactionHash } = await sendTransaction({
-        transaction,
         account: TEST_ACCOUNT_A,
+        transaction,
       });
       expect(transactionHash.length).toBe(66);
     });
 
     it("should generate a mint signature with default values", async () => {
       const { payload, signature } = await generateMintSignature({
+        account: TEST_ACCOUNT_A,
+        contract: erc721Contract,
         mintRequest: {
-          to: TEST_ACCOUNT_B.address,
           metadata: "https://example.com/token",
+          to: TEST_ACCOUNT_B.address,
         },
-        account: TEST_ACCOUNT_A,
-        contract: erc721Contract,
       });
 
       expect(payload.to).toBe("0x70997970C51812dc3A010C7d01b50e0d17dc79C8");
@@ -155,28 +155,28 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         signature,
       });
       const { transactionHash } = await sendTransaction({
-        transaction,
         account: TEST_ACCOUNT_A,
+        transaction,
       });
       expect(transactionHash.length).toBe(66);
     });
 
     it("should generate a mint signature with custom values", async () => {
       const { payload, signature } = await generateMintSignature({
+        account: TEST_ACCOUNT_A,
+        contract: erc721Contract,
         mintRequest: {
-          to: TEST_ACCOUNT_B.address,
-          royaltyRecipient: TEST_ACCOUNT_B.address,
-          royaltyBps: 500,
-          primarySaleRecipient: TEST_ACCOUNT_A.address,
+          currency: erc20TokenContract.address,
           metadata: "https://example.com/token",
           price: "0.2",
-          currency: erc20TokenContract.address,
-          validityStartTimestamp: new Date(1635724800),
-          validityEndTimestamp: new Date(1867260800),
+          primarySaleRecipient: TEST_ACCOUNT_A.address,
+          royaltyBps: 500,
+          royaltyRecipient: TEST_ACCOUNT_B.address,
+          to: TEST_ACCOUNT_B.address,
           uid: toHex("abcdef1234567890", { size: 32 }),
+          validityEndTimestamp: new Date(1867260800),
+          validityStartTimestamp: new Date(1635724800),
         },
-        account: TEST_ACCOUNT_A,
-        contract: erc721Contract,
       });
 
       expect(payload.to).toBe("0x70997970C51812dc3A010C7d01b50e0d17dc79C8");
@@ -200,20 +200,20 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should automatically encode a provided string uid", async () => {
       const { payload, signature } = await generateMintSignature({
+        account: TEST_ACCOUNT_A,
+        contract: erc721Contract,
         mintRequest: {
-          to: TEST_ACCOUNT_B.address,
-          royaltyRecipient: TEST_ACCOUNT_B.address,
-          royaltyBps: 500,
-          primarySaleRecipient: TEST_ACCOUNT_A.address,
+          currency: erc20TokenContract.address,
           metadata: "https://example.com/token",
           price: "0.2",
-          currency: erc20TokenContract.address,
-          validityStartTimestamp: new Date(1635724800),
-          validityEndTimestamp: new Date(1867260800),
+          primarySaleRecipient: TEST_ACCOUNT_A.address,
+          royaltyBps: 500,
+          royaltyRecipient: TEST_ACCOUNT_B.address,
+          to: TEST_ACCOUNT_B.address,
           uid: "abcdef1234567890",
+          validityEndTimestamp: new Date(1867260800),
+          validityStartTimestamp: new Date(1635724800),
         },
-        account: TEST_ACCOUNT_A,
-        contract: erc721Contract,
       });
 
       expect(payload.to).toBe("0x70997970C51812dc3A010C7d01b50e0d17dc79C8");
@@ -237,20 +237,20 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should default sale recipient to the contract's primarySaleRecipient when empty", async () => {
       const { payload, signature } = await generateMintSignature({
+        account: TEST_ACCOUNT_A,
+        contract: erc721Contract,
         mintRequest: {
-          to: TEST_ACCOUNT_B.address,
-          royaltyBps: 500,
+          currency: erc20TokenContract.address,
           metadata: "https://example.com/token",
           price: "0.2",
-          currency: erc20TokenContract.address,
-          validityStartTimestamp: new Date(1635724800),
-          validityEndTimestamp: new Date(1867260800),
-          uid: toHex("abcdef1234567890", { size: 32 }),
           primarySaleRecipient: "",
+          royaltyBps: 500,
           royaltyRecipient: "",
+          to: TEST_ACCOUNT_B.address,
+          uid: toHex("abcdef1234567890", { size: 32 }),
+          validityEndTimestamp: new Date(1867260800),
+          validityStartTimestamp: new Date(1635724800),
         },
-        account: TEST_ACCOUNT_A,
-        contract: erc721Contract,
       });
 
       expect(payload.royaltyRecipient).toBe(TEST_ACCOUNT_C.address);
diff --git a/packages/thirdweb/src/extensions/erc721/write/updateTokenURI.test.ts b/packages/thirdweb/src/extensions/erc721/write/updateTokenURI.test.ts
index 6461595b043..20fc77244ae 100644
--- a/packages/thirdweb/src/extensions/erc721/write/updateTokenURI.test.ts
+++ b/packages/thirdweb/src/extensions/erc721/write/updateTokenURI.test.ts
@@ -19,35 +19,35 @@ describe.runIf(process.env.TW_SECRET_KEY)(
   () => {
     it("should update token uri", async () => {
       const address = await deployERC721Contract({
-        client,
-        chain,
         account,
-        type: "TokenERC721",
+        chain,
+        client,
         params: {
-          name: "NFT collection",
           contractURI: TEST_CONTRACT_URI,
+          name: "NFT collection",
         },
+        type: "TokenERC721",
       });
       const contract = getContract({
         address,
-        client,
         chain,
+        client,
       });
       await sendAndConfirmTransaction({
+        account,
         transaction: mintTo({
           contract,
           nft: { name: "Test1" },
           to: account.address,
         }),
-        account,
       });
       await sendAndConfirmTransaction({
+        account,
         transaction: updateTokenURI({
           contract,
           newMetadata: { name: "Test1 Updated" },
           tokenId: 0n,
         }),
-        account,
       });
       const nft = await getNFT({ contract, tokenId: 0n });
       expect(nft.metadata.name).toBe("Test1 Updated");
diff --git a/packages/thirdweb/src/extensions/erc721/write/updateTokenURI.ts b/packages/thirdweb/src/extensions/erc721/write/updateTokenURI.ts
index 31ad763e6cf..efd5729fab1 100644
--- a/packages/thirdweb/src/extensions/erc721/write/updateTokenURI.ts
+++ b/packages/thirdweb/src/extensions/erc721/write/updateTokenURI.ts
@@ -46,8 +46,8 @@ export function updateTokenURI(
 ) {
   const { contract } = options;
   return setTokenURI({
-    contract,
     asyncParams: async () => getUpdateTokenParams(options),
+    contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/erc7504/__generated__/IRouterState/read/getAllExtensions.ts b/packages/thirdweb/src/extensions/erc7504/__generated__/IRouterState/read/getAllExtensions.ts
index 6c8ce5a86d9..e9d9edffc70 100644
--- a/packages/thirdweb/src/extensions/erc7504/__generated__/IRouterState/read/getAllExtensions.ts
+++ b/packages/thirdweb/src/extensions/erc7504/__generated__/IRouterState/read/getAllExtensions.ts
@@ -1,50 +1,49 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x4a00cc48" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "allExtensions",
     components: [
       {
-        type: "tuple",
-        name: "metadata",
         components: [
           {
-            type: "string",
             name: "name",
+            type: "string",
           },
           {
-            type: "string",
             name: "metadataURI",
+            type: "string",
           },
           {
-            type: "address",
             name: "implementation",
+            type: "address",
           },
         ],
+        name: "metadata",
+        type: "tuple",
       },
       {
-        type: "tuple[]",
-        name: "functions",
         components: [
           {
-            type: "bytes4",
             name: "functionSelector",
+            type: "bytes4",
           },
           {
-            type: "string",
             name: "functionSignature",
+            type: "string",
           },
         ],
+        name: "functions",
+        type: "tuple[]",
       },
     ],
+    name: "allExtensions",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/accountId.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/accountId.ts
index c833872cbc4..0cdc82fe213 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/accountId.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/accountId.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x9cfd7cff" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "string",
     name: "accountImplementationId",
+    type: "string",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/isModuleInstalled.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/isModuleInstalled.ts
index 7225170e831..60ad0322483 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/isModuleInstalled.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/isModuleInstalled.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isModuleInstalled" function.
@@ -24,16 +24,16 @@ export type IsModuleInstalledParams = {
 export const FN_SELECTOR = "0x112d3a7d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "moduleTypeId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "module",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "additionalContext",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/isValidSignature.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/isValidSignature.ts
index 88b6b0b11aa..df322da3153 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/isValidSignature.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/isValidSignature.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isValidSignature" function.
@@ -17,12 +17,12 @@ export type IsValidSignatureParams = {
 export const FN_SELECTOR = "0x1626ba7e" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "hash",
+    type: "bytes32",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/supportsExecutionMode.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/supportsExecutionMode.ts
index 7778eae8bee..3d6a47da4a3 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/supportsExecutionMode.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/supportsExecutionMode.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsExecutionMode" function.
@@ -19,8 +19,8 @@ export type SupportsExecutionModeParams = {
 export const FN_SELECTOR = "0xd03c7914" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "encodedMode",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/supportsModule.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/supportsModule.ts
index b31d7ab4910..ff29be0c985 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/supportsModule.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/read/supportsModule.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsModule" function.
@@ -19,8 +19,8 @@ export type SupportsModuleParams = {
 export const FN_SELECTOR = "0xf2dc691d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "moduleTypeId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/execute.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/execute.ts
index 5a7c9b02cd4..a45cd99822c 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/execute.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/execute.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "execute" function.
@@ -22,12 +22,12 @@ export type ExecuteParams = WithOverrides<{
 export const FN_SELECTOR = "0xe9ae5c53" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "mode",
+    type: "bytes32",
   },
   {
-    type: "bytes",
     name: "executionCalldata",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -129,23 +129,23 @@ export function execute(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.mode, resolvedOptions.executionCalldata] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.mode, resolvedOptions.executionCalldata] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/executeFromExecutor.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/executeFromExecutor.ts
index dcc7750443a..2590e8ce64a 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/executeFromExecutor.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/executeFromExecutor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "executeFromExecutor" function.
@@ -22,18 +22,18 @@ export type ExecuteFromExecutorParams = WithOverrides<{
 export const FN_SELECTOR = "0xd691c964" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "mode",
+    type: "bytes32",
   },
   {
-    type: "bytes",
     name: "executionCalldata",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes[]",
     name: "returnData",
+    type: "bytes[]",
   },
 ] as const;
 
@@ -138,23 +138,23 @@ export function executeFromExecutor(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.mode, resolvedOptions.executionCalldata] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.mode, resolvedOptions.executionCalldata] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/installModule.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/installModule.ts
index 9431c3d7dcf..822845b2145 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/installModule.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/installModule.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "installModule" function.
@@ -23,16 +23,16 @@ export type InstallModuleParams = WithOverrides<{
 export const FN_SELECTOR = "0x9517e29f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "moduleTypeId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "module",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "initData",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -140,8 +140,19 @@ export function installModule(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -151,16 +162,5 @@ export function installModule(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/uninstallModule.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/uninstallModule.ts
index 5cf2425dcac..1288636e295 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/uninstallModule.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/IERC7579Account/write/uninstallModule.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "uninstallModule" function.
@@ -26,16 +26,16 @@ export type UninstallModuleParams = WithOverrides<{
 export const FN_SELECTOR = "0xa71763a8" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "moduleTypeId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "module",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "deInitData",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -143,8 +143,19 @@ export function uninstallModule(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -154,16 +165,5 @@ export function uninstallModule(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/events/OwnershipTransferred.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/events/OwnershipTransferred.ts
index bd823de97a1..a4e11bccd61 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/events/OwnershipTransferred.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/events/OwnershipTransferred.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "OwnershipTransferred" event.
@@ -42,8 +42,8 @@ export function ownershipTransferredEvent(
   filters: OwnershipTransferredEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/events/Upgraded.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/events/Upgraded.ts
index ee84303fd0b..e3c49af0a2f 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/events/Upgraded.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/events/Upgraded.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Upgraded" event.
@@ -34,7 +34,7 @@ export type UpgradedEventFilters = Partial<{
  */
 export function upgradedEvent(filters: UpgradedEventFilters = {}) {
   return prepareEvent({
-    signature: "event Upgraded(address indexed implementation)",
     filters,
+    signature: "event Upgraded(address indexed implementation)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/accountImplementation.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/accountImplementation.ts
index bbf45d7fb41..5f54e325971 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/accountImplementation.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/accountImplementation.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x11464fbe" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/entrypoint.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/entrypoint.ts
index f31566f4716..2125755adc1 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/entrypoint.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/entrypoint.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa65d69d4" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/getAddress.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/getAddress.ts
index 180f8da52fc..b9633b280df 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/getAddress.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/getAddress.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAddress" function.
@@ -17,18 +17,18 @@ export type GetAddressParams = {
 export const FN_SELECTOR = "0x8878ed33" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "salt",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/implementation.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/implementation.ts
index 99a48c2f09d..3da59c7f228 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/implementation.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/implementation.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x5c60da1b" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "result",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/owner.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/owner.ts
index 3323ac7ce15..a9edc4b89a6 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/owner.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/read/owner.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x8da5cb5b" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "result",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/addStake.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/addStake.ts
index 3c7faad0ce7..31435f0de4d 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/addStake.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/addStake.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "addStake" function.
@@ -21,8 +21,8 @@ export type AddStakeParams = WithOverrides<{
 export const FN_SELECTOR = "0x0396cb60" as const;
 const FN_INPUTS = [
   {
-    type: "uint32",
     name: "unstakeDelaySec",
+    type: "uint32",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -118,23 +118,23 @@ export function addStake(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.unstakeDelaySec] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.unstakeDelaySec] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/createAccountWithModules.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/createAccountWithModules.ts
index e499f3b0187..da584e4ee29 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/createAccountWithModules.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/createAccountWithModules.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createAccountWithModules" function.
@@ -28,30 +28,30 @@ export type CreateAccountWithModulesParams = WithOverrides<{
 export const FN_SELECTOR = "0x7c37d0dc" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "salt",
+    type: "bytes",
   },
   {
-    type: "tuple[]",
-    name: "modules",
     components: [
       {
-        type: "uint256",
         name: "moduleTypeId",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "module",
+        type: "address",
       },
       {
-        type: "bytes",
         name: "initData",
+        type: "bytes",
       },
     ],
+    name: "modules",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -169,8 +169,19 @@ export function createAccountWithModules(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -180,16 +191,5 @@ export function createAccountWithModules(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/renounceOwnership.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/renounceOwnership.ts
index 5798a31905c..0fa112c28e3 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/renounceOwnership.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/renounceOwnership.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/transferOwnership.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/transferOwnership.ts
index 21c03f6f32a..ae9fadeeb32 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/transferOwnership.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/transferOwnership.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transferOwnership" function.
@@ -18,8 +18,8 @@ export type TransferOwnershipParams = WithOverrides<{
 export const FN_SELECTOR = "0xf2fde38b" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "newOwner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -119,23 +119,23 @@ export function transferOwnership(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newOwner] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newOwner] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/unlockStake.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/unlockStake.ts
index c3601ab471b..b2443506421 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/unlockStake.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/unlockStake.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/upgradeTo.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/upgradeTo.ts
index 632ee9f2fce..69778356cbc 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/upgradeTo.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/upgradeTo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "upgradeTo" function.
@@ -21,8 +21,8 @@ export type UpgradeToParams = WithOverrides<{
 export const FN_SELECTOR = "0x3659cfe6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "newImplementation",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function upgradeTo(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newImplementation] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newImplementation] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdraw.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdraw.ts
index 4a20c5590f8..b9f2a3c4a34 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdraw.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdraw.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdraw" function.
@@ -20,16 +20,16 @@ export type WithdrawParams = WithOverrides<{
 export const FN_SELECTOR = "0xd9caed12" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "address",
     name: "token",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -135,8 +135,19 @@ export function withdraw(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function withdraw(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdrawStake.ts b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdrawStake.ts
index a8e5011d893..7eb496448d3 100644
--- a/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdrawStake.ts
+++ b/packages/thirdweb/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdrawStake.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "withdrawStake" function.
@@ -18,8 +18,8 @@ export type WithdrawStakeParams = WithOverrides<{
 export const FN_SELECTOR = "0xc23a5cea" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function withdrawStake(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.to] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.to] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/events/Executed.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/events/Executed.ts
index 8d5f1a700d2..de30c93be7e 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/events/Executed.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/events/Executed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Executed" event.
@@ -34,7 +34,7 @@ export type ExecutedEventFilters = Partial<{
  */
 export function executedEvent(filters: ExecutedEventFilters = {}) {
   return prepareEvent({
-    signature: "event Executed(address indexed to, uint256 value, bytes data)",
     filters,
+    signature: "event Executed(address indexed to, uint256 value, bytes data)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/events/SessionCreated.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/events/SessionCreated.ts
index 93310f4dc59..6851748f9d1 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/events/SessionCreated.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/events/SessionCreated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "SessionCreated" event.
@@ -34,8 +34,8 @@ export type SessionCreatedEventFilters = Partial<{
  */
 export function sessionCreatedEvent(filters: SessionCreatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event SessionCreated(address indexed signer, (address signer, bool isWildcard, uint256 expiresAt, (address target, bytes4 selector, uint256 maxValuePerUse, (uint8 limitType, uint256 limit, uint256 period) valueLimit, (uint8 condition, uint64 index, bytes32 refValue, (uint8 limitType, uint256 limit, uint256 period) limit)[] constraints)[] callPolicies, (address target, uint256 maxValuePerUse, (uint8 limitType, uint256 limit, uint256 period) valueLimit)[] transferPolicies, bytes32 uid) sessionSpec)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/eip712Domain.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/eip712Domain.ts
index a8020aabb12..95be7b27e5a 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/eip712Domain.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/eip712Domain.ts
@@ -1,40 +1,39 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x84b0196e" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes1",
     name: "fields",
+    type: "bytes1",
   },
   {
-    type: "string",
     name: "name",
+    type: "string",
   },
   {
-    type: "string",
     name: "version",
+    type: "string",
   },
   {
-    type: "uint256",
     name: "chainId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "verifyingContract",
+    type: "address",
   },
   {
-    type: "bytes32",
     name: "salt",
+    type: "bytes32",
   },
   {
-    type: "uint256[]",
     name: "extensions",
+    type: "uint256[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getCallPoliciesForSigner.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getCallPoliciesForSigner.ts
index 3566c481b00..e5680d5fe09 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getCallPoliciesForSigner.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getCallPoliciesForSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getCallPoliciesForSigner" function.
@@ -16,81 +16,81 @@ export type GetCallPoliciesForSignerParams = {
 export const FN_SELECTOR = "0x7103acbb" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "bytes4",
         name: "selector",
+        type: "bytes4",
       },
       {
-        type: "uint256",
         name: "maxValuePerUse",
+        type: "uint256",
       },
       {
-        type: "tuple",
-        name: "valueLimit",
         components: [
           {
-            type: "uint8",
             name: "limitType",
+            type: "uint8",
           },
           {
-            type: "uint256",
             name: "limit",
+            type: "uint256",
           },
           {
-            type: "uint256",
             name: "period",
+            type: "uint256",
           },
         ],
+        name: "valueLimit",
+        type: "tuple",
       },
       {
-        type: "tuple[]",
-        name: "constraints",
         components: [
           {
-            type: "uint8",
             name: "condition",
+            type: "uint8",
           },
           {
-            type: "uint64",
             name: "index",
+            type: "uint64",
           },
           {
-            type: "bytes32",
             name: "refValue",
+            type: "bytes32",
           },
           {
-            type: "tuple",
-            name: "limit",
             components: [
               {
-                type: "uint8",
                 name: "limitType",
+                type: "uint8",
               },
               {
-                type: "uint256",
                 name: "limit",
+                type: "uint256",
               },
               {
-                type: "uint256",
                 name: "period",
+                type: "uint256",
               },
             ],
+            name: "limit",
+            type: "tuple",
           },
         ],
+        name: "constraints",
+        type: "tuple[]",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getSessionExpirationForSigner.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getSessionExpirationForSigner.ts
index 9c789a7cfff..de9198c6317 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getSessionExpirationForSigner.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getSessionExpirationForSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getSessionExpirationForSigner" function.
@@ -16,8 +16,8 @@ export type GetSessionExpirationForSignerParams = {
 export const FN_SELECTOR = "0xf0a83adf" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getSessionStateForSigner.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getSessionStateForSigner.ts
index ea93606d2d6..190f7ace4ba 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getSessionStateForSigner.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getSessionStateForSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getSessionStateForSigner" function.
@@ -16,81 +16,81 @@ export type GetSessionStateForSignerParams = {
 export const FN_SELECTOR = "0x74e25eb2" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "tuple[]",
-        name: "transferValue",
         components: [
           {
-            type: "uint256",
             name: "remaining",
+            type: "uint256",
           },
           {
-            type: "address",
             name: "target",
+            type: "address",
           },
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
           {
-            type: "uint256",
             name: "index",
+            type: "uint256",
           },
         ],
+        name: "transferValue",
+        type: "tuple[]",
       },
       {
-        type: "tuple[]",
-        name: "callValue",
         components: [
           {
-            type: "uint256",
             name: "remaining",
+            type: "uint256",
           },
           {
-            type: "address",
             name: "target",
+            type: "address",
           },
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
           {
-            type: "uint256",
             name: "index",
+            type: "uint256",
           },
         ],
+        name: "callValue",
+        type: "tuple[]",
       },
       {
-        type: "tuple[]",
-        name: "callParams",
         components: [
           {
-            type: "uint256",
             name: "remaining",
+            type: "uint256",
           },
           {
-            type: "address",
             name: "target",
+            type: "address",
           },
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
           {
-            type: "uint256",
             name: "index",
+            type: "uint256",
           },
         ],
+        name: "callParams",
+        type: "tuple[]",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getTransferPoliciesForSigner.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getTransferPoliciesForSigner.ts
index a1763951ba8..e08786479ca 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getTransferPoliciesForSigner.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/getTransferPoliciesForSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getTransferPoliciesForSigner" function.
@@ -16,41 +16,41 @@ export type GetTransferPoliciesForSignerParams = {
 export const FN_SELECTOR = "0xed6ed279" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxValuePerUse",
+        type: "uint256",
       },
       {
-        type: "tuple",
-        name: "valueLimit",
         components: [
           {
-            type: "uint8",
             name: "limitType",
+            type: "uint8",
           },
           {
-            type: "uint256",
             name: "limit",
+            type: "uint256",
           },
           {
-            type: "uint256",
             name: "period",
+            type: "uint256",
           },
         ],
+        name: "valueLimit",
+        type: "tuple",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/isWildcardSigner.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/isWildcardSigner.ts
index 3287eb5fbd0..880b985ffdd 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/isWildcardSigner.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/read/isWildcardSigner.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isWildcardSigner" function.
@@ -16,8 +16,8 @@ export type IsWildcardSignerParams = {
 export const FN_SELECTOR = "0x16c258a7" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/createSessionWithSig.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/createSessionWithSig.ts
index f78b186f2cf..e4b50d9a004 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/createSessionWithSig.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/createSessionWithSig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createSessionWithSig" function.
@@ -81,134 +81,134 @@ export type CreateSessionWithSigParams = WithOverrides<{
 export const FN_SELECTOR = "0xb5051648" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "sessionSpec",
     components: [
       {
-        type: "address",
         name: "signer",
+        type: "address",
       },
       {
-        type: "bool",
         name: "isWildcard",
+        type: "bool",
       },
       {
-        type: "uint256",
         name: "expiresAt",
+        type: "uint256",
       },
       {
-        type: "tuple[]",
-        name: "callPolicies",
         components: [
           {
-            type: "address",
             name: "target",
+            type: "address",
           },
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
           {
-            type: "uint256",
             name: "maxValuePerUse",
+            type: "uint256",
           },
           {
-            type: "tuple",
-            name: "valueLimit",
             components: [
               {
-                type: "uint8",
                 name: "limitType",
+                type: "uint8",
               },
               {
-                type: "uint256",
                 name: "limit",
+                type: "uint256",
               },
               {
-                type: "uint256",
                 name: "period",
+                type: "uint256",
               },
             ],
+            name: "valueLimit",
+            type: "tuple",
           },
           {
-            type: "tuple[]",
-            name: "constraints",
             components: [
               {
-                type: "uint8",
                 name: "condition",
+                type: "uint8",
               },
               {
-                type: "uint64",
                 name: "index",
+                type: "uint64",
               },
               {
-                type: "bytes32",
                 name: "refValue",
+                type: "bytes32",
               },
               {
-                type: "tuple",
-                name: "limit",
                 components: [
                   {
-                    type: "uint8",
                     name: "limitType",
+                    type: "uint8",
                   },
                   {
-                    type: "uint256",
                     name: "limit",
+                    type: "uint256",
                   },
                   {
-                    type: "uint256",
                     name: "period",
+                    type: "uint256",
                   },
                 ],
+                name: "limit",
+                type: "tuple",
               },
             ],
+            name: "constraints",
+            type: "tuple[]",
           },
         ],
+        name: "callPolicies",
+        type: "tuple[]",
       },
       {
-        type: "tuple[]",
-        name: "transferPolicies",
         components: [
           {
-            type: "address",
             name: "target",
+            type: "address",
           },
           {
-            type: "uint256",
             name: "maxValuePerUse",
+            type: "uint256",
           },
           {
-            type: "tuple",
-            name: "valueLimit",
             components: [
               {
-                type: "uint8",
                 name: "limitType",
+                type: "uint8",
               },
               {
-                type: "uint256",
                 name: "limit",
+                type: "uint256",
               },
               {
-                type: "uint256",
                 name: "period",
+                type: "uint256",
               },
             ],
+            name: "valueLimit",
+            type: "tuple",
           },
         ],
+        name: "transferPolicies",
+        type: "tuple[]",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "sessionSpec",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -316,23 +316,23 @@ export function createSessionWithSig(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.sessionSpec, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.sessionSpec, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/execute.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/execute.ts
index 81b1df259d6..e3e0a0ad402 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/execute.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/execute.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "execute" function.
@@ -26,22 +26,22 @@ export type ExecuteParams = WithOverrides<{
 export const FN_SELECTOR = "0x3f707e6b" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "calls",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "value",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "data",
+        type: "bytes",
       },
     ],
+    name: "calls",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -137,23 +137,23 @@ export function execute(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.calls] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.calls] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/executeWithSig.ts b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/executeWithSig.ts
index 808b3854139..b70e69ad6cd 100644
--- a/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/executeWithSig.ts
+++ b/packages/thirdweb/src/extensions/erc7702/__generated__/MinimalAccount/write/executeWithSig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "executeWithSig" function.
@@ -34,36 +34,36 @@ export type ExecuteWithSigParams = WithOverrides<{
 export const FN_SELECTOR = "0xba61557d" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "wrappedCalls",
     components: [
       {
-        type: "tuple[]",
-        name: "calls",
         components: [
           {
-            type: "address",
             name: "target",
+            type: "address",
           },
           {
-            type: "uint256",
             name: "value",
+            type: "uint256",
           },
           {
-            type: "bytes",
             name: "data",
+            type: "bytes",
           },
         ],
+        name: "calls",
+        type: "tuple[]",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "wrappedCalls",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -167,23 +167,23 @@ export function executeWithSig(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.wrappedCalls, resolvedOptions.signature] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.wrappedCalls, resolvedOptions.signature] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/idGateway.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/idGateway.ts
index 31bb53a4e44..ab6c007dacf 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/idGateway.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/idGateway.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x4b57a600" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/keyGateway.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/keyGateway.ts
index 7ead96b0c37..b27d76ee6e0 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/keyGateway.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/keyGateway.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x80334737" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/price.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/price.ts
index 52d7a381538..80f60351838 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/price.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/read/price.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "price" function.
@@ -19,8 +19,8 @@ export type PriceParams = {
 export const FN_SELECTOR = "0x26a49e37" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "extraStorage",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/write/register.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/write/register.ts
index 06c46b0a455..22f7b727c93 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/write/register.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IBundler/write/register.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "register" function.
@@ -43,66 +43,66 @@ export type RegisterParams = WithOverrides<{
 export const FN_SELECTOR = "0xa44c9ce7" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "registerParams",
     components: [
       {
-        type: "address",
         name: "to",
+        type: "address",
       },
       {
-        type: "address",
         name: "recovery",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "deadline",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "sig",
+        type: "bytes",
       },
     ],
+    name: "registerParams",
+    type: "tuple",
   },
   {
-    type: "tuple[]",
-    name: "signerParams",
     components: [
       {
-        type: "uint32",
         name: "keyType",
+        type: "uint32",
       },
       {
-        type: "bytes",
         name: "key",
+        type: "bytes",
       },
       {
-        type: "uint8",
         name: "metadataType",
+        type: "uint8",
       },
       {
-        type: "bytes",
         name: "metadata",
+        type: "bytes",
       },
       {
-        type: "uint256",
         name: "deadline",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "sig",
+        type: "bytes",
       },
     ],
+    name: "signerParams",
+    type: "tuple[]",
   },
   {
-    type: "uint256",
     name: "extraStorage",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
 ] as const;
 
@@ -207,8 +207,19 @@ export function register(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -218,16 +229,5 @@ export function register(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/REGISTER_TYPEHASH.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/REGISTER_TYPEHASH.ts
index 2c959f33f59..4a3345eef0f 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/REGISTER_TYPEHASH.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/REGISTER_TYPEHASH.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x6a5306a3" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/idRegistry.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/idRegistry.ts
index af26e126344..011085f6144 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/idRegistry.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/idRegistry.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x0aa13b8c" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/price.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/price.ts
index 52d7a381538..80f60351838 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/price.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/price.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "price" function.
@@ -19,8 +19,8 @@ export type PriceParams = {
 export const FN_SELECTOR = "0x26a49e37" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "extraStorage",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/storageRegistry.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/storageRegistry.ts
index 5bb15a70f8d..7a97f33ba5e 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/storageRegistry.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/read/storageRegistry.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x4ec77b45" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/write/register.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/write/register.ts
index 9be06cdbe1e..f0f2d76ae4a 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/write/register.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/write/register.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "register" function.
@@ -22,22 +22,22 @@ export type RegisterParams = WithOverrides<{
 export const FN_SELECTOR = "0x6d705ebb" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "recovery",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "extraStorage",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "overpayment",
+    type: "uint256",
   },
 ] as const;
 
@@ -138,23 +138,23 @@ export function register(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.recovery, resolvedOptions.extraStorage] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.recovery, resolvedOptions.extraStorage] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/write/registerFor.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/write/registerFor.ts
index dfc90dfd636..17e541df5d2 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/write/registerFor.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdGateway/write/registerFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "registerFor" function.
@@ -25,34 +25,34 @@ export type RegisterForParams = WithOverrides<{
 export const FN_SELECTOR = "0xa0c7529c" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "address",
     name: "recovery",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "deadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "sig",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "extraStorage",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "overpayment",
+    type: "uint256",
   },
 ] as const;
 
@@ -167,8 +167,19 @@ export function registerFor(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -180,16 +191,5 @@ export function registerFor(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/AdminReset.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/AdminReset.ts
index 514c3444a8e..19cd2f4d448 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/AdminReset.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/AdminReset.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AdminReset" event.
@@ -34,7 +34,7 @@ export type AdminResetEventFilters = Partial<{
  */
 export function adminResetEvent(filters: AdminResetEventFilters = {}) {
   return prepareEvent({
-    signature: "event AdminReset(uint256 indexed fid)",
     filters,
+    signature: "event AdminReset(uint256 indexed fid)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/ChangeRecoveryAddress.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/ChangeRecoveryAddress.ts
index 655c8354855..29ab077be4e 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/ChangeRecoveryAddress.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/ChangeRecoveryAddress.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ChangeRecoveryAddress" event.
@@ -42,8 +42,8 @@ export function changeRecoveryAddressEvent(
   filters: ChangeRecoveryAddressEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event ChangeRecoveryAddress(uint256 indexed id, address indexed recovery)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Recover.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Recover.ts
index a646e6f7252..c859416f5bf 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Recover.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Recover.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Recover" event.
@@ -46,8 +46,8 @@ export type RecoverEventFilters = Partial<{
  */
 export function recoverEvent(filters: RecoverEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Recover(address indexed from, address indexed to, uint256 indexed id)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Register.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Register.ts
index 43d1195a0c1..bbcd30cbe49 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Register.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Register.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Register" event.
@@ -40,8 +40,8 @@ export type RegisterEventFilters = Partial<{
  */
 export function registerEvent(filters: RegisterEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Register(address indexed to, uint256 indexed id, address recovery)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Transfer.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Transfer.ts
index e5e708c2290..7f232ba6a13 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Transfer.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/events/Transfer.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Transfer" event.
@@ -40,8 +40,8 @@ export type TransferEventFilters = Partial<{
  */
 export function transferEvent(filters: TransferEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Transfer(address indexed from, address indexed to, uint256 id)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/CHANGE_RECOVERY_ADDRESS_TYPEHASH.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/CHANGE_RECOVERY_ADDRESS_TYPEHASH.ts
index e92335890f0..8cf023ced5f 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/CHANGE_RECOVERY_ADDRESS_TYPEHASH.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/CHANGE_RECOVERY_ADDRESS_TYPEHASH.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xd5bac7f3" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_AND_CHANGE_RECOVERY_TYPEHASH.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_AND_CHANGE_RECOVERY_TYPEHASH.ts
index cd9b402fa7a..16234140459 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_AND_CHANGE_RECOVERY_TYPEHASH.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_AND_CHANGE_RECOVERY_TYPEHASH.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xea2bbb83" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_TYPEHASH.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_TYPEHASH.ts
index cb54955823e..f968b97b123 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_TYPEHASH.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/TRANSFER_TYPEHASH.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x00bf26f4" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/custodyOf.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/custodyOf.ts
index dd5e0800b68..0ef60f6be42 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/custodyOf.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/custodyOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "custodyOf" function.
@@ -16,14 +16,14 @@ export type CustodyOfParams = {
 export const FN_SELECTOR = "0x65269e47" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/gatewayFrozen.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/gatewayFrozen.ts
index 60f0638f844..b1633b0da23 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/gatewayFrozen.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/gatewayFrozen.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x95e7549f" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idCounter.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idCounter.ts
index 86c34619ada..4670417928c 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idCounter.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idCounter.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xeb08ab28" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idGateway.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idGateway.ts
index 31bb53a4e44..ab6c007dacf 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idGateway.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idGateway.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x4b57a600" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idOf.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idOf.ts
index aa4fbda61f2..b7de6626faa 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idOf.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/idOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "idOf" function.
@@ -16,14 +16,14 @@ export type IdOfParams = {
 export const FN_SELECTOR = "0xd94fe832" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/recoveryOf.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/recoveryOf.ts
index a790ee0cf7d..17bc3551062 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/recoveryOf.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/recoveryOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "recoveryOf" function.
@@ -16,14 +16,14 @@ export type RecoveryOfParams = {
 export const FN_SELECTOR = "0xfa1a1b25" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "recovery",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/verifyFidSignature.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/verifyFidSignature.ts
index 3b1472b3eab..271eadf920a 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/verifyFidSignature.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/read/verifyFidSignature.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verifyFidSignature" function.
@@ -22,26 +22,26 @@ export type VerifyFidSignatureParams = {
 export const FN_SELECTOR = "0x32faac70" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "custodyAddress",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
   {
-    type: "bytes32",
     name: "digest",
+    type: "bytes32",
   },
   {
-    type: "bytes",
     name: "sig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "isValid",
+    type: "bool",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/changeRecoveryAddress.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/changeRecoveryAddress.ts
index bda18636266..330bccfb96f 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/changeRecoveryAddress.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/changeRecoveryAddress.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "changeRecoveryAddress" function.
@@ -18,8 +18,8 @@ export type ChangeRecoveryAddressParams = WithOverrides<{
 export const FN_SELECTOR = "0xf1f0b224" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "recovery",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -121,23 +121,23 @@ export function changeRecoveryAddress(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.recovery] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.recovery] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/changeRecoveryAddressFor.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/changeRecoveryAddressFor.ts
index 60bc5bc9fc7..80e9629a194 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/changeRecoveryAddressFor.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/changeRecoveryAddressFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "changeRecoveryAddressFor" function.
@@ -21,20 +21,20 @@ export type ChangeRecoveryAddressForParams = WithOverrides<{
 export const FN_SELECTOR = "0x9cbef8dc" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "owner",
+    type: "address",
   },
   {
-    type: "address",
     name: "recovery",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "deadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "sig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -152,8 +152,19 @@ export function changeRecoveryAddressFor(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -164,16 +175,5 @@ export function changeRecoveryAddressFor(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/recover.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/recover.ts
index 8831467efb6..a0a9b3368f5 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/recover.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/recover.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "recover" function.
@@ -21,20 +21,20 @@ export type RecoverParams = WithOverrides<{
 export const FN_SELECTOR = "0x2a42ede3" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "deadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "sig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -144,8 +144,19 @@ export function recover(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -156,16 +167,5 @@ export function recover(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/recoverFor.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/recoverFor.ts
index af489197a44..93482dacc65 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/recoverFor.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/recoverFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "recoverFor" function.
@@ -32,28 +32,28 @@ export type RecoverForParams = WithOverrides<{
 export const FN_SELECTOR = "0xba656434" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "recoveryDeadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "recoverySig",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "toDeadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "toSig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -173,8 +173,19 @@ export function recoverFor(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -187,16 +198,5 @@ export function recoverFor(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transfer.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transfer.ts
index 326c6c3ab43..e910082125e 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transfer.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transfer.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transfer" function.
@@ -20,16 +20,16 @@ export type TransferParams = WithOverrides<{
 export const FN_SELECTOR = "0xbe45fd62" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "deadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "sig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -135,8 +135,19 @@ export function transfer(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function transfer(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecovery.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecovery.ts
index 2bbdcece210..6b19a04a8f8 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecovery.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecovery.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transferAndChangeRecovery" function.
@@ -21,20 +21,20 @@ export type TransferAndChangeRecoveryParams = WithOverrides<{
 export const FN_SELECTOR = "0x3ab8465d" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "address",
     name: "recovery",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "deadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "sig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -152,8 +152,19 @@ export function transferAndChangeRecovery(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -164,16 +175,5 @@ export function transferAndChangeRecovery(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecoveryFor.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecoveryFor.ts
index f254cef9caf..e7626ce8d2d 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecoveryFor.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferAndChangeRecoveryFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transferAndChangeRecoveryFor" function.
@@ -30,32 +30,32 @@ export type TransferAndChangeRecoveryForParams = WithOverrides<{
 export const FN_SELECTOR = "0x4c5cbb34" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "address",
     name: "recovery",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "fromDeadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "fromSig",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "toDeadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "toSig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -185,8 +185,19 @@ export function transferAndChangeRecoveryFor(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -200,16 +211,5 @@ export function transferAndChangeRecoveryFor(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferFor.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferFor.ts
index d4499dad613..adfb3d6d281 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferFor.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IIdRegistry/write/transferFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transferFor" function.
@@ -29,28 +29,28 @@ export type TransferForParams = WithOverrides<{
 export const FN_SELECTOR = "0x16f72842" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "fromDeadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "fromSig",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "toDeadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "toSig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -170,8 +170,19 @@ export function transferFor(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -184,16 +195,5 @@ export function transferFor(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/ADD_TYPEHASH.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/ADD_TYPEHASH.ts
index c4ac42ba8be..978192092e2 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/ADD_TYPEHASH.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/ADD_TYPEHASH.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xab583c1b" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/keyRegistry.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/keyRegistry.ts
index 32289cc6879..e9d4f945ce6 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/keyRegistry.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/keyRegistry.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x086b5198" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/nonces.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/nonces.ts
index 57aad7f4608..2d4370a57bd 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/nonces.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/read/nonces.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "nonces" function.
@@ -16,8 +16,8 @@ export type NoncesParams = {
 export const FN_SELECTOR = "0x7ecebe00" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/write/add.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/write/add.ts
index 2e72ed2db94..2693fa21f00 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/write/add.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/write/add.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "add" function.
@@ -24,20 +24,20 @@ export type AddParams = WithOverrides<{
 export const FN_SELECTOR = "0x22b1a414" as const;
 const FN_INPUTS = [
   {
-    type: "uint32",
     name: "keyType",
+    type: "uint32",
   },
   {
-    type: "bytes",
     name: "key",
+    type: "bytes",
   },
   {
-    type: "uint8",
     name: "metadataType",
+    type: "uint8",
   },
   {
-    type: "bytes",
     name: "metadata",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -147,8 +147,19 @@ export function add(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -159,16 +170,5 @@ export function add(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/write/addFor.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/write/addFor.ts
index ab6001559a8..36d8b42a717 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/write/addFor.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyGateway/write/addFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "addFor" function.
@@ -27,32 +27,32 @@ export type AddForParams = WithOverrides<{
 export const FN_SELECTOR = "0xa005d3d2" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "fidOwner",
+    type: "address",
   },
   {
-    type: "uint32",
     name: "keyType",
+    type: "uint32",
   },
   {
-    type: "bytes",
     name: "key",
+    type: "bytes",
   },
   {
-    type: "uint8",
     name: "metadataType",
+    type: "uint8",
   },
   {
-    type: "bytes",
     name: "metadata",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "deadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "sig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -174,8 +174,19 @@ export function addFor(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -189,16 +200,5 @@ export function addFor(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/Add.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/Add.ts
index 82c9fe8a6e9..aca8ff4c464 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/Add.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/Add.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Add" event.
@@ -46,8 +46,8 @@ export type AddEventFilters = Partial<{
  */
 export function addEvent(filters: AddEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Add(uint256 indexed fid, uint32 indexed keyType, bytes indexed key, bytes keyBytes, uint8 metadataType, bytes metadata)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/AdminReset.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/AdminReset.ts
index 4ddf953a99a..d058ba543ac 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/AdminReset.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/AdminReset.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AdminReset" event.
@@ -40,8 +40,8 @@ export type AdminResetEventFilters = Partial<{
  */
 export function adminResetEvent(filters: AdminResetEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event AdminReset(uint256 indexed fid, bytes indexed key, bytes keyBytes)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/Remove.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/Remove.ts
index 76876634bc2..2cbb8f5e029 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/Remove.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/events/Remove.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Remove" event.
@@ -40,8 +40,8 @@ export type RemoveEventFilters = Partial<{
  */
 export function removeEvent(filters: RemoveEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Remove(uint256 indexed fid, bytes indexed key, bytes keyBytes)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/REMOVE_TYPEHASH.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/REMOVE_TYPEHASH.ts
index c3ce52a2acc..ff5dd13852a 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/REMOVE_TYPEHASH.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/REMOVE_TYPEHASH.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xb5775561" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/gatewayFrozen.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/gatewayFrozen.ts
index 60f0638f844..b1633b0da23 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/gatewayFrozen.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/gatewayFrozen.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x95e7549f" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/idRegistry.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/idRegistry.ts
index af26e126344..011085f6144 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/idRegistry.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/idRegistry.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x0aa13b8c" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyAt.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyAt.ts
index c603ca366d6..08add3ea42d 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyAt.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyAt.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "keyAt" function.
@@ -18,16 +18,16 @@ export type KeyAtParams = {
 export const FN_SELECTOR = "0x0ea9442c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "state",
+    type: "uint8",
   },
   {
-    type: "uint256",
     name: "index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyDataOf.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyDataOf.ts
index 3ec2a78a3f8..7466ff56320 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyDataOf.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyDataOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "keyDataOf" function.
@@ -17,12 +17,12 @@ export type KeyDataOfParams = {
 export const FN_SELECTOR = "0xac34cc5a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "key",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyGateway.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyGateway.ts
index 7ead96b0c37..b27d76ee6e0 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyGateway.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keyGateway.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x80334737" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keysOf.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keysOf.ts
index 47e7e10c438..0a933d04649 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keysOf.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/keysOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "keysOf" function.
@@ -17,12 +17,12 @@ export type KeysOfParams = {
 export const FN_SELECTOR = "0x1f64222f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "state",
+    type: "uint8",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/maxKeysPerFid.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/maxKeysPerFid.ts
index fe3c07d5561..2ba35c2da2e 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/maxKeysPerFid.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/maxKeysPerFid.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe33acf38" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/totalKeys.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/totalKeys.ts
index 70f25124341..9a240bd9d14 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/totalKeys.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/read/totalKeys.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "totalKeys" function.
@@ -17,12 +17,12 @@ export type TotalKeysParams = {
 export const FN_SELECTOR = "0x6840b75e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "state",
+    type: "uint8",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/write/remove.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/write/remove.ts
index 96d8096c9d7..505b8038435 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/write/remove.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/write/remove.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "remove" function.
@@ -18,8 +18,8 @@ export type RemoveParams = WithOverrides<{
 export const FN_SELECTOR = "0x58edef4c" as const;
 const FN_INPUTS = [
   {
-    type: "bytes",
     name: "key",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function remove(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.key] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.key] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/write/removeFor.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/write/removeFor.ts
index 9f9ca5ec955..ea1c8ca3925 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/write/removeFor.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IKeyRegistry/write/removeFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "removeFor" function.
@@ -21,20 +21,20 @@ export type RemoveForParams = WithOverrides<{
 export const FN_SELECTOR = "0x787bd966" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "fidOwner",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "key",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "deadline",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "sig",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,8 +146,19 @@ export function removeFor(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -158,16 +169,5 @@ export function removeFor(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/deprecationTimestamp.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/deprecationTimestamp.ts
index 2804abcbb62..a14b1157781 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/deprecationTimestamp.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/deprecationTimestamp.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x2c39d670" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/maxUnits.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/maxUnits.ts
index 95f61c0b3b5..6b44251b8fd 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/maxUnits.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/maxUnits.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x06517a29" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/price.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/price.ts
index b269ae251b3..8505431f921 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/price.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/price.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "price" function.
@@ -16,8 +16,8 @@ export type PriceParams = {
 export const FN_SELECTOR = "0x26a49e37" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "units",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/rentedUnits.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/rentedUnits.ts
index 251d0af30af..467003b92d2 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/rentedUnits.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/rentedUnits.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x2751c4fd" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/unitPrice.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/unitPrice.ts
index 0ea65e49702..cb8970c72f0 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/unitPrice.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/unitPrice.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe73faa2d" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/usdUnitPrice.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/usdUnitPrice.ts
index 051a7d5075d..6d9acff24e6 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/usdUnitPrice.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/read/usdUnitPrice.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x40df0ba0" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/write/batchRent.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/write/batchRent.ts
index 7fe28d59ed6..62dc2021742 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/write/batchRent.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/write/batchRent.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "batchRent" function.
@@ -19,12 +19,12 @@ export type BatchRentParams = WithOverrides<{
 export const FN_SELECTOR = "0xa82c356e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256[]",
     name: "fids",
+    type: "uint256[]",
   },
   {
-    type: "uint256[]",
     name: "units",
+    type: "uint256[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function batchRent(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.fids, resolvedOptions.units] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.fids, resolvedOptions.units] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/write/rent.ts b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/write/rent.ts
index 83175b73a06..025e4f80b37 100644
--- a/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/write/rent.ts
+++ b/packages/thirdweb/src/extensions/farcaster/__generated__/IStorageRegistry/write/rent.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "rent" function.
@@ -19,18 +19,18 @@ export type RentParams = WithOverrides<{
 export const FN_SELECTOR = "0x783a112b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "fid",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "units",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "overpayment",
+    type: "uint256",
   },
 ] as const;
 
@@ -128,23 +128,23 @@ export function rent(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.fid, resolvedOptions.units] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.fid, resolvedOptions.units] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/contracts/getBundler.ts b/packages/thirdweb/src/extensions/farcaster/contracts/getBundler.ts
index 31b046895f9..678289b6dbf 100644
--- a/packages/thirdweb/src/extensions/farcaster/contracts/getBundler.ts
+++ b/packages/thirdweb/src/extensions/farcaster/contracts/getBundler.ts
@@ -1,7 +1,7 @@
 import { optimism } from "../../../chains/chain-definitions/optimism.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { BUNDLER_ADDRESS } from "../constants.js";
 import type { FarcasterContractOptions } from "./contractOptions.js";
@@ -24,8 +24,8 @@ export function getBundler(
   options: FarcasterContractOptions,
 ): ThirdwebContract {
   return getContract({
-    client: options.client,
     address: BUNDLER_ADDRESS,
     chain: options.chain ?? optimism,
+    client: options.client,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/contracts/getIdGateway.ts b/packages/thirdweb/src/extensions/farcaster/contracts/getIdGateway.ts
index b661c9d96a6..7ed733a339b 100644
--- a/packages/thirdweb/src/extensions/farcaster/contracts/getIdGateway.ts
+++ b/packages/thirdweb/src/extensions/farcaster/contracts/getIdGateway.ts
@@ -1,7 +1,7 @@
 import { optimism } from "../../../chains/chain-definitions/optimism.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { ID_GATEWAY_ADDRESS } from "../constants.js";
 import type { FarcasterContractOptions } from "./contractOptions.js";
@@ -24,8 +24,8 @@ export function getIdGateway(
   options: FarcasterContractOptions,
 ): ThirdwebContract {
   return getContract({
-    client: options.client,
     address: ID_GATEWAY_ADDRESS,
     chain: options.chain ?? optimism,
+    client: options.client,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/contracts/getIdRegistry.ts b/packages/thirdweb/src/extensions/farcaster/contracts/getIdRegistry.ts
index 5b3add0ac11..3557daf9747 100644
--- a/packages/thirdweb/src/extensions/farcaster/contracts/getIdRegistry.ts
+++ b/packages/thirdweb/src/extensions/farcaster/contracts/getIdRegistry.ts
@@ -1,7 +1,7 @@
 import { optimism } from "../../../chains/chain-definitions/optimism.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { ID_REGISTRY_ADDRESS } from "../constants.js";
 import type { FarcasterContractOptions } from "./contractOptions.js";
@@ -24,8 +24,8 @@ export function getIdRegistry(
   options: FarcasterContractOptions,
 ): ThirdwebContract {
   return getContract({
-    client: options.client,
     address: ID_REGISTRY_ADDRESS,
     chain: options.chain ?? optimism,
+    client: options.client,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/contracts/getKeyGateway.ts b/packages/thirdweb/src/extensions/farcaster/contracts/getKeyGateway.ts
index 7327567459c..5e389828102 100644
--- a/packages/thirdweb/src/extensions/farcaster/contracts/getKeyGateway.ts
+++ b/packages/thirdweb/src/extensions/farcaster/contracts/getKeyGateway.ts
@@ -1,7 +1,7 @@
 import { optimism } from "../../../chains/chain-definitions/optimism.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { KEY_GATEWAY_ADDRESS } from "../constants.js";
 import type { FarcasterContractOptions } from "./contractOptions.js";
@@ -24,8 +24,8 @@ export function getKeyGateway(
   options: FarcasterContractOptions,
 ): ThirdwebContract {
   return getContract({
-    client: options.client,
     address: KEY_GATEWAY_ADDRESS,
     chain: options.chain ?? optimism,
+    client: options.client,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/contracts/getStorageRegistry.ts b/packages/thirdweb/src/extensions/farcaster/contracts/getStorageRegistry.ts
index e3331580e72..5495bb6bc16 100644
--- a/packages/thirdweb/src/extensions/farcaster/contracts/getStorageRegistry.ts
+++ b/packages/thirdweb/src/extensions/farcaster/contracts/getStorageRegistry.ts
@@ -1,7 +1,7 @@
 import { optimism } from "../../../chains/chain-definitions/optimism.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { STORAGE_REGISTRY_ADDRESS } from "../constants.js";
 import type { FarcasterContractOptions } from "./contractOptions.js";
@@ -24,8 +24,8 @@ export function getStorageRegistry(
   options: FarcasterContractOptions,
 ): ThirdwebContract {
   return getContract({
-    client: options.client,
     address: STORAGE_REGISTRY_ADDRESS,
     chain: options.chain ?? optimism,
+    client: options.client,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/ed25519.ts b/packages/thirdweb/src/extensions/farcaster/ed25519.ts
index 5ef05720d3a..06d0964db32 100644
--- a/packages/thirdweb/src/extensions/farcaster/ed25519.ts
+++ b/packages/thirdweb/src/extensions/farcaster/ed25519.ts
@@ -23,7 +23,7 @@ export async function createEd25519Keypair(): Promise<Ed25519Keypair> {
   const privateKey = ed25519.utils.randomPrivateKey();
   const publicKey = ed25519.getPublicKey(privateKey);
   return {
-    publicKey: fromBytes(publicKey, "hex"),
     privateKey: fromBytes(privateKey, "hex"),
+    publicKey: fromBytes(publicKey, "hex"),
   };
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/eip712Signatures/addSignature.ts b/packages/thirdweb/src/extensions/farcaster/eip712Signatures/addSignature.ts
index 439da7a7de4..33ea5f887bd 100644
--- a/packages/thirdweb/src/extensions/farcaster/eip712Signatures/addSignature.ts
+++ b/packages/thirdweb/src/extensions/farcaster/eip712Signatures/addSignature.ts
@@ -4,10 +4,10 @@ import type { Account } from "../../../wallets/interfaces/wallet.js";
 import { KEY_GATEWAY_ADDRESS } from "../constants.js";
 
 const KEY_GATEWAY_EIP_712_DOMAIN = {
-  name: "Farcaster KeyGateway",
-  version: "1",
   chainId: 10,
+  name: "Farcaster KeyGateway",
   verifyingContract: KEY_GATEWAY_ADDRESS,
+  version: "1",
 } as const;
 
 const KEY_GATEWAY_ADD_TYPE = [
@@ -76,8 +76,8 @@ export type SignAddOptions = {
 export function getAddData(message: AddMessage) {
   return {
     ...KEY_GATEWAY_EIP_712_TYPES,
-    primaryType: "Add" as const,
     message,
+    primaryType: "Add" as const,
   };
 }
 
diff --git a/packages/thirdweb/src/extensions/farcaster/eip712Signatures/keyRequestSignature.ts b/packages/thirdweb/src/extensions/farcaster/eip712Signatures/keyRequestSignature.ts
index 8aa0a76ab98..0fc2d2ff828 100644
--- a/packages/thirdweb/src/extensions/farcaster/eip712Signatures/keyRequestSignature.ts
+++ b/packages/thirdweb/src/extensions/farcaster/eip712Signatures/keyRequestSignature.ts
@@ -6,10 +6,10 @@ import type { Account } from "../../../wallets/interfaces/wallet.js";
 import { SIGNED_KEY_REQUEST_VALIDATOR_ADDRESS } from "../constants.js";
 
 const SIGNED_KEY_REQUEST_VALIDATOR_EIP_712_DOMAIN = {
-  name: "Farcaster SignedKeyRequestValidator", // EIP-712 domain data for the SignedKeyRequestValidator.
-  version: "1",
-  chainId: 10,
+  chainId: 10, // EIP-712 domain data for the SignedKeyRequestValidator.
+  name: "Farcaster SignedKeyRequestValidator",
   verifyingContract: SIGNED_KEY_REQUEST_VALIDATOR_ADDRESS,
+  version: "1",
 } as const;
 
 const SIGNED_KEY_REQUEST_TYPE = [
@@ -87,8 +87,8 @@ export type SignKeyRequestOptions = {
 export function getKeyRequestData(message: SignedKeyRequestMessage) {
   return {
     ...SIGNED_KEY_REQUEST_VALIDATOR_EIP_712_TYPES,
-    primaryType: "SignedKeyRequest" as const,
     message,
+    primaryType: "SignedKeyRequest" as const,
   };
 }
 
@@ -160,10 +160,10 @@ export function encodeSignedKeyRequestMetadata(options: {
 }): Hex {
   return encodeAbiParameters(SIGNED_KEY_REQUEST_METADATA_ABI, [
     {
+      deadline: options.deadline,
       requestFid: options.requestFid,
       requestSigner: options.requestSigner,
       signature: options.keyRequestSignature,
-      deadline: options.deadline,
     },
   ]);
 }
@@ -217,10 +217,10 @@ export async function getSignedKeyRequestMetadata(
   }
 
   return encodeSignedKeyRequestMetadata({
-    requestSigner:
-      "account" in options ? options.account.address : options.accountAddress,
+    deadline: options.message.deadline,
     keyRequestSignature: signature,
     requestFid: options.message.requestFid,
-    deadline: options.message.deadline,
+    requestSigner:
+      "account" in options ? options.account.address : options.accountAddress,
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/eip712Signatures/registerSignature.ts b/packages/thirdweb/src/extensions/farcaster/eip712Signatures/registerSignature.ts
index 4a4fede9cf2..f4408f688e6 100644
--- a/packages/thirdweb/src/extensions/farcaster/eip712Signatures/registerSignature.ts
+++ b/packages/thirdweb/src/extensions/farcaster/eip712Signatures/registerSignature.ts
@@ -4,10 +4,10 @@ import type { Account } from "../../../wallets/interfaces/wallet.js";
 import { ID_GATEWAY_ADDRESS } from "../constants.js";
 
 const ID_GATEWAY_EIP_712_DOMAIN = {
-  name: "Farcaster IdGateway",
-  version: "1",
   chainId: 10,
+  name: "Farcaster IdGateway",
   verifyingContract: ID_GATEWAY_ADDRESS,
+  version: "1",
 } as const;
 
 const ID_GATEWAY_REGISTER_TYPE = [
@@ -60,8 +60,8 @@ export type SignRegisterOptions = {
 export function getRegisterData(message: RegisterMessage) {
   return {
     ...ID_GATEWAY_EIP_712_TYPES,
-    primaryType: "Register" as const,
     message,
+    primaryType: "Register" as const,
   };
 }
 
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getFid.test.ts b/packages/thirdweb/src/extensions/farcaster/read/getFid.test.ts
index 49a8ca534d7..20a2e987548 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getFid.test.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getFid.test.ts
@@ -7,18 +7,18 @@ import { getFid } from "./getFid.js";
 describe("farcaster.getFid", () => {
   it("should return the address's fid", async () => {
     const fid = await getFid({
-      client: TEST_CLIENT,
-      chain: FORKED_OPTIMISM_CHAIN,
       address: "0x6443ed8a3ffb006e3bb5a866bae6edfb93f8ff3e",
+      chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
     });
     expect(fid).toBe(7657n);
   });
 
   it("should return 0 if the address has no fid", async () => {
     const fid = await getFid({
-      client: TEST_CLIENT,
-      chain: FORKED_OPTIMISM_CHAIN,
       address: "0x0000000000000000000000000000000000000000",
+      chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
     });
     expect(fid).toBe(0n);
   });
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getFid.ts b/packages/thirdweb/src/extensions/farcaster/read/getFid.ts
index c9a3da29168..c7b5d88cf58 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getFid.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getFid.ts
@@ -33,8 +33,8 @@ export type GetFidParams = {
 export async function getFid(options: GetFidParams): Promise<bigint> {
   const fetch = () => {
     const contract = getIdRegistry({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     });
     return idOf({ contract, owner: options.address });
   };
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getNonce.test.ts b/packages/thirdweb/src/extensions/farcaster/read/getNonce.test.ts
index e6ad66eae3c..a05e1685fc3 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getNonce.test.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getNonce.test.ts
@@ -7,9 +7,9 @@ import { getNonce } from "./getNonce.js";
 describe("farcaster.getNonce", () => {
   it("should return the address's current nonce", async () => {
     const nonce = await getNonce({
-      client: TEST_CLIENT,
-      chain: FORKED_OPTIMISM_CHAIN,
       address: "0x6443ed8a3ffb006e3bb5a866bae6edfb93f8ff3e",
+      chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
     });
     expect(nonce).toBe(12n);
   });
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getNonce.ts b/packages/thirdweb/src/extensions/farcaster/read/getNonce.ts
index 818a292aea6..eeab74a4c8c 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getNonce.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getNonce.ts
@@ -33,10 +33,10 @@ export type GetNonceParams = {
 export async function getNonce(options: GetNonceParams): Promise<bigint> {
   const fetch = () => {
     const contract = getKeyGateway({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     });
-    return nonces({ contract, account: options.address });
+    return nonces({ account: options.address, contract });
   };
 
   return withCache(fetch, {
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getRegistrationPrice.test.ts b/packages/thirdweb/src/extensions/farcaster/read/getRegistrationPrice.test.ts
index 925a5d4404d..08178783f41 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getRegistrationPrice.test.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getRegistrationPrice.test.ts
@@ -7,16 +7,16 @@ import { getRegistrationPrice } from "./getRegistrationPrice.js";
 describe("farcaster.getRegistrationPrice", () => {
   it("should return the price to register a new fid", async () => {
     const price = await getRegistrationPrice({
-      client: TEST_CLIENT,
       chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
     });
     expect(price).toBe(824603002115370n);
   });
 
   it("should return the price to register a new fid with extra storage", async () => {
     const price = await getRegistrationPrice({
-      client: TEST_CLIENT,
       chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
       extraStorage: 3,
     });
     expect(price).toBe(3298412008461477n);
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getRegistrationPrice.ts b/packages/thirdweb/src/extensions/farcaster/read/getRegistrationPrice.ts
index bc65f30a17d..348ce638886 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getRegistrationPrice.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getRegistrationPrice.ts
@@ -41,8 +41,8 @@ export async function getRegistrationPrice(
 
   const fetch = () => {
     const contract = getIdGateway({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     });
     return price({ contract, extraStorage: toBigInt(extraStorage) });
   };
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getStoragePrice.test.ts b/packages/thirdweb/src/extensions/farcaster/read/getStoragePrice.test.ts
index 624aced96e9..7584232b60d 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getStoragePrice.test.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getStoragePrice.test.ts
@@ -7,16 +7,16 @@ import { getStoragePrice } from "./getStoragePrice.js";
 describe("farcaster.getStoragePrice", () => {
   it("should return the price to rent 1 unit of storage", async () => {
     const price = await getStoragePrice({
-      client: TEST_CLIENT,
       chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
     });
     expect(price).toBe(824603002115370n);
   });
 
   it("should return the price to rent 3 units of storage", async () => {
     const price = await getStoragePrice({
-      client: TEST_CLIENT,
       chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
       units: 3,
     });
     expect(price).toBe(824603002115370n * 3n);
@@ -25,8 +25,8 @@ describe("farcaster.getStoragePrice", () => {
   it("should error when 0 units specified", async () => {
     await expect(
       getStoragePrice({
-        client: TEST_CLIENT,
         chain: FORKED_OPTIMISM_CHAIN,
+        client: TEST_CLIENT,
         units: 0,
       }),
     ).rejects.toThrow("Expected units to be greater than or equal to 1, got 0");
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getStoragePrice.ts b/packages/thirdweb/src/extensions/farcaster/read/getStoragePrice.ts
index 739b4eb30c6..afe7efa8032 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getStoragePrice.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getStoragePrice.ts
@@ -41,8 +41,8 @@ export async function getStoragePrice(
 
   const fetch = async () => {
     const contract = getStorageRegistry({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     });
     return (await unitPrice({ contract })) * units;
   };
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getUsdRegistrationPrice.test.ts b/packages/thirdweb/src/extensions/farcaster/read/getUsdRegistrationPrice.test.ts
index 0377ff78af9..6b66c7ea32f 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getUsdRegistrationPrice.test.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getUsdRegistrationPrice.test.ts
@@ -7,16 +7,16 @@ import { getUsdRegistrationPrice } from "./getUsdRegistrationPrice.js";
 describe("farcaster.getRegistrationPrice", () => {
   it("should return the price to register a new fid in USD", async () => {
     const price = await getUsdRegistrationPrice({
-      client: TEST_CLIENT,
       chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
     });
     expect(price).toBe(3);
   });
 
   it("should return the price to register a new fid with extra storage in USD", async () => {
     const price = await getUsdRegistrationPrice({
-      client: TEST_CLIENT,
       chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
       extraStorage: 3,
     });
     expect(price).toBe(12);
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getUsdRegistrationPrice.ts b/packages/thirdweb/src/extensions/farcaster/read/getUsdRegistrationPrice.ts
index 3659b7a8111..c672eb05798 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getUsdRegistrationPrice.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getUsdRegistrationPrice.ts
@@ -42,8 +42,8 @@ export async function getUsdRegistrationPrice(
 
   const fetch = async () => {
     const contract = getStorageRegistry({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     });
     const bigNumberValue =
       (await usdUnitPrice({ contract })) * (extraStorage + 1n);
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getUsdStoragePrice.test.ts b/packages/thirdweb/src/extensions/farcaster/read/getUsdStoragePrice.test.ts
index 090ff7d8428..79c4767e0ff 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getUsdStoragePrice.test.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getUsdStoragePrice.test.ts
@@ -7,16 +7,16 @@ import { getUsdStoragePrice } from "./getUsdStoragePrice.js";
 describe("farcaster.getUsdStoragePrice", () => {
   it("should return the price to rent 1 unit of storage", async () => {
     const price = await getUsdStoragePrice({
-      client: TEST_CLIENT,
       chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
     });
     expect(price).toBe(3);
   });
 
   it("should return the price to rent 3 units of storage", async () => {
     const price = await getUsdStoragePrice({
-      client: TEST_CLIENT,
       chain: FORKED_OPTIMISM_CHAIN,
+      client: TEST_CLIENT,
       units: 3,
     });
     expect(price).toBe(9);
diff --git a/packages/thirdweb/src/extensions/farcaster/read/getUsdStoragePrice.ts b/packages/thirdweb/src/extensions/farcaster/read/getUsdStoragePrice.ts
index 652883f0121..958df702060 100644
--- a/packages/thirdweb/src/extensions/farcaster/read/getUsdStoragePrice.ts
+++ b/packages/thirdweb/src/extensions/farcaster/read/getUsdStoragePrice.ts
@@ -42,8 +42,8 @@ export async function getUsdStoragePrice(
 
   const fetch = async () => {
     const contract = getStorageRegistry({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     });
     const bigNumberValue = (await usdUnitPrice({ contract })) * units;
     return Number(toTokens(bigNumberValue, 8)); // storage registry uses 8 decimal places
diff --git a/packages/thirdweb/src/extensions/farcaster/write/addSigner.ts b/packages/thirdweb/src/extensions/farcaster/write/addSigner.ts
index 38908a3083d..a6361a146b5 100644
--- a/packages/thirdweb/src/extensions/farcaster/write/addSigner.ts
+++ b/packages/thirdweb/src/extensions/farcaster/write/addSigner.ts
@@ -60,27 +60,27 @@ export type AddSignerParams = Prettify<
 export function addSigner(options: AddSignerParams) {
   return prepareContractCall({
     contract: getKeyGateway({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     }),
     method: [
       "0x22b1a414",
       [
         {
-          type: "uint32",
           name: "keyType",
+          type: "uint32",
         },
         {
-          type: "bytes",
           name: "key",
+          type: "bytes",
         },
         {
-          type: "uint8",
           name: "metadataType",
+          type: "uint8",
         },
         {
-          type: "bytes",
           name: "metadata",
+          type: "bytes",
         },
       ],
       [],
@@ -92,12 +92,12 @@ export function addSigner(options: AddSignerParams) {
           : BigInt(Math.floor(Date.now() / 1000) + 3600); // default signatures last for 1 hour
 
       const appFid = await getFid({
-        client: options.client,
-        chain: options.chain,
         address:
           "appAccount" in options
             ? options.appAccount.address
             : options.appAccountAddress,
+        chain: options.chain,
+        client: options.client,
         disableCache: options.disableCache,
       });
 
@@ -112,9 +112,9 @@ export function addSigner(options: AddSignerParams) {
         signedKeyRequestMetadata = await getSignedKeyRequestMetadata({
           account: options.appAccount,
           message: {
-            requestFid: toBigInt(appFid),
-            key: options.signerPublicKey,
             deadline,
+            key: options.signerPublicKey,
+            requestFid: toBigInt(appFid),
           },
         });
       } else {
diff --git a/packages/thirdweb/src/extensions/farcaster/write/addSignerFor.ts b/packages/thirdweb/src/extensions/farcaster/write/addSignerFor.ts
index 6217cbb075f..f09b647731b 100644
--- a/packages/thirdweb/src/extensions/farcaster/write/addSignerFor.ts
+++ b/packages/thirdweb/src/extensions/farcaster/write/addSignerFor.ts
@@ -72,8 +72,8 @@ export type AddSignerForParams = Prettify<
  */
 export function addSignerFor(options: AddSignerForParams) {
   const keyGateway = getKeyGateway({
-    client: options.client,
     chain: options.chain,
+    client: options.client,
   });
   return prepareContractCall({
     contract: keyGateway,
@@ -81,32 +81,32 @@ export function addSignerFor(options: AddSignerForParams) {
       "0xa005d3d2",
       [
         {
-          type: "address",
           name: "fidOwner",
+          type: "address",
         },
         {
-          type: "uint32",
           name: "keyType",
+          type: "uint32",
         },
         {
-          type: "bytes",
           name: "key",
+          type: "bytes",
         },
         {
-          type: "uint8",
           name: "metadataType",
+          type: "uint8",
         },
         {
-          type: "bytes",
           name: "metadata",
+          type: "bytes",
         },
         {
-          type: "uint256",
           name: "deadline",
+          type: "uint256",
         },
         {
-          type: "bytes",
           name: "sig",
+          type: "bytes",
         },
       ],
       [],
@@ -128,9 +128,9 @@ export function addSignerFor(options: AddSignerForParams) {
 
       // Fetch the app's FID
       const appFid = await getFid({
-        client: options.client,
-        chain: options.chain,
         address: appAccountAddress,
+        chain: options.chain,
+        client: options.client,
         disableCache: options.disableCache,
       });
       if (appFid === 0n) {
@@ -148,9 +148,9 @@ export function addSignerFor(options: AddSignerForParams) {
         signedKeyRequestMetadata = await getSignedKeyRequestMetadata({
           account: options.appAccount,
           message: {
-            requestFid: toBigInt(appFid),
-            key: options.signerPublicKey,
             deadline,
+            key: options.signerPublicKey,
+            requestFid: toBigInt(appFid),
           },
         });
       } else {
@@ -174,13 +174,13 @@ export function addSignerFor(options: AddSignerForParams) {
         addSignature = await signAdd({
           account: options.userAccount,
           message: {
-            owner: userAddress,
-            keyType: 1,
+            deadline,
             key: options.signerPublicKey,
-            metadataType: 1,
+            keyType: 1,
             metadata: signedKeyRequestMetadata,
+            metadataType: 1,
             nonce,
-            deadline,
+            owner: userAddress,
           },
         });
       } else {
diff --git a/packages/thirdweb/src/extensions/farcaster/write/registerFid.ts b/packages/thirdweb/src/extensions/farcaster/write/registerFid.ts
index 086970b9195..8339b75477b 100644
--- a/packages/thirdweb/src/extensions/farcaster/write/registerFid.ts
+++ b/packages/thirdweb/src/extensions/farcaster/write/registerFid.ts
@@ -46,40 +46,40 @@ export function registerFid(options: RegisterFidParams) {
 
   return prepareContractCall({
     contract: getIdGateway({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     }),
     method: [
       "0x6d705ebb",
       [
         {
-          type: "address",
           name: "recovery",
+          type: "address",
         },
         {
-          type: "uint256",
           name: "extraStorage",
+          type: "uint256",
         },
       ],
       [
         {
-          type: "uint256",
           name: "fid",
+          type: "uint256",
         },
         {
-          type: "uint256",
           name: "overpayment",
+          type: "uint256",
         },
       ],
     ],
+    params: [options.recoveryAddress, extraStorage],
     value: async () => {
       return await getRegistrationPrice({
-        client: options.client,
         chain: options.chain,
-        extraStorage: extraStorage,
+        client: options.client,
         disableCache: options.disableCache,
+        extraStorage: extraStorage,
       });
     },
-    params: [options.recoveryAddress, extraStorage],
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/write/registerFidAndSigner.ts b/packages/thirdweb/src/extensions/farcaster/write/registerFidAndSigner.ts
index 2aede9034eb..70aa2d9cf3d 100644
--- a/packages/thirdweb/src/extensions/farcaster/write/registerFidAndSigner.ts
+++ b/packages/thirdweb/src/extensions/farcaster/write/registerFidAndSigner.ts
@@ -84,87 +84,76 @@ export function registerFidAndSigner(options: RegisterFidAndSignerParams) {
 
   return prepareContractCall({
     contract: getBundler({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     }),
     method: [
       "0xa44c9ce7",
       [
         {
-          type: "tuple",
-          name: "registerParams",
           components: [
             {
-              type: "address",
               name: "to",
+              type: "address",
             },
             {
-              type: "address",
               name: "recovery",
+              type: "address",
             },
             {
-              type: "uint256",
               name: "deadline",
+              type: "uint256",
             },
             {
-              type: "bytes",
               name: "sig",
+              type: "bytes",
             },
           ],
+          name: "registerParams",
+          type: "tuple",
         },
         {
-          type: "tuple[]",
-          name: "signerParams",
           components: [
             {
-              type: "uint32",
               name: "keyType",
+              type: "uint32",
             },
             {
-              type: "bytes",
               name: "key",
+              type: "bytes",
             },
             {
-              type: "uint8",
               name: "metadataType",
+              type: "uint8",
             },
             {
-              type: "bytes",
               name: "metadata",
+              type: "bytes",
             },
             {
-              type: "uint256",
               name: "deadline",
+              type: "uint256",
             },
             {
-              type: "bytes",
               name: "sig",
+              type: "bytes",
             },
           ],
+          name: "signerParams",
+          type: "tuple[]",
         },
         {
-          type: "uint256",
           name: "extraStorage",
+          type: "uint256",
         },
       ],
       [
         {
-          type: "uint256",
           name: "fid",
+          type: "uint256",
         },
       ],
     ],
-    value: async () => {
-      const { getRegistrationPrice } = await import(
-        "../read/getRegistrationPrice.js"
-      );
-      return await getRegistrationPrice({
-        client: options.client,
-        chain: options.chain,
-        extraStorage: extraStorage,
-        disableCache: options.disableCache,
-      });
-    },
     params: async () => {
       const deadline =
         "deadline" in options
@@ -182,9 +171,9 @@ export function registerFidAndSigner(options: RegisterFidAndSignerParams) {
 
       // Check if the user already has a registered fid
       const existingFid = await getFid({
-        client: options.client,
-        chain: options.chain,
         address: userAddress,
+        chain: options.chain,
+        client: options.client,
         disableCache: options.disableCache,
       });
       // If a fid is already registered for the user, throw an error
@@ -195,8 +184,8 @@ export function registerFidAndSigner(options: RegisterFidAndSignerParams) {
       }
 
       const keyGateway = getKeyGateway({
-        client: options.client,
         chain: options.chain,
+        client: options.client,
       });
 
       // Fetch the user's current key gateway nonce
@@ -219,10 +208,10 @@ export function registerFidAndSigner(options: RegisterFidAndSignerParams) {
         registerSignature = await signRegister({
           account: options.userAccount,
           message: {
+            deadline,
             nonce,
-            to: userAddress,
             recovery: options.recoveryAddress,
-            deadline,
+            to: userAddress,
           },
         });
       } else {
@@ -233,9 +222,9 @@ export function registerFidAndSigner(options: RegisterFidAndSignerParams) {
 
       // Get the fid for the app account
       const appFid = await getFid({
-        client: options.client,
-        chain: options.chain,
         address: appAccountAddress,
+        chain: options.chain,
+        client: options.client,
         disableCache: options.disableCache,
       });
       if (appFid === 0n) {
@@ -253,9 +242,9 @@ export function registerFidAndSigner(options: RegisterFidAndSignerParams) {
         signedKeyRequestMetadata = await getSignedKeyRequestMetadata({
           account: options.appAccount,
           message: {
-            requestFid: toBigInt(appFid),
-            key: options.signerPublicKey,
             deadline,
+            key: options.signerPublicKey,
+            requestFid: toBigInt(appFid),
           },
         });
       } else {
@@ -273,13 +262,13 @@ export function registerFidAndSigner(options: RegisterFidAndSignerParams) {
         addSignature = await signAdd({
           account: options.userAccount,
           message: {
-            owner: userAddress,
-            keyType: 1,
+            deadline,
             key: options.signerPublicKey,
-            metadataType: 1,
+            keyType: 1,
             metadata: signedKeyRequestMetadata,
+            metadataType: 1,
             nonce,
-            deadline,
+            owner: userAddress,
           },
         });
       } else {
@@ -290,23 +279,34 @@ export function registerFidAndSigner(options: RegisterFidAndSignerParams) {
 
       return [
         {
-          to: userAddress,
-          recovery: options.recoveryAddress,
           deadline,
+          recovery: options.recoveryAddress,
           sig: registerSignature,
+          to: userAddress,
         },
         [
           {
-            keyType: 1,
+            deadline,
             key: options.signerPublicKey,
-            metadataType: 1,
+            keyType: 1,
             metadata: signedKeyRequestMetadata,
-            deadline,
+            metadataType: 1,
             sig: addSignature,
           },
         ],
         extraStorage,
       ] as const;
     },
+    value: async () => {
+      const { getRegistrationPrice } = await import(
+        "../read/getRegistrationPrice.js"
+      );
+      return await getRegistrationPrice({
+        chain: options.chain,
+        client: options.client,
+        disableCache: options.disableCache,
+        extraStorage: extraStorage,
+      });
+    },
   });
 }
diff --git a/packages/thirdweb/src/extensions/farcaster/write/rentStorage.ts b/packages/thirdweb/src/extensions/farcaster/write/rentStorage.ts
index c950bb16594..10227389983 100644
--- a/packages/thirdweb/src/extensions/farcaster/write/rentStorage.ts
+++ b/packages/thirdweb/src/extensions/farcaster/write/rentStorage.ts
@@ -48,36 +48,36 @@ export function rentStorage(options: RentStorageParams) {
 
   return prepareContractCall({
     contract: getStorageRegistry({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     }),
     method: [
       "0x783a112b",
       [
         {
-          type: "uint256",
           name: "fid",
+          type: "uint256",
         },
         {
-          type: "uint256",
           name: "units",
+          type: "uint256",
         },
       ],
       [
         {
-          type: "uint256",
           name: "overpayment",
+          type: "uint256",
         },
       ],
     ],
+    params: [fid, units],
     value: async () => {
       const price = await getStoragePrice({
-        client: options.client,
         chain: options.chain,
+        client: options.client,
         units,
       });
       return price;
     },
-    params: [fid, units],
   });
 }
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowData.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowData.ts
index 7727e542752..a3f4b147599 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowData.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowData.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getFollowData" function.
@@ -19,31 +19,31 @@ export type GetFollowDataParams = {
 export const FN_SELECTOR = "0xd6cbec5d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "followTokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "uint160",
         name: "followerProfileId",
+        type: "uint160",
       },
       {
-        type: "uint48",
         name: "originalFollowTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "followTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint256",
         name: "profileIdAllowedToRecover",
+        type: "uint256",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowTimestamp.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowTimestamp.ts
index 790321c4822..658742012bc 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowTimestamp.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowTimestamp.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getFollowTimestamp" function.
@@ -19,8 +19,8 @@ export type GetFollowTimestampParams = {
 export const FN_SELECTOR = "0x3543a277" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "followTokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowTokenId.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowTokenId.ts
index 8ad5fa2669a..4f7435a95c8 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowTokenId.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowTokenId.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getFollowTokenId" function.
@@ -19,8 +19,8 @@ export type GetFollowTokenIdParams = {
 export const FN_SELECTOR = "0x11c763d6" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "followerProfileId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowerCount.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowerCount.ts
index 32715c1467b..b77f53ea762 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowerCount.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowerCount.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x7829ae4a" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowerProfileId.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowerProfileId.ts
index 9d41e05d6ec..8cf23e11f65 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowerProfileId.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getFollowerProfileId.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getFollowerProfileId" function.
@@ -19,8 +19,8 @@ export type GetFollowerProfileIdParams = {
 export const FN_SELECTOR = "0x886a65c3" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "followTokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getOriginalFollowTimestamp.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getOriginalFollowTimestamp.ts
index 5eb6814b734..c82404bae68 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getOriginalFollowTimestamp.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getOriginalFollowTimestamp.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getOriginalFollowTimestamp" function.
@@ -19,8 +19,8 @@ export type GetOriginalFollowTimestampParams = {
 export const FN_SELECTOR = "0xd1b34934" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "followTokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getProfileIdAllowedToRecover.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getProfileIdAllowedToRecover.ts
index 101623902a7..2942f9bf24e 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getProfileIdAllowedToRecover.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/getProfileIdAllowedToRecover.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getProfileIdAllowedToRecover" function.
@@ -19,8 +19,8 @@ export type GetProfileIdAllowedToRecoverParams = {
 export const FN_SELECTOR = "0x2af1544f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "followTokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/isFollowing.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/isFollowing.ts
index 6856b518944..fecddef35fa 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/isFollowing.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/isFollowing.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isFollowing" function.
@@ -19,8 +19,8 @@ export type IsFollowingParams = {
 export const FN_SELECTOR = "0x4d71688d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "followerProfileId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/mintTimestampOf.ts b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/mintTimestampOf.ts
index 1631c257613..75308c367f1 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/mintTimestampOf.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/FollowNFT/read/mintTimestampOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "mintTimestampOf" function.
@@ -16,8 +16,8 @@ export type MintTimestampOfParams = {
 export const FN_SELECTOR = "0x50ddf35c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getHandle.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getHandle.ts
index b30d2e0f539..d2b50d02fd7 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getHandle.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getHandle.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getHandle" function.
@@ -16,8 +16,8 @@ export type GetHandleParams = {
 export const FN_SELECTOR = "0xec81d194" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getHandleTokenURIContract.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getHandleTokenURIContract.ts
index de298f22a2d..eac910c2726 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getHandleTokenURIContract.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getHandleTokenURIContract.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x35eb3cb9" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getLocalName.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getLocalName.ts
index 099379d9c7a..d38af7a477c 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getLocalName.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getLocalName.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getLocalName" function.
@@ -16,8 +16,8 @@ export type GetLocalNameParams = {
 export const FN_SELECTOR = "0x4985e504" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getTokenId.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getTokenId.ts
index e2e95574a6d..11639e363d1 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getTokenId.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHandle/read/getTokenId.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getTokenId" function.
@@ -16,8 +16,8 @@ export type GetTokenIdParams = {
 export const FN_SELECTOR = "0x1e7663bc" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "localName",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/exists.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/exists.ts
index cc5518032e3..d510979c856 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/exists.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/exists.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "exists" function.
@@ -16,8 +16,8 @@ export type ExistsParams = {
 export const FN_SELECTOR = "0x4f558e79" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getContentURI.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getContentURI.ts
index 114e9c70f25..91ae1a9deaa 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getContentURI.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getContentURI.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getContentURI" function.
@@ -20,12 +20,12 @@ export type GetContentURIParams = {
 export const FN_SELECTOR = "0xb5a31496" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "profileId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "pubId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getProfile.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getProfile.ts
index 849132cce2d..b2edcfdec8b 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getProfile.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getProfile.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getProfile" function.
@@ -19,43 +19,43 @@ export type GetProfileParams = {
 export const FN_SELECTOR = "0xf08f4f64" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "profileId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "uint256",
         name: "pubCount",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "followModule",
+        type: "address",
       },
       {
-        type: "address",
         name: "followNFT",
+        type: "address",
       },
       {
-        type: "string",
         name: "__DEPRECATED__handle",
+        type: "string",
       },
       {
-        type: "string",
         name: "__DEPRECATED__imageURI",
+        type: "string",
       },
       {
-        type: "string",
         name: "__DEPRECATED__followNFTURI",
+        type: "string",
       },
       {
-        type: "string",
         name: "metadataURI",
+        type: "string",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getProfileIdByHandleHash.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getProfileIdByHandleHash.ts
index 378495f5b5e..2e009569ebd 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getProfileIdByHandleHash.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getProfileIdByHandleHash.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getProfileIdByHandleHash" function.
@@ -19,8 +19,8 @@ export type GetProfileIdByHandleHashParams = {
 export const FN_SELECTOR = "0x19e14070" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "handleHash",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getPublication.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getPublication.ts
index 940c42b7539..ba8160ed54d 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getPublication.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/getPublication.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPublication" function.
@@ -20,55 +20,55 @@ export type GetPublicationParams = {
 export const FN_SELECTOR = "0x7385ebc9" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "profileId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "pubId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "uint256",
         name: "pointedProfileId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pointedPubId",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "contentURI",
+        type: "string",
       },
       {
-        type: "address",
         name: "referenceModule",
+        type: "address",
       },
       {
-        type: "address",
         name: "__DEPRECATED__collectModule",
+        type: "address",
       },
       {
-        type: "address",
         name: "__DEPRECATED__collectNFT",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "pubType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "rootProfileId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "rootPubId",
+        type: "uint256",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/mintTimestampOf.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/mintTimestampOf.ts
index 1631c257613..75308c367f1 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/mintTimestampOf.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/mintTimestampOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "mintTimestampOf" function.
@@ -16,8 +16,8 @@ export type MintTimestampOfParams = {
 export const FN_SELECTOR = "0x50ddf35c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/nonces.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/nonces.ts
index 87a92d9f86e..d2a646311e4 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/nonces.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/nonces.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "nonces" function.
@@ -16,8 +16,8 @@ export type NoncesParams = {
 export const FN_SELECTOR = "0x7ecebe00" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/tokenDataOf.ts b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/tokenDataOf.ts
index ce9edc4470c..0bb4f9c14c9 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/tokenDataOf.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/LensHub/read/tokenDataOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "tokenDataOf" function.
@@ -16,23 +16,23 @@ export type TokenDataOfParams = {
 export const FN_SELECTOR = "0xc0da9bcd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "address",
         name: "owner",
+        type: "address",
       },
       {
-        type: "uint96",
         name: "mintTimestamp",
+        type: "uint96",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/getModuleTypes.ts b/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/getModuleTypes.ts
index 3e5b2b4e859..a5c8d475339 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/getModuleTypes.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/getModuleTypes.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getModuleTypes" function.
@@ -19,8 +19,8 @@ export type GetModuleTypesParams = {
 export const FN_SELECTOR = "0xc5dcd896" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "moduleAddress",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isErc20CurrencyRegistered.ts b/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isErc20CurrencyRegistered.ts
index 65cd261d708..54b6845605c 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isErc20CurrencyRegistered.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isErc20CurrencyRegistered.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isErc20CurrencyRegistered" function.
@@ -19,8 +19,8 @@ export type IsErc20CurrencyRegisteredParams = {
 export const FN_SELECTOR = "0xf21b24d7" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "currencyAddress",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isModuleRegistered.ts b/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isModuleRegistered.ts
index 0676878e575..8fa808d018d 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isModuleRegistered.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isModuleRegistered.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isModuleRegistered" function.
@@ -19,8 +19,8 @@ export type IsModuleRegisteredParams = {
 export const FN_SELECTOR = "0x1c5ebe2f" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "moduleAddress",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isModuleRegisteredAs.ts b/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isModuleRegisteredAs.ts
index 6c94f98c632..82708a7fd9e 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isModuleRegisteredAs.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/ModuleRegistry/read/isModuleRegisteredAs.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isModuleRegisteredAs" function.
@@ -23,12 +23,12 @@ export type IsModuleRegisteredAsParams = {
 export const FN_SELECTOR = "0xc2b62fdd" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "moduleAddress",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "moduleType",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/getDefaultHandle.ts b/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/getDefaultHandle.ts
index c7a8d1aaa1b..9b4eb1a45de 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/getDefaultHandle.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/getDefaultHandle.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getDefaultHandle" function.
@@ -19,8 +19,8 @@ export type GetDefaultHandleParams = {
 export const FN_SELECTOR = "0xe524488d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "profileId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/nonces.ts b/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/nonces.ts
index 2137f95a805..d208bdb8586 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/nonces.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/nonces.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "nonces" function.
@@ -16,14 +16,14 @@ export type NoncesParams = {
 export const FN_SELECTOR = "0x7ecebe00" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "nonce",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/resolve.ts b/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/resolve.ts
index 3c9809bd374..a3169c977c5 100644
--- a/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/resolve.ts
+++ b/packages/thirdweb/src/extensions/lens/__generated__/TokenHandleRegistry/read/resolve.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "resolve" function.
@@ -16,8 +16,8 @@ export type ResolveParams = {
 export const FN_SELECTOR = "0x4f896d4f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "handleId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/lens/read/getFullProfile.test.ts b/packages/thirdweb/src/extensions/lens/read/getFullProfile.test.ts
index 26cf971086a..26d23f23129 100644
--- a/packages/thirdweb/src/extensions/lens/read/getFullProfile.test.ts
+++ b/packages/thirdweb/src/extensions/lens/read/getFullProfile.test.ts
@@ -13,7 +13,7 @@ const client = TEST_CLIENT;
 
 describe.runIf(process.env.TW_SECRET_KEY)("lens/getFullProfile", () => {
   it("should return a full profile with handle and (maybe) profile metadata", async () => {
-    const profile = await getFullProfile({ profileId, client });
+    const profile = await getFullProfile({ client, profileId });
 
     // Although there is a profile, the metadata of that profile might still be "null"
     // if user hasn't set up any metadata like avatar, coverPicture, name, bio etc.
@@ -25,15 +25,15 @@ describe.runIf(process.env.TW_SECRET_KEY)("lens/getFullProfile", () => {
   it("should return null for invalid profileId", async () => {
     // As of Jul 2024 Lens has about 465k profiles | So trying to get profile of a max-unit256 profileId should return "null"
     // gotta be a very long before this number is reached so we should be safe
-    const profile = await getFullProfile({ profileId: MAX_UINT256, client });
+    const profile = await getFullProfile({ client, profileId: MAX_UINT256 });
     expect(profile === null).toBe(true);
   });
 
   it("should return joinDate", async () => {
     const profile = await getFullProfile({
-      profileId,
       client,
       includeJoinDate: true,
+      profileId,
     });
     expect(typeof profile?.joinDate).toBe("bigint");
   });
diff --git a/packages/thirdweb/src/extensions/lens/read/getFullProfile.ts b/packages/thirdweb/src/extensions/lens/read/getFullProfile.ts
index 76164069be2..c2b5d714751 100644
--- a/packages/thirdweb/src/extensions/lens/read/getFullProfile.ts
+++ b/packages/thirdweb/src/extensions/lens/read/getFullProfile.ts
@@ -98,7 +98,7 @@ export async function getFullProfile(
     import("../__generated__/LensHandle/read/getHandle.js"),
     import("../__generated__/LensHub/read/mintTimestampOf.js"),
     profile?.metadataURI
-      ? (await download({ uri: profile.metadataURI, client })).json()
+      ? (await download({ client, uri: profile.metadataURI })).json()
       : null,
   ]);
 
@@ -115,9 +115,9 @@ export async function getFullProfile(
   ]);
 
   const result: FullProfileResponse = {
-    profileData,
     handle,
     joinDate,
+    profileData,
   };
 
   return result;
diff --git a/packages/thirdweb/src/extensions/lens/read/getHandleFromProfileId.test.ts b/packages/thirdweb/src/extensions/lens/read/getHandleFromProfileId.test.ts
index 12419cd8ac3..227738d51ac 100644
--- a/packages/thirdweb/src/extensions/lens/read/getHandleFromProfileId.test.ts
+++ b/packages/thirdweb/src/extensions/lens/read/getHandleFromProfileId.test.ts
@@ -15,7 +15,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
   "lens/getHandleFromProfileId should return a handle for a valid profileId",
   () => {
     it("should return a string in this format: lens/@<handle>", async () => {
-      const handle = await getHandleFromProfileId({ profileId, client });
+      const handle = await getHandleFromProfileId({ client, profileId });
       expect(typeof handle).toBe("string");
       // @ts-ignore expected
       expect(handle.startsWith("lens/")).toBe(true);
@@ -25,21 +25,21 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       // As of Jul 2024 Lens has about 465k profiles | So trying to get handle of a max-unit256 profileId should return "null"
       // gotta be a very long before this number is reached so we should be safe
       const handle = await getHandleFromProfileId({
-        profileId: MAX_UINT256,
         client,
+        profileId: MAX_UINT256,
       });
       expect(handle).toBe(null);
     });
 
     it("should work with overrides", async () => {
       const handle = await getHandleFromProfileId({
-        profileId,
         client,
         overrides: {
           lensHandleAddress: "0xe7E7EaD361f3AaCD73A61A9bD6C10cA17F38E945",
           tokenHandleRegistryAddress:
             "0xD4F2F33680FCCb36748FA9831851643781608844",
         },
+        profileId,
       });
       // @ts-ignore expected
       expect(handle.startsWith("lens/")).toBe(true);
diff --git a/packages/thirdweb/src/extensions/lens/read/getProfileMetadata.test.ts b/packages/thirdweb/src/extensions/lens/read/getProfileMetadata.test.ts
index 6aaf0e12b15..6f315f602bc 100644
--- a/packages/thirdweb/src/extensions/lens/read/getProfileMetadata.test.ts
+++ b/packages/thirdweb/src/extensions/lens/read/getProfileMetadata.test.ts
@@ -13,7 +13,7 @@ const client = TEST_CLIENT;
 
 describe("lens/getProfileMetadata", () => {
   it("should return a profile object or null for valid profileId", async () => {
-    const profile = await getProfileMetadata({ profileId, client });
+    const profile = await getProfileMetadata({ client, profileId });
 
     // Although there is a profile, the metadata of that profile might still be "missing"
     // if user hasn't set up any metadata like avatar, coverPicture, name, bio etc.
@@ -24,19 +24,19 @@ describe("lens/getProfileMetadata", () => {
     // As of Jul 2024 Lens has about 465k profiles | So trying to get profile of a max-unit256 profileId should return nothing
     // gotta be a very long before this number is reached so we should be safe
     const profile = await getProfileMetadata({
-      profileId: MAX_UINT256,
       client,
+      profileId: MAX_UINT256,
     });
     expect(profile === null).toBe(true);
   });
 
   it("should work with overrides", async () => {
     const profile = await getProfileMetadata({
-      profileId,
       client,
       overrides: {
         lensHubAddress: "0xDb46d1Dc155634FbC732f92E853b10B288AD5a1d",
       },
+      profileId,
     });
     expect(typeof profile).toBe("object");
   });
diff --git a/packages/thirdweb/src/extensions/lens/read/getProfileMetadata.ts b/packages/thirdweb/src/extensions/lens/read/getProfileMetadata.ts
index f9398abc9d1..01f8f0e5958 100644
--- a/packages/thirdweb/src/extensions/lens/read/getProfileMetadata.ts
+++ b/packages/thirdweb/src/extensions/lens/read/getProfileMetadata.ts
@@ -64,8 +64,8 @@ export async function getProfileMetadata(
   }
   const { download } = await import("../../../storage/download.js");
   const res = await download({
-    uri: profile.metadataURI,
     client,
+    uri: profile.metadataURI,
   });
   const profileData = ((await res.json()) as LensProfileSchema) || null;
   return profileData;
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/BuyerApprovedForListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/BuyerApprovedForListing.ts
index 3bfc6a92603..50ae329f61e 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/BuyerApprovedForListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/BuyerApprovedForListing.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "BuyerApprovedForListing" event.
@@ -42,8 +42,8 @@ export function buyerApprovedForListingEvent(
   filters: BuyerApprovedForListingEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event BuyerApprovedForListing(uint256 indexed listingId, address indexed buyer, bool approved)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/CancelledListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/CancelledListing.ts
index 46d14a1b078..754fc8b8bec 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/CancelledListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/CancelledListing.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "CancelledListing" event.
@@ -42,8 +42,8 @@ export function cancelledListingEvent(
   filters: CancelledListingEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event CancelledListing(address indexed listingCreator, uint256 indexed listingId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/CurrencyApprovedForListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/CurrencyApprovedForListing.ts
index 127a498ddaf..dbafa7ec768 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/CurrencyApprovedForListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/CurrencyApprovedForListing.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "CurrencyApprovedForListing" event.
@@ -42,8 +42,8 @@ export function currencyApprovedForListingEvent(
   filters: CurrencyApprovedForListingEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event CurrencyApprovedForListing(uint256 indexed listingId, address indexed currency, uint256 pricePerToken)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/NewListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/NewListing.ts
index 23f46addfec..f9739d155ee 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/NewListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/NewListing.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "NewListing" event.
@@ -46,8 +46,8 @@ export type NewListingEventFilters = Partial<{
  */
 export function newListingEvent(filters: NewListingEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event NewListing(address indexed listingCreator, uint256 indexed listingId, address indexed assetContract, (uint256 listingId, uint256 tokenId, uint256 quantity, uint256 pricePerToken, uint128 startTimestamp, uint128 endTimestamp, address listingCreator, address assetContract, address currency, uint8 tokenType, uint8 status, bool reserved) listing)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/NewSale.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/NewSale.ts
index 4ea1ff93b92..012105533c8 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/NewSale.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/NewSale.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "NewSale" event.
@@ -46,8 +46,8 @@ export type NewSaleEventFilters = Partial<{
  */
 export function newSaleEvent(filters: NewSaleEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event NewSale(address indexed listingCreator, uint256 indexed listingId, address indexed assetContract, uint256 tokenId, address buyer, uint256 quantityBought, uint256 totalPricePaid)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/UpdatedListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/UpdatedListing.ts
index f33e4de028d..277774c796e 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/UpdatedListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/events/UpdatedListing.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "UpdatedListing" event.
@@ -46,8 +46,8 @@ export type UpdatedListingEventFilters = Partial<{
  */
 export function updatedListingEvent(filters: UpdatedListingEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event UpdatedListing(address indexed listingCreator, uint256 indexed listingId, address indexed assetContract, (uint256 listingId, uint256 tokenId, uint256 quantity, uint256 pricePerToken, uint128 startTimestamp, uint128 endTimestamp, address listingCreator, address assetContract, address currency, uint8 tokenType, uint8 status, bool reserved) listing)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/currencyPriceForListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/currencyPriceForListing.ts
index e4db3be77d7..ee737722047 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/currencyPriceForListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/currencyPriceForListing.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "currencyPriceForListing" function.
@@ -20,12 +20,12 @@ export type CurrencyPriceForListingParams = {
 export const FN_SELECTOR = "0xfb14079d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getAllListings.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getAllListings.ts
index 734378136b7..86a7393c146 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getAllListings.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getAllListings.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAllListings" function.
@@ -17,68 +17,68 @@ export type GetAllListingsParams = {
 export const FN_SELECTOR = "0xc5275fb0" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_startId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_endId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "listings",
     components: [
       {
-        type: "uint256",
         name: "listingId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "startTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "endTimestamp",
+        type: "uint128",
       },
       {
-        type: "address",
         name: "listingCreator",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
       {
-        type: "bool",
         name: "reserved",
+        type: "bool",
       },
     ],
+    name: "listings",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getAllValidListings.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getAllValidListings.ts
index 2b829550285..922ad75762b 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getAllValidListings.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getAllValidListings.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAllValidListings" function.
@@ -17,68 +17,68 @@ export type GetAllValidListingsParams = {
 export const FN_SELECTOR = "0x31654b4d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_startId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_endId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "listings",
     components: [
       {
-        type: "uint256",
         name: "listingId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "startTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "endTimestamp",
+        type: "uint128",
       },
       {
-        type: "address",
         name: "listingCreator",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
       {
-        type: "bool",
         name: "reserved",
+        type: "bool",
       },
     ],
+    name: "listings",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getListing.ts
index 3002d389ef2..b40e9af13c2 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/getListing.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getListing" function.
@@ -19,64 +19,64 @@ export type GetListingParams = {
 export const FN_SELECTOR = "0x107a274a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "listing",
     components: [
       {
-        type: "uint256",
         name: "listingId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "startTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "endTimestamp",
+        type: "uint128",
       },
       {
-        type: "address",
         name: "listingCreator",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
       {
-        type: "bool",
         name: "reserved",
+        type: "bool",
       },
     ],
+    name: "listing",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/isBuyerApprovedForListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/isBuyerApprovedForListing.ts
index 9bcfe71cbf1..c3dac315fb9 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/isBuyerApprovedForListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/isBuyerApprovedForListing.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isBuyerApprovedForListing" function.
@@ -20,12 +20,12 @@ export type IsBuyerApprovedForListingParams = {
 export const FN_SELECTOR = "0x9cfbe2a6" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_buyer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/isCurrencyApprovedForListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/isCurrencyApprovedForListing.ts
index 6351c37f548..67e44c1c426 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/isCurrencyApprovedForListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/isCurrencyApprovedForListing.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isCurrencyApprovedForListing" function.
@@ -20,12 +20,12 @@ export type IsCurrencyApprovedForListingParams = {
 export const FN_SELECTOR = "0xa8519047" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/totalListings.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/totalListings.ts
index b8d0b72e56a..742169f4f44 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/totalListings.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/read/totalListings.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xc78b616c" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/approveBuyerForListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/approveBuyerForListing.ts
index be8ce99cf58..e0db3ba1e41 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/approveBuyerForListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/approveBuyerForListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "approveBuyerForListing" function.
@@ -23,16 +23,16 @@ export type ApproveBuyerForListingParams = WithOverrides<{
 export const FN_SELECTOR = "0x48dd77df" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_buyer",
+    type: "address",
   },
   {
-    type: "bool",
     name: "_toApprove",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,8 +146,19 @@ export function approveBuyerForListing(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -157,16 +168,5 @@ export function approveBuyerForListing(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/approveCurrencyForListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/approveCurrencyForListing.ts
index ca45650bb17..1d6b7c5d0a8 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/approveCurrencyForListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/approveCurrencyForListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "approveCurrencyForListing" function.
@@ -26,16 +26,16 @@ export type ApproveCurrencyForListingParams = WithOverrides<{
 export const FN_SELECTOR = "0xea8f9a3c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_pricePerTokenInCurrency",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -149,8 +149,19 @@ export function approveCurrencyForListing(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -160,16 +171,5 @@ export function approveCurrencyForListing(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/buyFromListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/buyFromListing.ts
index d695f899c51..0b5e66a8d5e 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/buyFromListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/buyFromListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "buyFromListing" function.
@@ -28,24 +28,24 @@ export type BuyFromListingParams = WithOverrides<{
 export const FN_SELECTOR = "0x704232dc" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_buyFor",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_expectedTotalPrice",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -161,8 +161,19 @@ export function buyFromListing(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -174,16 +185,5 @@ export function buyFromListing(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/cancelListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/cancelListing.ts
index 504776da5b0..0f6d9036dac 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/cancelListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/cancelListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "cancelListing" function.
@@ -21,8 +21,8 @@ export type CancelListingParams = WithOverrides<{
 export const FN_SELECTOR = "0x305a67a8" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function cancelListing(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.listingId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.listingId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/createListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/createListing.ts
index 49303739da5..71b1d602dbb 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/createListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/createListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createListing" function.
@@ -31,48 +31,48 @@ export type CreateListingParams = WithOverrides<{
 export const FN_SELECTOR = "0x746415b5" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_params",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "startTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "endTimestamp",
+        type: "uint128",
       },
       {
-        type: "bool",
         name: "reserved",
+        type: "bool",
       },
     ],
+    name: "_params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "listingId",
+    type: "uint256",
   },
 ] as const;
 
@@ -169,23 +169,23 @@ export function createListing(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/updateListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/updateListing.ts
index e484d216997..e8e9b0db944 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/updateListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IDirectListings/write/updateListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "updateListing" function.
@@ -35,46 +35,46 @@ export type UpdateListingParams = WithOverrides<{
 export const FN_SELECTOR = "0x07b67758" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "_params",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "pricePerToken",
+        type: "uint256",
       },
       {
-        type: "uint128",
         name: "startTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "endTimestamp",
+        type: "uint128",
       },
       {
-        type: "bool",
         name: "reserved",
+        type: "bool",
       },
     ],
+    name: "_params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -175,23 +175,23 @@ export function updateListing(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.listingId, resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.listingId, resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/AuctionClosed.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/AuctionClosed.ts
index b15d763c5af..d0ff9814ed0 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/AuctionClosed.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/AuctionClosed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AuctionClosed" event.
@@ -46,8 +46,8 @@ export type AuctionClosedEventFilters = Partial<{
  */
 export function auctionClosedEvent(filters: AuctionClosedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event AuctionClosed(uint256 indexed auctionId, address indexed assetContract, address indexed closer, uint256 tokenId, address auctionCreator, address winningBidder)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/CancelledAuction.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/CancelledAuction.ts
index 930e0f2aa44..07175dd29db 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/CancelledAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/CancelledAuction.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "CancelledAuction" event.
@@ -42,8 +42,8 @@ export function cancelledAuctionEvent(
   filters: CancelledAuctionEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event CancelledAuction(address indexed auctionCreator, uint256 indexed auctionId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/NewAuction.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/NewAuction.ts
index dd69261100a..dce5bdedf9c 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/NewAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/NewAuction.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "NewAuction" event.
@@ -46,8 +46,8 @@ export type NewAuctionEventFilters = Partial<{
  */
 export function newAuctionEvent(filters: NewAuctionEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event NewAuction(address indexed auctionCreator, uint256 indexed auctionId, address indexed assetContract, (uint256 auctionId, uint256 tokenId, uint256 quantity, uint256 minimumBidAmount, uint256 buyoutBidAmount, uint64 timeBufferInSeconds, uint64 bidBufferBps, uint64 startTimestamp, uint64 endTimestamp, address auctionCreator, address assetContract, address currency, uint8 tokenType, uint8 status) auction)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/NewBid.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/NewBid.ts
index 27f25f28508..1fa747408d2 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/NewBid.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/events/NewBid.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "NewBid" event.
@@ -46,8 +46,8 @@ export type NewBidEventFilters = Partial<{
  */
 export function newBidEvent(filters: NewBidEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event NewBid(uint256 indexed auctionId, address indexed bidder, address indexed assetContract, uint256 bidAmount, (uint256 auctionId, uint256 tokenId, uint256 quantity, uint256 minimumBidAmount, uint256 buyoutBidAmount, uint64 timeBufferInSeconds, uint64 bidBufferBps, uint64 startTimestamp, uint64 endTimestamp, address auctionCreator, address assetContract, address currency, uint8 tokenType, uint8 status) auction)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAllAuctions.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAllAuctions.ts
index dd88bdc4fbb..f69f3a5af5a 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAllAuctions.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAllAuctions.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAllAuctions" function.
@@ -17,76 +17,76 @@ export type GetAllAuctionsParams = {
 export const FN_SELECTOR = "0xc291537c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_startId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_endId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "auctions",
     components: [
       {
-        type: "uint256",
         name: "auctionId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "minimumBidAmount",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "buyoutBidAmount",
+        type: "uint256",
       },
       {
-        type: "uint64",
         name: "timeBufferInSeconds",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "bidBufferBps",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "startTimestamp",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "endTimestamp",
+        type: "uint64",
       },
       {
-        type: "address",
         name: "auctionCreator",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
     ],
+    name: "auctions",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAllValidAuctions.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAllValidAuctions.ts
index 77c5116f129..6eb0f5938da 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAllValidAuctions.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAllValidAuctions.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAllValidAuctions" function.
@@ -17,76 +17,76 @@ export type GetAllValidAuctionsParams = {
 export const FN_SELECTOR = "0x7b063801" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_startId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_endId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "auctions",
     components: [
       {
-        type: "uint256",
         name: "auctionId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "minimumBidAmount",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "buyoutBidAmount",
+        type: "uint256",
       },
       {
-        type: "uint64",
         name: "timeBufferInSeconds",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "bidBufferBps",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "startTimestamp",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "endTimestamp",
+        type: "uint64",
       },
       {
-        type: "address",
         name: "auctionCreator",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
     ],
+    name: "auctions",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAuction.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAuction.ts
index 036617fbd7b..08ed92b3e27 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getAuction.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAuction" function.
@@ -19,72 +19,72 @@ export type GetAuctionParams = {
 export const FN_SELECTOR = "0x78bd7935" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_auctionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "auction",
     components: [
       {
-        type: "uint256",
         name: "auctionId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "minimumBidAmount",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "buyoutBidAmount",
+        type: "uint256",
       },
       {
-        type: "uint64",
         name: "timeBufferInSeconds",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "bidBufferBps",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "startTimestamp",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "endTimestamp",
+        type: "uint64",
       },
       {
-        type: "address",
         name: "auctionCreator",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
     ],
+    name: "auction",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getWinningBid.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getWinningBid.ts
index 9546e3db173..8a933346840 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getWinningBid.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/getWinningBid.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getWinningBid" function.
@@ -19,22 +19,22 @@ export type GetWinningBidParams = {
 export const FN_SELECTOR = "0x6891939d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_auctionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "bidder",
+    type: "address",
   },
   {
-    type: "address",
     name: "currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "bidAmount",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/isAuctionExpired.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/isAuctionExpired.ts
index 11c8eab2430..d90f1b5c0ed 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/isAuctionExpired.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/isAuctionExpired.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isAuctionExpired" function.
@@ -19,8 +19,8 @@ export type IsAuctionExpiredParams = {
 export const FN_SELECTOR = "0x1389b117" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_auctionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/isNewWinningBid.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/isNewWinningBid.ts
index aea27839d1d..7885c7c450e 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/isNewWinningBid.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/isNewWinningBid.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isNewWinningBid" function.
@@ -23,12 +23,12 @@ export type IsNewWinningBidParams = {
 export const FN_SELECTOR = "0x2eb566bd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_auctionId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_bidAmount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/totalAuctions.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/totalAuctions.ts
index 0610fda8156..6a9174b4a20 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/totalAuctions.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/read/totalAuctions.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x16002f4a" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/bidInAuction.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/bidInAuction.ts
index 942bb17d0c2..d571dfda0f6 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/bidInAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/bidInAuction.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "bidInAuction" function.
@@ -25,12 +25,12 @@ export type BidInAuctionParams = WithOverrides<{
 export const FN_SELECTOR = "0x0858e5ad" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_auctionId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_bidAmount",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -131,23 +131,23 @@ export function bidInAuction(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.auctionId, resolvedOptions.bidAmount] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.auctionId, resolvedOptions.bidAmount] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/cancelAuction.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/cancelAuction.ts
index 846aded52d0..9c30227fc67 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/cancelAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/cancelAuction.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "cancelAuction" function.
@@ -21,8 +21,8 @@ export type CancelAuctionParams = WithOverrides<{
 export const FN_SELECTOR = "0x96b5a755" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_auctionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function cancelAuction(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.auctionId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.auctionId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionPayout.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionPayout.ts
index 8004652acac..b6dbe57b1f9 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionPayout.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionPayout.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "collectAuctionPayout" function.
@@ -21,8 +21,8 @@ export type CollectAuctionPayoutParams = WithOverrides<{
 export const FN_SELECTOR = "0xebf05a62" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_auctionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -124,23 +124,23 @@ export function collectAuctionPayout(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.auctionId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.auctionId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionTokens.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionTokens.ts
index 864aab2e45f..de394d93a4c 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionTokens.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/collectAuctionTokens.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "collectAuctionTokens" function.
@@ -21,8 +21,8 @@ export type CollectAuctionTokensParams = WithOverrides<{
 export const FN_SELECTOR = "0x03a54fe0" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_auctionId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -124,23 +124,23 @@ export function collectAuctionTokens(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.auctionId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.auctionId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/createAuction.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/createAuction.ts
index e48106af277..0e10c08fbd0 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/createAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IEnglishAuctions/write/createAuction.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createAuction" function.
@@ -33,56 +33,56 @@ export type CreateAuctionParams = WithOverrides<{
 export const FN_SELECTOR = "0x16654d40" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_params",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "minimumBidAmount",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "buyoutBidAmount",
+        type: "uint256",
       },
       {
-        type: "uint64",
         name: "timeBufferInSeconds",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "bidBufferBps",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "startTimestamp",
+        type: "uint64",
       },
       {
-        type: "uint64",
         name: "endTimestamp",
+        type: "uint64",
       },
     ],
+    name: "_params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "auctionId",
+    type: "uint256",
   },
 ] as const;
 
@@ -179,23 +179,23 @@ export function createAuction(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/AuctionClosed.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/AuctionClosed.ts
index 37e97c246e0..193ef08a9c8 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/AuctionClosed.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/AuctionClosed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AuctionClosed" event.
@@ -46,8 +46,8 @@ export type AuctionClosedEventFilters = Partial<{
  */
 export function auctionClosedEvent(filters: AuctionClosedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event AuctionClosed(uint256 indexed listingId, address indexed closer, bool indexed cancelled, address auctionCreator, address winningBidder)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingAdded.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingAdded.ts
index 7fe12ca837f..3d715351f07 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingAdded.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingAdded.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ListingAdded" event.
@@ -46,8 +46,8 @@ export type ListingAddedEventFilters = Partial<{
  */
 export function listingAddedEvent(filters: ListingAddedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event ListingAdded(uint256 indexed listingId, address indexed assetContract, address indexed lister, (uint256 listingId, address tokenOwner, address assetContract, uint256 tokenId, uint256 startTime, uint256 endTime, uint256 quantity, address currency, uint256 reservePricePerToken, uint256 buyoutPricePerToken, uint8 tokenType, uint8 listingType) listing)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingRemoved.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingRemoved.ts
index 2233c856fc7..7a765b236c1 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingRemoved.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingRemoved.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ListingRemoved" event.
@@ -40,8 +40,8 @@ export type ListingRemovedEventFilters = Partial<{
  */
 export function listingRemovedEvent(filters: ListingRemovedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event ListingRemoved(uint256 indexed listingId, address indexed listingCreator)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingUpdated.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingUpdated.ts
index 5a9f20825a0..531eba5ddf4 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingUpdated.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/ListingUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ListingUpdated" event.
@@ -40,8 +40,8 @@ export type ListingUpdatedEventFilters = Partial<{
  */
 export function listingUpdatedEvent(filters: ListingUpdatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event ListingUpdated(uint256 indexed listingId, address indexed listingCreator)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/NewOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/NewOffer.ts
index b033e92129f..4b1606b5789 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/NewOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/NewOffer.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "NewOffer" event.
@@ -46,8 +46,8 @@ export type NewOfferEventFilters = Partial<{
  */
 export function newOfferEvent(filters: NewOfferEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event NewOffer(uint256 indexed listingId, address indexed offeror, uint8 indexed listingType, uint256 quantityWanted, uint256 totalOfferAmount, address currency)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/NewSale.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/NewSale.ts
index c5d506f7736..893e02000fc 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/NewSale.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/NewSale.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "NewSale" event.
@@ -46,8 +46,8 @@ export type NewSaleEventFilters = Partial<{
  */
 export function newSaleEvent(filters: NewSaleEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event NewSale(uint256 indexed listingId, address indexed assetContract, address indexed lister, address buyer, uint256 quantityBought, uint256 totalPricePaid)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/PlatformFeeInfoUpdated.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/PlatformFeeInfoUpdated.ts
index ec779ad8e7d..4e91f71b9d2 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/PlatformFeeInfoUpdated.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/events/PlatformFeeInfoUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PlatformFeeInfoUpdated" event.
@@ -36,8 +36,8 @@ export function platformFeeInfoUpdatedEvent(
   filters: PlatformFeeInfoUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event PlatformFeeInfoUpdated(address indexed platformFeeRecipient, uint256 platformFeeBps)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractType.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractType.ts
index 75061f26982..1cf532447a5 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractType.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractType.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcb2ef6f7" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractURI.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractURI.ts
index ca512450a4f..63421151241 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractURI.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractURI.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe8a3d485" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractVersion.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractVersion.ts
index cd44865ea62..3b2d58a96e6 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractVersion.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/contractVersion.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa0a8e460" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/getPlatformFeeInfo.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/getPlatformFeeInfo.ts
index a7f71ea7315..acfdf87abf0 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/getPlatformFeeInfo.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/read/getPlatformFeeInfo.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xd45573f6" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/acceptOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/acceptOffer.ts
index 387aed05883..49183fe3c78 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/acceptOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/acceptOffer.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "acceptOffer" function.
@@ -27,20 +27,20 @@ export type AcceptOfferParams = WithOverrides<{
 export const FN_SELECTOR = "0xb13c0e63" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_offeror",
+    type: "address",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_totalPrice",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -152,8 +152,19 @@ export function acceptOffer(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -164,16 +175,5 @@ export function acceptOffer(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/buy.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/buy.ts
index 97a608d0a86..027f141225b 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/buy.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/buy.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "buy" function.
@@ -28,24 +28,24 @@ export type BuyParams = WithOverrides<{
 export const FN_SELECTOR = "0x7687ab02" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_buyFor",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_quantity",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_totalPrice",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -159,8 +159,19 @@ export function buy(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -172,16 +183,5 @@ export function buy(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/cancelDirectListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/cancelDirectListing.ts
index 16205373cf0..0257eb65715 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/cancelDirectListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/cancelDirectListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "cancelDirectListing" function.
@@ -21,8 +21,8 @@ export type CancelDirectListingParams = WithOverrides<{
 export const FN_SELECTOR = "0x7506c84a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -122,23 +122,23 @@ export function cancelDirectListing(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.listingId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.listingId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/closeAuction.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/closeAuction.ts
index f44a7290903..ec6f0d8de8b 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/closeAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/closeAuction.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "closeAuction" function.
@@ -22,12 +22,12 @@ export type CloseAuctionParams = WithOverrides<{
 export const FN_SELECTOR = "0x6bab66ae" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_closeFor",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -128,23 +128,23 @@ export function closeAuction(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.listingId, resolvedOptions.closeFor] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.listingId, resolvedOptions.closeFor] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/createListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/createListing.ts
index a117cfa8e94..1890f378f7f 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/createListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/createListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createListing" function.
@@ -32,46 +32,46 @@ export type CreateListingParams = WithOverrides<{
 export const FN_SELECTOR = "0x296f4e16" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_params",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "startTime",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "secondsUntilEndTime",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantityToList",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currencyToAccept",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "reservePricePerToken",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "buyoutPricePerToken",
+        type: "uint256",
       },
       {
-        type: "uint8",
         name: "listingType",
+        type: "uint8",
       },
     ],
+    name: "_params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -169,23 +169,23 @@ export function createListing(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/offer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/offer.ts
index f4e8ccdcf4f..8c95eb6ab63 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/offer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/offer.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "offer" function.
@@ -34,24 +34,24 @@ export type OfferParams = WithOverrides<{
 export const FN_SELECTOR = "0x5fef45e7" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_quantityWanted",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currency",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_pricePerToken",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_expirationTimestamp",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -165,8 +165,19 @@ export function offer(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -178,16 +189,5 @@ export function offer(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/setContractURI.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/setContractURI.ts
index 8c2125dcf6f..a7d8b046f46 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/setContractURI.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/setContractURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setContractURI" function.
@@ -18,8 +18,8 @@ export type SetContractURIParams = WithOverrides<{
 export const FN_SELECTOR = "0x938e3d7b" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function setContractURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/setPlatformFeeInfo.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/setPlatformFeeInfo.ts
index f65d00c8a21..93dadff3486 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/setPlatformFeeInfo.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/setPlatformFeeInfo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setPlatformFeeInfo" function.
@@ -25,12 +25,12 @@ export type SetPlatformFeeInfoParams = WithOverrides<{
 export const FN_SELECTOR = "0x1e7ac488" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_platformFeeBps",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -136,8 +136,19 @@ export function setPlatformFeeInfo(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function setPlatformFeeInfo(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/updateListing.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/updateListing.ts
index cf7822145e7..6951adfe72f 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/updateListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IMarketplace/write/updateListing.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "updateListing" function.
@@ -45,32 +45,32 @@ export type UpdateListingParams = WithOverrides<{
 export const FN_SELECTOR = "0xc4b5b15f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_listingId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_quantityToList",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_reservePricePerToken",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_buyoutPricePerToken",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_currencyToAccept",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_startTime",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_secondsUntilEndTime",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -194,8 +194,19 @@ export function updateListing(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -209,16 +220,5 @@ export function updateListing(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/AcceptedOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/AcceptedOffer.ts
index 611ab797190..36db9ddb0a1 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/AcceptedOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/AcceptedOffer.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "AcceptedOffer" event.
@@ -46,8 +46,8 @@ export type AcceptedOfferEventFilters = Partial<{
  */
 export function acceptedOfferEvent(filters: AcceptedOfferEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event AcceptedOffer(address indexed offeror, uint256 indexed offerId, address indexed assetContract, uint256 tokenId, address seller, uint256 quantityBought, uint256 totalPricePaid)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/CancelledOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/CancelledOffer.ts
index 44708d6932b..052ab0867b1 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/CancelledOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/CancelledOffer.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "CancelledOffer" event.
@@ -40,8 +40,8 @@ export type CancelledOfferEventFilters = Partial<{
  */
 export function cancelledOfferEvent(filters: CancelledOfferEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event CancelledOffer(address indexed offeror, uint256 indexed offerId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/NewOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/NewOffer.ts
index 839757be049..3ec6d81ed9b 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/NewOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/events/NewOffer.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "NewOffer" event.
@@ -46,8 +46,8 @@ export type NewOfferEventFilters = Partial<{
  */
 export function newOfferEvent(filters: NewOfferEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event NewOffer(address indexed offeror, uint256 indexed offerId, address indexed assetContract, (uint256 offerId, uint256 tokenId, uint256 quantity, uint256 totalPrice, uint256 expirationTimestamp, address offeror, address assetContract, address currency, uint8 tokenType, uint8 status) offer)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getAllOffers.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getAllOffers.ts
index 9d96cf8d183..de44cd07ef4 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getAllOffers.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getAllOffers.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAllOffers" function.
@@ -17,60 +17,60 @@ export type GetAllOffersParams = {
 export const FN_SELECTOR = "0xc1edcfbe" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_startId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_endId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "offers",
     components: [
       {
-        type: "uint256",
         name: "offerId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalPrice",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "expirationTimestamp",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "offeror",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
     ],
+    name: "offers",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getAllValidOffers.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getAllValidOffers.ts
index d3b4a4df5cd..ef901d30f17 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getAllValidOffers.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getAllValidOffers.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAllValidOffers" function.
@@ -17,60 +17,60 @@ export type GetAllValidOffersParams = {
 export const FN_SELECTOR = "0x91940b3e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_startId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_endId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "offers",
     components: [
       {
-        type: "uint256",
         name: "offerId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalPrice",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "expirationTimestamp",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "offeror",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
     ],
+    name: "offers",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getOffer.ts
index 8004b2e251d..97fe560e741 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/getOffer.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getOffer" function.
@@ -16,56 +16,56 @@ export type GetOfferParams = {
 export const FN_SELECTOR = "0x4579268a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_offerId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "offer",
     components: [
       {
-        type: "uint256",
         name: "offerId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalPrice",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "expirationTimestamp",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "offeror",
+        type: "address",
       },
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint8",
         name: "status",
+        type: "uint8",
       },
     ],
+    name: "offer",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/totalOffers.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/totalOffers.ts
index 4de665a1cb5..a9656ff8634 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/totalOffers.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/read/totalOffers.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa9fd8ed1" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/acceptOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/acceptOffer.ts
index a055869c958..ba388eb5203 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/acceptOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/acceptOffer.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "acceptOffer" function.
@@ -18,8 +18,8 @@ export type AcceptOfferParams = WithOverrides<{
 export const FN_SELECTOR = "0xc815729d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_offerId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function acceptOffer(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.offerId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.offerId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/cancelOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/cancelOffer.ts
index 449475eae93..0ad97cd1fce 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/cancelOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/cancelOffer.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "cancelOffer" function.
@@ -18,8 +18,8 @@ export type CancelOfferParams = WithOverrides<{
 export const FN_SELECTOR = "0xef706adf" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_offerId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function cancelOffer(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.offerId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.offerId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/makeOffer.ts b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/makeOffer.ts
index b57181f8d69..7f373c49bac 100644
--- a/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/makeOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/__generated__/IOffers/write/makeOffer.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "makeOffer" function.
@@ -29,40 +29,40 @@ export type MakeOfferParams = WithOverrides<{
 export const FN_SELECTOR = "0x016767fa" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_params",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "quantity",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "totalPrice",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "expirationTimestamp",
+        type: "uint256",
       },
     ],
+    name: "_params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "offerId",
+    type: "uint256",
   },
 ] as const;
 
@@ -159,23 +159,23 @@ export function makeOffer(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/direct-listings/direct-listings.test.ts b/packages/thirdweb/src/extensions/marketplace/direct-listings/direct-listings.test.ts
index 77473b2ef82..d150d1bbb51 100644
--- a/packages/thirdweb/src/extensions/marketplace/direct-listings/direct-listings.test.ts
+++ b/packages/thirdweb/src/extensions/marketplace/direct-listings/direct-listings.test.ts
@@ -8,8 +8,8 @@ import {
   TEST_ACCOUNT_C,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { parseEventLogs } from "../../../event/actions/parse-logs.js";
 import { getApprovalForTransaction } from "../../../extensions/erc20/write/getApprovalForTransaction.js";
@@ -50,29 +50,29 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
       chain,
       client,
       params: {
-        name: "TestMarketPlace",
         contractURI: TEST_CONTRACT_URI,
+        name: "TestMarketPlace",
       },
     });
     const erc721Address = await deployERC721Contract({
-      type: "TokenERC721",
       account: TEST_ACCOUNT_B,
       chain,
       client,
       params: {
-        name: "TestERC721",
         contractURI: TEST_CONTRACT_URI,
+        name: "TestERC721",
       },
+      type: "TokenERC721",
     });
     const erc1155Address = await deployERC1155Contract({
-      type: "TokenERC1155",
       account: TEST_ACCOUNT_C,
       chain,
       client,
       params: {
-        name: "TestERC1155",
         contractURI: TEST_CONTRACT_URI,
+        name: "TestERC1155",
       },
+      type: "TokenERC1155",
     });
 
     marketplaceContract = getContract({
@@ -106,8 +106,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
         transaction: mintToErc1155({
           contract: erc1155Contract,
           nft: { name: "erc1155 #0" },
-          to: TEST_ACCOUNT_C.address,
           supply: 100n,
+          to: TEST_ACCOUNT_C.address,
         }),
       }),
     ]);
@@ -117,16 +117,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
       sendAndConfirmTransaction({
         account: TEST_ACCOUNT_B,
         transaction: setApprovalForAll721({
-          contract: erc721Contract,
           approved: true,
+          contract: erc721Contract,
           operator: marketplaceAddress,
         }),
       }),
       sendAndConfirmTransaction({
         account: TEST_ACCOUNT_C,
         transaction: setApprovalForAll1155({
-          contract: erc1155Contract,
           approved: true,
+          contract: erc1155Contract,
           operator: marketplaceAddress,
         }),
       }),
@@ -147,13 +147,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     expect(totalListingCount).toBe(0n);
 
     const receipt = await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_B,
       transaction: createListing({
-        contract: marketplaceContract,
         assetContractAddress: erc721Contract.address,
-        tokenId: 0n,
+        contract: marketplaceContract,
         pricePerToken: "1",
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_B,
     });
 
     const listingEvents = parseEventLogs({
@@ -210,8 +210,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     expect(firstListing.asset.owner).toBe(null);
     // check the listing is valid
     const firstListingValidity = await isListingValid({
-      listing: firstListing,
       contract: marketplaceContract,
+      listing: firstListing,
       quantity: 1n,
     });
 
@@ -223,13 +223,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     expect(nftBalanceOfAccountABeforePurchase).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: buyFromListing({
         contract: marketplaceContract,
         listingId: listingEvent.args.listingId,
-        recipient: TEST_ACCOUNT_A.address,
         quantity: 1n,
+        recipient: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     const [
@@ -255,14 +255,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     // this should fail because we're listing more than we have
     await expect(
       sendTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: createListing({
-          contract: marketplaceContract,
           assetContractAddress: erc1155Contract.address,
-          tokenId: 0n,
+          contract: marketplaceContract,
           pricePerToken: "1",
           quantity: 101n,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
       [TransactionError: Error - Marketplace: not owner or approved tokens.
@@ -272,14 +272,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     `);
 
     const receipt1155 = await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: createListing({
-        contract: marketplaceContract,
         assetContractAddress: erc1155Contract.address,
-        tokenId: 0n,
+        contract: marketplaceContract,
         pricePerToken: "0.01",
         quantity: 1n,
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     const listingEvents1155 = parseEventLogs({
@@ -296,15 +296,15 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     expect(listingEvent1155.args.assetContract).toBe(erc1155Contract.address);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: updateListing({
-        listingId: listingEvent1155.args.listingId,
-        contract: marketplaceContract,
         assetContractAddress: erc1155Contract.address,
-        tokenId: 0n,
+        contract: marketplaceContract,
+        listingId: listingEvent1155.args.listingId,
         pricePerToken: "0.05",
         quantity: 1n,
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     const [
@@ -349,8 +349,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
 
     // check the listing is valid
     const listingValidity = await isListingValid({
-      listing: secondListing,
       contract: marketplaceContract,
+      listing: secondListing,
       quantity: 1n,
     });
 
@@ -363,13 +363,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     expect(nft1155BalanceOfAccountABeforePurchase).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: buyFromListing({
         contract: marketplaceContract,
         listingId: listingEvent1155.args.listingId,
-        recipient: TEST_ACCOUNT_A.address,
         quantity: 1n,
+        recipient: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     const [
@@ -397,25 +397,25 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
      * so that getApprovalForTransaction can work properly
      */
     const erc20Address = await deployERC20Contract({
+      account: TEST_ACCOUNT_C,
       chain,
       client,
-      account: TEST_ACCOUNT_C,
-      type: "TokenERC20",
       params: {
-        name: "MyToken",
         contractURI: TEST_CONTRACT_URI,
+        name: "MyToken",
       },
+      type: "TokenERC20",
     });
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: createListing({
-        contract: marketplaceContract,
         assetContractAddress: erc1155Contract.address,
-        tokenId: 0n,
+        contract: marketplaceContract,
+        currencyContractAddress: erc20Address,
         pricePerToken: "0.01",
         quantity: 1n,
-        currencyContractAddress: erc20Address,
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_C,
     });
     // get the last listing id
     const _allListings = await getAllListings({
@@ -437,8 +437,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
       tokenAddress: erc20Address,
     });
     const approveTx = await getApprovalForTransaction({
-      transaction: buyListingTx,
       account: TEST_ACCOUNT_A,
+      transaction: buyListingTx,
     });
     expect(approveTx).not.toBe(null);
   }, 120_000);
diff --git a/packages/thirdweb/src/extensions/marketplace/direct-listings/read/getAllListings.ts b/packages/thirdweb/src/extensions/marketplace/direct-listings/read/getAllListings.ts
index 644e86f476c..9a935440a99 100644
--- a/packages/thirdweb/src/extensions/marketplace/direct-listings/read/getAllListings.ts
+++ b/packages/thirdweb/src/extensions/marketplace/direct-listings/read/getAllListings.ts
@@ -56,11 +56,11 @@ export async function getAllListings(
   const [rawListings, latestBlock] = await Promise.all([
     getAllInBatches(
       (startId, endId) =>
-        getAllListingGenerated({ contract: options.contract, startId, endId }),
+        getAllListingGenerated({ contract: options.contract, endId, startId }),
       {
-        start,
         end,
         maxSize: DEFAULT_QUERY_ALL_COUNT,
+        start,
       },
       // flatten the array of arrays
     ).then((listings) => listings.flat()),
diff --git a/packages/thirdweb/src/extensions/marketplace/direct-listings/read/getAllValidListings.ts b/packages/thirdweb/src/extensions/marketplace/direct-listings/read/getAllValidListings.ts
index ebc9d5511ef..dd2f326f039 100644
--- a/packages/thirdweb/src/extensions/marketplace/direct-listings/read/getAllValidListings.ts
+++ b/packages/thirdweb/src/extensions/marketplace/direct-listings/read/getAllValidListings.ts
@@ -58,13 +58,13 @@ export async function getAllValidListings(
       (startId, endId) =>
         getAllValidListingGenerated({
           contract: options.contract,
-          startId,
           endId,
+          startId,
         }),
       {
-        start,
         end,
         maxSize: DEFAULT_QUERY_ALL_COUNT,
+        start,
       },
       // flatten the array of arrays
     ).then((listings) => listings.flat()),
diff --git a/packages/thirdweb/src/extensions/marketplace/direct-listings/read/isBuyerApprovedForListing.ts b/packages/thirdweb/src/extensions/marketplace/direct-listings/read/isBuyerApprovedForListing.ts
index ae2fdc5ba6b..1837e43dab0 100644
--- a/packages/thirdweb/src/extensions/marketplace/direct-listings/read/isBuyerApprovedForListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/direct-listings/read/isBuyerApprovedForListing.ts
@@ -42,8 +42,8 @@ export async function isBuyerApprovedForListing(
       "../../__generated__/IDirectListings/read/isBuyerApprovedForListing.js"
     );
   return await generatedIsBuyerApprovedForListing({
-    contract: options.contract,
     buyer: options.buyer,
+    contract: options.contract,
     listingId: options.listingId,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/direct-listings/utils.ts b/packages/thirdweb/src/extensions/marketplace/direct-listings/utils.ts
index 0a63b83f3e9..9e59a9f7b78 100644
--- a/packages/thirdweb/src/extensions/marketplace/direct-listings/utils.ts
+++ b/packages/thirdweb/src/extensions/marketplace/direct-listings/utils.ts
@@ -20,10 +20,10 @@ export async function mapDirectListing(
   const { latestBlock, rawListing } = options;
   // process the listing
   const status = computeStatus({
-    listingStatus: rawListing.status,
     blockTimeStamp: latestBlock.timestamp,
-    startTimestamp: rawListing.startTimestamp,
     endTimestamp: rawListing.endTimestamp,
+    listingStatus: rawListing.status,
+    startTimestamp: rawListing.startTimestamp,
   });
 
   const currencyContract = getContract({
@@ -45,28 +45,28 @@ export async function mapDirectListing(
   ]);
 
   return {
-    id: rawListing.listingId,
-    creatorAddress: rawListing.listingCreator,
+    asset: nftAsset,
     assetContractAddress: rawListing.assetContract,
-    tokenId: rawListing.tokenId,
-    quantity: rawListing.quantity,
+    creatorAddress: rawListing.listingCreator,
     currencyContractAddress: rawListing.currency,
     currencyValuePerToken: {
       ...currencyValuePerToken,
-      value: rawListing.pricePerToken,
+      chainId: currencyContract.chain.id,
       displayValue: toTokens(
         rawListing.pricePerToken,
         currencyValuePerToken.decimals,
       ),
       tokenAddress: currencyContract.address,
-      chainId: currencyContract.chain.id,
+      value: rawListing.pricePerToken,
     },
-    pricePerToken: rawListing.pricePerToken,
-    asset: nftAsset,
-    startTimeInSeconds: rawListing.startTimestamp,
     endTimeInSeconds: rawListing.endTimestamp,
+    id: rawListing.listingId,
     isReservedListing: rawListing.reserved,
+    pricePerToken: rawListing.pricePerToken,
+    quantity: rawListing.quantity,
+    startTimeInSeconds: rawListing.startTimestamp,
     status,
+    tokenId: rawListing.tokenId,
     type: "direct-listing",
   };
 }
@@ -102,9 +102,9 @@ export async function isListingValid(
     const [approvedForAll, approvedOperator, tokenOwner] = await Promise.all([
       isApprovedForAll({
         contract: assetContract,
-        owner: options.listing.creatorAddress,
         // the marketplace contract address has to be approved to transfer the token
         operator: options.contract.address,
+        owner: options.listing.creatorAddress,
       }),
       getApproved({
         contract: assetContract,
@@ -118,14 +118,14 @@ export async function isListingValid(
     // if the marketplace is not approved for all and the marketplace contract is not the approved operator for the token
     // -> the listing is not valid
     if (!approvedForAll && approvedOperator !== options.contract.address) {
-      return { valid: false, reason: "Asset not approved for marketplace." };
+      return { reason: "Asset not approved for marketplace.", valid: false };
     }
     // if the token owner is not the creator of the listing
     // -> the listing is not valid
     if (tokenOwner !== options.listing.creatorAddress) {
       return {
-        valid: false,
         reason: "Listing creator no longer owns this token.",
+        valid: false,
       };
     }
     // otherwise the listing is valid
@@ -143,9 +143,9 @@ export async function isListingValid(
     const [approvedForAll, balance] = await Promise.all([
       isApprovedForAll({
         contract: assetContract,
-        owner: options.listing.creatorAddress,
         // the marketplace contract address has to be approved to transfer the token
         operator: options.contract.address,
+        owner: options.listing.creatorAddress,
       }),
       balanceOf({
         contract: assetContract,
@@ -157,16 +157,16 @@ export async function isListingValid(
     // if the marketplace is not approved for all
     // -> the listing is not valid
     if (!approvedForAll) {
-      return { valid: false, reason: "Asset not approved for marketplace." };
+      return { reason: "Asset not approved for marketplace.", valid: false };
     }
     // if the balance is less than the quantity the user is trying to purchase or the listing quantity
     // -> the listing is not valid
     const quantityWanted = options.quantity || options.listing.quantity;
     if (balance < quantityWanted) {
       return {
-        valid: false,
         reason:
           "Seller does not have enough balance of token to fulfill order.",
+        valid: false,
       };
     }
     return {
@@ -176,7 +176,7 @@ export async function isListingValid(
   // if the asset is neither ERC721 nor ERC1155
 
   return {
-    valid: false,
     reason: "AssetContract must implement ERC 1155 or ERC 721.",
+    valid: false,
   };
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/direct-listings/write/buyFromListing.ts b/packages/thirdweb/src/extensions/marketplace/direct-listings/write/buyFromListing.ts
index 8e3a6b95143..e55dbb43eec 100644
--- a/packages/thirdweb/src/extensions/marketplace/direct-listings/write/buyFromListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/direct-listings/write/buyFromListing.ts
@@ -41,7 +41,6 @@ export function buyFromListing(
   options: BaseTransactionOptions<BuyFromListingParams>,
 ) {
   return BuyFromListing.buyFromListing({
-    contract: options.contract,
     asyncParams: async () => {
       const listing = await GetListing.getListing({
         contract: options.contract,
@@ -58,25 +57,26 @@ export function buyFromListing(
       }
 
       return {
-        listingId: options.listingId,
-        quantity: options.quantity,
         buyFor: options.recipient,
         currency: listing.currencyContractAddress,
         expectedTotalPrice: listing.pricePerToken * options.quantity,
+        listingId: options.listingId,
         overrides: {
-          value: isNativeTokenAddress(listing.currencyContractAddress)
-            ? listing.pricePerToken * options.quantity
-            : 0n,
-          extraGas: 50_000n, // add extra gas to account for router call
           erc20Value: isNativeTokenAddress(listing.currencyContractAddress)
             ? undefined
             : {
                 amountWei: listing.pricePerToken * options.quantity,
                 tokenAddress: listing.currencyContractAddress,
               },
+          extraGas: 50_000n, // add extra gas to account for router call
+          value: isNativeTokenAddress(listing.currencyContractAddress)
+            ? listing.pricePerToken * options.quantity
+            : 0n,
         },
+        quantity: options.quantity,
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/marketplace/direct-listings/write/createListing.ts b/packages/thirdweb/src/extensions/marketplace/direct-listings/write/createListing.ts
index d4c898bc1d5..b83322998df 100644
--- a/packages/thirdweb/src/extensions/marketplace/direct-listings/write/createListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/direct-listings/write/createListing.ts
@@ -1,7 +1,7 @@
 import type { Address } from "abitype";
 import {
-  NATIVE_TOKEN_ADDRESS,
   isNativeTokenAddress,
+  NATIVE_TOKEN_ADDRESS,
 } from "../../../../constants/addresses.js";
 import { getContract } from "../../../../contract/contract.js";
 import { eth_getBlockByNumber } from "../../../../rpc/actions/eth_getBlockByNumber.js";
@@ -89,7 +89,6 @@ export function createListing(
   options: BaseTransactionOptions<CreateListingParams>,
 ) {
   return CreateListing.createListing({
-    contract: options.contract,
     asyncParams: async () => {
       const assetContract = getContract({
         ...options.contract,
@@ -165,21 +164,22 @@ export function createListing(
       }
 
       return {
+        overrides: {
+          extraGas: 50_000n, // add extra gas to account for router call
+        },
         params: {
           assetContract: options.assetContractAddress,
-          tokenId: options.tokenId,
           currency: options.currencyContractAddress ?? NATIVE_TOKEN_ADDRESS,
-          quantity,
-          pricePerToken,
-          startTimestamp,
           endTimestamp,
+          pricePerToken,
+          quantity,
           reserved: options.isReservedListing ?? false,
-        },
-        overrides: {
-          extraGas: 50_000n, // add extra gas to account for router call
+          startTimestamp,
+          tokenId: options.tokenId,
         },
       } as const;
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/marketplace/direct-listings/write/updateListing.ts b/packages/thirdweb/src/extensions/marketplace/direct-listings/write/updateListing.ts
index 03016ff26f5..34028972619 100644
--- a/packages/thirdweb/src/extensions/marketplace/direct-listings/write/updateListing.ts
+++ b/packages/thirdweb/src/extensions/marketplace/direct-listings/write/updateListing.ts
@@ -1,7 +1,7 @@
 import type { Address } from "abitype";
 import {
-  NATIVE_TOKEN_ADDRESS,
   isNativeTokenAddress,
+  NATIVE_TOKEN_ADDRESS,
 } from "../../../../constants/addresses.js";
 import { getContract } from "../../../../contract/contract.js";
 import { eth_getBlockByNumber } from "../../../../rpc/actions/eth_getBlockByNumber.js";
@@ -90,7 +90,6 @@ export function updateListing(
   options: BaseTransactionOptions<UpdateListingParams>,
 ) {
   return generatedUpdateListing({
-    contract: options.contract,
     asyncParams: async () => {
       const { contract, listingId, ...updateParams } = options;
 
@@ -183,21 +182,22 @@ export function updateListing(
 
       return {
         listingId,
+        overrides: {
+          extraGas: 50_000n, // add extra gas to account for router call
+        },
         params: {
           assetContract: mergedOptions.assetContractAddress,
-          tokenId: mergedOptions.tokenId,
           currency:
             mergedOptions.currencyContractAddress ?? NATIVE_TOKEN_ADDRESS,
-          quantity,
-          pricePerToken,
-          startTimestamp,
           endTimestamp,
+          pricePerToken,
+          quantity,
           reserved: mergedOptions.isReservedListing ?? false,
-        },
-        overrides: {
-          extraGas: 50_000n, // add extra gas to account for router call
+          startTimestamp,
+          tokenId: mergedOptions.tokenId,
         },
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/english-auctions.test.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/english-auctions.test.ts
index 3202e94f81a..cfcbe87b360 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/english-auctions.test.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/english-auctions.test.ts
@@ -7,8 +7,8 @@ import {
   TEST_ACCOUNT_B,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { parseEventLogs } from "../../../event/actions/parse-logs.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
@@ -37,42 +37,42 @@ describe.skip("Marketplace: English Auctions", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       params: {
-        name: "TestMarketPlace",
         contractURI: TEST_CONTRACT_URI,
+        name: "TestMarketPlace",
       },
     });
     marketplaceContract = getContract({
       address: marketplaceAddress,
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     // also deploy an ERC721 contract
     const erc721Address = await deployERC721Contract({
-      type: "TokenERC721",
       account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       params: {
-        name: "TestERC721",
         contractURI: TEST_CONTRACT_URI,
+        name: "TestERC721",
       },
+      type: "TokenERC721",
     });
 
     erc721Contract = getContract({
       address: erc721Address,
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     const mintTransaction = mintTo({
       contract: erc721Contract,
-      to: TEST_ACCOUNT_A.address,
       nft: { name: "Test:ERC721:EnglishAuction" },
+      to: TEST_ACCOUNT_A.address,
     });
     const receipt = await sendAndConfirmTransaction({
-      transaction: mintTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: mintTransaction,
     });
 
     const mintEvents = parseEventLogs({
@@ -104,20 +104,20 @@ describe.skip("Marketplace: English Auctions", () => {
     });
 
     await sendAndConfirmTransaction({
-      transaction: approveTx,
       account: TEST_ACCOUNT_A,
+      transaction: approveTx,
     });
 
     const transaction = createAuction({
-      contract: marketplaceContract,
       assetContractAddress: erc721Contract.address,
-      tokenId: nftTokenId,
-      minimumBidAmount: "1",
       buyoutBidAmount: "10",
+      contract: marketplaceContract,
+      minimumBidAmount: "1",
+      tokenId: nftTokenId,
     });
     const receipt = await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
 
     const listingEvents = parseEventLogs({
@@ -148,8 +148,8 @@ describe.skip("Marketplace: English Auctions", () => {
 
     // explicitly retrieve the listing!
     const listing = await getAuction({
-      contract: marketplaceContract,
       auctionId: listingEvent.args.auctionId,
+      contract: marketplaceContract,
     });
 
     expect(listing).toBeDefined();
@@ -190,8 +190,8 @@ describe.skip("Marketplace: English Auctions", () => {
     // check for a winning bid
     await expect(
       getWinningBid({
-        contract: marketplaceContract,
         auctionId: listing.id,
+        contract: marketplaceContract,
       }),
     ).resolves.toBeUndefined();
 
@@ -201,8 +201,8 @@ describe.skip("Marketplace: English Auctions", () => {
         account: TEST_ACCOUNT_B,
         transaction: bidInAuction({
           auctionId: listing.id,
-          contract: marketplaceContract,
           bidAmount: "0",
+          contract: marketplaceContract,
         }),
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot("[Error: Bid amount is zero]");
@@ -212,8 +212,8 @@ describe.skip("Marketplace: English Auctions", () => {
         account: TEST_ACCOUNT_B,
         transaction: bidInAuction({
           auctionId: listing.id,
-          contract: marketplaceContract,
           bidAmount: "11",
+          contract: marketplaceContract,
         }),
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -225,8 +225,8 @@ describe.skip("Marketplace: English Auctions", () => {
         account: TEST_ACCOUNT_B,
         transaction: bidInAuction({
           auctionId: listing.id,
-          contract: marketplaceContract,
           bidAmount: "0.5",
+          contract: marketplaceContract,
         }),
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -239,8 +239,8 @@ describe.skip("Marketplace: English Auctions", () => {
         account: TEST_ACCOUNT_B,
         transaction: bidInAuction({
           auctionId: listing.id,
-          contract: marketplaceContract,
           bidAmount: "2",
+          contract: marketplaceContract,
         }),
       }),
     ).resolves.toBeDefined();
@@ -248,8 +248,8 @@ describe.skip("Marketplace: English Auctions", () => {
     // check for a new winning bid
     await expect(
       getWinningBid({
-        contract: marketplaceContract,
         auctionId: listing.id,
+        contract: marketplaceContract,
       }),
     ).resolves.toMatchInlineSnapshot(`
       {
@@ -272,8 +272,8 @@ describe.skip("Marketplace: English Auctions", () => {
         account: TEST_ACCOUNT_B,
         transaction: bidInAuction({
           auctionId: listing.id,
-          contract: marketplaceContract,
           bidAmount: "1.5",
+          contract: marketplaceContract,
         }),
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -286,9 +286,9 @@ describe.skip("Marketplace: English Auctions", () => {
         account: TEST_ACCOUNT_B,
         transaction: bidInAuction({
           auctionId: listing.id,
-          contract: marketplaceContract,
           // 2 * 1.05 = 2.1, so 2.05 is invalid
           bidAmount: "2.05",
+          contract: marketplaceContract,
         }),
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -301,8 +301,8 @@ describe.skip("Marketplace: English Auctions", () => {
         account: TEST_ACCOUNT_B,
         transaction: bidInAuction({
           auctionId: listing.id,
-          contract: marketplaceContract,
           bidAmount: "3",
+          contract: marketplaceContract,
         }),
       }),
     ).resolves.toBeDefined();
@@ -310,8 +310,8 @@ describe.skip("Marketplace: English Auctions", () => {
     // check for a new winning bid
     await expect(
       getWinningBid({
-        contract: marketplaceContract,
         auctionId: listing.id,
+        contract: marketplaceContract,
       }),
     ).resolves.toMatchInlineSnapshot(`
       {
@@ -333,8 +333,8 @@ describe.skip("Marketplace: English Auctions", () => {
       sendAndConfirmTransaction({
         account: TEST_ACCOUNT_B,
         transaction: buyoutAuction({
-          contract: marketplaceContract,
           auctionId: listing.id,
+          contract: marketplaceContract,
         }),
       }),
     ).resolves.toBeDefined();
@@ -342,8 +342,8 @@ describe.skip("Marketplace: English Auctions", () => {
     // check for a new winning bid
     await expect(
       getWinningBid({
-        contract: marketplaceContract,
         auctionId: listing.id,
+        contract: marketplaceContract,
       }),
     ).resolves.toMatchInlineSnapshot(`
       {
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getAllAuctions.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getAllAuctions.ts
index 3f5bf9145e1..582edebfd0c 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getAllAuctions.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getAllAuctions.ts
@@ -56,11 +56,11 @@ export async function getAllAuctions(
   const [rawAuctions, latestBlock] = await Promise.all([
     getAllInBatches(
       (startId, endId) =>
-        getAllAuctionsGenerated({ contract: options.contract, startId, endId }),
+        getAllAuctionsGenerated({ contract: options.contract, endId, startId }),
       {
-        start,
         end,
         maxSize: DEFAULT_QUERY_ALL_COUNT,
+        start,
       },
       // flatten the array of arrays
     ).then((listings) => listings.flat()),
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getAllValidAuctions.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getAllValidAuctions.ts
index 312f94d0eca..5d1bd7bda9e 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getAllValidAuctions.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getAllValidAuctions.ts
@@ -58,13 +58,13 @@ export async function getAllValidAuctions(
       (startId, endId) =>
         getAllValidAuctionsGenerated({
           contract: options.contract,
-          startId,
           endId,
+          startId,
         }),
       {
-        start,
         end,
         maxSize: DEFAULT_QUERY_ALL_COUNT,
+        start,
       },
       // flatten the array of arrays
     ).then((listings) => listings.flat()),
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getWinningBid.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getWinningBid.ts
index 7b63ef4385a..5270c8dbeaa 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getWinningBid.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/read/getWinningBid.ts
@@ -35,9 +35,9 @@ export async function getWinningBid(
   }
 
   return {
+    bidAmountWei,
     bidderAddress,
     currencyAddress,
-    bidAmountWei,
     currencyValue: await resolveCurrencyValue({
       chain: options.contract.chain,
       client: options.contract.client,
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/utils.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/utils.ts
index 2b681448daa..d9f570ee70e 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/utils.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/utils.ts
@@ -18,10 +18,10 @@ export async function mapEnglishAuction(
   const { latestBlock, rawAuction } = options;
   // process the listing
   const status = computeStatus({
-    listingStatus: rawAuction.status,
     blockTimeStamp: latestBlock.timestamp,
-    startTimestamp: rawAuction.startTimestamp,
     endTimestamp: rawAuction.endTimestamp,
+    listingStatus: rawAuction.status,
+    startTimestamp: rawAuction.startTimestamp,
   });
 
   const currencyContract = getContract({
@@ -43,40 +43,40 @@ export async function mapEnglishAuction(
   ]);
 
   return {
-    id: rawAuction.auctionId,
-    creatorAddress: rawAuction.auctionCreator,
-    assetContractAddress: rawAuction.assetContract,
-    tokenId: rawAuction.tokenId,
-    quantity: rawAuction.quantity,
-    currencyContractAddress: rawAuction.currency,
     asset: nftAsset,
-    startTimeInSeconds: rawAuction.startTimestamp,
-    endTimeInSeconds: rawAuction.endTimestamp,
-    status,
-    minimumBidAmount: rawAuction.minimumBidAmount,
-    minimumBidCurrencyValue: {
+    assetContractAddress: rawAuction.assetContract,
+    bidBufferBps: rawAuction.bidBufferBps,
+    buyoutBidAmount: rawAuction.buyoutBidAmount,
+    buyoutCurrencyValue: {
       ...auctionCurrencyMetadata,
-      value: rawAuction.minimumBidAmount,
+      chainId: currencyContract.chain.id,
       displayValue: toTokens(
-        rawAuction.minimumBidAmount,
+        rawAuction.buyoutBidAmount,
         auctionCurrencyMetadata.decimals,
       ),
       tokenAddress: currencyContract.address,
-      chainId: currencyContract.chain.id,
+      value: rawAuction.buyoutBidAmount,
     },
-    buyoutBidAmount: rawAuction.buyoutBidAmount,
-    buyoutCurrencyValue: {
+    creatorAddress: rawAuction.auctionCreator,
+    currencyContractAddress: rawAuction.currency,
+    endTimeInSeconds: rawAuction.endTimestamp,
+    id: rawAuction.auctionId,
+    minimumBidAmount: rawAuction.minimumBidAmount,
+    minimumBidCurrencyValue: {
       ...auctionCurrencyMetadata,
-      value: rawAuction.buyoutBidAmount,
+      chainId: currencyContract.chain.id,
       displayValue: toTokens(
-        rawAuction.buyoutBidAmount,
+        rawAuction.minimumBidAmount,
         auctionCurrencyMetadata.decimals,
       ),
       tokenAddress: currencyContract.address,
-      chainId: currencyContract.chain.id,
+      value: rawAuction.minimumBidAmount,
     },
+    quantity: rawAuction.quantity,
+    startTimeInSeconds: rawAuction.startTimestamp,
+    status,
     timeBufferInSeconds: rawAuction.timeBufferInSeconds,
-    bidBufferBps: rawAuction.bidBufferBps,
+    tokenId: rawAuction.tokenId,
     type: "english-auction",
   };
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/bidInAuction.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/bidInAuction.ts
index c3f8b93d2c3..d2aef8422df 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/bidInAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/bidInAuction.ts
@@ -40,11 +40,10 @@ export function bidInAuction(
   options: BaseTransactionOptions<BidInAuctionParams>,
 ) {
   return BidInAuction.bidInAuction({
-    contract: options.contract,
     asyncParams: async () => {
       const auction = await GetAuction.getAuction({
-        contract: options.contract,
         auctionId: options.auctionId,
+        contract: options.contract,
       });
 
       const resolvedBidAmountWei = await (async () => {
@@ -59,8 +58,8 @@ export function bidInAuction(
         return await convertErc20Amount({
           amount: options.bidAmount,
           chain: options.contract.chain,
-          erc20Address: auction.currencyContractAddress,
           client: options.contract.client,
+          erc20Address: auction.currencyContractAddress,
         });
       })();
 
@@ -77,9 +76,9 @@ export function bidInAuction(
       if (existingWinningBid) {
         // check if the bid amount is sufficient to outbid the existing winning bid
         const isNewWinner = await IsNewWinningBid.isNewWinningBid({
-          contract: options.contract,
           auctionId: options.auctionId,
           bidAmount: resolvedBidAmountWei,
+          contract: options.contract,
         });
         if (!isNewWinner) {
           throw new Error(
@@ -97,13 +96,14 @@ export function bidInAuction(
         auctionId: options.auctionId,
         bidAmount: resolvedBidAmountWei,
         overrides: {
+          extraGas: 50_000n,
           value: isNativeTokenAddress(auction.currencyContractAddress)
             ? resolvedBidAmountWei
-            : undefined,
-          extraGas: 50_000n, // add extra gas to account for router call
+            : undefined, // add extra gas to account for router call
         },
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/buyoutAuction.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/buyoutAuction.ts
index e25b6893101..1943d086f00 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/buyoutAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/buyoutAuction.ts
@@ -32,23 +32,23 @@ export function buyoutAuction(
   options: BaseTransactionOptions<BuyoutAuctionParams>,
 ) {
   return generatedBidInAuction({
-    contract: options.contract,
     asyncParams: async () => {
       const auction = await getAuction({
-        contract: options.contract,
         auctionId: options.auctionId,
+        contract: options.contract,
       });
 
       return {
         auctionId: options.auctionId,
         bidAmount: auction.buyoutBidAmount,
         overrides: {
+          extraGas: 50_000n,
           value: isNativeTokenAddress(auction.currencyContractAddress)
             ? auction.buyoutBidAmount
-            : undefined,
-          extraGas: 50_000n, // add extra gas to account for router call
+            : undefined, // add extra gas to account for router call
         },
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/cancelAuction.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/cancelAuction.ts
index 931200f9ad3..4fa893ac8fa 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/cancelAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/cancelAuction.ts
@@ -36,11 +36,10 @@ export function cancelAuction(
   options: BaseTransactionOptions<CancelAuctionParams>,
 ) {
   return CancelAuction.cancelAuction({
-    contract: options.contract,
     asyncParams: async () => {
       const winningBid = await getWinningBid({
-        contract: options.contract,
         auctionId: options.auctionId,
+        contract: options.contract,
       });
       if (winningBid) {
         throw new Error("Cannot cancel an auction with an existing bid");
@@ -52,6 +51,7 @@ export function cancelAuction(
         },
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/createAuction.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/createAuction.ts
index 34db7f54176..77b3f9e3529 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/createAuction.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/createAuction.ts
@@ -1,7 +1,7 @@
 import type { Address } from "abitype";
 import {
-  NATIVE_TOKEN_ADDRESS,
   isNativeTokenAddress,
+  NATIVE_TOKEN_ADDRESS,
 } from "../../../../constants/addresses.js";
 import { getContract } from "../../../../contract/contract.js";
 import { eth_getBlockByNumber } from "../../../../rpc/actions/eth_getBlockByNumber.js";
@@ -224,22 +224,22 @@ export function createAuction(
       }
 
       return {
+        overrides: {
+          extraGas: 50_000n, // add extra gas to account for router call
+        },
         params: {
           assetContract: options.assetContractAddress,
-          tokenId: options.tokenId,
-          currency: options.currencyContractAddress ?? NATIVE_TOKEN_ADDRESS,
-          quantity,
-          startTimestamp,
-          endTimestamp,
-          buyoutBidAmount,
-          minimumBidAmount,
 
           // TODO validate these?
           bidBufferBps: BigInt(options.bidBufferBps ?? 500),
+          buyoutBidAmount,
+          currency: options.currencyContractAddress ?? NATIVE_TOKEN_ADDRESS,
+          endTimestamp,
+          minimumBidAmount,
+          quantity,
+          startTimestamp,
           timeBufferInSeconds: BigInt(options.timeBufferInSeconds ?? 900),
-        },
-        overrides: {
-          extraGas: 50_000n, // add extra gas to account for router call
+          tokenId: options.tokenId,
         },
       } as const;
     },
diff --git a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/executeSale.ts b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/executeSale.ts
index 4ff10b96ae3..c523dc7abcb 100644
--- a/packages/thirdweb/src/extensions/marketplace/english-auctions/write/executeSale.ts
+++ b/packages/thirdweb/src/extensions/marketplace/english-auctions/write/executeSale.ts
@@ -35,11 +35,10 @@ export function executeSale(
   options: BaseTransactionOptions<ExecuteSaleParams>,
 ) {
   return multicall({
-    contract: options.contract,
     asyncParams: async () => {
       const winningBid = await getWinningBid({
-        contract: options.contract,
         auctionId: options.auctionId,
+        contract: options.contract,
       });
       if (!winningBid) {
         throw new Error("Auction is still active");
@@ -55,5 +54,6 @@ export function executeSale(
         },
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/getAllInBatches.test.ts b/packages/thirdweb/src/extensions/marketplace/getAllInBatches.test.ts
index 7aad59f4401..86b1ca647c7 100644
--- a/packages/thirdweb/src/extensions/marketplace/getAllInBatches.test.ts
+++ b/packages/thirdweb/src/extensions/marketplace/getAllInBatches.test.ts
@@ -5,50 +5,50 @@ describe("getAllInBatches", () => {
   it("should handle range with multiple batches", async () => {
     const mockFnCalls: { start: bigint; end: bigint }[] = [];
     const mockFn = async (start: bigint, end: bigint) => {
-      mockFnCalls.push({ start, end });
-      return { start, end };
+      mockFnCalls.push({ end, start });
+      return { end, start };
     };
 
     const options = {
-      start: 1n,
       end: 20n,
       maxSize: 5n,
+      start: 1n,
     };
 
     const result = await getAllInBatches(mockFn, options);
 
     expect(mockFnCalls.length).toEqual(4);
-    expect(mockFnCalls[0]).toEqual({ start: 1n, end: 5n });
-    expect(mockFnCalls[1]).toEqual({ start: 6n, end: 10n });
-    expect(mockFnCalls[2]).toEqual({ start: 11n, end: 15n });
-    expect(mockFnCalls[3]).toEqual({ start: 16n, end: 19n });
+    expect(mockFnCalls[0]).toEqual({ end: 5n, start: 1n });
+    expect(mockFnCalls[1]).toEqual({ end: 10n, start: 6n });
+    expect(mockFnCalls[2]).toEqual({ end: 15n, start: 11n });
+    expect(mockFnCalls[3]).toEqual({ end: 19n, start: 16n });
 
     expect(result).toEqual([
-      { start: 1n, end: 5n },
-      { start: 6n, end: 10n },
-      { start: 11n, end: 15n },
-      { start: 16n, end: 19n },
+      { end: 5n, start: 1n },
+      { end: 10n, start: 6n },
+      { end: 15n, start: 11n },
+      { end: 19n, start: 16n },
     ]);
   });
 
   it("should handle single batch", async () => {
     const mockFnCalls: { start: bigint; end: bigint }[] = [];
     const mockFn = async (start: bigint, end: bigint) => {
-      mockFnCalls.push({ start, end });
-      return { start, end };
+      mockFnCalls.push({ end, start });
+      return { end, start };
     };
 
     const options = {
-      start: 1n,
       end: 4n,
       maxSize: 10n,
+      start: 1n,
     };
 
     const result = await getAllInBatches(mockFn, options);
 
     expect(mockFnCalls.length).toEqual(1);
-    expect(mockFnCalls[0]).toEqual({ start: 1n, end: 3n });
+    expect(mockFnCalls[0]).toEqual({ end: 3n, start: 1n });
 
-    expect(result).toEqual([{ start: 1n, end: 3n }]);
+    expect(result).toEqual([{ end: 3n, start: 1n }]);
   });
 });
diff --git a/packages/thirdweb/src/extensions/marketplace/offers/offers.test.ts b/packages/thirdweb/src/extensions/marketplace/offers/offers.test.ts
index 45c45c3da5a..30ca844c1b6 100644
--- a/packages/thirdweb/src/extensions/marketplace/offers/offers.test.ts
+++ b/packages/thirdweb/src/extensions/marketplace/offers/offers.test.ts
@@ -8,8 +8,8 @@ import {
 } from "../../../../test/src/test-wallets.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { getDeployedInfraContract } from "../../../contract/deployment/utils/infra.js";
 import { parseEventLogs } from "../../../event/actions/parse-logs.js";
@@ -43,42 +43,42 @@ describe.skip("Marketplace: Offers", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       params: {
-        name: "TestMarketPlace",
         contractURI: TEST_CONTRACT_URI,
+        name: "TestMarketPlace",
       },
     });
     marketplaceContract = getContract({
       address: marketplaceAddress,
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     // also deploy an ERC721 contract
     const erc721Address = await deployERC721Contract({
-      type: "TokenERC721",
       account: TEST_ACCOUNT_A,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       params: {
-        name: "TestERC721",
         contractURI: TEST_CONTRACT_URI,
+        name: "TestERC721",
       },
+      type: "TokenERC721",
     });
 
     erc721Contract = getContract({
       address: erc721Address,
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
 
     const mintTransaction = mintTo({
       contract: erc721Contract,
-      to: TEST_ACCOUNT_A.address,
       nft: { name: "Test:ERC721:Offers" },
+      to: TEST_ACCOUNT_A.address,
     });
     const receipt = await sendAndConfirmTransaction({
-      transaction: mintTransaction,
       account: TEST_ACCOUNT_A,
+      transaction: mintTransaction,
     });
 
     const mintEvents = parseEventLogs({
@@ -94,8 +94,8 @@ describe.skip("Marketplace: Offers", () => {
     // biome-ignore lint/style/noNonNullAssertion: test only and we know it will exist here because it gets deployed in the beforeAll
     WETH9 = (await getDeployedInfraContract({
       chain: ANVIL_CHAIN,
-      contractId: "WETH9",
       client: TEST_CLIENT,
+      contractId: "WETH9",
     }))!;
 
     expect(WETH9.address).toMatchInlineSnapshot(
@@ -125,14 +125,14 @@ describe.skip("Marketplace: Offers", () => {
 
     await expect(
       sendAndConfirmTransaction({
-        transaction: deposit({ contract: WETH9, amount: "10" }),
         account: TEST_ACCOUNT_B,
+        transaction: deposit({ amount: "10", contract: WETH9 }),
       }),
     ).resolves.toBeDefined();
 
     // check to make sure the weth9 balance is correct
     await expect(
-      getBalance({ contract: WETH9, address: TEST_ACCOUNT_B.address }),
+      getBalance({ address: TEST_ACCOUNT_B.address, contract: WETH9 }),
     ).resolves.toMatchInlineSnapshot(`
       {
         "decimals": 18,
@@ -146,12 +146,12 @@ describe.skip("Marketplace: Offers", () => {
     // now approve the marketplace contract to spend the WETH9 tokens
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_B,
         transaction: approveErc20({
+          amount: "10",
           contract: WETH9,
           spender: marketplaceContract.address,
-          amount: "10",
         }),
-        account: TEST_ACCOUNT_B,
       }),
     ).resolves.toBeDefined();
 
@@ -160,10 +160,10 @@ describe.skip("Marketplace: Offers", () => {
       account: TEST_ACCOUNT_B,
       transaction: makeOffer({
         assetContractAddress: erc721Contract.address,
-        tokenId: nftTokenId,
         contract: marketplaceContract,
         currencyContractAddress: NATIVE_TOKEN_ADDRESS,
         offerExpiresAt: new Date(Date.now() + 1000 * 60 * 60 * 24),
+        tokenId: nftTokenId,
         totalOffer: "1",
       }),
     });
@@ -222,11 +222,11 @@ describe.skip("Marketplace: Offers", () => {
   it("should allow a user to cancel an offer", async () => {
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_B,
         transaction: cancelOffer({
           contract: marketplaceContract,
           offerId: 0n,
         }),
-        account: TEST_ACCOUNT_B,
       }),
     ).resolves.toBeDefined();
     await expect(totalOffers({ contract: marketplaceContract })).resolves.toBe(
@@ -248,11 +248,11 @@ describe.skip("Marketplace: Offers", () => {
     // should no longer be able to accept the offer
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_B,
         transaction: acceptOffer({
           contract: marketplaceContract,
           offerId: 0n,
         }),
-        account: TEST_ACCOUNT_B,
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       "[Error: Offer is not active]",
@@ -267,10 +267,10 @@ describe.skip("Marketplace: Offers", () => {
         account: TEST_ACCOUNT_B,
         transaction: makeOffer({
           assetContractAddress: erc721Contract.address,
-          tokenId: nftTokenId,
           contract: marketplaceContract,
           currencyContractAddress: NATIVE_TOKEN_ADDRESS,
           offerExpiresAt: new Date(Date.now() + 1000 * 60 * 60 * 24),
+          tokenId: nftTokenId,
           // 2 WETH this time!
           totalOffer: "2",
         }),
@@ -297,29 +297,29 @@ describe.skip("Marketplace: Offers", () => {
     // have to approve the marketplace contract to control the NFT!
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: approveErc721({
           contract: erc721Contract,
           to: marketplaceContract.address,
           tokenId: nftTokenId,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).resolves.toBeDefined();
 
     // now we accept the offer!
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: acceptOffer({
           contract: marketplaceContract,
           offerId: 1n,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).resolves.toBeDefined();
 
     // check the balances
     await expect(
-      getBalance({ contract: WETH9, address: TEST_ACCOUNT_A.address }),
+      getBalance({ address: TEST_ACCOUNT_A.address, contract: WETH9 }),
     ).resolves.toMatchInlineSnapshot(`
       {
         "decimals": 18,
@@ -330,7 +330,7 @@ describe.skip("Marketplace: Offers", () => {
       }
     `);
     await expect(
-      getBalance({ contract: WETH9, address: TEST_ACCOUNT_B.address }),
+      getBalance({ address: TEST_ACCOUNT_B.address, contract: WETH9 }),
     ).resolves.toMatchInlineSnapshot(`
       {
         "decimals": 18,
diff --git a/packages/thirdweb/src/extensions/marketplace/offers/read/getAllOffers.ts b/packages/thirdweb/src/extensions/marketplace/offers/read/getAllOffers.ts
index 2b247a3b215..e9fa01be629 100644
--- a/packages/thirdweb/src/extensions/marketplace/offers/read/getAllOffers.ts
+++ b/packages/thirdweb/src/extensions/marketplace/offers/read/getAllOffers.ts
@@ -56,11 +56,11 @@ export async function getAllOffers(
   const [rawOffers, latestBlock] = await Promise.all([
     getAllInBatches(
       (startId, endId) =>
-        getAllOffersGenerated({ contract: options.contract, startId, endId }),
+        getAllOffersGenerated({ contract: options.contract, endId, startId }),
       {
-        start,
         end,
         maxSize: DEFAULT_QUERY_ALL_COUNT,
+        start,
       },
       // flatten the array of arrays
     ).then((listings) => listings.flat()),
diff --git a/packages/thirdweb/src/extensions/marketplace/offers/read/getAllValidOffers.ts b/packages/thirdweb/src/extensions/marketplace/offers/read/getAllValidOffers.ts
index c3505845a2f..ede259eed1c 100644
--- a/packages/thirdweb/src/extensions/marketplace/offers/read/getAllValidOffers.ts
+++ b/packages/thirdweb/src/extensions/marketplace/offers/read/getAllValidOffers.ts
@@ -58,13 +58,13 @@ export async function getAllValidOffers(
       (startId, endId) =>
         getAllValidOffersGenerated({
           contract: options.contract,
-          startId,
           endId,
+          startId,
         }),
       {
-        start,
         end,
         maxSize: DEFAULT_QUERY_ALL_COUNT,
+        start,
       },
       // flatten the array of arrays
     ).then((listings) => listings.flat()),
diff --git a/packages/thirdweb/src/extensions/marketplace/offers/utils.ts b/packages/thirdweb/src/extensions/marketplace/offers/utils.ts
index c2d9a5ededa..d537eec41ee 100644
--- a/packages/thirdweb/src/extensions/marketplace/offers/utils.ts
+++ b/packages/thirdweb/src/extensions/marketplace/offers/utils.ts
@@ -18,11 +18,11 @@ export async function mapOffer(
   const { latestBlock, rawOffer } = options;
   // process the listing
   const status = computeStatus({
-    listingStatus: rawOffer.status,
     blockTimeStamp: latestBlock.timestamp,
+    endTimestamp: rawOffer.expirationTimestamp,
+    listingStatus: rawOffer.status,
     // startTimestamp is always 0 for offers (they only have an expiration time not a start time)
     startTimestamp: 0n,
-    endTimestamp: rawOffer.expirationTimestamp,
   });
 
   const currencyContract = getContract({
@@ -44,25 +44,25 @@ export async function mapOffer(
   ]);
 
   return {
-    id: rawOffer.offerId,
-    offerorAddress: rawOffer.offeror,
+    asset: nftAsset,
     assetContractAddress: rawOffer.assetContract,
-    tokenId: rawOffer.tokenId,
-    quantity: rawOffer.quantity,
     currencyContractAddress: rawOffer.currency,
     currencyValue: {
       ...currencyValuePerToken,
-      value: rawOffer.totalPrice,
+      chainId: currencyContract.chain.id,
       displayValue: toTokens(
         rawOffer.totalPrice,
         currencyValuePerToken.decimals,
       ),
       tokenAddress: currencyContract.address,
-      chainId: currencyContract.chain.id,
+      value: rawOffer.totalPrice,
     },
-    totalPrice: rawOffer.totalPrice,
-    asset: nftAsset,
     endTimeInSeconds: rawOffer.expirationTimestamp,
+    id: rawOffer.offerId,
+    offerorAddress: rawOffer.offeror,
+    quantity: rawOffer.quantity,
     status,
+    tokenId: rawOffer.tokenId,
+    totalPrice: rawOffer.totalPrice,
   };
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/offers/write/acceptOffer.ts b/packages/thirdweb/src/extensions/marketplace/offers/write/acceptOffer.ts
index 0a351a1165c..d62f2206a25 100644
--- a/packages/thirdweb/src/extensions/marketplace/offers/write/acceptOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/offers/write/acceptOffer.ts
@@ -40,7 +40,6 @@ export function acceptOffer(
   options: BaseTransactionOptions<AcceptOfferParams>,
 ) {
   return generatedAcceptOffer({
-    contract: options.contract,
     asyncParams: async () => {
       const offer = await getOffer({
         contract: options.contract,
@@ -57,8 +56,8 @@ export function acceptOffer(
       });
       const [offerorBalance, offerorAllowance] = await Promise.all([
         balanceOf({
-          contract: currencyContract,
           address: offer.offerorAddress,
+          contract: currencyContract,
         }),
         allowance({
           contract: currencyContract,
@@ -76,5 +75,6 @@ export function acceptOffer(
       // if we get here we can accept!
       return { offerId: options.offerId };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/marketplace/offers/write/makeOffer.ts b/packages/thirdweb/src/extensions/marketplace/offers/write/makeOffer.ts
index f973e1a00c3..0acd121db03 100644
--- a/packages/thirdweb/src/extensions/marketplace/offers/write/makeOffer.ts
+++ b/packages/thirdweb/src/extensions/marketplace/offers/write/makeOffer.ts
@@ -68,7 +68,6 @@ export type MakeOfferParams = {
  */
 export function makeOffer(options: BaseTransactionOptions<MakeOfferParams>) {
   return makeOfferGenerated({
-    contract: options.contract,
     asyncParams: async () => {
       const [normalizedPrice, currency] = await Promise.all([
         (async () => {
@@ -83,8 +82,8 @@ export function makeOffer(options: BaseTransactionOptions<MakeOfferParams>) {
           return await convertErc20Amount({
             amount: options.totalOffer,
             chain: options.contract.chain,
-            erc20Address: options.currencyContractAddress,
             client: options.contract.client,
+            erc20Address: options.currencyContractAddress,
           });
         })(),
         (async () => {
@@ -121,6 +120,14 @@ export function makeOffer(options: BaseTransactionOptions<MakeOfferParams>) {
       );
 
       return {
+        overrides: {
+          erc20Value: isNativeTokenAddress(currency)
+            ? undefined
+            : {
+                amountWei: normalizedPrice,
+                tokenAddress: currency,
+              },
+        },
         params: {
           assetContract: options.assetContractAddress,
           currency,
@@ -129,15 +136,8 @@ export function makeOffer(options: BaseTransactionOptions<MakeOfferParams>) {
           tokenId: options.tokenId,
           totalPrice: normalizedPrice,
         },
-        overrides: {
-          erc20Value: isNativeTokenAddress(currency)
-            ? undefined
-            : {
-                tokenAddress: currency,
-                amountWei: normalizedPrice,
-              },
-        },
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/BatchMetadataERC1155/index.ts b/packages/thirdweb/src/extensions/modules/BatchMetadataERC1155/index.ts
index 540c1393df3..94d79fc28d6 100644
--- a/packages/thirdweb/src/extensions/modules/BatchMetadataERC1155/index.ts
+++ b/packages/thirdweb/src/extensions/modules/BatchMetadataERC1155/index.ts
@@ -1,9 +1,9 @@
-export { uploadMetadata, type UploadMetadataParams } from "./uploadMetadata.js";
+export { batchMetadataUpdateEvent } from "../__generated__/BatchMetadataERC1155/events/BatchMetadataUpdate.js";
 
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/BatchMetadataERC1155/module/install.js";
-export { batchMetadataUpdateEvent } from "../__generated__/BatchMetadataERC1155/events/BatchMetadataUpdate.js";
+export { type UploadMetadataParams, uploadMetadata } from "./uploadMetadata.js";
diff --git a/packages/thirdweb/src/extensions/modules/BatchMetadataERC721/index.ts b/packages/thirdweb/src/extensions/modules/BatchMetadataERC721/index.ts
index 603d13d2882..e90c3b74577 100644
--- a/packages/thirdweb/src/extensions/modules/BatchMetadataERC721/index.ts
+++ b/packages/thirdweb/src/extensions/modules/BatchMetadataERC721/index.ts
@@ -1,9 +1,9 @@
-export { uploadMetadata, type UploadMetadataParams } from "./uploadMetadata.js";
+export { batchMetadataUpdateEvent } from "../__generated__/BatchMetadataERC721/events/BatchMetadataUpdate.js";
 
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/BatchMetadataERC721/module/install.js";
-export { batchMetadataUpdateEvent } from "../__generated__/BatchMetadataERC721/events/BatchMetadataUpdate.js";
+export { type UploadMetadataParams, uploadMetadata } from "./uploadMetadata.js";
diff --git a/packages/thirdweb/src/extensions/modules/BatchMetadataERC721/uploadMetadata.ts b/packages/thirdweb/src/extensions/modules/BatchMetadataERC721/uploadMetadata.ts
index 26462fb5322..bb39ec3703c 100644
--- a/packages/thirdweb/src/extensions/modules/BatchMetadataERC721/uploadMetadata.ts
+++ b/packages/thirdweb/src/extensions/modules/BatchMetadataERC721/uploadMetadata.ts
@@ -38,7 +38,6 @@ export function uploadMetadata(
   options: BaseTransactionOptions<UploadMetadataParams>,
 ) {
   return generatedUploadMetadata({
-    contract: options.contract,
     asyncParams: async () => {
       const batchOfUris = await uploadOrExtractURIs(
         options.metadatas,
@@ -51,5 +50,6 @@ export function uploadMetadata(
         baseURI,
       } as const;
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC1155/claimableERC1155.test.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC1155/claimableERC1155.test.ts
index 02e4595e974..94477df1821 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC1155/claimableERC1155.test.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC1155/claimableERC1155.test.ts
@@ -8,41 +8,41 @@ import {
   TEST_ACCOUNT_C,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { balanceOf } from "../../erc1155/__generated__/IERC1155/read/balanceOf.js";
 import { getNFTs } from "../../erc1155/read/getNFTs.js";
 import { getOwnedNFTs } from "../../erc1155/read/getOwnedNFTs.js";
 import { deployModularContract } from "../../prebuilts/deploy-modular.js";
-import * as BatchMetadataERC1155 from "../BatchMetadataERC1155/index.js";
 import { getInstalledModules } from "../__generated__/IModularCore/read/getInstalledModules.js";
+import * as BatchMetadataERC1155 from "../BatchMetadataERC1155/index.js";
 import * as ClaimableERC1155 from "./index.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC1155", () => {
   let contract: ThirdwebContract;
   beforeAll(async () => {
     const address = await deployModularContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       core: "ERC1155",
-      params: {
-        name: "TestDropERC1155",
-        contractURI: TEST_CONTRACT_URI,
-      },
       modules: [
         ClaimableERC1155.module({
           primarySaleRecipient: TEST_ACCOUNT_A.address,
         }),
         BatchMetadataERC1155.module(),
       ],
+      params: {
+        contractURI: TEST_CONTRACT_URI,
+        name: "TestDropERC1155",
+      },
     });
     contract = getContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
   }, 120000);
 
@@ -62,8 +62,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC1155", () => {
     });
 
     await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
   });
 
@@ -71,62 +71,62 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC1155", () => {
     // should throw
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: ClaimableERC1155.mint({
           contract,
-          tokenId: 123123123213n,
           quantity: 1,
           to: TEST_ACCOUNT_A.address,
+          tokenId: 123123123213n,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/ClaimableOutOfTimeWindow/);
   });
 
   it("should claim tokens with claim conditions", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC1155.setClaimCondition({
         contract,
-        tokenId: 0n,
         maxClaimableSupply: "1",
         pricePerToken: "0.1",
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if claiming more than supply
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: ClaimableERC1155.mint({
           contract,
-          tokenId: 0n,
           quantity: 1000,
           to: TEST_ACCOUNT_A.address,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/ClaimableOutOfSupply/);
 
     let balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
       tokenId: 0n,
     });
 
     expect(balance).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC1155.mint({
         contract,
-        tokenId: 0n,
         quantity: 1,
         to: TEST_ACCOUNT_A.address,
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
       tokenId: 0n,
     });
     expect(balance).toBe(1n);
@@ -147,56 +147,56 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC1155", () => {
 
   it("should claim tokens with allowlist", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC1155.setClaimCondition({
+        allowList: [TEST_ACCOUNT_A.address, TEST_ACCOUNT_B.address],
         contract,
-        tokenId: 0n,
         maxClaimableSupply: "2",
         pricePerToken: "0.1",
-        allowList: [TEST_ACCOUNT_A.address, TEST_ACCOUNT_B.address],
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if not in allowlist
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC1155.mint({
           contract,
-          tokenId: 0n,
           quantity: 1,
           to: TEST_ACCOUNT_C.address,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableNotInAllowlist/);
 
     // should throw if in allowlist but over supply
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC1155.mint({
           contract,
-          tokenId: 0n,
           quantity: 3,
           to: TEST_ACCOUNT_C.address,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableOutOfSupply/);
 
     // can claim to address in allowlist (regardless of sender)
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: ClaimableERC1155.mint({
         contract,
-        tokenId: 0n,
         quantity: 2,
         to: TEST_ACCOUNT_B.address,
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     const balance = await balanceOf({
-      owner: TEST_ACCOUNT_B.address,
       contract,
+      owner: TEST_ACCOUNT_B.address,
       tokenId: 0n,
     });
     expect(balance).toBe(2n);
@@ -204,18 +204,18 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC1155", () => {
 
   it("should claim tokens with max per wallet", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC1155.setClaimCondition({
         contract,
-        tokenId: 0n,
-        maxClaimableSupply: 10,
         maxClaimablePerWallet: 1,
+        maxClaimableSupply: 10,
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     let balance = await balanceOf({
-      owner: TEST_ACCOUNT_C.address,
       contract,
+      owner: TEST_ACCOUNT_C.address,
       tokenId: 0n,
     });
     expect(balance).toBe(0n);
@@ -223,29 +223,29 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC1155", () => {
     // should throw if max per wallet is reached
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC1155.mint({
           contract,
-          tokenId: 0n,
           quantity: 4,
           to: TEST_ACCOUNT_C.address,
+          tokenId: 0n,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableMaxMintPerWalletExceeded/);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: ClaimableERC1155.mint({
         contract,
-        tokenId: 0n,
         quantity: 1,
         to: TEST_ACCOUNT_C.address,
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_C.address,
       contract,
+      owner: TEST_ACCOUNT_C.address,
       tokenId: 0n,
     });
     expect(balance).toBe(1n);
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC1155/index.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC1155/index.ts
index 39e3ea8dd17..3534c64e6eb 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC1155/index.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC1155/index.ts
@@ -1,12 +1,11 @@
-export { mint, encodeMintParams } from "./mint.js";
-export { setClaimCondition } from "./setClaimConditions.js";
-
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/ClaimableERC1155/module/install.js";
-export { setSaleConfig } from "../__generated__/ClaimableERC1155/write/setSaleConfig.js";
-export { getSaleConfig } from "../__generated__/ClaimableERC1155/read/getSaleConfig.js";
 export { getClaimConditionByTokenId as getClaimCondition } from "../__generated__/ClaimableERC1155/read/getClaimConditionByTokenId.js";
+export { getSaleConfig } from "../__generated__/ClaimableERC1155/read/getSaleConfig.js";
+export { setSaleConfig } from "../__generated__/ClaimableERC1155/write/setSaleConfig.js";
+export { encodeMintParams, mint } from "./mint.js";
+export { setClaimCondition } from "./setClaimConditions.js";
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC1155/mint.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC1155/mint.ts
index 39f6b074b9a..e05afa10a06 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC1155/mint.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC1155/mint.ts
@@ -34,7 +34,6 @@ type MintParams = {
  */
 export function mint(options: BaseTransactionOptions<MintParams>) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       const cc = await getClaimConditionByTokenId({
         contract: options.contract,
@@ -74,10 +73,8 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
           // fetch proofs
           if (merkleTreeUri) {
             const allowlistProof = await fetchProofsForClaimer({
-              contract: options.contract,
               claimer: options.to,
-              merkleTreeUri,
-              tokenDecimals: 18, // unused here
+              contract: options.contract,
               async hashEntry(options) {
                 return keccak256(
                   encodePacked(
@@ -86,6 +83,8 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
                   ),
                 );
               },
+              merkleTreeUri, // unused here
+              tokenDecimals: 18,
             });
             recipientAllowlistProof = allowlistProof?.proof || [];
           }
@@ -93,8 +92,6 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
       }
 
       return {
-        to: getAddress(options.to),
-        tokenId: options.tokenId,
         amount: BigInt(options.quantity),
         baseURI: "",
         data: encodeBytesBeforeMintERC1155Params({
@@ -105,11 +102,14 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
           },
         }),
         overrides: {
-          value,
           erc20Value,
+          value,
         },
+        to: getAddress(options.to),
+        tokenId: options.tokenId,
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC1155/setClaimConditions.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC1155/setClaimConditions.ts
index abdf257ab4c..40bbba109d4 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC1155/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC1155/setClaimConditions.ts
@@ -35,7 +35,6 @@ export function setClaimCondition(
   options: BaseTransactionOptions<ClaimConditionInput & { tokenId: bigint }>,
 ) {
   return generatedSetClaimCondition({
-    contract: options.contract,
     asyncParams: async () => {
       const { convertErc20Amount } = await import(
         "../../../utils/extensions/convert-erc20-amount.js"
@@ -46,10 +45,10 @@ export function setClaimCondition(
         await Promise.all([
           options.pricePerToken
             ? convertErc20Amount({
+                amount: options.pricePerToken.toString(),
                 chain: options.contract.chain,
                 client: options.contract.client,
                 erc20Address: options.currencyAddress || NATIVE_TOKEN_ADDRESS,
-                amount: options.pricePerToken.toString(),
               })
             : 0n,
           options.maxClaimableSupply
@@ -65,17 +64,17 @@ export function setClaimCondition(
       let merkleRoot: Hex = toHex("", { size: 32 });
       if (options.allowList) {
         const { shardedMerkleInfo, uri } = await processOverrideList({
-          overrides: options.allowList.map((entry) => ({
-            address: entry,
-          })),
-          client: options.contract.client,
           chain: options.contract.chain,
-          tokenDecimals: 18, // unused in this case
+          client: options.contract.client,
           async hashEntry(options) {
             return keccak256(
               encodePacked(["address"], [getAddress(options.entry.address)]),
             );
           },
+          overrides: options.allowList.map((entry) => ({
+            address: entry,
+          })), // unused in this case
+          tokenDecimals: 18,
         });
         merkleRoot = shardedMerkleInfo.merkleRoot;
         metadata = await upload({
@@ -90,18 +89,19 @@ export function setClaimCondition(
       }
 
       return {
-        tokenId: options.tokenId,
         claimCondition: {
-          startTimestamp: Number(dateToSeconds(startTime)),
-          endTimestamp: Number(dateToSeconds(endTime)),
-          pricePerUnit,
-          currency: getAddress(options.currencyAddress || NATIVE_TOKEN_ADDRESS),
+          allowlistMerkleRoot: merkleRoot,
+          auxData: metadata,
           availableSupply,
+          currency: getAddress(options.currencyAddress || NATIVE_TOKEN_ADDRESS),
+          endTimestamp: Number(dateToSeconds(endTime)),
           maxMintPerWallet,
-          allowlistMerkleRoot: merkleRoot,
-          auxData: metadata, // stores the merkle root and merkle tree uri in IPFS
+          pricePerUnit,
+          startTimestamp: Number(dateToSeconds(startTime)), // stores the merkle root and merkle tree uri in IPFS
         },
+        tokenId: options.tokenId,
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC20/claimableERC20.test.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC20/claimableERC20.test.ts
index d14c7f4e141..0c3fcc40d77 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC20/claimableERC20.test.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC20/claimableERC20.test.ts
@@ -8,8 +8,8 @@ import {
   TEST_ACCOUNT_C,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { getWalletBalance } from "../../../wallets/utils/getWalletBalance.js";
@@ -21,24 +21,24 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularDropERC20", () => {
   let contract: ThirdwebContract;
   beforeAll(async () => {
     const address = await deployModularContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       core: "ERC20",
-      params: {
-        name: "TestDropERC20",
-        contractURI: TEST_CONTRACT_URI,
-      },
       modules: [
         ClaimableERC20.module({
           primarySaleRecipient: TEST_ACCOUNT_A.address,
         }),
       ],
+      params: {
+        contractURI: TEST_CONTRACT_URI,
+        name: "TestDropERC20",
+      },
     });
     contract = getContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
   }, 120000);
 
@@ -51,35 +51,35 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularDropERC20", () => {
     // should throw
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: ClaimableERC20.mint({
           contract,
           quantity: "0.1",
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/ClaimableOutOfTimeWindow/);
   });
 
   it("should claim tokens with claim conditions", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC20.setClaimCondition({
         contract,
         maxClaimableSupply: "1",
         pricePerToken: "0.1",
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if claiming more than supply
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: ClaimableERC20.mint({
           contract,
           quantity: "10",
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/ClaimableOutOfSupply/);
 
@@ -93,12 +93,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularDropERC20", () => {
     expect(balance.value).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC20.mint({
         contract,
         quantity: "0.1",
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await getWalletBalance({
@@ -112,35 +112,35 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularDropERC20", () => {
 
   it("should claim tokens with allowlist", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC20.setClaimCondition({
+        allowList: [TEST_ACCOUNT_A.address, TEST_ACCOUNT_B.address],
         contract,
         maxClaimableSupply: "1",
         pricePerToken: "0.1",
-        allowList: [TEST_ACCOUNT_A.address, TEST_ACCOUNT_B.address],
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if not in allowlist
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC20.mint({
           contract,
           quantity: "0.1",
           to: TEST_ACCOUNT_C.address,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableNotInAllowlist/);
 
     // can claim to address in allowlist (regardless of sender)
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: ClaimableERC20.mint({
         contract,
         quantity: 0.2,
         to: TEST_ACCOUNT_B.address,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     const balance = await getWalletBalance({
@@ -154,34 +154,34 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularDropERC20", () => {
 
   it("should claim tokens with max per wallet", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC20.setClaimCondition({
         contract,
+        maxClaimablePerWallet: "0.1",
         maxClaimableSupply: "1",
         pricePerToken: "0.1",
-        maxClaimablePerWallet: "0.1",
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if max per wallet is reached
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC20.mint({
           contract,
           quantity: "0.12",
           to: TEST_ACCOUNT_C.address,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableMaxMintPerWalletExceeded/);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: ClaimableERC20.mint({
         contract,
         quantity: "0.05",
         to: TEST_ACCOUNT_C.address,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     const balance = await getWalletBalance({
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC20/index.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC20/index.ts
index 5ab7d2287f5..d93baf61e8f 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC20/index.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC20/index.ts
@@ -1,12 +1,11 @@
-export { mint, encodeMintParams } from "./mint.js";
-export { setClaimCondition } from "./setClaimConditions.js";
-
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/ClaimableERC20/module/install.js";
-export { setSaleConfig } from "../__generated__/ClaimableERC20/write/setSaleConfig.js";
-export { getSaleConfig } from "../__generated__/ClaimableERC20/read/getSaleConfig.js";
 export { getClaimCondition } from "../__generated__/ClaimableERC20/read/getClaimCondition.js";
+export { getSaleConfig } from "../__generated__/ClaimableERC20/read/getSaleConfig.js";
+export { setSaleConfig } from "../__generated__/ClaimableERC20/write/setSaleConfig.js";
+export { encodeMintParams, mint } from "./mint.js";
+export { setClaimCondition } from "./setClaimConditions.js";
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC20/mint.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC20/mint.ts
index d049d0ffdd5..20d00c7afab 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC20/mint.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC20/mint.ts
@@ -32,7 +32,6 @@ type MintParams = {
  */
 export function mint(options: BaseTransactionOptions<MintParams>) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       let amount = 0n;
 
@@ -44,8 +43,8 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
         ]);
       amount = await convertErc20Amount({
         amount: options.quantity.toString(),
-        client: options.contract.client,
         chain: options.contract.chain,
+        client: options.contract.client,
         erc20Address: options.contract.address,
       });
 
@@ -88,10 +87,8 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
           // fetch proofs
           if (merkleTreeUri) {
             const allowlistProof = await fetchProofsForClaimer({
-              contract: options.contract,
               claimer: options.to,
-              merkleTreeUri,
-              tokenDecimals,
+              contract: options.contract,
               async hashEntry(options) {
                 return keccak256(
                   encodePacked(
@@ -100,6 +97,8 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
                   ),
                 );
               },
+              merkleTreeUri,
+              tokenDecimals,
             });
             recipientAllowlistProof = allowlistProof?.proof || [];
           }
@@ -107,7 +106,6 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
       }
 
       return {
-        to: getAddress(options.to),
         amount,
         data: encodeBytesBeforeMintERC20Params({
           params: {
@@ -117,11 +115,13 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
           },
         }),
         overrides: {
-          value,
           erc20Value,
+          value,
         },
+        to: getAddress(options.to),
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC20/setClaimConditions.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC20/setClaimConditions.ts
index 277a7f060d9..1aeb3942917 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC20/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC20/setClaimConditions.ts
@@ -33,7 +33,6 @@ export function setClaimCondition(
   options: BaseTransactionOptions<ClaimConditionInput>,
 ) {
   return generatedSetClaimCondition({
-    contract: options.contract,
     asyncParams: async () => {
       const { convertErc20Amount } = await import(
         "../../../utils/extensions/convert-erc20-amount.js"
@@ -44,26 +43,26 @@ export function setClaimCondition(
         await Promise.all([
           options.pricePerToken
             ? convertErc20Amount({
+                amount: options.pricePerToken.toString(),
                 chain: options.contract.chain,
                 client: options.contract.client,
                 erc20Address: options.currencyAddress || NATIVE_TOKEN_ADDRESS,
-                amount: options.pricePerToken.toString(),
               })
             : 0n,
           options.maxClaimableSupply
             ? await convertErc20Amount({
+                amount: options.maxClaimableSupply.toString(),
                 chain: options.contract.chain,
                 client: options.contract.client,
                 erc20Address: options.contract.address,
-                amount: options.maxClaimableSupply.toString(),
               })
             : maxUint256,
           options.maxClaimablePerWallet
             ? await convertErc20Amount({
+                amount: options.maxClaimablePerWallet.toString(),
                 chain: options.contract.chain,
                 client: options.contract.client,
                 erc20Address: options.contract.address,
-                amount: options.maxClaimablePerWallet.toString(),
               })
             : maxUint256,
         ]);
@@ -73,17 +72,17 @@ export function setClaimCondition(
       let merkleRoot: Hex = toHex("", { size: 32 });
       if (options.allowList) {
         const { shardedMerkleInfo, uri } = await processOverrideList({
-          overrides: options.allowList.map((entry) => ({
-            address: entry,
-          })),
-          client: options.contract.client,
           chain: options.contract.chain,
-          tokenDecimals: 18, // unused in this case, we only care
+          client: options.contract.client,
           async hashEntry(options) {
             return keccak256(
               encodePacked(["address"], [getAddress(options.entry.address)]),
             );
           },
+          overrides: options.allowList.map((entry) => ({
+            address: entry,
+          })), // unused in this case, we only care
+          tokenDecimals: 18,
         });
         merkleRoot = shardedMerkleInfo.merkleRoot;
         metadata = await upload({
@@ -99,16 +98,17 @@ export function setClaimCondition(
 
       return {
         claimCondition: {
-          startTimestamp: Number(dateToSeconds(startTime)),
-          endTimestamp: Number(dateToSeconds(endTime)),
-          pricePerUnit,
-          currency: getAddress(options.currencyAddress || NATIVE_TOKEN_ADDRESS),
+          allowlistMerkleRoot: merkleRoot,
+          auxData: metadata,
           availableSupply,
+          currency: getAddress(options.currencyAddress || NATIVE_TOKEN_ADDRESS),
+          endTimestamp: Number(dateToSeconds(endTime)),
           maxMintPerWallet,
-          allowlistMerkleRoot: merkleRoot,
-          auxData: metadata, // stores the merkle root and merkle tree uri in IPFS
+          pricePerUnit,
+          startTimestamp: Number(dateToSeconds(startTime)), // stores the merkle root and merkle tree uri in IPFS
         },
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC721/claimableERC721.test.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC721/claimableERC721.test.ts
index 453052c7777..716b350c8ea 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC721/claimableERC721.test.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC721/claimableERC721.test.ts
@@ -8,39 +8,39 @@ import {
   TEST_ACCOUNT_C,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { balanceOf } from "../../erc721/__generated__/IERC721A/read/balanceOf.js";
 import { deployModularContract } from "../../prebuilts/deploy-modular.js";
-import * as BatchMetadataERC721 from "../BatchMetadataERC721/index.js";
 import { getInstalledModules } from "../__generated__/IModularCore/read/getInstalledModules.js";
+import * as BatchMetadataERC721 from "../BatchMetadataERC721/index.js";
 import * as ClaimableERC721 from "./index.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC721", () => {
   let contract: ThirdwebContract;
   beforeAll(async () => {
     const address = await deployModularContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       core: "ERC721",
-      params: {
-        name: "TestDropERC721",
-        contractURI: TEST_CONTRACT_URI,
-      },
       modules: [
         ClaimableERC721.module({
           primarySaleRecipient: TEST_ACCOUNT_A.address,
         }),
         BatchMetadataERC721.module(),
       ],
+      params: {
+        contractURI: TEST_CONTRACT_URI,
+        name: "TestDropERC721",
+      },
     });
     contract = getContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
   }, 120000);
 
@@ -60,8 +60,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC721", () => {
     });
 
     await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
   });
 
@@ -69,147 +69,147 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularClaimableERC721", () => {
     // should throw
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 1,
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/ClaimableOutOfTimeWindow/);
   });
 
   it("should claim tokens with claim conditions", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC721.setClaimCondition({
         contract,
         maxClaimableSupply: "1",
         pricePerToken: "0.1",
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if claiming more than supply
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 1000,
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/ClaimableOutOfSupply/);
 
     let balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
     });
 
     expect(balance).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC721.mint({
         contract,
         quantity: 1,
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
     });
     expect(balance).toBe(1n);
   });
 
   it("should claim tokens with allowlist", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC721.setClaimCondition({
+        allowList: [TEST_ACCOUNT_A.address, TEST_ACCOUNT_B.address],
         contract,
         maxClaimableSupply: "2",
         pricePerToken: "0.1",
-        allowList: [TEST_ACCOUNT_A.address, TEST_ACCOUNT_B.address],
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if not in allowlist
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 1,
           to: TEST_ACCOUNT_C.address,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableNotInAllowlist/);
 
     // should throw if in allowlist but over supply
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 3,
           to: TEST_ACCOUNT_C.address,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableOutOfSupply/);
 
     // can claim to address in allowlist (regardless of sender)
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: ClaimableERC721.mint({
         contract,
         quantity: 2,
         to: TEST_ACCOUNT_B.address,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     const balance = await balanceOf({
-      owner: TEST_ACCOUNT_B.address,
       contract,
+      owner: TEST_ACCOUNT_B.address,
     });
     expect(balance).toBe(2n);
   });
 
   it("should claim tokens with max per wallet", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC721.setClaimCondition({
         contract,
-        maxClaimableSupply: 10,
         maxClaimablePerWallet: 1,
+        maxClaimableSupply: 10,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if max per wallet is reached
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 4,
           to: TEST_ACCOUNT_C.address,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableMaxMintPerWalletExceeded/);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: ClaimableERC721.mint({
         contract,
         quantity: 1,
         to: TEST_ACCOUNT_C.address,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     const balance = await balanceOf({
-      owner: TEST_ACCOUNT_C.address,
       contract,
+      owner: TEST_ACCOUNT_C.address,
     });
     expect(balance).toBe(1n);
   });
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC721/index.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC721/index.ts
index 2ec85abde0d..2885cee5ea2 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC721/index.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC721/index.ts
@@ -1,12 +1,11 @@
-export { mint, encodeMintParams } from "./mint.js";
-export { setClaimCondition } from "./setClaimConditions.js";
-
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/ClaimableERC721/module/install.js";
-export { setSaleConfig } from "../__generated__/ClaimableERC721/write/setSaleConfig.js";
-export { getSaleConfig } from "../__generated__/ClaimableERC721/read/getSaleConfig.js";
 export { getClaimCondition } from "../__generated__/ClaimableERC721/read/getClaimCondition.js";
+export { getSaleConfig } from "../__generated__/ClaimableERC721/read/getSaleConfig.js";
+export { setSaleConfig } from "../__generated__/ClaimableERC721/write/setSaleConfig.js";
+export { encodeMintParams, mint } from "./mint.js";
+export { setClaimCondition } from "./setClaimConditions.js";
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC721/mint.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC721/mint.ts
index f41b72e9b7d..1e1cd14bc63 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC721/mint.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC721/mint.ts
@@ -33,7 +33,6 @@ type MintParams = {
  */
 export function mint(options: BaseTransactionOptions<MintParams>) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       const cc = await getClaimCondition({ contract: options.contract });
 
@@ -70,10 +69,8 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
           // fetch proofs
           if (merkleTreeUri) {
             const allowlistProof = await fetchProofsForClaimer({
-              contract: options.contract,
               claimer: options.to,
-              merkleTreeUri,
-              tokenDecimals: 18, // unused here
+              contract: options.contract,
               async hashEntry(options) {
                 return keccak256(
                   encodePacked(
@@ -82,6 +79,8 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
                   ),
                 );
               },
+              merkleTreeUri, // unused here
+              tokenDecimals: 18,
             });
             recipientAllowlistProof = allowlistProof?.proof || [];
           }
@@ -89,7 +88,6 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
       }
 
       return {
-        to: getAddress(options.to),
         amount: BigInt(options.quantity),
         baseURI: "",
         data: encodeBytesBeforeMintERC721Params({
@@ -100,11 +98,13 @@ export function mint(options: BaseTransactionOptions<MintParams>) {
           },
         }),
         overrides: {
-          value,
           erc20Value,
+          value,
         },
+        to: getAddress(options.to),
       };
     },
+    contract: options.contract,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/modules/ClaimableERC721/setClaimConditions.ts b/packages/thirdweb/src/extensions/modules/ClaimableERC721/setClaimConditions.ts
index cd5476a7853..187ead771c5 100644
--- a/packages/thirdweb/src/extensions/modules/ClaimableERC721/setClaimConditions.ts
+++ b/packages/thirdweb/src/extensions/modules/ClaimableERC721/setClaimConditions.ts
@@ -33,7 +33,6 @@ export function setClaimCondition(
   options: BaseTransactionOptions<ClaimConditionInput>,
 ) {
   return generatedSetClaimCondition({
-    contract: options.contract,
     asyncParams: async () => {
       const { convertErc20Amount } = await import(
         "../../../utils/extensions/convert-erc20-amount.js"
@@ -44,10 +43,10 @@ export function setClaimCondition(
         await Promise.all([
           options.pricePerToken
             ? convertErc20Amount({
+                amount: options.pricePerToken.toString(),
                 chain: options.contract.chain,
                 client: options.contract.client,
                 erc20Address: options.currencyAddress || NATIVE_TOKEN_ADDRESS,
-                amount: options.pricePerToken.toString(),
               })
             : 0n,
           options.maxClaimableSupply
@@ -63,17 +62,17 @@ export function setClaimCondition(
       let merkleRoot: Hex = toHex("", { size: 32 });
       if (options.allowList) {
         const { shardedMerkleInfo, uri } = await processOverrideList({
-          overrides: options.allowList.map((entry) => ({
-            address: entry,
-          })),
-          client: options.contract.client,
           chain: options.contract.chain,
-          tokenDecimals: 18, // unused in this case
+          client: options.contract.client,
           async hashEntry(options) {
             return keccak256(
               encodePacked(["address"], [getAddress(options.entry.address)]),
             );
           },
+          overrides: options.allowList.map((entry) => ({
+            address: entry,
+          })), // unused in this case
+          tokenDecimals: 18,
         });
         merkleRoot = shardedMerkleInfo.merkleRoot;
         metadata = await upload({
@@ -89,16 +88,17 @@ export function setClaimCondition(
 
       return {
         claimCondition: {
-          startTimestamp: Number(dateToSeconds(startTime)),
-          endTimestamp: Number(dateToSeconds(endTime)),
-          pricePerUnit,
-          currency: getAddress(options.currencyAddress || NATIVE_TOKEN_ADDRESS),
+          allowlistMerkleRoot: merkleRoot,
+          auxData: metadata,
           availableSupply,
+          currency: getAddress(options.currencyAddress || NATIVE_TOKEN_ADDRESS),
+          endTimestamp: Number(dateToSeconds(endTime)),
           maxMintPerWallet,
-          allowlistMerkleRoot: merkleRoot,
-          auxData: metadata, // stores the merkle root and merkle tree uri in IPFS
+          pricePerUnit,
+          startTimestamp: Number(dateToSeconds(startTime)), // stores the merkle root and merkle tree uri in IPFS
         },
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC1155/index.ts b/packages/thirdweb/src/extensions/modules/MintableERC1155/index.ts
index 4e4e13bee94..e2b22a17fc2 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC1155/index.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC1155/index.ts
@@ -1,15 +1,14 @@
-export { mintWithRole, type EditionMintParams } from "./mintWithRole.js";
-export {
-  generateMintSignature,
-  mintWithSignature,
-  type GenerateMintSignatureOptions,
-} from "./mintWithSignature.js";
-
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/MintableERC1155/module/install.js";
-export { setSaleConfig } from "../__generated__/MintableERC1155/write/setSaleConfig.js";
 export { getSaleConfig } from "../__generated__/MintableERC1155/read/getSaleConfig.js";
+export { setSaleConfig } from "../__generated__/MintableERC1155/write/setSaleConfig.js";
+export { type EditionMintParams, mintWithRole } from "./mintWithRole.js";
+export {
+  type GenerateMintSignatureOptions,
+  generateMintSignature,
+  mintWithSignature,
+} from "./mintWithSignature.js";
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC1155/mintWithRole.ts b/packages/thirdweb/src/extensions/modules/MintableERC1155/mintWithRole.ts
index 73afe3aed25..ea79e67860f 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC1155/mintWithRole.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC1155/mintWithRole.ts
@@ -43,7 +43,6 @@ export function mintWithRole(
   options: BaseTransactionOptions<EditionMintParams>,
 ) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       let baseURI = "";
       if (options.nft) {
@@ -56,12 +55,13 @@ export function mintWithRole(
 
       const tokenId = options.tokenId ?? maxUint256;
       return {
-        to: getAddress(options.to),
-        tokenId,
         amount: options.amount,
         baseURI: baseURI,
         data: "0x",
+        to: getAddress(options.to),
+        tokenId,
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC1155/mintWithSignature.ts b/packages/thirdweb/src/extensions/modules/MintableERC1155/mintWithSignature.ts
index e6ca4dbfa7d..c06d4d76e36 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC1155/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC1155/mintWithSignature.ts
@@ -57,18 +57,18 @@ export function mintWithSignature(
   >,
 ) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       const { payload, signature } = options;
       return {
-        to: payload.to,
-        tokenId: payload.tokenId,
-        baseURI: payload.baseURI,
         amount: payload.amount,
+        baseURI: payload.baseURI,
         data: payload.data,
         signature,
+        to: payload.to,
+        tokenId: payload.tokenId,
       };
     },
+    contract: options.contract,
   });
 }
 
@@ -142,33 +142,33 @@ export async function generateMintSignature(
 
   const mintParams: EncodeBytesBeforeMintWithSignatureERC1155Params["params"] =
     {
-      pricePerUnit,
-      uid,
       currency,
-      startTimestamp: Number(dateToSeconds(startTime)),
       endTimestamp: Number(dateToSeconds(endTime)),
+      pricePerUnit,
+      startTimestamp: Number(dateToSeconds(startTime)),
+      uid,
     };
 
   const payload = {
-    to: mintRequest.recipient,
-    tokenId: mintRequest.tokenId ?? maxUint256,
     amount: mintRequest.quantity,
     baseURI: metadataURI,
     data: encodeBytesBeforeMintWithSignatureERC1155Params({
       params: mintParams,
     }),
+    to: mintRequest.recipient,
+    tokenId: mintRequest.tokenId ?? maxUint256,
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: "ERC1155Core",
-      version: "1",
       chainId: contract.chain.id,
+      name: "ERC1155Core",
       verifyingContract: contract.address as Hex,
+      version: "1",
     },
-    types: { MintRequestERC1155: MintRequestERC1155 },
-    primaryType: "MintRequestERC1155",
     message: payload,
+    primaryType: "MintRequestERC1155",
+    types: { MintRequestERC1155: MintRequestERC1155 },
   });
   return { payload, signature };
 }
@@ -185,9 +185,9 @@ type GeneratePayloadInput = {
 };
 
 const MintRequestERC1155 = [
-  { type: "address", name: "to" },
-  { type: "uint256", name: "tokenId" },
-  { type: "uint256", name: "amount" },
-  { type: "string", name: "baseURI" },
-  { type: "bytes", name: "data" },
+  { name: "to", type: "address" },
+  { name: "tokenId", type: "uint256" },
+  { name: "amount", type: "uint256" },
+  { name: "baseURI", type: "string" },
+  { name: "data", type: "bytes" },
 ] as const;
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC1155/mintableERC1155.test.ts b/packages/thirdweb/src/extensions/modules/MintableERC1155/mintableERC1155.test.ts
index e49c6d978ee..b6e0e2a442b 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC1155/mintableERC1155.test.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC1155/mintableERC1155.test.ts
@@ -7,8 +7,8 @@ import {
   TEST_ACCOUNT_B,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { getAddress } from "../../../utils/address.js";
@@ -17,24 +17,19 @@ import { getNFTs } from "../../erc1155/read/getNFTs.js";
 import { getOwnedNFTs } from "../../erc1155/read/getOwnedNFTs.js";
 import * as BatchMetadataERC1155 from "../../modules/BatchMetadataERC1155/index.js";
 import { deployModularContract } from "../../prebuilts/deploy-modular.js";
-import * as SequentialTokenIdERC1155 from "../SequentialTokenIdERC1155/index.js";
 import { getInstalledModules } from "../__generated__/IModularCore/read/getInstalledModules.js";
 import { grantMinterRole } from "../common/grantMinterRole.js";
+import * as SequentialTokenIdERC1155 from "../SequentialTokenIdERC1155/index.js";
 import * as MintableERC1155 from "./index.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC1155", () => {
   let contract: ThirdwebContract;
   beforeAll(async () => {
     const address = await deployModularContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       core: "ERC1155",
-      params: {
-        name: "TestTokenERC1155",
-        symbol: "TT",
-        contractURI: TEST_CONTRACT_URI,
-      },
       modules: [
         MintableERC1155.module({
           primarySaleRecipient: TEST_ACCOUNT_A.address,
@@ -44,11 +39,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC1155", () => {
           startTokenId: 0n,
         }),
       ],
+      params: {
+        contractURI: TEST_CONTRACT_URI,
+        name: "TestTokenERC1155",
+        symbol: "TT",
+      },
     });
     contract = getContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
   }, 11155000);
 
@@ -61,48 +61,48 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC1155", () => {
     // should throw
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: MintableERC1155.mintWithRole({
+          amount: 10n,
           contract,
           nft: "ipfs://Qma4g1c8e9c7a6a4c5a1a5c1a3a2a4a5a6a7a8a9a0a",
-          amount: 10n,
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/MintableRequestUnauthorized/);
   });
 
   it("should mint tokens with permissions", async () => {
     let balance = await balanceOf({
+      contract,
       owner: TEST_ACCOUNT_A.address,
       tokenId: 0n,
-      contract,
     });
     expect(balance).toBe(0n);
 
     // grant minter role
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: grantMinterRole({
         contract,
         user: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // mint
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: MintableERC1155.mintWithRole({
+        amount: 10n,
         contract,
         nft: "ipfs://Qmah4ePps7cKPVydfrSme3NkiAfrWM8jSmirsKwyZCaQm4/0",
-        amount: 10n,
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
       tokenId: 0n,
     });
 
@@ -124,31 +124,31 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC1155", () => {
     const result = await MintableERC1155.generateMintSignature({
       account: TEST_ACCOUNT_A,
       contract,
-      nft: "ipfs://Qmah4ePps7cKPVydfrSme3NkiAfrWM8jSmirsKwyZCaQm4/0",
       mintRequest: {
-        recipient: getAddress(TEST_ACCOUNT_B.address),
         quantity: 10n,
+        recipient: getAddress(TEST_ACCOUNT_B.address),
       },
+      nft: "ipfs://Qmah4ePps7cKPVydfrSme3NkiAfrWM8jSmirsKwyZCaQm4/0",
     });
 
     let balance = await balanceOf({
-      owner: TEST_ACCOUNT_B.address,
       contract,
+      owner: TEST_ACCOUNT_B.address,
       tokenId: 1n,
     });
     expect(balance).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_B,
       transaction: MintableERC1155.mintWithSignature({
         contract,
         ...result,
-      }),
-      account: TEST_ACCOUNT_B, // diff account can mint
+      }), // diff account can mint
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_B.address,
       contract,
+      owner: TEST_ACCOUNT_B.address,
       tokenId: 1n,
     });
     expect(balance).toBe(10n);
@@ -156,27 +156,27 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC1155", () => {
 
   it.skip("should mint additional supply of tokens with permissions", async () => {
     let balance = await balanceOf({
+      contract,
       owner: TEST_ACCOUNT_A.address,
       tokenId: 0n,
-      contract,
     });
     expect(balance).toBe(10n);
 
     // mint
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: MintableERC1155.mintWithRole({
+        amount: 5n,
         contract,
         nft: "ipfs://Qmah4ePps7cKPVydfrSme3NkiAfrWM8jSmirsKwyZCaQm4/0",
-        amount: 5n,
-        tokenId: 0n,
         to: TEST_ACCOUNT_A.address,
+        tokenId: 0n,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
       tokenId: 0n,
     });
 
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC20/index.ts b/packages/thirdweb/src/extensions/modules/MintableERC20/index.ts
index 033ecd9eccf..83e56471a0b 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC20/index.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC20/index.ts
@@ -1,16 +1,14 @@
-export {
-  mintWithSignature,
-  generateMintSignature,
-  type GenerateMintSignatureOptions,
-} from "./mintWithSignature.js";
-
-export { mintWithRole, type TokenMintParams } from "./mintWithRole.js";
-
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/MintableERC20/module/install.js";
-export { setSaleConfig } from "../__generated__/MintableERC20/write/setSaleConfig.js";
 export { getSaleConfig } from "../__generated__/MintableERC20/read/getSaleConfig.js";
+export { setSaleConfig } from "../__generated__/MintableERC20/write/setSaleConfig.js";
+export { mintWithRole, type TokenMintParams } from "./mintWithRole.js";
+export {
+  type GenerateMintSignatureOptions,
+  generateMintSignature,
+  mintWithSignature,
+} from "./mintWithSignature.js";
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC20/mintWithRole.ts b/packages/thirdweb/src/extensions/modules/MintableERC20/mintWithRole.ts
index 5525bdb4f3a..7bc173f2276 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC20/mintWithRole.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC20/mintWithRole.ts
@@ -29,7 +29,6 @@ export type TokenMintParams = {
  */
 export function mintWithRole(options: BaseTransactionOptions<TokenMintParams>) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       let amount = 0n;
 
@@ -43,17 +42,18 @@ export function mintWithRole(options: BaseTransactionOptions<TokenMintParams>) {
         );
         amount = await convertErc20Amount({
           amount: options.quantity,
-          client: options.contract.client,
           chain: options.contract.chain,
+          client: options.contract.client,
           erc20Address: options.contract.address,
         });
       }
 
       return {
-        to: getAddress(options.to),
         amount: BigInt(amount),
         data: "0x",
+        to: getAddress(options.to),
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC20/mintWithSignature.ts b/packages/thirdweb/src/extensions/modules/MintableERC20/mintWithSignature.ts
index 92a09846b51..e9ee01f4151 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC20/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC20/mintWithSignature.ts
@@ -50,16 +50,16 @@ export function mintWithSignature(
   >,
 ) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       const { payload, signature } = options;
       return {
-        to: payload.to,
         amount: payload.amount,
         data: payload.data,
         signature,
+        to: payload.to,
       };
     },
+    contract: options.contract,
   });
 }
 
@@ -129,8 +129,8 @@ export async function generateMintSignature(
       );
       return await convertErc20Amount({
         amount: mintRequest.quantity,
-        client: contract.client,
         chain: contract.chain,
+        client: contract.client,
         erc20Address: contract.address,
       });
     })(),
@@ -141,31 +141,31 @@ export async function generateMintSignature(
   const endTime = mintRequest.validityEndTimestamp || tenYearsFromNow();
 
   const mintParams: EncodeBytesBeforeMintWithSignatureERC20Params["params"] = {
-    pricePerUnit,
-    uid,
     currency,
-    startTimestamp: Number(dateToSeconds(startTime)),
     endTimestamp: Number(dateToSeconds(endTime)),
+    pricePerUnit,
+    startTimestamp: Number(dateToSeconds(startTime)),
+    uid,
   };
 
   const payload = {
-    to: getAddress(mintRequest.recipient),
     amount: quantity,
     data: encodeBytesBeforeMintWithSignatureERC20Params({
       params: mintParams,
     }),
+    to: getAddress(mintRequest.recipient),
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: "ERC20Core",
-      version: "1",
       chainId: contract.chain.id,
+      name: "ERC20Core",
       verifyingContract: contract.address as Hex,
+      version: "1",
     },
-    types: { MintRequestERC20: MintRequestERC20 },
-    primaryType: "MintRequestERC20",
     message: payload,
+    primaryType: "MintRequestERC20",
+    types: { MintRequestERC20: MintRequestERC20 },
   });
   return { payload, signature };
 }
@@ -180,7 +180,7 @@ type GeneratePayloadInput = {
 } & ({ quantity: string } | { quantityWei: bigint });
 
 const MintRequestERC20 = [
-  { type: "address", name: "to" },
-  { type: "uint256", name: "amount" },
-  { type: "bytes", name: "data" },
+  { name: "to", type: "address" },
+  { name: "amount", type: "uint256" },
+  { name: "data", type: "bytes" },
 ] as const;
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC20/mintableERC20.test.ts b/packages/thirdweb/src/extensions/modules/MintableERC20/mintableERC20.test.ts
index 22489837b0c..2e00434231c 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC20/mintableERC20.test.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC20/mintableERC20.test.ts
@@ -7,8 +7,8 @@ import {
   TEST_ACCOUNT_B,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { getWalletBalance } from "../../../wallets/utils/getWalletBalance.js";
@@ -21,25 +21,25 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC20", () => {
   let contract: ThirdwebContract;
   beforeAll(async () => {
     const address = await deployModularContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       core: "ERC20",
-      params: {
-        name: "TestTokenERC20",
-        symbol: "TT",
-        contractURI: TEST_CONTRACT_URI,
-      },
       modules: [
         MintableERC20.module({
           primarySaleRecipient: TEST_ACCOUNT_A.address,
         }),
       ],
+      params: {
+        contractURI: TEST_CONTRACT_URI,
+        name: "TestTokenERC20",
+        symbol: "TT",
+      },
     });
     contract = getContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
   }, 120000);
 
@@ -52,12 +52,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC20", () => {
     // should throw
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: MintableERC20.mintWithRole({
           contract,
           quantity: "0.1",
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/MintableRequestUnauthorized/);
   });
@@ -73,21 +73,21 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC20", () => {
 
     // grant minter role
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: grantMinterRole({
         contract,
         user: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // mint
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: MintableERC20.mintWithRole({
         contract,
         quantity: "0.1",
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await getWalletBalance({
@@ -100,12 +100,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC20", () => {
     expect(balance.value).toBe(100000000000000000n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: MintableERC20.mintWithRole({
         contract,
         quantityWei: 2000000000n,
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await getWalletBalance({
@@ -137,12 +137,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC20", () => {
     expect(balance.value).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_B,
       transaction: MintableERC20.mintWithSignature({
         contract,
         payload: result.payload,
         signature: result.signature,
-      }),
-      account: TEST_ACCOUNT_B, // diff account can mint
+      }), // diff account can mint
     });
 
     balance = await getWalletBalance({
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC721/index.ts b/packages/thirdweb/src/extensions/modules/MintableERC721/index.ts
index f8056205212..2551dfaabfa 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC721/index.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC721/index.ts
@@ -1,15 +1,14 @@
-export { mintWithRole, type NFTMintParams } from "./mintWithRole.js";
-export {
-  generateMintSignature,
-  mintWithSignature,
-  type GenerateMintSignatureOptions,
-} from "./mintWithSignature.js";
-
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/MintableERC721/module/install.js";
-export { setSaleConfig } from "../__generated__/MintableERC721/write/setSaleConfig.js";
 export { getSaleConfig } from "../__generated__/MintableERC721/read/getSaleConfig.js";
+export { setSaleConfig } from "../__generated__/MintableERC721/write/setSaleConfig.js";
+export { mintWithRole, type NFTMintParams } from "./mintWithRole.js";
+export {
+  type GenerateMintSignatureOptions,
+  generateMintSignature,
+  mintWithSignature,
+} from "./mintWithSignature.js";
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC721/mintWithRole.ts b/packages/thirdweb/src/extensions/modules/MintableERC721/mintWithRole.ts
index d2ce45fb186..1a12250e0cd 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC721/mintWithRole.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC721/mintWithRole.ts
@@ -39,7 +39,6 @@ export type NFTMintParams = {
  */
 export function mintWithRole(options: BaseTransactionOptions<NFTMintParams>) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       let baseURI = "";
       if (options.nfts?.[0] !== "") {
@@ -51,11 +50,12 @@ export function mintWithRole(options: BaseTransactionOptions<NFTMintParams>) {
       }
 
       return {
-        to: getAddress(options.to),
         amount: BigInt(options.nfts.length),
         baseURI,
         data: "0x",
+        to: getAddress(options.to),
       };
     },
+    contract: options.contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC721/mintWithSignature.ts b/packages/thirdweb/src/extensions/modules/MintableERC721/mintWithSignature.ts
index 6736ac99b6d..116ec962bf7 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC721/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC721/mintWithSignature.ts
@@ -61,17 +61,17 @@ export function mintWithSignature(
   >,
 ) {
   return generatedMint({
-    contract: options.contract,
     asyncParams: async () => {
       const { payload, signature } = options;
       return {
-        to: payload.to,
         amount: payload.amount,
         baseURI: payload.baseURI,
         data: payload.data,
         signature,
+        to: payload.to,
       };
     },
+    contract: options.contract,
   });
 }
 
@@ -142,31 +142,31 @@ export async function generateMintSignature(
   const baseURI = getBaseUriFromBatch(batchOfUris);
 
   const mintParams: EncodeBytesBeforeMintWithSignatureERC721Params["params"] = {
-    pricePerUnit,
-    uid,
     currency,
-    startTimestamp: Number(dateToSeconds(startTime)),
     endTimestamp: Number(dateToSeconds(endTime)),
+    pricePerUnit,
+    startTimestamp: Number(dateToSeconds(startTime)),
+    uid,
   };
   const payload = {
-    to: getAddress(mintRequest.recipient),
     amount: quantity,
     baseURI: baseURI,
     data: encodeBytesBeforeMintWithSignatureERC721Params({
       params: mintParams,
     }),
+    to: getAddress(mintRequest.recipient),
   };
 
   const signature = await account.signTypedData({
     domain: {
-      name: "ERC721Core",
-      version: "1",
       chainId: contract.chain.id,
+      name: "ERC721Core",
       verifyingContract: contract.address as Hex,
+      version: "1",
     },
-    types: { MintRequestERC721: MintRequestERC721 },
-    primaryType: "MintRequestERC721",
     message: payload,
+    primaryType: "MintRequestERC721",
+    types: { MintRequestERC721: MintRequestERC721 },
   });
 
   return { payload, signature };
@@ -182,8 +182,8 @@ type GeneratePayloadInput = {
 };
 
 const MintRequestERC721 = [
-  { type: "address", name: "to" },
-  { type: "uint256", name: "amount" },
-  { type: "string", name: "baseURI" },
-  { type: "bytes", name: "data" },
+  { name: "to", type: "address" },
+  { name: "amount", type: "uint256" },
+  { name: "baseURI", type: "string" },
+  { name: "data", type: "bytes" },
 ] as const;
diff --git a/packages/thirdweb/src/extensions/modules/MintableERC721/mintableERC721.test.ts b/packages/thirdweb/src/extensions/modules/MintableERC721/mintableERC721.test.ts
index 5ac282ad534..2a6cce8f161 100644
--- a/packages/thirdweb/src/extensions/modules/MintableERC721/mintableERC721.test.ts
+++ b/packages/thirdweb/src/extensions/modules/MintableERC721/mintableERC721.test.ts
@@ -7,8 +7,8 @@ import {
   TEST_ACCOUNT_B,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { balanceOf } from "../../erc721/__generated__/IERC721A/read/balanceOf.js";
@@ -25,26 +25,26 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC721", () => {
   let contract: ThirdwebContract;
   beforeAll(async () => {
     const address = await deployModularContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       core: "ERC721",
-      params: {
-        name: "TestTokenERC721",
-        symbol: "TT",
-        contractURI: TEST_CONTRACT_URI,
-      },
       modules: [
         MintableERC721.module({
           primarySaleRecipient: TEST_ACCOUNT_A.address,
         }),
         BatchMetadataERC721.module(),
       ],
+      params: {
+        contractURI: TEST_CONTRACT_URI,
+        name: "TestTokenERC721",
+        symbol: "TT",
+      },
     });
     contract = getContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
   }, 1721000);
 
@@ -57,45 +57,45 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC721", () => {
     // should throw
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: MintableERC721.mintWithRole({
           contract,
           nfts: ["ipfs://Qma4g1c8e9c7a6a4c5a1a5c1a3a2a4a5a6a7a8a9a0a"],
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/MintableRequestUnauthorized/);
   });
 
   it("should mint tokens with permissions", async () => {
     let balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
     });
     expect(balance).toBe(0n);
 
     // grant minter role
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: grantMinterRole({
         contract,
         user: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // mint
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: MintableERC721.mintWithRole({
         contract,
         nfts: ["ipfs://Qmah4ePps7cKPVydfrSme3NkiAfrWM8jSmirsKwyZCaQm4/0"],
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
     });
 
     expect(balance).toBe(1n);
@@ -115,29 +115,29 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC721", () => {
     const result = await MintableERC721.generateMintSignature({
       account: TEST_ACCOUNT_A,
       contract,
-      nfts: ["ipfs://Qma4g1c8e9c7a6a4c5a1a5c1a3a2a4a5a6a7a8a9a0a"],
       mintRequest: {
         recipient: TEST_ACCOUNT_B.address,
       },
+      nfts: ["ipfs://Qma4g1c8e9c7a6a4c5a1a5c1a3a2a4a5a6a7a8a9a0a"],
     });
 
     let balance = await balanceOf({
-      owner: TEST_ACCOUNT_B.address,
       contract,
+      owner: TEST_ACCOUNT_B.address,
     });
     expect(balance).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_B,
       transaction: MintableERC721.mintWithSignature({
         contract,
         ...result,
-      }),
-      account: TEST_ACCOUNT_B, // diff account can mint
+      }), // diff account can mint
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_B.address,
       contract,
+      owner: TEST_ACCOUNT_B.address,
     });
     expect(balance).toBe(1n);
   });
@@ -145,21 +145,21 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC721", () => {
   it("should mint tokens with batch metadata", async () => {
     // should have minted 2 tokens at this point
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: MintableERC721.mintWithRole({
         contract,
         nfts: ["ipfs://some-uri/0", "ipfs://some-uri/1"],
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: MintableERC721.mintWithRole({
         contract,
         nfts: ["ipfs://some-other-uri/0"],
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     expect(
diff --git a/packages/thirdweb/src/extensions/modules/OpenEditionMetadataERC721/index.ts b/packages/thirdweb/src/extensions/modules/OpenEditionMetadataERC721/index.ts
index a25da5f6f75..d4a9bcd7f48 100644
--- a/packages/thirdweb/src/extensions/modules/OpenEditionMetadataERC721/index.ts
+++ b/packages/thirdweb/src/extensions/modules/OpenEditionMetadataERC721/index.ts
@@ -1,9 +1,10 @@
 // generated
+
+export { batchMetadataUpdateEvent } from "../__generated__/OpenEditionMetadataERC721/events/BatchMetadataUpdate.js";
+export { sharedMetadataUpdatedEvent } from "../__generated__/OpenEditionMetadataERC721/events/SharedMetadataUpdated.js";
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/OpenEditionMetadataERC721/module/install.js";
 export { setSharedMetadata } from "../__generated__/OpenEditionMetadataERC721/write/setSharedMetadata.js";
-export { batchMetadataUpdateEvent } from "../__generated__/OpenEditionMetadataERC721/events/BatchMetadataUpdate.js";
-export { sharedMetadataUpdatedEvent } from "../__generated__/OpenEditionMetadataERC721/events/SharedMetadataUpdated.js";
diff --git a/packages/thirdweb/src/extensions/modules/OpenEditionMetadataERC721/openEditionERC721.test.ts b/packages/thirdweb/src/extensions/modules/OpenEditionMetadataERC721/openEditionERC721.test.ts
index 1da710e4c12..9c3be27f801 100644
--- a/packages/thirdweb/src/extensions/modules/OpenEditionMetadataERC721/openEditionERC721.test.ts
+++ b/packages/thirdweb/src/extensions/modules/OpenEditionMetadataERC721/openEditionERC721.test.ts
@@ -8,42 +8,42 @@ import {
   TEST_ACCOUNT_C,
 } from "../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import { balanceOf } from "../../erc721/__generated__/IERC721A/read/balanceOf.js";
 import { getNFTs } from "../../erc721/read/getNFTs.js";
 import { getOwnedNFTs } from "../../erc721/read/getOwnedNFTs.js";
 import { deployModularContract } from "../../prebuilts/deploy-modular.js";
-import * as ClaimableERC721 from "../ClaimableERC721/index.js";
 import { getInstalledModules } from "../__generated__/IModularCore/read/getInstalledModules.js";
+import * as ClaimableERC721 from "../ClaimableERC721/index.js";
 import * as OpenEditionMetadataERC721 from "./index.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("ModularOpenEditionERC721", () => {
   let contract: ThirdwebContract;
   beforeAll(async () => {
     const address = await deployModularContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       core: "ERC721",
-      params: {
-        name: "TestDropERC721",
-        symbol: "TT",
-        contractURI: TEST_CONTRACT_URI,
-      },
       modules: [
         ClaimableERC721.module({
           primarySaleRecipient: TEST_ACCOUNT_A.address,
         }),
         OpenEditionMetadataERC721.module(),
       ],
+      params: {
+        contractURI: TEST_CONTRACT_URI,
+        name: "TestDropERC721",
+        symbol: "TT",
+      },
     });
     contract = getContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       address,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
   }, 120000);
 
@@ -56,16 +56,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularOpenEditionERC721", () => {
     const transaction = OpenEditionMetadataERC721.setSharedMetadata({
       contract,
       metadata: {
-        name: "Test Open Edition",
+        animationURI: "",
         description: "This is a test open edition",
         imageURI: "https://test.com/image.png",
-        animationURI: "",
+        name: "Test Open Edition",
       },
     });
 
     await sendAndConfirmTransaction({
-      transaction,
       account: TEST_ACCOUNT_A,
+      transaction,
     });
   });
 
@@ -73,57 +73,57 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularOpenEditionERC721", () => {
     // should throw
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 1,
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/ClaimableOutOfTimeWindow/);
   });
 
   it("should claim tokens with claim conditions", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC721.setClaimCondition({
         contract,
         maxClaimableSupply: "1",
         pricePerToken: "0.1",
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if claiming more than supply
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 1000,
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       }),
     ).rejects.toThrowError(/ClaimableOutOfSupply/);
 
     let balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
     });
 
     expect(balance).toBe(0n);
 
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC721.mint({
         contract,
         quantity: 1,
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     balance = await balanceOf({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
     });
     expect(balance).toBe(1n);
 
@@ -133,8 +133,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularOpenEditionERC721", () => {
     expect(all.length).toBe(1);
 
     const owned = await getOwnedNFTs({
-      owner: TEST_ACCOUNT_A.address,
       contract,
+      owner: TEST_ACCOUNT_A.address,
     });
     expect(owned.length).toBe(1);
     expect(owned[0]?.metadata.name).toBe("Test Open Edition 0");
@@ -142,52 +142,52 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularOpenEditionERC721", () => {
 
   it("should claim tokens with allowlist", async () => {
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: ClaimableERC721.setClaimCondition({
+        allowList: [TEST_ACCOUNT_A.address, TEST_ACCOUNT_B.address],
         contract,
         maxClaimableSupply: "2",
         pricePerToken: "0.1",
-        allowList: [TEST_ACCOUNT_A.address, TEST_ACCOUNT_B.address],
       }),
-      account: TEST_ACCOUNT_A,
     });
 
     // should throw if not in allowlist
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 1,
           to: TEST_ACCOUNT_C.address,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableNotInAllowlist/);
 
     // should throw if in allowlist but over supply
     await expect(
       sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_C,
         transaction: ClaimableERC721.mint({
           contract,
           quantity: 3,
           to: TEST_ACCOUNT_C.address,
         }),
-        account: TEST_ACCOUNT_C,
       }),
     ).rejects.toThrowError(/ClaimableOutOfSupply/);
 
     // can claim to address in allowlist (regardless of sender)
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_C,
       transaction: ClaimableERC721.mint({
         contract,
         quantity: 2,
         to: TEST_ACCOUNT_B.address,
       }),
-      account: TEST_ACCOUNT_C,
     });
 
     const balance = await balanceOf({
-      owner: TEST_ACCOUNT_B.address,
       contract,
+      owner: TEST_ACCOUNT_B.address,
     });
     expect(balance).toBe(2n);
   });
diff --git a/packages/thirdweb/src/extensions/modules/RoyaltyERC1155/index.ts b/packages/thirdweb/src/extensions/modules/RoyaltyERC1155/index.ts
index 39d037a795d..1c22a1ba443 100644
--- a/packages/thirdweb/src/extensions/modules/RoyaltyERC1155/index.ts
+++ b/packages/thirdweb/src/extensions/modules/RoyaltyERC1155/index.ts
@@ -1,33 +1,32 @@
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/RoyaltyERC1155/module/install.js";
-
-// read
-export {
-  royaltyInfo,
-  type RoyaltyInfoParams,
-} from "../__generated__/RoyaltyERC1155/read/royaltyInfo.js";
 export { getDefaultRoyaltyInfo } from "../__generated__/RoyaltyERC1155/read/getDefaultRoyaltyInfo.js";
 export {
-  getRoyaltyInfoForToken,
   type GetRoyaltyInfoForTokenParams,
+  getRoyaltyInfoForToken,
 } from "../__generated__/RoyaltyERC1155/read/getRoyaltyInfoForToken.js";
-export { getTransferValidator } from "../__generated__/RoyaltyERC1155/read/getTransferValidator.js";
 export { getTransferValidationFunction } from "../__generated__/RoyaltyERC1155/read/getTransferValidationFunction.js";
+export { getTransferValidator } from "../__generated__/RoyaltyERC1155/read/getTransferValidator.js";
+// read
+export {
+  type RoyaltyInfoParams,
+  royaltyInfo,
+} from "../__generated__/RoyaltyERC1155/read/royaltyInfo.js";
 
 // write
 export {
-  setDefaultRoyaltyInfo,
   type SetDefaultRoyaltyInfoParams,
+  setDefaultRoyaltyInfo,
 } from "../__generated__/RoyaltyERC1155/write/setDefaultRoyaltyInfo.js";
 export {
-  setRoyaltyInfoForToken,
   type SetRoyaltyInfoForTokenParams,
+  setRoyaltyInfoForToken,
 } from "../__generated__/RoyaltyERC1155/write/setRoyaltyInfoForToken.js";
 export {
-  setTransferValidator,
   type SetTransferValidatorParams,
+  setTransferValidator,
 } from "../__generated__/RoyaltyERC1155/write/setTransferValidator.js";
diff --git a/packages/thirdweb/src/extensions/modules/RoyaltyERC721/index.ts b/packages/thirdweb/src/extensions/modules/RoyaltyERC721/index.ts
index 64b19ee3a34..afcf07b5ccc 100644
--- a/packages/thirdweb/src/extensions/modules/RoyaltyERC721/index.ts
+++ b/packages/thirdweb/src/extensions/modules/RoyaltyERC721/index.ts
@@ -1,33 +1,32 @@
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/RoyaltyERC721/module/install.js";
-
-// read
-export {
-  royaltyInfo,
-  type RoyaltyInfoParams,
-} from "../__generated__/RoyaltyERC721/read/royaltyInfo.js";
 export { getDefaultRoyaltyInfo } from "../__generated__/RoyaltyERC721/read/getDefaultRoyaltyInfo.js";
 export {
-  getRoyaltyInfoForToken,
   type GetRoyaltyInfoForTokenParams,
+  getRoyaltyInfoForToken,
 } from "../__generated__/RoyaltyERC721/read/getRoyaltyInfoForToken.js";
-export { getTransferValidator } from "../__generated__/RoyaltyERC721/read/getTransferValidator.js";
 export { getTransferValidationFunction } from "../__generated__/RoyaltyERC721/read/getTransferValidationFunction.js";
+export { getTransferValidator } from "../__generated__/RoyaltyERC721/read/getTransferValidator.js";
+// read
+export {
+  type RoyaltyInfoParams,
+  royaltyInfo,
+} from "../__generated__/RoyaltyERC721/read/royaltyInfo.js";
 
 // write
 export {
-  setDefaultRoyaltyInfo,
   type SetDefaultRoyaltyInfoParams,
+  setDefaultRoyaltyInfo,
 } from "../__generated__/RoyaltyERC721/write/setDefaultRoyaltyInfo.js";
 export {
-  setRoyaltyInfoForToken,
   type SetRoyaltyInfoForTokenParams,
+  setRoyaltyInfoForToken,
 } from "../__generated__/RoyaltyERC721/write/setRoyaltyInfoForToken.js";
 export {
-  setTransferValidator,
   type SetTransferValidatorParams,
+  setTransferValidator,
 } from "../__generated__/RoyaltyERC721/write/setTransferValidator.js";
diff --git a/packages/thirdweb/src/extensions/modules/SequentialTokenIdERC1155/index.ts b/packages/thirdweb/src/extensions/modules/SequentialTokenIdERC1155/index.ts
index 260a7c1bde4..7a4c43255ee 100644
--- a/packages/thirdweb/src/extensions/modules/SequentialTokenIdERC1155/index.ts
+++ b/packages/thirdweb/src/extensions/modules/SequentialTokenIdERC1155/index.ts
@@ -1,6 +1,6 @@
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/SequentialTokenIdERC1155/module/install.js";
diff --git a/packages/thirdweb/src/extensions/modules/TransferableERC1155/index.ts b/packages/thirdweb/src/extensions/modules/TransferableERC1155/index.ts
index b51383ca4be..74b85217722 100644
--- a/packages/thirdweb/src/extensions/modules/TransferableERC1155/index.ts
+++ b/packages/thirdweb/src/extensions/modules/TransferableERC1155/index.ts
@@ -1,20 +1,20 @@
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/TransferableERC1155/module/install.js";
 
 // read
 export { isTransferEnabled } from "../__generated__/TransferableERC1155/read/isTransferEnabled.js";
 export {
-  isTransferEnabledFor,
   type IsTransferEnabledForParams,
+  isTransferEnabledFor,
 } from "../__generated__/TransferableERC1155/read/isTransferEnabledFor.js";
 
 // write
 export { setTransferable } from "../__generated__/TransferableERC1155/write/setTransferable.js";
 export {
-  setTransferableFor,
   type SetTransferableForParams,
+  setTransferableFor,
 } from "../__generated__/TransferableERC1155/write/setTransferableFor.js";
diff --git a/packages/thirdweb/src/extensions/modules/TransferableERC20/index.ts b/packages/thirdweb/src/extensions/modules/TransferableERC20/index.ts
index 4e9b2b8d335..6f79ef6cc42 100644
--- a/packages/thirdweb/src/extensions/modules/TransferableERC20/index.ts
+++ b/packages/thirdweb/src/extensions/modules/TransferableERC20/index.ts
@@ -1,20 +1,20 @@
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/TransferableERC20/module/install.js";
 
 // read
 export { isTransferEnabled } from "../__generated__/TransferableERC20/read/isTransferEnabled.js";
 export {
-  isTransferEnabledFor,
   type IsTransferEnabledForParams,
+  isTransferEnabledFor,
 } from "../__generated__/TransferableERC20/read/isTransferEnabledFor.js";
 
 // write
 export { setTransferable } from "../__generated__/TransferableERC20/write/setTransferable.js";
 export {
-  setTransferableFor,
   type SetTransferableForParams,
+  setTransferableFor,
 } from "../__generated__/TransferableERC20/write/setTransferableFor.js";
diff --git a/packages/thirdweb/src/extensions/modules/TransferableERC721/index.ts b/packages/thirdweb/src/extensions/modules/TransferableERC721/index.ts
index 59c29b32058..77eae5fd483 100644
--- a/packages/thirdweb/src/extensions/modules/TransferableERC721/index.ts
+++ b/packages/thirdweb/src/extensions/modules/TransferableERC721/index.ts
@@ -1,20 +1,20 @@
 // generated
 export {
+  encodeInstall,
   install,
   module,
-  encodeInstall,
 } from "../__generated__/TransferableERC721/module/install.js";
 
 // read
 export { isTransferEnabled } from "../__generated__/TransferableERC721/read/isTransferEnabled.js";
 export {
-  isTransferEnabledFor,
   type IsTransferEnabledForParams,
+  isTransferEnabledFor,
 } from "../__generated__/TransferableERC721/read/isTransferEnabledFor.js";
 
 // write
 export { setTransferable } from "../__generated__/TransferableERC721/write/setTransferable.js";
 export {
-  setTransferableFor,
   type SetTransferableForParams,
+  setTransferableFor,
 } from "../__generated__/TransferableERC721/write/setTransferableFor.js";
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/module/install.ts
index 93a3b918f36..6cc34069075 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/module/install.ts
@@ -48,8 +48,8 @@ export function module(params?: { publisher?: string }) {
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: "0x" as const,
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -83,8 +83,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: "0x" as const,
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/encodeBytesOnInstall.ts
index 70b5e739f97..b015f39ef05 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/encodeBytesOnInstall.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfec7ff72" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getAllMetadataBatches.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getAllMetadataBatches.ts
index cb8daa93fac..d4d3f44f0f6 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getAllMetadataBatches.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getAllMetadataBatches.ts
@@ -1,29 +1,28 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe6c23512" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "uint256",
         name: "startTokenIdInclusive",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "endTokenIdInclusive",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "baseURI",
+        type: "string",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getBatchIndex.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getBatchIndex.ts
index 5a193fd2cb0..3c5f845b84d 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getBatchIndex.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getBatchIndex.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getBatchIndex" function.
@@ -16,8 +16,8 @@ export type GetBatchIndexParams = {
 export const FN_SELECTOR = "0x44ec3c07" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getMetadataBatch.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getMetadataBatch.ts
index ca806668ee7..15e13a44647 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getMetadataBatch.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getMetadataBatch.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getMetadataBatch" function.
@@ -19,27 +19,27 @@ export type GetMetadataBatchParams = {
 export const FN_SELECTOR = "0xe034558b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_batchIndex",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "uint256",
         name: "startTokenIdInclusive",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "endTokenIdInclusive",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "baseURI",
+        type: "string",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getModuleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getModuleConfig.ts
index cf036b86757..84d5b4efa81 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getModuleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/read/getModuleConfig.ts
@@ -1,54 +1,53 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x89e04e0e" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "config",
     components: [
       {
-        type: "bool",
         name: "registerInstallationCallback",
+        type: "bool",
       },
       {
-        type: "bytes4[]",
         name: "requiredInterfaces",
+        type: "bytes4[]",
       },
       {
-        type: "bytes4[]",
         name: "supportedInterfaces",
+        type: "bytes4[]",
       },
       {
-        type: "tuple[]",
-        name: "callbackFunctions",
         components: [
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
         ],
+        name: "callbackFunctions",
+        type: "tuple[]",
       },
       {
-        type: "tuple[]",
-        name: "fallbackFunctions",
         components: [
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
           {
-            type: "uint256",
             name: "permissionBits",
+            type: "uint256",
           },
         ],
+        name: "fallbackFunctions",
+        type: "tuple[]",
       },
     ],
+    name: "config",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/write/setBaseURI.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/write/setBaseURI.ts
index 7d42f61ef90..d83394d46e5 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/write/setBaseURI.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/write/setBaseURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setBaseURI" function.
@@ -22,12 +22,12 @@ export type SetBaseURIParams = WithOverrides<{
 export const FN_SELECTOR = "0x33cfcb9f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_batchIndex",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_baseURI",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -128,23 +128,23 @@ export function setBaseURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.batchIndex, resolvedOptions.baseURI] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.batchIndex, resolvedOptions.baseURI] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/write/uploadMetadata.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/write/uploadMetadata.ts
index 3e18197cdbc..1223ae32382 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/write/uploadMetadata.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC1155/write/uploadMetadata.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "uploadMetadata" function.
@@ -19,12 +19,12 @@ export type UploadMetadataParams = WithOverrides<{
 export const FN_SELECTOR = "0xbfa2f36e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_amount",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_baseURI",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function uploadMetadata(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount, resolvedOptions.baseURI] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount, resolvedOptions.baseURI] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/module/install.ts
index 4bfa3868136..3c7ead09b1d 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/module/install.ts
@@ -48,8 +48,8 @@ export function module(params?: { publisher?: string }) {
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: "0x" as const,
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -83,8 +83,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: "0x" as const,
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/encodeBytesOnInstall.ts
index 8fc04c50266..79e6a9a81a1 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/encodeBytesOnInstall.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfec7ff72" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getAllMetadataBatches.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getAllMetadataBatches.ts
index ef821c8a2d7..f28001b736c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getAllMetadataBatches.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getAllMetadataBatches.ts
@@ -1,29 +1,28 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe6c23512" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "uint256",
         name: "startTokenIdInclusive",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "endTokenIdInclusive",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "baseURI",
+        type: "string",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getBatchIndex.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getBatchIndex.ts
index f6004039b01..98ba6899f86 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getBatchIndex.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getBatchIndex.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getBatchIndex" function.
@@ -16,8 +16,8 @@ export type GetBatchIndexParams = {
 export const FN_SELECTOR = "0x44ec3c07" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getMetadataBatch.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getMetadataBatch.ts
index 89701986e36..f4e4d3638b2 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getMetadataBatch.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getMetadataBatch.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getMetadataBatch" function.
@@ -19,27 +19,27 @@ export type GetMetadataBatchParams = {
 export const FN_SELECTOR = "0xe034558b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_batchIndex",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "uint256",
         name: "startTokenIdInclusive",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "endTokenIdInclusive",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "baseURI",
+        type: "string",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getModuleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getModuleConfig.ts
index 315f110f39a..96a414e53b6 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getModuleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/read/getModuleConfig.ts
@@ -1,54 +1,53 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x89e04e0e" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "config",
     components: [
       {
-        type: "bool",
         name: "registerInstallationCallback",
+        type: "bool",
       },
       {
-        type: "bytes4[]",
         name: "requiredInterfaces",
+        type: "bytes4[]",
       },
       {
-        type: "bytes4[]",
         name: "supportedInterfaces",
+        type: "bytes4[]",
       },
       {
-        type: "tuple[]",
-        name: "callbackFunctions",
         components: [
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
         ],
+        name: "callbackFunctions",
+        type: "tuple[]",
       },
       {
-        type: "tuple[]",
-        name: "fallbackFunctions",
         components: [
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
           {
-            type: "uint256",
             name: "permissionBits",
+            type: "uint256",
           },
         ],
+        name: "fallbackFunctions",
+        type: "tuple[]",
       },
     ],
+    name: "config",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/write/setBaseURI.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/write/setBaseURI.ts
index 511924b2dcf..4249bee158c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/write/setBaseURI.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/write/setBaseURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setBaseURI" function.
@@ -22,12 +22,12 @@ export type SetBaseURIParams = WithOverrides<{
 export const FN_SELECTOR = "0x33cfcb9f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_batchIndex",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_baseURI",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -128,23 +128,23 @@ export function setBaseURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.batchIndex, resolvedOptions.baseURI] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.batchIndex, resolvedOptions.baseURI] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/write/uploadMetadata.ts b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/write/uploadMetadata.ts
index 074b04bbfc1..cfba6d11c9d 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/write/uploadMetadata.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/BatchMetadataERC721/write/uploadMetadata.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "uploadMetadata" function.
@@ -19,12 +19,12 @@ export type UploadMetadataParams = WithOverrides<{
 export const FN_SELECTOR = "0xbfa2f36e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_amount",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_baseURI",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function uploadMetadata(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.amount, resolvedOptions.baseURI] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.amount, resolvedOptions.baseURI] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesBeforeMintERC1155.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesBeforeMintERC1155.ts
index 1e04910839c..7ee536eb81c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesBeforeMintERC1155.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesBeforeMintERC1155.ts
@@ -20,22 +20,22 @@ export type EncodeBytesBeforeMintERC1155Params = {
 export const FN_SELECTOR = "0x819ed5a3" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32[]",
         name: "recipientAllowlistProof",
+        type: "bytes32[]",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesBeforeMintWithSignatureERC1155.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesBeforeMintWithSignatureERC1155.ts
index a29c31da0f3..67aa84517d0 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesBeforeMintWithSignatureERC1155.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesBeforeMintWithSignatureERC1155.ts
@@ -23,34 +23,34 @@ export type EncodeBytesBeforeMintWithSignatureERC1155Params = {
 export const FN_SELECTOR = "0x63dacad2" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesOnInstall.ts
index e352e188aa6..472bbda5bd9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/encode/encodeBytesOnInstall.ts
@@ -15,8 +15,8 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x5d4c0b89" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/module/install.ts
index 51850c27a6b..d7ae3d13255 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "ClaimableERC1155";
 
@@ -55,8 +55,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -92,8 +92,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/read/getClaimConditionByTokenId.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/read/getClaimConditionByTokenId.ts
index 37ecb3a29ec..feda9f2530a 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/read/getClaimConditionByTokenId.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/read/getClaimConditionByTokenId.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getClaimConditionByTokenId" function.
@@ -16,48 +16,48 @@ export type GetClaimConditionByTokenIdParams = {
 export const FN_SELECTOR = "0x29a20bf4" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "claimCondition",
     components: [
       {
-        type: "uint256",
         name: "availableSupply",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "allowlistMerkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "string",
         name: "auxData",
+        type: "string",
       },
     ],
+    name: "claimCondition",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/read/getSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/read/getSaleConfig.ts
index ca8d248d475..ef5c00dc302 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/read/getSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/read/getSaleConfig.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcea943ee" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/write/setClaimConditionByTokenId.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/write/setClaimConditionByTokenId.ts
index f9ed45eafa0..c6f44da5916 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/write/setClaimConditionByTokenId.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/write/setClaimConditionByTokenId.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimConditionByTokenId" function.
@@ -32,46 +32,46 @@ export type SetClaimConditionByTokenIdParams = WithOverrides<{
 export const FN_SELECTOR = "0x3bcec708" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "tuple",
-    name: "_claimCondition",
     components: [
       {
-        type: "uint256",
         name: "availableSupply",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "allowlistMerkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "string",
         name: "auxData",
+        type: "string",
       },
     ],
+    name: "_claimCondition",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -181,23 +181,23 @@ export function setClaimConditionByTokenId(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.claimCondition] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.claimCondition] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/write/setSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/write/setSaleConfig.ts
index de6de1fac6f..408b582e56e 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/write/setSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC1155/write/setSaleConfig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSaleConfig" function.
@@ -21,8 +21,8 @@ export type SetSaleConfigParams = WithOverrides<{
 export const FN_SELECTOR = "0xd29a3628" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setSaleConfig(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.primarySaleRecipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.primarySaleRecipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesBeforeMintERC20.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesBeforeMintERC20.ts
index 80b41cd4b0a..807504e8605 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesBeforeMintERC20.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesBeforeMintERC20.ts
@@ -20,22 +20,22 @@ export type EncodeBytesBeforeMintERC20Params = {
 export const FN_SELECTOR = "0x4e6030da" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32[]",
         name: "recipientAllowlistProof",
+        type: "bytes32[]",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesBeforeMintWithSignatureERC20.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesBeforeMintWithSignatureERC20.ts
index fe4972d9e1c..65624f7e192 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesBeforeMintWithSignatureERC20.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesBeforeMintWithSignatureERC20.ts
@@ -23,34 +23,34 @@ export type EncodeBytesBeforeMintWithSignatureERC20Params = {
 export const FN_SELECTOR = "0x3f4a1bb6" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesOnInstall.ts
index e352e188aa6..472bbda5bd9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/encode/encodeBytesOnInstall.ts
@@ -15,8 +15,8 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x5d4c0b89" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/module/install.ts
index 4f07605a11f..fda1dd75578 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "ClaimableERC20";
 
@@ -55,8 +55,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -92,8 +92,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/read/getClaimCondition.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/read/getClaimCondition.ts
index 88f1fa11af0..034494e34a1 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/read/getClaimCondition.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/read/getClaimCondition.ts
@@ -1,50 +1,49 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x30a63e11" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "claimCondition",
     components: [
       {
-        type: "uint256",
         name: "availableSupply",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "allowlistMerkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "string",
         name: "auxData",
+        type: "string",
       },
     ],
+    name: "claimCondition",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/read/getSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/read/getSaleConfig.ts
index d77a83b90b3..3aa090f11c4 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/read/getSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/read/getSaleConfig.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcea943ee" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/write/setClaimCondition.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/write/setClaimCondition.ts
index 68acc8f5564..3ab227ed981 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/write/setClaimCondition.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/write/setClaimCondition.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimCondition" function.
@@ -31,42 +31,42 @@ export type SetClaimConditionParams = WithOverrides<{
 export const FN_SELECTOR = "0xac0c12f4" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_claimCondition",
     components: [
       {
-        type: "uint256",
         name: "availableSupply",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "allowlistMerkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "string",
         name: "auxData",
+        type: "string",
       },
     ],
+    name: "_claimCondition",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -166,23 +166,23 @@ export function setClaimCondition(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.claimCondition] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.claimCondition] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/write/setSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/write/setSaleConfig.ts
index 8f35e243b55..08b8be4fbc6 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/write/setSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC20/write/setSaleConfig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSaleConfig" function.
@@ -21,8 +21,8 @@ export type SetSaleConfigParams = WithOverrides<{
 export const FN_SELECTOR = "0xd29a3628" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setSaleConfig(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.primarySaleRecipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.primarySaleRecipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesBeforeMintERC721.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesBeforeMintERC721.ts
index 1433a0cb4e8..3643365d32b 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesBeforeMintERC721.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesBeforeMintERC721.ts
@@ -20,22 +20,22 @@ export type EncodeBytesBeforeMintERC721Params = {
 export const FN_SELECTOR = "0xd9584651" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32[]",
         name: "recipientAllowlistProof",
+        type: "bytes32[]",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesBeforeMintWithSignatureERC721.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesBeforeMintWithSignatureERC721.ts
index 2aeb7ccf962..13646dc8d2c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesBeforeMintWithSignatureERC721.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesBeforeMintWithSignatureERC721.ts
@@ -23,34 +23,34 @@ export type EncodeBytesBeforeMintWithSignatureERC721Params = {
 export const FN_SELECTOR = "0x937bdca4" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesOnInstall.ts
index e352e188aa6..472bbda5bd9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/encode/encodeBytesOnInstall.ts
@@ -15,8 +15,8 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x5d4c0b89" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/module/install.ts
index 03a615c3f62..79b494f3934 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "ClaimableERC721";
 
@@ -55,8 +55,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -92,8 +92,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/read/getClaimCondition.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/read/getClaimCondition.ts
index 7040ddc3643..9e478cd3ba9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/read/getClaimCondition.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/read/getClaimCondition.ts
@@ -1,50 +1,49 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x30a63e11" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "claimCondition",
     components: [
       {
-        type: "uint256",
         name: "availableSupply",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "allowlistMerkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "string",
         name: "auxData",
+        type: "string",
       },
     ],
+    name: "claimCondition",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/read/getSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/read/getSaleConfig.ts
index 4be195f871d..12438909570 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/read/getSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/read/getSaleConfig.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcea943ee" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/write/setClaimCondition.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/write/setClaimCondition.ts
index b4e0bba598b..e22768b0ac0 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/write/setClaimCondition.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/write/setClaimCondition.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setClaimCondition" function.
@@ -31,42 +31,42 @@ export type SetClaimConditionParams = WithOverrides<{
 export const FN_SELECTOR = "0xac0c12f4" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_claimCondition",
     components: [
       {
-        type: "uint256",
         name: "availableSupply",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "allowlistMerkleRoot",
+        type: "bytes32",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "maxMintPerWallet",
+        type: "uint256",
       },
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "string",
         name: "auxData",
+        type: "string",
       },
     ],
+    name: "_claimCondition",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -166,23 +166,23 @@ export function setClaimCondition(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.claimCondition] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.claimCondition] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/write/setSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/write/setSaleConfig.ts
index 0086cabc826..c865fd7ab43 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/write/setSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ClaimableERC721/write/setSaleConfig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSaleConfig" function.
@@ -21,8 +21,8 @@ export type SetSaleConfigParams = WithOverrides<{
 export const FN_SELECTOR = "0xd29a3628" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setSaleConfig(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.primarySaleRecipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.primarySaleRecipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/burn.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/burn.ts
index 286199fdb6d..5a5c87744d9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/burn.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/burn.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "burn" function.
@@ -21,20 +21,20 @@ export type BurnParams = WithOverrides<{
 export const FN_SELECTOR = "0x8a94b05f" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -144,8 +144,19 @@ export function burn(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -156,16 +167,5 @@ export function burn(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/initialize.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/initialize.ts
index 75422b16100..5ac92bed461 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -29,28 +29,28 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0x62835ade" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address",
     name: "_owner",
+    type: "address",
   },
   {
-    type: "address[]",
     name: "_modules",
+    type: "address[]",
   },
   {
-    type: "bytes[]",
     name: "_moduleInstallData",
+    type: "bytes[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -170,8 +170,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -184,16 +195,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/mint.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/mint.ts
index ad1b67dbc55..3e490cab7f1 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/mint.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/mint.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mint" function.
@@ -22,24 +22,24 @@ export type MintParams = WithOverrides<{
 export const FN_SELECTOR = "0xa4b645eb" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "baseURI",
+    type: "string",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -153,8 +153,19 @@ export function mint(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -166,16 +177,5 @@ export function mint(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/mintWithSignature.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/mintWithSignature.ts
index 62821e2d4fc..547c35b3196 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC1155Core/write/mintWithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintWithSignature" function.
@@ -23,28 +23,28 @@ export type MintWithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0xe6bd6ada" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "baseURI",
+    type: "string",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -166,8 +166,19 @@ export function mintWithSignature(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -180,16 +191,5 @@ export function mintWithSignature(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/burn.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/burn.ts
index 67b1b0cfbe1..48e0fea98c2 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/burn.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/burn.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "burn" function.
@@ -20,16 +20,16 @@ export type BurnParams = WithOverrides<{
 export const FN_SELECTOR = "0x44d17187" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "from",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -135,8 +135,19 @@ export function burn(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function burn(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/initialize.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/initialize.ts
index a380e4ee56f..0fc533a1f71 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -29,28 +29,28 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0x62835ade" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address",
     name: "_owner",
+    type: "address",
   },
   {
-    type: "address[]",
     name: "_modules",
+    type: "address[]",
   },
   {
-    type: "bytes[]",
     name: "_moduleInstallData",
+    type: "bytes[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -170,8 +170,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -184,16 +195,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/mint.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/mint.ts
index a5540effcfc..75498e5102f 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/mint.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/mint.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mint" function.
@@ -20,16 +20,16 @@ export type MintParams = WithOverrides<{
 export const FN_SELECTOR = "0x94d008ef" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -135,8 +135,19 @@ export function mint(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function mint(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/mintWithSignature.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/mintWithSignature.ts
index 98d9e06e4d4..075d4f6e81d 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC20Core/write/mintWithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintWithSignature" function.
@@ -21,20 +21,20 @@ export type MintWithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0x0f7d3652" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -148,8 +148,19 @@ export function mintWithSignature(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -160,16 +171,5 @@ export function mintWithSignature(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/read/totalMinted.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/read/totalMinted.ts
index 00be5232ce5..bd7a10125ee 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/read/totalMinted.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/read/totalMinted.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa2309ff8" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/burn.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/burn.ts
index f0e404d832b..794487cb1fd 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/burn.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/burn.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "burn" function.
@@ -19,12 +19,12 @@ export type BurnParams = WithOverrides<{
 export const FN_SELECTOR = "0xfe9d9303" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -123,23 +123,23 @@ export function burn(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.data] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.data] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/initialize.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/initialize.ts
index c176139c21c..8e8d54b68ed 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -29,28 +29,28 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0x62835ade" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address",
     name: "_owner",
+    type: "address",
   },
   {
-    type: "address[]",
     name: "_modules",
+    type: "address[]",
   },
   {
-    type: "bytes[]",
     name: "_moduleInstallData",
+    type: "bytes[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -170,8 +170,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -184,16 +195,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/mint.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/mint.ts
index 4b4f3ae9b43..7dc21f0c27f 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/mint.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/mint.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mint" function.
@@ -21,20 +21,20 @@ export type MintParams = WithOverrides<{
 export const FN_SELECTOR = "0xd2b04fd6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "baseURI",
+    type: "string",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -144,8 +144,19 @@ export function mint(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -156,16 +167,5 @@ export function mint(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/mintWithSignature.ts b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/mintWithSignature.ts
index 00b3b74bad7..33c6d26c550 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/mintWithSignature.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/ERC721Core/write/mintWithSignature.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "mintWithSignature" function.
@@ -22,24 +22,24 @@ export type MintWithSignatureParams = WithOverrides<{
 export const FN_SELECTOR = "0xeb4ada8a" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "to",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "amount",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "baseURI",
+    type: "string",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -157,8 +157,19 @@ export function mintWithSignature(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -170,16 +181,5 @@ export function mintWithSignature(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/getInstalledModules.ts b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/getInstalledModules.ts
index c3e63b2ed21..1431afe234c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/getInstalledModules.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/getInstalledModules.ts
@@ -1,63 +1,62 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3e429396" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "address",
         name: "implementation",
+        type: "address",
       },
       {
-        type: "tuple",
-        name: "config",
         components: [
           {
-            type: "bool",
             name: "registerInstallationCallback",
+            type: "bool",
           },
           {
-            type: "bytes4[]",
             name: "requiredInterfaces",
+            type: "bytes4[]",
           },
           {
-            type: "bytes4[]",
             name: "supportedInterfaces",
+            type: "bytes4[]",
           },
           {
-            type: "tuple[]",
-            name: "callbackFunctions",
             components: [
               {
-                type: "bytes4",
                 name: "selector",
+                type: "bytes4",
               },
             ],
+            name: "callbackFunctions",
+            type: "tuple[]",
           },
           {
-            type: "tuple[]",
-            name: "fallbackFunctions",
             components: [
               {
-                type: "bytes4",
                 name: "selector",
+                type: "bytes4",
               },
               {
-                type: "uint256",
                 name: "permissionBits",
+                type: "uint256",
               },
             ],
+            name: "fallbackFunctions",
+            type: "tuple[]",
           },
         ],
+        name: "config",
+        type: "tuple",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/getSupportedCallbackFunctions.ts b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/getSupportedCallbackFunctions.ts
index 719f3b0ae6a..3ed05afb70e 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/getSupportedCallbackFunctions.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/getSupportedCallbackFunctions.ts
@@ -1,25 +1,24 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xf147db8a" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "bytes4",
         name: "selector",
+        type: "bytes4",
       },
       {
-        type: "uint8",
         name: "mode",
+        type: "uint8",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/supportsInterface.ts b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/supportsInterface.ts
index 1ae6424e1b4..028c738f9f1 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/supportsInterface.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/read/supportsInterface.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "supportsInterface" function.
@@ -19,8 +19,8 @@ export type SupportsInterfaceParams = {
 export const FN_SELECTOR = "0x01ffc9a7" as const;
 const FN_INPUTS = [
   {
-    type: "bytes4",
     name: "interfaceID",
+    type: "bytes4",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/write/installModule.ts b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/write/installModule.ts
index 983aead308b..a99b9fe145c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/write/installModule.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/write/installModule.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "installModule" function.
@@ -22,12 +22,12 @@ export type InstallModuleParams = WithOverrides<{
 export const FN_SELECTOR = "0x8da798da" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "moduleContract",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -128,23 +128,23 @@ export function installModule(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.moduleContract, resolvedOptions.data] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.moduleContract, resolvedOptions.data] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/write/uninstallModule.ts b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/write/uninstallModule.ts
index f8887d33005..49defff7752 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/write/uninstallModule.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/IModularCore/write/uninstallModule.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "uninstallModule" function.
@@ -22,12 +22,12 @@ export type UninstallModuleParams = WithOverrides<{
 export const FN_SELECTOR = "0x70c109cd" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "moduleContract",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -128,23 +128,23 @@ export function uninstallModule(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.moduleContract, resolvedOptions.data] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.moduleContract, resolvedOptions.data] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/IModule/read/getModuleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/IModule/read/getModuleConfig.ts
index f1360d0e902..375cd7455d0 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/IModule/read/getModuleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/IModule/read/getModuleConfig.ts
@@ -1,53 +1,52 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x89e04e0e" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "bool",
         name: "registerInstallationCallback",
+        type: "bool",
       },
       {
-        type: "bytes4[]",
         name: "requiredInterfaces",
+        type: "bytes4[]",
       },
       {
-        type: "bytes4[]",
         name: "supportedInterfaces",
+        type: "bytes4[]",
       },
       {
-        type: "tuple[]",
-        name: "callbackFunctions",
         components: [
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
         ],
+        name: "callbackFunctions",
+        type: "tuple[]",
       },
       {
-        type: "tuple[]",
-        name: "fallbackFunctions",
         components: [
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
           {
-            type: "uint256",
             name: "permissionBits",
+            type: "uint256",
           },
         ],
+        name: "fallbackFunctions",
+        type: "tuple[]",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/encode/encodeBytesBeforeMintWithSignatureERC1155.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/encode/encodeBytesBeforeMintWithSignatureERC1155.ts
index d4cdaf386fb..1f8b979b0cc 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/encode/encodeBytesBeforeMintWithSignatureERC1155.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/encode/encodeBytesBeforeMintWithSignatureERC1155.ts
@@ -22,30 +22,30 @@ export type EncodeBytesBeforeMintWithSignatureERC1155Params = {
 export const FN_SELECTOR = "0x2e33c806" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/encode/encodeBytesOnInstall.ts
index e352e188aa6..472bbda5bd9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/encode/encodeBytesOnInstall.ts
@@ -15,8 +15,8 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x5d4c0b89" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/module/install.ts
index 6371f09be45..0b7bb6d7aa4 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "MintableERC1155";
 
@@ -55,8 +55,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -92,8 +92,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/read/getSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/read/getSaleConfig.ts
index 673d7cc1ebf..11d94b6158c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/read/getSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/read/getSaleConfig.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcea943ee" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/write/setSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/write/setSaleConfig.ts
index b81647b202d..23dc1237e2c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/write/setSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/write/setSaleConfig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSaleConfig" function.
@@ -21,8 +21,8 @@ export type SetSaleConfigParams = WithOverrides<{
 export const FN_SELECTOR = "0xd29a3628" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setSaleConfig(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.primarySaleRecipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.primarySaleRecipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/write/setTokenURI.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/write/setTokenURI.ts
index eb9899c1979..41f55380ad5 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/write/setTokenURI.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC1155/write/setTokenURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTokenURI" function.
@@ -19,12 +19,12 @@ export type SetTokenURIParams = WithOverrides<{
 export const FN_SELECTOR = "0x162094c4" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "_tokenURI",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function setTokenURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId, resolvedOptions.tokenURI] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId, resolvedOptions.tokenURI] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/encode/encodeBytesBeforeMintWithSignatureERC20.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/encode/encodeBytesBeforeMintWithSignatureERC20.ts
index 7b619ad0290..27c321b1114 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/encode/encodeBytesBeforeMintWithSignatureERC20.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/encode/encodeBytesBeforeMintWithSignatureERC20.ts
@@ -22,30 +22,30 @@ export type EncodeBytesBeforeMintWithSignatureERC20Params = {
 export const FN_SELECTOR = "0x76e51eae" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/encode/encodeBytesOnInstall.ts
index e352e188aa6..472bbda5bd9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/encode/encodeBytesOnInstall.ts
@@ -15,8 +15,8 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x5d4c0b89" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/module/install.ts
index 7a9aebc778c..c24512fd757 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "MintableERC20";
 
@@ -55,8 +55,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -92,8 +92,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/read/getSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/read/getSaleConfig.ts
index 64b25a5b2f0..f7d4ab4a5f6 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/read/getSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/read/getSaleConfig.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcea943ee" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/write/setSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/write/setSaleConfig.ts
index cbe052bf6ee..d22cd1992d7 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/write/setSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC20/write/setSaleConfig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSaleConfig" function.
@@ -21,8 +21,8 @@ export type SetSaleConfigParams = WithOverrides<{
 export const FN_SELECTOR = "0xd29a3628" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setSaleConfig(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.primarySaleRecipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.primarySaleRecipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/encode/encodeBytesBeforeMintWithSignatureERC721.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/encode/encodeBytesBeforeMintWithSignatureERC721.ts
index fa4ec577b2f..191ca3c367e 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/encode/encodeBytesBeforeMintWithSignatureERC721.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/encode/encodeBytesBeforeMintWithSignatureERC721.ts
@@ -22,30 +22,30 @@ export type EncodeBytesBeforeMintWithSignatureERC721Params = {
 export const FN_SELECTOR = "0xcab11f42" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "uint48",
         name: "startTimestamp",
+        type: "uint48",
       },
       {
-        type: "uint48",
         name: "endTimestamp",
+        type: "uint48",
       },
       {
-        type: "address",
         name: "currency",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "pricePerUnit",
+        type: "uint256",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/encode/encodeBytesOnInstall.ts
index e352e188aa6..472bbda5bd9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/encode/encodeBytesOnInstall.ts
@@ -15,8 +15,8 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x5d4c0b89" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/events/NewMetadataBatch.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/events/NewMetadataBatch.ts
index ca998dd2c29..590125d7378 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/events/NewMetadataBatch.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/events/NewMetadataBatch.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "NewMetadataBatch" event.
@@ -42,8 +42,8 @@ export function newMetadataBatchEvent(
   filters: NewMetadataBatchEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event NewMetadataBatch(uint256 indexed startTokenIdInclusive, uint256 indexed endTokenIdNonInclusive, string baseURI)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/module/install.ts
index 9b60229de6b..df47c808fc8 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "MintableERC721";
 
@@ -55,8 +55,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -92,8 +92,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/read/getSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/read/getSaleConfig.ts
index f87c6bd5c9c..e890af50168 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/read/getSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/read/getSaleConfig.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcea943ee" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/write/setSaleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/write/setSaleConfig.ts
index 2b74aa58d07..c03481cd89e 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/write/setSaleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/MintableERC721/write/setSaleConfig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSaleConfig" function.
@@ -21,8 +21,8 @@ export type SetSaleConfigParams = WithOverrides<{
 export const FN_SELECTOR = "0xd29a3628" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_primarySaleRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setSaleConfig(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.primarySaleRecipient] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.primarySaleRecipient] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/module/install.ts
index 208a0b32079..e65b530c488 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/module/install.ts
@@ -48,8 +48,8 @@ export function module(params?: { publisher?: string }) {
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: "0x" as const,
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -83,8 +83,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: "0x" as const,
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/read/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/read/encodeBytesOnInstall.ts
index 616dc92e9b5..dc0d78919c8 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/read/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/read/encodeBytesOnInstall.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfec7ff72" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/read/onTokenURI.ts b/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/read/onTokenURI.ts
index 5dc96770798..d035555f3b4 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/read/onTokenURI.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/read/onTokenURI.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "onTokenURI" function.
@@ -16,8 +16,8 @@ export type OnTokenURIParams = {
 export const FN_SELECTOR = "0xcfc0cb96" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_id",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/write/setSharedMetadata.ts b/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/write/setSharedMetadata.ts
index 7e3187f8f91..2dcb41b5319 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/write/setSharedMetadata.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OpenEditionMetadataERC721/write/setSharedMetadata.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setSharedMetadata" function.
@@ -27,26 +27,26 @@ export type SetSharedMetadataParams = WithOverrides<{
 export const FN_SELECTOR = "0xa7d27d9d" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "_metadata",
     components: [
       {
-        type: "string",
         name: "name",
+        type: "string",
       },
       {
-        type: "string",
         name: "description",
+        type: "string",
       },
       {
-        type: "string",
         name: "imageURI",
+        type: "string",
       },
       {
-        type: "string",
         name: "animationURI",
+        type: "string",
       },
     ],
+    name: "_metadata",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,23 +146,23 @@ export function setSharedMetadata(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.metadata] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.metadata] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipHandoverCanceled.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipHandoverCanceled.ts
index bc9687f3f35..b87781e237f 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipHandoverCanceled.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipHandoverCanceled.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "OwnershipHandoverCanceled" event.
@@ -36,7 +36,7 @@ export function ownershipHandoverCanceledEvent(
   filters: OwnershipHandoverCanceledEventFilters = {},
 ) {
   return prepareEvent({
-    signature: "event OwnershipHandoverCanceled(address indexed pendingOwner)",
     filters,
+    signature: "event OwnershipHandoverCanceled(address indexed pendingOwner)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipHandoverRequested.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipHandoverRequested.ts
index b1a9f4ee776..c6c082fa6fe 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipHandoverRequested.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipHandoverRequested.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "OwnershipHandoverRequested" event.
@@ -36,7 +36,7 @@ export function ownershipHandoverRequestedEvent(
   filters: OwnershipHandoverRequestedEventFilters = {},
 ) {
   return prepareEvent({
-    signature: "event OwnershipHandoverRequested(address indexed pendingOwner)",
     filters,
+    signature: "event OwnershipHandoverRequested(address indexed pendingOwner)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipTransferred.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipTransferred.ts
index c951a7071ba..8aa28dbb9e4 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipTransferred.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/OwnershipTransferred.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "OwnershipTransferred" event.
@@ -42,8 +42,8 @@ export function ownershipTransferredEvent(
   filters: OwnershipTransferredEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/RolesUpdated.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/RolesUpdated.ts
index 82b3d8935da..09855a76d6e 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/RolesUpdated.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/events/RolesUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RolesUpdated" event.
@@ -40,8 +40,8 @@ export type RolesUpdatedEventFilters = Partial<{
  */
 export function rolesUpdatedEvent(filters: RolesUpdatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RolesUpdated(address indexed user, uint256 indexed roles)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/hasAllRoles.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/hasAllRoles.ts
index b838128393f..0bdde11a759 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/hasAllRoles.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/hasAllRoles.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "hasAllRoles" function.
@@ -17,12 +17,12 @@ export type HasAllRolesParams = {
 export const FN_SELECTOR = "0x1cd64df4" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "user",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "roles",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/hasAnyRole.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/hasAnyRole.ts
index d9d0e18c144..a11783f7b72 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/hasAnyRole.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/hasAnyRole.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "hasAnyRole" function.
@@ -17,12 +17,12 @@ export type HasAnyRoleParams = {
 export const FN_SELECTOR = "0x514e62fc" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "user",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "roles",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/owner.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/owner.ts
index 94949dba052..26e37a619e0 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/owner.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/owner.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x8da5cb5b" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "result",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/ownershipHandoverExpiresAt.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/ownershipHandoverExpiresAt.ts
index 10e84ec3171..8fe37830db0 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/ownershipHandoverExpiresAt.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/ownershipHandoverExpiresAt.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "ownershipHandoverExpiresAt" function.
@@ -19,14 +19,14 @@ export type OwnershipHandoverExpiresAtParams = {
 export const FN_SELECTOR = "0xfee81cf4" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "pendingOwner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "result",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/rolesOf.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/rolesOf.ts
index 0079ccfea7e..5450af081eb 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/rolesOf.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/read/rolesOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "rolesOf" function.
@@ -16,14 +16,14 @@ export type RolesOfParams = {
 export const FN_SELECTOR = "0x2de94807" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "user",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "roles",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/cancelOwnershipHandover.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/cancelOwnershipHandover.ts
index 603d57d63fc..5508806b5ba 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/cancelOwnershipHandover.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/cancelOwnershipHandover.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/completeOwnershipHandover.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/completeOwnershipHandover.ts
index 84cd06bad6e..fbd54080592 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/completeOwnershipHandover.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/completeOwnershipHandover.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "completeOwnershipHandover" function.
@@ -21,8 +21,8 @@ export type CompleteOwnershipHandoverParams = WithOverrides<{
 export const FN_SELECTOR = "0xf04e283e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "pendingOwner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -126,23 +126,23 @@ export function completeOwnershipHandover(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.pendingOwner] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.pendingOwner] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/grantRoles.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/grantRoles.ts
index aa00ee8e415..9a024670bd9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/grantRoles.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/grantRoles.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "grantRoles" function.
@@ -19,12 +19,12 @@ export type GrantRolesParams = WithOverrides<{
 export const FN_SELECTOR = "0x1c10893f" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "user",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "roles",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function grantRoles(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.user, resolvedOptions.roles] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.user, resolvedOptions.roles] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/renounceOwnership.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/renounceOwnership.ts
index 28fa4ef4566..5371c300c7b 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/renounceOwnership.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/renounceOwnership.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/renounceRoles.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/renounceRoles.ts
index eb705776b19..f9d7616b494 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/renounceRoles.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/renounceRoles.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "renounceRoles" function.
@@ -18,8 +18,8 @@ export type RenounceRolesParams = WithOverrides<{
 export const FN_SELECTOR = "0x183a4f6e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "roles",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function renounceRoles(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.roles] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.roles] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/requestOwnershipHandover.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/requestOwnershipHandover.ts
index fd1aab1c092..e368991836c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/requestOwnershipHandover.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/requestOwnershipHandover.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/revokeRoles.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/revokeRoles.ts
index 61079b5f6b9..2ce4e70aca2 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/revokeRoles.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/revokeRoles.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "revokeRoles" function.
@@ -19,12 +19,12 @@ export type RevokeRolesParams = WithOverrides<{
 export const FN_SELECTOR = "0x4a4ee7b1" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "user",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "roles",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function revokeRoles(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.user, resolvedOptions.roles] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.user, resolvedOptions.roles] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/transferOwnership.ts b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/transferOwnership.ts
index c02c49a5685..72369738307 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/transferOwnership.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/OwnableRoles/write/transferOwnership.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "transferOwnership" function.
@@ -18,8 +18,8 @@ export type TransferOwnershipParams = WithOverrides<{
 export const FN_SELECTOR = "0xf2fde38b" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "newOwner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -119,23 +119,23 @@ export function transferOwnership(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newOwner] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newOwner] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/encode/encodeBytesOnInstall.ts
index f38917a3864..3930834c6e1 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/encode/encodeBytesOnInstall.ts
@@ -23,16 +23,16 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x2fbb2623" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint16",
     name: "royaltyBps",
+    type: "uint16",
   },
   {
-    type: "address",
     name: "transferValidator",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/events/DefaultRoyaltyUpdated.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/events/DefaultRoyaltyUpdated.ts
index 25bc5945a14..333242c3936 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/events/DefaultRoyaltyUpdated.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/events/DefaultRoyaltyUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "DefaultRoyaltyUpdated" event.
@@ -36,8 +36,8 @@ export function defaultRoyaltyUpdatedEvent(
   filters: DefaultRoyaltyUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event DefaultRoyaltyUpdated(address indexed recipient, uint16 bps)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/events/TokenRoyaltyUpdated.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/events/TokenRoyaltyUpdated.ts
index f90f117f6e3..4f783777de5 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/events/TokenRoyaltyUpdated.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/events/TokenRoyaltyUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokenRoyaltyUpdated" event.
@@ -42,8 +42,8 @@ export function tokenRoyaltyUpdatedEvent(
   filters: TokenRoyaltyUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokenRoyaltyUpdated(uint256 indexed tokenId, address indexed recipient, uint16 bps)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/module/install.ts
index b7717a9d368..62f4448a2a3 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "RoyaltyERC1155";
 
@@ -57,8 +57,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -96,8 +96,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getDefaultRoyaltyInfo.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getDefaultRoyaltyInfo.ts
index 161877a044f..79bb9aec7ea 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getDefaultRoyaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getDefaultRoyaltyInfo.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xb24f2d39" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getRoyaltyInfoForToken.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getRoyaltyInfoForToken.ts
index 106c526e719..394b63003af 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getRoyaltyInfoForToken.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getRoyaltyInfoForToken.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getRoyaltyInfoForToken" function.
@@ -16,8 +16,8 @@ export type GetRoyaltyInfoForTokenParams = {
 export const FN_SELECTOR = "0x4cc157df" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getTransferValidationFunction.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getTransferValidationFunction.ts
index 79049e5fc58..776b7cf96b2 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getTransferValidationFunction.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getTransferValidationFunction.ts
@@ -1,20 +1,19 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x0d705df6" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes4",
     name: "functionSignature",
+    type: "bytes4",
   },
   {
-    type: "bool",
     name: "isViewFunction",
+    type: "bool",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getTransferValidator.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getTransferValidator.ts
index 218f32e8641..dc5f443de9c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getTransferValidator.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/getTransferValidator.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x098144d4" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "validator",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/royaltyInfo.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/royaltyInfo.ts
index a8f3c6855f9..c3b89ac1636 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/royaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/read/royaltyInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "royaltyInfo" function.
@@ -20,22 +20,22 @@ export type RoyaltyInfoParams = {
 export const FN_SELECTOR = "0x2a55205a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_salePrice",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "royaltyAmount",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setDefaultRoyaltyInfo.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setDefaultRoyaltyInfo.ts
index 561504fb0fe..ce3acf2d779 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setDefaultRoyaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setDefaultRoyaltyInfo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setDefaultRoyaltyInfo" function.
@@ -25,12 +25,12 @@ export type SetDefaultRoyaltyInfoParams = WithOverrides<{
 export const FN_SELECTOR = "0x93d79445" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint16",
     name: "_royaltyBps",
+    type: "uint16",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -138,8 +138,19 @@ export function setDefaultRoyaltyInfo(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -148,16 +159,5 @@ export function setDefaultRoyaltyInfo(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setRoyaltyInfoForToken.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setRoyaltyInfoForToken.ts
index e41fc809383..bce879fd67d 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setRoyaltyInfoForToken.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setRoyaltyInfoForToken.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setRoyaltyInfoForToken" function.
@@ -23,16 +23,16 @@ export type SetRoyaltyInfoForTokenParams = WithOverrides<{
 export const FN_SELECTOR = "0xab8e8c44" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_recipient",
+    type: "address",
   },
   {
-    type: "uint16",
     name: "_bps",
+    type: "uint16",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,8 +146,19 @@ export function setRoyaltyInfoForToken(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -157,16 +168,5 @@ export function setRoyaltyInfoForToken(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setTransferValidator.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setTransferValidator.ts
index 2294f18888e..e0ebc01e101 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setTransferValidator.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC1155/write/setTransferValidator.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTransferValidator" function.
@@ -21,8 +21,8 @@ export type SetTransferValidatorParams = WithOverrides<{
 export const FN_SELECTOR = "0xa9fc664e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "validator",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -124,23 +124,23 @@ export function setTransferValidator(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.validator] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.validator] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/encode/encodeBytesOnInstall.ts
index f38917a3864..3930834c6e1 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/encode/encodeBytesOnInstall.ts
@@ -23,16 +23,16 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x2fbb2623" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint16",
     name: "royaltyBps",
+    type: "uint16",
   },
   {
-    type: "address",
     name: "transferValidator",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/events/DefaultRoyaltyUpdated.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/events/DefaultRoyaltyUpdated.ts
index 4051647d5cc..445ff0cd1c6 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/events/DefaultRoyaltyUpdated.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/events/DefaultRoyaltyUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "DefaultRoyaltyUpdated" event.
@@ -36,8 +36,8 @@ export function defaultRoyaltyUpdatedEvent(
   filters: DefaultRoyaltyUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event DefaultRoyaltyUpdated(address indexed recipient, uint256 bps)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/events/TokenRoyaltyUpdated.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/events/TokenRoyaltyUpdated.ts
index 75761816d99..1f9d3f1785b 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/events/TokenRoyaltyUpdated.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/events/TokenRoyaltyUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "TokenRoyaltyUpdated" event.
@@ -42,8 +42,8 @@ export function tokenRoyaltyUpdatedEvent(
   filters: TokenRoyaltyUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event TokenRoyaltyUpdated(uint256 indexed tokenId, address indexed recipient, uint16 bps)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/module/install.ts
index 7061f2b4f41..5443b949f05 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "RoyaltyERC721";
 
@@ -57,8 +57,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -96,8 +96,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getDefaultRoyaltyInfo.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getDefaultRoyaltyInfo.ts
index 10575fe9af2..ca55810873a 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getDefaultRoyaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getDefaultRoyaltyInfo.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xb24f2d39" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getRoyaltyInfoForToken.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getRoyaltyInfoForToken.ts
index 6718ff82997..3d4af24e62c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getRoyaltyInfoForToken.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getRoyaltyInfoForToken.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getRoyaltyInfoForToken" function.
@@ -16,8 +16,8 @@ export type GetRoyaltyInfoForTokenParams = {
 export const FN_SELECTOR = "0x4cc157df" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getTransferValidationFunction.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getTransferValidationFunction.ts
index 8e50ecc5c12..e891734133a 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getTransferValidationFunction.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getTransferValidationFunction.ts
@@ -1,20 +1,19 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x0d705df6" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes4",
     name: "functionSignature",
+    type: "bytes4",
   },
   {
-    type: "bool",
     name: "isViewFunction",
+    type: "bool",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getTransferValidator.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getTransferValidator.ts
index a4c7f3198e9..178845eae52 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getTransferValidator.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/getTransferValidator.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x098144d4" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "validator",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/royaltyInfo.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/royaltyInfo.ts
index 521ca3e83a4..474b1820f22 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/royaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/read/royaltyInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "royaltyInfo" function.
@@ -20,22 +20,22 @@ export type RoyaltyInfoParams = {
 export const FN_SELECTOR = "0x2a55205a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_salePrice",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "receiver",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "royaltyAmount",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setDefaultRoyaltyInfo.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setDefaultRoyaltyInfo.ts
index db307f59b19..c795304efef 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setDefaultRoyaltyInfo.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setDefaultRoyaltyInfo.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setDefaultRoyaltyInfo" function.
@@ -25,12 +25,12 @@ export type SetDefaultRoyaltyInfoParams = WithOverrides<{
 export const FN_SELECTOR = "0x93d79445" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint16",
     name: "_royaltyBps",
+    type: "uint16",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -138,8 +138,19 @@ export function setDefaultRoyaltyInfo(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -148,16 +159,5 @@ export function setDefaultRoyaltyInfo(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setRoyaltyInfoForToken.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setRoyaltyInfoForToken.ts
index cd56610879a..3596a985a30 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setRoyaltyInfoForToken.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setRoyaltyInfoForToken.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setRoyaltyInfoForToken" function.
@@ -23,16 +23,16 @@ export type SetRoyaltyInfoForTokenParams = WithOverrides<{
 export const FN_SELECTOR = "0xab8e8c44" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_recipient",
+    type: "address",
   },
   {
-    type: "uint16",
     name: "_bps",
+    type: "uint16",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -146,8 +146,19 @@ export function setRoyaltyInfoForToken(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -157,16 +168,5 @@ export function setRoyaltyInfoForToken(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setTransferValidator.ts b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setTransferValidator.ts
index 10ec0919cb2..f1a38cc3b14 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setTransferValidator.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/RoyaltyERC721/write/setTransferValidator.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTransferValidator" function.
@@ -21,8 +21,8 @@ export type SetTransferValidatorParams = WithOverrides<{
 export const FN_SELECTOR = "0xa9fc664e" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "validator",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -124,23 +124,23 @@ export function setTransferValidator(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.validator] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.validator] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/encode/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/encode/encodeBytesOnInstall.ts
index 308f4bc860a..715ef2901f7 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/encode/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/encode/encodeBytesOnInstall.ts
@@ -15,8 +15,8 @@ export type EncodeBytesOnInstallParams = {
 export const FN_SELECTOR = "0x579a6021" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "startTokenId",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/module/install.ts
index ce28b48f975..4259c6a152e 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/module/install.ts
@@ -4,12 +4,12 @@ import type { ThirdwebContract } from "../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../transaction/prepare-transaction.js";
 import type { Address } from "../../../../../utils/address.js";
 import type { Account } from "../../../../../wallets/interfaces/wallet.js";
+import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
+import { installPublishedModule } from "../../../common/installPublishedModule.js";
 import {
   type EncodeBytesOnInstallParams,
   encodeBytesOnInstallParams,
 } from "../encode/encodeBytesOnInstall.js";
-import { getOrDeployModule } from "../../../common/getOrDeployModule.js";
-import { installPublishedModule } from "../../../common/installPublishedModule.js";
 
 const contractId = "SequentialTokenIdERC1155";
 
@@ -55,8 +55,8 @@ export function module(
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: encodeInstall(params),
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -92,8 +92,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: encodeInstall(options.params),
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/read/getModuleConfig.ts b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/read/getModuleConfig.ts
index 4750da4f484..d9ce9b9a5b9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/read/getModuleConfig.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/read/getModuleConfig.ts
@@ -1,54 +1,53 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x89e04e0e" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "config",
     components: [
       {
-        type: "bool",
         name: "registerInstallationCallback",
+        type: "bool",
       },
       {
-        type: "bytes4[]",
         name: "requiredInterfaces",
+        type: "bytes4[]",
       },
       {
-        type: "bytes4[]",
         name: "supportedInterfaces",
+        type: "bytes4[]",
       },
       {
-        type: "tuple[]",
-        name: "callbackFunctions",
         components: [
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
         ],
+        name: "callbackFunctions",
+        type: "tuple[]",
       },
       {
-        type: "tuple[]",
-        name: "fallbackFunctions",
         components: [
           {
-            type: "bytes4",
             name: "selector",
+            type: "bytes4",
           },
           {
-            type: "uint256",
             name: "permissionBits",
+            type: "uint256",
           },
         ],
+        name: "fallbackFunctions",
+        type: "tuple[]",
       },
     ],
+    name: "config",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/read/getNextTokenId.ts b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/read/getNextTokenId.ts
index 5f09bcb32ac..bd993363080 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/read/getNextTokenId.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/read/getNextTokenId.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcaa0f92a" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/write/updateTokenIdERC1155.ts b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/write/updateTokenIdERC1155.ts
index 698a143391c..eaa624292f0 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/write/updateTokenIdERC1155.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/SequentialTokenIdERC1155/write/updateTokenIdERC1155.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "updateTokenIdERC1155" function.
@@ -18,8 +18,8 @@ export type UpdateTokenIdERC1155Params = WithOverrides<{
 export const FN_SELECTOR = "0x034eb4dd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -125,23 +125,23 @@ export function updateTokenIdERC1155(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.tokenId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.tokenId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/module/install.ts
index 5d31516a063..08bc5943cf9 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/module/install.ts
@@ -48,8 +48,8 @@ export function module(params?: { publisher?: string }) {
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: "0x" as const,
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -83,8 +83,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: "0x" as const,
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/encodeBytesOnInstall.ts
index 5fe0ab63e3a..a96c96e2a66 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/encodeBytesOnInstall.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfec7ff72" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/isTransferEnabled.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/isTransferEnabled.ts
index 5e91dbb0878..6b6d99356cf 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/isTransferEnabled.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/isTransferEnabled.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcca5dcb6" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/isTransferEnabledFor.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/isTransferEnabledFor.ts
index 9c3942e30e3..b148b098f53 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/isTransferEnabledFor.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/read/isTransferEnabledFor.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isTransferEnabledFor" function.
@@ -16,8 +16,8 @@ export type IsTransferEnabledForParams = {
 export const FN_SELECTOR = "0x735d0538" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "target",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/write/setTransferable.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/write/setTransferable.ts
index 586ec8163af..931c64cc23c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/write/setTransferable.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/write/setTransferable.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTransferable" function.
@@ -21,8 +21,8 @@ export type SetTransferableParams = WithOverrides<{
 export const FN_SELECTOR = "0x9cd23707" as const;
 const FN_INPUTS = [
   {
-    type: "bool",
     name: "enableTransfer",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setTransferable(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.enableTransfer] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.enableTransfer] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/write/setTransferableFor.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/write/setTransferableFor.ts
index fc521da4fc5..f09c0328a29 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/write/setTransferableFor.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC1155/write/setTransferableFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTransferableFor" function.
@@ -22,12 +22,12 @@ export type SetTransferableForParams = WithOverrides<{
 export const FN_SELECTOR = "0x4c297cbd" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "target",
+    type: "address",
   },
   {
-    type: "bool",
     name: "enableTransfer",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -133,23 +133,23 @@ export function setTransferableFor(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.target, resolvedOptions.enableTransfer] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.target, resolvedOptions.enableTransfer] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/module/install.ts
index c847d48cab4..565fe2593d5 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/module/install.ts
@@ -48,8 +48,8 @@ export function module(params?: { publisher?: string }) {
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: "0x" as const,
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -83,8 +83,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: "0x" as const,
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/encodeBytesOnInstall.ts
index f2282b92fe8..33d073e5146 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/encodeBytesOnInstall.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfec7ff72" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/isTransferEnabled.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/isTransferEnabled.ts
index 03a1c407723..62ccbd551ab 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/isTransferEnabled.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/isTransferEnabled.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcca5dcb6" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/isTransferEnabledFor.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/isTransferEnabledFor.ts
index 370d8312c2e..b6f36081ea6 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/isTransferEnabledFor.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/read/isTransferEnabledFor.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isTransferEnabledFor" function.
@@ -16,8 +16,8 @@ export type IsTransferEnabledForParams = {
 export const FN_SELECTOR = "0x735d0538" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "target",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/write/setTransferable.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/write/setTransferable.ts
index 893845f2478..b5096a9a7bd 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/write/setTransferable.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/write/setTransferable.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTransferable" function.
@@ -21,8 +21,8 @@ export type SetTransferableParams = WithOverrides<{
 export const FN_SELECTOR = "0x9cd23707" as const;
 const FN_INPUTS = [
   {
-    type: "bool",
     name: "enableTransfer",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setTransferable(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.enableTransfer] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.enableTransfer] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/write/setTransferableFor.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/write/setTransferableFor.ts
index b075bc48f49..55ff5f1e4d3 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/write/setTransferableFor.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC20/write/setTransferableFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTransferableFor" function.
@@ -22,12 +22,12 @@ export type SetTransferableForParams = WithOverrides<{
 export const FN_SELECTOR = "0x4c297cbd" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "target",
+    type: "address",
   },
   {
-    type: "bool",
     name: "enableTransfer",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -133,23 +133,23 @@ export function setTransferableFor(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.target, resolvedOptions.enableTransfer] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.target, resolvedOptions.enableTransfer] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/module/install.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/module/install.ts
index 4f83bb4478d..afd927bc4be 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/module/install.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/module/install.ts
@@ -48,8 +48,8 @@ export function module(params?: { publisher?: string }) {
       publisher: params?.publisher,
     });
     return {
-      module: moduleContract.address as Address,
       data: "0x" as const,
+      module: moduleContract.address as Address,
     };
   };
 }
@@ -83,8 +83,8 @@ export function install(options: {
   return installPublishedModule({
     account: options.account,
     contract: options.contract,
-    moduleName: contractId,
     moduleData: "0x" as const,
+    moduleName: contractId,
     publisher: options.params?.publisher,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/encodeBytesOnInstall.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/encodeBytesOnInstall.ts
index bf376a7ff49..6e17d1c53f7 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/encodeBytesOnInstall.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/encodeBytesOnInstall.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfec7ff72" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/isTransferEnabled.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/isTransferEnabled.ts
index d15e0f67619..19244f93174 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/isTransferEnabled.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/isTransferEnabled.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcca5dcb6" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/isTransferEnabledFor.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/isTransferEnabledFor.ts
index 7ce195f07a7..30f28d06d3c 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/isTransferEnabledFor.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/read/isTransferEnabledFor.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "isTransferEnabledFor" function.
@@ -16,8 +16,8 @@ export type IsTransferEnabledForParams = {
 export const FN_SELECTOR = "0x735d0538" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "target",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/write/setTransferable.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/write/setTransferable.ts
index 6c553cf6db0..1a9467f6a60 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/write/setTransferable.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/write/setTransferable.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTransferable" function.
@@ -21,8 +21,8 @@ export type SetTransferableParams = WithOverrides<{
 export const FN_SELECTOR = "0x9cd23707" as const;
 const FN_INPUTS = [
   {
-    type: "bool",
     name: "enableTransfer",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setTransferable(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.enableTransfer] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.enableTransfer] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/write/setTransferableFor.ts b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/write/setTransferableFor.ts
index 27bb4135660..fc9691076ff 100644
--- a/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/write/setTransferableFor.ts
+++ b/packages/thirdweb/src/extensions/modules/__generated__/TransferableERC721/write/setTransferableFor.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setTransferableFor" function.
@@ -22,12 +22,12 @@ export type SetTransferableForParams = WithOverrides<{
 export const FN_SELECTOR = "0x4c297cbd" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "target",
+    type: "address",
   },
   {
-    type: "bool",
     name: "enableTransfer",
+    type: "bool",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -133,23 +133,23 @@ export function setTransferableFor(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.target, resolvedOptions.enableTransfer] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.target, resolvedOptions.enableTransfer] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/common/checkModulesCompatibility.test.ts b/packages/thirdweb/src/extensions/modules/common/checkModulesCompatibility.test.ts
index 52e8b6fe65b..246896f5038 100644
--- a/packages/thirdweb/src/extensions/modules/common/checkModulesCompatibility.test.ts
+++ b/packages/thirdweb/src/extensions/modules/common/checkModulesCompatibility.test.ts
@@ -10,10 +10,10 @@ import { checkModulesCompatibility } from "./checkModulesCompatibility.js";
 describe("compatibleModules", () => {
   it("should return true for compatible modules", async () => {
     const result = await checkModulesCompatibility({
-      coreBytecode: ERC20_CORE_BYTECODE,
-      moduleBytecodes: [CLAIMABLE_ERC20_MODULE_BYTECODE],
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      coreBytecode: ERC20_CORE_BYTECODE,
+      moduleBytecodes: [CLAIMABLE_ERC20_MODULE_BYTECODE],
     });
 
     expect(result).toBe(true);
@@ -21,10 +21,10 @@ describe("compatibleModules", () => {
 
   it("should return false for incompatible modules", async () => {
     const result = await checkModulesCompatibility({
-      coreBytecode: ERC20_CORE_BYTECODE,
-      moduleBytecodes: [CLAIMABLE_ERC721_BYTECODE],
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      coreBytecode: ERC20_CORE_BYTECODE,
+      moduleBytecodes: [CLAIMABLE_ERC721_BYTECODE],
     });
 
     expect(result).toBe(false);
@@ -32,13 +32,13 @@ describe("compatibleModules", () => {
 
   it("should return false for overlapping modules", async () => {
     const result = await checkModulesCompatibility({
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       coreBytecode: ERC20_CORE_BYTECODE,
       moduleBytecodes: [
         CLAIMABLE_ERC20_MODULE_BYTECODE,
         MINTABLE_ERC20_BYTECODE,
       ],
-      chain: ANVIL_CHAIN,
-      client: TEST_CLIENT,
     });
 
     expect(result).toBe(false);
diff --git a/packages/thirdweb/src/extensions/modules/common/checkModulesCompatibility.ts b/packages/thirdweb/src/extensions/modules/common/checkModulesCompatibility.ts
index 5187742aefb..fe59ce44557 100644
--- a/packages/thirdweb/src/extensions/modules/common/checkModulesCompatibility.ts
+++ b/packages/thirdweb/src/extensions/modules/common/checkModulesCompatibility.ts
@@ -39,19 +39,19 @@ export async function checkModulesCompatibility(options: {
     _coreBytecode = `0x${_coreBytecode.substring(index)}`;
   }
   const rpcClient = getRpcClient({
-    client: options.client,
     chain: options.chain,
+    client: options.client,
   });
 
   // get the core's supported callback functions
   const coreCallResult = await eth_call(rpcClient, {
     data: getSupportedCallbackFunctionsSelector,
-    to: addr,
     stateOverrides: {
       [addr]: {
         code: _coreBytecode,
       },
     },
+    to: addr,
   });
 
   const decodedCallResult =
@@ -73,12 +73,12 @@ export async function checkModulesCompatibility(options: {
 
       const callResult = await eth_call(rpcClient, {
         data: getModuleConfigSelector,
-        to: addr,
         stateOverrides: {
           [addr]: {
             code: moduleBytecode,
           },
         },
+        to: addr,
       });
       return decodeGetModuleConfigResult(callResult);
     }),
@@ -102,12 +102,12 @@ export async function checkModulesCompatibility(options: {
           data: encodeSupportsInterface({
             interfaceId: r,
           }),
-          to: addr,
           stateOverrides: {
             [addr]: {
               code: _coreBytecode,
             },
           },
+          to: addr,
         });
         return decodeSupportsInterfaceResult(callResult);
       }),
diff --git a/packages/thirdweb/src/extensions/modules/common/getOrDeployModule.ts b/packages/thirdweb/src/extensions/modules/common/getOrDeployModule.ts
index 21c01702f20..3616e9ab981 100644
--- a/packages/thirdweb/src/extensions/modules/common/getOrDeployModule.ts
+++ b/packages/thirdweb/src/extensions/modules/common/getOrDeployModule.ts
@@ -32,9 +32,9 @@ export async function getOrDeployModule(options: {
 }) {
   const { client, chain, account, contractId, publisher } = options;
   const contract = await getOrDeployInfraContract({
-    client,
-    chain,
     account,
+    chain,
+    client,
     contractId,
     publisher,
   });
@@ -67,8 +67,8 @@ export async function getDeployedModule(options: {
 }) {
   const { client, chain, contractId, publisher } = options;
   return getDeployedInfraContract({
-    client,
     chain,
+    client,
     contractId,
     publisher,
   });
diff --git a/packages/thirdweb/src/extensions/modules/common/grantMinterRole.ts b/packages/thirdweb/src/extensions/modules/common/grantMinterRole.ts
index 469ea4b2e49..1f79b9e586c 100644
--- a/packages/thirdweb/src/extensions/modules/common/grantMinterRole.ts
+++ b/packages/thirdweb/src/extensions/modules/common/grantMinterRole.ts
@@ -33,7 +33,7 @@ export function grantMinterRole(
 ) {
   return grantRoles({
     contract: options.contract,
-    user: options.user,
     roles: MINTER_ROLE,
+    user: options.user,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/common/installPublishedModule.ts b/packages/thirdweb/src/extensions/modules/common/installPublishedModule.ts
index ff022357c1d..6592ce0ce69 100644
--- a/packages/thirdweb/src/extensions/modules/common/installPublishedModule.ts
+++ b/packages/thirdweb/src/extensions/modules/common/installPublishedModule.ts
@@ -48,23 +48,23 @@ export function installPublishedModule(options: InstallPublishedModuleOptions) {
   } = options;
 
   return installModule({
-    contract,
-    overrides: {
-      nonce,
-    },
     asyncParams: async () => {
       const deployedModule = await getOrDeployInfraForPublishedContract({
+        account,
         chain: contract.chain,
         client: contract.client,
-        account,
-        contractId: moduleName,
         constructorParams,
+        contractId: moduleName,
         publisher,
       });
       return {
-        moduleContract: deployedModule.implementationContract.address as string,
         data: moduleData || "0x",
+        moduleContract: deployedModule.implementationContract.address as string,
       };
     },
+    contract,
+    overrides: {
+      nonce,
+    },
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/common/uninstallModuleByProxy.ts b/packages/thirdweb/src/extensions/modules/common/uninstallModuleByProxy.ts
index d8372080f05..73901d2d968 100644
--- a/packages/thirdweb/src/extensions/modules/common/uninstallModuleByProxy.ts
+++ b/packages/thirdweb/src/extensions/modules/common/uninstallModuleByProxy.ts
@@ -1,8 +1,8 @@
 import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { resolveImplementation } from "../../../utils/bytecode/resolveImplementation.js";
 import { uninstallModule } from "../__generated__/IModularCore/write/uninstallModule.js";
@@ -39,19 +39,19 @@ export function uninstallModuleByProxy(options: UninstallModuleByProxyOptions) {
   const { client, chain, contract, moduleProxyAddress, moduleData } = options;
 
   return uninstallModule({
-    contract,
     asyncParams: async () => {
       const moduleImplementation = await resolveImplementation(
         getContract({
+          address: moduleProxyAddress,
           chain,
           client,
-          address: moduleProxyAddress,
         }),
       );
       return {
-        moduleContract: moduleImplementation.address,
         data: moduleData || "0x",
+        moduleContract: moduleImplementation.address,
       };
     },
+    contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/modules/common/uninstallPublishedModule.ts b/packages/thirdweb/src/extensions/modules/common/uninstallPublishedModule.ts
index 94ea3c9547b..bac20c19fe4 100644
--- a/packages/thirdweb/src/extensions/modules/common/uninstallPublishedModule.ts
+++ b/packages/thirdweb/src/extensions/modules/common/uninstallPublishedModule.ts
@@ -37,7 +37,6 @@ export function uninstallPublishedModule(
   const { contract, moduleName, publisherAddress, moduleData } = options;
 
   return uninstallModule({
-    contract,
     asyncParams: async () => {
       const deployedModule = await getDeployedInfraContract({
         chain: contract.chain,
@@ -46,9 +45,10 @@ export function uninstallPublishedModule(
         publisher: publisherAddress,
       });
       return {
-        moduleContract: deployedModule?.address as string,
         data: moduleData || "0x",
+        moduleContract: deployedModule?.address as string,
       };
     },
+    contract,
   });
 }
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBasefee.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBasefee.ts
index af544c422c1..89315b85fd4 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBasefee.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBasefee.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3e64a696" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "basefee",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBlockHash.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBlockHash.ts
index 3884c555518..1cae461b7f6 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBlockHash.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBlockHash.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getBlockHash" function.
@@ -19,14 +19,14 @@ export type GetBlockHashParams = {
 export const FN_SELECTOR = "0xee82ac5e" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes32",
     name: "blockHash",
+    type: "bytes32",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBlockNumber.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBlockNumber.ts
index c14e8ec22b4..1778d07fb55 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBlockNumber.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getBlockNumber.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x42cbb15c" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getChainId.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getChainId.ts
index 13081555936..e838cdbbd89 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getChainId.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getChainId.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3408e470" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "chainid",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockCoinbase.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockCoinbase.ts
index 7f20ac5749c..f0a479e8f6d 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockCoinbase.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockCoinbase.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa8b0574e" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "coinbase",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockDifficulty.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockDifficulty.ts
index 38a3806a0cc..54792ffa12e 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockDifficulty.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockDifficulty.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x72425d9d" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "difficulty",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockGasLimit.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockGasLimit.ts
index 7ce8741e849..101ac59bd58 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockGasLimit.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockGasLimit.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x86d516e8" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "gaslimit",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockTimestamp.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockTimestamp.ts
index 02daf1735db..84891a0d046 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockTimestamp.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getCurrentBlockTimestamp.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x0f28c97d" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "timestamp",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getEthBalance.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getEthBalance.ts
index 30dca5d1fba..0f5f3c88fae 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getEthBalance.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getEthBalance.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getEthBalance" function.
@@ -16,14 +16,14 @@ export type GetEthBalanceParams = {
 export const FN_SELECTOR = "0x4d2301cc" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "addr",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "balance",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getLastBlockHash.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getLastBlockHash.ts
index f1a2b78e80e..080524bd944 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getLastBlockHash.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/read/getLastBlockHash.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x27e86d6e" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes32",
     name: "blockHash",
+    type: "bytes32",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate.ts
index f8dd64f3895..d12a1873521 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "aggregate" function.
@@ -25,28 +25,28 @@ export type AggregateParams = WithOverrides<{
 export const FN_SELECTOR = "0x252dba42" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "calls",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
     ],
+    name: "calls",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
   {
-    type: "bytes[]",
     name: "returnData",
+    type: "bytes[]",
   },
 ] as const;
 
@@ -143,23 +143,23 @@ export function aggregate(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.calls] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.calls] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate3.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate3.ts
index d93589faf77..a996711c929 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate3.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate3.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "aggregate3" function.
@@ -26,38 +26,38 @@ export type Aggregate3Params = WithOverrides<{
 export const FN_SELECTOR = "0x82ad56cb" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "calls",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "bool",
         name: "allowFailure",
+        type: "bool",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
     ],
+    name: "calls",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "returnData",
     components: [
       {
-        type: "bool",
         name: "success",
+        type: "bool",
       },
       {
-        type: "bytes",
         name: "returnData",
+        type: "bytes",
       },
     ],
+    name: "returnData",
+    type: "tuple[]",
   },
 ] as const;
 
@@ -154,23 +154,23 @@ export function aggregate3(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.calls] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.calls] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate3Value.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate3Value.ts
index c08826f923c..51477184ea9 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate3Value.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/aggregate3Value.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "aggregate3Value" function.
@@ -27,42 +27,42 @@ export type Aggregate3ValueParams = WithOverrides<{
 export const FN_SELECTOR = "0x174dea71" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "calls",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "bool",
         name: "allowFailure",
+        type: "bool",
       },
       {
-        type: "uint256",
         name: "value",
+        type: "uint256",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
     ],
+    name: "calls",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "returnData",
     components: [
       {
-        type: "bool",
         name: "success",
+        type: "bool",
       },
       {
-        type: "bytes",
         name: "returnData",
+        type: "bytes",
       },
     ],
+    name: "returnData",
+    type: "tuple[]",
   },
 ] as const;
 
@@ -159,23 +159,23 @@ export function aggregate3Value(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.calls] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.calls] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/blockAndAggregate.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/blockAndAggregate.ts
index aaad8b8ba9d..eff1237ea72 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/blockAndAggregate.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/blockAndAggregate.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "blockAndAggregate" function.
@@ -25,42 +25,42 @@ export type BlockAndAggregateParams = WithOverrides<{
 export const FN_SELECTOR = "0xc3077fa9" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "calls",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
     ],
+    name: "calls",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
   {
-    type: "bytes32",
     name: "blockHash",
+    type: "bytes32",
   },
   {
-    type: "tuple[]",
-    name: "returnData",
     components: [
       {
-        type: "bool",
         name: "success",
+        type: "bool",
       },
       {
-        type: "bytes",
         name: "returnData",
+        type: "bytes",
       },
     ],
+    name: "returnData",
+    type: "tuple[]",
   },
 ] as const;
 
@@ -159,23 +159,23 @@ export function blockAndAggregate(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.calls] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.calls] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/tryAggregate.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/tryAggregate.ts
index 2e262064045..bf87fb34568 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/tryAggregate.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/tryAggregate.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "tryAggregate" function.
@@ -29,38 +29,38 @@ export type TryAggregateParams = WithOverrides<{
 export const FN_SELECTOR = "0xbce38bd7" as const;
 const FN_INPUTS = [
   {
-    type: "bool",
     name: "requireSuccess",
+    type: "bool",
   },
   {
-    type: "tuple[]",
-    name: "calls",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
     ],
+    name: "calls",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "returnData",
     components: [
       {
-        type: "bool",
         name: "success",
+        type: "bool",
       },
       {
-        type: "bytes",
         name: "returnData",
+        type: "bytes",
       },
     ],
+    name: "returnData",
+    type: "tuple[]",
   },
 ] as const;
 
@@ -163,23 +163,23 @@ export function tryAggregate(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.requireSuccess, resolvedOptions.calls] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.requireSuccess, resolvedOptions.calls] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/tryBlockAndAggregate.ts b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/tryBlockAndAggregate.ts
index 148eb873fc5..2c750751ccd 100644
--- a/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/tryBlockAndAggregate.ts
+++ b/packages/thirdweb/src/extensions/multicall3/__generated__/IMulticall3/write/tryBlockAndAggregate.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "tryBlockAndAggregate" function.
@@ -29,46 +29,46 @@ export type TryBlockAndAggregateParams = WithOverrides<{
 export const FN_SELECTOR = "0x399542e9" as const;
 const FN_INPUTS = [
   {
-    type: "bool",
     name: "requireSuccess",
+    type: "bool",
   },
   {
-    type: "tuple[]",
-    name: "calls",
     components: [
       {
-        type: "address",
         name: "target",
+        type: "address",
       },
       {
-        type: "bytes",
         name: "callData",
+        type: "bytes",
       },
     ],
+    name: "calls",
+    type: "tuple[]",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
   {
-    type: "bytes32",
     name: "blockHash",
+    type: "bytes32",
   },
   {
-    type: "tuple[]",
-    name: "returnData",
     components: [
       {
-        type: "bool",
         name: "success",
+        type: "bool",
       },
       {
-        type: "bytes",
         name: "returnData",
+        type: "bytes",
       },
     ],
+    name: "returnData",
+    type: "tuple[]",
   },
 ] as const;
 
@@ -175,23 +175,23 @@ export function tryBlockAndAggregate(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.requireSuccess, resolvedOptions.calls] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.requireSuccess, resolvedOptions.calls] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackCreated.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackCreated.ts
index 85a8404f8e8..7f7e59e4970 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackCreated.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackCreated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackCreated" event.
@@ -34,8 +34,8 @@ export type PackCreatedEventFilters = Partial<{
  */
 export function packCreatedEvent(filters: PackCreatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event PackCreated(uint256 indexed packId, address recipient, uint256 totalPacksCreated)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackOpened.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackOpened.ts
index 34e6efaa1fe..eb67785465c 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackOpened.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackOpened.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackOpened" event.
@@ -40,8 +40,8 @@ export type PackOpenedEventFilters = Partial<{
  */
 export function packOpenedEvent(filters: PackOpenedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event PackOpened(uint256 indexed packId, address indexed opener, uint256 numOfPacksOpened, (address assetContract, uint8 tokenType, uint256 tokenId, uint256 totalAmount)[] rewardUnitsDistributed)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackUpdated.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackUpdated.ts
index 5858c8f0520..27908200057 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackUpdated.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/events/PackUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackUpdated" event.
@@ -34,8 +34,8 @@ export type PackUpdatedEventFilters = Partial<{
  */
 export function packUpdatedEvent(filters: PackUpdatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event PackUpdated(uint256 indexed packId, address recipient, uint256 totalPacksCreated)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/canUpdatePack.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/canUpdatePack.ts
index 8f713d143a3..18d152fdf41 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/canUpdatePack.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/canUpdatePack.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "canUpdatePack" function.
@@ -16,8 +16,8 @@ export type CanUpdatePackParams = {
 export const FN_SELECTOR = "0xb0381b08" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_key",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getPackContents.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getPackContents.ts
index 233d0176ef1..f455965d931 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getPackContents.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getPackContents.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPackContents" function.
@@ -16,36 +16,36 @@ export type GetPackContentsParams = {
 export const FN_SELECTOR = "0x8d4c446a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_packId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "contents",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    name: "contents",
+    type: "tuple[]",
   },
   {
-    type: "uint256[]",
     name: "perUnitAmounts",
+    type: "uint256[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getTokenCountOfBundle.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getTokenCountOfBundle.ts
index 63551a691f3..6cca3c47cf2 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getTokenCountOfBundle.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getTokenCountOfBundle.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getTokenCountOfBundle" function.
@@ -16,8 +16,8 @@ export type GetTokenCountOfBundleParams = {
 export const FN_SELECTOR = "0xd0d2fe25" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_bundleId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getTokenOfBundle.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getTokenOfBundle.ts
index 6d3292d8791..6129e13d9d4 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getTokenOfBundle.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getTokenOfBundle.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getTokenOfBundle" function.
@@ -17,35 +17,35 @@ export type GetTokenOfBundleParams = {
 export const FN_SELECTOR = "0x1da799c9" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_bundleId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getUriOfBundle.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getUriOfBundle.ts
index 9991755461f..5d808e4b42c 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getUriOfBundle.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/read/getUriOfBundle.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getUriOfBundle" function.
@@ -16,8 +16,8 @@ export type GetUriOfBundleParams = {
 export const FN_SELECTOR = "0x61195e94" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_bundleId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/addPackContents.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/addPackContents.ts
index 25f164cd723..c4a1a4dc21d 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/addPackContents.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/addPackContents.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "addPackContents" function.
@@ -36,48 +36,48 @@ export type AddPackContentsParams = WithOverrides<{
 export const FN_SELECTOR = "0xa96b1438" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_packId",
+    type: "uint256",
   },
   {
-    type: "tuple[]",
-    name: "_contents",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    name: "_contents",
+    type: "tuple[]",
   },
   {
-    type: "uint256[]",
     name: "_numOfRewardUnits",
+    type: "uint256[]",
   },
   {
-    type: "address",
     name: "_recipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "packTotalSupply",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "newSupplyAdded",
+    type: "uint256",
   },
 ] as const;
 
@@ -188,8 +188,19 @@ export function addPackContents(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -200,16 +211,5 @@ export function addPackContents(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/createPack.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/createPack.ts
index b73f6efe6e4..be63061314e 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/createPack.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/createPack.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createPack" function.
@@ -44,56 +44,56 @@ export type CreatePackParams = WithOverrides<{
 export const FN_SELECTOR = "0x092e6075" as const;
 const FN_INPUTS = [
   {
-    type: "tuple[]",
-    name: "contents",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    name: "contents",
+    type: "tuple[]",
   },
   {
-    type: "uint256[]",
     name: "numOfRewardUnits",
+    type: "uint256[]",
   },
   {
-    type: "string",
     name: "packUri",
+    type: "string",
   },
   {
-    type: "uint128",
     name: "openStartTimestamp",
+    type: "uint128",
   },
   {
-    type: "uint128",
     name: "amountDistributedPerOpen",
+    type: "uint128",
   },
   {
-    type: "address",
     name: "recipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "packId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "packTotalSupply",
+    type: "uint256",
   },
 ] as const;
 
@@ -212,8 +212,19 @@ export function createPack(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -226,16 +237,5 @@ export function createPack(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/openPack.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/openPack.ts
index cb086aedfcd..97ca8cb2c9d 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/openPack.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPack/write/openPack.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "openPack" function.
@@ -22,35 +22,35 @@ export type OpenPackParams = WithOverrides<{
 export const FN_SELECTOR = "0x914e126a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "packId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "amountToOpen",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    type: "tuple[]",
   },
 ] as const;
 
@@ -148,23 +148,23 @@ export function openPack(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.packId, resolvedOptions.amountToOpen] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.packId, resolvedOptions.amountToOpen] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/events/PackOpenRequested.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/events/PackOpenRequested.ts
index dc0b6ac9be2..1c57f1ecb1b 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/events/PackOpenRequested.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/events/PackOpenRequested.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackOpenRequested" event.
@@ -42,8 +42,8 @@ export function packOpenRequestedEvent(
   filters: PackOpenRequestedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event PackOpenRequested(address indexed opener, uint256 indexed packId, uint256 amountToOpen, uint256 requestId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/events/PackRandomnessFulfilled.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/events/PackRandomnessFulfilled.ts
index dac830eb692..031826194c5 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/events/PackRandomnessFulfilled.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/events/PackRandomnessFulfilled.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PackRandomnessFulfilled" event.
@@ -42,8 +42,8 @@ export function packRandomnessFulfilledEvent(
   filters: PackRandomnessFulfilledEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event PackRandomnessFulfilled(uint256 indexed packId, uint256 indexed requestId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/read/canClaimRewards.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/read/canClaimRewards.ts
index cac29e8419e..80e8a798a58 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/read/canClaimRewards.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/read/canClaimRewards.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "canClaimRewards" function.
@@ -16,8 +16,8 @@ export type CanClaimRewardsParams = {
 export const FN_SELECTOR = "0xa9b47a66" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_opener",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/write/claimRewards.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/write/claimRewards.ts
index 381d4d1006c..bdc6de9c6d2 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/write/claimRewards.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/write/claimRewards.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
@@ -7,26 +7,26 @@ export const FN_SELECTOR = "0x372500ab" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "rewardUnits",
     components: [
       {
-        type: "address",
         name: "assetContract",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "totalAmount",
+        type: "uint256",
       },
     ],
+    name: "rewardUnits",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/write/openPackAndClaimRewards.ts b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/write/openPackAndClaimRewards.ts
index bc954a62d72..ad89f183adb 100644
--- a/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/write/openPackAndClaimRewards.ts
+++ b/packages/thirdweb/src/extensions/pack/__generated__/IPackVRFDirect/write/openPackAndClaimRewards.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "openPackAndClaimRewards" function.
@@ -26,16 +26,16 @@ export type OpenPackAndClaimRewardsParams = WithOverrides<{
 export const FN_SELECTOR = "0xac296b3f" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_packId",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_amountToOpen",
+    type: "uint256",
   },
   {
-    type: "uint32",
     name: "_callBackGasLimit",
+    type: "uint32",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -153,8 +153,19 @@ export function openPackAndClaimRewards(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -164,16 +175,5 @@ export function openPackAndClaimRewards(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/pack/createNewPack.test.ts b/packages/thirdweb/src/extensions/pack/createNewPack.test.ts
index dfbcbadf19c..52a2ed07fbe 100644
--- a/packages/thirdweb/src/extensions/pack/createNewPack.test.ts
+++ b/packages/thirdweb/src/extensions/pack/createNewPack.test.ts
@@ -32,8 +32,8 @@ describe.skip("createNewPack", () => {
     it("should create a Pack and open it to receive rewards", async () => {
       const packAddress = await deployPackContract({
         account,
-        client,
         chain,
+        client,
         params: {
           name: "pack-contract",
         },
@@ -46,14 +46,14 @@ describe.skip("createNewPack", () => {
       });
 
       const erc20Address = await deployERC20Contract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
-        type: "TokenERC20",
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         params: {
-          name: "Token",
           contractURI: TEST_CONTRACT_URI,
+          name: "Token",
         },
+        type: "TokenERC20",
       });
 
       const erc20Contract = getContract({
@@ -63,14 +63,14 @@ describe.skip("createNewPack", () => {
       });
 
       const erc721Address = await deployERC721Contract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
-        type: "TokenERC721",
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         params: {
-          name: "NFTCollection",
           contractURI: TEST_CONTRACT_URI,
+          name: "NFTCollection",
         },
+        type: "TokenERC721",
       });
 
       const erc721Contract = getContract({
@@ -80,68 +80,68 @@ describe.skip("createNewPack", () => {
       });
       // Mint some ERC20 tokens
       await sendAndConfirmTransaction({
+        account,
         transaction: mintToERC20({
+          amount: "100",
           contract: erc20Contract,
           to: account.address,
-          amount: "100",
         }),
-        account,
       });
 
       // Set allowance for Pack contract
       await sendAndConfirmTransaction({
+        account,
         transaction: approve({
-          contract: erc20Contract,
           amount: "1000000000000000",
+          contract: erc20Contract,
           spender: packContract.address,
         }),
-        account,
       });
 
       // Mint some ERC721 tokens
       await sendAndConfirmTransaction({
+        account,
         transaction: mintToERC721({
           contract: erc721Contract,
-          to: account.address,
           nft: { name: "token #0" },
+          to: account.address,
         }),
-        account,
       });
 
       // set erc721 approval
       await sendAndConfirmTransaction({
+        account,
         transaction: setApprovalForAll({
-          contract: erc721Contract,
           approved: true,
+          contract: erc721Contract,
           operator: packContract.address,
         }),
-        account,
       });
 
       // Create pack
       await sendAndConfirmTransaction({
+        account,
         transaction: createNewPack({
+          amountDistributedPerOpen: 1n,
+          client,
           contract: packContract,
           erc20Rewards: [
             {
               contractAddress: erc20Contract.address,
-              totalRewards: 1,
               quantityPerReward: 1,
+              totalRewards: 1,
             },
           ],
           erc721Rewards: [
             { contractAddress: erc721Contract.address, tokenId: 0n },
           ],
-          client,
+          openStartTimestamp: new Date(),
           packMetadata: {
             name: "Pack #0",
           },
           recipient: account.address,
           tokenOwner: account.address,
-          openStartTimestamp: new Date(),
-          amountDistributedPerOpen: 1n,
         }),
-        account,
       });
 
       // Read the info of the new Pack
@@ -153,9 +153,9 @@ describe.skip("createNewPack", () => {
         erc721BalanceAfterCreatePack,
       ] = await Promise.all([
         getPackContents({ contract: packContract, packId: 0n }),
-        getTokenCountOfBundle({ contract: packContract, bundleId: 0n }),
-        getUriOfBundle({ contract: packContract, bundleId: 0n }),
-        balanceOfERC20({ contract: erc20Contract, address: account.address }),
+        getTokenCountOfBundle({ bundleId: 0n, contract: packContract }),
+        getUriOfBundle({ bundleId: 0n, contract: packContract }),
+        balanceOfERC20({ address: account.address, contract: erc20Contract }),
         balanceOfERC721({ contract: erc721Contract, owner: account.address }),
       ]);
 
@@ -168,14 +168,14 @@ describe.skip("createNewPack", () => {
         [
           {
             assetContract: erc20Contract.address,
-            tokenType: 0,
             tokenId: 0n,
+            tokenType: 0,
             totalAmount: 1000000000000000000n,
           },
           {
             assetContract: erc721Contract.address,
-            tokenType: 1,
             tokenId: 0n,
+            tokenType: 1,
             totalAmount: 1n,
           },
         ],
@@ -194,14 +194,14 @@ describe.skip("createNewPack", () => {
       await sendAndConfirmTransaction({
         account,
         transaction: openPack({
+          amountToOpen: 1n,
           contract: packContract,
           packId: 0n,
-          amountToOpen: 1n,
         }),
       });
 
       const [erc20Balance, erc721Owner] = await Promise.all([
-        balanceOfERC20({ contract: erc20Contract, address: account.address }),
+        balanceOfERC20({ address: account.address, contract: erc20Contract }),
         ownerOf({ contract: erc721Contract, tokenId: 0n }),
       ]);
 
diff --git a/packages/thirdweb/src/extensions/pack/createNewPack.ts b/packages/thirdweb/src/extensions/pack/createNewPack.ts
index 50ccf310455..68d4b9ca9d5 100644
--- a/packages/thirdweb/src/extensions/pack/createNewPack.ts
+++ b/packages/thirdweb/src/extensions/pack/createNewPack.ts
@@ -1,5 +1,5 @@
 import type { ThirdwebClient } from "../../client/client.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { upload } from "../../storage/upload.js";
 import type {
   BaseTransactionOptions,
@@ -13,7 +13,6 @@ import {
   createPack,
 } from "./__generated__/IPack/write/createPack.js";
 
-// biome-ignore lint/nursery/noEnum: fine here
 export enum PACK_TOKEN_TYPE {
   ERC20 = 0,
   ERC721 = 1,
@@ -123,8 +122,8 @@ export function createNewPack(
   options: WithOverrides<BaseTransactionOptions<CreateNewPackParams>>,
 ) {
   return createPack({
-    contract: options.contract,
     asyncParams: async () => getCreatePackParams(options),
+    contract: options.contract,
   });
 }
 
@@ -149,18 +148,18 @@ async function getCreatePackParams(
   const [erc20Content, erc721Content, erc1155Content, packUri] =
     await Promise.all([
       processErc20Rewards({
-        packContract: contract,
         content: erc20Rewards,
+        packContract: contract,
         tokenOwner,
       }),
       processErc721Rewards({
-        packContract: contract,
         content: erc721Rewards,
+        packContract: contract,
         tokenOwner,
       }),
       processErc1155Rewards({
-        packContract: contract,
         content: erc1155Rewards,
+        packContract: contract,
         tokenOwner,
       }),
       typeof packMetadata === "string"
@@ -179,14 +178,14 @@ async function getCreatePackParams(
     .concat(erc1155Content.numOfRewardUnits);
 
   return {
-    packUri,
-    recipient,
+    amountDistributedPerOpen,
     contents,
     numOfRewardUnits,
     // openStartTimestamp should be in seconds and not millisecond
     openStartTimestamp: BigInt(Math.ceil(openStartTimestamp.getTime() / 1000)),
-    amountDistributedPerOpen,
     overrides,
+    packUri,
+    recipient,
   };
 }
 
@@ -235,8 +234,8 @@ async function processErc20Rewards(options: {
         return Promise.all([
           allowance({
             contract,
-            spender: packContract.address,
             owner: tokenOwner,
+            spender: packContract.address,
           }),
           decimals({ contract }).catch(() => undefined),
           contract.address,
@@ -279,8 +278,8 @@ async function processErc20Rewards(options: {
     numOfRewardUnits.push(BigInt(item.totalRewards));
     return {
       assetContract: contractAddress,
-      tokenType: PACK_TOKEN_TYPE.ERC20,
-      tokenId: 0n, // hard-coded to `0n` for ERC20
+      tokenId: 0n,
+      tokenType: PACK_TOKEN_TYPE.ERC20, // hard-coded to `0n` for ERC20
       totalAmount: totalRequired,
     };
   });
@@ -354,8 +353,8 @@ async function processErc721Rewards(options: {
     numOfRewardUnits.push(1n);
     return {
       assetContract: address,
-      tokenType: PACK_TOKEN_TYPE.ERC721,
       tokenId,
+      tokenType: PACK_TOKEN_TYPE.ERC721,
       totalAmount: 1n,
     };
   });
@@ -389,8 +388,8 @@ async function processErc1155Rewards(options: {
           chain: packContract.chain,
           client: packContract.client,
         }),
-        tokenId: o.tokenId,
         quantityPerReward: o.quantityPerReward,
+        tokenId: o.tokenId,
         totalRewards: o.totalRewards,
       })),
     ),
@@ -428,8 +427,8 @@ async function processErc1155Rewards(options: {
     numOfRewardUnits.push(BigInt(totalRewards));
     return {
       assetContract: address,
-      tokenType: PACK_TOKEN_TYPE.ERC1155,
       tokenId,
+      tokenType: PACK_TOKEN_TYPE.ERC1155,
       totalAmount: BigInt(quantityPerReward) * BigInt(totalRewards),
     };
   });
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleAdminChanged.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleAdminChanged.ts
index 01a5c361ce1..ee99c86ea03 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleAdminChanged.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleAdminChanged.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RoleAdminChanged" event.
@@ -48,8 +48,8 @@ export function roleAdminChangedEvent(
   filters: RoleAdminChangedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event RoleAdminChanged(bytes32 indexed role, bytes32 indexed previousAdminRole, bytes32 indexed newAdminRole)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleGranted.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleGranted.ts
index 91f566246e0..b6b837ece97 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleGranted.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleGranted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RoleGranted" event.
@@ -46,8 +46,8 @@ export type RoleGrantedEventFilters = Partial<{
  */
 export function roleGrantedEvent(filters: RoleGrantedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RoleGranted(bytes32 indexed role, address indexed account, address indexed sender)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleRevoked.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleRevoked.ts
index 91fcab84e65..601f4413c5d 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleRevoked.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/events/RoleRevoked.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RoleRevoked" event.
@@ -46,8 +46,8 @@ export type RoleRevokedEventFilters = Partial<{
  */
 export function roleRevokedEvent(filters: RoleRevokedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RoleRevoked(bytes32 indexed role, address indexed account, address indexed sender)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/read/getRoleAdmin.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/read/getRoleAdmin.ts
index 142c73b479c..47d44113063 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/read/getRoleAdmin.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/read/getRoleAdmin.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getRoleAdmin" function.
@@ -16,8 +16,8 @@ export type GetRoleAdminParams = {
 export const FN_SELECTOR = "0x248a9ca3" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/read/hasRole.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/read/hasRole.ts
index 44c5782708b..f62f3380b91 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/read/hasRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/read/hasRole.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "hasRole" function.
@@ -17,12 +17,12 @@ export type HasRoleParams = {
 export const FN_SELECTOR = "0x91d14854" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/grantRole.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/grantRole.ts
index d1a4941ec7c..63cc21447cb 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/grantRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/grantRole.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "grantRole" function.
@@ -19,12 +19,12 @@ export type GrantRoleParams = WithOverrides<{
 export const FN_SELECTOR = "0x2f2ff15d" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function grantRole(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.role, resolvedOptions.account] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.role, resolvedOptions.account] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/renounceRole.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/renounceRole.ts
index c6e5e3be592..e24baa2bb0c 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/renounceRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/renounceRole.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "renounceRole" function.
@@ -19,12 +19,12 @@ export type RenounceRoleParams = WithOverrides<{
 export const FN_SELECTOR = "0x36568abe" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function renounceRole(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.role, resolvedOptions.account] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.role, resolvedOptions.account] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/revokeRole.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/revokeRole.ts
index 114846fcd0d..78c0b88ae38 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/revokeRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissions/write/revokeRole.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "revokeRole" function.
@@ -19,12 +19,12 @@ export type RevokeRoleParams = WithOverrides<{
 export const FN_SELECTOR = "0xd547741f" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function revokeRole(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.role, resolvedOptions.account] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.role, resolvedOptions.account] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleAdminChanged.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleAdminChanged.ts
index 01a5c361ce1..ee99c86ea03 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleAdminChanged.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleAdminChanged.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RoleAdminChanged" event.
@@ -48,8 +48,8 @@ export function roleAdminChangedEvent(
   filters: RoleAdminChangedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event RoleAdminChanged(bytes32 indexed role, bytes32 indexed previousAdminRole, bytes32 indexed newAdminRole)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleGranted.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleGranted.ts
index 91f566246e0..b6b837ece97 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleGranted.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleGranted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RoleGranted" event.
@@ -46,8 +46,8 @@ export type RoleGrantedEventFilters = Partial<{
  */
 export function roleGrantedEvent(filters: RoleGrantedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RoleGranted(bytes32 indexed role, address indexed account, address indexed sender)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleRevoked.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleRevoked.ts
index 91fcab84e65..601f4413c5d 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleRevoked.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/events/RoleRevoked.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RoleRevoked" event.
@@ -46,8 +46,8 @@ export type RoleRevokedEventFilters = Partial<{
  */
 export function roleRevokedEvent(filters: RoleRevokedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RoleRevoked(bytes32 indexed role, address indexed account, address indexed sender)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleAdmin.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleAdmin.ts
index 142c73b479c..47d44113063 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleAdmin.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleAdmin.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getRoleAdmin" function.
@@ -16,8 +16,8 @@ export type GetRoleAdminParams = {
 export const FN_SELECTOR = "0x248a9ca3" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleMember.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleMember.ts
index c1eed901f0f..d07f9e82b32 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleMember.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleMember.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getRoleMember" function.
@@ -17,12 +17,12 @@ export type GetRoleMemberParams = {
 export const FN_SELECTOR = "0x9010d07c" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "uint256",
     name: "index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleMemberCount.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleMemberCount.ts
index d6255b64f06..2ef53c1b07c 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleMemberCount.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/getRoleMemberCount.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getRoleMemberCount" function.
@@ -16,8 +16,8 @@ export type GetRoleMemberCountParams = {
 export const FN_SELECTOR = "0xca15c873" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/hasRole.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/hasRole.ts
index 44c5782708b..f62f3380b91 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/hasRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/read/hasRole.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "hasRole" function.
@@ -17,12 +17,12 @@ export type HasRoleParams = {
 export const FN_SELECTOR = "0x91d14854" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/grantRole.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/grantRole.ts
index d1a4941ec7c..63cc21447cb 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/grantRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/grantRole.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "grantRole" function.
@@ -19,12 +19,12 @@ export type GrantRoleParams = WithOverrides<{
 export const FN_SELECTOR = "0x2f2ff15d" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function grantRole(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.role, resolvedOptions.account] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.role, resolvedOptions.account] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/renounceRole.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/renounceRole.ts
index c6e5e3be592..e24baa2bb0c 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/renounceRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/renounceRole.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "renounceRole" function.
@@ -19,12 +19,12 @@ export type RenounceRoleParams = WithOverrides<{
 export const FN_SELECTOR = "0x36568abe" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function renounceRole(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.role, resolvedOptions.account] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.role, resolvedOptions.account] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/revokeRole.ts b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/revokeRole.ts
index 114846fcd0d..78c0b88ae38 100644
--- a/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/revokeRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/revokeRole.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "revokeRole" function.
@@ -19,12 +19,12 @@ export type RevokeRoleParams = WithOverrides<{
 export const FN_SELECTOR = "0xd547741f" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "role",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -125,23 +125,23 @@ export function revokeRole(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.role, resolvedOptions.account] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.role, resolvedOptions.account] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/permissions.test.ts b/packages/thirdweb/src/extensions/permissions/permissions.test.ts
index 54a9f33d003..e1f83dace40 100644
--- a/packages/thirdweb/src/extensions/permissions/permissions.test.ts
+++ b/packages/thirdweb/src/extensions/permissions/permissions.test.ts
@@ -6,7 +6,7 @@ import {
   TEST_ACCOUNT_A,
   TEST_ACCOUNT_B,
 } from "../../../test/src/test-wallets.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { deployERC20Contract } from "../prebuilts/deploy-erc20.js";
 import { getAllRoleMembers } from "./read/getAllMembers.js";
@@ -22,8 +22,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Permissions", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       params: {
-        name: "PermissionsErc20",
         contractURI: TEST_CONTRACT_URI,
+        name: "PermissionsErc20",
       },
       type: "TokenERC20",
     });
@@ -72,8 +72,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Permissions", () => {
       targetAccountAddress: TEST_ACCOUNT_B.address,
     });
     await sendAndConfirmTransaction({
-      transaction: grantTx,
       account: TEST_ACCOUNT_A,
+      transaction: grantTx,
     });
 
     // now the target account should have the admin role
@@ -104,8 +104,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Permissions", () => {
     });
 
     await sendAndConfirmTransaction({
-      transaction: revokeTx,
       account: TEST_ACCOUNT_A,
+      transaction: revokeTx,
     });
 
     // now the target account should not have the admin role
@@ -136,8 +136,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Permissions", () => {
     });
 
     await sendAndConfirmTransaction({
-      transaction: revokeTx,
       account: TEST_ACCOUNT_A,
+      transaction: revokeTx,
     });
 
     // now the target account should not have the admin role
@@ -169,8 +169,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Permissions", () => {
 
     await expect(
       sendAndConfirmTransaction({
-        transaction: grantTx,
         account: TEST_ACCOUNT_B,
+        transaction: grantTx,
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
       [TransactionError: Error - AccessControl: account 0x70997970c51812dc3a010c7d01b50e0d17dc79c8 is missing role 0x0000000000000000000000000000000000000000000000000000000000000000
@@ -197,8 +197,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("PermissionsEnumerable", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       params: {
-        name: "PermissionsErc20",
         contractURI: TEST_CONTRACT_URI,
+        name: "PermissionsErc20",
       },
       type: "TokenERC20",
     });
@@ -218,8 +218,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("PermissionsEnumerable", () => {
       targetAccountAddress: TEST_ACCOUNT_B.address,
     });
     await sendAndConfirmTransaction({
-      transaction: grantTx,
       account: TEST_ACCOUNT_A,
+      transaction: grantTx,
     });
 
     await expect(
diff --git a/packages/thirdweb/src/extensions/permissions/read/getAllMembers.ts b/packages/thirdweb/src/extensions/permissions/read/getAllMembers.ts
index 9ab111b9cb6..69259045179 100644
--- a/packages/thirdweb/src/extensions/permissions/read/getAllMembers.ts
+++ b/packages/thirdweb/src/extensions/permissions/read/getAllMembers.ts
@@ -7,7 +7,7 @@ import {
   getRoleMemberCount,
   isGetRoleMemberCountSupported,
 } from "../__generated__/IPermissionsEnumerable/read/getRoleMemberCount.js";
-import { type RoleInput, getRoleHash } from "../utils.js";
+import { getRoleHash, type RoleInput } from "../utils.js";
 
 /**
  * @extension PERMISSIONS
@@ -47,7 +47,7 @@ export async function getAllRoleMembers(
 
   for (let i = 0n; i < count; i++) {
     promises.push(
-      getRoleMember({ contract: options.contract, role: roleHash, index: i }),
+      getRoleMember({ contract: options.contract, index: i, role: roleHash }),
     );
   }
 
diff --git a/packages/thirdweb/src/extensions/permissions/read/getRoleAdmin.ts b/packages/thirdweb/src/extensions/permissions/read/getRoleAdmin.ts
index 683de60c0a5..050c0a6e0d5 100644
--- a/packages/thirdweb/src/extensions/permissions/read/getRoleAdmin.ts
+++ b/packages/thirdweb/src/extensions/permissions/read/getRoleAdmin.ts
@@ -1,6 +1,6 @@
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { getRoleAdmin as generatedGetRoleAdmin } from "../__generated__/IPermissions/read/getRoleAdmin.js";
-import { type RoleInput, getRoleHash } from "../utils.js";
+import { getRoleHash, type RoleInput } from "../utils.js";
 
 export { isGetRoleAdminSupported } from "../__generated__/IPermissions/read/getRoleAdmin.js";
 
diff --git a/packages/thirdweb/src/extensions/permissions/read/getRoleMember.ts b/packages/thirdweb/src/extensions/permissions/read/getRoleMember.ts
index 8a4e1285131..1412432c19d 100644
--- a/packages/thirdweb/src/extensions/permissions/read/getRoleMember.ts
+++ b/packages/thirdweb/src/extensions/permissions/read/getRoleMember.ts
@@ -1,6 +1,6 @@
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { getRoleMember as generatedGetRoleMember } from "../__generated__/IPermissionsEnumerable/read/getRoleMember.js";
-import { type RoleInput, getRoleHash } from "../utils.js";
+import { getRoleHash, type RoleInput } from "../utils.js";
 
 export { isGetRoleMemberSupported } from "../__generated__/IPermissionsEnumerable/read/getRoleMember.js";
 
@@ -35,7 +35,7 @@ export function getRoleMember(
 ): Promise<string> {
   return generatedGetRoleMember({
     contract: options.contract,
-    role: getRoleHash(options.role),
     index: options.index,
+    role: getRoleHash(options.role),
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/read/getRoleMemberCount.ts b/packages/thirdweb/src/extensions/permissions/read/getRoleMemberCount.ts
index 6d3c391dd4e..a893e480280 100644
--- a/packages/thirdweb/src/extensions/permissions/read/getRoleMemberCount.ts
+++ b/packages/thirdweb/src/extensions/permissions/read/getRoleMemberCount.ts
@@ -1,6 +1,6 @@
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { getRoleMemberCount as generatedGetRoleMemberCount } from "../__generated__/IPermissionsEnumerable/read/getRoleMemberCount.js";
-import { type RoleInput, getRoleHash } from "../utils.js";
+import { getRoleHash, type RoleInput } from "../utils.js";
 
 export { isGetRoleMemberCountSupported } from "../__generated__/IPermissionsEnumerable/read/getRoleMemberCount.js";
 
diff --git a/packages/thirdweb/src/extensions/permissions/read/hasRole.ts b/packages/thirdweb/src/extensions/permissions/read/hasRole.ts
index 9c1f604c291..c7801fdc0ea 100644
--- a/packages/thirdweb/src/extensions/permissions/read/hasRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/read/hasRole.ts
@@ -1,6 +1,6 @@
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { hasRole as hasRoleGenerated } from "../__generated__/IPermissions/read/hasRole.js";
-import { type RoleInput, getRoleHash } from "../utils.js";
+import { getRoleHash, type RoleInput } from "../utils.js";
 
 export { isHasRoleSupported } from "../__generated__/IPermissions/read/hasRole.js";
 
@@ -32,8 +32,8 @@ export function hasRole(
   options: BaseTransactionOptions<HasRoleParams>,
 ): Promise<boolean> {
   return hasRoleGenerated({
+    account: options.targetAccountAddress,
     contract: options.contract,
     role: getRoleHash(options.role),
-    account: options.targetAccountAddress,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/utils.ts b/packages/thirdweb/src/extensions/permissions/utils.ts
index 5f731980fa6..b6fbe0671f1 100644
--- a/packages/thirdweb/src/extensions/permissions/utils.ts
+++ b/packages/thirdweb/src/extensions/permissions/utils.ts
@@ -7,17 +7,17 @@ import { type Hex, isHex, padHex } from "../../utils/encoding/hex.js";
  */
 export const roleMap = {
   admin: "",
-  transfer: "TRANSFER_ROLE",
-  minter: "MINTER_ROLE",
-  pauser: "PAUSER_ROLE",
-  lister: "LISTER_ROLE",
   asset: "ASSET_ROLE",
-  unwrap: "UNWRAP_ROLE",
   factory: "FACTORY_ROLE",
-  signer: "SIGNER_ROLE",
+  lister: "LISTER_ROLE",
   metadata: "METADATA_ROLE",
-  revoke: "REVOKE_ROLE",
   migration: "MIGRATION_ROLE",
+  minter: "MINTER_ROLE",
+  pauser: "PAUSER_ROLE",
+  revoke: "REVOKE_ROLE",
+  signer: "SIGNER_ROLE",
+  transfer: "TRANSFER_ROLE",
+  unwrap: "UNWRAP_ROLE",
 } as const;
 
 /**
diff --git a/packages/thirdweb/src/extensions/permissions/write/grantRole.ts b/packages/thirdweb/src/extensions/permissions/write/grantRole.ts
index b977e76e058..2189a7184a3 100644
--- a/packages/thirdweb/src/extensions/permissions/write/grantRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/write/grantRole.ts
@@ -1,7 +1,7 @@
 import type { Address } from "abitype";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { grantRole as generatedGrantRole } from "../__generated__/IPermissions/write/grantRole.js";
-import { type RoleInput, getRoleHash } from "../utils.js";
+import { getRoleHash, type RoleInput } from "../utils.js";
 
 export { isGrantRoleSupported } from "../__generated__/IPermissions/write/grantRole.js";
 
@@ -35,8 +35,8 @@ export type GrantRoleParams = {
  */
 export function grantRole(options: BaseTransactionOptions<GrantRoleParams>) {
   return generatedGrantRole({
+    account: options.targetAccountAddress,
     contract: options.contract,
     role: getRoleHash(options.role),
-    account: options.targetAccountAddress,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/write/renounceRole.ts b/packages/thirdweb/src/extensions/permissions/write/renounceRole.ts
index 74a7358a117..ed1a326d61f 100644
--- a/packages/thirdweb/src/extensions/permissions/write/renounceRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/write/renounceRole.ts
@@ -1,7 +1,7 @@
 import type { Address } from "abitype";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { renounceRole as generatedRenounceRole } from "../__generated__/IPermissions/write/renounceRole.js";
-import { type RoleInput, getRoleHash } from "../utils.js";
+import { getRoleHash, type RoleInput } from "../utils.js";
 
 export { isRenounceRoleSupported } from "../__generated__/IPermissions/write/renounceRole.js";
 
@@ -36,8 +36,8 @@ export function renounceRole(
   options: BaseTransactionOptions<RenounceRoleParams>,
 ) {
   return generatedRenounceRole({
+    account: options.targetAccountAddress,
     contract: options.contract,
     role: getRoleHash(options.role),
-    account: options.targetAccountAddress,
   });
 }
diff --git a/packages/thirdweb/src/extensions/permissions/write/revokeRole.ts b/packages/thirdweb/src/extensions/permissions/write/revokeRole.ts
index 0f9b0672778..41f12c160fb 100644
--- a/packages/thirdweb/src/extensions/permissions/write/revokeRole.ts
+++ b/packages/thirdweb/src/extensions/permissions/write/revokeRole.ts
@@ -1,7 +1,7 @@
 import type { Address } from "abitype";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { revokeRole as generatedRevokeRole } from "../__generated__/IPermissions/write/revokeRole.js";
-import { type RoleInput, getRoleHash } from "../utils.js";
+import { getRoleHash, type RoleInput } from "../utils.js";
 
 export { isRevokeRoleSupported } from "../__generated__/IPermissions/write/revokeRole.js";
 
@@ -35,8 +35,8 @@ export type RevokeRoleParams = {
  */
 export function revokeRole(options: BaseTransactionOptions<RevokeRoleParams>) {
   return generatedRevokeRole({
+    account: options.targetAccountAddress,
     contract: options.contract,
     role: getRoleHash(options.role),
-    account: options.targetAccountAddress,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC1155/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC1155/write/initialize.ts
index c4c449c8056..52eae2fe169 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC1155/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC1155/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -51,44 +51,44 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xe1591634" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_saleRecipient",
+    type: "address",
   },
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint128",
     name: "_royaltyBps",
+    type: "uint128",
   },
   {
-    type: "uint128",
     name: "_platformFeeBps",
+    type: "uint128",
   },
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -224,8 +224,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -242,16 +253,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC20/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC20/write/initialize.ts
index 9fccd394f82..274ea20dd28 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC20/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC20/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -43,36 +43,36 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0x49c5c5b6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_saleRecipient",
+    type: "address",
   },
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
   {
-    type: "uint128",
     name: "_platformFeeBps",
+    type: "uint128",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -200,8 +200,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -216,16 +227,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC721/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC721/write/initialize.ts
index c4c449c8056..52eae2fe169 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC721/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/DropERC721/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -51,44 +51,44 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xe1591634" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_saleRecipient",
+    type: "address",
   },
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint128",
     name: "_royaltyBps",
+    type: "uint128",
   },
   {
-    type: "uint128",
     name: "_platformFeeBps",
+    type: "uint128",
   },
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -224,8 +224,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -242,16 +253,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/Marketplace/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/Marketplace/write/initialize.ts
index 926c5ad6b8c..afd8adc4244 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/Marketplace/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/Marketplace/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -37,24 +37,24 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xaaae5633" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
   {
-    type: "uint16",
     name: "_platformFeeBps",
+    type: "uint16",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -170,8 +170,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -183,16 +194,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/OpenEditionERC721/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/OpenEditionERC721/write/initialize.ts
index b5c91d37dd1..593b1a9ae8a 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/OpenEditionERC721/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/OpenEditionERC721/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -43,36 +43,36 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0x49c5c5b6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_saleRecipient",
+    type: "address",
   },
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint128",
     name: "_royaltyBps",
+    type: "uint128",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -200,8 +200,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -216,16 +227,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/Pack/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/Pack/write/initialize.ts
index dd971b7f2f4..c91ceb8b30e 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/Pack/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/Pack/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -39,32 +39,32 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0x754b8fe7" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_royaltyBps",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -188,8 +188,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -203,16 +214,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/Split/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/Split/write/initialize.ts
index 898c849c688..1eecf8ddaf0 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/Split/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/Split/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -31,24 +31,24 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xb1a14437" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address[]",
     name: "_payees",
+    type: "address[]",
   },
   {
-    type: "uint256[]",
     name: "_shares",
+    type: "uint256[]",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -164,8 +164,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -177,16 +188,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC1155/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC1155/write/initialize.ts
index 8159cb1cf0d..e5c2007a36a 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC1155/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC1155/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -51,44 +51,44 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xe1591634" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_primarySaleRecipient",
+    type: "address",
   },
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint128",
     name: "_royaltyBps",
+    type: "uint128",
   },
   {
-    type: "uint128",
     name: "_platformFeeBps",
+    type: "uint128",
   },
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -224,8 +224,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -242,16 +253,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC20/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC20/write/initialize.ts
index 68d91821e86..d7bd411370f 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC20/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC20/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -43,36 +43,36 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xdfad80a6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_primarySaleRecipient",
+    type: "address",
   },
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_platformFeeBps",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -200,8 +200,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -216,16 +227,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC721/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC721/write/initialize.ts
index c4c449c8056..52eae2fe169 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC721/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/TokenERC721/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -51,44 +51,44 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0xe1591634" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_defaultAdmin",
+    type: "address",
   },
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_symbol",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_saleRecipient",
+    type: "address",
   },
   {
-    type: "address",
     name: "_royaltyRecipient",
+    type: "address",
   },
   {
-    type: "uint128",
     name: "_royaltyBps",
+    type: "uint128",
   },
   {
-    type: "uint128",
     name: "_platformFeeBps",
+    type: "uint128",
   },
   {
-    type: "address",
     name: "_platformFeeRecipient",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -224,8 +224,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -242,16 +253,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/__generated__/VoteERC20/write/initialize.ts b/packages/thirdweb/src/extensions/prebuilts/__generated__/VoteERC20/write/initialize.ts
index 2ce2e181c53..9e6fdd28aa3 100644
--- a/packages/thirdweb/src/extensions/prebuilts/__generated__/VoteERC20/write/initialize.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/__generated__/VoteERC20/write/initialize.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "initialize" function.
@@ -43,36 +43,36 @@ export type InitializeParams = WithOverrides<{
 export const FN_SELECTOR = "0x7cf43f8d" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "_name",
+    type: "string",
   },
   {
-    type: "string",
     name: "_contractURI",
+    type: "string",
   },
   {
-    type: "address[]",
     name: "_trustedForwarders",
+    type: "address[]",
   },
   {
-    type: "address",
     name: "_token",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_initialVotingDelay",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_initialVotingPeriod",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_initialProposalThreshold",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "_initialVoteQuorumFraction",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -200,8 +200,19 @@ export function initialize(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -216,16 +227,5 @@ export function initialize(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/compute-ref-deployments.ts b/packages/thirdweb/src/extensions/prebuilts/compute-ref-deployments.ts
index 5d33071c4bc..a327113c915 100644
--- a/packages/thirdweb/src/extensions/prebuilts/compute-ref-deployments.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/compute-ref-deployments.ts
@@ -43,12 +43,12 @@ export async function computeRefDeployments(
             : "";
 
         const addr = await computePublishedContractAddress({
-          client,
           chain,
+          client,
           contractId: contracts[0]?.contractId,
           publisher: contracts[0]?.publisherAddress,
-          version: contracts[0]?.version,
           salt,
+          version: contracts[0]?.version,
         });
 
         return addr;
@@ -65,12 +65,12 @@ export async function computeRefDeployments(
 
           addressArray.push(
             await computePublishedContractAddress({
-              client,
               chain,
+              client,
               contractId: c.contractId,
               publisher: c.publisherAddress,
-              version: c.version,
               salt,
+              version: c.version,
             }),
           );
         }
@@ -95,8 +95,8 @@ export async function computeRefDeployments(
             } else if (v.dynamicValue) {
               values.push(
                 await computeRefDeployments({
-                  client,
                   chain,
+                  client,
                   paramValue: v,
                 }),
               );
@@ -133,8 +133,8 @@ export async function computeRefDeployments(
               } else if (v.dynamicValue) {
                 values.push(
                   await computeRefDeployments({
-                    client,
                     chain,
+                    client,
                     paramValue: v,
                   }),
                 );
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-erc1155.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-erc1155.ts
index 3b814fd1152..e63219f28ac 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-erc1155.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-erc1155.ts
@@ -2,8 +2,8 @@ import type { ThirdwebClient } from "../../client/client.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import { deployViaAutoFactory } from "../../contract/deployment/deploy-via-autofactory.js";
 import { getOrDeployInfraForPublishedContract } from "../../contract/deployment/utils/bootstrap.js";
-import { upload } from "../../storage/upload.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import { upload } from "../../storage/upload.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChainAndAccount } from "../../utils/types.js";
 import { initialize as initDropERC1155 } from "./__generated__/DropERC1155/write/initialize.js";
@@ -71,23 +71,23 @@ export async function deployERC1155Contract(
   const { chain, client, account, type, params } = options;
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
       contractId: type,
     });
   const initializeTransaction = await getInitializeTransaction({
+    accountAddress: account.address,
     client,
     implementationContract,
-    type,
     params,
-    accountAddress: account.address,
+    type,
   });
 
   return deployViaAutoFactory({
-    client,
-    chain,
     account,
+    chain,
+    client,
     cloneFactoryContract,
     initializeTransaction,
   });
@@ -108,14 +108,14 @@ async function getInitializeTransaction(options: {
       client,
       files: [
         {
-          name: params.name,
           description: params.description,
-          symbol: params.symbol,
-          image: params.image,
           external_link: params.external_link,
-          social_urls: params.social_urls,
-          seller_fee_basis_points: params.royaltyBps,
           fee_recipient: params.royaltyRecipient,
+          image: params.image,
+          name: params.name,
+          seller_fee_basis_points: params.royaltyBps,
+          social_urls: params.social_urls,
+          symbol: params.symbol,
         },
       ],
     })) ||
@@ -124,29 +124,29 @@ async function getInitializeTransaction(options: {
     case "DropERC1155":
       return initDropERC1155({
         contract: implementationContract,
-        name: params.name || "",
-        symbol: params.symbol || "",
         contractURI,
         defaultAdmin: params.defaultAdmin || accountAddress,
-        saleRecipient: params.saleRecipient || accountAddress,
+        name: params.name || "",
         platformFeeBps: params.platformFeeBps || 0n,
         platformFeeRecipient: params.platformFeeRecipient || accountAddress,
-        royaltyRecipient: params.royaltyRecipient || accountAddress,
         royaltyBps: params.royaltyBps || 0n,
+        royaltyRecipient: params.royaltyRecipient || accountAddress,
+        saleRecipient: params.saleRecipient || accountAddress,
+        symbol: params.symbol || "",
         trustedForwarders: params.trustedForwarders || [],
       });
     case "TokenERC1155":
       return initTokenERC1155({
         contract: implementationContract,
-        name: params.name || "",
-        symbol: params.symbol || "",
         contractURI,
         defaultAdmin: params.defaultAdmin || accountAddress,
-        primarySaleRecipient: params.saleRecipient || accountAddress,
+        name: params.name || "",
         platformFeeBps: params.platformFeeBps || 0n,
         platformFeeRecipient: params.platformFeeRecipient || accountAddress,
-        royaltyRecipient: params.royaltyRecipient || accountAddress,
+        primarySaleRecipient: params.saleRecipient || accountAddress,
         royaltyBps: params.royaltyBps || 0n,
+        royaltyRecipient: params.royaltyRecipient || accountAddress,
+        symbol: params.symbol || "",
         trustedForwarders: params.trustedForwarders || [],
       });
   }
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-erc20.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-erc20.ts
index a18d9b5cde8..fa958fed7bd 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-erc20.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-erc20.ts
@@ -2,8 +2,8 @@ import type { ThirdwebClient } from "../../client/client.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import { deployViaAutoFactory } from "../../contract/deployment/deploy-via-autofactory.js";
 import { getOrDeployInfraForPublishedContract } from "../../contract/deployment/utils/bootstrap.js";
-import { upload } from "../../storage/upload.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import { upload } from "../../storage/upload.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChainAndAccount } from "../../utils/types.js";
 import { initialize as initDropERC20 } from "./__generated__/DropERC20/write/initialize.js";
@@ -65,24 +65,24 @@ export async function deployERC20Contract(options: DeployERC20ContractOptions) {
   const { chain, client, account, type, params, publisher } = options;
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
       contractId: type,
       publisher,
     });
   const initializeTransaction = await getInitializeTransaction({
+    accountAddress: account.address,
     client,
     implementationContract,
-    type,
     params,
-    accountAddress: account.address,
+    type,
   });
 
   return deployViaAutoFactory({
-    client,
-    chain,
     account,
+    chain,
+    client,
     cloneFactoryContract,
     initializeTransaction,
   });
@@ -103,12 +103,12 @@ async function getInitializeTransaction(options: {
       client,
       files: [
         {
-          name: params.name,
           description: params.description,
-          symbol: params.symbol,
-          image: params.image,
           external_link: params.external_link,
+          image: params.image,
+          name: params.name,
           social_urls: params.social_urls,
+          symbol: params.symbol,
         },
       ],
     })) ||
@@ -117,25 +117,25 @@ async function getInitializeTransaction(options: {
     case "DropERC20":
       return initDropERC20({
         contract: implementationContract,
-        name: params.name || "",
-        symbol: params.symbol || "",
         contractURI,
         defaultAdmin: params.defaultAdmin || accountAddress,
-        saleRecipient: params.saleRecipient || accountAddress,
+        name: params.name || "",
         platformFeeBps: params.platformFeeBps || 0n,
         platformFeeRecipient: params.platformFeeRecipient || accountAddress,
+        saleRecipient: params.saleRecipient || accountAddress,
+        symbol: params.symbol || "",
         trustedForwarders: params.trustedForwarders || [],
       });
     case "TokenERC20":
       return initTokenERC20({
         contract: implementationContract,
-        name: params.name || "",
-        symbol: params.symbol || "",
         contractURI,
         defaultAdmin: params.defaultAdmin || accountAddress,
-        primarySaleRecipient: params.saleRecipient || accountAddress,
+        name: params.name || "",
         platformFeeBps: params.platformFeeBps || 0n,
         platformFeeRecipient: params.platformFeeRecipient || accountAddress,
+        primarySaleRecipient: params.saleRecipient || accountAddress,
+        symbol: params.symbol || "",
         trustedForwarders: params.trustedForwarders || [],
       });
   }
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-erc721.test.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-erc721.test.ts
index 0d5681c843c..fdc9c58e3c4 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-erc721.test.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-erc721.test.ts
@@ -11,21 +11,21 @@ const account = TEST_ACCOUNT_B;
 describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
   it("should deploy ERC721 open edition", async () => {
     const address = await deployERC721Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account,
-      type: "OpenEditionERC721",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
         name: "OE",
       },
+      type: "OpenEditionERC721",
     });
 
     expect(address).toBeDefined();
     const deployedName = await name({
       contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       }),
     });
     expect(deployedName).toBe("OE");
@@ -33,22 +33,22 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
 
   it("should deploy ERC721 drop", async () => {
     const address = await deployERC721Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account,
-      type: "DropERC721",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
         name: "Drop",
         symbol: "DRP",
       },
+      type: "DropERC721",
     });
 
     expect(address).toBeDefined();
     const deployedName = await name({
       contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       }),
     });
     expect(deployedName).toBe("Drop");
@@ -56,22 +56,22 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
 
   it("should deploy ERC721 token", async () => {
     const address = await deployERC721Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account,
-      type: "TokenERC721",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
         name: "Token",
         symbol: "TKN",
       },
+      type: "TokenERC721",
     });
 
     expect(address).toBeDefined();
     const deployedName = await name({
       contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       }),
     });
     expect(deployedName).toBe("Token");
@@ -79,22 +79,22 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
 
   it("should deploy ERC721 loyalty card", async () => {
     const address = await deployERC721Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account,
-      type: "LoyaltyCard",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
         name: "Loyalty",
         symbol: "LOY",
       },
+      type: "LoyaltyCard",
     });
 
     expect(address).toBeDefined();
     const deployedName = await name({
       contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       }),
     });
     expect(deployedName).toBe("Loyalty");
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-erc721.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-erc721.ts
index 448770101f4..a2d592748d6 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-erc721.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-erc721.ts
@@ -2,8 +2,8 @@ import type { ThirdwebClient } from "../../client/client.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import { deployViaAutoFactory } from "../../contract/deployment/deploy-via-autofactory.js";
 import { getOrDeployInfraForPublishedContract } from "../../contract/deployment/utils/bootstrap.js";
-import { upload } from "../../storage/upload.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import { upload } from "../../storage/upload.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChainAndAccount } from "../../utils/types.js";
 import { initialize as initLoyaltyCard } from "../erc721/__generated__/LoyaltyCard/write/initialize.js";
@@ -78,24 +78,24 @@ export async function deployERC721Contract(
 
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
       contractId: type,
     });
 
   const initializeTransaction = await getInitializeTransaction({
+    accountAddress: account.address,
     client,
     implementationContract,
-    type,
     params,
-    accountAddress: account.address,
+    type,
   });
 
   return deployViaAutoFactory({
-    client,
-    chain,
     account,
+    chain,
+    client,
     cloneFactoryContract,
     initializeTransaction,
   });
@@ -116,14 +116,14 @@ async function getInitializeTransaction(options: {
       client,
       files: [
         {
-          name: params.name,
           description: params.description,
-          symbol: params.symbol,
-          image: params.image,
           external_link: params.external_link,
-          social_urls: params.social_urls,
-          seller_fee_basis_points: params.royaltyBps,
           fee_recipient: params.royaltyRecipient,
+          image: params.image,
+          name: params.name,
+          seller_fee_basis_points: params.royaltyBps,
+          social_urls: params.social_urls,
+          symbol: params.symbol,
         },
       ],
     })) ||
@@ -132,56 +132,56 @@ async function getInitializeTransaction(options: {
     case "DropERC721":
       return initDropERC721({
         contract: implementationContract,
-        name: params.name || "",
-        symbol: params.symbol || "",
         contractURI,
         defaultAdmin: params.defaultAdmin || accountAddress,
-        saleRecipient: params.saleRecipient || accountAddress,
+        name: params.name || "",
         platformFeeBps: params.platformFeeBps || 0n,
         platformFeeRecipient: params.platformFeeRecipient || accountAddress,
-        royaltyRecipient: params.royaltyRecipient || accountAddress,
         royaltyBps: params.royaltyBps || 0n,
+        royaltyRecipient: params.royaltyRecipient || accountAddress,
+        saleRecipient: params.saleRecipient || accountAddress,
+        symbol: params.symbol || "",
         trustedForwarders: params.trustedForwarders || [],
       });
     case "TokenERC721":
       return initTokenERC721({
         contract: implementationContract,
-        name: params.name || "",
-        symbol: params.symbol || "",
         contractURI,
         defaultAdmin: params.defaultAdmin || accountAddress,
-        saleRecipient: params.saleRecipient || accountAddress,
+        name: params.name || "",
         platformFeeBps: params.platformFeeBps || 0n,
         platformFeeRecipient: params.platformFeeRecipient || accountAddress,
-        royaltyRecipient: params.royaltyRecipient || accountAddress,
         royaltyBps: params.royaltyBps || 0n,
+        royaltyRecipient: params.royaltyRecipient || accountAddress,
+        saleRecipient: params.saleRecipient || accountAddress,
+        symbol: params.symbol || "",
         trustedForwarders: params.trustedForwarders || [],
       });
     case "OpenEditionERC721":
       return initOpenEditionERC721({
         contract: implementationContract,
-        name: params.name || "",
-        symbol: params.symbol || "",
         contractURI,
         defaultAdmin: params.defaultAdmin || accountAddress,
-        saleRecipient: params.saleRecipient || accountAddress,
-        royaltyRecipient: params.royaltyRecipient || accountAddress,
+        name: params.name || "",
         royaltyBps: params.royaltyBps || 0n,
+        royaltyRecipient: params.royaltyRecipient || accountAddress,
+        saleRecipient: params.saleRecipient || accountAddress,
+        symbol: params.symbol || "",
         trustedForwarders: params.trustedForwarders || [],
       });
     case "LoyaltyCard":
       return initLoyaltyCard({
         contract: implementationContract,
+        contractURI,
         defaultAdmin: params.defaultAdmin || accountAddress,
         name: params.name || "",
-        symbol: params.symbol || "",
-        contractURI,
-        royaltyRecipient: params.royaltyRecipient || accountAddress,
-        royaltyBps: params.royaltyBps || 0n,
-        trustedForwarders: params.trustedForwarders || [],
-        saleRecipient: params.saleRecipient || accountAddress,
         platformFeeBps: params.platformFeeBps || 0n,
         platformFeeRecipient: params.platformFeeRecipient || accountAddress,
+        royaltyBps: params.royaltyBps || 0n,
+        royaltyRecipient: params.royaltyRecipient || accountAddress,
+        saleRecipient: params.saleRecipient || accountAddress,
+        symbol: params.symbol || "",
+        trustedForwarders: params.trustedForwarders || [],
       });
   }
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-marketplace.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-marketplace.ts
index 281aa24f3cb..28279bd60dd 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-marketplace.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-marketplace.ts
@@ -7,8 +7,8 @@ import {
   getOrDeployInfraContract,
   getOrDeployInfraForPublishedContract,
 } from "../../contract/deployment/utils/bootstrap.js";
-import { upload } from "../../storage/upload.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import { upload } from "../../storage/upload.js";
 import { getRoyaltyEngineV1ByChainId } from "../../utils/royalty-engine.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChainAndAccount } from "../../utils/types.js";
@@ -76,9 +76,9 @@ export async function deployMarketplaceContract(
 ) {
   const { chain, client, account, params, version } = options;
   const WETH = await getOrDeployInfraContract({
+    account,
     chain,
     client,
-    account,
     contractId: "WETH9",
   });
 
@@ -87,27 +87,27 @@ export async function deployMarketplaceContract(
   if (options.version !== "6.0.0") {
     const isFeeExempt = chain.id === 232 || chain.id === 37111;
     const direct = await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
-      contractId: "DirectListingsLogic",
       constructorParams: { _nativeTokenWrapper: WETH.address },
+      contractId: "DirectListingsLogic",
       version: isFeeExempt ? "0.1.2" : "latest",
     });
 
     const english = await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
-      contractId: "EnglishAuctionsLogic",
       constructorParams: { _nativeTokenWrapper: WETH.address },
+      contractId: "EnglishAuctionsLogic",
       version: isFeeExempt ? "0.0.11" : "latest",
     });
 
     const offers = await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
       contractId: "OffersLogic",
       version: isFeeExempt ? "0.0.8" : "latest",
     });
@@ -126,59 +126,59 @@ export async function deployMarketplaceContract(
       ]);
     extensions = [
       {
+        functions: directFunctions,
         metadata: {
-          name: "Direct Listings",
-          metadataURI: "",
           implementation: direct.implementationContract.address,
+          metadataURI: "",
+          name: "Direct Listings",
         },
-        functions: directFunctions,
       },
       {
+        functions: englishFunctions,
         metadata: {
-          name: "English Auctions",
-          metadataURI: "",
           implementation: english.implementationContract.address,
+          metadataURI: "",
+          name: "English Auctions",
         },
-        functions: englishFunctions,
       },
       {
+        functions: offersFunctions,
         metadata: {
-          name: "Offers",
-          metadataURI: "",
           implementation: offers.implementationContract.address,
+          metadataURI: "",
+          name: "Offers",
         },
-        functions: offersFunctions,
       },
     ];
   }
 
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
-      contractId: "MarketplaceV3",
       constructorParams: {
         _marketplaceV3Params: {
           extensions,
-          royaltyEngineAddress: getRoyaltyEngineV1ByChainId(chain.id),
           nativeTokenWrapper: WETH.address,
+          royaltyEngineAddress: getRoyaltyEngineV1ByChainId(chain.id),
         } as MarketplaceConstructorParams[number],
       },
+      contractId: "MarketplaceV3",
       version,
     });
 
   const initializeTransaction = await getInitializeTransaction({
+    accountAddress: account.address,
     client,
     implementationContract,
     params,
-    accountAddress: account.address,
   });
 
   return deployViaAutoFactory({
-    client,
-    chain,
     account,
+    chain,
+    client,
     cloneFactoryContract,
     initializeTransaction,
   });
@@ -197,10 +197,10 @@ async function getInitializeTransaction(options: {
       client,
       files: [
         {
-          name: params.name,
           description: params.description,
-          image: params.image,
           external_link: params.external_link,
+          image: params.image,
+          name: params.name,
           social_urls: params.social_urls,
         },
       ],
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-modular-core.test.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-modular-core.test.ts
index 6f0598a2b92..f035b6117f4 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-modular-core.test.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-modular-core.test.ts
@@ -6,8 +6,8 @@ import { ZERO_ADDRESS } from "../../constants/addresses.js";
 import { getContract } from "../../contract/contract.js";
 import { fetchPublishedContractMetadata } from "../../contract/deployment/publisher.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
-import * as ERC20Claimable from "../modules/ClaimableERC20/index.js";
 import { getInstalledModules } from "../modules/__generated__/IModularCore/read/getInstalledModules.js";
+import * as ERC20Claimable from "../modules/ClaimableERC20/index.js";
 import { installPublishedModule } from "../modules/common/installPublishedModule.js";
 import { uninstallModuleByProxy } from "../modules/common/uninstallModuleByProxy.js";
 import { uninstallPublishedModule } from "../modules/common/uninstallPublishedModule.js";
@@ -28,9 +28,9 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
 
     beforeAll(async () => {
       address = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "DemoCore",
         contractParams: {
           _owner: TEST_ACCOUNT_A.address,
@@ -45,9 +45,9 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
 
       const installedModules = await getInstalledModules({
         contract: getContract({
-          client: TEST_CLIENT,
-          chain: ANVIL_CHAIN,
           address,
+          chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
         }),
       });
       expect(installedModules.length).toBe(0);
@@ -55,21 +55,21 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
 
     it("should install and uninstall an module by proxy address", async () => {
       const core = getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       });
 
       // install module with published name
       const installTransaction = installPublishedModule({
-        contract: core,
         account: TEST_ACCOUNT_A,
+        contract: core,
         moduleName: "DemoModuleWithFunctions",
         publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
       });
       await sendAndConfirmTransaction({
-        transaction: installTransaction,
         account: TEST_ACCOUNT_A,
+        transaction: installTransaction,
       });
 
       // get installed module proxy address
@@ -81,15 +81,15 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
 
       // uninstall module
       const uninstallTransaction = uninstallModuleByProxy({
-        contract: core,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        moduleProxyAddress: moduleAddress as string,
+        contract: core,
         moduleData: "0x",
+        moduleProxyAddress: moduleAddress as string,
       });
       await sendAndConfirmTransaction({
-        transaction: uninstallTransaction,
         account: TEST_ACCOUNT_A,
+        transaction: uninstallTransaction,
       });
 
       installedModules = await getInstalledModules({
@@ -101,21 +101,21 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
 
     it("should install and uninstall modules by publish name", async () => {
       const core = getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       });
 
       // install module with published name
       const installTransaction = installPublishedModule({
-        contract: core,
         account: TEST_ACCOUNT_A,
+        contract: core,
         moduleName: "DemoModuleWithFunctions",
         publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
       });
       await sendAndConfirmTransaction({
-        transaction: installTransaction,
         account: TEST_ACCOUNT_A,
+        transaction: installTransaction,
       });
 
       let installedModules = await getInstalledModules({
@@ -127,13 +127,13 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
       // uninstall module
       const uninstallTransaction = uninstallPublishedModule({
         contract: core,
+        moduleData: "0x",
         moduleName: "DemoModuleWithFunctions",
         publisherAddress: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
-        moduleData: "0x",
       });
       await sendAndConfirmTransaction({
-        transaction: uninstallTransaction,
         account: TEST_ACCOUNT_A,
+        transaction: uninstallTransaction,
       });
 
       installedModules = await getInstalledModules({
@@ -145,25 +145,25 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
 
     it("should deploy a modular contract with a module", async () => {
       const address = await deployModularContract({
+        account: TEST_ACCOUNT_A,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_A,
         core: "ERC20",
-        params: {
-          name: "TestModularERC20",
-          symbol: "TT",
-        },
         modules: [
           ERC20Claimable.module({
             primarySaleRecipient: TEST_ACCOUNT_A.address,
           }),
         ],
+        params: {
+          name: "TestModularERC20",
+          symbol: "TT",
+        },
       });
       const installedModules = await getInstalledModules({
         contract: getContract({
-          client: TEST_CLIENT,
-          chain: ANVIL_CHAIN,
           address,
+          chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
         }),
       });
       expect(installedModules.length).toBe(1);
@@ -192,33 +192,33 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
         }).then((m) => ({
           deployMetadata: m,
           initializeParams: {
-            royaltyRecipient: TEST_ACCOUNT_A.address,
             royaltyBps: 10000,
+            royaltyRecipient: TEST_ACCOUNT_A.address,
             transferValidator: ZERO_ADDRESS,
           },
         })),
       ]);
       const address = await deployContractfromDeployMetadata({
+        account: TEST_ACCOUNT_A,
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
-        account: TEST_ACCOUNT_A,
         deployMetadata: await fetchPublishedContractMetadata({
           client: TEST_CLIENT,
           contractId: "ERC721CoreInitializable",
         }),
         initializeParams: {
-          owner: TEST_ACCOUNT_A.address,
+          contractURI: "",
           name: "TestModularDynamic",
+          owner: TEST_ACCOUNT_A.address,
           symbol: "TT",
-          contractURI: "",
         },
         modules,
       });
       const installedModules = await getInstalledModules({
         contract: getContract({
-          client: TEST_CLIENT,
-          chain: ANVIL_CHAIN,
           address,
+          chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
         }),
       });
       expect(installedModules.length).toBe(3);
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-modular.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-modular.ts
index c1aede3f783..f4c3836b3f3 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-modular.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-modular.ts
@@ -3,10 +3,9 @@ import type { ThirdwebClient } from "../../client/client.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import { deployViaAutoFactory } from "../../contract/deployment/deploy-via-autofactory.js";
 import { getOrDeployInfraForPublishedContract } from "../../contract/deployment/utils/bootstrap.js";
-import { upload } from "../../storage/upload.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import { upload } from "../../storage/upload.js";
 import { type Address, getAddress } from "../../utils/address.js";
-import type {} from "../../utils/any-evm/deploy-metadata.js";
 import type { Hex } from "../../utils/encoding/hex.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChainAndAccount } from "../../utils/types.js";
@@ -103,9 +102,9 @@ export async function deployModularContract(
   const contractId = getContractId(core);
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
       contractId,
       publisher,
     });
@@ -115,38 +114,38 @@ export async function deployModularContract(
       client,
       files: [
         {
-          name: coreParams.name,
           description: coreParams.description,
-          symbol: coreParams.symbol,
-          image: coreParams.image,
           external_link: coreParams.external_link,
+          image: coreParams.image,
+          name: coreParams.name,
           social_urls: coreParams.social_urls,
+          symbol: coreParams.symbol,
         },
       ],
     })) ||
     "";
   const initializeTransaction =
     await getInitializeTransactionForModularContract({
-      client,
-      chain,
       account,
-      implementationContract,
+      accountAddress: getAddress(account.address),
+      chain,
+      client,
       contractId,
+      implementationContract,
       initializeParams: {
-        name: coreParams.name || "",
-        symbol: coreParams.symbol || "",
         contractURI,
+        name: coreParams.name || "",
         owner: coreParams.defaultAdmin
           ? getAddress(coreParams.defaultAdmin)
           : account.address,
+        symbol: coreParams.symbol || "",
       },
-      accountAddress: getAddress(account.address),
       modules,
     });
   return deployViaAutoFactory({
-    client,
-    chain,
     account,
+    chain,
+    client,
     cloneFactoryContract,
     initializeTransaction,
     salt,
@@ -183,9 +182,9 @@ async function getInitializeTransactionForModularContract(options: {
       for (const installer of modules) {
         // this might deploy the module if not already deployed
         const installData = await installer({
-          client,
-          chain,
           account,
+          chain,
+          client,
         });
         moduleAddresses.push(installData.module);
         moduleInstallData.push(installData.data);
@@ -193,12 +192,12 @@ async function getInitializeTransactionForModularContract(options: {
       // all 3 cores have the same initializer
       return initialize({
         contract: implementationContract,
-        owner: initializeParams.owner,
-        name: initializeParams.name,
-        symbol: initializeParams.symbol,
         contractURI: initializeParams.contractURI,
-        modules: moduleAddresses,
         moduleInstallData,
+        modules: moduleAddresses,
+        name: initializeParams.name,
+        owner: initializeParams.owner,
+        symbol: initializeParams.symbol,
       });
     }
     default:
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-pack.test.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-pack.test.ts
index cfb5cc3dcef..71d937c7bef 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-pack.test.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-pack.test.ts
@@ -11,8 +11,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("deploy-pack contract", () => {
   it("should deploy Pack contract", async () => {
     const address = await deployPackContract({
       account,
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
         name: "pack-contract",
       },
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-pack.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-pack.ts
index 9d153680ecf..a7175c7dcce 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-pack.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-pack.ts
@@ -6,8 +6,8 @@ import {
   getOrDeployInfraContract,
   getOrDeployInfraForPublishedContract,
 } from "../../contract/deployment/utils/bootstrap.js";
-import { upload } from "../../storage/upload.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import { upload } from "../../storage/upload.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChainAndAccount } from "../../utils/types.js";
 import { initialize } from "./__generated__/Pack/write/initialize.js";
@@ -81,41 +81,41 @@ export async function deployPackContract(options: DeployPackContractOptions) {
   const { chain, client, account, params } = options;
   const [WETH, forwarder] = await Promise.all([
     getOrDeployInfraContract({
+      account,
       chain,
       client,
-      account,
       contractId: "WETH9",
     }),
     getOrDeployInfraContract({
+      account,
       chain,
       client,
-      account,
       contractId: "ForwarderEOAOnly",
     }),
   ]);
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
-      contractId: "Pack",
       constructorParams: {
         nativeTokenWrapper: WETH.address,
         trustedForwarder: forwarder.address,
       },
+      contractId: "Pack",
     });
   const initializeTransaction = await getInitializeTransaction({
+    accountAddress: account.address,
+    chain,
     client,
     implementationContract,
     params,
-    accountAddress: account.address,
-    chain,
   });
 
   return deployViaAutoFactory({
-    client,
-    chain,
     account,
+    chain,
+    client,
     cloneFactoryContract,
     initializeTransaction,
   });
@@ -138,12 +138,12 @@ async function getInitializeTransaction(options: {
       client,
       files: [
         {
-          name: params.name,
           description: params.description,
-          symbol: params.symbol || "",
-          image: params.image,
           external_link: params.external_link,
+          image: params.image,
+          name: params.name,
           social_urls: params.social_urls,
+          symbol: params.symbol || "",
         },
       ],
     })) ||
@@ -165,12 +165,12 @@ async function getInitializeTransaction(options: {
   }
   return initialize({
     contract: implementationContract,
-    name: params.name,
-    symbol: params.symbol || "",
+    contractURI,
     defaultAdmin: params.defaultAdmin || accountAddress,
+    name: params.name,
+    royaltyBps,
     royaltyRecipient: params.royaltyRecipient || accountAddress,
-    contractURI,
+    symbol: params.symbol || "",
     trustedForwarders: params.trustedForwarders || [],
-    royaltyBps,
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-published.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-published.ts
index d862311cd8f..ccadb0756ab 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-published.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-published.ts
@@ -1,7 +1,7 @@
 import type { AbiFunction } from "abitype";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { fetchPublishedContractMetadata } from "../../contract/deployment/publisher.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { simulateTransaction } from "../../transaction/actions/simulate.js";
@@ -10,11 +10,11 @@ import { resolveMethod } from "../../transaction/resolve-method.js";
 import { encodeAbiParameters } from "../../utils/abi/encodeAbiParameters.js";
 import { normalizeFunctionParams } from "../../utils/abi/normalizeFunctionParams.js";
 import { getAddress } from "../../utils/address.js";
+import type { FetchDeployMetadataResult } from "../../utils/any-evm/deploy-metadata.js";
 import {
   type CompilerMetadata,
   fetchBytecodeFromCompilerMetadata,
 } from "../../utils/any-evm/deploy-metadata.js";
-import type { FetchDeployMetadataResult } from "../../utils/any-evm/deploy-metadata.js";
 import { encodeExtraDataWithUri } from "../../utils/any-evm/encode-extra-data-with-uri.js";
 import type { Hex } from "../../utils/encoding/hex.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
@@ -107,16 +107,16 @@ export async function deployPublishedContract(
   return deployContractfromDeployMetadata({
     account,
     chain,
-    deployMetadata,
     client,
-    initializeParams: {
-      ...deployMetadata.constructorParams,
-      ...contractParams,
-    },
+    deployMetadata,
     implementationConstructorParams: {
       ...deployMetadata.implConstructorParams,
       ...implementationConstructorParams,
     },
+    initializeParams: {
+      ...deployMetadata.constructorParams,
+      ...contractParams,
+    },
     salt,
   });
 }
@@ -166,9 +166,9 @@ export async function deployContractfromDeployMetadata(
     processedImplParams = {};
     for (const key in implementationConstructorParams) {
       processedImplParams[key] = await processRefDeployments({
-        client,
         account,
         chain,
+        client,
         paramValue: implementationConstructorParams[key] as
           | string
           | ImplementationConstructorParam,
@@ -180,9 +180,9 @@ export async function deployContractfromDeployMetadata(
     processedInitializeParams = {};
     for (const key in initializeParams) {
       processedInitializeParams[key] = await processRefDeployments({
-        client,
         account,
         chain,
+        client,
         paramValue: initializeParams[key] as
           | string
           | ImplementationConstructorParam,
@@ -194,12 +194,12 @@ export async function deployContractfromDeployMetadata(
     case "standard": {
       return directDeploy({
         account,
-        client,
         chain,
+        client,
         compilerMetadata: deployMetadata,
         contractParams: processedInitializeParams,
-        salt,
         metadataUri: deployMetadata.metadataUri,
+        salt,
       });
     }
     case "autoFactory": {
@@ -217,28 +217,27 @@ export async function deployContractfromDeployMetadata(
       ) {
         for (const e of deployMetadata.defaultExtensions) {
           await getOrDeployInfraForPublishedContract({
+            account,
             chain,
             client,
-            account,
-            contractId: e.extensionName,
-            version: e.extensionVersion || "latest",
-            publisher: e.publisherAddress,
             constructorParams:
               await getAllDefaultConstructorParamsForImplementation({
                 chain,
                 client,
                 contractId: e.extensionName,
               }),
+            contractId: e.extensionName,
+            publisher: e.publisherAddress,
+            version: e.extensionVersion || "latest",
           });
         }
       }
 
       const { cloneFactoryContract, implementationContract } =
         await getOrDeployInfraForPublishedContract({
+          account,
           chain,
           client,
-          account,
-          contractId: deployMetadata.name,
           constructorParams: {
             ...(await getAllDefaultConstructorParamsForImplementation({
               chain,
@@ -248,36 +247,37 @@ export async function deployContractfromDeployMetadata(
             })),
             ...processedImplParams,
           },
+          contractId: deployMetadata.name,
           publisher: deployMetadata.publisher,
           version: deployMetadata.version,
         });
 
       if (isCrosschain) {
         return deployViaAutoFactory({
-          client,
-          chain,
           account,
+          chain,
+          client,
           cloneFactoryContract,
           implementationAddress: implementationContract.address,
           initializeData,
-          salt,
           isCrosschain,
+          salt,
         });
       }
 
       const initializeTransaction = await getInitializeTransaction({
-        client,
+        account,
         chain,
+        client,
         deployMetadata,
         implementationContract,
         initializeParams: processedInitializeParams,
-        account,
         modules,
       });
       return deployViaAutoFactory({
-        client,
-        chain,
         account,
+        chain,
+        client,
         cloneFactoryContract,
         initializeTransaction,
         salt,
@@ -298,9 +298,9 @@ export async function deployContractfromDeployMetadata(
       }
 
       const factory = getContract({
-        client,
-        chain,
         address: factoryAddress,
+        chain,
+        client,
       });
       const method = await resolveMethod(factoryFunction)(factory);
       const deployTx = prepareContractCall({
@@ -313,8 +313,8 @@ export async function deployContractfromDeployMetadata(
         transaction: deployTx,
       });
       await sendAndConfirmTransaction({
-        transaction: deployTx,
         account,
+        transaction: deployTx,
       });
       return address as string;
     }
@@ -322,12 +322,12 @@ export async function deployContractfromDeployMetadata(
       // Default to standard deployment if none was specified
       return directDeploy({
         account,
-        client,
         chain,
+        client,
         compilerMetadata: deployMetadata,
         contractParams: processedInitializeParams,
-        salt,
         metadataUri: deployMetadata.metadataUri,
+        salt,
       });
     }
     default:
@@ -353,17 +353,16 @@ async function directDeploy(options: {
   );
   const isStylus = options.compilerMetadata.metadata.language === "rust";
   return deployContract({
+    abi: compilerMetadata.abi,
     account,
-    client,
-    chain,
     bytecode: await fetchBytecodeFromCompilerMetadata({
-      compilerMetadata,
-      client,
       chain,
+      client,
+      compilerMetadata,
     }),
-    abi: compilerMetadata.abi,
+    chain,
+    client,
     constructorParams: contractParams,
-    salt,
     extraDataWithUri:
       isStylus && options.metadataUri
         ? encodeExtraDataWithUri({
@@ -371,6 +370,7 @@ async function directDeploy(options: {
           })
         : undefined,
     isStylus,
+    salt,
   });
 }
 
@@ -464,9 +464,9 @@ export async function getInitializeTransaction(options: {
 
   const initializeTransaction = prepareContractCall({
     contract: getContract({
-      client,
-      chain,
       address: implementationContract.address,
+      chain,
+      client,
     }),
     method: initializeFunction,
     params: normalizeFunctionParams(initializeFunction, initializeParams),
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-split.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-split.ts
index 479327730c2..70e4806da38 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-split.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-split.ts
@@ -2,8 +2,8 @@ import type { ThirdwebClient } from "../../client/client.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import { deployViaAutoFactory } from "../../contract/deployment/deploy-via-autofactory.js";
 import { getOrDeployInfraForPublishedContract } from "../../contract/deployment/utils/bootstrap.js";
-import { upload } from "../../storage/upload.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import { upload } from "../../storage/upload.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChainAndAccount } from "../../utils/types.js";
 import { initialize } from "./__generated__/Split/write/initialize.js";
@@ -79,22 +79,22 @@ export async function deploySplitContract(options: DeploySplitContractOptions) {
   const { chain, client, account, params } = options;
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
       contractId: "Split",
     });
   const initializeTransaction = await getInitializeTransaction({
+    accountAddress: account.address,
     client,
     implementationContract,
     params,
-    accountAddress: account.address,
   });
 
   return deployViaAutoFactory({
-    client,
-    chain,
     account,
+    chain,
+    client,
     cloneFactoryContract,
     initializeTransaction,
   });
@@ -123,22 +123,22 @@ async function getInitializeTransaction(options: {
       client,
       files: [
         {
-          name,
           description,
-          symbol,
-          image,
           external_link,
+          image,
+          name,
           social_urls,
+          symbol,
         },
       ],
     })) ||
     "";
   return initialize({
     contract: implementationContract,
-    defaultAdmin: params.defaultAdmin || accountAddress,
     contractURI,
-    trustedForwarders: params.trustedForwarders || [],
+    defaultAdmin: params.defaultAdmin || accountAddress,
     payees,
     shares,
+    trustedForwarders: params.trustedForwarders || [],
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-vote.test.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-vote.test.ts
index a61633a5119..85b29ddf9b7 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-vote.test.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-vote.test.ts
@@ -12,15 +12,15 @@ describe.runIf(process.env.TW_SECRET_KEY)("deploy-voteERC20 contract", () => {
     await expect(
       deployVoteContract({
         account,
-        client: TEST_CLIENT,
         chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         params: {
-          name: "",
           contractURI: TEST_CONTRACT_URI,
-          tokenAddress: "doesnt matter here, code wont be reached",
           initialProposalThreshold: "0.5",
           initialVotingPeriod: 10,
           minVoteQuorumRequiredPercent: 51.12,
+          name: "",
+          tokenAddress: "doesnt matter here, code wont be reached",
         },
       }),
     ).rejects.toThrowError(
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-vote.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-vote.ts
index 0db5d206ba4..25aeb940bb2 100644
--- a/packages/thirdweb/src/extensions/prebuilts/deploy-vote.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/deploy-vote.ts
@@ -1,6 +1,6 @@
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { deployViaAutoFactory } from "../../contract/deployment/deploy-via-autofactory.js";
 import { getOrDeployInfraForPublishedContract } from "../../contract/deployment/utils/bootstrap.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
@@ -93,23 +93,23 @@ export async function deployVoteContract(options: DeployVoteContractOptions) {
   const { chain, client, account, params } = options;
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
+      account,
       chain,
       client,
-      account,
       contractId: "VoteERC20",
     });
   const initializeTransaction = await getInitializeTransaction({
+    accountAddress: account.address,
+    chain,
     client,
     implementationContract,
     params,
-    accountAddress: account.address,
-    chain,
   });
 
   return deployViaAutoFactory({
-    client,
-    chain,
     account,
+    chain,
+    client,
     cloneFactoryContract,
     initializeTransaction,
   });
@@ -159,8 +159,8 @@ async function getInitializeTransaction(options: {
 
   const tokenErc20Contract = getContract({
     address: tokenAddress,
-    client,
     chain,
+    client,
   });
 
   /**
@@ -187,12 +187,12 @@ async function getInitializeTransaction(options: {
       client,
       files: [
         {
-          name,
           description,
-          symbol,
-          image,
           external_link,
+          image,
+          name,
           social_urls,
+          symbol,
         },
       ],
     })) ||
@@ -200,14 +200,14 @@ async function getInitializeTransaction(options: {
 
   return initialize({
     contract: implementationContract,
-    name,
-    token: tokenAddress,
+    contractURI,
     // Make sure the final value passed to `initialProposalThreshold` is in wei
     initialProposalThreshold: initialProposalThresholdInWei,
     initialVoteQuorumFraction,
     initialVotingDelay: BigInt(initialVotingDelay || 0),
     initialVotingPeriod: BigInt(initialVotingPeriod),
-    contractURI,
+    name,
+    token: tokenAddress,
     trustedForwarders: params.trustedForwarders || [],
   });
 }
diff --git a/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.test.ts b/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.test.ts
index faf27a8cfe6..6f6c8bb9154 100644
--- a/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.test.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.test.ts
@@ -20,8 +20,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         contractId: "AccountFactory",
       });
       const results = await getRequiredTransactions({
-        client: TEST_CLIENT,
         chain: CLEAN_ANVIL_CHAIN,
+        client: TEST_CLIENT,
         deployMetadata,
       });
       expect(results.length).toBe(1);
@@ -33,8 +33,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         contractId: "Airdrop",
       });
       const results = await getRequiredTransactions({
-        client: TEST_CLIENT,
         chain: CLEAN_ANVIL_CHAIN,
+        client: TEST_CLIENT,
         deployMetadata,
       });
       expect(results.length).toBe(4);
@@ -46,8 +46,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         contractId: "ERC721CoreInitializable",
       });
       const results = await getRequiredTransactions({
-        client: TEST_CLIENT,
         chain: CLEAN_ANVIL_CHAIN,
+        client: TEST_CLIENT,
         deployMetadata,
         modules: await Promise.all(
           ["ClaimableERC721", "BatchMetadataERC721", "RoyaltyERC721"].map(
@@ -70,8 +70,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         contractId: "EvolvingNFT",
       });
       const results = await getRequiredTransactions({
-        client: TEST_CLIENT,
         chain: CLEAN_ANVIL_CHAIN,
+        client: TEST_CLIENT,
         deployMetadata,
       });
 
diff --git a/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.ts b/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.ts
index 15036cf662a..b9e038370e8 100644
--- a/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.ts
@@ -4,8 +4,10 @@ import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import { getDeployedCreate2Factory } from "../../contract/deployment/utils/create-2-factory.js";
-import { getDeployedInfraContract } from "../../contract/deployment/utils/infra.js";
-import { getDeployedInfraContractFromMetadata } from "../../contract/deployment/utils/infra.js";
+import {
+  getDeployedInfraContract,
+  getDeployedInfraContractFromMetadata,
+} from "../../contract/deployment/utils/infra.js";
 import { ZKSYNC_WETH } from "../../contract/deployment/zksync/implementations.js";
 import { computePublishedContractAddress } from "../../utils/any-evm/compute-published-contract-address.js";
 import type { FetchDeployMetadataResult } from "../../utils/any-evm/deploy-metadata.js";
@@ -72,7 +74,7 @@ export async function getRequiredTransactions(
           }).then((c) =>
             c
               ? null
-              : ({ type: "infra", contractId: "Create2Factory" } as const),
+              : ({ contractId: "Create2Factory", type: "infra" } as const),
           ),
       isZkSync
         ? null
@@ -81,14 +83,13 @@ export async function getRequiredTransactions(
             client,
             contractId: "Forwarder",
           }).then((c) =>
-            c ? null : ({ type: "infra", contractId: "Forwarder" } as const),
+            c ? null : ({ contractId: "Forwarder", type: "infra" } as const),
           ),
       isZkSync
         ? null
         : getDeployedInfraContract({
             chain,
             client,
-            contractId: "TWCloneFactory",
             constructorParams: {
               _trustedForwarder: await computePublishedContractAddress({
                 chain,
@@ -96,10 +97,11 @@ export async function getRequiredTransactions(
                 contractId: "Forwarder",
               }),
             },
+            contractId: "TWCloneFactory",
           }).then((c) =>
             c
               ? null
-              : ({ type: "infra", contractId: "TWCloneFactory" } as const),
+              : ({ contractId: "TWCloneFactory", type: "infra" } as const),
           ),
       // TODO (deploy): add WETH contract check for implementations that need it (check implementation constructor params)
       getTransactionsForImplementation({
@@ -117,17 +119,17 @@ export async function getRequiredTransactions(
           c
             ? null
             : ({
-                type: "module",
                 contractId: m.deployMetadata.name,
+                type: "module",
               } as const),
         ),
       ),
     ]);
-    results.push({ type: "proxy", contractId: deployMetadata.name });
+    results.push({ contractId: deployMetadata.name, type: "proxy" });
     return results.flat().filter((r) => r !== null);
   }
 
-  return [{ type: "implementation", contractId: deployMetadata.name }];
+  return [{ contractId: deployMetadata.name, type: "implementation" }];
 }
 
 async function getTransactionsForImplementation(options: {
@@ -158,16 +160,16 @@ async function getTransactionsForImplementation(options: {
   const result = await getDeployedInfraContract({
     chain,
     client,
-    contractId: deployMetadata.name,
     constructorParams,
+    contractId: deployMetadata.name,
     publisher: deployMetadata.publisher,
     version: deployMetadata.version,
   }).then((c) =>
     c
       ? null
       : ({
-          type: "implementation",
           contractId: deployMetadata.name,
+          type: "implementation",
         } as const),
   );
   return result ? [result] : [];
@@ -189,40 +191,40 @@ async function getTransactionsForMarketplaceV3(options: {
       client,
       contractId: "WETH9",
     }).then((c) =>
-      c ? null : ({ type: "infra", contractId: "WETH9" } as const),
+      c ? null : ({ contractId: "WETH9", type: "infra" } as const),
     ),
     getDeployedInfraContract({
       chain,
       client,
-      contractId: "DirectListingsLogic",
       constructorParams: { _nativeTokenWrapper: WETHAddress },
+      contractId: "DirectListingsLogic",
     }).then((c) =>
       c
         ? null
-        : ({ type: "extension", contractId: "DirectListingsLogic" } as const),
+        : ({ contractId: "DirectListingsLogic", type: "extension" } as const),
     ),
     getDeployedInfraContract({
       chain,
       client,
-      contractId: "EnglishAuctionsLogic",
       constructorParams: { _nativeTokenWrapper: WETHAddress },
+      contractId: "EnglishAuctionsLogic",
     }).then((c) =>
       c
         ? null
-        : ({ type: "extension", contractId: "EnglishAuctionsLogic" } as const),
+        : ({ contractId: "EnglishAuctionsLogic", type: "extension" } as const),
     ),
     getDeployedInfraContract({
       chain,
       client,
       contractId: "OffersLogic",
     }).then((c) =>
-      c ? null : ({ type: "extension", contractId: "OffersLogic" } as const),
+      c ? null : ({ contractId: "OffersLogic", type: "extension" } as const),
     ),
   ]);
   // hacky assumption: if we need to deploy any of the extensions, we also need to deploy the implementation
   const transactions = extensions.filter((e) => e !== null);
   if (transactions.length) {
-    transactions.push({ type: "implementation", contractId: "MarketplaceV3" });
+    transactions.push({ contractId: "MarketplaceV3", type: "implementation" });
   }
   return transactions;
 }
@@ -243,7 +245,7 @@ async function getTransactionsForDynamicContract(options: {
     client,
     contractId: "WETH9",
   }).then((c) =>
-    c ? null : ({ type: "infra", contractId: "WETH9" } as const),
+    c ? null : ({ contractId: "WETH9", type: "infra" } as const),
   );
   const extensions: (DeployTransactionResult | null)[] = options.deployMetadata
     .defaultExtensions
@@ -252,14 +254,14 @@ async function getTransactionsForDynamicContract(options: {
           return getDeployedInfraContract({
             chain,
             client,
+            constructorParams: { _nativeTokenWrapper: WETHAddress },
             contractId: e.extensionName,
             publisher: e.publisherAddress,
             version: e.extensionVersion || "latest",
-            constructorParams: { _nativeTokenWrapper: WETHAddress },
           }).then((c) =>
             c
               ? null
-              : ({ type: "extension", contractId: e.extensionName } as const),
+              : ({ contractId: e.extensionName, type: "extension" } as const),
           );
         }),
       )
@@ -268,8 +270,8 @@ async function getTransactionsForDynamicContract(options: {
   const transactions = [...extensions, wethTx].filter((e) => e !== null);
   if (transactions.length) {
     transactions.push({
-      type: "implementation",
       contractId: options.deployMetadata.name,
+      type: "implementation",
     });
   }
   return transactions;
@@ -319,18 +321,18 @@ export async function getAllDefaultConstructorParamsForImplementation(args: {
 
   const defaultExtensionInput = args.defaultExtensions
     ? await generateExtensionInput({
-        defaultExtensions: args.defaultExtensions,
         chain,
         client,
+        defaultExtensions: args.defaultExtensions,
         forwarder,
         nativeTokenWrapper: weth,
       })
     : [];
 
   return {
-    trustedForwarder: forwarder,
-    nativeTokenWrapper: weth,
     extensions: defaultExtensionInput,
+    nativeTokenWrapper: weth,
+    trustedForwarder: forwarder,
   };
 }
 
@@ -349,14 +351,14 @@ async function generateExtensionInput(args: {
       getDeployedInfraContract({
         chain,
         client,
+        constructorParams: { forwarder, nativeTokenWrapper },
         contractId: e.extensionName,
         publisher: e.publisherAddress,
         version: e.extensionVersion || "latest",
-        constructorParams: { forwarder, nativeTokenWrapper },
       }).then((c) => ({
-        name: e.extensionName,
-        metadataURI: "",
         implementation: c,
+        metadataURI: "",
+        name: e.extensionName,
       })),
     ),
   );
@@ -369,11 +371,11 @@ async function generateExtensionInput(args: {
       return resolveContractAbi(e.implementation)
         .then(generateExtensionFunctionsFromAbi)
         .then((c) => ({
+          functions: c,
           metadata: {
             ...e,
             implementation: e.implementation?.address,
           },
-          functions: c,
         }));
     }),
   );
diff --git a/packages/thirdweb/src/extensions/prebuilts/process-ref-deployments.test.ts b/packages/thirdweb/src/extensions/prebuilts/process-ref-deployments.test.ts
index e8a592d4995..89ee2ea11e6 100644
--- a/packages/thirdweb/src/extensions/prebuilts/process-ref-deployments.test.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/process-ref-deployments.test.ts
@@ -25,104 +25,104 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     beforeAll(async () => {
       multisigAddress = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "MultiSig",
-        version: "0.0.4",
-        salt: "",
         publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+        salt: "",
+        version: "0.0.4",
       });
       dummyContractAddress = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "ContractWithBytes",
-        version: "0.0.2",
-        salt: "",
         publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+        salt: "",
+        version: "0.0.2",
       });
       mintfeeManagerModuleAddress = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "MintFeeManagerModule",
-        version: "0.0.1",
-        salt: "",
         publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+        salt: "",
+        version: "0.0.1",
       });
       mintfeeManagerCoreAddress = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "MintFeeManagerCore",
-        version: "0.0.26",
-        salt: "",
         publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+        salt: "",
+        version: "0.0.26",
       });
       claimableModuleAddress = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "ClaimableERC721",
-        version: "0.0.14",
-        salt: "",
         publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+        salt: "",
+        version: "0.0.14",
       });
       wethAddress = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "WETH9",
         salt: "",
       });
       forwarderAddress = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "Forwarder",
-        version: "0.0.1",
-        salt: "",
         publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+        salt: "",
+        version: "0.0.1",
       });
       multiwrapAddress = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         account: TEST_ACCOUNT_A,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         contractId: "Multiwrap",
-        version: "0.0.4",
-        publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
         contractParams: {
+          _contractURI: "",
           _defaultAdmin: TEST_ACCOUNT_A.address,
           _name: "test",
+          _royaltyBps: 500n,
+          _royaltyRecipient: TEST_ACCOUNT_A.address,
           _symbol: "test",
-          _contractURI: "",
           _trustedForwarders: {
             defaultValue: "",
             dynamicValue: {
-              type: "address[]",
               refContracts: [
                 {
                   contractId: "Forwarder",
-                  version: "0.0.1",
                   publisherAddress:
                     "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
                   salt: "",
+                  version: "0.0.1",
                 },
               ],
+              type: "address[]",
             },
           },
-          _royaltyRecipient: TEST_ACCOUNT_A.address,
-          _royaltyBps: 500n,
         },
+        publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+        version: "0.0.4",
       });
     }, 120000);
 
     it("should set ref contract dependencies for direct deploy contracts", async () => {
       const claimableModule = getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address: claimableModuleAddress,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       });
       const fetchedMintFeeManagerAddress = await readContract({
         contract: claimableModule,
@@ -133,9 +133,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       );
 
       const mintFeeManager = getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address: mintfeeManagerCoreAddress,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       });
       const owner = await readContract({
         contract: mintFeeManager,
@@ -161,9 +161,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(fee).to.eq(5n);
 
       const dummyContract = getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address: dummyContractAddress,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       });
       const dummyContractOwner = await readContract({
         contract: dummyContract,
@@ -174,9 +174,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should set ref contract dependencies for auto factory contracts", async () => {
       const multiwrap = getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
         address: multiwrapAddress,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       });
       const fetchedWethAddress = await readContract({
         contract: multiwrap,
@@ -200,39 +200,39 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         claimableModuleAddressComputed,
       ] = await Promise.all([
         getDeployedInfraContract({
-          client: TEST_CLIENT,
           chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
           contractId: "MultiSig",
-          version: "0.0.4",
           publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+          version: "0.0.4",
         }),
         getDeployedInfraContract({
-          client: TEST_CLIENT,
           chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
           contractId: "ContractWithBytes",
-          version: "0.0.2",
           publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+          version: "0.0.2",
         }),
         getDeployedInfraContract({
-          client: TEST_CLIENT,
           chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
           contractId: "MintFeeManagerModule",
-          version: "0.0.1",
           publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+          version: "0.0.1",
         }),
         getDeployedInfraContract({
-          client: TEST_CLIENT,
           chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
           contractId: "MintFeeManagerCore",
-          version: "0.0.26",
           publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+          version: "0.0.26",
         }),
         getDeployedInfraContract({
-          client: TEST_CLIENT,
           chain: ANVIL_CHAIN,
+          client: TEST_CLIENT,
           contractId: "ClaimableERC721",
-          version: "0.0.14",
           publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+          version: "0.0.14",
         }),
       ]);
 
diff --git a/packages/thirdweb/src/extensions/prebuilts/process-ref-deployments.ts b/packages/thirdweb/src/extensions/prebuilts/process-ref-deployments.ts
index f3b6e0cb110..8704a286449 100644
--- a/packages/thirdweb/src/extensions/prebuilts/process-ref-deployments.ts
+++ b/packages/thirdweb/src/extensions/prebuilts/process-ref-deployments.ts
@@ -50,13 +50,13 @@ export async function processRefDeployments(
             : "";
 
         const addr = await deployPublishedContract({
-          client,
-          chain,
           account,
+          chain,
+          client,
           contractId: contracts[0]?.contractId,
           publisher: contracts[0]?.publisherAddress,
-          version: contracts[0]?.version,
           salt,
+          version: contracts[0]?.version,
         });
 
         return addr;
@@ -73,13 +73,13 @@ export async function processRefDeployments(
 
           addressArray.push(
             await deployPublishedContract({
-              client,
-              chain,
               account,
+              chain,
+              client,
               contractId: c.contractId,
               publisher: c.publisherAddress,
-              version: c.version,
               salt,
+              version: c.version,
             }),
           );
         }
@@ -104,9 +104,9 @@ export async function processRefDeployments(
             } else if (v.dynamicValue) {
               values.push(
                 await processRefDeployments({
-                  client,
                   account,
                   chain,
+                  client,
                   paramValue: v,
                 }),
               );
@@ -143,9 +143,9 @@ export async function processRefDeployments(
               } else if (v.dynamicValue) {
                 values.push(
                   await processRefDeployments({
-                    client,
                     account,
                     chain,
+                    client,
                     paramValue: v,
                   }),
                 );
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/read/payee.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/read/payee.ts
index 78ca9f193c6..62e10b946de 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/read/payee.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/read/payee.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "payee" function.
@@ -16,8 +16,8 @@ export type PayeeParams = {
 export const FN_SELECTOR = "0x8b83209b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "index",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/read/payeeCount.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/read/payeeCount.ts
index ca0a1d2018b..3a1d7c9f2da 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/read/payeeCount.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/read/payeeCount.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x00dbe109" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/read/releasable.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/read/releasable.ts
index 5b08e87a951..c6de9aba5b8 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/read/releasable.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/read/releasable.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "releasable" function.
@@ -16,8 +16,8 @@ export type ReleasableParams = {
 export const FN_SELECTOR = "0xa3f8eace" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/read/released.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/read/released.ts
index 6e4946af5fd..3563fa67f9d 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/read/released.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/read/released.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "released" function.
@@ -16,8 +16,8 @@ export type ReleasedParams = {
 export const FN_SELECTOR = "0x9852595c" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/read/shares.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/read/shares.ts
index b8a0402e720..ab616ea8dc4 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/read/shares.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/read/shares.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "shares" function.
@@ -16,8 +16,8 @@ export type SharesParams = {
 export const FN_SELECTOR = "0xce7c2ac2" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/read/totalReleased.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/read/totalReleased.ts
index ee0ae7881a6..f83e68fedbb 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/read/totalReleased.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/read/totalReleased.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe33b7de3" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/read/totalShares.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/read/totalShares.ts
index 878318ebe64..e36396a24c7 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/read/totalShares.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/read/totalShares.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3a98ef39" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/write/distribute.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/write/distribute.ts
index 10c3a66ef3a..ae168c8df86 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/write/distribute.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/write/distribute.ts
@@ -1,5 +1,5 @@
-import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
 
diff --git a/packages/thirdweb/src/extensions/split/__generated__/Split/write/release.ts b/packages/thirdweb/src/extensions/split/__generated__/Split/write/release.ts
index b3bd48606b0..f8170be5ac4 100644
--- a/packages/thirdweb/src/extensions/split/__generated__/Split/write/release.ts
+++ b/packages/thirdweb/src/extensions/split/__generated__/Split/write/release.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "release" function.
@@ -18,8 +18,8 @@ export type ReleaseParams = WithOverrides<{
 export const FN_SELECTOR = "0x19165587" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function release(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.account] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.account] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/split/read/getAllRecipientsPercentages.ts b/packages/thirdweb/src/extensions/split/read/getAllRecipientsPercentages.ts
index f50260a5f4d..c5024200480 100644
--- a/packages/thirdweb/src/extensions/split/read/getAllRecipientsPercentages.ts
+++ b/packages/thirdweb/src/extensions/split/read/getAllRecipientsPercentages.ts
@@ -1,8 +1,8 @@
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { getAllRecipientsAddresses } from "./getAllRecipientsAddresses.js";
 import {
-  type SplitRecipient,
   getRecipientSplitPercentage,
+  type SplitRecipient,
 } from "./getRecipientSplitPercentage.js";
 
 /**
diff --git a/packages/thirdweb/src/extensions/split/read/getRecipientSplitPercentage.ts b/packages/thirdweb/src/extensions/split/read/getRecipientSplitPercentage.ts
index 2cd1c69f398..c56b8f89ba9 100644
--- a/packages/thirdweb/src/extensions/split/read/getRecipientSplitPercentage.ts
+++ b/packages/thirdweb/src/extensions/split/read/getRecipientSplitPercentage.ts
@@ -39,7 +39,7 @@ export async function getRecipientSplitPercentage(
   const { contract, recipientAddress } = options;
   const [_totalShares, walletsShares] = await Promise.all([
     totalShares({ contract }),
-    shares({ contract, account: recipientAddress }),
+    shares({ account: recipientAddress, contract }),
   ]);
   // We convert to basis points to avoid floating point loss of precision
   // 7544n -> 75.44 (75.44 %)
diff --git a/packages/thirdweb/src/extensions/split/split.test.ts b/packages/thirdweb/src/extensions/split/split.test.ts
index ba9a28d056f..5236b318f1d 100644
--- a/packages/thirdweb/src/extensions/split/split.test.ts
+++ b/packages/thirdweb/src/extensions/split/split.test.ts
@@ -2,7 +2,7 @@ import { beforeAll, describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "~test/chains.js";
 import { TEST_CLIENT } from "~test/test-clients.js";
 import { TEST_ACCOUNT_D } from "~test/test-wallets.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { isAddress } from "../../utils/address.js";
 import { deploySplitContract } from "../prebuilts/deploy-split.js";
 import { getAllRecipientsAddresses } from "./read/getAllRecipientsAddresses.js";
@@ -17,8 +17,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Split contract tests", () => {
   beforeAll(async () => {
     const address = await deploySplitContract({
       account: TEST_ACCOUNT_D,
-      client,
       chain,
+      client,
       params: {
         name: "split-contract",
         payees: [
@@ -35,8 +35,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Split contract tests", () => {
     expect(isAddress(address)).toBe(true);
     contract = getContract({
       address,
-      client,
       chain,
+      client,
     });
   }, 60_000);
 
diff --git a/packages/thirdweb/src/extensions/stylus/__generated__/IArbWasm/write/activateProgram.ts b/packages/thirdweb/src/extensions/stylus/__generated__/IArbWasm/write/activateProgram.ts
index 1fb37500877..bd2994597f1 100644
--- a/packages/thirdweb/src/extensions/stylus/__generated__/IArbWasm/write/activateProgram.ts
+++ b/packages/thirdweb/src/extensions/stylus/__generated__/IArbWasm/write/activateProgram.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "activateProgram" function.
@@ -18,8 +18,8 @@ export type ActivateProgramParams = WithOverrides<{
 export const FN_SELECTOR = "0x58c780c2" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "program",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -124,23 +124,23 @@ export function activateProgram(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.program] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.program] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/stylus/write/activateStylusContract.ts b/packages/thirdweb/src/extensions/stylus/write/activateStylusContract.ts
index 03a05722cbe..f7593d03d6a 100644
--- a/packages/thirdweb/src/extensions/stylus/write/activateStylusContract.ts
+++ b/packages/thirdweb/src/extensions/stylus/write/activateStylusContract.ts
@@ -40,29 +40,29 @@ export async function activateStylusContract(
 ) {
   const { chain, client, contractAddress } = options;
   const arbWasmPrecompile = getContract({
-    client,
-    chain,
     address: ARB_WASM_ADDRESS,
+    chain,
+    client,
   });
 
   const dataFee = await estimateDataFee({
     transaction: activateProgram({
-      program: contractAddress,
       contract: arbWasmPrecompile,
+      program: contractAddress,
     }),
   });
 
   return activateProgram({
-    program: contractAddress,
     contract: arbWasmPrecompile,
     overrides: {
       value: dataFee,
     },
+    program: contractAddress,
   });
 }
 
 async function estimateDataFee(options: {
-  // biome-ignore lint/suspicious/noExplicitAny:
+  // biome-ignore lint/suspicious/noExplicitAny: TODO
   transaction: PreparedTransaction<any>;
 }) {
   const data = await encode(options.transaction);
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IAppURI/read/appURI.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IAppURI/read/appURI.ts
index 46f16ea3875..ec59487b8e8 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IAppURI/read/appURI.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IAppURI/read/appURI.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x094ec830" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IAppURI/write/setAppURI.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IAppURI/write/setAppURI.ts
index 0432d51a0f9..73aa2497ff6 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IAppURI/write/setAppURI.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IAppURI/write/setAppURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setAppURI" function.
@@ -18,8 +18,8 @@ export type SetAppURIParams = WithOverrides<{
 export const FN_SELECTOR = "0xfea18082" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function setAppURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.ts
index bc0db42d912..281d0697df8 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ProxyDeployed" event.
@@ -40,8 +40,8 @@ export type ProxyDeployedEventFilters = Partial<{
  */
 export function proxyDeployedEvent(filters: ProxyDeployedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event ProxyDeployed(address indexed implementation, address proxy, address indexed deployer)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployedV2.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployedV2.ts
index ecf298f13a1..44cf4fe1793 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployedV2.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployedV2.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ProxyDeployedV2" event.
@@ -48,8 +48,8 @@ export function proxyDeployedV2Event(
   filters: ProxyDeployedV2EventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event ProxyDeployedV2(address indexed implementation, address indexed proxy, address indexed deployer, bytes32 inputSalt, bytes data, bytes extraData)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.ts
index c7eee5a47d3..ce0d0a2c98e 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "deployProxyByImplementation" function.
@@ -23,16 +23,16 @@ export type DeployProxyByImplementationParams = WithOverrides<{
 export const FN_SELECTOR = "0x11b804ab" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "implementation",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
   {
-    type: "bytes32",
     name: "salt",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -150,8 +150,19 @@ export function deployProxyByImplementation(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -161,16 +172,5 @@ export function deployProxyByImplementation(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementationV2.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementationV2.ts
index 6918e6fc719..cf91f261d41 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementationV2.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementationV2.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "deployProxyByImplementationV2" function.
@@ -24,20 +24,20 @@ export type DeployProxyByImplementationV2Params = WithOverrides<{
 export const FN_SELECTOR = "0xd057c8b1" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "implementation",
+    type: "address",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
   {
-    type: "bytes32",
     name: "salt",
+    type: "bytes32",
   },
   {
-    type: "bytes",
     name: "extraData",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -159,8 +159,19 @@ export function deployProxyByImplementationV2(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -171,16 +182,5 @@ export function deployProxyByImplementationV2(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/ContractPublished.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/ContractPublished.ts
index a7581368a99..756cc6f3e75 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/ContractPublished.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/ContractPublished.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ContractPublished" event.
@@ -42,8 +42,8 @@ export function contractPublishedEvent(
   filters: ContractPublishedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event ContractPublished(address indexed operator, address indexed publisher, (string contractId, uint256 publishTimestamp, string publishMetadataUri, bytes32 bytecodeHash, address implementation) publishedContract)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/ContractUnpublished.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/ContractUnpublished.ts
index 3fdc9a44132..d5c0c6d5527 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/ContractUnpublished.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/ContractUnpublished.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ContractUnpublished" event.
@@ -48,8 +48,8 @@ export function contractUnpublishedEvent(
   filters: ContractUnpublishedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event ContractUnpublished(address indexed operator, address indexed publisher, string indexed contractId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/PublisherProfileUpdated.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/PublisherProfileUpdated.ts
index 952bbb39f58..f149393f44b 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/PublisherProfileUpdated.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/events/PublisherProfileUpdated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PublisherProfileUpdated" event.
@@ -36,8 +36,8 @@ export function publisherProfileUpdatedEvent(
   filters: PublisherProfileUpdatedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event PublisherProfileUpdated(address indexed publisher, string prevURI, string newURI)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getAllPublishedContracts.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getAllPublishedContracts.ts
index 3ebf22f4d5a..f8d9d8c3329 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getAllPublishedContracts.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getAllPublishedContracts.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAllPublishedContracts" function.
@@ -19,36 +19,36 @@ export type GetAllPublishedContractsParams = {
 export const FN_SELECTOR = "0xaf8db690" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "publisher",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "published",
     components: [
       {
-        type: "string",
         name: "contractId",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "publishTimestamp",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "publishMetadataUri",
+        type: "string",
       },
       {
-        type: "bytes32",
         name: "bytecodeHash",
+        type: "bytes32",
       },
       {
-        type: "address",
         name: "implementation",
+        type: "address",
       },
     ],
+    name: "published",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContract.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContract.ts
index f75744abb19..1779b66b970 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContract.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContract.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPublishedContract" function.
@@ -23,40 +23,40 @@ export type GetPublishedContractParams = {
 export const FN_SELECTOR = "0x7ec047fa" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "publisher",
+    type: "address",
   },
   {
-    type: "string",
     name: "contractId",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple",
-    name: "published",
     components: [
       {
-        type: "string",
         name: "contractId",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "publishTimestamp",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "publishMetadataUri",
+        type: "string",
       },
       {
-        type: "bytes32",
         name: "bytecodeHash",
+        type: "bytes32",
       },
       {
-        type: "address",
         name: "implementation",
+        type: "address",
       },
     ],
+    name: "published",
+    type: "tuple",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContractVersions.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContractVersions.ts
index 40b31842870..6a7f3ed3a73 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContractVersions.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedContractVersions.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPublishedContractVersions" function.
@@ -23,40 +23,40 @@ export type GetPublishedContractVersionsParams = {
 export const FN_SELECTOR = "0x80251dac" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "publisher",
+    type: "address",
   },
   {
-    type: "string",
     name: "contractId",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "published",
     components: [
       {
-        type: "string",
         name: "contractId",
+        type: "string",
       },
       {
-        type: "uint256",
         name: "publishTimestamp",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "publishMetadataUri",
+        type: "string",
       },
       {
-        type: "bytes32",
         name: "bytecodeHash",
+        type: "bytes32",
       },
       {
-        type: "address",
         name: "implementation",
+        type: "address",
       },
     ],
+    name: "published",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedUriFromCompilerUri.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedUriFromCompilerUri.ts
index e8506e61a6d..d5cefe1c3f3 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedUriFromCompilerUri.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublishedUriFromCompilerUri.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPublishedUriFromCompilerUri" function.
@@ -19,14 +19,14 @@ export type GetPublishedUriFromCompilerUriParams = {
 export const FN_SELECTOR = "0x819e992f" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "compilerMetadataUri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "string[]",
     name: "publishedMetadataUris",
+    type: "string[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublisherProfileUri.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublisherProfileUri.ts
index 98a7af736c7..10f803b6e41 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublisherProfileUri.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/read/getPublisherProfileUri.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPublisherProfileUri" function.
@@ -19,14 +19,14 @@ export type GetPublisherProfileUriParams = {
 export const FN_SELECTOR = "0x4f781675" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "publisher",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "string",
     name: "uri",
+    type: "string",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/publishContract.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/publishContract.ts
index 27b37ddbe45..8eb1035a5ca 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/publishContract.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/publishContract.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "publishContract" function.
@@ -41,28 +41,28 @@ export type PublishContractParams = WithOverrides<{
 export const FN_SELECTOR = "0xd50299e6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "publisher",
+    type: "address",
   },
   {
-    type: "string",
     name: "contractId",
+    type: "string",
   },
   {
-    type: "string",
     name: "publishMetadataUri",
+    type: "string",
   },
   {
-    type: "string",
     name: "compilerMetadataUri",
+    type: "string",
   },
   {
-    type: "bytes32",
     name: "bytecodeHash",
+    type: "bytes32",
   },
   {
-    type: "address",
     name: "implementation",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -182,8 +182,19 @@ export function publishContract(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -196,16 +207,5 @@ export function publishContract(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/setPublisherProfileUri.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/setPublisherProfileUri.ts
index ed3e71f44a2..aa618eedd09 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/setPublisherProfileUri.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/setPublisherProfileUri.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setPublisherProfileUri" function.
@@ -22,12 +22,12 @@ export type SetPublisherProfileUriParams = WithOverrides<{
 export const FN_SELECTOR = "0x6e578e54" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "publisher",
+    type: "address",
   },
   {
-    type: "string",
     name: "uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -134,23 +134,23 @@ export function setPublisherProfileUri(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.publisher, resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.publisher, resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/unpublishContract.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/unpublishContract.ts
index 5c5b15fdc91..9c835cfff23 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/unpublishContract.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IContractPublisher/write/unpublishContract.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "unpublishContract" function.
@@ -25,12 +25,12 @@ export type UnpublishContractParams = WithOverrides<{
 export const FN_SELECTOR = "0x06eb56cc" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "publisher",
+    type: "address",
   },
   {
-    type: "string",
     name: "contractId",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -136,23 +136,23 @@ export function unpublishContract(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.publisher, resolvedOptions.contractId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.publisher, resolvedOptions.contractId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RuleCreated.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RuleCreated.ts
index 104a865aaff..89bae55fec4 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RuleCreated.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RuleCreated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RuleCreated" event.
@@ -34,8 +34,8 @@ export type RuleCreatedEventFilters = Partial<{
  */
 export function ruleCreatedEvent(filters: RuleCreatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event RuleCreated(bytes32 indexed ruleId, (bytes32 ruleId, address token, uint8 tokenType, uint256 tokenId, uint256 balance, uint256 score, uint8 ruleType) rule)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RuleDeleted.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RuleDeleted.ts
index 67e1736ab9b..d49aa30069a 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RuleDeleted.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RuleDeleted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RuleDeleted" event.
@@ -34,7 +34,7 @@ export type RuleDeletedEventFilters = Partial<{
  */
 export function ruleDeletedEvent(filters: RuleDeletedEventFilters = {}) {
   return prepareEvent({
-    signature: "event RuleDeleted(bytes32 indexed ruleId)",
     filters,
+    signature: "event RuleDeleted(bytes32 indexed ruleId)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RulesEngineOverriden.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RulesEngineOverriden.ts
index 03a28920054..3058ceb2afd 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RulesEngineOverriden.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/events/RulesEngineOverriden.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RulesEngineOverriden" event.
@@ -36,7 +36,7 @@ export function rulesEngineOverridenEvent(
   filters: RulesEngineOverridenEventFilters = {},
 ) {
   return prepareEvent({
-    signature: "event RulesEngineOverriden(address indexed newRulesEngine)",
     filters,
+    signature: "event RulesEngineOverriden(address indexed newRulesEngine)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getAllRules.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getAllRules.ts
index a89a1d00220..ba836cf5188 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getAllRules.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getAllRules.ts
@@ -1,46 +1,45 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x1184aef2" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "rules",
     components: [
       {
-        type: "bytes32",
         name: "ruleId",
+        type: "bytes32",
       },
       {
-        type: "address",
         name: "token",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "balance",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "score",
+        type: "uint256",
       },
       {
-        type: "uint8",
         name: "ruleType",
+        type: "uint8",
       },
     ],
+    name: "rules",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getRulesEngineOverride.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getRulesEngineOverride.ts
index f374d148564..5258456d62a 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getRulesEngineOverride.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getRulesEngineOverride.ts
@@ -1,16 +1,15 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa7145eb4" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "rulesEngineAddress",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getScore.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getScore.ts
index 5e5b14f615f..118ea4765b4 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getScore.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/read/getScore.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getScore" function.
@@ -19,14 +19,14 @@ export type GetScoreParams = {
 export const FN_SELECTOR = "0xd47875d0" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_tokenOwner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "score",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleMultiplicative.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleMultiplicative.ts
index 8f2dde241dd..708421fe18d 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleMultiplicative.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleMultiplicative.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createRuleMultiplicative" function.
@@ -27,32 +27,32 @@ export type CreateRuleMultiplicativeParams = WithOverrides<{
 export const FN_SELECTOR = "0x1e2e9cb5" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "rule",
     components: [
       {
-        type: "address",
         name: "token",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "scorePerOwnedToken",
+        type: "uint256",
       },
     ],
+    name: "rule",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes32",
     name: "ruleId",
+    type: "bytes32",
   },
 ] as const;
 
@@ -155,23 +155,23 @@ export function createRuleMultiplicative(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.rule] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.rule] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleThreshold.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleThreshold.ts
index 846a085d5b5..ea16c30dc1f 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleThreshold.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleThreshold.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createRuleThreshold" function.
@@ -28,36 +28,36 @@ export type CreateRuleThresholdParams = WithOverrides<{
 export const FN_SELECTOR = "0x1022a25e" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "rule",
     components: [
       {
-        type: "address",
         name: "token",
+        type: "address",
       },
       {
-        type: "uint8",
         name: "tokenType",
+        type: "uint8",
       },
       {
-        type: "uint256",
         name: "tokenId",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "balance",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "score",
+        type: "uint256",
       },
     ],
+    name: "rule",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bytes32",
     name: "ruleId",
+    type: "bytes32",
   },
 ] as const;
 
@@ -156,23 +156,23 @@ export function createRuleThreshold(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.rule] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.rule] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/deleteRule.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/deleteRule.ts
index 605a10a3feb..31f0de9b86c 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/deleteRule.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/deleteRule.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "deleteRule" function.
@@ -18,8 +18,8 @@ export type DeleteRuleParams = WithOverrides<{
 export const FN_SELECTOR = "0x9d907761" as const;
 const FN_INPUTS = [
   {
-    type: "bytes32",
     name: "ruleId",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function deleteRule(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.ruleId] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.ruleId] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/setRulesEngineOverride.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/setRulesEngineOverride.ts
index 704af13404f..b42aa90b0a3 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/setRulesEngineOverride.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IRulesEngine/write/setRulesEngineOverride.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setRulesEngineOverride" function.
@@ -21,8 +21,8 @@ export type SetRulesEngineOverrideParams = WithOverrides<{
 export const FN_SELECTOR = "0x0eb0adb6" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_rulesEngineAddress",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -126,23 +126,23 @@ export function setRulesEngineOverride(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.rulesEngineAddress] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.rulesEngineAddress] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ISignatureAction/events/RequestExecuted.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ISignatureAction/events/RequestExecuted.ts
index 06a90ad62ff..103ba42602c 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ISignatureAction/events/RequestExecuted.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ISignatureAction/events/RequestExecuted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "RequestExecuted" event.
@@ -42,8 +42,8 @@ export function requestExecutedEvent(
   filters: RequestExecutedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event RequestExecuted(address indexed user, address indexed signer, (uint128 validityStartTimestamp, uint128 validityEndTimestamp, bytes32 uid, bytes data) _req)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ISignatureAction/read/verify.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ISignatureAction/read/verify.ts
index fde6a54b1a7..416b10cdeb4 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ISignatureAction/read/verify.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ISignatureAction/read/verify.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "verify" function.
@@ -26,40 +26,40 @@ export type VerifyParams = {
 export const FN_SELECTOR = "0xc4376dd7" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "req",
     components: [
       {
-        type: "uint128",
         name: "validityStartTimestamp",
+        type: "uint128",
       },
       {
-        type: "uint128",
         name: "validityEndTimestamp",
+        type: "uint128",
       },
       {
-        type: "bytes32",
         name: "uid",
+        type: "bytes32",
       },
       {
-        type: "bytes",
         name: "data",
+        type: "bytes",
       },
     ],
+    name: "req",
+    type: "tuple",
   },
   {
-    type: "bytes",
     name: "signature",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "bool",
     name: "success",
+    type: "bool",
   },
   {
-    type: "address",
     name: "signer",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWFee/read/getFeeInfo.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWFee/read/getFeeInfo.ts
index db4ca066a73..8ca983f087a 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWFee/read/getFeeInfo.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWFee/read/getFeeInfo.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getFeeInfo" function.
@@ -17,22 +17,22 @@ export type GetFeeInfoParams = {
 export const FN_SELECTOR = "0x85b49ad0" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_proxy",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_type",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "recipient",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "bps",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/events/Added.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/events/Added.ts
index 40dd0fc17f8..a7bd17c4176 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/events/Added.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/events/Added.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Added" event.
@@ -46,8 +46,8 @@ export type AddedEventFilters = Partial<{
  */
 export function addedEvent(filters: AddedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Added(address indexed deployer, address indexed deployment, uint256 indexed chainId, string metadataUri)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/events/Deleted.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/events/Deleted.ts
index 66fb7bdc924..8daf7a56c1b 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/events/Deleted.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/events/Deleted.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "Deleted" event.
@@ -46,8 +46,8 @@ export type DeletedEventFilters = Partial<{
  */
 export function deletedEvent(filters: DeletedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event Deleted(address indexed deployer, address indexed deployment, uint256 indexed chainId)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/count.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/count.ts
index 546a25e9dc1..d180091e31d 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/count.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/count.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "count" function.
@@ -16,14 +16,14 @@ export type CountParams = {
 export const FN_SELECTOR = "0x05d85eda" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_deployer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "deploymentCount",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getAll.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getAll.ts
index 43d29ec079f..d2e648e1b3c 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getAll.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getAll.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getAll" function.
@@ -16,28 +16,28 @@ export type GetAllParams = {
 export const FN_SELECTOR = "0xeb077342" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_deployer",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "allDeployments",
     components: [
       {
-        type: "address",
         name: "deploymentAddress",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "chainId",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "metadataURI",
+        type: "string",
       },
     ],
+    name: "allDeployments",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getMetadataUri.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getMetadataUri.ts
index b51c3652736..7fa8bc8d256 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getMetadataUri.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/read/getMetadataUri.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getMetadataUri" function.
@@ -20,18 +20,18 @@ export type GetMetadataUriParams = {
 export const FN_SELECTOR = "0xf4c2012d" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "_chainId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "_deployment",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "string",
     name: "metadataUri",
+    type: "string",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/add.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/add.ts
index 1de66810ea7..16f44e82e66 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/add.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/add.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "add" function.
@@ -27,20 +27,20 @@ export type AddParams = WithOverrides<{
 export const FN_SELECTOR = "0x26c5b516" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_deployer",
+    type: "address",
   },
   {
-    type: "address",
     name: "_deployment",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_chainId",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "metadataUri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -150,8 +150,19 @@ export function add(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -162,16 +173,5 @@ export function add(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/remove.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/remove.ts
index 58b3d8ee112..49949360631 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/remove.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/remove.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "remove" function.
@@ -23,16 +23,16 @@ export type RemoveParams = WithOverrides<{
 export const FN_SELECTOR = "0x59e5fd04" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "_deployer",
+    type: "address",
   },
   {
-    type: "address",
     name: "_deployment",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "_chainId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -138,8 +138,19 @@ export function remove(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -149,16 +160,5 @@ export function remove(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractType.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractType.ts
index e05dc87b740..0a11a4eda0d 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractType.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractType.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcb2ef6f7" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractURI.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractURI.ts
index 23912c3e211..ff69d4ffd6b 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractURI.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractURI.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xe8a3d485" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractVersion.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractVersion.ts
index 9dcc8a6a8fa..3b6693d9579 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractVersion.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/read/contractVersion.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xa0a8e460" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/write/setContractURI.ts b/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/write/setContractURI.ts
index 73284334c06..005bdc41676 100644
--- a/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/write/setContractURI.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/__generated__/IThirdwebContract/write/setContractURI.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setContractURI" function.
@@ -18,8 +18,8 @@ export type SetContractURIParams = WithOverrides<{
 export const FN_SELECTOR = "0x938e3d7b" as const;
 const FN_INPUTS = [
   {
-    type: "string",
     name: "_uri",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -117,23 +117,23 @@ export function setContractURI(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.uri] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.uri] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/thirdweb/write/publish.test.ts b/packages/thirdweb/src/extensions/thirdweb/write/publish.test.ts
index b93618f9180..e433c12409e 100644
--- a/packages/thirdweb/src/extensions/thirdweb/write/publish.test.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/write/publish.test.ts
@@ -16,11 +16,12 @@ import { getAllPublishedContracts } from "../__generated__/IContractPublisher/re
 import { getPublishedContractVersions } from "../__generated__/IContractPublisher/read/getPublishedContractVersions.js";
 import { publishContract } from "./publish.js";
 
-describe.runIf(process.env.TW_SECRET_KEY).sequential("publishContract", () => {
+// currently disabled because it's flaky
+describe.skip.sequential("publishContract", () => {
   const publisherContract = getContract({
-    client: TEST_CLIENT,
-    chain: FORKED_POLYGON_CHAIN,
     address: CONTRACT_PUBLISHER_ADDRESS,
+    chain: FORKED_POLYGON_CHAIN,
+    client: TEST_CLIENT,
   });
   let publishedData: FetchDeployMetadataResult;
 
@@ -38,18 +39,18 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential("publishContract", () => {
     });
 
     const tx = publishContract({
-      contract: publisherContract,
       account: TEST_ACCOUNT_D,
+      contract: publisherContract,
       metadata: {
         ...catAttackDeployMetadata,
-        version: "0.0.1",
-        description: "Cat Attack NFT",
         changelog: "Initial release",
+        description: "Cat Attack NFT",
+        version: "0.0.1",
       },
     });
     const result = await sendAndConfirmTransaction({
-      transaction: tx,
       account: TEST_ACCOUNT_D,
+      transaction: tx,
     });
     expect(result.transactionHash.length).toBeGreaterThan(0);
     const logs = parseEventLogs({
@@ -109,14 +110,14 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential("publishContract", () => {
       sendAndConfirmTransaction({
         account: TEST_ACCOUNT_D,
         transaction: publishContract({
-          contract: publisherContract,
           account: TEST_ACCOUNT_D,
-          previousMetadata: publishedData,
+          contract: publisherContract,
           metadata: {
             ...publishedData,
-            version: "0.0.1",
             changelog: "Initial release 2",
+            version: "0.0.1",
           },
+          previousMetadata: publishedData,
         }),
       }),
     ).rejects.toThrow("Version 0.0.1 is not greater than 0.0.1");
@@ -124,18 +125,18 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential("publishContract", () => {
 
   it("should publish a new version", async () => {
     const tx2 = publishContract({
-      contract: publisherContract,
       account: TEST_ACCOUNT_D,
-      previousMetadata: publishedData,
+      contract: publisherContract,
       metadata: {
         ...publishedData,
-        version: "0.0.2",
         changelog: "Initial release 2",
+        version: "0.0.2",
       },
+      previousMetadata: publishedData,
     });
     const result2 = await sendAndConfirmTransaction({
-      transaction: tx2,
       account: TEST_ACCOUNT_D,
+      transaction: tx2,
     });
 
     expect(result2.transactionHash.length).toBeGreaterThan(0);
diff --git a/packages/thirdweb/src/extensions/thirdweb/write/publish.ts b/packages/thirdweb/src/extensions/thirdweb/write/publish.ts
index 49bf3a13c14..b9896c24ec1 100644
--- a/packages/thirdweb/src/extensions/thirdweb/write/publish.ts
+++ b/packages/thirdweb/src/extensions/thirdweb/write/publish.ts
@@ -46,7 +46,6 @@ export function publishContract(
   options: BaseTransactionOptions<PublishContractParams>,
 ) {
   return generatedPublishContract({
-    contract: options.contract,
     async asyncParams() {
       const currentVersion = options.previousMetadata?.version;
       // check if the version is greater than the current version
@@ -71,15 +70,12 @@ export function publishContract(
       const routerType = getRouterType(abi);
       // not spreading here, we don't want to re-upload the fetched data like bytecode
       const newMetadata: ExtendedMetadata = {
-        bytecodeUri: options.metadata.bytecodeUri,
-        metadataUri: options.metadata.metadataUri,
-        name: options.metadata.name,
-        version: options.metadata.version,
         audit: options.metadata.audit,
+        bytecodeUri: options.metadata.bytecodeUri,
         changelog: options.metadata.changelog,
+        compilers: options.metadata.compilers,
         compositeAbi: options.metadata.compositeAbi,
         constructorParams: options.metadata.constructorParams,
-        implConstructorParams: options.metadata.implConstructorParams,
         defaultExtensions:
           routerType === "dynamic"
             ? options.metadata.defaultExtensions
@@ -92,15 +88,18 @@ export function publishContract(
         description: options.metadata.description,
         displayName: options.metadata.displayName,
         factoryDeploymentData: options.metadata.factoryDeploymentData,
+        implConstructorParams: options.metadata.implConstructorParams,
         isDeployableViaFactory: options.metadata.isDeployableViaFactory,
         isDeployableViaProxy: options.metadata.isDeployableViaProxy,
         logo: options.metadata.logo,
+        metadataUri: options.metadata.metadataUri,
+        name: options.metadata.name,
         networksForDeployment: options.metadata.networksForDeployment,
-        readme: options.metadata.readme,
-        tags: options.metadata.tags,
-        compilers: options.metadata.compilers,
         publisher: options.account.address,
+        readme: options.metadata.readme,
         routerType,
+        tags: options.metadata.tags,
+        version: options.metadata.version,
       };
 
       // upload the new metadata
@@ -110,14 +109,15 @@ export function publishContract(
       });
 
       return {
-        publisher: options.account.address,
-        contractId: options.metadata.name,
-        publishMetadataUri: newMetadataUri,
-        compilerMetadataUri: options.metadata.metadataUri,
         bytecodeHash,
+        compilerMetadataUri: options.metadata.metadataUri,
+        contractId: options.metadata.name,
         implementation: ZERO_ADDRESS,
+        publisher: options.account.address,
+        publishMetadataUri: newMetadataUri,
       };
     },
+    contract: options.contract,
   });
 }
 
@@ -127,9 +127,9 @@ export function publishContract(
  */
 export function getContractPublisher(client: ThirdwebClient) {
   return getContract({
-    client,
-    chain: polygon,
     address: CONTRACT_PUBLISHER_ADDRESS,
+    chain: polygon,
+    client,
   });
 }
 
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInput.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInput.ts
index a5b2de9ba3d..17b942605db 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInput.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInput.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "quoteExactInput" function.
@@ -19,18 +19,18 @@ export type QuoteExactInputParams = WithOverrides<{
 export const FN_SELECTOR = "0xcdca1753" as const;
 const FN_INPUTS = [
   {
-    type: "bytes",
     name: "path",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "amountIn",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "amountOut",
+    type: "uint256",
   },
 ] as const;
 
@@ -130,23 +130,23 @@ export function quoteExactInput(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.path, resolvedOptions.amountIn] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.path, resolvedOptions.amountIn] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInputSingle.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInputSingle.ts
index e2f2bd0b25f..d7c41d1dd30 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInputSingle.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInputSingle.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "quoteExactInputSingle" function.
@@ -25,30 +25,30 @@ export type QuoteExactInputSingleParams = WithOverrides<{
 export const FN_SELECTOR = "0xf7729d43" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenIn",
+    type: "address",
   },
   {
-    type: "address",
     name: "tokenOut",
+    type: "address",
   },
   {
-    type: "uint24",
     name: "fee",
+    type: "uint24",
   },
   {
-    type: "uint256",
     name: "amountIn",
+    type: "uint256",
   },
   {
-    type: "uint160",
     name: "sqrtPriceLimitX96",
+    type: "uint160",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "amountOut",
+    type: "uint256",
   },
 ] as const;
 
@@ -167,8 +167,19 @@ export function quoteExactInputSingle(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -180,16 +191,5 @@ export function quoteExactInputSingle(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutput.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutput.ts
index e70abf27fa9..256a91b26a4 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutput.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutput.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "quoteExactOutput" function.
@@ -22,18 +22,18 @@ export type QuoteExactOutputParams = WithOverrides<{
 export const FN_SELECTOR = "0x2f80bb1d" as const;
 const FN_INPUTS = [
   {
-    type: "bytes",
     name: "path",
+    type: "bytes",
   },
   {
-    type: "uint256",
     name: "amountOut",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "amountIn",
+    type: "uint256",
   },
 ] as const;
 
@@ -133,23 +133,23 @@ export function quoteExactOutput(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.path, resolvedOptions.amountOut] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.path, resolvedOptions.amountOut] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutputSingle.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutputSingle.ts
index 40571bef183..664bccb2532 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutputSingle.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutputSingle.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "quoteExactOutputSingle" function.
@@ -28,30 +28,30 @@ export type QuoteExactOutputSingleParams = WithOverrides<{
 export const FN_SELECTOR = "0x30d07f21" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenIn",
+    type: "address",
   },
   {
-    type: "address",
     name: "tokenOut",
+    type: "address",
   },
   {
-    type: "uint24",
     name: "fee",
+    type: "uint24",
   },
   {
-    type: "uint256",
     name: "amountOut",
+    type: "uint256",
   },
   {
-    type: "uint160",
     name: "sqrtPriceLimitX96",
+    type: "uint160",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "amountIn",
+    type: "uint256",
   },
 ] as const;
 
@@ -172,8 +172,19 @@ export function quoteExactOutputSingle(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -185,16 +196,5 @@ export function quoteExactOutputSingle(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInput.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInput.ts
index 62b9d01cce6..2122be61c0b 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInput.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInput.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "exactInput" function.
@@ -28,36 +28,36 @@ export type ExactInputParams = WithOverrides<{
 export const FN_SELECTOR = "0xc04b8d59" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "bytes",
         name: "path",
+        type: "bytes",
       },
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "deadline",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amountIn",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amountOutMinimum",
+        type: "uint256",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "amountOut",
+    type: "uint256",
   },
 ] as const;
 
@@ -154,23 +154,23 @@ export function exactInput(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInputSingle.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInputSingle.ts
index 7e3abba3449..16ef0dc642e 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInputSingle.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInputSingle.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "exactInputSingle" function.
@@ -31,48 +31,48 @@ export type ExactInputSingleParams = WithOverrides<{
 export const FN_SELECTOR = "0x414bf389" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "address",
         name: "tokenIn",
+        type: "address",
       },
       {
-        type: "address",
         name: "tokenOut",
+        type: "address",
       },
       {
-        type: "uint24",
         name: "fee",
+        type: "uint24",
       },
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "deadline",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amountIn",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amountOutMinimum",
+        type: "uint256",
       },
       {
-        type: "uint160",
         name: "sqrtPriceLimitX96",
+        type: "uint160",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "amountOut",
+    type: "uint256",
   },
 ] as const;
 
@@ -169,23 +169,23 @@ export function exactInputSingle(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutput.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutput.ts
index dcbeb08a4a1..940aa4c4349 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutput.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutput.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "exactOutput" function.
@@ -28,36 +28,36 @@ export type ExactOutputParams = WithOverrides<{
 export const FN_SELECTOR = "0xf28c0498" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "bytes",
         name: "path",
+        type: "bytes",
       },
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "deadline",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amountOut",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amountInMaximum",
+        type: "uint256",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "amountIn",
+    type: "uint256",
   },
 ] as const;
 
@@ -154,23 +154,23 @@ export function exactOutput(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutputSingle.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutputSingle.ts
index da33aaa7b58..ab60bfb7b4c 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutputSingle.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutputSingle.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "exactOutputSingle" function.
@@ -31,48 +31,48 @@ export type ExactOutputSingleParams = WithOverrides<{
 export const FN_SELECTOR = "0xdb3e2198" as const;
 const FN_INPUTS = [
   {
-    type: "tuple",
-    name: "params",
     components: [
       {
-        type: "address",
         name: "tokenIn",
+        type: "address",
       },
       {
-        type: "address",
         name: "tokenOut",
+        type: "address",
       },
       {
-        type: "uint24",
         name: "fee",
+        type: "uint24",
       },
       {
-        type: "address",
         name: "recipient",
+        type: "address",
       },
       {
-        type: "uint256",
         name: "deadline",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amountOut",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "amountInMaximum",
+        type: "uint256",
       },
       {
-        type: "uint160",
         name: "sqrtPriceLimitX96",
+        type: "uint160",
       },
     ],
+    name: "params",
+    type: "tuple",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "amountIn",
+    type: "uint256",
   },
 ] as const;
 
@@ -171,23 +171,23 @@ export function exactOutputSingle(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.params] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.params] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/events/OwnerChanged.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/events/OwnerChanged.ts
index 7ecf70ce4c8..30f6cb7997e 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/events/OwnerChanged.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/events/OwnerChanged.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "OwnerChanged" event.
@@ -40,8 +40,8 @@ export type OwnerChangedEventFilters = Partial<{
  */
 export function ownerChangedEvent(filters: OwnerChangedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event OwnerChanged(address indexed oldOwner, address indexed newOwner)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/events/PoolCreated.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/events/PoolCreated.ts
index e58a4baf468..4cd77819ff1 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/events/PoolCreated.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/events/PoolCreated.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "PoolCreated" event.
@@ -46,8 +46,8 @@ export type PoolCreatedEventFilters = Partial<{
  */
 export function poolCreatedEvent(filters: PoolCreatedEventFilters = {}) {
   return prepareEvent({
+    filters,
     signature:
       "event PoolCreated(address indexed token0, address indexed token1, uint24 fee, int24 tickLower, int24 tickUpper, uint128 liquidity, address indexed sender)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/feeAmountTickSpacing.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/feeAmountTickSpacing.ts
index 255f43c261a..feed9aec478 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/feeAmountTickSpacing.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/feeAmountTickSpacing.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "feeAmountTickSpacing" function.
@@ -16,8 +16,8 @@ export type FeeAmountTickSpacingParams = {
 export const FN_SELECTOR = "0x22afcccb" as const;
 const FN_INPUTS = [
   {
-    type: "uint24",
     name: "fee",
+    type: "uint24",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/getPool.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/getPool.ts
index 0ba8694755b..a176b876892 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/getPool.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/getPool.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getPool" function.
@@ -18,22 +18,22 @@ export type GetPoolParams = {
 export const FN_SELECTOR = "0x1698ee82" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenA",
+    type: "address",
   },
   {
-    type: "address",
     name: "tokenB",
+    type: "address",
   },
   {
-    type: "uint24",
     name: "fee",
+    type: "uint24",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "pool",
+    type: "address",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/owner.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/owner.ts
index 5c788ce980c..c4a193d970e 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/owner.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/read/owner.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x8da5cb5b" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/createPool.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/createPool.ts
index 9fb6af4ed9a..3a0e4d3e1bb 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/createPool.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/createPool.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "createPool" function.
@@ -20,22 +20,22 @@ export type CreatePoolParams = WithOverrides<{
 export const FN_SELECTOR = "0xa1671295" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "tokenA",
+    type: "address",
   },
   {
-    type: "address",
     name: "tokenB",
+    type: "address",
   },
   {
-    type: "uint24",
     name: "fee",
+    type: "uint24",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "address",
     name: "pool",
+    type: "address",
   },
 ] as const;
 
@@ -142,8 +142,19 @@ export function createPool(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -153,16 +164,5 @@ export function createPool(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/enableFeeAmount.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/enableFeeAmount.ts
index c8e4e71ccd4..c0f8917eedb 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/enableFeeAmount.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/enableFeeAmount.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "enableFeeAmount" function.
@@ -22,12 +22,12 @@ export type EnableFeeAmountParams = WithOverrides<{
 export const FN_SELECTOR = "0x8a7c195f" as const;
 const FN_INPUTS = [
   {
-    type: "uint24",
     name: "fee",
+    type: "uint24",
   },
   {
-    type: "int24",
     name: "tickSpacing",
+    type: "int24",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -128,23 +128,23 @@ export function enableFeeAmount(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.fee, resolvedOptions.tickSpacing] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.fee, resolvedOptions.tickSpacing] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/setOwner.ts b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/setOwner.ts
index 6e4c1ba930b..95cdc0516de 100644
--- a/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/setOwner.ts
+++ b/packages/thirdweb/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/setOwner.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setOwner" function.
@@ -18,8 +18,8 @@ export type SetOwnerParams = WithOverrides<{
 export const FN_SELECTOR = "0x13af4035" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "newOwner",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -115,23 +115,23 @@ export function setOwner(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newOwner] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newOwner] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/uniswap/read/getUniswapV3Pools.test.ts b/packages/thirdweb/src/extensions/uniswap/read/getUniswapV3Pools.test.ts
index af4716ee371..34ff46b2f5c 100644
--- a/packages/thirdweb/src/extensions/uniswap/read/getUniswapV3Pools.test.ts
+++ b/packages/thirdweb/src/extensions/uniswap/read/getUniswapV3Pools.test.ts
@@ -17,14 +17,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("uniswap.getUniswapV3Pool", () => {
     });
     expect(pools).toMatchInlineSnapshot(`
       [
-        {
-          "poolAddress": "0x88051B0eea095007D3bEf21aB287Be961f3d8598",
-          "poolFee": 3000,
-        },
         {
           "poolAddress": "0x584eC2562b937C4AC0452184D8d83346382B5D3a",
           "poolFee": 10000,
         },
+        {
+          "poolAddress": "0x88051B0eea095007D3bEf21aB287Be961f3d8598",
+          "poolFee": 3000,
+        },
       ]
     `);
   });
diff --git a/packages/thirdweb/src/extensions/uniswap/read/getUniswapV3Pools.ts b/packages/thirdweb/src/extensions/uniswap/read/getUniswapV3Pools.ts
index 284c40844a8..4feffac01c6 100644
--- a/packages/thirdweb/src/extensions/uniswap/read/getUniswapV3Pools.ts
+++ b/packages/thirdweb/src/extensions/uniswap/read/getUniswapV3Pools.ts
@@ -3,10 +3,10 @@ import { ZERO_ADDRESS } from "../../../constants/addresses.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 
 const UniswapFee = {
-  LOWEST: 100,
+  HIGH: 10000,
   LOW: 500,
+  LOWEST: 100,
   MEDIUM: 3000,
-  HIGH: 10000,
 } as const;
 
 /**
@@ -53,14 +53,14 @@ export async function getUniswapV3Pool(
     .map(async (fee) => {
       const poolAddress = await getPool({
         contract: options.contract,
+        fee,
         tokenA: options.tokenA,
         tokenB: options.tokenB,
-        fee,
       });
 
       return {
-        poolFee: fee,
         poolAddress,
+        poolFee: fee,
       };
     });
 
diff --git a/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/exists.ts b/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/exists.ts
index f4a9b84da2c..b62fc51aefe 100644
--- a/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/exists.ts
+++ b/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/exists.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "exists" function.
@@ -16,8 +16,8 @@ export type ExistsParams = {
 export const FN_SELECTOR = "0x4f558e79" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/getMany.ts b/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/getMany.ts
index e108e47b49f..f4660917967 100644
--- a/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/getMany.ts
+++ b/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/getMany.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getMany" function.
@@ -17,18 +17,18 @@ export type GetManyParams = {
 export const FN_SELECTOR = "0x1bd8cc1a" as const;
 const FN_INPUTS = [
   {
-    type: "string[]",
     name: "keys",
+    type: "string[]",
   },
   {
-    type: "uint256",
     name: "tokenId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "string[]",
     name: "values",
+    type: "string[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/namehash.ts b/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/namehash.ts
index 1f4ff5195b1..78b61ec5e6f 100644
--- a/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/namehash.ts
+++ b/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/namehash.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "namehash" function.
@@ -16,14 +16,14 @@ export type NamehashParams = {
 export const FN_SELECTOR = "0x276fabb1" as const;
 const FN_INPUTS = [
   {
-    type: "string[]",
     name: "labels",
+    type: "string[]",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "hash",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/reverseNameOf.ts b/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/reverseNameOf.ts
index b86c1c4bd8a..b6e9564a151 100644
--- a/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/reverseNameOf.ts
+++ b/packages/thirdweb/src/extensions/unstoppable-domains/__generated__/UnstoppableDomains/read/reverseNameOf.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "reverseNameOf" function.
@@ -16,14 +16,14 @@ export type ReverseNameOfParams = {
 export const FN_SELECTOR = "0xbebec6b4" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "addr",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "string",
     name: "reverseUri",
+    type: "string",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveAddress.test.ts b/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveAddress.test.ts
index bb52d41947a..8f267e7e486 100644
--- a/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveAddress.test.ts
+++ b/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveAddress.test.ts
@@ -11,8 +11,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(
         (
           await resolveAddress({
-            name: "thirdwebsdk.unstoppable",
             client: TEST_CLIENT,
+            name: "thirdwebsdk.unstoppable",
           })
         ).toLowerCase(),
       ).toBe("0x12345674b599ce99958242b3D3741e7b01841DF3".toLowerCase());
@@ -21,8 +21,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     it("should throw an error with a non-existent domain name", async () => {
       await expect(
         resolveAddress({
-          name: "thirdwebsdk.thissuredoesnotexist",
           client: TEST_CLIENT,
+          name: "thirdwebsdk.thissuredoesnotexist",
         }),
       ).rejects.toThrowError(
         "Could not resolve a valid tokenId from the domain: thirdwebsdk.thissuredoesnotexist. Make sure it exists.",
diff --git a/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveAddress.ts b/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveAddress.ts
index e7390df6679..aaca7b84ac8 100644
--- a/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveAddress.ts
+++ b/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveAddress.ts
@@ -61,9 +61,9 @@ export async function resolveAddress(
   return withCache(
     async () => {
       const contract = getContract({
-        client,
-        chain: resolverChain || polygon,
         address: resolverAddress || UD_POLYGON_MAINNET,
+        chain: resolverChain || polygon,
+        client,
       });
 
       // Get namehash
@@ -83,9 +83,9 @@ export async function resolveAddress(
       // Resolve ETH address from the tokenId
       const resolved = await getMany({
         contract,
-        tokenId: possibleTokenId,
         // note that you can also retrieve the (BTC, SOL, etc.) address by using "crypto.<symbol>.address" (should that become useful one day)
         keys: ["crypto.ETH.address"],
+        tokenId: possibleTokenId,
       });
 
       const possibleETHAddress = resolved[0];
diff --git a/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveName.test.ts b/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveName.test.ts
index 5e055a2fc51..f975cd3095f 100644
--- a/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveName.test.ts
+++ b/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveName.test.ts
@@ -19,7 +19,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should throw error on addresses that dont own any UD", async () => {
       await expect(
-        resolveName({ client: TEST_CLIENT, address: TEST_ACCOUNT_D.address }),
+        resolveName({ address: TEST_ACCOUNT_D.address, client: TEST_CLIENT }),
       ).rejects.toThrowError(
         `Failed to retrieve domain for address: ${TEST_ACCOUNT_D.address}. Make sure you have set the Reverse Resolution address for your domain at https://unstoppabledomains.com/manage?page=reverseResolution&domain=your-domain`,
       );
diff --git a/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveName.ts b/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveName.ts
index b8ec7f4c08a..e030cdf87b5 100644
--- a/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveName.ts
+++ b/packages/thirdweb/src/extensions/unstoppable-domains/read/resolveName.ts
@@ -53,14 +53,14 @@ export async function resolveName(
   return withCache(
     async () => {
       const contract = getContract({
-        client,
-        chain: resolverChain || polygon,
         address: resolverAddress || UD_POLYGON_MAINNET,
+        chain: resolverChain || polygon,
+        client,
       });
 
       // Note: if the given wallet address does not have any UD name, `reverseNameOf` will return an empty string
       // This can still happen if you have transferred a domain to a new address, and forgot to set up the Reverse Resolution on the new address
-      const domain = await reverseNameOf({ contract, addr: address });
+      const domain = await reverseNameOf({ addr: address, contract });
       if (!domain) {
         throw new Error(
           `Failed to retrieve domain for address: ${address}. Make sure you have set the Reverse Resolution address for your domain at https://unstoppabledomains.com/manage?page=reverseResolution&domain=your-domain`,
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/BALLOT_TYPEHASH.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/BALLOT_TYPEHASH.ts
index ec04f2d479a..060fe07c78a 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/BALLOT_TYPEHASH.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/BALLOT_TYPEHASH.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xdeaaa7cc" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/COUNTING_MODE.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/COUNTING_MODE.ts
index 6734c8b2303..1a0672fb8cc 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/COUNTING_MODE.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/COUNTING_MODE.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xdd4e2ba5" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getAllProposals.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getAllProposals.ts
index 4325be6c282..6f22db94aec 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getAllProposals.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getAllProposals.ts
@@ -1,54 +1,53 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xcceb68f5" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    type: "tuple[]",
-    name: "allProposals",
     components: [
       {
-        type: "uint256",
         name: "proposalId",
+        type: "uint256",
       },
       {
-        type: "address",
         name: "proposer",
+        type: "address",
       },
       {
-        type: "address[]",
         name: "targets",
+        type: "address[]",
       },
       {
-        type: "uint256[]",
         name: "values",
+        type: "uint256[]",
       },
       {
-        type: "string[]",
         name: "signatures",
+        type: "string[]",
       },
       {
-        type: "bytes[]",
         name: "calldatas",
+        type: "bytes[]",
       },
       {
-        type: "uint256",
         name: "startBlock",
+        type: "uint256",
       },
       {
-        type: "uint256",
         name: "endBlock",
+        type: "uint256",
       },
       {
-        type: "string",
         name: "description",
+        type: "string",
       },
     ],
+    name: "allProposals",
+    type: "tuple[]",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getVotes.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getVotes.ts
index c2b66c0be2a..9a0da285da8 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getVotes.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getVotes.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getVotes" function.
@@ -20,12 +20,12 @@ export type GetVotesParams = {
 export const FN_SELECTOR = "0xeb9019d4" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getVotesWithParams.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getVotesWithParams.ts
index f8eca80d4bf..dfbae849b8b 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getVotesWithParams.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/getVotesWithParams.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "getVotesWithParams" function.
@@ -21,16 +21,16 @@ export type GetVotesWithParamsParams = {
 export const FN_SELECTOR = "0x9a802a6d" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "params",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/hasVoted.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/hasVoted.ts
index 5815f1c8684..eacb9d77023 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/hasVoted.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/hasVoted.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "hasVoted" function.
@@ -20,12 +20,12 @@ export type HasVotedParams = {
 export const FN_SELECTOR = "0x43859632" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "account",
+    type: "address",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/hashProposal.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/hashProposal.ts
index 87e81f3c2ec..5259840fe3c 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/hashProposal.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/hashProposal.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "hashProposal" function.
@@ -25,20 +25,20 @@ export type HashProposalParams = {
 export const FN_SELECTOR = "0xc59057e4" as const;
 const FN_INPUTS = [
   {
-    type: "address[]",
     name: "targets",
+    type: "address[]",
   },
   {
-    type: "uint256[]",
     name: "values",
+    type: "uint256[]",
   },
   {
-    type: "bytes[]",
     name: "calldatas",
+    type: "bytes[]",
   },
   {
-    type: "bytes32",
     name: "descriptionHash",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalDeadline.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalDeadline.ts
index e0640658526..aa55ad0e79c 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalDeadline.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalDeadline.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "proposalDeadline" function.
@@ -19,8 +19,8 @@ export type ProposalDeadlineParams = {
 export const FN_SELECTOR = "0xc01f9e37" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalIndex.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalIndex.ts
index a8d1ccb5c76..d1b77a0eeca 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalIndex.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalIndex.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x5977e0f2" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalSnapshot.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalSnapshot.ts
index 593f248d154..ecdd310f479 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalSnapshot.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalSnapshot.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "proposalSnapshot" function.
@@ -19,8 +19,8 @@ export type ProposalSnapshotParams = {
 export const FN_SELECTOR = "0x2d63f693" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalThreshold.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalThreshold.ts
index 098c4dc79c8..ced5cabd45f 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalThreshold.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalThreshold.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xb58131b0" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalVotes.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalVotes.ts
index 5bc8c234e58..9220e63ab34 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalVotes.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposalVotes.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "proposalVotes" function.
@@ -19,22 +19,22 @@ export type ProposalVotesParams = {
 export const FN_SELECTOR = "0x544ffc9c" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "againstVotes",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "forVotes",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "abstainVotes",
+    type: "uint256",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposals.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposals.ts
index 3c89313b550..04fe41b8e1b 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposals.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/proposals.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "proposals" function.
@@ -16,30 +16,30 @@ export type ProposalsParams = {
 export const FN_SELECTOR = "0x013cf08b" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "key",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
   {
-    type: "address",
     name: "proposer",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "startBlock",
+    type: "uint256",
   },
   {
-    type: "uint256",
     name: "endBlock",
+    type: "uint256",
   },
   {
-    type: "string",
     name: "description",
+    type: "string",
   },
 ] as const;
 
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/quorum.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/quorum.ts
index b2de58c41b0..8ca849b0c87 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/quorum.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/quorum.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "quorum" function.
@@ -19,8 +19,8 @@ export type QuorumParams = {
 export const FN_SELECTOR = "0xf8ce560a" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "blockNumber",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/quorumDenominator.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/quorumDenominator.ts
index 56636d20aee..cf3126a06d1 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/quorumDenominator.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/quorumDenominator.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x97c3d334" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/state.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/state.ts
index 15bcb254830..57a47c9faa2 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/state.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/state.ts
@@ -1,10 +1,10 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 /**
  * Represents the parameters for the "state" function.
@@ -19,8 +19,8 @@ export type StateParams = {
 export const FN_SELECTOR = "0x3e4f49e6" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/token.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/token.ts
index 02e70e2d6c7..60c0d33089b 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/token.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/token.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0xfc0c546a" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/votingDelay.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/votingDelay.ts
index eff242b13e6..51689a20a6c 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/votingDelay.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/votingDelay.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x3932abb1" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/votingPeriod.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/votingPeriod.ts
index 35de8cb92c0..5b96e7a33aa 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/votingPeriod.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/read/votingPeriod.ts
@@ -1,9 +1,8 @@
+import { decodeAbiParameters } from "viem";
 import { readContract } from "../../../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../../../transaction/types.js";
-
-import { decodeAbiParameters } from "viem";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import type { Hex } from "../../../../../utils/encoding/hex.js";
 
 export const FN_SELECTOR = "0x02a251a3" as const;
 const FN_INPUTS = [] as const;
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVote.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVote.ts
index f7c42629976..dab01bb13e5 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVote.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVote.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "castVote" function.
@@ -22,12 +22,12 @@ export type CastVoteParams = WithOverrides<{
 export const FN_SELECTOR = "0x56781388" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "support",
+    type: "uint8",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -130,23 +130,23 @@ export function castVote(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.proposalId, resolvedOptions.support] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.proposalId, resolvedOptions.support] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteBySig.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteBySig.ts
index 6322bdf5e39..e09620b20f8 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteBySig.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteBySig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "castVoteBySig" function.
@@ -25,24 +25,24 @@ export type CastVoteBySigParams = WithOverrides<{
 export const FN_SELECTOR = "0x3bccf4fd" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "support",
+    type: "uint8",
   },
   {
-    type: "uint8",
     name: "v",
+    type: "uint8",
   },
   {
-    type: "bytes32",
     name: "r",
+    type: "bytes32",
   },
   {
-    type: "bytes32",
     name: "s",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -162,8 +162,19 @@ export function castVoteBySig(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -175,16 +186,5 @@ export function castVoteBySig(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReason.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReason.ts
index 4d5af34b63c..48027e963a1 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReason.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReason.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "castVoteWithReason" function.
@@ -23,16 +23,16 @@ export type CastVoteWithReasonParams = WithOverrides<{
 export const FN_SELECTOR = "0x7b3c71d3" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "support",
+    type: "uint8",
   },
   {
-    type: "string",
     name: "reason",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -146,8 +146,19 @@ export function castVoteWithReason(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -157,16 +168,5 @@ export function castVoteWithReason(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParams.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParams.ts
index 0c625832619..622e146f4e5 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParams.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParams.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "castVoteWithReasonAndParams" function.
@@ -24,20 +24,20 @@ export type CastVoteWithReasonAndParamsParams = WithOverrides<{
 export const FN_SELECTOR = "0x5f398a14" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "support",
+    type: "uint8",
   },
   {
-    type: "string",
     name: "reason",
+    type: "string",
   },
   {
-    type: "bytes",
     name: "params",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -159,8 +159,19 @@ export function castVoteWithReasonAndParams(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -171,16 +182,5 @@ export function castVoteWithReasonAndParams(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParamsBySig.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParamsBySig.ts
index 20122e5859d..055e6ebb49f 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParamsBySig.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/castVoteWithReasonAndParamsBySig.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "castVoteWithReasonAndParamsBySig" function.
@@ -27,32 +27,32 @@ export type CastVoteWithReasonAndParamsBySigParams = WithOverrides<{
 export const FN_SELECTOR = "0x03420181" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
   {
-    type: "uint8",
     name: "support",
+    type: "uint8",
   },
   {
-    type: "string",
     name: "reason",
+    type: "string",
   },
   {
-    type: "bytes",
     name: "params",
+    type: "bytes",
   },
   {
-    type: "uint8",
     name: "v",
+    type: "uint8",
   },
   {
-    type: "bytes32",
     name: "r",
+    type: "bytes32",
   },
   {
-    type: "bytes32",
     name: "s",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -186,8 +186,19 @@ export function castVoteWithReasonAndParamsBySig(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -201,16 +212,5 @@ export function castVoteWithReasonAndParamsBySig(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/execute.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/execute.ts
index 4f94b043506..74443dd4c8f 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/execute.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/execute.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "execute" function.
@@ -27,20 +27,20 @@ export type ExecuteParams = WithOverrides<{
 export const FN_SELECTOR = "0x2656227d" as const;
 const FN_INPUTS = [
   {
-    type: "address[]",
     name: "targets",
+    type: "address[]",
   },
   {
-    type: "uint256[]",
     name: "values",
+    type: "uint256[]",
   },
   {
-    type: "bytes[]",
     name: "calldatas",
+    type: "bytes[]",
   },
   {
-    type: "bytes32",
     name: "descriptionHash",
+    type: "bytes32",
   },
 ] as const;
 const FN_OUTPUTS = [
@@ -154,8 +154,19 @@ export function execute(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -166,16 +177,5 @@ export function execute(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/propose.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/propose.ts
index abc8a1f168c..85ecd849904 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/propose.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/propose.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "propose" function.
@@ -27,26 +27,26 @@ export type ProposeParams = WithOverrides<{
 export const FN_SELECTOR = "0x7d5e81e2" as const;
 const FN_INPUTS = [
   {
-    type: "address[]",
     name: "targets",
+    type: "address[]",
   },
   {
-    type: "uint256[]",
     name: "values",
+    type: "uint256[]",
   },
   {
-    type: "bytes[]",
     name: "calldatas",
+    type: "bytes[]",
   },
   {
-    type: "string",
     name: "description",
+    type: "string",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    type: "uint256",
     name: "proposalId",
+    type: "uint256",
   },
 ] as const;
 
@@ -155,8 +155,19 @@ export function propose(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -167,16 +178,5 @@ export function propose(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/relay.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/relay.ts
index edd2ad5a3f3..2097326cb98 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/relay.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/relay.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "relay" function.
@@ -20,16 +20,16 @@ export type RelayParams = WithOverrides<{
 export const FN_SELECTOR = "0xc28bc2fa" as const;
 const FN_INPUTS = [
   {
-    type: "address",
     name: "target",
+    type: "address",
   },
   {
-    type: "uint256",
     name: "value",
+    type: "uint256",
   },
   {
-    type: "bytes",
     name: "data",
+    type: "bytes",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -135,8 +135,19 @@ export function relay(
   });
 
   return prepareContractCall({
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
     contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
     params: async () => {
       const resolvedOptions = await asyncOptions();
       return [
@@ -146,16 +157,5 @@ export function relay(
       ] as const;
     },
     value: async () => (await asyncOptions()).overrides?.value,
-    accessList: async () => (await asyncOptions()).overrides?.accessList,
-    gas: async () => (await asyncOptions()).overrides?.gas,
-    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
-    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
-    maxPriorityFeePerGas: async () =>
-      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
-    nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setProposalThreshold.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setProposalThreshold.ts
index 9eac196fd77..d0456bd84d2 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setProposalThreshold.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setProposalThreshold.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setProposalThreshold" function.
@@ -21,8 +21,8 @@ export type SetProposalThresholdParams = WithOverrides<{
 export const FN_SELECTOR = "0xece40cc1" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "newProposalThreshold",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -124,23 +124,23 @@ export function setProposalThreshold(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newProposalThreshold] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newProposalThreshold] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setVotingDelay.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setVotingDelay.ts
index 313d949b8c2..32a50d073d2 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setVotingDelay.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setVotingDelay.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setVotingDelay" function.
@@ -21,8 +21,8 @@ export type SetVotingDelayParams = WithOverrides<{
 export const FN_SELECTOR = "0x70b0f660" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "newVotingDelay",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setVotingDelay(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newVotingDelay] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newVotingDelay] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setVotingPeriod.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setVotingPeriod.ts
index d74fc333fcb..eae17976887 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setVotingPeriod.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/setVotingPeriod.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "setVotingPeriod" function.
@@ -21,8 +21,8 @@ export type SetVotingPeriodParams = WithOverrides<{
 export const FN_SELECTOR = "0xea0217cf" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "newVotingPeriod",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -120,23 +120,23 @@ export function setVotingPeriod(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newVotingPeriod] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newVotingPeriod] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/updateQuorumNumerator.ts b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/updateQuorumNumerator.ts
index 819963e4608..3431c12a84b 100644
--- a/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/updateQuorumNumerator.ts
+++ b/packages/thirdweb/src/extensions/vote/__generated__/Vote/write/updateQuorumNumerator.ts
@@ -1,12 +1,12 @@
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import type {
   BaseTransactionOptions,
   WithOverrides,
 } from "../../../../../transaction/types.js";
-import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
 import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
-import { once } from "../../../../../utils/promise/once.js";
 import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+import { once } from "../../../../../utils/promise/once.js";
 
 /**
  * Represents the parameters for the "updateQuorumNumerator" function.
@@ -21,8 +21,8 @@ export type UpdateQuorumNumeratorParams = WithOverrides<{
 export const FN_SELECTOR = "0x06f3f9e6" as const;
 const FN_INPUTS = [
   {
-    type: "uint256",
     name: "newQuorumNumerator",
+    type: "uint256",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;
@@ -124,23 +124,23 @@ export function updateQuorumNumerator(
   });
 
   return prepareContractCall({
-    contract: options.contract,
-    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
-    params: async () => {
-      const resolvedOptions = await asyncOptions();
-      return [resolvedOptions.newQuorumNumerator] as const;
-    },
-    value: async () => (await asyncOptions()).overrides?.value,
     accessList: async () => (await asyncOptions()).overrides?.accessList,
+    authorizationList: async () =>
+      (await asyncOptions()).overrides?.authorizationList,
+    contract: options.contract,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
     gas: async () => (await asyncOptions()).overrides?.gas,
     gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
     maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
     maxPriorityFeePerGas: async () =>
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
-    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
-    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
-    authorizationList: async () =>
-      (await asyncOptions()).overrides?.authorizationList,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.newQuorumNumerator] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/read/getAll.ts b/packages/thirdweb/src/extensions/vote/read/getAll.ts
index ce8e9ee5f70..f27f279719c 100644
--- a/packages/thirdweb/src/extensions/vote/read/getAll.ts
+++ b/packages/thirdweb/src/extensions/vote/read/getAll.ts
@@ -4,8 +4,8 @@ import { getAllProposals } from "../__generated__/Vote/read/getAllProposals.js";
 import { state } from "../__generated__/Vote/read/state.js";
 import { ProposalState } from "../types.js";
 import {
-  type ProposalVoteInfo,
   getProposalVoteCounts,
+  type ProposalVoteInfo,
 } from "./getProposalVoteCounts.js";
 
 /**
@@ -88,19 +88,19 @@ export async function getAll(
       throw new Error(`Proposal not found for index: ${index}`);
     }
     return {
-      proposalId: data.proposalId,
-      proposer: data.proposer,
       description: data.description,
-      startBlock: data.startBlock,
       endBlock: data.endBlock,
-      state: state,
-      stateLabel: ProposalState[state],
-      votes: votes,
       executions: data.targets.map((_, index) => ({
-        toAddress: data.targets[index],
         nativeTokenValue: data.values[index],
+        toAddress: data.targets[index],
         transactionData: data.calldatas[index],
       })),
+      proposalId: data.proposalId,
+      proposer: data.proposer,
+      startBlock: data.startBlock,
+      state: state,
+      stateLabel: ProposalState[state],
+      votes: votes,
     };
   });
 }
diff --git a/packages/thirdweb/src/extensions/vote/read/getProposalVoteCounts.ts b/packages/thirdweb/src/extensions/vote/read/getProposalVoteCounts.ts
index a366bbd6930..0660f4ade5f 100644
--- a/packages/thirdweb/src/extensions/vote/read/getProposalVoteCounts.ts
+++ b/packages/thirdweb/src/extensions/vote/read/getProposalVoteCounts.ts
@@ -33,8 +33,8 @@ export async function getProposalVoteCounts(
 ): Promise<ProposalVoteInfo> {
   const votes = await proposalVotes(options);
   return {
+    abstain: votes[2],
     against: votes[0],
     for: votes[1],
-    abstain: votes[2],
   };
 }
diff --git a/packages/thirdweb/src/extensions/vote/types.ts b/packages/thirdweb/src/extensions/vote/types.ts
index 6a7490b76b9..c12288df1c4 100644
--- a/packages/thirdweb/src/extensions/vote/types.ts
+++ b/packages/thirdweb/src/extensions/vote/types.ts
@@ -1,11 +1,9 @@
-// biome-ignore lint/nursery/noEnum: TODO convert this
 export enum VoteType {
   against = 0,
   for = 1,
   abstain = 2,
 }
 
-// biome-ignore lint/nursery/noEnum: TODO convert this
 export enum ProposalState {
   pending = 0,
   active = 1,
diff --git a/packages/thirdweb/src/extensions/vote/vote.test.ts b/packages/thirdweb/src/extensions/vote/vote.test.ts
index 8c5053eedfc..210c10cf864 100644
--- a/packages/thirdweb/src/extensions/vote/vote.test.ts
+++ b/packages/thirdweb/src/extensions/vote/vote.test.ts
@@ -20,26 +20,26 @@ const chain = ANVIL_CHAIN;
 describe.runIf(process.env.TW_SECRET_KEY)("proposal exists", () => {
   it("`proposalExists` and `propose` should work", async () => {
     const tokenAddress = await deployERC20Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account,
-      type: "TokenERC20",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
-        name: "Token",
         contractURI: TEST_CONTRACT_URI,
+        name: "Token",
       },
+      type: "TokenERC20",
     });
     const address = await deployVoteContract({
       account,
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
-        tokenAddress: tokenAddress,
         initialProposalThreshold: "0.5",
         initialVotingPeriod: 10,
         minVoteQuorumRequiredPercent: 51,
+        name: "",
+        tokenAddress: tokenAddress,
       },
     });
     const voteContract = getContract({
@@ -60,27 +60,27 @@ describe.runIf(process.env.TW_SECRET_KEY)("proposal exists", () => {
     });
     // first step: mint enough tokens so it passes the voting threshold
     const mintTransaction = mintTo({
+      amount: "1000",
       contract: tokenContract,
       to: account.address,
-      amount: "1000",
     });
-    await sendAndConfirmTransaction({ transaction: mintTransaction, account });
+    await sendAndConfirmTransaction({ account, transaction: mintTransaction });
     // 2nd step: to delegate the token
     const delegation = delegate({
       contract: tokenContract,
       delegatee: account.address,
     });
-    await sendAndConfirmTransaction({ transaction: delegation, account });
+    await sendAndConfirmTransaction({ account, transaction: delegation });
 
     // step 3: create a proposal
     const transaction = propose({
+      calldatas: ["0x"],
       contract: voteContract,
       description: "first proposal",
       targets: [voteContract.address],
       values: [0n],
-      calldatas: ["0x"],
     });
-    await sendAndConfirmTransaction({ transaction, account });
+    await sendAndConfirmTransaction({ account, transaction });
     const allProposals = await getAll({ contract: voteContract });
     expect(allProposals.length).toBe(1);
     const exists = await proposalExists({
diff --git a/packages/thirdweb/src/extensions/vote/write/executeProposal.ts b/packages/thirdweb/src/extensions/vote/write/executeProposal.ts
index 21752fb12b3..0f44765eff6 100644
--- a/packages/thirdweb/src/extensions/vote/write/executeProposal.ts
+++ b/packages/thirdweb/src/extensions/vote/write/executeProposal.ts
@@ -22,8 +22,8 @@ export function executeProposal(
   options: BaseTransactionOptions<{ proposalId: bigint }>,
 ) {
   return execute({
-    contract: options.contract,
     asyncParams: async () => getExecuteParams(options),
+    contract: options.contract,
   });
 }
 
@@ -55,9 +55,9 @@ async function getExecuteParams(
   const { targets, values, calldatas, description } = proposal;
   const descriptionHash = keccak256(stringToBytes(description));
   return {
+    calldatas,
     descriptionHash,
     targets,
     values,
-    calldatas,
   };
 }
diff --git a/packages/thirdweb/src/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.ts b/packages/thirdweb/src/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.ts
index 48964fd99a3..68fc917edd2 100644
--- a/packages/thirdweb/src/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.ts
+++ b/packages/thirdweb/src/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.ts
@@ -1,5 +1,5 @@
-import { prepareEvent } from "../../../../../event/prepare-event.js";
 import type { AbiParameterToPrimitiveType } from "abitype";
+import { prepareEvent } from "../../../../../event/prepare-event.js";
 
 /**
  * Represents the filters for the "ContractDeployed" event.
@@ -48,8 +48,8 @@ export function contractDeployedEvent(
   filters: ContractDeployedEventFilters = {},
 ) {
   return prepareEvent({
+    filters,
     signature:
       "event ContractDeployed(address indexed deployerAddress, bytes32 indexed bytecodeHash, address indexed contractAddress)",
-    filters,
   });
 }
diff --git a/packages/thirdweb/src/gas/estimate-l1-fee.ts b/packages/thirdweb/src/gas/estimate-l1-fee.ts
index 3a644d6eb73..12697c93770 100644
--- a/packages/thirdweb/src/gas/estimate-l1-fee.ts
+++ b/packages/thirdweb/src/gas/estimate-l1-fee.ts
@@ -18,13 +18,13 @@ const OPStackGasPriceOracleAddress =
 export async function estimateL1Fee(options: EstimateL1FeeOptions) {
   const { transaction, gasPriceOracleAddress } = options;
   const oracleContract = getContract({
-    client: transaction.client,
     address: gasPriceOracleAddress || OPStackGasPriceOracleAddress,
     chain: transaction.chain,
+    client: transaction.client,
   });
 
-  // purposefully remove gasPrice from the transaction
-
+  //
+  // biome-ignore lint/correctness/noUnusedVariables: purposefully remove gasPrice from the transaction
   const { gasPrice, ...serializableTx } = await toSerializableTransaction({
     transaction,
   });
diff --git a/packages/thirdweb/src/gas/fee-data.ts b/packages/thirdweb/src/gas/fee-data.ts
index c9987177ef4..16ab15862bd 100644
--- a/packages/thirdweb/src/gas/fee-data.ts
+++ b/packages/thirdweb/src/gas/fee-data.ts
@@ -136,7 +136,7 @@ export async function getDefaultGasOverrides(
     FORCE_GAS_PRICE_CHAIN_IDS.includes(chain.id)
   ) {
     return {
-      gasPrice: await getGasPrice({ client, chain, percentMultiplier: 10 }),
+      gasPrice: await getGasPrice({ chain, client, percentMultiplier: 10 }),
     };
   }
   const feeData = await getDynamicFeeData(client, chain);
@@ -148,7 +148,7 @@ export async function getDefaultGasOverrides(
   }
   // TODO: resolvedFeeType here could be "EIP1559", but we could not get EIP1559 fee data. should we throw?
   return {
-    gasPrice: await getGasPrice({ client, chain, percentMultiplier: 10 }),
+    gasPrice: await getGasPrice({ chain, client, percentMultiplier: 10 }),
   };
 }
 
@@ -167,7 +167,7 @@ async function getDynamicFeeData(
   let maxFeePerGas: null | bigint = null;
   let maxPriorityFeePerGas_: null | bigint = null;
 
-  const rpcRequest = getRpcClient({ client, chain });
+  const rpcRequest = getRpcClient({ chain, client });
 
   const [block, maxPriorityFeePerGas] = await Promise.all([
     eth_getBlockByNumber(rpcRequest, { blockTag: "latest" }),
diff --git a/packages/thirdweb/src/gas/get-gas-price.ts b/packages/thirdweb/src/gas/get-gas-price.ts
index 819a992cfbf..4de338fc700 100644
--- a/packages/thirdweb/src/gas/get-gas-price.ts
+++ b/packages/thirdweb/src/gas/get-gas-price.ts
@@ -26,7 +26,7 @@ export async function getGasPrice(
   options: GetGasPriceOptions,
 ): Promise<bigint> {
   const { client, chain, percentMultiplier } = options;
-  const rpcClient = getRpcClient({ client, chain });
+  const rpcClient = getRpcClient({ chain, client });
   const gasPrice_ = await eth_gasPrice(rpcClient);
   const extraTip = percentMultiplier
     ? (gasPrice_ / BigInt(100)) * BigInt(percentMultiplier)
diff --git a/packages/thirdweb/src/gas/op-gas-fee-reducer.ts b/packages/thirdweb/src/gas/op-gas-fee-reducer.ts
index 1246789d2b0..036a81f74aa 100644
--- a/packages/thirdweb/src/gas/op-gas-fee-reducer.ts
+++ b/packages/thirdweb/src/gas/op-gas-fee-reducer.ts
@@ -16,7 +16,6 @@ export function roundUpGas(value: bigint): bigint {
   // Find the highest set bit by shifting until the value is 0.
   let highestBit = 1n;
   while (value > 0n) {
-    // biome-ignore lint/style/noParameterAssign: the whole point is that we modify the value in palce
     value >>= 1n;
     highestBit <<= 1n;
   }
diff --git a/packages/thirdweb/src/insight/get-events.ts b/packages/thirdweb/src/insight/get-events.ts
index ba24c5ebf79..bf57ec76dd4 100644
--- a/packages/thirdweb/src/insight/get-events.ts
+++ b/packages/thirdweb/src/insight/get-events.ts
@@ -59,8 +59,8 @@ export async function getContractEvents(options: {
 
   const defaultQueryOptions: GetV1EventsByContractAddressData["query"] = {
     chain: chains.map((chain) => chain.id),
-    limit: 100,
     decode: decodeLogs,
+    limit: 100,
   };
 
   if (event) {
diff --git a/packages/thirdweb/src/insight/get-nfts.ts b/packages/thirdweb/src/insight/get-nfts.ts
index 9902c99664c..f80ce9ecdab 100644
--- a/packages/thirdweb/src/insight/get-nfts.ts
+++ b/packages/thirdweb/src/insight/get-nfts.ts
@@ -6,12 +6,12 @@ import type {
   GetV1NftsResponse,
 } from "@thirdweb-dev/insight";
 import type { Chain } from "../chains/types.js";
-import type { ThirdwebClient } from "../client/client.js";
-import type { NFT } from "../utils/nft/parseNft.js";
-
 import { getCachedChain } from "../chains/utils.js";
+import type { ThirdwebClient } from "../client/client.js";
 import { getContract } from "../contract/contract.js";
 import { getAddress } from "../utils/address.js";
+import type { NFT } from "../utils/nft/parseNft.js";
+
 type OwnedNFT = GetV1NftsResponse["data"][number];
 type ContractNFT = GetV1NftsByContractAddressResponse["data"][number];
 
@@ -134,10 +134,10 @@ export async function getContractNFTs(args: {
 
   const defaultQueryOptions: GetV1NftsByContractAddressData["query"] = {
     chain: chains.map((chain) => chain.id),
-    // metadata: includeMetadata ? "true" : "false", TODO (insight): add support for this
-    limit: 50,
     include_owners:
       includeOwners === true ? ("true" as const) : ("false" as const),
+    // metadata: includeMetadata ? "true" : "false", TODO (insight): add support for this
+    limit: 50,
   };
 
   await assertInsightEnabled(chains);
@@ -259,13 +259,19 @@ async function transformNFTModel(
       let parsedNft: NFT;
       const {
         contract,
+
+        // biome-ignore lint/correctness/noUnusedVariables: explicitly unused to not include it in the resulting metadata
         extra_metadata,
+        // biome-ignore lint/correctness/noUnusedVariables: explicitly unused to not include it in the resulting metadata
         collection,
         metadata_url,
+        // biome-ignore lint/correctness/noUnusedVariables: explicitly unused to not include it in the resulting metadata
         chain_id,
         token_id,
+        // biome-ignore lint/correctness/noUnusedVariables: explicitly unused to not include it in the resulting metadata
         status,
         balance,
+        // biome-ignore lint/correctness/noUnusedVariables: explicitly unused to not include it in the resulting metadata
         token_type,
         ...rest
       } = nft;
@@ -282,9 +288,9 @@ async function transformNFTModel(
       }
 
       const metadata = replaceIPFSGatewayRecursively({
-        uri: nft.metadata_url ?? "",
-        image: nft.image_url,
         attributes: nft.extra_metadata?.attributes ?? undefined,
+        image: nft.image_url,
+        uri: nft.metadata_url ?? "",
         ...metadataToUse,
       });
 
@@ -300,22 +306,22 @@ async function transformNFTModel(
         }).catch(() => 0n);
 
         parsedNft = parseNFT(metadata, {
+          chainId: contract?.chain_id ?? 0,
+          owner: owners?.[0],
+          supply: supply,
+          tokenAddress: contract?.address ?? "",
           tokenId: BigInt(token_id),
           tokenUri: replaceIPFSGateway(metadata_url) ?? "",
           type: "ERC1155",
-          owner: owners?.[0],
-          tokenAddress: contract?.address ?? "",
-          chainId: contract?.chain_id ?? 0,
-          supply: supply,
         });
       } else {
         parsedNft = parseNFT(metadata, {
-          tokenId: BigInt(token_id),
-          type: "ERC721",
+          chainId: contract?.chain_id ?? 0,
           owner: owners?.[0],
-          tokenUri: replaceIPFSGateway(metadata_url) ?? "",
           tokenAddress: contract?.address ?? "",
-          chainId: contract?.chain_id ?? 0,
+          tokenId: BigInt(token_id),
+          tokenUri: replaceIPFSGateway(metadata_url) ?? "",
+          type: "ERC721",
         });
       }
 
diff --git a/packages/thirdweb/src/insight/get-tokens.ts b/packages/thirdweb/src/insight/get-tokens.ts
index 9de2d46dc67..1251f2eb052 100644
--- a/packages/thirdweb/src/insight/get-tokens.ts
+++ b/packages/thirdweb/src/insight/get-tokens.ts
@@ -50,12 +50,12 @@ export async function getOwnedTokens(args: {
   await assertInsightEnabled(chains);
 
   const defaultQueryOptions: GetV1TokensData["query"] = {
-    owner_address: ownerAddress,
     chain_id: chains.length > 0 ? chains.map((chain) => chain.id) : [1],
     include_native: "true",
     include_spam: "false",
-    metadata: "true",
     limit: 50,
+    metadata: "true",
+    owner_address: ownerAddress,
   };
 
   const result = await getV1Tokens({
@@ -84,13 +84,13 @@ async function transformOwnedToken(
     const decimals = t.decimals ?? 18;
     const value = BigInt(t.balance);
     return {
-      value,
-      displayValue: toTokens(value, decimals),
-      tokenAddress: t.token_address,
       chainId: t.chain_id,
       decimals,
-      symbol: t.symbol ?? "",
+      displayValue: toTokens(value, decimals),
       name: t.name ?? "",
+      symbol: t.symbol ?? "",
+      tokenAddress: t.token_address,
+      value,
     };
   });
 }
diff --git a/packages/thirdweb/src/insight/get-transactions.ts b/packages/thirdweb/src/insight/get-transactions.ts
index af70207af5c..e16b877468f 100644
--- a/packages/thirdweb/src/insight/get-transactions.ts
+++ b/packages/thirdweb/src/insight/get-transactions.ts
@@ -59,13 +59,13 @@ export async function getTransactions(args: {
   const result = await getV1WalletsByWalletAddressTransactions({
     baseUrl: `https://${getThirdwebDomains().insight}`,
     fetch: getClientFetch(client),
+    path: {
+      wallet_address: walletAddress,
+    },
     query: {
       ...defaultQueryOptions,
       ...queryOptions,
     },
-    path: {
-      wallet_address: walletAddress,
-    },
   });
   if (result.error) {
     throw new Error(
diff --git a/packages/thirdweb/src/insight/index.ts b/packages/thirdweb/src/insight/index.ts
index 885a8d0f68c..e09cfea6ca8 100644
--- a/packages/thirdweb/src/insight/index.ts
+++ b/packages/thirdweb/src/insight/index.ts
@@ -1,8 +1,8 @@
+export { type ContractEvent, getContractEvents } from "./get-events.js";
 export {
   getContractNFTs,
-  getOwnedNFTs,
   getNFT,
+  getOwnedNFTs,
 } from "./get-nfts.js";
 export { getOwnedTokens } from "./get-tokens.js";
 export { getTransactions, type Transaction } from "./get-transactions.js";
-export { getContractEvents, type ContractEvent } from "./get-events.js";
diff --git a/packages/thirdweb/src/merkletree/MerkleTree.ts b/packages/thirdweb/src/merkletree/MerkleTree.ts
index af7ef021dc0..dc70f1d076c 100644
--- a/packages/thirdweb/src/merkletree/MerkleTree.ts
+++ b/packages/thirdweb/src/merkletree/MerkleTree.ts
@@ -100,18 +100,16 @@ export class MerkleTree {
     if (typeof leaf === "undefined") {
       throw new Error("leaf is required");
     }
-    // biome-ignore lint/style/noParameterAssign: part of the functionality
+
     leaf = leaf instanceof Uint8Array ? leaf : hexToBytes(leaf);
     const proof = [];
 
     if (!Number.isInteger(index)) {
-      // biome-ignore lint/style/noParameterAssign: part of the functionality
       index = -1;
 
       for (let i = 0; i < this.leaves.length; i++) {
         // biome-ignore lint/style/noNonNullAssertion: within bounds
         if (areUint8ArraysEqual(leaf, this.leaves[i]!)) {
-          // biome-ignore lint/style/noParameterAssign: part of the functionality
           index = i;
         }
       }
@@ -136,14 +134,13 @@ export class MerkleTree {
 
       if (pairIndex < layer.length) {
         proof.push({
-          position: isRightNode ? "left" : "right",
           data: layer[pairIndex],
+          position: isRightNode ? "left" : "right",
         });
       }
 
       // set index to parent index
       // @ts-expect-error - issue from original code
-      // biome-ignore lint/style/noParameterAssign: part of the functionality
       index = (index / 2) | 0;
     }
 
diff --git a/packages/thirdweb/src/pay/buyWithCrypto/getQuote.ts b/packages/thirdweb/src/pay/buyWithCrypto/getQuote.ts
index 42f13a4436b..f0f5a0181f1 100644
--- a/packages/thirdweb/src/pay/buyWithCrypto/getQuote.ts
+++ b/packages/thirdweb/src/pay/buyWithCrypto/getQuote.ts
@@ -199,16 +199,16 @@ export async function getBuyWithCryptoQuote(
               });
         const amount = Value.from(params.toAmount, tokenDecimals);
         return Bridge.Buy.prepare({
-          sender: params.fromAddress,
-          receiver: params.toAddress,
-          originChainId: params.fromChainId,
-          originTokenAddress: params.fromTokenAddress,
-          destinationChainId: params.toChainId,
-          destinationTokenAddress: params.toTokenAddress,
           amount: amount,
-          purchaseData: params.purchaseData,
           client: params.client,
+          destinationChainId: params.toChainId,
+          destinationTokenAddress: params.toTokenAddress,
+          originChainId: params.fromChainId,
+          originTokenAddress: params.fromTokenAddress,
           paymentLinkId: params.paymentLinkId,
+          purchaseData: params.purchaseData,
+          receiver: params.toAddress,
+          sender: params.fromAddress,
         });
       } else if (params.fromAmount) {
         const originTokenContract = getContract({
@@ -221,16 +221,16 @@ export async function getBuyWithCryptoQuote(
         });
         const amount = Value.from(params.fromAmount, tokenDecimals);
         return Bridge.Sell.prepare({
-          sender: params.fromAddress,
-          receiver: params.toAddress,
-          originChainId: params.fromChainId,
-          originTokenAddress: params.fromTokenAddress,
-          destinationChainId: params.toChainId,
-          destinationTokenAddress: params.toTokenAddress,
           amount: amount,
-          purchaseData: params.purchaseData,
           client: params.client,
+          destinationChainId: params.toChainId,
+          destinationTokenAddress: params.toTokenAddress,
+          originChainId: params.fromChainId,
+          originTokenAddress: params.fromTokenAddress,
           paymentLinkId: params.paymentLinkId,
+          purchaseData: params.purchaseData,
+          receiver: params.toAddress,
+          sender: params.fromAddress,
         });
       }
       throw new Error(
@@ -278,64 +278,68 @@ export async function getBuyWithCryptoQuote(
         approvalTx.data,
       );
       approvalData = {
+        amountWei: amount.toString(),
         chainId: firstStep.originToken.chainId,
-        tokenAddress: firstStep.originToken.address,
         spenderAddress: spender,
-        amountWei: amount.toString(),
+        tokenAddress: firstStep.originToken.address,
       };
     }
 
     const swapRoute: BuyWithCryptoQuote = {
-      transactionRequest: {
-        ...tx,
-        extraGas: 50000n, // extra gas buffer
-      },
       approvalData,
-      swapDetails: {
-        fromAddress: quote.intent.sender,
-        toAddress: quote.intent.receiver,
+      client: params.client,
 
-        fromToken: {
-          tokenAddress: firstStep.originToken.address,
-          chainId: firstStep.originToken.chainId,
-          decimals: firstStep.originToken.decimals,
-          symbol: firstStep.originToken.symbol,
-          name: firstStep.originToken.name,
-          priceUSDCents: firstStep.originToken.priceUsd * 100,
+      paymentTokens: [
+        {
+          amount: Value.format(
+            quote.originAmount,
+            firstStep.originToken.decimals,
+          ).toString(),
+          amountUSDCents:
+            Number(
+              Value.format(quote.originAmount, firstStep.originToken.decimals),
+            ) *
+            firstStep.originToken.priceUsd *
+            100,
+          amountWei: quote.originAmount.toString(),
+          token: {
+            chainId: firstStep.originToken.chainId,
+            decimals: firstStep.originToken.decimals,
+            name: firstStep.originToken.name,
+            priceUSDCents: firstStep.originToken.priceUsd * 100,
+            symbol: firstStep.originToken.symbol,
+            tokenAddress: firstStep.originToken.address,
+          },
         },
-        toToken: {
-          tokenAddress: firstStep.destinationToken.address,
-          chainId: firstStep.destinationToken.chainId,
-          decimals: firstStep.destinationToken.decimals,
-          symbol: firstStep.destinationToken.symbol,
-          name: firstStep.destinationToken.name,
-          priceUSDCents: firstStep.destinationToken.priceUsd * 100,
+      ],
+      // TODO (UB): add develope and platform fees in API
+      processingFees: [
+        {
+          amount: "0",
+          amountUSDCents: 0,
+          amountWei: "0",
+          token: {
+            chainId: firstStep.originToken.chainId,
+            decimals: firstStep.originToken.decimals,
+            name: firstStep.originToken.name,
+            priceUSDCents: firstStep.originToken.priceUsd * 100,
+            symbol: firstStep.originToken.symbol,
+            tokenAddress: firstStep.originToken.address,
+          },
         },
-
-        fromAmount: Value.format(
-          quote.originAmount,
-          firstStep.originToken.decimals,
-        ).toString(),
-        fromAmountWei: quote.originAmount.toString(),
-
-        toAmountMinWei: quote.destinationAmount.toString(),
-        toAmountMin: Value.format(
-          quote.destinationAmount,
-          firstStep.destinationToken.decimals,
-        ).toString(),
-
-        toAmountWei: quote.destinationAmount.toString(),
-        toAmount: Value.format(
-          quote.destinationAmount,
-          firstStep.destinationToken.decimals,
-        ).toString(),
+      ],
+      swapDetails: {
         estimated: {
+          durationSeconds: firstStep.estimatedExecutionTimeMs / 1000,
+          feesUSDCents: 0,
           fromAmountUSDCents:
             Number(
               Value.format(quote.originAmount, firstStep.originToken.decimals),
             ) *
             firstStep.originToken.priceUsd *
             100,
+          gasCostUSDCents: 0,
+          slippageBPS: 0,
           toAmountMinUSDCents:
             Number(
               Value.format(
@@ -354,55 +358,51 @@ export async function getBuyWithCryptoQuote(
             ) *
             firstStep.destinationToken.priceUsd *
             100,
-          slippageBPS: 0,
-          feesUSDCents: 0,
-          gasCostUSDCents: 0,
-          durationSeconds: firstStep.estimatedExecutionTimeMs / 1000,
         },
+        fromAddress: quote.intent.sender,
 
-        maxSlippageBPS: 0,
-      },
+        fromAmount: Value.format(
+          quote.originAmount,
+          firstStep.originToken.decimals,
+        ).toString(),
+        fromAmountWei: quote.originAmount.toString(),
 
-      paymentTokens: [
-        {
-          token: {
-            tokenAddress: firstStep.originToken.address,
-            chainId: firstStep.originToken.chainId,
-            decimals: firstStep.originToken.decimals,
-            symbol: firstStep.originToken.symbol,
-            name: firstStep.originToken.name,
-            priceUSDCents: firstStep.originToken.priceUsd * 100,
-          },
-          amountWei: quote.originAmount.toString(),
-          amount: Value.format(
-            quote.originAmount,
-            firstStep.originToken.decimals,
-          ).toString(),
-          amountUSDCents:
-            Number(
-              Value.format(quote.originAmount, firstStep.originToken.decimals),
-            ) *
-            firstStep.originToken.priceUsd *
-            100,
+        fromToken: {
+          chainId: firstStep.originToken.chainId,
+          decimals: firstStep.originToken.decimals,
+          name: firstStep.originToken.name,
+          priceUSDCents: firstStep.originToken.priceUsd * 100,
+          symbol: firstStep.originToken.symbol,
+          tokenAddress: firstStep.originToken.address,
         },
-      ],
-      // TODO (UB): add develope and platform fees in API
-      processingFees: [
-        {
-          token: {
-            tokenAddress: firstStep.originToken.address,
-            chainId: firstStep.originToken.chainId,
-            decimals: firstStep.originToken.decimals,
-            symbol: firstStep.originToken.symbol,
-            name: firstStep.originToken.name,
-            priceUSDCents: firstStep.originToken.priceUsd * 100,
-          },
-          amountUSDCents: 0,
-          amountWei: "0",
-          amount: "0",
+
+        maxSlippageBPS: 0,
+        toAddress: quote.intent.receiver,
+        toAmount: Value.format(
+          quote.destinationAmount,
+          firstStep.destinationToken.decimals,
+        ).toString(),
+        toAmountMin: Value.format(
+          quote.destinationAmount,
+          firstStep.destinationToken.decimals,
+        ).toString(),
+
+        toAmountMinWei: quote.destinationAmount.toString(),
+
+        toAmountWei: quote.destinationAmount.toString(),
+        toToken: {
+          chainId: firstStep.destinationToken.chainId,
+          decimals: firstStep.destinationToken.decimals,
+          name: firstStep.destinationToken.name,
+          priceUSDCents: firstStep.destinationToken.priceUsd * 100,
+          symbol: firstStep.destinationToken.symbol,
+          tokenAddress: firstStep.destinationToken.address,
         },
-      ],
-      client: params.client,
+      },
+      transactionRequest: {
+        ...tx,
+        extraGas: 50000n, // extra gas buffer
+      },
     };
 
     return swapRoute;
diff --git a/packages/thirdweb/src/pay/buyWithCrypto/getStatus.ts b/packages/thirdweb/src/pay/buyWithCrypto/getStatus.ts
index 7733efaa475..f2b4ffe01e3 100644
--- a/packages/thirdweb/src/pay/buyWithCrypto/getStatus.ts
+++ b/packages/thirdweb/src/pay/buyWithCrypto/getStatus.ts
@@ -1,4 +1,4 @@
-import { type Status, status as bridgeStatus } from "../../bridge/index.js";
+import { status as bridgeStatus, type Status } from "../../bridge/index.js";
 import type { Token } from "../../bridge/types/Token.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import type { Hex } from "../../utils/encoding/hex.js";
@@ -136,9 +136,9 @@ export async function getBuyWithCryptoStatus(
       throw new Error("Transaction hash is required");
     }
     const result = await bridgeStatus({
-      transactionHash: buyWithCryptoTransaction.transactionHash as Hex,
       chainId: buyWithCryptoTransaction.chainId,
       client: buyWithCryptoTransaction.client,
+      transactionHash: buyWithCryptoTransaction.transactionHash as Hex,
     });
 
     switch (result.status) {
@@ -151,37 +151,37 @@ export async function getBuyWithCryptoStatus(
         );
 
         return toBuyWithCryptoStatus({
-          originTransaction,
-          destinationTransaction,
-          originAmount: result.originAmount,
           destinationAmount: result.destinationAmount,
-          originTokenAddress: result.originTokenAddress,
+          destinationChainId: result.destinationChainId,
+          destinationToken: result.destinationToken,
           destinationTokenAddress: result.destinationTokenAddress,
+          destinationTransaction,
+          originAmount: result.originAmount,
           originChainId: result.originChainId,
-          destinationChainId: result.destinationChainId,
-          status: result.status,
-          sender: result.sender,
-          receiver: result.receiver,
-          paymentId: result.paymentId,
           originToken: result.originToken,
-          destinationToken: result.destinationToken,
+          originTokenAddress: result.originTokenAddress,
+          originTransaction,
+          paymentId: result.paymentId,
           purchaseData: result.purchaseData as object | undefined,
+          receiver: result.receiver,
+          sender: result.sender,
+          status: result.status,
         });
       }
       case "PENDING": {
         return toBuyWithCryptoStatus({
-          originAmount: result.originAmount,
-          originTokenAddress: result.originTokenAddress,
+          destinationChainId: result.destinationChainId,
+          destinationToken: result.destinationToken,
           destinationTokenAddress: result.destinationTokenAddress,
+          originAmount: result.originAmount,
           originChainId: result.originChainId,
-          destinationChainId: result.destinationChainId,
-          status: result.status,
-          sender: result.sender,
-          receiver: result.receiver,
-          paymentId: result.paymentId,
           originToken: result.originToken,
-          destinationToken: result.destinationToken,
+          originTokenAddress: result.originTokenAddress,
+          paymentId: result.paymentId,
           purchaseData: result.purchaseData as object | undefined,
+          receiver: result.receiver,
+          sender: result.sender,
+          status: result.status,
         });
       }
       case "FAILED": {
@@ -192,20 +192,20 @@ export async function getBuyWithCryptoStatus(
           (tx) => tx.chainId !== buyWithCryptoTransaction.chainId,
         );
         return toBuyWithCryptoStatus({
-          originTransaction,
-          destinationTransaction,
-          originAmount: BigInt(0), // TODO: get from API
-          originTokenAddress: "", // TODO: get from API
+          destinationChainId: 0,
+          destinationToken: undefined,
           destinationTokenAddress: "", // TODO: get from API
+          destinationTransaction, // TODO: get from API
+          originAmount: BigInt(0), // TODO: get from API
           originChainId: 0, // TODO: get from API
-          destinationChainId: 0, // TODO: get from API
-          status: result.status,
-          sender: "",
-          receiver: "",
+          originToken: undefined, // TODO: get from API
+          originTokenAddress: "",
+          originTransaction,
           paymentId: "",
-          originToken: undefined,
-          destinationToken: undefined,
           purchaseData: result.purchaseData as object | undefined,
+          receiver: "",
+          sender: "",
+          status: result.status,
         });
       }
       default: {
@@ -254,28 +254,57 @@ function toBuyWithCryptoStatus(args: {
     destinationToken,
   } = args;
   return {
+    bridge: "STARPORT",
+    destination: {
+      amount: destinationToken
+        ? toTokens(
+            destinationAmount ?? BigInt(0),
+            destinationToken.decimals,
+          ).toString()
+        : "",
+      amountUSDCents: 0,
+      amountWei: destinationAmount?.toString() ?? "",
+      completedAt: new Date().toISOString(),
+      explorerLink: "",
+      token: {
+        chainId: destinationChainId,
+        decimals: destinationToken?.decimals ?? 18,
+        name: destinationToken?.name ?? "",
+        priceUSDCents: 0,
+        symbol: destinationToken?.symbol ?? "",
+        tokenAddress: destinationTokenAddress,
+      },
+      transactionHash: destinationTransaction?.transactionHash ?? "",
+    },
     fromAddress: sender,
-    toAddress: receiver,
+    purchaseData: purchaseData as object | undefined, // TODO transfer type?
     quote: {
       createdAt: new Date().toISOString(),
       estimated: {
+        durationSeconds: 0,
+        feesUSDCents: 0,
         fromAmountUSDCents: 0,
+        gasCostUSDCents: 0,
+        slippageBPS: 0,
         toAmountMinUSDCents: 0,
         toAmountUSDCents: 0,
-        slippageBPS: 0,
-        feesUSDCents: 0,
-        gasCostUSDCents: 0,
-        durationSeconds: 0,
       },
       fromAmount: originToken
         ? toTokens(originAmount, originToken.decimals).toString()
         : "",
       fromAmountWei: originAmount.toString(),
+      fromToken: {
+        chainId: originChainId,
+        decimals: originToken?.decimals ?? 18,
+        name: originToken?.name ?? "",
+        priceUSDCents: 0,
+        symbol: originToken?.symbol ?? "",
+        tokenAddress: originTokenAddress,
+      },
       toAmount:
         destinationToken && destinationAmount
           ? toTokens(destinationAmount, destinationToken.decimals).toString()
           : "",
-      toAmountWei: destinationAmount ? destinationAmount.toString() : "",
       toAmountMin: destinationToken
         ? toTokens(
             destinationAmount ?? BigInt(0),
@@ -283,69 +312,40 @@ function toBuyWithCryptoStatus(args: {
           ).toString()
         : "",
       toAmountMinWei: destinationAmount ? destinationAmount.toString() : "",
-      fromToken: {
-        tokenAddress: originTokenAddress,
-        chainId: originChainId,
-        decimals: originToken?.decimals ?? 18,
-        name: originToken?.name ?? "",
-        symbol: originToken?.symbol ?? "",
-        priceUSDCents: 0,
-      },
+      toAmountWei: destinationAmount ? destinationAmount.toString() : "",
       toToken: {
-        tokenAddress: destinationTokenAddress,
         chainId: destinationChainId,
         decimals: destinationToken?.decimals ?? 18,
         name: destinationToken?.name ?? "",
-        symbol: destinationToken?.symbol ?? "",
         priceUSDCents: 0,
-      },
-    },
-    swapType:
-      originTransaction?.chainId === destinationTransaction?.chainId
-        ? "SAME_CHAIN"
-        : "CROSS_CHAIN", // TODO transfer type?
-    status: status,
-    subStatus: status === "COMPLETED" ? "SUCCESS" : "NONE",
-    purchaseData: purchaseData as object | undefined,
-    bridge: "STARPORT",
-    destination: {
-      amount: destinationToken
-        ? toTokens(
-            destinationAmount ?? BigInt(0),
-            destinationToken.decimals,
-          ).toString()
-        : "",
-      amountWei: destinationAmount?.toString() ?? "",
-      token: {
-        tokenAddress: destinationTokenAddress,
-        chainId: destinationChainId,
-        decimals: destinationToken?.decimals ?? 18,
-        name: destinationToken?.name ?? "",
         symbol: destinationToken?.symbol ?? "",
-        priceUSDCents: 0,
+        tokenAddress: destinationTokenAddress,
       },
-      amountUSDCents: 0,
-      completedAt: new Date().toISOString(),
-      explorerLink: "",
-      transactionHash: destinationTransaction?.transactionHash ?? "",
     },
     source: {
       amount: originToken
         ? toTokens(originAmount, originToken.decimals).toString()
         : "",
+      amountUSDCents: 0,
       amountWei: originAmount.toString(),
+      completedAt: new Date().toISOString(),
+      explorerLink: "",
       token: {
-        tokenAddress: originTokenAddress,
         chainId: originChainId,
         decimals: originToken?.decimals ?? 18,
         name: originToken?.name ?? "",
-        symbol: originToken?.symbol ?? "",
         priceUSDCents: 0,
+        symbol: originToken?.symbol ?? "",
+        tokenAddress: originTokenAddress,
       },
-      amountUSDCents: 0,
-      completedAt: new Date().toISOString(),
-      explorerLink: "",
       transactionHash: originTransaction?.transactionHash ?? "",
     },
+    status: status,
+    subStatus: status === "COMPLETED" ? "SUCCESS" : "NONE",
+    swapType:
+      originTransaction?.chainId === destinationTransaction?.chainId
+        ? "SAME_CHAIN"
+        : "CROSS_CHAIN",
+    toAddress: receiver,
   };
 }
diff --git a/packages/thirdweb/src/pay/buyWithCrypto/getTransfer.ts b/packages/thirdweb/src/pay/buyWithCrypto/getTransfer.ts
index 14b410c3139..bbf59301880 100644
--- a/packages/thirdweb/src/pay/buyWithCrypto/getTransfer.ts
+++ b/packages/thirdweb/src/pay/buyWithCrypto/getTransfer.ts
@@ -125,15 +125,15 @@ export async function getBuyWithCryptoTransfer(
           });
     const amount = Value.from(params.amount, tokenDecimals);
     const quote = await Transfer.prepare({
-      chainId: params.chainId,
-      tokenAddress: params.tokenAddress,
       amount,
-      sender: params.fromAddress,
-      receiver: params.toAddress,
+      chainId: params.chainId,
       client: params.client,
       feePayer: params.feePayer,
       paymentLinkId: params.paymentLinkId,
       purchaseData: params.purchaseData,
+      receiver: params.toAddress,
+      sender: params.fromAddress,
+      tokenAddress: params.tokenAddress,
     });
 
     const firstStep = quote.steps[0];
@@ -163,10 +163,10 @@ export async function getBuyWithCryptoTransfer(
         approvalTx.data,
       );
       approvalData = {
+        amountWei: amount.toString(),
         chainId: firstStep.originToken.chainId,
-        tokenAddress: firstStep.originToken.address,
         spenderAddress: spender,
-        amountWei: amount.toString(),
+        tokenAddress: firstStep.originToken.address,
       };
     }
 
@@ -184,23 +184,11 @@ export async function getBuyWithCryptoTransfer(
     }
 
     const transfer: BuyWithCryptoTransfer = {
-      transactionRequest: {
-        ...tx,
-        extraGas: 50000n, // extra gas buffer
-      },
       approvalData,
+      client: params.client,
+      estimatedGasCostUSDCents: 0,
       fromAddress: params.fromAddress,
-      toAddress: params.toAddress,
       paymentToken: {
-        token: {
-          tokenAddress: firstStep.originToken.address,
-          chainId: firstStep.originToken.chainId,
-          decimals: firstStep.originToken.decimals,
-          symbol: firstStep.originToken.symbol,
-          name: firstStep.originToken.name,
-          priceUSDCents: firstStep.originToken.priceUsd * 100,
-        },
-        amountWei: quote.originAmount.toString(),
         amount: Value.format(
           quote.originAmount,
           firstStep.originToken.decimals,
@@ -211,20 +199,17 @@ export async function getBuyWithCryptoTransfer(
           ) *
           firstStep.originToken.priceUsd *
           100,
-      },
-      processingFee: {
+        amountWei: quote.originAmount.toString(),
         token: {
-          tokenAddress: firstStep.originToken.address,
           chainId: firstStep.originToken.chainId,
           decimals: firstStep.originToken.decimals,
-          symbol: firstStep.originToken.symbol,
           name: firstStep.originToken.name,
           priceUSDCents: firstStep.originToken.priceUsd * 100,
+          symbol: firstStep.originToken.symbol,
+          tokenAddress: firstStep.originToken.address,
         },
-        amountWei:
-          params.feePayer === "sender"
-            ? (quote.originAmount - quote.destinationAmount).toString()
-            : "0",
+      },
+      processingFee: {
         amount:
           params.feePayer === "sender"
             ? Value.format(
@@ -243,9 +228,24 @@ export async function getBuyWithCryptoTransfer(
               firstStep.originToken.priceUsd *
               100
             : 0,
+        amountWei:
+          params.feePayer === "sender"
+            ? (quote.originAmount - quote.destinationAmount).toString()
+            : "0",
+        token: {
+          chainId: firstStep.originToken.chainId,
+          decimals: firstStep.originToken.decimals,
+          name: firstStep.originToken.name,
+          priceUSDCents: firstStep.originToken.priceUsd * 100,
+          symbol: firstStep.originToken.symbol,
+          tokenAddress: firstStep.originToken.address,
+        },
+      },
+      toAddress: params.toAddress,
+      transactionRequest: {
+        ...tx,
+        extraGas: 50000n, // extra gas buffer
       },
-      estimatedGasCostUSDCents: 0,
-      client: params.client,
     };
 
     return transfer;
diff --git a/packages/thirdweb/src/pay/buyWithFiat/getPostOnRampQuote.ts b/packages/thirdweb/src/pay/buyWithFiat/getPostOnRampQuote.ts
index bce67e9e287..20938882b03 100644
--- a/packages/thirdweb/src/pay/buyWithFiat/getPostOnRampQuote.ts
+++ b/packages/thirdweb/src/pay/buyWithFiat/getPostOnRampQuote.ts
@@ -74,15 +74,15 @@ export async function getPostOnRampQuote({
 
   return getBuyWithCryptoQuote({
     client,
-    intentId: buyWithFiatStatus.intentId,
     // onramp always happens to fromAddress, and then swap is done from - fromAddress to toAddress
     fromAddress: buyWithFiatStatus.fromAddress,
-    toAddress: buyWithFiatStatus.toAddress,
     fromChainId: buyWithFiatStatus.quote.onRampToken.chainId,
     fromTokenAddress: buyWithFiatStatus.quote.onRampToken.tokenAddress,
+    intentId: buyWithFiatStatus.intentId,
+    paymentLinkId: paymentLinkId,
+    toAddress: buyWithFiatStatus.toAddress,
+    toAmount: buyWithFiatStatus.quote.estimatedToTokenAmount,
     toChainId: buyWithFiatStatus.quote.toToken.chainId,
     toTokenAddress: buyWithFiatStatus.quote.toToken.tokenAddress,
-    toAmount: buyWithFiatStatus.quote.estimatedToTokenAmount,
-    paymentLinkId: paymentLinkId,
   });
 }
diff --git a/packages/thirdweb/src/pay/buyWithFiat/getQuote.ts b/packages/thirdweb/src/pay/buyWithFiat/getQuote.ts
index d7c722f2b9f..2f7dc0648c1 100644
--- a/packages/thirdweb/src/pay/buyWithFiat/getQuote.ts
+++ b/packages/thirdweb/src/pay/buyWithFiat/getQuote.ts
@@ -307,9 +307,9 @@ export async function getBuyWithFiatQuote(
       params.toTokenAddress !== NATIVE_TOKEN_ADDRESS
         ? await decimals({
             contract: getContract({
-              client: params.client,
               address: params.toTokenAddress,
               chain: getCachedChain(params.toChainId),
+              client: params.client,
             }),
           })
         : 18;
@@ -319,19 +319,19 @@ export async function getBuyWithFiatQuote(
 
     // Call new Onramp.prepare to get the quote & link
     const prepared = await prepareOnramp({
-      client: params.client,
-      onramp: onrampProvider,
-      chainId: params.toChainId,
-      tokenAddress: params.toTokenAddress,
-      receiver: params.toAddress,
-      sender: params.fromAddress,
       amount: amountWei,
-      purchaseData: params.purchaseData,
+      chainId: params.toChainId,
+      client: params.client,
       currency: params.fromCurrencySymbol,
       maxSteps: 2,
-      onrampTokenAddress: params.onrampTokenAddress ?? NATIVE_TOKEN_ADDRESS, // force onramp to native token to avoid missing gas issues
+      onramp: onrampProvider,
       onrampChainId: params.onrampChainId,
+      onrampTokenAddress: params.onrampTokenAddress ?? NATIVE_TOKEN_ADDRESS,
       paymentLinkId: params.paymentLinkId,
+      purchaseData: params.purchaseData,
+      receiver: params.toAddress, // force onramp to native token to avoid missing gas issues
+      sender: params.fromAddress,
+      tokenAddress: params.toTokenAddress,
     });
 
     // Determine tokens based on steps rules
@@ -369,11 +369,11 @@ export async function getBuyWithFiatQuote(
       priceUsd: number;
     }): PayTokenInfo => ({
       chainId: token.chainId,
-      tokenAddress: token.address,
       decimals: token.decimals,
-      priceUSDCents: Math.round(token.priceUsd * 100),
       name: token.name,
+      priceUSDCents: Math.round(token.priceUsd * 100),
       symbol: token.symbol,
+      tokenAddress: token.address,
     });
 
     // Determine the raw token objects using new simplified rules
@@ -406,10 +406,10 @@ export async function getBuyWithFiatQuote(
     // Build info objects
     const onRampTokenObject = {
       amount: onRampTokenAmount,
-      amountWei: onRampTokenAmountWei.toString(),
       amountUSDCents: Math.round(
         Number(onRampTokenAmount) * onRampTokenRaw.priceUsd * 100,
       ),
+      amountWei: onRampTokenAmountWei.toString(),
       token: tokenToPayTokenInfo(onRampTokenRaw),
     };
 
@@ -432,10 +432,10 @@ export async function getBuyWithFiatQuote(
       );
       routingTokenObject = {
         amount: routingAmount,
-        amountWei: routingAmountWei.toString(),
         amountUSDCents: Math.round(
           Number(routingAmount) * routingTokenRaw.priceUsd * 100,
         ),
+        amountWei: routingAmountWei.toString(),
         token: tokenToPayTokenInfo(routingTokenRaw),
       };
     }
@@ -444,30 +444,30 @@ export async function getBuyWithFiatQuote(
       estimatedDurationSeconds,
       estimatedToAmountMin: estimatedToAmountMin,
       estimatedToAmountMinWei: estimatedToAmountMinWeiBigInt.toString(),
-      toAmountMinWei: toAmountMinWeiBigInt.toString(),
-      toAmountMin: toAmountMin,
+      fromAddress: params.fromAddress,
       fromCurrency: {
         amount: prepared.currencyAmount.toString(),
         amountUnits: Number(prepared.currencyAmount).toFixed(2),
-        decimals: 2,
         currencySymbol: prepared.currency,
+        decimals: 2,
       },
       fromCurrencyWithFees: {
         amount: prepared.currencyAmount.toString(),
         amountUnits: Number(prepared.currencyAmount).toFixed(2),
-        decimals: 2,
         currencySymbol: prepared.currency,
+        decimals: 2,
       },
-      toToken: tokenToPayTokenInfo(toTokenRaw),
-      toAddress: params.toAddress,
-      fromAddress: params.fromAddress,
-      maxSlippageBPS: maxSlippageBPS,
       intentId: prepared.id,
-      processingFees: [],
-      onRampToken: onRampTokenObject,
-      routingToken: routingTokenObject,
+      maxSlippageBPS: maxSlippageBPS,
       onRampLink: prepared.link,
+      onRampToken: onRampTokenObject,
+      processingFees: [],
       provider: (params.preferredProvider ?? "COINBASE") as FiatProvider,
+      routingToken: routingTokenObject,
+      toAddress: params.toAddress,
+      toAmountMin: toAmountMin,
+      toAmountMinWei: toAmountMinWeiBigInt.toString(),
+      toToken: tokenToPayTokenInfo(toTokenRaw),
     };
 
     return buyWithFiatQuote;
diff --git a/packages/thirdweb/src/pay/buyWithFiat/getStatus.ts b/packages/thirdweb/src/pay/buyWithFiat/getStatus.ts
index f60d48ad17e..dbe5a14f504 100644
--- a/packages/thirdweb/src/pay/buyWithFiat/getStatus.ts
+++ b/packages/thirdweb/src/pay/buyWithFiat/getStatus.ts
@@ -158,8 +158,8 @@ export async function getBuyWithFiatStatus(
   params: GetBuyWithFiatStatusParams,
 ): Promise<BuyWithFiatStatus> {
   const result = await onrampStatus({
-    id: params.intentId,
     client: params.client,
+    id: params.intentId,
   });
 
   return toBuyWithFiatStatus({ intentId: params.intentId, result });
@@ -180,18 +180,18 @@ function toBuyWithFiatStatus(args: {
     typeof result.status,
     "NONE" | "PENDING_PAYMENT" | "PAYMENT_FAILED" | "ON_RAMP_TRANSFER_COMPLETED"
   > = {
+    COMPLETED: "ON_RAMP_TRANSFER_COMPLETED",
     CREATED: "PENDING_PAYMENT",
-    PENDING: "PENDING_PAYMENT",
     FAILED: "PAYMENT_FAILED",
-    COMPLETED: "ON_RAMP_TRANSFER_COMPLETED",
+    PENDING: "PENDING_PAYMENT",
   } as const;
 
   const mappedStatus = STATUS_MAP[result.status];
 
   return buildPlaceholderStatus({
     intentId,
-    status: mappedStatus,
     purchaseData: result.purchaseData,
+    status: mappedStatus,
   });
 }
 
@@ -209,11 +209,11 @@ function buildPlaceholderStatus(args: {
   // Build a minimal—but type-complete—object that satisfies BuyWithFiatStatus.
   const emptyToken: PayTokenInfo = {
     chainId: 0,
-    tokenAddress: "",
     decimals: 18,
-    priceUSDCents: 0,
     name: "",
+    priceUSDCents: 0,
     symbol: "",
+    tokenAddress: "",
   };
 
   type BuyWithFiatStatusWithData = Exclude<
@@ -222,6 +222,8 @@ function buildPlaceholderStatus(args: {
   >;
 
   const quote: BuyWithFiatStatusWithData["quote"] = {
+    createdAt: new Date().toISOString(),
+    estimatedDurationSeconds: 0,
     estimatedOnRampAmount: "0",
     estimatedOnRampAmountWei: "0",
 
@@ -231,19 +233,17 @@ function buildPlaceholderStatus(args: {
     fromCurrency: {
       amount: "0",
       amountUnits: "USD",
-      decimals: 2,
       currencySymbol: "USD",
+      decimals: 2,
     },
     fromCurrencyWithFees: {
       amount: "0",
       amountUnits: "USD",
-      decimals: 2,
       currencySymbol: "USD",
+      decimals: 2,
     },
     onRampToken: emptyToken,
     toToken: emptyToken,
-    estimatedDurationSeconds: 0,
-    createdAt: new Date().toISOString(),
   } as BuyWithFiatStatusWithData["quote"];
 
   // The source/destination fields can only be filled accurately when extra context is returned
@@ -251,12 +251,12 @@ function buildPlaceholderStatus(args: {
   // now (they are optional).
 
   const base: Exclude<BuyWithFiatStatus, { status: "NOT_FOUND" }> = {
+    fromAddress: "",
     intentId,
+    purchaseData: purchaseData as object | undefined,
+    quote,
     status,
     toAddress: "",
-    fromAddress: "",
-    quote,
-    purchaseData: purchaseData as object | undefined,
   };
 
   return base;
diff --git a/packages/thirdweb/src/pay/buyWithFiat/isSwapRequiredPostOnramp.ts b/packages/thirdweb/src/pay/buyWithFiat/isSwapRequiredPostOnramp.ts
index ed0a2076d41..198c1b4a1bf 100644
--- a/packages/thirdweb/src/pay/buyWithFiat/isSwapRequiredPostOnramp.ts
+++ b/packages/thirdweb/src/pay/buyWithFiat/isSwapRequiredPostOnramp.ts
@@ -38,8 +38,8 @@ export function getOnRampSteps(
     return [
       {
         action: "buy",
-        token: buyWithFiatQuote.toToken,
         amount: buyWithFiatQuote.estimatedToAmountMin,
+        token: buyWithFiatQuote.toToken,
       },
     ];
   }
@@ -48,18 +48,18 @@ export function getOnRampSteps(
     return [
       {
         action: "buy",
-        token: buyWithFiatQuote.onRampToken.token,
         amount: buyWithFiatQuote.onRampToken.amount,
+        token: buyWithFiatQuote.onRampToken.token,
       },
       {
         action: "swap",
-        token: buyWithFiatQuote.routingToken.token,
         amount: buyWithFiatQuote.routingToken.amount,
+        token: buyWithFiatQuote.routingToken.token,
       },
       {
         action: "bridge",
-        token: buyWithFiatQuote.toToken,
         amount: buyWithFiatQuote.estimatedToAmountMin,
+        token: buyWithFiatQuote.toToken,
       },
     ];
   }
@@ -67,13 +67,13 @@ export function getOnRampSteps(
   return [
     {
       action: "buy",
-      token: buyWithFiatQuote.onRampToken.token,
       amount: buyWithFiatQuote.onRampToken.amount,
+      token: buyWithFiatQuote.onRampToken.token,
     },
     {
       action: "swap",
-      token: buyWithFiatQuote.toToken,
       amount: buyWithFiatQuote.estimatedToAmountMin,
+      token: buyWithFiatQuote.toToken,
     },
   ];
 }
diff --git a/packages/thirdweb/src/pay/convert/cryptoToFiat.test.ts b/packages/thirdweb/src/pay/convert/cryptoToFiat.test.ts
index 34d06e8fe6d..7f7f7a46458 100644
--- a/packages/thirdweb/src/pay/convert/cryptoToFiat.test.ts
+++ b/packages/thirdweb/src/pay/convert/cryptoToFiat.test.ts
@@ -10,10 +10,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
   it("should convert ETH price to USD on Ethereum mainnet", async () => {
     const data = await convertCryptoToFiat({
       chain: ethereum,
-      fromTokenAddress: NATIVE_TOKEN_ADDRESS,
+      client: TEST_CLIENT,
       fromAmount: 1,
+      fromTokenAddress: NATIVE_TOKEN_ADDRESS,
       to: "USD",
-      client: TEST_CLIENT,
     });
     expect(data.result).toBeDefined();
     // Should be a number
@@ -26,10 +26,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
   it("should convert ETH price to USD on Base mainnet", async () => {
     const data = await convertCryptoToFiat({
       chain: base,
-      fromTokenAddress: NATIVE_TOKEN_ADDRESS,
+      client: TEST_CLIENT,
       fromAmount: 1,
+      fromTokenAddress: NATIVE_TOKEN_ADDRESS,
       to: "USD",
-      client: TEST_CLIENT,
     });
     expect(data.result).toBeDefined();
     // Should be a number
@@ -40,10 +40,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
   it("should return zero if fromAmount is zero", async () => {
     const data = await convertCryptoToFiat({
       chain: base,
-      fromTokenAddress: NATIVE_TOKEN_ADDRESS,
+      client: TEST_CLIENT,
       fromAmount: 0,
+      fromTokenAddress: NATIVE_TOKEN_ADDRESS,
       to: "USD",
-      client: TEST_CLIENT,
     });
     expect(data.result).toBe(0);
   });
@@ -52,10 +52,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
     await expect(
       convertCryptoToFiat({
         chain: sepolia,
-        fromTokenAddress: NATIVE_TOKEN_ADDRESS,
+        client: TEST_CLIENT,
         fromAmount: 1,
+        fromTokenAddress: NATIVE_TOKEN_ADDRESS,
         to: "USD",
-        client: TEST_CLIENT,
       }),
     ).rejects.toThrowError(
       `Cannot fetch price for a testnet (chainId: ${sepolia.id})`,
@@ -66,10 +66,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
     await expect(
       convertCryptoToFiat({
         chain: ethereum,
-        fromTokenAddress: "haha",
+        client: TEST_CLIENT,
         fromAmount: 1,
+        fromTokenAddress: "haha",
         to: "USD",
-        client: TEST_CLIENT,
       }),
     ).rejects.toThrowError(
       "Invalid fromTokenAddress. Expected a valid EVM contract address",
diff --git a/packages/thirdweb/src/pay/convert/fiatToCrypto.test.ts b/packages/thirdweb/src/pay/convert/fiatToCrypto.test.ts
index 5053708bc3f..35db7dbebc3 100644
--- a/packages/thirdweb/src/pay/convert/fiatToCrypto.test.ts
+++ b/packages/thirdweb/src/pay/convert/fiatToCrypto.test.ts
@@ -10,10 +10,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
   it("should convert fiat price to token on Ethereum mainnet", async () => {
     const data = await convertFiatToCrypto({
       chain: ethereum,
+      client: TEST_CLIENT,
       from: "USD",
       fromAmount: 1,
       to: NATIVE_TOKEN_ADDRESS,
-      client: TEST_CLIENT,
     });
     expect(data.result).toBeDefined();
     // Should be a number
@@ -26,10 +26,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
   it("should convert fiat price to token on Base mainnet", async () => {
     const data = await convertFiatToCrypto({
       chain: base,
+      client: TEST_CLIENT,
       from: "USD",
       fromAmount: 1,
       to: NATIVE_TOKEN_ADDRESS,
-      client: TEST_CLIENT,
     });
 
     expect(data.result).toBeDefined();
@@ -43,10 +43,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
   it("should return zero if the fromAmount is zero", async () => {
     const data = await convertFiatToCrypto({
       chain: base,
+      client: TEST_CLIENT,
       from: "USD",
       fromAmount: 0,
       to: NATIVE_TOKEN_ADDRESS,
-      client: TEST_CLIENT,
     });
     expect(data.result).toBe(0);
   });
@@ -55,10 +55,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
     await expect(
       convertFiatToCrypto({
         chain: sepolia,
-        to: NATIVE_TOKEN_ADDRESS,
-        fromAmount: 1,
-        from: "USD",
         client: TEST_CLIENT,
+        from: "USD",
+        fromAmount: 1,
+        to: NATIVE_TOKEN_ADDRESS,
       }),
     ).rejects.toThrowError(
       `Cannot fetch price for a testnet (chainId: ${sepolia.id})`,
@@ -69,10 +69,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
     await expect(
       convertFiatToCrypto({
         chain: ethereum,
-        to: "haha",
-        fromAmount: 1,
-        from: "USD",
         client: TEST_CLIENT,
+        from: "USD",
+        fromAmount: 1,
+        to: "haha",
       }),
     ).rejects.toThrowError(
       "Invalid `to`. Expected a valid EVM contract address",
diff --git a/packages/thirdweb/src/pay/convert/get-token.ts b/packages/thirdweb/src/pay/convert/get-token.ts
index 351f7cdce9d..fd178225ed7 100644
--- a/packages/thirdweb/src/pay/convert/get-token.ts
+++ b/packages/thirdweb/src/pay/convert/get-token.ts
@@ -11,16 +11,16 @@ export async function getToken(
   return withCache(
     async () => {
       const result = await tokens({
+        chainId,
         client,
         tokenAddress,
-        chainId,
       });
       const token = result[0];
       if (!token) {
         // Attempt to add the token
         const tokenResult = await add({
-          client,
           chainId,
+          client,
           tokenAddress,
         }).catch(() => {
           throw new Error("Token not supported");
diff --git a/packages/thirdweb/src/react/core/design-system/CustomThemeProvider.tsx b/packages/thirdweb/src/react/core/design-system/CustomThemeProvider.tsx
index 211d1815380..89316e3db5e 100644
--- a/packages/thirdweb/src/react/core/design-system/CustomThemeProvider.tsx
+++ b/packages/thirdweb/src/react/core/design-system/CustomThemeProvider.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { createContext, useContext } from "react";
-import { type Theme, darkThemeObj, lightThemeObj } from "./index.js";
+import { darkThemeObj, lightThemeObj, type Theme } from "./index.js";
 
 const CustomThemeCtx = /* @__PURE__ */ createContext(darkThemeObj);
 
diff --git a/packages/thirdweb/src/react/core/design-system/index.ts b/packages/thirdweb/src/react/core/design-system/index.ts
index 22ad3419427..a0484032317 100644
--- a/packages/thirdweb/src/react/core/design-system/index.ts
+++ b/packages/thirdweb/src/react/core/design-system/index.ts
@@ -14,32 +14,32 @@ type ThemeColors = {
 };
 
 const darkColors = {
+  accentBg: "hsl(216 100% 50%)",
+  accentText: "#3385FF",
   base1: "hsl(230 11.63% 8.43%)",
   base2: "hsl(230 11.63% 12%)",
   base3: "hsl(230 11.63% 15%)",
   base4: "hsl(230 11.63% 17%)",
+  danger: "#e5484D",
+  overlay: "rgba(0, 0, 0, 0.7)",
   primaryText: "#eeeef0",
   secondaryText: "#7c7a85",
-  danger: "#e5484D",
   success: "#30A46C",
-  overlay: "rgba(0, 0, 0, 0.7)",
-  accentText: "#3385FF",
-  accentBg: "hsl(216 100% 50%)",
   textOnAccent: "#eeeef0",
 } as const satisfies ThemeColors;
 
 const lightColors = {
+  accentBg: "hsl(216 100% 50%)",
+  accentText: "#3385FF",
   base1: "#fdfcfd",
   base2: "#f2eff3",
   base3: "#e3dfe6",
   base4: "#dbd8e0",
+  danger: "#e5484D",
+  overlay: "rgba(0, 0, 0, 0.7)",
   primaryText: "#211f26",
   secondaryText: "#6f6d78",
-  accentText: "#3385FF",
   success: "#30A46C",
-  danger: "#e5484D",
-  overlay: "rgba(0, 0, 0, 0.7)",
-  accentBg: "hsl(216 100% 50%)",
   textOnAccent: "#fdfcfd",
 } as const satisfies ThemeColors;
 
@@ -100,52 +100,51 @@ export type Theme = {
  */
 function createThemeObj(type: "dark" | "light", colors: ThemeColors): Theme {
   return {
-    type,
     colors: {
-      primaryText: colors.primaryText,
-      secondaryText: colors.secondaryText,
+      accentButtonBg: colors.accentBg,
+      accentButtonText: colors.textOnAccent,
       accentText: colors.accentText,
 
-      danger: colors.danger,
-      success: colors.success,
-
-      modalOverlayBg: colors.overlay,
+      borderColor: colors.base4,
 
-      accentButtonBg: colors.accentBg,
-      accentButtonText: colors.textOnAccent,
+      connectedButtonBg: colors.base1,
+      connectedButtonBgHover: colors.base2,
 
-      primaryButtonBg: colors.primaryText,
-      primaryButtonText: colors.base1,
+      danger: colors.danger,
 
-      secondaryButtonBg: colors.base3,
-      secondaryButtonText: colors.primaryText,
-      secondaryButtonHoverBg: colors.base4,
+      inputAutofillBg: colors.base1,
 
       modalBg: colors.base1,
 
-      tooltipBg: colors.primaryText,
-      tooltipText: colors.base1,
+      modalOverlayBg: colors.overlay,
 
-      inputAutofillBg: colors.base1,
+      primaryButtonBg: colors.primaryText,
+      primaryButtonText: colors.base1,
+      primaryText: colors.primaryText,
       scrollbarBg: colors.base2,
-      tertiaryBg: colors.base2,
 
-      separatorLine: colors.base4,
+      secondaryButtonBg: colors.base3,
+      secondaryButtonHoverBg: colors.base4,
+      secondaryButtonText: colors.primaryText,
 
       secondaryIconColor: colors.secondaryText,
       secondaryIconHoverBg: colors.base3,
       secondaryIconHoverColor: colors.primaryText,
-
-      borderColor: colors.base4,
-      skeletonBg: colors.base3,
+      secondaryText: colors.secondaryText,
+      selectedTextBg: colors.primaryText,
 
       selectedTextColor: colors.base1,
-      selectedTextBg: colors.primaryText,
 
-      connectedButtonBg: colors.base1,
-      connectedButtonBgHover: colors.base2,
+      separatorLine: colors.base4,
+      skeletonBg: colors.base3,
+      success: colors.success,
+      tertiaryBg: colors.base2,
+
+      tooltipBg: colors.primaryText,
+      tooltipText: colors.base1,
     },
     fontFamily: "inherit",
+    type,
   };
 }
 
@@ -163,46 +162,46 @@ export type ThemeOverrides = {
 };
 
 export const fontSize = {
-  xs: "12px",
-  sm: "14px",
-  md: "16px",
+  "3xl": "48px",
   lg: "20px",
+  md: "16px",
+  sm: "14px",
   xl: "24px",
+  xs: "12px",
   xxl: "32px",
-  "3xl": "48px",
 };
 
 export const spacing = {
-  "4xs": "2px",
+  "3xl": "64px",
   "3xs": "4px",
-  xxs: "6px",
-  xs: "8px",
-  sm: "12px",
-  md: "16px",
+  "4xs": "2px",
   lg: "24px",
+  md: "16px",
+  sm: "12px",
   xl: "32px",
+  xs: "8px",
   xxl: "48px",
-  "3xl": "64px",
+  xxs: "6px",
 };
 
 export const radius = {
-  xs: "4px",
-  sm: "6px",
-  md: "8px",
   lg: "12px",
+  md: "8px",
+  sm: "6px",
   xl: "20px",
+  xs: "4px",
   xxl: "32px",
 };
 
 export const iconSize = {
-  xs: "12",
-  sm: "16",
-  md: "24",
+  "3xl": "96",
+  "4xl": "128",
   lg: "32",
+  md: "24",
+  sm: "16",
   xl: "48",
+  xs: "12",
   xxl: "64",
-  "3xl": "96",
-  "4xl": "128",
 };
 
 // desktop first style media query
@@ -212,9 +211,9 @@ export const media = {
 
 // TODO - move to theme
 export const shadow = {
-  sm: "0 1px 2px 0 rgb(0 0 0 / 0.05)",
-  md: "0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)",
   lg: "0 10px 15px -3px rgb(0 0 0 / 0.07), 0 4px 6px -4px rgb(0 0 0 / 0.1)",
+  md: "0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)",
+  sm: "0 1px 2px 0 rgb(0 0 0 / 0.05)",
   xl: "0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1)",
 };
 
diff --git a/packages/thirdweb/src/react/core/errors/mapBridgeError.test.ts b/packages/thirdweb/src/react/core/errors/mapBridgeError.test.ts
index 57c2d357243..d529217eaf4 100644
--- a/packages/thirdweb/src/react/core/errors/mapBridgeError.test.ts
+++ b/packages/thirdweb/src/react/core/errors/mapBridgeError.test.ts
@@ -6,9 +6,9 @@ describe("mapBridgeError", () => {
   it("should return the same error for INVALID_INPUT", () => {
     const error = new ApiError({
       code: "INVALID_INPUT",
+      correlationId: "test-correlation-id",
       message: "Invalid input provided",
       statusCode: 400,
-      correlationId: "test-correlation-id",
     });
 
     const result = mapBridgeError(error);
@@ -23,9 +23,9 @@ describe("mapBridgeError", () => {
   it("should return the same error for INTERNAL_SERVER_ERROR", () => {
     const error = new ApiError({
       code: "INTERNAL_SERVER_ERROR",
+      correlationId: "internal-error-id",
       message: "Internal server error occurred",
       statusCode: 500,
-      correlationId: "internal-error-id",
     });
 
     const result = mapBridgeError(error);
@@ -56,9 +56,9 @@ describe("mapBridgeError", () => {
   it("should return the same error for AMOUNT_TOO_LOW", () => {
     const error = new ApiError({
       code: "AMOUNT_TOO_LOW",
+      correlationId: "amount-validation-id",
       message: "Amount is below minimum threshold",
       statusCode: 400,
-      correlationId: "amount-validation-id",
     });
 
     const result = mapBridgeError(error);
diff --git a/packages/thirdweb/src/react/core/hooks/auth/useSiweAuth.ts b/packages/thirdweb/src/react/core/hooks/auth/useSiweAuth.ts
index c23d7f52b69..b1a51a8e5da 100644
--- a/packages/thirdweb/src/react/core/hooks/auth/useSiweAuth.ts
+++ b/packages/thirdweb/src/react/core/hooks/auth/useSiweAuth.ts
@@ -57,8 +57,9 @@ export function useSiweAuth(
   const queryClient = useQueryClient();
 
   const isLoggedInQuery = useQuery({
-    queryKey: ["siwe_auth", "isLoggedIn", activeAccount?.address],
     enabled: requiresAuth && !!activeAccount?.address,
+    gcTime: 0,
+    placeholderData: false,
     queryFn: () => {
       // these cases should never be hit but just in case...
       if (!authOptions || !activeAccount?.address) {
@@ -66,13 +67,11 @@ export function useSiweAuth(
       }
       return authOptions.isLoggedIn(activeAccount.address);
     },
-    gcTime: 0,
-    placeholderData: false,
+    queryKey: ["siwe_auth", "isLoggedIn", activeAccount?.address],
     refetchOnWindowFocus: false,
   });
 
   const loginMutation = useMutation({
-    mutationKey: ["siwe_auth", "login", activeAccount?.address],
     mutationFn: async () => {
       if (!authOptions) {
         throw new Error("No auth options provided");
@@ -104,12 +103,13 @@ export function useSiweAuth(
       }
 
       const signedPayload = await signLoginPayload({
-        payload,
         account: activeAccount,
+        payload,
       });
 
       return await authOptions.doLogin(signedPayload);
     },
+    mutationKey: ["siwe_auth", "login", activeAccount?.address],
     onSuccess: () => {
       return queryClient.invalidateQueries({
         queryKey: ["siwe_auth", "isLoggedIn"],
@@ -118,7 +118,6 @@ export function useSiweAuth(
   });
 
   const logoutMutation = useMutation({
-    mutationKey: ["siwe_auth", "logout", activeAccount?.address],
     mutationFn: async () => {
       if (!authOptions) {
         throw new Error("No auth options provided");
@@ -126,6 +125,7 @@ export function useSiweAuth(
 
       return await authOptions.doLogout();
     },
+    mutationKey: ["siwe_auth", "logout", activeAccount?.address],
     onSuccess: () => {
       return queryClient.invalidateQueries({
         queryKey: ["siwe_auth", "isLoggedIn"],
@@ -134,20 +134,19 @@ export function useSiweAuth(
   });
 
   return {
-    // is auth even enabled
-    requiresAuth,
-
     // login
     doLogin: loginMutation.mutateAsync,
-    isLoggingIn: loginMutation.isPending,
 
     // logout
     doLogout: logoutMutation.mutateAsync,
-    isLoggingOut: logoutMutation.isPending,
+    isLoading: isLoggedInQuery.isFetching,
 
     // checking if logged in
     isLoggedIn: isLoggedInQuery.data,
-    isLoading: isLoggedInQuery.isFetching,
+    isLoggingIn: loginMutation.isPending,
+    isLoggingOut: logoutMutation.isPending,
     isPending: isLoggedInQuery.isPending,
+    // is auth even enabled
+    requiresAuth,
   };
 }
diff --git a/packages/thirdweb/src/react/core/hooks/contract/useContractEvents.ts b/packages/thirdweb/src/react/core/hooks/contract/useContractEvents.ts
index 61aca6ead5c..0cba2207892 100644
--- a/packages/thirdweb/src/react/core/hooks/contract/useContractEvents.ts
+++ b/packages/thirdweb/src/react/core/hooks/contract/useContractEvents.ts
@@ -103,7 +103,7 @@ export function useContractEvents<
   );
 
   const query = useQuery({
-    queryKey,
+    enabled,
     queryFn: async () => {
       const rpcRequest = getRpcClient(contract);
       const currentBlockNumber = await eth_blockNumber(rpcRequest);
@@ -115,7 +115,7 @@ export function useContractEvents<
       });
       return initialEvents;
     },
-    enabled,
+    queryKey,
   });
 
   useEffect(() => {
@@ -127,6 +127,8 @@ export function useContractEvents<
     // the return is important here because it will unwatch the events
     return watchContractEvents<abi, abiEvents>({
       contract,
+      events,
+      latestBlockNumber: latestBlockNumber.current,
       onEvents: (newEvents) => {
         if (newEvents.length > 0 && newEvents[0]) {
           latestBlockNumber.current = newEvents[0].blockNumber; // Update the latest block number to avoid duplicate events if a new poller is spawned during this block
@@ -137,8 +139,6 @@ export function useContractEvents<
           ...newEvents,
         ]);
       },
-      events,
-      latestBlockNumber: latestBlockNumber.current,
     });
   }, [contract, enabled, events, queryClient, queryKey, watch]);
 
diff --git a/packages/thirdweb/src/react/core/hooks/contract/useReadContract.ts b/packages/thirdweb/src/react/core/hooks/contract/useReadContract.ts
index 917b58c1582..923e4181292 100644
--- a/packages/thirdweb/src/react/core/hooks/contract/useReadContract.ts
+++ b/packages/thirdweb/src/react/core/hooks/contract/useReadContract.ts
@@ -1,6 +1,6 @@
 import {
-  type UseQueryResult,
   queryOptions as defineQuery,
+  type UseQueryResult,
   useQuery,
 } from "@tanstack/react-query";
 import type { Abi, AbiFunction, ExtractAbiFunctionNames } from "abitype";
@@ -168,8 +168,8 @@ export function useReadContract<
 
   return useQuery(
     defineQuery({
-      queryKey: queryKey as QueryKey,
       queryFn: queryFn as QueryFn,
+      queryKey: queryKey as QueryKey,
       ...(queryOpts ?? {}),
     }),
   );
diff --git a/packages/thirdweb/src/react/core/hooks/contract/useWaitForReceipt.ts b/packages/thirdweb/src/react/core/hooks/contract/useWaitForReceipt.ts
index c28dd8ec700..085cb607a82 100644
--- a/packages/thirdweb/src/react/core/hooks/contract/useWaitForReceipt.ts
+++ b/packages/thirdweb/src/react/core/hooks/contract/useWaitForReceipt.ts
@@ -22,20 +22,20 @@ export function useWaitForReceipt(
     | undefined,
 ): UseQueryResult<TransactionReceipt> {
   return useQuery({
-    queryKey: [
-      "waitForReceipt",
-      // TODO: here chain can be undfined so we go to a `-1` chain but this feels wrong
-      options?.chain.id || -1,
-      options?.transactionHash,
-    ] as const,
+    enabled:
+      !!options?.transactionHash && (options?.queryOptions?.enabled ?? true),
     queryFn: async () => {
       if (!options?.transactionHash) {
         throw new Error("No transaction hash or user op hash provided");
       }
       return waitForReceipt(options);
     },
-    enabled:
-      !!options?.transactionHash && (options?.queryOptions?.enabled ?? true),
+    queryKey: [
+      "waitForReceipt",
+      // TODO: here chain can be undfined so we go to a `-1` chain but this feels wrong
+      options?.chain.id || -1,
+      options?.transactionHash,
+    ] as const,
     retry: false,
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/others/useChainQuery.ts b/packages/thirdweb/src/react/core/hooks/others/useChainQuery.ts
index 0eb36c2f7f0..f5ad66b28f2 100644
--- a/packages/thirdweb/src/react/core/hooks/others/useChainQuery.ts
+++ b/packages/thirdweb/src/react/core/hooks/others/useChainQuery.ts
@@ -15,22 +15,22 @@ export function useChainName(chain?: Chain) {
   // only if we have a chain and no chain name!
   const isEnabled = !!chain && !chain.name;
   const chainQuery = useQuery({
-    queryKey: ["chain", chain?.id],
     enabled: isEnabled,
-    retry: false,
-    // 1 hour
-    staleTime: 60 * 60 * 1000,
     queryFn: async () => {
       if (!chain) {
         throw new Error("chain is required");
       }
       return convertApiChainToChain(await getChainMetadata(chain));
     },
+    queryKey: ["chain", chain?.id],
+    retry: false,
+    // 1 hour
+    staleTime: 60 * 60 * 1000,
   });
 
   return {
-    name: chain?.name ?? chainQuery.data?.name,
     isLoading: isEnabled && chainQuery.isLoading,
+    name: chain?.name ?? chainQuery.data?.name,
   };
 }
 
@@ -38,23 +38,23 @@ export function useChainIconUrl(chain?: Chain) {
   // only if we have a chain and no chain icon url!
   const isEnabled = !!chain && !chain.icon?.url;
   const chainQuery = useQuery({
-    queryKey: ["chain", chain?.id],
     // only if we have a chain and no chain icon url!
     enabled: isEnabled,
-    retry: false,
-    // 1 hour
-    staleTime: 60 * 60 * 1000,
     queryFn: async () => {
       if (!chain) {
         throw new Error("chain is required");
       }
       return convertApiChainToChain(await getChainMetadata(chain));
     },
+    queryKey: ["chain", chain?.id],
+    retry: false,
+    // 1 hour
+    staleTime: 60 * 60 * 1000,
   });
 
   return {
-    url: chain?.icon?.url ?? chainQuery.data?.icon?.url,
     isLoading: isEnabled && chainQuery.isLoading,
+    url: chain?.icon?.url ?? chainQuery.data?.icon?.url,
   };
 }
 
@@ -67,17 +67,17 @@ export function useChainFaucets(chain?: Chain) {
     chain.id !== 1337;
 
   const chainQuery = useQuery({
-    queryKey: ["chain", chain?.id],
     enabled: isEnabled,
-    retry: false,
-    // 1 hour
-    staleTime: 60 * 60 * 1000,
     queryFn: async () => {
       if (!chain) {
         throw new Error("chain is required");
       }
       return convertApiChainToChain(await getChainMetadata(chain));
     },
+    queryKey: ["chain", chain?.id],
+    retry: false,
+    // 1 hour
+    staleTime: 60 * 60 * 1000,
   });
 
   return {
@@ -90,24 +90,24 @@ export function useChainSymbol(chain?: Chain) {
   // only if we have a chain and no chain icon url!
   const isEnabled = !!chain && !chain.nativeCurrency?.symbol;
   const chainQuery = useQuery({
-    queryKey: ["chain", chain?.id],
     // only if we have a chain and no chain icon url!
     enabled: isEnabled,
-    retry: false,
-    // 1 hour
-    staleTime: 60 * 60 * 1000,
     queryFn: async () => {
       if (!chain) {
         throw new Error("chain is required");
       }
       return convertApiChainToChain(await getChainMetadata(chain));
     },
+    queryKey: ["chain", chain?.id],
+    retry: false,
+    // 1 hour
+    staleTime: 60 * 60 * 1000,
   });
 
   return {
+    isLoading: isEnabled && chainQuery.isLoading,
     symbol:
       chain?.nativeCurrency?.symbol ?? chainQuery.data?.nativeCurrency?.symbol,
-    isLoading: isEnabled && chainQuery.isLoading,
   };
 }
 
@@ -116,17 +116,17 @@ export function useChainExplorers(chain?: Chain) {
   const isEnabled = !!chain && !chain.blockExplorers?.length;
 
   const chainQuery = useQuery({
-    queryKey: ["chain", chain?.id],
     enabled: isEnabled,
-    retry: false,
-    // 1 hour
-    staleTime: 60 * 60 * 1000,
     queryFn: async () => {
       if (!chain) {
         throw new Error("chain is required");
       }
       return convertApiChainToChain(await getChainMetadata(chain));
     },
+    queryKey: ["chain", chain?.id],
+    retry: false,
+    // 1 hour
+    staleTime: 60 * 60 * 1000,
   });
 
   return {
@@ -137,8 +137,8 @@ export function useChainExplorers(chain?: Chain) {
 
 function getQueryOptions(chain?: Chain) {
   return {
-    queryKey: ["chain", chain?.id],
     enabled: !!chain,
+    queryKey: ["chain", chain?.id],
     staleTime: 1000 * 60 * 60, // 1 hour
   } as const;
 }
diff --git a/packages/thirdweb/src/react/core/hooks/others/useTokenInfo.ts b/packages/thirdweb/src/react/core/hooks/others/useTokenInfo.ts
index 1fea20e42b9..ff5d475d5fe 100644
--- a/packages/thirdweb/src/react/core/hooks/others/useTokenInfo.ts
+++ b/packages/thirdweb/src/react/core/hooks/others/useTokenInfo.ts
@@ -21,7 +21,7 @@ type GetTokenInfoResult = {
 export function useTokenInfo(options: GetTokenInfoOptions) {
   const { chain, tokenAddress, client } = options;
   return useQuery({
-    queryKey: ["tokenInfo", chain?.id || -1, { tokenAddress }] as const,
+    enabled: !!chain && !!client,
     queryFn: async () => {
       // erc20 case
       if (tokenAddress) {
@@ -29,7 +29,7 @@ export function useTokenInfo(options: GetTokenInfoOptions) {
           "../../../../extensions/erc20/read/getCurrencyMetadata.js"
         );
         const result: GetTokenInfoResult = await getCurrencyMetadata({
-          contract: getContract({ client, chain, address: tokenAddress }),
+          contract: getContract({ address: tokenAddress, chain, client }),
         });
 
         return result;
@@ -46,12 +46,12 @@ export function useTokenInfo(options: GetTokenInfoOptions) {
 
       const result: GetTokenInfoResult = {
         decimals: nativeDecimals,
-        symbol: nativeSymbol,
         name: nativeName,
+        symbol: nativeSymbol,
       };
 
       return result;
     },
-    enabled: !!chain && !!client,
+    queryKey: ["tokenInfo", chain?.id || -1, { tokenAddress }] as const,
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/others/useWalletBalance.test.tsx b/packages/thirdweb/src/react/core/hooks/others/useWalletBalance.test.tsx
index 264a194dad1..99a483bf3ac 100644
--- a/packages/thirdweb/src/react/core/hooks/others/useWalletBalance.test.tsx
+++ b/packages/thirdweb/src/react/core/hooks/others/useWalletBalance.test.tsx
@@ -22,40 +22,40 @@ const createWrapper = () => {
 describe.runIf(process.env.TW_SECRET_KEY)("useWalletBalance", () => {
   it("should return the correct balance for erc20", async () => {
     const erc20Address = await deployERC20Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
-      type: "TokenERC20",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "TokenERC20",
     });
     const erc20Contract = getContract({
+      address: erc20Address,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      address: erc20Address,
     });
 
     const amount = 1000;
 
     // Mint some tokens
     const tx = mintTo({
+      amount,
       contract: erc20Contract,
       to: TEST_ACCOUNT_A.address,
-      amount,
     });
 
     await sendAndConfirmTransaction({
-      transaction: tx,
       account: TEST_ACCOUNT_A,
+      transaction: tx,
     });
 
     const { result } = renderHook(
       () =>
         useWalletBalance({
-          chain: ANVIL_CHAIN,
           address: TEST_ACCOUNT_A.address,
+          chain: ANVIL_CHAIN,
           client: TEST_CLIENT,
           tokenAddress: erc20Address,
         }),
diff --git a/packages/thirdweb/src/react/core/hooks/others/useWalletBalance.ts b/packages/thirdweb/src/react/core/hooks/others/useWalletBalance.ts
index 90446c358b6..8fe84ff675a 100644
--- a/packages/thirdweb/src/react/core/hooks/others/useWalletBalance.ts
+++ b/packages/thirdweb/src/react/core/hooks/others/useWalletBalance.ts
@@ -62,12 +62,11 @@ export function useWalletBalance(
   const { chain, address, tokenAddress, client } = options;
   return useQuery({
     ...queryOptions,
-    queryKey: [
-      "walletBalance",
-      chain?.id || -1,
-      address || "0x0",
-      { tokenAddress },
-    ] as const,
+    enabled:
+      (queryOptions?.enabled === undefined || queryOptions.enabled) &&
+      !!chain &&
+      !!client &&
+      !!address,
     queryFn: async () => {
       if (!chain) {
         throw new Error("chain is required");
@@ -79,16 +78,17 @@ export function useWalletBalance(
         throw new Error("address is required");
       }
       return getWalletBalance({
+        address,
         chain,
         client,
-        address,
         tokenAddress,
       });
     },
-    enabled:
-      (queryOptions?.enabled === undefined || queryOptions.enabled) &&
-      !!chain &&
-      !!client &&
-      !!address,
+    queryKey: [
+      "walletBalance",
+      chain?.id || -1,
+      address || "0x0",
+      { tokenAddress },
+    ] as const,
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyHistory.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyHistory.ts
index 34abcc9ed8d..5afa9053f93 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/useBuyHistory.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/useBuyHistory.ts
@@ -43,13 +43,13 @@ export function useBuyHistory(
 ): UseQueryResult<BuyHistoryData> {
   return useQuery({
     ...queryParams,
-    queryKey: ["getBuyHistory", params],
+    enabled: !!params,
     queryFn: () => {
       if (!params) {
         throw new Error("params are required");
       }
       return getBuyHistory(params);
     },
-    enabled: !!params,
+    queryKey: ["getBuyHistory", params],
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoHistory.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoHistory.ts
index a363569e177..7c489ffd44b 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoHistory.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoHistory.ts
@@ -43,13 +43,13 @@ export function useBuyWithCryptoHistory(
 ): UseQueryResult<BuyWithCryptoHistoryData> {
   return useQuery({
     ...queryParams,
-    queryKey: ["getBuyWithCryptoHistory", params],
+    enabled: !!params,
     queryFn: () => {
       if (!params) {
         throw new Error("Swap params are required");
       }
       return getBuyWithCryptoHistory(params);
     },
-    enabled: !!params,
+    queryKey: ["getBuyWithCryptoHistory", params],
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoQuote.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoQuote.ts
index 5e79673dc8a..40541dfa3af 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoQuote.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoQuote.ts
@@ -80,8 +80,7 @@ export function useBuyWithCryptoQuote(
 ): UseQueryResult<BuyWithCryptoQuote> {
   return useQuery({
     ...queryParams,
-    queryKey: ["buyWithCryptoQuote", params],
-    refetchInterval: 20_000,
+    enabled: !!params,
     queryFn: () => {
       if (!params) {
         throw new Error("Swap params are required");
@@ -89,7 +88,8 @@ export function useBuyWithCryptoQuote(
 
       return getBuyWithCryptoQuote(params);
     },
-    enabled: !!params,
+    queryKey: ["buyWithCryptoQuote", params],
+    refetchInterval: 20_000,
     retry: false,
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoStatus.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoStatus.ts
index 4879bd84384..12c1aea3099 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoStatus.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoStatus.ts
@@ -57,14 +57,14 @@ import {
  */
 export function useBuyWithCryptoStatus(params?: BuyWithCryptoTransaction) {
   return useQuery<BuyWithCryptoStatus, Error>({
-    queryKey: ["getBuyWithCryptoStatus", params?.transactionHash] as const,
+    enabled: !!params,
     queryFn: async () => {
       if (!params) {
         throw new Error("No params");
       }
       return getBuyWithCryptoStatus(params);
     },
-    enabled: !!params,
+    queryKey: ["getBuyWithCryptoStatus", params?.transactionHash] as const,
     refetchInterval: (query) => {
       const status = (query.state.data as BuyWithCryptoStatus)?.status;
       if (status === "COMPLETED" || status === "FAILED") {
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatHistory.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatHistory.ts
index 292295c665e..cbabf0b0082 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatHistory.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatHistory.ts
@@ -43,13 +43,13 @@ export function useBuyWithFiatHistory(
 ): UseQueryResult<BuyWithFiatHistoryData> {
   return useQuery({
     ...queryParams,
-    queryKey: ["buyWithFiatHistory", params],
+    enabled: !!params,
     queryFn: () => {
       if (!params) {
         throw new Error("params are required");
       }
       return getBuyWithFiatHistory(params);
     },
-    enabled: !!params,
+    queryKey: ["buyWithFiatHistory", params],
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuote.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuote.ts
index 9594596c2c5..a893dc45a0a 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuote.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuote.ts
@@ -69,14 +69,14 @@ export function useBuyWithFiatQuote(
 ): UseQueryResult<BuyWithFiatQuote> {
   return useQuery({
     ...queryOptions,
-    queryKey: ["useBuyWithFiatQuote", params],
+    enabled: !!params,
     queryFn: async () => {
       if (!params) {
         throw new Error("No params provided");
       }
       return getBuyWithFiatQuote(params);
     },
-    enabled: !!params,
+    queryKey: ["useBuyWithFiatQuote", params],
     retry: false,
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuotesForProviders.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuotesForProviders.ts
index 77619e4c59b..5794662584c 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuotesForProviders.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuotesForProviders.ts
@@ -67,7 +67,7 @@ export function useBuyWithFiatQuotesForProviders(
   const queries = useQueries({
     queries: providers.map((provider) => ({
       ...queryOptions,
-      queryKey: ["onramp-prepare", provider, params],
+      enabled: !!params,
       queryFn: async () => {
         if (!params) {
           throw new Error("No params provided");
@@ -82,16 +82,16 @@ export function useBuyWithFiatQuotesForProviders(
         const amountWei = toUnits(params.amount, token.decimals);
 
         return prepareOnramp({
+          amount: amountWei,
+          chainId: params.chainId,
           client: params.client,
+          currency: params.currency || "USD",
           onramp: provider,
-          chainId: params.chainId,
-          tokenAddress: params.tokenAddress,
           receiver: params.receiver,
-          amount: amountWei,
-          currency: params.currency || "USD",
+          tokenAddress: params.tokenAddress,
         });
       },
-      enabled: !!params,
+      queryKey: ["onramp-prepare", provider, params],
       retry: false,
     })),
   });
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatStatus.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatStatus.ts
index d89c0181482..3783ab39f1e 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatStatus.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatStatus.ts
@@ -39,14 +39,14 @@ export function useBuyWithFiatStatus(
   params?: WithPickedOnceQueryOptions<GetBuyWithFiatStatusParams>,
 ): UseQueryResult<BuyWithFiatStatus> {
   return useQuery({
-    queryKey: ["useBuyWithFiatStatus", params],
+    enabled: !!params,
     queryFn: async () => {
       if (!params) {
         throw new Error("No params provided");
       }
       return getBuyWithFiatStatus(params);
     },
-    enabled: !!params,
+    queryKey: ["useBuyWithFiatStatus", params],
     refetchInterval: (query) => {
       const data = query.state.data as BuyWithFiatStatus;
       const status = data?.status;
diff --git a/packages/thirdweb/src/react/core/hooks/pay/usePostOnrampQuote.ts b/packages/thirdweb/src/react/core/hooks/pay/usePostOnrampQuote.ts
index 26914458cb1..0ec22f19300 100644
--- a/packages/thirdweb/src/react/core/hooks/pay/usePostOnrampQuote.ts
+++ b/packages/thirdweb/src/react/core/hooks/pay/usePostOnrampQuote.ts
@@ -40,13 +40,13 @@ export function usePostOnRampQuote(
 ): UseQueryResult<BuyWithCryptoQuote> {
   return useQuery({
     ...queryOptions,
-    queryKey: ["getPostOnRampQuote", params],
+    enabled: !!params,
     queryFn: async () => {
       if (!params) {
         throw new Error("No params provided");
       }
       return getPostOnRampQuote(params);
     },
-    enabled: !!params,
+    queryKey: ["getPostOnRampQuote", params],
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/rpc/useBlockNumber.ts b/packages/thirdweb/src/react/core/hooks/rpc/useBlockNumber.ts
index eb469df8ad1..0c833a7ea59 100644
--- a/packages/thirdweb/src/react/core/hooks/rpc/useBlockNumber.ts
+++ b/packages/thirdweb/src/react/core/hooks/rpc/useBlockNumber.ts
@@ -31,14 +31,14 @@ export function useBlockNumber(options: UseBlockNumberOptions) {
 
   const queryKey = useMemo(() => [chain.id, "blockNumber"] as const, [chain]);
   const query = useQuery({
-    // TODO: technically client should be part of the queryKey here...
-
-    queryKey: queryKey,
+    enabled,
     queryFn: async () => {
-      const rpcRequest = getRpcClient({ client, chain });
+      const rpcRequest = getRpcClient({ chain, client });
       return await eth_blockNumber(rpcRequest);
     },
-    enabled,
+    // TODO: technically client should be part of the queryKey here...
+
+    queryKey: queryKey,
   });
 
   useEffect(() => {
@@ -47,8 +47,8 @@ export function useBlockNumber(options: UseBlockNumberOptions) {
       return;
     }
     return watchBlockNumber({
-      client,
       chain,
+      client,
       onNewBlockNumber: (newBlockNumber) => {
         queryClient.setQueryData(queryKey, newBlockNumber);
       },
diff --git a/packages/thirdweb/src/react/core/hooks/transaction/useEstimateGas.ts b/packages/thirdweb/src/react/core/hooks/transaction/useEstimateGas.ts
index 9cb29eb4444..38abd60db71 100644
--- a/packages/thirdweb/src/react/core/hooks/transaction/useEstimateGas.ts
+++ b/packages/thirdweb/src/react/core/hooks/transaction/useEstimateGas.ts
@@ -26,6 +26,6 @@ export function useEstimateGas(): UseMutationResult<
 > {
   const account = useActiveAccount();
   return useMutation({
-    mutationFn: (transaction) => estimateGas({ transaction, account }),
+    mutationFn: (transaction) => estimateGas({ account, transaction }),
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/transaction/useEstimateGasCost.ts b/packages/thirdweb/src/react/core/hooks/transaction/useEstimateGasCost.ts
index bb2e160b9bc..6e0e64b8967 100644
--- a/packages/thirdweb/src/react/core/hooks/transaction/useEstimateGasCost.ts
+++ b/packages/thirdweb/src/react/core/hooks/transaction/useEstimateGasCost.ts
@@ -27,6 +27,6 @@ export function useEstimateGasCost(): UseMutationResult<
 > {
   const account = useActiveAccount();
   return useMutation({
-    mutationFn: (transaction) => estimateGasCost({ transaction, account }),
+    mutationFn: (transaction) => estimateGasCost({ account, transaction }),
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/transaction/useSendAndConfirmTransaction.ts b/packages/thirdweb/src/react/core/hooks/transaction/useSendAndConfirmTransaction.ts
index e337ddf4d4f..59632720ff7 100644
--- a/packages/thirdweb/src/react/core/hooks/transaction/useSendAndConfirmTransaction.ts
+++ b/packages/thirdweb/src/react/core/hooks/transaction/useSendAndConfirmTransaction.ts
@@ -65,9 +65,9 @@ export function useSendAndConfirmTransaction(
         throw new Error("No active account");
       }
       return await sendAndConfirmTransaction({
-        transaction,
         account,
         gasless,
+        transaction,
       });
     },
   });
diff --git a/packages/thirdweb/src/react/core/hooks/transaction/useSendBatchTransaction.ts b/packages/thirdweb/src/react/core/hooks/transaction/useSendBatchTransaction.ts
index 6d0f9011e61..bc9ce27ed1e 100644
--- a/packages/thirdweb/src/react/core/hooks/transaction/useSendBatchTransaction.ts
+++ b/packages/thirdweb/src/react/core/hooks/transaction/useSendBatchTransaction.ts
@@ -29,8 +29,8 @@ export function useSendBatchTransaction(): UseMutationResult<
         throw new Error("No active account");
       }
       return await sendBatchTransaction({
-        transactions,
         account,
+        transactions,
       });
     },
   });
diff --git a/packages/thirdweb/src/react/core/hooks/transaction/useSendTransaction.ts b/packages/thirdweb/src/react/core/hooks/transaction/useSendTransaction.ts
index 8498ec5ff31..256fc30f045 100644
--- a/packages/thirdweb/src/react/core/hooks/transaction/useSendTransaction.ts
+++ b/packages/thirdweb/src/react/core/hooks/transaction/useSendTransaction.ts
@@ -152,16 +152,16 @@ export function useSendTransactionCore(args: {
 
       if (!showPayModal) {
         trackPayEvent({
+          chainId: tx.chain.id,
           client: tx.client,
+          event: "pay_transaction_modal_disabled",
           walletAddress: account.address,
           walletType: wallet?.id,
-          chainId: tx.chain.id,
-          event: "pay_transaction_modal_disabled",
         });
         return sendTransaction({
-          transaction: tx,
           account,
           gasless,
+          transaction: tx,
         });
       }
 
@@ -169,9 +169,9 @@ export function useSendTransactionCore(args: {
         const sendTx = async () => {
           try {
             const res = await sendTransaction({
-              transaction: tx,
               account,
               gasless,
+              transaction: tx,
             });
 
             resolve(res);
@@ -179,12 +179,12 @@ export function useSendTransactionCore(args: {
             // Track insufficient funds errors specifically
             if (isInsufficientFundsError(e)) {
               trackInsufficientFundsError({
-                client: tx.client,
-                error: e,
-                walletAddress: account.address,
                 chainId: tx.chain.id,
+                client: tx.client,
                 contractAddress: await resolvePromisedValue(tx.to ?? undefined),
+                error: e,
                 transactionValue: await resolvePromisedValue(tx.value),
+                walletAddress: account.address,
               });
             }
 
@@ -204,15 +204,15 @@ export function useSendTransactionCore(args: {
 
             const [nativeBalance, erc20Balance, gasCost] = await Promise.all([
               getWalletBalance({
-                client: tx.client,
                 address: account.address,
                 chain: tx.chain,
+                client: tx.client,
               }),
               _erc20Value?.tokenAddress
                 ? getTokenBalance({
-                    client: tx.client,
                     account,
                     chain: tx.chain,
+                    client: tx.client,
                     tokenAddress: _erc20Value.tokenAddress,
                   })
                 : undefined,
@@ -237,11 +237,11 @@ export function useSendTransactionCore(args: {
               }).catch((err) => {
                 trackPayEvent({
                   client: tx.client,
+                  error: err?.message,
+                  event: "pay_transaction_modal_pay_api_error",
+                  toChainId: tx.chain.id,
                   walletAddress: account.address,
                   walletType: wallet?.id,
-                  toChainId: tx.chain.id,
-                  event: "pay_transaction_modal_pay_api_error",
-                  error: err?.message,
                 });
                 return null;
               });
@@ -253,24 +253,24 @@ export function useSendTransactionCore(args: {
                 // not a supported destination -> show deposit screen
                 trackPayEvent({
                   client: tx.client,
-                  walletAddress: account.address,
-                  walletType: wallet?.id,
-                  toChainId: tx.chain.id,
-                  toToken: _erc20Value?.tokenAddress || undefined,
-                  event: "pay_transaction_modal_chain_token_not_supported",
                   error: JSON.stringify({
                     chain: tx.chain.id,
-                    token: _erc20Value?.tokenAddress,
                     message: "chain/token not supported",
+                    token: _erc20Value?.tokenAddress,
                   }),
+                  event: "pay_transaction_modal_chain_token_not_supported",
+                  toChainId: tx.chain.id,
+                  toToken: _erc20Value?.tokenAddress || undefined,
+                  walletAddress: account.address,
+                  walletType: wallet?.id,
                 });
 
                 showPayModal({
                   mode: "deposit",
-                  tx,
-                  sendTx,
                   rejectTx: reject,
                   resolveTx: resolve,
+                  sendTx,
+                  tx,
                 });
                 return;
               }
@@ -278,19 +278,19 @@ export function useSendTransactionCore(args: {
               // chain is supported, show buy mode
               showPayModal({
                 mode: "buy",
-                tx,
-                sendTx,
                 rejectTx: reject,
                 resolveTx: resolve,
+                sendTx,
+                tx,
               });
             } else {
               trackPayEvent({
                 client: tx.client,
-                walletAddress: account.address,
-                walletType: wallet?.id,
+                event: "pay_transaction_modal_has_enough_funds",
                 toChainId: tx.chain.id,
                 toToken: _erc20Value?.tokenAddress || undefined,
-                event: "pay_transaction_modal_has_enough_funds",
+                walletAddress: account.address,
+                walletType: wallet?.id,
               });
               sendTx();
             }
diff --git a/packages/thirdweb/src/react/core/hooks/useBridgeError.ts b/packages/thirdweb/src/react/core/hooks/useBridgeError.ts
index ea4b7751648..e17ac144d6c 100644
--- a/packages/thirdweb/src/react/core/hooks/useBridgeError.ts
+++ b/packages/thirdweb/src/react/core/hooks/useBridgeError.ts
@@ -85,13 +85,13 @@ export function useBridgeError(
   // No error case
   if (!error) {
     return {
-      mappedError: null,
-      isRetryable: false,
-      userMessage: "",
       errorCode: null,
-      statusCode: null,
       isClientError: false,
+      isRetryable: false,
       isServerError: false,
+      mappedError: null,
+      statusCode: null,
+      userMessage: "",
     };
   }
 
@@ -117,13 +117,13 @@ export function useBridgeError(
   const userMessage = getUserFriendlyMessage(apiError);
 
   return {
-    mappedError: apiError,
-    isRetryable: isRetryable(apiError.code),
-    userMessage,
     errorCode: apiError.code,
-    statusCode,
     isClientError,
+    isRetryable: isRetryable(apiError.code),
     isServerError,
+    mappedError: apiError,
+    statusCode,
+    userMessage,
   };
 }
 
diff --git a/packages/thirdweb/src/react/core/hooks/useBridgePrepare.test.ts b/packages/thirdweb/src/react/core/hooks/useBridgePrepare.test.ts
index 5293e528879..0426d8f3ba8 100644
--- a/packages/thirdweb/src/react/core/hooks/useBridgePrepare.test.ts
+++ b/packages/thirdweb/src/react/core/hooks/useBridgePrepare.test.ts
@@ -15,15 +15,15 @@ describe("useBridgePrepare", () => {
 
   it("should have correct type structure for buy prepare request", () => {
     const buyRequest: BridgePrepareRequest = {
-      type: "buy",
+      amount: 1000000n,
       client: mockClient,
-      originChainId: 1,
-      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       destinationChainId: 137,
       destinationTokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-      amount: 1000000n,
-      sender: "0x1234567890123456789012345678901234567890",
+      originChainId: 1,
+      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       receiver: "0x1234567890123456789012345678901234567890",
+      sender: "0x1234567890123456789012345678901234567890",
+      type: "buy",
     };
 
     expect(buyRequest.type).toBe("buy");
@@ -33,13 +33,13 @@ describe("useBridgePrepare", () => {
 
   it("should have correct type structure for transfer prepare request", () => {
     const transferRequest: BridgePrepareRequest = {
-      type: "transfer",
-      client: mockClient,
-      chainId: 1,
-      tokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       amount: 1000000n,
-      sender: "0x1234567890123456789012345678901234567890",
+      chainId: 1,
+      client: mockClient,
       receiver: "0x1234567890123456789012345678901234567890",
+      sender: "0x1234567890123456789012345678901234567890",
+      tokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      type: "transfer",
     };
 
     expect(transferRequest.type).toBe("transfer");
@@ -49,15 +49,15 @@ describe("useBridgePrepare", () => {
 
   it("should have correct type structure for sell prepare request", () => {
     const sellRequest: BridgePrepareRequest = {
-      type: "sell",
+      amount: 1000000n,
       client: mockClient,
-      originChainId: 1,
-      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       destinationChainId: 137,
       destinationTokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-      amount: 1000000n,
-      sender: "0x1234567890123456789012345678901234567890",
+      originChainId: 1,
+      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       receiver: "0x1234567890123456789012345678901234567890",
+      sender: "0x1234567890123456789012345678901234567890",
+      type: "sell",
     };
 
     expect(sellRequest.type).toBe("sell");
@@ -67,13 +67,13 @@ describe("useBridgePrepare", () => {
 
   it("should have correct type structure for onramp prepare request", () => {
     const onrampRequest: BridgePrepareRequest = {
-      type: "onramp",
+      amount: 1000000n,
+      chainId: 137,
       client: mockClient,
       onramp: "stripe",
-      chainId: 137,
-      tokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
       receiver: "0x1234567890123456789012345678901234567890",
-      amount: 1000000n,
+      tokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+      type: "onramp",
     };
 
     expect(onrampRequest.type).toBe("onramp");
@@ -83,16 +83,16 @@ describe("useBridgePrepare", () => {
 
   it("should handle UseBridgePrepareParams with enabled option", () => {
     const params: UseBridgePrepareParams = {
-      type: "buy",
+      amount: 1000000n,
       client: mockClient,
-      originChainId: 1,
-      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       destinationChainId: 137,
       destinationTokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-      amount: 1000000n,
-      sender: "0x1234567890123456789012345678901234567890",
-      receiver: "0x1234567890123456789012345678901234567890",
       enabled: false,
+      originChainId: 1,
+      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      receiver: "0x1234567890123456789012345678901234567890",
+      sender: "0x1234567890123456789012345678901234567890",
+      type: "buy",
     };
 
     expect(params.enabled).toBe(false);
@@ -101,13 +101,13 @@ describe("useBridgePrepare", () => {
 
   it("should have optional enabled parameter", () => {
     const paramsWithoutEnabled: UseBridgePrepareParams = {
-      type: "transfer",
-      client: mockClient,
-      chainId: 1,
-      tokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       amount: 1000000n,
-      sender: "0x1234567890123456789012345678901234567890",
+      chainId: 1,
+      client: mockClient,
       receiver: "0x1234567890123456789012345678901234567890",
+      sender: "0x1234567890123456789012345678901234567890",
+      tokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      type: "transfer",
     };
 
     expect(paramsWithoutEnabled.enabled).toBeUndefined(); // Should be optional
@@ -116,15 +116,15 @@ describe("useBridgePrepare", () => {
 
   it("should correctly discriminate between different prepare request types", () => {
     const buyRequest: BridgePrepareRequest = {
-      type: "buy",
+      amount: 1000000n,
       client: mockClient,
-      originChainId: 1,
-      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       destinationChainId: 137,
       destinationTokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-      amount: 1000000n,
-      sender: "0x1234567890123456789012345678901234567890",
+      originChainId: 1,
+      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       receiver: "0x1234567890123456789012345678901234567890",
+      sender: "0x1234567890123456789012345678901234567890",
+      type: "buy",
     };
 
     // Type narrowing should work
@@ -138,13 +138,13 @@ describe("useBridgePrepare", () => {
     }
 
     const onrampRequest: BridgePrepareRequest = {
-      type: "onramp",
+      amount: 1000000n,
+      chainId: 137,
       client: mockClient,
       onramp: "stripe",
-      chainId: 137,
-      tokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
       receiver: "0x1234567890123456789012345678901234567890",
-      amount: 1000000n,
+      tokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+      type: "onramp",
     };
 
     // Type narrowing should work for onramp
diff --git a/packages/thirdweb/src/react/core/hooks/useBridgePrepare.ts b/packages/thirdweb/src/react/core/hooks/useBridgePrepare.ts
index 8ee3c592871..fb718341274 100644
--- a/packages/thirdweb/src/react/core/hooks/useBridgePrepare.ts
+++ b/packages/thirdweb/src/react/core/hooks/useBridgePrepare.ts
@@ -1,9 +1,9 @@
 import { useQuery } from "@tanstack/react-query";
 import type { prepare as BuyPrepare } from "../../../bridge/Buy.js";
+import * as Bridge from "../../../bridge/index.js";
 import type { prepare as OnrampPrepare } from "../../../bridge/Onramp.js";
 import type { prepare as SellPrepare } from "../../../bridge/Sell.js";
 import type { prepare as TransferPrepare } from "../../../bridge/Transfer.js";
-import * as Bridge from "../../../bridge/index.js";
 import { ApiError } from "../../../bridge/types/Errors.js";
 import { stringify } from "../../../utils/json.js";
 import { mapBridgeError } from "../errors/mapBridgeError.js";
@@ -76,7 +76,8 @@ export function useBridgePrepare(params: UseBridgePrepareParams) {
   const { enabled = true, type, ...prepareParams } = params;
 
   return useQuery({
-    queryKey: ["bridge-prepare", type, stringify(prepareParams)],
+    enabled: enabled && !!prepareParams.client,
+    gcTime: 5 * 60 * 1000,
     queryFn: async (): Promise<BridgePrepareResult> => {
       switch (type) {
         case "buy": {
@@ -107,9 +108,7 @@ export function useBridgePrepare(params: UseBridgePrepareParams) {
           throw new Error(`Unsupported bridge prepare type: ${type}`);
       }
     },
-    enabled: enabled && !!prepareParams.client,
-    staleTime: 2 * 60 * 1000, // 2 minutes - prepared quotes have shorter validity
-    gcTime: 5 * 60 * 1000, // 5 minutes garbage collection
+    queryKey: ["bridge-prepare", type, stringify(prepareParams)], // 2 minutes - prepared quotes have shorter validity
     retry: (failureCount, error) => {
       // Handle both ApiError and generic Error instances
       if (error instanceof ApiError) {
@@ -127,7 +126,8 @@ export function useBridgePrepare(params: UseBridgePrepareParams) {
 
       // Retry up to 2 times for prepared quotes (they're more time-sensitive)
       return failureCount < 2;
-    },
-    retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 10000), // Exponential backoff, max 10s
+    }, // 5 minutes garbage collection
+    retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 10000),
+    staleTime: 2 * 60 * 1000, // Exponential backoff, max 10s
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/useBridgeQuote.ts b/packages/thirdweb/src/react/core/hooks/useBridgeQuote.ts
index 5d1661e7a55..5a0a1b8ac9f 100644
--- a/packages/thirdweb/src/react/core/hooks/useBridgeQuote.ts
+++ b/packages/thirdweb/src/react/core/hooks/useBridgeQuote.ts
@@ -22,14 +22,8 @@ export function useBridgeQuote({
   enabled = true,
 }: UseBridgeQuoteParams) {
   return useQuery({
-    queryKey: [
-      "bridge-quote",
-      originToken.chainId,
-      originToken.address,
-      destinationToken.chainId,
-      destinationToken.address,
-      destinationAmount.toString(),
-    ],
+    enabled:
+      enabled && !!originToken && !!destinationToken && !!destinationAmount,
     queryFn: async () => {
       // if ssame token and chain, use transfer
       if (
@@ -38,30 +32,36 @@ export function useBridgeQuote({
         originToken.chainId === destinationToken.chainId
       ) {
         const transfer = await Transfer.prepare({
-          client,
+          amount: destinationAmount,
           chainId: originToken.chainId,
-          tokenAddress: originToken.address,
-          sender: originToken.address,
+          client,
           receiver: destinationToken.address,
-          amount: destinationAmount,
+          sender: originToken.address,
+          tokenAddress: originToken.address,
         });
         return transfer;
       }
       const quote = await Buy.quote({
-        originChainId: originToken.chainId,
-        originTokenAddress: originToken.address,
-        destinationChainId: destinationToken.chainId,
-        destinationTokenAddress: destinationToken.address,
         amount: destinationAmount,
         client,
+        destinationChainId: destinationToken.chainId,
+        destinationTokenAddress: destinationToken.address,
+        originChainId: originToken.chainId,
+        originTokenAddress: originToken.address,
       });
 
       return quote;
     },
-    enabled:
-      enabled && !!originToken && !!destinationToken && !!destinationAmount,
-    staleTime: 30000, // 30 seconds
-    refetchInterval: 60000, // 1 minute
-    retry: 3,
+    queryKey: [
+      "bridge-quote",
+      originToken.chainId,
+      originToken.address,
+      destinationToken.chainId,
+      destinationToken.address,
+      destinationAmount.toString(),
+    ],
+    refetchInterval: 60000, // 30 seconds
+    retry: 3, // 1 minute
+    staleTime: 30000,
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/useBridgeRoutes.test.ts b/packages/thirdweb/src/react/core/hooks/useBridgeRoutes.test.ts
index 8a539cbe9ee..9839a935d7b 100644
--- a/packages/thirdweb/src/react/core/hooks/useBridgeRoutes.test.ts
+++ b/packages/thirdweb/src/react/core/hooks/useBridgeRoutes.test.ts
@@ -1,9 +1,9 @@
 import {
-  type MockedFunction,
   beforeEach,
   describe,
   expect,
   it,
+  type MockedFunction,
   vi,
 } from "vitest";
 import { routes } from "../../../bridge/Routes.js";
@@ -25,21 +25,21 @@ const mockClient = { clientId: "test" } as ThirdwebClient;
 // Mock route data
 const mockRouteData: Route[] = [
   {
-    originToken: {
-      chainId: 1,
-      address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      symbol: "ETH",
-      name: "Ethereum",
-      decimals: 18,
-      priceUsd: 2000.0,
-    },
     destinationToken: {
-      chainId: 137,
       address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
-      symbol: "WETH",
+      chainId: 137,
+      decimals: 18,
       name: "Wrapped Ethereum",
+      priceUsd: 2000.0,
+      symbol: "WETH",
+    },
+    originToken: {
+      address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      chainId: 1,
       decimals: 18,
+      name: "Ethereum",
       priceUsd: 2000.0,
+      symbol: "ETH",
     },
   },
 ];
@@ -53,9 +53,9 @@ describe("useBridgeRoutes", () => {
     // Type-only test to verify UseBridgeRoutesParams interface
     const params: UseBridgeRoutesParams = {
       client: mockClient,
-      originChainId: 1,
       destinationChainId: 137,
       enabled: true,
+      originChainId: 1,
     };
 
     expect(params).toBeDefined();
@@ -68,15 +68,15 @@ describe("useBridgeRoutes", () => {
   it("should handle different parameter combinations", () => {
     const fullParams: UseBridgeRoutesParams = {
       client: mockClient,
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       destinationChainId: 137,
       destinationTokenAddress: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
-      maxSteps: 3,
-      sortBy: "popularity",
+      enabled: false,
       limit: 10,
+      maxSteps: 3,
       offset: 0,
-      enabled: false,
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      sortBy: "popularity",
     };
 
     expect(fullParams).toBeDefined();
@@ -89,8 +89,8 @@ describe("useBridgeRoutes", () => {
   it("should have optional enabled parameter defaulting to true", () => {
     const paramsWithoutEnabled: UseBridgeRoutesParams = {
       client: mockClient,
-      originChainId: 1,
       destinationChainId: 137,
+      originChainId: 1,
     };
 
     expect(paramsWithoutEnabled.enabled).toBeUndefined(); // Should be optional
@@ -99,8 +99,8 @@ describe("useBridgeRoutes", () => {
   it("should validate that Bridge.routes would be called with correct parameters", async () => {
     const testParams = {
       client: mockClient,
-      originChainId: 1,
       destinationChainId: 137,
+      originChainId: 1,
       originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE" as const,
     };
 
@@ -126,8 +126,8 @@ describe("useBridgeRoutes", () => {
     try {
       await routes({
         client: mockClient,
-        originChainId: 1,
         destinationChainId: 137,
+        originChainId: 1,
       });
     } catch (error) {
       expect(error).toBe(apiError);
diff --git a/packages/thirdweb/src/react/core/hooks/useBridgeRoutes.ts b/packages/thirdweb/src/react/core/hooks/useBridgeRoutes.ts
index 39eddea54f8..f9f4ddbb14b 100644
--- a/packages/thirdweb/src/react/core/hooks/useBridgeRoutes.ts
+++ b/packages/thirdweb/src/react/core/hooks/useBridgeRoutes.ts
@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
-import { routes } from "../../../bridge/Routes.js";
 import type { routes as RoutesTypes } from "../../../bridge/Routes.js";
+import { routes } from "../../../bridge/Routes.js";
 import { ApiError } from "../../../bridge/types/Errors.js";
 import { mapBridgeError } from "../errors/mapBridgeError.js";
 
@@ -35,23 +35,22 @@ export function useBridgeRoutes(params: UseBridgeRoutesParams) {
   const { enabled = true, ...routeParams } = params;
 
   return useQuery({
+    enabled: enabled && !!routeParams.client,
+    gcTime: 10 * 60 * 1000,
+    queryFn: () => routes(routeParams),
     queryKey: [
       "bridge-routes",
       {
-        originChainId: routeParams.originChainId,
-        originTokenAddress: routeParams.originTokenAddress,
         destinationChainId: routeParams.destinationChainId,
         destinationTokenAddress: routeParams.destinationTokenAddress,
-        maxSteps: routeParams.maxSteps,
-        sortBy: routeParams.sortBy,
         limit: routeParams.limit,
+        maxSteps: routeParams.maxSteps,
         offset: routeParams.offset,
+        originChainId: routeParams.originChainId,
+        originTokenAddress: routeParams.originTokenAddress,
+        sortBy: routeParams.sortBy,
       },
-    ],
-    queryFn: () => routes(routeParams),
-    enabled: enabled && !!routeParams.client,
-    staleTime: 5 * 60 * 1000, // 5 minutes - routes are relatively stable
-    gcTime: 10 * 60 * 1000, // 10 minutes garbage collection
+    ], // 5 minutes - routes are relatively stable
     retry: (failureCount, error) => {
       // Handle both ApiError and generic Error instances
       if (error instanceof ApiError) {
@@ -69,7 +68,8 @@ export function useBridgeRoutes(params: UseBridgeRoutesParams) {
 
       // Retry up to 3 times for server errors or network issues
       return failureCount < 3;
-    },
-    retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000), // Exponential backoff, max 30s
+    }, // 10 minutes garbage collection
+    retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000),
+    staleTime: 5 * 60 * 1000, // Exponential backoff, max 30s
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/usePaymentMethods.ts b/packages/thirdweb/src/react/core/hooks/usePaymentMethods.ts
index 1083259071a..ab56413430a 100644
--- a/packages/thirdweb/src/react/core/hooks/usePaymentMethods.ts
+++ b/packages/thirdweb/src/react/core/hooks/usePaymentMethods.ts
@@ -51,14 +51,7 @@ export function usePaymentMethods(options: {
   const wallet = payerWallet || localWallet;
 
   const routesQuery = useQuery({
-    queryKey: [
-      "bridge-routes",
-      destinationToken.chainId,
-      destinationToken.address,
-      destinationAmount,
-      payerWallet?.getAccount()?.address,
-      includeDestinationToken,
-    ],
+    enabled: !!wallet,
     queryFn: async (): Promise<PaymentMethod[]> => {
       if (!wallet) {
         throw new Error("No wallet connected");
@@ -67,10 +60,10 @@ export function usePaymentMethods(options: {
         client,
         destinationChainId: destinationToken.chainId,
         destinationTokenAddress: destinationToken.address,
-        sortBy: "popularity",
         includePrices: true,
+        limit: 100,
         maxSteps: 3,
-        limit: 100, // Get top 100 most popular routes
+        sortBy: "popularity", // Get top 100 most popular routes
       });
 
       const allOriginTokens = includeDestinationToken
@@ -98,13 +91,13 @@ export function usePaymentMethods(options: {
 
       while (true) {
         const batch = await getOwnedTokens({
-          ownerAddress: wallet.getAccount()?.address || "",
           chains: insightEnabledChains.map((c) => c.chain),
           client,
+          ownerAddress: wallet.getAccount()?.address || "",
           queryOptions: {
             limit,
-            page,
             metadata: "false",
+            page,
           },
         });
 
@@ -115,13 +108,13 @@ export function usePaymentMethods(options: {
         // find matching origin token in allRoutes
         const tokensWithBalance = batch
           .map((b) => ({
+            balance: b.value,
+            originAmount: 0n,
             originToken: allOriginTokens.find(
               (t) =>
                 t.address.toLowerCase() === b.tokenAddress.toLowerCase() &&
                 t.chainId === b.chainId,
             ),
-            balance: b.value,
-            originAmount: 0n,
           }))
           .filter((t) => !!t.originToken) as OwnedTokenWithQuote[];
 
@@ -179,24 +172,31 @@ export function usePaymentMethods(options: {
 
       const transformedRoutes = [
         ...suitableOriginTokens.map((s) => ({
-          type: "wallet" as const,
-          payerWallet: wallet,
-          originToken: s.originToken,
           balance: s.balance,
+          originToken: s.originToken,
+          payerWallet: wallet,
+          type: "wallet" as const,
         })),
       ];
       return transformedRoutes;
     },
-    staleTime: 5 * 60 * 1000, // 5 minutes
+    queryKey: [
+      "bridge-routes",
+      destinationToken.chainId,
+      destinationToken.address,
+      destinationAmount,
+      payerWallet?.getAccount()?.address,
+      includeDestinationToken,
+    ], // 5 minutes
     refetchOnWindowFocus: false,
-    enabled: !!wallet,
+    staleTime: 5 * 60 * 1000,
   });
 
   return {
     data: routesQuery.data || [],
-    isLoading: routesQuery.isLoading,
     error: routesQuery.error,
     isError: routesQuery.isError,
+    isLoading: routesQuery.isLoading,
     isSuccess: routesQuery.isSuccess,
     refetch: routesQuery.refetch,
   };
diff --git a/packages/thirdweb/src/react/core/hooks/useStepExecutor.ts b/packages/thirdweb/src/react/core/hooks/useStepExecutor.ts
index fe6e1825cc0..53bad596148 100644
--- a/packages/thirdweb/src/react/core/hooks/useStepExecutor.ts
+++ b/packages/thirdweb/src/react/core/hooks/useStepExecutor.ts
@@ -130,11 +130,6 @@ export function useStepExecutor(
   >(preparedQuote?.type === "onramp" ? "pending" : undefined);
 
   useQuery({
-    queryKey: [
-      "bridge-quote-execution-state",
-      stringify(preparedQuote?.steps),
-      isLoading,
-    ],
     queryFn: async () => {
       if (!isLoading) {
         setExecutionState("idle");
@@ -143,6 +138,11 @@ export function useStepExecutor(
       }
       return executionState;
     },
+    queryKey: [
+      "bridge-quote-execution-state",
+      stringify(preparedQuote?.steps),
+      isLoading,
+    ],
   });
 
   // Cancellation tracking
@@ -222,8 +222,8 @@ export function useStepExecutor(
       const preparedTx = prepareTransaction({
         chain: tx.chain,
         client: tx.client,
-        to: tx.to,
         data: tx.data,
+        to: tx.to,
         value: tx.value,
       });
 
@@ -244,9 +244,9 @@ export function useStepExecutor(
       const { status } = await import("../../../bridge/Status.js");
       await poller(async () => {
         const statusResult = await status({
-          transactionHash: hash,
           chainId: tx.chainId,
           client: tx.client,
+          transactionHash: hash,
         });
 
         if (statusResult.status === "COMPLETED") {
@@ -297,8 +297,8 @@ export function useStepExecutor(
           const preparedTx = prepareTransaction({
             chain: tx.chain,
             client: tx.client,
-            to: tx.to,
             data: tx.data,
+            to: tx.to,
             value: tx.value,
           });
           return preparedTx;
@@ -325,9 +325,9 @@ export function useStepExecutor(
       const { status } = await import("../../../bridge/Status.js");
       await poller(async () => {
         const statusResult = await status({
-          transactionHash: result.transactionHash,
           chainId: firstTx.chainId,
           client: firstTx.client,
+          transactionHash: result.transactionHash,
         });
 
         if (statusResult.status === "COMPLETED") {
@@ -365,8 +365,8 @@ export function useStepExecutor(
       const { Onramp } = await import("../../../bridge/index.js");
       await poller(async () => {
         const statusResult = await Onramp.status({
-          id: onrampQuote.id,
           client: client,
+          id: onrampQuote.id,
         });
 
         const status = statusResult.status;
@@ -592,15 +592,15 @@ export function useStepExecutor(
   }, []);
 
   return {
+    cancel,
     currentStep,
     currentTxIndex,
-    progress,
+    error,
     executionState,
-    steps: preparedQuote?.steps,
     onrampStatus,
-    error,
-    start,
-    cancel,
+    progress,
     retry,
+    start,
+    steps: preparedQuote?.steps,
   };
 }
diff --git a/packages/thirdweb/src/react/core/hooks/useTransactionDetails.ts b/packages/thirdweb/src/react/core/hooks/useTransactionDetails.ts
index 50b1fef70d0..472a6c853b2 100644
--- a/packages/thirdweb/src/react/core/hooks/useTransactionDetails.ts
+++ b/packages/thirdweb/src/react/core/hooks/useTransactionDetails.ts
@@ -53,18 +53,13 @@ export function useTransactionDetails({
   const chainMetadata = useChainMetadata(transaction.chain);
 
   return useQuery({
-    queryKey: [
-      "transaction-details",
-      transaction.to,
-      transaction.chain.id,
-      transaction.erc20Value?.toString(),
-    ],
+    enabled: !!transaction.to && !!chainMetadata.data,
     queryFn: async (): Promise<TransactionDetails> => {
       // Create contract instance for metadata fetching
       const contract = getContract({
-        client,
-        chain: transaction.chain,
         address: transaction.to as string,
+        chain: transaction.chain,
+        client,
       });
 
       const [contractMetadata, value, erc20Value, transactionData] =
@@ -86,9 +81,9 @@ export function useTransactionDetails({
 
       // Process function info from ABI if available
       let functionInfo = {
+        description: undefined,
         functionName: "Contract Call",
         selector: "0x",
-        description: undefined,
       };
 
       if (contractMetadata?.abi && transactionData.length >= 10) {
@@ -114,9 +109,9 @@ export function useTransactionDetails({
 
           if (matchingFunction) {
             functionInfo = {
+              description: undefined,
               functionName: matchingFunction.name,
-              selector,
-              description: undefined, // Skip devdoc for now
+              selector, // Skip devdoc for now
             };
           }
         } catch {
@@ -131,9 +126,9 @@ export function useTransactionDetails({
         if (erc20Value) {
           return decimals({
             contract: getContract({
-              client,
-              chain: transaction.chain,
               address: erc20Value.tokenAddress,
+              chain: transaction.chain,
+              client,
             }),
           });
         }
@@ -157,21 +152,26 @@ export function useTransactionDetails({
 
       return {
         contractMetadata,
+        costWei,
         functionInfo,
-        usdValueDisplay: usdValue
-          ? formatCurrencyAmount("USD", usdValue)
-          : null,
-        txCostDisplay: `${formatTokenAmount(costWei, decimal)} ${tokenSymbol}`,
         gasCostDisplay: gasCostWei
           ? `${formatTokenAmount(gasCostWei, 18)} ${nativeTokenSymbol}`
           : null,
-        tokenInfo,
-        costWei,
         gasCostWei,
+        tokenInfo,
         totalCost,
         totalCostWei,
+        txCostDisplay: `${formatTokenAmount(costWei, decimal)} ${tokenSymbol}`,
+        usdValueDisplay: usdValue
+          ? formatCurrencyAmount("USD", usdValue)
+          : null,
       };
     },
-    enabled: !!transaction.to && !!chainMetadata.data,
+    queryKey: [
+      "transaction-details",
+      transaction.to,
+      transaction.chain.id,
+      transaction.erc20Value?.toString(),
+    ],
   });
 }
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useAddConnectedWallet.test.tsx b/packages/thirdweb/src/react/core/hooks/wallets/useAddConnectedWallet.test.tsx
index 7b439d2c402..5250586a4d4 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useAddConnectedWallet.test.tsx
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useAddConnectedWallet.test.tsx
@@ -26,8 +26,8 @@ describe("useAddConnectedWallet", () => {
 
   const wallet = createWalletAdapter({
     adaptedAccount: TEST_ACCOUNT_A,
-    client: TEST_CLIENT,
     chain: ethereum,
+    client: TEST_CLIENT,
     onDisconnect: () => {},
     switchChain: () => {},
   });
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useAutoConnect.ts b/packages/thirdweb/src/react/core/hooks/wallets/useAutoConnect.ts
index 43688d0ef56..12862bea3eb 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useAutoConnect.ts
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useAutoConnect.ts
@@ -18,23 +18,23 @@ export function useAutoConnectCore(
 ) {
   const manager = useConnectionManagerCtx("useAutoConnect");
   const { connect } = useConnect({
-    client: props.client,
     accountAbstraction: props.accountAbstraction,
+    client: props.client,
   });
 
   // trigger the auto connect on first mount only
   const query = useQuery({
-    queryKey: ["autoConnect", props.client.clientId],
     queryFn: () =>
       autoConnectCore({
+        connectOverride: connect,
         createWalletFn,
+        getInstalledWallets,
         manager,
         props,
-        storage,
-        connectOverride: connect,
-        getInstalledWallets,
         setLastAuthProvider,
+        storage,
       }),
+    queryKey: ["autoConnect", props.client.clientId],
     refetchOnMount: false,
     refetchOnWindowFocus: false,
   });
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useAutoConnectCore.test.tsx b/packages/thirdweb/src/react/core/hooks/wallets/useAutoConnectCore.test.tsx
index be98b304186..b4c0852a073 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useAutoConnectCore.test.tsx
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useAutoConnectCore.test.tsx
@@ -30,8 +30,8 @@ describe("useAutoConnectCore", () => {
   it("should return a useQuery result", async () => {
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -40,14 +40,14 @@ describe("useAutoConnectCore", () => {
         useAutoConnectCore(
           mockStorage,
           {
-            wallets: [wallet],
             client: TEST_CLIENT,
+            wallets: [wallet],
           },
           (id: WalletId) =>
             createWalletAdapter({
               adaptedAccount: TEST_ACCOUNT_A,
-              client: TEST_CLIENT,
               chain: ethereum,
+              client: TEST_CLIENT,
               onDisconnect: () => {
                 console.warn(id);
               },
@@ -65,8 +65,8 @@ describe("useAutoConnectCore", () => {
   it("should return `false` if there's no lastConnectedWalletIds", async () => {
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -75,14 +75,14 @@ describe("useAutoConnectCore", () => {
         useAutoConnectCore(
           mockStorage,
           {
-            wallets: [wallet],
             client: TEST_CLIENT,
+            wallets: [wallet],
           },
           (id: WalletId) =>
             createWalletAdapter({
               adaptedAccount: TEST_ACCOUNT_A,
-              client: TEST_CLIENT,
               chain: ethereum,
+              client: TEST_CLIENT,
               onDisconnect: () => {
                 console.warn(id);
               },
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useCapabilities.ts b/packages/thirdweb/src/react/core/hooks/wallets/useCapabilities.ts
index 38063c44666..7212a7eedaa 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useCapabilities.ts
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useCapabilities.ts
@@ -29,7 +29,6 @@ export function useCapabilities(options?: {
 }): UseQueryResult<GetCapabilitiesResult> {
   const wallet = useActiveWallet();
   return useQuery({
-    queryKey: ["getCapabilities", wallet?.id, options?.chainId] as const,
     queryFn: async () => {
       if (!wallet) {
         return {
@@ -37,10 +36,11 @@ export function useCapabilities(options?: {
         } as const;
       }
       return getCapabilities({
-        wallet,
         chainId: options?.chainId,
+        wallet,
       });
     },
+    queryKey: ["getCapabilities", wallet?.id, options?.chainId] as const,
     retry: false,
     ...options?.queryOptions,
   });
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useConnect.test.tsx b/packages/thirdweb/src/react/core/hooks/wallets/useConnect.test.tsx
index 26699c4b072..515fc385fff 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useConnect.test.tsx
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useConnect.test.tsx
@@ -30,8 +30,8 @@ describe("useAddConnectedWallet", () => {
 
   const wallet = createWalletAdapter({
     adaptedAccount: TEST_ACCOUNT_A,
-    client: TEST_CLIENT,
     chain: ethereum,
+    client: TEST_CLIENT,
     onDisconnect: () => {},
     switchChain: () => {},
   });
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useConnect.ts b/packages/thirdweb/src/react/core/hooks/wallets/useConnect.ts
index 175d4c83c73..726fead15f6 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useConnect.ts
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useConnect.ts
@@ -79,5 +79,5 @@ export function useConnect(options?: ConnectManagerOptions) {
     [connect, options, setConnectionStatus],
   );
 
-  return { connect: handleConnection, isConnecting, error } as const;
+  return { connect: handleConnection, error, isConnecting } as const;
 }
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useSendAndConfirmCalls.ts b/packages/thirdweb/src/react/core/hooks/wallets/useSendAndConfirmCalls.ts
index 290cf7b517d..7ab4c74190f 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useSendAndConfirmCalls.ts
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useSendAndConfirmCalls.ts
@@ -87,8 +87,8 @@ export function useSendAndConfirmCalls(args?: {
 
       return sendAndConfirmCalls({
         ...options,
-        wallet,
         maxBlocksWaitTime: args?.maxBlocksWaitTime,
+        wallet,
       });
     },
     onSettled: async (_result, _error, variables) => {
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useSendToken.ts b/packages/thirdweb/src/react/core/hooks/wallets/useSendToken.ts
index c1a8fcce78d..6f2824d4df2 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useSendToken.ts
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useSendToken.ts
@@ -88,8 +88,8 @@ export function useSendToken(client: ThirdwebClient) {
           value: toWei(amount),
         });
         const gasEstimate = await estimateGas({
-          transaction: sendNativeTokenTx,
           account,
+          transaction: sendNativeTokenTx,
         });
         const balance = await getWalletBalance({
           address: account.address,
@@ -101,16 +101,16 @@ export function useSendToken(client: ThirdwebClient) {
         }
 
         return await sendTransaction({
-          transaction: sendNativeTokenTx,
           account,
+          transaction: sendNativeTokenTx,
         });
       }
       // erc20 token transfer
       else {
         const contract = getContract({
           address: tokenAddress,
-          client,
           chain: activeChain,
+          client,
         });
 
         const tx = transfer({
@@ -120,8 +120,8 @@ export function useSendToken(client: ThirdwebClient) {
         });
 
         return await sendTransaction({
-          transaction: tx,
           account,
+          transaction: tx,
         });
       }
     },
@@ -131,10 +131,10 @@ export function useSendToken(client: ThirdwebClient) {
       }
       if (data?.transactionHash) {
         await waitForReceipt({
-          transactionHash: data.transactionHash,
-          client,
           chain: data.chain,
+          client,
           maxBlocksWaitTime: 10_000,
+          transactionHash: data.transactionHash,
         });
       }
       invalidateWalletBalance(queryClient);
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useSetActiveWallet.test.tsx b/packages/thirdweb/src/react/core/hooks/wallets/useSetActiveWallet.test.tsx
index bef745a8d2a..6116af29532 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useSetActiveWallet.test.tsx
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useSetActiveWallet.test.tsx
@@ -26,8 +26,8 @@ describe("useAddConnectedWallet", () => {
 
   const wallet = createWalletAdapter({
     adaptedAccount: TEST_ACCOUNT_A,
-    client: TEST_CLIENT,
     chain: ethereum,
+    client: TEST_CLIENT,
     onDisconnect: () => {},
     switchChain: () => {},
   });
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useSwitchActiveWalletChain.test.tsx b/packages/thirdweb/src/react/core/hooks/wallets/useSwitchActiveWalletChain.test.tsx
index 8dd704903a5..1b167e0c9cb 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useSwitchActiveWalletChain.test.tsx
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useSwitchActiveWalletChain.test.tsx
@@ -29,8 +29,8 @@ describe("useSwitchActiveWalletChain", () => {
 
   const wallet = createWalletAdapter({
     adaptedAccount: TEST_ACCOUNT_A,
-    client: TEST_CLIENT,
     chain: ethereum,
+    client: TEST_CLIENT,
     onDisconnect: () => {},
     switchChain,
   });
diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useWaitForCallsReceipt.ts b/packages/thirdweb/src/react/core/hooks/wallets/useWaitForCallsReceipt.ts
index d3425837823..b4deab65d8f 100644
--- a/packages/thirdweb/src/react/core/hooks/wallets/useWaitForCallsReceipt.ts
+++ b/packages/thirdweb/src/react/core/hooks/wallets/useWaitForCallsReceipt.ts
@@ -27,7 +27,7 @@ export function useWaitForCallsReceipt(
     | undefined,
 ) {
   return useQuery({
-    queryKey: ["waitForCallsReceipt", args?.id] as const,
+    enabled: !!args?.id && (args?.queryOptions?.enabled ?? true),
     queryFn: async () => {
       if (!args?.id) {
         throw new Error("No call result provided");
@@ -37,7 +37,7 @@ export function useWaitForCallsReceipt(
         maxBlocksWaitTime: args.maxBlocksWaitTime,
       });
     },
-    enabled: !!args?.id && (args?.queryOptions?.enabled ?? true),
+    queryKey: ["waitForCallsReceipt", args?.id] as const,
     retry: false,
   });
 }
diff --git a/packages/thirdweb/src/react/core/machines/paymentMachine.test.ts b/packages/thirdweb/src/react/core/machines/paymentMachine.test.ts
index b4f90695cdb..355d93fa9ad 100644
--- a/packages/thirdweb/src/react/core/machines/paymentMachine.test.ts
+++ b/packages/thirdweb/src/react/core/machines/paymentMachine.test.ts
@@ -24,83 +24,83 @@ const mockWindowAdapter: WindowAdapter = {
 
 const mockStorage: AsyncStorage = {
   getItem: vi.fn().mockResolvedValue(null),
-  setItem: vi.fn().mockResolvedValue(undefined),
   removeItem: vi.fn().mockResolvedValue(undefined),
+  setItem: vi.fn().mockResolvedValue(undefined),
 };
 
 // Test token objects
 const testUSDCToken: Token = {
-  chainId: 137,
   address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-  name: "USD Coin (PoS)",
-  symbol: "USDC",
+  chainId: 137,
   decimals: 6,
+  name: "USD Coin (PoS)",
   priceUsd: 1.0,
+  symbol: "USDC",
 };
 
 const testETHToken: Token = {
-  chainId: 1,
   address: NATIVE_TOKEN_ADDRESS,
-  name: "Ethereum",
-  symbol: "ETH",
+  chainId: 1,
   decimals: 18,
+  name: "Ethereum",
   priceUsd: 2500.0,
+  symbol: "ETH",
 };
 
 const testTokenForPayment: Token = {
-  chainId: 1,
   address: "0xA0b86a33E6425c03e54c4b45DCb6d75b6B72E2AA",
-  name: "Test Token",
-  symbol: "TT",
+  chainId: 1,
   decimals: 18,
+  name: "Test Token",
   priceUsd: 1.0,
+  symbol: "TT",
 };
 
 const mockBuyQuote: BridgePrepareResult = {
-  type: "buy",
-  originAmount: 1000000000000000000n, // 1 ETH
-  destinationAmount: 100000000n, // 100 USDC
-  timestamp: Date.now(),
-  estimatedExecutionTimeMs: 120000, // 2 minutes
+  destinationAmount: 100000000n,
+  estimatedExecutionTimeMs: 120000, // 1 ETH
+  intent: {
+    amount: 100000000n,
+    destinationChainId: 137,
+    destinationTokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+    originChainId: 1,
+    originTokenAddress: NATIVE_TOKEN_ADDRESS,
+    receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+    sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+  }, // 100 USDC
+  originAmount: 1000000000000000000n,
   steps: [
     {
-      originToken: testETHToken,
-      destinationToken: testUSDCToken,
-      originAmount: 1000000000000000000n,
       destinationAmount: 100000000n,
+      destinationToken: testUSDCToken,
       estimatedExecutionTimeMs: 120000,
+      originAmount: 1000000000000000000n,
+      originToken: testETHToken,
       transactions: [
         {
           action: "approval" as const,
-          id: "0x123" as const,
-          to: "0x456" as const,
-          data: "0x789" as const,
+          chain: defineChain(1),
           chainId: 1,
           client: TEST_CLIENT,
-          chain: defineChain(1),
+          data: "0x789" as const,
+          id: "0x123" as const,
+          to: "0x456" as const,
         },
         {
           action: "buy" as const,
+          chain: defineChain(1),
+          chainId: 1,
+          client: TEST_CLIENT,
+          data: "0x012" as const,
           id: "0xabc" as const,
           to: "0xdef" as const,
-          data: "0x012" as const,
           value: 1000000000000000000n,
-          chainId: 1,
-          client: TEST_CLIENT,
-          chain: defineChain(1),
         },
       ],
     },
-  ],
-  intent: {
-    originChainId: 1,
-    originTokenAddress: NATIVE_TOKEN_ADDRESS,
-    destinationChainId: 137,
-    destinationTokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-    amount: 100000000n,
-    sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-    receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-  },
+  ], // 2 minutes
+  timestamp: Date.now(),
+  type: "buy",
 };
 
 describe("PaymentMachine", () => {
@@ -108,8 +108,8 @@ describe("PaymentMachine", () => {
 
   beforeEach(() => {
     adapters = {
-      window: mockWindowAdapter,
       storage: mockStorage,
+      window: mockWindowAdapter,
     };
   });
 
@@ -133,8 +133,8 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "ERROR_OCCURRED",
         error: testError,
+        type: "ERROR_OCCURRED",
       });
     });
 
@@ -163,38 +163,38 @@ describe("PaymentMachine", () => {
     );
 
     const testToken: Token = {
-      chainId: 42,
       address: "0xtest",
-      name: "Test Token",
-      symbol: "TEST",
+      chainId: 42,
       decimals: 18,
+      name: "Test Token",
       priceUsd: 1.0,
+      symbol: "TEST",
     };
 
     // Confirm destination
     act(() => {
       const [, send] = result.current;
       send({
-        type: "DESTINATION_CONFIRMED",
-        destinationToken: testToken,
         destinationAmount: "50",
+        destinationToken: testToken,
         receiverAddress: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+        type: "DESTINATION_CONFIRMED",
       });
     });
 
     // Select payment method
     const paymentMethod: PaymentMethod = {
-      type: "wallet",
-      payerWallet: TEST_IN_APP_WALLET_A,
-      originToken: testUSDCToken,
       balance: 1000000000000000000n,
+      originToken: testUSDCToken,
+      payerWallet: TEST_IN_APP_WALLET_A,
+      type: "wallet",
     };
 
     act(() => {
       const [, send] = result.current;
       send({
-        type: "PAYMENT_METHOD_SELECTED",
         paymentMethod,
+        type: "PAYMENT_METHOD_SELECTED",
       });
     });
 
@@ -219,13 +219,13 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "PAYMENT_METHOD_SELECTED",
         paymentMethod: {
-          type: "fiat",
           currency: "USD",
-          payerWallet: TEST_IN_APP_WALLET_A,
           onramp: "stripe",
+          payerWallet: TEST_IN_APP_WALLET_A,
+          type: "fiat",
         },
+        type: "PAYMENT_METHOD_SELECTED",
       });
     });
 
@@ -236,10 +236,10 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "DESTINATION_CONFIRMED",
-        destinationToken: testTokenForPayment,
         destinationAmount: "100",
+        destinationToken: testTokenForPayment,
         receiverAddress: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+        type: "DESTINATION_CONFIRMED",
       });
     });
 
@@ -256,23 +256,23 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "DESTINATION_CONFIRMED",
-        destinationToken: testTokenForPayment,
         destinationAmount: "100",
+        destinationToken: testTokenForPayment,
         receiverAddress: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+        type: "DESTINATION_CONFIRMED",
       });
     });
 
     act(() => {
       const [, send] = result.current;
       send({
-        type: "PAYMENT_METHOD_SELECTED",
         paymentMethod: {
-          type: "fiat",
           currency: "USD",
-          payerWallet: TEST_IN_APP_WALLET_A,
           onramp: "stripe",
+          payerWallet: TEST_IN_APP_WALLET_A,
+          type: "fiat",
         },
+        type: "PAYMENT_METHOD_SELECTED",
       });
     });
 
@@ -283,8 +283,8 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "ERROR_OCCURRED",
         error: new Error("Test error"),
+        type: "ERROR_OCCURRED",
       });
     });
 
@@ -315,8 +315,8 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "ERROR_OCCURRED",
         error: new Error("Init error"),
+        type: "ERROR_OCCURRED",
       });
     });
 
@@ -333,18 +333,18 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "DESTINATION_CONFIRMED",
-        destinationToken: testTokenForPayment,
         destinationAmount: "100",
+        destinationToken: testTokenForPayment,
         receiverAddress: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+        type: "DESTINATION_CONFIRMED",
       });
     });
 
     act(() => {
       const [, send] = result.current;
       send({
-        type: "ERROR_OCCURRED",
         error: new Error("Method selection error"),
+        type: "ERROR_OCCURRED",
       });
     });
 
@@ -362,10 +362,10 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "DESTINATION_CONFIRMED",
-        destinationToken: testTokenForPayment,
         destinationAmount: "100",
+        destinationToken: testTokenForPayment,
         receiverAddress: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+        type: "DESTINATION_CONFIRMED",
       });
     });
 
@@ -373,13 +373,13 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "PAYMENT_METHOD_SELECTED",
         paymentMethod: {
-          type: "fiat",
           currency: "USD",
-          payerWallet: TEST_IN_APP_WALLET_A,
           onramp: "stripe",
+          payerWallet: TEST_IN_APP_WALLET_A,
+          type: "fiat",
         },
+        type: "PAYMENT_METHOD_SELECTED",
       });
     });
 
@@ -418,31 +418,31 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "DESTINATION_CONFIRMED",
-        destinationToken: testTokenForPayment,
         destinationAmount: "100",
+        destinationToken: testTokenForPayment,
         receiverAddress: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+        type: "DESTINATION_CONFIRMED",
       });
     });
 
     act(() => {
       const [, send] = result.current;
       send({
-        type: "PAYMENT_METHOD_SELECTED",
         paymentMethod: {
-          type: "wallet",
-          payerWallet: TEST_IN_APP_WALLET_A,
-          originToken: testUSDCToken,
           balance: 1000000000000000000n,
+          originToken: testUSDCToken,
+          payerWallet: TEST_IN_APP_WALLET_A,
+          type: "wallet",
         },
+        type: "PAYMENT_METHOD_SELECTED",
       });
     });
 
     act(() => {
       const [, send] = result.current;
       send({
-        type: "QUOTE_RECEIVED",
         preparedQuote: mockBuyQuote,
+        type: "QUOTE_RECEIVED",
       });
     });
 
@@ -456,31 +456,31 @@ describe("PaymentMachine", () => {
     act(() => {
       const [, send] = result.current;
       send({
-        type: "EXECUTION_COMPLETE",
         completedStatuses: [
           {
-            type: "buy",
-            status: "COMPLETED",
-            paymentId: "test-payment-id",
-            originAmount: 1000000000000000000n,
             destinationAmount: 100000000n,
-            originChainId: 1,
             destinationChainId: 137,
-            originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            destinationToken: testUSDCToken,
             destinationTokenAddress:
               "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+            originAmount: 1000000000000000000n,
+            originChainId: 1,
             originToken: testETHToken,
-            destinationToken: testUSDCToken,
-            sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+            originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            paymentId: "test-payment-id",
             receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+            sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+            status: "COMPLETED",
             transactions: [
               {
                 chainId: 1,
                 transactionHash: "0xtest123",
               },
             ],
+            type: "buy",
           },
         ],
+        type: "EXECUTION_COMPLETE",
       });
     });
 
diff --git a/packages/thirdweb/src/react/core/machines/paymentMachine.ts b/packages/thirdweb/src/react/core/machines/paymentMachine.ts
index 4f0b8fc35ef..e98484ad2dc 100644
--- a/packages/thirdweb/src/react/core/machines/paymentMachine.ts
+++ b/packages/thirdweb/src/react/core/machines/paymentMachine.ts
@@ -108,8 +108,8 @@ export function usePaymentMachine(
 ) {
   const [currentState, setCurrentState] = useState<PaymentMachineState>("init");
   const [context, setContext] = useState<PaymentMachineContext>({
-    mode,
     adapters,
+    mode,
   });
 
   const send = useCallback(
@@ -121,8 +121,8 @@ export function usePaymentMachine(
               if (event.type === "DESTINATION_CONFIRMED") {
                 return {
                   ...ctx,
-                  destinationToken: event.destinationToken,
                   destinationAmount: event.destinationAmount,
+                  destinationToken: event.destinationToken,
                   receiverAddress: event.receiverAddress,
                 };
               } else if (event.type === "ERROR_OCCURRED") {
@@ -204,8 +204,8 @@ export function usePaymentMachine(
             case "success":
               if (event.type === "RESET") {
                 return {
-                  mode: ctx.mode,
                   adapters: ctx.adapters,
+                  mode: ctx.mode,
                 };
               }
               break;
@@ -213,8 +213,8 @@ export function usePaymentMachine(
             case "post-buy-transaction":
               if (event.type === "RESET") {
                 return {
-                  mode: ctx.mode,
                   adapters: ctx.adapters,
+                  mode: ctx.mode,
                 };
               }
               break;
@@ -282,8 +282,8 @@ export function usePaymentMachine(
 
   return [
     {
-      value: currentState,
       context,
+      value: currentState,
     },
     send,
   ] as const;
diff --git a/packages/thirdweb/src/react/core/providers/thirdweb-provider.tsx b/packages/thirdweb/src/react/core/providers/thirdweb-provider.tsx
index 3357f3aa70f..8084c21ed1b 100644
--- a/packages/thirdweb/src/react/core/providers/thirdweb-provider.tsx
+++ b/packages/thirdweb/src/react/core/providers/thirdweb-provider.tsx
@@ -7,9 +7,9 @@ import type { Hex } from "../../../utils/encoding/hex.js";
 import { isObjectWithKeys } from "../../../utils/type-guards.js";
 import type { ConnectionManager } from "../../../wallets/manager/index.js";
 import { structuralSharing } from "../utils/structuralSharing.js";
-import { SetRootElementContext } from "./RootElementContext.js";
 import { ConnectionManagerCtx } from "./connection-manager.js";
 import { invalidateWalletBalance } from "./invalidateWalletBalance.js";
+import { SetRootElementContext } from "./RootElementContext.js";
 
 /**
  * @internal
@@ -31,9 +31,9 @@ export function ThirdwebProviderCore(props: {
                   isObjectWithKeys(variables, ["client", "chain"])
                 ) {
                   waitForReceipt({
-                    transactionHash: data.transactionHash as Hex, // We know it exists from the if
+                    chain: variables.chain, // We know it exists from the if
                     client: variables.client,
-                    chain: variables.chain,
+                    transactionHash: data.transactionHash as Hex,
                   })
                     .catch((e) => {
                       // swallow errors for receipts, but log
diff --git a/packages/thirdweb/src/react/core/social/useSocialProfiles.ts b/packages/thirdweb/src/react/core/social/useSocialProfiles.ts
index 9e4431aed4f..e88b7d8823d 100644
--- a/packages/thirdweb/src/react/core/social/useSocialProfiles.ts
+++ b/packages/thirdweb/src/react/core/social/useSocialProfiles.ts
@@ -27,9 +27,7 @@ export function useSocialProfiles(options: {
 }) {
   const { client, address } = options;
   return useQuery({
-    queryKey: ["social-profiles", address],
     enabled: !!address,
-    retry: 3,
     queryFn: async () => {
       if (!address) {
         throw new Error(
@@ -38,5 +36,7 @@ export function useSocialProfiles(options: {
       }
       return await getSocialProfiles({ address, client });
     },
+    queryKey: ["social-profiles", address],
+    retry: 3,
   });
 }
diff --git a/packages/thirdweb/src/react/core/utils/account.ts b/packages/thirdweb/src/react/core/utils/account.ts
index c0241634950..0d2d305da28 100644
--- a/packages/thirdweb/src/react/core/utils/account.ts
+++ b/packages/thirdweb/src/react/core/utils/account.ts
@@ -3,8 +3,8 @@ import type { ThirdwebClient } from "../../../client/client.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
 import { convertCryptoToFiat } from "../../../pay/convert/cryptoToFiat.js";
 import {
-  type SupportedFiatCurrency,
   getFiatSymbol,
+  type SupportedFiatCurrency,
 } from "../../../pay/convert/type.js";
 import { type Address, isAddress } from "../../../utils/address.js";
 import { formatNumber } from "../../../utils/formatNumber.js";
@@ -75,9 +75,9 @@ export async function loadAccountBalance(props: {
   }
 
   const tokenBalanceData = await getWalletBalance({
+    address,
     chain,
     client,
-    address,
     tokenAddress,
   }).catch(() => undefined);
 
@@ -89,11 +89,11 @@ export async function loadAccountBalance(props: {
 
   if (showBalanceInFiat) {
     const fiatData = await convertCryptoToFiat({
+      chain,
+      client,
       fromAmount: Number(tokenBalanceData.displayValue),
       fromTokenAddress: tokenAddress || NATIVE_TOKEN_ADDRESS,
       to: showBalanceInFiat,
-      chain,
-      client,
     }).catch(() => undefined);
 
     if (fiatData === undefined) {
diff --git a/packages/thirdweb/src/react/core/utils/createQuery.ts b/packages/thirdweb/src/react/core/utils/createQuery.ts
index e741f7add2e..779ff940c54 100644
--- a/packages/thirdweb/src/react/core/utils/createQuery.ts
+++ b/packages/thirdweb/src/react/core/utils/createQuery.ts
@@ -43,6 +43,7 @@ export function createContractQuery<
     const { contract, queryOptions, ...params } = options;
 
     return useQuery({
+      queryFn: () => readCall(options),
       queryKey: [
         "readContract",
         contract.chain.id,
@@ -50,7 +51,6 @@ export function createContractQuery<
         getFunctionId(readCall),
         stringify(params),
       ] as const,
-      queryFn: () => readCall(options),
       ...queryOptions,
     });
   }
diff --git a/packages/thirdweb/src/react/core/utils/defaultTokens.ts b/packages/thirdweb/src/react/core/utils/defaultTokens.ts
index c79656605b5..ed92560b5ac 100644
--- a/packages/thirdweb/src/react/core/utils/defaultTokens.ts
+++ b/packages/thirdweb/src/react/core/utils/defaultTokens.ts
@@ -40,275 +40,275 @@ const DEFAULT_TOKENS = {
   "1": [
     {
       address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+      icon: wrappedEthIcon,
       name: "Wrapped Ether",
       symbol: "WETH",
-      icon: wrappedEthIcon,
     },
     {
       address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+      icon: tetherUsdIcon,
       name: "Tether USD",
       symbol: "USDT",
-      icon: tetherUsdIcon,
     },
     {
       address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      icon: usdcIcon,
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
     {
       address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+      icon: wrappedBtcIcon,
       name: "Wrapped Bitcoin",
       symbol: "WBTC",
-      icon: wrappedBtcIcon,
     },
     {
       address: "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
+      icon: maticIcon,
       name: "Polygon",
       symbol: "WMATIC",
-      icon: maticIcon,
-    },
-  ],
-  "11155111": [
-    {
-      address: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
-      name: "USD Coin",
-      symbol: "USDC",
-      icon: usdcIcon,
     },
   ],
   "10": [
     {
       address: "0x4200000000000000000000000000000000000006",
+      icon: wrappedEthIcon,
       name: "Wrapped Ether",
       symbol: "WETH",
-      icon: wrappedEthIcon,
     },
     {
       address: "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
+      icon: usdcIcon,
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
   ],
   "56": [
     {
       address: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
+      icon: binanceCoinIcon,
       name: "Wrapped Binance Chain Token",
       symbol: "WBNB",
-      icon: binanceCoinIcon,
     },
     {
       address: "0xe9e7CEA3DedcA5984780Bafc599bD69ADd087D56",
+      icon: BUSDIcon,
       name: "Binance USD",
       symbol: "BUSD",
-      icon: BUSDIcon,
     },
   ],
   "97": [
     {
       address: "0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd",
+      icon: binanceCoinIcon,
       name: "Wrapped Binance Chain Testnet Token",
       symbol: "WBNB",
-      icon: binanceCoinIcon,
     },
     {
       address: "0xed24fc36d5ee211ea25a80239fb8c4cfd80f12ee",
+      icon: BUSDIcon,
       name: "Binance USD",
       symbol: "BUSD",
-      icon: BUSDIcon,
     },
   ],
   "137": [
     {
       address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+      icon: usdcIcon,
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
     {
       address: "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270",
+      icon: maticIcon,
       name: "Wrapped Matic",
       symbol: "WMATIC",
-      icon: maticIcon,
     },
     {
       address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
+      icon: wrappedEthIcon,
       name: "Wrapped Ether",
       symbol: "WETH",
-      icon: wrappedEthIcon,
     },
     {
       address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
+      icon: tetherUsdIcon,
       name: "Tether USD",
       symbol: "USDT",
-      icon: tetherUsdIcon,
     },
     {
       address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
+      icon: wrappedBtcIcon,
       name: "Wrapped BTC",
       symbol: "WBTC",
-      icon: wrappedBtcIcon,
     },
   ],
   "250": [
     {
       address: "0x21be370D5312f44cB42ce377BC9b8a0cEF1A4C83",
+      icon: fantomIcon,
       name: "Wrapped Fantom",
       symbol: "WFTM",
-      icon: fantomIcon,
     },
     {
-      name: "Wrapped Ether",
       address: "0x74b23882a30290451A17c44f4F05243b6b58C76d",
-      symbol: "WETH",
       icon: wrappedEthIcon,
+      name: "Wrapped Ether",
+      symbol: "WETH",
     },
     {
-      name: "USD Coin",
       address: "0x04068DA6C83AFCFA0e13ba15A6696662335D5B75",
-      symbol: "USDC",
       icon: usdcIcon,
+      name: "USD Coin",
+      symbol: "USDC",
     },
     {
-      name: "Wrapped Bitcoin",
       address: "0x321162Cd933E2Be498Cd2267a90534A804051b11",
-      symbol: "WBTC",
       icon: wrappedBtcIcon,
+      name: "Wrapped Bitcoin",
+      symbol: "WBTC",
     },
   ],
   "420": [
     {
       address: "0x4200000000000000000000000000000000000006",
+      icon: wrappedEthIcon,
       name: "Wrapped Ether",
       symbol: "WETH",
-      icon: wrappedEthIcon,
     },
   ],
   "4002": [
     {
       address: "0xf1277d1Ed8AD466beddF92ef448A132661956621",
+      icon: fantomIcon,
       name: "Wrapped Fantom",
       symbol: "WFTM",
-      icon: fantomIcon,
+    },
+  ],
+  // Base mainnet
+  "8453": [
+    {
+      address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      icon: usdcIcon,
+      name: "USD Coin",
+      symbol: "USDC",
     },
   ],
   "42161": [
     {
       address: "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
+      icon: wrappedEthIcon,
       name: "Wrapped Ether",
       symbol: "WETH",
-      icon: wrappedEthIcon,
     },
     {
       address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+      icon: usdcIcon,
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
   ],
   "43113": [
     {
       address: "0xd00ae08403B9bbb9124bB305C09058E32C39A48c",
+      icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTUwMyIgaGVpZ2h0PSIxNTA0IiB2aWV3Qm94PSIwIDAgMTUwMyAxNTA0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cmVjdCB4PSIyODciIHk9IjI1OCIgd2lkdGg9IjkyOCIgaGVpZ2h0PSI4NDQiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMTUwMi41IDc1MkMxNTAyLjUgMTE2Ni43NyAxMTY2LjI3IDE1MDMgNzUxLjUgMTUwM0MzMzYuNzM0IDE1MDMgMC41IDExNjYuNzcgMC41IDc1MkMwLjUgMzM3LjIzNCAzMzYuNzM0IDEgNzUxLjUgMUMxMTY2LjI3IDEgMTUwMi41IDMzNy4yMzQgMTUwMi41IDc1MlpNNTM4LjY4OCAxMDUwLjg2SDM5Mi45NEMzNjIuMzE0IDEwNTAuODYgMzQ3LjE4NiAxMDUwLjg2IDMzNy45NjIgMTA0NC45NkMzMjcuOTk5IDEwMzguNSAzMjEuOTExIDEwMjcuOCAzMjEuMTczIDEwMTUuOTlDMzIwLjYxOSAxMDA1LjExIDMyOC4xODQgOTkxLjgyMiAzNDMuMzEyIDk2NS4yNTVMNzAzLjE4MiAzMzAuOTM1QzcxOC40OTUgMzAzLjk5OSA3MjYuMjQzIDI5MC41MzEgNzM2LjAyMSAyODUuNTVDNzQ2LjUzNyAyODAuMiA3NTkuMDgzIDI4MC4yIDc2OS41OTkgMjg1LjU1Qzc3OS4zNzcgMjkwLjUzMSA3ODcuMTI2IDMwMy45OTkgODAyLjQzOCAzMzAuOTM1TDg3Ni40MiA0NjAuMDc5TDg3Ni43OTcgNDYwLjczOEM4OTMuMzM2IDQ4OS42MzUgOTAxLjcyMyA1MDQuMjg5IDkwNS4zODUgNTE5LjY2OUM5MDkuNDQzIDUzNi40NTggOTA5LjQ0MyA1NTQuMTY5IDkwNS4zODUgNTcwLjk1OEM5MDEuNjk1IDU4Ni40NTUgODkzLjM5MyA2MDEuMjE1IDg3Ni42MDQgNjMwLjU0OUw2ODcuNTczIDk2NC43MDJMNjg3LjA4NCA5NjUuNTU4QzY3MC40MzYgOTk0LjY5MyA2NjEuOTk5IDEwMDkuNDYgNjUwLjMwNiAxMDIwLjZDNjM3LjU3NiAxMDMyLjc4IDYyMi4yNjMgMTA0MS42MyA2MDUuNDc0IDEwNDYuNjJDNTkwLjE2MSAxMDUwLjg2IDU3My4wMDQgMTA1MC44NiA1MzguNjg4IDEwNTAuODZaTTkwNi43NSAxMDUwLjg2SDExMTUuNTlDMTE0Ni40IDEwNTAuODYgMTE2MS45IDEwNTAuODYgMTE3MS4xMyAxMDQ0Ljc4QzExODEuMDkgMTAzOC4zMiAxMTg3LjM2IDEwMjcuNDMgMTE4Ny45MiAxMDE1LjYzQzExODguNDUgMTAwNS4xIDExODEuMDUgOTkyLjMzIDExNjYuNTUgOTY3LjMwN0MxMTY2LjA1IDk2Ni40NTUgMTE2NS41NSA5NjUuNTg4IDExNjUuMDQgOTY0LjcwNkwxMDYwLjQzIDc4NS43NUwxMDU5LjI0IDc4My43MzVDMTA0NC41NCA3NTguODc3IDEwMzcuMTIgNzQ2LjMyNCAxMDI3LjU5IDc0MS40NzJDMTAxNy4wOCA3MzYuMTIxIDEwMDQuNzEgNzM2LjEyMSA5OTQuMTk5IDc0MS40NzJDOTg0LjYwNSA3NDYuNDUzIDk3Ni44NTcgNzU5LjU1MiA5NjEuNTQ0IDc4NS45MzRMODU3LjMwNiA5NjQuODkxTDg1Ni45NDkgOTY1LjUwN0M4NDEuNjkgOTkxLjg0NyA4MzQuMDY0IDEwMDUuMDEgODM0LjYxNCAxMDE1LjgxQzgzNS4zNTIgMTAyNy42MiA4NDEuNDQgMTAzOC41IDg1MS40MDIgMTA0NC45NkM4NjAuNDQzIDEwNTAuODYgODc1Ljk0IDEwNTAuODYgOTA2Ljc1IDEwNTAuODZaIiBmaWxsPSIjRTg0MTQyIi8+Cjwvc3ZnPgo=",
       name: "Wrapped AVAX",
       symbol: "WAVAX",
-      icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTUwMyIgaGVpZ2h0PSIxNTA0IiB2aWV3Qm94PSIwIDAgMTUwMyAxNTA0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cmVjdCB4PSIyODciIHk9IjI1OCIgd2lkdGg9IjkyOCIgaGVpZ2h0PSI4NDQiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMTUwMi41IDc1MkMxNTAyLjUgMTE2Ni43NyAxMTY2LjI3IDE1MDMgNzUxLjUgMTUwM0MzMzYuNzM0IDE1MDMgMC41IDExNjYuNzcgMC41IDc1MkMwLjUgMzM3LjIzNCAzMzYuNzM0IDEgNzUxLjUgMUMxMTY2LjI3IDEgMTUwMi41IDMzNy4yMzQgMTUwMi41IDc1MlpNNTM4LjY4OCAxMDUwLjg2SDM5Mi45NEMzNjIuMzE0IDEwNTAuODYgMzQ3LjE4NiAxMDUwLjg2IDMzNy45NjIgMTA0NC45NkMzMjcuOTk5IDEwMzguNSAzMjEuOTExIDEwMjcuOCAzMjEuMTczIDEwMTUuOTlDMzIwLjYxOSAxMDA1LjExIDMyOC4xODQgOTkxLjgyMiAzNDMuMzEyIDk2NS4yNTVMNzAzLjE4MiAzMzAuOTM1QzcxOC40OTUgMzAzLjk5OSA3MjYuMjQzIDI5MC41MzEgNzM2LjAyMSAyODUuNTVDNzQ2LjUzNyAyODAuMiA3NTkuMDgzIDI4MC4yIDc2OS41OTkgMjg1LjU1Qzc3OS4zNzcgMjkwLjUzMSA3ODcuMTI2IDMwMy45OTkgODAyLjQzOCAzMzAuOTM1TDg3Ni40MiA0NjAuMDc5TDg3Ni43OTcgNDYwLjczOEM4OTMuMzM2IDQ4OS42MzUgOTAxLjcyMyA1MDQuMjg5IDkwNS4zODUgNTE5LjY2OUM5MDkuNDQzIDUzNi40NTggOTA5LjQ0MyA1NTQuMTY5IDkwNS4zODUgNTcwLjk1OEM5MDEuNjk1IDU4Ni40NTUgODkzLjM5MyA2MDEuMjE1IDg3Ni42MDQgNjMwLjU0OUw2ODcuNTczIDk2NC43MDJMNjg3LjA4NCA5NjUuNTU4QzY3MC40MzYgOTk0LjY5MyA2NjEuOTk5IDEwMDkuNDYgNjUwLjMwNiAxMDIwLjZDNjM3LjU3NiAxMDMyLjc4IDYyMi4yNjMgMTA0MS42MyA2MDUuNDc0IDEwNDYuNjJDNTkwLjE2MSAxMDUwLjg2IDU3My4wMDQgMTA1MC44NiA1MzguNjg4IDEwNTAuODZaTTkwNi43NSAxMDUwLjg2SDExMTUuNTlDMTE0Ni40IDEwNTAuODYgMTE2MS45IDEwNTAuODYgMTE3MS4xMyAxMDQ0Ljc4QzExODEuMDkgMTAzOC4zMiAxMTg3LjM2IDEwMjcuNDMgMTE4Ny45MiAxMDE1LjYzQzExODguNDUgMTAwNS4xIDExODEuMDUgOTkyLjMzIDExNjYuNTUgOTY3LjMwN0MxMTY2LjA1IDk2Ni40NTUgMTE2NS41NSA5NjUuNTg4IDExNjUuMDQgOTY0LjcwNkwxMDYwLjQzIDc4NS43NUwxMDU5LjI0IDc4My43MzVDMTA0NC41NCA3NTguODc3IDEwMzcuMTIgNzQ2LjMyNCAxMDI3LjU5IDc0MS40NzJDMTAxNy4wOCA3MzYuMTIxIDEwMDQuNzEgNzM2LjEyMSA5OTQuMTk5IDc0MS40NzJDOTg0LjYwNSA3NDYuNDUzIDk3Ni44NTcgNzU5LjU1MiA5NjEuNTQ0IDc4NS45MzRMODU3LjMwNiA5NjQuODkxTDg1Ni45NDkgOTY1LjUwN0M4NDEuNjkgOTkxLjg0NyA4MzQuMDY0IDEwMDUuMDEgODM0LjYxNCAxMDE1LjgxQzgzNS4zNTIgMTAyNy42MiA4NDEuNDQgMTAzOC41IDg1MS40MDIgMTA0NC45NkM4NjAuNDQzIDEwNTAuODYgODc1Ljk0IDEwNTAuODYgOTA2Ljc1IDEwNTAuODZaIiBmaWxsPSIjRTg0MTQyIi8+Cjwvc3ZnPgo=",
     },
     {
       address: "0x5425890298aed601595a70AB815c96711a31Bc65",
+      icon: usdcIcon,
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
   ],
   "43114": [
     {
       address: "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
+      icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTUwMyIgaGVpZ2h0PSIxNTA0IiB2aWV3Qm94PSIwIDAgMTUwMyAxNTA0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cmVjdCB4PSIyODciIHk9IjI1OCIgd2lkdGg9IjkyOCIgaGVpZ2h0PSI4NDQiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMTUwMi41IDc1MkMxNTAyLjUgMTE2Ni43NyAxMTY2LjI3IDE1MDMgNzUxLjUgMTUwM0MzMzYuNzM0IDE1MDMgMC41IDExNjYuNzcgMC41IDc1MkMwLjUgMzM3LjIzNCAzMzYuNzM0IDEgNzUxLjUgMUMxMTY2LjI3IDEgMTUwMi41IDMzNy4yMzQgMTUwMi41IDc1MlpNNTM4LjY4OCAxMDUwLjg2SDM5Mi45NEMzNjIuMzE0IDEwNTAuODYgMzQ3LjE4NiAxMDUwLjg2IDMzNy45NjIgMTA0NC45NkMzMjcuOTk5IDEwMzguNSAzMjEuOTExIDEwMjcuOCAzMjEuMTczIDEwMTUuOTlDMzIwLjYxOSAxMDA1LjExIDMyOC4xODQgOTkxLjgyMiAzNDMuMzEyIDk2NS4yNTVMNzAzLjE4MiAzMzAuOTM1QzcxOC40OTUgMzAzLjk5OSA3MjYuMjQzIDI5MC41MzEgNzM2LjAyMSAyODUuNTVDNzQ2LjUzNyAyODAuMiA3NTkuMDgzIDI4MC4yIDc2OS41OTkgMjg1LjU1Qzc3OS4zNzcgMjkwLjUzMSA3ODcuMTI2IDMwMy45OTkgODAyLjQzOCAzMzAuOTM1TDg3Ni40MiA0NjAuMDc5TDg3Ni43OTcgNDYwLjczOEM4OTMuMzM2IDQ4OS42MzUgOTAxLjcyMyA1MDQuMjg5IDkwNS4zODUgNTE5LjY2OUM5MDkuNDQzIDUzNi40NTggOTA5LjQ0MyA1NTQuMTY5IDkwNS4zODUgNTcwLjk1OEM5MDEuNjk1IDU4Ni40NTUgODkzLjM5MyA2MDEuMjE1IDg3Ni42MDQgNjMwLjU0OUw2ODcuNTczIDk2NC43MDJMNjg3LjA4NCA5NjUuNTU4QzY3MC40MzYgOTk0LjY5MyA2NjEuOTk5IDEwMDkuNDYgNjUwLjMwNiAxMDIwLjZDNjM3LjU3NiAxMDMyLjc4IDYyMi4yNjMgMTA0MS42MyA2MDUuNDc0IDEwNDYuNjJDNTkwLjE2MSAxMDUwLjg2IDU3My4wMDQgMTA1MC44NiA1MzguNjg4IDEwNTAuODZaTTkwNi43NSAxMDUwLjg2SDExMTUuNTlDMTE0Ni40IDEwNTAuODYgMTE2MS45IDEwNTAuODYgMTE3MS4xMyAxMDQ0Ljc4QzExODEuMDkgMTAzOC4zMiAxMTg3LjM2IDEwMjcuNDMgMTE4Ny45MiAxMDE1LjYzQzExODguNDUgMTAwNS4xIDExODEuMDUgOTkyLjMzIDExNjYuNTUgOTY3LjMwN0MxMTY2LjA1IDk2Ni40NTUgMTE2NS41NSA5NjUuNTg4IDExNjUuMDQgOTY0LjcwNkwxMDYwLjQzIDc4NS43NUwxMDU5LjI0IDc4My43MzVDMTA0NC41NCA3NTguODc3IDEwMzcuMTIgNzQ2LjMyNCAxMDI3LjU5IDc0MS40NzJDMTAxNy4wOCA3MzYuMTIxIDEwMDQuNzEgNzM2LjEyMSA5OTQuMTk5IDc0MS40NzJDOTg0LjYwNSA3NDYuNDUzIDk3Ni44NTcgNzU5LjU1MiA5NjEuNTQ0IDc4NS45MzRMODU3LjMwNiA5NjQuODkxTDg1Ni45NDkgOTY1LjUwN0M4NDEuNjkgOTkxLjg0NyA4MzQuMDY0IDEwMDUuMDEgODM0LjYxNCAxMDE1LjgxQzgzNS4zNTIgMTAyNy42MiA4NDEuNDQgMTAzOC41IDg1MS40MDIgMTA0NC45NkM4NjAuNDQzIDEwNTAuODYgODc1Ljk0IDEwNTAuODYgOTA2Ljc1IDEwNTAuODZaIiBmaWxsPSIjRTg0MTQyIi8+Cjwvc3ZnPgo=",
       name: "Wrapped AVAX",
       symbol: "WAVAX",
-      icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTUwMyIgaGVpZ2h0PSIxNTA0IiB2aWV3Qm94PSIwIDAgMTUwMyAxNTA0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cmVjdCB4PSIyODciIHk9IjI1OCIgd2lkdGg9IjkyOCIgaGVpZ2h0PSI4NDQiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMTUwMi41IDc1MkMxNTAyLjUgMTE2Ni43NyAxMTY2LjI3IDE1MDMgNzUxLjUgMTUwM0MzMzYuNzM0IDE1MDMgMC41IDExNjYuNzcgMC41IDc1MkMwLjUgMzM3LjIzNCAzMzYuNzM0IDEgNzUxLjUgMUMxMTY2LjI3IDEgMTUwMi41IDMzNy4yMzQgMTUwMi41IDc1MlpNNTM4LjY4OCAxMDUwLjg2SDM5Mi45NEMzNjIuMzE0IDEwNTAuODYgMzQ3LjE4NiAxMDUwLjg2IDMzNy45NjIgMTA0NC45NkMzMjcuOTk5IDEwMzguNSAzMjEuOTExIDEwMjcuOCAzMjEuMTczIDEwMTUuOTlDMzIwLjYxOSAxMDA1LjExIDMyOC4xODQgOTkxLjgyMiAzNDMuMzEyIDk2NS4yNTVMNzAzLjE4MiAzMzAuOTM1QzcxOC40OTUgMzAzLjk5OSA3MjYuMjQzIDI5MC41MzEgNzM2LjAyMSAyODUuNTVDNzQ2LjUzNyAyODAuMiA3NTkuMDgzIDI4MC4yIDc2OS41OTkgMjg1LjU1Qzc3OS4zNzcgMjkwLjUzMSA3ODcuMTI2IDMwMy45OTkgODAyLjQzOCAzMzAuOTM1TDg3Ni40MiA0NjAuMDc5TDg3Ni43OTcgNDYwLjczOEM4OTMuMzM2IDQ4OS42MzUgOTAxLjcyMyA1MDQuMjg5IDkwNS4zODUgNTE5LjY2OUM5MDkuNDQzIDUzNi40NTggOTA5LjQ0MyA1NTQuMTY5IDkwNS4zODUgNTcwLjk1OEM5MDEuNjk1IDU4Ni40NTUgODkzLjM5MyA2MDEuMjE1IDg3Ni42MDQgNjMwLjU0OUw2ODcuNTczIDk2NC43MDJMNjg3LjA4NCA5NjUuNTU4QzY3MC40MzYgOTk0LjY5MyA2NjEuOTk5IDEwMDkuNDYgNjUwLjMwNiAxMDIwLjZDNjM3LjU3NiAxMDMyLjc4IDYyMi4yNjMgMTA0MS42MyA2MDUuNDc0IDEwNDYuNjJDNTkwLjE2MSAxMDUwLjg2IDU3My4wMDQgMTA1MC44NiA1MzguNjg4IDEwNTAuODZaTTkwNi43NSAxMDUwLjg2SDExMTUuNTlDMTE0Ni40IDEwNTAuODYgMTE2MS45IDEwNTAuODYgMTE3MS4xMyAxMDQ0Ljc4QzExODEuMDkgMTAzOC4zMiAxMTg3LjM2IDEwMjcuNDMgMTE4Ny45MiAxMDE1LjYzQzExODguNDUgMTAwNS4xIDExODEuMDUgOTkyLjMzIDExNjYuNTUgOTY3LjMwN0MxMTY2LjA1IDk2Ni40NTUgMTE2NS41NSA5NjUuNTg4IDExNjUuMDQgOTY0LjcwNkwxMDYwLjQzIDc4NS43NUwxMDU5LjI0IDc4My43MzVDMTA0NC41NCA3NTguODc3IDEwMzcuMTIgNzQ2LjMyNCAxMDI3LjU5IDc0MS40NzJDMTAxNy4wOCA3MzYuMTIxIDEwMDQuNzEgNzM2LjEyMSA5OTQuMTk5IDc0MS40NzJDOTg0LjYwNSA3NDYuNDUzIDk3Ni44NTcgNzU5LjU1MiA5NjEuNTQ0IDc4NS45MzRMODU3LjMwNiA5NjQuODkxTDg1Ni45NDkgOTY1LjUwN0M4NDEuNjkgOTkxLjg0NyA4MzQuMDY0IDEwMDUuMDEgODM0LjYxNCAxMDE1LjgxQzgzNS4zNTIgMTAyNy42MiA4NDEuNDQgMTAzOC41IDg1MS40MDIgMTA0NC45NkM4NjAuNDQzIDEwNTAuODYgODc1Ljk0IDEwNTAuODYgOTA2Ljc1IDEwNTAuODZaIiBmaWxsPSIjRTg0MTQyIi8+Cjwvc3ZnPgo=",
     },
     {
       address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
+      icon: wrappedEthIcon,
       name: "Wrapped Ether",
       symbol: "WETH",
-      icon: wrappedEthIcon,
     },
     {
       address: "0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7",
+      icon: tetherUsdIcon,
       name: "Tether USD",
       symbol: "USDT",
-      icon: tetherUsdIcon,
     },
     {
       address: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+      icon: usdcIcon,
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
     {
       address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
+      icon: wrappedBtcIcon,
       name: "Wrapped BTC",
       symbol: "WBTC",
-      icon: wrappedBtcIcon,
     },
   ],
   "80001": [
     {
       address: "0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889",
+      icon: maticIcon,
       name: "Wrapped Matic",
       symbol: "WMATIC",
-      icon: maticIcon,
     },
     {
-      name: "Wrapped Ether",
       address: "0xa6fa4fb5f76172d178d61b04b0ecd319c5d1c0aa",
-      symbol: "WETH",
       icon: wrappedEthIcon,
+      name: "Wrapped Ether",
+      symbol: "WETH",
     },
     {
       address: "0x0FA8781a83E46826621b3BC094Ea2A0212e71B23",
+      icon: usdcIcon,
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
     {
-      name: "Tether USD",
       address: "0x3813e82e6f7098b9583FC0F33a962D02018B6803",
-      symbol: "USDT",
       icon: tetherUsdIcon,
+      name: "Tether USD",
+      symbol: "USDT",
+    },
+  ],
+  // Base sepolia
+  "84532": [
+    {
+      address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+      icon: usdcIcon,
+      name: "USD Coin",
+      symbol: "USDC",
     },
   ],
   "421613": [
     {
       address: "0xe39Ab88f8A4777030A534146A9Ca3B52bd5D43A3",
+      icon: wrappedEthIcon,
       name: "Wrapped Ether",
       symbol: "WETH",
-      icon: wrappedEthIcon,
     },
     {
       address: "0xfd064A18f3BF249cf1f87FC203E90D8f650f2d63",
-      name: "USD Coin",
-      symbol: "USDC",
       icon: usdcIcon,
-    },
-  ],
-  // Base mainnet
-  "8453": [
-    {
-      address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
   ],
-  // Base sepolia
-  "84532": [
+  "11155111": [
     {
-      address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+      address: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
+      icon: usdcIcon,
       name: "USD Coin",
       symbol: "USDC",
-      icon: usdcIcon,
     },
   ],
 } as const;
diff --git a/packages/thirdweb/src/react/core/utils/storage.test.ts b/packages/thirdweb/src/react/core/utils/storage.test.ts
index 3ef78ac7e76..e80d8079f29 100644
--- a/packages/thirdweb/src/react/core/utils/storage.test.ts
+++ b/packages/thirdweb/src/react/core/utils/storage.test.ts
@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { AsyncStorage } from "../../../utils/storage/AsyncStorage.js";
 import type { AuthArgsType } from "../../../wallets/in-app/core/authentication/types.js";
 import {
-  LAST_AUTH_PROVIDER_STORAGE_KEY,
   getLastAuthProvider,
+  LAST_AUTH_PROVIDER_STORAGE_KEY,
   setLastAuthProvider,
 } from "./storage.js";
 
@@ -13,8 +13,8 @@ describe("Auth Provider Storage", () => {
   beforeEach(() => {
     mockStorage = {
       getItem: vi.fn(),
-      setItem: vi.fn(),
       removeItem: vi.fn(),
+      setItem: vi.fn(),
     };
   });
 
diff --git a/packages/thirdweb/src/react/core/utils/structuralSharing.ts b/packages/thirdweb/src/react/core/utils/structuralSharing.ts
index 46f36454934..cfd65c98fcc 100644
--- a/packages/thirdweb/src/react/core/utils/structuralSharing.ts
+++ b/packages/thirdweb/src/react/core/utils/structuralSharing.ts
@@ -29,7 +29,7 @@ function deepEqual(a: any, b: any) {
 
     for (i = length; i-- !== 0; )
       // biome-ignore lint/style/noNonNullAssertion: We know its there
-      if (!Object.prototype.hasOwnProperty.call(b, keys[i]!)) return false;
+      if (!Object.hasOwn(b, keys[i]!)) return false;
 
     for (i = length; i-- !== 0; ) {
       const key = keys[i];
@@ -41,7 +41,7 @@ function deepEqual(a: any, b: any) {
   }
 
   // true if both NaN, false otherwise
-  // biome-ignore lint/suspicious/noSelfCompare: <explanation>
+  // biome-ignore lint/suspicious/noSelfCompare: TODO
   return a !== a && b !== b;
 }
 
diff --git a/packages/thirdweb/src/react/core/utils/wallet.test.ts b/packages/thirdweb/src/react/core/utils/wallet.test.ts
index 37d8d5af4b0..2474fbbd97e 100644
--- a/packages/thirdweb/src/react/core/utils/wallet.test.ts
+++ b/packages/thirdweb/src/react/core/utils/wallet.test.ts
@@ -9,14 +9,14 @@ describe("hasSponsoredTransactionsEnabled", () => {
 
   it("should handle smart wallet with sponsorGas config", () => {
     const mockSmartWallet = {
-      id: "smart",
       getConfig: () => ({ sponsorGas: true }),
+      id: "smart",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockSmartWallet)).toBe(true);
 
     const mockSmartWalletDisabled = {
-      id: "smart",
       getConfig: () => ({ sponsorGas: false }),
+      id: "smart",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockSmartWalletDisabled)).toBe(
       false,
@@ -25,30 +25,30 @@ describe("hasSponsoredTransactionsEnabled", () => {
 
   it("should handle smart wallet with gasless config", () => {
     const mockSmartWallet = {
-      id: "smart",
       getConfig: () => ({ gasless: true }),
+      id: "smart",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockSmartWallet)).toBe(true);
   });
 
   it("should handle inApp wallet with smartAccount config", () => {
     const mockInAppWallet = {
-      id: "inApp",
       getConfig: () => ({
         smartAccount: {
           sponsorGas: true,
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWallet)).toBe(true);
 
     const mockInAppWalletDisabled = {
-      id: "inApp",
       getConfig: () => ({
         smartAccount: {
           sponsorGas: false,
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWalletDisabled)).toBe(
       false,
@@ -57,20 +57,20 @@ describe("hasSponsoredTransactionsEnabled", () => {
 
   it("should handle inApp wallet with gasless config", () => {
     const mockInAppWallet = {
-      id: "inApp",
       getConfig: () => ({
         smartAccount: {
           gasless: true,
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWallet)).toBe(true);
   });
 
   it("should return false for regular wallet without smart account config", () => {
     const mockRegularWallet = {
-      id: "inApp",
       getConfig: () => ({}),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockRegularWallet)).toBe(false);
   });
diff --git a/packages/thirdweb/src/react/core/utils/wallet.ts b/packages/thirdweb/src/react/core/utils/wallet.ts
index 4d22c18cc1f..1c314d6f551 100644
--- a/packages/thirdweb/src/react/core/utils/wallet.ts
+++ b/packages/thirdweb/src/react/core/utils/wallet.ts
@@ -34,14 +34,14 @@ export function useEnsName(options: {
 }) {
   const { client, address } = options;
   return useQuery({
-    queryKey: ["ens-name", address],
     enabled: !!address,
     queryFn: () =>
       resolveName({
-        client,
         address: address || "",
+        client,
         resolverChain: ethereum,
       }),
+    queryKey: ["ens-name", address],
   });
 }
 
@@ -66,13 +66,13 @@ export function useEnsAvatar(options: {
 }) {
   const { client, ensName } = options;
   return useQuery({
-    queryKey: ["ens-avatar", ensName],
     enabled: !!ensName,
     queryFn: async () =>
       resolveAvatar({
         client,
         name: ensName || "",
       }),
+    queryKey: ["ens-avatar", ensName],
   });
 }
 
@@ -92,8 +92,8 @@ export function useConnectedWalletDetails(
       : undefined;
 
   const ensNameQuery = useEnsName({
-    client,
     address: activeAccount?.address,
+    client,
   });
 
   const ensAvatarQuery = useEnsAvatar({
@@ -102,8 +102,8 @@ export function useConnectedWalletDetails(
   });
 
   const socialProfileQuery = useSocialProfiles({
-    client,
     address: activeAccount?.address,
+    client,
   });
 
   const shortAddress = activeAccount?.address
@@ -111,10 +111,10 @@ export function useConnectedWalletDetails(
     : "";
 
   const balanceQuery = useWalletBalance({
-    chain: walletChain ? walletChain : undefined,
-    tokenAddress,
     address: activeAccount?.address,
+    chain: walletChain ? walletChain : undefined,
     client,
+    tokenAddress,
   });
 
   const addressOrENS = ensNameQuery.data || shortAddress;
@@ -122,29 +122,29 @@ export function useConnectedWalletDetails(
     ?.avatar;
 
   const { data: pfp } = useQuery({
-    queryKey: ["ens-avatar", pfpUnresolved],
+    enabled: !!pfpUnresolved,
     queryFn: async () => {
       if (!pfpUnresolved) {
         return undefined;
       }
       return parseAvatarRecord({ client, uri: pfpUnresolved });
     },
-    enabled: !!pfpUnresolved,
-    refetchOnWindowFocus: false,
+    queryKey: ["ens-avatar", pfpUnresolved],
     refetchOnMount: false,
+    refetchOnWindowFocus: false,
   });
   const name =
     socialProfileQuery.data?.filter((p) => p.name)[0]?.name || addressOrENS;
 
   return {
-    socialProfileQuery,
-    ensNameQuery,
-    ensAvatarQuery,
     addressOrENS,
-    pfp,
+    balanceQuery,
+    ensAvatarQuery,
+    ensNameQuery,
     name,
+    pfp,
     shortAddress,
-    balanceQuery,
+    socialProfileQuery,
   };
 }
 
@@ -162,17 +162,17 @@ export function useConnectedWalletDetails(
  */
 export function useWalletInfo(id: WalletId | undefined) {
   return useQuery<WalletInfo>({
-    queryKey: ["wallet-info", id],
+    enabled: !!id,
     queryFn: () => {
       if (!id) {
         throw new Error("Wallet id is required");
       }
       return getWalletInfo(id, false);
     },
-    retry: false,
-    refetchOnWindowFocus: false,
+    queryKey: ["wallet-info", id],
     refetchOnMount: false,
-    enabled: !!id,
+    refetchOnWindowFocus: false,
+    retry: false,
   });
 }
 
@@ -192,7 +192,7 @@ export function useWalletInfo(id: WalletId | undefined) {
  */
 export function useWalletImage(id: WalletId | undefined) {
   return useQuery({
-    queryKey: ["wallet-image", id],
+    enabled: !!id,
     queryFn: async () => {
       if (!id) {
         throw new Error("Wallet id is required");
@@ -208,9 +208,9 @@ export function useWalletImage(id: WalletId | undefined) {
       }
       return getWalletInfo(id, true);
     },
-    retry: false,
-    refetchOnWindowFocus: false,
+    queryKey: ["wallet-image", id],
     refetchOnMount: false,
-    enabled: !!id,
+    refetchOnWindowFocus: false,
+    retry: false,
   });
 }
diff --git a/packages/thirdweb/src/react/core/utils/walletIcon.ts b/packages/thirdweb/src/react/core/utils/walletIcon.ts
index 37f67398376..25b43435c60 100644
--- a/packages/thirdweb/src/react/core/utils/walletIcon.ts
+++ b/packages/thirdweb/src/react/core/utils/walletIcon.ts
@@ -46,18 +46,18 @@ const passkeyIcon =
  * @internal
  */
 export const socialIcons = {
-  google: googleIconUri,
   apple: appleIconUri,
   coinbase: coinbaseIconUri,
-  facebook: facebookIconUri,
   discord: discordIconUri,
-  line: lineIconUri,
-  x: xIcon,
+  facebook: facebookIconUri,
   farcaster: farcasterIconUri,
-  telegram: telegramIconUri,
-  twitch: twitchIconUri,
   github: githubIconUri,
+  google: googleIconUri,
+  line: lineIconUri,
   steam: steamIconUri,
+  telegram: telegramIconUri,
+  twitch: twitchIconUri,
+  x: xIcon,
 };
 
 /**
@@ -119,8 +119,8 @@ export function useWalletIcon(props: {
 }) {
   const { id } = useWalletContext();
   const imageQuery = useQuery({
-    queryKey: ["walletIcon", id],
     queryFn: async () => fetchWalletImage({ id }),
+    queryKey: ["walletIcon", id],
     ...props.queryOptions,
   });
   return imageQuery;
diff --git a/packages/thirdweb/src/react/core/utils/walletname.ts b/packages/thirdweb/src/react/core/utils/walletname.ts
index 8c4d0df0a6b..1d3b9cd5c5a 100644
--- a/packages/thirdweb/src/react/core/utils/walletname.ts
+++ b/packages/thirdweb/src/react/core/utils/walletname.ts
@@ -1,5 +1,5 @@
-import { useQuery } from "@tanstack/react-query";
 import type { UseQueryOptions } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import { getFunctionId } from "../../../utils/function-id.js";
 import { getWalletInfo } from "../../../wallets/__generated__/getWalletInfo.js";
 import type { WalletId } from "../../../wallets/wallet-types.js";
@@ -14,8 +14,8 @@ export function useWalletName(props: {
 }) {
   const { id } = useWalletContext();
   const nameQuery = useQuery({
-    queryKey: getQueryKeys({ id, formatFn: props.formatFn }),
-    queryFn: async () => fetchWalletName({ id, formatFn: props.formatFn }),
+    queryFn: async () => fetchWalletName({ formatFn: props.formatFn, id }),
+    queryKey: getQueryKeys({ formatFn: props.formatFn, id }),
     ...props.queryOptions,
   });
   return nameQuery;
diff --git a/packages/thirdweb/src/react/core/wallet/provider.test.tsx b/packages/thirdweb/src/react/core/wallet/provider.test.tsx
index db97a5ce152..f3b062cd0a0 100644
--- a/packages/thirdweb/src/react/core/wallet/provider.test.tsx
+++ b/packages/thirdweb/src/react/core/wallet/provider.test.tsx
@@ -1,10 +1,11 @@
+/** biome-ignore-all lint/nursery/useUniqueElementIds: "id" is not the html attribute here (TODO: we should not use "id" as a key in the first place) */
 import { type FC, useContext } from "react";
 import { describe, expect, it, vi } from "vitest";
 import { render, renderHook, screen } from "~test/react-render.js";
 import {
+  useWalletContext,
   WalletProvider,
   WalletProviderContext,
-  useWalletContext,
 } from "./provider.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("WalletProvider", () => {
diff --git a/packages/thirdweb/src/react/native/design-system/index.ts b/packages/thirdweb/src/react/native/design-system/index.ts
index 278c2b053f1..69701fe5dc7 100644
--- a/packages/thirdweb/src/react/native/design-system/index.ts
+++ b/packages/thirdweb/src/react/native/design-system/index.ts
@@ -1,31 +1,31 @@
 export const spacing = {
-  xxs: 2,
-  xs: 4,
+  "3xl": 64,
+  lg: 24,
+  md: 16,
   sm: 8,
   smd: 12,
-  md: 16,
-  lg: 24,
   xl: 32,
+  xs: 4,
   xxl: 48,
-  "3xl": 64,
+  xxs: 2,
 };
 
 export const radius = {
+  full: 9999,
+  lg: 12,
+  md: 8,
   none: 0,
   sm: 4,
-  md: 8,
-  lg: 12,
   xl: 24,
   xxl: 32,
-  full: 9999,
 };
 
 export const fontSize = {
-  xxs: 10,
-  xs: 12,
-  sm: 14,
-  md: 16,
   lg: 20,
+  md: 16,
+  sm: 14,
   xl: 24,
+  xs: 12,
   xxl: 32,
+  xxs: 10,
 };
diff --git a/packages/thirdweb/src/react/native/hooks/transaction/useSendTransaction.tsx b/packages/thirdweb/src/react/native/hooks/transaction/useSendTransaction.tsx
index 796389d2ee8..8acf9656096 100644
--- a/packages/thirdweb/src/react/native/hooks/transaction/useSendTransaction.tsx
+++ b/packages/thirdweb/src/react/native/hooks/transaction/useSendTransaction.tsx
@@ -48,7 +48,7 @@ export function useSendTransaction(config: SendTransactionConfig = {}) {
   const wallet = useActiveWallet();
   const switchChain = useSwitchActiveWalletChain();
   return useSendTransactionCore({
-    wallet,
     switchChain,
+    wallet,
   });
 }
diff --git a/packages/thirdweb/src/react/native/hooks/wallets/useLinkProfile.ts b/packages/thirdweb/src/react/native/hooks/wallets/useLinkProfile.ts
index eba52743881..0902a3fa643 100644
--- a/packages/thirdweb/src/react/native/hooks/wallets/useLinkProfile.ts
+++ b/packages/thirdweb/src/react/native/hooks/wallets/useLinkProfile.ts
@@ -80,7 +80,6 @@ export function useLinkProfile() {
   const wallets = useConnectedWallets();
   const queryClient = useQueryClient();
   return useMutation({
-    mutationKey: ["profiles"],
     mutationFn: async (options: AuthArgsType) => {
       const ecosystemWallet = wallets.find((w) => isEcosystemWallet(w));
       const ecosystem: Ecosystem | undefined = ecosystemWallet
@@ -92,6 +91,7 @@ export function useLinkProfile() {
       const optionsWithEcosystem = { ...options, ecosystem } as AuthArgsType;
       return linkProfile(optionsWithEcosystem);
     },
+    mutationKey: ["profiles"],
     onSuccess() {
       setTimeout(() => {
         queryClient.invalidateQueries({ queryKey: ["profiles"] });
diff --git a/packages/thirdweb/src/react/native/hooks/wallets/useProfiles.ts b/packages/thirdweb/src/react/native/hooks/wallets/useProfiles.ts
index a4a6ddb2262..3444fb3ad52 100644
--- a/packages/thirdweb/src/react/native/hooks/wallets/useProfiles.ts
+++ b/packages/thirdweb/src/react/native/hooks/wallets/useProfiles.ts
@@ -34,10 +34,6 @@ export function useProfiles(args: {
     wallets.length > 0 &&
     wallets.some((w) => w.id === "inApp" || isEcosystemWallet(w));
   return useQuery({
-    queryKey: [
-      "profiles",
-      wallets.map((w) => `${w.id}-${w.getAccount()?.address}`),
-    ],
     enabled,
     queryFn: async () => {
       const ecosystemWallet = wallets.find((w) => isEcosystemWallet(w));
@@ -52,5 +48,9 @@ export function useProfiles(args: {
         ecosystem,
       });
     },
+    queryKey: [
+      "profiles",
+      wallets.map((w) => `${w.id}-${w.getAccount()?.address}`),
+    ],
   });
 }
diff --git a/packages/thirdweb/src/react/native/hooks/wallets/useUnlinkProfile.test.tsx b/packages/thirdweb/src/react/native/hooks/wallets/useUnlinkProfile.test.tsx
index 456843daa47..2ea14fdffaa 100644
--- a/packages/thirdweb/src/react/native/hooks/wallets/useUnlinkProfile.test.tsx
+++ b/packages/thirdweb/src/react/native/hooks/wallets/useUnlinkProfile.test.tsx
@@ -37,10 +37,10 @@ describe("useUnlinkProfile", () => {
     });
 
     expect(unlinkProfile).toHaveBeenCalledWith({
+      allowAccountDeletion: false,
       client: TEST_CLIENT,
       ecosystem: undefined,
       profileToUnlink: mockProfile,
-      allowAccountDeletion: false,
     });
     expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
       queryKey: ["profiles"],
@@ -55,17 +55,17 @@ describe("useUnlinkProfile", () => {
 
     await act(async () => {
       await mutationFn({
+        allowAccountDeletion: true,
         client: TEST_CLIENT,
         profileToUnlink: mockProfile,
-        allowAccountDeletion: true,
       });
     });
 
     expect(unlinkProfile).toHaveBeenCalledWith({
+      allowAccountDeletion: true,
       client: TEST_CLIENT,
       ecosystem: undefined,
       profileToUnlink: mockProfile,
-      allowAccountDeletion: true,
     });
     expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
       queryKey: ["profiles"],
@@ -74,8 +74,8 @@ describe("useUnlinkProfile", () => {
 
   it("should include ecosystem if ecosystem wallet is found", async () => {
     const mockWallet = {
-      id: "ecosystem.wallet-id",
       getConfig: () => ({ partnerId: "partner-id" }),
+      id: "ecosystem.wallet-id",
     } as unknown as Wallet;
     vi.mocked(useConnectedWallets).mockReturnValue([mockWallet]);
 
@@ -89,6 +89,7 @@ describe("useUnlinkProfile", () => {
     });
 
     expect(unlinkProfile).toHaveBeenCalledWith({
+      allowAccountDeletion: false,
       client: TEST_CLIENT,
       ecosystem: {
         id: mockWallet.id,
@@ -96,7 +97,6 @@ describe("useUnlinkProfile", () => {
           ?.partnerId,
       },
       profileToUnlink: mockProfile,
-      allowAccountDeletion: false,
     });
   });
 });
diff --git a/packages/thirdweb/src/react/native/hooks/wallets/useUnlinkProfile.ts b/packages/thirdweb/src/react/native/hooks/wallets/useUnlinkProfile.ts
index 4138de7bd94..5d00e624fe4 100644
--- a/packages/thirdweb/src/react/native/hooks/wallets/useUnlinkProfile.ts
+++ b/packages/thirdweb/src/react/native/hooks/wallets/useUnlinkProfile.ts
@@ -72,10 +72,10 @@ export function useUnlinkProfile() {
         : undefined;
 
       await unlinkProfile({
+        allowAccountDeletion,
         client,
         ecosystem,
         profileToUnlink,
-        allowAccountDeletion,
       });
     },
     onSuccess: () => {
diff --git a/packages/thirdweb/src/react/native/ui/components/Address.tsx b/packages/thirdweb/src/react/native/ui/components/Address.tsx
index 38b9132f99f..8fc190ebe99 100644
--- a/packages/thirdweb/src/react/native/ui/components/Address.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/Address.tsx
@@ -17,7 +17,6 @@ export const Address = ({ account, theme, addressOrENS }: AddressProps) => {
   const [copySuccess, setCopySuccess] = useState(false);
   return (
     <TouchableOpacity
-      style={styles.addressContainer}
       onPress={() => {
         Clipboard.setString(account.address);
         setCopySuccess(true);
@@ -25,17 +24,18 @@ export const Address = ({ account, theme, addressOrENS }: AddressProps) => {
           setCopySuccess(false);
         }, 2500);
       }}
+      style={styles.addressContainer}
     >
       <ThemedText theme={theme} type="defaultSemiBold">
         {addressOrENS}
       </ThemedText>
       <RNImage
-        theme={theme}
-        data={copySuccess ? CHECK : COPY_ICON}
-        size={15}
         color={
           copySuccess ? theme.colors.success : theme.colors.secondaryIconColor
         }
+        data={copySuccess ? CHECK : COPY_ICON}
+        size={15}
+        theme={theme}
       />
     </TouchableOpacity>
   );
@@ -43,8 +43,8 @@ export const Address = ({ account, theme, addressOrENS }: AddressProps) => {
 
 const styles = StyleSheet.create({
   addressContainer: {
+    alignItems: "center",
     flexDirection: "row",
     gap: spacing.sm,
-    alignItems: "center",
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/components/ChainIcon.tsx b/packages/thirdweb/src/react/native/ui/components/ChainIcon.tsx
index 72b2a5fef58..643469c5e62 100644
--- a/packages/thirdweb/src/react/native/ui/components/ChainIcon.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/ChainIcon.tsx
@@ -22,8 +22,8 @@ export const ChainIcon = (props: ChainIconProps) => {
     }
     try {
       return resolveScheme({
-        uri: url,
         client: props.client,
+        uri: url,
       });
     } catch {
       return CHAIN_ICON;
@@ -31,11 +31,11 @@ export const ChainIcon = (props: ChainIconProps) => {
   }, [props, url]);
   return (
     <RNImage
-      theme={props.theme}
-      size={props.size}
+      color={props.theme.colors.secondaryIconColor}
       data={data}
       placeholder={CHAIN_ICON}
-      color={props.theme.colors.secondaryIconColor}
+      size={props.size}
+      theme={props.theme}
     />
   );
 };
diff --git a/packages/thirdweb/src/react/native/ui/components/Header.tsx b/packages/thirdweb/src/react/native/ui/components/Header.tsx
index 7c453c67851..9e519fad887 100644
--- a/packages/thirdweb/src/react/native/ui/components/Header.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/Header.tsx
@@ -25,17 +25,17 @@ export function Header({
       <TouchableOpacity
         onPress={onBack}
         style={{
+          alignItems: "center",
           flexDirection: "row",
           gap: spacing.sm,
-          alignItems: "center",
           paddingTop: spacing.lg,
         }}
       >
         <RNImage
-          theme={theme}
+          color={theme.colors.secondaryIconColor}
           data={BACK_ICON}
           size={14}
-          color={theme.colors.secondaryIconColor}
+          theme={theme}
         />
         <ThemedText theme={theme} type="subtext">
           Back
@@ -49,10 +49,10 @@ export function Header({
       {onBack && (
         <TouchableOpacity onPress={onBack}>
           <RNImage
-            theme={theme}
+            color={theme.colors.secondaryIconColor}
             data={BACK_ICON}
             size={24}
-            color={theme.colors.secondaryIconColor}
+            theme={theme}
           />
         </TouchableOpacity>
       )}
@@ -62,10 +62,10 @@ export function Header({
       {onClose && (
         <TouchableOpacity onPress={onClose}>
           <RNImage
-            theme={theme}
+            color={theme.colors.secondaryIconColor}
             data={CLOSE_ICON}
             size={24}
-            color={theme.colors.secondaryIconColor}
+            theme={theme}
           />
         </TouchableOpacity>
       )}
@@ -75,8 +75,8 @@ export function Header({
 
 const styles = StyleSheet.create({
   headerModal: {
-    flexDirection: "row",
     alignItems: "center",
+    flexDirection: "row",
     justifyContent: "space-between",
     paddingHorizontal: spacing.lg,
     paddingTop: spacing.lg,
diff --git a/packages/thirdweb/src/react/native/ui/components/RNImage.tsx b/packages/thirdweb/src/react/native/ui/components/RNImage.tsx
index 585d24921d9..7bce982799d 100644
--- a/packages/thirdweb/src/react/native/ui/components/RNImage.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/RNImage.tsx
@@ -52,16 +52,16 @@ export const RNImage = (props: ImageInfo) => {
       return (
         <>
           <Image
-            source={{ uri: image }}
-            loadingIndicatorSource={{ uri: placeholder }}
-            width={size}
             height={size}
+            loadingIndicatorSource={{ uri: placeholder }}
+            source={{ uri: image }}
             style={[{ borderRadius: radius.md }]}
+            width={size}
           />
         </>
       );
     case "xml":
-      return <SvgXml xml={image} width={size} height={size} color={color} />;
+      return <SvgXml color={color} height={size} width={size} xml={image} />;
     default:
       return null;
   }
diff --git a/packages/thirdweb/src/react/native/ui/components/Skeleton.tsx b/packages/thirdweb/src/react/native/ui/components/Skeleton.tsx
index 4f510c2c86c..a7ae80d6986 100644
--- a/packages/thirdweb/src/react/native/ui/components/Skeleton.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/Skeleton.tsx
@@ -29,13 +29,13 @@ export const Skeleton: React.FC<SkeletonLoaderProps> = ({
     const animation = Animated.loop(
       Animated.sequence([
         Animated.timing(translateX.current, {
-          toValue: width,
           duration: 2500,
+          toValue: width,
           useNativeDriver: true,
         }),
         Animated.timing(translateX.current, {
-          toValue: -width,
           duration: 0,
+          toValue: -width,
           useNativeDriver: true,
         }),
       ]),
@@ -70,24 +70,24 @@ export const Skeleton: React.FC<SkeletonLoaderProps> = ({
 
 const styles = StyleSheet.create({
   container: {
-    overflow: "hidden",
     borderRadius: radius.lg,
-  },
-  skeleton: {
-    height: "100%",
-    width: "100%",
+    overflow: "hidden",
   },
   gradient: {
+    bottom: 0,
     position: "absolute",
     top: 0,
-    bottom: 0,
     width: "100%",
   },
   innerGradient: {
-    width: "100%",
-    height: "100%",
     backgroundColor: "rgba(255,255,255,0.5)",
+    height: "100%",
     opacity: 0.3,
     transform: [{ skewX: "-20deg" }],
+    width: "100%",
+  },
+  skeleton: {
+    height: "100%",
+    width: "100%",
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/components/TokenIcon.tsx b/packages/thirdweb/src/react/native/ui/components/TokenIcon.tsx
index eca88bb3990..6134cdbd8fe 100644
--- a/packages/thirdweb/src/react/native/ui/components/TokenIcon.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/TokenIcon.tsx
@@ -19,9 +19,9 @@ export function TokenIcon(props: {
 }) {
   return props.token ? (
     <RNImage
-      theme={props.theme}
       data={props.token?.icon || genericTokenIcon}
       size={props.size}
+      theme={props.theme}
     />
   ) : (
     <ChainIcon {...props} />
diff --git a/packages/thirdweb/src/react/native/ui/components/WalletImage.tsx b/packages/thirdweb/src/react/native/ui/components/WalletImage.tsx
index 33ae7c14bd8..7dd8945e0bb 100644
--- a/packages/thirdweb/src/react/native/ui/components/WalletImage.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/WalletImage.tsx
@@ -37,7 +37,7 @@ export const WalletImage = (props: {
   const { wallet, avatar, size, client } = props;
 
   const { data: imageData } = useQuery({
-    queryKey: ["wallet-image", wallet.id, wallet.getAccount()?.address],
+    enabled: !avatar,
     queryFn: async (): Promise<string> => {
       let activeEOAId = wallet.id;
       if (wallet.id === "smart") {
@@ -69,16 +69,16 @@ export const WalletImage = (props: {
 
       return WALLET_ICON;
     },
-    enabled: !avatar,
+    queryKey: ["wallet-image", wallet.id, wallet.getAccount()?.address],
   });
 
   const data = avatar || imageData || WALLET_ICON;
   return (
     <RNImage
-      theme={props.theme}
+      color={props.theme.colors.accentButtonBg}
       data={data}
       size={size}
-      color={props.theme.colors.accentButtonBg}
+      theme={props.theme}
     />
   );
 };
diff --git a/packages/thirdweb/src/react/native/ui/components/button.tsx b/packages/thirdweb/src/react/native/ui/components/button.tsx
index 389320717d0..18aeecfd66e 100644
--- a/packages/thirdweb/src/react/native/ui/components/button.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/button.tsx
@@ -23,15 +23,15 @@ export function ThemedButton(props: ThemedButtonProps) {
       style={[
         styles.button,
         {
-          borderColor:
-            variant === "secondary" ? theme.colors.borderColor : "transparent",
-          borderWidth: variant === "secondary" ? 1 : 0,
           backgroundColor:
             variant === "secondary"
               ? "transparent"
               : variant === "accent"
                 ? props.theme.colors.accentButtonBg
                 : props.theme.colors.primaryButtonBg,
+          borderColor:
+            variant === "secondary" ? theme.colors.borderColor : "transparent",
+          borderWidth: variant === "secondary" ? 1 : 0,
         },
         styleOverride,
       ]}
@@ -50,21 +50,21 @@ export function ThemedButtonWithIcon(
 ) {
   const { theme, title, icon, onPress } = props;
   return (
-    <ThemedButton theme={theme} variant="secondary" onPress={onPress}>
+    <ThemedButton onPress={onPress} theme={theme} variant="secondary">
       <View
         style={{
+          alignContent: "center",
           flexDirection: "row",
           gap: spacing.md,
           paddingLeft: spacing.sm,
-          alignContent: "center",
           width: "100%",
         }}
       >
         <RNImage
-          theme={theme}
-          size={24}
-          data={icon}
           color={theme.colors.accentButtonBg}
+          data={icon}
+          size={24}
+          theme={theme}
         />
         <ThemedText theme={theme}>{title}</ThemedText>
       </View>
@@ -74,10 +74,10 @@ export function ThemedButtonWithIcon(
 
 const styles = StyleSheet.create({
   button: {
-    flexDirection: "row",
-    padding: spacing.md,
+    alignItems: "center",
     borderRadius: radius.lg,
+    flexDirection: "row",
     justifyContent: "center",
-    alignItems: "center",
+    padding: spacing.md,
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/components/input.tsx b/packages/thirdweb/src/react/native/ui/components/input.tsx
index bc27bc15a37..cd3d0dcb377 100644
--- a/packages/thirdweb/src/react/native/ui/components/input.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/input.tsx
@@ -34,14 +34,14 @@ export function ThemedInput(props: ThemedInputProps) {
     >
       {leftView && leftView}
       <TextInput
+        onBlur={() => setIsFocused(false)}
+        onFocus={() => setIsFocused(true)}
         placeholderTextColor={theme.colors.secondaryText}
         style={[
           styles.input,
           { color: theme.colors.primaryText },
           leftView ? { paddingLeft: 0 } : {},
         ]}
-        onFocus={() => setIsFocused(true)}
-        onBlur={() => setIsFocused(false)}
         {...props}
       />
       {rightView && (
@@ -75,6 +75,9 @@ export function ThemedInputWithSubmit(
       ]}
     >
       <TextInput
+        onBlur={() => setIsFocused(false)}
+        onChangeText={setVal}
+        onFocus={() => setIsFocused(true)}
         placeholderTextColor={theme.colors.secondaryText}
         style={[
           styles.input,
@@ -83,27 +86,24 @@ export function ThemedInputWithSubmit(
           },
         ]}
         value={val}
-        onChangeText={setVal}
-        onFocus={() => setIsFocused(true)}
-        onBlur={() => setIsFocused(false)}
         {...props}
       />
       {onSubmit && (
         <TouchableOpacity
-          onPress={() => onSubmit(val)}
           disabled={props.isSubmitting}
+          onPress={() => onSubmit(val)}
           style={{
             paddingHorizontal: spacing.lg,
           }}
         >
           {props.isSubmitting ? (
-            <ThemedSpinner size={24} color={theme.colors.secondaryIconColor} />
+            <ThemedSpinner color={theme.colors.secondaryIconColor} size={24} />
           ) : (
             <SvgXml
-              width={24}
+              color={theme.colors.secondaryIconColor}
               height={24}
+              width={24}
               xml={RIGHT_ARROW}
-              color={theme.colors.secondaryIconColor}
             />
           )}
         </TouchableOpacity>
@@ -114,21 +114,21 @@ export function ThemedInputWithSubmit(
 
 const styles = StyleSheet.create({
   container: {
-    flexDirection: "row",
     alignItems: "center",
     borderRadius: radius.lg,
-    borderWidth: 1,
     borderStyle: "solid",
+    borderWidth: 1,
+    flexDirection: "row",
   },
   input: {
+    alignItems: "center",
     flex: 1,
     flexDirection: "row",
     fontSize: 16,
-    height: 56,
     gap: spacing.md,
+    height: 56,
+    justifyContent: "center",
     paddingLeft: spacing.lg,
     paddingVertical: spacing.md,
-    justifyContent: "center",
-    alignItems: "center",
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/components/text.tsx b/packages/thirdweb/src/react/native/ui/components/text.tsx
index 08b36b61ac0..b5eb327479e 100644
--- a/packages/thirdweb/src/react/native/ui/components/text.tsx
+++ b/packages/thirdweb/src/react/native/ui/components/text.tsx
@@ -45,19 +45,19 @@ const styles = StyleSheet.create({
     fontSize: 16,
     fontWeight: "600",
   },
+  link: {
+    fontSize: 16,
+  },
   subtext: {
     fontSize: 14,
   },
-  title: {
-    fontSize: 24,
-    fontWeight: "bold",
-    lineHeight: 28,
-  },
   subtitle: {
     fontSize: 18,
     fontWeight: "600",
   },
-  link: {
-    fontSize: 16,
+  title: {
+    fontSize: 24,
+    fontWeight: "bold",
+    lineHeight: 28,
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/ConnectButton.tsx b/packages/thirdweb/src/react/native/ui/connect/ConnectButton.tsx
index ae053189125..5ba73e4b7c2 100644
--- a/packages/thirdweb/src/react/native/ui/connect/ConnectButton.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/ConnectButton.tsx
@@ -20,9 +20,9 @@ import { useAutoConnect } from "../../hooks/wallets/useAutoConnect.js";
 import { ThemedButton } from "../components/button.js";
 import { ThemedSpinner } from "../components/spinner.js";
 import { ThemedText } from "../components/text.js";
-import { ConnectModal } from "./ConnectModal.js";
 import { ConnectedButton } from "./ConnectedButton.js";
 import { ConnectedModal } from "./ConnectedModal.js";
+import { ConnectModal } from "./ConnectModal.js";
 
 /**
  * A component that allows the user to connect their wallet.
@@ -59,15 +59,15 @@ export function ConnectButton(props: ConnectButtonProps) {
     setVisible(true);
     Animated.parallel([
       Animated.timing(fadeAnim.current, {
-        toValue: 1,
         duration: 300,
+        toValue: 1,
         useNativeDriver: true,
       }),
       Animated.timing(slideAnim.current, {
-        toValue: 0,
         duration: 300,
-        useNativeDriver: true,
         easing: Easing.out(Easing.exp),
+        toValue: 0,
+        useNativeDriver: true,
       }),
     ]).start();
   }, []);
@@ -88,15 +88,15 @@ export function ConnectButton(props: ConnectButtonProps) {
   const closeModal = useCallback(() => {
     Animated.parallel([
       Animated.timing(fadeAnim.current, {
-        toValue: 0,
         duration: 300,
+        toValue: 0,
         useNativeDriver: true,
       }),
       Animated.timing(slideAnim.current, {
-        toValue: screenHeight,
         duration: 300,
-        useNativeDriver: true,
         easing: Easing.in(Easing.exp),
+        toValue: screenHeight,
+        useNativeDriver: true,
       }),
     ]).start(() => {
       setVisible(false);
@@ -113,26 +113,24 @@ export function ConnectButton(props: ConnectButtonProps) {
     <View>
       {isConnectedAndAuth ? (
         <ConnectedButton
-          openModal={() => openModal()}
+          account={account}
           onClose={closeModal}
+          openModal={() => openModal()}
           wallet={wallet}
-          account={account}
           {...props}
         />
       ) : (
-        <ThemedButton theme={theme} onPress={() => openModal()}>
+        <ThemedButton onPress={() => openModal()} theme={theme}>
           {status === "connecting" ||
           siweAuth.isLoggingIn ||
           siweAuth.isLoading ||
           siweAuth.isLoggingOut ? (
-            <>
-              <ThemedSpinner color={theme.colors.primaryButtonText} />
-            </>
+            <ThemedSpinner color={theme.colors.primaryButtonText} />
           ) : (
             <ThemedText
+              style={{ color: theme.colors.primaryButtonText }}
               theme={theme}
               type="defaultSemiBold"
-              style={{ color: theme.colors.primaryButtonText }}
             >
               {isConnectedAndNotAuth
                 ? props.signInButton?.label || "Sign In"
@@ -142,10 +140,10 @@ export function ConnectButton(props: ConnectButtonProps) {
         </ThemedButton>
       )}
       <Modal
-        visible={visible}
         animationType="none"
-        transparent={true}
         onRequestClose={closeModal}
+        transparent={true}
+        visible={visible}
       >
         <KeyboardAvoidingView behavior="padding" style={{ flex: 1 }}>
           <Animated.View
@@ -156,24 +154,24 @@ export function ConnectButton(props: ConnectButtonProps) {
               { flex: 1, transform: [{ translateY: slideAnim.current }] },
             ]}
           >
-            <Pressable style={styles.dismissArea} onPress={closeModal} />
+            <Pressable onPress={closeModal} style={styles.dismissArea} />
             <View style={styles.bottomSheetContainer}>
               {isConnectedAndAuth ? (
                 <ConnectedModal
                   {...props}
-                  theme={theme}
-                  onClose={closeModal}
+                  account={account}
                   containerType="modal"
+                  onClose={closeModal}
+                  theme={theme}
                   wallet={wallet}
-                  account={account}
                 />
               ) : (
                 <ConnectModal
                   {...props}
-                  theme={theme}
-                  onClose={closeModal}
                   containerType="modal"
+                  onClose={closeModal}
                   siweAuth={siweAuth}
+                  theme={theme}
                 />
               )}
             </View>
@@ -189,19 +187,19 @@ const modalHeight = 520;
 const screenWidth = Dimensions.get("window").width;
 
 const styles = StyleSheet.create({
-  modalOverlay: {
-    position: "absolute",
+  bottomSheetContainer: {
+    flexDirection: "column",
+    height: modalHeight,
     width: screenWidth,
-    height: screenHeight,
-    backgroundColor: "rgba(0,0,0,0.8)",
   },
   dismissArea: {
-    width: "100%",
     flex: 1,
+    width: "100%",
   },
-  bottomSheetContainer: {
-    height: modalHeight,
+  modalOverlay: {
+    backgroundColor: "rgba(0,0,0,0.8)",
+    height: screenHeight,
+    position: "absolute",
     width: screenWidth,
-    flexDirection: "column",
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/ConnectModal.tsx b/packages/thirdweb/src/react/native/ui/connect/ConnectModal.tsx
index 050d7a3d179..2cd6fb0d7cf 100644
--- a/packages/thirdweb/src/react/native/ui/connect/ConnectModal.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/ConnectModal.tsx
@@ -18,16 +18,16 @@ import { useConnectionManager } from "../../../core/providers/connection-manager
 import { useWalletInfo } from "../../../core/utils/wallet.js";
 import { radius, spacing } from "../../design-system/index.js";
 import { getDefaultWallets } from "../../wallets/defaultWallets.js";
+import { ThemedButton, ThemedButtonWithIcon } from "../components/button.js";
 import { type ContainerType, Header } from "../components/Header.js";
 import { RNImage } from "../components/RNImage.js";
-import {
-  WalletImage,
-  getAuthProviderImage,
-} from "../components/WalletImage.js";
-import { ThemedButton, ThemedButtonWithIcon } from "../components/button.js";
 import { Spacer } from "../components/spacer.js";
 import { ThemedText } from "../components/text.js";
 import { ThemedView } from "../components/view.js";
+import {
+  getAuthProviderImage,
+  WalletImage,
+} from "../components/WalletImage.js";
 import { TW_ICON, WALLET_ICON } from "../icons/svgs.js";
 import { ErrorView } from "./ErrorView.js";
 import { AllWalletsList, ExternalWalletsList } from "./ExternalWalletsList.js";
@@ -77,9 +77,9 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
   return isConnected ? null : (
     <ConnectModal
       {...adaptedProps}
-      theme={theme}
       containerType="embed"
       siweAuth={siweAuth}
+      theme={theme}
     />
   );
 }
@@ -121,15 +121,15 @@ export function ConnectModal(
       authMethod?: InAppWalletAuth;
     }) => {
       setModalState({
+        authMethod: args.authMethod,
         screen: "connecting",
         wallet: args.wallet,
-        authMethod: args.authMethod,
       });
       try {
         const w = await args.connectFn(props.chain);
         await connectionManager.connect(w, {
-          client,
           accountAbstraction,
+          client,
           onConnect,
         });
         if (siweAuth.requiresAuth && !siweAuth.isLoggedIn) {
@@ -148,8 +148,8 @@ export function ConnectModal(
         }
       } catch (error) {
         setModalState({
-          screen: "error",
           error: (error as Error)?.message || "Unknown error",
+          screen: "error",
         });
       }
     },
@@ -171,10 +171,10 @@ export function ConnectModal(
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
             containerType={containerType}
             onBack={() => setModalState({ screen: "base" })}
+            onClose={props.onClose}
+            theme={theme}
             title={props.connectModal?.title || "Sign in"}
           />
           <Spacer size="xl" />
@@ -187,11 +187,11 @@ export function ConnectModal(
           >
             <OtpLogin
               auth={modalState.auth}
-              wallet={modalState.wallet}
               client={client}
+              connector={connector}
               setScreen={setModalState}
               theme={theme}
-              connector={connector}
+              wallet={modalState.wallet}
             />
           </View>
           {containerType === "modal" ? (
@@ -207,21 +207,21 @@ export function ConnectModal(
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
             containerType={containerType}
             onBack={() => setModalState({ screen: "base" })}
+            onClose={props.onClose}
+            theme={theme}
             title={props.connectModal?.title || "Sign in"}
           />
           <Spacer size="lg" />
           <ExternalWalletsList
-            theme={theme}
-            externalWallets={externalWallets}
             client={client}
             connector={connector}
             containerType={containerType}
-            showAllWalletsButton={props.showAllWallets !== false}
+            externalWallets={externalWallets}
             onShowAllWallets={() => setModalState({ screen: "all_wallets" })}
+            showAllWalletsButton={props.showAllWallets !== false}
+            theme={theme}
           />
         </>
       );
@@ -231,23 +231,23 @@ export function ConnectModal(
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
             containerType={containerType}
             onBack={() =>
               inAppWallet
                 ? setModalState({ screen: "external_wallets" })
                 : setModalState({ screen: "base" })
             }
+            onClose={props.onClose}
+            theme={theme}
             title={props.connectModal?.title || "Select Wallet"}
           />
           <Spacer size="lg" />
           <AllWalletsList
-            theme={theme}
-            externalWallets={externalWallets}
             client={client}
             connector={connector}
             containerType={containerType}
+            externalWallets={externalWallets}
+            theme={theme}
           />
         </>
       );
@@ -257,10 +257,10 @@ export function ConnectModal(
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
             containerType={containerType}
             onBack={() => setModalState({ screen: "base" })}
+            onClose={props.onClose}
+            theme={theme}
             title={props.connectModal?.title || "Sign in"}
           />
           {containerType === "modal" ? (
@@ -269,10 +269,10 @@ export function ConnectModal(
             <Spacer size="lg" />
           )}
           <WalletLoadingView
+            authProvider={modalState.authMethod}
+            client={client}
             theme={theme}
             wallet={modalState.wallet}
-            client={client}
-            authProvider={modalState.authMethod}
           />
           {containerType === "modal" ? (
             <View style={{ flex: 1 }} />
@@ -287,10 +287,10 @@ export function ConnectModal(
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
             containerType={containerType}
             onBack={() => setModalState({ screen: "base" })}
+            onClose={props.onClose}
+            theme={theme}
             title={props.connectModal?.title || "Sign in"}
           />
           {containerType === "modal" ? (
@@ -299,11 +299,11 @@ export function ConnectModal(
             <Spacer size="lg" />
           )}
           <PasskeyView
-            wallet={modalState.wallet}
             client={client}
+            connector={connector}
             setScreen={setModalState}
             theme={theme}
-            connector={connector}
+            wallet={modalState.wallet}
           />
           {containerType === "modal" ? (
             <View style={{ flex: 1 }} />
@@ -318,10 +318,10 @@ export function ConnectModal(
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
             containerType={containerType}
             onBack={props.onClose}
+            onClose={props.onClose}
+            theme={theme}
             title={props.connectModal?.title || "Sign in"}
           />
           {containerType === "modal" ? (
@@ -330,12 +330,12 @@ export function ConnectModal(
             <Spacer size="lg" />
           )}
           <SignInView
-            theme={theme}
             client={client}
-            siweAuth={siweAuth}
-            onSignIn={() => props.onClose?.()}
-            onError={(error) => setModalState({ screen: "error", error })}
             onDisconnect={() => setModalState({ screen: "base" })}
+            onError={(error) => setModalState({ error, screen: "error" })}
+            onSignIn={() => props.onClose?.()}
+            siweAuth={siweAuth}
+            theme={theme}
           />
           {containerType === "modal" ? (
             <View style={{ flex: 1 }} />
@@ -350,10 +350,10 @@ export function ConnectModal(
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
             containerType={containerType}
             onBack={() => setModalState({ screen: "base" })}
+            onClose={props.onClose}
+            theme={theme}
             title={props.connectModal?.title || "Sign in"}
           />
           {containerType === "modal" ? (
@@ -375,9 +375,9 @@ export function ConnectModal(
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
             containerType={containerType}
+            onClose={props.onClose}
+            theme={theme}
             title={props.connectModal?.title || "Sign in"}
           />
           {inAppWallet ? (
@@ -395,22 +395,22 @@ export function ConnectModal(
                 }}
               >
                 <InAppWalletUI
-                  wallet={inAppWallet}
-                  setScreen={setModalState}
                   client={client}
-                  theme={theme}
                   connector={connector}
+                  setScreen={setModalState}
+                  theme={theme}
+                  wallet={inAppWallet}
                 />
                 {externalWallets.length > 0 ? (
                   <>
                     <OrDivider theme={theme} />
                     <ThemedButtonWithIcon
-                      theme={theme}
                       icon={WALLET_ICON}
-                      title="Connect a wallet"
                       onPress={() =>
                         setModalState({ screen: "external_wallets" })
                       }
+                      theme={theme}
+                      title="Connect a wallet"
                     />
                   </>
                 ) : null}
@@ -430,15 +430,15 @@ export function ConnectModal(
                 }}
               >
                 <ExternalWalletsList
-                  theme={theme}
-                  externalWallets={externalWallets}
                   client={client}
                   connector={connector}
                   containerType={containerType}
-                  showAllWalletsButton={props.showAllWallets !== false}
+                  externalWallets={externalWallets}
                   onShowAllWallets={() =>
                     setModalState({ screen: "all_wallets" })
                   }
+                  showAllWalletsButton={props.showAllWallets !== false}
+                  theme={theme}
                 />
               </View>
             </>
@@ -450,12 +450,12 @@ export function ConnectModal(
 
   return (
     <ThemedView
-      theme={theme}
       style={
         containerType === "modal"
           ? styles.modalContainer
           : styles.embedContainer
       }
+      theme={theme}
     >
       {content}
       {showBranding && <PoweredByThirdweb theme={theme} />}
@@ -478,18 +478,18 @@ function WalletLoadingView({
   return (
     <View
       style={{
-        flexDirection: "column",
-        flex: 1,
         alignItems: "center",
+        flex: 1,
+        flexDirection: "column",
         justifyContent: "center",
         paddingVertical: spacing.xl,
       }}
     >
       <WalletLoadingThumbnail
-        theme={theme}
-        imageSize={100}
         animate={true}
+        imageSize={100}
         roundLoader={authProvider === "passkey"}
+        theme={theme}
       >
         {authProvider ? (
           <View
@@ -499,18 +499,18 @@ function WalletLoadingView({
             }}
           >
             <RNImage
-              theme={theme}
-              size={80}
-              data={getAuthProviderImage(authProvider)}
               color={theme.colors.accentButtonBg}
+              data={getAuthProviderImage(authProvider)}
+              size={80}
+              theme={theme}
             />
           </View>
         ) : (
           <WalletImage
-            theme={theme}
+            client={client}
             size={90}
+            theme={theme}
             wallet={wallet}
-            client={client}
           />
         )}
       </WalletLoadingThumbnail>
@@ -553,23 +553,23 @@ function SignInView({
     wallet && (
       <View
         style={{
-          flexDirection: "column",
-          flex: 1,
           alignItems: "center",
+          flex: 1,
+          flexDirection: "column",
           justifyContent: "center",
           padding: spacing.xl,
         }}
       >
         <WalletLoadingThumbnail
-          theme={theme}
-          imageSize={100}
           animate={isSigningIn}
+          imageSize={100}
+          theme={theme}
         >
           <WalletImage
-            theme={theme}
+            client={client}
             size={90}
+            theme={theme}
             wallet={wallet}
-            client={client}
           />
         </WalletLoadingThumbnail>
         <Spacer size="xl" />
@@ -582,10 +582,7 @@ function SignInView({
         </ThemedText>
         <Spacer size="xl" />
         <ThemedButton
-          theme={theme}
-          variant="accent"
           disabled={isSigningIn}
-          style={{ width: "100%" }}
           onPress={async () => {
             try {
               await siweAuth.doLogin();
@@ -594,35 +591,38 @@ function SignInView({
               onError((e as Error)?.message || "Unknown error");
             }
           }}
+          style={{ width: "100%" }}
+          theme={theme}
+          variant="accent"
         >
           <ThemedText
-            theme={theme}
-            type="defaultSemiBold"
             style={{
               color: theme.colors.accentButtonText,
             }}
+            theme={theme}
+            type="defaultSemiBold"
           >
             Sign login request
           </ThemedText>
         </ThemedButton>
         <Spacer size="md" />
         <ThemedButton
-          theme={theme}
-          variant="secondary"
           disabled={isSigningIn}
-          style={{ width: "100%" }}
           onPress={async () => {
             disconnect(wallet);
             siweAuth.doLogout();
             onDisconnect();
           }}
+          style={{ width: "100%" }}
+          theme={theme}
+          variant="secondary"
         >
           <ThemedText
-            theme={theme}
-            type="defaultSemiBold"
             style={{
               color: theme.colors.secondaryButtonText,
             }}
+            theme={theme}
+            type="defaultSemiBold"
           >
             Disconnect
           </ThemedText>
@@ -636,27 +636,27 @@ function OrDivider({ theme }: { theme: Theme }) {
   return (
     <View
       style={{
-        flexDirection: "row",
         alignItems: "center",
-        justifyContent: "center",
+        flexDirection: "row",
         gap: spacing.lg,
+        justifyContent: "center",
       }}
     >
       <View
         style={{
+          backgroundColor: theme.colors.borderColor,
           flex: 1,
           height: 1,
-          backgroundColor: theme.colors.borderColor,
         }}
       />
-      <ThemedText theme={theme} style={{ color: theme.colors.secondaryText }}>
+      <ThemedText style={{ color: theme.colors.secondaryText }} theme={theme}>
         OR
       </ThemedText>
       <View
         style={{
+          backgroundColor: theme.colors.borderColor,
           flex: 1,
           height: 1,
-          backgroundColor: theme.colors.borderColor,
         }}
       />
     </View>
@@ -667,10 +667,10 @@ function PoweredByThirdweb({ theme }: { theme: Theme }) {
   return (
     <View
       style={{
-        flexDirection: "row",
-        justifyContent: "center",
         alignItems: "center",
+        flexDirection: "row",
         gap: spacing.xs,
+        justifyContent: "center",
         paddingBottom: Platform.OS === "android" ? spacing.md : spacing.lg,
       }}
     >
@@ -678,13 +678,13 @@ function PoweredByThirdweb({ theme }: { theme: Theme }) {
         Powered by
       </ThemedText>
       <SvgXml
-        xml={TW_ICON}
-        width={22}
+        color={theme.colors.secondaryText}
         height={22}
         style={{ marginBottom: -2 }}
-        color={theme.colors.secondaryText}
+        width={22}
+        xml={TW_ICON}
       />
-      <ThemedText theme={theme} type="subtext" style={{ fontWeight: "600" }}>
+      <ThemedText style={{ fontWeight: "600" }} theme={theme} type="subtext">
         thirdweb
       </ThemedText>
     </View>
@@ -697,17 +697,17 @@ function capitalizeFirstLetter(str: string): string {
 }
 
 const styles = StyleSheet.create({
-  modalContainer: {
+  embedContainer: {
+    backgroundColor: "transparent",
     flex: 1,
-    width: "100%",
     flexDirection: "column",
+    width: "100%",
+  },
+  modalContainer: {
     borderTopLeftRadius: radius.lg,
     borderTopRightRadius: radius.lg,
-  },
-  embedContainer: {
     flex: 1,
-    width: "100%",
     flexDirection: "column",
-    backgroundColor: "transparent",
+    width: "100%",
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/ConnectedButton.tsx b/packages/thirdweb/src/react/native/ui/connect/ConnectedButton.tsx
index 4243381b2e8..330e4f3c4e9 100644
--- a/packages/thirdweb/src/react/native/ui/connect/ConnectedButton.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/ConnectedButton.tsx
@@ -6,10 +6,10 @@ import type { ConnectButtonProps } from "../../../core/hooks/connection/ConnectB
 import { useActiveWalletChain } from "../../../core/hooks/wallets/useActiveWalletChain.js";
 import { useConnectedWalletDetails } from "../../../core/utils/wallet.js";
 import { fontSize, spacing } from "../../design-system/index.js";
-import { Skeleton } from "../components/Skeleton.js";
-import { WalletImage } from "../components/WalletImage.js";
 import { ThemedButton } from "../components/button.js";
+import { Skeleton } from "../components/Skeleton.js";
 import { ThemedText } from "../components/text.js";
+import { WalletImage } from "../components/WalletImage.js";
 
 export function ConnectedButton(
   props: ConnectButtonProps & {
@@ -30,7 +30,6 @@ export function ConnectedButton(
   );
   return (
     <ThemedButton
-      theme={theme}
       onPress={() => {
         props.openModal();
       }}
@@ -38,41 +37,42 @@ export function ConnectedButton(
         paddingHorizontal: spacing.md,
         paddingVertical: spacing.smd,
       }}
+      theme={theme}
     >
       <View style={styles.row}>
         <WalletImage
-          theme={theme}
-          size={40}
-          wallet={wallet}
           avatar={pfp}
           client={client}
+          size={40}
+          theme={theme}
+          wallet={wallet}
         />
         <View style={styles.col}>
           <ThemedText
-            theme={theme}
-            type="defaultSemiBold"
             style={{
               color: theme.colors.primaryButtonText,
             }}
+            theme={theme}
+            type="defaultSemiBold"
           >
             {name}
           </ThemedText>
           {balanceQuery.data ? (
             <ThemedText
-              theme={theme}
-              type="subtext"
               style={{
                 fontSize: fontSize.sm,
               }}
+              theme={theme}
+              type="subtext"
             >
               {formatBalanceOnButton(Number(balanceQuery.data.displayValue))}{" "}
               {balanceQuery.data?.symbol}
             </ThemedText>
           ) : (
             <Skeleton
-              theme={theme}
-              style={{ width: 80, height: 16 }}
               color={theme.colors.secondaryText}
+              style={{ height: 16, width: 80 }}
+              theme={theme}
             />
           )}
         </View>
@@ -86,14 +86,14 @@ function formatBalanceOnButton(num: number) {
 }
 
 const styles = StyleSheet.create({
-  row: {
-    flexDirection: "row",
-    flex: 1,
-    gap: spacing.md,
-    alignItems: "center",
-  },
   col: {
     flexDirection: "column",
     gap: spacing.xxs,
   },
+  row: {
+    alignItems: "center",
+    flex: 1,
+    flexDirection: "row",
+    gap: spacing.md,
+  },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/ConnectedModal.tsx b/packages/thirdweb/src/react/native/ui/connect/ConnectedModal.tsx
index 434cb5ace72..98f3b2bb1e4 100644
--- a/packages/thirdweb/src/react/native/ui/connect/ConnectedModal.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/ConnectedModal.tsx
@@ -17,15 +17,15 @@ import { useDisconnect } from "../../../core/hooks/wallets/useDisconnect.js";
 import { useConnectedWalletDetails } from "../../../core/utils/wallet.js";
 import { fontSize, radius, spacing } from "../../design-system/index.js";
 import { Address } from "../components/Address.js";
+import { ThemedButton } from "../components/button.js";
 import { ChainIcon } from "../components/ChainIcon.js";
 import { type ContainerType, Header } from "../components/Header.js";
 import { RNImage } from "../components/RNImage.js";
 import { Skeleton } from "../components/Skeleton.js";
-import { WalletImage } from "../components/WalletImage.js";
-import { ThemedButton } from "../components/button.js";
 import { Spacer } from "../components/spacer.js";
 import { ThemedText } from "../components/text.js";
 import { ThemedView } from "../components/view.js";
+import { WalletImage } from "../components/WalletImage.js";
 import {
   CLOSE_ICON,
   COINS_ICON,
@@ -70,12 +70,12 @@ export function ConnectedModal(props: ConnectedModalProps) {
     case "send": {
       content = (
         <SendScreen
-          theme={theme}
           client={client}
-          onClose={props.onClose}
-          onBack={() => setModalState({ screen: "account" })}
           containerType={containerType}
+          onBack={() => setModalState({ screen: "account" })}
+          onClose={props.onClose}
           supportedTokens={props.supportedTokens}
+          theme={theme}
         />
       );
       break;
@@ -84,12 +84,12 @@ export function ConnectedModal(props: ConnectedModalProps) {
       content = (
         <ReceiveScreen
           account={props.account}
-          wallet={props.wallet}
           client={props.client}
-          theme={theme}
           containerType={props.containerType}
           onBack={() => setModalState({ screen: "account" })}
           onClose={props.onClose}
+          theme={theme}
+          wallet={props.wallet}
         />
       );
       break;
@@ -98,17 +98,17 @@ export function ConnectedModal(props: ConnectedModalProps) {
       content = (
         <>
           <Header
-            theme={theme}
-            onClose={props.onClose}
-            onBack={() => setModalState({ screen: "account" })}
             containerType={containerType}
+            onBack={() => setModalState({ screen: "account" })}
+            onClose={props.onClose}
+            theme={theme}
             title="View Funds"
           />
           <Spacer size="xl" />
           <TokenListScreen
             client={client}
-            theme={theme}
             supportedTokens={props.supportedTokens}
+            theme={theme}
           />
         </>
       );
@@ -129,10 +129,10 @@ export function ConnectedModal(props: ConnectedModalProps) {
               }}
             >
               <RNImage
-                theme={theme}
+                color={theme.colors.secondaryIconColor}
                 data={CLOSE_ICON}
                 size={24}
-                color={theme.colors.secondaryIconColor}
+                theme={theme}
               />
             </TouchableOpacity>
           )}
@@ -149,12 +149,12 @@ export function ConnectedModal(props: ConnectedModalProps) {
 
   return (
     <ThemedView
-      theme={theme}
       style={
         containerType === "modal"
           ? styles.modalContainer
           : styles.embedContainer
       }
+      theme={theme}
     >
       {content}
     </ThemedView>
@@ -173,29 +173,29 @@ const AccountHeader = (props: ConnectedModalProps) => {
   return (
     <View style={styles.accountHeaderContainer}>
       <WalletImage
-        theme={theme}
-        size={70}
-        wallet={wallet}
         avatar={pfp}
         client={client}
+        size={70}
+        theme={theme}
+        wallet={wallet}
       />
       <SmartAccountBadge client={props.client} theme={theme} />
       <Spacer size="smd" />
-      <Address account={account} theme={theme} addressOrENS={name} />
+      <Address account={account} addressOrENS={name} theme={theme} />
       <Spacer size="xxs" />
       {balanceQuery.data ? (
         <ThemedText
-          theme={theme}
-          type="subtext"
           style={{
             fontSize: fontSize.sm,
           }}
+          theme={theme}
+          type="subtext"
         >
           {formatNumber(Number(balanceQuery.data.displayValue), 5)}{" "}
           {balanceQuery.data?.symbol}
         </ThemedText>
       ) : (
-        <Skeleton theme={theme} style={{ width: 80, height: 16 }} />
+        <Skeleton style={{ height: 16, width: 80 }} theme={theme} />
       )}
     </View>
   );
@@ -206,32 +206,32 @@ const WalletActionsRow = (props: ConnectedModalPropsInner) => {
   return (
     <View style={styles.walletActionRowContainer}>
       <ThemedButton
+        onPress={() => setModalState({ screen: "send" })}
+        style={styles.walletActionButton}
         theme={theme}
         variant="secondary"
-        style={styles.walletActionButton}
-        onPress={() => setModalState({ screen: "send" })}
       >
         <RNImage
-          theme={theme}
-          size={24}
-          data={SEND_ICON}
           color={theme.colors.secondaryIconColor}
+          data={SEND_ICON}
+          size={24}
+          theme={theme}
         />
         <ThemedText theme={theme} type="defaultSemiBold">
           Send
         </ThemedText>
       </ThemedButton>
       <ThemedButton
+        onPress={() => setModalState({ screen: "receive" })}
+        style={styles.walletActionButton}
         theme={theme}
         variant="secondary"
-        style={styles.walletActionButton}
-        onPress={() => setModalState({ screen: "receive" })}
       >
         <RNImage
-          theme={theme}
-          size={24}
-          data={RECEIVE_ICON}
           color={theme.colors.secondaryIconColor}
+          data={RECEIVE_ICON}
+          size={24}
+          theme={theme}
         />
         <ThemedText theme={theme} type="defaultSemiBold">
           Receive
@@ -260,13 +260,13 @@ const ChainSwitcher = (props: ConnectedModalPropsInner) => {
   const { name } = useChainName(chain);
   return (
     <TouchableOpacity style={styles.walletMenuRow}>
-      <ChainIcon client={client} size={32} chain={chain} theme={theme} />
+      <ChainIcon chain={chain} client={client} size={32} theme={theme} />
       {name ? (
         <ThemedText theme={theme} type="defaultSemiBold">
           {name}
         </ThemedText>
       ) : (
-        <Skeleton theme={theme} style={{ width: 80, height: 16 }} />
+        <Skeleton style={{ height: 16, width: 80 }} theme={theme} />
       )}
     </TouchableOpacity>
   );
@@ -276,14 +276,14 @@ const ViewFunds = (props: ConnectedModalPropsInner) => {
   const { theme, setModalState } = props;
   return (
     <TouchableOpacity
-      style={styles.walletMenuRow}
       onPress={() => setModalState({ screen: "view_funds" })}
+      style={styles.walletMenuRow}
     >
       <RNImage
-        theme={theme}
-        size={32}
-        data={COINS_ICON}
         color={theme.colors.secondaryIconColor}
+        data={COINS_ICON}
+        size={32}
+        theme={theme}
       />
       <ThemedText theme={theme} type="defaultSemiBold">
         View Funds
@@ -298,7 +298,6 @@ const DisconnectWallet = (props: ConnectedModalProps) => {
   const siweAuth = useSiweAuth(wallet, account, props.auth);
   return (
     <TouchableOpacity
-      style={styles.walletMenuRow}
       onPress={() => {
         onClose?.();
         disconnect(wallet);
@@ -306,12 +305,13 @@ const DisconnectWallet = (props: ConnectedModalProps) => {
           siweAuth.doLogout();
         }
       }}
+      style={styles.walletMenuRow}
     >
       <RNImage
-        theme={theme}
-        size={32}
-        data={EXIT_ICON}
         color={theme.colors.secondaryIconColor}
+        data={EXIT_ICON}
+        size={32}
+        theme={theme}
       />
       <ThemedText theme={theme} type="defaultSemiBold">
         Disconnect Wallet
@@ -320,10 +320,7 @@ const DisconnectWallet = (props: ConnectedModalProps) => {
   );
 };
 
-function SmartAccountBadge(props: {
-  theme: Theme;
-  client: ThirdwebClient;
-}) {
+function SmartAccountBadge(props: { theme: Theme; client: ThirdwebClient }) {
   const activeAccount = useActiveAccount();
   const activeWallet = useActiveWallet();
   const isSW = isSmartWallet(activeWallet);
@@ -351,26 +348,26 @@ function SmartAccountBadge(props: {
   const content = (
     <View
       style={{
-        flexDirection: "row",
         alignItems: "center",
-        justifyContent: "center",
-        gap: spacing.xs,
         backgroundColor: theme.colors.secondaryButtonBg,
         borderRadius: radius.md,
-        paddingVertical: spacing.xs,
+        flexDirection: "row",
+        gap: spacing.xs,
+        justifyContent: "center",
         paddingLeft: spacing.sm,
         paddingRight: spacing.smd,
+        paddingVertical: spacing.xs,
       }}
     >
       <RNImage
-        theme={theme}
+        color={theme.colors.accentButtonBg}
         data={SMART_WALLET_ICON}
         size={14}
-        color={theme.colors.accentButtonBg}
+        theme={theme}
       />
       <ThemedText
-        theme={theme}
         style={{ color: theme.colors.primaryText, fontSize: fontSize.xs }}
+        theme={theme}
       >
         Smart Account
       </ThemedText>
@@ -402,42 +399,42 @@ function SmartAccountBadge(props: {
 }
 
 const styles = StyleSheet.create({
-  modalContainer: {
-    flex: 1,
-    width: "100%",
+  accountHeaderContainer: {
+    alignItems: "center",
     flexDirection: "column",
-    borderTopLeftRadius: radius.lg,
-    borderTopRightRadius: radius.lg,
+    justifyContent: "center",
+    paddingHorizontal: spacing.lg,
   },
   embedContainer: {
+    backgroundColor: "transparent",
     flex: 1,
-    width: "100%",
     flexDirection: "column",
-    backgroundColor: "transparent",
+    width: "100%",
   },
-  accountHeaderContainer: {
+  modalContainer: {
+    borderTopLeftRadius: radius.lg,
+    borderTopRightRadius: radius.lg,
+    flex: 1,
     flexDirection: "column",
-    justifyContent: "center",
-    alignItems: "center",
-    paddingHorizontal: spacing.lg,
+    width: "100%",
   },
+  walletActionButton: { flex: 1, gap: spacing.smd, padding: spacing.smd },
   walletActionRowContainer: {
-    flexDirection: "row",
-    justifyContent: "space-evenly",
     alignItems: "center",
+    flexDirection: "row",
     gap: spacing.md,
+    justifyContent: "space-evenly",
     paddingHorizontal: spacing.lg,
   },
-  walletActionButton: { flex: 1, padding: spacing.smd, gap: spacing.smd },
   walletMenuContainer: {
     flexDirection: "column",
     gap: spacing.lg,
     paddingHorizontal: spacing.lg,
   },
   walletMenuRow: {
-    flexDirection: "row",
-    justifyContent: "flex-start",
     alignItems: "center",
+    flexDirection: "row",
     gap: spacing.md,
+    justifyContent: "flex-start",
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/ErrorView.tsx b/packages/thirdweb/src/react/native/ui/connect/ErrorView.tsx
index 362cf2c206d..c3c9b9657ea 100644
--- a/packages/thirdweb/src/react/native/ui/connect/ErrorView.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/ErrorView.tsx
@@ -16,15 +16,15 @@ export const ErrorView = (props: ErrorViewProps) => {
   return (
     <View style={styles.container}>
       <RNImage
-        theme={theme}
+        color={theme.colors.danger}
         data={CLOSE_CIRCLE}
         size={64}
-        color={theme.colors.danger}
+        theme={theme}
       />
       <ThemedText
-        type="defaultSemiBold"
-        theme={theme}
         style={{ color: theme.colors.danger, textAlign: "center" }}
+        theme={theme}
+        type="defaultSemiBold"
       >
         {title}
       </ThemedText>
@@ -34,11 +34,11 @@ export const ErrorView = (props: ErrorViewProps) => {
 
 const styles = StyleSheet.create({
   container: {
-    paddingHorizontal: spacing.lg,
-    paddingVertical: spacing.xxl,
-    flexDirection: "column",
-    justifyContent: "center",
     alignItems: "center",
+    flexDirection: "column",
     gap: spacing.lg,
+    justifyContent: "center",
+    paddingHorizontal: spacing.lg,
+    paddingVertical: spacing.xxl,
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/ExternalWalletsList.tsx b/packages/thirdweb/src/react/native/ui/connect/ExternalWalletsList.tsx
index aa3d40170d1..0d9c91edb64 100644
--- a/packages/thirdweb/src/react/native/ui/connect/ExternalWalletsList.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/ExternalWalletsList.tsx
@@ -19,9 +19,9 @@ import type { Theme } from "../../../core/design-system/index.js";
 import { useWalletImage, useWalletInfo } from "../../../core/utils/wallet.js";
 import { spacing } from "../../design-system/index.js";
 import type { ContainerType } from "../components/Header.js";
+import { ThemedInput } from "../components/input.js";
 import { RNImage } from "../components/RNImage.js";
 import { Skeleton } from "../components/Skeleton.js";
-import { ThemedInput } from "../components/input.js";
 import { Spacer } from "../components/spacer.js";
 import { ThemedText } from "../components/text.js";
 import { SEARCH_ICON } from "../icons/svgs.js";
@@ -46,14 +46,14 @@ export function ExternalWalletsList(
   const { connector, client, theme, externalWallets, onShowAllWallets } = props;
   const connectWallet = (wallet: Wallet) => {
     connector({
-      wallet,
       connectFn: async (chain) => {
         await wallet.connect({
-          client,
           chain,
+          client,
         });
         return wallet;
       },
+      wallet,
     });
   };
   return (
@@ -73,18 +73,18 @@ export function ExternalWalletsList(
         >
           {externalWallets.map((wallet) => (
             <ExternalWalletRow
-              key={wallet.id}
-              wallet={wallet}
               connectWallet={connectWallet}
+              key={wallet.id}
               theme={theme}
+              wallet={wallet}
             />
           ))}
           {props.showAllWalletsButton && (
-            <ShowAllWalletsRow theme={theme} onPress={onShowAllWallets} />
+            <ShowAllWalletsRow onPress={onShowAllWallets} theme={theme} />
           )}
         </View>
       </ScrollView>
-      <NewToWallets theme={props.theme} containerType={props.containerType} />
+      <NewToWallets containerType={props.containerType} theme={props.theme} />
     </View>
   );
 }
@@ -114,14 +114,14 @@ export function AllWalletsList(
 
   const connectWallet = (wallet: Wallet) => {
     connector({
-      wallet,
       connectFn: async (chain) => {
         await wallet.connect({
-          client,
           chain,
+          client,
         });
         return wallet;
       },
+      wallet,
     });
   };
 
@@ -129,47 +129,47 @@ export function AllWalletsList(
     <View style={styles.container}>
       <View style={styles.searchContainer}>
         <ThemedInput
-          theme={theme}
           leftView={
             <View
               style={{
-                padding: spacing.sm,
-                width: 48,
                 flexDirection: "row",
                 justifyContent: "center",
+                padding: spacing.sm,
+                width: 48,
               }}
             >
               <RNImage
+                color={theme.colors.secondaryIconColor}
                 data={SEARCH_ICON}
                 size={24}
                 theme={theme}
-                color={theme.colors.secondaryIconColor}
               />
             </View>
           }
+          onChangeText={setSearchQuery}
           placeholder="Search Wallet"
+          theme={theme}
           value={searchQuery}
-          onChangeText={setSearchQuery}
         />
       </View>
       <Spacer size="md" />
       <FlatList
-        style={{
-          flex: 1,
-          paddingHorizontal: props.containerType === "modal" ? spacing.lg : 0,
-          paddingBottom: spacing.md,
-        }}
         data={walletsToShow}
+        ItemSeparatorComponent={() => <View style={{ height: spacing.md }} />}
+        keyExtractor={(walletId) => walletId}
         renderItem={({ item: walletId }) => (
           <ExternalWalletRow
-            key={walletId}
-            wallet={createWallet(walletId as WalletId)}
             connectWallet={connectWallet}
+            key={walletId}
             theme={theme}
+            wallet={createWallet(walletId as WalletId)}
           />
         )}
-        keyExtractor={(walletId) => walletId}
-        ItemSeparatorComponent={() => <View style={{ height: spacing.md }} />}
+        style={{
+          flex: 1,
+          paddingBottom: spacing.md,
+          paddingHorizontal: props.containerType === "modal" ? spacing.lg : 0,
+        }}
       />
     </View>
   );
@@ -184,19 +184,19 @@ function ExternalWalletRow(props: {
   const imageQuery = useWalletImage(wallet.id);
   const infoQuery = useWalletInfo(wallet.id);
   return (
-    <TouchableOpacity style={styles.row} onPress={() => connectWallet(wallet)}>
+    <TouchableOpacity onPress={() => connectWallet(wallet)} style={styles.row}>
       {imageQuery.data ? (
         <Image
           source={{ uri: imageQuery.data ?? "" }}
-          style={{ width: 52, height: 52, borderRadius: 6 }}
+          style={{ borderRadius: 6, height: 52, width: 52 }}
         />
       ) : (
         <Skeleton
-          theme={theme}
           style={{
-            width: 52,
             height: 52,
+            width: 52,
           }}
+          theme={theme}
         />
       )}
       <ThemedText theme={theme} type="subtitle">
@@ -206,26 +206,23 @@ function ExternalWalletRow(props: {
   );
 }
 
-function ShowAllWalletsRow(props: {
-  theme: Theme;
-  onPress: () => void;
-}) {
+function ShowAllWalletsRow(props: { theme: Theme; onPress: () => void }) {
   const { theme, onPress } = props;
   return (
-    <TouchableOpacity style={styles.row} onPress={onPress}>
+    <TouchableOpacity onPress={onPress} style={styles.row}>
       <View
         style={{
-          width: 52,
-          height: 52,
-          flexDirection: "row",
-          flexWrap: "wrap",
-          justifyContent: "space-between",
           alignContent: "space-between",
           backgroundColor: theme.colors.secondaryButtonBg,
           borderColor: theme.colors.borderColor,
+          borderRadius: 6,
           borderWidth: 1,
+          flexDirection: "row",
+          flexWrap: "wrap",
+          height: 52,
+          justifyContent: "space-between",
           padding: 8,
-          borderRadius: 6,
+          width: 52,
         }}
       >
         {[...Array(4)].map((_, index) => (
@@ -233,10 +230,10 @@ function ShowAllWalletsRow(props: {
             // biome-ignore lint/suspicious/noArrayIndexKey: only have index as key
             key={index}
             style={{
-              width: 14,
-              height: 14,
-              borderRadius: 7,
               backgroundColor: theme.colors.secondaryIconColor,
+              borderRadius: 7,
+              height: 14,
+              width: 14,
             }}
           />
         ))}
@@ -251,16 +248,19 @@ function ShowAllWalletsRow(props: {
 function NewToWallets({
   theme,
   containerType,
-}: { theme: Theme; containerType: ContainerType }) {
+}: {
+  theme: Theme;
+  containerType: ContainerType;
+}) {
   return (
     <View
       style={[
         styles.row,
         {
-          borderTopWidth: 1,
           borderColor: theme.colors.borderColor,
-          paddingVertical: spacing.md,
+          borderTopWidth: 1,
           paddingHorizontal: containerType === "modal" ? spacing.lg : 0,
+          paddingVertical: spacing.md,
         },
       ]}
     >
@@ -269,12 +269,12 @@ function NewToWallets({
       </ThemedText>
       <View style={{ flex: 1 }} />
       <ThemedText
-        type="subtext"
-        style={{ color: theme.colors.primaryText }}
-        theme={theme}
         onPress={() =>
           Linking.openURL("https://blog.thirdweb.com/web3-wallet/")
         }
+        style={{ color: theme.colors.primaryText }}
+        theme={theme}
+        type="subtext"
       >
         Get started
       </ThemedText>
@@ -288,16 +288,16 @@ const styles = StyleSheet.create({
     flexDirection: "column",
   },
   row: {
+    alignItems: "center",
     flexDirection: "row",
     gap: spacing.md,
     justifyContent: "flex-start",
-    alignItems: "center",
   },
   searchContainer: {
+    alignItems: "center",
     flexDirection: "row",
     gap: spacing.md,
     justifyContent: "flex-start",
-    alignItems: "center",
     paddingHorizontal: spacing.lg,
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/InAppWalletUI.tsx b/packages/thirdweb/src/react/native/ui/connect/InAppWalletUI.tsx
index e555fea3031..e5db683a92f 100644
--- a/packages/thirdweb/src/react/native/ui/connect/InAppWalletUI.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/InAppWalletUI.tsx
@@ -22,12 +22,12 @@ import {
 import type { Theme } from "../../../core/design-system/index.js";
 import { setLastAuthProvider } from "../../../core/utils/storage.js";
 import { radius, spacing } from "../../design-system/index.js";
-import { RNImage } from "../components/RNImage.js";
-import { getAuthProviderImage } from "../components/WalletImage.js";
 import { ThemedButton, ThemedButtonWithIcon } from "../components/button.js";
 import { ThemedInput, ThemedInputWithSubmit } from "../components/input.js";
+import { RNImage } from "../components/RNImage.js";
 import { Spacer } from "../components/spacer.js";
 import { ThemedText } from "../components/text.js";
+import { getAuthProviderImage } from "../components/WalletImage.js";
 import {
   APPLE_ICON,
   COINBASE_ICON,
@@ -55,18 +55,18 @@ const defaultAuthOptions: InAppWalletAuth[] = [
 ];
 
 const socialIcons = {
-  google: GOOGLE_ICON,
-  facebook: FACEBOOK_ICON,
-  coinbase: COINBASE_ICON,
   apple: APPLE_ICON,
+  coinbase: COINBASE_ICON,
   discord: DISCORD_ICON,
-  line: LINE_ICON,
-  x: X_ICON,
+  facebook: FACEBOOK_ICON,
   farcaster: FARCASTER_ICON,
-  telegram: TELEGRAM_ICON,
   github: GITHUB_ICON,
-  twitch: TWITCH_ICON,
+  google: GOOGLE_ICON,
+  line: LINE_ICON,
   steam: STEAM_ICON,
+  telegram: TELEGRAM_ICON,
+  twitch: TWITCH_ICON,
+  x: X_ICON,
 };
 
 type InAppWalletFormUIProps = {
@@ -95,7 +95,7 @@ export function InAppWalletUI(props: InAppWalletFormUIProps) {
     <View style={styles.container}>
       <View style={styles.row}>
         {socialLogins.map((auth) => (
-          <SocialLogin key={auth} auth={auth} {...props} />
+          <SocialLogin auth={auth} key={auth} {...props} />
         ))}
       </View>
       {authOptions.includes("email") ? (
@@ -103,10 +103,10 @@ export function InAppWalletUI(props: InAppWalletFormUIProps) {
           <PreOtpLogin auth="email" {...props} />
         ) : (
           <ThemedButtonWithIcon
-            theme={theme}
-            title="Email address"
             icon={getAuthProviderImage("email")}
             onPress={() => setInputMode("email")}
+            theme={theme}
+            title="Email address"
           />
         )
       ) : null}
@@ -115,21 +115,21 @@ export function InAppWalletUI(props: InAppWalletFormUIProps) {
           <PreOtpLogin auth="phone" {...props} />
         ) : (
           <ThemedButtonWithIcon
-            theme={theme}
-            title="Phone number"
             icon={getAuthProviderImage("phone")}
             onPress={() => setInputMode("phone")}
+            theme={theme}
+            title="Phone number"
           />
         )
       ) : null}
       {authOptions.includes("passkey") ? (
         <ThemedButtonWithIcon
-          theme={theme}
-          title="Passkey"
           icon={getAuthProviderImage("passkey")}
           onPress={() => {
             props.setScreen({ screen: "passkey", wallet });
           }}
+          theme={theme}
+          title="Passkey"
         />
       ) : null}
       {authOptions.includes("guest") ? <GuestLogin {...props} /> : null}
@@ -141,7 +141,7 @@ function GuestLogin(props: InAppWalletFormUIProps) {
   const { theme, wallet, client, connector } = props;
   const connectInAppWallet = useCallback(() => {
     connector({
-      wallet,
+      authMethod: "guest",
       connectFn: async () => {
         await wallet.connect({
           client,
@@ -150,18 +150,18 @@ function GuestLogin(props: InAppWalletFormUIProps) {
         await setLastAuthProvider("guest", nativeLocalStorage);
         return wallet;
       },
-      authMethod: "guest",
+      wallet,
     });
   }, [connector, wallet, client]);
 
   return (
     <ThemedButtonWithIcon
-      theme={theme}
-      title="Continue as guest"
       icon={getAuthProviderImage("guest")}
       onPress={() => {
         connectInAppWallet();
       }}
+      theme={theme}
+      title="Continue as guest"
     />
   );
 }
@@ -174,30 +174,30 @@ function SocialLogin(
   const strategy = props.auth;
   const connectInAppWallet = useCallback(() => {
     connector({
-      wallet,
+      authMethod: auth,
       connectFn: async (chain) => {
         await wallet.connect({
+          chain,
           client,
           strategy: auth,
-          chain,
         });
         await setLastAuthProvider(auth, nativeLocalStorage);
         return wallet;
       },
-      authMethod: auth,
+      wallet,
     });
   }, [connector, auth, wallet, client]);
 
   return (
     <TouchableOpacity
+      key={strategy}
+      onPress={connectInAppWallet}
       style={[
         styles.socialIconContainer,
         { borderColor: theme.colors.borderColor },
       ]}
-      key={strategy}
-      onPress={connectInAppWallet}
     >
-      <RNImage theme={theme} size={38} data={socialIcons[auth]} />
+      <RNImage data={socialIcons[auth]} size={38} theme={theme} />
     </TouchableOpacity>
   );
 }
@@ -224,14 +224,14 @@ function PreOtpLogin(
         }
         await preAuthenticate({
           client,
-          strategy: auth,
           phoneNumber: phoneOrEmail,
+          strategy: auth,
         });
       } else {
         await preAuthenticate({
           client,
-          strategy: auth,
           email: phoneOrEmail,
+          strategy: auth,
         });
       }
     },
@@ -239,11 +239,9 @@ function PreOtpLogin(
 
   return (
     <ThemedInputWithSubmit
-      theme={theme}
-      placeholder={auth === "phone" ? "Phone number" : "Email address"}
-      onChangeText={setPhoneNumberOrEmail}
-      value={phoneOrEmail}
+      isSubmitting={sendCode.isPending}
       keyboardType={auth === "phone" ? "phone-pad" : "email-address"}
+      onChangeText={setPhoneNumberOrEmail}
       onSubmit={() =>
         sendCode.mutate(
           {
@@ -251,32 +249,34 @@ function PreOtpLogin(
             phoneOrEmail,
           },
           {
+            onError: (error) => {
+              // TODO (rn) - handle error toast or input error border/label
+              Alert.alert("Error", error.message);
+            },
             onSuccess: (_, vars) => {
               if (vars.auth === "phone") {
                 setScreen({
-                  screen: "otp",
                   auth: {
-                    strategy: vars.auth,
                     phoneNumber: vars.phoneOrEmail,
+                    strategy: vars.auth,
                   },
+                  screen: "otp",
                   wallet,
                 });
               } else {
                 setScreen({
+                  auth: { email: vars.phoneOrEmail, strategy: vars.auth },
                   screen: "otp",
-                  auth: { strategy: vars.auth, email: vars.phoneOrEmail },
                   wallet,
                 });
               }
             },
-            onError: (error) => {
-              // TODO (rn) - handle error toast or input error border/label
-              Alert.alert("Error", error.message);
-            },
           },
         )
       }
-      isSubmitting={sendCode.isPending}
+      placeholder={auth === "phone" ? "Phone number" : "Email address"}
+      theme={theme}
+      value={phoneOrEmail}
     />
   );
 }
@@ -292,29 +292,29 @@ export function OtpLogin(
   const connectInAppWallet = async () => {
     if (!verificationCode || !verificationCode) return;
     await connector({
-      wallet,
+      authMethod: auth.strategy,
       connectFn: async (chain) => {
         if (auth.strategy === "phone") {
           await wallet.connect({
+            chain,
             client,
-            strategy: auth.strategy,
             phoneNumber: auth.phoneNumber,
+            strategy: auth.strategy,
             verificationCode,
-            chain,
           });
         } else {
           await wallet.connect({
+            chain,
             client,
-            strategy: auth.strategy,
             email: auth.email,
+            strategy: auth.strategy,
             verificationCode,
-            chain,
           });
         }
         await setLastAuthProvider(auth.strategy, nativeLocalStorage);
         return wallet;
       },
-      authMethod: auth.strategy,
+      wallet,
     });
   };
 
@@ -322,12 +322,12 @@ export function OtpLogin(
     <>
       <View
         style={{
+          alignItems: "center",
           flexDirection: "column",
           justifyContent: "center",
-          alignItems: "center",
         }}
       >
-        <ThemedText theme={theme} style={{ color: theme.colors.secondaryText }}>
+        <ThemedText style={{ color: theme.colors.secondaryText }} theme={theme}>
           Enter the verification code sent to
         </ThemedText>
         <ThemedText theme={theme} type="defaultSemiBold">
@@ -336,17 +336,17 @@ export function OtpLogin(
       </View>
       <Spacer size="xs" />
       <ThemedInput
-        theme={theme}
-        placeholder="Verification code"
+        keyboardType="number-pad"
         onChangeText={setVerificationCode}
+        placeholder="Verification code"
+        theme={theme}
         value={verificationCode}
-        keyboardType="number-pad"
       />
-      <ThemedButton theme={theme} onPress={connectInAppWallet} variant="accent">
+      <ThemedButton onPress={connectInAppWallet} theme={theme} variant="accent">
         <ThemedText
+          style={{ color: theme.colors.accentButtonText }}
           theme={theme}
           type="defaultSemiBold"
-          style={{ color: theme.colors.accentButtonText }}
         >
           Verify
         </ThemedText>
@@ -398,52 +398,52 @@ export function PasskeyView(props: InAppWalletFormUIProps) {
     wallet && (
       <View
         style={{
-          flexDirection: "column",
           alignItems: "center",
+          flexDirection: "column",
           justifyContent: "center",
           padding: spacing.xl,
         }}
       >
         <RNImage
-          theme={theme}
-          size={90}
-          data={getAuthProviderImage("passkey")}
           color={theme.colors.accentButtonBg}
+          data={getAuthProviderImage("passkey")}
+          size={90}
+          theme={theme}
         />
         <Spacer size="xxl" />
         <ThemedButton
-          theme={theme}
-          variant="accent"
-          style={{ width: "100%" }}
           onPress={async () => {
             setScreen("signup");
           }}
+          style={{ width: "100%" }}
+          theme={theme}
+          variant="accent"
         >
           <ThemedText
-            theme={theme}
-            type="defaultSemiBold"
             style={{
               color: theme.colors.accentButtonText,
             }}
+            theme={theme}
+            type="defaultSemiBold"
           >
             Create a Passkey
           </ThemedText>
         </ThemedButton>
         <Spacer size="md" />
         <ThemedButton
-          theme={theme}
-          variant="secondary"
-          style={{ width: "100%" }}
           onPress={async () => {
             setScreen("login");
           }}
+          style={{ width: "100%" }}
+          theme={theme}
+          variant="secondary"
         >
           <ThemedText
-            theme={theme}
-            type="defaultSemiBold"
             style={{
               color: theme.colors.secondaryButtonText,
             }}
+            theme={theme}
+            type="defaultSemiBold"
           >
             I have a Passkey
           </ThemedText>
@@ -468,18 +468,18 @@ function PasskeyLoadingView(
     triggered.current = true;
     const connectInAppWallet = async (type: "sign-in" | "sign-up") => {
       await connector({
-        wallet,
+        authMethod: "passkey",
         connectFn: async (chain) => {
           await wallet.connect({
+            chain,
             client,
             strategy: "passkey",
             type,
-            chain,
           });
           await setLastAuthProvider("passkey", nativeLocalStorage);
           return wallet;
         },
-        authMethod: "passkey",
+        wallet,
       });
     };
     connectInAppWallet(type);
@@ -500,13 +500,13 @@ const styles = StyleSheet.create({
     justifyContent: "space-evenly",
   },
   socialIconContainer: {
-    flex: 1,
-    flexDirection: "column",
     alignItems: "center",
-    justifyContent: "center",
+    borderRadius: radius.lg,
     borderStyle: "solid",
     borderWidth: 1,
-    borderRadius: radius.lg,
+    flex: 1,
+    flexDirection: "column",
     height: 60,
+    justifyContent: "center",
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/LoadingView.tsx b/packages/thirdweb/src/react/native/ui/connect/LoadingView.tsx
index 65f2707b59b..e4fb377cd92 100644
--- a/packages/thirdweb/src/react/native/ui/connect/LoadingView.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/LoadingView.tsx
@@ -12,18 +12,18 @@ export const LoadingView = (props: LoadingViewProps) => {
 
   return (
     <View style={styles.container}>
-      <ThemedSpinner size="large" color={theme.colors.accentText} />
+      <ThemedSpinner color={theme.colors.accentText} size="large" />
     </View>
   );
 };
 
 const styles = StyleSheet.create({
   container: {
-    paddingHorizontal: spacing.lg,
-    paddingVertical: spacing.xxl,
-    flexDirection: "column",
-    justifyContent: "center",
     alignItems: "center",
+    flexDirection: "column",
     gap: spacing.lg,
+    justifyContent: "center",
+    paddingHorizontal: spacing.lg,
+    paddingVertical: spacing.xxl,
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/ReceiveScreen.tsx b/packages/thirdweb/src/react/native/ui/connect/ReceiveScreen.tsx
index 7923e629a92..36c4a8c1a32 100644
--- a/packages/thirdweb/src/react/native/ui/connect/ReceiveScreen.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/ReceiveScreen.tsx
@@ -6,9 +6,9 @@ import type { Theme } from "../../../core/design-system/index.js";
 import { spacing } from "../../design-system/index.js";
 import { Address } from "../components/Address.js";
 import { type ContainerType, Header } from "../components/Header.js";
-import { WalletImage } from "../components/WalletImage.js";
 import { Spacer } from "../components/spacer.js";
 import { ThemedText } from "../components/text.js";
+import { WalletImage } from "../components/WalletImage.js";
 
 type ReceiveScreenProps = {
   theme: Theme;
@@ -27,15 +27,15 @@ export const ReceiveScreen = (props: ReceiveScreenProps) => {
   return (
     <>
       <Header
-        theme={theme}
-        onClose={onClose}
-        onBack={onBack}
         containerType={containerType}
+        onBack={onBack}
+        onClose={onClose}
+        theme={theme}
         title="Receive Funds"
       />
       <View style={styles.container}>
         {/* TODO (rn) QR code scanning */}
-        <WalletImage theme={theme} wallet={wallet} size={80} client={client} />
+        <WalletImage client={client} size={80} theme={theme} wallet={wallet} />
         <Spacer size="lg" />
         <View
           style={[
@@ -50,9 +50,9 @@ export const ReceiveScreen = (props: ReceiveScreenProps) => {
           />
         </View>
         <ThemedText
+          style={{ textAlign: "center" }}
           theme={theme}
           type="subtext"
-          style={{ textAlign: "center" }}
         >
           Copy your address to send funds to this wallet
         </ThemedText>
@@ -62,23 +62,23 @@ export const ReceiveScreen = (props: ReceiveScreenProps) => {
 };
 
 const styles = StyleSheet.create({
-  container: {
-    paddingHorizontal: spacing.lg,
-    paddingVertical: spacing.xxl,
-    flexDirection: "column",
-    gap: spacing.md,
-    alignItems: "center",
-    justifyContent: "center",
-    flex: 1,
-  },
   addressContainer: {
-    width: "100%",
+    alignItems: "center",
+    borderRadius: spacing.lg,
+    borderWidth: 1,
     flexDirection: "row",
     gap: spacing.sm,
-    alignItems: "center",
     justifyContent: "center",
-    borderWidth: 1,
     padding: spacing.md,
-    borderRadius: spacing.lg,
+    width: "100%",
+  },
+  container: {
+    alignItems: "center",
+    flex: 1,
+    flexDirection: "column",
+    gap: spacing.md,
+    justifyContent: "center",
+    paddingHorizontal: spacing.lg,
+    paddingVertical: spacing.xxl,
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/SendScreen.tsx b/packages/thirdweb/src/react/native/ui/connect/SendScreen.tsx
index 07520cf9123..ee5ffd1fd70 100644
--- a/packages/thirdweb/src/react/native/ui/connect/SendScreen.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/SendScreen.tsx
@@ -11,8 +11,8 @@ import type {
   TokenInfo,
 } from "../../../core/utils/defaultTokens.js";
 import { radius, spacing } from "../../design-system/index.js";
-import { type ContainerType, Header } from "../components/Header.js";
 import { ThemedButton } from "../components/button.js";
+import { type ContainerType, Header } from "../components/Header.js";
 import { ThemedInput } from "../components/input.js";
 import { Spacer } from "../components/spacer.js";
 import { ThemedSpinner } from "../components/spinner.js";
@@ -56,12 +56,12 @@ export const SendScreen = (props: SendScreenProps) => {
         tokenAddress: selectedToken?.address,
       },
       {
-        onSuccess() {
-          setScreen("success");
-        },
         onError() {
           setScreen("error");
         },
+        onSuccess() {
+          setScreen("success");
+        },
       },
     );
   };
@@ -70,10 +70,10 @@ export const SendScreen = (props: SendScreenProps) => {
     return (
       <>
         <Header
-          theme={theme}
-          onClose={onClose}
-          onBack={() => setScreen("base")}
           containerType={containerType}
+          onBack={() => setScreen("base")}
+          onClose={onClose}
+          theme={theme}
           title="Funds Sent"
         />
         <Spacer size="xl" />
@@ -88,10 +88,10 @@ export const SendScreen = (props: SendScreenProps) => {
     return (
       <>
         <Header
-          theme={theme}
-          onClose={onClose}
-          onBack={() => setScreen("base")}
           containerType={containerType}
+          onBack={() => setScreen("base")}
+          onClose={onClose}
+          theme={theme}
           title="Error Sending Funds"
         />
         <Spacer size="xl" />
@@ -109,22 +109,22 @@ export const SendScreen = (props: SendScreenProps) => {
     return (
       <>
         <Header
-          theme={theme}
-          onClose={onClose}
-          onBack={() => setScreen("base")}
           containerType={containerType}
+          onBack={() => setScreen("base")}
+          onClose={onClose}
+          theme={theme}
           title="Token to Send"
         />
         <Spacer size="xl" />
         <View style={{ flex: 1 }}>
           <TokenListScreen
-            theme={theme}
             client={client}
-            supportedTokens={supportedTokens}
             onTokenSelected={(t) => {
               setSelectedToken(t);
               setScreen("base");
             }}
+            supportedTokens={supportedTokens}
+            theme={theme}
           />
         </View>
       </>
@@ -134,10 +134,10 @@ export const SendScreen = (props: SendScreenProps) => {
   return (
     <>
       <Header
-        theme={theme}
-        onClose={onClose}
-        onBack={onBack}
         containerType={containerType}
+        onBack={onBack}
+        onClose={onClose}
+        theme={theme}
         title="Send Funds"
       />
       <View style={styles.container}>
@@ -148,19 +148,19 @@ export const SendScreen = (props: SendScreenProps) => {
           <View
             style={{
               borderColor: theme.colors.borderColor,
+              borderRadius: radius.lg,
               borderWidth: 1,
               paddingHorizontal: spacing.md,
               paddingVertical: spacing.smd,
-              borderRadius: radius.lg,
             }}
           >
             <TokenRow
-              theme={theme}
-              client={client}
               address={account?.address}
               chain={chain}
-              token={selectedToken}
+              client={client}
               onTokenSelected={handleTokenClicked}
+              theme={theme}
+              token={selectedToken}
             />
           </View>
         </View>
@@ -169,13 +169,13 @@ export const SendScreen = (props: SendScreenProps) => {
             Send to
           </ThemedText>
           <ThemedInput
-            theme={theme}
+            autoCapitalize="none"
+            keyboardType="url"
             onChangeText={setReceiverAddress}
-            value={receiverAddress}
             placeholder="0x... / ENS name"
             textContentType="URL"
-            keyboardType="url"
-            autoCapitalize="none"
+            theme={theme}
+            value={receiverAddress}
           />
         </View>
         <View style={styles.inputContainer}>
@@ -183,37 +183,37 @@ export const SendScreen = (props: SendScreenProps) => {
             Amount
           </ThemedText>
           <ThemedInput
-            theme={theme}
-            onChangeText={setAmount}
-            value={amount}
             inputMode="numeric"
+            onChangeText={setAmount}
             rightView={
               <ThemedText
+                style={{ marginRight: spacing.md }}
                 theme={theme}
                 type="subtext"
-                style={{ marginRight: spacing.md }}
               >
                 {selectedToken?.symbol || symbol}
               </ThemedText>
             }
+            theme={theme}
+            value={amount}
           />
         </View>
         <View style={styles.inputContainer}>
           <ThemedButton
+            disabled={sendMutation.isPending}
+            onPress={handleSend}
             theme={theme}
             variant="accent"
-            onPress={handleSend}
-            disabled={sendMutation.isPending}
           >
             {sendMutation.isPending ? (
               <ThemedSpinner color={theme.colors.accentButtonText} />
             ) : (
               <ThemedText
-                theme={theme}
-                type="defaultSemiBold"
                 style={{
                   color: theme.colors.accentButtonText,
                 }}
+                theme={theme}
+                type="defaultSemiBold"
               >
                 Send
               </ThemedText>
@@ -227,10 +227,10 @@ export const SendScreen = (props: SendScreenProps) => {
 
 const styles = StyleSheet.create({
   container: {
-    paddingHorizontal: spacing.lg,
-    paddingVertical: spacing.lg,
     flexDirection: "column",
     gap: spacing.md,
+    paddingHorizontal: spacing.lg,
+    paddingVertical: spacing.lg,
   },
   inputContainer: {
     gap: spacing.sm,
diff --git a/packages/thirdweb/src/react/native/ui/connect/SuccessView.tsx b/packages/thirdweb/src/react/native/ui/connect/SuccessView.tsx
index 07396d2406c..53608ba8abc 100644
--- a/packages/thirdweb/src/react/native/ui/connect/SuccessView.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/SuccessView.tsx
@@ -16,15 +16,15 @@ export const SuccessView = (props: SuccessViewProps) => {
   return (
     <View style={styles.container}>
       <RNImage
-        theme={theme}
+        color={theme.colors.success}
         data={CHECK_CIRCLE}
         size={64}
-        color={theme.colors.success}
+        theme={theme}
       />
       <ThemedText
-        type="defaultSemiBold"
-        theme={theme}
         style={{ color: theme.colors.success, textAlign: "center" }}
+        theme={theme}
+        type="defaultSemiBold"
       >
         {title}
       </ThemedText>
@@ -34,11 +34,11 @@ export const SuccessView = (props: SuccessViewProps) => {
 
 const styles = StyleSheet.create({
   container: {
-    paddingHorizontal: spacing.lg,
-    paddingVertical: spacing.xxl,
-    flexDirection: "column",
-    justifyContent: "center",
     alignItems: "center",
+    flexDirection: "column",
     gap: spacing.lg,
+    justifyContent: "center",
+    paddingHorizontal: spacing.lg,
+    paddingVertical: spacing.xxl,
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/TokenListScreen.tsx b/packages/thirdweb/src/react/native/ui/connect/TokenListScreen.tsx
index ea0ebbdeede..45a79196c1b 100644
--- a/packages/thirdweb/src/react/native/ui/connect/TokenListScreen.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/TokenListScreen.tsx
@@ -7,9 +7,9 @@ import { useWalletBalance } from "../../../core/hooks/others/useWalletBalance.js
 import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
 import { useActiveWalletChain } from "../../../core/hooks/wallets/useActiveWalletChain.js";
 import {
+  defaultTokens,
   type SupportedTokens,
   type TokenInfo,
-  defaultTokens,
 } from "../../../core/utils/defaultTokens.js";
 import { spacing } from "../../design-system/index.js";
 import { RNImage } from "../components/RNImage.js";
@@ -35,22 +35,22 @@ export const TokenListScreen = (props: TokenListScreenProps) => {
     <ScrollView style={{ flex: 1 }}>
       <View style={styles.listContainer}>
         <TokenRow
-          chain={chain}
           address={account?.address}
+          chain={chain}
           client={props.client}
-          theme={props.theme}
           onTokenSelected={props.onTokenSelected}
+          theme={props.theme}
         />
         {tokens.map((t) => {
           return (
             <TokenRow
+              address={account?.address}
               chain={chain}
               client={props.client}
-              address={account?.address}
+              key={t.address}
+              onTokenSelected={props.onTokenSelected}
               theme={props.theme}
               token={t}
-              onTokenSelected={props.onTokenSelected}
-              key={t.address}
             />
           );
         })}
@@ -78,11 +78,11 @@ export const TokenRow = (props: {
   const inner = (
     <>
       <TokenIcon
-        token={token}
-        size={40}
         chain={chain}
         client={client}
+        size={40}
         theme={theme}
+        token={token}
       />
       <View style={{ flexDirection: "column", gap: spacing.xxs }}>
         <ThemedText theme={theme} type="defaultSemiBold">
@@ -95,17 +95,17 @@ export const TokenRow = (props: {
               {balanceQuery.data?.symbol}
             </ThemedText>
           ) : (
-            <Skeleton theme={theme} style={{ width: 80, height: 14 }} />
+            <Skeleton style={{ height: 14, width: 80 }} theme={theme} />
           ))}
       </View>
       {props.onTokenSelected && (
         <>
           <View style={{ flex: 1 }} />
           <RNImage
-            theme={theme}
-            size={24}
-            data={RIGHT_CHEVRON}
             color={theme.colors.secondaryIconColor}
+            data={RIGHT_CHEVRON}
+            size={24}
+            theme={theme}
           />
         </>
       )}
@@ -113,8 +113,8 @@ export const TokenRow = (props: {
   );
   return onTokenSelected ? (
     <TouchableOpacity
-      style={styles.tokenRowContainer}
       onPress={() => onTokenSelected(token)}
+      style={styles.tokenRowContainer}
     >
       {inner}
     </TouchableOpacity>
@@ -128,22 +128,22 @@ function formatBalanceOnButton(num: number) {
 }
 
 const styles = StyleSheet.create({
-  listContainer: {
+  emptyContainer: {
+    alignItems: "center",
+    flex: 1,
     flexDirection: "column",
+    justifyContent: "center",
+    padding: spacing.lg,
+  },
+  listContainer: {
     flex: 1,
-    paddingHorizontal: spacing.lg,
+    flexDirection: "column",
     gap: spacing.md,
+    paddingHorizontal: spacing.lg,
   },
   tokenRowContainer: {
+    alignItems: "center",
     flexDirection: "row",
     gap: spacing.md,
-    alignItems: "center",
-  },
-  emptyContainer: {
-    flexDirection: "column",
-    flex: 1,
-    justifyContent: "center",
-    alignItems: "center",
-    padding: spacing.lg,
   },
 });
diff --git a/packages/thirdweb/src/react/native/ui/connect/WalletLoadingThumbnail.tsx b/packages/thirdweb/src/react/native/ui/connect/WalletLoadingThumbnail.tsx
index 14d97cfe937..bd453b16a59 100644
--- a/packages/thirdweb/src/react/native/ui/connect/WalletLoadingThumbnail.tsx
+++ b/packages/thirdweb/src/react/native/ui/connect/WalletLoadingThumbnail.tsx
@@ -31,10 +31,10 @@ function WalletLoadingThumbnail({
   useEffect(() => {
     if (!animate) return;
     const animation = Animated.timing(spinValue.current, {
-      toValue: 1,
       duration: 1150,
-      useNativeDriver: true,
       easing: Easing.linear,
+      toValue: 1,
+      useNativeDriver: true,
     });
 
     const loop = Animated.loop(animation);
@@ -55,23 +55,23 @@ function WalletLoadingThumbnail({
   return (
     <View style={styles.container}>
       <Svg
-        width={imageSize + PADDING}
         height={imageSize + PADDING}
-        viewBox={`0 0 ${imageSize + PADDING} ${imageSize + PADDING}`}
         style={styles.loader}
+        viewBox={`0 0 ${imageSize + PADDING} ${imageSize + PADDING}`}
+        width={imageSize + PADDING}
       >
         {animate && (
           <AnimatedRect
-            x="2"
-            y="2"
-            width={imageSize + INTERNAL_PADDING}
+            fill="transparent"
             height={imageSize + INTERNAL_PADDING}
             rx={rx}
             stroke={showError ? "transparent" : theme.colors.accentText}
-            strokeWidth={3}
-            fill="transparent"
             strokeDasharray="100 300"
             strokeDashoffset={spin}
+            strokeWidth={3}
+            width={imageSize + INTERNAL_PADDING}
+            x="2"
+            y="2"
           />
         )}
       </Svg>
@@ -79,12 +79,12 @@ function WalletLoadingThumbnail({
         <View
           style={[
             {
-              position: "absolute",
+              borderColor: theme.colors.borderColor,
+              borderRadius: radius.lg,
               borderWidth: 3,
               height: imageSize + INTERNAL_PADDING,
+              position: "absolute",
               width: imageSize + INTERNAL_PADDING,
-              borderRadius: radius.lg,
-              borderColor: theme.colors.borderColor,
             },
           ]}
         />
diff --git a/packages/thirdweb/src/react/native/ui/prebuilt/Account/avatar.tsx b/packages/thirdweb/src/react/native/ui/prebuilt/Account/avatar.tsx
index 51c2f1308c7..a2a3fa46a1d 100644
--- a/packages/thirdweb/src/react/native/ui/prebuilt/Account/avatar.tsx
+++ b/packages/thirdweb/src/react/native/ui/prebuilt/Account/avatar.tsx
@@ -162,18 +162,12 @@ export function AccountAvatar({
 }: AccountAvatarProps) {
   const { address, client } = useAccountContext();
   const avatarQuery = useQuery({
-    queryKey: [
-      "account-avatar",
-      address,
-      { socialType },
-      { resolverAddress, resolverChain },
-    ],
     queryFn: async (): Promise<string> => {
       const [socialData, ensName] = await Promise.all([
         getSocialProfiles({ address, client }),
         resolveName({
-          client,
           address: address || "",
+          client,
           resolverAddress,
           resolverChain,
         }),
@@ -209,6 +203,12 @@ export function AccountAvatar({
 
       throw new Error("Failed to resolve social + ens avatar");
     },
+    queryKey: [
+      "account-avatar",
+      address,
+      { socialType },
+      { resolverAddress, resolverChain },
+    ],
     retry: false,
     ...queryOptions,
   });
diff --git a/packages/thirdweb/src/react/native/ui/prebuilt/Account/balance.tsx b/packages/thirdweb/src/react/native/ui/prebuilt/Account/balance.tsx
index 8e87c2733fc..e0b27397ca5 100644
--- a/packages/thirdweb/src/react/native/ui/prebuilt/Account/balance.tsx
+++ b/packages/thirdweb/src/react/native/ui/prebuilt/Account/balance.tsx
@@ -10,9 +10,9 @@ import { useAccountContext } from "../../../../core/account/provider.js";
 import {
   type AccountBalanceInfo,
   formatAccountFiatBalance,
+  formatAccountTokenBalance,
   loadAccountBalance,
 } from "../../../../core/utils/account.js";
-import { formatAccountTokenBalance } from "../../../../core/utils/account.js";
 
 /**
  * Props for the AccountBalance component
@@ -170,6 +170,14 @@ export function AccountBalance({
   const walletChain = useActiveWalletChain();
   const chainToLoad = chain || walletChain;
   const balanceQuery = useQuery({
+    queryFn: async (): Promise<AccountBalanceInfo> =>
+      loadAccountBalance({
+        address: getAddress(address),
+        chain: chainToLoad,
+        client,
+        showBalanceInFiat,
+        tokenAddress: tokenAddress ? getAddress(tokenAddress) : undefined,
+      }),
     queryKey: [
       "internal_account_balance",
       chainToLoad?.id || -1,
@@ -177,14 +185,6 @@ export function AccountBalance({
       { tokenAddress },
       showBalanceInFiat,
     ] as const,
-    queryFn: async (): Promise<AccountBalanceInfo> =>
-      loadAccountBalance({
-        chain: chainToLoad,
-        client,
-        address: getAddress(address),
-        tokenAddress: tokenAddress ? getAddress(tokenAddress) : undefined,
-        showBalanceInFiat,
-      }),
     retry: false,
     ...queryOptions,
   });
diff --git a/packages/thirdweb/src/react/native/ui/prebuilt/Account/blobbie.tsx b/packages/thirdweb/src/react/native/ui/prebuilt/Account/blobbie.tsx
index badf07bd951..16385bd8f6f 100644
--- a/packages/thirdweb/src/react/native/ui/prebuilt/Account/blobbie.tsx
+++ b/packages/thirdweb/src/react/native/ui/prebuilt/Account/blobbie.tsx
@@ -54,8 +54,8 @@ export function Blobbie(props: BlobbieProps) {
     if (props.size) {
       return {
         ...baseStyle,
-        width: props.size,
         height: props.size,
+        width: props.size,
       };
     }
     return baseStyle;
@@ -68,20 +68,20 @@ export function Blobbie(props: BlobbieProps) {
 
   return (
     <View style={[styles.container, containerStyle]}>
-      <Svg height="100%" width="100%" style={StyleSheet.absoluteFillObject}>
+      <Svg height="100%" style={StyleSheet.absoluteFillObject} width="100%">
         <Defs>
           <LinearGradient
             id={gradientUniqueId}
             x1="0%"
-            y1="100%"
             x2="100%"
+            y1="100%"
             y2="0%"
           >
             <Stop offset="0" stopColor={colors[0]} />
             <Stop offset="1" stopColor={colors[1]} />
           </LinearGradient>
         </Defs>
-        <Rect width="100%" height="100%" fill={`url(#${gradientUniqueId})`} />
+        <Rect fill={`url(#${gradientUniqueId})`} height="100%" width="100%" />
       </Svg>
     </View>
   );
diff --git a/packages/thirdweb/src/react/native/ui/prebuilt/Account/name.tsx b/packages/thirdweb/src/react/native/ui/prebuilt/Account/name.tsx
index 12801369597..2cd811d9888 100644
--- a/packages/thirdweb/src/react/native/ui/prebuilt/Account/name.tsx
+++ b/packages/thirdweb/src/react/native/ui/prebuilt/Account/name.tsx
@@ -137,18 +137,12 @@ export function AccountName({
 }: AccountNameProps) {
   const { address, client } = useAccountContext();
   const nameQuery = useQuery({
-    queryKey: [
-      "account-name",
-      address,
-      { socialType },
-      { resolverAddress, resolverChain },
-    ],
     queryFn: async () => {
       const [socialData, ensName] = await Promise.all([
         getSocialProfiles({ address, client }),
         resolveName({
-          client,
           address,
+          client,
           resolverAddress,
           resolverChain,
         }),
@@ -164,6 +158,12 @@ export function AccountName({
       }
       return formatFn ? formatFn(name) : name;
     },
+    queryKey: [
+      "account-name",
+      address,
+      { socialType },
+      { resolverAddress, resolverChain },
+    ],
     retry: false,
     ...queryOptions,
   });
diff --git a/packages/thirdweb/src/react/native/ui/prebuilt/Wallet/name.tsx b/packages/thirdweb/src/react/native/ui/prebuilt/Wallet/name.tsx
index e750576981d..99e0f9c1089 100644
--- a/packages/thirdweb/src/react/native/ui/prebuilt/Wallet/name.tsx
+++ b/packages/thirdweb/src/react/native/ui/prebuilt/Wallet/name.tsx
@@ -101,7 +101,7 @@ export function WalletName({
   formatFn,
   ...restProps
 }: WalletNameProps) {
-  const nameQuery = useWalletName({ queryOptions, formatFn });
+  const nameQuery = useWalletName({ formatFn, queryOptions });
   if (nameQuery.isLoading) {
     return loadingComponent || null;
   }
diff --git a/packages/thirdweb/src/react/native/ui/transaction/TransactionButton.tsx b/packages/thirdweb/src/react/native/ui/transaction/TransactionButton.tsx
index a98c612f339..eae270b4c9b 100644
--- a/packages/thirdweb/src/react/native/ui/transaction/TransactionButton.tsx
+++ b/packages/thirdweb/src/react/native/ui/transaction/TransactionButton.tsx
@@ -28,19 +28,7 @@ import { ThemedSpinner } from "../components/spinner.js";
  * @transaction
  */
 export function TransactionButton(props: TransactionButtonProps) {
-  const {
-    children,
-    transaction,
-    onTransactionSent,
-    onTransactionConfirmed,
-    onError,
-    onClick,
-    gasless,
-    payModal,
-    disabled,
-    unstyled,
-    ...buttonProps
-  } = props;
+  const { children, gasless, payModal, disabled, ...buttonProps } = props;
   const account = useActiveAccount();
   const sendTransaction = useSendTransaction({ gasless, payModal });
   const { mutate: handleClick, isPending } = useTransactionButtonMutation(
@@ -52,22 +40,22 @@ export function TransactionButton(props: TransactionButtonProps) {
   return (
     <ThemedButton
       disabled={!account || disabled || isPending}
-      variant="primary"
       onPress={() => handleClick()}
       style={buttonProps.style as StyleProp<ViewStyle>}
       theme={theme}
+      variant="primary"
     >
       <View style={{ opacity: isPending ? 0 : 1 }}>{children}</View>
       {isPending && (
         <View
           style={{
-            position: "absolute",
-            flex: 1,
-            justifyContent: "center",
             alignItems: "center",
-            top: 0,
             bottom: 0,
+            flex: 1,
+            justifyContent: "center",
             margin: "auto",
+            position: "absolute",
+            top: 0,
           }}
         >
           <ThemedSpinner color={theme.colors.primaryButtonText} />
diff --git a/packages/thirdweb/src/react/web/hooks/transaction/useSendTransaction.tsx b/packages/thirdweb/src/react/web/hooks/transaction/useSendTransaction.tsx
index 16117a6cdd5..dc63713cc99 100644
--- a/packages/thirdweb/src/react/web/hooks/transaction/useSendTransaction.tsx
+++ b/packages/thirdweb/src/react/web/hooks/transaction/useSendTransaction.tsx
@@ -111,40 +111,40 @@ export function useSendTransaction(config: SendTransactionConfig = {}) {
     if (payModal === false) return;
     setRootEl(
       <TransactionModal
-        title={payModal?.metadata?.name || "Transaction"}
-        txId={randomBytesHex()}
-        tx={data.tx}
-        onComplete={data.sendTx}
+        client={data.tx.client}
+        localeId={payModal?.locale || "en_US"}
+        modalMode={data.mode}
         onClose={() => {
           setRootEl(null);
           data.rejectTx(
             new Error("User rejected transaction by closing modal"),
           );
         }}
+        onComplete={data.sendTx}
         onTxSent={data.resolveTx}
-        client={data.tx.client}
-        localeId={payModal?.locale || "en_US"}
-        supportedTokens={payModal?.supportedTokens}
-        theme={payModal?.theme || "dark"}
-        modalMode={data.mode}
         payOptions={{
           buyWithCrypto: payModal?.buyWithCrypto,
           buyWithFiat: payModal?.buyWithFiat,
-          purchaseData: payModal?.purchaseData,
-          mode: "transaction",
-          transaction: data.tx,
           metadata: payModal?.metadata,
+          mode: "transaction",
           onPurchaseSuccess: payModal?.onPurchaseSuccess,
+          purchaseData: payModal?.purchaseData,
           showThirdwebBranding: payModal?.showThirdwebBranding,
+          transaction: data.tx,
         }}
+        supportedTokens={payModal?.supportedTokens}
+        theme={payModal?.theme || "dark"}
+        title={payModal?.metadata?.name || "Transaction"}
+        tx={data.tx}
+        txId={randomBytesHex()}
       />,
     );
   };
 
   return useSendTransactionCore({
+    gasless: config.gasless,
     showPayModal:
       !payModalEnabled || payModal === false ? undefined : showPayModal,
-    gasless: config.gasless,
     switchChain,
     wallet,
   });
diff --git a/packages/thirdweb/src/react/web/hooks/wallets/useLinkProfile.ts b/packages/thirdweb/src/react/web/hooks/wallets/useLinkProfile.ts
index fe72dbe06dd..7be8d692b34 100644
--- a/packages/thirdweb/src/react/web/hooks/wallets/useLinkProfile.ts
+++ b/packages/thirdweb/src/react/web/hooks/wallets/useLinkProfile.ts
@@ -79,7 +79,6 @@ export function useLinkProfile() {
   const wallets = useConnectedWallets();
   const queryClient = useQueryClient();
   return useMutation({
-    mutationKey: ["profiles"],
     mutationFn: async (options: AuthArgsType) => {
       const ecosystemWallet = wallets.find((w) => isEcosystemWallet(w));
       const ecosystem: Ecosystem | undefined = ecosystemWallet
@@ -91,6 +90,7 @@ export function useLinkProfile() {
       const optionsWithEcosystem = { ...options, ecosystem } as AuthArgsType;
       return linkProfile(optionsWithEcosystem);
     },
+    mutationKey: ["profiles"],
     onSuccess() {
       setTimeout(() => {
         queryClient.invalidateQueries({ queryKey: ["profiles"] });
diff --git a/packages/thirdweb/src/react/web/hooks/wallets/useProfiles.ts b/packages/thirdweb/src/react/web/hooks/wallets/useProfiles.ts
index a4a6ddb2262..3444fb3ad52 100644
--- a/packages/thirdweb/src/react/web/hooks/wallets/useProfiles.ts
+++ b/packages/thirdweb/src/react/web/hooks/wallets/useProfiles.ts
@@ -34,10 +34,6 @@ export function useProfiles(args: {
     wallets.length > 0 &&
     wallets.some((w) => w.id === "inApp" || isEcosystemWallet(w));
   return useQuery({
-    queryKey: [
-      "profiles",
-      wallets.map((w) => `${w.id}-${w.getAccount()?.address}`),
-    ],
     enabled,
     queryFn: async () => {
       const ecosystemWallet = wallets.find((w) => isEcosystemWallet(w));
@@ -52,5 +48,9 @@ export function useProfiles(args: {
         ecosystem,
       });
     },
+    queryKey: [
+      "profiles",
+      wallets.map((w) => `${w.id}-${w.getAccount()?.address}`),
+    ],
   });
 }
diff --git a/packages/thirdweb/src/react/web/hooks/wallets/useUnlinkProfile.test.tsx b/packages/thirdweb/src/react/web/hooks/wallets/useUnlinkProfile.test.tsx
index 0d360b75160..14d2893a379 100644
--- a/packages/thirdweb/src/react/web/hooks/wallets/useUnlinkProfile.test.tsx
+++ b/packages/thirdweb/src/react/web/hooks/wallets/useUnlinkProfile.test.tsx
@@ -37,10 +37,10 @@ describe("useUnlinkProfile", () => {
     });
 
     expect(unlinkProfile).toHaveBeenCalledWith({
+      allowAccountDeletion: false,
       client: TEST_CLIENT,
       ecosystem: undefined,
       profileToUnlink: mockProfile,
-      allowAccountDeletion: false,
     });
     expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
       queryKey: ["profiles"],
@@ -49,8 +49,8 @@ describe("useUnlinkProfile", () => {
 
   it("should include ecosystem if ecosystem wallet is found", async () => {
     const mockWallet = {
-      id: "ecosystem.wallet-id",
       getConfig: () => ({ partnerId: "partner-id" }),
+      id: "ecosystem.wallet-id",
     } as unknown as Wallet;
     vi.mocked(useConnectedWallets).mockReturnValue([mockWallet]);
 
@@ -64,6 +64,7 @@ describe("useUnlinkProfile", () => {
     });
 
     expect(unlinkProfile).toHaveBeenCalledWith({
+      allowAccountDeletion: false,
       client: TEST_CLIENT,
       ecosystem: {
         id: mockWallet.id,
@@ -71,7 +72,6 @@ describe("useUnlinkProfile", () => {
           ?.partnerId,
       },
       profileToUnlink: mockProfile,
-      allowAccountDeletion: false,
     });
   });
 });
diff --git a/packages/thirdweb/src/react/web/hooks/wallets/useUnlinkProfile.ts b/packages/thirdweb/src/react/web/hooks/wallets/useUnlinkProfile.ts
index 4138de7bd94..5d00e624fe4 100644
--- a/packages/thirdweb/src/react/web/hooks/wallets/useUnlinkProfile.ts
+++ b/packages/thirdweb/src/react/web/hooks/wallets/useUnlinkProfile.ts
@@ -72,10 +72,10 @@ export function useUnlinkProfile() {
         : undefined;
 
       await unlinkProfile({
+        allowAccountDeletion,
         client,
         ecosystem,
         profileToUnlink,
-        allowAccountDeletion,
       });
     },
     onSuccess: () => {
diff --git a/packages/thirdweb/src/react/web/ui/AutoConnect/AutoConnect.test.tsx b/packages/thirdweb/src/react/web/ui/AutoConnect/AutoConnect.test.tsx
index 06d44c2e1a5..3576afcc715 100644
--- a/packages/thirdweb/src/react/web/ui/AutoConnect/AutoConnect.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/AutoConnect/AutoConnect.test.tsx
@@ -8,8 +8,8 @@ describe("AutoConnect", () => {
   it("does not break", () => {
     render(
       <AutoConnect
-        wallets={[createWallet("io.metamask")]}
         client={TEST_CLIENT}
+        wallets={[createWallet("io.metamask")]}
       />,
     );
   });
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/BridgeOrchestrator.tsx b/packages/thirdweb/src/react/web/ui/Bridge/BridgeOrchestrator.tsx
index 670145ea8e0..91470eb54d2 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/BridgeOrchestrator.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/BridgeOrchestrator.tsx
@@ -18,18 +18,18 @@ import {
 import { webWindowAdapter } from "../../adapters/WindowAdapter.js";
 import en from "../ConnectWallet/locale/en.js";
 import type { ConnectLocale } from "../ConnectWallet/locale/types.js";
+import { Container } from "../components/basic.js";
 import type { PayEmbedConnectOptions } from "../PayEmbed.js";
 import { ExecutingTxScreen } from "../TransactionButton/ExecutingScreen.js";
-import { Container } from "../components/basic.js";
 import { DirectPayment } from "./DirectPayment.js";
 import { ErrorBanner } from "./ErrorBanner.js";
 import { FundWallet } from "./FundWallet.js";
-import { QuoteLoader } from "./QuoteLoader.js";
-import { StepRunner } from "./StepRunner.js";
-import { TransactionPayment } from "./TransactionPayment.js";
 import { PaymentDetails } from "./payment-details/PaymentDetails.js";
 import { PaymentSelection } from "./payment-selection/PaymentSelection.js";
 import { SuccessScreen } from "./payment-success/SuccessScreen.js";
+import { QuoteLoader } from "./QuoteLoader.js";
+import { StepRunner } from "./StepRunner.js";
+import { TransactionPayment } from "./TransactionPayment.js";
 
 export type UIOptions = Prettify<
   {
@@ -131,8 +131,8 @@ export function BridgeOrchestrator({
   // Initialize adapters
   const adapters = useMemo(
     () => ({
-      window: webWindowAdapter,
       storage: webLocalStorage,
+      window: webWindowAdapter,
     }),
     [],
   );
@@ -160,7 +160,7 @@ export function BridgeOrchestrator({
   const handleError = useCallback(
     (error: Error) => {
       onError?.(error);
-      send({ type: "ERROR_OCCURRED", error });
+      send({ error, type: "ERROR_OCCURRED" });
     },
     [onError, send],
   );
@@ -168,7 +168,7 @@ export function BridgeOrchestrator({
   // Handle payment method selection
   const handlePaymentMethodSelected = useCallback(
     (paymentMethod: PaymentMethod) => {
-      send({ type: "PAYMENT_METHOD_SELECTED", paymentMethod });
+      send({ paymentMethod, type: "PAYMENT_METHOD_SELECTED" });
     },
     [send],
   );
@@ -176,7 +176,7 @@ export function BridgeOrchestrator({
   // Handle quote received
   const handleQuoteReceived = useCallback(
     (quote: BridgePrepareResult, request: BridgePrepareRequest) => {
-      send({ type: "QUOTE_RECEIVED", quote, request });
+      send({ quote, request, type: "QUOTE_RECEIVED" });
     },
     [send],
   );
@@ -189,7 +189,7 @@ export function BridgeOrchestrator({
   // Handle execution complete
   const handleExecutionComplete = useCallback(
     (completedStatuses: CompletedStatusResult[]) => {
-      send({ type: "EXECUTION_COMPLETE", completedStatuses });
+      send({ completedStatuses, type: "EXECUTION_COMPLETE" });
     },
     [send],
   );
@@ -203,10 +203,10 @@ export function BridgeOrchestrator({
   const handleRequirementsResolved = useCallback(
     (amount: string, token: Token, receiverAddress: Address) => {
       send({
-        type: "DESTINATION_CONFIRMED",
+        destinationAmount: amount,
         destinationToken: token,
         receiverAddress,
-        destinationAmount: amount,
+        type: "DESTINATION_CONFIRMED",
       });
     },
     [send],
@@ -218,38 +218,38 @@ export function BridgeOrchestrator({
       {state.value === "error" && state.context.currentError && (
         <ErrorBanner
           error={state.context.currentError}
-          onRetry={handleRetry}
           onCancel={onCancel}
+          onRetry={handleRetry}
         />
       )}
 
       {/* Render current screen based on state */}
       {state.value === "init" && uiOptions.mode === "fund_wallet" && (
         <FundWallet
-          uiOptions={uiOptions}
-          receiverAddress={receiverAddress}
           client={client}
-          onContinue={handleRequirementsResolved}
           connectOptions={connectOptions}
+          onContinue={handleRequirementsResolved}
           presetOptions={presetOptions}
+          receiverAddress={receiverAddress}
+          uiOptions={uiOptions}
         />
       )}
 
       {state.value === "init" && uiOptions.mode === "direct_payment" && (
         <DirectPayment
-          uiOptions={uiOptions}
           client={client}
-          onContinue={handleRequirementsResolved}
           connectOptions={connectOptions}
+          onContinue={handleRequirementsResolved}
+          uiOptions={uiOptions}
         />
       )}
 
       {state.value === "init" && uiOptions.mode === "transaction" && (
         <TransactionPayment
-          uiOptions={uiOptions}
           client={client}
-          onContinue={handleRequirementsResolved}
           connectOptions={connectOptions}
+          onContinue={handleRequirementsResolved}
+          uiOptions={uiOptions}
         />
       )}
 
@@ -258,18 +258,18 @@ export function BridgeOrchestrator({
         state.context.destinationAmount &&
         state.context.receiverAddress && (
           <PaymentSelection
-            destinationToken={state.context.destinationToken}
             client={client}
+            connectLocale={connectLocale || en}
+            connectOptions={connectOptions}
             destinationAmount={state.context.destinationAmount}
-            receiverAddress={state.context.receiverAddress}
-            onPaymentMethodSelected={handlePaymentMethodSelected}
-            onError={handleError}
+            destinationToken={state.context.destinationToken}
+            includeDestinationToken={uiOptions.mode !== "fund_wallet"}
             onBack={() => {
               send({ type: "BACK" });
             }}
-            connectOptions={connectOptions}
-            connectLocale={connectLocale || en}
-            includeDestinationToken={uiOptions.mode !== "fund_wallet"}
+            onError={handleError}
+            onPaymentMethodSelected={handlePaymentMethodSelected}
+            receiverAddress={state.context.receiverAddress}
           />
         )}
 
@@ -279,18 +279,18 @@ export function BridgeOrchestrator({
         state.context.destinationToken &&
         state.context.destinationAmount && (
           <QuoteLoader
-            destinationToken={state.context.destinationToken}
-            purchaseData={purchaseData}
-            paymentLinkId={paymentLinkId}
-            paymentMethod={state.context.selectedPaymentMethod}
-            receiver={state.context.receiverAddress}
             amount={state.context.destinationAmount}
             client={client}
-            onQuoteReceived={handleQuoteReceived}
-            onError={handleError}
+            destinationToken={state.context.destinationToken}
             onBack={() => {
               send({ type: "BACK" });
             }}
+            onError={handleError}
+            onQuoteReceived={handleQuoteReceived}
+            paymentLinkId={paymentLinkId}
+            paymentMethod={state.context.selectedPaymentMethod}
+            purchaseData={purchaseData}
+            receiver={state.context.receiverAddress}
           />
         )}
 
@@ -298,15 +298,15 @@ export function BridgeOrchestrator({
         state.context.selectedPaymentMethod &&
         state.context.quote && (
           <PaymentDetails
-            uiOptions={uiOptions}
             client={client}
-            paymentMethod={state.context.selectedPaymentMethod}
-            preparedQuote={state.context.quote}
-            onConfirm={handleRouteConfirmed}
             onBack={() => {
               send({ type: "BACK" });
             }}
+            onConfirm={handleRouteConfirmed}
             onError={handleError}
+            paymentMethod={state.context.selectedPaymentMethod}
+            preparedQuote={state.context.quote}
+            uiOptions={uiOptions}
           />
         )}
 
@@ -315,16 +315,16 @@ export function BridgeOrchestrator({
         state.context.request &&
         state.context.selectedPaymentMethod?.payerWallet && (
           <StepRunner
-            request={state.context.request}
-            wallet={state.context.selectedPaymentMethod?.payerWallet}
-            client={client}
             autoStart={true}
-            windowAdapter={webWindowAdapter}
-            onComplete={handleExecutionComplete}
-            onCancel={onCancel}
+            client={client}
             onBack={() => {
               send({ type: "BACK" });
             }}
+            onCancel={onCancel}
+            onComplete={handleExecutionComplete}
+            request={state.context.request}
+            wallet={state.context.selectedPaymentMethod?.payerWallet}
+            windowAdapter={webWindowAdapter}
           />
         )}
 
@@ -332,10 +332,10 @@ export function BridgeOrchestrator({
         state.context.quote &&
         state.context.completedStatuses && (
           <SuccessScreen
-            uiOptions={uiOptions}
-            preparedQuote={state.context.quote}
             completedStatuses={state.context.completedStatuses}
             onDone={handleBuyComplete}
+            preparedQuote={state.context.quote}
+            uiOptions={uiOptions}
             windowAdapter={webWindowAdapter}
           />
         )}
@@ -344,12 +344,12 @@ export function BridgeOrchestrator({
         uiOptions.mode === "transaction" &&
         uiOptions.transaction && (
           <ExecutingTxScreen
-            tx={uiOptions.transaction}
-            windowAdapter={webWindowAdapter}
             closeModal={handlePostBuyTransactionComplete}
             onTxSent={() => {
               // Do nothing
             }}
+            tx={uiOptions.transaction}
+            windowAdapter={webWindowAdapter}
           />
         )}
     </Container>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/BuyWidget.tsx b/packages/thirdweb/src/react/web/ui/Bridge/BuyWidget.tsx
index 53f4db8469d..87fa8629bc3 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/BuyWidget.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/BuyWidget.tsx
@@ -21,8 +21,8 @@ import type { Theme } from "../../../core/design-system/index.js";
 import type { SiweAuthOptions } from "../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButton_connectModalOptions } from "../../../core/hooks/connection/ConnectButtonProps.js";
 import type { SupportedTokens } from "../../../core/utils/defaultTokens.js";
-import { EmbedContainer } from "../ConnectWallet/Modal/ConnectEmbed.js";
 import { useConnectLocale } from "../ConnectWallet/locale/getConnectLocale.js";
+import { EmbedContainer } from "../ConnectWallet/Modal/ConnectEmbed.js";
 import { DynamicHeight } from "../components/DynamicHeight.js";
 import { Spinner } from "../components/Spinner.js";
 import type { LocaleId } from "../types.js";
@@ -259,7 +259,6 @@ export function BuyWidget(props: BuyWidgetProps) {
   const theme = props.theme || "dark";
 
   const bridgeDataQuery = useQuery({
-    queryKey: ["bridgeData", stringify(props)],
     queryFn: async (): Promise<UIOptionsResult> => {
       if (
         !props.tokenAddress ||
@@ -273,12 +272,12 @@ export function BuyWidget(props: BuyWidgetProps) {
           props.chain.id,
         );
         return {
-          type: "success",
           data: {
-            mode: "fund_wallet",
             destinationToken: ETH,
             initialAmount: props.amount,
+            mode: "fund_wallet",
           },
+          type: "success",
         };
       }
 
@@ -291,23 +290,24 @@ export function BuyWidget(props: BuyWidgetProps) {
       });
       if (!token) {
         return {
-          type: "unsupported_token",
-          tokenAddress: props.tokenAddress,
           chain: props.chain,
+          tokenAddress: props.tokenAddress,
+          type: "unsupported_token",
         };
       }
       return {
-        type: "success",
         data: {
-          mode: "fund_wallet",
           destinationToken: token,
           initialAmount: props.amount,
           metadata: {
             title: props.title,
           },
+          mode: "fund_wallet",
         },
+        type: "success",
       };
     },
+    queryKey: ["bridgeData", stringify(props)],
   });
 
   let content = null;
@@ -315,13 +315,13 @@ export function BuyWidget(props: BuyWidgetProps) {
     content = (
       <div
         style={{
-          minHeight: "350px",
+          alignItems: "center",
           display: "flex",
           justifyContent: "center",
-          alignItems: "center",
+          minHeight: "350px",
         }}
       >
-        <Spinner size="xl" color="secondaryText" />
+        <Spinner color="secondaryText" size="xl" />
       </div>
     );
   } else if (bridgeDataQuery.data?.type === "unsupported_token") {
@@ -332,22 +332,22 @@ export function BuyWidget(props: BuyWidgetProps) {
     content = (
       <BridgeOrchestrator
         client={props.client}
-        uiOptions={bridgeDataQuery.data.data}
-        connectOptions={props.connectOptions}
         connectLocale={localeQuery.data}
-        purchaseData={props.purchaseData}
-        paymentLinkId={props.paymentLinkId}
+        connectOptions={props.connectOptions}
+        onCancel={() => {
+          props.onCancel?.();
+        }}
         onComplete={() => {
           props.onSuccess?.();
         }}
         onError={(err: Error) => {
           props.onError?.(err);
         }}
-        onCancel={() => {
-          props.onCancel?.();
-        }}
+        paymentLinkId={props.paymentLinkId}
         presetOptions={props.presetOptions}
+        purchaseData={props.purchaseData}
         receiverAddress={undefined}
+        uiOptions={bridgeDataQuery.data.data}
       />
     );
   }
@@ -355,9 +355,9 @@ export function BuyWidget(props: BuyWidgetProps) {
   return (
     <CustomThemeProvider theme={theme}>
       <EmbedContainer
+        className={props.className}
         modalSize="compact"
         style={props.style}
-        className={props.className}
       >
         <DynamicHeight>{content}</DynamicHeight>
       </EmbedContainer>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/CheckoutWidget.tsx b/packages/thirdweb/src/react/web/ui/Bridge/CheckoutWidget.tsx
index d5e32621eec..48b5facda41 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/CheckoutWidget.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/CheckoutWidget.tsx
@@ -17,8 +17,8 @@ import type { Theme } from "../../../core/design-system/index.js";
 import type { SiweAuthOptions } from "../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButton_connectModalOptions } from "../../../core/hooks/connection/ConnectButtonProps.js";
 import type { SupportedTokens } from "../../../core/utils/defaultTokens.js";
-import { EmbedContainer } from "../ConnectWallet/Modal/ConnectEmbed.js";
 import { useConnectLocale } from "../ConnectWallet/locale/getConnectLocale.js";
+import { EmbedContainer } from "../ConnectWallet/Modal/ConnectEmbed.js";
 import { DynamicHeight } from "../components/DynamicHeight.js";
 import { Spinner } from "../components/Spinner.js";
 import type { LocaleId } from "../types.js";
@@ -252,7 +252,6 @@ export function CheckoutWidget(props: CheckoutWidgetProps) {
   const theme = props.theme || "dark";
 
   const bridgeDataQuery = useQuery({
-    queryKey: ["bridgeData", stringify(props)],
     queryFn: async (): Promise<UIOptionsResult> => {
       const token = await getToken(
         props.client,
@@ -263,31 +262,32 @@ export function CheckoutWidget(props: CheckoutWidgetProps) {
       );
       if (!token) {
         return {
-          type: "unsupported_token",
+          chain: props.chain,
           tokenAddress: checksumAddress(
             props.tokenAddress || NATIVE_TOKEN_ADDRESS,
           ),
-          chain: props.chain,
+          type: "unsupported_token",
         };
       }
       return {
-        type: "success",
         data: {
-          mode: "direct_payment",
           metadata: {
-            title: props.name,
-            image: props.image,
             description: props.description,
+            image: props.image,
+            title: props.name,
           },
+          mode: "direct_payment",
           paymentInfo: {
-            token,
             amount: props.amount,
+            feePayer: props.feePayer === "seller" ? "receiver" : "sender",
             sellerAddress: props.seller,
-            feePayer: props.feePayer === "seller" ? "receiver" : "sender", // User is sender, seller is receiver
+            token, // User is sender, seller is receiver
           },
         },
+        type: "success",
       };
     },
+    queryKey: ["bridgeData", stringify(props)],
   });
 
   let content = null;
@@ -295,13 +295,13 @@ export function CheckoutWidget(props: CheckoutWidgetProps) {
     content = (
       <div
         style={{
-          minHeight: "350px",
+          alignItems: "center",
           display: "flex",
           justifyContent: "center",
-          alignItems: "center",
+          minHeight: "350px",
         }}
       >
-        <Spinner size="xl" color="secondaryText" />
+        <Spinner color="secondaryText" size="xl" />
       </div>
     );
   } else if (bridgeDataQuery.data?.type === "unsupported_token") {
@@ -312,22 +312,22 @@ export function CheckoutWidget(props: CheckoutWidgetProps) {
     content = (
       <BridgeOrchestrator
         client={props.client}
-        uiOptions={bridgeDataQuery.data.data}
-        connectOptions={props.connectOptions}
         connectLocale={localeQuery.data}
-        purchaseData={props.purchaseData}
-        paymentLinkId={props.paymentLinkId}
+        connectOptions={props.connectOptions}
+        onCancel={() => {
+          props.onCancel?.();
+        }}
         onComplete={() => {
           props.onSuccess?.();
         }}
         onError={(err: Error) => {
           props.onError?.(err);
         }}
-        onCancel={() => {
-          props.onCancel?.();
-        }}
+        paymentLinkId={props.paymentLinkId}
         presetOptions={props.presetOptions}
+        purchaseData={props.purchaseData}
         receiverAddress={props.seller}
+        uiOptions={bridgeDataQuery.data.data}
       />
     );
   }
@@ -335,9 +335,9 @@ export function CheckoutWidget(props: CheckoutWidgetProps) {
   return (
     <CustomThemeProvider theme={theme}>
       <EmbedContainer
+        className={props.className}
         modalSize="compact"
         style={props.style}
-        className={props.className}
       >
         <DynamicHeight>{content}</DynamicHeight>
       </EmbedContainer>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/DirectPayment.tsx b/packages/thirdweb/src/react/web/ui/Bridge/DirectPayment.tsx
index 427c0573463..2a89b60fd19 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/DirectPayment.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/DirectPayment.tsx
@@ -9,12 +9,12 @@ import { useEnsName } from "../../../core/utils/wallet.js";
 import { ConnectButton } from "../ConnectWallet/ConnectButton.js";
 import { PoweredByThirdweb } from "../ConnectWallet/PoweredByTW.js";
 import { FiatValue } from "../ConnectWallet/screens/Buy/swap/FiatValue.js";
-import type { PayEmbedConnectOptions } from "../PayEmbed.js";
-import { ChainName } from "../components/ChainName.js";
-import { Spacer } from "../components/Spacer.js";
 import { Container, Line } from "../components/basic.js";
 import { Button } from "../components/buttons.js";
+import { ChainName } from "../components/ChainName.js";
+import { Spacer } from "../components/Spacer.js";
 import { Text } from "../components/text.js";
+import type { PayEmbedConnectOptions } from "../PayEmbed.js";
 import type { UIOptions } from "./BridgeOrchestrator.js";
 import { ChainIcon } from "./common/TokenAndChain.js";
 import { WithHeader } from "./common/WithHeader.js";
@@ -66,48 +66,48 @@ export function DirectPayment({
 
   const buyNow = (
     <Container flex="row" gap="3xs">
-      <Text size="md" color="primaryButtonText">
+      <Text color="primaryButtonText" size="md">
         Buy Now ·
       </Text>
       <FiatValue
-        tokenAmount={uiOptions.paymentInfo.amount}
-        token={uiOptions.paymentInfo.token}
         chain={chain}
         client={client}
         color="primaryButtonText"
         size="md"
+        token={uiOptions.paymentInfo.token}
+        tokenAmount={uiOptions.paymentInfo.amount}
       />
     </Container>
   );
 
   return (
     <WithHeader
-      uiOptions={uiOptions}
-      defaultTitle="Direct Payment"
       client={client}
+      defaultTitle="Direct Payment"
+      uiOptions={uiOptions}
     >
       {/* Price section */}
       <Container
-        flex="row"
         center="y"
+        flex="row"
         gap="3xs"
         style={{
           justifyContent: "space-between",
         }}
       >
         <FiatValue
-          tokenAmount={uiOptions.paymentInfo.amount}
-          token={uiOptions.paymentInfo.token}
           chain={chain}
           client={client}
           color="primaryText"
           size="xl"
+          token={uiOptions.paymentInfo.token}
+          tokenAmount={uiOptions.paymentInfo.amount}
           weight={700}
         />
         <Container flex="row" gap="3xs">
           <Text
-            size="xs"
             color="secondaryText"
+            size="xs"
             style={{
               overflow: "hidden",
               textOverflow: "ellipsis",
@@ -129,16 +129,16 @@ export function DirectPayment({
       <Container
         flex="row"
         style={{
-          justifyContent: "space-between",
           alignItems: "center",
+          justifyContent: "space-between",
         }}
       >
-        <Text size="sm" color="secondaryText">
+        <Text color="secondaryText" size="sm">
           Sold by
         </Text>
         <Text
-          size="sm"
           color="primaryText"
+          size="sm"
           style={{
             fontFamily: "monospace",
           }}
@@ -152,16 +152,16 @@ export function DirectPayment({
       <Container
         flex="row"
         style={{
-          justifyContent: "space-between",
           alignItems: "center",
+          justifyContent: "space-between",
         }}
       >
-        <Text size="sm" color="secondaryText">
+        <Text color="secondaryText" size="sm">
           Price
         </Text>
         <Text
-          size="sm"
           color="primaryText"
+          size="sm"
           style={{
             fontFamily: "monospace",
           }}
@@ -176,21 +176,21 @@ export function DirectPayment({
       <Container
         flex="row"
         style={{
-          justifyContent: "space-between",
           alignItems: "center",
+          justifyContent: "space-between",
         }}
       >
-        <Text size="sm" color="secondaryText">
+        <Text color="secondaryText" size="sm">
           Network
         </Text>
-        <Container flex="row" gap="3xs" center="y">
-          <ChainIcon chain={chain} size={"xs"} client={client} />
+        <Container center="y" flex="row" gap="3xs">
+          <ChainIcon chain={chain} client={client} size={"xs"} />
           <ChainName
             chain={chain}
             client={client}
-            size="sm"
             color="primaryText"
             short
+            size="sm"
             style={{
               fontFamily: "monospace",
             }}
@@ -207,19 +207,19 @@ export function DirectPayment({
       {/* Action button */}
       <Container flex="column">
         {activeAccount ? (
-          <Button variant="primary" fullWidth onClick={handleContinue}>
+          <Button fullWidth onClick={handleContinue} variant="primary">
             {buyNow}
           </Button>
         ) : (
           <ConnectButton
             client={client}
-            theme={theme}
             connectButton={{
               label: buyNow,
               style: {
                 width: "100%",
               },
             }}
+            theme={theme}
             {...connectOptions}
           />
         )}
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/ErrorBanner.tsx b/packages/thirdweb/src/react/web/ui/Bridge/ErrorBanner.tsx
index 25ee7648dee..ed40a5ce343 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/ErrorBanner.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/ErrorBanner.tsx
@@ -30,28 +30,28 @@ export function ErrorBanner({ error, onRetry, onCancel }: ErrorBannerProps) {
   const { userMessage } = useBridgeError({ error });
 
   return (
-    <Container flex="column" gap="md" p="lg" fullHeight>
+    <Container flex="column" fullHeight gap="md" p="lg">
       {/* Error Icon and Message */}
       <Container flex="row" gap="md" style={{ alignItems: "flex-start" }}>
         <Container
           center="both"
           style={{
-            width: "24px",
-            height: "24px",
-            borderRadius: "50%",
             backgroundColor: theme.colors.tertiaryBg,
+            borderRadius: "50%",
             flexShrink: 0,
+            height: "24px",
+            width: "24px",
           }}
         >
           <CrossCircledIcon
-            width={iconSize.md}
-            height={iconSize.md}
             color={theme.colors.danger}
+            height={iconSize.md}
+            width={iconSize.md}
           />
         </Container>
 
-        <Container flex="column" gap="sm" style={{ flex: 1 }} fullHeight>
-          <Text size="lg" color="primaryText">
+        <Container flex="column" fullHeight gap="sm" style={{ flex: 1 }}>
+          <Text color="primaryText" size="lg">
             Error
           </Text>
           <Container
@@ -62,7 +62,7 @@ export function ErrorBanner({ error, onRetry, onCancel }: ErrorBannerProps) {
             }}
           >
             <Container flex="column" gap="sm" style={{ flex: 1 }}>
-              <Text size="sm" color="secondaryText">
+              <Text color="secondaryText" size="sm">
                 {userMessage}
               </Text>
             </Container>
@@ -70,11 +70,11 @@ export function ErrorBanner({ error, onRetry, onCancel }: ErrorBannerProps) {
 
           {/* Action Buttons */}
           <Container flex="row" gap="sm" style={{ justifyContent: "flex-end" }}>
-            <Button variant="primary" onClick={onRetry}>
+            <Button onClick={onRetry} variant="primary">
               Try Again
             </Button>
             {onCancel && (
-              <Button variant="secondary" onClick={onCancel}>
+              <Button onClick={onCancel} variant="secondary">
                 Cancel
               </Button>
             )}
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/FundWallet.tsx b/packages/thirdweb/src/react/web/ui/Bridge/FundWallet.tsx
index 5591e316f17..15a6f64df4c 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/FundWallet.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/FundWallet.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { useState } from "react";
+import { useRef, useState } from "react";
 import type { Token } from "../../../../bridge/types/Token.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { type Address, getAddress } from "../../../../utils/address.js";
@@ -12,15 +12,15 @@ import {
 } from "../../../core/design-system/index.js";
 import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
 import { ConnectButton } from "../ConnectWallet/ConnectButton.js";
-import { PoweredByThirdweb } from "../ConnectWallet/PoweredByTW.js";
 import { OutlineWalletIcon } from "../ConnectWallet/icons/OutlineWalletIcon.js";
+import { PoweredByThirdweb } from "../ConnectWallet/PoweredByTW.js";
 import { WalletRow } from "../ConnectWallet/screens/Buy/swap/WalletRow.js";
-import type { PayEmbedConnectOptions } from "../PayEmbed.js";
-import { Spacer } from "../components/Spacer.js";
 import { Container } from "../components/basic.js";
 import { Button } from "../components/buttons.js";
 import { Input } from "../components/formElements.js";
+import { Spacer } from "../components/Spacer.js";
 import { Text } from "../components/text.js";
+import type { PayEmbedConnectOptions } from "../PayEmbed.js";
 import type { UIOptions } from "./BridgeOrchestrator.js";
 import { TokenAndChain } from "./common/TokenAndChain.js";
 import { WithHeader } from "./common/WithHeader.js";
@@ -99,9 +99,10 @@ export function FundWallet({
 
   const isValidAmount = amount && Number(amount) > 0;
 
+  const inputRef = useRef<HTMLInputElement>(null);
+
   const focusInput = () => {
-    const input = document.querySelector("#amount-input") as HTMLInputElement;
-    input?.focus();
+    inputRef.current?.focus();
   };
 
   const handleQuickAmount = (usdAmount: number) => {
@@ -119,42 +120,41 @@ export function FundWallet({
 
   return (
     <WithHeader
-      uiOptions={uiOptions}
-      defaultTitle={`Buy ${uiOptions.destinationToken.symbol}`}
       client={client}
+      defaultTitle={`Buy ${uiOptions.destinationToken.symbol}`}
+      uiOptions={uiOptions}
     >
       <Container flex="column">
         {/* Token Info */}
         <Container
-          flex="row"
           center="both"
+          flex="row"
           gap="3xs"
           p="md"
           style={{
-            flexWrap: "nowrap",
+            backgroundColor: theme.colors.tertiaryBg,
             border: `1px solid ${theme.colors.borderColor}`,
             borderRadius: radius.md,
-            backgroundColor: theme.colors.tertiaryBg,
+            flexWrap: "nowrap",
           }}
         >
           <TokenAndChain
-            token={uiOptions.destinationToken}
             client={client}
             size="xl"
+            token={uiOptions.destinationToken}
           />
           {/* Amount Input */}
           <Container
-            flex="column"
-            gap="3xs"
             center="x"
             expand
+            flex="column"
+            gap="3xs"
             style={{
-              justifyContent: "flex-end",
               alignItems: "flex-end",
+              justifyContent: "flex-end",
             }}
           >
             <div
-              style={{ cursor: "text" }}
               onClick={focusInput}
               onKeyDown={(e: React.KeyboardEvent<HTMLDivElement>) => {
                 if (e.key === "Enter" || e.key === " ") {
@@ -162,12 +162,14 @@ export function FundWallet({
                   focusInput();
                 }
               }}
+              // biome-ignore lint/a11y/useSemanticElements: FIXME
               role="button"
+              style={{ cursor: "text" }}
               tabIndex={0}
             >
               <Container
-                flex="row"
                 center="y"
+                flex="row"
                 gap="xs"
                 style={{
                   flexWrap: "nowrap",
@@ -175,14 +177,11 @@ export function FundWallet({
                 }}
               >
                 <Input
-                  id="amount-input"
-                  variant="transparent"
-                  pattern="^[0-9]*[.,]?[0-9]*$"
-                  inputMode="decimal"
-                  placeholder="0"
-                  type="text"
                   data-placeholder={amount === ""}
-                  value={amount || "0"}
+                  inputMode="decimal"
+                  onChange={(e) => {
+                    handleAmountChange(e.target.value);
+                  }}
                   onClick={(e) => {
                     // put cursor at the end of the input
                     if (amount === "") {
@@ -192,30 +191,33 @@ export function FundWallet({
                       );
                     }
                   }}
-                  onChange={(e) => {
-                    handleAmountChange(e.target.value);
-                  }}
+                  pattern="^[0-9]*[.,]?[0-9]*$"
+                  placeholder="0"
+                  ref={inputRef}
                   style={{
+                    border: "none",
+                    boxShadow: "none",
                     fontSize: getAmountFontSize(),
                     fontWeight: 600,
-                    textAlign: "right",
                     padding: "0",
-                    border: "none",
-                    boxShadow: "none",
+                    textAlign: "right",
                   }}
+                  type="text"
+                  value={amount || "0"}
+                  variant="transparent"
                 />
               </Container>
             </div>
 
             {/* Fiat Value */}
             <Container
-              flex="row"
               center="both"
-              style={{ height: fontSize.lg, flexWrap: "nowrap" }}
+              flex="row"
+              style={{ flexWrap: "nowrap", height: fontSize.lg }}
             >
               <Text
-                size="md"
                 color="secondaryText"
+                size="md"
                 style={{ textWrap: "nowrap" }}
               >
                 ≈ $
@@ -232,8 +234,8 @@ export function FundWallet({
           <>
             <Spacer y="md" />
             <Container
-              flex="row"
               center="x"
+              flex="row"
               gap="xs"
               style={{
                 justifyContent: "space-evenly",
@@ -241,15 +243,15 @@ export function FundWallet({
             >
               {presetOptions?.map((amount) => (
                 <Button
-                  variant="outline"
-                  onClick={() => handleQuickAmount(Number(amount))}
                   key={amount}
+                  onClick={() => handleQuickAmount(Number(amount))}
                   style={{
-                    padding: `${spacing.sm} ${spacing.md}`,
-                    fontSize: fontSize.sm,
-                    flex: 1,
                     backgroundColor: theme.colors.tertiaryBg,
+                    flex: 1,
+                    fontSize: fontSize.sm,
+                    padding: `${spacing.sm} ${spacing.md}`,
                   }}
+                  variant="outline"
                 >
                   ${amount}
                 </Button>
@@ -261,15 +263,15 @@ export function FundWallet({
         <Spacer y="md" />
 
         <Container
+          center="y"
+          color="secondaryText"
           flex="row"
           gap="sm"
           px="md"
           py="sm"
-          center="y"
-          color="secondaryText"
           style={{
-            border: `1px solid ${theme.colors.borderColor}`,
             backgroundColor: theme.colors.tertiaryBg,
+            border: `1px solid ${theme.colors.borderColor}`,
             borderRadius: radius.md,
           }}
         >
@@ -284,8 +286,8 @@ export function FundWallet({
             <>
               <OutlineWalletIcon size={iconSize.md} />
               <Text
-                size="sm"
                 color="secondaryText"
+                size="sm"
                 style={{
                   flex: 1,
                 }}
@@ -302,9 +304,8 @@ export function FundWallet({
       {/* Continue Button */}
       {receiver ? (
         <Button
-          variant="primary"
-          fullWidth
           disabled={!isValidAmount}
+          fullWidth
           onClick={() => {
             if (isValidAmount) {
               onContinue(
@@ -315,19 +316,20 @@ export function FundWallet({
             }
           }}
           style={{
-            padding: `${spacing.sm} ${spacing.md}`,
             fontSize: fontSize.md,
+            padding: `${spacing.sm} ${spacing.md}`,
           }}
+          variant="primary"
         >
           Buy {amount} {uiOptions.destinationToken.symbol}
         </Button>
       ) : (
         <ConnectButton
           client={client}
-          theme={theme}
           connectButton={{
             label: `Buy ${amount} ${uiOptions.destinationToken.symbol}`,
           }}
+          theme={theme}
           {...connectOptions}
         />
       )}
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/QuoteLoader.tsx b/packages/thirdweb/src/react/web/ui/Bridge/QuoteLoader.tsx
index 9690b5abf95..b34c8e1682f 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/QuoteLoader.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/QuoteLoader.tsx
@@ -11,9 +11,9 @@ import {
   useBridgePrepare,
 } from "../../../core/hooks/useBridgePrepare.js";
 import type { PaymentMethod } from "../../../core/machines/paymentMachine.js";
+import { Container } from "../components/basic.js";
 import { Spacer } from "../components/Spacer.js";
 import { Spinner } from "../components/Spinner.js";
-import { Container } from "../components/basic.js";
 import { Text } from "../components/text.js";
 
 interface QuoteLoaderProps {
@@ -97,15 +97,15 @@ export function QuoteLoader({
   // For now, we'll use a simple buy operation
   // This will be expanded to handle different bridge types based on the payment method
   const request: BridgePrepareRequest = getBridgeParams({
-    paymentMethod,
     amount,
+    client,
     destinationToken,
+    feePayer,
+    paymentLinkId,
+    paymentMethod,
+    purchaseData,
     receiver,
     sender,
-    client,
-    purchaseData,
-    paymentLinkId,
-    feePayer,
   });
   const prepareQuery = useBridgePrepare(request);
 
@@ -125,19 +125,19 @@ export function QuoteLoader({
 
   return (
     <Container
-      flex="column"
       center="both"
-      p="lg"
+      flex="column"
       fullHeight
+      p="lg"
       style={{ minHeight: "350px" }}
     >
-      <Spinner size="xl" color="secondaryText" />
+      <Spinner color="secondaryText" size="xl" />
       <Spacer y="md" />
-      <Text size="lg" color="primaryText" center style={{ fontWeight: 600 }}>
+      <Text center color="primaryText" size="lg" style={{ fontWeight: 600 }}>
         Finding the best route...
       </Text>
       <Spacer y="sm" />
-      <Text size="sm" color="secondaryText" center>
+      <Text center color="secondaryText" size="sm">
         We're searching for the most efficient path for this payment.
       </Text>
     </Container>
@@ -161,19 +161,19 @@ function getBridgeParams(args: {
   switch (paymentMethod.type) {
     case "fiat":
       return {
-        type: "onramp",
-        client,
         amount: toUnits(amount, destinationToken.decimals),
-        receiver,
-        sender,
         chainId: destinationToken.chainId,
-        tokenAddress: destinationToken.address,
-        onramp: paymentMethod.onramp || "coinbase",
-        purchaseData: args.purchaseData,
+        client,
         currency: paymentMethod.currency,
-        onrampTokenAddress: NATIVE_TOKEN_ADDRESS, // always onramp to native token
-        paymentLinkId: args.paymentLinkId,
         enabled: !!(destinationToken && amount && client),
+        onramp: paymentMethod.onramp || "coinbase",
+        onrampTokenAddress: NATIVE_TOKEN_ADDRESS,
+        paymentLinkId: args.paymentLinkId,
+        purchaseData: args.purchaseData,
+        receiver,
+        sender, // always onramp to native token
+        tokenAddress: destinationToken.address,
+        type: "onramp",
       };
     case "wallet":
       // if the origin token is the same as the destination token, use transfer type
@@ -183,37 +183,37 @@ function getBridgeParams(args: {
           destinationToken.address.toLowerCase()
       ) {
         return {
-          type: "transfer",
-          client,
+          amount: toUnits(amount, destinationToken.decimals),
           chainId: destinationToken.chainId,
-          tokenAddress: destinationToken.address,
+          client,
+          enabled: !!(destinationToken && amount && client),
           feePayer: args.feePayer || "sender",
-          amount: toUnits(amount, destinationToken.decimals),
+          paymentLinkId: args.paymentLinkId,
+          purchaseData: args.purchaseData,
+          receiver,
           sender:
             sender ||
             paymentMethod.payerWallet.getAccount()?.address ||
             receiver,
-          receiver,
-          purchaseData: args.purchaseData,
-          paymentLinkId: args.paymentLinkId,
-          enabled: !!(destinationToken && amount && client),
+          tokenAddress: destinationToken.address,
+          type: "transfer",
         };
       }
 
       return {
-        type: "buy",
+        amount: toUnits(amount, destinationToken.decimals),
         client,
-        originChainId: paymentMethod.originToken.chainId,
-        originTokenAddress: paymentMethod.originToken.address,
         destinationChainId: destinationToken.chainId,
         destinationTokenAddress: destinationToken.address,
-        amount: toUnits(amount, destinationToken.decimals),
+        enabled: !!(destinationToken && amount && client),
+        originChainId: paymentMethod.originToken.chainId,
+        originTokenAddress: paymentMethod.originToken.address,
+        paymentLinkId: args.paymentLinkId,
+        purchaseData: args.purchaseData,
+        receiver,
         sender:
           sender || paymentMethod.payerWallet.getAccount()?.address || receiver,
-        receiver,
-        purchaseData: args.purchaseData,
-        paymentLinkId: args.paymentLinkId,
-        enabled: !!(destinationToken && amount && client),
+        type: "buy",
       };
   }
 }
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/StepRunner.tsx b/packages/thirdweb/src/react/web/ui/Bridge/StepRunner.tsx
index f543410ae17..0e5690fb70f 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/StepRunner.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/StepRunner.tsx
@@ -17,11 +17,11 @@ import {
   type CompletedStatusResult,
   useStepExecutor,
 } from "../../../core/hooks/useStepExecutor.js";
+import { Container, ModalHeader } from "../components/basic.js";
+import { Button } from "../components/buttons.js";
 import { ChainName } from "../components/ChainName.js";
 import { Spacer } from "../components/Spacer.js";
 import { Spinner } from "../components/Spinner.js";
-import { Container, ModalHeader } from "../components/basic.js";
-import { Button } from "../components/buttons.js";
 import { Text } from "../components/text.js";
 
 interface StepRunnerProps {
@@ -87,14 +87,14 @@ export function StepRunner({
     cancel,
     retry,
   } = useStepExecutor({
-    request,
-    wallet,
-    client,
-    windowAdapter,
     autoStart,
+    client,
     onComplete: (completedStatuses: CompletedStatusResult[]) => {
       onComplete(completedStatuses);
     },
+    request,
+    wallet,
+    windowAdapter,
   });
 
   const handleCancel = () => {
@@ -139,23 +139,23 @@ export function StepRunner({
       case "completed":
         return (
           <CheckIcon
-            width={iconSize.sm}
-            height={iconSize.sm}
             color={theme.colors.accentButtonText}
+            height={iconSize.sm}
+            width={iconSize.sm}
           />
         );
       case "executing":
-        return <Spinner size="sm" color={"accentButtonText"} />;
+        return <Spinner color={"accentButtonText"} size="sm" />;
       case "failed":
         return (
-          <Cross1Icon width={iconSize.sm} height={iconSize.sm} color="white" />
+          <Cross1Icon color="white" height={iconSize.sm} width={iconSize.sm} />
         );
       default:
         return (
           <ClockIcon
-            width={iconSize.sm}
-            height={iconSize.sm}
             color={theme.colors.primaryText}
+            height={iconSize.sm}
+            width={iconSize.sm}
           />
         );
     }
@@ -198,15 +198,15 @@ export function StepRunner({
     if (originToken.chainId !== destinationToken.chainId) {
       return (
         <Container flex="row" gap="3xs">
-          <Text size="sm" color="primaryText">
+          <Text color="primaryText" size="sm">
             Bridge {originToken.symbol} to{" "}
           </Text>
           <ChainName
             chain={getDestinationChain(request)}
-            size="sm"
             client={client}
-            short
             color="primaryText"
+            short
+            size="sm"
           />
         </Container>
       );
@@ -215,7 +215,7 @@ export function StepRunner({
     // If different tokens on same chain, it's a swap
     if (originToken.symbol !== destinationToken.symbol) {
       return (
-        <Text size="sm" color="primaryText">
+        <Text color="primaryText" size="sm">
           Swap {originToken.symbol} to {destinationToken.symbol}
         </Text>
       );
@@ -223,7 +223,7 @@ export function StepRunner({
 
     // Fallback to step number
     return (
-      <Text size="sm" color="primaryText">
+      <Text color="primaryText" size="sm">
         Process transaction
       </Text>
     );
@@ -248,40 +248,40 @@ export function StepRunner({
 
   return (
     <Container flex="column" fullHeight p="lg">
-      <ModalHeader title="Processing Payment" onBack={onBack} />
+      <ModalHeader onBack={onBack} title="Processing Payment" />
 
       <Spacer y="xl" />
 
       <Container flex="column">
         {/* Progress Bar */}
         <Container flex="column" gap="sm">
-          <Container flex="row" center="y">
-            <Text size="sm" color="secondaryText" style={{ flex: 1 }}>
+          <Container center="y" flex="row">
+            <Text color="secondaryText" size="sm" style={{ flex: 1 }}>
               Progress
             </Text>
-            <Text size="sm" color="primaryText">
+            <Text color="primaryText" size="sm">
               {progress}%
             </Text>
           </Container>
 
           <Container
             style={{
-              width: "100%",
-              height: "8px",
               backgroundColor: theme.colors.tertiaryBg,
               border: `1px solid ${theme.colors.borderColor}`,
               borderRadius: "4px",
+              height: "8px",
               overflow: "hidden",
+              width: "100%",
             }}
           >
             <Container
               style={{
-                width: `${progress}%`,
-                height: "100%",
                 backgroundColor: error
                   ? theme.colors.danger
                   : theme.colors.accentButtonBg,
+                height: "100%",
                 transition: "width 0.3s ease",
+                width: `${progress}%`,
               }}
             >
               <Text />
@@ -299,32 +299,32 @@ export function StepRunner({
               gap="md"
               style={{
                 alignItems: "center",
-                padding: `${spacing.sm} ${spacing.md}`,
-                borderRadius: radius.md,
                 backgroundColor: getStepBackgroundColor(onrampStatus),
                 border: `1px solid ${theme.colors.borderColor}`,
+                borderRadius: radius.md,
+                padding: `${spacing.sm} ${spacing.md}`,
               }}
             >
               <Container
                 center="both"
                 flex="row"
                 style={{
-                  width: `${iconSize.lg}px`,
-                  height: `${iconSize.lg}px`,
-                  borderRadius: "50%",
                   backgroundColor: getIconBackgroundColor(onrampStatus),
+                  borderRadius: "50%",
                   color: theme.colors.primaryButtonText,
                   flexShrink: 0,
+                  height: `${iconSize.lg}px`,
+                  width: `${iconSize.lg}px`,
                 }}
               >
                 {getStatusIcon(onrampStatus)}
               </Container>
 
               <Container flex="column" gap="3xs" style={{ flex: 1 }}>
-                <Text size="sm" color="primaryText">
+                <Text color="primaryText" size="sm">
                   TEST
                 </Text>
-                <Text size="xs" color="secondaryText">
+                <Text color="secondaryText" size="xs">
                   {getStepStatusText(onrampStatus)}
                 </Text>
               </Container>
@@ -335,27 +335,27 @@ export function StepRunner({
 
             return (
               <Container
-                key={`${step.originToken.chainId}-${step.destinationToken.chainId}-${index}`}
                 flex="row"
                 gap="md"
+                key={`${step.originToken.chainId}-${step.destinationToken.chainId}-${index}`}
                 style={{
                   alignItems: "center",
-                  padding: `${spacing.sm} ${spacing.md}`,
-                  borderRadius: radius.md,
                   backgroundColor: getStepBackgroundColor(status),
                   border: `1px solid ${theme.colors.borderColor}`,
+                  borderRadius: radius.md,
+                  padding: `${spacing.sm} ${spacing.md}`,
                 }}
               >
                 <Container
                   center="both"
                   flex="row"
                   style={{
-                    width: `${iconSize.lg}px`,
-                    height: `${iconSize.lg}px`,
-                    borderRadius: "50%",
                     backgroundColor: getIconBackgroundColor(status),
+                    borderRadius: "50%",
                     color: theme.colors.primaryButtonText,
                     flexShrink: 0,
+                    height: `${iconSize.lg}px`,
+                    width: `${iconSize.lg}px`,
                   }}
                 >
                   {getStatusIcon(status)}
@@ -363,7 +363,7 @@ export function StepRunner({
 
                 <Container flex="column" gap="3xs" style={{ flex: 1 }}>
                   {getStepDescription(step)}
-                  <Text size="xs" color="secondaryText">
+                  <Text color="secondaryText" size="xs">
                     {getStepStatusText(status)}
                   </Text>
                 </Container>
@@ -373,7 +373,7 @@ export function StepRunner({
         </Container>
 
         <Spacer y="md" />
-        <Text size="xs" color="secondaryText" center>
+        <Text center color="secondaryText" size="xs">
           Keep this window open until all
           <br /> transactions are complete.
         </Text>
@@ -383,17 +383,17 @@ export function StepRunner({
         {/* Action Buttons */}
         {error ? (
           <Container flex="row" gap="md">
-            <Button variant="primary" fullWidth onClick={handleRetry}>
+            <Button fullWidth onClick={handleRetry} variant="primary">
               Retry
             </Button>
           </Container>
         ) : executionState === "idle" && progress === 0 ? (
-          <Button variant="accent" fullWidth onClick={start}>
+          <Button fullWidth onClick={start} variant="accent">
             Start Transaction
           </Button>
         ) : executionState === "executing" ||
           executionState === "auto-starting" ? (
-          <Button variant="secondary" fullWidth onClick={handleCancel}>
+          <Button fullWidth onClick={handleCancel} variant="secondary">
             Cancel Transaction
           </Button>
         ) : null}
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/TransactionPayment.tsx b/packages/thirdweb/src/react/web/ui/Bridge/TransactionPayment.tsx
index f847b1ec3b5..90c2875fedb 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/TransactionPayment.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/TransactionPayment.tsx
@@ -7,18 +7,22 @@ import {
   shortenAddress,
 } from "../../../../utils/address.js";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
-import { fontSize, spacing } from "../../../core/design-system/index.js";
+import {
+  fontSize,
+  spacing,
+  type Theme,
+} from "../../../core/design-system/index.js";
 import { useChainMetadata } from "../../../core/hooks/others/useChainQuery.js";
 import { useTransactionDetails } from "../../../core/hooks/useTransactionDetails.js";
 import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
 import { ConnectButton } from "../ConnectWallet/ConnectButton.js";
 import { PoweredByThirdweb } from "../ConnectWallet/PoweredByTW.js";
-import type { PayEmbedConnectOptions } from "../PayEmbed.js";
-import { ChainName } from "../components/ChainName.js";
-import { Spacer } from "../components/Spacer.js";
 import { Container, Line } from "../components/basic.js";
 import { Button } from "../components/buttons.js";
+import { ChainName } from "../components/ChainName.js";
+import { Spacer } from "../components/Spacer.js";
 import { Text } from "../components/text.js";
+import type { PayEmbedConnectOptions } from "../PayEmbed.js";
 import type { UIOptions } from "./BridgeOrchestrator.js";
 import { ChainIcon } from "./common/TokenAndChain.js";
 import { WithHeader } from "./common/WithHeader.js";
@@ -59,8 +63,8 @@ export function TransactionPayment({
 
   // Use the extracted hook for transaction details
   const transactionDataQuery = useTransactionDetails({
-    transaction: uiOptions.transaction,
     client,
+    transaction: uiOptions.transaction,
   });
 
   const contractName =
@@ -71,74 +75,15 @@ export function TransactionPayment({
 
   const buttonLabel = `Execute ${functionName}`;
 
-  // Skeleton component for loading state
-  const SkeletonRow = ({ width = "100%" }: { width?: string }) => (
-    <Container
-      flex="row"
-      style={{
-        justifyContent: "space-between",
-        alignItems: "center",
-      }}
-    >
-      <div
-        style={{
-          width: "30%",
-          height: "16px",
-          backgroundColor: theme.colors.skeletonBg,
-          borderRadius: spacing.xs,
-        }}
-      />
-      <div
-        style={{
-          width,
-          height: "16px",
-          backgroundColor: theme.colors.skeletonBg,
-          borderRadius: spacing.xs,
-        }}
-      />
-    </Container>
-  );
-
-  const SkeletonHeader = () => (
-    <Container
-      flex="row"
-      center="y"
-      gap="3xs"
-      style={{
-        justifyContent: "space-between",
-      }}
-    >
-      {/* USD Value Skeleton */}
-      <div
-        style={{
-          width: "80px",
-          height: "32px",
-          backgroundColor: theme.colors.skeletonBg,
-          borderRadius: spacing.xs,
-        }}
-      />
-
-      {/* Function Name Skeleton */}
-      <div
-        style={{
-          width: "120px",
-          height: "24px",
-          backgroundColor: theme.colors.skeletonBg,
-          borderRadius: spacing.sm,
-        }}
-      />
-    </Container>
-  );
-
   if (isLoading) {
     return (
       <WithHeader
-        uiOptions={uiOptions}
-        defaultTitle="Transaction"
         client={client}
+        defaultTitle="Transaction"
+        uiOptions={uiOptions}
       >
         {/* Loading Header */}
-        <SkeletonHeader />
+        <SkeletonHeader theme={theme} />
 
         <Spacer y="md" />
 
@@ -147,15 +92,15 @@ export function TransactionPayment({
         <Spacer y="md" />
 
         {/* Loading Rows */}
-        <SkeletonRow width="60%" />
+        <SkeletonRow theme={theme} width="60%" />
         <Spacer y="xs" />
-        <SkeletonRow width="40%" />
+        <SkeletonRow theme={theme} width="40%" />
         <Spacer y="xs" />
-        <SkeletonRow width="50%" />
+        <SkeletonRow theme={theme} width="50%" />
         <Spacer y="xs" />
-        <SkeletonRow width="45%" />
+        <SkeletonRow theme={theme} width="45%" />
         <Spacer y="xs" />
-        <SkeletonRow width="55%" />
+        <SkeletonRow theme={theme} width="55%" />
 
         <Spacer y="md" />
 
@@ -166,10 +111,10 @@ export function TransactionPayment({
         {/* Loading Button */}
         <div
           style={{
-            width: "100%",
-            height: "48px",
             backgroundColor: theme.colors.skeletonBg,
             borderRadius: spacing.md,
+            height: "48px",
+            width: "100%",
           }}
         />
 
@@ -183,35 +128,35 @@ export function TransactionPayment({
 
   return (
     <WithHeader
-      uiOptions={uiOptions}
-      defaultTitle="Transaction"
       client={client}
+      defaultTitle="Transaction"
+      uiOptions={uiOptions}
     >
       {/* Cost and Function Name section */}
       <Container
-        flex="row"
         center="y"
+        flex="row"
         gap="3xs"
         style={{
           justifyContent: "space-between",
         }}
       >
         {/* USD Value */}
-        <Text size="xl" color="primaryText" weight={700}>
+        <Text color="primaryText" size="xl" weight={700}>
           {transactionDataQuery.data?.usdValueDisplay ||
             transactionDataQuery.data?.txCostDisplay}
         </Text>
 
         {/* Function Name */}
         <Text
-          size="md"
           color="secondaryText"
+          size="md"
           style={{
-            fontFamily: "monospace",
-            textAlign: "right",
             backgroundColor: theme.colors.tertiaryBg,
-            padding: `${spacing.xs} ${spacing.sm}`,
             borderRadius: spacing.sm,
+            fontFamily: "monospace",
+            padding: `${spacing.xs} ${spacing.sm}`,
+            textAlign: "right",
           }}
         >
           {functionName}
@@ -228,14 +173,14 @@ export function TransactionPayment({
       <Container
         flex="row"
         style={{
-          justifyContent: "space-between",
           alignItems: "center",
+          justifyContent: "space-between",
         }}
       >
-        <Text size="sm" color="secondaryText">
+        <Text color="secondaryText" size="sm">
           Contract
         </Text>
-        <Text size="sm" color="primaryText">
+        <Text color="primaryText" size="sm">
           {contractName}
         </Text>
       </Container>
@@ -246,23 +191,23 @@ export function TransactionPayment({
       <Container
         flex="row"
         style={{
-          justifyContent: "space-between",
           alignItems: "center",
+          justifyContent: "space-between",
         }}
       >
-        <Text size="sm" color="secondaryText">
+        <Text color="secondaryText" size="sm">
           Address
         </Text>
         <a
           href={`https://thirdweb.com/${uiOptions.transaction.chain.id}/${uiOptions.transaction.to}`}
-          target="_blank"
           rel="noopener noreferrer"
           style={{
             color: theme.colors.accentText,
-            textDecoration: "none",
             fontFamily: "monospace",
             fontSize: fontSize.sm,
+            textDecoration: "none",
           }}
+          target="_blank"
         >
           {shortenAddress(uiOptions.transaction.to as string)}
         </a>
@@ -274,25 +219,25 @@ export function TransactionPayment({
       <Container
         flex="row"
         style={{
-          justifyContent: "space-between",
           alignItems: "center",
+          justifyContent: "space-between",
         }}
       >
-        <Text size="sm" color="secondaryText">
+        <Text color="secondaryText" size="sm">
           Network
         </Text>
-        <Container flex="row" gap="3xs" center="y">
+        <Container center="y" flex="row" gap="3xs">
           <ChainIcon
             chain={uiOptions.transaction.chain}
-            size="xs"
             client={client}
+            size="xs"
           />
           <ChainName
             chain={uiOptions.transaction.chain}
             client={client}
-            size="sm"
             color="primaryText"
             short
+            size="sm"
             style={{
               fontFamily: "monospace",
             }}
@@ -308,16 +253,16 @@ export function TransactionPayment({
           <Container
             flex="row"
             style={{
-              justifyContent: "space-between",
               alignItems: "center",
+              justifyContent: "space-between",
             }}
           >
-            <Text size="sm" color="secondaryText">
+            <Text color="secondaryText" size="sm">
               Cost
             </Text>
             <Text
-              size="sm"
               color="primaryText"
+              size="sm"
               style={{
                 fontFamily: "monospace",
               }}
@@ -336,16 +281,16 @@ export function TransactionPayment({
           <Container
             flex="row"
             style={{
-              justifyContent: "space-between",
               alignItems: "center",
+              justifyContent: "space-between",
             }}
           >
-            <Text size="sm" color="secondaryText">
+            <Text color="secondaryText" size="sm">
               Network fees
             </Text>
             <Text
-              size="sm"
               color="primaryText"
+              size="sm"
               style={{
                 fontFamily: "monospace",
               }}
@@ -365,7 +310,6 @@ export function TransactionPayment({
       {/* Action Button */}
       {activeAccount ? (
         <Button
-          variant="primary"
           fullWidth
           onClick={() => {
             if (transactionDataQuery.data?.tokenInfo) {
@@ -377,19 +321,20 @@ export function TransactionPayment({
             }
           }}
           style={{
-            padding: `${spacing.sm} ${spacing.md}`,
             fontSize: fontSize.md,
+            padding: `${spacing.sm} ${spacing.md}`,
           }}
+          variant="primary"
         >
           {buttonLabel}
         </Button>
       ) : (
         <ConnectButton
           client={client}
-          theme={theme}
           connectButton={{
             label: buttonLabel,
           }}
+          theme={theme}
           {...connectOptions}
         />
       )}
@@ -401,3 +346,68 @@ export function TransactionPayment({
     </WithHeader>
   );
 }
+
+const SkeletonHeader = (props: { theme: Theme }) => (
+  <Container
+    center="y"
+    flex="row"
+    gap="3xs"
+    style={{
+      justifyContent: "space-between",
+    }}
+  >
+    {/* USD Value Skeleton */}
+    <div
+      style={{
+        backgroundColor: props.theme.colors.skeletonBg,
+        borderRadius: spacing.xs,
+        height: "32px",
+        width: "80px",
+      }}
+    />
+
+    {/* Function Name Skeleton */}
+    <div
+      style={{
+        backgroundColor: props.theme.colors.skeletonBg,
+        borderRadius: spacing.sm,
+        height: "24px",
+        width: "120px",
+      }}
+    />
+  </Container>
+);
+
+// Skeleton component for loading state
+const SkeletonRow = ({
+  width = "100%",
+  theme,
+}: {
+  width?: string;
+  theme: Theme;
+}) => (
+  <Container
+    flex="row"
+    style={{
+      alignItems: "center",
+      justifyContent: "space-between",
+    }}
+  >
+    <div
+      style={{
+        backgroundColor: theme.colors.skeletonBg,
+        borderRadius: spacing.xs,
+        height: "16px",
+        width: "30%",
+      }}
+    />
+    <div
+      style={{
+        backgroundColor: theme.colors.skeletonBg,
+        borderRadius: spacing.xs,
+        height: "16px",
+        width,
+      }}
+    />
+  </Container>
+);
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/TransactionWidget.tsx b/packages/thirdweb/src/react/web/ui/Bridge/TransactionWidget.tsx
index 1630b6bd416..0bb40d97a7c 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/TransactionWidget.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/TransactionWidget.tsx
@@ -22,8 +22,8 @@ import type { Theme } from "../../../core/design-system/index.js";
 import type { SiweAuthOptions } from "../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButton_connectModalOptions } from "../../../core/hooks/connection/ConnectButtonProps.js";
 import type { SupportedTokens } from "../../../core/utils/defaultTokens.js";
-import { EmbedContainer } from "../ConnectWallet/Modal/ConnectEmbed.js";
 import { useConnectLocale } from "../ConnectWallet/locale/getConnectLocale.js";
+import { EmbedContainer } from "../ConnectWallet/Modal/ConnectEmbed.js";
 import { DynamicHeight } from "../components/DynamicHeight.js";
 import { Spinner } from "../components/Spinner.js";
 import type { LocaleId } from "../types.js";
@@ -276,7 +276,6 @@ export function TransactionWidget(props: TransactionWidgetProps) {
   const theme = props.theme || "dark";
 
   const bridgeDataQuery = useQuery({
-    queryKey: ["bridgeData", stringify(props)],
     queryFn: async (): Promise<UIOptionsResult> => {
       let erc20Value = props.transaction.erc20Value;
 
@@ -301,18 +300,19 @@ export function TransactionWidget(props: TransactionWidgetProps) {
       });
 
       return {
-        type: "success",
         data: {
-          mode: "transaction",
           metadata: {
-            title: props.title,
             description: props.description,
             image: props.image,
+            title: props.title,
           },
+          mode: "transaction",
           transaction,
         },
+        type: "success",
       };
     },
+    queryKey: ["bridgeData", stringify(props)],
   });
 
   let content = null;
@@ -320,13 +320,13 @@ export function TransactionWidget(props: TransactionWidgetProps) {
     content = (
       <div
         style={{
-          minHeight: "350px",
+          alignItems: "center",
           display: "flex",
           justifyContent: "center",
-          alignItems: "center",
+          minHeight: "350px",
         }}
       >
-        <Spinner size="xl" color="secondaryText" />
+        <Spinner color="secondaryText" size="xl" />
       </div>
     );
   } else if (bridgeDataQuery.data?.type === "unsupported_token") {
@@ -337,22 +337,22 @@ export function TransactionWidget(props: TransactionWidgetProps) {
     content = (
       <BridgeOrchestrator
         client={props.client}
-        uiOptions={bridgeDataQuery.data.data}
-        connectOptions={props.connectOptions}
         connectLocale={localeQuery.data}
-        purchaseData={props.purchaseData}
-        paymentLinkId={props.paymentLinkId}
+        connectOptions={props.connectOptions}
+        onCancel={() => {
+          props.onCancel?.();
+        }}
         onComplete={() => {
           props.onSuccess?.();
         }}
         onError={(err: Error) => {
           props.onError?.(err);
         }}
-        onCancel={() => {
-          props.onCancel?.();
-        }}
+        paymentLinkId={props.paymentLinkId}
         presetOptions={props.presetOptions}
+        purchaseData={props.purchaseData}
         receiverAddress={undefined}
+        uiOptions={bridgeDataQuery.data.data}
       />
     );
   }
@@ -360,9 +360,9 @@ export function TransactionWidget(props: TransactionWidgetProps) {
   return (
     <CustomThemeProvider theme={theme}>
       <EmbedContainer
+        className={props.className}
         modalSize="compact"
         style={props.style}
-        className={props.className}
       >
         <DynamicHeight>{content}</DynamicHeight>
       </EmbedContainer>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/UnsupportedTokenScreen.tsx b/packages/thirdweb/src/react/web/ui/Bridge/UnsupportedTokenScreen.tsx
index 98067d91332..2a10feeed0c 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/UnsupportedTokenScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/UnsupportedTokenScreen.tsx
@@ -2,8 +2,8 @@ import type { Chain } from "../../../../chains/types.js";
 import { iconSize } from "../../../core/design-system/index.js";
 import { useChainMetadata } from "../../../core/hooks/others/useChainQuery.js";
 import { AccentFailIcon } from "../ConnectWallet/icons/AccentFailIcon.js";
-import { Spacer } from "../components/Spacer.js";
 import { Container } from "../components/basic.js";
+import { Spacer } from "../components/Spacer.js";
 import { Text } from "../components/text.js";
 
 export interface UnsupportedTokenScreenProps {
@@ -26,8 +26,8 @@ export function UnsupportedTokenScreen(props: UnsupportedTokenScreenProps) {
     return (
       <Container
         animate="fadein"
-        flex="column"
         center="both"
+        flex="column"
         style={{ minHeight: "350px" }}
       >
         {/* Error Icon */}
@@ -45,7 +45,7 @@ export function UnsupportedTokenScreen(props: UnsupportedTokenScreenProps) {
           center
           color="secondaryText"
           size="sm"
-          style={{ maxWidth: "280px", lineHeight: 1.5 }}
+          style={{ lineHeight: 1.5, maxWidth: "280px" }}
         >
           The Universal Bridge does not support testnets at this time.
         </Text>
@@ -56,8 +56,8 @@ export function UnsupportedTokenScreen(props: UnsupportedTokenScreenProps) {
   return (
     <Container
       animate="fadein"
-      flex="column"
       center="both"
+      flex="column"
       style={{ minHeight: "350px" }}
     >
       {/* Error Icon */}
@@ -75,7 +75,7 @@ export function UnsupportedTokenScreen(props: UnsupportedTokenScreenProps) {
         center
         color="secondaryText"
         size="sm"
-        style={{ maxWidth: "280px", lineHeight: 1.5 }}
+        style={{ lineHeight: 1.5, maxWidth: "280px" }}
       >
         This token or chain is not supported by the Universal Bridge.
       </Text>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/common/TokenAndChain.tsx b/packages/thirdweb/src/react/web/ui/Bridge/common/TokenAndChain.tsx
index 4b195daf67a..a8b32108383 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/common/TokenAndChain.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/common/TokenAndChain.tsx
@@ -13,10 +13,10 @@ import {
 } from "../../../../core/hooks/others/useChainQuery.js";
 import { genericTokenIcon } from "../../../../core/utils/walletIcon.js";
 import { isNativeToken } from "../../ConnectWallet/screens/nativeToken.js";
-import { ChainName } from "../../components/ChainName.js";
-import { Img } from "../../components/Img.js";
 import { Container } from "../../components/basic.js";
+import { ChainName } from "../../components/ChainName.js";
 import { fallbackChainIcon } from "../../components/fallbackChainIcon.js";
+import { Img } from "../../components/Img.js";
 import { Text } from "../../components/text.js";
 
 export function TokenAndChain({
@@ -34,8 +34,8 @@ export function TokenAndChain({
   const chain = getCachedChain(token.chainId);
   return (
     <Container
-      flex="row"
       center="y"
+      flex="row"
       gap="sm"
       style={{
         flexWrap: "nowrap",
@@ -44,30 +44,30 @@ export function TokenAndChain({
     >
       <Container
         style={{
+          height: iconSize[size],
           position: "relative",
           width: iconSize[size],
-          height: iconSize[size],
         }}
       >
-        <TokenIconWithFallback token={token} size={size} client={client} />
+        <TokenIconWithFallback client={client} size={size} token={token} />
         {chain.id !== 1 && (
           <Container
             style={{
-              position: "absolute",
+              background: theme.colors.borderColor,
+              border: `1.5px solid ${theme.colors.modalBg}`,
+              borderRadius: "50%",
               bottom: "-2px",
-              right: "-6px",
-              width: size === "lg" || size === "xl" ? iconSize.sm : iconSize.xs,
               height:
                 size === "lg" || size === "xl" ? iconSize.sm : iconSize.xs,
-              borderRadius: "50%",
-              background: theme.colors.borderColor,
-              border: `1.5px solid ${theme.colors.modalBg}`,
+              position: "absolute",
+              right: "-6px",
+              width: size === "lg" || size === "xl" ? iconSize.sm : iconSize.xs,
             }}
           >
             <ChainIcon
               chain={chain}
-              size={size === "xl" || size === "lg" ? "sm" : "xs"}
               client={client}
+              size={size === "xl" || size === "lg" ? "sm" : "xs"}
             />
           </Container>
         )}
@@ -75,22 +75,22 @@ export function TokenAndChain({
 
       <Container flex="column" gap="3xs" style={{ minWidth: 0 }}>
         <Text
-          size={size === "xl" ? "lg" : "sm"}
           color="primaryText"
-          weight={600}
+          size={size === "xl" ? "lg" : "sm"}
           style={{
             overflow: "hidden",
             textOverflow: "ellipsis",
             whiteSpace: "nowrap",
           }}
+          weight={600}
         >
           {token.name}
         </Text>
         <ChainName
           chain={chain}
-          size={size === "xl" ? "sm" : "xs"}
           client={client}
           short
+          size={size === "xl" ? "sm" : "xs"}
         />
       </Container>
     </Container>
@@ -121,32 +121,32 @@ function TokenIconWithFallback(props: {
 
   return tokenImage ? (
     <Img
+      client={props.client}
+      fallbackImage={genericTokenIcon}
+      height={iconSize[props.size]}
       src={tokenImage}
       style={{
         borderRadius: "50%",
       }}
       width={iconSize[props.size]}
-      height={iconSize[props.size]}
-      fallbackImage={genericTokenIcon}
-      client={props.client}
     />
   ) : (
     <Container
       style={{
-        width: `${iconSize.md}px`,
-        height: `${iconSize.md}px`,
-        borderRadius: "50%",
+        alignItems: "center",
         backgroundColor: theme.colors.secondaryButtonBg,
         border: `1px solid ${theme.colors.borderColor}`,
+        borderRadius: "50%",
         display: "flex",
-        alignItems: "center",
+        height: `${iconSize.md}px`,
         justifyContent: "center",
         padding: spacing.xs,
+        width: `${iconSize.md}px`,
       }}
     >
       <Text
-        size={props.size === "xl" ? "sm" : "xs"}
         color="secondaryText"
+        size={props.size === "xl" ? "sm" : "xs"}
         style={{ fontWeight: 600 }}
       >
         {props.token.symbol.slice(0, 1)}
@@ -164,21 +164,21 @@ export const ChainIcon: React.FC<{
   return (
     <Container
       style={{
-        position: "relative",
+        alignItems: "center",
         display: "flex",
         flexShrink: 0,
-        alignItems: "center",
+        position: "relative",
       }}
     >
       <Img
+        client={props.client}
+        fallbackImage={fallbackChainIcon}
+        height={iconSize[props.size]}
         src={getSrcChainIcon({
-          client: props.client,
           chainIconUrl: url,
+          client: props.client,
         })}
         width={iconSize[props.size]}
-        height={iconSize[props.size]}
-        fallbackImage={fallbackChainIcon}
-        client={props.client}
       />
     </Container>
   );
@@ -194,8 +194,8 @@ const getSrcChainIcon = (props: {
   }
   try {
     return resolveScheme({
-      uri: url,
       client: props.client,
+      uri: url,
     });
   } catch {
     return fallbackChainIcon;
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/common/TokenBalanceRow.tsx b/packages/thirdweb/src/react/web/ui/Bridge/common/TokenBalanceRow.tsx
index 6f5ba2a3312..c51001a8081 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/common/TokenBalanceRow.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/common/TokenBalanceRow.tsx
@@ -27,37 +27,37 @@ export function TokenBalanceRow({
   return (
     <StyledButton
       onClick={() => onClick(token)}
-      variant="secondary"
       style={{
         display: "flex",
         justifyContent: "space-between",
         padding: `${spacing.sm} ${spacing.md}`,
         ...style,
       }}
+      variant="secondary"
     >
       <TokenAndChain
-        token={token}
         client={client}
         size="lg"
-        style={{ maxWidth: "50%", flex: 1 }}
+        style={{ flex: 1, maxWidth: "50%" }}
+        token={token}
       />
 
       <Container
-        flex="row"
         center="y"
-        gap="4xs"
         color="secondaryText"
+        flex="row"
+        gap="4xs"
         style={{
           flex: "1",
+          flexWrap: "nowrap",
+          justifyContent: "flex-end",
           maxWidth: "50%",
           minWidth: 0,
-          justifyContent: "flex-end",
-          flexWrap: "nowrap",
         }}
       >
         <Container
-          flex="column"
           color="secondaryText"
+          flex="column"
           gap="3xs"
           style={{
             alignItems: "flex-end",
@@ -66,16 +66,16 @@ export function TokenBalanceRow({
           }}
         >
           <FiatValue
-            tokenAmount={amount}
-            token={token}
             chain={chain}
             client={client}
             color="primaryText"
             size="sm"
+            token={token}
+            tokenAmount={amount}
           />
           <Text
-            size="xs"
             color="secondaryText"
+            size="xs"
             style={{
               overflow: "hidden",
               textOverflow: "ellipsis",
@@ -96,16 +96,16 @@ export function TokenBalanceRow({
 const StyledButton = /* @__PURE__ */ styled(Button)((props) => {
   const theme = useCustomTheme();
   return {
+    "&:hover": {
+      background: theme.colors.secondaryButtonBg,
+    },
     background: "transparent",
-    justifyContent: "space-between",
-    flexWrap: "nowrap",
     flexDirection: "row",
+    flexWrap: "nowrap",
+    gap: spacing.sm,
+    justifyContent: "space-between",
     padding: spacing.sm,
     paddingRight: spacing.xs,
-    gap: spacing.sm,
-    "&:hover": {
-      background: theme.colors.secondaryButtonBg,
-    },
     transition: "background 200ms ease, transform 150ms ease",
     ...props.style,
   };
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/common/WithHeader.tsx b/packages/thirdweb/src/react/web/ui/Bridge/common/WithHeader.tsx
index 359006e00ba..1d15290b8f4 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/common/WithHeader.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/common/WithHeader.tsx
@@ -2,8 +2,8 @@ import type { ThirdwebClient } from "../../../../../client/client.js";
 import { resolveScheme } from "../../../../../utils/ipfs.js";
 import { useCustomTheme } from "../../../../core/design-system/CustomThemeProvider.js";
 import { radius } from "../../../../core/design-system/index.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container } from "../../components/basic.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 import type { UIOptions } from "../BridgeOrchestrator.js";
 
@@ -25,17 +25,17 @@ export function WithHeader({
       {uiOptions.metadata?.image && (
         <div
           style={{
-            width: "100%",
-            borderRadius: `${radius.md} ${radius.md} 0 0`,
-            overflow: "hidden",
             aspectRatio: "16/9",
             backgroundColor: theme.colors.tertiaryBg,
             backgroundImage: `url(${resolveScheme({
               client,
               uri: uiOptions.metadata.image,
             })})`,
-            backgroundSize: "cover",
             backgroundPosition: "center",
+            backgroundSize: "cover",
+            borderRadius: `${radius.md} ${radius.md} 0 0`,
+            overflow: "hidden",
+            width: "100%",
           }}
         />
       )}
@@ -43,7 +43,7 @@ export function WithHeader({
         <Spacer y="lg" />
 
         {/* title */}
-        <Text size="lg" color="primaryText" weight={700}>
+        <Text color="primaryText" size="lg" weight={700}>
           {uiOptions.metadata?.title || defaultTitle}
         </Text>
 
@@ -51,7 +51,7 @@ export function WithHeader({
         {uiOptions.metadata?.description && (
           <>
             <Spacer y="xs" />
-            <Text size="sm" color="secondaryText">
+            <Text color="secondaryText" size="sm">
               {uiOptions.metadata?.description}
             </Text>
           </>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/payment-details/PaymentDetails.tsx b/packages/thirdweb/src/react/web/ui/Bridge/payment-details/PaymentDetails.tsx
index 13e1fba6f20..d8b285dca29 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/payment-details/PaymentDetails.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/payment-details/PaymentDetails.tsx
@@ -4,14 +4,13 @@ import { useCustomTheme } from "../../../../core/design-system/CustomThemeProvid
 import { radius, spacing } from "../../../../core/design-system/index.js";
 import type { BridgePrepareResult } from "../../../../core/hooks/useBridgePrepare.js";
 import type { PaymentMethod } from "../../../../core/machines/paymentMachine.js";
-import {} from "../../ConnectWallet/screens/Buy/fiat/currencies.js";
 import {
   formatCurrencyAmount,
   formatTokenAmount,
 } from "../../ConnectWallet/screens/formatTokenBalance.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container, ModalHeader } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 import type { UIOptions } from "../BridgeOrchestrator.js";
 import { PaymentOverview } from "./PaymentOverview.js";
@@ -81,25 +80,25 @@ export function PaymentDetails({
           // can never happen
           onError(new Error("Invalid payment method"));
           return {
-            originToken: undefined,
-            destinationToken: undefined,
-            originAmount: "0",
             destinationAmount: "0",
+            destinationToken: undefined,
             estimatedTime: 0,
+            originAmount: "0",
+            originToken: undefined,
           };
         }
         return {
-          originToken: token,
-          destinationToken: token,
-          originAmount: formatTokenAmount(
-            preparedQuote.originAmount,
-            token.decimals,
-          ),
           destinationAmount: formatTokenAmount(
             preparedQuote.destinationAmount,
             token.decimals,
           ),
+          destinationToken: token,
           estimatedTime: preparedQuote.estimatedExecutionTimeMs,
+          originAmount: formatTokenAmount(
+            preparedQuote.originAmount,
+            token.decimals,
+          ),
+          originToken: token,
         };
       }
       case "buy": {
@@ -109,31 +108,31 @@ export function PaymentDetails({
           // can never happen
           onError(new Error("Invalid payment method"));
           return {
-            originToken: undefined,
-            destinationToken: undefined,
-            originAmount: "0",
             destinationAmount: "0",
+            destinationToken: undefined,
             estimatedTime: 0,
+            originAmount: "0",
+            originToken: undefined,
           };
         }
         return {
-          originToken:
-            paymentMethod.type === "wallet"
-              ? paymentMethod.originToken
-              : undefined,
+          destinationAmount: formatTokenAmount(
+            preparedQuote.destinationAmount,
+            preparedQuote.steps[preparedQuote.steps.length - 1]
+              ?.destinationToken?.decimals ?? 18,
+          ),
           destinationToken:
             preparedQuote.steps[preparedQuote.steps.length - 1]
               ?.destinationToken,
+          estimatedTime: preparedQuote.estimatedExecutionTimeMs,
           originAmount: formatTokenAmount(
             preparedQuote.originAmount,
             method.originToken.decimals,
           ),
-          destinationAmount: formatTokenAmount(
-            preparedQuote.destinationAmount,
-            preparedQuote.steps[preparedQuote.steps.length - 1]
-              ?.destinationToken?.decimals ?? 18,
-          ),
-          estimatedTime: preparedQuote.estimatedExecutionTimeMs,
+          originToken:
+            paymentMethod.type === "wallet"
+              ? paymentMethod.originToken
+              : undefined,
         };
       }
       case "onramp": {
@@ -143,25 +142,25 @@ export function PaymentDetails({
           // can never happen
           onError(new Error("Invalid payment method"));
           return {
-            originToken: undefined,
-            destinationToken: undefined,
-            originAmount: "0",
             destinationAmount: "0",
+            destinationToken: undefined,
             estimatedTime: 0,
+            originAmount: "0",
+            originToken: undefined,
           };
         }
         return {
-          originToken: undefined, // Onramp starts with fiat
+          destinationAmount: formatTokenAmount(
+            preparedQuote.destinationAmount,
+            preparedQuote.destinationToken.decimals,
+          ), // Onramp starts with fiat
           destinationToken: preparedQuote.destinationToken,
+          estimatedTime: undefined,
           originAmount: formatCurrencyAmount(
             method.currency,
             Number(preparedQuote.currencyAmount),
           ),
-          destinationAmount: formatTokenAmount(
-            preparedQuote.destinationAmount,
-            preparedQuote.destinationToken.decimals,
-          ),
-          estimatedTime: undefined,
+          originToken: undefined,
         };
       }
       default: {
@@ -176,7 +175,7 @@ export function PaymentDetails({
 
   return (
     <Container flex="column" fullHeight p="lg">
-      <ModalHeader title="Payment Details" onBack={onBack} />
+      <ModalHeader onBack={onBack} title="Payment Details" />
 
       <Spacer y="xl" />
 
@@ -185,17 +184,17 @@ export function PaymentDetails({
         <Container flex="column">
           {displayData.destinationToken && (
             <PaymentOverview
-              uiOptions={uiOptions}
+              client={client}
+              fromAmount={displayData.originAmount}
+              paymentMethod={paymentMethod}
+              receiver={preparedQuote.intent.receiver}
               sender={
                 preparedQuote.intent.sender ||
                 paymentMethod.payerWallet.getAccount()?.address
               }
-              client={client}
-              paymentMethod={paymentMethod}
-              toToken={displayData.destinationToken}
-              receiver={preparedQuote.intent.receiver}
-              fromAmount={displayData.originAmount}
               toAmount={displayData.destinationAmount}
+              toToken={displayData.destinationToken}
+              uiOptions={uiOptions}
             />
           )}
 
@@ -204,12 +203,12 @@ export function PaymentDetails({
             <Container
               flex="row"
               gap="xs"
-              style={{ justifyContent: "center", flex: 1 }}
+              style={{ flex: 1, justifyContent: "center" }}
             >
-              <Text size="sm" color="secondaryText">
+              <Text color="secondaryText" size="sm">
                 Estimated Time
               </Text>
-              <Text size="sm" color="primaryText">
+              <Text color="primaryText" size="sm">
                 {displayData.estimatedTime
                   ? `~${Math.ceil(displayData.estimatedTime / 60000)} min`
                   : "~2 min"}
@@ -220,12 +219,12 @@ export function PaymentDetails({
               <Container
                 flex="row"
                 gap="xs"
-                style={{ justifyContent: "center", flex: 1 }}
+                style={{ flex: 1, justifyContent: "center" }}
               >
-                <Text size="sm" color="secondaryText">
+                <Text color="secondaryText" size="sm">
                   Route Length
                 </Text>
-                <Text size="sm" color="primaryText">
+                <Text color="primaryText" size="sm">
                   {preparedQuote.steps.length} step
                   {preparedQuote.steps.length !== 1 ? "s" : ""}
                 </Text>
@@ -243,17 +242,17 @@ export function PaymentDetails({
               flex="column"
               gap="sm"
               style={{
+                backgroundColor: theme.colors.tertiaryBg,
                 border: `1px solid ${theme.colors.borderColor}`,
                 borderRadius: radius.md,
-                backgroundColor: theme.colors.tertiaryBg,
                 padding: `${spacing.sm} ${spacing.md}`,
               }}
             >
               {preparedQuote.steps.map((step, stepIndex) => (
                 <Container
-                  key={`step-${stepIndex}-${step.originToken.address}-${step.destinationToken.address}`}
                   flex="column"
                   gap="sm"
+                  key={`step-${stepIndex}-${step.originToken.address}-${step.destinationToken.address}`}
                 >
                   {/* Step Header */}
                   <Container
@@ -265,33 +264,33 @@ export function PaymentDetails({
                       center="both"
                       flex="row"
                       style={{
-                        width: "24px",
-                        height: "24px",
-                        borderRadius: "50%",
                         backgroundColor: theme.colors.accentButtonBg,
+                        borderRadius: "50%",
                         color: theme.colors.accentButtonText,
+                        flexShrink: 0,
                         fontSize: "12px",
                         fontWeight: "bold",
-                        flexShrink: 0,
+                        height: "24px",
+                        width: "24px",
                       }}
                     >
-                      <Text size="xs" color="accentButtonText">
+                      <Text color="accentButtonText" size="xs">
                         {stepIndex + 1}
                       </Text>
                     </Container>
 
                     <Container
-                      flex="row"
                       center="y"
+                      flex="row"
                       gap="sm"
                       style={{ flex: 1 }}
                     >
                       <Container flex="column" gap="3xs" style={{ flex: 1 }}>
-                        <Text size="sm" color="primaryText">
+                        <Text color="primaryText" size="sm">
                           {step.originToken.symbol} →{" "}
                           {step.destinationToken.symbol}
                         </Text>
-                        <Text size="xs" color="secondaryText">
+                        <Text color="secondaryText" size="xs">
                           {step.originToken.name} to{" "}
                           {step.destinationToken.name}
                         </Text>
@@ -308,7 +307,7 @@ export function PaymentDetails({
 
         {/* Action Buttons */}
         <Container flex="column" gap="sm">
-          <Button variant="accent" fullWidth onClick={handleConfirm}>
+          <Button fullWidth onClick={handleConfirm} variant="accent">
             Confirm Payment
           </Button>
         </Container>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/payment-details/PaymentOverview.tsx b/packages/thirdweb/src/react/web/ui/Bridge/payment-details/PaymentOverview.tsx
index d51918c5380..f10b444c453 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/payment-details/PaymentOverview.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/payment-details/PaymentOverview.tsx
@@ -39,8 +39,8 @@ export function PaymentOverview(props: {
         bg="tertiaryBg"
         flex="column"
         style={{
-          borderRadius: radius.lg,
           border: `1px solid ${theme.colors.borderColor}`,
+          borderRadius: radius.lg,
         }}
       >
         {sender && (
@@ -63,42 +63,42 @@ export function PaymentOverview(props: {
         )}
         {props.paymentMethod.type === "wallet" && (
           <TokenBalanceRow
-            token={props.paymentMethod.originToken}
-            client={props.client}
             amount={props.fromAmount}
+            client={props.client}
             onClick={() => {}}
             style={{
               background: "transparent",
-              borderRadius: 0,
               border: "none",
+              borderRadius: 0,
             }}
+            token={props.paymentMethod.originToken}
           />
         )}
         {props.paymentMethod.type === "fiat" && (
           <Container
+            center="y"
             flex="row"
             gap="sm"
             px="md"
             py="sm"
-            center="y"
             style={{ justifyContent: "space-between" }}
           >
-            <Container flex="row" gap="sm" center="y">
+            <Container center="y" flex="row" gap="sm">
               {getFiatCurrencyIcon({
                 currency: props.paymentMethod.currency,
                 size: "lg",
               })}
-              <Container flex="column" gap="3xs" center="y">
-                <Text size="sm" color="primaryText" style={{ fontWeight: 600 }}>
+              <Container center="y" flex="column" gap="3xs">
+                <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
                   {props.paymentMethod.currency}
                 </Text>
-                <Text size="xs" color="secondaryText">
+                <Text color="secondaryText" size="xs">
                   {props.paymentMethod.onramp.charAt(0).toUpperCase() +
                     props.paymentMethod.onramp.slice(1)}
                 </Text>
               </Container>
             </Container>
-            <Text size="sm" color="primaryText" style={{ fontWeight: 600 }}>
+            <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
               {props.fromAmount}
             </Text>
           </Container>
@@ -108,11 +108,11 @@ export function PaymentOverview(props: {
       <StepConnectorArrow />
       {/* Buy */}
       <Container
-        flex="column"
         bg="tertiaryBg"
+        flex="column"
         style={{
-          borderRadius: radius.lg,
           border: `1px solid ${theme.colors.borderColor}`,
+          borderRadius: radius.lg,
         }}
       >
         {isDifferentRecipient && (
@@ -135,38 +135,38 @@ export function PaymentOverview(props: {
         )}
         {props.uiOptions.mode === "direct_payment" && (
           <Container
+            center="y"
             flex="row"
             gap="sm"
             p="md"
-            center="y"
             style={{ justifyContent: "space-between" }}
           >
-            <Container flex="column" gap="3xs" center="y" style={{ flex: 1 }}>
-              <Text size="sm" color="primaryText" style={{ fontWeight: 600 }}>
+            <Container center="y" flex="column" gap="3xs" style={{ flex: 1 }}>
+              <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
                 {props.uiOptions.metadata?.title || "Payment"}
               </Text>
               {props.uiOptions.metadata?.description && (
-                <Text size="xs" color="secondaryText">
+                <Text color="secondaryText" size="xs">
                   {props.uiOptions.metadata.description}
                 </Text>
               )}
             </Container>
             <Container
+              center="y"
               flex="column"
               gap="3xs"
-              center="y"
               style={{ alignItems: "flex-end" }}
             >
               <FiatValue
-                tokenAmount={props.uiOptions.paymentInfo.amount}
-                token={props.toToken}
-                client={props.client}
                 chain={defineChain(props.toToken.chainId)}
-                weight={600}
+                client={props.client}
                 color="primaryText"
                 size="sm"
+                token={props.toToken}
+                tokenAmount={props.uiOptions.paymentInfo.amount}
+                weight={600}
               />
-              <Text size="xs" color="secondaryText">
+              <Text color="secondaryText" size="xs">
                 {props.uiOptions.paymentInfo.amount} {props.toToken.symbol}
               </Text>
             </Container>
@@ -174,21 +174,21 @@ export function PaymentOverview(props: {
         )}
         {props.uiOptions.mode === "fund_wallet" && (
           <TokenBalanceRow
-            token={props.toToken}
-            client={props.client}
             amount={props.toAmount}
+            client={props.client}
             onClick={() => {}}
             style={{
               background: "transparent",
-              borderRadius: 0,
               border: "none",
+              borderRadius: 0,
             }}
+            token={props.toToken}
           />
         )}
         {props.uiOptions.mode === "transaction" && (
           <TransactionOverViewCompact
-            uiOptions={props.uiOptions}
             client={props.client}
+            uiOptions={props.uiOptions}
           />
         )}
       </Container>
@@ -202,55 +202,55 @@ const TransactionOverViewCompact = (props: {
 }) => {
   const theme = useCustomTheme();
   const txInfo = useTransactionDetails({
-    transaction: props.uiOptions.transaction,
     client: props.client,
+    transaction: props.uiOptions.transaction,
   });
 
   if (!txInfo.data) {
     // Skeleton loading state
     return (
       <Container
+        center="y"
         flex="row"
         gap="sm"
         p="md"
-        center="y"
         style={{ justifyContent: "space-between" }}
       >
-        <Container flex="column" gap="3xs" center="y" style={{ flex: 1 }}>
+        <Container center="y" flex="column" gap="3xs" style={{ flex: 1 }}>
           {/* Title skeleton */}
           <div
             style={{
-              width: "120px",
-              height: "16px",
               backgroundColor: theme.colors.skeletonBg,
               borderRadius: spacing.xs,
+              height: "16px",
+              width: "120px",
             }}
           />
           {/* Description skeleton - only if metadata exists */}
           {props.uiOptions.metadata?.description && (
             <div
               style={{
-                width: "80px",
-                height: "12px",
                 backgroundColor: theme.colors.skeletonBg,
                 borderRadius: spacing.xs,
+                height: "12px",
+                width: "80px",
               }}
             />
           )}
         </Container>
         <Container
+          center="y"
           flex="column"
           gap="3xs"
-          center="y"
           style={{ alignItems: "flex-end" }}
         >
           {/* Function name skeleton */}
           <div
             style={{
-              width: "100px",
-              height: "24px",
               backgroundColor: theme.colors.skeletonBg,
               borderRadius: spacing.sm,
+              height: "24px",
+              width: "100px",
             }}
           />
         </Container>
@@ -260,37 +260,37 @@ const TransactionOverViewCompact = (props: {
 
   return (
     <Container
+      center="y"
       flex="row"
       gap="sm"
       p="md"
-      center="y"
       style={{ justifyContent: "space-between" }}
     >
-      <Container flex="column" gap="3xs" center="y" style={{ flex: 1 }}>
-        <Text size="sm" color="primaryText" style={{ fontWeight: 600 }}>
+      <Container center="y" flex="column" gap="3xs" style={{ flex: 1 }}>
+        <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
           {props.uiOptions.metadata?.title || "Transaction"}
         </Text>
         {props.uiOptions.metadata?.description && (
-          <Text size="xs" color="secondaryText">
+          <Text color="secondaryText" size="xs">
             {props.uiOptions.metadata.description}
           </Text>
         )}
       </Container>
       <Container
+        center="y"
         flex="column"
         gap="3xs"
-        center="y"
         style={{ alignItems: "flex-end" }}
       >
         <Text
-          size="xs"
           color="secondaryText"
+          size="xs"
           style={{
-            fontFamily: "monospace",
-            textAlign: "right",
             backgroundColor: theme.colors.secondaryButtonBg,
-            padding: `${spacing.xs} ${spacing.sm}`,
             borderRadius: spacing.sm,
+            fontFamily: "monospace",
+            padding: `${spacing.xs} ${spacing.sm}`,
+            textAlign: "right",
           }}
         >
           {txInfo.data.functionInfo.functionName}
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/FiatProviderSelection.tsx b/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/FiatProviderSelection.tsx
index 3611b05cd12..c9107df5fbf 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/FiatProviderSelection.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/FiatProviderSelection.tsx
@@ -10,11 +10,11 @@ import {
   spacing,
 } from "../../../../core/design-system/index.js";
 import { useBuyWithFiatQuotesForProviders } from "../../../../core/hooks/pay/useBuyWithFiatQuotesForProviders.js";
+import { Container } from "../../components/basic.js";
+import { Button } from "../../components/buttons.js";
 import { Img } from "../../components/Img.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Spinner } from "../../components/Spinner.js";
-import { Container } from "../../components/basic.js";
-import { Button } from "../../components/buttons.js";
 import { Text } from "../../components/text.js";
 
 interface FiatProviderSelectionProps {
@@ -28,22 +28,22 @@ interface FiatProviderSelectionProps {
 
 const PROVIDERS = [
   {
-    id: "coinbase" as const,
-    name: "Coinbase",
     description: "Fast and secure payments",
     iconUri: "https://i.ibb.co/LDJ3Rk2t/Frame-5.png",
+    id: "coinbase" as const,
+    name: "Coinbase",
   },
   {
-    id: "stripe" as const,
-    name: "Stripe",
     description: "Trusted payment processing",
     iconUri: "https://i.ibb.co/CpgQC2Lf/images-3.png",
+    id: "stripe" as const,
+    name: "Stripe",
   },
   {
-    id: "transak" as const,
-    name: "Transak",
     description: "Global payment solution",
     iconUri: "https://i.ibb.co/Xx2r882p/Transak-official-symbol-1.png",
+    id: "transak" as const,
+    name: "Transak",
   },
 ];
 
@@ -59,12 +59,12 @@ export function FiatProviderSelection({
 
   // Fetch quotes for all providers
   const quoteQueries = useBuyWithFiatQuotesForProviders({
-    client,
-    chainId: toChainId,
-    tokenAddress: checksumAddress(toTokenAddress),
-    receiver: checksumAddress(toAddress),
     amount: toAmount || "0",
+    chainId: toChainId,
+    client,
     currency: "USD",
+    receiver: checksumAddress(toAddress),
+    tokenAddress: checksumAddress(toTokenAddress),
   });
 
   const quotes = useMemo(() => {
@@ -89,53 +89,53 @@ export function FiatProviderSelection({
 
               return (
                 <Container
-                  key={provider.id}
                   animate="fadein"
+                  key={provider.id}
                   style={{
                     animationDelay: `${index * 100}ms`,
                   }}
                 >
                   <Button
-                    variant="secondary"
                     fullWidth
                     onClick={() => onProviderSelected(provider.id)}
                     style={{
+                      backgroundColor: theme.colors.tertiaryBg,
                       border: `1px solid ${theme.colors.borderColor}`,
                       borderRadius: radius.md,
                       padding: `${spacing.sm} ${spacing.md}`,
-                      backgroundColor: theme.colors.tertiaryBg,
                       textAlign: "left",
                     }}
+                    variant="secondary"
                   >
                     <Container
                       flex="row"
                       gap="sm"
-                      style={{ width: "100%", alignItems: "center" }}
+                      style={{ alignItems: "center", width: "100%" }}
                     >
                       <Container
                         style={{
-                          width: `${iconSize.md}px`,
-                          height: `${iconSize.md}px`,
+                          alignItems: "center",
                           borderRadius: "50%",
                           display: "flex",
-                          alignItems: "center",
+                          height: `${iconSize.md}px`,
                           justifyContent: "center",
-                          padding: spacing.xs,
                           overflow: "hidden",
+                          padding: spacing.xs,
+                          width: `${iconSize.md}px`,
                         }}
                       >
                         <Img
-                          src={provider.iconUri}
                           alt={provider.name}
-                          width={iconSize.md}
-                          height={iconSize.md}
                           client={client}
+                          height={iconSize.md}
+                          src={provider.iconUri}
+                          width={iconSize.md}
                         />
                       </Container>
                       <Container flex="column" gap="3xs" style={{ flex: 1 }}>
                         <Text
-                          size="md"
                           color="primaryText"
+                          size="md"
                           style={{ fontWeight: 600 }}
                         >
                           {provider.name}
@@ -147,18 +147,18 @@ export function FiatProviderSelection({
                         style={{ alignItems: "flex-end" }}
                       >
                         <Text
-                          size="sm"
                           color="primaryText"
+                          size="sm"
                           style={{ fontWeight: 500 }}
                         >
                           $
                           {quote.currencyAmount.toLocaleString(undefined, {
-                            minimumFractionDigits: 2,
                             maximumFractionDigits: 2,
+                            minimumFractionDigits: 2,
                           })}{" "}
                           {quote.currency}
                         </Text>
-                        <Text size="xs" color="secondaryText">
+                        <Text color="secondaryText" size="xs">
                           {toTokens(
                             quote.destinationAmount,
                             quote.destinationToken.decimals,
@@ -172,10 +172,10 @@ export function FiatProviderSelection({
               );
             })
         ) : (
-          <Container flex="column" center="both" style={{ minHeight: "120px" }}>
-            <Spinner size="lg" color="secondaryText" />
+          <Container center="both" flex="column" style={{ minHeight: "120px" }}>
+            <Spinner color="secondaryText" size="lg" />
             <Spacer y="sm" />
-            <Text size="sm" color="secondaryText" center>
+            <Text center color="secondaryText" size="sm">
               Generating quotes...
             </Text>
           </Container>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/PaymentSelection.tsx b/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/PaymentSelection.tsx
index fc97f34e969..353d5f9c327 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/PaymentSelection.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/PaymentSelection.tsx
@@ -12,9 +12,9 @@ import { useConnectedWallets } from "../../../../core/hooks/wallets/useConnected
 import type { PaymentMethod } from "../../../../core/machines/paymentMachine.js";
 import type { ConnectLocale } from "../../ConnectWallet/locale/types.js";
 import { WalletSwitcherConnectionScreen } from "../../ConnectWallet/screens/WalletSwitcherConnectionScreen.js";
-import type { PayEmbedConnectOptions } from "../../PayEmbed.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container, ModalHeader } from "../../components/basic.js";
+import { Spacer } from "../../components/Spacer.js";
+import type { PayEmbedConnectOptions } from "../../PayEmbed.js";
 import { FiatProviderSelection } from "./FiatProviderSelection.js";
 import { TokenSelection } from "./TokenSelection.js";
 import { WalletFiatSelection } from "./WalletFiatSelection.js";
@@ -105,9 +105,9 @@ export function PaymentSelection({
     isLoading: paymentMethodsLoading,
     error: paymentMethodsError,
   } = usePaymentMethods({
-    destinationToken,
-    destinationAmount,
     client,
+    destinationAmount,
+    destinationToken,
     includeDestinationToken:
       includeDestinationToken ||
       receiverAddress?.toLowerCase() !==
@@ -131,7 +131,7 @@ export function PaymentSelection({
   };
 
   const handleWalletSelected = (wallet: Wallet) => {
-    setCurrentStep({ type: "tokenSelection", selectedWallet: wallet });
+    setCurrentStep({ selectedWallet: wallet, type: "tokenSelection" });
   };
 
   const handleConnectWallet = async () => {
@@ -155,10 +155,10 @@ export function PaymentSelection({
     }
 
     const fiatPaymentMethod: PaymentMethod = {
-      type: "fiat",
-      payerWallet,
-      currency: "USD", // Default to USD for now
+      currency: "USD",
       onramp: provider,
+      payerWallet, // Default to USD for now
+      type: "fiat",
     };
     handlePaymentMethodSelected(fiatPaymentMethod);
   };
@@ -204,10 +204,10 @@ export function PaymentSelection({
         chains={chains}
         client={client}
         connectLocale={connectLocale}
+        hiddenWallets={[]}
         isEmbed={false}
         onBack={handleBackToWalletSelection}
         onSelect={handleWalletSelected}
-        hiddenWallets={[]}
         recommendedWallets={connectOptions?.recommendedWallets}
         showAllWallets={
           connectOptions?.showAllWallets === undefined
@@ -222,33 +222,33 @@ export function PaymentSelection({
 
   return (
     <Container flex="column" p="lg">
-      <ModalHeader title={getStepTitle()} onBack={getBackHandler()} />
+      <ModalHeader onBack={getBackHandler()} title={getStepTitle()} />
 
       <Spacer y="xl" />
 
       <Container flex="column">
         {currentStep.type === "walletSelection" && (
           <WalletFiatSelection
-            connectedWallets={connectedWallets}
             client={client}
-            onWalletSelected={handleWalletSelected}
-            onFiatSelected={handleFiatSelected}
+            connectedWallets={connectedWallets}
             onConnectWallet={handleConnectWallet}
+            onFiatSelected={handleFiatSelected}
+            onWalletSelected={handleWalletSelected}
           />
         )}
 
         {currentStep.type === "tokenSelection" && (
           <TokenSelection
-            paymentMethods={paymentMethods}
-            paymentMethodsLoading={paymentMethodsLoading}
             client={client}
-            onPaymentMethodSelected={handlePaymentMethodSelected}
-            onBack={handleBackToWalletSelection}
-            destinationToken={destinationToken}
             destinationAmount={toUnits(
               destinationAmount,
               destinationToken.decimals,
             )}
+            destinationToken={destinationToken}
+            onBack={handleBackToWalletSelection}
+            onPaymentMethodSelected={handlePaymentMethodSelected}
+            paymentMethods={paymentMethods}
+            paymentMethodsLoading={paymentMethodsLoading}
           />
         )}
 
@@ -256,10 +256,10 @@ export function PaymentSelection({
           <FiatProviderSelection
             client={client}
             onProviderSelected={handleOnrampProviderSelected}
-            toChainId={destinationToken.chainId}
-            toTokenAddress={destinationToken.address}
             toAddress={receiverAddress || ""}
             toAmount={destinationAmount}
+            toChainId={destinationToken.chainId}
+            toTokenAddress={destinationToken.address}
           />
         )}
       </Container>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/TokenSelection.tsx b/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/TokenSelection.tsx
index cc1f8e83778..547562305dc 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/TokenSelection.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/TokenSelection.tsx
@@ -6,10 +6,10 @@ import { radius, spacing } from "../../../../core/design-system/index.js";
 import { useBridgeQuote } from "../../../../core/hooks/useBridgeQuote.js";
 import type { PaymentMethod } from "../../../../core/machines/paymentMachine.js";
 import { formatTokenAmount } from "../../ConnectWallet/screens/formatTokenBalance.js";
-import { Skeleton } from "../../components/Skeleton.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
+import { Skeleton } from "../../components/Skeleton.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 import { TokenAndChain } from "../common/TokenAndChain.js";
 
@@ -47,10 +47,10 @@ function PaymentMethodTokenRow({
     isLoading: quoteLoading,
     error: quoteError,
   } = useBridgeQuote({
-    originToken: paymentMethod.originToken,
-    destinationToken,
-    destinationAmount,
     client,
+    destinationAmount,
+    destinationToken,
+    originToken: paymentMethod.originToken,
   });
 
   // Use the fetched originAmount if available, otherwise fall back to the one from paymentMethod
@@ -61,56 +61,56 @@ function PaymentMethodTokenRow({
 
   return (
     <Button
-      key={`${paymentMethod.originToken.address}-${paymentMethod.originToken.chainId}`}
-      variant="secondary"
+      disabled={!hasEnoughBalance}
       fullWidth
+      key={`${paymentMethod.originToken.address}-${paymentMethod.originToken.chainId}`}
       onClick={() => onPaymentMethodSelected(paymentMethod)}
-      disabled={!hasEnoughBalance}
       style={{
+        backgroundColor: theme.colors.tertiaryBg,
         border: `1px solid ${theme.colors.borderColor}`,
         borderRadius: radius.md,
-        padding: `${spacing.sm} ${spacing.md}`,
-        backgroundColor: theme.colors.tertiaryBg,
         opacity: hasEnoughBalance ? 1 : 0.5,
+        padding: `${spacing.sm} ${spacing.md}`,
         textAlign: "left",
       }}
+      variant="secondary"
     >
       <Container
         flex="row"
         gap="md"
-        style={{ width: "100%", alignItems: "center" }}
+        style={{ alignItems: "center", width: "100%" }}
       >
         <TokenAndChain
-          token={paymentMethod.originToken}
           client={client}
           size="lg"
           style={{
             maxWidth: "50%",
           }}
+          token={paymentMethod.originToken}
         />
         <Container
           flex="column"
           gap="3xs"
-          style={{ flex: 1, alignItems: "flex-end" }}
+          style={{ alignItems: "flex-end", flex: 1 }}
         >
           {quoteLoading ? (
             <>
               {/* Price amount skeleton */}
-              <Skeleton width="80px" height="16px" />
+              <Skeleton height="16px" width="80px" />
               {/* Balance skeleton */}
               <Container flex="row" gap="3xs">
-                <Skeleton width="50px" height="12px" />
-                <Skeleton width="40px" height="12px" />
+                <Skeleton height="12px" width="50px" />
+                <Skeleton height="12px" width="40px" />
               </Container>
             </>
           ) : quoteError ? (
-            <Text size="sm" color="danger" style={{ fontWeight: 600 }}>
+            <Text color="danger" size="sm" style={{ fontWeight: 600 }}>
               Quote failed
             </Text>
           ) : displayOriginAmount ? (
             <Text
-              size="sm"
               color="primaryText"
+              size="sm"
               style={{ fontWeight: 600, textWrap: "nowrap" }}
             >
               {formatTokenAmount(
@@ -124,11 +124,10 @@ function PaymentMethodTokenRow({
           )}
           {!quoteLoading && (
             <Container flex="row" gap="3xs">
-              <Text size="xs" color="secondaryText">
+              <Text color="secondaryText" size="xs">
                 Balance:{" "}
               </Text>
               <Text
-                size="xs"
                 color={
                   !quoteLoading
                     ? hasEnoughBalance
@@ -136,6 +135,7 @@ function PaymentMethodTokenRow({
                       : "danger"
                     : "secondaryText"
                 }
+                size="xs"
               >
                 {formatTokenAmount(
                   paymentMethod.balance,
@@ -164,7 +164,7 @@ export function TokenSelection({
   if (paymentMethodsLoading) {
     return (
       <>
-        <Text size="md" color="primaryText">
+        <Text color="primaryText" size="md">
           Loading your tokens
         </Text>
         <Spacer y="sm" />
@@ -174,38 +174,38 @@ export function TokenSelection({
             <Container
               key={i}
               style={{
+                backgroundColor: theme.colors.tertiaryBg,
                 border: `1px solid ${theme.colors.borderColor}`,
                 borderRadius: radius.md,
                 padding: `${spacing.sm} ${spacing.md}`,
-                backgroundColor: theme.colors.tertiaryBg,
               }}
             >
               <Container
                 flex="row"
                 gap="md"
-                style={{ width: "100%", alignItems: "center" }}
+                style={{ alignItems: "center", width: "100%" }}
               >
                 {/* Left side: Token icon and name skeleton */}
                 <Container
+                  center="y"
                   flex="row"
                   gap="sm"
-                  center="y"
                   style={{ maxWidth: "50%" }}
                 >
                   {/* Token icon skeleton */}
                   <div
                     style={{
-                      width: "32px",
-                      height: "32px",
                       backgroundColor: theme.colors.skeletonBg,
                       borderRadius: "50%",
+                      height: "32px",
+                      width: "32px",
                     }}
                   />
                   <Container flex="column" gap="3xs">
                     {/* Token name skeleton */}
-                    <Skeleton width="60px" height="14px" />
+                    <Skeleton height="14px" width="60px" />
                     {/* Chain name skeleton */}
-                    <Skeleton width="40px" height="12px" />
+                    <Skeleton height="12px" width="40px" />
                   </Container>
                 </Container>
 
@@ -213,14 +213,14 @@ export function TokenSelection({
                 <Container
                   flex="column"
                   gap="3xs"
-                  style={{ flex: 1, alignItems: "flex-end" }}
+                  style={{ alignItems: "flex-end", flex: 1 }}
                 >
                   {/* Price amount skeleton */}
-                  <Skeleton width="80px" height="16px" />
+                  <Skeleton height="16px" width="80px" />
                   {/* Balance skeleton */}
                   <Container flex="row" gap="3xs">
-                    <Skeleton width="50px" height="12px" />
-                    <Skeleton width="40px" height="12px" />
+                    <Skeleton height="12px" width="50px" />
+                    <Skeleton height="12px" width="40px" />
                   </Container>
                 </Container>
               </Container>
@@ -233,16 +233,16 @@ export function TokenSelection({
 
   if (paymentMethods.length === 0) {
     return (
-      <Container flex="column" center="both" style={{ minHeight: "250px" }}>
-        <Text size="md" color="primaryText" center>
+      <Container center="both" flex="column" style={{ minHeight: "250px" }}>
+        <Text center color="primaryText" size="md">
           No available tokens found for this wallet
         </Text>
         <Spacer y="sm" />
-        <Text size="sm" color="secondaryText" center>
+        <Text center color="secondaryText" size="sm">
           Try connecting a different wallet or pay with card
         </Text>
         <Spacer y="lg" />
-        <Button variant="primary" onClick={onBack}>
+        <Button onClick={onBack} variant="primary">
           Select another payment method
         </Button>
       </Container>
@@ -251,7 +251,7 @@ export function TokenSelection({
 
   return (
     <>
-      <Text size="md" color="primaryText">
+      <Text color="primaryText" size="md">
         Select payment token
       </Text>
       <Spacer y="sm" />
@@ -268,12 +268,12 @@ export function TokenSelection({
           .filter((method) => method.type === "wallet")
           .map((method) => (
             <PaymentMethodTokenRow
-              key={`${method.originToken.address}-${method.originToken.chainId}`}
-              paymentMethod={method}
-              destinationToken={destinationToken}
-              destinationAmount={destinationAmount}
               client={client}
+              destinationAmount={destinationAmount}
+              destinationToken={destinationToken}
+              key={`${method.originToken.address}-${method.originToken.chainId}`}
               onPaymentMethodSelected={onPaymentMethodSelected}
+              paymentMethod={method}
             />
           ))}
       </Container>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/WalletFiatSelection.tsx b/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/WalletFiatSelection.tsx
index fc83b6adf93..c224dad027d 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/WalletFiatSelection.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/payment-selection/WalletFiatSelection.tsx
@@ -10,9 +10,9 @@ import {
 } from "../../../../core/design-system/index.js";
 import { CreditCardIcon } from "../../ConnectWallet/icons/CreditCardIcon.js";
 import { WalletRow } from "../../ConnectWallet/screens/Buy/swap/WalletRow.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 
 interface WalletFiatSelectionProps {
@@ -34,7 +34,7 @@ export function WalletFiatSelection({
 
   return (
     <>
-      <Text size="md" color="primaryText">
+      <Text color="primaryText" size="md">
         Pay with Crypto
       </Text>
       <Spacer y="md" />
@@ -49,26 +49,26 @@ export function WalletFiatSelection({
               }
               return (
                 <Button
-                  key={wallet.id}
-                  variant="secondary"
                   fullWidth
+                  key={wallet.id}
                   onClick={() => onWalletSelected(wallet)}
                   style={{
+                    backgroundColor: theme.colors.tertiaryBg,
                     border: `1px solid ${theme.colors.borderColor}`,
                     borderRadius: radius.md,
-                    padding: `${spacing.sm} ${spacing.md}`,
-                    backgroundColor: theme.colors.tertiaryBg,
                     justifyContent: "space-between",
+                    padding: `${spacing.sm} ${spacing.md}`,
                   }}
+                  variant="secondary"
                 >
                   <WalletRow
-                    client={client}
                     address={account?.address}
+                    client={client}
                     iconSize="lg"
                     textSize="sm"
                   />
                   <ChevronRightIcon
-                    style={{ width: iconSize.md, height: iconSize.md }}
+                    style={{ height: iconSize.md, width: iconSize.md }}
                   />
                 </Button>
               );
@@ -80,46 +80,46 @@ export function WalletFiatSelection({
 
       {/* Connect Another Wallet */}
       <Button
-        variant="secondary"
         fullWidth
         onClick={onConnectWallet}
         style={{
+          backgroundColor: theme.colors.tertiaryBg,
           border: `1px solid ${theme.colors.borderColor}`,
           borderRadius: radius.md,
+          height: "auto",
           padding: `${spacing.sm} ${spacing.md}`,
-          backgroundColor: theme.colors.tertiaryBg,
           textAlign: "left",
-          height: "auto",
         }}
+        variant="secondary"
       >
         <Container
           flex="row"
           gap="md"
-          style={{ width: "100%", alignItems: "center" }}
+          style={{ alignItems: "center", width: "100%" }}
         >
           <Container
             style={{
-              borderRadius: radius.sm,
+              alignItems: "center",
               border: `1px dashed ${theme.colors.secondaryIconColor}`,
+              borderRadius: radius.sm,
               display: "flex",
-              alignItems: "center",
+              height: iconSize.lg,
               justifyContent: "center",
               padding: spacing["4xs"],
               width: iconSize.lg,
-              height: iconSize.lg,
             }}
           >
             <PlusIcon
-              width={iconSize.md}
-              height={iconSize.md}
               color={theme.colors.secondaryText}
+              height={iconSize.md}
+              width={iconSize.md}
             />
           </Container>
           <Container flex="column" gap="3xs" style={{ flex: 1 }}>
-            <Text size="sm" color="primaryText" style={{ fontWeight: 600 }}>
+            <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
               Connect Another Wallet
             </Text>
-            <Text size="xs" color="secondaryText">
+            <Text color="secondaryText" size="xs">
               Use a different wallet to pay
             </Text>
           </Container>
@@ -129,39 +129,39 @@ export function WalletFiatSelection({
       <Spacer y="md" />
 
       {/* Pay with Debit Card */}
-      <Text size="md" color="primaryText">
+      <Text color="primaryText" size="md">
         Pay with Fiat
       </Text>
 
       <Spacer y="md" />
 
       <Button
-        variant="secondary"
         fullWidth
         onClick={onFiatSelected}
         style={{
+          backgroundColor: theme.colors.tertiaryBg,
           border: `1px solid ${theme.colors.borderColor}`,
           borderRadius: radius.md,
+          height: "auto",
           padding: `${spacing.sm} ${spacing.md}`,
-          backgroundColor: theme.colors.tertiaryBg,
           textAlign: "left",
-          height: "auto",
         }}
+        variant="secondary"
       >
         <Container
           flex="row"
           gap="md"
-          style={{ width: "100%", alignItems: "center" }}
+          style={{ alignItems: "center", width: "100%" }}
         >
           <CreditCardIcon
-            size={iconSize.lg}
             color={theme.colors.secondaryIconColor}
+            size={iconSize.lg}
           />
           <Container flex="column" gap="3xs" style={{ flex: 1 }}>
-            <Text size="sm" color="primaryText" style={{ fontWeight: 600 }}>
+            <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
               Pay with Card
             </Text>
-            <Text size="xs" color="secondaryText">
+            <Text color="secondaryText" size="xs">
               Buy crypto and bridge in one step
             </Text>
           </Container>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/payment-success/PaymentReceipt.tsx b/packages/thirdweb/src/react/web/ui/Bridge/payment-success/PaymentReceipt.tsx
index 12e12d4a0b4..8b18a793e83 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/payment-success/PaymentReceipt.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/payment-success/PaymentReceipt.tsx
@@ -21,10 +21,10 @@ import {
 import type { BridgePrepareResult } from "../../../../core/hooks/useBridgePrepare.js";
 import type { CompletedStatusResult } from "../../../../core/hooks/useStepExecutor.js";
 import { formatTokenAmount } from "../../ConnectWallet/screens/formatTokenBalance.js";
+import { Container, ModalHeader } from "../../components/basic.js";
 import { shorterChainName } from "../../components/ChainName.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";
-import { Container, ModalHeader } from "../../components/basic.js";
 import { Text } from "../../components/text.js";
 
 interface TransactionInfo {
@@ -58,29 +58,25 @@ function useTransactionInfo(
   preparedQuote: BridgePrepareResult,
 ) {
   return useQuery({
-    queryKey: [
-      "transaction-info",
-      status.type,
-      getPaymentId(preparedQuote, status),
-    ],
+    enabled: true,
     queryFn: async (): Promise<TransactionInfo | null> => {
       const isOnramp = status.type === "onramp";
 
       if (isOnramp && preparedQuote.type === "onramp") {
         // For onramp, create a display ID since OnrampStatus doesn't have paymentId
         return {
-          type: "paymentId" as const,
-          id: preparedQuote.id,
-          label: "Onramp Payment",
-          destinationToken: preparedQuote.destinationToken,
-          chain: await getChainMetadata(
-            defineChain(preparedQuote.destinationToken.chainId),
-          ),
           amountPaid: `${preparedQuote.currencyAmount} ${preparedQuote.currency}`,
           amountReceived: `${formatTokenAmount(
             preparedQuote.destinationAmount,
             preparedQuote.destinationToken.decimals,
           )} ${preparedQuote.destinationToken.symbol}`,
+          chain: await getChainMetadata(
+            defineChain(preparedQuote.destinationToken.chainId),
+          ),
+          destinationToken: preparedQuote.destinationToken,
+          id: preparedQuote.id,
+          label: "Onramp Payment",
+          type: "paymentId" as const,
         };
       } else if (
         status.type === "buy" ||
@@ -96,22 +92,22 @@ function useTransactionInfo(
               getChainMetadata(getCachedChain(status.originToken.chainId)),
             ]);
             return {
-              type: "transactionHash" as const,
-              id: tx.transactionHash,
-              label: "Transaction",
-              chain: destinationChain,
-              originToken: status.originToken,
-              originChain,
-              destinationToken: status.destinationToken,
-              destinationChain,
-              amountReceived: `${formatTokenAmount(
-                status.destinationAmount,
-                status.destinationToken.decimals,
-              )} ${status.destinationToken.symbol}`,
               amountPaid: `${formatTokenAmount(
                 status.originAmount,
                 status.originToken.decimals,
               )} ${status.originToken.symbol}`,
+              amountReceived: `${formatTokenAmount(
+                status.destinationAmount,
+                status.destinationToken.decimals,
+              )} ${status.destinationToken.symbol}`,
+              chain: destinationChain,
+              destinationChain,
+              destinationToken: status.destinationToken,
+              id: tx.transactionHash,
+              label: "Transaction",
+              originChain,
+              originToken: status.originToken,
+              type: "transactionHash" as const,
             };
           }
         }
@@ -119,7 +115,11 @@ function useTransactionInfo(
 
       return null;
     },
-    enabled: true,
+    queryKey: [
+      "transaction-info",
+      status.type,
+      getPaymentId(preparedQuote, status),
+    ],
     staleTime: 5 * 60 * 1000, // 5 minutes
   });
 }
@@ -149,10 +149,10 @@ function CompletedStepDetailCard({
         flex="column"
         gap="sm"
         style={{
-          padding: spacing.md,
-          borderRadius: radius.sm,
           backgroundColor: theme.colors.tertiaryBg,
           border: `1px solid ${theme.colors.borderColor}`,
+          borderRadius: radius.sm,
+          padding: spacing.md,
         }}
       >
         <Skeleton height="30px" />
@@ -168,14 +168,14 @@ function CompletedStepDetailCard({
 
   return (
     <Container
-      key={txInfo.id}
       flex="column"
       gap="sm"
+      key={txInfo.id}
       style={{
-        padding: spacing.md,
-        borderRadius: radius.sm,
         backgroundColor: theme.colors.tertiaryBg,
         border: `1px solid ${theme.colors.borderColor}`,
+        borderRadius: radius.sm,
+        padding: spacing.md,
       }}
     >
       {/* Status Badge */}
@@ -187,14 +187,14 @@ function CompletedStepDetailCard({
           justifyContent: "space-between",
         }}
       >
-        <Text size="sm" color="primaryText">
+        <Text color="primaryText" size="sm">
           {txInfo.label}
         </Text>
         <Container
           style={{
-            padding: `${spacing["3xs"]} ${spacing.xs}`,
-            borderRadius: radius.sm,
             backgroundColor: theme.colors.success,
+            borderRadius: radius.sm,
+            padding: `${spacing["3xs"]} ${spacing.xs}`,
           }}
         >
           <Text size="xs" style={{ color: theme.colors.primaryButtonText }}>
@@ -206,14 +206,14 @@ function CompletedStepDetailCard({
       {/* Amount Paid */}
       {txInfo.amountPaid && (
         <Container
-          flex="row"
           center="y"
+          flex="row"
           style={{ justifyContent: "space-between" }}
         >
-          <Text size="sm" color="secondaryText">
+          <Text color="secondaryText" size="sm">
             Amount Paid
           </Text>
-          <Text size="sm" color="primaryText">
+          <Text color="primaryText" size="sm">
             {txInfo.amountPaid}
           </Text>
         </Container>
@@ -222,14 +222,14 @@ function CompletedStepDetailCard({
       {/* Origin Chain */}
       {txInfo.originChain && (
         <Container
-          flex="row"
           center="y"
+          flex="row"
           style={{ justifyContent: "space-between" }}
         >
-          <Text size="sm" color="secondaryText">
+          <Text color="secondaryText" size="sm">
             Origin Chain
           </Text>
-          <Text size="sm" color="primaryText">
+          <Text color="primaryText" size="sm">
             {shorterChainName(txInfo.originChain.name)}
           </Text>
         </Container>
@@ -238,14 +238,14 @@ function CompletedStepDetailCard({
       {/* Amount Received */}
       {txInfo.amountReceived && (
         <Container
-          flex="row"
           center="y"
+          flex="row"
           style={{ justifyContent: "space-between" }}
         >
-          <Text size="sm" color="secondaryText">
+          <Text color="secondaryText" size="sm">
             Amount Received
           </Text>
-          <Text size="sm" color="primaryText">
+          <Text color="primaryText" size="sm">
             {txInfo.amountReceived}
           </Text>
         </Container>
@@ -253,35 +253,30 @@ function CompletedStepDetailCard({
 
       {/* Chain */}
       <Container
-        flex="row"
         center="y"
+        flex="row"
         style={{ justifyContent: "space-between" }}
       >
-        <Text size="sm" color="secondaryText">
+        <Text color="secondaryText" size="sm">
           Chain
         </Text>
-        <Text size="sm" color="primaryText">
+        <Text color="primaryText" size="sm">
           {shorterChainName(txInfo.chain.name)}
         </Text>
       </Container>
 
       {/* Transaction Info */}
       <Container
-        flex="row"
         center="y"
+        flex="row"
         style={{ justifyContent: "space-between" }}
       >
-        <Text size="sm" color="secondaryText">
+        <Text color="secondaryText" size="sm">
           {txInfo.type === "paymentId" ? "Payment ID" : "Transaction Hash"}
         </Text>
         <Container flex="row" gap="sm" style={{ alignItems: "center" }}>
           <Text
-            size="sm"
             color="accentText"
-            style={{
-              fontFamily: "monospace",
-              cursor: "pointer",
-            }}
             onClick={
               txInfo.type === "paymentId"
                 ? () => onCopyToClipboard(txInfo.id)
@@ -294,25 +289,30 @@ function CompletedStepDetailCard({
                     }
                   }
             }
+            size="sm"
+            style={{
+              cursor: "pointer",
+              fontFamily: "monospace",
+            }}
           >
             {shortenHex(txInfo.id)}
           </Text>
 
           {txInfo.type === "paymentId" ? (
             <button
-              type="button"
+              onClick={() => onCopyToClipboard(txInfo.id)}
               style={{
-                cursor: "pointer",
                 background: "none",
                 border: "none",
+                cursor: "pointer",
                 padding: 0,
               }}
-              onClick={() => onCopyToClipboard(txInfo.id)}
+              type="button"
             >
               <CopyIcon
-                width={iconSize.sm}
-                height={iconSize.sm}
                 color={theme.colors.primaryText}
+                height={iconSize.sm}
+                width={iconSize.sm}
               />
             </button>
           ) : null}
@@ -367,24 +367,24 @@ export function PaymentReceipt({
       p="lg"
       style={{ maxHeight: "500px", minHeight: "250px", overflowY: "auto" }}
     >
-      <ModalHeader title="Payment Receipt" onBack={onBack} />
+      <ModalHeader onBack={onBack} title="Payment Receipt" />
 
       <Spacer y="lg" />
 
       <Container flex="column" gap="lg">
         {/* Status Results */}
         <Container flex="column" gap="md">
-          <Text size="md" color="primaryText">
+          <Text color="primaryText" size="md">
             Transactions
           </Text>
 
           {completedStatuses.map((status, index) => (
             <CompletedStepDetailCard
               key={`${status.type}-${index}`}
-              status={status}
+              onCopyToClipboard={copyToClipboard}
               preparedQuote={preparedQuote}
+              status={status}
               windowAdapter={windowAdapter}
-              onCopyToClipboard={copyToClipboard}
             />
           ))}
         </Container>
diff --git a/packages/thirdweb/src/react/web/ui/Bridge/payment-success/SuccessScreen.tsx b/packages/thirdweb/src/react/web/ui/Bridge/payment-success/SuccessScreen.tsx
index 54b72c25e60..6f7f9a3c3d6 100644
--- a/packages/thirdweb/src/react/web/ui/Bridge/payment-success/SuccessScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/Bridge/payment-success/SuccessScreen.tsx
@@ -6,9 +6,9 @@ import { useCustomTheme } from "../../../../core/design-system/CustomThemeProvid
 import { iconSize } from "../../../../core/design-system/index.js";
 import type { BridgePrepareResult } from "../../../../core/hooks/useBridgePrepare.js";
 import type { CompletedStatusResult } from "../../../../core/hooks/useStepExecutor.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container, ModalHeader } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 import type { UIOptions } from "../BridgeOrchestrator.js";
 import { PaymentReceipt } from "./PaymentReceipt.js";
@@ -54,10 +54,10 @@ export function SuccessScreen({
   if (viewState === "detail") {
     return (
       <PaymentReceipt
-        preparedQuote={preparedQuote}
         completedStatuses={completedStatuses}
-        windowAdapter={windowAdapter}
         onBack={() => setViewState("success")}
+        preparedQuote={preparedQuote}
+        windowAdapter={windowAdapter}
       />
     );
   }
@@ -68,36 +68,36 @@ export function SuccessScreen({
 
       <Spacer y="xl" />
 
-      <Container flex="column" gap="md" center="x">
+      <Container center="x" flex="column" gap="md">
         {/* Success Icon with Animation */}
         <Container
           center="both"
           flex="row"
           style={{
-            width: "64px",
-            height: "64px",
-            borderRadius: "50%",
+            animation: "successBounce 0.6s ease-out",
             backgroundColor: theme.colors.tertiaryBg,
-            marginBottom: "16px",
             border: `2px solid ${theme.colors.success}`,
-            animation: "successBounce 0.6s ease-out",
+            borderRadius: "50%",
+            height: "64px",
+            marginBottom: "16px",
+            width: "64px",
           }}
         >
           <CheckIcon
-            width={iconSize.xl}
-            height={iconSize.xl}
             color={theme.colors.success}
+            height={iconSize.xl}
             style={{
               animation: "checkAppear 0.3s ease-out 0.3s both",
             }}
+            width={iconSize.xl}
           />
         </Container>
 
-        <Text size="xl" color="primaryText" center>
+        <Text center color="primaryText" size="xl">
           Payment Successful!
         </Text>
 
-        <Text size="sm" color="secondaryText" center>
+        <Text center color="secondaryText" size="sm">
           Your cross-chain payment has been completed successfully.
         </Text>
       </Container>
@@ -106,14 +106,14 @@ export function SuccessScreen({
       {/* Action Buttons */}
       <Container flex="column" gap="sm" style={{ width: "100%" }}>
         <Button
-          variant="secondary"
           fullWidth
           onClick={() => setViewState("detail")}
+          variant="secondary"
         >
           View Payment Receipt
         </Button>
 
-        <Button variant="accent" fullWidth onClick={onDone}>
+        <Button fullWidth onClick={onDone} variant="accent">
           {uiOptions.mode === "transaction" ? "Continue" : "Done"}
         </Button>
       </Container>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Blobbie.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Blobbie.tsx
index d8a3e9d6d99..002a4f5d181 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Blobbie.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Blobbie.tsx
@@ -42,18 +42,18 @@ export function Blobbie(props: BlobbieProps) {
 
   return (
     <div
+      className={props.className}
       id={id}
       style={{
         ...props.style,
         backgroundImage: `radial-gradient(ellipse at left bottom, ${colors[0]}, ${colors[1]})`,
         ...(props.size
           ? {
-              width: `${props.size}px`,
               height: `${props.size}px`,
+              width: `${props.size}px`,
             }
           : undefined),
       }}
-      className={props.className}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/ConnectButton.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/ConnectButton.tsx
index b4ba96771db..2e7858c0d81 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/ConnectButton.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/ConnectButton.tsx
@@ -13,22 +13,22 @@ import { useActiveWalletConnectionStatus } from "../../../core/hooks/wallets/use
 import { useConnectionManager } from "../../../core/providers/connection-manager.js";
 import { defaultTokens } from "../../../core/utils/defaultTokens.js";
 import {
-  WalletUIStatesProvider,
   useSetIsWalletModalOpen,
+  WalletUIStatesProvider,
 } from "../../providers/wallet-ui-states-provider.js";
 import { canFitWideModal } from "../../utils/canFitWideModal.js";
 import { usePreloadWalletProviders } from "../../utils/usePreloadWalletProviders.js";
 import { AutoConnect } from "../AutoConnect/AutoConnect.js";
-import { Modal } from "../components/Modal.js";
-import { Spinner } from "../components/Spinner.js";
 import { Container } from "../components/basic.js";
 import { Button } from "../components/buttons.js";
+import { Modal } from "../components/Modal.js";
+import { Spinner } from "../components/Spinner.js";
 import { fadeInAnimation } from "../design-system/animations.js";
 import { ConnectedWalletDetails } from "./Details.js";
-import ConnectModal from "./Modal/ConnectModal.js";
 import { LockIcon } from "./icons/LockIcon.js";
 import { useConnectLocale } from "./locale/getConnectLocale.js";
 import type { ConnectLocale } from "./locale/types.js";
+import ConnectModal from "./Modal/ConnectModal.js";
 import { SignatureScreen } from "./screens/SignatureScreen.js";
 
 const TW_CONNECT_WALLET = "tw-connect-wallet";
@@ -331,18 +331,18 @@ export function ConnectButton(props: ConnectButtonProps) {
 
   const autoConnectComp = props.autoConnect !== false && (
     <AutoConnect
-      chain={preferredChain}
+      accountAbstraction={props.accountAbstraction}
       appMetadata={props.appMetadata}
+      chain={preferredChain}
       client={props.client}
-      wallets={wallets}
+      onConnect={props.onConnect}
+      siweAuth={siweAuth}
       timeout={
         typeof props.autoConnect === "boolean"
           ? undefined
           : props.autoConnect?.timeout
       }
-      accountAbstraction={props.accountAbstraction}
-      onConnect={props.onConnect}
-      siweAuth={siweAuth}
+      wallets={wallets}
     />
   );
 
@@ -350,54 +350,54 @@ export function ConnectButton(props: ConnectButtonProps) {
     const combinedClassName = `${props.connectButton?.className || ""} ${TW_CONNECT_WALLET}`;
     return (
       <AnimatedButton
-        disabled={true}
         className={combinedClassName}
-        variant="primary"
-        type="button"
+        disabled={true}
         style={{
-          minWidth: "165px",
           height: "50px",
+          minWidth: "165px",
           ...props.connectButton?.style,
         }}
+        type="button"
+        variant="primary"
       >
         {autoConnectComp}
-        <Spinner size="sm" color="primaryButtonText" />
+        <Spinner color="primaryButtonText" size="sm" />
       </AnimatedButton>
     );
   }
 
   return (
-    <WalletUIStatesProvider theme={props.theme} isOpen={false}>
+    <WalletUIStatesProvider isOpen={false} theme={props.theme}>
       <ConnectButtonInner
         {...props}
-        siweAuth={siweAuth}
         connectLocale={localeQuery.data}
+        siweAuth={siweAuth}
       />
       <ConnectModal
-        shouldSetActive={true}
         accountAbstraction={props.accountAbstraction}
         auth={props.auth}
         chain={preferredChain}
         chains={props.chains}
         client={props.client}
         connectLocale={localeQuery.data}
+        hiddenWallets={hiddenWallets}
+        localeId={props.locale || "en_US"}
         meta={{
-          title: props.connectModal?.title,
-          titleIconUrl: props.connectModal?.titleIcon,
-          showThirdwebBranding: props.connectModal?.showThirdwebBranding,
-          termsOfServiceUrl: props.connectModal?.termsOfServiceUrl,
           privacyPolicyUrl: props.connectModal?.privacyPolicyUrl,
           requireApproval: props.connectModal?.requireApproval,
+          showThirdwebBranding: props.connectModal?.showThirdwebBranding,
+          termsOfServiceUrl: props.connectModal?.termsOfServiceUrl,
+          title: props.connectModal?.title,
+          titleIconUrl: props.connectModal?.titleIcon,
         }}
-        welcomeScreen={props.connectModal?.welcomeScreen}
-        size={size}
-        localeId={props.locale || "en_US"}
         onConnect={props.onConnect}
         recommendedWallets={props.recommendedWallets}
+        shouldSetActive={true}
         showAllWallets={props.showAllWallets}
-        hiddenWallets={hiddenWallets}
+        size={size}
         walletConnect={props.walletConnect}
         wallets={wallets}
+        welcomeScreen={props.connectModal?.welcomeScreen}
       />
       {autoConnectComp}
     </WalletUIStatesProvider>
@@ -456,18 +456,6 @@ function ConnectButtonInner(
     const combinedClassName = `${props.connectButton?.className || ""} ${TW_CONNECT_WALLET}`;
     return (
       <AnimatedButton
-        disabled={isLoading}
-        className={combinedClassName}
-        data-theme={theme}
-        data-is-loading={isLoading}
-        variant="primary"
-        type="button"
-        style={{
-          minWidth: "165px",
-          height: "50px",
-          fontSize: "16px",
-          ...props.connectButton?.style,
-        }}
         aria-label={
           connectionStatus === "connecting"
             ? locale.connecting
@@ -475,13 +463,25 @@ function ConnectButtonInner(
               ? connectButtonLabel
               : locale.defaultButtonTitle
         }
+        className={combinedClassName}
+        data-is-loading={isLoading}
+        data-test="connect-wallet-button"
+        data-theme={theme}
+        disabled={isLoading}
         onClick={() => {
           setIsWalletModalOpen(true);
         }}
-        data-test="connect-wallet-button"
+        style={{
+          fontSize: "16px",
+          height: "50px",
+          minWidth: "165px",
+          ...props.connectButton?.style,
+        }}
+        type="button"
+        variant="primary"
       >
         {isLoading ? (
-          <Spinner size="sm" color="primaryButtonText" />
+          <Spinner color="primaryButtonText" size="sm" />
         ) : (
           connectButtonLabel
         )}
@@ -496,17 +496,17 @@ function ConnectButtonInner(
       const combinedClassName = `${props.connectButton?.className || ""} ${TW_CONNECT_WALLET}`;
       return (
         <AnimatedButton
-          disabled={true}
           className={combinedClassName}
-          variant="primary"
-          type="button"
+          disabled={true}
           style={{
-            minWidth: "165px",
             height: "50px",
+            minWidth: "165px",
             ...props.connectButton?.style,
           }}
+          type="button"
+          variant="primary"
         >
-          <Spinner size="sm" color="primaryButtonText" />
+          <Spinner color="primaryButtonText" size="sm" />
         </AnimatedButton>
       );
     }
@@ -515,40 +515,40 @@ function ConnectButtonInner(
       return (
         <>
           <Button
-            variant="primary"
-            type="button"
+            className={props.signInButton?.className}
             onClick={() => {
               setShowSignatureModal(true);
             }}
-            className={props.signInButton?.className}
             style={{
-              minWidth: "165px",
               minHeight: "50px",
+              minWidth: "165px",
               ...props.signInButton?.style,
             }}
+            type="button"
+            variant="primary"
           >
             {siweAuth.isLoggingIn ? (
-              <Spinner size="sm" color="primaryButtonText" />
+              <Spinner color="primaryButtonText" size="sm" />
             ) : (
-              <Container flex="row" center="y" gap="sm">
+              <Container center="y" flex="row" gap="sm">
                 <LockIcon size={iconSize.sm} />
                 <span> {props.signInButton?.label || locale.signIn} </span>
               </Container>
             )}
           </Button>
           <Modal
-            size="compact"
             open={showSignatureModal}
             setOpen={setShowSignatureModal}
+            size="compact"
           >
             <SignatureScreen
+              auth={props.auth}
               client={props.client}
               connectLocale={locale}
               modalSize="compact"
-              termsOfServiceUrl={props.connectModal?.termsOfServiceUrl}
-              privacyPolicyUrl={props.connectModal?.privacyPolicyUrl}
               onDone={() => setShowSignatureModal(false)}
-              auth={props.auth}
+              privacyPolicyUrl={props.connectModal?.privacyPolicyUrl}
+              termsOfServiceUrl={props.connectModal?.termsOfServiceUrl}
             />
           </Modal>
         </>
@@ -560,24 +560,8 @@ function ConnectButtonInner(
   return (
     <AccountProvider address={activeAccount.address} client={props.client}>
       <ConnectedWalletDetails
-        theme={theme}
-        detailsButton={props.detailsButton}
-        detailsModal={{
-          ...props.detailsModal,
-          hiddenWallets: hiddenWallets,
-        }}
-        supportedTokens={supportedTokens}
-        supportedNFTs={props.supportedNFTs}
-        onDisconnect={(info) => {
-          // logout on explicit disconnect!
-          if (siweAuth.requiresAuth) {
-            siweAuth.doLogout();
-          }
-          props.onDisconnect?.(info);
-        }}
-        chains={props?.chains || []}
         chain={props.chain}
-        switchButton={props.switchButton}
+        chains={props?.chains || []}
         client={props.client}
         connectLocale={locale}
         connectOptions={{
@@ -586,12 +570,28 @@ function ConnectButtonInner(
           chain: props.chain,
           chains: props.chains,
           connectModal: props.connectModal,
+          hiddenWallets: hiddenWallets,
           recommendedWallets: props.recommendedWallets,
           showAllWallets: props.showAllWallets,
           walletConnect: props.walletConnect,
           wallets: props.wallets,
+        }}
+        detailsButton={props.detailsButton}
+        detailsModal={{
+          ...props.detailsModal,
           hiddenWallets: hiddenWallets,
         }}
+        onDisconnect={(info) => {
+          // logout on explicit disconnect!
+          if (siweAuth.requiresAuth) {
+            siweAuth.doLogout();
+          }
+          props.onDisconnect?.(info);
+        }}
+        supportedNFTs={props.supportedNFTs}
+        supportedTokens={supportedTokens}
+        switchButton={props.switchButton}
+        theme={theme}
       />
     </AccountProvider>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Details.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Details.test.tsx
index 56e9dd47961..aabb97fd940 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Details.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Details.test.tsx
@@ -20,12 +20,12 @@ import {
   ConnectedToSmartWallet,
   ConnectedWalletDetails,
   DetailsModal,
+  detailsBtn_formatFiatBalanceForButton,
+  detailsBtn_formatTokenBalanceForButton,
   InAppWalletUserInfo,
   NetworkSwitcherButton,
   StyledChevronRightIcon,
   SwitchNetworkButton,
-  detailsBtn_formatFiatBalanceForButton,
-  detailsBtn_formatTokenBalanceForButton,
   useWalletDetailsModal,
 } from "./Details.js";
 import en from "./locale/en.js";
@@ -57,17 +57,17 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
-            detailsButton={undefined}
-            detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
-            onDisconnect={() => {}}
             chains={[]}
-            switchButton={undefined}
             client={client}
             connectLocale={en}
             connectOptions={undefined}
+            detailsButton={undefined}
+            detailsModal={undefined}
+            onDisconnect={() => {}}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
+            switchButton={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -82,19 +82,19 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
+            chains={[]}
+            client={client}
+            connectLocale={en}
+            connectOptions={undefined}
             detailsButton={{
               showBalanceInFiat: "USD",
             }}
             detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
             onDisconnect={() => {}}
-            chains={[]}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
             switchButton={undefined}
-            client={client}
-            connectLocale={en}
-            connectOptions={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -109,19 +109,19 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
+            chains={[]}
+            client={client}
+            connectLocale={en}
+            connectOptions={undefined}
             detailsButton={{
               render: () => <p className="thirdweb_tw" />,
             }}
             detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
             onDisconnect={() => {}}
-            chains={[]}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
             switchButton={undefined}
-            client={client}
-            connectLocale={en}
-            connectOptions={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -136,7 +136,10 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
+            chains={[]}
+            client={client}
+            connectLocale={en}
+            connectOptions={undefined}
             detailsButton={{
               style: {
                 color: "red",
@@ -144,14 +147,11 @@ describe("Details button", () => {
               },
             }}
             detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
             onDisconnect={() => {}}
-            chains={[]}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
             switchButton={undefined}
-            client={client}
-            connectLocale={en}
-            connectOptions={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -172,17 +172,17 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
-            detailsButton={undefined}
-            detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
-            onDisconnect={() => {}}
             chains={[]}
-            switchButton={undefined}
             client={client}
             connectLocale={en}
             connectOptions={undefined}
+            detailsButton={undefined}
+            detailsModal={undefined}
+            onDisconnect={() => {}}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
+            switchButton={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -199,17 +199,17 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
-            detailsButton={undefined}
-            detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
-            onDisconnect={() => {}}
             chains={[]}
-            switchButton={undefined}
             client={client}
             connectLocale={en}
             connectOptions={undefined}
+            detailsButton={undefined}
+            detailsModal={undefined}
+            onDisconnect={() => {}}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
+            switchButton={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -226,19 +226,19 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
+            chains={[]}
+            client={client}
+            connectLocale={en}
+            connectOptions={undefined}
             detailsButton={{
               connectedAccountName: "test name",
             }}
             detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
             onDisconnect={() => {}}
-            chains={[]}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
             switchButton={undefined}
-            client={client}
-            connectLocale={en}
-            connectOptions={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -256,19 +256,19 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
+            chains={[]}
+            client={client}
+            connectLocale={en}
+            connectOptions={undefined}
             detailsButton={{
               connectedAccountAvatarUrl: "https://thirdweb.com/cat.png",
             }}
             detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
             onDisconnect={() => {}}
-            chains={[]}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
             switchButton={undefined}
-            client={client}
-            connectLocale={en}
-            connectOptions={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -284,19 +284,19 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
+            chains={[]}
+            client={client}
+            connectLocale={en}
+            connectOptions={undefined}
             detailsButton={{
               connectedAccountName: "test name",
             }}
             detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
             onDisconnect={() => {}}
-            chains={[]}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
             switchButton={undefined}
-            client={client}
-            connectLocale={en}
-            connectOptions={undefined}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -320,26 +320,26 @@ describe("Details button", () => {
       <QueryClientProvider client={queryClient}>
         <AccountProvider address={VITALIK_WALLET} client={client}>
           <ConnectedWalletDetails
-            theme={"dark"}
+            chain={ethereum}
+            chains={[]}
+            client={client}
+            connectLocale={en}
+            connectOptions={undefined}
             detailsButton={{
               connectedAccountName: "test name",
             }}
             detailsModal={undefined}
-            supportedTokens={undefined}
-            supportedNFTs={undefined}
             onDisconnect={() => {}}
-            chains={[]}
+            supportedNFTs={undefined}
+            supportedTokens={undefined}
             switchButton={{
+              className: "thirdwebSwitchBtn",
+              label: "switchbtn",
               style: {
                 color: "red",
               },
-              className: "thirdwebSwitchBtn",
-              label: "switchbtn",
             }}
-            client={client}
-            connectLocale={en}
-            connectOptions={undefined}
-            chain={ethereum}
+            theme={"dark"}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -409,7 +409,7 @@ describe("useWalletDetailsModal", () => {
 describe("SwitchNetworkButton", () => {
   it("should render a default button", () => {
     const { container } = render(
-      <SwitchNetworkButton targetChain={ethereum} connectLocale={en} />,
+      <SwitchNetworkButton connectLocale={en} targetChain={ethereum} />,
     );
     const element = container.querySelector(
       "button.tw-connect-wallet--switch-network",
@@ -420,9 +420,9 @@ describe("SwitchNetworkButton", () => {
   it("should apply the style properly", () => {
     const { container } = render(
       <SwitchNetworkButton
-        targetChain={ethereum}
         connectLocale={en}
         style={{ color: "red", width: "4444px" }}
+        targetChain={ethereum}
       />,
     );
     const element = container.querySelector(
@@ -439,9 +439,9 @@ describe("SwitchNetworkButton", () => {
   it("should apply the className properly", () => {
     const { container } = render(
       <SwitchNetworkButton
-        targetChain={ethereum}
-        connectLocale={en}
         className="thirdwebRocks"
+        connectLocale={en}
+        targetChain={ethereum}
       />,
     );
     const element = container.querySelector("button.thirdwebRocks");
@@ -450,7 +450,7 @@ describe("SwitchNetworkButton", () => {
 
   it("should render button's text with locale.switchNetwork by default", () => {
     const { container } = render(
-      <SwitchNetworkButton targetChain={ethereum} connectLocale={en} />,
+      <SwitchNetworkButton connectLocale={en} targetChain={ethereum} />,
     );
     const element = container.querySelector(
       "button.tw-connect-wallet--switch-network",
@@ -464,9 +464,9 @@ describe("SwitchNetworkButton", () => {
   it("should render `switchNetworkBtnTitle` properly", () => {
     const { container } = render(
       <SwitchNetworkButton
-        targetChain={ethereum}
         connectLocale={en}
         switchNetworkBtnTitle="cat"
+        targetChain={ethereum}
       />,
     );
     const element = container.querySelector(
@@ -523,18 +523,18 @@ describe("Details Modal", () => {
 
     render(
       <DetailsModal
+        assetTabs={mockAssetTabs}
+        chains={mockChains}
         client={TEST_CLIENT}
-        locale={locale}
-        detailsModal={mockDetailsModalOptions}
-        theme="light"
-        supportedTokens={mockSupportedTokens}
-        supportedNFTs={mockSupportedNFTs}
         closeModal={closeModalMock}
-        onDisconnect={mockOnDisconnect}
-        chains={mockChains}
-        displayBalanceToken={mockDisplayBalanceToken}
         connectOptions={mockConnectOptions}
-        assetTabs={mockAssetTabs}
+        detailsModal={mockDetailsModalOptions}
+        displayBalanceToken={mockDisplayBalanceToken}
+        locale={locale}
+        onDisconnect={mockOnDisconnect}
+        supportedNFTs={mockSupportedNFTs}
+        supportedTokens={mockSupportedTokens}
+        theme="light"
       />,
     );
 
@@ -549,13 +549,13 @@ describe("Details Modal", () => {
 
     render(
       <DetailsModal
+        chains={mockChains}
         client={TEST_CLIENT}
-        locale={locale}
-        theme="light"
         closeModal={closeModalMock}
-        onDisconnect={mockOnDisconnect}
-        chains={mockChains}
         connectOptions={mockConnectOptions}
+        locale={locale}
+        onDisconnect={mockOnDisconnect}
+        theme="light"
       />,
     );
 
@@ -569,13 +569,13 @@ describe("Details Modal", () => {
 
     render(
       <DetailsModal
+        chains={mockChains}
         client={TEST_CLIENT}
-        locale={locale}
-        theme="light"
         closeModal={closeModalMock}
-        onDisconnect={mockOnDisconnect}
-        chains={mockChains}
         connectOptions={mockConnectOptions}
+        locale={locale}
+        onDisconnect={mockOnDisconnect}
+        theme="light"
       />,
     );
 
@@ -591,10 +591,10 @@ describe("Details Modal", () => {
     const { container } = render(
       <AccountProvider address={VITALIK_WALLET} client={client}>
         <NetworkSwitcherButton
-          setScreen={(_scr) => {}}
+          client={client}
           disableSwitchChain={false}
           displayBalanceToken={undefined}
-          client={client}
+          setScreen={(_scr) => {}}
         />
       </AccountProvider>,
     );
@@ -616,10 +616,10 @@ describe("Details Modal", () => {
     const { container } = render(
       <AccountProvider address={VITALIK_WALLET} client={client}>
         <NetworkSwitcherButton
-          setScreen={(_scr) => {}}
+          client={client}
           disableSwitchChain={false}
           displayBalanceToken={undefined}
-          client={client}
+          setScreen={(_scr) => {}}
         />
       </AccountProvider>,
     );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Details.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Details.tsx
index 7e6efc62e12..276d6aa8d08 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Details.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Details.tsx
@@ -48,17 +48,17 @@ import {
   useCustomTheme,
 } from "../../../core/design-system/CustomThemeProvider.js";
 import {
-  type Theme,
   fontSize,
   iconSize,
   radius,
   spacing,
+  type Theme,
 } from "../../../core/design-system/index.js";
 import type {
-  ConnectButtonProps,
   ConnectButton_connectModalOptions,
   ConnectButton_detailsButtonOptions,
   ConnectButton_detailsModalOptions,
+  ConnectButtonProps,
   PayUIOptions,
 } from "../../../core/hooks/connection/ConnectButtonProps.js";
 import { useChainFaucets } from "../../../core/hooks/others/useChainQuery.js";
@@ -80,19 +80,19 @@ import type {
 } from "../../../core/utils/defaultTokens.js";
 import { useWalletInfo } from "../../../core/utils/wallet.js";
 import { WalletUIStatesProvider } from "../../providers/wallet-ui-states-provider.js";
+import { Container, Line } from "../components/basic.js";
+import { Button, IconButton } from "../components/buttons.js";
 import { ChainActiveDot } from "../components/ChainActiveDot.js";
 import { CopyIcon } from "../components/CopyIcon.js";
+import { fallbackChainIcon } from "../components/fallbackChainIcon.js";
 import { IconContainer } from "../components/IconContainer.js";
 import { Modal } from "../components/Modal.js";
 import { Skeleton } from "../components/Skeleton.js";
 import { Spacer } from "../components/Spacer.js";
 import { Spinner } from "../components/Spinner.js";
 import { ToolTip } from "../components/Tooltip.js";
-import { WalletImage } from "../components/WalletImage.js";
-import { Container, Line } from "../components/basic.js";
-import { Button, IconButton } from "../components/buttons.js";
-import { fallbackChainIcon } from "../components/fallbackChainIcon.js";
 import { Link, Text } from "../components/text.js";
+import { WalletImage } from "../components/WalletImage.js";
 import { fadeInAnimation } from "../design-system/animations.js";
 import { StyledButton } from "../design-system/elements.js";
 import { AccountAddress } from "../prebuilt/Account/address.js";
@@ -104,32 +104,32 @@ import { ChainIcon } from "../prebuilt/Chain/icon.js";
 import { ChainName } from "../prebuilt/Chain/name.js";
 import { ChainProvider } from "../prebuilt/Chain/provider.js";
 import type { LocaleId } from "../types.js";
-import { MenuButton, MenuLink } from "./MenuButton.js";
-import { ScreenSetupContext, useSetupScreen } from "./Modal/screen.js";
-import {
-  NetworkSelectorContent,
-  type NetworkSelectorProps,
-} from "./NetworkSelector.js";
-import { TransactionsScreen } from "./TransactionsScreen.js";
 import { onModalUnmount } from "./constants.js";
 import { CoinsIcon } from "./icons/CoinsIcon.js";
 import { FundsIcon } from "./icons/FundsIcon.js";
 import { OutlineWalletIcon } from "./icons/OutlineWalletIcon.js";
 import { getConnectLocale } from "./locale/getConnectLocale.js";
 import type { ConnectLocale } from "./locale/types.js";
+import { MenuButton, MenuLink } from "./MenuButton.js";
+import { ScreenSetupContext, useSetupScreen } from "./Modal/screen.js";
+import {
+  NetworkSelectorContent,
+  type NetworkSelectorProps,
+} from "./NetworkSelector.js";
 import { LazyBuyScreen } from "./screens/Buy/LazyBuyScreen.js";
 import { WalletManagerScreen } from "./screens/Details/WalletManagerScreen.js";
-import { LinkProfileScreen } from "./screens/LinkProfileScreen.js";
 import { LinkedProfilesScreen } from "./screens/LinkedProfilesScreen.js";
+import { LinkProfileScreen } from "./screens/LinkProfileScreen.js";
 import { ManageWalletScreen } from "./screens/ManageWalletScreen.js";
 import { PrivateKey } from "./screens/PrivateKey.js";
 import { ReceiveFunds } from "./screens/ReceiveFunds.js";
 import { SendFunds } from "./screens/SendFunds.js";
+import type { WalletDetailsModalScreen } from "./screens/types.js";
 import { type AssetTabs, ViewAssets } from "./screens/ViewAssets.js";
 import { ViewNFTs } from "./screens/ViewNFTs.js";
 import { ViewTokens } from "./screens/ViewTokens.js";
 import { WalletConnectReceiverScreen } from "./screens/WalletConnectReceiverScreen.js";
-import type { WalletDetailsModalScreen } from "./screens/types.js";
+import { TransactionsScreen } from "./TransactionsScreen.js";
 
 const TW_CONNECTED_WALLET = "tw-connected-wallet";
 
@@ -139,10 +139,7 @@ const LocalhostChainId = 1337;
  * @internal
  */
 export const ConnectedWalletDetails: React.FC<{
-  onDisconnect: (info: {
-    wallet: Wallet;
-    account: Account;
-  }) => void;
+  onDisconnect: (info: { wallet: Wallet; account: Account }) => void;
   detailsButton?: ConnectButton_detailsButtonOptions;
   detailsModal?: ConnectButton_detailsModalOptions;
   theme: "light" | "dark" | Theme;
@@ -166,18 +163,18 @@ export const ConnectedWalletDetails: React.FC<{
   function openModal() {
     setRootEl(
       <DetailsModal
+        assetTabs={props.detailsModal?.assetTabs}
+        chains={props.chains}
         client={client}
-        locale={locale}
-        detailsModal={props.detailsModal}
-        theme={props.theme}
-        supportedTokens={props.supportedTokens}
-        supportedNFTs={props.supportedNFTs}
         closeModal={closeModal}
-        onDisconnect={props.onDisconnect}
-        chains={props.chains}
-        displayBalanceToken={props.detailsButton?.displayBalanceToken}
         connectOptions={props.connectOptions}
-        assetTabs={props.detailsModal?.assetTabs}
+        detailsModal={props.detailsModal}
+        displayBalanceToken={props.detailsButton?.displayBalanceToken}
+        locale={locale}
+        onDisconnect={props.onDisconnect}
+        supportedNFTs={props.supportedNFTs}
+        supportedTokens={props.supportedTokens}
+        theme={props.theme}
       />,
     );
   }
@@ -188,6 +185,7 @@ export const ConnectedWalletDetails: React.FC<{
   if (props.detailsButton?.render) {
     return (
       // biome-ignore lint/a11y/useKeyWithClickEvents: ok
+      // biome-ignore lint/a11y/noStaticElementInteractions: TODO
       <div onClick={openModal}>
         <props.detailsButton.render />
       </div>
@@ -197,11 +195,11 @@ export const ConnectedWalletDetails: React.FC<{
   if (props.chain && isNetworkMismatch) {
     return (
       <SwitchNetworkButton
-        style={props.switchButton?.style}
         className={props.switchButton?.className}
+        connectLocale={locale}
+        style={props.switchButton?.style}
         switchNetworkBtnTitle={props.switchButton?.label}
         targetChain={props.chain}
-        connectLocale={locale}
       />
     );
   }
@@ -213,18 +211,18 @@ export const ConnectedWalletDetails: React.FC<{
 
   return (
     <WalletInfoButton
-      type="button"
       className={combinedClassName}
-      style={props.detailsButton?.style}
       data-test="connected-wallet-details"
       onClick={openModal}
+      style={props.detailsButton?.style}
+      type="button"
     >
       <Container
         style={{
           borderRadius: "100%",
+          height: "35px",
           overflow: "hidden",
           width: "35px",
-          height: "35px",
         }}
       >
         {props.detailsButton?.connectedAccountAvatarUrl ? (
@@ -233,33 +231,33 @@ export const ConnectedWalletDetails: React.FC<{
             src={props.detailsButton.connectedAccountAvatarUrl}
             style={{
               height: "100%",
-              width: "100%",
               objectFit: "cover",
+              width: "100%",
             }}
           />
         ) : (
           <AccountAvatar
             className={`${TW_CONNECTED_WALLET}__account_avatar`}
-            loadingComponent={
+            fallbackComponent={
               <AccountBlobbie
-                size={35}
                 className={`${TW_CONNECTED_WALLET}__account_avatar`}
+                size={35}
               />
             }
-            fallbackComponent={
+            loadingComponent={
               <AccountBlobbie
-                size={35}
                 className={`${TW_CONNECTED_WALLET}__account_avatar`}
+                size={35}
               />
             }
             queryOptions={{
-              refetchOnWindowFocus: false,
               refetchOnMount: false,
+              refetchOnWindowFocus: false,
             }}
             style={{
               height: "100%",
-              width: "100%",
               objectFit: "cover",
+              width: "100%",
             }}
           />
         )}
@@ -268,74 +266,74 @@ export const ConnectedWalletDetails: React.FC<{
         flex="column"
         gap="4xs"
         style={{
+          borderRadius: `0 ${radius.md} ${radius.md} 0`,
           textOverflow: "ellipsis",
           whiteSpace: "nowrap",
-          borderRadius: `0 ${radius.md} ${radius.md} 0`,
         }}
       >
         {/* Address */}
         {props.detailsButton?.connectedAccountName ? (
           <Text
-            size="xs"
+            className={`${TW_CONNECTED_WALLET}__address`}
             color="primaryText"
+            size="xs"
             weight={500}
-            className={`${TW_CONNECTED_WALLET}__address`}
           >
             {props.detailsButton.connectedAccountName}
           </Text>
         ) : (
           <Text
-            size="xs"
+            className={`${TW_CONNECTED_WALLET}__address`}
             color="primaryText"
+            size="xs"
             weight={500}
-            className={`${TW_CONNECTED_WALLET}__address`}
           >
             <AccountName
-              loadingComponent={<AccountAddress formatFn={shortenAddress} />}
               fallbackComponent={<AccountAddress formatFn={shortenAddress} />}
+              loadingComponent={<AccountAddress formatFn={shortenAddress} />}
             />
           </Text>
         )}
 
         <Text
           className={`${TW_CONNECTED_WALLET}__balance`}
-          size="xs"
           color="secondaryText"
-          weight={400}
+          size="xs"
           style={{
+            alignItems: "center",
             display: "flex",
             gap: "2px",
-            alignItems: "center",
           }}
+          weight={400}
         >
           {props.detailsButton?.showBalanceInFiat ? (
             <>
               <AccountBalance
                 chain={walletChain}
-                loadingComponent={
+                fallbackComponent={
                   <Skeleton height={fontSize.xs} width="50px" />
                 }
-                fallbackComponent={
+                loadingComponent={
                   <Skeleton height={fontSize.xs} width="50px" />
                 }
                 tokenAddress={tokenAddress}
               />
               <AccountBalance
                 chain={walletChain}
-                tokenAddress={tokenAddress}
-                showBalanceInFiat="USD"
                 formatFn={detailsBtn_formatFiatBalanceForButton}
                 loadingComponent={
                   <Skeleton height={fontSize.xs} width="20px" />
                 }
+                showBalanceInFiat="USD"
+                tokenAddress={tokenAddress}
               />
             </>
           ) : (
             <AccountBalance
               chain={walletChain}
-              loadingComponent={<Skeleton height={fontSize.xs} width="70px" />}
               fallbackComponent={<Skeleton height={fontSize.xs} width="70px" />}
               formatFn={detailsBtn_formatTokenBalanceForButton}
+              loadingComponent={<Skeleton height={fontSize.xs} width="70px" />}
               tokenAddress={tokenAddress}
             />
           )}
@@ -374,10 +372,7 @@ export function DetailsModal(props: {
   supportedTokens?: SupportedTokens;
   supportedNFTs?: SupportedNFTs;
   closeModal: () => void;
-  onDisconnect: (info: {
-    wallet: Wallet;
-    account: Account;
-  }) => void;
+  onDisconnect: (info: { wallet: Wallet; account: Account }) => void;
   chains: Chain[];
   displayBalanceToken?: Record<number, string>;
   connectOptions: DetailsModalConnectOptions | undefined;
@@ -400,8 +395,8 @@ export function DetailsModal(props: {
 
   const screenSetup = useSetupScreen({
     size: "compact",
-    welcomeScreen: undefined,
     wallets: activeWallet ? [activeWallet] : [],
+    welcomeScreen: undefined,
   });
 
   const closeModal = useCallback(() => {
@@ -431,38 +426,38 @@ export function DetailsModal(props: {
   const avatarContent = (
     <Container
       style={{
-        position: "relative",
         height: `${iconSize.xl}px`,
+        position: "relative",
         width: `${iconSize.xl}px`,
       }}
     >
       <Container
         style={{
-          width: "100%",
-          height: "100%",
           borderRadius: "100%",
+          height: "100%",
           overflow: "hidden",
+          width: "100%",
         }}
       >
         {props.detailsModal?.connectedAccountAvatarUrl ? (
           <img
+            alt=""
             src={props.detailsModal.connectedAccountAvatarUrl}
             style={{
               height: "100%",
-              width: "100%",
               objectFit: "cover",
+              width: "100%",
             }}
-            alt=""
           />
         ) : (
           activeAccount && (
             <AccountAvatar
-              loadingComponent={<AccountBlobbie size={Number(iconSize.xxl)} />}
               fallbackComponent={<AccountBlobbie size={Number(iconSize.xxl)} />}
+              loadingComponent={<AccountBlobbie size={Number(iconSize.xxl)} />}
               style={{
                 height: "100%",
-                width: "100%",
                 objectFit: "cover",
+                width: "100%",
               }}
             />
           )
@@ -471,23 +466,23 @@ export function DetailsModal(props: {
       {!props.detailsModal?.hideSwitchWallet ? (
         <Container
           style={{
-            position: "absolute",
             bottom: -2,
+            position: "absolute",
             right: -2,
           }}
         >
           <IconContainer
+            padding="4px"
             style={{
               background: theme.colors.modalBg,
             }}
-            padding="4px"
           >
             {activeWallet && (
               <WalletImage
-                style={{ borderRadius: 0 }}
-                id={activeWallet.id}
                 client={client}
+                id={activeWallet.id}
                 size="12"
+                style={{ borderRadius: 0 }}
               />
             )}
           </IconContainer>
@@ -500,30 +495,31 @@ export function DetailsModal(props: {
     <div className={`${TW_CONNECTED_WALLET}__default_modal_screen`}>
       <Spacer y="xs" />
       <Container
-        px="lg"
-        gap="sm"
-        flex="row"
         center="y"
+        flex="row"
+        gap="sm"
+        px="lg"
         style={{
-          paddingTop: spacing.lg,
           paddingBottom: hideAllButtons ? spacing.md : spacing.lg,
+          paddingTop: spacing.lg,
         }}
       >
         {props.detailsModal?.hideSwitchWallet ? (
           avatarContent
         ) : (
           <ToolTip tip="Switch wallet">
+            {/** biome-ignore lint/a11y/noStaticElementInteractions: TODO */}
             <div
-              style={{
-                cursor: "pointer",
+              onClick={() => {
+                setScreen("wallet-manager");
               }}
               onKeyDown={(e) => {
                 if (e.key === "w") {
                   setScreen("wallet-manager");
                 }
               }}
-              onClick={() => {
-                setScreen("wallet-manager");
+              style={{
+                cursor: "pointer",
               }}
             >
               {avatarContent}
@@ -533,22 +529,22 @@ export function DetailsModal(props: {
         <Container flex="column" gap="3xs">
           <div
             style={{
+              alignItems: "center",
               display: "flex",
               gap: spacing.xxs,
-              alignItems: "center",
             }}
           >
             {props.detailsModal?.connectedAccountName ? (
-              <Text color="primaryText" weight={500} size="md">
+              <Text color="primaryText" size="md" weight={500}>
                 {props.detailsModal.connectedAccountName}
               </Text>
             ) : (
-              <Text color="primaryText" weight={500} size="md">
+              <Text color="primaryText" size="md" weight={500}>
                 <AccountName
-                  loadingComponent={
+                  fallbackComponent={
                     <AccountAddress formatFn={shortenAddress} />
                   }
-                  fallbackComponent={
+                  loadingComponent={
                     <AccountAddress formatFn={shortenAddress} />
                   }
                 />
@@ -577,26 +573,26 @@ export function DetailsModal(props: {
             >
               {!hideSendFunds && (
                 <Button
-                  variant="outline"
+                  onClick={() => {
+                    setScreen("send");
+                  }}
                   style={{
-                    fontSize: fontSize.sm,
+                    alignItems: "center",
                     display: "flex",
+                    flex: 1,
+                    fontSize: fontSize.sm,
                     gap: spacing.xs,
-                    alignItems: "center",
                     padding: spacing.sm,
-                    flex: 1,
-                  }}
-                  onClick={() => {
-                    setScreen("send");
                   }}
+                  variant="outline"
                 >
-                  <Container color="secondaryText" flex="row" center="both">
+                  <Container center="both" color="secondaryText" flex="row">
                     <PaperPlaneIcon
-                      width={iconSize.sm}
                       height={iconSize.sm}
                       style={{
                         transform: "translateY(-10%) rotate(-45deg) ",
                       }}
+                      width={iconSize.sm}
                     />
                   </Container>
 
@@ -606,21 +602,21 @@ export function DetailsModal(props: {
 
               {!hideReceiveFunds && (
                 <Button
-                  variant="outline"
+                  onClick={() => {
+                    setScreen("receive");
+                  }}
                   style={{
-                    fontSize: fontSize.sm,
+                    alignItems: "center",
                     display: "flex",
+                    flex: 1,
+                    fontSize: fontSize.sm,
                     gap: spacing.xs,
-                    alignItems: "center",
                     padding: spacing.sm,
-                    flex: 1,
-                  }}
-                  onClick={() => {
-                    setScreen("receive");
                   }}
+                  variant="outline"
                 >
-                  <Container color="secondaryText" flex="row" center="both">
-                    <PinBottomIcon width={iconSize.sm} height={iconSize.sm} />
+                  <Container center="both" color="secondaryText" flex="row">
+                    <PinBottomIcon height={iconSize.sm} width={iconSize.sm} />
                   </Container>
                   {locale.receive}
                 </Button>
@@ -628,27 +624,27 @@ export function DetailsModal(props: {
 
               {!hideBuyFunds && (
                 <Button
-                  variant="outline"
-                  style={{
-                    fontSize: fontSize.sm,
-                    display: "flex",
-                    gap: spacing.xs,
-                    alignItems: "center",
-                    padding: spacing.sm,
-                    flex: 1,
-                  }}
                   onClick={() => {
                     trackPayEvent({
-                      event: "details_modal_buy_click",
                       client: client,
+                      event: "details_modal_buy_click",
                       walletAddress: activeAccount?.address,
                       walletType: activeWallet?.id,
                     });
                     setScreen("buy");
                   }}
+                  style={{
+                    alignItems: "center",
+                    display: "flex",
+                    flex: 1,
+                    fontSize: fontSize.sm,
+                    gap: spacing.xs,
+                    padding: spacing.sm,
+                  }}
+                  variant="outline"
                 >
-                  <Container color="secondaryText" flex="row" center="both">
-                    <PlusIcon width={iconSize.sm} height={iconSize.sm} />
+                  <Container center="both" color="secondaryText" flex="row">
+                    <PlusIcon height={iconSize.sm} width={iconSize.sm} />
                   </Container>
                   {locale.buy}
                 </Button>
@@ -670,10 +666,10 @@ export function DetailsModal(props: {
           {/* Network Switcher */}
           <NetworkSwitcherButton
             client={props.client}
-            setScreen={() => setScreen("network-switcher")}
             disableSwitchChain={disableSwitchChain}
-            showBalanceInFiat={props.detailsModal?.showBalanceInFiat}
             displayBalanceToken={props.displayBalanceToken}
+            setScreen={() => setScreen("network-switcher")}
+            showBalanceInFiat={props.detailsModal?.showBalanceInFiat}
           />
 
           {/* Transactions */}
@@ -685,8 +681,8 @@ export function DetailsModal(props: {
               fontSize: fontSize.sm,
             }}
           >
-            <TextAlignJustifyIcon width={iconSize.md} height={iconSize.md} />
-            <Container flex="row" gap="xs" center="y">
+            <TextAlignJustifyIcon height={iconSize.md} width={iconSize.md} />
+            <Container center="y" flex="row" gap="xs">
               <Text color="primaryText">{locale.transactions}</Text>
             </Container>
           </MenuButton>
@@ -725,17 +721,17 @@ export function DetailsModal(props: {
             (chainFaucetsQuery.faucets.length > 0 ||
               walletChain?.id === LocalhostChainId) && (
               <MenuLink
+                as="a"
                 href={
                   chainFaucetsQuery.faucets ? chainFaucetsQuery.faucets[0] : "#"
                 }
-                target="_blank"
-                as="a"
                 style={{
-                  textDecoration: "none",
                   color: "inherit",
+                  textDecoration: "none",
                 }}
+                target="_blank"
               >
-                <Container flex="row" center="both" color="secondaryText">
+                <Container center="both" color="secondaryText" flex="row">
                   <FundsIcon size={iconSize.md} />
                 </Container>
                 {locale.requestTestnetFunds}
@@ -756,7 +752,6 @@ export function DetailsModal(props: {
           <Container px="md">
             <MenuButton
               data-variant="danger"
-              type="button"
               onClick={() => {
                 if (activeWallet && activeAccount) {
                   disconnect(activeWallet);
@@ -766,8 +761,9 @@ export function DetailsModal(props: {
                   });
                 }
               }}
+              type="button"
             >
-              <ExitIcon width={iconSize.md} height={iconSize.md} />
+              <ExitIcon height={iconSize.md} width={iconSize.md} />
               <Text color="primaryText">{locale.disconnectWallet}</Text>
             </MenuButton>
           </Container>
@@ -780,12 +776,12 @@ export function DetailsModal(props: {
   if (screen === "transactions") {
     content = (
       <TransactionsScreen
-        title={locale.buy}
-        onBack={() => setScreen("main")}
+        client={client}
         closeModal={closeModal}
         locale={locale}
+        onBack={() => setScreen("main")}
         setScreen={setScreen}
-        client={client}
+        title={locale.buy}
       />
     );
   }
@@ -798,21 +794,21 @@ export function DetailsModal(props: {
   ) {
     content = (
       <WalletManagerScreen
-        onBack={() => setScreen("main")}
         accountAbstraction={props.connectOptions?.accountAbstraction}
+        activeAccount={activeAccount}
+        activeChain={walletChain}
+        activeWallet={activeWallet}
         appMetadata={props.connectOptions?.appMetadata}
         chain={props.connectOptions?.chain}
         chains={props.connectOptions?.chains}
         client={client}
-        hiddenWallets={props.connectOptions?.hiddenWallets}
         connectLocale={locale}
+        hiddenWallets={props.connectOptions?.hiddenWallets}
+        onBack={() => setScreen("main")}
         recommendedWallets={props.connectOptions?.recommendedWallets}
         showAllWallets={!!props.connectOptions?.showAllWallets}
         walletConnect={props.connectOptions?.walletConnect}
         wallets={props.connectOptions?.wallets}
-        activeAccount={activeAccount}
-        activeChain={walletChain}
-        activeWallet={activeWallet}
       />
     );
   }
@@ -827,104 +823,104 @@ export function DetailsModal(props: {
             ? [walletChain, ...props.chains]
             : props.chains
         }
+        client={client}
         closeModal={closeModal}
+        connectLocale={locale}
         networkSelector={props.detailsModal?.networkSelector}
         onBack={() => {
           setScreen("main");
         }}
-        connectLocale={locale}
-        client={client}
       />
     );
   } else if (screen === "view-assets") {
     content = (
       <ViewAssets
-        supportedTokens={props.supportedTokens}
-        supportedNFTs={props.supportedNFTs}
+        assetTabs={props.detailsModal?.assetTabs}
+        client={client}
+        connectLocale={locale}
         onBack={() => {
           setScreen("main");
         }}
-        theme={props.theme}
         setScreen={setScreen}
-        client={client}
-        connectLocale={locale}
-        assetTabs={props.detailsModal?.assetTabs}
+        supportedNFTs={props.supportedNFTs}
+        supportedTokens={props.supportedTokens}
+        theme={props.theme}
       />
     );
   } else if (screen === "view-nfts") {
     content = (
       <ViewNFTs
-        theme={props.theme}
-        supportedNFTs={props.supportedNFTs}
+        client={client}
+        connectLocale={locale}
         onBack={() => {
           setScreen("main");
         }}
-        client={client}
-        connectLocale={locale}
+        supportedNFTs={props.supportedNFTs}
+        theme={props.theme}
       />
     );
   } else if (screen === "view-tokens") {
     content = (
       <ViewTokens
-        supportedTokens={props.supportedTokens}
+        client={client}
+        connectLocale={locale}
         onBack={() => {
           setScreen("main");
         }}
-        client={client}
-        connectLocale={locale}
+        supportedTokens={props.supportedTokens}
       />
     );
   } else if (screen === "private-key") {
     content = (
       <PrivateKey
-        theme={props.theme} // do not use the useCustomTheme hook to get this, it's not valid here
+        client={client} // do not use the useCustomTheme hook to get this, it's not valid here
+        connectLocale={locale}
         onBack={() => {
           setScreen("manage-wallet");
         }}
+        theme={props.theme}
         wallet={activeWallet}
-        client={client}
-        connectLocale={locale}
       />
     );
   } else if (screen === "manage-wallet") {
     content = (
       <ManageWalletScreen
+        client={client}
+        closeModal={closeModal}
+        locale={locale}
         onBack={() => {
           setScreen("main");
         }}
-        locale={locale}
-        closeModal={closeModal}
-        client={client}
         setScreen={setScreen}
       />
     );
   } else if (screen === "wallet-connect-receiver") {
     content = (
       <WalletConnectReceiverScreen
+        chains={props.chains}
+        client={client}
         onBack={() => {
           setScreen("manage-wallet");
         }}
-        chains={props.chains}
-        client={client}
       />
     );
   } else if (screen === "linked-profiles") {
     content = (
       <LinkedProfilesScreen
-        onBack={() => setScreen("manage-wallet")}
         client={client}
         locale={locale}
+        onBack={() => setScreen("manage-wallet")}
         setScreen={setScreen}
       />
     );
   } else if (screen === "link-profile") {
     content = (
       <LinkProfileScreen
+        client={client}
+        locale={locale}
         onBack={() => {
           setScreen("linked-profiles");
         }}
-        client={client}
-        locale={locale}
         walletConnect={props.connectOptions?.walletConnect}
       />
     );
@@ -934,12 +930,12 @@ export function DetailsModal(props: {
   else if (screen === "send") {
     content = (
       <SendFunds
-        supportedTokens={props.supportedTokens}
+        client={client}
+        connectLocale={locale}
         onBack={() => {
           setScreen("main");
         }}
-        client={client}
-        connectLocale={locale}
+        supportedTokens={props.supportedTokens}
       />
     );
   }
@@ -948,12 +944,12 @@ export function DetailsModal(props: {
   else if (screen === "receive") {
     content = (
       <ReceiveFunds
-        walletId={activeWallet?.id}
+        client={client}
+        connectLocale={locale}
         onBack={() => {
           setScreen("main");
         }}
-        client={client}
-        connectLocale={locale}
+        walletId={activeWallet?.id}
       />
     );
   }
@@ -962,31 +958,30 @@ export function DetailsModal(props: {
   else if (screen === "buy") {
     content = (
       <LazyBuyScreen
-        title={locale.buy}
-        isEmbed={false}
         client={client}
-        onBack={() => setScreen("main")}
-        supportedTokens={props.supportedTokens}
         connectLocale={locale}
+        connectOptions={undefined}
+        hiddenWallets={props.detailsModal?.hiddenWallets}
+        isEmbed={false}
+        onBack={() => setScreen("main")}
+        onDone={closeModal}
         payOptions={
           props.detailsModal?.payOptions || {
             mode: "fund_wallet",
           }
         }
-        hiddenWallets={props.detailsModal?.hiddenWallets}
+        supportedTokens={props.supportedTokens}
         theme={typeof props.theme === "string" ? props.theme : props.theme.type}
-        onDone={closeModal}
-        connectOptions={undefined}
+        title={locale.buy}
       />
     );
   }
 
   return (
     <CustomThemeProvider theme={props.theme}>
-      <WalletUIStatesProvider theme={props.theme} isOpen={false}>
+      <WalletUIStatesProvider isOpen={false} theme={props.theme}>
         <ScreenSetupContext.Provider value={screenSetup}>
           <Modal
-            size="compact"
             open={isOpen}
             setOpen={(_open) => {
               if (!_open) {
@@ -996,6 +991,7 @@ export function DetailsModal(props: {
                 }
               }
             }}
+            size="compact"
           >
             {activeAccount?.address && (
               <AccountProvider address={activeAccount.address} client={client}>
@@ -1028,96 +1024,96 @@ export function NetworkSwitcherButton(props: {
   }
   return (
     <MenuButton
-      type="button"
+      className="tw-internal-network-switcher-button"
+      data-variant="primary"
       disabled={disableSwitchChain}
       onClick={() => {
         setScreen("network-switcher");
       }}
-      data-variant="primary"
-      className="tw-internal-network-switcher-button"
+      type="button"
     >
       <ChainProvider chain={walletChain}>
         <div
           style={{
-            display: "flex",
             alignItems: "center",
+            display: "flex",
             position: "relative",
           }}
         >
           <Container
             style={{
-              position: "relative",
+              alignItems: "center",
               display: "flex",
               flexShrink: 0,
-              alignItems: "center",
+              position: "relative",
             }}
           >
             <ChainIcon
               client={client}
-              loadingComponent={
-                <Skeleton
-                  height={`${iconSize.md}px`}
-                  width={`${iconSize.md}px`}
-                />
-              }
               fallbackComponent={
                 <img
-                  src={fallbackChainIcon}
                   alt=""
+                  src={fallbackChainIcon}
                   style={{
-                    width: `${iconSize.md}px`,
                     height: `${iconSize.md}px`,
+                    width: `${iconSize.md}px`,
                   }}
                 />
               }
+              loadingComponent={
+                <Skeleton
+                  height={`${iconSize.md}px`}
+                  width={`${iconSize.md}px`}
+                />
+              }
               style={{
-                width: `${iconSize.md}px`,
                 height: `${iconSize.md}px`,
+                width: `${iconSize.md}px`,
               }}
             />
             <ChainActiveDot className="tw-chain-active-dot-details-button" />
           </Container>
         </div>
 
-        <Text color="primaryText" size="md" multiline>
+        <Text color="primaryText" multiline size="md">
           <ChainName
-            loadingComponent={<Skeleton height="16px" width="150px" />}
             fallbackComponent={<span>Unknown chain #{walletChain?.id}</span>}
+            loadingComponent={<Skeleton height="16px" width="150px" />}
           />
           <Text color="secondaryText" size="xs">
             {showBalanceInFiat ? (
               <>
                 <AccountBalance
+                  chain={walletChain}
                   fallbackComponent={<Skeleton height="1em" width="70px" />}
+                  formatFn={(props: AccountBalanceInfo) =>
+                    formatAccountTokenBalance({ ...props, decimals: 7 })
+                  }
                   loadingComponent={<Skeleton height="1em" width="70px" />}
-                  chain={walletChain}
                   tokenAddress={
                     props.displayBalanceToken?.[Number(walletChain?.id)]
                   }
-                  formatFn={(props: AccountBalanceInfo) =>
-                    formatAccountTokenBalance({ ...props, decimals: 7 })
-                  }
                 />{" "}
                 <AccountBalance
-                  loadingComponent={<Skeleton height="1em" width="30px" />}
                   chain={walletChain}
-                  tokenAddress={
-                    props.displayBalanceToken?.[Number(walletChain?.id)]
-                  }
                   formatFn={(props: AccountBalanceInfo) =>
                     ` (${formatAccountFiatBalance({ ...props, decimals: 3 })})`
                   }
+                  loadingComponent={<Skeleton height="1em" width="30px" />}
                   showBalanceInFiat="USD"
+                  tokenAddress={
+                    props.displayBalanceToken?.[Number(walletChain?.id)]
+                  }
                 />
               </>
             ) : (
               <AccountBalance
+                chain={walletChain}
                 fallbackComponent={<Skeleton height="1em" width="100px" />}
-                loadingComponent={<Skeleton height="1em" width="100px" />}
                 formatFn={(props: AccountBalanceInfo) =>
                   formatAccountTokenBalance({ ...props, decimals: 7 })
                 }
-                chain={walletChain}
+                loadingComponent={<Skeleton height="1em" width="100px" />}
                 tokenAddress={
                   props.displayBalanceToken?.[Number(walletChain?.id)]
                 }
@@ -1128,12 +1124,12 @@ export function NetworkSwitcherButton(props: {
       </ChainProvider>
 
       <StyledChevronRightIcon
-        width={iconSize.sm}
         height={iconSize.sm}
         style={{
           flexShrink: 0,
           marginLeft: "auto",
         }}
+        width={iconSize.sm}
       />
     </MenuButton>
   );
@@ -1142,26 +1138,26 @@ export function NetworkSwitcherButton(props: {
 const WalletInfoButton = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
+    "&:hover": {
+      background: theme.colors.connectedButtonBgHover,
+      transition: "background 250ms ease",
+    },
+    alignItems: "center",
     all: "unset",
+    animation: `${fadeInAnimation} 300ms ease`,
     background: theme.colors.connectedButtonBg,
-    overflow: "hidden",
+    border: `1px solid ${theme.colors.borderColor}`,
     borderRadius: radius.md,
+    boxSizing: "border-box",
     cursor: "pointer",
     display: "inline-flex",
     gap: spacing.xs,
-    padding: spacing.xs,
-    alignItems: "center",
-    minWidth: "165px",
     height: "50px",
-    boxSizing: "border-box",
-    border: `1px solid ${theme.colors.borderColor}`,
-    WebkitTapHighlightColor: "transparent",
     lineHeight: "normal",
-    animation: `${fadeInAnimation} 300ms ease`,
-    "&:hover": {
-      transition: "background 250ms ease",
-      background: theme.colors.connectedButtonBgHover,
-    },
+    minWidth: "165px",
+    overflow: "hidden",
+    padding: spacing.xs,
+    WebkitTapHighlightColor: "transparent",
   };
 });
 
@@ -1209,8 +1205,8 @@ export function ConnectedToSmartWallet(props: {
   }, [activeAccount, chain, client, isSW]);
 
   const content = (
-    <Container flex="row" gap="3xs" center="y">
-      <Text size="xs" weight={400} color="secondaryText">
+    <Container center="y" flex="row" gap="3xs">
+      <Text color="secondaryText" size="xs" weight={400}>
         {locale.connectedToSmartWallet}
       </Text>
     </Container>
@@ -1224,8 +1220,8 @@ export function ConnectedToSmartWallet(props: {
             color="secondaryText"
             hoverColor="primaryText"
             href={`https://thirdweb.com/${chain.id}/${activeAccount.address}/account`}
-            target="_blank"
             size="sm"
+            target="_blank"
           >
             {content}
           </Link>
@@ -1253,10 +1249,7 @@ export function InAppWalletUserInfo(props: {
   const { data: walletInfo } = useWalletInfo(activeWallet?.id);
   const isSW = isSmartWallet(activeWallet);
   const { data: walletName } = useQuery({
-    queryKey: [
-      "wallet-name",
-      { walletId: activeWallet?.id, walletAddress: account?.address },
-    ],
+    enabled: !!activeWallet?.id && !!walletInfo,
     queryFn: async () => {
       const lastAuthProvider = await getLastAuthProvider(webLocalStorage);
       if (lastAuthProvider === "guest") {
@@ -1273,11 +1266,14 @@ export function InAppWalletUserInfo(props: {
       }
       return walletInfo?.name;
     },
-    enabled: !!activeWallet?.id && !!walletInfo,
+    queryKey: [
+      "wallet-name",
+      { walletAddress: account?.address, walletId: activeWallet?.id },
+    ],
   });
 
   const userInfoQuery = useQuery({
-    queryKey: ["in-app-wallet-user", client, account?.address],
+    enabled: !!adminWallet,
     queryFn: async () => {
       const isInAppWallet =
         adminWallet &&
@@ -1314,7 +1310,7 @@ export function InAppWalletUserInfo(props: {
 
       return email || phone || null;
     },
-    enabled: !!adminWallet,
+    queryKey: ["in-app-wallet-user", client, account?.address],
   });
 
   if (!userInfoQuery.data && isSW) {
@@ -1331,9 +1327,9 @@ export function InAppWalletUserInfo(props: {
 
   return (
     <Skeleton
-      width="50px"
-      height="10px"
       className="InAppWalletUserInfo__skeleton"
+      height="10px"
+      width="50px"
     />
   );
 }
@@ -1357,9 +1353,8 @@ export function SwitchNetworkButton(props: {
 
   return (
     <Button
+      aria-label={switching ? locale.switchingNetwork : undefined}
       className={`tw-connect-wallet--switch-network ${props.className || ""}`}
-      variant="primary"
-      type="button"
       data-is-loading={switching}
       data-test="switch-network-button"
       disabled={switching}
@@ -1376,10 +1371,11 @@ export function SwitchNetworkButton(props: {
         minWidth: "140px",
         ...props.style,
       }}
-      aria-label={switching ? locale.switchingNetwork : undefined}
+      type="button"
+      variant="primary"
     >
       {switching ? (
-        <Spinner size="sm" color="primaryButtonText" />
+        <Spinner color="primaryButtonText" size="sm" />
       ) : (
         switchNetworkBtnTitle
       )}
@@ -1579,10 +1575,7 @@ export type UseWalletDetailsModalOptions = {
    * }
    * ```
    */
-  onDisconnect?: (info: {
-    wallet: Wallet;
-    account: Account;
-  }) => void;
+  onDisconnect?: (info: { wallet: Wallet; account: Account }) => void;
 
   /**
    * Render custom UI at the bottom of the Details Modal
@@ -1716,34 +1709,34 @@ export function useWalletDetailsModal() {
       .then((locale) => {
         setRootEl(
           <DetailsModal
+            chains={props.chains || []}
             client={props.client}
-            locale={locale}
+            closeModal={closeModal}
+            connectOptions={props.connectOptions}
             detailsModal={{
+              assetTabs: props.assetTabs,
+              connectedAccountAvatarUrl: props.connectedAccountAvatarUrl,
+              connectedAccountName: props.connectedAccountName,
               footer: props.footer,
+              hideBuyFunds: props.hideBuyFunds,
               hideDisconnect: props.hideDisconnect,
+              hideReceiveFunds: props.hideReceiveFunds,
+              hideSendFunds: props.hideSendFunds,
               hideSwitchWallet: props.hideSwitchWallet,
               networkSelector: props.networkSelector,
+              onClose: props.onClose,
               payOptions: props.payOptions,
               showTestnetFaucet: props.showTestnetFaucet,
-              connectedAccountName: props.connectedAccountName,
-              connectedAccountAvatarUrl: props.connectedAccountAvatarUrl,
-              hideBuyFunds: props.hideBuyFunds,
-              hideReceiveFunds: props.hideReceiveFunds,
-              hideSendFunds: props.hideSendFunds,
-              assetTabs: props.assetTabs,
-              onClose: props.onClose,
             }}
             displayBalanceToken={props.displayBalanceToken}
-            theme={props.theme || "dark"}
-            supportedTokens={props.supportedTokens}
-            supportedNFTs={props.supportedNFTs}
-            closeModal={closeModal}
+            locale={locale}
             onDisconnect={(info) => {
               props.onDisconnect?.(info);
               closeModal();
             }}
-            chains={props.chains || []}
-            connectOptions={props.connectOptions}
+            supportedNFTs={props.supportedNFTs}
+            supportedTokens={props.supportedTokens}
+            theme={props.theme || "dark"}
           />,
         );
       })
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/MenuButton.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/MenuButton.tsx
index 131269d05eb..c7cfa4e9f09 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/MenuButton.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/MenuButton.tsx
@@ -9,42 +9,42 @@ import { StyledButton } from "../design-system/elements.js";
 export const MenuButton = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
-    all: "unset",
-    padding: `${spacing.sm} ${spacing.sm}`,
-    borderRadius: radius.md,
-    backgroundColor: "transparent",
-    // border: `1px solid ${theme.colors.borderColor}`,
-    boxSizing: "border-box",
-    display: "flex",
-    alignItems: "center",
-    width: "100%",
-    cursor: "pointer",
-    fontSize: fontSize.md,
-    fontWeight: 500,
-    color: theme.colors.secondaryText,
-    gap: spacing.sm,
-    WebkitTapHighlightColor: "transparent",
-    lineHeight: 1.3,
-    transition: "background-color 200ms ease, transform 200ms ease",
     "&:hover": {
       backgroundColor: theme.colors.tertiaryBg,
       svg: {
         color: theme.colors.accentText,
       },
     },
+    "&[data-variant='danger']:hover svg": {
+      color: `${theme.colors.danger}!important`,
+    },
+    "&[data-variant='primary']:hover svg": {
+      color: `${theme.colors.primaryText}!important`,
+    },
     "&[disabled]": {
       cursor: "not-allowed",
     },
+    alignItems: "center",
+    all: "unset",
+    backgroundColor: "transparent",
+    borderRadius: radius.md,
+    // border: `1px solid ${theme.colors.borderColor}`,
+    boxSizing: "border-box",
+    color: theme.colors.secondaryText,
+    cursor: "pointer",
+    display: "flex",
+    fontSize: fontSize.md,
+    fontWeight: 500,
+    gap: spacing.sm,
+    lineHeight: 1.3,
+    padding: `${spacing.sm} ${spacing.sm}`,
     svg: {
       color: theme.colors.secondaryText,
       transition: "color 200ms ease",
     },
-    "&[data-variant='danger']:hover svg": {
-      color: `${theme.colors.danger}!important`,
-    },
-    "&[data-variant='primary']:hover svg": {
-      color: `${theme.colors.primaryText}!important`,
-    },
+    transition: "background-color 200ms ease, transform 200ms ease",
+    WebkitTapHighlightColor: "transparent",
+    width: "100%",
   };
 });
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/AllWalletsUI.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/AllWalletsUI.tsx
index 10dc8c848c7..22c8203c331 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/AllWalletsUI.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/AllWalletsUI.tsx
@@ -1,7 +1,6 @@
 "use client";
 import styled from "@emotion/styled";
-import { MagnifyingGlassIcon } from "@radix-ui/react-icons";
-import { CrossCircledIcon } from "@radix-ui/react-icons";
+import { CrossCircledIcon, MagnifyingGlassIcon } from "@radix-ui/react-icons";
 import Fuse from "fuse.js";
 import { useMemo, useRef, useState } from "react";
 import type { ThirdwebClient } from "../../../../../client/client.js";
@@ -12,15 +11,15 @@ import { useCustomTheme } from "../../../../core/design-system/CustomThemeProvid
 import { iconSize, spacing } from "../../../../core/design-system/index.js";
 import { useSetSelectionData } from "../../../providers/wallet-ui-states-provider.js";
 import { sortWallets } from "../../../utils/sortWallets.js";
-import { Spacer } from "../../components/Spacer.js";
-import { Spinner } from "../../components/Spinner.js";
 import { Container, ModalHeader } from "../../components/basic.js";
 import { Input } from "../../components/formElements.js";
+import { Spacer } from "../../components/Spacer.js";
+import { Spinner } from "../../components/Spinner.js";
 import { Text } from "../../components/text.js";
 import { useDebouncedValue } from "../../hooks/useDebouncedValue.js";
 import { useShowMore } from "../../hooks/useShowMore.js";
-import { WalletEntryButton } from "../WalletEntryButton.js";
 import type { ConnectLocale } from "../locale/types.js";
+import { WalletEntryButton } from "../WalletEntryButton.js";
 
 /**
  *
@@ -47,13 +46,13 @@ function AllWalletsUI(props: {
 
   const fuseInstance = useMemo(() => {
     return new Fuse(walletList, {
-      threshold: 0.4,
       keys: [
         {
           name: "name",
           weight: 1,
         },
       ],
+      threshold: 0.4,
     });
   }, [walletList]);
 
@@ -70,9 +69,9 @@ function AllWalletsUI(props: {
   }, [searchResults, itemsToShow]);
 
   return (
-    <Container fullHeight flex="column" animate="fadein">
+    <Container animate="fadein" flex="column" fullHeight>
       <Container p="lg">
-        <ModalHeader title="Select Wallet" onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title="Select Wallet" />
       </Container>
 
       <Spacer y="xs" />
@@ -81,27 +80,27 @@ function AllWalletsUI(props: {
         {/* Search */}
         <div
           style={{
-            display: "flex",
             alignItems: "center",
+            display: "flex",
             position: "relative",
           }}
         >
-          <StyledMagnifyingGlassIcon width={iconSize.md} height={iconSize.md} />
+          <StyledMagnifyingGlassIcon height={iconSize.md} width={iconSize.md} />
 
           <Input
-            style={{
-              padding: `${spacing.sm} ${spacing.sm} ${spacing.sm} ${spacing.xxl}`,
-            }}
-            tabIndex={-1}
-            variant="outline"
-            placeholder="Search Wallet"
-            value={searchTerm}
             onChange={(e) => {
               listContainer.current?.parentElement?.scroll({
                 top: 0,
               });
               setSearchTerm(e.target.value);
             }}
+            placeholder="Search Wallet"
+            style={{
+              padding: `${spacing.sm} ${spacing.sm} ${spacing.sm} ${spacing.xxl}`,
+            }}
+            tabIndex={-1}
+            value={searchTerm}
+            variant="outline"
           />
           {/* Searching Spinner */}
           {deferredSearchTerm !== searchTerm && (
@@ -111,7 +110,7 @@ function AllWalletsUI(props: {
                 right: spacing.md,
               }}
             >
-              <Spinner size="md" color="accentText" />
+              <Spinner color="accentText" size="md" />
             </div>
           )}
         </div>
@@ -134,25 +133,25 @@ function AllWalletsUI(props: {
 
                 return (
                   <li
-                    ref={isLast ? lastItemRef : undefined}
                     key={walletInfo.id}
+                    ref={isLast ? lastItemRef : undefined}
                     style={{
                       listStyle: "none",
                     }}
                   >
                     <WalletEntryButton
-                      wallet={wallet}
+                      badge={undefined}
+                      client={props.client}
+                      connectLocale={props.connectLocale}
+                      isActive={false}
+                      recommendedWallets={props.recommendedWallets}
                       selectWallet={() => {
                         props.onSelect(wallet);
                         if (!props.disableSelectionDataReset) {
                           setSelectionData({});
                         }
                       }}
-                      client={props.client}
-                      recommendedWallets={props.recommendedWallets}
-                      connectLocale={props.connectLocale}
-                      isActive={false}
-                      badge={undefined}
+                      wallet={wallet}
                     />
                   </li>
                 );
@@ -166,17 +165,17 @@ function AllWalletsUI(props: {
 
       {walletInfosToShow.length === 0 && (
         <Container
-          flex="column"
-          gap="md"
+          animate="fadein"
           center="both"
           color="secondaryText"
-          animate="fadein"
           expand
+          flex="column"
+          gap="md"
           style={{
             minHeight: "250px",
           }}
         >
-          <CrossCircledIcon width={iconSize.xl} height={iconSize.xl} />
+          <CrossCircledIcon height={iconSize.xl} width={iconSize.xl} />
           <Text> No Results </Text>
         </Container>
       )}
@@ -189,8 +188,8 @@ const StyledMagnifyingGlassIcon = /* @__PURE__ */ styled(MagnifyingGlassIcon)(
     const theme = useCustomTheme();
     return {
       color: theme.colors.secondaryText,
-      position: "absolute",
       left: spacing.sm,
+      position: "absolute",
     };
   },
 );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/AnyWalletConnectUI.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/AnyWalletConnectUI.tsx
index 73b483fa857..a32ec12f186 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/AnyWalletConnectUI.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/AnyWalletConnectUI.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { useQuery } from "@tanstack/react-query";
-import { Suspense, lazy, useState } from "react";
+import { lazy, Suspense, useState } from "react";
 import type { Chain } from "../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { isMobile } from "../../../../../utils/web/isMobile.js";
@@ -22,8 +22,8 @@ import {
   WalletConnectConnection,
   WalletConnectStandaloneConnection,
 } from "../../../wallets/shared/WalletConnectConnection.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container, ModalHeader } from "../../components/basic.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 import { AccentFailIcon } from "../icons/AccentFailIcon.js";
 import type { ConnectLocale } from "../locale/types.js";
@@ -73,12 +73,12 @@ export function AnyWalletConnectUI(props: {
 
   const localeId = props.connectLocale.id;
   const localeFnQuery = useQuery({
-    queryKey: ["injectedWalletLocale", localeId, walletInfo.data?.name],
     queryFn: async () => {
       return getInjectedWalletLocale(localeId);
     },
-    refetchOnWindowFocus: false,
+    queryKey: ["injectedWalletLocale", localeId, walletInfo.data?.name],
     refetchOnMount: false,
+    refetchOnWindowFocus: false,
   });
 
   if (walletInfo.isLoading || !localeFnQuery.data) {
@@ -96,14 +96,14 @@ export function AnyWalletConnectUI(props: {
     if (injectedProvider) {
       return (
         <InjectedConnectUI
-          wallet={props.wallet as Wallet<InjectedSupportedWalletIds>}
-          walletName={injectedProvider.info.name}
+          chain={props.chain}
+          client={props.client}
           done={props.done}
           locale={localeFn(injectedProvider.info.name)}
           onBack={props.onBack}
-          chain={props.chain}
-          client={props.client}
           size={props.size}
+          wallet={props.wallet as Wallet<InjectedSupportedWalletIds>}
+          walletName={injectedProvider.info.name}
         />
       );
     }
@@ -111,14 +111,14 @@ export function AnyWalletConnectUI(props: {
     // This will only happen if developer passes a wallet with unknown id and it's not injected
     // Adding a fallback UI just in case
     return (
-      <Container animate="fadein" fullHeight flex="column">
+      <Container animate="fadein" flex="column" fullHeight>
         <Container p="lg">
-          <ModalHeader title="Not Supported" onBack={props.onBack} />
+          <ModalHeader onBack={props.onBack} title="Not Supported" />
         </Container>
         <Container
-          flex="column"
-          expand
           center="both"
+          expand
+          flex="column"
           p="lg"
           style={{
             minHeight: "300px",
@@ -126,7 +126,7 @@ export function AnyWalletConnectUI(props: {
         >
           <AccentFailIcon size={iconSize["3xl"]} />
           <Spacer y="lg" />
-          <Text color="primaryText" center>
+          <Text center color="primaryText">
             Wallet is not supported
           </Text>
           <Spacer y="xxl" />
@@ -145,13 +145,13 @@ export function AnyWalletConnectUI(props: {
   if (screen === "get-started") {
     return (
       <GetStartedScreen
+        client={props.client}
         locale={locale}
-        wallet={props.wallet}
-        walletInfo={walletInfo.data}
         onBack={() => {
           setScreen("main");
         }}
-        client={props.client}
+        wallet={props.wallet}
+        walletInfo={walletInfo.data}
       />
     );
   }
@@ -167,15 +167,15 @@ export function AnyWalletConnectUI(props: {
   if (walletInfo.data.deepLink?.mobile && shouldDeeplink) {
     return (
       <DeepLinkConnectUI
-        wallet={props.wallet as Wallet<InjectedSupportedWalletIds>}
-        walletInfo={walletInfo.data}
+        client={props.client}
         deepLinkPrefix={walletInfo.data.deepLink.mobile}
         locale={locale}
+        onBack={props.onBack}
         onGetStarted={() => {
           setScreen("get-started");
         }}
-        onBack={props.onBack}
-        client={props.client}
+        wallet={props.wallet as Wallet<InjectedSupportedWalletIds>}
+        walletInfo={walletInfo.data}
       />
     );
   }
@@ -183,17 +183,17 @@ export function AnyWalletConnectUI(props: {
   if (walletInfo.data.rdns && isInstalled) {
     return (
       <InjectedConnectUI
-        wallet={props.wallet as Wallet<InjectedSupportedWalletIds>}
-        walletName={walletInfo.data.name}
+        chain={props.chain}
+        client={props.client}
         done={props.done}
         locale={locale}
+        onBack={props.onBack}
         onGetStarted={() => {
           setScreen("get-started");
         }}
-        onBack={props.onBack}
-        chain={props.chain}
-        client={props.client}
         size={props.size}
+        wallet={props.wallet as Wallet<InjectedSupportedWalletIds>}
+        walletName={walletInfo.data.name}
       />
     );
   }
@@ -202,19 +202,19 @@ export function AnyWalletConnectUI(props: {
   if (walletInfo.data.mobile.native || walletInfo.data.mobile.universal) {
     return (
       <WalletConnectConnection
+        chain={props.chain}
+        chains={props.chains}
+        client={props.client}
+        done={props.done}
         locale={locale}
+        onBack={props.onBack}
         onGetStarted={() => {
           setScreen("get-started");
         }}
-        onBack={props.onBack}
-        done={props.done}
-        wallet={props.wallet as Wallet<WCSupportedWalletIds>}
-        walletInfo={walletInfo.data}
-        chain={props.chain}
-        chains={props.chains}
-        client={props.client}
         size={props.size}
+        wallet={props.wallet as Wallet<WCSupportedWalletIds>}
         walletConnect={props.walletConnect}
+        walletInfo={walletInfo.data}
       />
     );
   }
@@ -223,17 +223,17 @@ export function AnyWalletConnectUI(props: {
   if (props.wallet.id === "walletConnect") {
     return (
       <WalletConnectStandaloneConnection
-        locale={locale}
-        onBack={props.onBack}
-        done={props.done}
-        wallet={props.wallet as Wallet<"walletConnect">}
-        walletInfo={walletInfo.data}
-        setModalVisibility={props.setModalVisibility}
         chain={props.chain}
         chains={props.chains}
         client={props.client}
+        done={props.done}
+        locale={locale}
+        onBack={props.onBack}
+        setModalVisibility={props.setModalVisibility}
         size={props.size}
+        wallet={props.wallet as Wallet<"walletConnect">}
         walletConnect={props.walletConnect}
+        walletInfo={walletInfo.data}
       />
     );
   }
@@ -242,15 +242,15 @@ export function AnyWalletConnectUI(props: {
     return (
       <Suspense fallback={<LoadingScreen />}>
         <InAppWalletConnectUI
-          wallet={props.wallet as Wallet<"inApp">}
-          done={props.done}
-          goBack={props.onBack}
           chain={props.chain}
           client={props.client}
-          size={props.size}
-          walletConnect={props.walletConnect}
           connectLocale={props.connectLocale}
+          done={props.done}
+          goBack={props.onBack}
           meta={props.meta}
+          size={props.size}
+          wallet={props.wallet as Wallet<"inApp">}
+          walletConnect={props.walletConnect}
         />
       </Suspense>
     );
@@ -260,15 +260,15 @@ export function AnyWalletConnectUI(props: {
     return (
       <Suspense fallback={<LoadingScreen />}>
         <EcosystemWalletConnectUI
-          wallet={props.wallet as Wallet<EcosystemWalletId>}
-          done={props.done}
-          goBack={props.onBack}
           chain={props.chain}
           client={props.client}
-          size={props.size}
+          connectLocale={props.connectLocale}
+          done={props.done}
+          goBack={props.onBack}
           meta={props.meta}
+          size={props.size}
+          wallet={props.wallet as Wallet<EcosystemWalletId>}
           walletConnect={props.walletConnect}
-          connectLocale={props.connectLocale}
         />
       </Suspense>
     );
@@ -279,17 +279,17 @@ export function AnyWalletConnectUI(props: {
     return (
       <Suspense fallback={<LoadingScreen />}>
         <CoinbaseSDKWalletConnectUI
+          chain={props.chain}
+          client={props.client}
+          done={props.done}
           locale={locale}
+          onBack={props.onBack}
           onGetStarted={() => {
             setScreen("get-started");
           }}
-          onBack={props.onBack}
-          done={props.done}
+          size={props.size}
           wallet={props.wallet}
           walletInfo={walletInfo.data}
-          chain={props.chain}
-          client={props.client}
-          size={props.size}
         />
       </Suspense>
     );
@@ -298,11 +298,11 @@ export function AnyWalletConnectUI(props: {
   // if can't connect in any way - show get started screen
   return (
     <GetStartedScreen
+      client={props.client}
       locale={locale}
+      onBack={props.onBack}
       wallet={props.wallet}
       walletInfo={walletInfo.data}
-      onBack={props.onBack}
-      client={props.client}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx
index b8db5516fa0..2b4d64c6ed1 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx
@@ -227,11 +227,11 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
   const meta = useMemo(() => {
     return {
       privacyPolicyUrl: props.privacyPolicyUrl,
+      requireApproval: props.requireApproval,
       showThirdwebBranding: props.showThirdwebBranding !== false,
       termsOfServiceUrl: props.termsOfServiceUrl,
       title: undefined,
       titleIconUrl: undefined,
-      requireApproval: props.requireApproval,
     };
   }, [
     props.privacyPolicyUrl,
@@ -245,18 +245,18 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
 
   const autoConnectComp = props.autoConnect !== false && (
     <AutoConnect
-      chain={preferredChain}
+      accountAbstraction={props.accountAbstraction}
       appMetadata={props.appMetadata}
+      chain={preferredChain}
       client={props.client}
+      onConnect={props.onConnect}
       siweAuth={siweAuth}
-      wallets={wallets}
-      accountAbstraction={props.accountAbstraction}
       timeout={
         typeof props.autoConnect === "boolean"
           ? undefined
           : props.autoConnect?.timeout
       }
-      onConnect={props.onConnect}
+      wallets={wallets}
     />
   );
 
@@ -275,28 +275,28 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
     }
 
     return (
-      <WalletUIStatesProvider theme={props.theme} isOpen={true}>
+      <WalletUIStatesProvider isOpen={true} theme={props.theme}>
         <ConnectEmbedContent
-          auth={props.auth}
           accountAbstraction={props.accountAbstraction}
+          auth={props.auth}
           chain={preferredChain}
           chains={props.chains}
+          className={props.className}
           client={props.client}
           connectLocale={localeQuery.data}
-          size={modalSize}
-          meta={meta}
           header={props.header}
+          hiddenWallets={props.hiddenWallets}
           localeId={props.locale || "en_US"}
+          meta={meta}
+          modalSize={modalSize}
           onConnect={props.onConnect}
           recommendedWallets={props.recommendedWallets}
           showAllWallets={props.showAllWallets}
+          size={modalSize}
+          style={props.style}
           walletConnect={props.walletConnect}
           wallets={wallets}
-          className={props.className}
-          modalSize={modalSize}
-          style={props.style}
           welcomeScreen={props.welcomeScreen}
-          hiddenWallets={props.hiddenWallets}
         />
         {autoConnectComp}
       </WalletUIStatesProvider>
@@ -351,8 +351,8 @@ const ConnectEmbedContent = (props: {
   // const requiresSignIn = false;
   const screenSetup = useSetupScreen({
     size: props.size,
-    welcomeScreen: undefined,
     wallets: props.wallets,
+    welcomeScreen: undefined,
   });
   const { setScreen, initialScreen, screen } = screenSetup;
   const activeWallet = useActiveWallet();
@@ -385,21 +385,14 @@ const ConnectEmbedContent = (props: {
   } else {
     content = (
       <ConnectModalContent
-        shouldSetActive={true}
-        screenSetup={screenSetup}
-        isOpen={true}
-        onClose={() => {
-          setScreen(initialScreen);
-        }}
-        setModalVisibility={() => {
-          // no op
-        }}
         accountAbstraction={props.accountAbstraction}
         auth={props.auth}
         chain={props.chain}
         chains={props.chains}
         client={props.client}
         connectLocale={props.connectLocale}
+        hideHeader={!props.header}
+        isOpen={true}
         meta={{
           ...props.meta,
           title:
@@ -409,24 +402,31 @@ const ConnectEmbedContent = (props: {
               ? props.header.titleIcon
               : undefined,
         }}
-        size={props.size}
-        welcomeScreen={props.welcomeScreen}
-        hideHeader={!props.header}
+        modalHeader={undefined}
+        onClose={() => {
+          setScreen(initialScreen);
+        }}
         onConnect={props.onConnect}
         recommendedWallets={props.recommendedWallets}
+        screenSetup={screenSetup}
+        setModalVisibility={() => {
+          // no op
+        }}
+        shouldSetActive={true}
         showAllWallets={props.showAllWallets}
+        size={props.size}
         walletConnect={props.walletConnect}
-        wallets={props.wallets}
-        modalHeader={undefined}
         walletIdsToHide={props.hiddenWallets}
+        wallets={props.wallets}
+        welcomeScreen={props.welcomeScreen}
       />
     );
   }
 
   return (
     <EmbedContainer
-      modalSize={modalSize}
       className={props.className}
+      modalSize={modalSize}
       style={props.style}
     >
       {modalSize === "wide" ? (
@@ -444,23 +444,23 @@ export const EmbedContainer = /* @__PURE__ */ StyledDiv<{
   const { modalSize } = props;
   const theme = useCustomTheme();
   return {
-    color: theme.colors.primaryText,
-    background: theme.colors.modalBg,
-    height: modalSize === "compact" ? "auto" : wideModalMaxHeight,
-    width: modalSize === "compact" ? modalMaxWidthCompact : modalMaxWidthWide,
-    boxSizing: "border-box",
-    position: "relative",
-    lineHeight: "normal",
-    borderRadius: radius.xl,
-    border: `1px solid ${theme.colors.borderColor}`,
-    overflow: "hidden",
-    fontFamily: theme.fontFamily,
+    "& *": {
+      boxSizing: "border-box",
+    },
     "& *::selection": {
       backgroundColor: theme.colors.selectedTextBg,
       color: theme.colors.selectedTextColor,
     },
-    "& *": {
-      boxSizing: "border-box",
-    },
+    background: theme.colors.modalBg,
+    border: `1px solid ${theme.colors.borderColor}`,
+    borderRadius: radius.xl,
+    boxSizing: "border-box",
+    color: theme.colors.primaryText,
+    fontFamily: theme.fontFamily,
+    height: modalSize === "compact" ? "auto" : wideModalMaxHeight,
+    lineHeight: "normal",
+    overflow: "hidden",
+    position: "relative",
+    width: modalSize === "compact" ? modalMaxWidthCompact : modalMaxWidthWide,
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModal.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModal.tsx
index fff9f2a30b7..953b3a62634 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModal.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModal.tsx
@@ -58,8 +58,8 @@ type ConnectModalOptions = {
 const ConnectModal = (props: ConnectModalOptions) => {
   const screenSetup = useSetupScreen({
     size: props.size,
-    welcomeScreen: props.welcomeScreen,
     wallets: props.wallets,
+    welcomeScreen: props.welcomeScreen,
   });
   const setSelectionData = useSetSelectionData();
   const { screen, setScreen, initialScreen } = screenSetup;
@@ -119,7 +119,6 @@ const ConnectModal = (props: ConnectModalOptions) => {
   return (
     <Modal
       hide={hideModal}
-      size={props.size}
       open={isWalletModalOpen}
       setOpen={(value) => {
         if (hideModal) {
@@ -130,30 +129,31 @@ const ConnectModal = (props: ConnectModalOptions) => {
           closeModal();
         }
       }}
+      size={props.size}
     >
       <ConnectModalContent
-        shouldSetActive={props.shouldSetActive}
-        screenSetup={screenSetup}
-        setModalVisibility={setModalVisibility}
-        isOpen={isWalletModalOpen}
-        onClose={closeModal}
         accountAbstraction={props.accountAbstraction}
         auth={props.auth}
+        chain={props.chain}
+        chains={props.chains}
         client={props.client}
         connectLocale={props.connectLocale}
-        size={props.size}
-        welcomeScreen={props.welcomeScreen}
-        meta={props.meta}
         hideHeader={false}
+        isOpen={isWalletModalOpen}
+        meta={props.meta}
+        modalHeader={undefined}
+        onClose={closeModal}
         onConnect={props.onConnect}
         recommendedWallets={props.recommendedWallets}
-        wallets={props.wallets}
-        chain={props.chain}
+        screenSetup={screenSetup}
+        setModalVisibility={setModalVisibility}
+        shouldSetActive={props.shouldSetActive}
         showAllWallets={props.showAllWallets}
-        chains={props.chains}
+        size={props.size}
         walletConnect={props.walletConnect}
-        modalHeader={undefined}
         walletIdsToHide={props.hiddenWallets}
+        wallets={props.wallets}
+        welcomeScreen={props.welcomeScreen}
       />
     </Modal>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModalContent.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModalContent.tsx
index b54dbfb5ea7..7f41018a344 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModalContent.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModalContent.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { Suspense, lazy, useCallback } from "react";
+import { lazy, Suspense, useCallback } from "react";
 import type { Chain } from "../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
@@ -15,12 +15,12 @@ import { useSetActiveWallet } from "../../../../core/hooks/wallets/useSetActiveW
 import { useConnectionManager } from "../../../../core/providers/connection-manager.js";
 import { useSetSelectionData } from "../../../providers/wallet-ui-states-provider.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
-import { WalletSelector } from "../WalletSelector.js";
 import { onModalUnmount, reservedScreens } from "../constants.js";
 import type { ConnectLocale } from "../locale/types.js";
 import { SignatureScreen } from "../screens/SignatureScreen.js";
 import { StartScreen } from "../screens/StartScreen.js";
 import type { WelcomeScreen } from "../screens/types.js";
+import { WalletSelector } from "../WalletSelector.js";
 import { AnyWalletConnectUI } from "./AnyWalletConnectUI.js";
 import {
   ConnectModalCompactLayout,
@@ -130,8 +130,20 @@ export const ConnectModalContent = (props: {
 
   const walletList = (
     <WalletSelector
-      title={props.meta.title || props.connectLocale.defaultModalTitle}
-      wallets={props.wallets}
+      accountAbstraction={props.accountAbstraction}
+      chain={props.chain}
+      chains={props.chains}
+      client={props.client}
+      connectLocale={props.connectLocale}
+      done={handleConnected}
+      goBack={props.wallets.length > 1 ? handleBack : undefined}
+      hideHeader={props.hideHeader}
+      meta={props.meta}
+      modalHeader={props.modalHeader}
+      onShowAll={() => {
+        setScreen(reservedScreens.showAll);
+      }}
+      recommendedWallets={props.recommendedWallets}
       selectWallet={(newWallet) => {
         if (newWallet.onConnectRequested) {
           newWallet
@@ -142,38 +154,26 @@ export const ConnectModalContent = (props: {
           setScreen(newWallet);
         }
       }}
-      onShowAll={() => {
-        setScreen(reservedScreens.showAll);
-      }}
-      done={handleConnected}
-      goBack={props.wallets.length > 1 ? handleBack : undefined}
       setModalVisibility={setModalVisibility}
-      client={props.client}
-      connectLocale={props.connectLocale}
-      hideHeader={props.hideHeader}
-      recommendedWallets={props.recommendedWallets}
-      accountAbstraction={props.accountAbstraction}
-      chain={props.chain}
       showAllWallets={props.showAllWallets}
-      chains={props.chains}
-      walletConnect={props.walletConnect}
-      meta={props.meta}
       size={props.size}
-      modalHeader={props.modalHeader}
+      title={props.meta.title || props.connectLocale.defaultModalTitle}
+      walletConnect={props.walletConnect}
       walletIdsToHide={props.walletIdsToHide}
+      wallets={props.wallets}
     />
   );
 
   const showAll = (
     <Suspense fallback={<LoadingScreen />}>
       <AllWalletsUI
-        onBack={handleBack}
-        onSelect={setScreen}
         client={props.client}
         connectLocale={props.connectLocale}
+        onBack={handleBack}
+        onSelect={setScreen}
         recommendedWallets={props.recommendedWallets}
-        specifiedWallets={props.wallets}
         size={props.size}
+        specifiedWallets={props.wallets}
       />
     </Suspense>
   );
@@ -193,55 +193,55 @@ export const ConnectModalContent = (props: {
     if (props.accountAbstraction) {
       return (
         <SmartConnectUI
-          key={wallet.id}
           accountAbstraction={props.accountAbstraction}
+          chain={props.chain}
+          chains={props.chains}
+          client={props.client}
+          connectLocale={props.connectLocale}
           done={(smartWallet) => {
             handleConnected(smartWallet);
           }}
-          personalWallet={wallet}
+          key={wallet.id}
+          meta={props.meta}
           onBack={goBack}
+          personalWallet={wallet}
           setModalVisibility={props.setModalVisibility}
-          meta={props.meta}
           size={props.size}
-          chain={props.chain}
-          chains={props.chains}
-          client={props.client}
           walletConnect={props.walletConnect}
-          connectLocale={props.connectLocale}
         />
       );
     }
 
     return (
       <AnyWalletConnectUI
-        key={wallet.id}
-        wallet={wallet}
-        onBack={goBack}
-        done={() => {
-          handleConnected(wallet);
-        }}
-        setModalVisibility={props.setModalVisibility}
         chain={props.chain}
         chains={props.chains}
         client={props.client}
+        connectLocale={props.connectLocale}
+        done={() => {
+          handleConnected(wallet);
+        }}
+        key={wallet.id}
         meta={props.meta}
+        onBack={goBack}
+        setModalVisibility={props.setModalVisibility}
         size={props.size}
+        wallet={wallet}
         walletConnect={props.walletConnect}
-        connectLocale={props.connectLocale}
       />
     );
   };
 
   const signatureScreen = (
     <SignatureScreen
-      onDone={onClose}
-      onClose={onClose}
-      modalSize={props.size}
-      termsOfServiceUrl={props.meta.termsOfServiceUrl}
-      privacyPolicyUrl={props.meta.privacyPolicyUrl}
       auth={props.auth}
       client={props.client}
       connectLocale={props.connectLocale}
+      modalSize={props.size}
+      onClose={onClose}
+      onDone={onClose}
+      privacyPolicyUrl={props.meta.privacyPolicyUrl}
+      termsOfServiceUrl={props.meta.termsOfServiceUrl}
     />
   );
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModalSkeleton.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModalSkeleton.tsx
index f892ffa9dda..e496337e0e8 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModalSkeleton.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/ConnectModalSkeleton.tsx
@@ -14,13 +14,13 @@ export function ConnectModalWideLayout(props: {
   return (
     <div
       style={{
-        height: "100%",
         display: "grid",
         gridTemplateColumns: "300px 1fr",
+        height: "100%",
       }}
     >
       <LeftContainer> {props.left} </LeftContainer>
-      <Container flex="column" scrollY relative>
+      <Container flex="column" relative scrollY>
         {props.right}
       </Container>
     </div>
@@ -36,8 +36,8 @@ export function ConnectModalCompactLayout(props: {
   return (
     <Container
       flex="column"
-      scrollY
       relative
+      scrollY
       style={{
         maxHeight: compactModalMaxHeight,
       }}
@@ -54,7 +54,7 @@ const LeftContainer = /* @__PURE__ */ StyledDiv((_) => {
     flexDirection: "column",
     overflowY: "auto",
     ...noScrollBar,
-    position: "relative",
     borderRight: `1px solid ${theme.colors.separatorLine}`,
+    position: "relative",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/DeepLinkConnectUI.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/DeepLinkConnectUI.tsx
index 575dfe64cf4..7056772f780 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/DeepLinkConnectUI.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/DeepLinkConnectUI.tsx
@@ -8,9 +8,9 @@ import type { WalletInfo } from "../../../../../wallets/wallet-info.js";
 import { useCustomTheme } from "../../../../core/design-system/CustomThemeProvider.js";
 import { iconSize, radius } from "../../../../core/design-system/index.js";
 import type { InjectedWalletLocale } from "../../../wallets/injected/locale/types.js";
-import { WalletImage } from "../../components/WalletImage.js";
 import { Container, ModalHeader } from "../../components/basic.js";
 import { ButtonLink } from "../../components/buttons.js";
+import { WalletImage } from "../../components/WalletImage.js";
 import { StyledDiv } from "../../design-system/elements.js";
 
 /**
@@ -38,16 +38,16 @@ export const DeepLinkConnectUI = (props: {
         <ModalHeader onBack={props.onBack} title={props.walletInfo.name} />
       </Container>
 
-      <Container flex="row" center="x" animate="fadein" py="3xl">
+      <Container animate="fadein" center="x" flex="row" py="3xl">
         <PulsatingContainer>
-          <WalletImage id={props.wallet.id} client={props.client} size="80" />
+          <WalletImage client={props.client} id={props.wallet.id} size="80" />
         </PulsatingContainer>
       </Container>
 
       <Container p="lg">
-        <ButtonLink fullWidth variant="accent" href={deeplink} gap="xs">
+        <ButtonLink fullWidth gap="xs" href={deeplink} variant="accent">
           Continue in {props.walletInfo.name}
-          <ExternalLinkIcon width={iconSize.sm} height={iconSize.sm} />
+          <ExternalLinkIcon height={iconSize.sm} width={iconSize.sm} />
         </ButtonLink>
       </Container>
     </Container>
@@ -67,19 +67,19 @@ const pulseAnimation = keyframes`
 const PulsatingContainer = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
-    position: "relative",
     "&::before": {
+      animation: `${pulseAnimation} 2s cubic-bezier(0.175, 0.885, 0.32, 1.1) infinite`,
+      background: theme.colors.accentText,
+      borderRadius: radius.xl,
+      bottom: 0,
       content: '""',
       display: "block",
-      position: "absolute",
       left: 0,
-      top: 0,
-      bottom: 0,
+      position: "absolute",
       right: 0,
-      background: theme.colors.accentText,
-      animation: `${pulseAnimation} 2s cubic-bezier(0.175, 0.885, 0.32, 1.1) infinite`,
+      top: 0,
       zIndex: -1,
-      borderRadius: radius.xl,
     },
+    position: "relative",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/InjectedConnectUI.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/InjectedConnectUI.tsx
index dc5f911c966..7fc6ca313aa 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/InjectedConnectUI.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/InjectedConnectUI.tsx
@@ -32,8 +32,8 @@ export const InjectedConnectUI = (props: {
       setErrorConnecting(false);
       await wait(1000);
       await wallet.connect({
-        client: props.client,
         chain: props.chain,
+        client: props.client,
       });
 
       done();
@@ -54,23 +54,23 @@ export const InjectedConnectUI = (props: {
 
   return (
     <ConnectingScreen
+      client={props.client}
+      errorConnecting={errorConnecting}
       locale={{
+        failed: locale.connectionScreen.failed,
         getStartedLink: locale.getStartedLink,
+        inProgress: locale.connectionScreen.inProgress,
         instruction: locale.connectionScreen.instruction,
         tryAgain: locale.connectionScreen.retry,
-        inProgress: locale.connectionScreen.inProgress,
-        failed: locale.connectionScreen.failed,
       }}
       onBack={props.onBack}
-      walletName={props.walletName}
       onGetStarted={props.onGetStarted}
-      walletId={props.wallet.id}
       onRetry={() => {
         connectToExtension();
       }}
-      errorConnecting={errorConnecting}
-      client={props.client}
       size={props.size}
+      walletId={props.wallet.id}
+      walletName={props.walletName}
     />
   );
 };
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx
index 337698e29f8..ffb857f57d0 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx
@@ -11,9 +11,9 @@ import { useWalletInfo } from "../../../../core/utils/wallet.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
 import { getSmartWalletLocale } from "../../../wallets/smartWallet/locale/getSmartWalletLocale.js";
 import type { SmartWalletLocale } from "../../../wallets/smartWallet/locale/types.js";
+import { Container } from "../../components/basic.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Spinner } from "../../components/Spinner.js";
-import { Container } from "../../components/basic.js";
 import { Text } from "../../components/text.js";
 import type { LocaleId } from "../../types.js";
 import type { ConnectLocale } from "../locale/types.js";
@@ -57,33 +57,33 @@ export function SmartConnectUI(props: {
   if (!keyConnected) {
     return (
       <AnyWalletConnectUI
-        wallet={props.personalWallet}
+        chain={props.chain}
+        chains={props.chains}
+        client={props.client}
+        connectLocale={props.connectLocale}
         done={() => {
           setKeyConnected(true);
         }}
+        meta={props.meta}
         onBack={props.onBack}
         setModalVisibility={props.setModalVisibility}
-        chain={props.chain}
-        chains={props.chains}
-        client={props.client}
-        meta={props.meta}
         size={props.size}
+        wallet={props.personalWallet}
         walletConnect={props.walletConnect}
-        connectLocale={props.connectLocale}
       />
     );
   }
 
   return (
     <SmartWalletConnecting
-      done={props.done}
-      personalWallet={props.personalWallet}
       accountAbstraction={props.accountAbstraction}
+      client={props.client}
+      done={props.done}
+      localeId={props.connectLocale.id}
       onBack={props.onBack}
+      personalWallet={props.personalWallet}
       personalWalletInfo={personalWalletInfo.data}
-      localeId={props.connectLocale.id}
       size={props.size}
-      client={props.client}
     />
   );
 }
@@ -99,8 +99,8 @@ function SmartWalletConnecting(props: {
   client: ThirdwebClient;
 }) {
   const localeQuery = useQuery<SmartWalletLocale>({
-    queryKey: ["getSmartWalletLocale", props.localeId],
     queryFn: () => getSmartWalletLocale(props.localeId),
+    queryKey: ["getSmartWalletLocale", props.localeId],
   });
   const { personalWallet } = props;
   const { done } = props;
@@ -153,10 +153,10 @@ function SmartWalletConnecting(props: {
   if (smartWalletConnectionStatus === "connect-error") {
     return (
       <Container
-        fullHeight
         animate="fadein"
-        flex="column"
         center="both"
+        flex="column"
+        fullHeight
         p="lg"
         style={{
           minHeight: "300px",
@@ -169,14 +169,14 @@ function SmartWalletConnecting(props: {
 
   return (
     <Container
-      fullHeight
-      flex="column"
       center="both"
+      flex="column"
+      fullHeight
       style={{
         minHeight: "300px",
       }}
     >
-      <Text color="primaryText" multiline center>
+      <Text center color="primaryText" multiline>
         {localeQuery.data.connecting}
       </Text>
       <Spacer y="lg" />
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/TOS.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/TOS.tsx
index aacdd2e15ee..5e4ac29c662 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/TOS.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/TOS.tsx
@@ -1,8 +1,7 @@
 "use client";
 import { spacing } from "../../../../core/design-system/index.js";
 import { Container } from "../../components/basic.js";
-import { Link } from "../../components/text.js";
-import { Text } from "../../components/text.js";
+import { Link, Text } from "../../components/text.js";
 import type { ConnectLocale } from "../locale/types.js";
 
 /**
@@ -26,39 +25,39 @@ export function TOS(props: {
   const bothGiven = termsOfServiceUrl && privacyPolicyUrl;
 
   return (
-    <Container flex="row" center="x">
+    <Container center="x" flex="row">
       <Text
-        size="xs"
-        multiline
         balance
-        inline
         center
+        inline
+        multiline
+        size="xs"
         style={{
           maxWidth: "250px",
         }}
       >
         {requireApproval && (
           <input
+            checked={props.isApproved}
+            disabled={!requireApproval}
+            onChange={props.onApprove}
             style={{
-              transform: "translateY(3px)",
               marginRight: spacing["3xs"],
+              transform: "translateY(3px)",
             }}
             type="checkbox"
-            onChange={props.onApprove}
-            checked={props.isApproved}
-            disabled={!requireApproval}
           />
         )}
         {locale.prefix}{" "}
         {termsOfServiceUrl && (
           <Link
+            href={termsOfServiceUrl}
             inline
             size="xs"
-            href={termsOfServiceUrl}
-            target="_blank"
             style={{
               whiteSpace: "nowrap",
             }}
+            target="_blank"
           >
             {" "}
             {locale.termsOfService}{" "}
@@ -66,7 +65,7 @@ export function TOS(props: {
         )}
         {bothGiven && `${locale.and} `}
         {privacyPolicyUrl && (
-          <Link inline size="xs" href={privacyPolicyUrl} target="_blank">
+          <Link href={privacyPolicyUrl} inline size="xs" target="_blank">
             {locale.privacyPolicy}
           </Link>
         )}
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/screen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/screen.tsx
index 96d65521409..72c5b1941b4 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/screen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/Modal/screen.tsx
@@ -57,9 +57,9 @@ export function useSetupScreen(props: {
   }, [activeAccount, screen]);
 
   return {
+    initialScreen,
     screen,
     setScreen,
-    initialScreen,
   };
 }
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/NetworkSelector.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/NetworkSelector.test.tsx
index b3087ba707f..c8733b95e44 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/NetworkSelector.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/NetworkSelector.test.tsx
@@ -4,6 +4,7 @@ import { TEST_CLIENT } from "~test/test-clients.js";
 import { base } from "../../../../chains/chain-definitions/base.js";
 import { ethereum } from "../../../../chains/chain-definitions/ethereum.js";
 import { useActiveWalletChain } from "../../../../react/core/hooks/wallets/useActiveWalletChain.js";
+import en from "./locale/en.js";
 import {
   ChainButton,
   NetworkButton,
@@ -13,7 +14,6 @@ import {
   StyledMagnifyingGlassIcon,
   TabButton,
 } from "./NetworkSelector.js";
-import en from "./locale/en.js";
 
 const client = TEST_CLIENT;
 
@@ -46,11 +46,11 @@ describe("NetworkSelector", () => {
     const { container } = render(
       <ChainButton
         chain={ethereum}
-        onClick={() => {}}
-        confirming={true}
-        switchingFailed={false}
         client={client}
+        confirming={true}
         connectLocale={en}
+        onClick={() => {}}
+        switchingFailed={false}
       />,
     );
     await waitFor(
@@ -71,11 +71,11 @@ describe("NetworkSelector", () => {
     render(
       <ChainButton
         chain={ethereum}
-        onClick={() => {}}
-        confirming={true}
-        switchingFailed={true}
         client={client}
+        confirming={true}
         connectLocale={en}
+        onClick={() => {}}
+        switchingFailed={true}
       />,
     );
     await waitFor(
@@ -101,11 +101,11 @@ describe("NetworkSelector", () => {
     const { container } = render(
       <ChainButton
         chain={ethereum}
-        onClick={() => {}}
-        confirming={true}
-        switchingFailed={true}
         client={client}
+        confirming={true}
         connectLocale={en}
+        onClick={() => {}}
+        switchingFailed={true}
       />,
     );
     await waitFor(() => {
@@ -120,11 +120,11 @@ describe("NetworkSelector", () => {
     const { container } = render(
       <ChainButton
         chain={ethereum}
-        onClick={() => {}}
-        confirming={false}
-        switchingFailed={false}
         client={client}
+        confirming={false}
         connectLocale={en}
+        onClick={() => {}}
+        switchingFailed={false}
       />,
     );
 
@@ -142,8 +142,8 @@ describe("NetworkSelector", () => {
   it("NetworkList should render ChainIcon by default", async () => {
     render(
       <NetworkList
-        client={client}
         chains={[ethereum, base]}
+        client={client}
         connectLocale={en}
         onSwitch={() => {}}
       />,
@@ -175,11 +175,11 @@ describe("NetworkSelector", () => {
 
     const { container } = render(
       <NetworkList
-        renderChain={CustomRender}
-        client={client}
         chains={[ethereum, base]}
+        client={client}
         connectLocale={en}
         onSwitch={() => {}}
+        renderChain={CustomRender}
       />,
     );
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/NetworkSelector.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/NetworkSelector.tsx
index c4dbda45028..15307c866ad 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/NetworkSelector.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/NetworkSelector.tsx
@@ -2,6 +2,7 @@
 import styled from "@emotion/styled";
 import { CrossCircledIcon, MagnifyingGlassIcon } from "@radix-ui/react-icons";
 import Fuse from "fuse.js";
+import type React from "react";
 import {
   Fragment,
   memo,
@@ -11,7 +12,6 @@ import {
   useMemo,
   useState,
 } from "react";
-import type React from "react";
 import type { Chain } from "../../../../chains/types.js";
 import { convertApiChainToChain } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
@@ -20,27 +20,27 @@ import {
   useCustomTheme,
 } from "../../../core/design-system/CustomThemeProvider.js";
 import {
-  type Theme,
   fontSize,
   iconSize,
   media,
   radius,
   spacing,
+  type Theme,
 } from "../../../core/design-system/index.js";
 import { useChainsQuery } from "../../../core/hooks/others/useChainQuery.js";
 import { useActiveWalletChain } from "../../../core/hooks/wallets/useActiveWalletChain.js";
 import { useSwitchActiveWalletChain } from "../../../core/hooks/wallets/useSwitchActiveWalletChain.js";
 import { SetRootElementContext } from "../../../core/providers/RootElementContext.js";
-import { ChainActiveDot } from "../components/ChainActiveDot.js";
-import { Modal } from "../components/Modal.js";
-import { Skeleton } from "../components/Skeleton.js";
-import { Spacer } from "../components/Spacer.js";
-import { Spinner } from "../components/Spinner.js";
 import { Container, Line, ModalHeader } from "../components/basic.js";
 import { Button } from "../components/buttons.js";
+import { ChainActiveDot } from "../components/ChainActiveDot.js";
 import { fallbackChainIcon } from "../components/fallbackChainIcon.js";
 import { Input } from "../components/formElements.js";
+import { Modal } from "../components/Modal.js";
 import { ModalTitle } from "../components/modalElements.js";
+import { Skeleton } from "../components/Skeleton.js";
+import { Spacer } from "../components/Spacer.js";
+import { Spinner } from "../components/Spinner.js";
 import { Text } from "../components/text.js";
 import { StyledButton, StyledP, StyledUl } from "../design-system/elements.js";
 import { useDebouncedValue } from "../hooks/useDebouncedValue.js";
@@ -186,8 +186,8 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
         );
         if (chainsToAdd.length > 0) {
           chainSectionsValue.push({
-            label: s.label,
             chains: chainsToAdd,
+            label: s.label,
           });
           for (const c of chainsToAdd) {
             addChain(c, s.label);
@@ -209,8 +209,8 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
           .filter((c) => c !== undefined);
 
         chainSectionsValue.push({
-          label: recentLabel,
           chains: recentChains,
+          label: recentLabel,
         });
         for (const c of recentChains) {
           addChain(c, recentLabel);
@@ -231,8 +231,8 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
         );
         if (chainsToAdd.length > 0) {
           chainSectionsValue.push({
-            label: popularLabel,
             chains: chainsToAdd,
+            label: popularLabel,
           });
           for (const c of chainsToAdd) {
             addChain(c, popularLabel);
@@ -247,8 +247,8 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
     );
     if (otherChainsToAdd.length > 0) {
       chainSectionsValue.push({
-        label: othersLabel,
         chains: otherChainsToAdd,
+        label: othersLabel,
       });
       for (const c of otherChainsToAdd) {
         addChain(c, othersLabel);
@@ -256,9 +256,9 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
     }
 
     return {
-      chainSections: chainSectionsValue,
       allChains: allChainsValue,
       allChainsToSectionMap: allChainsToSectionMapValue,
+      chainSections: chainSectionsValue,
     };
   }, [
     props.networkSelector?.sections,
@@ -289,7 +289,6 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
   // fuse instance for searching
   const fuse = useMemo(() => {
     return new Fuse(allChainsMetadata, {
-      threshold: 0.4,
       keys: [
         {
           name: "name",
@@ -300,6 +299,7 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
           weight: 1,
         },
       ],
+      threshold: 0.4,
     });
   }, [allChainsMetadata]);
 
@@ -329,8 +329,8 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
           section.chains.push(c);
         } else {
           filteredChainSectionsValue.push({
-            label,
             chains: [c],
+            label,
           });
         }
       }
@@ -344,12 +344,12 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
     }
 
     return searchedChainSections.map((section) => ({
-      label: section.label,
       chains: section.chains.filter(
         (c) =>
           (selectedTab === "mainnet" && !c.testnet) ||
           (selectedTab === "testnet" && c.testnet),
       ),
+      label: section.label,
     }));
   }, [searchedChainSections, selectedTab]);
 
@@ -367,7 +367,7 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
     <Container>
       <Container p="lg">
         {props.onBack ? (
-          <ModalHeader title={locale.title} onBack={props.onBack} />
+          <ModalHeader onBack={props.onBack} title={locale.title} />
         ) : (
           <ModalTitle>{locale.title}</ModalTitle>
         )}
@@ -379,20 +379,20 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
           <Container px="lg">
             <Container flex="row" gap="xxs">
               <TabButton
-                onClick={() => setSelectedTab("all")}
                 data-active={selectedTab === "all"}
+                onClick={() => setSelectedTab("all")}
               >
                 {locale.allNetworks}
               </TabButton>
               <TabButton
-                onClick={() => setSelectedTab("mainnet")}
                 data-active={selectedTab === "mainnet"}
+                onClick={() => setSelectedTab("mainnet")}
               >
                 {locale.mainnets}
               </TabButton>
               <TabButton
-                onClick={() => setSelectedTab("testnet")}
                 data-active={selectedTab === "testnet"}
+                onClick={() => setSelectedTab("testnet")}
               >
                 {locale.testnets}
               </TabButton>
@@ -408,29 +408,29 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
         {/* Search */}
         <div
           style={{
-            display: "flex",
             alignItems: "center",
+            display: "flex",
             position: "relative",
           }}
         >
-          <StyledMagnifyingGlassIcon width={iconSize.md} height={iconSize.md} />
+          <StyledMagnifyingGlassIcon height={iconSize.md} width={iconSize.md} />
 
           <Input
-            style={{
-              padding: `${spacing.sm} ${spacing.md} ${spacing.sm} ${spacing.xxl}`,
-            }}
-            tabIndex={-1}
-            variant="outline"
-            value={searchTerm}
+            disabled={isAllChainsQueryLoading}
             onChange={(e) => {
               setSearchTerm(e.target.value);
             }}
-            disabled={isAllChainsQueryLoading}
             placeholder={
               isAllChainsQueryLoading
                 ? "Loading chains..."
                 : locale.inputPlaceholder
             }
+            style={{
+              padding: `${spacing.sm} ${spacing.md} ${spacing.sm} ${spacing.xxl}`,
+            }}
+            tabIndex={-1}
+            value={searchTerm}
+            variant="outline"
           />
           {/* Searching Spinner */}
           {(deferredSearchTerm !== searchTerm || isAllChainsQueryLoading) && (
@@ -440,7 +440,7 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
                 right: spacing.md,
               }}
             >
-              <Spinner size="md" color="accentText" />
+              <Spinner color="accentText" size="md" />
             </div>
           )}
         </div>
@@ -449,11 +449,11 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
       <Container px="md">
         <NetworkTabContent
           chainSections={filteredChainSections}
-          onSwitch={handleSwitch}
-          renderChain={props.networkSelector?.renderChain}
-          connectLocale={props.connectLocale}
           client={props.client}
           close={props.closeModal}
+          connectLocale={props.connectLocale}
+          onSwitch={handleSwitch}
+          renderChain={props.networkSelector?.renderChain}
         />
       </Container>
       {onCustomClick && (
@@ -462,16 +462,16 @@ export function NetworkSelectorContent(props: NetworkSelectorContentProps) {
           <Container p="lg">
             <Button
               fullWidth
-              variant="link"
               onClick={() => {
                 onCustomClick();
                 props.closeModal();
               }}
               style={{
+                boxShadow: "none",
                 display: "flex",
                 fontSize: fontSize.sm,
-                boxShadow: "none",
               }}
+              variant="link"
             >
               {locale.addCustomNetwork}
             </Button>
@@ -502,8 +502,8 @@ const NetworkTabContent = (props: {
 
   return (
     <Container
-      scrollY
       animate="fadein"
+      scrollY
       style={{
         height: "330px",
         paddingBottom: spacing.lg,
@@ -511,9 +511,9 @@ const NetworkTabContent = (props: {
     >
       {/* empty state */}
       {noChainsToShow ? (
-        <Container flex="column" gap="md" center="both" color="secondaryText">
+        <Container center="both" color="secondaryText" flex="column" gap="md">
           <Spacer y="xl" />
-          <CrossCircledIcon width={iconSize.xl} height={iconSize.xl} />
+          <CrossCircledIcon height={iconSize.xl} width={iconSize.xl} />
           <Text> No Results </Text>
         </Container>
       ) : (
@@ -528,11 +528,11 @@ const NetworkTabContent = (props: {
               <Spacer y="xs" />
               <NetworkList
                 chains={section.chains}
-                onSwitch={props.onSwitch}
-                renderChain={props.renderChain}
-                close={props.close}
                 client={props.client}
+                close={props.close}
                 connectLocale={props.connectLocale}
+                onSwitch={props.onSwitch}
+                renderChain={props.renderChain}
               />
             </Fragment>
           );
@@ -607,22 +607,22 @@ export const NetworkList = /* @__PURE__ */ memo(function NetworkList(
           <li key={chain.id} ref={isLast ? lastItemRef : undefined}>
             {RenderChain ? (
               <RenderChain
+                chain={chain}
+                close={props.close}
                 switchChain={() => {
                   handleSwitch(chain);
                 }}
-                chain={chain}
-                switching={switchingChainId === chain.id}
                 switchFailed={errorSwitchingChainId === chain.id}
-                close={props.close}
+                switching={switchingChainId === chain.id}
               />
             ) : (
               <ChainButton
                 chain={chain}
+                client={props.client}
                 confirming={confirming}
+                connectLocale={props.connectLocale}
                 onClick={() => handleSwitch(chain)}
                 switchingFailed={switchingFailed}
-                client={props.client}
-                connectLocale={props.connectLocale}
               />
             )}
           </li>
@@ -655,35 +655,35 @@ export const ChainButton = /* @__PURE__ */ memo(function ChainButton(props: {
       >
         <Container
           style={{
-            position: "relative",
+            alignItems: "center",
             display: "flex",
             flexShrink: 0,
-            alignItems: "center",
+            position: "relative",
           }}
         >
           <ChainIcon
             client={props.client}
-            loadingComponent={
-              <Skeleton
-                width={`${iconSize.lg}px`}
-                height={`${iconSize.lg}px`}
-              />
-            }
             fallbackComponent={
               <img
-                src={fallbackChainIcon}
                 alt=""
+                src={fallbackChainIcon}
                 style={{
-                  width: `${iconSize.lg}px`,
                   height: `${iconSize.lg}px`,
+                  width: `${iconSize.lg}px`,
                 }}
               />
             }
+            loading="lazy"
+            loadingComponent={
+              <Skeleton
+                height={`${iconSize.lg}px`}
+                width={`${iconSize.lg}px`}
+              />
+            }
             style={{
-              width: `${iconSize.lg}px`,
               height: `${iconSize.lg}px`,
+              width: `${iconSize.lg}px`,
             }}
-            loading="lazy"
           />
           {activeChain?.id === chain.id && (
             <ChainActiveDot className="tw-chain-active-dot-button-network-selector" />
@@ -698,21 +698,21 @@ export const ChainButton = /* @__PURE__ */ memo(function ChainButton(props: {
             }}
           >
             <ChainName
-              loadingComponent={<Skeleton width="150px" height="20px" />}
+              loadingComponent={<Skeleton height="20px" width="150px" />}
             />
-            <Container animate="fadein" flex="row" gap="xxs" center="y">
+            <Container animate="fadein" center="y" flex="row" gap="xxs">
               {confirming && (
                 <>
-                  <Text size="xs" color="accentText">
+                  <Text color="accentText" size="xs">
                     {locale.switchingNetwork}
                   </Text>
-                  <Spinner size="xs" color="accentText" />
+                  <Spinner color="accentText" size="xs" />
                 </>
               )}
 
               {switchingFailed && (
                 <Container animate="fadein">
-                  <Text size="xs" color="danger">
+                  <Text color="danger" size="xs">
                     {locale.networkSelector.failedToSwitch}
                   </Text>
                 </Container>
@@ -721,8 +721,8 @@ export const ChainButton = /* @__PURE__ */ memo(function ChainButton(props: {
           </div>
         ) : (
           <ChainName
-            loadingComponent={<Skeleton width="150px" height="20px" />}
             className="tw-chain-icon-none-confirming"
+            loadingComponent={<Skeleton height="20px" width="150px" />}
           />
         )}
       </NetworkButton>
@@ -737,20 +737,19 @@ export const TabButton = /* @__PURE__ */ (() =>
   styled.button((_) => {
     const theme = useCustomTheme();
     return {
+      "&[data-active='true']": {
+        background: theme.colors.secondaryButtonBg,
+        color: theme.colors.primaryText,
+      },
       all: "unset",
-      fontSize: fontSize.sm,
-      fontWeight: 500,
+      borderRadius: radius.lg,
       color: theme.colors.secondaryText,
       cursor: "pointer",
+      fontSize: fontSize.sm,
+      fontWeight: 500,
       padding: `${spacing.sm} ${spacing.sm}`,
-      WebkitTapHighlightColor: "transparent",
-      borderRadius: radius.lg,
       transition: "background 0.2s ease, color 0.2s ease",
-
-      "&[data-active='true']": {
-        background: theme.colors.secondaryButtonBg,
-        color: theme.colors.primaryText,
-      },
+      WebkitTapHighlightColor: "transparent",
     };
   }))();
 
@@ -760,22 +759,22 @@ export const TabButton = /* @__PURE__ */ (() =>
 export const SectionLabel = /* @__PURE__ */ StyledP(() => {
   const theme = useCustomTheme();
   return {
-    fontSize: fontSize.sm,
     color: theme.colors.secondaryText,
-    margin: 0,
     display: "block",
+    fontSize: fontSize.sm,
+    margin: 0,
     padding: `0 ${spacing.xs}`,
   };
 });
 
 const NetworkListUl = /* @__PURE__ */ StyledUl({
-  padding: 0,
-  margin: 0,
-  listStyle: "none",
+  boxSizing: "border-box",
   display: "flex",
   flexDirection: "column",
   gap: spacing.xs,
-  boxSizing: "border-box",
+  listStyle: "none",
+  margin: 0,
+  padding: 0,
 });
 
 /**
@@ -784,22 +783,22 @@ const NetworkListUl = /* @__PURE__ */ StyledUl({
 export const NetworkButton = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
+    "&:hover": {
+      background: theme.colors.secondaryButtonBg,
+    },
+    alignItems: "center",
     all: "unset",
-    display: "flex",
-    width: "100%",
+    borderRadius: radius.md,
     boxSizing: "border-box",
-    alignItems: "center",
+    color: theme.colors.primaryText,
+    cursor: "pointer",
+    display: "flex",
+    fontSize: fontSize.md,
+    fontWeight: 500,
     gap: spacing.md,
     padding: `${spacing.xs} ${spacing.sm}`,
-    borderRadius: radius.md,
-    cursor: "pointer",
     transition: "background 0.2s ease",
-    color: theme.colors.primaryText,
-    fontWeight: 500,
-    fontSize: fontSize.md,
-    "&:hover": {
-      background: theme.colors.secondaryButtonBg,
-    },
+    width: "100%",
 
     [media.mobile]: {
       fontSize: fontSize.sm,
@@ -816,8 +815,8 @@ export const StyledMagnifyingGlassIcon = /* @__PURE__ */ styled(
   const theme = useCustomTheme();
   return {
     color: theme.colors.secondaryText,
-    position: "absolute",
     left: spacing.sm,
+    position: "absolute",
   };
 });
 
@@ -957,21 +956,21 @@ export function useNetworkSwitcherModal() {
       setRootEl(
         <CustomThemeProvider theme={props.theme}>
           <Modal
-            size="compact"
             open={true}
             setOpen={(value) => {
               if (!value) {
                 closeModal();
               }
             }}
+            size="compact"
             style={{
               paddingBottom: props.onCustomClick ? spacing.md : "0px",
             }}
           >
             <NetworkSelectorContent
+              chains={[activeChain]}
               client={props.client}
               closeModal={closeModal}
-              chains={[activeChain]}
               connectLocale={locale}
               networkSelector={{
                 onCustomClick: props.onCustomClick,
@@ -988,7 +987,7 @@ export function useNetworkSwitcherModal() {
   );
 
   return {
-    open: openNetworkSwitcher,
     close: closeModal,
+    open: openNetworkSwitcher,
   };
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/PoweredByTW.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/PoweredByTW.tsx
index 27633931e30..10e9e5b1e64 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/PoweredByTW.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/PoweredByTW.tsx
@@ -1,14 +1,11 @@
 import { Container } from "../components/basic.js";
-import { Link } from "../components/text.js";
-import { Text } from "../components/text.js";
+import { Link, Text } from "../components/text.js";
 import { ThirdwebTextIcon } from "./icons/ThirdwebTextIcon.js";
 
 /**
  * @internal
  */
-export function PoweredByThirdweb(props: {
-  link?: string;
-}) {
+export function PoweredByThirdweb(props: { link?: string }) {
   const link =
     props.link ||
     "https://playground.thirdweb.com/connect/sign-in/button?utm_source=cw_text";
@@ -16,12 +13,12 @@ export function PoweredByThirdweb(props: {
     <Link
       color="secondaryText"
       hoverColor="primaryText"
-      target="_blank"
       href={link}
+      target="_blank"
     >
       <Container
-        flex="row"
         center="both"
+        flex="row"
         style={{
           color: "currentColor",
           gap: 4,
@@ -29,10 +26,10 @@ export function PoweredByThirdweb(props: {
       >
         <Text
           size="xs"
-          weight={600}
           style={{
             color: "currentColor",
           }}
+          weight={600}
         >
           Powered by
         </Text>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/TransactionsScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/TransactionsScreen.tsx
index 982c7efe698..6d8531eac4e 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/TransactionsScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/TransactionsScreen.tsx
@@ -9,13 +9,13 @@ import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.j
 import { useActiveWallet } from "../../../core/hooks/wallets/useActiveWallet.js";
 import { useActiveWalletChain } from "../../../core/hooks/wallets/useActiveWalletChain.js";
 import { LoadingScreen } from "../../wallets/shared/LoadingScreen.js";
-import { Spacer } from "../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../components/basic.js";
 import { ButtonLink } from "../components/buttons.js";
+import { Spacer } from "../components/Spacer.js";
 import type { ConnectLocale } from "./locale/types.js";
 import type { PayerInfo } from "./screens/Buy/types.js";
-import { WalletTransactionHistory } from "./screens/WalletTransactionHistory.js";
 import type { WalletDetailsModalScreen } from "./screens/types.js";
+import { WalletTransactionHistory } from "./screens/WalletTransactionHistory.js";
 
 /**
  * @internal
@@ -35,7 +35,7 @@ export function TransactionsScreen(props: {
 
   const payer: PayerInfo | undefined =
     activeChain && activeAccount && activeWallet
-      ? { chain: activeChain, account: activeAccount, wallet: activeWallet }
+      ? { account: activeAccount, chain: activeChain, wallet: activeWallet }
       : undefined;
 
   if (!payer) {
@@ -45,7 +45,7 @@ export function TransactionsScreen(props: {
   return (
     <Container animate="fadein">
       <Container p="lg">
-        <ModalHeader title={props.locale.transactions} onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title={props.locale.transactions} />
       </Container>
       <Line />
       <Container
@@ -57,30 +57,30 @@ export function TransactionsScreen(props: {
       >
         <Spacer y="md" />
         <WalletTransactionHistory
-          locale={props.locale}
-          client={props.client}
           address={payer.account.address}
+          client={props.client}
+          locale={props.locale}
         />
       </Container>
       <Line />
       <Container p="lg">
         <ButtonLink
+          as="a"
           fullWidth
-          variant="outline"
+          gap="xs"
           href={formatExplorerAddressUrl(
             chainExplorers.explorers[0]?.url ?? "",
             activeAccount?.address ?? "",
           )}
-          target="_blank"
-          as="a"
-          gap="xs"
           style={{
-            textDecoration: "none",
             color: "inherit",
+            textDecoration: "none",
           }}
+          target="_blank"
+          variant="outline"
         >
           View on Explorer
-          <ExternalLinkIcon width={iconSize.sm} height={iconSize.sm} />
+          <ExternalLinkIcon height={iconSize.sm} width={iconSize.sm} />
         </ButtonLink>
       </Container>
     </Container>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletEntryButton.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletEntryButton.tsx
index 38c4e54aac3..0f9191c54f4 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletEntryButton.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletEntryButton.tsx
@@ -11,11 +11,11 @@ import {
   spacing,
 } from "../../../core/design-system/index.js";
 import { useWalletInfo } from "../../../core/utils/wallet.js";
+import { Container } from "../components/basic.js";
 import { Img } from "../components/Img.js";
 import { Skeleton } from "../components/Skeleton.js";
-import { WalletImage } from "../components/WalletImage.js";
-import { Container } from "../components/basic.js";
 import { Text } from "../components/text.js";
+import { WalletImage } from "../components/WalletImage.js";
 import { StyledButton } from "../design-system/elements.js";
 import type { ConnectLocale } from "./locale/types.js";
 
@@ -56,29 +56,29 @@ export function WalletEntryButton(props: {
 
   return (
     <WalletButtonEl
-      type="button"
-      onClick={selectWallet}
       data-active={props.isActive}
+      onClick={selectWallet}
+      type="button"
     >
       {iconOverride ? (
         <Img
+          alt={nameOverride}
           client={props.client}
+          height={`${iconSize.xl}`}
           src={iconOverride}
-          alt={nameOverride}
           width={`${iconSize.xl}`}
-          height={`${iconSize.xl}`}
         />
       ) : (
-        <WalletImage id={walletId} size={iconSize.xl} client={props.client} />
+        <WalletImage client={props.client} id={walletId} size={iconSize.xl} />
       )}
 
-      <Container flex="column" gap="xxs" expand>
+      <Container expand flex="column" gap="xxs">
         {nameOverride ? (
           <Text color="primaryText" weight={600}>
             {nameOverride}
           </Text>
         ) : (
-          <Skeleton width="100px" height={fontSize.md} />
+          <Skeleton height={fontSize.md} width="100px" />
         )}
         {props.badge ? (
           <Text size="sm">{props.badge}</Text>
@@ -95,17 +95,6 @@ export function WalletEntryButton(props: {
 export const WalletButtonEl = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
-    all: "unset",
-    display: "flex",
-    alignItems: "center",
-    gap: spacing.sm,
-    cursor: "pointer",
-    boxSizing: "border-box",
-    width: "100%",
-    color: theme.colors.secondaryText,
-    position: "relative",
-    borderRadius: radius.md,
-    padding: `${spacing.xs} ${spacing.xs}`,
     "&:hover": {
       backgroundColor: theme.colors.tertiaryBg,
       transform: "scale(1.01)",
@@ -113,6 +102,17 @@ export const WalletButtonEl = /* @__PURE__ */ StyledButton((_) => {
     '&[data-active="true"]': {
       backgroundColor: theme.colors.tertiaryBg,
     },
+    alignItems: "center",
+    all: "unset",
+    borderRadius: radius.md,
+    boxSizing: "border-box",
+    color: theme.colors.secondaryText,
+    cursor: "pointer",
+    display: "flex",
+    gap: spacing.sm,
+    padding: `${spacing.xs} ${spacing.xs}`,
+    position: "relative",
     transition: "background-color 200ms ease, transform 200ms ease",
+    width: "100%",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletSelector.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletSelector.tsx
index 8fa694d2a91..584f44e97a3 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletSelector.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletSelector.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { ChevronLeftIcon } from "@radix-ui/react-icons";
-import { Suspense, lazy, useEffect, useRef, useState } from "react";
+import { lazy, Suspense, useEffect, useRef, useState } from "react";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { InjectedSupportedWalletIds } from "../../../../wallets/__generated__/wallet-ids.js";
@@ -19,30 +19,29 @@ import {
 import { useSetSelectionData } from "../../providers/wallet-ui-states-provider.js";
 import { sortWallets } from "../../utils/sortWallets.js";
 import { LoadingScreen } from "../../wallets/shared/LoadingScreen.js";
-import { Img } from "../components/Img.js";
-import { Spacer } from "../components/Spacer.js";
-import { TextDivider } from "../components/TextDivider.js";
 import {
   Container,
   Line,
   ModalHeader,
-  ScreenBottomContainer,
   noScrollBar,
+  ScreenBottomContainer,
 } from "../components/basic.js";
 import { Button, IconButton } from "../components/buttons.js";
+import { Img } from "../components/Img.js";
 import { ModalTitle } from "../components/modalElements.js";
-import { Link } from "../components/text.js";
-import { Text } from "../components/text.js";
+import { Spacer } from "../components/Spacer.js";
+import { TextDivider } from "../components/TextDivider.js";
+import { Link, Text } from "../components/text.js";
 import { StyledDiv, StyledUl } from "../design-system/elements.js";
+import { compactModalMaxHeight } from "./constants.js";
+import { OutlineWalletIcon } from "./icons/OutlineWalletIcon.js";
+import type { ConnectLocale } from "./locale/types.js";
 import { SmartConnectUI } from "./Modal/SmartWalletConnectUI.js";
-import { TOS } from "./Modal/TOS.js";
 import { useScreenContext } from "./Modal/screen.js";
+import { TOS } from "./Modal/TOS.js";
 import { PoweredByThirdweb } from "./PoweredByTW.js";
 import { WalletButtonEl, WalletEntryButton } from "./WalletEntryButton.js";
 import { WalletTypeRowButton } from "./WalletTypeRowButton.js";
-import { compactModalMaxHeight } from "./constants.js";
-import { OutlineWalletIcon } from "./icons/OutlineWalletIcon.js";
-import type { ConnectLocale } from "./locale/types.js";
 
 const InAppWalletSelectionUI = /* @__PURE__ */ lazy(
   () => import("../../wallets/in-app/InAppWalletSelectionUI.js"),
@@ -105,17 +104,17 @@ export function WalletSelector(props: WalletSelectorProps) {
     return (
       <SmartConnectUI
         accountAbstraction={props.accountAbstraction}
+        chain={props.chain}
+        chains={props.chains}
+        client={props.client}
+        connectLocale={props.connectLocale}
         done={props.done}
+        meta={props.meta}
+        onBack={props.goBack}
         personalWallet={personalWallet}
         setModalVisibility={props.setModalVisibility}
-        onBack={props.goBack}
-        meta={props.meta}
         size={props.size}
-        chain={props.chain}
-        chains={props.chains}
-        client={props.client}
         walletConnect={props.walletConnect}
-        connectLocale={props.connectLocale}
       />
     );
   }
@@ -169,21 +168,21 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
 
   const continueAsGuest = localWalletConfig && (
     <Button
+      data-test="continue-as-guest-button"
+      disabled={props.meta.requireApproval && !approvedTOS}
       fullWidth
-      variant={isCompact ? "outline" : "link"}
+      onClick={() => {
+        props.selectWallet(localWalletConfig);
+      }}
       style={
         !isCompact
           ? {
-              textAlign: "left",
               justifyContent: "flex-start",
+              textAlign: "left",
             }
           : undefined
       }
-      onClick={() => {
-        props.selectWallet(localWalletConfig);
-      }}
-      data-test="continue-as-guest-button"
-      disabled={props.meta.requireApproval && !approvedTOS}
+      variant={isCompact ? "outline" : "link"}
     >
       {props.connectLocale.continueAsGuest}
     </Button>
@@ -199,17 +198,17 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
 
   const twTitle = props.modalHeader ? (
     <ModalHeader
-      title={props.modalHeader.title}
       onBack={props.modalHeader.onBack}
+      title={props.modalHeader.title}
     />
   ) : (
-    <Container gap="xxs" center="y" flex="row">
+    <Container center="y" flex="row" gap="xxs">
       {!props.meta.titleIconUrl ? null : (
         <Img
+          client={props.client}
+          height={iconSize.md}
           src={props.meta.titleIconUrl}
           width={iconSize.md}
-          height={iconSize.md}
-          client={props.client}
         />
       )}
 
@@ -224,8 +223,8 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
   const connectAWallet = (
     <WalletTypeRowButton
       client={props.client}
-      icon={OutlineWalletIcon}
       disabled={props.meta.requireApproval && !approvedTOS}
+      icon={OutlineWalletIcon}
       onClick={() => {
         setIsWalletGroupExpanded(true);
       }}
@@ -244,10 +243,10 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
         {props.connectLocale.newToWallets}
       </Text>
       <Link
-        weight={500}
+        href="https://blog.thirdweb.com/web3-wallet/"
         size="sm"
         target="_blank"
-        href="https://blog.thirdweb.com/web3-wallet/"
+        weight={500}
       >
         {props.connectLocale.getStarted}
       </Link>
@@ -259,12 +258,12 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
     props.meta.termsOfServiceUrl ||
     props.meta.privacyPolicyUrl ? (
       <TOS
-        termsOfServiceUrl={props.meta.termsOfServiceUrl}
-        privacyPolicyUrl={props.meta.privacyPolicyUrl}
-        locale={props.connectLocale.agreement}
-        requireApproval={props.meta.requireApproval}
         isApproved={approvedTOS}
+        locale={props.connectLocale.agreement}
         onApprove={() => setApprovedTOS(!approvedTOS)}
+        privacyPolicyUrl={props.meta.privacyPolicyUrl}
+        requireApproval={props.meta.requireApproval}
+        termsOfServiceUrl={props.meta.termsOfServiceUrl}
       />
     ) : undefined;
 
@@ -275,19 +274,19 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
   if (!isCompact) {
     topSection = (
       <WalletSelection
-        wallets={nonLocalWalletConfigs}
-        selectWallet={handleSelect}
+        chain={props.chain}
+        client={props.client}
+        connectLocale={props.connectLocale}
+        diableSelectionDataReset={props.disableSelectionDataReset}
+        disabled={props.meta.requireApproval && !approvedTOS}
         done={props.done}
         goBack={props.goBack}
         onShowAll={props.onShowAll}
-        client={props.client}
-        connectLocale={props.connectLocale}
-        size={props.size}
         recommendedWallets={props.recommendedWallets}
-        chain={props.chain}
+        selectWallet={handleSelect}
         showAllWallets={props.showAllWallets}
-        diableSelectionDataReset={props.disableSelectionDataReset}
-        disabled={props.meta.requireApproval && !approvedTOS}
+        size={props.size}
+        wallets={nonLocalWalletConfigs}
       />
     );
 
@@ -304,26 +303,26 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
     if (socialWallets.length === 0) {
       topSection = (
         <WalletSelection
-          wallets={nonLocalWalletConfigs}
-          selectWallet={handleSelect}
+          chain={props.chain}
+          client={props.client}
+          connectLocale={props.connectLocale}
+          diableSelectionDataReset={props.disableSelectionDataReset}
+          disabled={props.meta.requireApproval && !approvedTOS}
           done={props.done}
           goBack={props.goBack}
           onShowAll={props.onShowAll}
-          client={props.client}
-          connectLocale={props.connectLocale}
-          size={props.size}
           recommendedWallets={props.recommendedWallets}
-          chain={props.chain}
+          selectWallet={handleSelect}
           showAllWallets={props.showAllWallets}
-          diableSelectionDataReset={props.disableSelectionDataReset}
-          disabled={props.meta.requireApproval && !approvedTOS}
+          size={props.size}
+          wallets={nonLocalWalletConfigs}
         />
       );
 
       bottomSection = (
         <>
           <Line />
-          <Container flex="column" p="md" gap="md">
+          <Container flex="column" gap="md" p="md">
             {newToWallets}
             {continueAsGuest}
           </Container>
@@ -350,18 +349,18 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
         topSection = (
           <Container px="xs">
             <WalletSelection
-              wallets={socialWallets}
-              selectWallet={handleSelect}
-              done={props.done}
-              goBack={props.goBack}
+              chain={props.chain}
               client={props.client}
               connectLocale={props.connectLocale}
-              size={props.size}
-              recommendedWallets={props.recommendedWallets}
-              chain={props.chain}
-              showAllWallets={props.showAllWallets}
               diableSelectionDataReset={props.disableSelectionDataReset}
               disabled={props.meta.requireApproval && !approvedTOS}
+              done={props.done}
+              goBack={props.goBack}
+              recommendedWallets={props.recommendedWallets}
+              selectWallet={handleSelect}
+              showAllWallets={props.showAllWallets}
+              size={props.size}
+              wallets={socialWallets}
             />
             {eoaWallets.length > 0 && (
               <>
@@ -396,12 +395,12 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
             bottomSection = (
               <Container
                 flex="column"
-                style={{ position: "relative" }}
                 gap="sm"
+                style={{ position: "relative" }}
               >
                 <GradientDiv />
 
-                <Container px="lg" flex="column" gap="md">
+                <Container flex="column" gap="md" px="lg">
                   {connectAWallet}
                   {continueAsGuest}
                 </Container>
@@ -421,24 +420,24 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
               <>
                 <Container px="lg">
                   <WalletSelection
-                    wallets={eoaWallets}
-                    selectWallet={handleSelect}
+                    chain={props.chain}
+                    client={props.client}
+                    connectLocale={props.connectLocale}
+                    diableSelectionDataReset={props.disableSelectionDataReset}
+                    disabled={props.meta.requireApproval && !approvedTOS}
                     done={props.done}
                     goBack={props.goBack}
                     onShowAll={props.onShowAll}
-                    client={props.client}
-                    connectLocale={props.connectLocale}
-                    size={props.size}
                     recommendedWallets={props.recommendedWallets}
-                    chain={props.chain}
+                    selectWallet={handleSelect}
                     showAllWallets={props.showAllWallets}
-                    diableSelectionDataReset={props.disableSelectionDataReset}
-                    disabled={props.meta.requireApproval && !approvedTOS}
+                    size={props.size}
+                    wallets={eoaWallets}
                   />
                 </Container>
 
                 {continueAsGuest && (
-                  <Container flex="column" px="lg" gap="lg">
+                  <Container flex="column" gap="lg" px="lg">
                     {continueAsGuest}
                   </Container>
                 )}
@@ -449,7 +448,7 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
                     <Container p="md"> {tos} </Container>
                   </>
                 ) : (
-                  <>{continueAsGuest && <Spacer y="xl" />}</>
+                  continueAsGuest && <Spacer y="xl" />
                 )}
               </>
             );
@@ -461,19 +460,19 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
       else {
         topSection = (
           <WalletSelection
-            wallets={eoaWallets}
-            selectWallet={handleSelect}
+            chain={props.chain}
+            client={props.client}
+            connectLocale={props.connectLocale}
+            diableSelectionDataReset={props.disableSelectionDataReset}
+            disabled={props.meta.requireApproval && !approvedTOS}
             done={props.done}
             goBack={props.goBack}
             onShowAll={props.onShowAll}
-            client={props.client}
-            connectLocale={props.connectLocale}
-            size={props.size}
             recommendedWallets={props.recommendedWallets}
-            chain={props.chain}
+            selectWallet={handleSelect}
             showAllWallets={props.showAllWallets}
-            diableSelectionDataReset={props.disableSelectionDataReset}
-            disabled={props.meta.requireApproval && !approvedTOS}
+            size={props.size}
+            wallets={eoaWallets}
           />
         );
 
@@ -489,10 +488,10 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
 
   return (
     <Container
-      scrollY
-      flex="column"
       animate="fadein"
+      flex="column"
       fullHeight
+      scrollY
       style={{
         maxHeight: props.size === "compact" ? compactModalMaxHeight : undefined,
       }}
@@ -502,10 +501,10 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
         <Container p="lg">
           {isWalletGroupExpanded ? (
             <ModalHeader
-              title={twTitle}
               onBack={() => {
                 setIsWalletGroupExpanded(false);
               }}
+              title={twTitle}
             />
           ) : (
             twTitle
@@ -516,8 +515,8 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
       {/* Body */}
       <Container
         expand
-        scrollY
         px="md"
+        scrollY
         style={
           !showHeader
             ? {
@@ -530,8 +529,8 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
       >
         {!showHeader && isWalletGroupExpanded && (
           <Container
-            flex="row"
             center="y"
+            flex="row"
             style={{
               padding: spacing.sm,
               paddingTop: 0,
@@ -543,12 +542,12 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
               }}
               style={{
                 gap: spacing.xxs,
-                transform: `translateX(-${spacing.xs})`,
                 paddingBlock: spacing.xxs,
                 paddingRight: spacing.xs,
+                transform: `translateX(-${spacing.xs})`,
               }}
             >
-              <ChevronLeftIcon width={iconSize.sm} height={iconSize.sm} />
+              <ChevronLeftIcon height={iconSize.sm} width={iconSize.sm} />
               {props.connectLocale.goBackButton}
             </IconButton>
           </Container>
@@ -607,8 +606,8 @@ const WalletSelection: React.FC<{
   return (
     <WalletList
       style={{
-        minHeight: "100%",
         maxHeight: "370px",
+        minHeight: "100%",
       }}
     >
       {wallets.map((wallet) => {
@@ -623,32 +622,32 @@ const WalletSelection: React.FC<{
             {wallet.id === "inApp" && props.size === "compact" ? (
               <Suspense fallback={<LoadingScreen height="195px" />}>
                 <InAppWalletSelectionUI
-                  done={() => props.done(wallet)}
-                  select={() => props.selectWallet(wallet)}
-                  wallet={wallet as Wallet<"inApp">}
-                  goBack={props.goBack}
+                  chain={props.chain}
                   client={props.client}
                   connectLocale={props.connectLocale}
-                  size={props.size}
-                  recommendedWallets={props.recommendedWallets}
-                  chain={props.chain}
                   disabled={props.disabled}
+                  done={() => props.done(wallet)}
+                  goBack={props.goBack}
+                  recommendedWallets={props.recommendedWallets}
+                  select={() => props.selectWallet(wallet)}
+                  size={props.size}
+                  wallet={wallet as Wallet<"inApp">}
                 />
               </Suspense>
             ) : (
               <WalletEntryButton
-                wallet={wallet}
+                badge={undefined}
+                client={props.client}
+                connectLocale={props.connectLocale}
+                isActive={isActive}
+                recommendedWallets={props.recommendedWallets}
                 selectWallet={() => {
                   if (!props.diableSelectionDataReset) {
                     setSelectionData({});
                   }
                   props.selectWallet(wallet);
                 }}
-                connectLocale={props.connectLocale}
-                client={props.client}
-                recommendedWallets={props.recommendedWallets}
-                isActive={isActive}
-                badge={undefined}
+                wallet={wallet}
               />
             )}
           </li>
@@ -679,11 +678,11 @@ const BadgeText = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
     backgroundColor: theme.colors.secondaryButtonBg,
-    paddingBlock: "3px",
-    paddingInline: spacing.xxs,
-    fontSize: fontSize.xs,
     borderRadius: radius.sm,
     color: theme.colors.secondaryText,
+    fontSize: fontSize.xs,
+    paddingBlock: "3px",
+    paddingInline: spacing.xxs,
   };
 });
 
@@ -699,40 +698,40 @@ const ButtonContainer = /* @__PURE__ */ StyledDiv(() => {
 const ShowAllWalletsIcon = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
-    width: `${iconSize.lg}px`,
-    height: `${iconSize.lg}px`,
+    "& div": {
+      background: theme.colors.secondaryText,
+      borderRadius: "50%",
+      height: "10px",
+      transition: "background 200ms ease",
+      width: "10px",
+    },
+    alignItems: "center",
     backgroundColor: theme.colors.tertiaryBg,
     border: `2px solid ${theme.colors.borderColor}`,
     borderRadius: radius.md,
     display: "grid",
     gridTemplateColumns: "1fr 1fr",
+    height: `${iconSize.lg}px`,
     justifyItems: "center",
-    alignItems: "center",
     padding: spacing.xs,
-    "& div": {
-      transition: "background 200ms ease",
-      background: theme.colors.secondaryText,
-      borderRadius: "50%",
-      width: "10px",
-      height: "10px",
-    },
+    width: `${iconSize.lg}px`,
   };
 });
 
 const WalletList = /* @__PURE__ */ StyledUl({
   all: "unset",
-  listStyleType: "none",
+  boxSizing: "border-box",
   display: "flex",
+  flex: 1,
   flexDirection: "column",
   gap: "2px",
-  boxSizing: "border-box",
+  listStyleType: "none",
   overflowY: "auto",
-  flex: 1,
   ...noScrollBar,
-  // to show the box-shadow of inputs that overflows
-  padding: "2px",
   margin: "-2px",
   marginBottom: 0,
+  // to show the box-shadow of inputs that overflows
+  padding: "2px",
   paddingBottom: spacing.lg,
 });
 
@@ -740,12 +739,12 @@ const GradientDiv = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   theme.colors.modalBg;
   return {
+    background: `linear-gradient(to bottom, transparent 0%, ${theme.colors.modalBg} 80%)`,
     height: spacing.lg,
+    left: 0,
+    pointerEvents: "none",
     position: "absolute",
     top: `-${spacing.lg}`,
-    left: 0,
     width: "100%",
-    background: `linear-gradient(to bottom, transparent 0%, ${theme.colors.modalBg} 80%)`,
-    pointerEvents: "none",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletTypeRowButton.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletTypeRowButton.tsx
index 35bc1225394..fe1cc9b0e2c 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletTypeRowButton.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/WalletTypeRowButton.tsx
@@ -16,19 +16,19 @@ type WalletTypeRowProps = {
 export function WalletTypeRowButton(props: WalletTypeRowProps) {
   return (
     <Button
+      disabled={props.disabled}
       fullWidth
-      variant="outline"
+      onClick={() => {
+        props.onClick();
+      }}
       style={{
         display: "flex",
         justifyContent: "flex-start",
         padding: spacing.sm,
       }}
-      onClick={() => {
-        props.onClick();
-      }}
-      disabled={props.disabled}
+      variant="outline"
     >
-      <Container flex="row" gap="sm" center="y" color="accentText">
+      <Container center="y" color="accentText" flex="row" gap="sm">
         <props.icon size={iconSize.md} />
         <Text color="primaryText">{props.title}</Text>
       </Container>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/constants.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/constants.ts
index 739d518f3df..cbcf5cfd285 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/constants.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/constants.ts
@@ -1,8 +1,8 @@
 export const reservedScreens = {
-  main: "main",
   getStarted: "getStarted",
-  signIn: "signIn",
+  main: "main",
   showAll: "showAll",
+  signIn: "signIn",
 };
 
 export const modalMaxWidthCompact = "400px";
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AccentFailIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AccentFailIcon.tsx
index 595397aa558..1ce47b22c05 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AccentFailIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AccentFailIcon.tsx
@@ -1,19 +1,22 @@
+import { useId } from "react";
 import type { IconFC } from "./types.js";
 
 /**
  * @internal
  */
 export const AccentFailIcon: IconFC = (props) => {
+  const linearGradientId = useId();
+  const clipPathId = useId();
   return (
     <svg
-      width={props.size}
+      fill="none"
       height={props.size}
+      role="presentation"
       viewBox="0 0 109 109"
-      fill="none"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
     >
-      <g clipPath="url(#clip0_4036_4155)">
+      <g clipPath={`url(#${clipPathId})`}>
         <path
           d="M54.5 109C84.5995 109 109 84.5995 109 54.5C109 24.4005 84.5995 0 54.5 0C24.4005 0 0 24.4005 0 54.5C0 84.5995 24.4005 109 54.5 109Z"
           fill="#4BABFF"
@@ -24,23 +27,23 @@ export const AccentFailIcon: IconFC = (props) => {
         />
         <path
           d="M73.2352 69.389C73.7459 69.8997 74.0329 70.5924 74.0329 71.3147C74.0329 72.037 73.7459 72.7298 73.2352 73.2405C72.7244 73.7513 72.0317 74.0382 71.3094 74.0382C70.5871 74.0382 69.8944 73.7513 69.3836 73.2405L54.9992 58.8515L40.6102 73.236C40.0994 73.7467 39.4067 74.0337 38.6844 74.0337C37.9621 74.0337 37.2694 73.7467 36.7586 73.236C36.2479 72.7252 35.9609 72.0325 35.9609 71.3102C35.9609 70.5879 36.2479 69.8952 36.7586 69.3844L51.1476 55L36.7632 40.611C36.2524 40.1002 35.9655 39.4075 35.9655 38.6852C35.9655 37.9629 36.2524 37.2702 36.7632 36.7594C37.2739 36.2487 37.9666 35.9617 38.6889 35.9617C39.4112 35.9617 40.104 36.2487 40.6147 36.7594L54.9992 51.1484L69.3881 36.7572C69.8989 36.2464 70.5916 35.9595 71.3139 35.9595C72.0362 35.9595 72.729 36.2464 73.2397 36.7572C73.7505 37.2679 74.0374 37.9606 74.0374 38.6829C74.0374 39.4052 73.7505 40.098 73.2397 40.6087L58.8507 55L73.2352 69.389Z"
-          fill="url(#paint0_linear_4036_4155)"
+          fill={`url(#${linearGradientId})`}
         />
       </g>
       <defs>
         <linearGradient
-          id="paint0_linear_4036_4155"
+          gradientUnits="userSpaceOnUse"
+          id={linearGradientId}
           x1="54.9992"
-          y1="35.9595"
           x2="54.9992"
+          y1="35.9595"
           y2="74.0382"
-          gradientUnits="userSpaceOnUse"
         >
           <stop stopColor="white" />
           <stop offset="1" stopColor="#90CBFF" />
         </linearGradient>
-        <clipPath id="clip0_4036_4155">
-          <rect width="109" height="109" fill="white" />
+        <clipPath id={clipPathId}>
+          <rect fill="white" height="109" width="109" />
         </clipPath>
       </defs>
     </svg>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AddUserIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AddUserIcon.tsx
index 205af6cdf6c..b8af624313e 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AddUserIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AddUserIcon.tsx
@@ -6,19 +6,19 @@ import type { IconFC } from "./types.js";
 export const AddUserIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 24 24"
       fill="none"
+      height={props.size}
       role="presentation"
+      viewBox="0 0 24 24"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
         d="M12 15.5H7.5C6.10444 15.5 5.40665 15.5 4.83886 15.6722C3.56045 16.06 2.56004 17.0605 2.17224 18.3389C2 18.9067 2 19.6044 2 21M19 21V15M16 18H22M14.5 7.5C14.5 9.98528 12.4853 12 10 12C7.51472 12 5.5 9.98528 5.5 7.5C5.5 5.01472 7.51472 3 10 3C12.4853 3 14.5 5.01472 14.5 7.5Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AppleIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AppleIcon.tsx
index 7aec2b9fbc9..44b12235d62 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AppleIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/AppleIcon.tsx
@@ -6,12 +6,12 @@ import type { IconFC } from "./types.js";
 export const AppleIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 23 28"
       fill="none"
+      height={props.size}
       role="presentation"
+      viewBox="0 0 23 28"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
       <path
         d="M22.4181 21.6041C22.008 22.5506 21.5224 23.422 20.9599 24.223C20.1931 25.3151 19.5652 26.0711 19.0814 26.4908C18.3313 27.1799 17.5277 27.5327 16.6671 27.5528C16.0493 27.5528 15.3043 27.3772 14.437 27.021C13.5669 26.6664 12.7673 26.4908 12.0362 26.4908C11.2694 26.4908 10.447 26.6664 9.56734 27.021C8.68636 27.3772 7.97665 27.5628 7.43403 27.5812C6.60879 27.6164 5.78624 27.2534 4.96519 26.4908C4.44116 26.0343 3.78569 25.2516 3.00047 24.1428C2.15799 22.9587 1.46536 21.5857 0.92274 20.0203C0.341611 18.3295 0.050293 16.6922 0.050293 15.1071C0.050293 13.2914 0.44307 11.7253 1.2298 10.413C1.84809 9.35886 2.67065 8.52734 3.70014 7.91691C4.72963 7.30648 5.84199 6.99541 7.03991 6.97551C7.69538 6.97551 8.55493 7.17804 9.6231 7.57607C10.6882 7.97544 11.3722 8.17797 11.672 8.17797C11.8962 8.17797 12.656 7.94116 13.944 7.46904C15.162 7.0312 16.19 6.84991 17.0321 6.92133C19.3141 7.10529 21.0285 8.00387 22.1687 9.62276C20.1278 10.858 19.1182 12.5881 19.1383 14.8076C19.1567 16.5363 19.7846 17.9749 21.0185 19.1172C21.5777 19.6473 22.2022 20.0571 22.897 20.3481C22.7463 20.7846 22.5872 21.2027 22.4181 21.6041ZM17.1845 1.03178C17.1845 2.38678 16.6889 3.65194 15.7011 4.82296C14.509 6.21507 13.0672 7.0195 11.5036 6.89256C11.4837 6.73 11.4721 6.55892 11.4721 6.37913C11.4721 5.07833 12.039 3.68622 13.0457 2.54798C13.5484 1.97167 14.1876 1.49247 14.9628 1.11021C15.7363 0.733653 16.4679 0.525407 17.156 0.489746C17.1761 0.670889 17.1845 0.85206 17.1845 1.03178Z"
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ChromeIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ChromeIcon.tsx
index f62a1f91681..0718d52f86d 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ChromeIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ChromeIcon.tsx
@@ -6,41 +6,41 @@ import type { IconFC } from "./types.js";
 export const ChromeIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
       height={props.size}
-      viewBox="0 0 190.5 190.5"
       role="presentation"
+      viewBox="0 0 190.5 190.5"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
       <g transform="translate(90.669 -507.469)">
         <path
+          clipPath="none"
           d="M4.583 650.342c26.304 0 47.627-21.324 47.627-47.628s-21.323-47.628-47.627-47.628-47.627 21.324-47.627 47.628 21.323 47.628 47.627 47.628z"
           fill="#fff"
-          clipPath="none"
           mask="none"
         />
         <path
+          clipPath="none"
           d="M-36.664 626.539l-41.24-71.43c-8.362 14.479-12.765 30.904-12.765 47.625s4.401 33.146 12.762 47.625 20.387 26.503 34.868 34.86 30.908 12.755 47.628 12.75l41.24-71.43v-.011c-4.177 7.244-10.188 13.26-17.428 17.443a47.62 47.62 0 0 1-47.632.007 47.62 47.62 0 0 1-17.433-17.437z"
           fill="#229342"
-          clipPath="none"
           mask="none"
         />
         <path
+          clipPath="none"
           d="M45.826 626.536l-41.239 71.43c16.72.003 33.146-4.398 47.626-12.757s26.504-20.384 34.863-34.865a95.24 95.24 0 0 0 12.755-47.627c-.003-16.72-4.408-33.145-12.772-47.623H4.58l-.01.007a47.62 47.62 0 0 1 23.819 6.372c7.243 4.179 13.257 10.19 17.439 17.431a47.62 47.62 0 0 1-.001 47.633z"
           fill="#fbc116"
-          clipPath="none"
           mask="none"
         />
         <path
+          clipPath="none"
           d="M4.583 640.43c20.824 0 37.705-16.881 37.705-37.706s-16.881-37.705-37.705-37.705-37.705 16.881-37.705 37.705 16.881 37.706 37.705 37.706z"
           fill="#1a73e8"
-          clipPath="none"
           mask="none"
         />
         <path
+          clipPath="none"
           d="M4.583 555.097h82.479c-8.358-14.481-20.381-26.507-34.861-34.868a95.23 95.23 0 0 0-47.625-12.76c-16.72.001-33.145 4.404-47.623 12.767a95.23 95.23 0 0 0-34.856 34.872l41.24 71.43.011.006a47.62 47.62 0 0 1-.015-47.633c4.179-7.242 10.193-13.256 17.434-17.436s15.456-6.381 23.818-6.379z"
           fill="#e33b2e"
-          clipPath="none"
           mask="none"
         />
       </g>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/CoinsIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/CoinsIcon.tsx
index 8a3d5ed7954..6e273d680b9 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/CoinsIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/CoinsIcon.tsx
@@ -6,40 +6,40 @@ import type { IconFC } from "./types.js";
 export const CoinsIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
+      fill="none"
       height={props.size}
       role="presentation"
       viewBox="0 0 24 24"
-      fill="none"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
         d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z"
         stroke="currentColor"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <path
         d="M18.0901 10.37C19.0354 10.7224 19.8766 11.3075 20.5358 12.0712C21.1951 12.8349 21.6512 13.7524 21.8618 14.7391C22.0725 15.7257 22.031 16.7495 21.7411 17.7158C21.4513 18.6822 20.9224 19.5598 20.2035 20.2676C19.4846 20.9754 18.5988 21.4905 17.6281 21.7652C16.6573 22.04 15.633 22.0655 14.6498 21.8395C13.6666 21.6134 12.7562 21.1431 12.0029 20.472C11.2496 19.8009 10.6777 18.9507 10.3401 18"
         stroke="currentColor"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <path
         d="M7 6H8V10"
         stroke="currentColor"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <path
         d="M16.7101 13.88L17.4101 14.59L14.5901 17.41"
         stroke="currentColor"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/CreditCardIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/CreditCardIcon.tsx
index c7a7a38e291..47d9713793e 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/CreditCardIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/CreditCardIcon.tsx
@@ -6,18 +6,18 @@ import type { IconFC } from "./types.js";
 export const CreditCardIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 24 24"
       fill="none"
+      height={props.size}
+      role="presentation"
       stroke={props.color ?? "currentColor"}
-      strokeWidth="1"
       strokeLinecap="round"
       strokeLinejoin="round"
-      role="presentation"
+      strokeWidth="1"
+      viewBox="0 0 24 24"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <rect width="20" height="14" x="2" y="5" rx="2" />
+      <rect height="14" rx="2" width="20" x="2" y="5" />
       <line x1="2" x2="22" y1="10" y2="10" />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/EmailIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/EmailIcon.tsx
index 04031ebfebc..bf07dfe1c11 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/EmailIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/EmailIcon.tsx
@@ -6,12 +6,12 @@ import type { IconFC } from "./types.js";
 export const EmailIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
+      fill="none"
       height={props.size}
+      role="presentation"
       viewBox="0 0 16 16"
-      fill="none"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
     >
       <path
         d="M13.3335 2.6665H2.66683C1.93045 2.6665 1.3335 3.26346 1.3335 3.99984V11.9998C1.3335 12.7362 1.93045 13.3332 2.66683 13.3332H13.3335C14.0699 13.3332 14.6668 12.7362 14.6668 11.9998V3.99984C14.6668 3.26346 14.0699 2.6665 13.3335 2.6665Z"
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/FingerPrintIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/FingerPrintIcon.tsx
index cfb28de01fa..fc7587589dd 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/FingerPrintIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/FingerPrintIcon.tsx
@@ -3,74 +3,74 @@ import type { IconFC } from "./types.js";
 export const FingerPrintIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
+      aria-hidden="true"
+      fill="none"
       height={props.size}
       viewBox="0 0 36 36"
-      fill="none"
-      aria-hidden="true"
+      width={props.size}
     >
       <path
         d="M18.0001 15C17.2045 15 16.4414 15.3161 15.8788 15.8787C15.3162 16.4413 15.0001 17.2044 15.0001 18C15.0001 19.53 14.8501 21.765 14.6101 24"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
       <path
         d="M21.0002 19.6801C21.0002 23.2501 21.0002 29.2501 19.5002 33.0001"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
       <path
         d="M25.9348 31.53C26.1148 30.63 26.5798 28.08 26.6848 27"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
       <path
         d="M2.99976 18C2.99976 14.8518 3.99032 11.7833 5.83112 9.22935C7.67193 6.67536 10.2697 4.76531 13.2563 3.76975C16.243 2.77419 19.4672 2.74359 22.4723 3.6823C25.4773 4.621 28.1108 6.48141 29.9998 9"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
       <path
         d="M2.99976 24H3.01628"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
       <path
         d="M32.7 24C33 21 32.8965 15.969 32.7 15"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
       <path
         d="M7.49976 29.25C8.24976 27 8.99976 22.5 8.99976 18C8.99824 16.9783 9.17071 15.9638 9.50976 15"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
       <path
         d="M12.9751 33C13.2901 32.01 13.6501 31.02 13.8301 30"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
       <path
         d="M13.5 10.2C14.8686 9.40988 16.4211 8.99401 18.0014 8.99426C19.5818 8.99452 21.1342 9.41088 22.5025 10.2015C23.8708 10.9921 25.0069 12.129 25.7964 13.498C26.5859 14.867 27.001 16.4197 27 18V21"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="3"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="3"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/FundsIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/FundsIcon.tsx
index 9c321f086ae..31abf463b27 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/FundsIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/FundsIcon.tsx
@@ -6,33 +6,33 @@ import type { IconFC } from "./types.js";
 export const FundsIcon: IconFC = ({ size }) => {
   return (
     <svg
-      width={size}
+      fill="none"
       height={size}
+      role="presentation"
       viewBox="0 0 16 16"
-      fill="none"
+      width={size}
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
     >
       <path
         d="M14.001 8.00048C14.001 9.18726 13.649 10.3474 12.9897 11.3342C12.3304 12.3209 11.3932 13.09 10.2968 13.5442C9.20032 13.9984 7.99382 14.1172 6.82984 13.8857C5.66587 13.6541 4.59668 13.0826 3.7575 12.2435C2.91832 11.4043 2.34683 10.3351 2.1153 9.17111C1.88377 8.00713 2.0026 6.80064 2.45676 5.70419C2.91092 4.60775 3.68002 3.6706 4.66679 3.01126C5.65357 2.35192 6.8137 2 8.00048 2"
         stroke="currentColor"
-        strokeWidth="1.2001"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.2001"
       />
       <path
         d="M14.0005 2L8 8.00048"
         stroke="currentColor"
-        strokeWidth="1.2001"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.2001"
       />
       <path
         d="M10.3984 2H13.9987V5.60029"
         stroke="currentColor"
-        strokeWidth="1.2001"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.2001"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/GlobalIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/GlobalIcon.tsx
index 917fb2eb14b..d985b436d9a 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/GlobalIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/GlobalIcon.tsx
@@ -6,12 +6,12 @@ import type { IconFC } from "./types.js";
 export const GlobeIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
+      fill="none"
       height={props.size}
+      role="presentation"
       viewBox="0 0 129 131"
-      fill="none"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
     >
       <path
         d="M59.7178 0C62.7511 0 65.788 0 68.8212 0C71.4429 0.423181 74.1011 0.679982 76.6755 1.29848C103.785 7.78725 120.277 24.7723 126.755 51.5485C127.428 54.3335 127.712 57.2089 128.175 60.0446V69.8103C127.803 72.1722 127.472 74.5449 127.057 76.8995C122.582 102.298 103.177 122.722 77.9136 128.56C74.8003 129.28 71.6104 129.67 68.457 130.213H59.3537C57.3838 129.913 55.4065 129.663 53.4475 129.305C27.0442 124.491 6.91125 104.974 1.44197 78.8526C0.841148 75.9808 0.473373 73.0656 0 70.1684C0 66.9132 0 63.6579 0 60.4027C0.371416 58.0408 0.706418 55.6718 1.11425 53.3135C5.52026 28.0493 24.9905 7.50151 50.0902 1.70719C53.2618 0.97657 56.5062 0.560624 59.7178 0ZM96.8813 10.3119C96.8959 10.2865 96.9104 10.2576 96.9286 10.2323C96.8886 10.2504 96.8522 10.2648 96.8121 10.2829C96.8085 10.2287 96.8048 10.178 96.8012 10.1238C96.8303 10.1853 96.8558 10.2504 96.8849 10.3119H96.8813ZM25.1762 115.709C25.2089 115.716 25.2454 115.72 25.2781 115.727C25.249 115.749 25.2235 115.771 25.1944 115.792C25.2053 115.767 25.2162 115.742 25.2271 115.716C25.1252 115.525 25.0196 115.333 24.9176 115.141C22.7328 113.087 21.127 110.421 18.3305 109.014C18.2977 109.032 18.2613 109.05 18.2285 109.065C18.2758 109.058 18.3232 109.054 18.3705 109.047C18.4397 109.365 18.3997 109.795 18.5926 109.984C20.3587 111.687 22.1502 113.362 23.9745 115.004C24.1675 115.177 24.5972 115.083 24.9176 115.116C25.0014 115.311 25.0851 115.51 25.1725 115.706L25.1762 115.709ZM27.594 12.4567L27.2262 12.9197C27.1898 13.1439 27.1571 13.3682 27.1206 13.5924C26.8038 13.5924 26.4871 13.596 26.1703 13.5996C26.0683 13.813 25.9663 14.0264 25.8607 14.2362L25.7661 14.2652L25.8243 14.1856C25.9336 13.9686 26.0428 13.7479 26.1557 13.5309C26.4688 13.5418 26.7856 13.5526 27.0988 13.5671C27.1243 13.332 27.1498 13.0969 27.1753 12.8618C27.2954 12.7352 27.412 12.6122 27.5321 12.4856C27.543 12.511 27.554 12.5399 27.5649 12.5652C27.5758 12.529 27.5831 12.4893 27.594 12.4531V12.4567ZM106.589 111.926C106.738 111.868 106.891 111.806 107.041 111.749C107.616 111.354 108.286 111.043 108.756 110.548C110.281 108.924 111.771 107.26 113.205 105.553C113.919 104.703 114.483 103.726 115.113 102.808C113.981 103.448 112.849 104.084 111.716 104.725C111.669 104.753 111.632 104.811 111.6 104.862C110.088 107.166 108.577 109.474 107.07 111.778L106.556 111.958L106.625 112.06L106.589 111.926ZM79.6906 2.95141C79.6906 2.92971 79.6906 2.90801 79.6906 2.88631C79.6724 2.89716 79.6505 2.91163 79.6323 2.92248C79.8253 2.9478 80.0146 2.97311 80.2076 2.99843C80.0328 2.98397 79.8617 2.96588 79.6869 2.95141H79.6906ZM95.1662 8.90488C95.1116 8.90488 95.0533 8.89764 94.9987 8.90849C94.9732 8.91211 94.955 8.94828 94.9368 8.96998C95.0242 8.93381 95.1116 8.89764 95.199 8.86147C95.301 9.07125 95.3956 9.28827 95.5194 9.49082C95.5376 9.51975 95.6796 9.47273 95.7634 9.45827C95.5668 9.2738 95.3665 9.08934 95.1699 8.90126L95.1662 8.90488ZM86.7729 124.603C85.8772 124.921 84.9778 125.229 84.0893 125.565C83.94 125.623 83.8417 125.811 83.7215 125.941C83.8562 125.988 84.031 126.111 84.1184 126.068C85.0069 125.605 85.8808 125.117 86.7584 124.636C86.8021 124.621 86.8494 124.592 86.8895 124.596C86.9259 124.6 86.9623 124.643 86.9951 124.665C86.9186 124.643 86.8458 124.621 86.7693 124.603H86.7729ZM82.2431 4.35478L82.2941 4.31138V4.32223C82.5672 4.5935 82.793 5.00583 83.1207 5.11072C85.8189 5.99325 88.5317 6.82153 91.2445 7.6498C91.4193 7.70406 91.6341 7.64257 91.8271 7.63172C91.6596 7.46896 91.514 7.25917 91.3173 7.14705C88.4844 5.599 85.4912 4.56456 82.2395 4.35116L82.2431 4.35478ZM29.9609 10.9991C30.2995 11.0135 30.6928 11.1438 30.9732 11.0208C33.8389 9.75847 36.6937 8.46361 39.5376 7.15428C39.9054 6.98429 40.2331 6.70217 40.5244 6.41643C40.7319 6.21388 40.8412 5.91729 40.9941 5.66049C40.6664 5.68943 40.2913 5.62432 40.0219 5.76177C36.6573 7.49066 33.3109 9.2521 29.9609 11.0027C29.9864 11.0461 30.0119 11.0895 30.041 11.1293C30.0701 11.1655 30.1102 11.1944 30.1466 11.2233L29.9609 10.9991ZM8.93219 95.5918C8.89213 95.628 8.84844 95.6677 8.80838 95.7039C8.85208 95.6641 8.89942 95.6243 8.94311 95.5845C8.99773 96.0801 8.91398 96.6443 9.12882 97.0566C11.7397 102.034 14.7984 106.641 19.9509 109.43C19.9436 109.437 19.9363 109.445 19.9327 109.455C19.7579 108.913 19.6413 108.345 19.401 107.828C18.4943 105.875 17.6204 103.903 16.5899 102.015C16.1347 101.18 15.4283 100.417 14.6746 99.82C12.8102 98.3479 10.8512 96.9915 8.93219 95.5918ZM23.0533 112.295C23.097 112.248 23.1407 112.201 23.1844 112.15C23.1443 112.19 23.1006 112.23 23.0606 112.269C23.279 112.472 23.5449 112.646 23.7087 112.888C27.1206 117.861 32.1275 120.35 37.7861 121.818C38.1648 121.916 38.5763 121.887 38.9732 121.919C38.813 121.608 38.6709 121.283 38.4925 120.983C37.7861 119.789 37.1525 118.541 36.3259 117.434C35.8344 116.776 35.1206 116.125 34.3669 115.843C31.1917 114.657 27.9691 113.597 24.7501 112.53C24.2149 112.353 23.6177 112.367 23.0496 112.291L23.0533 112.295ZM69.8298 86.3252C73.0378 86.3252 75.4666 86.2927 77.8917 86.3397C78.9514 86.3614 79.4029 86.025 79.4284 84.9074C79.5049 81.4134 79.6432 77.9195 79.818 74.4291C79.8763 73.25 79.4757 72.9353 78.2777 72.8919C71.4903 72.6605 64.7065 72.353 57.9227 71.9986C56.8048 71.9407 56.2804 72.1107 56.204 73.3477C55.9855 76.8344 55.7015 80.3211 55.341 83.797C55.2135 85.0267 55.665 85.3595 56.8048 85.4282C61.4074 85.7067 66.0028 86.0539 69.8262 86.3216L69.8298 86.3252ZM69.9245 72.2192C72.2076 72.2192 74.9969 72.1505 77.7789 72.2481C79.2937 72.3024 79.9527 71.9371 79.869 70.2697C79.7015 66.9638 79.6796 63.6507 79.7088 60.3412C79.7197 58.8836 79.2536 58.4315 77.7315 58.3881C71.6177 58.2217 65.5076 57.9251 59.4011 57.5779C58.1994 57.5092 57.828 57.8274 57.7224 58.9776C57.3838 62.6307 56.9832 66.2838 56.528 69.9261C56.3897 71.0401 56.8776 71.2571 57.8171 71.3222C61.6842 71.5862 65.5513 71.8937 69.9281 72.2228L69.9245 72.2192ZM55.3956 74.3749C55.4247 74.0892 55.432 73.5394 55.5412 73.0149C55.7415 72.0564 55.2936 71.7852 54.4088 71.6333C47.8471 70.5048 41.2927 69.3401 34.742 68.1429C33.9481 67.9982 33.4748 68.0019 33.3655 68.9459C32.9249 72.6496 32.4115 76.3461 32.0401 80.0571C32 80.473 32.6118 81.2905 33.0269 81.3664C39.7488 82.6396 46.4852 83.8151 53.2181 85.0267C54.2267 85.2076 54.6091 84.8531 54.671 83.8115C54.853 80.7479 55.1334 77.688 55.3956 74.3749ZM54.143 71.2065C55.4757 71.3511 55.7634 70.7073 55.8726 69.5788C56.2222 65.9294 56.6264 62.2835 57.0888 58.6449C57.2272 57.5489 56.7429 57.3645 55.8253 57.2089C49.8644 56.1926 43.9108 55.1437 37.9718 54.0297C37.0178 53.8488 36.6464 54.0731 36.4461 54.9484C35.6122 58.5798 34.7638 62.2075 33.9008 65.8317C33.6823 66.754 33.8753 67.2966 34.9131 67.4955C41.3255 68.7144 47.7342 69.9659 54.1466 71.2101L54.143 71.2065ZM68.519 99.3606C71.5449 99.3606 73.97 99.3172 76.3915 99.3787C77.564 99.4077 78.1612 99.0894 78.2595 97.8198C78.5035 94.702 78.8203 91.5879 79.1808 88.4809C79.3119 87.3524 78.9514 87.0558 77.8262 87.0161C70.8093 86.7629 63.7925 86.4554 56.7793 86.0901C55.6286 86.0286 55.1334 86.2565 55.0897 87.4646C54.9805 90.5896 54.813 93.7146 54.5981 96.836C54.518 97.9753 54.8676 98.4094 56.0656 98.4781C60.417 98.7277 64.7611 99.0857 68.5153 99.3606H68.519ZM80.5244 79.623H80.4261C80.3278 81.3664 80.2659 83.1134 80.1202 84.8531C80.0365 85.8442 80.3023 86.318 81.3947 86.2095C87.7816 85.5621 94.1721 84.9616 100.555 84.2636C101.007 84.2129 101.728 83.4968 101.739 83.0772C101.826 79.3482 101.779 75.6155 101.772 71.8864C101.772 71.1486 101.488 70.852 100.654 70.9388C94.3287 71.5935 88.0001 72.2083 81.6678 72.8015C80.8339 72.8811 80.4989 73.1849 80.5171 74.0277C80.5572 75.894 80.5281 77.7603 80.5281 79.6267L80.5244 79.623ZM80.3788 65.1156C80.437 65.1156 80.4953 65.1156 80.5536 65.1156C80.5536 66.9819 80.5936 68.8518 80.5353 70.7182C80.5062 71.6911 80.7393 72.2011 81.8389 72.089C88.0474 71.4633 94.2559 70.852 100.468 70.2624C101.418 70.172 101.699 69.7271 101.579 68.8374C101.058 65.0794 100.559 61.3178 100.057 57.5598C99.9473 56.7424 99.5795 56.5217 98.7056 56.6158C93.0433 57.2234 87.3738 57.7768 81.7006 58.2868C80.7138 58.3772 80.3096 58.6557 80.3533 59.6938C80.4297 61.4986 80.3751 63.3071 80.3751 65.1119L80.3788 65.1156ZM54.1393 91.8881C54.1393 91.8881 54.1466 91.8881 54.1503 91.8881C54.2413 90.2677 54.2959 88.6401 54.4416 87.0233C54.518 86.1805 54.2304 85.8767 53.3892 85.7357C46.6527 84.5819 39.9199 83.4027 33.198 82.173C32.1675 81.9849 31.7342 82.173 31.7379 83.2581C31.7451 86.5639 31.6687 89.8734 31.7379 93.1793C31.7488 93.6386 32.3496 94.4054 32.7829 94.485C39.3774 95.7365 45.99 96.8939 52.599 98.0802C53.5385 98.2502 53.9026 97.8777 53.9136 96.93C53.9391 95.2482 54.0592 93.5663 54.1393 91.8844V91.8881ZM70.1758 44.2893C66.5199 44.018 63.8508 43.8878 61.2035 43.5912C60.0929 43.4682 59.7106 43.7395 59.5831 44.8391C59.1717 48.3656 58.7019 51.8884 58.1594 55.3969C57.9773 56.5724 58.4033 56.8653 59.4702 56.9087C65.6423 57.1619 71.8144 57.4404 77.9864 57.7406C79.2063 57.8021 79.5631 57.3211 79.4612 56.1492C79.1516 52.6118 78.8822 49.0709 78.6819 45.5263C78.62 44.4412 78.1102 44.264 77.1817 44.2784C74.5162 44.3182 71.8508 44.2929 70.1758 44.2929V44.2893ZM82.6983 99.3715C87.9782 98.7168 93.2582 98.0513 98.5417 97.4147C99.4084 97.3098 100.006 97.0747 100.14 96.0728C100.585 92.7995 101.091 89.5334 101.579 86.2637C101.728 85.2655 101.458 84.9182 100.319 85.0412C94.0665 85.714 87.8107 86.3397 81.544 86.8678C80.2695 86.9763 79.9163 87.4428 79.8471 88.593C79.7088 90.8717 79.5085 93.1504 79.2427 95.4182C78.7912 99.2919 78.762 99.2883 82.6983 99.3715ZM58.9495 44.0035C58.9714 43.4682 58.9714 43.4755 57.6423 43.2368C52.6427 42.3398 47.6396 41.4681 42.6509 40.5168C41.6823 40.3324 41.2308 40.553 40.9213 41.4789C39.7633 44.9584 38.5617 48.4234 37.3309 51.8776C37.0105 52.7782 37.1999 53.2159 38.1539 53.3822C44.1694 54.4311 50.1776 55.5162 56.204 56.5109C56.5499 56.5688 57.3146 56.019 57.3692 55.6754C57.9372 51.9318 58.4033 48.1739 58.9532 44.0035H58.9495ZM83.798 57.7225C88.5499 57.1619 93.3019 56.6122 98.0538 56.0371C98.8767 55.9358 99.8308 55.9539 99.4484 54.5903C98.4289 50.9372 97.4603 47.2696 96.488 43.6057C96.2732 42.7919 95.8071 42.6472 95.0097 42.734C90.2541 43.2476 85.4948 43.7504 80.7283 44.1518C79.6177 44.2459 79.2572 44.5497 79.3738 45.6637C79.6651 48.4777 79.8981 51.2989 80.0693 54.1237C80.2841 57.6647 80.2477 57.6683 83.798 57.7189V57.7225ZM32.6154 68.0344C32.437 67.9259 31.9673 67.5244 31.4283 67.3255C26.538 65.546 21.6222 63.8279 16.7392 62.0231C15.8835 61.7084 15.421 61.571 15.2535 62.6669C14.711 66.2404 14.092 69.7995 13.5895 73.3766C13.5239 73.8396 13.8443 74.7004 14.1939 74.8306C19.5175 76.8344 24.8667 78.7622 30.2376 80.643C30.467 80.7226 31.188 80.2162 31.2244 79.9233C31.7124 76.1617 32.1202 72.3856 32.6154 68.0308V68.0344ZM32.6919 66.8951C32.8485 66.5189 33.0851 66.1174 33.1907 65.687C34.0574 62.0629 34.8439 58.417 35.7797 54.8073C36.0565 53.7403 35.6705 53.5052 34.7893 53.1978C30.2813 51.6389 25.777 50.0547 21.3164 48.3692C20.3223 47.993 19.9181 48.116 19.594 49.0781C18.4324 52.554 17.249 56.0262 16.0364 59.4876C15.6759 60.5148 16.0328 61.0465 17.005 61.3901C21.9026 63.1226 26.7893 64.8768 31.6832 66.6202C31.909 66.6998 32.1493 66.7468 32.6955 66.8915L32.6919 66.8951ZM67.1207 110.645C69.8116 110.645 72.2404 110.598 74.6619 110.667C75.7324 110.696 76.1767 110.298 76.3405 109.282C76.7738 106.605 77.2363 103.936 77.7679 101.278C77.9828 100.207 77.5203 100.098 76.6282 100.062C69.7242 99.7874 62.8239 99.4836 55.9236 99.1364C54.9259 99.0857 54.5035 99.2774 54.5071 100.359C54.5144 102.949 54.467 105.538 54.3287 108.124C54.2595 109.383 54.7292 109.817 55.9527 109.886C59.7652 110.099 63.574 110.396 67.1207 110.642V110.645ZM53.615 104.106C53.6769 104.106 53.7351 104.106 53.797 104.106C53.797 102.844 53.7351 101.578 53.8153 100.319C53.8772 99.3642 53.6113 98.9483 52.5918 98.7783C46.0264 97.6679 39.472 96.5141 32.9249 95.306C31.8871 95.1143 31.7706 95.4471 31.8835 96.2935C32.2658 99.093 32.6518 101.892 32.9759 104.699C33.0924 105.712 33.6059 106.15 34.5672 106.32C40.4698 107.358 46.3651 108.407 52.2604 109.488C53.3637 109.691 53.655 109.257 53.6223 108.258C53.5786 106.877 53.6113 105.491 53.6113 104.106H53.615ZM30.9586 87.8552C30.9805 87.8552 31.0059 87.8552 31.0278 87.8552C31.0278 86.2927 30.9513 84.7229 31.0533 83.164C31.1225 82.0717 30.7583 81.6304 29.6951 81.2688C24.6627 79.5543 19.6596 77.7495 14.6746 75.9085C13.7351 75.5612 13.3309 75.5793 13.3673 76.6716C13.4766 80.0354 13.5166 83.4027 13.7169 86.7629C13.7497 87.3199 14.3359 88.1337 14.8566 88.329C19.8307 90.2026 24.8448 91.964 29.8444 93.7761C30.7474 94.1052 31.0096 93.8267 30.9768 92.908C30.9186 91.2262 30.9622 89.5407 30.9622 87.8552H30.9586ZM40.6009 40.2564C40.1785 40.0719 39.7524 39.8622 39.3118 39.703C35.554 38.343 31.7706 37.0518 28.0492 35.5978C27.0587 35.2108 26.6436 35.417 26.2103 36.2308C24.477 39.4752 22.7547 42.7268 20.9595 45.935C20.3769 46.9803 20.701 47.4396 21.7023 47.7941C26.152 49.3674 30.6054 50.9372 35.0369 52.5684C36.0783 52.9518 36.3915 52.5467 36.6901 51.6497C37.848 48.1594 39.0715 44.6944 40.2695 41.2185C40.3496 40.9906 40.4261 40.7628 40.6045 40.26L40.6009 40.2564ZM117.997 64.3632C117.018 60.4172 116.082 56.5688 115.062 52.742C115.004 52.5214 114.236 52.2791 113.897 52.3767C109.786 53.5776 105.69 54.8218 101.611 56.1275C101.233 56.2505 100.734 56.9124 100.774 57.2704C101.225 61.1478 101.753 65.0179 102.332 68.8772C102.383 69.2063 103.039 69.7633 103.257 69.6982C107.882 68.331 112.488 66.9023 117.083 65.4302C117.422 65.3217 117.63 64.8045 117.994 64.3632H117.997ZM81.0087 110.443C81.016 110.501 81.0269 110.555 81.0342 110.613C85.666 110.034 90.3014 109.484 94.9222 108.848C95.4903 108.768 96.3205 108.367 96.4807 107.918C97.5513 104.978 98.4762 101.983 99.4339 99.0025C99.6523 98.3262 99.4776 98.0296 98.651 98.1164C92.3187 98.7602 85.9828 99.3425 79.6541 100.015C79.2463 100.059 78.6601 100.641 78.5654 101.061C78.1539 102.88 77.8808 104.732 77.5859 106.576C77.3783 107.86 77.2181 109.155 77.036 110.443H81.0051H81.0087ZM102.518 77.131C102.518 77.131 102.529 77.131 102.533 77.131C102.533 78.9973 102.54 80.86 102.529 82.7264C102.525 83.3485 102.423 84.0827 103.414 83.7789C108.148 82.3249 112.878 80.8528 117.582 79.3156C117.946 79.1962 118.354 78.5126 118.351 78.0967C118.311 74.4291 118.172 70.7652 118.081 67.0976C118.059 66.2259 117.852 66.0053 116.89 66.3164C112.524 67.7306 108.133 69.0797 103.72 70.3456C102.682 70.6422 102.402 71.022 102.485 72.0745C102.616 73.7492 102.522 75.4419 102.522 77.1237L102.518 77.131ZM70.8895 43.5767C73.1871 43.5767 75.1243 43.537 77.0579 43.5912C78.1102 43.6201 78.4634 43.2512 78.3105 42.2168C77.8226 38.9471 77.3565 35.6774 76.9414 32.3968C76.8285 31.4962 76.4607 31.2069 75.554 31.1815C71.4429 31.0658 67.3319 30.9103 63.2245 30.6933C62.2559 30.6426 61.7861 30.8849 61.6368 31.8651C61.1562 35.0119 60.661 38.1586 60.0893 41.2945C59.8671 42.5134 60.3187 42.8968 61.4657 42.9583C64.7283 43.1391 67.9837 43.3814 70.8858 43.5731L70.8895 43.5767ZM58.3596 42.857C58.7056 42.3723 59.2372 41.9491 59.3319 41.4428C59.9181 38.2454 60.3587 35.0191 60.9559 31.8217C61.1489 30.7873 60.9122 30.4871 59.8781 30.3207C56.051 29.7058 52.2349 29.0078 48.4297 28.2771C47.5048 28.0999 46.9659 28.2771 46.5617 29.1524C45.1489 32.216 43.696 35.2614 42.2212 38.2996C41.7879 39.1894 41.7916 39.6958 42.9532 39.9092C47.9563 40.8351 52.9486 41.8153 58.356 42.857H58.3596ZM101.029 55.8743C105.457 54.3841 109.691 52.9808 113.894 51.4906C114.156 51.3965 114.414 50.5466 114.276 50.2102C112.779 46.6041 111.224 43.0197 109.611 39.4643C109.484 39.1858 108.745 38.9362 108.395 39.0375C104.863 40.0647 101.342 41.1462 97.8426 42.2819C97.5295 42.3832 97.118 43.027 97.1872 43.3091C98.1375 47.096 99.1535 50.8649 100.191 54.6301C100.29 54.9918 100.628 55.2884 101.025 55.8671L101.029 55.8743ZM82.5089 43.5731C86.4816 43.0993 90.4507 42.6183 94.4234 42.1625C95.4648 42.0432 95.9746 41.7611 95.4502 40.5783C94.0374 37.3846 92.7484 34.1329 91.2918 30.9573C91.0843 30.5016 90.1922 30.0603 89.6532 30.1001C86.0301 30.3713 82.4179 30.8235 78.7948 31.1056C77.6951 31.1888 77.4985 31.5432 77.666 32.5451C78.0993 35.1602 78.4379 37.7897 78.8094 40.4119C79.1055 42.5098 80.3375 43.5635 82.5053 43.5731H82.5089ZM118.245 81.8981C117.735 81.3881 119.017 79.8762 117.357 80.3283C112.692 81.6015 108.082 83.0772 103.479 84.5529C103.006 84.7048 102.442 85.345 102.361 85.8297C101.812 89.1537 101.397 92.4993 100.89 95.8305C100.745 96.7818 101.04 97.0675 101.946 96.7854C106.276 95.4399 110.624 94.1486 114.91 92.6838C115.583 92.4523 116.268 91.4866 116.446 90.7451C117.153 87.8226 117.662 84.8531 118.245 81.8981ZM32.1857 105.224C31.7925 101.784 31.4866 98.7313 31.0533 95.6967C30.9914 95.2699 30.3906 94.749 29.9281 94.579C24.9868 92.7778 20.0128 91.0706 15.0751 89.2622C14.0519 88.886 13.8844 89.1247 14.1102 90.0507C14.8494 93.0853 15.574 96.1271 16.3569 99.1545C16.4661 99.5704 16.8157 100.106 17.1834 100.243C21.9317 102.034 26.7019 103.77 31.4793 105.48C31.716 105.564 32.0911 105.26 32.1821 105.224H32.1857ZM65.8244 119.662C67.8854 119.662 69.9464 119.626 72.0037 119.681C72.9832 119.706 73.6023 119.449 73.8717 118.433C74.3815 116.516 74.9313 114.606 75.5358 112.714C75.8599 111.691 75.6341 111.376 74.5126 111.34C68.2786 111.134 62.0447 110.902 55.8143 110.551C54.4743 110.475 54.2704 110.924 54.3432 112.038C54.4634 113.839 54.5435 115.644 54.5472 117.449C54.5472 118.512 54.955 118.928 56.0292 118.99C59.2955 119.171 62.5544 119.435 65.8244 119.666V119.662ZM40.7174 39.2871C40.914 39.023 41.2672 38.6794 41.4639 38.2671C42.9495 35.171 44.3769 32.0496 45.8881 28.968C46.3068 28.1144 46.2558 27.778 45.2727 27.4525C42.3451 26.4831 39.4757 25.351 36.5481 24.3817C36.0783 24.2262 35.1971 24.3926 34.9131 24.7362C32.579 27.5755 30.3505 30.5052 28.0601 33.3842C27.361 34.2632 27.5977 34.737 28.5772 35.0842C32.3387 36.4116 36.0965 37.7571 39.858 39.0954C40.0292 39.1569 40.2112 39.1749 40.7137 39.2871H40.7174ZM53.757 114.577C53.6732 113.26 54.0774 111.492 53.3783 110.75C52.6209 109.947 50.833 110.103 49.493 109.839C49.3146 109.803 49.1361 109.781 48.9577 109.745C44.3259 108.877 39.6796 108.067 35.066 107.112C33.5658 106.801 33.391 107.199 33.828 108.468C34.4943 110.399 35.1243 112.342 35.7215 114.291C36.0201 115.271 36.6282 115.738 37.6368 115.923C41.6787 116.657 45.6987 117.532 49.7552 118.194C53.8881 118.867 53.9026 118.784 53.757 114.573V114.577ZM10.4215 40.8894C10.163 41.3017 9.90442 41.6128 9.75513 41.9672C8.40055 45.1863 7.09696 48.4234 5.71325 51.6316C5.2508 52.7023 5.49113 53.5305 6.34684 54.1816C8.84116 56.0732 11.3755 57.9215 13.888 59.7878C14.8603 60.5076 15.1297 60.0446 15.4392 59.0825C16.5644 55.5886 17.7369 52.1018 19.026 48.6658C19.4047 47.6566 19.0587 47.3709 18.3123 46.8537C15.8908 45.1682 13.5494 43.3634 11.1825 41.5983C10.9458 41.4211 10.7492 41.1968 10.4215 40.8894ZM97.2272 41.9564C100.996 40.6977 104.605 39.5041 108.188 38.2454C108.37 38.1803 108.534 37.3882 108.373 37.1458C106.229 33.8725 104.047 30.6245 101.804 27.4199C101.604 27.1306 100.861 26.9859 100.468 27.1016C97.8572 27.8503 95.2755 28.7112 92.6719 29.4816C91.9618 29.6914 91.6487 29.8433 92.0128 30.6824C93.4803 34.0425 94.8603 37.4424 96.3023 40.817C96.4589 41.1823 96.8157 41.4645 97.2272 41.96V41.9564ZM14.5872 61.3503C14.4961 61.2635 14.1102 60.8331 13.655 60.4931C11.0879 58.5942 8.4661 56.7604 5.94265 54.8001C5.22531 54.2394 4.90852 53.9718 4.71917 55.0677C4.11106 58.5653 3.46655 62.0592 2.93491 65.5677C2.85116 66.1247 3.10242 66.9927 3.51753 67.3255C6.24124 69.5065 9.04507 71.5899 11.8416 73.6804C12.4752 74.1543 12.7519 73.883 12.8575 73.1343C13.3855 69.3763 13.9536 65.6255 14.5872 61.3431V61.3503ZM26.1703 34.8817C25.868 34.661 25.584 34.4621 25.3073 34.2523C23.2353 32.7006 21.1197 31.2069 19.1206 29.5684C18.4288 29.0005 18.1411 29.1488 17.7369 29.7348C15.5885 32.8598 13.4511 35.9957 11.2808 39.1026C10.7346 39.8839 10.9641 40.477 11.6013 40.9653C13.8953 42.7195 16.2185 44.434 18.5198 46.1773C19.4447 46.8754 19.878 46.5933 20.3842 45.595C22.0446 42.3217 23.8289 39.1135 25.5694 35.8799C25.7406 35.5616 25.9372 35.2614 26.1666 34.878L26.1703 34.8817ZM77.6332 119.492C79.7488 119.308 81.8644 119.156 83.9764 118.935C91.5431 118.147 91.7106 118.02 95.0643 111.21C95.1189 111.101 95.1844 110.996 95.2208 110.884C95.3483 110.494 95.4648 110.099 95.585 109.709C95.1699 109.705 94.7511 109.662 94.3396 109.705C89.6387 110.182 84.9414 110.732 80.2331 111.137C76.6865 111.445 76.6828 111.362 75.7106 114.859C75.5649 115.38 75.4193 115.904 75.2627 116.422C74.6194 118.541 75.4096 119.565 77.6332 119.492ZM97.7625 108.812C102.398 107.17 106.669 105.665 110.926 104.131C111.17 104.045 111.396 103.733 111.509 103.477C112.834 100.446 114.141 97.4039 115.427 94.3584C115.529 94.1161 115.448 93.8014 115.452 93.5193C115.172 93.5772 114.884 93.6169 114.611 93.6965C110.267 94.995 105.919 96.279 101.59 97.6281C101.102 97.78 100.493 98.2177 100.341 98.6626C99.3246 101.621 98.4143 104.616 97.4967 107.607C97.4275 107.828 97.5986 108.121 97.7625 108.819V108.812ZM70.5399 30.5052C72.3205 30.5052 73.8353 30.4726 75.3501 30.516C76.3587 30.545 76.6173 30.1326 76.4061 29.2067C75.7834 26.447 75.2445 23.6692 74.5454 20.9312C74.4361 20.4971 73.6933 19.9618 73.2053 19.9257C70.5508 19.7195 67.8817 19.6869 65.2235 19.5206C64.3788 19.4663 64.0219 19.7448 63.869 20.5405C63.3592 23.199 62.8348 25.8574 62.2668 28.505C62.0228 29.6335 62.4379 30.0024 63.5485 30.0494C65.9664 30.1543 68.3842 30.3605 70.5363 30.5052H70.5399ZM60.4862 29.9011C60.8103 29.525 61.371 29.1633 61.4766 28.7003C62.1029 25.937 62.5981 23.1483 63.1917 20.3814C63.3665 19.5712 63.0897 19.3252 62.3287 19.2023C59.8162 18.7936 57.3219 18.28 54.8057 17.911C54.3323 17.8423 53.564 18.0846 53.32 18.4463C51.5176 21.0867 49.828 23.7994 48.0729 26.4723C47.534 27.2933 47.9636 27.4923 48.681 27.6297C52.4898 28.3567 56.295 29.0946 60.4862 29.9011ZM80.2841 30.3677C80.2877 30.4075 80.295 30.4473 80.2987 30.4835C83.2955 30.1182 86.2923 29.7348 89.2928 29.3984C90.2286 29.2935 90.4361 28.9607 89.93 28.1469C88.2186 25.3908 86.5727 22.5913 84.7848 19.8859C84.4898 19.4374 83.5904 19.148 82.9932 19.1806C80.7648 19.3035 78.5472 19.6508 76.3187 19.7846C75.2736 19.8461 75.1498 20.215 75.3647 21.112C75.9109 23.3871 76.366 25.6838 76.8831 27.9661C77.5167 30.762 76.7993 30.4509 79.9236 30.3822C80.0438 30.3822 80.1639 30.3713 80.2841 30.3677ZM12.5553 81.0915C12.5954 81.0915 12.6318 81.0915 12.6718 81.0915C12.6718 79.4639 12.6136 77.8363 12.6937 76.2123C12.741 75.2972 12.3805 74.8668 11.6377 74.364C8.98681 72.5809 6.42331 70.6712 3.8234 68.8084C3.53938 68.6059 3.25171 68.4033 2.96404 68.2008C2.86209 68.5914 2.65453 68.9857 2.67638 69.3691C2.85845 72.6749 3.05508 75.9772 3.31361 79.2794C3.35367 79.775 3.6122 80.4007 3.98362 80.7009C6.61266 82.8023 9.29268 84.8495 11.9763 86.8822C12.6172 87.3669 12.9413 87.1571 12.8794 86.3216C12.7447 84.5782 12.6573 82.8349 12.5517 81.0915H12.5553ZM28.7774 19.0395C28.457 19.2529 28.1293 19.4121 27.878 19.6508C25.1216 22.2622 22.3796 24.8953 19.6231 27.5031C18.9859 28.1035 19.0332 28.6642 19.6814 29.1488C21.6987 30.6679 23.716 32.1907 25.8025 33.6157C26.0829 33.8074 26.9604 33.6049 27.208 33.3011C29.5931 30.3496 31.8835 27.3259 34.2504 24.3564C34.7711 23.7053 34.6728 23.4594 34.0064 23C32.4188 21.9113 30.9222 20.6961 29.3892 19.5278C29.2035 19.3867 29.0287 19.2348 28.7811 19.0359L28.7774 19.0395ZM126.128 57.5272C125.076 53.9971 123.962 50.25 122.808 46.5173C122.786 46.4414 122.159 46.4016 121.977 46.5426C120.098 48.0364 118.223 49.5411 116.421 51.1217C116.071 51.4291 115.783 52.1308 115.874 52.5648C116.65 56.2758 117.502 59.9687 118.402 63.6543C118.471 63.9328 119.203 64.3488 119.381 64.2547C121.799 62.9454 123.995 61.354 125.499 58.9921C125.717 58.6485 125.83 58.2362 126.132 57.5309L126.128 57.5272ZM122.083 44.745C122.028 44.5388 122.017 44.4086 121.963 44.3074C120.091 40.8062 118.223 37.305 116.311 33.8255C116.253 33.7206 115.634 33.7604 115.43 33.9232C113.835 35.1963 112.259 36.4912 110.737 37.8475C110.449 38.1043 110.194 38.759 110.321 39.0664C111.825 42.6761 113.391 46.2605 115.001 49.8232C115.139 50.127 115.929 50.4959 116.057 50.3947C117.965 48.8575 119.822 47.2552 121.661 45.6312C121.905 45.4178 121.966 45.0018 122.087 44.745H122.083ZM17.4238 101.245C17.4529 101.668 17.3874 101.994 17.5075 102.225C18.8038 104.735 20.1002 107.246 21.4657 109.72C21.706 110.157 22.1939 110.573 22.6637 110.75C26.4434 112.193 30.2449 113.586 34.0465 114.964C34.3487 115.073 34.731 114.968 35.077 114.964C34.9932 114.624 34.924 114.277 34.8221 113.94C34.203 111.929 33.4966 109.944 32.9795 107.907C32.721 106.895 32.2404 106.475 31.2499 106.146C27.0041 104.743 22.8057 103.213 18.589 101.722C18.305 101.621 18.0282 101.491 17.4238 101.241V101.245ZM45.7096 14.9271C45.6878 14.9379 45.4402 14.9922 45.2763 15.1405C42.4288 17.6542 39.5849 20.1716 36.7593 22.7035C36.0492 23.34 36.6464 23.6294 37.1707 23.8175C40.0692 24.8628 42.9641 25.9081 45.8881 26.8738C46.2522 26.9931 46.9987 26.7653 47.2026 26.4578C49.0051 23.756 50.7383 21.0035 52.4534 18.2402C52.5918 18.0159 52.5153 17.3613 52.3842 17.3142C50.2395 16.504 48.0692 15.7553 45.7133 14.9271H45.7096ZM119.254 73.0873C119.214 73.0873 119.177 73.0909 119.137 73.0945C119.137 74.5376 119.174 75.9844 119.123 77.4276C119.093 78.3354 119.447 78.5995 120.135 78.0352C122.079 76.4402 124.024 74.8306 125.848 73.1017C126.354 72.6243 126.671 71.6984 126.664 70.9822C126.635 67.557 126.467 64.1317 126.329 60.7065C126.318 60.4461 126.132 60.1893 126.03 59.9325C125.808 60.1025 125.579 60.2689 125.36 60.4461C123.481 61.9435 121.653 63.5133 119.698 64.9058C118.951 65.4375 118.653 65.8896 118.747 66.7902C118.973 68.8844 119.09 70.9858 119.254 73.0873ZM91.0807 29.3948C94.5945 28.241 97.2891 27.3765 99.9582 26.4289C100.118 26.371 100.235 25.474 100.049 25.2787C97.4603 22.5949 94.8312 19.9474 92.1548 17.3504C91.8599 17.0647 91.1608 16.9706 90.7311 17.0828C89.158 17.4915 87.6287 18.0666 86.0592 18.5006C85.229 18.7285 85.1489 19.0106 85.5932 19.7231C87.3446 22.5262 89.0561 25.3547 90.742 28.194C90.9823 28.6027 91.0115 29.1344 91.0843 29.3948H91.0807ZM115.401 32.5053C115.139 32.093 114.931 31.6626 114.629 31.3081C112.452 28.7401 110.216 26.2191 108.086 23.6113C107.103 22.4105 106.487 22.4503 105.548 23.6836C104.914 24.5155 103.942 25.1376 103.024 25.6983C102.219 26.1902 102.092 26.5121 102.667 27.3367C104.801 30.3894 106.869 33.4891 108.898 36.6142C109.378 37.3556 109.775 37.7282 110.554 37.0844C111.938 35.9378 113.333 34.8021 114.684 33.6193C114.986 33.3553 115.139 32.9249 115.401 32.5089V32.5053ZM63.7197 125.876C64.5317 125.876 65.5003 125.869 66.4689 125.876C70.8021 125.916 70.762 125.902 72.5317 121.858C73.0633 120.639 72.8558 120.364 71.5267 120.339C67.2845 120.266 63.046 120.093 58.8075 119.905C54.0155 119.691 54.5472 118.44 55.1807 123.967C55.29 124.932 55.7306 125.316 56.6628 125.374C58.9605 125.515 61.2581 125.695 63.716 125.873L63.7197 125.876ZM110.263 105.679C109.87 105.679 109.575 105.614 109.32 105.69C105.438 106.819 101.56 107.944 97.6969 109.134C97.1981 109.289 96.6665 109.723 96.397 110.172C95.1444 112.291 93.9719 114.458 92.7848 116.617C92.6501 116.863 92.5882 117.149 92.4935 117.416C92.7848 117.416 93.0943 117.492 93.3601 117.409C96.6373 116.375 99.9145 115.337 103.174 114.248C103.661 114.085 104.157 113.723 104.477 113.322C106.269 111.061 108.006 108.757 109.761 106.464C109.906 106.276 110.023 106.063 110.267 105.679H110.263ZM37.3018 116.834C37.2909 116.935 37.1307 117.301 37.2508 117.492C38.2085 119.019 39.1807 120.541 40.2331 122.003C40.5207 122.4 41.0742 122.748 41.5622 122.842C45.5385 123.609 49.5258 124.328 53.5203 124.99C53.8007 125.037 54.4671 124.498 54.4561 124.256C54.3979 122.939 54.2486 121.616 53.9755 120.324C53.8954 119.945 53.3528 119.449 52.9559 119.384C47.8908 118.519 42.8111 117.72 37.3018 116.834ZM3.87074 82.8421C4.34411 84.5348 4.95221 86.3108 5.32363 88.1337C6.3869 93.3601 10.0319 96.3622 14.3905 98.7855C14.6746 98.9411 15.0278 98.97 15.3519 99.0568C15.3227 98.7711 15.3191 98.4781 15.2572 98.1996C14.5981 95.2626 13.9536 92.3257 13.2399 89.4032C13.1124 88.8824 12.7847 88.2892 12.3623 87.9818C9.78062 86.0974 7.14794 84.2817 4.52982 82.4515C4.36232 82.3321 4.14384 82.2851 3.9472 82.2055C3.929 82.3755 3.90715 82.5455 3.87074 82.8493V82.8421ZM44.7301 14.5147C44.6209 14.3267 44.5881 14.2001 44.508 14.135C43.361 13.256 42.2285 12.3554 41.0342 11.5416C40.8412 11.4078 40.3278 11.585 40.0474 11.755C36.752 13.7696 33.4748 15.8168 30.1903 17.8495C29.4839 18.2872 29.4729 18.7646 30.1138 19.2384C31.6104 20.3488 33.0888 21.4954 34.6582 22.4973C34.975 22.6998 35.8052 22.5045 36.1475 22.2043C38.8348 19.8714 41.4602 17.4698 44.1038 15.0862C44.3187 14.8945 44.5262 14.6956 44.7228 14.5111L44.7301 14.5147ZM75.1935 125.71C77.6551 125.406 80.2477 125.164 82.8075 124.733C83.7689 124.571 84.7848 124.129 85.5495 123.533C86.8239 122.538 87.9382 121.33 89.0816 120.176C89.3911 119.861 89.5622 119.413 89.7989 119.022C89.3255 119.033 88.8522 119.011 88.3824 119.055C84.4134 119.431 80.448 119.966 76.468 120.147C74.5563 120.234 73.442 120.755 72.9286 122.614C72.6337 123.681 72.0802 124.679 71.6396 125.71H75.1899H75.1935ZM126.474 75.4925C126.314 74.9464 126.223 74.6389 126.132 74.3315C125.903 74.5051 125.677 74.6823 125.448 74.8559C123.678 76.1978 121.897 77.5252 120.149 78.8924C119.712 79.236 119.133 79.6701 119.046 80.1439C118.394 83.6198 117.848 87.1173 117.273 90.6077C117.182 91.1538 117.164 91.6783 117.954 91.1972C120.557 89.6166 123.201 87.9384 124.177 84.9218C125.189 81.7968 125.753 78.5271 126.474 75.4961V75.4925ZM95.4248 13.7552C94.6783 14.4207 94.0338 15.1513 93.2436 15.6577C92.3442 16.2328 92.4716 16.58 93.1598 17.2347C95.3009 19.2746 97.4311 21.329 99.4594 23.4775C101.844 26.0057 102.026 26.06 104.619 23.633C104.881 23.3871 105.111 23.1013 105.369 22.8481C106.09 22.1464 106.036 21.5424 105.216 20.9348C102.212 18.7031 99.2263 16.4498 96.2295 14.2109C95.9928 14.0337 95.7124 13.9179 95.4248 13.7552ZM69.9099 19.1625C70.9696 19.1625 71.9382 19.1299 72.9068 19.1733C73.8426 19.2131 74.0865 18.8514 73.7989 17.9906C73.2126 16.2219 72.6992 14.4279 72.0693 12.6773C71.8653 12.1095 71.4393 11.245 71.0242 11.1872C69.4876 10.981 67.9108 11.0352 66.3487 11.0606C66.2176 11.0606 66.0501 11.5561 65.9773 11.8382C65.4821 13.7588 65.0196 15.6866 64.5135 17.6072C64.2841 18.4789 64.5972 18.8044 65.4712 18.8478C66.9823 18.9201 68.4898 19.0612 69.9099 19.1661V19.1625ZM62.7584 18.6633C63.0497 18.327 63.6032 17.9436 63.7816 17.4336C64.1967 16.2472 64.4261 14.9958 64.7392 13.7733C65.4639 10.9593 65.4712 10.9267 62.5508 10.3625C61.7898 10.2142 60.65 10.0406 60.2349 10.4421C58.3778 12.2397 56.7138 14.2398 54.9878 16.1677C54.467 16.75 54.6309 17.1298 55.3701 17.2708C57.686 17.7157 60.0055 18.1461 62.762 18.6633H62.7584ZM76.4134 19.1444C78.3906 18.9238 80.3678 18.6706 82.3487 18.4934C83.5431 18.3885 83.503 17.9544 82.8403 17.1949C81.6569 15.8349 80.3715 14.54 79.3483 13.0716C77.8444 10.9123 75.9254 10.3914 73.453 10.9267C72.5535 11.1221 72.3678 11.3137 72.681 12.1782C73.351 14.0373 73.9955 15.9145 74.4762 17.8315C74.7638 18.9853 75.3574 19.2891 76.4134 19.1408V19.1444ZM17.1725 23.7741C17.4311 24.8266 17.584 25.5861 17.8061 26.3276C18.1375 27.4308 18.5307 27.6297 19.4629 26.6604C21.5931 24.4432 23.7633 22.2441 26.1084 20.262C27.5467 19.0431 28.7192 18.034 27.4556 16.0772C27.3646 15.9362 27.35 15.7264 27.361 15.5492C27.4338 14.3447 27.0223 14.1567 26.1011 14.9271C23.5521 17.0538 20.9413 19.1082 18.4798 21.329C17.7952 21.9475 17.5476 23.0398 17.1725 23.7741ZM8.80838 35.2072C9.11425 36.2597 9.35458 37.2435 9.69323 38.1948C10.0027 39.0628 10.3414 39.193 10.9386 38.2779C12.6718 35.6087 14.3942 32.9177 16.3387 30.4039C17.4165 29.0114 18.2103 27.8684 17.005 26.1938C16.7174 25.7923 16.7647 25.1557 16.6482 24.6313C16.5863 24.3528 16.5025 24.0779 16.4261 23.7994C16.153 23.9766 15.7997 24.096 15.6177 24.3419C13.6441 26.9895 11.6377 29.619 9.77698 32.3426C9.23078 33.1419 9.12154 34.2306 8.80474 35.2072H8.80838ZM56.2877 8.43468C56.102 8.50701 55.8617 8.56488 55.6578 8.68786C52.8467 10.3553 50.0428 12.0263 47.239 13.7045C46.427 14.1928 46.802 14.5256 47.4284 14.7498C49.1361 15.3683 50.8403 16.0121 52.5772 16.5294C52.985 16.6523 53.7024 16.4751 53.9864 16.1677C55.7597 14.2688 57.4602 12.3048 59.1498 10.3336C59.2991 10.1563 59.3027 9.56316 59.219 9.52699C58.2759 9.12913 57.3 8.79999 56.2841 8.43829L56.2877 8.43468ZM84.8394 18.1714C86.5727 17.6434 88.1312 17.1659 89.6897 16.6885C90.5927 16.4136 90.7784 16.0447 89.8972 15.4479C87.4502 13.7877 84.9814 12.1565 82.5927 10.4168C81.3801 9.53422 80.2841 9.51975 78.9259 10.0623C77.9791 10.4421 77.9391 10.6048 78.5945 11.321C80.3824 13.2777 82.0902 15.3068 83.8453 17.2925C84.1366 17.6217 84.508 17.8857 84.8358 18.1714H84.8394ZM27.838 14.7064C28.1584 15.7662 28.3041 16.4787 28.6063 17.1153C28.701 17.3179 29.3273 17.5132 29.5166 17.3974C32.9723 15.3068 36.4133 13.1909 39.818 11.028C41.016 10.2648 39.5995 9.30997 39.8726 8.44914C39.4356 8.40212 38.9113 8.17787 38.5763 8.34064C35.4702 9.81272 32.3678 11.292 29.3382 12.9088C28.6609 13.2705 28.2713 14.1639 27.8343 14.71L27.838 14.7064ZM3.23714 47.9894C3.53573 48.9913 3.81976 50.0293 4.16568 51.0493C4.24579 51.2844 4.5371 51.4508 4.73009 51.6461C4.88303 51.411 5.07602 51.1904 5.17797 50.9336C6.20483 48.4234 7.09332 45.8518 8.26947 43.4176C9.22714 41.4355 10.3013 39.6054 8.65181 37.5003C8.44789 37.2399 8.47338 36.8095 8.3605 36.4659C8.28039 36.2163 8.1493 35.9848 8.04006 35.7425C7.858 35.9631 7.61038 36.1548 7.50843 36.4044C6.32135 39.3015 5.13064 42.1951 3.99818 45.1139C3.65226 46.0037 3.49932 46.9658 3.2335 47.9894H3.23714ZM122.837 89.1862C122.775 88.9837 122.727 88.8426 122.684 88.6979C122.534 88.7847 122.378 88.8607 122.24 88.9583C120.608 90.0941 118.977 91.2298 117.36 92.3836C117.076 92.5861 116.741 92.8248 116.617 93.125C115.368 96.185 114.159 99.263 112.947 102.337C112.885 102.493 112.892 102.674 112.87 102.844C113.074 102.818 113.307 102.844 113.478 102.753C113.854 102.558 114.192 102.305 114.549 102.081C117.404 100.283 118.82 97.3894 120.291 94.5573C121.205 92.7959 121.992 90.973 122.837 89.1826V89.1862ZM53.5421 6.52494C52.8102 6.72749 52.3915 6.81068 51.9946 6.95535C49.1034 8.01873 46.2012 9.05317 43.3391 10.1853C41.5476 10.8942 41.5585 11.1221 43.077 12.3012C45.3564 14.0698 45.3273 14.0301 47.7197 12.4893C49.7479 11.1835 51.8526 9.99719 53.9136 8.73488C54.3432 8.47084 54.7147 8.11277 55.1152 7.79448C54.5362 7.3279 53.9573 6.8577 53.5385 6.5177L53.5421 6.52494ZM102.107 115.854C101.364 115.951 101.098 115.959 100.85 116.027C98.0538 116.787 95.2536 117.532 92.4753 118.349C91.8781 118.527 91.27 118.888 90.8258 119.326C89.5804 120.549 88.4152 121.847 87.2281 123.127C87.0315 123.341 86.8749 123.59 86.7001 123.826C86.9769 123.811 87.2645 123.833 87.534 123.782C92.8576 122.744 97.3219 120.096 101.265 116.49C101.397 116.367 101.553 116.273 102.11 115.861L102.107 115.854ZM83.0806 7.8415C82.7238 8.14532 82.3305 8.47808 81.9336 8.81445C82.1885 9.09657 82.3997 9.43657 82.7056 9.64635C85.1344 11.3174 87.6141 12.9233 90.0174 14.6305C91.7907 15.8928 92.184 15.8964 93.7716 14.352C94.5108 13.6358 94.6273 13.1186 93.564 12.6303C90.3924 11.1618 87.239 9.66443 84.0747 8.18511C83.8053 8.05851 83.5103 7.98618 83.0806 7.83788V7.8415ZM95.5449 12.0118C95.8144 12.4856 95.971 13.1041 96.3715 13.408C99.4302 15.7481 102.536 18.0304 105.639 20.3163C105.85 20.4718 106.152 20.5007 106.411 20.5912C106.48 20.3091 106.691 19.9618 106.596 19.7557C106.039 18.544 105.704 16.9996 104.75 16.2472C102.351 14.3556 99.6596 12.8256 97.0816 11.1618C96.204 10.594 95.443 10.301 95.5486 12.0154L95.5449 12.0118ZM116.148 30.0639C115.947 29.2899 115.966 28.4363 115.554 27.9263C113.063 24.8411 110.482 21.8318 107.911 18.8116C107.82 18.7068 107.463 18.667 107.368 18.7502C107.103 18.9889 107.452 21.9584 107.732 22.2767C110.125 24.9966 112.51 27.7201 114.906 30.4401C115.135 30.7005 115.416 30.9211 115.674 31.1598C115.834 30.7909 115.995 30.4256 116.151 30.0639H116.148ZM62.4525 126.603C62.4525 126.567 62.4525 126.531 62.4525 126.495C60.7593 126.383 59.0661 126.238 57.3728 126.173C56.8376 126.151 56.2914 126.336 55.7524 126.426C56.0583 127.124 56.3023 127.858 56.7028 128.499C56.8339 128.708 57.3728 128.712 57.7297 128.73C60.3915 128.86 63.0606 129.117 65.7151 129.012C66.793 128.969 67.8562 128.162 68.8831 127.623C69.1161 127.5 69.1708 127.052 69.3055 126.752C69.0215 126.701 68.7374 126.611 68.4498 126.611C66.4507 126.6 64.4516 126.603 62.4525 126.603ZM0.666364 60.938C0.972236 62.1678 1.20892 63.2167 1.51115 64.2439C1.58034 64.4754 1.88257 64.6417 2.07556 64.837C2.14474 64.6092 2.23214 64.3849 2.27583 64.1535C2.77834 61.3756 3.0041 58.5147 3.85253 55.8454C4.51889 53.7584 4.02731 52.138 3.1097 50.4272C3.00774 50.2355 2.82567 50.0872 2.68002 49.9208C2.59627 50.1415 2.47246 50.3549 2.43241 50.5864C1.82795 54.0731 1.23805 57.5634 0.662723 60.938H0.666364ZM40.5826 8.26468C40.7793 9.6572 40.8812 10.4529 42.3159 9.8706C45.5676 8.55404 48.8849 7.40385 52.1584 6.14154C52.5044 6.00772 52.7301 5.57369 53.0105 5.2771C52.6355 5.09263 52.2131 4.68754 51.8963 4.75988C48.4734 5.5339 45.0578 6.34409 41.6678 7.24471C41.1762 7.37492 40.823 8.02596 40.5826 8.26468ZM54.2522 128.354C55.0752 128.484 55.5485 128.408 55.2281 127.352C54.9441 126.415 54.6236 125.858 53.4693 125.703C50.1776 125.261 46.9113 124.618 43.6341 124.071C43.2044 123.999 42.7602 124.032 42.3196 124.014C42.6473 124.346 42.9495 124.715 43.31 125.008C46.4925 127.627 50.5162 127.536 54.2522 128.35V128.354ZM122.928 41.8804C122.666 40.9906 122.516 40.0213 122.108 39.1713C120.885 36.6214 119.589 34.104 118.252 31.6083C117.928 31.0043 117.338 30.5413 116.872 30.0097C116.778 30.9428 116.661 31.8724 116.61 32.8055C116.599 33.0008 116.861 33.2034 116.978 33.4132C118.591 36.3067 120.197 39.2039 121.813 42.0938C122.006 42.4374 122.265 42.7412 122.491 43.0668C122.622 42.7051 122.753 42.347 122.924 41.8768L122.928 41.8804ZM95.0934 11.8961C95.1553 11.6899 95.2172 11.4837 95.2828 11.2776C94.7074 10.6555 94.2486 9.75124 93.5349 9.4655C90.5709 8.28276 87.534 7.27364 84.508 6.24643C84.1803 6.13431 83.7543 6.32239 83.3719 6.36941C83.6086 6.71302 83.7689 7.21215 84.0966 7.3713C87.4102 8.96998 90.742 10.5216 94.092 12.0444C94.3506 12.1601 94.7584 11.9539 95.0934 11.8961ZM71.0096 128.915C75.463 128.549 78.6091 127.808 81.1835 126.401C81.4348 126.263 81.6496 126.064 81.879 125.894C81.5695 125.855 81.2527 125.757 80.9468 125.779C77.8699 126.021 74.7893 126.26 71.716 126.56C71.2281 126.607 70.6892 126.857 70.3214 127.178C69.8444 127.594 69.5167 128.177 69.1234 128.687L71.006 128.915H71.0096ZM69.3565 10.3733C71.1698 10.4059 71.2281 10.3155 70.4452 8.62999C70.2449 8.19596 70.0483 7.75831 69.808 7.3496C69.3637 6.59366 68.8904 5.85581 68.4279 5.11072C68.0456 5.93176 67.5941 6.7311 67.2955 7.5847C66.3342 10.3155 66.356 10.3227 69.3565 10.3733ZM52.6318 2.81759C50.4725 3.17566 48.4188 3.39268 46.4343 3.88458C45.0615 4.22457 43.7761 4.92264 42.4689 5.50496C42.2613 5.599 42.1557 5.92453 42.0064 6.14154C42.2358 6.13431 42.4725 6.15963 42.6946 6.11261C45.9937 5.38199 49.2927 4.6586 52.5845 3.8882C52.9377 3.80501 53.229 3.4614 53.5494 3.24077C53.2254 3.09247 52.9049 2.94418 52.6318 2.81759ZM64.9286 10.1274C65.2782 9.80187 65.8025 9.52699 65.9846 9.10381C66.4361 8.0549 66.7383 6.9445 67.077 5.85219C67.1425 5.64602 67.0952 5.40731 67.0988 5.17944C66.8804 5.23731 66.6255 5.23731 66.4507 5.35667C65.5585 5.97878 64.6555 6.59366 63.8144 7.28088C63.0861 7.87767 62.4306 8.5685 61.7461 9.21593C62.711 9.49082 63.676 9.7657 64.925 10.1202L64.9286 10.1274ZM73.0815 10.5867C73.1799 10.4819 73.2818 10.377 73.3801 10.2721C73.6787 10.2504 73.9882 10.2612 74.2795 10.1997C74.7274 10.1057 75.1644 9.96464 75.605 9.84166C75.3246 9.4872 75.0988 9.06764 74.7529 8.79637C73.4784 7.7981 72.1712 6.83961 70.8567 5.88836C70.5799 5.68943 70.2377 5.5773 69.9281 5.42539C70.0228 5.79794 70.0702 6.18856 70.2231 6.53579C70.6091 7.41109 70.955 8.32255 71.4866 9.10742C71.8835 9.69337 72.5426 10.1021 73.0852 10.5904L73.0815 10.5867ZM126.824 54.6662C125.972 51.4074 125.072 47.9351 124.144 44.4665C124.042 44.0867 123.78 43.7467 123.59 43.3887C123.416 43.8263 123.201 44.2567 123.081 44.7088C123.026 44.915 123.139 45.1718 123.204 45.3961C124.162 48.6079 125.12 51.8197 126.092 55.0279C126.154 55.2305 126.358 55.3933 126.493 55.5705C126.565 55.3679 126.638 55.1654 126.82 54.6662H126.824ZM64.6446 5.11072C62.4889 5.92091 60.2386 6.75642 58.0028 7.6281C57.8972 7.66789 57.8863 8.23574 57.9008 8.23936C58.8621 8.43829 60.0565 9.04594 60.752 8.68786C62.2704 7.91022 63.5412 6.64791 64.9031 5.57007C65.0087 5.48688 65.0342 5.30603 65.0961 5.17221C64.9832 5.15774 64.8703 5.13965 64.6482 5.11072H64.6446ZM1.90442 71.749C1.94447 71.749 1.98088 71.749 2.02094 71.749C2.02094 70.4252 2.08648 69.0978 1.99545 67.7776C1.94811 67.094 1.65316 66.4177 1.42012 65.7558C1.35093 65.5604 1.11789 65.423 0.961312 65.2602C0.881203 65.4555 0.717342 65.6545 0.735549 65.8389C1.0305 69.3148 1.33637 72.7907 1.67137 76.2593C1.69322 76.5016 1.94811 76.7223 2.09012 76.9538C2.12654 76.7223 2.19936 76.4836 2.18844 76.2557C2.10469 74.7547 1.99909 73.25 1.90078 71.749H1.90442ZM77.3674 9.71869C77.7352 9.63911 77.9828 9.61741 78.2049 9.53061C78.6382 9.36061 79.0606 9.15806 79.4866 8.96636C79.1225 8.70233 78.7912 8.36957 78.387 8.18872C76.5736 7.38215 74.7384 6.61536 72.9068 5.84496C72.6992 5.75815 72.4625 5.73645 72.2404 5.68581C72.3424 5.85942 72.4006 6.08729 72.5463 6.20303C73.8644 7.25194 75.1899 8.29 76.5299 9.30636C76.7993 9.5089 77.1453 9.61379 77.3674 9.71869ZM42.6218 125.355C42.163 125.005 41.9372 124.889 41.7843 124.712C39.7379 122.31 36.5116 122.578 33.9663 121.312C33.879 121.268 33.7479 121.323 33.635 121.33C33.7151 121.456 33.7661 121.652 33.8826 121.706C36.4971 122.932 39.1152 124.144 41.737 125.345C41.8826 125.413 42.0902 125.352 42.6218 125.352V125.355ZM62.0046 4.78881C59.9108 5.19391 57.726 5.60624 55.5485 6.05112C55.3082 6.09814 55.1079 6.32962 54.8894 6.4743C55.046 6.6443 55.1662 6.89025 55.3628 6.96982C55.7852 7.14705 56.3132 7.45087 56.6737 7.33151C58.549 6.69855 60.3879 5.94985 62.2304 5.23008C62.3833 5.16859 62.4925 4.99859 62.62 4.88285C62.4489 4.85753 62.2777 4.83222 62.0046 4.79243V4.78881ZM75.3319 5.50135C75.026 5.55198 74.9131 5.57007 74.7966 5.59177C74.8986 5.7039 74.9787 5.86304 75.1061 5.92091C76.8503 6.72749 78.5872 7.55215 80.3606 8.29C80.6701 8.42021 81.1653 8.23936 81.5185 8.0766C81.635 8.02235 81.6314 7.35321 81.5695 7.33513C79.443 6.68047 77.3055 6.0692 75.3319 5.50135ZM54.4743 5.47603C56.5936 5.06732 58.4871 4.70562 60.3842 4.3367C60.4971 4.315 60.5991 4.25351 60.7083 4.2101C60.5881 4.15223 60.4643 4.03649 60.3478 4.04011C58.4179 4.145 56.488 4.23904 54.5654 4.40542C54.3178 4.42712 54.0993 4.81775 53.8699 5.03838C54.1211 5.21923 54.3687 5.40007 54.478 5.47603H54.4743ZM77.0287 4.76711C76.854 4.80328 76.5918 4.85392 76.3333 4.90817C76.5991 5.03838 76.854 5.21561 77.138 5.29518C78.5363 5.69666 79.9345 6.09452 81.3474 6.44175C81.686 6.52494 82.0756 6.40196 82.4434 6.37664C82.1667 6.10176 81.9263 5.65326 81.6023 5.58454C80.1239 5.26263 78.62 5.042 77.0324 4.77073L77.0287 4.76711ZM69.4293 1.27316C68.4789 1.19359 67.8271 1.10316 67.1717 1.09955C66.9459 1.09955 66.7201 1.30933 66.4907 1.42507C67.0697 1.89889 67.6487 2.3727 68.224 2.85014C68.5408 2.43781 68.854 2.02548 69.4256 1.27316H69.4293ZM77.2581 3.55544C77.2545 3.58799 77.2509 3.62055 77.2472 3.6531C76.8867 3.6531 76.5226 3.64225 76.1621 3.65671C75.9254 3.66756 75.6887 3.72182 75.452 3.75437C75.6705 3.82309 75.8817 3.92075 76.1038 3.9533C77.3565 4.13777 78.6091 4.31499 79.8653 4.47052C80.0583 4.49584 80.2659 4.39818 80.4662 4.3584C80.2914 4.21372 80.1312 3.98224 79.9345 3.94607C79.0497 3.78331 78.1539 3.67842 77.2618 3.55182L77.2581 3.55544ZM72.7575 1.71804C72.0073 1.59145 71.4794 1.38167 71.006 1.46124C70.5362 1.54081 70.1066 1.89889 69.6878 2.17739C69.5859 2.24611 69.6041 2.48845 69.564 2.64759C70.0192 2.59695 70.4743 2.57525 70.9222 2.48845C71.3337 2.40887 71.7379 2.27866 72.1384 2.14122C72.2768 2.0942 72.3897 1.97123 72.7575 1.71081V1.71804ZM55.5631 3.55906C57.067 3.45778 58.3269 3.37821 59.5904 3.28055C59.7579 3.26609 59.9181 3.16843 60.082 3.10694C59.9327 3.04907 59.7798 2.94418 59.6305 2.94056C58.3669 2.89716 57.1034 2.84291 55.8398 2.86822C55.5376 2.87546 55.239 3.17205 54.9368 3.33481C55.2172 3.43608 55.4975 3.53736 55.5667 3.56267L55.5631 3.55906ZM63.5267 1.05976C63.29 1.12486 63.0169 1.20082 62.7474 1.27678C62.9841 1.43592 63.2026 1.63485 63.4575 1.74698C63.7889 1.89165 64.1421 2.00739 64.4953 2.06165C64.965 2.13399 65.4457 2.13399 65.919 2.16654C65.4966 1.84825 65.1034 1.46847 64.6373 1.22614C64.3351 1.07061 63.9309 1.1104 63.5267 1.05614V1.05976ZM59.9036 1.57336C59.889 1.61677 59.8781 1.65655 59.8635 1.69996C59.7433 1.69272 59.6195 1.65655 59.5067 1.68187C59.1644 1.75421 58.8294 1.85187 58.4871 1.93867C58.793 2.0291 59.0952 2.13399 59.4047 2.20633C59.5758 2.24611 59.7615 2.23164 59.94 2.2425C60.7629 2.2859 61.5859 2.3293 62.4052 2.3727C61.5713 2.10867 60.7338 1.84102 59.8999 1.57698L59.9036 1.57336ZM54.3214 2.25696C54.7183 2.10867 55.2354 1.91335 55.7561 1.72166C55.5594 1.66017 55.3519 1.51911 55.1698 1.54805C54.4161 1.65655 53.6696 1.8157 52.9195 1.95676C53.3237 2.04356 53.7279 2.13037 54.3214 2.26058V2.25696ZM75.2008 2.97311C75.452 2.92248 75.9946 2.81397 76.5372 2.70546C75.9291 2.60419 75.3246 2.48121 74.7165 2.40887C74.4871 2.37994 74.2395 2.43419 74.0137 2.4993C73.8062 2.55717 73.6168 2.67291 73.4165 2.76333C73.6095 2.83205 73.7989 2.94056 73.9992 2.96588C74.2905 3.00205 74.5927 2.97311 75.2008 2.97311ZM127.064 58.5436C127.017 58.4496 126.966 58.3555 126.919 58.2579C126.875 58.3447 126.78 58.4459 126.795 58.5219C126.82 58.6413 126.919 58.7425 126.984 58.851C127.01 58.7498 127.035 58.6485 127.064 58.5436Z"
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/GuestIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/GuestIcon.tsx
index 90dc1750969..13a46228eb2 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/GuestIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/GuestIcon.tsx
@@ -6,16 +6,16 @@ import type { IconFC } from "./types.js";
 export const GuestIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 24 24"
       fill="none"
+      height={props.size}
+      role="presentation"
       stroke={props.color ?? "currentColor"}
-      strokeWidth="2"
       strokeLinecap="round"
       strokeLinejoin="round"
-      role="presentation"
+      strokeWidth="2"
+      viewBox="0 0 24 24"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
       <path d="M19 21v-2a4 4 0 0 0-4-4H9a4 4 0 0 0-4 4v2" />
       <circle cx="12" cy="7" r="4" />
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ImageIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ImageIcon.tsx
index ed6b7db5174..02b252d11d3 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ImageIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ImageIcon.tsx
@@ -6,18 +6,18 @@ import type { IconFC } from "./types.js";
 export const ImageIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 24 24"
       fill="none"
+      height={props.size}
+      role="presentation"
       stroke="currentColor"
-      strokeWidth="2"
       strokeLinecap="round"
       strokeLinejoin="round"
-      role="presentation"
+      strokeWidth="2"
+      viewBox="0 0 24 24"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />
+      <rect height="18" rx="2" ry="2" width="18" x="3" y="3" />
       <circle cx="9" cy="9" r="2" />
       <path d="m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21" />
     </svg>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/KeyIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/KeyIcon.tsx
index 1b0dc42f498..fe38a02dc06 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/KeyIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/KeyIcon.tsx
@@ -6,27 +6,27 @@ import type { IconFC } from "./types.js";
 export const KeyIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 24 24"
       fill="none"
+      height={props.size}
       role="presentation"
+      viewBox="0 0 24 24"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
       <path
         d="M2 5.99999L2 2.99999C2 2.39999 2.4 1.99999 3 1.99999H7L7 4.99999H10V7.99999H12L13.4 9.39999C14.7898 8.91585 16.3028 8.9177 17.6915 9.40524C19.0801 9.89278 20.2622 10.8372 21.0444 12.0839C21.8265 13.3306 22.1624 14.8058 21.9971 16.2683C21.8318 17.7307 21.1751 19.0937 20.1344 20.1344C19.0937 21.1751 17.7307 21.8318 16.2683 21.9971C14.8058 22.1624 13.3306 21.8265 12.0839 21.0444C10.8372 20.2622 9.89279 19.0801 9.40525 17.6915C8.91771 16.3028 8.91585 14.7898 9.4 13.4L2 5.99999Z"
         stroke="currentColor"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <path
         d="M15.5 15C15.7761 15 16 15.2239 16 15.5C16 15.7761 15.7761 16 15.5 16C15.2239 16 15 15.7761 15 15.5C15 15.2239 15.2239 15 15.5 15Z"
         fill="currentColor"
         stroke="currentColor"
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/LockIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/LockIcon.tsx
index 712d98bec93..7a0c02d61f0 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/LockIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/LockIcon.tsx
@@ -6,12 +6,12 @@ import type { IconFC } from "./types.js";
 export const LockIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
+      fill="none"
       height={props.size}
+      role="presentation"
       viewBox="0 0 16 21"
-      fill="none"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
     >
       <path
         d="M2 21C1.45 21 0.979333 20.8043 0.588 20.413C0.196 20.021 0 19.55 0 19V9C0 8.45 0.196 7.979 0.588 7.587C0.979333 7.19567 1.45 7 2 7H3V5C3 3.61667 3.48767 2.43733 4.463 1.462C5.43767 0.487333 6.61667 0 8 0C9.38333 0 10.5627 0.487333 11.538 1.462C12.5127 2.43733 13 3.61667 13 5V7H14C14.55 7 15.021 7.19567 15.413 7.587C15.8043 7.979 16 8.45 16 9V19C16 19.55 15.8043 20.021 15.413 20.413C15.021 20.8043 14.55 21 14 21H2ZM8 16C8.55 16 9.021 15.8043 9.413 15.413C9.80433 15.021 10 14.55 10 14C10 13.45 9.80433 12.979 9.413 12.587C9.021 12.1957 8.55 12 8 12C7.45 12 6.97933 12.1957 6.588 12.587C6.196 12.979 6 13.45 6 14C6 14.55 6.196 15.021 6.588 15.413C6.97933 15.8043 7.45 16 8 16ZM5 7H11V5C11 4.16667 10.7083 3.45833 10.125 2.875C9.54167 2.29167 8.83333 2 8 2C7.16667 2 6.45833 2.29167 5.875 2.875C5.29167 3.45833 5 4.16667 5 5V7Z"
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/MultiUserIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/MultiUserIcon.tsx
index 61f28a1dec1..968ba1042c1 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/MultiUserIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/MultiUserIcon.tsx
@@ -6,19 +6,19 @@ import type { IconFC } from "./types.js";
 export const MultiUserIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 24 24"
       fill="none"
+      height={props.size}
       role="presentation"
+      viewBox="0 0 24 24"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
         d="M22 21V19C22 17.1362 20.7252 15.5701 19 15.126M15.5 3.29076C16.9659 3.88415 18 5.32131 18 7C18 8.67869 16.9659 10.1159 15.5 10.7092M17 21C17 19.1362 17 18.2044 16.6955 17.4693C16.2895 16.4892 15.5108 15.7105 14.5307 15.3045C13.7956 15 12.8638 15 11 15H8C6.13623 15 5.20435 15 4.46927 15.3045C3.48915 15.7105 2.71046 16.4892 2.30448 17.4693C2 18.2044 2 19.1362 2 21M13.5 7C13.5 9.20914 11.7091 11 9.5 11C7.29086 11 5.5 9.20914 5.5 7C5.5 4.79086 7.29086 3 9.5 3C11.7091 3 13.5 4.79086 13.5 7Z"
         stroke="currentColor"
-        strokeWidth="2"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="2"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/OutlineWalletIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/OutlineWalletIcon.tsx
index 59210957c8a..2f64e5419d7 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/OutlineWalletIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/OutlineWalletIcon.tsx
@@ -6,26 +6,26 @@ import type { IconFC } from "./types.js";
 export const OutlineWalletIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
+      fill="none"
       height={props.size}
-      viewBox="0 0 24 24"
       role="presentation"
-      fill="none"
+      viewBox="0 0 24 24"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
         d="M19 7V4C19 3.73478 18.8946 3.48043 18.7071 3.29289C18.5196 3.10536 18.2652 3 18 3H5C4.46957 3 3.96086 3.21071 3.58579 3.58579C3.21071 3.96086 3 4.46957 3 5C3 5.53043 3.21071 6.03914 3.58579 6.41421C3.96086 6.78929 4.46957 7 5 7H20C20.2652 7 20.5196 7.10536 20.7071 7.29289C20.8946 7.48043 21 7.73478 21 8V12M21 12H18C17.4696 12 16.9609 12.2107 16.5858 12.5858C16.2107 12.9609 16 13.4696 16 14C16 14.5304 16.2107 15.0391 16.5858 15.4142C16.9609 15.7893 17.4696 16 18 16H21C21.2652 16 21.5196 15.8946 21.7071 15.7071C21.8946 15.5196 22 15.2652 22 15V13C22 12.7348 21.8946 12.4804 21.7071 12.2929C21.5196 12.1054 21.2652 12 21 12Z"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
       <path
         d="M3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H20C20.2652 21 20.5196 20.8946 20.7071 20.7071C20.8946 20.5196 21 20.2652 21 20V16"
         stroke={props.color ?? "currentColor"}
-        strokeWidth="1.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        strokeWidth="1.5"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/PhoneIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/PhoneIcon.tsx
index 08b62608b1b..cfb50ea373c 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/PhoneIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/PhoneIcon.tsx
@@ -1,30 +1,32 @@
+import { useId } from "react";
 import type { IconFC } from "./types.js";
 
 /**
  * @internal
  */
 export const PhoneIcon: IconFC = (props) => {
+  const clipPathId = useId();
   return (
     <svg
-      width={props.size}
+      fill="none"
       height={props.size}
+      role="presentation"
       viewBox="0 0 16 16"
-      fill="none"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
     >
-      <g clipPath="url(#clip0_5639_632)">
+      <g clipPath={`url(#${clipPathId})`}>
         <path
           d="M14.6669 11.2802V13.2802C14.6677 13.4659 14.6297 13.6497 14.5553 13.8198C14.4809 13.9899 14.3718 14.1426 14.235 14.2681C14.0982 14.3937 13.9367 14.4892 13.7608 14.5487C13.5849 14.6082 13.3985 14.6303 13.2136 14.6136C11.1622 14.3907 9.19161 13.6897 7.46028 12.5669C5.8495 11.5433 4.48384 10.1777 3.46028 8.56689C2.3336 6.8277 1.63244 4.84756 1.41361 2.78689C1.39695 2.60254 1.41886 2.41673 1.47795 2.24131C1.53703 2.06589 1.63199 1.90469 1.75679 1.76797C1.88159 1.63126 2.03348 1.52203 2.20281 1.44724C2.37213 1.37245 2.55517 1.33374 2.74028 1.33356H4.74028C5.06382 1.33038 5.37748 1.44495 5.62279 1.65592C5.8681 1.86689 6.02833 2.15986 6.07361 2.48023C6.15803 3.12027 6.31458 3.74871 6.54028 4.35356C6.62998 4.59218 6.64939 4.8515 6.59622 5.10081C6.54305 5.35012 6.41952 5.57897 6.24028 5.76023L5.39361 6.60689C6.34265 8.27592 7.72458 9.65786 9.39361 10.6069L10.2403 9.76023C10.4215 9.58099 10.6504 9.45746 10.8997 9.40429C11.149 9.35112 11.4083 9.37053 11.6469 9.46023C12.2518 9.68593 12.8802 9.84248 13.5203 9.92689C13.8441 9.97258 14.1399 10.1357 14.3513 10.3852C14.5627 10.6348 14.6751 10.9533 14.6669 11.2802Z"
           stroke={props.color ?? "currentColor"}
-          strokeWidth="1.33333"
           strokeLinecap="round"
           strokeLinejoin="round"
+          strokeWidth="1.33333"
         />
       </g>
       <defs>
-        <clipPath id="clip0_5639_632">
-          <rect width="16" height="16" fill="white" />
+        <clipPath id={clipPathId}>
+          <rect fill="white" height="16" width="16" />
         </clipPath>
       </defs>
     </svg>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/PlayStoreIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/PlayStoreIcon.tsx
index fc71f1b618e..358d9af8617 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/PlayStoreIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/PlayStoreIcon.tsx
@@ -6,12 +6,12 @@ import type { IconFC } from "./types.js";
 export const PlayStoreIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 23 26"
       fill="none"
+      height={props.size}
       role="presentation"
+      viewBox="0 0 23 26"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
       <path
         d="M10.5832 12.0978L0.0976562 23.2275C0.0980507 23.2298 0.0988382 23.2317 0.0992076 23.2341C0.420793 24.4427 1.52467 25.3326 2.83473 25.3326C3.35844 25.3326 3.85012 25.191 4.27179 24.9424L4.30528 24.9228L16.1087 18.1117L10.5838 12.0977"
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ThirdwebTextIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ThirdwebTextIcon.tsx
index cceb7317d67..bb6c4bcb0a5 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ThirdwebTextIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/ThirdwebTextIcon.tsx
@@ -1,33 +1,36 @@
+import { useId } from "react";
+
 /**
  * @internal
  */
 export const ThirdwebTextIcon = (props: { height: number }) => {
+  const clipPathId = useId();
   return (
     <svg
-      width={(props.height * 74) / 11}
+      fill="none"
       height={props.height}
+      role="presentation"
       viewBox="0 0 74 11"
-      fill="none"
+      width={(props.height * 74) / 11}
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
     >
       <path
-        fillRule="evenodd"
         clipRule="evenodd"
         d="M34.1489 0.373291C33.5297 0.373291 33.022 0.874761 33.022 1.51414C33.022 2.14097 33.5297 2.64244 34.1489 2.64244C34.7681 2.64244 35.2758 2.14097 35.2758 1.51414C35.2758 0.874761 34.7681 0.373291 34.1489 0.373291ZM35.1396 3.21913H33.1706V9.97644H35.1396V3.21913ZM21.6787 0.624035H23.5982V3.21914H25.0718V5.02444H23.5982V7.40642C23.5982 7.75745 23.8706 8.03326 24.205 8.03326H25.0594V9.95138H24.205C22.818 9.95138 21.6787 8.81054 21.6787 7.39389V5.0119H20.7871V3.20661H21.6787V0.624035ZM29.7652 3.0687C28.8736 3.0687 28.1677 3.44481 27.8953 4.03403V0.624035H25.9263V9.96392H27.8953V6.17782C27.8953 5.388 28.403 4.83639 29.1213 4.83639C29.8519 4.83639 30.2605 5.31278 30.2605 6.11514V9.97646H32.2295V5.8644C32.2295 4.10925 31.3379 3.0687 29.7652 3.0687ZM37.9507 3.2066V4.13432C38.2479 3.45734 38.9661 3.0687 39.8701 3.05616C40.0063 3.05616 40.1797 3.0687 40.3902 3.09377V4.97429C40.1921 4.93668 39.9692 4.9116 39.7339 4.9116C38.607 4.9116 37.9507 5.55098 37.9507 6.66675V9.96392H35.9817V3.2066H37.9507ZM45.9257 4.09672C45.7275 3.50749 44.9474 3.09378 43.9443 3.09378C43.0032 3.09378 42.2106 3.43227 41.5791 4.10926C40.9599 4.7737 40.6379 5.61367 40.6379 6.59154C40.6379 7.5694 40.9599 8.39683 41.5791 9.08635C42.2106 9.7508 43.0032 10.0893 43.9443 10.0893C44.9474 10.0893 45.7275 9.67558 45.9257 9.08635V9.97646H47.8946V0.624035H45.9257V4.09672ZM45.5294 7.79506C45.195 8.12102 44.7864 8.27146 44.3034 8.27146C43.8329 8.27146 43.4242 8.10848 43.1022 7.79506C42.7679 7.45657 42.6069 7.0554 42.6069 6.59154C42.6069 6.12767 42.7679 5.7265 43.1022 5.40054C43.4366 5.06205 43.8329 4.89907 44.3034 4.89907C44.7988 4.89907 45.2074 5.06205 45.5294 5.40054C45.8761 5.7265 46.0495 6.12767 46.0495 6.59154C46.0495 7.0554 45.8761 7.45657 45.5294 7.79506ZM53.5787 3.2442L55.3619 6.45361L56.5631 3.21913H58.4949L55.7458 10.3651L53.5787 6.47868L51.4115 10.3651L48.6748 3.21913H50.6066L51.7954 6.45361L53.5787 3.2442ZM61.7394 3.05616C60.7239 3.05616 59.8694 3.38212 59.2007 4.03403C58.5444 4.6734 58.2101 5.5259 58.2101 6.57899V6.64167C58.2101 7.69476 58.5444 8.54726 59.2007 9.18664C59.8818 9.81347 60.7487 10.1394 61.8384 10.1394C62.8539 10.1394 63.6836 9.93884 64.3151 9.52513V7.78252C63.6959 8.22131 62.9034 8.43443 61.9499 8.43443C60.9097 8.43443 60.2286 7.92042 60.1914 7.11807H65.0829C65.1077 6.91748 65.12 6.69182 65.12 6.46616C65.12 5.50083 64.7981 4.69848 64.1789 4.04657C63.5597 3.38212 62.73 3.05616 61.7394 3.05616ZM60.1914 5.82679C60.2038 5.51337 60.3648 5.25009 60.662 5.03697C60.9716 4.82385 61.3183 4.71101 61.7394 4.71101C62.5195 4.71101 63.1263 5.22502 63.1263 5.82679H60.1914ZM69.8135 3.09378C70.7546 3.09378 71.5472 3.43227 72.1663 4.10925C72.7979 4.78624 73.1199 5.60113 73.1199 6.579C73.1199 7.55686 72.7979 8.38429 72.1663 9.07381C71.5472 9.73826 70.7546 10.0768 69.8135 10.0768C68.8104 10.0768 68.0302 9.66304 67.8321 9.07381V9.96392H65.8631V0.624035H67.8321V4.09672C68.0302 3.50749 68.8104 3.09378 69.8135 3.09378ZM69.4543 8.27146C69.9249 8.27146 70.3212 8.12102 70.6555 7.79506C70.9899 7.45657 71.1509 7.05539 71.1509 6.59153C71.1509 6.12767 70.9899 5.7265 70.6555 5.40054C70.3336 5.06205 69.9249 4.89907 69.4543 4.89907C68.9714 4.89907 68.5627 5.06205 68.216 5.40054C67.8816 5.7265 67.7083 6.12767 67.7083 6.59153C67.7083 7.05539 67.8816 7.45657 68.216 7.79506C68.5503 8.10848 68.959 8.27146 69.4543 8.27146Z"
         fill="currentColor"
+        fillRule="evenodd"
       />
-      <g clipPath="url(#clip0_5017_2727)">
+      <g clipPath={`url(#${clipPathId})`}>
         <path
-          fillRule="evenodd"
           clipRule="evenodd"
           d="M0.045011 0.900694C-0.126602 0.467742 0.193222 0 0.661257 0H3.56697C3.83999 0 4.08181 0.162357 4.18322 0.413623L6.49609 6.18115C6.55849 6.33578 6.55849 6.50973 6.49609 6.66822L5.04128 10.2903C4.81896 10.8431 4.03111 10.8431 3.80879 10.2903L0.045011 0.900694ZM5.65759 0.881366C5.50158 0.45228 5.8214 0 6.28164 0H8.81292C9.09374 0 9.34336 0.173954 9.43697 0.432951L11.5392 6.20048C11.5899 6.34351 11.5899 6.502 11.5392 6.6489L10.2755 10.1164C10.0649 10.6962 9.23805 10.6962 9.02744 10.1164L5.65759 0.881366ZM11.3404 0C10.8724 0 10.5525 0.467742 10.7241 0.900694L14.4879 10.2903C14.7102 10.8431 15.4981 10.8431 15.7204 10.2903L17.1752 6.66822C17.2376 6.50973 17.2376 6.33578 17.1752 6.18115L14.8623 0.413623C14.7609 0.162357 14.5191 0 14.2461 0H11.3404Z"
           fill="currentColor"
+          fillRule="evenodd"
         />
       </g>
       <defs>
-        <clipPath id="clip0_5017_2727">
-          <rect width="17.219" height="10.7049" fill="white" />
+        <clipPath id={clipPathId}>
+          <rect fill="white" height="10.7049" width="17.219" />
         </clipPath>
       </defs>
     </svg>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/WalletConnectIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/WalletConnectIcon.tsx
index a66a979487d..9fbbda81aaf 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/WalletConnectIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/WalletConnectIcon.tsx
@@ -6,11 +6,11 @@ import type { IconFC } from "./types.js";
 export const WalletConnectIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 24 24"
       fill="none"
+      height={props.size}
       role="presentation"
+      viewBox="0 0 24 24"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/CADIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/CADIcon.tsx
index 3cf4eca4764..2b6f92f39a0 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/CADIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/CADIcon.tsx
@@ -1,26 +1,28 @@
+import { useId } from "react";
 import type { IconFC } from "../types.js";
 
 export const CADIcon: IconFC = (props) => {
+  const id = useId();
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
+      aria-hidden="true"
       height={props.size}
       viewBox="0 0 512 512"
-      aria-hidden="true"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <mask id="a">
-        <circle cx="256" cy="256" r="256" fill="#fff" />
+      <mask id={id}>
+        <circle cx="256" cy="256" fill="#fff" r="256" />
       </mask>
-      <g mask="url(#a)">
+      <g mask={`url(#${id})`}>
         <path
-          fill="#d80027"
           d="M0 0v512h144l112-64 112 64h144V0H368L256 64 144 0Z"
+          fill="#d80027"
         />
-        <path fill="#eee" d="M144 0h224v512H144Z" />
+        <path d="M144 0h224v512H144Z" fill="#eee" />
         <path
-          fill="#d80027"
           d="m301 289 44-22-22-11v-22l-45 22 23-44h-23l-22-34-22 33h-23l23 45-45-22v22l-22 11 45 22-12 23h45v33h22v-33h45z"
+          fill="#d80027"
         />
       </g>
     </svg>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/EURIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/EURIcon.tsx
index 82f7ef76300..155013a743d 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/EURIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/EURIcon.tsx
@@ -1,22 +1,24 @@
+import { useId } from "react";
 import type { IconFC } from "../types.js";
 
 export const EURIcon: IconFC = (props) => {
+  const id = useId();
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width={props.size}
+      aria-hidden="true"
       height={props.size}
       viewBox="0 0 512 512"
-      aria-hidden="true"
+      width={props.size}
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <mask id="a">
-        <circle cx="256" cy="256" r="256" fill="#fff" />
+      <mask id={id}>
+        <circle cx="256" cy="256" fill="#fff" r="256" />
       </mask>
-      <g mask="url(#a)">
-        <path fill="#0052b4" d="M0 0h512v512H0z" />
+      <g mask={`url(#${id})`}>
+        <path d="M0 0h512v512H0z" fill="#0052b4" />
         <path
-          fill="#ffda44"
           d="m256 100.2 8.3 25.5H291l-21.7 15.7 8.3 25.6-21.7-15.8-21.7 15.8 8.3-25.6-21.7-15.7h26.8zm-110.2 45.6 24 12.2 18.9-19-4.2 26.5 23.9 12.2-26.5 4.2-4.2 26.5-12.2-24-26.5 4.3 19-19zM100.2 256l25.5-8.3V221l15.7 21.7 25.6-8.3-15.8 21.7 15.8 21.7-25.6-8.3-15.7 21.7v-26.8zm45.6 110.2 12.2-24-19-18.9 26.5 4.2 12.2-23.9 4.2 26.5 26.5 4.2-24 12.2 4.3 26.5-19-19zM256 411.8l-8.3-25.5H221l21.7-15.7-8.3-25.6 21.7 15.8 21.7-15.8-8.3 25.6 21.7 15.7h-26.8zm110.2-45.6-24-12.2-18.9 19 4.2-26.5-23.9-12.2 26.5-4.2 4.2-26.5 12.2 24 26.5-4.3-19 19zM411.8 256l-25.5 8.3V291l-15.7-21.7-25.6 8.3 15.8-21.7-15.8-21.7 25.6 8.3 15.7-21.7v26.8zm-45.6-110.2-12.2 24 19 18.9-26.5-4.2-12.2 23.9-4.2-26.5-26.5-4.2 24-12.2-4.3-26.5 19 19z"
+          fill="#ffda44"
         />
       </g>
     </svg>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/GBPIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/GBPIcon.tsx
index 81332134c15..3c42c39f890 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/GBPIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/GBPIcon.tsx
@@ -3,71 +3,70 @@ import type { IconFC } from "../types.js";
 export const GBPIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
+      aria-hidden="true"
+      height={props.size}
       version="1.1"
-      id="Layer_1"
+      viewBox="0 0 512 512"
+      width={props.size}
       x="0px"
+      xmlns="http://www.w3.org/2000/svg"
       y="0px"
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 512 512"
-      aria-hidden="true"
     >
-      <circle fill="#F0F0F0" cx="256" cy="256" r="256" />
+      <circle cx="256" cy="256" fill="#F0F0F0" r="256" />
       <g>
         <path
-          fill="#0052B4"
           d="M52.92,100.142c-20.109,26.163-35.272,56.318-44.101,89.077h133.178L52.92,100.142z"
+          fill="#0052B4"
         />
         <path
-          fill="#0052B4"
           d="M503.181,189.219c-8.829-32.758-23.993-62.913-44.101-89.076l-89.075,89.076H503.181z"
+          fill="#0052B4"
         />
         <path
-          fill="#0052B4"
           d="M8.819,322.784c8.83,32.758,23.993,62.913,44.101,89.075l89.074-89.075L8.819,322.784L8.819,322.784   z"
+          fill="#0052B4"
         />
         <path
-          fill="#0052B4"
           d="M411.858,52.921c-26.163-20.109-56.317-35.272-89.076-44.102v133.177L411.858,52.921z"
+          fill="#0052B4"
         />
         <path
-          fill="#0052B4"
           d="M100.142,459.079c26.163,20.109,56.318,35.272,89.076,44.102V370.005L100.142,459.079z"
+          fill="#0052B4"
         />
         <path
-          fill="#0052B4"
           d="M189.217,8.819c-32.758,8.83-62.913,23.993-89.075,44.101l89.075,89.075V8.819z"
+          fill="#0052B4"
         />
         <path
-          fill="#0052B4"
           d="M322.783,503.181c32.758-8.83,62.913-23.993,89.075-44.101l-89.075-89.075V503.181z"
+          fill="#0052B4"
         />
         <path
-          fill="#0052B4"
           d="M370.005,322.784l89.075,89.076c20.108-26.162,35.272-56.318,44.101-89.076H370.005z"
+          fill="#0052B4"
         />
       </g>
       <g>
         <path
-          fill="#D80027"
           d="M509.833,222.609h-220.44h-0.001V2.167C278.461,0.744,267.317,0,256,0   c-11.319,0-22.461,0.744-33.391,2.167v220.44v0.001H2.167C0.744,233.539,0,244.683,0,256c0,11.319,0.744,22.461,2.167,33.391   h220.44h0.001v220.442C233.539,511.256,244.681,512,256,512c11.317,0,22.461-0.743,33.391-2.167v-220.44v-0.001h220.442   C511.256,278.461,512,267.319,512,256C512,244.683,511.256,233.539,509.833,222.609z"
+          fill="#D80027"
         />
         <path
-          fill="#D80027"
           d="M322.783,322.784L322.783,322.784L437.019,437.02c5.254-5.252,10.266-10.743,15.048-16.435   l-97.802-97.802h-31.482V322.784z"
+          fill="#D80027"
         />
         <path
-          fill="#D80027"
           d="M189.217,322.784h-0.002L74.98,437.019c5.252,5.254,10.743,10.266,16.435,15.048l97.802-97.804   V322.784z"
+          fill="#D80027"
         />
         <path
-          fill="#D80027"
           d="M189.217,189.219v-0.002L74.981,74.98c-5.254,5.252-10.266,10.743-15.048,16.435l97.803,97.803   H189.217z"
+          fill="#D80027"
         />
         <path
-          fill="#D80027"
           d="M322.783,189.219L322.783,189.219L437.02,74.981c-5.252-5.254-10.743-10.266-16.435-15.047   l-97.802,97.803V189.219z"
+          fill="#D80027"
         />
       </g>
     </svg>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/JPYIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/JPYIcon.tsx
index d101b0668b2..ecfe6229bde 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/JPYIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/JPYIcon.tsx
@@ -3,11 +3,11 @@ import type { IconFC } from "../types.js";
 export const JPYIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
       height={props.size}
+      role="presentation"
       viewBox="0 0 32 32"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
-      role="presentation"
     >
       <g fill="none" fillRule="evenodd">
         <circle cx="16" cy="16" fill="#a81b1b" r="16" />
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/USDIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/USDIcon.tsx
index a204946c5ae..4b5be861ed9 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/USDIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/icons/currencies/USDIcon.tsx
@@ -6,37 +6,37 @@ import type { IconFC } from "../types.js";
 export const USDIcon: IconFC = (props) => {
   return (
     <svg
-      xmlns="http://www.w3.org/2000/svg"
+      aria-hidden="true"
+      height={props.size}
       version="1.1"
+      viewBox="0 0 512 512"
       width={props.size}
-      height={props.size}
       x="0px"
+      xmlns="http://www.w3.org/2000/svg"
       y="0px"
-      viewBox="0 0 512 512"
-      aria-hidden="true"
     >
-      <circle fill="#F0F0F0" cx="256" cy="256" r="256" />
+      <circle cx="256" cy="256" fill="#F0F0F0" r="256" />
       <g>
         <path
-          fill="#D80027"
           d="M244.87,256H512c0-23.106-3.08-45.49-8.819-66.783H244.87V256z"
+          fill="#D80027"
         />
         <path
-          fill="#D80027"
           d="M244.87,122.435h229.556c-15.671-25.572-35.708-48.175-59.07-66.783H244.87V122.435z"
+          fill="#D80027"
         />
         <path
-          fill="#D80027"
           d="M256,512c60.249,0,115.626-20.824,159.356-55.652H96.644C140.374,491.176,195.751,512,256,512z"
+          fill="#D80027"
         />
         <path
-          fill="#D80027"
           d="M37.574,389.565h436.852c12.581-20.529,22.338-42.969,28.755-66.783H8.819   C15.236,346.596,24.993,369.036,37.574,389.565z"
+          fill="#D80027"
         />
       </g>
       <path
-        fill="#0052B4"
         d="M118.584,39.978h23.329l-21.7,15.765l8.289,25.509l-21.699-15.765L85.104,81.252l7.16-22.037  C73.158,75.13,56.412,93.776,42.612,114.552h7.475l-13.813,10.035c-2.152,3.59-4.216,7.237-6.194,10.938l6.596,20.301l-12.306-8.941  c-3.059,6.481-5.857,13.108-8.372,19.873l7.267,22.368h26.822l-21.7,15.765l8.289,25.509l-21.699-15.765l-12.998,9.444  C0.678,234.537,0,245.189,0,256h256c0-141.384,0-158.052,0-256C205.428,0,158.285,14.67,118.584,39.978z M128.502,230.4  l-21.699-15.765L85.104,230.4l8.289-25.509l-21.7-15.765h26.822l8.288-25.509l8.288,25.509h26.822l-21.7,15.765L128.502,230.4z   M120.213,130.317l8.289,25.509l-21.699-15.765l-21.699,15.765l8.289-25.509l-21.7-15.765h26.822l8.288-25.509l8.288,25.509h26.822  L120.213,130.317z M220.328,230.4l-21.699-15.765L176.93,230.4l8.289-25.509l-21.7-15.765h26.822l8.288-25.509l8.288,25.509h26.822  l-21.7,15.765L220.328,230.4z M212.039,130.317l8.289,25.509l-21.699-15.765l-21.699,15.765l8.289-25.509l-21.7-15.765h26.822  l8.288-25.509l8.288,25.509h26.822L212.039,130.317z M212.039,55.743l8.289,25.509l-21.699-15.765L176.93,81.252l8.289-25.509  l-21.7-15.765h26.822l8.288-25.509l8.288,25.509h26.822L212.039,55.743z"
+        fill="#0052B4"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/br.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/br.ts
index 340c8fd5e45..a05312ba1e8 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/br.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/br.ts
@@ -1,123 +1,123 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectWalletLocalPtBr: ConnectLocale = {
-  id: "pt_BR",
-  signIn: "Entrar",
-  defaultButtonTitle: "Conectar carteira",
+  agreement: {
+    and: "e",
+    prefix: "Ao conectar, você aceita os",
+    privacyPolicy: "Política de privacidade",
+    termsOfService: "Termos de serviço",
+  },
+  backupWallet: "Fazer backup da carteira",
+  buy: "Comprar",
+  confirmInWallet: "Confirmar na carteira",
+  connectAWallet: "Conectar uma carteira",
+  connectedToSmartWallet: "carteira inteligente",
   connecting: "Conectando",
-  switchNetwork: "Trocar de rede",
-  switchingNetwork: "Trocando de rede",
-  defaultModalTitle: "Conectar",
-  recommended: "Recomendado",
-  installed: "Instalado",
   continueAsGuest: "Continuar como convidado",
-  connectAWallet: "Conectar uma carteira",
-  newToWallets: "Novo em carteiras?",
+  copyAddress: "Copiar endereço",
+  currentNetwork: "Rede atual",
+  defaultButtonTitle: "Conectar carteira",
+  defaultModalTitle: "Conectar",
+  disconnectWallet: "Desconectar carteira",
   getStarted: "Começar",
+  goBackButton: "Voltar",
   guest: "Convidado",
-  send: "Enviar",
-  receive: "Receber",
-  buy: "Comprar",
-  transactions: "Transações",
-  payTransactions: "Transações Fiat",
-  walletTransactions: "Transações de Carteira",
-  viewAllTransactions: "Ver todas as transações",
-  currentNetwork: "Rede atual",
-  switchAccount: "Trocar conta",
-  requestTestnetFunds: "Solicitar fundos para Testnet",
-  backupWallet: "Fazer backup da carteira",
   guestWalletWarning:
     "Esta é uma carteira de convidado temporária. Faça um backup se não quiser perder o acesso a ela",
-  switchTo: "Trocar para",
-  connectedToSmartWallet: "carteira inteligente",
-  confirmInWallet: "Confirmar na carteira",
-  disconnectWallet: "Desconectar carteira",
-  copyAddress: "Copiar endereço",
-  personalWallet: "Carteira pessoal",
-  smartWallet: "Carteira inteligente",
-  or: "Ou",
-  goBackButton: "Voltar",
-  passkeys: {
-    title: "Chave de acesso",
-    linkPasskey: "Vincular uma chave de acesso",
-  },
-  welcomeScreen: {
-    defaultTitle: "Sua porta de entrada para o mundo descentralizado",
-    defaultSubtitle: "Conecte uma carteira para começar",
-  },
-  agreement: {
-    prefix: "Ao conectar, você aceita os",
-    termsOfService: "Termos de serviço",
-    and: "e",
-    privacyPolicy: "Política de privacidade",
+  id: "pt_BR",
+  installed: "Instalado",
+  manageWallet: {
+    connectAnApp: "Conectar um Aplicativo",
+    exportPrivateKey: "Exportar chave privada",
+    linkedProfiles: "Perfis vinculados",
+    linkProfile: "Vincular um perfil",
+    title: "Gerenciar Carteira",
   },
   networkSelector: {
-    title: "Selecionar rede",
-    mainnets: "Redes principais",
-    testnets: "Redes de teste",
-    allNetworks: "Todas",
     addCustomNetwork: "Adicionar rede personalizada",
-    inputPlaceholder: "Buscar rede ou ID da cadeia",
+    allNetworks: "Todas",
     categoryLabel: {
-      recentlyUsed: "Usadas recentemente",
-      popular: "Populares",
       others: "Outras redes",
+      popular: "Populares",
+      recentlyUsed: "Usadas recentemente",
     },
-    loading: "Carregando",
     failedToSwitch: "Erro ao trocar de rede",
+    inputPlaceholder: "Buscar rede ou ID da cadeia",
+    loading: "Carregando",
+    mainnets: "Redes principais",
+    testnets: "Redes de teste",
+    title: "Selecionar rede",
   },
+  newToWallets: "Novo em carteiras?",
+  or: "Ou",
+  passkeys: {
+    linkPasskey: "Vincular uma chave de acesso",
+    title: "Chave de acesso",
+  },
+  payTransactions: "Transações Fiat",
+  personalWallet: "Carteira pessoal",
+  receive: "Receber",
   receiveFundsScreen: {
-    title: "Receber fundos",
     instruction:
       "Copie o endereço da carteira para enviar fundos para esta carteira",
+    title: "Receber fundos",
   },
+  recommended: "Recomendado",
+  requestTestnetFunds: "Solicitar fundos para Testnet",
+  send: "Enviar",
   sendFundsScreen: {
-    title: "Enviar fundos",
-    submitButton: "Enviar",
-    token: "Token",
-    sendTo: "Enviar para",
     amount: "Quantidade",
-    successMessage: "Transação bem-sucedida",
+    insufficientFunds: "Fundos insuficientes",
     invalidAddress: "Endereço inválido",
     noTokensFound: "Nenhum token encontrado",
     searchToken: "Buscar ou colar o endereço do token",
-    transactionFailed: "Transação falhou",
-    transactionRejected: "Transação rejeitada",
-    insufficientFunds: "Fundos insuficientes",
     selectTokenTitle: "Selecione um Token",
     sending: "Enviando",
+    sendTo: "Enviar para",
+    submitButton: "Enviar",
+    successMessage: "Transação bem-sucedida",
+    title: "Enviar fundos",
+    token: "Token",
+    transactionFailed: "Transação falhou",
+    transactionRejected: "Transação rejeitada",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "Entrar",
+      disconnectWallet: "Desconectar carteira",
       instruction:
         "Por favor, assine a solicitação de mensagem na sua carteira para continuar",
       signInButton: "Entrar",
-      disconnectWallet: "Desconectar carteira",
+      title: "Entrar",
     },
     signingScreen: {
-      title: "Entrando",
+      approveTransactionInSafe: "Aprovar transação no Safe",
+      failedToSignIn: "Erro ao entrar",
+      inProgress: "Aguardando confirmação",
       prompt: "Assine a solicitação de assinatura na sua carteira",
       promptForSafe:
         "Assine a solicitação de assinatura na sua carteira e aprove a transação no Safe",
-      approveTransactionInSafe: "Aprovar transação no Safe",
+      title: "Entrando",
       tryAgain: "Tentar novamente",
-      failedToSignIn: "Erro ao entrar",
-      inProgress: "Aguardando confirmação",
     },
   },
-  manageWallet: {
-    title: "Gerenciar Carteira",
-    linkedProfiles: "Perfis vinculados",
-    linkProfile: "Vincular um perfil",
-    connectAnApp: "Conectar um Aplicativo",
-    exportPrivateKey: "Exportar chave privada",
-  },
+  signIn: "Entrar",
+  smartWallet: "Carteira inteligente",
+  switchAccount: "Trocar conta",
+  switchingNetwork: "Trocando de rede",
+  switchNetwork: "Trocar de rede",
+  switchTo: "Trocar para",
+  transactions: "Transações",
+  viewAllTransactions: "Ver todas as transações",
   viewFunds: {
     title: "Ver Fundos",
+    viewAssets: "Ver Ativos",
     viewNFTs: "Ver NFTs",
     viewTokens: "Ver Tokens",
-    viewAssets: "Ver Ativos",
+  },
+  walletTransactions: "Transações de Carteira",
+  welcomeScreen: {
+    defaultSubtitle: "Conecte uma carteira para começar",
+    defaultTitle: "Sua porta de entrada para o mundo descentralizado",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/de.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/de.ts
index f15d03bd66a..696cb496fc7 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/de.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/de.ts
@@ -1,122 +1,122 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectLocaleDe: ConnectLocale = {
-  id: "de_DE",
-  signIn: "Anmelden",
-  defaultButtonTitle: "Wallet verbinden",
-  connecting: "Anmelden",
-  switchNetwork: "Netzwerk wechseln",
-  switchingNetwork: "Netzwerk wechseln",
-  defaultModalTitle: "Anmelden",
-  recommended: "Empfohlen",
-  installed: "Installiert",
+  agreement: {
+    and: "&",
+    prefix: "Durch die Verbindung stimmst du diesen zu:",
+    privacyPolicy: "Datenschutzrichtlinien",
+    termsOfService: "Nutzungsbedingungen",
+  },
+  backupWallet: "Wallet sichern",
   buy: "Kaufen",
-  continueAsGuest: "Als Gast fortfahren",
+  confirmInWallet: "Im Wallet bestätigen",
   connectAWallet: "Wallet verbinden",
-  newToWallets: `Was ist ein "Wallet"?`,
+  connectedToSmartWallet: "Smart Account",
+  connecting: "Anmelden",
+  continueAsGuest: "Als Gast fortfahren",
+  copyAddress: "Adresse kopieren",
+  currentNetwork: "Aktuelles Netzwerk",
+  defaultButtonTitle: "Wallet verbinden",
+  defaultModalTitle: "Anmelden",
+  disconnectWallet: "Wallet trennen",
   getStarted: "Loslegen",
+  goBackButton: "Zurück",
   guest: "Gast",
-  send: "Senden",
-  receive: "Empfangen",
-  currentNetwork: "Aktuelles Netzwerk",
-  switchAccount: "Account wechseln",
-  requestTestnetFunds: "Testnetz-Geld anfordern",
-  transactions: "Transaktionen",
-  payTransactions: "Fiat Transaktionen",
-  walletTransactions: "Wallet Transaktionen",
-  viewAllTransactions: "Alle Transaktionen anzeigen",
-  backupWallet: "Wallet sichern",
   guestWalletWarning:
     "Dies ist ein temporäres Gast-Wallet. Sichere das Wallet, wenn du den Zugriff darauf nicht verlieren möchtest",
-  switchTo: "Wechsle zu", // Used in "Switch to <Wallet-Name>"
-  connectedToSmartWallet: "Smart Account",
-  confirmInWallet: "Im Wallet bestätigen",
-  disconnectWallet: "Wallet trennen",
-  copyAddress: "Adresse kopieren",
-  personalWallet: "Persönliches Wallet",
-  smartWallet: "Smart Wallet",
-  or: "Oder",
-  goBackButton: "Zurück",
-  passkeys: {
-    title: "Passkeys",
-    linkPasskey: "Passkey verknüpfen",
-  },
-  welcomeScreen: {
-    defaultTitle: "Dein Tor zur dezentralen Welt",
-    defaultSubtitle: "Verbinde ein Wallet, um loszulegen",
-  },
-  agreement: {
-    prefix: "Durch die Verbindung stimmst du diesen zu:",
-    termsOfService: "Nutzungsbedingungen",
-    and: "&",
-    privacyPolicy: "Datenschutzrichtlinien",
+  id: "de_DE",
+  installed: "Installiert",
+  manageWallet: {
+    connectAnApp: "App verbinden",
+    exportPrivateKey: "PrivateKey exportieren",
+    linkedProfiles: "Verknüpfte Profile",
+    linkProfile: "Profil verknüpfen",
+    title: "Wallet verwalten",
   },
   networkSelector: {
-    title: "Netzwerk auswählen",
-    mainnets: "Mainnets",
-    testnets: "Testnets",
-    allNetworks: "Alle",
     addCustomNetwork: "Eigenes Netzwerk hinzufügen",
-    inputPlaceholder: "Netzwerk oder Chain ID suchen",
+    allNetworks: "Alle",
     categoryLabel: {
-      recentlyUsed: "Zuletzt verwendet",
-      popular: "Beliebt",
       others: "Alle Netzwerke",
+      popular: "Beliebt",
+      recentlyUsed: "Zuletzt verwendet",
     },
-    loading: "Laden",
     failedToSwitch: "Netzwerkwechsel fehlgeschlagen",
+    inputPlaceholder: "Netzwerk oder Chain ID suchen",
+    loading: "Laden",
+    mainnets: "Mainnets",
+    testnets: "Testnets",
+    title: "Netzwerk auswählen",
   },
+  newToWallets: `Was ist ein "Wallet"?`,
+  or: "Oder",
+  passkeys: {
+    linkPasskey: "Passkey verknüpfen",
+    title: "Passkeys",
+  },
+  payTransactions: "Fiat Transaktionen",
+  personalWallet: "Persönliches Wallet",
+  receive: "Empfangen", // Used in "Switch to <Wallet-Name>"
   receiveFundsScreen: {
-    title: "Geld empfangen",
     instruction:
       "Kopiere die Wallet-Adresse, um Geld an dieses Wallet zu senden",
+    title: "Geld empfangen",
   },
+  recommended: "Empfohlen",
+  requestTestnetFunds: "Testnetz-Geld anfordern",
+  send: "Senden",
   sendFundsScreen: {
-    title: "Geld senden",
-    submitButton: "Senden",
-    token: "Token",
-    sendTo: "Senden an",
     amount: "Betrag",
-    successMessage: "Transaktion erfolgreich",
+    insufficientFunds: "Nicht genügend Guthaben",
     invalidAddress: "Ungültige Adresse",
     noTokensFound: "Keine Token gefunden",
     searchToken: "Token suchen oder einfügen",
-    transactionFailed: "Transaktion fehlgeschlagen",
-    transactionRejected: "Transaktion abgelehnt",
-    insufficientFunds: "Nicht genügend Guthaben",
     selectTokenTitle: "Token auswählen",
     sending: "Sende",
+    sendTo: "Senden an",
+    submitButton: "Senden",
+    successMessage: "Transaktion erfolgreich",
+    title: "Geld senden",
+    token: "Token",
+    transactionFailed: "Transaktion fehlgeschlagen",
+    transactionRejected: "Transaktion abgelehnt",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "Anmelden",
+      disconnectWallet: "Wallet trennen",
       instruction: "Signiere die Anmeldeanfrage in deinem Wallet",
       signInButton: "Anmelden",
-      disconnectWallet: "Wallet trennen",
+      title: "Anmelden",
     },
     signingScreen: {
-      title: "Signaturanfrage",
+      approveTransactionInSafe: "Transaktion im Safe bestätigen",
+      failedToSignIn: "Anmeldung fehlgeschlagen",
+      inProgress: "Warte auf Bestätigung",
       prompt: "Signiere die Signaturanfrage in deinem Wallet",
       promptForSafe:
         "Signiere die Signaturanfrage in deinem Wallet, um fortzufahren",
-      approveTransactionInSafe: "Transaktion im Safe bestätigen",
+      title: "Signaturanfrage",
       tryAgain: "Erneut versuchen",
-      failedToSignIn: "Anmeldung fehlgeschlagen",
-      inProgress: "Warte auf Bestätigung",
     },
   },
-  manageWallet: {
-    title: "Wallet verwalten",
-    connectAnApp: "App verbinden",
-    linkProfile: "Profil verknüpfen",
-    linkedProfiles: "Verknüpfte Profile",
-    exportPrivateKey: "PrivateKey exportieren",
-  },
+  signIn: "Anmelden",
+  smartWallet: "Smart Wallet",
+  switchAccount: "Account wechseln",
+  switchingNetwork: "Netzwerk wechseln",
+  switchNetwork: "Netzwerk wechseln",
+  switchTo: "Wechsle zu",
+  transactions: "Transaktionen",
+  viewAllTransactions: "Alle Transaktionen anzeigen",
   viewFunds: {
     title: "Guthaben anzeigen",
+    viewAssets: "Assets anzeigen",
     viewNFTs: "NFTs anzeigen",
     viewTokens: "Tokens anzeigen",
-    viewAssets: "Assets anzeigen",
+  },
+  walletTransactions: "Wallet Transaktionen",
+  welcomeScreen: {
+    defaultSubtitle: "Verbinde ein Wallet, um loszulegen",
+    defaultTitle: "Dein Tor zur dezentralen Welt",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/en.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/en.ts
index fa5024fa817..37de293fba9 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/en.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/en.ts
@@ -1,121 +1,121 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectLocaleEn: ConnectLocale = {
-  id: "en_US",
-  signIn: "Sign in",
-  defaultButtonTitle: "Connect",
-  connecting: "Connecting",
-  switchNetwork: "Switch Network",
-  switchingNetwork: "Switching Network",
-  defaultModalTitle: "Sign in",
-  recommended: "Recommended",
-  installed: "Installed",
+  agreement: {
+    and: "&",
+    prefix: "By connecting, you agree to the",
+    privacyPolicy: "Privacy Policy",
+    termsOfService: "Terms of Service",
+  },
+  backupWallet: "Backup Wallet",
   buy: "Buy",
-  continueAsGuest: "Continue as guest",
+  confirmInWallet: "Confirm in wallet",
   connectAWallet: "Connect a Wallet",
-  newToWallets: "New to wallets?",
+  connectedToSmartWallet: "Smart Account",
+  connecting: "Connecting",
+  continueAsGuest: "Continue as guest",
+  copyAddress: "Copy Address",
+  currentNetwork: "Current network",
+  defaultButtonTitle: "Connect",
+  defaultModalTitle: "Sign in",
+  disconnectWallet: "Disconnect Wallet",
   getStarted: "Get started",
+  goBackButton: "Back",
   guest: "Guest",
-  send: "Send",
-  receive: "Receive",
-  currentNetwork: "Current network",
-  switchAccount: "Switch Account",
-  requestTestnetFunds: "Request Testnet Funds",
-  transactions: "Transactions",
-  payTransactions: "Fiat Transactions",
-  walletTransactions: "Wallet Transactions",
-  viewAllTransactions: "View All Transactions",
-  backupWallet: "Backup Wallet",
   guestWalletWarning:
     "This is a temporary guest wallet. Backup wallet if you don't want to lose access to it",
-  switchTo: "Switch to", // Used in "Switch to <Wallet-Name>"
-  connectedToSmartWallet: "Smart Account",
-  confirmInWallet: "Confirm in wallet",
-  disconnectWallet: "Disconnect Wallet",
-  copyAddress: "Copy Address",
-  personalWallet: "Personal Wallet",
-  smartWallet: "Smart Wallet",
-  or: "OR",
-  goBackButton: "Back",
-  passkeys: {
-    title: "Passkeys",
-    linkPasskey: "Link a Passkey",
-  },
-  welcomeScreen: {
-    defaultTitle: "Your gateway to the decentralized world",
-    defaultSubtitle: "Connect a wallet to get started",
-  },
-  agreement: {
-    prefix: "By connecting, you agree to the",
-    termsOfService: "Terms of Service",
-    and: "&",
-    privacyPolicy: "Privacy Policy",
+  id: "en_US",
+  installed: "Installed",
+  manageWallet: {
+    connectAnApp: "Connect an App",
+    exportPrivateKey: "Export Private Key",
+    linkedProfiles: "Linked Profiles",
+    linkProfile: "Link a Profile",
+    title: "Manage Wallet",
   },
   networkSelector: {
-    title: "Select Network",
-    mainnets: "Mainnets",
-    testnets: "Testnets",
-    allNetworks: "All",
     addCustomNetwork: "Add Custom Network",
-    inputPlaceholder: "Search Network or Chain ID",
+    allNetworks: "All",
     categoryLabel: {
-      recentlyUsed: "Recently Used",
-      popular: "Popular",
       others: "All Networks",
+      popular: "Popular",
+      recentlyUsed: "Recently Used",
     },
-    loading: "Loading",
     failedToSwitch: "Failed to switch network",
+    inputPlaceholder: "Search Network or Chain ID",
+    loading: "Loading",
+    mainnets: "Mainnets",
+    testnets: "Testnets",
+    title: "Select Network",
   },
+  newToWallets: "New to wallets?",
+  or: "OR",
+  passkeys: {
+    linkPasskey: "Link a Passkey",
+    title: "Passkeys",
+  },
+  payTransactions: "Fiat Transactions",
+  personalWallet: "Personal Wallet",
+  receive: "Receive", // Used in "Switch to <Wallet-Name>"
   receiveFundsScreen: {
-    title: "Receive Funds",
     instruction: "Copy the address to send funds to this wallet",
+    title: "Receive Funds",
   },
+  recommended: "Recommended",
+  requestTestnetFunds: "Request Testnet Funds",
+  send: "Send",
   sendFundsScreen: {
-    title: "Send Funds",
-    submitButton: "Send",
-    token: "Token",
-    sendTo: "Send to",
     amount: "Amount",
-    successMessage: "Transaction Successful",
+    insufficientFunds: "Insufficient Funds",
     invalidAddress: "Invalid Address",
     noTokensFound: "No Tokens Found",
     searchToken: "Search or Paste token address",
-    transactionFailed: "Transaction Failed",
-    transactionRejected: "Transaction Rejected",
-    insufficientFunds: "Insufficient Funds",
     selectTokenTitle: "Select a Token",
     sending: "Sending",
+    sendTo: "Send to",
+    submitButton: "Send",
+    successMessage: "Transaction Successful",
+    title: "Send Funds",
+    token: "Token",
+    transactionFailed: "Transaction Failed",
+    transactionRejected: "Transaction Rejected",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "Sign in",
+      disconnectWallet: "Disconnect Wallet",
       instruction: "Please sign the message request in your wallet to continue",
       signInButton: "Sign in",
-      disconnectWallet: "Disconnect Wallet",
+      title: "Sign in",
     },
     signingScreen: {
-      title: "Signing In",
+      approveTransactionInSafe: "Approve transaction in Safe",
+      failedToSignIn: "Failed to Sign in",
+      inProgress: "Awaiting Confirmation",
       prompt: "Signing the signature request in your wallet",
       promptForSafe:
         "Sign signature request in your wallet & approve transaction in Safe",
-      approveTransactionInSafe: "Approve transaction in Safe",
+      title: "Signing In",
       tryAgain: "Try Again",
-      failedToSignIn: "Failed to Sign in",
-      inProgress: "Awaiting Confirmation",
     },
   },
-  manageWallet: {
-    title: "Manage Wallet",
-    linkedProfiles: "Linked Profiles",
-    linkProfile: "Link a Profile",
-    connectAnApp: "Connect an App",
-    exportPrivateKey: "Export Private Key",
-  },
+  signIn: "Sign in",
+  smartWallet: "Smart Wallet",
+  switchAccount: "Switch Account",
+  switchingNetwork: "Switching Network",
+  switchNetwork: "Switch Network",
+  switchTo: "Switch to",
+  transactions: "Transactions",
+  viewAllTransactions: "View All Transactions",
   viewFunds: {
     title: "View Funds",
+    viewAssets: "View Assets",
     viewNFTs: "View NFTs",
     viewTokens: "View Tokens",
-    viewAssets: "View Assets",
+  },
+  walletTransactions: "Wallet Transactions",
+  welcomeScreen: {
+    defaultSubtitle: "Connect a wallet to get started",
+    defaultTitle: "Your gateway to the decentralized world",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/es.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/es.ts
index 50ff28bf54e..569c69a4fdc 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/es.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/es.ts
@@ -1,123 +1,123 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectWalletLocalEs: ConnectLocale = {
-  id: "es_ES",
-  signIn: "Iniciar sesión",
-  defaultButtonTitle: "Conectar cartera",
+  agreement: {
+    and: "y",
+    prefix: "Al conectar, aceptas los",
+    privacyPolicy: "Política de privacidad",
+    termsOfService: "Términos de servicio",
+  },
+  backupWallet: "Respaldar cartera",
+  buy: "Comprar",
+  confirmInWallet: "Confirmar en cartera",
+  connectAWallet: "Conectar una cartera",
+  connectedToSmartWallet: "cartera inteligente",
   connecting: "Conectando",
-  switchNetwork: "Cambiar red",
-  switchingNetwork: "Cambiando de red",
-  defaultModalTitle: "Conectar",
-  recommended: "Recomendado",
-  installed: "Instalado",
   continueAsGuest: "Continuar como invitado",
-  connectAWallet: "Conectar una cartera",
-  newToWallets: "¿Nuevo en carteras?",
+  copyAddress: "Copiar dirección",
+  currentNetwork: "Red actual",
+  defaultButtonTitle: "Conectar cartera",
+  defaultModalTitle: "Conectar",
+  disconnectWallet: "Desconectar cartera",
   getStarted: "Comenzar",
+  goBackButton: "Atras",
   guest: "Invitado",
-  send: "Enviar",
-  receive: "Recibir",
-  buy: "Comprar",
-  transactions: "Transactions",
-  payTransactions: "Fiat Transactions",
-  walletTransactions: "Wallet Transactions",
-  viewAllTransactions: "View All Transactions", // TODO
-  currentNetwork: "Red actual",
-  switchAccount: "Cambiar cuenta",
-  requestTestnetFunds: "Solicitar fondos de Testnet",
-  backupWallet: "Respaldar cartera",
   guestWalletWarning:
     "Esta es una cartera de invitado temporal. Haz una copia de seguridad si no quieres perder el acceso a ella",
-  switchTo: "Cambiar a",
-  connectedToSmartWallet: "cartera inteligente",
-  confirmInWallet: "Confirmar en cartera",
-  disconnectWallet: "Desconectar cartera",
-  copyAddress: "Copiar dirección",
-  personalWallet: "Cartera personal",
-  smartWallet: "Cartera inteligente",
-  or: "O",
-  goBackButton: "Atras",
-  passkeys: {
-    title: "Clave de acceso",
-    linkPasskey: "Vincular una clave de acceso",
-  },
-  welcomeScreen: {
-    defaultTitle: "Tu puerta de entrada al mundo descentralizado",
-    defaultSubtitle: "Conecta una cartera para empezar",
-  },
-  agreement: {
-    prefix: "Al conectar, aceptas los",
-    termsOfService: "Términos de servicio",
-    and: "y",
-    privacyPolicy: "Política de privacidad",
+  id: "es_ES",
+  installed: "Instalado",
+  manageWallet: {
+    connectAnApp: "Conectar una Aplicación",
+    exportPrivateKey: "Exportar Clave Privada",
+    linkedProfiles: "Perfiles vinculados",
+    linkProfile: "Vincular un perfil",
+    title: "Gestionar Cartera",
   },
   networkSelector: {
-    title: "Seleccionar red",
-    mainnets: "Redes principales",
-    testnets: "Redes de prueba",
-    allNetworks: "Todas",
     addCustomNetwork: "Agregar red personalizada",
-    inputPlaceholder: "Buscar red o ID de cadena",
+    allNetworks: "Todas",
     categoryLabel: {
-      recentlyUsed: "Usadas recientemente",
-      popular: "Populares",
       others: "Todas las redes",
+      popular: "Populares",
+      recentlyUsed: "Usadas recientemente",
     },
-    loading: "Cargando",
     failedToSwitch: "Error al cambiar de red",
+    inputPlaceholder: "Buscar red o ID de cadena",
+    loading: "Cargando",
+    mainnets: "Redes principales",
+    testnets: "Redes de prueba",
+    title: "Seleccionar red",
+  }, // TODO
+  newToWallets: "¿Nuevo en carteras?",
+  or: "O",
+  passkeys: {
+    linkPasskey: "Vincular una clave de acceso",
+    title: "Clave de acceso",
   },
+  payTransactions: "Fiat Transactions",
+  personalWallet: "Cartera personal",
+  receive: "Recibir",
   receiveFundsScreen: {
-    title: "Recibir fondos",
     instruction:
       "Copia la dirección de la cartera para enviar fondos a esta cartera",
+    title: "Recibir fondos",
   },
+  recommended: "Recomendado",
+  requestTestnetFunds: "Solicitar fondos de Testnet",
+  send: "Enviar",
   sendFundsScreen: {
-    title: "Enviar fondos",
-    submitButton: "Enviar",
-    token: "Token",
-    sendTo: "Enviar a",
     amount: "Cantidad",
-    successMessage: "Transacción exitosa",
+    insufficientFunds: "Fondos insuficientes",
     invalidAddress: "Dirección inválida",
     noTokensFound: "No se encontraron tokens",
     searchToken: "Buscar o pegar la dirección del token",
-    transactionFailed: "Transacción fallida",
-    transactionRejected: "Transacción rechazada",
-    insufficientFunds: "Fondos insuficientes",
     selectTokenTitle: "Seleccione un Token",
     sending: "Enviando",
+    sendTo: "Enviar a",
+    submitButton: "Enviar",
+    successMessage: "Transacción exitosa",
+    title: "Enviar fondos",
+    token: "Token",
+    transactionFailed: "Transacción fallida",
+    transactionRejected: "Transacción rechazada",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "Iniciar sesión",
+      disconnectWallet: "Desconectar cartera",
       instruction:
         "Por favor, firma la solicitud de mensaje en tu cartera para continuar",
       signInButton: "Iniciar sesión",
-      disconnectWallet: "Desconectar cartera",
+      title: "Iniciar sesión",
     },
     signingScreen: {
-      title: "Iniciando sesión",
+      approveTransactionInSafe: "Aprobar transacción en Safe",
+      failedToSignIn: "Error al iniciar sesión",
+      inProgress: "Esperando confirmación",
       prompt: "Firma la solicitud de firma en tu cartera",
       promptForSafe:
         "Firma la solicitud de firma en tu cartera y aprueba la transacción en Safe",
-      approveTransactionInSafe: "Aprobar transacción en Safe",
+      title: "Iniciando sesión",
       tryAgain: "Intentar de nuevo",
-      failedToSignIn: "Error al iniciar sesión",
-      inProgress: "Esperando confirmación",
     },
   },
-  manageWallet: {
-    title: "Gestionar Cartera",
-    linkedProfiles: "Perfiles vinculados",
-    linkProfile: "Vincular un perfil",
-    connectAnApp: "Conectar una Aplicación",
-    exportPrivateKey: "Exportar Clave Privada",
-  },
+  signIn: "Iniciar sesión",
+  smartWallet: "Cartera inteligente",
+  switchAccount: "Cambiar cuenta",
+  switchingNetwork: "Cambiando de red",
+  switchNetwork: "Cambiar red",
+  switchTo: "Cambiar a",
+  transactions: "Transactions",
+  viewAllTransactions: "View All Transactions",
   viewFunds: {
     title: "Ver Fondos",
+    viewAssets: "Ver Activos",
     viewNFTs: "Ver NFTs",
     viewTokens: "Ver Tokens",
-    viewAssets: "Ver Activos",
+  },
+  walletTransactions: "Wallet Transactions",
+  welcomeScreen: {
+    defaultSubtitle: "Conecta una cartera para empezar",
+    defaultTitle: "Tu puerta de entrada al mundo descentralizado",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/fr.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/fr.ts
index 2e5581f3984..4f104795df6 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/fr.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/fr.ts
@@ -1,123 +1,123 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectLocaleFr: ConnectLocale = {
-  id: "fr_FR",
-  signIn: "S'authentifier",
-  defaultButtonTitle: "Se Connecter",
-  connecting: "Connexion",
-  switchNetwork: "Changer de réseau",
-  switchingNetwork: "Changement de réseau",
-  defaultModalTitle: "Se connecter",
-  recommended: "Recommandé",
-  installed: "Installé",
+  agreement: {
+    and: "&",
+    prefix: "En vous connectant, vous acceptez les",
+    privacyPolicy: "Politique de confidentialité",
+    termsOfService: "Conditions d'utilisation",
+  },
+  backupWallet: "Sauvegarder le portefeuille",
   buy: "Acheter",
-  continueAsGuest: "Continuer en tant qu'invité",
+  confirmInWallet: "Confirmer dans le portefeuille",
   connectAWallet: "Connecter un portefeuille",
-  newToWallets: "En savoir plus sur les portefeuilles",
+  connectedToSmartWallet: "Compte intelligent",
+  connecting: "Connexion",
+  continueAsGuest: "Continuer en tant qu'invité",
+  copyAddress: "Copier l'adresse",
+  currentNetwork: "Réseau actuel",
+  defaultButtonTitle: "Se Connecter",
+  defaultModalTitle: "Se connecter",
+  disconnectWallet: "Déconnecter le portefeuille",
   getStarted: "Commencer",
+  goBackButton: "Retour",
   guest: "Invité",
-  send: "Envoyer",
-  receive: "Recevoir",
-  currentNetwork: "Réseau actuel",
-  switchAccount: "Changer de compte",
-  requestTestnetFunds: "Demander des fonds Testnet",
-  transactions: "Transactions",
-  payTransactions: "Transactions en Euros",
-  walletTransactions: "Transactions du portefeuille",
-  viewAllTransactions: "Voir toutes les transactions",
-  backupWallet: "Sauvegarder le portefeuille",
   guestWalletWarning:
     "Ceci est un portefeuille invité temporaire. Sauvegardez le portefeuille si vous ne voulez pas perdre l'accès",
-  switchTo: "Passer à", // Used in "Switch to <Wallet-Name>"
-  connectedToSmartWallet: "Compte intelligent",
-  confirmInWallet: "Confirmer dans le portefeuille",
-  disconnectWallet: "Déconnecter le portefeuille",
-  copyAddress: "Copier l'adresse",
-  personalWallet: "Portefeuille personnel",
-  smartWallet: "Portefeuille intelligent",
-  or: "OU",
-  goBackButton: "Retour",
-  passkeys: {
-    title: "Clés d'accès",
-    linkPasskey: "Lier une clé d'accès",
-  },
-  welcomeScreen: {
-    defaultTitle: "Votre porte d'entrée vers le monde décentralisé",
-    defaultSubtitle: "Connectez un portefeuille pour commencer",
-  },
-  agreement: {
-    prefix: "En vous connectant, vous acceptez les",
-    termsOfService: "Conditions d'utilisation",
-    and: "&",
-    privacyPolicy: "Politique de confidentialité",
+  id: "fr_FR",
+  installed: "Installé",
+  manageWallet: {
+    connectAnApp: "Connecter une application",
+    exportPrivateKey: "Exporter la clé privée",
+    linkedProfiles: "Profils liés",
+    linkProfile: "Lier un profil",
+    title: "Gérer le portefeuille",
   },
   networkSelector: {
-    title: "Sélectionner un réseau",
-    mainnets: "Mainnets",
-    testnets: "Testnets",
-    allNetworks: "Tous",
     addCustomNetwork: "Ajouter un réseau personnalisé",
-    inputPlaceholder: "Rechercher un réseau ou un ID de chaîne",
+    allNetworks: "Tous",
     categoryLabel: {
-      recentlyUsed: "Récemment utilisé",
-      popular: "Populaire",
       others: "Tous les réseaux",
+      popular: "Populaire",
+      recentlyUsed: "Récemment utilisé",
     },
-    loading: "Chargement",
     failedToSwitch: "Échec du changement de réseau",
+    inputPlaceholder: "Rechercher un réseau ou un ID de chaîne",
+    loading: "Chargement",
+    mainnets: "Mainnets",
+    testnets: "Testnets",
+    title: "Sélectionner un réseau",
   },
+  newToWallets: "En savoir plus sur les portefeuilles",
+  or: "OU",
+  passkeys: {
+    linkPasskey: "Lier une clé d'accès",
+    title: "Clés d'accès",
+  },
+  payTransactions: "Transactions en Euros",
+  personalWallet: "Portefeuille personnel",
+  receive: "Recevoir", // Used in "Switch to <Wallet-Name>"
   receiveFundsScreen: {
-    title: "Recevoir des fonds",
     instruction:
       "Copiez l'adresse du portefeuille pour envoyer des fonds à ce portefeuille",
+    title: "Recevoir des fonds",
   },
+  recommended: "Recommandé",
+  requestTestnetFunds: "Demander des fonds Testnet",
+  send: "Envoyer",
   sendFundsScreen: {
-    title: "Envoyer des fonds",
-    submitButton: "Envoyer",
-    token: "Token",
-    sendTo: "Envoyer à",
     amount: "Montant",
-    successMessage: "Transaction réussie",
+    insufficientFunds: "Fonds insuffisants",
     invalidAddress: "Adresse invalide",
     noTokensFound: "Aucun token trouvé",
     searchToken: "Rechercher ou coller l'adresse du token",
-    transactionFailed: "Échec de la transaction",
-    transactionRejected: "Transaction rejetée",
-    insufficientFunds: "Fonds insuffisants",
     selectTokenTitle: "Sélectionner un token",
     sending: "Envoi en cours",
+    sendTo: "Envoyer à",
+    submitButton: "Envoyer",
+    successMessage: "Transaction réussie",
+    title: "Envoyer des fonds",
+    token: "Token",
+    transactionFailed: "Échec de la transaction",
+    transactionRejected: "Transaction rejetée",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "Se connecter",
+      disconnectWallet: "Déconnecter le portefeuille",
       instruction:
         "Veuillez signer la demande de message dans votre portefeuille pour continuer",
       signInButton: "Se connecter",
-      disconnectWallet: "Déconnecter le portefeuille",
+      title: "Se connecter",
     },
     signingScreen: {
-      title: "Connexion en cours",
+      approveTransactionInSafe: "Approuvez la transaction dans Safe",
+      failedToSignIn: "Échec de la connexion",
+      inProgress: "En attente de confirmation",
       prompt: "Signez la demande de signature dans votre portefeuille",
       promptForSafe:
         "Signez la demande de signature dans votre portefeuille et approuvez la transaction dans Safe",
-      approveTransactionInSafe: "Approuvez la transaction dans Safe",
+      title: "Connexion en cours",
       tryAgain: "Réessayer",
-      failedToSignIn: "Échec de la connexion",
-      inProgress: "En attente de confirmation",
     },
   },
-  manageWallet: {
-    title: "Gérer le portefeuille",
-    linkedProfiles: "Profils liés",
-    linkProfile: "Lier un profil",
-    connectAnApp: "Connecter une application",
-    exportPrivateKey: "Exporter la clé privée",
-  },
+  signIn: "S'authentifier",
+  smartWallet: "Portefeuille intelligent",
+  switchAccount: "Changer de compte",
+  switchingNetwork: "Changement de réseau",
+  switchNetwork: "Changer de réseau",
+  switchTo: "Passer à",
+  transactions: "Transactions",
+  viewAllTransactions: "Voir toutes les transactions",
   viewFunds: {
     title: "Voir les fonds",
+    viewAssets: "Voir les actifs",
     viewNFTs: "Voir les NFT",
     viewTokens: "Voir les tokens",
-    viewAssets: "Voir les actifs",
+  },
+  walletTransactions: "Transactions du portefeuille",
+  welcomeScreen: {
+    defaultSubtitle: "Connectez un portefeuille pour commencer",
+    defaultTitle: "Votre porte d'entrée vers le monde décentralisé",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/getConnectLocale.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/getConnectLocale.ts
index 7c8326085f1..8c6f2802104 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/getConnectLocale.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/getConnectLocale.ts
@@ -41,11 +41,11 @@ export async function getConnectLocale(localeId: LocaleId) {
  */
 export function useConnectLocale(localeId: LocaleId) {
   return useQuery({
-    queryKey: ["connect-locale", localeId],
     queryFn: async () => {
       return getConnectLocale(localeId);
     },
-    refetchOnWindowFocus: false,
+    queryKey: ["connect-locale", localeId],
     refetchOnMount: false,
+    refetchOnWindowFocus: false,
   });
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/ja.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/ja.ts
index 19a25356681..464c5343934 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/ja.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/ja.ts
@@ -1,123 +1,123 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectWalletLocalJa: ConnectLocale = {
-  id: "ja_JP",
-  signIn: "サインイン",
-  defaultButtonTitle: "ウォレット接続",
+  agreement: {
+    and: "および",
+    prefix: "接続することで、以下に同意したことになります：",
+    privacyPolicy: "プライバシーポリシー",
+    termsOfService: "利用規約",
+  },
+  backupWallet: "ウォレットのバックアップ",
+  buy: "購入",
+  confirmInWallet: "ウォレットで確認",
+  connectAWallet: "ウォレットを接続する",
+  connectedToSmartWallet: "スマートウォレットに接続済み",
   connecting: "接続中",
-  switchNetwork: "ネットワークを切り替える",
-  switchingNetwork: "ネットワークの切替中",
-  defaultModalTitle: "接続",
-  recommended: "推奨",
-  installed: "インストール済み",
   continueAsGuest: "ゲストとして続ける",
-  connectAWallet: "ウォレットを接続する",
-  newToWallets: "ウォレットは初めてですか？",
+  copyAddress: "アドレスをコピー",
+  currentNetwork: "現在のネットワーク",
+  defaultButtonTitle: "ウォレット接続",
+  defaultModalTitle: "接続",
+  disconnectWallet: "ウォレットの切断",
   getStarted: "始める",
+  goBackButton: "戻る",
   guest: "ゲスト",
-  send: "送る",
-  receive: "受け取る",
-  currentNetwork: "現在のネットワーク",
-  switchAccount: "アカウントを切り替える",
-  requestTestnetFunds: "テストネットの資金をリクエストする",
-  buy: "購入",
-  transactions: "取引",
-  payTransactions: "支払い取引",
-  walletTransactions: "ウォレット取引",
-  viewAllTransactions: "全ての取引を表示",
-  backupWallet: "ウォレットのバックアップ",
   guestWalletWarning:
     "これは一時的なゲストウォレットです。アクセスできなくなることを防ぐため、バックアップをしてください",
-  switchTo: "切り替え先", // Used in "Switch to <Wallet-Name>"
-  connectedToSmartWallet: "スマートウォレットに接続済み",
-  confirmInWallet: "ウォレットで確認",
-  disconnectWallet: "ウォレットの切断",
-  copyAddress: "アドレスをコピー",
-  personalWallet: "パーソナルウォレット",
-  smartWallet: "スマートウォレット",
-  or: "または",
-  goBackButton: "戻る", // TODO - check translation
-  passkeys: {
-    linkPasskey: "パスキーをリンクする",
-    title: "パスキー",
-  },
-  welcomeScreen: {
-    defaultTitle: "分散型世界へのゲートウェイ",
-    defaultSubtitle: "始めるためにウォレットを接続してください",
-  },
-  agreement: {
-    prefix: "接続することで、以下に同意したことになります：",
-    termsOfService: "利用規約",
-    and: "および",
-    privacyPolicy: "プライバシーポリシー",
+  id: "ja_JP",
+  installed: "インストール済み",
+  manageWallet: {
+    connectAnApp: "アプリを接続",
+    exportPrivateKey: "秘密鍵をエクスポート",
+    linkedProfiles: "リンクされたプロファイル",
+    linkProfile: "プロフィールをリンクする",
+    title: "ウォレットを管理",
   },
   networkSelector: {
-    title: "ネットワークの選択",
-    mainnets: "メインネット",
-    testnets: "テストネット",
-    allNetworks: "すべて",
     addCustomNetwork: "カスタムネットワークを追加",
-    inputPlaceholder: "ネットワーク名またはチェーンIDを検索",
+    allNetworks: "すべて",
     categoryLabel: {
-      recentlyUsed: "最近使用したもの",
-      popular: "人気",
       others: "全てのネットワーク",
+      popular: "人気",
+      recentlyUsed: "最近使用したもの",
     },
-    loading: "読み込み中",
     failedToSwitch: "ネットワークの切替に失敗しました",
+    inputPlaceholder: "ネットワーク名またはチェーンIDを検索",
+    loading: "読み込み中",
+    mainnets: "メインネット",
+    testnets: "テストネット",
+    title: "ネットワークの選択",
   },
+  newToWallets: "ウォレットは初めてですか？",
+  or: "または",
+  passkeys: {
+    linkPasskey: "パスキーをリンクする",
+    title: "パスキー",
+  },
+  payTransactions: "支払い取引",
+  personalWallet: "パーソナルウォレット",
+  receive: "受け取る", // Used in "Switch to <Wallet-Name>"
   receiveFundsScreen: {
-    title: "資金を受け取る",
     instruction:
       "このウォレットに資金を送るためのウォレットアドレスをコピーしてください",
+    title: "資金を受け取る",
   },
+  recommended: "推奨",
+  requestTestnetFunds: "テストネットの資金をリクエストする",
+  send: "送る",
   sendFundsScreen: {
-    title: "資金の送付",
-    submitButton: "送信",
-    token: "トークン",
-    sendTo: "送信先",
     amount: "金額",
-    successMessage: "取引成功",
+    insufficientFunds: "資金が不足しています",
     invalidAddress: "無効なアドレス",
     noTokensFound: "トークンが見つかりません",
     searchToken: "トークンのアドレスを検索するか、貼り付けてください",
-    transactionFailed: "取引に失敗しました",
-    transactionRejected: "取引が拒否されました",
-    insufficientFunds: "資金が不足しています",
     selectTokenTitle: "トークンを選択",
     sending: "送信中",
+    sendTo: "送信先",
+    submitButton: "送信",
+    successMessage: "取引成功",
+    title: "資金の送付",
+    token: "トークン",
+    transactionFailed: "取引に失敗しました",
+    transactionRejected: "取引が拒否されました",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "サインイン",
+      disconnectWallet: "ウォレットの切断",
       instruction:
         "続行するためにウォレットでメッセージリクエストにサインしてください",
       signInButton: "サインイン",
-      disconnectWallet: "ウォレットの切断",
+      title: "サインイン",
     },
     signingScreen: {
-      title: "サインイン中",
+      approveTransactionInSafe: "Safeで取引を承認",
+      failedToSignIn: "サインインに失敗しました",
+      inProgress: "確認待ち",
       prompt: "ウォレットで署名リクエストにサインしてください",
       promptForSafe:
         "ウォレットで署名リクエストにサインし、Safeで取引を承認してください",
-      approveTransactionInSafe: "Safeで取引を承認",
+      title: "サインイン中",
       tryAgain: "再試行",
-      failedToSignIn: "サインインに失敗しました",
-      inProgress: "確認待ち",
     },
   },
-  manageWallet: {
-    title: "ウォレットを管理",
-    linkedProfiles: "リンクされたプロファイル",
-    linkProfile: "プロフィールをリンクする",
-    connectAnApp: "アプリを接続",
-    exportPrivateKey: "秘密鍵をエクスポート",
-  },
+  signIn: "サインイン",
+  smartWallet: "スマートウォレット", // TODO - check translation
+  switchAccount: "アカウントを切り替える",
+  switchingNetwork: "ネットワークの切替中",
+  switchNetwork: "ネットワークを切り替える",
+  switchTo: "切り替え先",
+  transactions: "取引",
+  viewAllTransactions: "全ての取引を表示",
   viewFunds: {
     title: "資金を表示",
+    viewAssets: "資産を表示",
     viewNFTs: "NFTを表示",
     viewTokens: "トークンを表示",
-    viewAssets: "資産を表示",
+  },
+  walletTransactions: "ウォレット取引",
+  welcomeScreen: {
+    defaultSubtitle: "始めるためにウォレットを接続してください",
+    defaultTitle: "分散型世界へのゲートウェイ",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/kr.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/kr.ts
index 6cffc7fc9c0..c331589056a 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/kr.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/kr.ts
@@ -1,120 +1,121 @@
 import type { ConnectLocale } from "./types.js";
+
 const connectLocaleKr: ConnectLocale = {
-  id: "ko_KR",
-  signIn: "로그인",
-  defaultButtonTitle: "지갑 연결",
-  connecting: "연결 중",
-  switchNetwork: "네트워크 전환",
-  switchingNetwork: "네트워크 전환 중",
-  defaultModalTitle: "로그인",
-  recommended: "추천",
-  installed: "설치됨",
+  agreement: {
+    and: "&",
+    prefix: "연결함으로써 귀하는 다음에 동의하게 됩니다",
+    privacyPolicy: "개인정보 보호정책",
+    termsOfService: "서비스 약관",
+  },
+  backupWallet: "지갑 백업",
   buy: "구매",
-  continueAsGuest: "게스트로 계속",
+  confirmInWallet: "지갑에서 확인",
   connectAWallet: "지갑 연결",
-  newToWallets: "지갑 사용이 처음이신가요?",
+  connectedToSmartWallet: "스마트 계정",
+  connecting: "연결 중",
+  continueAsGuest: "게스트로 계속",
+  copyAddress: "주소 복사",
+  currentNetwork: "현재 네트워크",
+  defaultButtonTitle: "지갑 연결",
+  defaultModalTitle: "로그인",
+  disconnectWallet: "지갑 연결 해제",
   getStarted: "시작하기",
+  goBackButton: "뒤로",
   guest: "게스트",
-  send: "보내기",
-  receive: "받기",
-  currentNetwork: "현재 네트워크",
-  switchAccount: "계정 전환",
-  requestTestnetFunds: "테스트넷 자금 요청",
-  transactions: "거래",
-  payTransactions: "법정화폐 거래",
-  walletTransactions: "지갑 거래",
-  viewAllTransactions: "모든 거래 보기",
-  backupWallet: "지갑 백업",
   guestWalletWarning:
     "이것은 임시 게스트 지갑입니다. 접근을 잃지 않으려면 지갑을 백업하십시오",
-  switchTo: "전환", // Used in "<Wallet-Name> 으로 전환"
-  connectedToSmartWallet: "스마트 계정",
-  confirmInWallet: "지갑에서 확인",
-  disconnectWallet: "지갑 연결 해제",
-  copyAddress: "주소 복사",
-  personalWallet: "개인 지갑",
-  smartWallet: "스마트 지갑",
-  or: "또는",
-  goBackButton: "뒤로",
-  passkeys: {
-    title: "패스키",
-    linkPasskey: "패스키 연결",
-  },
-  welcomeScreen: {
-    defaultTitle: "분산된 세계로의 게이트웨이",
-    defaultSubtitle: "시작하려면 지갑을 연결하십시오",
-  },
-  agreement: {
-    prefix: "연결함으로써 귀하는 다음에 동의하게 됩니다",
-    termsOfService: "서비스 약관",
-    and: "&",
-    privacyPolicy: "개인정보 보호정책",
+  id: "ko_KR",
+  installed: "설치됨",
+  manageWallet: {
+    connectAnApp: "앱 연결",
+    exportPrivateKey: "개인 키 내보내기",
+    linkedProfiles: "연결된 프로필",
+    linkProfile: "링크 프로필",
+    title: "지갑 관리",
   },
   networkSelector: {
-    title: "네트워크 선택",
-    mainnets: "메인넷",
-    testnets: "테스트넷",
-    allNetworks: "모두",
     addCustomNetwork: "맞춤 네트워크 추가",
-    inputPlaceholder: "네트워크 또는 체인 ID 검색",
+    allNetworks: "모두",
     categoryLabel: {
-      recentlyUsed: "최근 사용",
-      popular: "인기",
       others: "모든 네트워크",
+      popular: "인기",
+      recentlyUsed: "최근 사용",
     },
-    loading: "로딩 중",
     failedToSwitch: "네트워크 전환 실패",
+    inputPlaceholder: "네트워크 또는 체인 ID 검색",
+    loading: "로딩 중",
+    mainnets: "메인넷",
+    testnets: "테스트넷",
+    title: "네트워크 선택",
   },
+  newToWallets: "지갑 사용이 처음이신가요?",
+  or: "또는",
+  passkeys: {
+    linkPasskey: "패스키 연결",
+    title: "패스키",
+  },
+  payTransactions: "법정화폐 거래",
+  personalWallet: "개인 지갑",
+  receive: "받기", // Used in "<Wallet-Name> 으로 전환"
   receiveFundsScreen: {
-    title: "자금 수신",
     instruction: "자금을 이 지갑으로 보내려면 지갑 주소를 복사하십시오",
+    title: "자금 수신",
   },
+  recommended: "추천",
+  requestTestnetFunds: "테스트넷 자금 요청",
+  send: "보내기",
   sendFundsScreen: {
-    title: "자금 송금",
-    submitButton: "보내기",
-    token: "토큰",
-    sendTo: "보낼 곳",
     amount: "금액",
-    successMessage: "거래 성공",
+    insufficientFunds: "자금 부족",
     invalidAddress: "유효하지 않은 주소",
     noTokensFound: "토큰을 찾을 수 없음",
     searchToken: "토큰 주소 검색 또는 붙여넣기",
-    transactionFailed: "거래 실패",
-    transactionRejected: "거래 거부됨",
-    insufficientFunds: "자금 부족",
     selectTokenTitle: "토큰 선택",
     sending: "보내는 중",
+    sendTo: "보낼 곳",
+    submitButton: "보내기",
+    successMessage: "거래 성공",
+    title: "자금 송금",
+    token: "토큰",
+    transactionFailed: "거래 실패",
+    transactionRejected: "거래 거부됨",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "로그인",
+      disconnectWallet: "지갑 연결 해제",
       instruction: "계속하려면 지갑에서 메시지 요청에 서명하십시오",
       signInButton: "로그인",
-      disconnectWallet: "지갑 연결 해제",
+      title: "로그인",
     },
     signingScreen: {
-      title: "로그인 중",
+      approveTransactionInSafe: "Safe에서 거래 승인",
+      failedToSignIn: "로그인 실패",
+      inProgress: "확인 대기 중",
       prompt: "지갑에서 서명 요청에 서명하십시오",
       promptForSafe:
         "지갑에서 서명 요청에 서명하고 Safe에서 거래를 승인하십시오",
-      approveTransactionInSafe: "Safe에서 거래 승인",
+      title: "로그인 중",
       tryAgain: "다시 시도",
-      failedToSignIn: "로그인 실패",
-      inProgress: "확인 대기 중",
     },
   },
-  manageWallet: {
-    title: "지갑 관리",
-    linkedProfiles: "연결된 프로필",
-    linkProfile: "링크 프로필",
-    connectAnApp: "앱 연결",
-    exportPrivateKey: "개인 키 내보내기",
-  },
+  signIn: "로그인",
+  smartWallet: "스마트 지갑",
+  switchAccount: "계정 전환",
+  switchingNetwork: "네트워크 전환 중",
+  switchNetwork: "네트워크 전환",
+  switchTo: "전환",
+  transactions: "거래",
+  viewAllTransactions: "모든 거래 보기",
   viewFunds: {
     title: "자금 보기",
+    viewAssets: "자산 보기",
     viewNFTs: "NFT 보기",
     viewTokens: "토큰 보기",
-    viewAssets: "자산 보기",
+  },
+  walletTransactions: "지갑 거래",
+  welcomeScreen: {
+    defaultSubtitle: "시작하려면 지갑을 연결하십시오",
+    defaultTitle: "분산된 세계로의 게이트웨이",
   },
 };
 export default connectLocaleKr;
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/ru.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/ru.ts
index a346c0c8ac1..0077e79ac36 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/ru.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/ru.ts
@@ -1,123 +1,123 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectLocaleRu: ConnectLocale = {
-  id: "ru_RU",
-  signIn: "Войти",
-  defaultButtonTitle: "Подключиться",
-  connecting: "Подключение",
-  switchNetwork: "Сменить сеть",
-  switchingNetwork: "Смена сети",
-  defaultModalTitle: "Войти",
-  recommended: "Рекомендуется",
-  installed: "Установлено",
+  agreement: {
+    and: "и",
+    prefix: "Подключаясь, вы соглашаетесь с",
+    privacyPolicy: "Политикой конфиденциальности",
+    termsOfService: "Условиями использования",
+  },
+  backupWallet: "Создать резервную копию кошелька",
   buy: "Купить",
-  continueAsGuest: "Продолжить как гость",
+  confirmInWallet: "Подтвердить в кошельке",
   connectAWallet: "Подключить кошелек",
-  newToWallets: "Новичок в кошельках?",
+  connectedToSmartWallet: "Смарт-аккаунт",
+  connecting: "Подключение",
+  continueAsGuest: "Продолжить как гость",
+  copyAddress: "Скопировать адрес",
+  currentNetwork: "Текущая сеть",
+  defaultButtonTitle: "Подключиться",
+  defaultModalTitle: "Войти",
+  disconnectWallet: "Отсоединить кошелек",
   getStarted: "Начать",
+  goBackButton: "Назад",
   guest: "Гость",
-  send: "Отправить",
-  receive: "Получить",
-  currentNetwork: "Текущая сеть",
-  switchAccount: "Сменить аккаунт",
-  requestTestnetFunds: "Запросить средства тестовой сети",
-  transactions: "Транзакции",
-  payTransactions: "Фиатные транзакции",
-  walletTransactions: "Транзакции кошелька",
-  viewAllTransactions: "Просмотреть все транзакции",
-  backupWallet: "Создать резервную копию кошелька",
   guestWalletWarning:
     "Это временный гостевой кошелек. Создайте резервную копию, если не хотите потерять к нему доступ",
-  switchTo: "Переключиться на", // Используется в "Switch to <Wallet-Name>>"
-  connectedToSmartWallet: "Смарт-аккаунт",
-  confirmInWallet: "Подтвердить в кошельке",
-  disconnectWallet: "Отсоединить кошелек",
-  copyAddress: "Скопировать адрес",
-  personalWallet: "Личный кошелек",
-  smartWallet: "Смарт-кошелек",
-  or: "ИЛИ",
-  goBackButton: "Назад",
-  passkeys: {
-    title: "Ключи доступа",
-    linkPasskey: "Привязать ключ доступа",
-  },
-  welcomeScreen: {
-    defaultTitle: "Ваш портал в мир децентрализации",
-    defaultSubtitle: "Подключите кошелек, чтобы начать",
-  },
-  agreement: {
-    prefix: "Подключаясь, вы соглашаетесь с",
-    termsOfService: "Условиями использования",
-    and: "и",
-    privacyPolicy: "Политикой конфиденциальности",
+  id: "ru_RU",
+  installed: "Установлено",
+  manageWallet: {
+    connectAnApp: "Подключить приложение",
+    exportPrivateKey: "Экспортировать приватный ключ",
+    linkedProfiles: "Привязанные профили",
+    linkProfile: "Привязать профиль",
+    title: "Управление кошельком",
   },
   networkSelector: {
-    title: "Выбрать сеть",
-    mainnets: "Основные сети (мейннетс)",
-    testnets: "Тестовые сети (тестнетс)",
-    allNetworks: "Все",
     addCustomNetwork: "Добавить кастомную сеть",
-    inputPlaceholder: "Поиск сети или Chain ID",
+    allNetworks: "Все",
     categoryLabel: {
-      recentlyUsed: "Недавно использованные",
-      popular: "Популярные",
       others: "Все сети",
+      popular: "Популярные",
+      recentlyUsed: "Недавно использованные",
     },
-    loading: "Загрузка",
     failedToSwitch: "Не удалось сменить сеть",
+    inputPlaceholder: "Поиск сети или Chain ID",
+    loading: "Загрузка",
+    mainnets: "Основные сети (мейннетс)",
+    testnets: "Тестовые сети (тестнетс)",
+    title: "Выбрать сеть",
   },
+  newToWallets: "Новичок в кошельках?",
+  or: "ИЛИ",
+  passkeys: {
+    linkPasskey: "Привязать ключ доступа",
+    title: "Ключи доступа",
+  },
+  payTransactions: "Фиатные транзакции",
+  personalWallet: "Личный кошелек",
+  receive: "Получить", // Используется в "Switch to <Wallet-Name>>"
   receiveFundsScreen: {
-    title: "Получить средства",
     instruction:
       "Скопируйте адрес кошелька, чтобы отправить средства на этот кошелек",
+    title: "Получить средства",
   },
+  recommended: "Рекомендуется",
+  requestTestnetFunds: "Запросить средства тестовой сети",
+  send: "Отправить",
   sendFundsScreen: {
-    title: "Отправить средства",
-    submitButton: "Отправить",
-    token: "Токен",
-    sendTo: "Отправить на",
     amount: "Сумма",
-    successMessage: "Транзакция успешно выполнена",
+    insufficientFunds: "Недостаточно средств",
     invalidAddress: "Недействительный адрес",
     noTokensFound: "Токены не найдены",
     searchToken: "Найти или вставить адрес токена",
-    transactionFailed: "Транзакция не удалась",
-    transactionRejected: "Транзакция отклонена",
-    insufficientFunds: "Недостаточно средств",
     selectTokenTitle: "Выбрать токен",
     sending: "Отправка",
+    sendTo: "Отправить на",
+    submitButton: "Отправить",
+    successMessage: "Транзакция успешно выполнена",
+    title: "Отправить средства",
+    token: "Токен",
+    transactionFailed: "Транзакция не удалась",
+    transactionRejected: "Транзакция отклонена",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "Войти",
+      disconnectWallet: "Отсоединить кошелек",
       instruction:
         "Пожалуйста, подпишите сообщение в кошельке, чтобы продолжить",
       signInButton: "Войти",
-      disconnectWallet: "Отсоединить кошелек",
+      title: "Войти",
     },
     signingScreen: {
-      title: "Вход",
+      approveTransactionInSafe: "Подтвердить транзакцию в Safe",
+      failedToSignIn: "Не удалось войти",
+      inProgress: "Ожидание подтверждения",
       prompt: "Подпись запроса в вашем кошельке",
       promptForSafe:
         "Подпишите запрос в вашем кошельке и подтвердите транзакцию в Safe",
-      approveTransactionInSafe: "Подтвердить транзакцию в Safe",
+      title: "Вход",
       tryAgain: "Попробовать снова",
-      failedToSignIn: "Не удалось войти",
-      inProgress: "Ожидание подтверждения",
     },
   },
-  manageWallet: {
-    title: "Управление кошельком",
-    linkedProfiles: "Привязанные профили",
-    linkProfile: "Привязать профиль",
-    connectAnApp: "Подключить приложение",
-    exportPrivateKey: "Экспортировать приватный ключ",
-  },
+  signIn: "Войти",
+  smartWallet: "Смарт-кошелек",
+  switchAccount: "Сменить аккаунт",
+  switchingNetwork: "Смена сети",
+  switchNetwork: "Сменить сеть",
+  switchTo: "Переключиться на",
+  transactions: "Транзакции",
+  viewAllTransactions: "Просмотреть все транзакции",
   viewFunds: {
     title: "Просмотр средств",
+    viewAssets: "Просмотр активов",
     viewNFTs: "Просмотр NFTs",
     viewTokens: "Просмотр токенов",
-    viewAssets: "Просмотр активов",
+  },
+  walletTransactions: "Транзакции кошелька",
+  welcomeScreen: {
+    defaultSubtitle: "Подключите кошелек, чтобы начать",
+    defaultTitle: "Ваш портал в мир децентрализации",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/tl.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/tl.ts
index 2177eddb309..962728eb507 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/tl.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/tl.ts
@@ -1,122 +1,122 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectWalletLocalTl: ConnectLocale = {
-  id: "tl_PH",
-  signIn: "Mag-sign in",
-  defaultButtonTitle: "Ikonekta ang Wallet",
+  agreement: {
+    and: "&",
+    prefix: "Sa pamamagitan ng pagkonekta, sumasang-ayon ka sa",
+    privacyPolicy: "Patakaran sa Privacy",
+    termsOfService: "Mga Tuntunin ng Serbisyo",
+  },
+  backupWallet: "I-backup ang Wallet",
+  buy: "Bumili",
+  confirmInWallet: "Kumpirmahin sa wallet",
+  connectAWallet: "Kumonekta ng wallet",
+  connectedToSmartWallet: "Smart Account",
   connecting: "Kumokonekta",
-  switchNetwork: "Palitan ang Network",
-  switchingNetwork: "Papalitan ang Network",
-  defaultModalTitle: "Kumonekta",
-  recommended: "Inirerekomenda",
-  installed: "Naka-install",
   continueAsGuest: "Magpatuloy bilang guest",
-  connectAWallet: "Kumonekta ng wallet",
-  newToWallets: "Bago sa mga wallet?",
+  copyAddress: "Kopyahin ang Address",
+  currentNetwork: "Kasalukuyang network",
+  defaultButtonTitle: "Ikonekta ang Wallet",
+  defaultModalTitle: "Kumonekta",
+  disconnectWallet: "I-disconnect ang Wallet",
   getStarted: "Simulan",
+  goBackButton: "Bumalik",
   guest: "Guest",
-  buy: "Bumili",
-  transactions: "Mga Transaksyon",
-  payTransactions: "Mga Transaksyong Fiat",
-  walletTransactions: "Mga Transaksyon sa Wallet",
-  viewAllTransactions: "Tingnan ang Lahat ng Transaksyon",
-  send: "Ipadala",
-  receive: "Matanggap",
-  currentNetwork: "Kasalukuyang network",
-  switchAccount: "Palitan ang Account",
-  requestTestnetFunds: "Humingi ng Testnet Funds",
-  backupWallet: "I-backup ang Wallet",
   guestWalletWarning:
     "Ito ay isang pansamantalang guest wallet. I-download mo ang backup para hindi ka mawalan ng access dito.",
-  switchTo: "Palitan ang", // Used in "Switch to <Wallet-Name>"
-  connectedToSmartWallet: "Smart Account",
-  confirmInWallet: "Kumpirmahin sa wallet",
-  disconnectWallet: "I-disconnect ang Wallet",
-  copyAddress: "Kopyahin ang Address",
-  personalWallet: "Personal na Wallet",
-  smartWallet: "Smart Wallet",
-  or: "O",
-  goBackButton: "Bumalik",
-  passkeys: {
-    title: "Mga Passkey",
-    linkPasskey: "I-link ang Passkey",
-  },
-  welcomeScreen: {
-    defaultTitle: "Ang iyong daan patungo sa decentralized na mundo",
-    defaultSubtitle: "Kumonekta ng wallet para magsimula",
-  },
-  agreement: {
-    prefix: "Sa pamamagitan ng pagkonekta, sumasang-ayon ka sa",
-    termsOfService: "Mga Tuntunin ng Serbisyo",
-    and: "&",
-    privacyPolicy: "Patakaran sa Privacy",
+  id: "tl_PH",
+  installed: "Naka-install",
+  manageWallet: {
+    connectAnApp: "Ikonekta ang isang App",
+    exportPrivateKey: "I-export ang Pribadong Susi",
+    linkedProfiles: "Linked Profiles",
+    linkProfile: "Link a Profile",
+    title: "Pamahalaan ang Wallet",
   },
   networkSelector: {
-    title: "Pumili ng Network",
-    mainnets: "Mainnets",
-    testnets: "Testnets",
-    allNetworks: "Lahat",
     addCustomNetwork: "Magdagdag ng Custom Network",
-    inputPlaceholder: "Maghanap ng Network o Chain ID",
+    allNetworks: "Lahat",
     categoryLabel: {
-      recentlyUsed: "Kamakailang Ginamit",
-      popular: "Sikat",
       others: "Lahat ng Networks",
+      popular: "Sikat",
+      recentlyUsed: "Kamakailang Ginamit",
     },
-    loading: "Loading",
     failedToSwitch: "Hindi nagawa ang pagpapalit ng network",
+    inputPlaceholder: "Maghanap ng Network o Chain ID",
+    loading: "Loading",
+    mainnets: "Mainnets",
+    testnets: "Testnets",
+    title: "Pumili ng Network",
   },
+  newToWallets: "Bago sa mga wallet?",
+  or: "O",
+  passkeys: {
+    linkPasskey: "I-link ang Passkey",
+    title: "Mga Passkey",
+  },
+  payTransactions: "Mga Transaksyong Fiat",
+  personalWallet: "Personal na Wallet",
+  receive: "Matanggap", // Used in "Switch to <Wallet-Name>"
   receiveFundsScreen: {
-    title: "Matanggap ang Pondo",
     instruction: "Kopyahin ang address ng wallet para ipadala ang pondo dito",
+    title: "Matanggap ang Pondo",
   },
+  recommended: "Inirerekomenda",
+  requestTestnetFunds: "Humingi ng Testnet Funds",
+  send: "Ipadala",
   sendFundsScreen: {
-    title: "Ipadala ang Pondo",
-    submitButton: "Ipadala",
-    token: "Token",
-    sendTo: "Ipadala sa",
     amount: "Halaga",
-    successMessage: "Tagumpay ang Transaksyon",
+    insufficientFunds: "Kulang ang Pondo",
     invalidAddress: "Hindi wastong Address",
     noTokensFound: "Walang Nakitang Tokens",
     searchToken: "Maghanap o I-paste ang token address",
-    transactionFailed: "Nabigo ang Transaksyon",
-    transactionRejected: "Tinanggihan ang Transaksyon",
-    insufficientFunds: "Kulang ang Pondo",
     selectTokenTitle: "Pumili ng Token",
     sending: "Ipinapadala",
+    sendTo: "Ipadala sa",
+    submitButton: "Ipadala",
+    successMessage: "Tagumpay ang Transaksyon",
+    title: "Ipadala ang Pondo",
+    token: "Token",
+    transactionFailed: "Nabigo ang Transaksyon",
+    transactionRejected: "Tinanggihan ang Transaksyon",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "Mag-sign in",
+      disconnectWallet: "I-disconnect ang Wallet",
       instruction:
         "Mangyaring pirmahan ang kahilingan ng mensahe sa iyong wallet para magpatuloy",
       signInButton: "Mag-sign in",
-      disconnectWallet: "I-disconnect ang Wallet",
+      title: "Mag-sign in",
     },
     signingScreen: {
-      title: "Pagsisign-in",
+      approveTransactionInSafe: "Aprubahan ang transaksyon sa Safe",
+      failedToSignIn: "Hindi nagawa ang pagsisign-in",
+      inProgress: "Naghihintay ng Kumpirmasyon",
       prompt: "Pirmahan ang kahilingan ng signature sa iyong wallet",
       promptForSafe:
         "Pirmahan ang kahilingan ng signature sa iyong wallet at aprubahan ang transaksyon sa Safe",
-      approveTransactionInSafe: "Aprubahan ang transaksyon sa Safe",
+      title: "Pagsisign-in",
       tryAgain: "Subukan muli",
-      failedToSignIn: "Hindi nagawa ang pagsisign-in",
-      inProgress: "Naghihintay ng Kumpirmasyon",
     },
   },
-  manageWallet: {
-    title: "Pamahalaan ang Wallet",
-    linkedProfiles: "Linked Profiles",
-    linkProfile: "Link a Profile",
-    connectAnApp: "Ikonekta ang isang App",
-    exportPrivateKey: "I-export ang Pribadong Susi",
-  },
+  signIn: "Mag-sign in",
+  smartWallet: "Smart Wallet",
+  switchAccount: "Palitan ang Account",
+  switchingNetwork: "Papalitan ang Network",
+  switchNetwork: "Palitan ang Network",
+  switchTo: "Palitan ang",
+  transactions: "Mga Transaksyon",
+  viewAllTransactions: "Tingnan ang Lahat ng Transaksyon",
   viewFunds: {
     title: "Tingnan ang Pondo",
+    viewAssets: "Tingnan ang mga Asset",
     viewNFTs: "Tingnan ang mga NFT",
     viewTokens: "Tingnan ang mga Token",
-    viewAssets: "Tingnan ang mga Asset",
+  },
+  walletTransactions: "Mga Transaksyon sa Wallet",
+  welcomeScreen: {
+    defaultSubtitle: "Kumonekta ng wallet para magsimula",
+    defaultTitle: "Ang iyong daan patungo sa decentralized na mundo",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/vi.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/vi.ts
index 6b76795f549..d6cc5bb86d8 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/vi.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/locale/vi.ts
@@ -1,121 +1,121 @@
 import type { ConnectLocale } from "./types.js";
 
 const connectLocaleVi: ConnectLocale = {
-  id: "vi_VN",
-  signIn: "Đăng nhập",
-  defaultButtonTitle: "Kết nối ví",
-  connecting: "Đang kết nối",
-  switchNetwork: "Chuyển mạng",
-  switchingNetwork: "Đang chuyển mạng",
-  defaultModalTitle: "Đăng nhập",
-  recommended: "Khuyên dùng",
-  installed: "Đã cài đặt",
+  agreement: {
+    and: "và",
+    prefix: "Bằng việc kết nối, bạn đồng ý với",
+    privacyPolicy: "Chính sách bảo mật",
+    termsOfService: "Điều khoản dịch vụ",
+  },
+  backupWallet: "Sao lưu ví",
   buy: "Mua",
-  continueAsGuest: "Continue as guest",
+  confirmInWallet: "Xác nhận bằng ví",
   connectAWallet: "Kết nối ví",
-  newToWallets: "Tìm hiểu về ví điện tử",
+  connectedToSmartWallet: "Ví Thông Minh",
+  connecting: "Đang kết nối",
+  continueAsGuest: "Continue as guest",
+  copyAddress: "Sao chép địa chỉ",
+  currentNetwork: "Mạng lưới hiện tại",
+  defaultButtonTitle: "Kết nối ví",
+  defaultModalTitle: "Đăng nhập",
+  disconnectWallet: "Ngắt kết nối ví",
   getStarted: "Bắt đầu",
+  goBackButton: "Quay lại",
   guest: "Guest",
-  send: "Gửi",
-  receive: "Nhận",
-  currentNetwork: "Mạng lưới hiện tại",
-  switchAccount: "Chuyển tài khoản",
-  requestTestnetFunds: "Nhận Testnet Funds",
-  transactions: "Transactions",
-  payTransactions: "Fiat Transactions",
-  walletTransactions: "Wallet Transactions",
-  viewAllTransactions: "Tất cả giao dịch",
-  backupWallet: "Sao lưu ví",
   guestWalletWarning:
     "Đây là ví tạm thời cho phiên đăng nhập của bạn. Vui lòng sao lưu ví nếu bạn không muốn dánh mất thông tin",
-  switchTo: "Đổi qua ví", // Used in "Switch to <Wallet-Name>"
-  connectedToSmartWallet: "Ví Thông Minh",
-  confirmInWallet: "Xác nhận bằng ví",
-  disconnectWallet: "Ngắt kết nối ví",
-  copyAddress: "Sao chép địa chỉ",
-  personalWallet: "Ví cá nhân",
-  smartWallet: "Ví Thông Minh",
-  or: "hoặc",
-  goBackButton: "Quay lại",
-  passkeys: {
-    title: "Khóa truy cập",
-    linkPasskey: "Liên kết khóa truy cập",
-  },
-  welcomeScreen: {
-    defaultTitle: "Cánh cổng dẫn tới thế giới phi tập trung",
-    defaultSubtitle: "Kết nối ví để bắt đầu",
-  },
-  agreement: {
-    prefix: "Bằng việc kết nối, bạn đồng ý với",
-    termsOfService: "Điều khoản dịch vụ",
-    and: "và",
-    privacyPolicy: "Chính sách bảo mật",
+  id: "vi_VN",
+  installed: "Đã cài đặt",
+  manageWallet: {
+    connectAnApp: "Kết nối ứng dụng",
+    exportPrivateKey: "Sao lưu private key",
+    linkedProfiles: "Tài khoản",
+    linkProfile: "Thêm tính năng xác thực",
+    title: "Quản lý ví",
   },
   networkSelector: {
-    title: "Chọn mạng lưới",
-    mainnets: "Mainnets",
-    testnets: "Testnets",
-    allNetworks: "Tất cả",
     addCustomNetwork: "Thêm mạng lưới",
-    inputPlaceholder: "Tìm theo tên hoặc ID",
+    allNetworks: "Tất cả",
     categoryLabel: {
-      recentlyUsed: "Gần đây",
-      popular: "Thông dụng",
       others: "Tất cả mạng lưới",
+      popular: "Thông dụng",
+      recentlyUsed: "Gần đây",
     },
-    loading: "Đang tải",
     failedToSwitch: "Không thể đổi mạng lưới",
+    inputPlaceholder: "Tìm theo tên hoặc ID",
+    loading: "Đang tải",
+    mainnets: "Mainnets",
+    testnets: "Testnets",
+    title: "Chọn mạng lưới",
   },
+  newToWallets: "Tìm hiểu về ví điện tử",
+  or: "hoặc",
+  passkeys: {
+    linkPasskey: "Liên kết khóa truy cập",
+    title: "Khóa truy cập",
+  },
+  payTransactions: "Fiat Transactions",
+  personalWallet: "Ví cá nhân",
+  receive: "Nhận", // Used in "Switch to <Wallet-Name>"
   receiveFundsScreen: {
-    title: "Nhận tiền",
     instruction: "Sử dụng địa chỉ ví này để nhận tiền",
+    title: "Nhận tiền",
   },
+  recommended: "Khuyên dùng",
+  requestTestnetFunds: "Nhận Testnet Funds",
+  send: "Gửi",
   sendFundsScreen: {
-    title: "Gửi tiền",
-    submitButton: "Gửi",
-    token: "Token",
-    sendTo: "Gửi tới",
     amount: "Số lượng",
-    successMessage: "Giao dịch thành công",
+    insufficientFunds: "Không đủ vốn",
     invalidAddress: "Địa chỉ không hợp lệ",
     noTokensFound: "Không tìm thấy token",
     searchToken: "Tìm kiếm hoặc dán địa chỉ token",
-    transactionFailed: "Giao dịch thất baị",
-    transactionRejected: "Giao dịch bị huỷ",
-    insufficientFunds: "Không đủ vốn",
     selectTokenTitle: "Chọn Token",
     sending: "Đang gửi",
+    sendTo: "Gửi tới",
+    submitButton: "Gửi",
+    successMessage: "Giao dịch thành công",
+    title: "Gửi tiền",
+    token: "Token",
+    transactionFailed: "Giao dịch thất baị",
+    transactionRejected: "Giao dịch bị huỷ",
   },
   signatureScreen: {
     instructionScreen: {
-      title: "Đăng nhập",
+      disconnectWallet: "Ngắt kết nối ví",
       instruction: "Kí vào yêu cầu tin nhắn trong ví của bạn để tiếp tục",
       signInButton: "Đăng nhập",
-      disconnectWallet: "Ngắt kết nối ví",
+      title: "Đăng nhập",
     },
     signingScreen: {
-      title: "Đang đăng nhập",
+      approveTransactionInSafe: "Xác nhận giao dịch bằng ví Safe",
+      failedToSignIn: "Đăng nhập thất bại",
+      inProgress: "Đang đợi xác nhận",
       prompt: "Ký vào yêu cầu tin nhắn trong ví của bạn",
       promptForSafe:
         "Kí vào yêu cầu tin nhắn trong ví của bạn và chấp nhận giao dịch trong ứng dụng Safe",
-      approveTransactionInSafe: "Xác nhận giao dịch bằng ví Safe",
+      title: "Đang đăng nhập",
       tryAgain: "Thử lại",
-      failedToSignIn: "Đăng nhập thất bại",
-      inProgress: "Đang đợi xác nhận",
     },
   },
-  manageWallet: {
-    title: "Quản lý ví",
-    linkedProfiles: "Tài khoản",
-    linkProfile: "Thêm tính năng xác thực",
-    connectAnApp: "Kết nối ứng dụng",
-    exportPrivateKey: "Sao lưu private key",
-  },
+  signIn: "Đăng nhập",
+  smartWallet: "Ví Thông Minh",
+  switchAccount: "Chuyển tài khoản",
+  switchingNetwork: "Đang chuyển mạng",
+  switchNetwork: "Chuyển mạng",
+  switchTo: "Đổi qua ví",
+  transactions: "Transactions",
+  viewAllTransactions: "Tất cả giao dịch",
   viewFunds: {
     title: "Tài sản",
-    viewTokens: "Tokens",
-    viewNFTs: "NFTs",
     viewAssets: "Tài sản",
+    viewNFTs: "NFTs",
+    viewTokens: "Tokens",
+  },
+  walletTransactions: "Wallet Transactions",
+  welcomeScreen: {
+    defaultSubtitle: "Kết nối ví để bắt đầu",
+    defaultTitle: "Cánh cổng dẫn tới thế giới phi tập trung",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx
index b132713e40e..1061309b8e5 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx
@@ -14,9 +14,9 @@ import { formatNumber } from "../../../../../../utils/formatNumber.js";
 import type { Account } from "../../../../../../wallets/interfaces/wallet.js";
 import type { WalletId } from "../../../../../../wallets/wallet-types.js";
 import {
-  type Theme,
   fontSize,
   spacing,
+  type Theme,
 } from "../../../../../core/design-system/index.js";
 import type {
   FundWalletOptions,
@@ -30,23 +30,21 @@ import type {
 } from "../../../../../core/utils/defaultTokens.js";
 import { ErrorState } from "../../../../wallets/shared/ErrorState.js";
 import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
-import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
-import { ChainName } from "../../../components/ChainName.js";
-import { Spacer } from "../../../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../../components/basic.js";
 import { Button } from "../../../components/buttons.js";
+import { ChainName } from "../../../components/ChainName.js";
 import { Input } from "../../../components/formElements.js";
+import { Spacer } from "../../../components/Spacer.js";
 import { TokenSymbol } from "../../../components/token/TokenSymbol.js";
+import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
 import { ConnectButton } from "../../ConnectButton.js";
+import type { ConnectLocale } from "../../locale/types.js";
 import { ChainButton, NetworkSelectorContent } from "../../NetworkSelector.js";
 import { PoweredByThirdweb } from "../../PoweredByTW.js";
-import type { ConnectLocale } from "../../locale/types.js";
+import { type ERC20OrNativeToken, isNativeToken } from "../nativeToken.js";
 import { TokenSelector } from "../TokenSelector.js";
 import { WalletSwitcherConnectionScreen } from "../WalletSwitcherConnectionScreen.js";
-import { type ERC20OrNativeToken, isNativeToken } from "../nativeToken.js";
 import { DirectPaymentModeScreen } from "./DirectPaymentModeScreen.js";
-import { PayTokenIcon } from "./PayTokenIcon.js";
-import { TransactionModeScreen } from "./TransactionModeScreen.js";
 import { CurrencySelection } from "./fiat/CurrencySelection.js";
 import { FiatScreenContent } from "./fiat/FiatScreenContent.js";
 import { OnRampScreen } from "./fiat/OnRampScreen.js";
@@ -60,18 +58,20 @@ import {
   useFromTokenSelectionStates,
   useToTokenSelectionStates,
 } from "./main/useUISelectionStates.js";
+import { PayTokenIcon } from "./PayTokenIcon.js";
 import { BuyTokenInput } from "./swap/BuyTokenInput.js";
 import { FiatValue } from "./swap/FiatValue.js";
+import { useWalletsAndBalances } from "./swap/fetchBalancesForWallet.js";
 import { SwapFlow } from "./swap/SwapFlow.js";
 import { SwapScreenContent } from "./swap/SwapScreenContent.js";
 import { TokenSelectorScreen } from "./swap/TokenSelectorScreen.js";
 import { TransferFlow } from "./swap/TransferFlow.js";
-import { useWalletsAndBalances } from "./swap/fetchBalancesForWallet.js";
 import {
   type SupportedChainAndTokens,
   useBuySupportedDestinations,
   useBuySupportedSources,
 } from "./swap/useSwapSupportedChains.js";
+import { TransactionModeScreen } from "./TransactionModeScreen.js";
 import { usePayerSetup } from "./usePayerSetup.js";
 
 export type BuyScreenProps = {
@@ -104,16 +104,16 @@ export default function BuyScreen(props: BuyScreenProps) {
   if (supportedDestinationsQuery.isError) {
     return (
       <Container
+        center="both"
+        flex="row"
+        fullHeight
         style={{
           minHeight: "350px",
         }}
-        fullHeight
-        flex="row"
-        center="both"
       >
         <ErrorState
-          title="Something went wrong"
           onTryAgain={supportedDestinationsQuery.refetch}
+          title="Something went wrong"
         />
       </Container>
     );
@@ -227,10 +227,10 @@ function BuyScreenContent(props: BuyScreenContentProps) {
   // preload wallets and balances
   useWalletsAndBalances({
     client: props.client,
+    mode: payOptions.mode,
     sourceSupportedTokens: sourceSupportedTokens || [],
     toChain: toChain,
     toToken: toToken,
-    mode: payOptions.mode,
   });
 
   const { fromChain, setFromChain, fromToken, setFromToken } =
@@ -262,8 +262,8 @@ function BuyScreenContent(props: BuyScreenContentProps) {
   const onSwapSuccess = useCallback(
     (_status: BuyWithCryptoStatus) => {
       props.payOptions.onPurchaseSuccess?.({
-        type: "crypto",
         status: _status,
+        type: "crypto",
       });
       invalidateWalletBalance(queryClient);
     },
@@ -273,8 +273,8 @@ function BuyScreenContent(props: BuyScreenContentProps) {
   const onFiatSuccess = useCallback(
     (_status: BuyWithFiatStatus) => {
       props.payOptions.onPurchaseSuccess?.({
-        type: "fiat",
         status: _status,
+        type: "fiat",
       });
       invalidateWalletBalance(queryClient);
     },
@@ -290,6 +290,7 @@ function BuyScreenContent(props: BuyScreenContentProps) {
         chains={[toChain, ...(props.connectOptions?.chains || [])]}
         client={props.client}
         connectLocale={props.connectLocale}
+        hiddenWallets={props.hiddenWallets}
         isEmbed={props.isEmbed}
         onBack={() => setScreen(screen.backScreen)}
         onSelect={(w) => {
@@ -303,7 +304,6 @@ function BuyScreenContent(props: BuyScreenContentProps) {
             });
           }
         }}
-        hiddenWallets={props.hiddenWallets}
         recommendedWallets={props.connectOptions?.recommendedWallets}
         showAllWallets={
           props.connectOptions?.showAllWallets === undefined
@@ -319,26 +319,26 @@ function BuyScreenContent(props: BuyScreenContentProps) {
   if (screen.id === "swap-flow" && payer) {
     return (
       <SwapFlow
-        title={props.title}
-        transactionMode={payOptions.mode === "transaction"}
-        isEmbed={props.isEmbed}
+        approvalAmount={screen.approvalAmount}
+        buyWithCryptoQuote={screen.quote}
         client={client}
+        isEmbed={props.isEmbed}
+        isFiatFlow={false}
         onBack={() => {
           setScreen({
             id: "buy-with-crypto",
           });
         }}
-        buyWithCryptoQuote={screen.quote}
-        payer={payer}
-        isFiatFlow={false}
         onDone={onDone}
+        onSuccess={onSwapSuccess}
         onTryAgain={() => {
           setScreen({
             id: "buy-with-crypto",
           });
         }}
-        onSuccess={onSwapSuccess}
-        approvalAmount={screen.approvalAmount}
+        payer={payer}
+        title={props.title}
+        transactionMode={payOptions.mode === "transaction"}
       />
     );
   }
@@ -350,26 +350,26 @@ function BuyScreenContent(props: BuyScreenContentProps) {
     const receiverAddress = defaultRecipientAddress || payer.account.address;
     return (
       <OnRampScreen
-        title={props.title}
-        transactionMode={payOptions.mode === "transaction"}
-        paymentLinkId={props.paymentLinkId}
-        quote={screen.quote}
+        client={client}
+        isEmbed={props.isEmbed}
         onBack={() => {
           setScreen({
             id: "buy-with-fiat",
           });
         }}
-        client={client}
+        onDone={onDone}
+        onSuccess={onFiatSuccess}
+        payer={payer}
+        paymentLinkId={props.paymentLinkId}
+        quote={screen.quote}
+        receiverAddress={receiverAddress}
         testMode={
           props.payOptions.buyWithFiat !== false &&
           props.payOptions.buyWithFiat?.testMode === true
         }
         theme={typeof props.theme === "string" ? props.theme : props.theme.type}
-        onDone={onDone}
-        isEmbed={props.isEmbed}
-        payer={payer}
-        receiverAddress={receiverAddress}
-        onSuccess={onFiatSuccess}
+        title={props.title}
+        transactionMode={payOptions.mode === "transaction"}
       />
     );
   }
@@ -383,25 +383,25 @@ function BuyScreenContent(props: BuyScreenContentProps) {
     const receiverAddress = defaultRecipientAddress || activeAccount.address;
     return (
       <TransferFlow
-        title={props.title}
-        onBack={goBack}
-        payer={payer}
-        client={props.client}
         chain={toChain}
-        token={toToken}
-        tokenAmount={tokenAmount}
-        receiverAddress={receiverAddress}
-        transactionMode={props.payOptions.mode === "transaction"}
-        payOptions={payOptions}
+        client={props.client}
         isEmbed={props.isEmbed}
+        onBack={goBack}
         onDone={onDone}
+        onSuccess={onSwapSuccess}
         onTryAgain={() => {
           setScreen({
             id: "buy-with-crypto",
           });
         }}
-        onSuccess={onSwapSuccess}
+        payer={payer}
         paymentLinkId={props.paymentLinkId}
+        payOptions={payOptions}
+        receiverAddress={receiverAddress}
+        title={props.title}
+        token={toToken}
+        tokenAmount={tokenAmount}
+        transactionMode={props.payOptions.mode === "transaction"}
       />
     );
   }
@@ -410,11 +410,11 @@ function BuyScreenContent(props: BuyScreenContentProps) {
     const goBack = () => setScreen(screen.backScreen);
     return (
       <CurrencySelection
+        onBack={goBack}
         onSelect={(currency) => {
           goBack();
           setSelectedCurrency(currency);
         }}
-        onBack={goBack}
       />
     );
   }
@@ -431,25 +431,14 @@ function BuyScreenContent(props: BuyScreenContentProps) {
           chains={chains}
           client={props.client}
           connectLocale={props.connectLocale}
-          setChain={setToChain}
           goBack={goBack}
+          setChain={setToChain}
         />
       );
     }
 
     return (
       <TokenSelector
-        onBack={goBack}
-        tokenList={(
-          (toChain?.id ? destinationSupportedTokens[toChain.id] : undefined) ||
-          []
-        ).filter(
-          (x) => x.address.toLowerCase() !== NATIVE_TOKEN_ADDRESS.toLowerCase(),
-        )}
-        onTokenSelect={(tokenInfo) => {
-          setToToken(tokenInfo);
-          goBack();
-        }}
         chain={toChain}
         chainSelection={
           // hide chain selection if it's disabled
@@ -462,9 +451,20 @@ function BuyScreenContent(props: BuyScreenContentProps) {
               }
             : undefined
         }
-        connectLocale={connectLocale}
         client={client}
+        connectLocale={connectLocale}
         modalTitle={props.title}
+        onBack={goBack}
+        onTokenSelect={(tokenInfo) => {
+          setToToken(tokenInfo);
+          goBack();
+        }}
+        tokenList={(
+          (toChain?.id ? destinationSupportedTokens[toChain.id] : undefined) ||
+          []
+        ).filter(
+          (x) => x.address.toLowerCase() !== NATIVE_TOKEN_ADDRESS.toLowerCase(),
+        )}
       />
     );
   }
@@ -474,29 +474,29 @@ function BuyScreenContent(props: BuyScreenContentProps) {
       <div>
         {screen.id === "main" && (
           <MainScreen
-            title={props.title}
-            payerAccount={payer?.account}
             client={client}
+            connectOptions={props.connectOptions}
+            enabledPaymentMethods={enabledPaymentMethods}
+            hasEditedAmount={hasEditedAmount}
+            onBack={props.onBack}
             onSelectBuyToken={() =>
-              setScreen({ id: "select-to-token", backScreen: screen })
+              setScreen({ backScreen: screen, id: "select-to-token" })
             }
+            payerAccount={payer?.account}
             payOptions={payOptions}
-            setTokenAmount={setTokenAmount}
-            setToChain={setToChain}
-            setToToken={setToToken}
             setFromChain={setFromChain}
             setFromToken={setFromToken}
-            toChain={toChain}
-            toToken={toToken}
-            tokenAmount={tokenAmount}
-            connectOptions={props.connectOptions}
+            setHasEditedAmount={setHasEditedAmount}
             setScreen={setScreen}
+            setToChain={setToChain}
+            setTokenAmount={setTokenAmount}
+            setToToken={setToToken}
             supportedDestinations={supportedDestinations}
-            onBack={props.onBack}
             theme={props.theme}
-            hasEditedAmount={hasEditedAmount}
-            setHasEditedAmount={setHasEditedAmount}
-            enabledPaymentMethods={enabledPaymentMethods}
+            title={props.title}
+            toChain={toChain}
+            tokenAmount={tokenAmount}
+            toToken={toToken}
           />
         )}
 
@@ -506,17 +506,12 @@ function BuyScreenContent(props: BuyScreenContentProps) {
           screen.id === "select-from-token") &&
           payer && (
             <TokenSelectedLayout
+              client={client}
               disabled={
                 ("prefillBuy" in payOptions &&
                   payOptions.prefillBuy?.allowEdits?.amount === false) ||
                 payOptions.mode !== "fund_wallet"
               }
-              title={props.title}
-              selectedChain={toChain}
-              selectedToken={toToken}
-              tokenAmount={tokenAmount}
-              setTokenAmount={setTokenAmount}
-              client={client}
               onBack={() => {
                 if (
                   (screen.id === "buy-with-crypto" ||
@@ -524,8 +519,8 @@ function BuyScreenContent(props: BuyScreenContentProps) {
                   enabledPaymentMethods.buyWithCryptoEnabled
                 ) {
                   setScreen({
-                    id: "select-from-token",
                     backScreen: { id: "main" },
+                    id: "select-from-token",
                   });
                 } else if (screen.id === "select-from-token") {
                   setScreen(screen.backScreen);
@@ -533,34 +528,18 @@ function BuyScreenContent(props: BuyScreenContentProps) {
                   setScreen({ id: "main" });
                 }
               }}
+              selectedChain={toChain}
+              selectedToken={toToken}
+              setTokenAmount={setTokenAmount}
+              title={props.title}
+              tokenAmount={tokenAmount}
             >
               {screen.id === "buy-with-crypto" && activeAccount && (
                 <SwapScreenContent
-                  setScreen={setScreen}
-                  paymentLinkId={props.paymentLinkId}
-                  tokenAmount={deferredTokenAmount}
-                  toChain={toChain}
-                  toToken={toToken}
-                  fromChain={fromChain}
-                  fromToken={fromToken as TokenInfo}
-                  showFromTokenSelector={() => {
-                    setScreen({
-                      id: "select-from-token",
-                      backScreen: screen,
-                    });
-                  }}
-                  payer={payer}
+                  activeAccount={activeAccount}
                   client={client}
-                  isEmbed={props.isEmbed}
-                  onDone={onDone}
-                  payOptions={payOptions}
                   connectLocale={connectLocale}
                   connectOptions={props.connectOptions}
-                  setPayer={setPayer}
-                  // pass it even though we are passing payer, because payer might be different
-                  activeAccount={activeAccount}
-                  setTokenAmount={setTokenAmount}
-                  setHasEditedAmount={setHasEditedAmount}
                   disableTokenSelection={
                     payDisabled === true ||
                     (payOptions.buyWithCrypto !== false &&
@@ -569,31 +548,52 @@ function BuyScreenContent(props: BuyScreenContentProps) {
                       payOptions.buyWithCrypto?.prefillSource?.allowEdits
                         ?.token === false)
                   }
+                  fromChain={fromChain}
+                  fromToken={fromToken as TokenInfo}
+                  isEmbed={props.isEmbed}
+                  onDone={onDone}
+                  payer={payer}
+                  paymentLinkId={props.paymentLinkId}
+                  payOptions={payOptions}
+                  setHasEditedAmount={setHasEditedAmount}
+                  setPayer={setPayer}
+                  setScreen={setScreen}
+                  setTokenAmount={setTokenAmount}
+                  // pass it even though we are passing payer, because payer might be different
+                  showFromTokenSelector={() => {
+                    setScreen({
+                      backScreen: screen,
+                      id: "select-from-token",
+                    });
+                  }}
+                  toChain={toChain}
+                  tokenAmount={deferredTokenAmount}
+                  toToken={toToken}
                 />
               )}
 
               {screen.id === "buy-with-fiat" && (
                 <FiatScreenContent
-                  setScreen={setScreen}
-                  tokenAmount={deferredTokenAmount}
-                  toChain={toChain}
-                  toToken={toToken}
-                  selectedCurrency={selectedCurrency}
                   client={client}
                   isEmbed={props.isEmbed}
                   onDone={onDone}
+                  payer={payer}
+                  paymentLinkId={props.paymentLinkId}
                   payOptions={payOptions}
-                  theme={props.theme}
+                  selectedCurrency={selectedCurrency}
+                  setHasEditedAmount={setHasEditedAmount}
+                  setScreen={setScreen}
+                  setTokenAmount={setTokenAmount}
                   showCurrencySelector={() => {
                     setScreen({
-                      id: "select-currency",
                       backScreen: screen,
+                      id: "select-currency",
                     });
                   }}
-                  payer={payer}
-                  setTokenAmount={setTokenAmount}
-                  setHasEditedAmount={setHasEditedAmount}
-                  paymentLinkId={props.paymentLinkId}
+                  theme={props.theme}
+                  toChain={toChain}
+                  tokenAmount={deferredTokenAmount}
+                  toToken={toToken}
                 />
               )}
 
@@ -601,19 +601,14 @@ function BuyScreenContent(props: BuyScreenContentProps) {
                 supportedSourcesQuery.data &&
                 sourceSupportedTokens && (
                   <TokenSelectorScreen
-                    fiatSupported={props.payOptions.buyWithFiat !== false}
                     client={props.client}
-                    sourceTokens={sourceSupportedTokens}
-                    sourceSupportedTokens={sourceSupportedTokens}
-                    toChain={toChain}
-                    toToken={toToken}
-                    tokenAmount={tokenAmount}
-                    mode={payOptions.mode}
+                    fiatSupported={props.payOptions.buyWithFiat !== false}
                     hiddenWallets={props.hiddenWallets}
+                    mode={payOptions.mode}
                     onConnect={() => {
                       setScreen({
-                        id: "connect-payer-wallet",
                         backScreen: screen,
+                        id: "connect-payer-wallet",
                       });
                     }}
                     onPayWithFiat={() => {
@@ -634,6 +629,11 @@ function BuyScreenContent(props: BuyScreenContentProps) {
                       }
                       setScreen({ id: "buy-with-crypto" });
                     }}
+                    sourceSupportedTokens={sourceSupportedTokens}
+                    sourceTokens={sourceSupportedTokens}
+                    toChain={toChain}
+                    tokenAmount={tokenAmount}
+                    toToken={toToken}
                   />
                 )}
             </TokenSelectedLayout>
@@ -663,33 +663,18 @@ function SelectedTokenInfo(props: {
   return (
     <div>
       <Container
+        center="y"
         flex="row"
         gap="sm"
-        center="y"
         style={{
           justifyContent: "space-between",
         }}
       >
-        <Container flex="row" gap="xxs" center="y">
+        <Container center="y" flex="row" gap="xxs">
           <Input
-            variant="outline"
-            pattern="^[0-9]*[.,]?[0-9]*$"
-            inputMode="decimal"
-            tabIndex={-1}
-            placeholder="0"
-            type="text"
             data-placeholder={props.tokenAmount === ""}
-            value={props.tokenAmount || "0"}
             disabled={props.disabled}
-            onClick={(e) => {
-              // put cursor at the end of the input
-              if (props.tokenAmount === "") {
-                e.currentTarget.setSelectionRange(
-                  e.currentTarget.value.length,
-                  e.currentTarget.value.length,
-                );
-              }
-            }}
+            inputMode="decimal"
             onChange={(e) => {
               let value = e.target.value;
 
@@ -715,25 +700,40 @@ function SelectedTokenInfo(props: {
                 props.setTokenAmount(value);
               }
             }}
+            onClick={(e) => {
+              // put cursor at the end of the input
+              if (props.tokenAmount === "") {
+                e.currentTarget.setSelectionRange(
+                  e.currentTarget.value.length,
+                  e.currentTarget.value.length,
+                );
+              }
+            }}
+            pattern="^[0-9]*[.,]?[0-9]*$"
+            placeholder="0"
             style={{
               border: "none",
-              fontSize: fontSize.lg,
-              boxShadow: "none",
               borderRadius: "0",
+              boxShadow: "none",
+              fontSize: fontSize.lg,
+              fontWeight: 600,
               padding: "0",
               paddingBlock: "2px",
-              fontWeight: 600,
               textAlign: "left",
               width: getWidth(),
             }}
+            tabIndex={-1}
+            type="text"
+            value={props.tokenAmount || "0"}
+            variant="outline"
           />
 
-          <Container flex="row" gap="xxs" center="y">
+          <Container center="y" flex="row" gap="xxs">
             <TokenSymbol
-              token={props.selectedToken}
               chain={props.selectedChain}
-              size="md"
               color="secondaryText"
+              size="md"
+              token={props.selectedToken}
             />
             <PayTokenIcon
               chain={props.selectedChain}
@@ -746,17 +746,17 @@ function SelectedTokenInfo(props: {
           <FiatValue
             chain={props.selectedChain}
             client={props.client}
-            tokenAmount={props.tokenAmount}
-            token={props.selectedToken}
             size="sm"
+            token={props.selectedToken}
+            tokenAmount={props.tokenAmount}
           />
         </Container>
 
         <ChainName
           chain={props.selectedChain}
           client={props.client}
-          size="sm"
           short
+          size="sm"
         />
       </Container>
     </div>
@@ -809,11 +809,8 @@ function MainScreen(props: {
     case "transaction": {
       return (
         <TransactionModeScreen
-          supportedDestinations={supportedDestinations}
-          payUiOptions={payOptions}
-          payerAccount={payerAccount}
-          connectOptions={props.connectOptions}
           client={client}
+          connectOptions={props.connectOptions}
           onContinue={(tokenAmount, toChain, toToken) => {
             setTokenAmount(tokenAmount);
             setToChain(toChain);
@@ -824,11 +821,14 @@ function MainScreen(props: {
               props.setScreen({ id: "buy-with-fiat" });
             } else {
               props.setScreen({
-                id: "select-from-token",
                 backScreen: { id: "main" },
+                id: "select-from-token",
               });
             }
           }}
+          payerAccount={payerAccount}
+          payUiOptions={payOptions}
+          supportedDestinations={supportedDestinations}
         />
       );
     }
@@ -836,10 +836,7 @@ function MainScreen(props: {
       return (
         <DirectPaymentModeScreen
           client={client}
-          payUiOptions={payOptions}
-          payerAccount={payerAccount}
           connectOptions={props.connectOptions}
-          supportedDestinations={supportedDestinations}
           onContinue={(tokenAmount, toChain, toToken) => {
             setTokenAmount(tokenAmount);
             setToChain(toChain);
@@ -850,11 +847,14 @@ function MainScreen(props: {
               props.setScreen({ id: "buy-with-fiat" });
             } else {
               props.setScreen({
-                id: "select-from-token",
                 backScreen: { id: "main" },
+                id: "select-from-token",
               });
             }
           }}
+          payerAccount={payerAccount}
+          payUiOptions={payOptions}
+          supportedDestinations={supportedDestinations}
         />
       );
     }
@@ -862,17 +862,14 @@ function MainScreen(props: {
       return (
         <Container px="lg">
           <Spacer y="lg" />
-          <ModalHeader title={props.title} onBack={props.onBack} />
+          <ModalHeader onBack={props.onBack} title={props.title} />
 
           <Spacer y="xl" />
 
           {/* To */}
           <BuyTokenInput
-            value={tokenAmount}
-            onChange={async (value) => {
-              props.setHasEditedAmount(true);
-              setTokenAmount(value);
-            }}
+            chain={toChain}
+            client={props.client}
             freezeAmount={payOptions.prefillBuy?.allowEdits?.amount === false}
             freezeChainAndToken={
               (payOptions.prefillBuy?.allowEdits?.chain === false &&
@@ -883,10 +880,13 @@ function MainScreen(props: {
                 payOptions.buyWithCrypto?.prefillSource?.allowEdits?.chain ===
                   false)
             }
-            token={toToken}
-            chain={toChain}
+            onChange={async (value) => {
+              props.setHasEditedAmount(true);
+              setTokenAmount(value);
+            }}
             onSelectToken={props.onSelectBuyToken}
-            client={props.client}
+            token={toToken}
+            value={tokenAmount}
           />
 
           <Spacer y="md" />
@@ -898,39 +898,39 @@ function MainScreen(props: {
                 <ConnectButton
                   {...props.connectOptions}
                   client={props.client}
-                  theme={props.theme}
                   connectButton={{
                     style: {
                       width: "100%",
                     },
                   }}
+                  theme={props.theme}
                 />
               </div>
             ) : (
               <Button
-                variant="accent"
-                fullWidth
-                disabled={disableContinue}
                 data-disabled={disableContinue}
+                disabled={disableContinue}
+                fullWidth
                 onClick={() => {
                   if (buyWithFiatEnabled && !buyWithCryptoEnabled) {
                     props.setScreen({ id: "buy-with-fiat" });
                   } else {
                     props.setScreen({
-                      id: "select-from-token",
                       backScreen: { id: "main" },
+                      id: "select-from-token",
                     });
                   }
                   trackPayEvent({
-                    event: "choose_payment_method_fund_wallet_mode",
                     client,
-                    walletAddress: payerAccount.address,
+                    event: "choose_payment_method_fund_wallet_mode",
                     toChainId: toChain.id,
                     toToken: isNativeToken(toToken)
                       ? undefined
                       : toToken.address,
+                    walletAddress: payerAccount.address,
                   });
                 }}
+                variant="accent"
               >
                 Continue
               </Button>
@@ -963,7 +963,7 @@ function TokenSelectedLayout(props: {
   return (
     <Container>
       <Container p="lg">
-        <ModalHeader title={props.title} onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title={props.title} />
       </Container>
 
       <Container
@@ -974,12 +974,12 @@ function TokenSelectedLayout(props: {
       >
         <Spacer y="xs" />
         <SelectedTokenInfo
-          selectedToken={props.selectedToken}
-          selectedChain={props.selectedChain}
-          tokenAmount={props.tokenAmount}
-          setTokenAmount={props.setTokenAmount}
           client={props.client}
           disabled={props.disabled}
+          selectedChain={props.selectedChain}
+          selectedToken={props.selectedToken}
+          setTokenAmount={props.setTokenAmount}
+          tokenAmount={props.tokenAmount}
         />
 
         <Spacer y="sm" />
@@ -1047,29 +1047,29 @@ function ChainSelectionScreen(props: {
 }) {
   return (
     <NetworkSelectorContent
-      client={props.client}
-      connectLocale={props.connectLocale}
-      showTabs={false}
-      onBack={props.goBack}
       chains={props.chains}
+      client={props.client}
       closeModal={props.goBack}
+      connectLocale={props.connectLocale}
       networkSelector={{
         renderChain(renderChainProps) {
           return (
             <ChainButton
               chain={renderChainProps.chain}
+              client={props.client}
               confirming={false}
-              switchingFailed={false}
+              connectLocale={props.connectLocale}
               onClick={() => {
                 props.setChain(renderChainProps.chain);
                 props.goBack();
               }}
-              client={props.client}
-              connectLocale={props.connectLocale}
+              switchingFailed={false}
             />
           );
         },
       }}
+      onBack={props.goBack}
+      showTabs={false}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/DirectPaymentModeScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/DirectPaymentModeScreen.tsx
index c92395f7e7e..b4a39f3e83d 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/DirectPaymentModeScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/DirectPaymentModeScreen.tsx
@@ -17,15 +17,15 @@ import { useActiveWallet } from "../../../../../core/hooks/wallets/useActiveWall
 import type { TokenInfo } from "../../../../../core/utils/defaultTokens.js";
 import { useEnsName } from "../../../../../core/utils/wallet.js";
 import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
-import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
+import { Container, Line, ModalHeader } from "../../../components/basic.js";
+import { Button } from "../../../components/buttons.js";
 import { ChainIcon } from "../../../components/ChainIcon.js";
 import { Img } from "../../../components/Img.js";
 import { Spacer } from "../../../components/Spacer.js";
 import { TokenIcon } from "../../../components/TokenIcon.js";
-import { WalletImage } from "../../../components/WalletImage.js";
-import { Container, Line, ModalHeader } from "../../../components/basic.js";
-import { Button } from "../../../components/buttons.js";
 import { Text } from "../../../components/text.js";
+import { WalletImage } from "../../../components/WalletImage.js";
+import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
 import { ConnectButton } from "../../ConnectButton.js";
 import { PoweredByThirdweb } from "../../PoweredByTW.js";
 import { type ERC20OrNativeToken, isNativeToken } from "../nativeToken.js";
@@ -56,12 +56,11 @@ export function DirectPaymentModeScreen(props: {
   const paymentInfo = payUiOptions.paymentInfo;
   const { data: chainData } = useChainMetadata(paymentInfo.chain);
   const { data: sellerEns } = useEnsName({
-    client,
     address: paymentInfo.sellerAddress,
+    client,
   });
 
   const totalCostQuery = useQuery({
-    queryKey: ["amount", paymentInfo],
     queryFn: async () => {
       let tokenDecimals = 18;
       if (paymentInfo.token && !isNativeToken(paymentInfo.token)) {
@@ -81,6 +80,7 @@ export function DirectPaymentModeScreen(props: {
       }
       return cost;
     },
+    queryKey: ["amount", paymentInfo],
   });
 
   const totalCost = totalCostQuery.data;
@@ -90,8 +90,6 @@ export function DirectPaymentModeScreen(props: {
 
   const token: TokenInfo = paymentInfo.token
     ? {
-        name: paymentInfo.token.name || chainData.nativeCurrency.name,
-        symbol: paymentInfo.token.symbol || chainData.nativeCurrency.symbol,
         address: paymentInfo.token.address || NATIVE_TOKEN_ADDRESS,
         icon:
           paymentInfo.token?.icon ||
@@ -102,12 +100,14 @@ export function DirectPaymentModeScreen(props: {
                 t.address.toLowerCase() ===
                 paymentInfo.token?.address.toLowerCase(),
             )?.icon,
+        name: paymentInfo.token.name || chainData.nativeCurrency.name,
+        symbol: paymentInfo.token.symbol || chainData.nativeCurrency.symbol,
       }
     : {
         address: NATIVE_TOKEN_ADDRESS,
+        icon: chainData.icon?.url,
         name: chainData.nativeCurrency.name,
         symbol: chainData.nativeCurrency.symbol,
-        icon: chainData.icon?.url,
       };
 
   return (
@@ -122,55 +122,55 @@ export function DirectPaymentModeScreen(props: {
             client={client}
             src={metadata?.image}
             style={{
-              width: "100%",
-              borderRadius: spacing.md,
               backgroundColor: theme.colors.tertiaryBg,
+              borderRadius: spacing.md,
+              width: "100%",
             }}
           />
         ) : activeWallet ? (
           <Container
-            flex="row"
             center="both"
+            flex="row"
             style={{
-              padding: spacing.md,
-              marginBottom: spacing.md,
-              borderRadius: spacing.md,
               backgroundColor: theme.colors.tertiaryBg,
+              borderRadius: spacing.md,
+              marginBottom: spacing.md,
+              padding: spacing.md,
             }}
           >
             <WalletImage
-              size={iconSize.xl}
-              id={activeWallet.id}
               client={client}
+              id={activeWallet.id}
+              size={iconSize.xl}
             />
             <div
               style={{
-                flexGrow: 1,
                 borderBottom: "6px dotted",
                 borderColor: theme.colors.secondaryIconColor,
+                flexGrow: 1,
                 marginLeft: spacing.md,
                 marginRight: spacing.md,
               }}
             />
             <ChainIcon
+              chainIconUrl={chainData.icon?.url}
               client={client}
               size={iconSize.xl}
-              chainIconUrl={chainData.icon?.url}
             />
           </Container>
         ) : null}
         <Spacer y="md" />
         <Container flex="row">
-          <Container flex="column" expand>
-            <Text size="md" color="primaryText" weight={700}>
+          <Container expand flex="column">
+            <Text color="primaryText" size="md" weight={700}>
               Price
             </Text>
           </Container>
           <Container expand>
             <Container
+              center="y"
               flex="row"
               gap="xs"
-              center="y"
               style={{ justifyContent: "right" }}
             >
               <TokenIcon
@@ -189,26 +189,26 @@ export function DirectPaymentModeScreen(props: {
         <Line />
         <Spacer y="md" />
         <Container flex="row">
-          <Container flex="column" expand>
-            <Text size="xs" color="secondaryText">
+          <Container expand flex="column">
+            <Text color="secondaryText" size="xs">
               Network
             </Text>
           </Container>
           <Container expand>
             <Container
+              center="y"
               flex="row"
               gap="xs"
-              center="y"
               style={{ justifyContent: "right" }}
             >
               <ChainIcon
                 chainIconUrl={chainData.icon?.url}
-                size="xs"
                 client={props.client}
+                size="xs"
               />
               <Text
-                size="xs"
                 color="secondaryText"
+                size="xs"
                 style={{ textAlign: "right" }}
               >
                 {chainData.name}
@@ -218,21 +218,21 @@ export function DirectPaymentModeScreen(props: {
         </Container>
         <Spacer y="sm" />
         <Container flex="row">
-          <Container flex="column" expand>
-            <Text size="xs" color="secondaryText">
+          <Container expand flex="column">
+            <Text color="secondaryText" size="xs">
               Seller
             </Text>
           </Container>
           <Container expand>
             <Container
+              center="y"
               flex="row"
               gap="xs"
-              center="y"
               style={{ justifyContent: "right" }}
             >
               <Text
-                size="xs"
                 color="secondaryText"
+                size="xs"
                 style={{ textAlign: "right" }}
               >
                 {sellerEns || shortenAddress(paymentInfo.sellerAddress)}
@@ -244,19 +244,19 @@ export function DirectPaymentModeScreen(props: {
       <Spacer y="xl" />
       {payerAccount ? (
         <Button
-          variant="accent"
           fullWidth
           onClick={() => {
             trackPayEvent({
-              event: "choose_payment_method_direct_payment_mode",
               client,
-              walletAddress: payerAccount.address,
-              walletType: activeWallet?.id,
+              event: "choose_payment_method_direct_payment_mode",
               toChainId: paymentInfo.chain.id,
               toToken: paymentInfo.token?.address,
+              walletAddress: payerAccount.address,
+              walletType: activeWallet?.id,
             });
             onContinue(totalCost, paymentInfo.chain, token);
           }}
+          variant="accent"
         >
           Choose Payment Method
         </Button>
@@ -265,12 +265,12 @@ export function DirectPaymentModeScreen(props: {
           <ConnectButton
             {...props.connectOptions}
             client={client}
-            theme={theme}
             connectButton={{
               style: {
                 width: "100%",
               },
             }}
+            theme={theme}
           />
         </div>
       )}
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/EstimatedTimeAndFees.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/EstimatedTimeAndFees.tsx
index 694de180677..d98f3bfeea7 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/EstimatedTimeAndFees.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/EstimatedTimeAndFees.tsx
@@ -4,9 +4,9 @@ import {
   iconSize,
   radius,
 } from "../../../../../core/design-system/index.js";
-import { Skeleton } from "../../../components/Skeleton.js";
 import { Container } from "../../../components/basic.js";
 import { Button } from "../../../components/buttons.js";
+import { Skeleton } from "../../../components/Skeleton.js";
 import { Text } from "../../../components/text.js";
 import type { IconFC } from "../../icons/types.js";
 import { formatSeconds } from "./swap/formatSeconds.js";
@@ -21,24 +21,24 @@ export function EstimatedTimeAndFees(props: {
   return (
     <Container
       bg="tertiaryBg"
-      flex="row"
       borderColor="borderColor"
+      flex="row"
       style={{
+        alignItems: "center",
         borderRadius: radius.md,
+        borderStyle: "solid",
         borderTopLeftRadius: 0,
         borderTopRightRadius: 0,
-        justifyContent: "space-between",
-        alignItems: "center",
         borderWidth: "1px",
-        borderStyle: "solid",
+        justifyContent: "space-between",
       }}
     >
-      <Container flex="row" center="y" gap="xxs" color="accentText" p="sm">
-        <ClockIcon width={iconSize.sm} height={iconSize.sm} />
+      <Container center="y" color="accentText" flex="row" gap="xxs" p="sm">
+        <ClockIcon height={iconSize.sm} width={iconSize.sm} />
         {quoteIsLoading ? (
-          <Skeleton height={fontSize.xs} width="50px" color="borderColor" />
+          <Skeleton color="borderColor" height={fontSize.xs} width="50px" />
         ) : (
-          <Text size="xs" color="secondaryText">
+          <Text color="secondaryText" size="xs">
             {estimatedSeconds !== undefined
               ? `~${formatSeconds(estimatedSeconds)}`
               : "--"}
@@ -46,11 +46,11 @@ export function EstimatedTimeAndFees(props: {
         )}
       </Container>
 
-      <Button variant="ghost" onClick={props.onViewFees} gap="xs">
-        <Container color="accentText" flex="row" center="both">
+      <Button gap="xs" onClick={props.onViewFees} variant="ghost">
+        <Container center="both" color="accentText" flex="row">
           <ViewFeeIcon size={iconSize.sm} />
         </Container>
-        <Text size="xs" color="secondaryText">
+        <Text color="secondaryText" size="xs">
           View Fees
         </Text>
       </Button>
@@ -61,12 +61,12 @@ export function EstimatedTimeAndFees(props: {
 const ViewFeeIcon: IconFC = (props) => {
   return (
     <svg
-      width={props.size}
+      aria-hidden="true"
+      fill="none"
       height={props.size}
       viewBox="0 0 12 12"
-      fill="none"
+      width={props.size}
       xmlns="http://www.w3.org/2000/svg"
-      aria-hidden="true"
     >
       <path
         d="M9.5 1.5H2.5C1.94772 1.5 1.5 1.94772 1.5 2.5V9.5C1.5 10.0523 1.94772 10.5 2.5 10.5H9.5C10.0523 10.5 10.5 10.0523 10.5 9.5V2.5C10.5 1.94772 10.0523 1.5 9.5 1.5Z"
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/LazyBuyScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/LazyBuyScreen.tsx
index fe062b249ff..a0595b4ed60 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/LazyBuyScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/LazyBuyScreen.tsx
@@ -1,4 +1,4 @@
-import { Suspense, lazy } from "react";
+import { lazy, Suspense } from "react";
 import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
 import type { BuyScreenProps } from "./BuyScreen.js";
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayProviderSelection.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayProviderSelection.tsx
index 905ebcc52c1..b035ed0cb04 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayProviderSelection.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayProviderSelection.tsx
@@ -18,10 +18,10 @@ export const PayProviderSelection = (props: {
 }) => {
   const ProviderItem = (
     <Container
-      flex="row"
       center="y"
-      gap="xxs"
       color="secondaryText"
+      flex="row"
+      gap="xxs"
       style={{ padding: spacing.md }}
     >
       <Text size="xs">
@@ -30,7 +30,7 @@ export const PayProviderSelection = (props: {
         )}
       </Text>
       {props.supportedProviders.length > 1 && (
-        <ChevronDownIcon width={iconSize.sm} height={iconSize.sm} />
+        <ChevronDownIcon height={iconSize.sm} width={iconSize.sm} />
       )}
     </Container>
   );
@@ -38,25 +38,25 @@ export const PayProviderSelection = (props: {
   return (
     <Container
       bg="tertiaryBg"
-      flex="row"
       borderColor="borderColor"
+      flex="row"
       style={{
-        paddingLeft: spacing.md,
-        justifyContent: "space-between",
         alignItems: "center",
-        borderWidth: "1px",
-        borderStyle: "solid",
         borderBottom: "none",
+        borderStyle: "solid",
+        borderWidth: "1px",
+        justifyContent: "space-between",
+        paddingLeft: spacing.md,
       }}
     >
-      <Text size="xs" color="secondaryText">
+      <Text color="secondaryText" size="xs">
         Provider
       </Text>
       {props.supportedProviders.length > 1 ? (
         <Button
-          variant="ghost"
           onClick={props.onShowProviders}
-          style={{ padding: 0 }} // Padding is managed within children as the button is conditional
+          style={{ padding: 0 }}
+          variant="ghost" // Padding is managed within children as the button is conditional
         >
           {ProviderItem}
         </Button>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayTokenIcon.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayTokenIcon.tsx
index c29a0c1edf1..f83bcc5eb94 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayTokenIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayTokenIcon.tsx
@@ -3,7 +3,7 @@ import type { ThirdwebClient } from "../../../../../../client/client.js";
 import { getAddress } from "../../../../../../utils/address.js";
 import type { iconSize } from "../../../../../core/design-system/index.js";
 import { TokenIcon } from "../../../components/TokenIcon.js";
-import { type NativeToken, isNativeToken } from "../nativeToken.js";
+import { isNativeToken, type NativeToken } from "../nativeToken.js";
 import { useBuySupportedDestinations } from "./swap/useSwapSupportedChains.js";
 
 // This is a temporary solution to get the token icon working for ERC20 tokens
@@ -32,6 +32,9 @@ export function PayTokenIcon(props: {
 
   return (
     <TokenIcon
+      chain={props.chain}
+      client={props.client}
+      size={props.size}
       token={
         isNativeToken(token)
           ? { nativeToken: true }
@@ -40,9 +43,6 @@ export function PayTokenIcon(props: {
               icon: token.icon || tokenIcon,
             }
       }
-      chain={props.chain}
-      client={props.client}
-      size={props.size}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayWIthCreditCard.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayWIthCreditCard.tsx
index 31d103dd8c2..bf5e3640a28 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayWIthCreditCard.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/PayWIthCreditCard.tsx
@@ -8,9 +8,9 @@ import {
   radius,
   spacing,
 } from "../../../../../core/design-system/index.js";
-import { Skeleton } from "../../../components/Skeleton.js";
 import { Container } from "../../../components/basic.js";
 import { Button } from "../../../components/buttons.js";
+import { Skeleton } from "../../../components/Skeleton.js";
 import { Text } from "../../../components/text.js";
 import { type CurrencyMeta, getFiatIcon } from "./fiat/currencies.js";
 
@@ -33,55 +33,55 @@ export function PayWithCreditCard(props: {
       borderColor="borderColor"
       flex="row"
       style={{
-        borderRadius: radius.md,
-        borderBottomRightRadius: 0,
+        alignItems: "center",
+        borderBottom: "none",
         borderBottomLeftRadius: 0,
-        borderWidth: "1px",
+        borderBottomRightRadius: 0,
+        borderRadius: radius.md,
         borderStyle: "solid",
-        borderBottom: "none",
+        borderWidth: "1px",
         flexWrap: "nowrap",
         justifyContent: "space-between",
-        alignItems: "center",
       }}
     >
       {/* Left */}
       <CurrencyButton
-        variant="ghost"
+        gap="sm"
         onClick={props.onSelectCurrency}
         style={{
-          minHeight: "64px",
           justifyContent: "flex-start",
+          minHeight: "64px",
           minWidth: "50%",
         }}
-        gap="sm"
+        variant="ghost"
       >
         {getFiatIcon(props.currency, "md")}
-        <Container flex="row" center="y" gap="xxs" color="secondaryText">
+        <Container center="y" color="secondaryText" flex="row" gap="xxs">
           <Text color="primaryText">{props.currency.shorthand}</Text>
-          <ChevronDownIcon width={iconSize.sm} height={iconSize.sm} />
+          <ChevronDownIcon height={iconSize.sm} width={iconSize.sm} />
         </Container>
       </CurrencyButton>
 
       {/* Right */}
       <div
         style={{
-          flexGrow: 1,
-          flexShrink: 1,
+          alignItems: "flex-end",
           display: "flex",
           flexDirection: "column",
-          alignItems: "flex-end",
+          flexGrow: 1,
+          flexShrink: 1,
           gap: spacing.xxs,
+          justifyContent: "center",
           overflow: "hidden",
+          paddingRight: spacing.sm,
           textOverflow: "ellipsis",
           whiteSpace: "nowrap",
-          justifyContent: "center",
-          paddingRight: spacing.sm,
         }}
       >
         {props.isLoading ? (
-          <Skeleton width="100px" height={fontSize.lg} />
+          <Skeleton height={fontSize.lg} width="100px" />
         ) : (
-          <Text size="lg" color={props.value ? "primaryText" : "secondaryText"}>
+          <Text color={props.value ? "primaryText" : "secondaryText"} size="lg">
             {props.value
               ? `${props.currency.symbol}${formatNumber(
                   Number(props.value),
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/Stepper.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/Stepper.tsx
index 8a862ba46ef..6f866e463b2 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/Stepper.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/Stepper.tsx
@@ -4,13 +4,9 @@ import { fontSize, iconSize } from "../../../../../core/design-system/index.js";
 import { Container } from "../../../components/basic.js";
 import { StyledDiv } from "../../../design-system/elements.js";
 
-export function StepIcon(props: {
-  isDone: boolean;
-  isActive: boolean;
-}) {
+export function StepIcon(props: { isDone: boolean; isActive: boolean }) {
   return (
     <Container
-      flex="row"
       center="both"
       color={
         props.isDone
@@ -19,10 +15,11 @@ export function StepIcon(props: {
             ? "accentText"
             : "secondaryText"
       }
+      flex="row"
     >
       <Circle>
         {props.isDone ? (
-          <CheckIcon width={iconSize.sm} height={iconSize.sm} />
+          <CheckIcon height={iconSize.sm} width={iconSize.sm} />
         ) : (
           <PulsingDot data-active={props.isActive} />
         )}
@@ -38,12 +35,7 @@ export function Step(props: {
 }) {
   return (
     <Container
-      flex="row"
       center="y"
-      gap="xs"
-      style={{
-        fontSize: fontSize.sm,
-      }}
       color={
         props.isDone
           ? "success"
@@ -51,8 +43,13 @@ export function Step(props: {
             ? "accentText"
             : "secondaryText"
       }
+      flex="row"
+      gap="xs"
+      style={{
+        fontSize: fontSize.sm,
+      }}
     >
-      <StepIcon isDone={props.isDone} isActive={props.isActive} />
+      <StepIcon isActive={props.isActive} isDone={props.isDone} />
       {props.label}
     </Container>
   );
@@ -71,24 +68,24 @@ const pulseAnimation = keyframes`
 
 const PulsingDot = /* @__PURE__ */ StyledDiv(() => {
   return {
-    background: "currentColor",
-    width: "10px",
-    height: "10px",
-    borderRadius: "50%",
     '&[data-active="true"]': {
       animation: `${pulseAnimation} 1s infinite`,
     },
+    background: "currentColor",
+    borderRadius: "50%",
+    height: "10px",
+    width: "10px",
   };
 });
 
 const Circle = /* @__PURE__ */ StyledDiv(() => {
   return {
+    alignItems: "center",
     border: "1px solid currentColor",
-    width: "20px",
-    height: "20px",
     borderRadius: "50%",
     display: "flex",
-    alignItems: "center",
+    height: "20px",
     justifyContent: "center",
+    width: "20px",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.tsx
index ee1ddcddd0c..5f9f0b253e9 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.tsx
@@ -19,28 +19,28 @@ import { useActiveAccount } from "../../../../../core/hooks/wallets/useActiveAcc
 import { useActiveWallet } from "../../../../../core/hooks/wallets/useActiveWallet.js";
 import { ErrorState } from "../../../../wallets/shared/ErrorState.js";
 import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
-import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
+import { Container, Line, ModalHeader } from "../../../components/basic.js";
+import { Button } from "../../../components/buttons.js";
 import { ChainIcon } from "../../../components/ChainIcon.js";
 import { Img } from "../../../components/Img.js";
 import { Skeleton } from "../../../components/Skeleton.js";
 import { Spacer } from "../../../components/Spacer.js";
 import { TokenIcon } from "../../../components/TokenIcon.js";
-import { Container, Line, ModalHeader } from "../../../components/basic.js";
-import { Button } from "../../../components/buttons.js";
 import { Text } from "../../../components/text.js";
 import { TokenSymbol } from "../../../components/token/TokenSymbol.js";
+import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
 import { ConnectButton } from "../../ConnectButton.js";
-import { PoweredByThirdweb } from "../../PoweredByTW.js";
 import { OutlineWalletIcon } from "../../icons/OutlineWalletIcon.js";
+import { PoweredByThirdweb } from "../../PoweredByTW.js";
 import { formatTokenBalance } from "../formatTokenBalance.js";
 import {
   type ERC20OrNativeToken,
-  NATIVE_TOKEN,
   isNativeToken,
+  NATIVE_TOKEN,
 } from "../nativeToken.js";
 import { useTransactionCostAndData } from "./main/useBuyTxStates.js";
-import { WalletRow } from "./swap/WalletRow.js";
 import type { SupportedChainAndTokens } from "./swap/useSwapSupportedChains.js";
+import { WalletRow } from "./swap/WalletRow.js";
 
 export function TransactionModeScreen(props: {
   client: ThirdwebClient;
@@ -74,9 +74,9 @@ export function TransactionModeScreen(props: {
     isLoading: transactionCostAndDataLoading,
     refetch: transactionCostAndDataRefetch,
   } = useTransactionCostAndData({
-    transaction: payUiOptions.transaction,
     account: payerAccount,
     supportedDestinations,
+    transaction: payUiOptions.transaction,
   });
   const theme = useCustomTheme();
   const activeWallet = useActiveWallet();
@@ -87,10 +87,10 @@ export function TransactionModeScreen(props: {
     {
       address: activeAccount?.address,
       chain: payUiOptions.transaction.chain,
+      client: props.client,
       tokenAddress: isNativeToken(transactionCostAndData?.token || NATIVE_TOKEN)
         ? undefined
         : transactionCostAndData?.token.address,
-      client: props.client,
     },
     {
       enabled: !!transactionCostAndData,
@@ -104,16 +104,16 @@ export function TransactionModeScreen(props: {
   if (!activeAccount) {
     return (
       <Container
+        center="both"
+        flex="row"
+        fullHeight
         style={{
           minHeight: "350px",
         }}
-        fullHeight
-        flex="row"
-        center="both"
       >
         <Container animate="fadein">
           <Spacer y="xxl" />
-          <Container flex="row" center="x">
+          <Container center="x" flex="row">
             <OutlineWalletIcon size={iconSize["3xl"]} />
           </Container>
           <Spacer y="lg" />
@@ -121,7 +121,7 @@ export function TransactionModeScreen(props: {
             Please connect a wallet to continue
           </Text>
           <Spacer y="xl" />
-          <Container flex="row" center="x" style={{ width: "100%" }}>
+          <Container center="x" flex="row" style={{ width: "100%" }}>
             <ConnectButton
               client={client}
               theme={theme}
@@ -136,24 +136,24 @@ export function TransactionModeScreen(props: {
   if (transactionCostAndDataError || chainDataError) {
     return (
       <Container
+        center="both"
+        flex="row"
+        fullHeight
         style={{
           minHeight: "350px",
         }}
-        fullHeight
-        flex="row"
-        center="both"
       >
         <ErrorState
-          title={
-            transactionCostAndDataError?.message ||
-            chainDataError?.message ||
-            "Something went wrong"
-          }
           onTryAgain={
             transactionCostAndDataError
               ? transactionCostAndDataRefetch
               : chainDataRefetch
           }
+          title={
+            transactionCostAndDataError?.message ||
+            chainDataError?.message ||
+            "Something went wrong"
+          }
         />
       </Container>
     );
@@ -179,20 +179,20 @@ export function TransactionModeScreen(props: {
             client={client}
             src={metadata?.image}
             style={{
-              width: "100%",
-              borderRadius: spacing.md,
-              border: `1px solid ${theme.colors.borderColor}`,
               backgroundColor: theme.colors.tertiaryBg,
+              border: `1px solid ${theme.colors.borderColor}`,
+              borderRadius: spacing.md,
+              width: "100%",
             }}
           />
         ) : activeAccount ? (
           <Container flex="column" gap="sm">
             {insufficientFunds && (
               <div>
-                <Text color="danger" size="xs" center multiline>
+                <Text center color="danger" multiline size="xs">
                   Insufficient Funds
                 </Text>
-                <Text size="xs" center multiline>
+                <Text center multiline size="xs">
                   Select another token or pay with card.
                 </Text>
               </div>
@@ -200,49 +200,49 @@ export function TransactionModeScreen(props: {
             <Container
               flex="row"
               style={{
-                justifyContent: "space-between",
-                padding: spacing.sm,
-                marginBottom: spacing.sm,
-                borderRadius: spacing.md,
                 backgroundColor: theme.colors.tertiaryBg,
                 border: `1px solid ${theme.colors.borderColor}`,
+                borderRadius: spacing.md,
+                justifyContent: "space-between",
+                marginBottom: spacing.sm,
+                padding: spacing.sm,
               }}
             >
               <WalletRow
                 address={activeAccount?.address}
-                iconSize="md"
                 client={client}
+                iconSize="md"
               />
               {balanceQuery.data ? (
-                <Container flex="row" gap="3xs" center="y">
-                  <Text size="xs" color="secondaryText" weight={500}>
+                <Container center="y" flex="row" gap="3xs">
+                  <Text color="secondaryText" size="xs" weight={500}>
                     {formatTokenBalance(balanceQuery.data, false)}
                   </Text>
                   <TokenSymbol
-                    token={transactionCostAndData.token}
                     chain={payUiOptions.transaction.chain}
-                    size="xs"
                     color="secondaryText"
+                    size="xs"
+                    token={transactionCostAndData.token}
                   />
                 </Container>
               ) : (
-                <Skeleton width="70px" height={fontSize.xs} />
+                <Skeleton height={fontSize.xs} width="70px" />
               )}
             </Container>
           </Container>
         ) : null}
         <Spacer y="md" />
         <Container flex="row">
-          <Container flex="column" expand>
-            <Text size="md" color="primaryText" weight={700}>
+          <Container expand flex="column">
+            <Text color="primaryText" size="md" weight={700}>
               Price
             </Text>
           </Container>
           <Container expand>
             <Container
+              center="y"
               flex="row"
               gap="xs"
-              center="y"
               style={{ justifyContent: "right" }}
             >
               <TokenIcon
@@ -272,16 +272,16 @@ export function TransactionModeScreen(props: {
         <Line />
         <Spacer y="md" />
         <Container flex="row">
-          <Container flex="column" expand>
-            <Text size="xs" color="secondaryText">
+          <Container expand flex="column">
+            <Text color="secondaryText" size="xs">
               Gas Fees
             </Text>
           </Container>
           <Container expand>
             <Container
+              center="y"
               flex="row"
               gap="xs"
-              center="y"
               style={{ justifyContent: "right" }}
             >
               <Text
@@ -307,26 +307,26 @@ export function TransactionModeScreen(props: {
         </Container>
         <Spacer y="sm" />
         <Container flex="row">
-          <Container flex="column" expand>
-            <Text size="xs" color="secondaryText">
+          <Container expand flex="column">
+            <Text color="secondaryText" size="xs">
               Network
             </Text>
           </Container>
           <Container expand>
             <Container
+              center="y"
               flex="row"
               gap="xs"
-              center="y"
               style={{ justifyContent: "right" }}
             >
               <ChainIcon
                 chainIconUrl={chainData.icon?.url}
-                size="xs"
                 client={props.client}
+                size="xs"
               />
               <Text
-                size="xs"
                 color="secondaryText"
+                size="xs"
                 style={{ textAlign: "right" }}
               >
                 {chainData.name}
@@ -338,7 +338,6 @@ export function TransactionModeScreen(props: {
       <Spacer y="xl" />
       {payerAccount ? (
         <Button
-          variant="accent"
           fullWidth
           onClick={() => {
             let totalCostWei = insufficientFunds
@@ -352,13 +351,13 @@ export function TransactionModeScreen(props: {
               totalCostWei += transactionCostAndData.gasCostWei;
             }
             trackPayEvent({
-              event: "choose_payment_method_transaction_mode",
+              amountWei: totalCostWei.toString(),
               client,
-              walletAddress: payerAccount.address,
-              walletType: activeWallet?.id,
+              event: "choose_payment_method_transaction_mode",
               toChainId: payUiOptions.transaction.chain.id,
               toToken: transactionCostAndData.token.address,
-              amountWei: totalCostWei.toString(),
+              walletAddress: payerAccount.address,
+              walletType: activeWallet?.id,
             });
             onContinue(
               toTokens(totalCostWei, transactionCostAndData.decimals),
@@ -366,6 +365,7 @@ export function TransactionModeScreen(props: {
               transactionCostAndData.token,
             );
           }}
+          variant="accent"
         >
           Choose Payment Method
         </Button>
@@ -374,12 +374,12 @@ export function TransactionModeScreen(props: {
           <ConnectButton
             {...props.connectOptions}
             client={client}
-            theme={theme}
             connectButton={{
               style: {
                 width: "100%",
               },
             }}
+            theme={theme}
           />
         </div>
       )}
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/CurrencySelection.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/CurrencySelection.tsx
index b8d0b442430..e0ff6f22b59 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/CurrencySelection.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/CurrencySelection.tsx
@@ -1,9 +1,9 @@
 import styled from "@emotion/styled";
 import { useCustomTheme } from "../../../../../../core/design-system/CustomThemeProvider.js";
 import { spacing } from "../../../../../../core/design-system/index.js";
-import { Spacer } from "../../../../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../../../components/basic.js";
 import { Button } from "../../../../components/buttons.js";
+import { Spacer } from "../../../../components/Spacer.js";
 import { Text } from "../../../../components/text.js";
 import { type CurrencyMeta, currencies, getFiatIcon } from "./currencies.js";
 
@@ -14,7 +14,7 @@ export function CurrencySelection(props: {
   return (
     <Container>
       <Container p="lg">
-        <ModalHeader title="Pay with" onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title="Pay with" />
       </Container>
 
       <Line />
@@ -25,10 +25,10 @@ export function CurrencySelection(props: {
           return (
             <SelectCurrencyButton
               fullWidth
-              variant="secondary"
+              gap="sm"
               key={c.shorthand}
               onClick={() => props.onSelect(c)}
-              gap="sm"
+              variant="secondary"
             >
               {getFiatIcon(c, "lg")}
               <Container flex="column" gap="xxs">
@@ -48,14 +48,14 @@ export function CurrencySelection(props: {
 const SelectCurrencyButton = /* @__PURE__ */ styled(Button)(() => {
   const theme = useCustomTheme();
   return {
-    background: theme.colors.tertiaryBg,
-    justifyContent: "flex-start",
-    gap: spacing.sm,
-    padding: spacing.sm,
     "&:hover": {
       background: theme.colors.secondaryButtonBg,
       transform: "scale(1.01)",
     },
+    background: theme.colors.tertiaryBg,
+    gap: spacing.sm,
+    justifyContent: "flex-start",
+    padding: spacing.sm,
     transition: "background 200ms ease, transform 150ms ease",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
index 9fd9659b030..b187e2961ee 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
@@ -12,6 +12,8 @@ import type { PayUIOptions } from "../../../../../../core/hooks/connection/Conne
 import { useBuyWithFiatQuote } from "../../../../../../core/hooks/pay/useBuyWithFiatQuote.js";
 import { PREFERRED_FIAT_PROVIDER_STORAGE_KEY } from "../../../../../../core/utils/storage.js";
 import { getErrorMessage } from "../../../../../utils/errors.js";
+import { Container } from "../../../../components/basic.js";
+import { Button } from "../../../../components/buttons.js";
 import {
   Drawer,
   DrawerOverlay,
@@ -19,18 +21,16 @@ import {
 } from "../../../../components/Drawer.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { Spinner } from "../../../../components/Spinner.js";
-import { Container } from "../../../../components/basic.js";
-import { Button } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
 import { type ERC20OrNativeToken, isNativeToken } from "../../nativeToken.js";
 import { EstimatedTimeAndFees } from "../EstimatedTimeAndFees.js";
+import type { SelectedScreen } from "../main/types.js";
 import { PayProviderSelection } from "../PayProviderSelection.js";
 import { PayWithCreditCard } from "../PayWIthCreditCard.js";
-import type { SelectedScreen } from "../main/types.js";
 import { FiatFees } from "../swap/Fees.js";
 import type { PayerInfo } from "../types.js";
-import { Providers } from "./Providers.js";
 import type { CurrencyMeta } from "./currencies.js";
+import { Providers } from "./Providers.js";
 
 export function FiatScreenContent(props: {
   setScreen: (screen: SelectedScreen) => void;
@@ -99,21 +99,21 @@ export function FiatScreenContent(props: {
   const fiatQuoteQuery = useBuyWithFiatQuote(
     buyWithFiatOptions !== false && tokenAmount
       ? {
+          client,
+          fromAddress: payer.account.address,
           fromCurrencySymbol: selectedCurrency.shorthand,
-          toChainId: toChain.id,
+          isTestMode: buyWithFiatOptions?.testMode,
+          onrampChainId: buyWithFiatOptions?.onrampChainId,
+          onrampTokenAddress: buyWithFiatOptions?.onrampTokenAddress,
+          paymentLinkId: paymentLinkId,
+          preferredProvider: preferredProvider ?? supportedProviders[0],
+          purchaseData: props.payOptions.purchaseData,
           toAddress: receiverAddress,
+          toAmount: tokenAmount,
+          toChainId: toChain.id,
           toTokenAddress: isNativeToken(toToken)
             ? NATIVE_TOKEN_ADDRESS
             : toToken.address,
-          toAmount: tokenAmount,
-          client,
-          isTestMode: buyWithFiatOptions?.testMode,
-          purchaseData: props.payOptions.purchaseData,
-          fromAddress: payer.account.address,
-          paymentLinkId: paymentLinkId,
-          preferredProvider: preferredProvider ?? supportedProviders[0],
-          onrampChainId: buyWithFiatOptions?.onrampChainId,
-          onrampTokenAddress: buyWithFiatOptions?.onrampTokenAddress,
         }
       : undefined,
   );
@@ -151,14 +151,14 @@ export function FiatScreenContent(props: {
       : undefined;
 
   return (
-    <Container flex="column" gap="lg" animate="fadein">
+    <Container animate="fadein" flex="column" gap="lg">
       {isOpen && (
         <>
           <DrawerOverlay ref={drawerOverlayRef} />
-          <Drawer ref={drawerRef} close={() => setIsOpen(false)}>
+          <Drawer close={() => setIsOpen(false)} ref={drawerRef}>
             {drawerScreen === "fees" && fiatQuoteQuery.data && (
               <div>
-                <Text size="lg" color="primaryText">
+                <Text color="primaryText" size="lg">
                   Fees
                 </Text>
 
@@ -168,15 +168,11 @@ export function FiatScreenContent(props: {
             )}
             {drawerScreen === "providers" && (
               <div>
-                <Text size="lg" color="primaryText">
+                <Text color="primaryText" size="lg">
                   Providers
                 </Text>
                 <Spacer y="lg" />
                 <Providers
-                  supportedProviders={supportedProviders}
-                  preferredProvider={
-                    preferredProvider || fiatQuoteQuery.data?.provider
-                  }
                   onSelect={(provider) => {
                     setPreferredProvider(provider);
                     // save the pref in local storage
@@ -186,6 +182,10 @@ export function FiatScreenContent(props: {
                     );
                     setIsOpen(false);
                   }}
+                  preferredProvider={
+                    preferredProvider || fiatQuoteQuery.data?.provider
+                  }
+                  supportedProviders={supportedProviders}
                 />
               </div>
             )}
@@ -197,34 +197,34 @@ export function FiatScreenContent(props: {
         <Text size="sm">Pay with card</Text>
         <div>
           <PayWithCreditCard
-            isLoading={fiatQuoteQuery.isLoading}
-            value={fiatQuoteQuery.data?.fromCurrencyWithFees.amount}
             client={client}
             currency={selectedCurrency}
+            isLoading={fiatQuoteQuery.isLoading}
             onSelectCurrency={showCurrencySelector}
+            value={fiatQuoteQuery.data?.fromCurrencyWithFees.amount}
           />
           {/** Shows preferred or quoted provider and conditional selection */}
           <PayProviderSelection
             onShowProviders={showProviders}
-            quotedProvider={fiatQuoteQuery.data?.provider}
             preferredProvider={preferredProvider}
+            quotedProvider={fiatQuoteQuery.data?.provider}
             supportedProviders={supportedProviders}
           />
           {/* Estimated time + View fees button */}
           <EstimatedTimeAndFees
-            quoteIsLoading={fiatQuoteQuery.isLoading}
             estimatedSeconds={fiatQuoteQuery.data?.estimatedDurationSeconds}
             onViewFees={showFees}
+            quoteIsLoading={fiatQuoteQuery.isLoading}
           />
         </div>
 
         {/* Error message */}
         {errorMsg && (
           <div>
-            <Text color="danger" size="xs" center multiline>
+            <Text center color="danger" multiline size="xs">
               {errorMsg.title}
             </Text>
-            <Text size="xs" center multiline>
+            <Text center multiline size="xs">
               {errorMsg.message}
             </Text>
           </div>
@@ -232,22 +232,22 @@ export function FiatScreenContent(props: {
       </Container>
 
       <Button
-        variant={disableSubmit ? "outline" : "accent"}
         data-disabled={disableSubmit}
         disabled={disableSubmit}
         fullWidth
+        gap="xs"
         onClick={() => {
           trackPayEvent({
-            event: "confirm_onramp_quote",
             client: client,
-            walletAddress: payer.account.address,
-            walletType: payer.wallet.id,
+            event: "confirm_onramp_quote",
             toChainId: toChain.id,
             toToken: isNativeToken(toToken) ? undefined : toToken.address,
+            walletAddress: payer.account.address,
+            walletType: payer.wallet.id,
           });
           handleSubmit();
         }}
-        gap="xs"
+        variant={disableSubmit ? "outline" : "accent"}
       >
         {fiatQuoteQuery.isLoading ? (
           <>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx
index 685f1340f8e..fc55f96db73 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx
@@ -1,15 +1,15 @@
 import { Cross1Icon } from "@radix-ui/react-icons";
 import {
-  type Theme,
   iconSize,
   radius,
   spacing,
+  type Theme,
 } from "../../../../../../core/design-system/index.js";
-import { Spinner } from "../../../../components/Spinner.js";
 import { Container } from "../../../../components/basic.js";
+import { Spinner } from "../../../../components/Spinner.js";
 import { Text } from "../../../../components/text.js";
-import { StepIcon } from "../Stepper.js";
 import type { FiatStatusMeta } from "../pay-transactions/statusMeta.js";
+import { StepIcon } from "../Stepper.js";
 
 export function StepContainer(props: {
   state?: FiatStatusMeta["progressStatus"];
@@ -37,13 +37,13 @@ export function StepContainer(props: {
     <Container
       bg="tertiaryBg"
       borderColor={color === "success" ? "borderColor" : color}
-      py="sm"
       px="md"
+      py="sm"
       style={{
-        borderRadius: radius.lg,
         alignItems: "flex-start",
-        borderWidth: "1px",
+        borderRadius: radius.lg,
         borderStyle: "solid",
+        borderWidth: "1px",
         position: "relative",
         ...props.style,
       }}
@@ -51,16 +51,16 @@ export function StepContainer(props: {
       {props.children}
       <div
         style={{
+          alignItems: "center",
+          display: "flex",
+          gap: spacing.xs,
           position: "absolute",
           right: spacing.xs,
           top: spacing.xs,
-          display: "flex",
-          gap: spacing.xs,
-          alignItems: "center",
         }}
       >
         {props.state && text && (
-          <Text size="xs" color={color}>
+          <Text color={color} size="xs">
             {text}
           </Text>
         )}
@@ -75,8 +75,8 @@ export function StepContainer(props: {
         {props.state === "pending" && <Spinner color="accentText" size="sm" />}
 
         {props.state === "failed" && (
-          <Container color="danger" flex="row" center="both">
-            <Cross1Icon width={iconSize.sm} height={iconSize.sm} />
+          <Container center="both" color="danger" flex="row">
+            <Cross1Icon height={iconSize.sm} width={iconSize.sm} />
           </Container>
         )}
       </div>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx
index 3e76e10b970..514a5eaaa45 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx
@@ -14,8 +14,8 @@ import {
   getBuyWithFiatStatus,
 } from "../../../../../../../pay/buyWithFiat/getStatus.js";
 import {
-  type OnRampStep,
   getOnRampSteps,
+  type OnRampStep,
 } from "../../../../../../../pay/buyWithFiat/isSwapRequiredPostOnramp.js";
 import type { PayTokenInfo } from "../../../../../../../pay/utils/commonTypes.js";
 import { sendBatchTransaction } from "../../../../../../../transaction/actions/send-batch-transaction.js";
@@ -30,19 +30,19 @@ import { useBuyWithCryptoStatus } from "../../../../../../core/hooks/pay/useBuyW
 import { useBuyWithFiatStatus } from "../../../../../../core/hooks/pay/useBuyWithFiatStatus.js";
 import { useConnectedWallets } from "../../../../../../core/hooks/wallets/useConnectedWallets.js";
 import { invalidateWalletBalance } from "../../../../../../core/providers/invalidateWalletBalance.js";
+import { Container, ModalHeader } from "../../../../components/basic.js";
+import { Button } from "../../../../components/buttons.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { Spinner } from "../../../../components/Spinner.js";
 import { SwitchNetworkButton } from "../../../../components/SwitchNetwork.js";
-import { Container, ModalHeader } from "../../../../components/basic.js";
-import { Button } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
 import { TokenSymbol } from "../../../../components/token/TokenSymbol.js";
-import { PayTokenIcon } from "../PayTokenIcon.js";
 import { openOnrampPopup } from "../openOnRamppopup.js";
+import { PayTokenIcon } from "../PayTokenIcon.js";
 import type { FiatStatusMeta } from "../pay-transactions/statusMeta.js";
+import { addPendingTx } from "../swap/pendingSwapTx.js";
 import { StepConnectorArrow } from "../swap/StepConnector.js";
 import { WalletRow } from "../swap/WalletRow.js";
-import { addPendingTx } from "../swap/pendingSwapTx.js";
 import type { PayerInfo } from "../types.js";
 import { getProviderLabel } from "../utils.js";
 import { StepContainer } from "./FiatSteps.js";
@@ -76,38 +76,38 @@ export function OnRampScreen(props: {
 }) {
   const connectedWallets = useConnectedWallets();
   const isAutoMode = isInAppSigner({
-    wallet: props.payer.wallet,
     connectedWallets,
+    wallet: props.payer.wallet,
   });
   const state = useOnRampScreenState({
-    quote: props.quote,
     client: props.client,
-    onSuccess: props.onSuccess,
+    isAutoMode,
     onDone: props.onDone,
+    onSuccess: props.onSuccess,
     payer: props.payer,
-    theme: props.theme,
-    isAutoMode,
     paymentLinkId: props.paymentLinkId,
+    quote: props.quote,
+    theme: props.theme,
   });
   const firstStepChainId = state.steps[0]?.step.token.chainId;
   return (
     <Container p="lg">
-      <ModalHeader title={props.title} onBack={props.onBack} />
+      <ModalHeader onBack={props.onBack} title={props.title} />
       <Spacer y="xl" />
       <Container
+        center="y"
         flex="column"
         gap="xs"
-        center="y"
         style={{
           paddingLeft: spacing.md,
         }}
       >
         <WalletRow
-          client={props.client}
           address={props.receiverAddress}
+          client={props.client}
           iconSize="md"
-          textSize="sm"
           label="Recipient wallet"
+          textSize="sm"
         />
       </Container>
       <Spacer y="md" />
@@ -115,17 +115,17 @@ export function OnRampScreen(props: {
         {state.steps.map(({ step, status }, index) => (
           <Container flex="column" key={step.action}>
             <StepContainer
-              state={status}
               index={index}
+              state={status}
               style={{
                 flex: "1",
               }}
             >
               <StepUI
-                step={step}
                 client={props.client}
-                payer={props.payer}
                 index={index}
+                payer={props.payer}
+                step={step}
               />
             </StepContainer>
             {index < state.steps.length - 1 && <StepConnectorArrow />}
@@ -136,9 +136,9 @@ export function OnRampScreen(props: {
       <Spacer y="md" />
 
       <Text
-        size="xs"
-        color="secondaryText"
         center
+        color="secondaryText"
+        size="xs"
         style={{ padding: `0 ${spacing.xl}` }}
       >
         Keep this window open until all transactions are complete.
@@ -152,20 +152,20 @@ export function OnRampScreen(props: {
         firstStepChainId !== props.payer.chain.id ? (
           <SwitchNetworkButton
             fullWidth
-            variant="accent"
             switchChain={async () => {
               await props.payer.wallet.switchChain(
                 getCachedChain(firstStepChainId),
               );
             }}
+            variant="accent"
           />
         ) : (
           <Button
-            variant="accent"
-            gap="sm"
+            disabled={state.isLoading}
             fullWidth
+            gap="sm"
             onClick={state.handleContinue}
-            disabled={state.isLoading}
+            variant="accent"
           >
             {state.isLoading
               ? "Processing"
@@ -176,7 +176,7 @@ export function OnRampScreen(props: {
                 : state.isFailed
                   ? "Retry"
                   : "Continue"}
-            {state.isLoading && <Spinner size="sm" color="primaryText" />}
+            {state.isLoading && <Spinner color="primaryText" size="sm" />}
           </Button>
         )}
       </Container>
@@ -195,13 +195,13 @@ function StepUI(props: {
   return (
     <Container flex="column" gap="xs" py="3xs">
       <Container
-        flex="row"
         center="y"
+        flex="row"
         gap="sm"
         style={{
           display: "flex",
-          justifyContent: "space-between",
           flexWrap: "nowrap",
+          justifyContent: "space-between",
         }}
       >
         <PayTokenIcon
@@ -212,57 +212,57 @@ function StepUI(props: {
             address: step.token.tokenAddress,
           }}
         />
-        <Container flex="column" gap="3xs" center="y" style={{ flex: "1" }}>
-          <Text size="sm" color="primaryText">
+        <Container center="y" flex="column" gap="3xs" style={{ flex: "1" }}>
+          <Text color="primaryText" size="sm">
             {getProviderLabel(step.action)}
           </Text>
 
           <Container
+            center="y"
             flex="row"
             gap="xs"
-            center="y"
             style={{
               display: "flex",
-              justifyContent: "space-between",
               flexWrap: "nowrap",
+              justifyContent: "space-between",
             }}
           >
             <Container
+              center="y"
               flex="row"
               gap="xxs"
-              center="y"
               style={{
                 flex: "1 1 60%",
-                minWidth: 0,
+                flexWrap: "nowrap",
                 maxWidth: "60%",
+                minWidth: 0,
                 overflow: "hidden",
-                flexWrap: "nowrap",
               }}
             >
-              <Text size="sm" color="primaryText">
+              <Text color="primaryText" size="sm">
                 {formatNumber(Number(step.amount), 5)}
               </Text>
               <TokenSymbol
+                chain={getCachedChain(step.token.chainId)}
+                color="secondaryText"
+                size="sm"
                 token={{
                   address: step.token.tokenAddress,
                   name: step.token.name || "",
                   symbol: step.token.symbol || "",
                 }}
-                chain={getCachedChain(step.token.chainId)}
-                size="sm"
-                color="secondaryText"
               />
             </Container>
             <Container
+              center="y"
               flex="row"
               gap="xs"
-              center="y"
               style={{
                 flex: "1 1 40%",
+                flexWrap: "nowrap",
+                justifyContent: "flex-end",
                 maxWidth: "40%",
                 minWidth: 0,
-                justifyContent: "flex-end",
-                flexWrap: "nowrap",
               }}
             >
               <Text
@@ -303,8 +303,8 @@ function useOnRampScreenState(props: {
 
   // Track onramp status
   const { uiStatus: fiatOnrampStatus } = useOnRampStatus({
-    intentId: props.quote.intentId,
     client: props.client,
+    intentId: props.quote.intentId,
     onSuccess: (status) => {
       if (onRampSteps.length === 1) {
         // If only one step, this is the final success
@@ -324,22 +324,21 @@ function useOnRampScreenState(props: {
   // Handle swap execution
   const swapMutation = useSwapMutation({
     client: props.client,
-    payer: props.payer,
     isFiatFlow: true,
+    payer: props.payer,
     paymentLinkId: props.paymentLinkId,
   });
 
   // Track swap status
   const { uiStatus: swapStatus } = useSwapStatus({
-    client: props.client,
-    transactionHash: swapTxHash?.hash,
     chainId: swapTxHash?.chainId,
+    client: props.client,
     onSuccess: () => {
       if (currentStepIndex === onRampSteps.length - 1) {
         // Last step completed - call final success
         getBuyWithFiatStatus({
-          intentId: props.quote.intentId,
           client: props.client,
+          intentId: props.quote.intentId,
         }).then(props.onSuccess);
       } else {
         // Reset swap state before moving to next step
@@ -349,6 +348,7 @@ function useOnRampScreenState(props: {
         setCurrentStepIndex((prev) => prev + 1);
       }
     },
+    transactionHash: swapTxHash?.hash,
   });
 
   // Map steps to their current status
@@ -376,8 +376,8 @@ function useOnRampScreenState(props: {
 
     return {
       index,
-      step,
       status,
+      step,
     };
   });
 
@@ -396,30 +396,30 @@ function useOnRampScreenState(props: {
       // First step - open onramp popup
       const popup = openOnrampPopup(props.quote.onRampLink, props.theme);
       trackPayEvent({
-        event: "open_onramp_popup",
+        amountWei: props.quote.onRampToken.amountWei,
         client: props.client,
-        walletAddress: props.payer.account.address,
-        walletType: props.payer.wallet.id,
+        event: "open_onramp_popup",
         toChainId: props.quote.onRampToken.token.chainId,
         toToken: props.quote.onRampToken.token.tokenAddress,
-        amountWei: props.quote.onRampToken.amountWei,
+        walletAddress: props.payer.account.address,
+        walletType: props.payer.wallet.id,
       });
       setPopupWindow(popup);
       addPendingTx({
-        type: "fiat",
         intentId: props.quote.intentId,
+        type: "fiat",
       });
     } else if (previousStep && currentStep && !swapTxHash) {
       // Execute swap/bridge
       try {
         const result = await swapMutation.mutateAsync({
+          amount: currentStep.amount,
           fromToken: previousStep.token,
           toToken: currentStep.token,
-          amount: currentStep.amount,
         });
         setSwapTxHash({
-          hash: result.transactionHash,
           chainId: result.chainId,
+          hash: result.transactionHash,
         });
       } catch (e) {
         console.error("Failed to execute swap:", e);
@@ -475,11 +475,11 @@ function useOnRampScreenState(props: {
   ]);
 
   return {
-    steps,
     handleContinue,
-    isLoading,
     isDone,
     isFailed,
+    isLoading,
+    steps,
   };
 }
 
@@ -491,8 +491,8 @@ function useOnRampStatus(props: {
 }) {
   const queryClient = useQueryClient();
   const statusQuery = useBuyWithFiatStatus({
-    intentId: props.intentId,
     client: props.client,
+    intentId: props.intentId,
     queryOptions: {
       enabled: !!props.openedWindow,
     },
@@ -564,9 +564,9 @@ function useSwapStatus(props: {
   const swapStatus = useBuyWithCryptoStatus(
     props.transactionHash && props.chainId
       ? {
+          chainId: props.chainId,
           client: props.client,
           transactionHash: props.transactionHash,
-          chainId: props.chainId,
         }
       : undefined,
   );
@@ -645,22 +645,22 @@ function useSwapMutation(props: {
 
       // always get a fresh quote before executing
       const quote = await getBuyWithCryptoQuote({
+        client: props.client,
+        fromAddress: account.address,
         fromChainId: fromToken.chainId,
         fromTokenAddress: fromToken.tokenAddress,
+        paymentLinkId: props.paymentLinkId,
+        toAddress: account.address,
         toAmount: amount,
         toChainId: toToken.chainId,
         toTokenAddress: toToken.tokenAddress,
-        fromAddress: account.address,
-        toAddress: account.address,
-        paymentLinkId: props.paymentLinkId,
-        client: props.client,
       });
 
       const canBatch = account.sendBatchTransaction;
       const tokenContract = getContract({
-        client: props.client,
         address: quote.swapDetails.fromToken.tokenAddress,
         chain: getCachedChain(quote.swapDetails.fromToken.chainId),
+        client: props.client,
       });
       const approveTxRequired =
         quote.approvalData &&
@@ -671,21 +671,21 @@ function useSwapMutation(props: {
         })) < BigInt(quote.approvalData.amountWei);
       if (approveTxRequired && quote.approvalData && !canBatch) {
         trackPayEvent({
-          event: "prompt_swap_approval",
+          amountWei: quote.swapDetails.fromAmountWei,
+          chainId: quote.swapDetails.fromToken.chainId,
           client: props.client,
-          walletAddress: account.address,
-          walletType: props.payer.wallet.id,
+          event: "prompt_swap_approval",
           fromToken: quote.swapDetails.fromToken.tokenAddress,
-          chainId: quote.swapDetails.fromToken.chainId,
-          amountWei: quote.swapDetails.fromAmountWei,
-          toToken: quote.swapDetails.toToken.tokenAddress,
           toChainId: quote.swapDetails.toToken.chainId,
+          toToken: quote.swapDetails.toToken.tokenAddress,
+          walletAddress: account.address,
+          walletType: props.payer.wallet.id,
         });
 
         const transaction = approve({
+          amountWei: BigInt(quote.approvalData.amountWei),
           contract: tokenContract,
           spender: quote.approvalData.spenderAddress,
-          amountWei: BigInt(quote.approvalData.amountWei),
         });
 
         const tx = await sendTransaction({
@@ -696,37 +696,37 @@ function useSwapMutation(props: {
         await waitForReceipt({ ...tx, maxBlocksWaitTime: 50 });
 
         trackPayEvent({
-          event: "swap_approval_success",
-          client: props.client,
-          walletAddress: account.address,
-          walletType: props.payer.wallet.id,
-          fromToken: quote.swapDetails.fromToken.tokenAddress,
           amountWei: quote.swapDetails.fromAmountWei,
-          toToken: quote.swapDetails.toToken.tokenAddress,
           chainId: quote.swapDetails.fromToken.chainId,
+          client: props.client,
+          event: "swap_approval_success",
+          fromToken: quote.swapDetails.fromToken.tokenAddress,
           toChainId: quote.swapDetails.toToken.chainId,
+          toToken: quote.swapDetails.toToken.tokenAddress,
+          walletAddress: account.address,
+          walletType: props.payer.wallet.id,
         });
       }
 
       trackPayEvent({
-        event: "prompt_swap_execution",
-        client: props.client,
-        walletAddress: account.address,
-        walletType: props.payer.wallet.id,
-        fromToken: quote.swapDetails.fromToken.tokenAddress,
         amountWei: quote.swapDetails.fromAmountWei,
-        toToken: quote.swapDetails.toToken.tokenAddress,
         chainId: quote.swapDetails.fromToken.chainId,
+        client: props.client,
+        event: "prompt_swap_execution",
+        fromToken: quote.swapDetails.fromToken.tokenAddress,
         toChainId: quote.swapDetails.toToken.chainId,
+        toToken: quote.swapDetails.toToken.tokenAddress,
+        walletAddress: account.address,
+        walletType: props.payer.wallet.id,
       });
       const tx = quote.transactionRequest;
       let _swapTx: WaitForReceiptOptions;
       // check if we can batch approval and swap
       if (canBatch && quote.approvalData && approveTxRequired) {
         const approveTx = approve({
+          amountWei: BigInt(quote.approvalData.amountWei),
           contract: tokenContract,
           spender: quote.approvalData.spenderAddress,
-          amountWei: BigInt(quote.approvalData.amountWei),
         });
 
         _swapTx = await sendBatchTransaction({
@@ -743,29 +743,29 @@ function useSwapMutation(props: {
       await waitForReceipt({ ..._swapTx, maxBlocksWaitTime: 50 });
 
       trackPayEvent({
-        event: "swap_execution_success",
+        amountWei: quote.swapDetails.fromAmountWei,
+        chainId: quote.swapDetails.fromToken.chainId,
         client: props.client,
-        walletAddress: account.address,
-        walletType: props.payer.wallet.id,
+        event: "swap_execution_success",
         fromToken: quote.swapDetails.fromToken.tokenAddress,
-        amountWei: quote.swapDetails.fromAmountWei,
-        toToken: quote.swapDetails.toToken.tokenAddress,
         toChainId: quote.swapDetails.toToken.chainId,
-        chainId: quote.swapDetails.fromToken.chainId,
+        toToken: quote.swapDetails.toToken.tokenAddress,
+        walletAddress: account.address,
+        walletType: props.payer.wallet.id,
       });
 
       // do not add pending tx if the swap is part of fiat flow
       if (!props.isFiatFlow) {
         addPendingTx({
-          type: "swap",
-          txHash: _swapTx.transactionHash,
           chainId: _swapTx.chain.id,
+          txHash: _swapTx.transactionHash,
+          type: "swap",
         });
       }
 
       return {
-        transactionHash: _swapTx.transactionHash,
         chainId: _swapTx.chain.id,
+        transactionHash: _swapTx.transactionHash,
       };
     },
     onSuccess: () => {
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.tsx
index 8201e09af83..795f82d1191 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.tsx
@@ -23,9 +23,9 @@ export function Providers(props: {
     >
       {props.supportedProviders.map((provider) => (
         <Container
-          key={provider}
-          flex="row"
           expand
+          flex="row"
+          key={provider}
           style={{
             justifyContent: "space-between",
           }}
@@ -41,8 +41,8 @@ export function Providers(props: {
                   ? "primaryText"
                   : "secondaryText"
               }
-              size="sm"
               hoverColor="primaryText"
+              size="sm"
             >
               {getProviderLabel(provider)}
             </Link>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/currencies.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/currencies.tsx
index 996937f421b..e5ffa67c5ae 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/currencies.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/currencies.tsx
@@ -17,53 +17,53 @@ export type CurrencyMeta = {
 };
 
 export const usdCurrency: CurrencyMeta = {
-  shorthand: "USD",
   countryCode: "US",
+  icon: USDIcon,
   name: "US Dollar",
+  shorthand: "USD",
   symbol: "$",
-  icon: USDIcon,
 };
 
 export const currencies: CurrencyMeta[] = [
   usdCurrency,
   {
-    shorthand: "CAD",
     countryCode: "CA",
+    icon: CADIcon,
     name: "Canadian Dollar",
+    shorthand: "CAD",
     symbol: "$",
-    icon: CADIcon,
   },
   {
-    shorthand: "GBP",
     countryCode: "GB",
+    icon: GBPIcon,
     name: "British Pound",
+    shorthand: "GBP",
     symbol: "£",
-    icon: GBPIcon,
   },
   {
-    shorthand: "EUR",
     countryCode: "EU",
+    icon: EURIcon,
     name: "Euro",
+    shorthand: "EUR",
     symbol: "€",
-    icon: EURIcon,
   },
   {
-    shorthand: "JPY",
     countryCode: "JP",
+    icon: JPYIcon,
     name: "Japanese Yen",
+    shorthand: "JPY",
     symbol: "¥",
-    icon: JPYIcon,
   },
   {
-    shorthand: "AUD",
     countryCode: "AU",
     name: "Australian Dollar",
+    shorthand: "AUD",
     symbol: "$",
   },
   {
-    shorthand: "NZD",
     countryCode: "NZ",
     name: "New Zealand Dollar",
+    shorthand: "NZD",
     symbol: "$",
   },
 ];
@@ -74,12 +74,12 @@ export function getCurrencyMeta(shorthand: string): CurrencyMeta {
       (currency) =>
         currency.shorthand.toLowerCase() === shorthand.toLowerCase(),
     ) ?? {
+      countryCode: "US",
       // This should never happen
       icon: UnknownCurrencyIcon,
-      countryCode: "US",
       name: shorthand,
-      symbol: "$",
       shorthand: shorthand as CurrencyMeta["shorthand"],
+      symbol: "$",
     }
   );
 }
@@ -92,10 +92,10 @@ export function getFiatIcon(
     <currency.icon size={iconSize[size]} />
   ) : (
     <img
-      src={`https://flagsapi.com/${currency.countryCode.toUpperCase()}/flat/64.png`}
       alt={currency.shorthand}
-      width={iconSize[size]}
       height={iconSize[size]}
+      src={`https://flagsapi.com/${currency.countryCode.toUpperCase()}/flat/64.png`}
+      width={iconSize[size]}
     />
   );
 }
@@ -108,5 +108,5 @@ export function getFiatCurrencyIcon(props: {
 }
 
 const UnknownCurrencyIcon: IconFC = (props) => {
-  return <RadiobuttonIcon width={props.size} height={props.size} />;
+  return <RadiobuttonIcon height={props.size} width={props.size} />;
 };
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.ts
index ed8a33dccd4..f53c89094da 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.ts
@@ -40,22 +40,17 @@ export function useTransactionCostAndData(args: {
       encode(transaction),
     ]).then(([value, erc20Value, to, data]) => {
       setTxQueryKey({
-        value: value?.toString(),
-        erc20Value: erc20Value?.amountWei?.toString(),
+        data,
         erc20Currency: erc20Value?.tokenAddress,
+        erc20Value: erc20Value?.amountWei?.toString(),
         to,
-        data,
+        value: value?.toString(),
       });
     });
   }, [transaction]);
 
   return useQuery({
-    queryKey: [
-      "transaction-cost",
-      transaction.chain.id,
-      account?.address,
-      txQueryKey,
-    ],
+    enabled: !!transaction && !!txQueryKey,
     queryFn: async () => {
       if (!account) {
         throw new Error("No payer account found");
@@ -85,8 +80,6 @@ export function useTransactionCostAndData(args: {
         const walletBalance = tokenBalance;
         const currency = {
           address: erc20Value.tokenAddress,
-          name: tokenMeta.name,
-          symbol: tokenMeta.symbol,
           icon: supportedDestinations
             .find((c) => c.chain.id === transaction.chain.id)
             ?.tokens.find(
@@ -94,14 +87,16 @@ export function useTransactionCostAndData(args: {
                 t.address.toLowerCase() ===
                 erc20Value.tokenAddress.toLowerCase(),
             )?.icon,
+          name: tokenMeta.name,
+          symbol: tokenMeta.symbol,
         };
         return {
-          token: currency,
-          decimals: tokenMeta.decimals,
           chainMetadata,
-          walletBalance,
+          decimals: tokenMeta.decimals,
           gasCostWei,
+          token: currency,
           transactionValueWei,
+          walletBalance,
         } satisfies TransactionCostAndData;
       }
 
@@ -119,20 +114,25 @@ export function useTransactionCostAndData(args: {
       const transactionValueWei =
         (await resolvePromisedValue(transaction.value)) || 0n;
       return {
+        chainMetadata,
+        decimals: 18,
+        gasCostWei,
         token: {
           address: NATIVE_TOKEN_ADDRESS,
+          icon: chainMetadata.icon?.url,
           name: chainMetadata.nativeCurrency.name,
           symbol: chainMetadata.nativeCurrency.symbol,
-          icon: chainMetadata.icon?.url,
         },
-        chainMetadata,
-        decimals: 18,
-        walletBalance,
-        gasCostWei,
         transactionValueWei,
+        walletBalance,
       } satisfies TransactionCostAndData;
     },
-    enabled: !!transaction && !!txQueryKey,
+    queryKey: [
+      "transaction-cost",
+      transaction.chain.id,
+      account?.address,
+      txQueryKey,
+    ],
     refetchInterval: args.refetchIntervalMs || 30_000,
   });
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useEnabledPaymentMethods.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useEnabledPaymentMethods.ts
index c9ff63d1621..5472b2a2c3e 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useEnabledPaymentMethods.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useEnabledPaymentMethods.ts
@@ -59,7 +59,7 @@ export function useEnabledPaymentMethods(options: {
   const buyWithCryptoEnabled = payOptions.buyWithCrypto !== false && swap;
 
   return {
-    buyWithFiatEnabled,
     buyWithCryptoEnabled,
+    buyWithFiatEnabled,
   };
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts
index caa7aa62403..d2c0a601469 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts
@@ -75,13 +75,13 @@ export function useToTokenSelectionStates(options: {
   );
 
   return {
-    toChain,
+    deferredTokenAmount,
     setToChain,
-    toToken,
+    setTokenAmount,
     setToToken,
+    toChain,
     tokenAmount,
-    setTokenAmount,
-    deferredTokenAmount,
+    toToken,
   };
 }
 
@@ -118,8 +118,8 @@ export function useFromTokenSelectionStates(options: {
 
   return {
     fromChain,
-    setFromChain,
     fromToken,
+    setFromChain,
     setFromToken,
   };
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/SwapDetailsScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/SwapDetailsScreen.tsx
index 90cfebaf9bc..c66a5917ffa 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/SwapDetailsScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/SwapDetailsScreen.tsx
@@ -13,13 +13,13 @@ import {
   useChainExplorers,
   useChainName,
 } from "../../../../../../core/hooks/others/useChainQuery.js";
-import { Spacer } from "../../../../components/Spacer.js";
 import { Container, Line } from "../../../../components/basic.js";
 import { ButtonLink } from "../../../../components/buttons.js";
+import { Spacer } from "../../../../components/Spacer.js";
 import { Text } from "../../../../components/text.js";
 import { WalletRow } from "../swap/WalletRow.js";
+import { getBuyWithCryptoStatusMeta, type StatusMeta } from "./statusMeta.js";
 import { TokenInfoRow } from "./TokenInfoRow.js";
-import { type StatusMeta, getBuyWithCryptoStatusMeta } from "./statusMeta.js";
 
 type SwapTxDetailsData = {
   fromToken: {
@@ -75,52 +75,52 @@ export function SwapTxDetailsTable(
       status.status === "COMPLETED" && status.subStatus === "PARTIAL_SUCCESS";
 
     uiData = {
+      destinationTxHash: status.destination?.transactionHash,
+      estimatedDuration: status.quote.estimated.durationSeconds || 0,
+      fromAddress: status.fromAddress,
       fromToken: {
-        chainId: status.quote.fromToken.chainId,
-        symbol: status.quote.fromToken.symbol || "",
         address: status.quote.fromToken.tokenAddress,
         amount: status.quote.fromAmount,
-      },
-      quotedToToken: {
-        chainId: status.quote.toToken.chainId,
-        symbol: status.quote.toToken.symbol || "",
-        address: status.quote.toToken.tokenAddress,
-        amount: status.quote.toAmount,
+        chainId: status.quote.fromToken.chainId,
+        symbol: status.quote.fromToken.symbol || "",
       },
       gotToken: status.destination
         ? {
-            chainId: status.destination.token.chainId,
-            symbol: status.destination.token.symbol || "",
             address: status.destination.token.tokenAddress,
             amount: status.destination.amount,
+            chainId: status.destination.token.chainId,
+            symbol: status.destination.token.symbol || "",
           }
         : undefined,
-      statusMeta: getBuyWithCryptoStatusMeta(status),
-      estimatedDuration: status.quote.estimated.durationSeconds || 0,
       isPartialSuccess,
-      destinationTxHash: status.destination?.transactionHash,
+      quotedToToken: {
+        address: status.quote.toToken.tokenAddress,
+        amount: status.quote.toAmount,
+        chainId: status.quote.toToken.chainId,
+        symbol: status.quote.toToken.symbol || "",
+      },
       sourceTxHash: status.source?.transactionHash,
-      fromAddress: status.fromAddress,
+      statusMeta: getBuyWithCryptoStatusMeta(status),
       toAddress: status.toAddress,
     };
   } else {
     const quote = props.quote;
     uiData = {
+      estimatedDuration: quote.swapDetails.estimated.durationSeconds || 0,
+      fromAddress: quote.swapDetails.fromAddress,
       fromToken: {
-        chainId: quote.swapDetails.fromToken.chainId,
-        symbol: quote.swapDetails.fromToken.symbol || "",
         address: quote.swapDetails.fromToken.tokenAddress,
         amount: quote.swapDetails.fromAmount,
+        chainId: quote.swapDetails.fromToken.chainId,
+        symbol: quote.swapDetails.fromToken.symbol || "",
       },
+      isPartialSuccess: false,
       quotedToToken: {
-        chainId: quote.swapDetails.toToken.chainId,
-        symbol: quote.swapDetails.toToken.symbol || "",
         address: quote.swapDetails.toToken.tokenAddress,
         amount: quote.swapDetails.toAmount,
+        chainId: quote.swapDetails.toToken.chainId,
+        symbol: quote.swapDetails.toToken.symbol || "",
       },
-      isPartialSuccess: false,
-      estimatedDuration: quote.swapDetails.estimated.durationSeconds || 0,
-      fromAddress: quote.swapDetails.fromAddress,
       toAddress: quote.swapDetails.toAddress,
     };
   }
@@ -160,9 +160,9 @@ export function SwapTxDetailsTable(
         chainId={fromToken.chainId}
         client={client}
         label="Paid"
+        tokenAddress={fromToken.address}
         tokenAmount={fromToken.amount}
         tokenSymbol={fromToken.symbol || ""}
-        tokenAddress={fromToken.address}
       />
 
       {lineSpacer}
@@ -174,9 +174,9 @@ export function SwapTxDetailsTable(
             chainId={toToken.chainId}
             client={client}
             label={isPartialSuccess ? "Expected" : "Received"}
+            tokenAddress={toToken.address}
             tokenAmount={toToken.amount}
             tokenSymbol={toToken.symbol || ""}
-            tokenAddress={toToken.address}
           />
 
           {lineSpacer}
@@ -186,9 +186,9 @@ export function SwapTxDetailsTable(
             chainId={gotToken.chainId}
             client={client}
             label="Got"
+            tokenAddress={gotToken.address}
             tokenAmount={gotToken.amount}
             tokenSymbol={gotToken.symbol || ""}
-            tokenAddress={gotToken.address}
           />
         </>
       ) : (
@@ -197,24 +197,22 @@ export function SwapTxDetailsTable(
           chainId={toToken.chainId}
           client={client}
           label="Received"
+          tokenAddress={toToken.address}
           tokenAmount={toToken.amount}
           tokenSymbol={toToken.symbol || ""}
-          tokenAddress={toToken.address}
         />
       )}
 
-      <>
-        {lineSpacer}
-        <Container
-          flex="row"
-          style={{
-            justifyContent: "space-between",
-          }}
-        >
-          <Text size="sm">Recipient</Text>
-          <WalletRow address={uiData.toAddress} iconSize="sm" client={client} />
-        </Container>
-      </>
+      {lineSpacer}
+      <Container
+        flex="row"
+        style={{
+          justifyContent: "space-between",
+        }}
+      >
+        <Text size="sm">Recipient</Text>
+        <WalletRow address={uiData.toAddress} client={client} iconSize="sm" />
+      </Container>
 
       {/* Status */}
       {statusMeta && showStatusRow && (
@@ -228,9 +226,9 @@ export function SwapTxDetailsTable(
           >
             <Text size="sm">Status</Text>
             <Container
+              center="y"
               flex="column"
               gap="3xs"
-              center="y"
               style={{
                 alignItems: "flex-end",
               }}
@@ -249,20 +247,20 @@ export function SwapTxDetailsTable(
       {fromChainExplorers.explorers?.[0]?.url && sourceTxHash && (
         <ButtonLink
           fullWidth
-          variant="outline"
+          gap="xs"
           href={formatExplorerTxUrl(
             fromChainExplorers.explorers[0]?.url,
             sourceTxHash,
           )}
-          target="_blank"
-          gap="xs"
           style={{
             fontSize: fontSize.sm,
             padding: spacing.sm,
           }}
+          target="_blank"
+          variant="outline"
         >
           View on {fromChainName.name} Explorer
-          <ExternalLinkIcon width={iconSize.sm} height={iconSize.sm} />
+          <ExternalLinkIcon height={iconSize.sm} width={iconSize.sm} />
         </ButtonLink>
       )}
 
@@ -274,20 +272,20 @@ export function SwapTxDetailsTable(
             <Spacer y="sm" />
             <ButtonLink
               fullWidth
-              variant="outline"
+              gap="xs"
               href={formatExplorerTxUrl(
                 toChainExplorers.explorers[0]?.url,
                 destinationTxHash,
               )}
-              target="_blank"
-              gap="xs"
               style={{
                 fontSize: fontSize.sm,
                 padding: spacing.sm,
               }}
+              target="_blank"
+              variant="outline"
             >
               View on {toChainName.name} Explorer
-              <ExternalLinkIcon width={iconSize.sm} height={iconSize.sm} />
+              <ExternalLinkIcon height={iconSize.sm} width={iconSize.sm} />
             </ButtonLink>
           </>
         )}
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/TokenInfoRow.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/TokenInfoRow.tsx
index ed1bb52d10f..bb322abe937 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/TokenInfoRow.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/TokenInfoRow.tsx
@@ -36,14 +36,14 @@ export function TokenInfoRow(props: {
           alignItems: "flex-end",
         }}
       >
-        <Container flex="row" gap="xs" center="y">
+        <Container center="y" flex="row" gap="xs">
           <PayTokenIcon
             chain={chainObj}
+            client={props.client}
             size="sm"
             token={{
               address: props.tokenAddress,
             }}
-            client={props.client}
           />
           <Text color="primaryText" size="sm">
             {formatNumber(Number(props.tokenAmount), 6)} {props.tokenSymbol}
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/statusMeta.test.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/statusMeta.test.ts
index a4eebbfabf8..5fdaefc0331 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/statusMeta.test.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/statusMeta.test.ts
@@ -8,8 +8,8 @@ describe("getBuyWithCryptoStatusMeta", () => {
       status: "NOT_FOUND",
     } as BuyWithCryptoStatus);
     expect(result).toEqual({
-      status: "Unknown",
       color: "secondaryText",
+      status: "Unknown",
     });
   });
 
@@ -19,9 +19,9 @@ describe("getBuyWithCryptoStatusMeta", () => {
       subStatus: "WAITING_BRIDGE",
     } as BuyWithCryptoStatus);
     expect(result).toEqual({
-      status: "Bridging",
       color: "accentText",
       loading: true,
+      status: "Bridging",
     });
   });
 
@@ -31,8 +31,8 @@ describe("getBuyWithCryptoStatusMeta", () => {
       subStatus: "PARTIAL_SUCCESS",
     } as BuyWithCryptoStatus);
     expect(result).toEqual({
-      status: "Incomplete",
       color: "secondaryText",
+      status: "Incomplete",
     });
   });
 
@@ -41,9 +41,9 @@ describe("getBuyWithCryptoStatusMeta", () => {
       status: "PENDING",
     } as BuyWithCryptoStatus);
     expect(result).toEqual({
-      status: "Pending",
       color: "accentText",
       loading: true,
+      status: "Pending",
     });
   });
 
@@ -52,8 +52,8 @@ describe("getBuyWithCryptoStatusMeta", () => {
       status: "FAILED",
     } as BuyWithCryptoStatus);
     expect(result).toEqual({
-      status: "Failed",
       color: "danger",
+      status: "Failed",
     });
   });
 
@@ -62,8 +62,8 @@ describe("getBuyWithCryptoStatusMeta", () => {
       status: "COMPLETED",
     } as BuyWithCryptoStatus);
     expect(result).toEqual({
-      status: "Completed",
       color: "success",
+      status: "Completed",
     });
   });
 
@@ -73,8 +73,8 @@ describe("getBuyWithCryptoStatusMeta", () => {
       status: "Unknown",
     });
     expect(result).toEqual({
-      status: "Unknown",
       color: "secondaryText",
+      status: "Unknown",
     });
   });
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/statusMeta.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/statusMeta.ts
index 3238d9112a5..8db1e33eea0 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/statusMeta.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/statusMeta.ts
@@ -12,8 +12,8 @@ export function getBuyWithCryptoStatusMeta(
 ): StatusMeta {
   if (cryptoStatus.status === "NOT_FOUND") {
     return {
-      status: "Unknown",
       color: "secondaryText",
+      status: "Unknown",
     };
   }
 
@@ -22,44 +22,44 @@ export function getBuyWithCryptoStatusMeta(
 
   if (subStatus === "WAITING_BRIDGE") {
     return {
-      status: "Bridging",
       color: "accentText",
       loading: true,
+      status: "Bridging",
     };
   }
 
   if (subStatus === "PARTIAL_SUCCESS") {
     return {
-      status: "Incomplete",
       color: "secondaryText",
+      status: "Incomplete",
     };
   }
 
   if (status === "PENDING") {
     return {
-      status: "Pending",
       color: "accentText",
       loading: true,
+      status: "Pending",
     };
   }
 
   if (status === "FAILED") {
     return {
-      status: "Failed",
       color: "danger",
+      status: "Failed",
     };
   }
 
   if (status === "COMPLETED") {
     return {
-      status: "Completed",
       color: "success",
+      status: "Completed",
     };
   }
 
   return {
-    status: "Unknown",
     color: "secondaryText",
+    status: "Unknown",
   };
 }
 
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.tsx
index 5bd251be533..a9e225c74cf 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.tsx
@@ -1,9 +1,10 @@
+import { useRef } from "react";
 import type { Chain } from "../../../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../../../client/client.js";
 import { fontSize } from "../../../../../../core/design-system/index.js";
-import { Spacer } from "../../../../components/Spacer.js";
 import { Container } from "../../../../components/basic.js";
 import { Input } from "../../../../components/formElements.js";
+import { Spacer } from "../../../../components/Spacer.js";
 import { TokenRow } from "../../../../components/token/TokenRow.js";
 import { TokenSymbol } from "../../../../components/token/TokenSymbol.js";
 import type { ERC20OrNativeToken } from "../../nativeToken.js";
@@ -33,43 +34,30 @@ export function BuyTokenInput(props: {
     return `calc(${`${Math.max(1, chars)}ch`} + 6px)`;
   };
 
+  const inputRef = useRef<HTMLInputElement>(null);
+
   return (
     <Container>
       {/* Input */}
-
-      {/* biome-ignore lint/a11y/useKeyWithClickEvents: <explanation> */}
+      {/** biome-ignore lint/a11y/noStaticElementInteractions: TODO */}
+      {/** biome-ignore lint/a11y/useKeyWithClickEvents: TODO */}
       <div
-        onClick={(e) => {
-          e.currentTarget.querySelector("input")?.focus();
+        onClick={() => {
+          inputRef.current?.focus();
         }}
       >
         <Container
-          flex="row"
           center="both"
+          flex="row"
           gap="xs"
           style={{
             flexWrap: "nowrap",
           }}
         >
           <Input
-            variant="outline"
-            pattern="^[0-9]*[.,]?[0-9]*$"
-            inputMode="decimal"
-            tabIndex={-1}
-            placeholder="0"
-            type="text"
             data-placeholder={props.value === ""}
-            value={props.value || "0"}
             disabled={props.freezeAmount}
-            onClick={(e) => {
-              // put cursor at the end of the input
-              if (props.value === "") {
-                e.currentTarget.setSelectionRange(
-                  e.currentTarget.value.length,
-                  e.currentTarget.value.length,
-                );
-              }
-            }}
+            inputMode="decimal"
             onChange={(e) => {
               let value = e.target.value;
 
@@ -91,41 +79,57 @@ export function BuyTokenInput(props: {
                 props.onChange(value);
               }
             }}
+            onClick={(e) => {
+              // put cursor at the end of the input
+              if (props.value === "") {
+                e.currentTarget.setSelectionRange(
+                  e.currentTarget.value.length,
+                  e.currentTarget.value.length,
+                );
+              }
+            }}
+            pattern="^[0-9]*[.,]?[0-9]*$"
+            placeholder="0"
+            ref={inputRef}
             style={{
               border: "none",
-              fontSize: getBuyTokenAmountFontSize(props.value),
-              boxShadow: "none",
               borderRadius: "0",
+              boxShadow: "none",
+              fontSize: getBuyTokenAmountFontSize(props.value),
+              fontWeight: 600,
+              maxWidth: "calc(100% - 100px)",
               padding: "0",
               paddingBlock: "2px",
-              fontWeight: 600,
               textAlign: "right",
               width: getWidth(),
-              maxWidth: "calc(100% - 100px)",
             }}
+            tabIndex={-1}
+            type="text"
+            value={props.value || "0"}
+            variant="outline"
           />
           <TokenSymbol
-            token={props.token}
             chain={props.chain}
-            size="lg"
             color="secondaryText"
+            size="lg"
+            token={props.token}
           />
         </Container>
       </div>
 
       <Container
-        flex="row"
         center="both"
+        flex="row"
         style={{
           height: fontSize.xl,
         }}
       >
         <FiatValue
-          tokenAmount={props.value}
-          token={props.token}
           chain={props.chain}
           client={props.client}
           size="md"
+          token={props.token}
+          tokenAmount={props.value}
         />
       </Container>
 
@@ -134,13 +138,13 @@ export function BuyTokenInput(props: {
           <Spacer y="md" />
 
           {/* Token / Chain selector */}
-          <Container flex="row" center="x">
+          <Container center="x" flex="row">
             <TokenRow
-              token={props.token}
               chain={props.chain}
               client={props.client}
-              onSelectToken={props.onSelectToken}
               freezeChainAndToken={props.freezeChainAndToken}
+              onSelectToken={props.onSelectToken}
+              token={props.token}
             />
           </Container>
         </>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx
index 5b948c09299..53cfc9cd812 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx
@@ -12,20 +12,20 @@ import {
   waitForReceipt,
 } from "../../../../../../../transaction/actions/wait-for-tx-receipt.js";
 import { useCustomTheme } from "../../../../../../core/design-system/CustomThemeProvider.js";
+import { Container, ModalHeader } from "../../../../components/basic.js";
+import { Button } from "../../../../components/buttons.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { Spinner } from "../../../../components/Spinner.js";
 import { StepBar } from "../../../../components/StepBar.js";
 import { SwitchNetworkButton } from "../../../../components/SwitchNetwork.js";
-import { Container, ModalHeader } from "../../../../components/basic.js";
-import { Button } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
 import { StyledDiv } from "../../../../design-system/elements.js";
 import type { ERC20OrNativeToken } from "../../nativeToken.js";
 import { Step } from "../Stepper.js";
 import type { PayerInfo } from "../types.js";
 import { ErrorText } from "./ErrorText.js";
-import { SwapSummary } from "./SwapSummary.js";
 import { addPendingTx } from "./pendingSwapTx.js";
+import { SwapSummary } from "./SwapSummary.js";
 
 /**
  * @internal
@@ -74,21 +74,21 @@ export function SwapConfirmationScreen(props: {
         error.toLowerCase().includes("user denied")
       ) {
         return {
-          title: "Failed to Approve",
           message: "Your wallet rejected the approval request.",
+          title: "Failed to Approve",
         };
       }
       if (error.toLowerCase().includes("insufficient funds for gas")) {
         return {
-          title: "Insufficient Native Funds",
           message:
             "You do not have enough native funds to approve the transaction.",
+          title: "Insufficient Native Funds",
         };
       }
       return {
-        title: "Failed to Approve",
         message:
           "Your wallet failed to approve the transaction for an unknown reason. Please try again or contact support.",
+        title: "Failed to Approve",
       };
     }
 
@@ -99,21 +99,21 @@ export function SwapConfirmationScreen(props: {
         error.toLowerCase().includes("user denied")
       ) {
         return {
-          title: "Failed to Confirm",
           message: "Your wallet rejected the confirmation request.",
+          title: "Failed to Confirm",
         };
       }
       if (error.toLowerCase().includes("insufficient funds for gas")) {
         return {
-          title: "Insufficient Native Funds",
           message:
             "You do not have enough native funds to confirm the transaction.",
+          title: "Insufficient Native Funds",
         };
       }
       return {
-        title: "Failed to Confirm",
         message:
           "Your wallet failed to confirm the transaction for an unknown reason. Please try again or contact support.",
+        title: "Failed to Confirm",
       };
     }
 
@@ -122,12 +122,12 @@ export function SwapConfirmationScreen(props: {
 
   return (
     <Container p="lg">
-      <ModalHeader title={props.title} onBack={props.onBack} />
+      <ModalHeader onBack={props.onBack} title={props.title} />
 
       {props.isFiatFlow ? (
         <>
           <Spacer y="lg" />
-          <StepBar steps={2} currentStep={2} />
+          <StepBar currentStep={2} steps={2} />
           <Spacer y="sm" />
           <Text size="xs">
             Step 2 of 2 - Converting {props.fromTokenSymbol} to{" "}
@@ -144,15 +144,15 @@ export function SwapConfirmationScreen(props: {
       )}
 
       <SwapSummary
-        sender={sender}
-        receiver={receiver}
         client={props.client}
-        fromToken={props.fromToken}
-        fromChain={props.fromChain}
-        toToken={props.toToken}
-        toChain={props.toChain}
         fromAmount={props.fromAmount}
+        fromChain={props.fromChain}
+        fromToken={props.fromToken}
+        receiver={receiver}
+        sender={sender}
         toAmount={props.toAmount}
+        toChain={props.toChain}
+        toToken={props.toToken}
       />
 
       <Spacer y="md" />
@@ -162,21 +162,21 @@ export function SwapConfirmationScreen(props: {
         <>
           <Spacer y="sm" />
           <Container
-            gap="sm"
+            center="y"
+            color="accentText"
             flex="row"
+            gap="sm"
             style={{
               justifyContent: "space-between",
             }}
-            center="y"
-            color="accentText"
           >
             <Step
-              isDone={step === "swap"}
               isActive={step === "approval"}
+              isDone={step === "swap"}
               label={step === "approval" ? "Approve" : "Approved"}
             />
             <ConnectorLine />
-            <Step isDone={false} label="Confirm" isActive={step === "swap"} />
+            <Step isActive={step === "swap"} isDone={false} label="Confirm" />
           </Container>
           <Spacer y="lg" />
         </>
@@ -185,8 +185,8 @@ export function SwapConfirmationScreen(props: {
       {uiErrorMessage && (
         <>
           <ErrorText
-            title={uiErrorMessage.title}
             message={uiErrorMessage.message}
+            title={uiErrorMessage.title}
           />
           <Spacer y="md" />
         </>
@@ -197,19 +197,19 @@ export function SwapConfirmationScreen(props: {
           <Spacer y="xs" />
           <SwitchNetworkButton
             fullWidth
-            variant="accent"
             switchChain={async () => {
               await props.payer.wallet.switchChain(props.fromChain);
             }}
+            variant="accent"
           />
         </>
       ) : (
         <>
           <Spacer y="xs" />
           <Button
-            variant="accent"
-            fullWidth
             disabled={status === "pending"}
+            fullWidth
+            gap="xs"
             onClick={async () => {
               const wallet = props.payer.wallet;
 
@@ -229,25 +229,25 @@ export function SwapConfirmationScreen(props: {
                   setStatus("pending");
 
                   trackPayEvent({
-                    event: "prompt_swap_approval",
+                    amountWei: props.quote.swapDetails.fromAmountWei,
+                    chainId: props.quote.swapDetails.fromToken.chainId,
                     client: props.client,
-                    walletAddress: account.address,
-                    walletType: wallet.id,
+                    event: "prompt_swap_approval",
                     fromToken: props.quote.swapDetails.fromToken.tokenAddress,
-                    amountWei: props.quote.swapDetails.fromAmountWei,
-                    toToken: props.quote.swapDetails.toToken.tokenAddress,
                     toChainId: props.quote.swapDetails.toToken.chainId,
-                    chainId: props.quote.swapDetails.fromToken.chainId,
+                    toToken: props.quote.swapDetails.toToken.tokenAddress,
+                    walletAddress: account.address,
+                    walletType: wallet.id,
                   });
 
                   const transaction = approve({
+                    amountWei: BigInt(props.quote.approvalData.amountWei),
                     contract: getContract({
-                      client: props.client,
                       address: props.quote.swapDetails.fromToken.tokenAddress,
                       chain: props.fromChain,
+                      client: props.client,
                     }),
                     spender: props.quote.approvalData.spenderAddress,
-                    amountWei: BigInt(props.quote.approvalData.amountWei),
                   });
 
                   const tx = await sendTransaction({
@@ -258,15 +258,15 @@ export function SwapConfirmationScreen(props: {
                   await waitForReceipt({ ...tx, maxBlocksWaitTime: 50 });
 
                   trackPayEvent({
-                    event: "swap_approval_success",
+                    amountWei: props.quote.swapDetails.fromAmountWei,
+                    chainId: props.quote.swapDetails.fromToken.chainId,
                     client: props.client,
-                    walletAddress: account.address,
-                    walletType: wallet.id,
+                    event: "swap_approval_success",
                     fromToken: props.quote.swapDetails.fromToken.tokenAddress,
-                    amountWei: props.quote.swapDetails.fromAmountWei,
-                    toToken: props.quote.swapDetails.toToken.tokenAddress,
                     toChainId: props.quote.swapDetails.toToken.chainId,
-                    chainId: props.quote.swapDetails.fromToken.chainId,
+                    toToken: props.quote.swapDetails.toToken.tokenAddress,
+                    walletAddress: account.address,
+                    walletType: wallet.id,
                   });
 
                   setStep("swap");
@@ -282,15 +282,15 @@ export function SwapConfirmationScreen(props: {
                 setStatus("pending");
                 try {
                   trackPayEvent({
-                    event: "prompt_swap_execution",
+                    amountWei: props.quote.swapDetails.fromAmountWei,
+                    chainId: props.quote.swapDetails.fromToken.chainId,
                     client: props.client,
-                    walletAddress: account.address,
-                    walletType: wallet.id,
+                    event: "prompt_swap_execution",
                     fromToken: props.quote.swapDetails.fromToken.tokenAddress,
-                    amountWei: props.quote.swapDetails.fromAmountWei,
-                    toToken: props.quote.swapDetails.toToken.tokenAddress,
                     toChainId: props.quote.swapDetails.toToken.chainId,
-                    chainId: props.quote.swapDetails.fromToken.chainId,
+                    toToken: props.quote.swapDetails.toToken.tokenAddress,
+                    walletAddress: account.address,
+                    walletType: wallet.id,
                   });
                   const tx = props.quote.transactionRequest;
                   let _swapTx: WaitForReceiptOptions;
@@ -302,13 +302,13 @@ export function SwapConfirmationScreen(props: {
                     approveTxRequired
                   ) {
                     const approveTx = approve({
+                      amountWei: BigInt(props.quote.approvalData.amountWei),
                       contract: getContract({
-                        client: props.client,
                         address: props.quote.swapDetails.fromToken.tokenAddress,
                         chain: props.fromChain,
+                        client: props.client,
                       }),
                       spender: props.quote.approvalData.spenderAddress,
-                      amountWei: BigInt(props.quote.approvalData.amountWei),
                     });
 
                     _swapTx = await sendBatchTransaction({
@@ -323,23 +323,23 @@ export function SwapConfirmationScreen(props: {
                   }
 
                   trackPayEvent({
-                    event: "swap_execution_success",
+                    amountWei: props.quote.swapDetails.fromAmountWei,
+                    chainId: props.quote.swapDetails.fromToken.chainId,
                     client: props.client,
-                    walletAddress: account.address,
-                    walletType: wallet.id,
+                    event: "swap_execution_success",
                     fromToken: props.quote.swapDetails.fromToken.tokenAddress,
-                    amountWei: props.quote.swapDetails.fromAmountWei,
-                    toToken: props.quote.swapDetails.toToken.tokenAddress,
                     toChainId: props.quote.swapDetails.toToken.chainId,
-                    chainId: props.quote.swapDetails.fromToken.chainId,
+                    toToken: props.quote.swapDetails.toToken.tokenAddress,
+                    walletAddress: account.address,
+                    walletType: wallet.id,
                   });
 
                   // do not add pending tx if the swap is part of fiat flow
                   if (!props.isFiatFlow) {
                     addPendingTx({
-                      type: "swap",
-                      txHash: _swapTx.transactionHash,
                       chainId: _swapTx.chain.id,
+                      txHash: _swapTx.transactionHash,
+                      type: "swap",
                     });
                   }
 
@@ -351,14 +351,14 @@ export function SwapConfirmationScreen(props: {
                 }
               }
             }}
-            gap="xs"
+            variant="accent"
           >
             {step === "approval" &&
               (status === "pending" ? "Approving" : "Approve")}
             {step === "swap" &&
               (status === "pending" ? "Confirming" : "Confirm")}
             {status === "pending" && (
-              <Spinner size="sm" color="accentButtonText" />
+              <Spinner color="accentButtonText" size="sm" />
             )}
           </Button>
         </>
@@ -370,8 +370,8 @@ export function SwapConfirmationScreen(props: {
 export const ConnectorLine = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
-    height: "4px",
     background: theme.colors.borderColor,
     flex: 1,
+    height: "4px",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ErrorText.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ErrorText.tsx
index 729783282f9..8bfa0229335 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ErrorText.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ErrorText.tsx
@@ -3,14 +3,11 @@ import { iconSize } from "../../../../../../core/design-system/index.js";
 import { Container } from "../../../../components/basic.js";
 import { Text } from "../../../../components/text.js";
 
-export function ErrorText(props: {
-  title: string;
-  message: string;
-}) {
+export function ErrorText(props: { title: string; message: string }) {
   return (
-    <Container gap="xxs" flex="column">
-      <Container flex="row" gap="xxs" center="both" color="danger">
-        <CrossCircledIcon width={iconSize.sm} height={iconSize.sm} />
+    <Container flex="column" gap="xxs">
+      <Container center="both" color="danger" flex="row" gap="xxs">
+        <CrossCircledIcon height={iconSize.sm} width={iconSize.sm} />
         <Text color="danger" size="sm">
           {props.title}
         </Text>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.tsx
index 543c4467a8d..b5cb30292c2 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.tsx
@@ -1,16 +1,14 @@
 import type { BuyWithCryptoQuote } from "../../../../../../../pay/buyWithCrypto/getQuote.js";
 import type { BuyWithFiatQuote } from "../../../../../../../pay/buyWithFiat/getQuote.js";
 import { formatNumber } from "../../../../../../../utils/formatNumber.js";
-import { Spacer } from "../../../../components/Spacer.js";
 import { Container, Line } from "../../../../components/basic.js";
+import { Spacer } from "../../../../components/Spacer.js";
 import { Text } from "../../../../components/text.js";
 
 /**
  * @internal
  */
-export function SwapFees(props: {
-  quote: BuyWithCryptoQuote;
-}) {
+export function SwapFees(props: { quote: BuyWithCryptoQuote }) {
   return (
     <Container
       flex="column"
@@ -23,9 +21,9 @@ export function SwapFees(props: {
         const feeAmount = formatNumber(Number(fee.amount), 6);
         return (
           <Container
-            key={`${fee.token.chainId}_${fee.token.tokenAddress}_${feeAmount}`}
             flex="row"
             gap="xxs"
+            key={`${fee.token.chainId}_${fee.token.tokenAddress}_${feeAmount}`}
           >
             <Text color="primaryText" size="sm">
               {feeAmount === 0 ? "~" : ""}
@@ -44,9 +42,7 @@ export function SwapFees(props: {
 /**
  * @internal
  */
-export function FiatFees(props: {
-  quote: BuyWithFiatQuote;
-}) {
+export function FiatFees(props: { quote: BuyWithFiatQuote }) {
   return (
     <Container flex="column" gap="xs">
       {/* Amount ( without fees included ) */}
@@ -56,7 +52,7 @@ export function FiatFees(props: {
           justifyContent: "space-between",
         }}
       >
-        <Text inline color="secondaryText">
+        <Text color="secondaryText" inline>
           Amount
         </Text>
         <Text color="primaryText" inline>
@@ -78,7 +74,7 @@ export function FiatFees(props: {
               justifyContent: "space-between",
             }}
           >
-            <Text inline color="secondaryText">
+            <Text color="secondaryText" inline>
               {fee.feeType === "NETWORK" ? "Network Fee" : "Processing Fee"}
             </Text>
 
@@ -100,7 +96,7 @@ export function FiatFees(props: {
           justifyContent: "space-between",
         }}
       >
-        <Text inline color="secondaryText">
+        <Text color="secondaryText" inline>
           Total
         </Text>
         <Text color="primaryText" inline>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.tsx
index 75fc29ca35f..5162bac27f9 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.tsx
@@ -5,8 +5,8 @@ import { convertCryptoToFiat } from "../../../../../../../pay/convert/cryptoToFi
 import { formatNumber } from "../../../../../../../utils/formatNumber.js";
 import { fontSize } from "../../../../../../core/design-system/index.js";
 import { Skeleton } from "../../../../components/Skeleton.js";
-import { Text } from "../../../../components/text.js";
 import type { TextProps } from "../../../../components/text.js";
+import { Text } from "../../../../components/text.js";
 import { useDebouncedValue } from "../../../../hooks/useDebouncedValue.js";
 import type { ERC20OrNativeToken } from "../../nativeToken.js";
 import { getTokenAddress } from "../../nativeToken.js";
@@ -21,24 +21,24 @@ export function FiatValue(
 ) {
   const deferredTokenAmount = useDebouncedValue(props.tokenAmount, 500);
   const cryptoToFiatQuery = useQuery({
-    queryKey: [
-      "cryptoToFiat",
-      props.chain.id,
-      getTokenAddress(props.token),
-      deferredTokenAmount,
-    ],
     queryFn: () =>
       convertCryptoToFiat({
-        client: props.client,
         chain: props.chain,
-        fromTokenAddress: getTokenAddress(props.token),
+        client: props.client,
         fromAmount: Number(deferredTokenAmount),
+        fromTokenAddress: getTokenAddress(props.token),
         to: "USD",
       }),
+    queryKey: [
+      "cryptoToFiat",
+      props.chain.id,
+      getTokenAddress(props.token),
+      deferredTokenAmount,
+    ],
   });
 
   if (cryptoToFiatQuery.isLoading) {
-    return <Skeleton width={"50px"} height={fontSize.lg} />;
+    return <Skeleton height={fontSize.lg} width={"50px"} />;
   }
 
   return cryptoToFiatQuery.data?.result ? (
@@ -47,8 +47,8 @@ export function FiatValue(
       {Number(
         formatNumber(cryptoToFiatQuery.data.result, 2).toFixed(2),
       ).toLocaleString(undefined, {
-        minimumFractionDigits: 2,
         maximumFractionDigits: 2,
+        minimumFractionDigits: 2,
       })}
     </Text>
   ) : null;
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.tsx
index 8a535e2e5ab..43141db3ffa 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.tsx
@@ -9,13 +9,13 @@ import {
 } from "../../../../../../core/design-system/index.js";
 import { useWalletBalance } from "../../../../../../core/hooks/others/useWalletBalance.js";
 import type { TokenInfo } from "../../../../../../core/utils/defaultTokens.js";
-import { Skeleton } from "../../../../components/Skeleton.js";
 import { Container } from "../../../../components/basic.js";
+import { Skeleton } from "../../../../components/Skeleton.js";
 import { Text } from "../../../../components/text.js";
 import { TokenRow } from "../../../../components/token/TokenRow.js";
 import { TokenSymbol } from "../../../../components/token/TokenSymbol.js";
 import { formatTokenBalance } from "../../formatTokenBalance.js";
-import { type NativeToken, isNativeToken } from "../../nativeToken.js";
+import { isNativeToken, type NativeToken } from "../../nativeToken.js";
 import { WalletRow } from "./WalletRow.js";
 
 /**
@@ -40,10 +40,10 @@ export function PayWithCryptoQuoteInfo(props: {
     {
       address: props.payerAccount.address,
       chain: props.chain,
+      client: props.client,
       tokenAddress: isNativeToken(props.token)
         ? undefined
         : props.token?.address,
-      client: props.client,
     },
     {
       enabled: !!props.chain && !!props.token,
@@ -54,8 +54,8 @@ export function PayWithCryptoQuoteInfo(props: {
     <Container
       bg="tertiaryBg"
       style={{
-        borderRadius: radius.lg,
         border: `1px solid ${theme.colors.borderColor}`,
+        borderRadius: radius.lg,
         ...(props.swapRequired
           ? {
               borderBottom: "none",
@@ -70,44 +70,44 @@ export function PayWithCryptoQuoteInfo(props: {
         flex="row"
         gap="sm"
         style={{
+          borderBottom: `1px solid ${theme.colors.borderColor}`,
           justifyContent: "space-between",
           padding: spacing.sm,
-          borderBottom: `1px solid ${theme.colors.borderColor}`,
         }}
       >
-        <WalletRow client={props.client} address={props.payerAccount.address} />
+        <WalletRow address={props.payerAccount.address} client={props.client} />
         {props.token && props.chain && balanceQuery.data ? (
-          <Container flex="row" gap="3xs" center="y">
-            <Text size="xs" color="secondaryText" weight={500}>
+          <Container center="y" flex="row" gap="3xs">
+            <Text color="secondaryText" size="xs" weight={500}>
               {formatTokenBalance(balanceQuery.data, false, 4)}
             </Text>
             <TokenSymbol
-              token={props.token}
               chain={props.chain}
-              size="xs"
               color="secondaryText"
+              size="xs"
+              token={props.token}
             />
           </Container>
         ) : props.token && props.chain && balanceQuery.isLoading ? (
-          <Skeleton width="70px" height={fontSize.xs} />
+          <Skeleton height={fontSize.xs} width="70px" />
         ) : null}
       </Container>
       {/* Quoted price & token selector */}
       <TokenRow
-        token={props.token}
         chain={props.chain}
         client={props.client}
         isLoading={props.isLoading}
-        value={props.value}
         onSelectToken={props.onSelectToken}
         style={{
           border: "none",
-          borderRadius: 0,
           borderBottomLeftRadius:
             !props.token || !props.chain || !props.swapRequired ? radius.lg : 0,
           borderBottomRightRadius:
             !props.token || !props.chain || !props.swapRequired ? radius.lg : 0,
+          borderRadius: 0,
         }}
+        token={props.token}
+        value={props.value}
       />
     </Container>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/StepConnector.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/StepConnector.tsx
index 8648c9b4dd8..039ff99c224 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/StepConnector.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/StepConnector.tsx
@@ -6,29 +6,29 @@ export function StepConnectorArrow() {
   const theme = useCustomTheme();
   return (
     <Container
-      flex="row"
       center="both"
+      flex="row"
       style={{
-        width: "100%",
-        position: "relative",
-        marginTop: "-10px",
         marginBottom: "-10px",
+        marginTop: "-10px",
+        position: "relative",
+        width: "100%",
         zIndex: 1000,
       }}
     >
       <Container
-        flex="row"
         center="both"
         color="primaryText"
+        flex="row"
         style={{
-          borderRadius: "100%",
-          width: "30px",
-          height: "30px",
           backgroundColor: theme.colors.modalBg,
           border: `1px solid ${theme.colors.borderColor}`,
+          borderRadius: "100%",
+          height: "30px",
+          width: "30px",
         }}
       >
-        <ChevronDownIcon width={16} height={16} />
+        <ChevronDownIcon height={16} width={16} />
       </Container>
     </Container>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.tsx
index 7ce58dcefa2..34c22c135db 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.tsx
@@ -78,40 +78,40 @@ export function SwapFlow(props: SwapFlowProps) {
   if (swapTxHash) {
     return (
       <SwapStatusScreen
-        title={props.title}
+        client={props.client}
+        fromChain={fromChain}
+        isEmbed={props.isEmbed}
         onBack={props.onBack}
+        onDone={props.onDone}
+        onSuccess={props.onSuccess}
         onTryAgain={props.onTryAgain}
+        quote={quote}
         swapTxHash={swapTxHash}
-        fromChain={fromChain}
-        client={props.client}
-        onDone={props.onDone}
+        title={props.title}
         transactionMode={props.transactionMode}
-        isEmbed={props.isEmbed}
-        quote={quote}
-        onSuccess={props.onSuccess}
       />
     );
   }
 
   return (
     <SwapConfirmationScreen
-      title={props.title}
-      setSwapTxHash={setSwapTxHash}
-      toChain={toChain}
-      toAmount={toAmount}
-      toTokenSymbol={toTokenSymbol}
-      fromChain={fromChain}
-      toToken={toToken}
+      client={props.client}
       fromAmount={fromAmount}
+      fromChain={fromChain}
       fromToken={fromToken}
       fromTokenSymbol={fromTokenSymbol}
-      client={props.client}
+      isFiatFlow={props.isFiatFlow}
       onBack={props.onBack}
       onTryAgain={props.onTryAgain}
-      quote={quote}
-      isFiatFlow={props.isFiatFlow}
       payer={props.payer}
       preApprovedAmount={props.approvalAmount}
+      quote={quote}
+      setSwapTxHash={setSwapTxHash}
+      title={props.title}
+      toAmount={toAmount}
+      toChain={toChain}
+      toToken={toToken}
+      toTokenSymbol={toTokenSymbol}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
index 43bcb8186dc..4c1270d72dd 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
@@ -13,7 +13,8 @@ import type { PayUIOptions } from "../../../../../../core/hooks/connection/Conne
 import { useWalletBalance } from "../../../../../../core/hooks/others/useWalletBalance.js";
 import { useBuyWithCryptoQuote } from "../../../../../../core/hooks/pay/useBuyWithCryptoQuote.js";
 import { getErrorMessage } from "../../../../../utils/errors.js";
-import type { PayEmbedConnectOptions } from "../../../../PayEmbed.js";
+import { Container } from "../../../../components/basic.js";
+import { Button } from "../../../../components/buttons.js";
 import {
   Drawer,
   DrawerOverlay,
@@ -21,10 +22,9 @@ import {
 } from "../../../../components/Drawer.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { Spinner } from "../../../../components/Spinner.js";
-import { Container } from "../../../../components/basic.js";
-import { Button } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
 import { TokenSymbol } from "../../../../components/token/TokenSymbol.js";
+import type { PayEmbedConnectOptions } from "../../../../PayEmbed.js";
 import type { ConnectLocale } from "../../../locale/types.js";
 import { type ERC20OrNativeToken, isNativeToken } from "../../nativeToken.js";
 import { EstimatedTimeAndFees } from "../EstimatedTimeAndFees.js";
@@ -82,8 +82,8 @@ export function SwapScreenContent(props: {
     {
       address: payer.account.address,
       chain: fromChain,
-      tokenAddress: isNativeToken(fromToken) ? undefined : fromToken?.address,
       client,
+      tokenAddress: isNativeToken(fromToken) ? undefined : fromToken?.address,
     },
     {
       enabled: !!fromChain && !!fromToken,
@@ -104,54 +104,54 @@ export function SwapScreenContent(props: {
   const quoteParams: GetBuyWithCryptoQuoteParams | undefined =
     fromChain && fromToken && swapRequired
       ? {
+          client,
           // wallets
           fromAddress: payer.account.address,
-          toAddress: receiverAddress,
           // from
           fromChainId: fromChain.id,
           fromTokenAddress: isNativeToken(fromToken)
             ? NATIVE_TOKEN_ADDRESS
             : fromToken.address,
+          paymentLinkId: props.paymentLinkId,
+          purchaseData: payOptions.purchaseData,
+          toAddress: receiverAddress,
+          toAmount: tokenAmount,
           // to
           toChainId: toChain.id,
           toTokenAddress: isNativeToken(toToken)
             ? NATIVE_TOKEN_ADDRESS
             : toToken.address,
-          toAmount: tokenAmount,
-          client,
-          purchaseData: payOptions.purchaseData,
-          paymentLinkId: props.paymentLinkId,
         }
       : undefined;
 
   const quoteQuery = useBuyWithCryptoQuote(quoteParams, {
+    gcTime: 30 * 1000,
+    refetchInterval: 30 * 1000,
     // refetch every 30 seconds
     staleTime: 30 * 1000,
-    refetchInterval: 30 * 1000,
-    gcTime: 30 * 1000,
   });
 
   const allowanceQuery = useQuery({
-    queryKey: [
-      "allowance",
-      payer.account.address,
-      quoteQuery.data?.approvalData,
-    ],
+    enabled: !!quoteQuery.data?.approvalData,
     queryFn: () => {
       if (!quoteQuery.data?.approvalData) {
         return null;
       }
       return allowance({
         contract: getContract({
-          client: props.client,
           address: quoteQuery.data.swapDetails.fromToken.tokenAddress,
           chain: getCachedChain(quoteQuery.data.swapDetails.fromToken.chainId),
+          client: props.client,
         }),
-        spender: quoteQuery.data.approvalData.spenderAddress,
         owner: props.payer.account.address,
+        spender: quoteQuery.data.approvalData.spenderAddress,
       });
     },
-    enabled: !!quoteQuery.data?.approvalData,
+    queryKey: [
+      "allowance",
+      payer.account.address,
+      quoteQuery.data?.approvalData,
+    ],
     refetchOnMount: true,
   });
 
@@ -210,9 +210,9 @@ export function SwapScreenContent(props: {
     }
 
     setScreen({
+      approvalAmount: allowanceQuery.data ?? undefined,
       id: "swap-flow",
       quote: quoteQuery.data,
-      approvalAmount: allowanceQuery.data ?? undefined,
     });
   }
 
@@ -226,14 +226,14 @@ export function SwapScreenContent(props: {
   }
 
   return (
-    <Container flex="column" gap="lg" animate="fadein">
+    <Container animate="fadein" flex="column" gap="lg">
       {isOpen && (
         <>
           <DrawerOverlay ref={drawerOverlayRef} />
-          <Drawer ref={drawerRef} close={() => setIsOpen(false)}>
+          <Drawer close={() => setIsOpen(false)} ref={drawerRef}>
             {drawerScreen === "fees" && quoteQuery.data && (
               <div>
-                <Text size="lg" color="primaryText">
+                <Text color="primaryText" size="lg">
                   Fees
                 </Text>
                 <Spacer y="lg" />
@@ -246,14 +246,14 @@ export function SwapScreenContent(props: {
 
       {/* Quote info */}
       <Container flex="column" gap="sm">
-        <Container flex="row" gap="xxs" center="y">
+        <Container center="y" flex="row" gap="xxs">
           <Text size="sm">Pay with</Text>
           {fromToken && fromChain ? (
             <TokenSymbol
-              token={fromToken}
               chain={fromChain}
-              size="sm"
               color="secondaryText"
+              size="sm"
+              token={fromToken}
             />
           ) : (
             "crypto"
@@ -261,23 +261,23 @@ export function SwapScreenContent(props: {
         </Container>
         <div>
           <PayWithCryptoQuoteInfo
-            value={sourceTokenAmount || ""}
             chain={fromChain}
-            token={fromToken}
-            isLoading={quoteQuery.isLoading && !sourceTokenAmount}
             client={client}
             freezeChainAndTokenSelection={disableTokenSelection}
+            isLoading={quoteQuery.isLoading && !sourceTokenAmount}
+            onSelectToken={props.showFromTokenSelector}
             payerAccount={props.payer.account}
             swapRequired={swapRequired}
-            onSelectToken={props.showFromTokenSelector}
+            token={fromToken}
+            value={sourceTokenAmount || ""}
           />
           {swapRequired && fromChain && fromToken && (
             <EstimatedTimeAndFees
-              quoteIsLoading={quoteQuery.isLoading}
               estimatedSeconds={
                 quoteQuery.data?.swapDetails.estimated.durationSeconds
               }
               onViewFees={showFees}
+              quoteIsLoading={quoteQuery.isLoading}
             />
           )}
         </div>
@@ -285,10 +285,10 @@ export function SwapScreenContent(props: {
         {errorMsg && (
           <div>
             <div>
-              <Text color="danger" size="xs" center multiline>
+              <Text center color="danger" multiline size="xs">
                 {errorMsg.title}
               </Text>
-              <Text size="xs" center multiline>
+              <Text center multiline size="xs">
                 {errorMsg.message}
               </Text>
             </div>
@@ -297,10 +297,10 @@ export function SwapScreenContent(props: {
 
         {!errorMsg && isNotEnoughBalance && (
           <div>
-            <Text color="danger" size="xs" center multiline>
+            <Text center color="danger" multiline size="xs">
               Insufficient Funds
             </Text>
-            <Text size="xs" center multiline>
+            <Text center multiline size="xs">
               Select another token or pay with card.
             </Text>
           </div>
@@ -310,18 +310,18 @@ export function SwapScreenContent(props: {
       {/* Button */}
       {isNotEnoughBalance || errorMsg ? (
         <Button
-          variant="accent"
           fullWidth
           onClick={() => props.showFromTokenSelector()}
+          variant="accent"
         >
           Pay with another token
         </Button>
       ) : (
         <Button
-          variant={disableContinue ? "outline" : "accent"}
-          fullWidth
           data-disabled={disableContinue}
           disabled={disableContinue}
+          fullWidth
+          gap="xs"
           onClick={async () => {
             if (!disableContinue) {
               if (props.payer.wallet.getChain()?.id !== fromChain?.id) {
@@ -329,20 +329,20 @@ export function SwapScreenContent(props: {
               }
               showSwapFlow();
               trackPayEvent({
-                event: "confirm_swap_quote",
-                client: client,
-                walletAddress: payer.account.address,
-                walletType: payer.wallet.id,
                 chainId: fromChain.id,
+                client: client,
+                event: "confirm_swap_quote",
                 fromToken: isNativeToken(fromToken)
                   ? undefined
                   : fromToken.address,
                 toChainId: toChain.id,
                 toToken: isNativeToken(toToken) ? undefined : toToken.address,
+                walletAddress: payer.account.address,
+                walletType: payer.wallet.id,
               });
             }
           }}
-          gap="xs"
+          variant={disableContinue ? "outline" : "accent"}
         >
           {quoteQuery.isLoading ? (
             <>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapStatusScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapStatusScreen.tsx
index 89f08f2405d..c44e69a33e6 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapStatusScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapStatusScreen.tsx
@@ -8,10 +8,10 @@ import type { BuyWithCryptoStatus } from "../../../../../../../pay/buyWithCrypto
 import { iconSize } from "../../../../../../core/design-system/index.js";
 import { useBuyWithCryptoStatus } from "../../../../../../core/hooks/pay/useBuyWithCryptoStatus.js";
 import { invalidateWalletBalance } from "../../../../../../core/providers/invalidateWalletBalance.js";
-import { Spacer } from "../../../../components/Spacer.js";
-import { Spinner } from "../../../../components/Spinner.js";
 import { Container, ModalHeader } from "../../../../components/basic.js";
 import { Button } from "../../../../components/buttons.js";
+import { Spacer } from "../../../../components/Spacer.js";
+import { Spinner } from "../../../../components/Spinner.js";
 import { Text } from "../../../../components/text.js";
 import { AccentFailIcon } from "../../../icons/AccentFailIcon.js";
 import { SwapTxDetailsTable } from "../pay-transactions/SwapDetailsScreen.js";
@@ -35,9 +35,9 @@ export function SwapStatusScreen(props: {
   const [showDetails, setShowDetails] = useState(false);
 
   const swapStatus = useBuyWithCryptoStatus({
+    chainId: props.fromChain.id,
     client: props.client,
     transactionHash: props.swapTxHash,
-    chainId: props.fromChain.id,
   });
 
   let uiStatus: UIStatus = "pending";
@@ -81,15 +81,15 @@ export function SwapStatusScreen(props: {
   const swapDetails =
     swapStatus.data && swapStatus.data.status !== "NOT_FOUND" ? (
       <SwapTxDetailsTable
+        client={props.client}
         status={swapStatus.data}
         type="status"
-        client={props.client}
       />
     ) : props.quote ? (
       <SwapTxDetailsTable
-        type="quote"
-        quote={props.quote}
         client={props.client}
+        quote={props.quote}
+        type="quote"
       />
     ) : null;
 
@@ -98,8 +98,8 @@ export function SwapStatusScreen(props: {
       <Container animate="fadein">
         <Container p="lg">
           <ModalHeader
-            title={"Transaction Details"}
             onBack={() => setShowDetails(false)}
+            title={"Transaction Details"}
           />
           <Spacer y="xl" />
           {swapDetails}
@@ -111,16 +111,16 @@ export function SwapStatusScreen(props: {
   return (
     <Container animate="fadein">
       <Container p="lg">
-        <ModalHeader title={props.title} onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title={props.title} />
         <Spacer y="sm" />
 
         {uiStatus === "success" && (
           <>
             <Spacer y="md" />
-            <Container color="success" flex="column" center="x">
+            <Container center="x" color="success" flex="column">
               <CheckCircledIcon
-                width={iconSize["3xl"]}
                 height={iconSize["3xl"]}
+                width={iconSize["3xl"]}
               />
               <Spacer y="sm" />
               <Text color="primaryText" size="lg">
@@ -130,14 +130,14 @@ export function SwapStatusScreen(props: {
 
             <Spacer y="xl" />
             <Button
-              variant="outline"
               fullWidth
               onClick={() => setShowDetails(true)}
+              variant="outline"
             >
               View transaction details
             </Button>
             <Spacer y="sm" />
-            <Button variant="accent" fullWidth onClick={props.onDone}>
+            <Button fullWidth onClick={props.onDone} variant="accent">
               {props.transactionMode ? "Continue Transaction" : "Done"}
             </Button>
           </>
@@ -148,14 +148,14 @@ export function SwapStatusScreen(props: {
           swapStatus.data?.destination && (
             <>
               <Spacer y="lg" />
-              <Container color="success" flex="column" center="x">
+              <Container center="x" color="success" flex="column">
                 <AccentFailIcon size={iconSize["3xl"]} />
                 <Spacer y="xl" />
                 <Text color="primaryText" size="lg">
                   Incomplete
                 </Text>
                 <Spacer y="sm" />
-                <Text size="sm" color="danger">
+                <Text color="danger" size="sm">
                   Expected {swapStatus.data.quote.toToken.symbol}, Got{" "}
                   {swapStatus.data.destination.token.symbol} instead
                 </Text>
@@ -169,7 +169,7 @@ export function SwapStatusScreen(props: {
             <Spacer y="xxl" />
 
             <Container flex="column">
-              <Container flex="column" center="both">
+              <Container center="both" flex="column">
                 <AccentFailIcon size={iconSize["3xl"]} />
                 <Spacer y="xl" />
                 <Text color="primaryText" size="lg">
@@ -184,16 +184,16 @@ export function SwapStatusScreen(props: {
 
               <Spacer y="xl" />
               <Button
-                variant="outline"
                 fullWidth
                 onClick={() => setShowDetails(true)}
+                variant="outline"
               >
                 View transaction details
               </Button>
 
               <Spacer y="sm" />
 
-              <Button variant="accent" fullWidth onClick={props.onTryAgain}>
+              <Button fullWidth onClick={props.onTryAgain} variant="accent">
                 Try Again
               </Button>
             </Container>
@@ -203,16 +203,16 @@ export function SwapStatusScreen(props: {
         {uiStatus === "pending" && (
           <>
             <Spacer y="xl" />
-            <Container flex="column" animate="fadein" center="both">
+            <Container animate="fadein" center="both" flex="column">
               <div
                 style={{
-                  position: "relative",
-                  display: "flex",
                   alignItems: "center",
+                  display: "flex",
                   justifyContent: "center",
+                  position: "relative",
                 }}
               >
-                <Spinner size="3xl" color="accentText" />
+                <Spinner color="accentText" size="3xl" />
               </div>
               <Spacer y="lg" />
               <Text color="primaryText" size="lg">
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.tsx
index dfa4b3fb9eb..8da74f1b008 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.tsx
@@ -29,8 +29,8 @@ export function SwapSummary(props: {
         bg="tertiaryBg"
         flex="column"
         style={{
-          borderRadius: radius.lg,
           border: `1px solid ${theme.colors.borderColor}`,
+          borderRadius: radius.lg,
         }}
       >
         <Container
@@ -49,29 +49,29 @@ export function SwapSummary(props: {
           />
         </Container>
         <TokenRow
-          token={props.fromToken}
           chain={props.fromChain}
           client={props.client}
-          isLoading={false}
-          value={props.fromAmount}
           freezeChainAndToken={true}
+          isLoading={false}
           onSelectToken={() => {}}
           style={{
             background: "transparent",
-            borderRadius: 0,
             border: "none",
+            borderRadius: 0,
           }}
+          token={props.fromToken}
+          value={props.fromAmount}
         />
       </Container>
       {/* Connector Icon */}
       <StepConnectorArrow />
       {/* Buy */}
       <Container
-        flex="column"
         bg="tertiaryBg"
+        flex="column"
         style={{
-          borderRadius: radius.lg,
           border: `1px solid ${theme.colors.borderColor}`,
+          borderRadius: radius.lg,
         }}
       >
         {isDifferentRecipient && (
@@ -92,18 +92,18 @@ export function SwapSummary(props: {
           </Container>
         )}
         <TokenRow
-          token={props.toToken}
           chain={props.toChain}
           client={props.client}
-          isLoading={false}
-          value={props.toAmount}
           freezeChainAndToken={true}
+          isLoading={false}
           onSelectToken={() => {}}
           style={{
             background: "transparent",
-            borderRadius: 0,
             border: "none",
+            borderRadius: 0,
           }}
+          token={props.toToken}
+          value={props.toAmount}
         />
       </Container>
     </Container>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.tsx
index 167b7d8420d..0d54e91929d 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.tsx
@@ -29,21 +29,21 @@ import type {
   TokenInfo,
 } from "../../../../../../core/utils/defaultTokens.js";
 import { LoadingScreen } from "../../../../../wallets/shared/LoadingScreen.js";
+import { Container } from "../../../../components/basic.js";
+import { Button } from "../../../../components/buttons.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { TextDivider } from "../../../../components/TextDivider.js";
 import { TokenIcon } from "../../../../components/TokenIcon.js";
-import { Container } from "../../../../components/basic.js";
-import { Button } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
 import { OutlineWalletIcon } from "../../../icons/OutlineWalletIcon.js";
 import { formatTokenBalance } from "../../formatTokenBalance.js";
 import { type ERC20OrNativeToken, isNativeToken } from "../../nativeToken.js";
 import { FiatValue } from "./FiatValue.js";
-import { WalletRow } from "./WalletRow.js";
 import {
   type TokenBalance,
   useWalletsAndBalances,
 } from "./fetchBalancesForWallet.js";
+import { WalletRow } from "./WalletRow.js";
 
 export function TokenSelectorScreen(props: {
   client: ThirdwebClient;
@@ -67,10 +67,10 @@ export function TokenSelectorScreen(props: {
 
   const walletsAndBalances = useWalletsAndBalances({
     client: props.client,
+    mode: props.mode,
     sourceSupportedTokens: props.sourceSupportedTokens || [],
     toChain: props.toChain,
     toToken: props.toToken,
-    mode: props.mode,
   });
 
   if (
@@ -98,7 +98,7 @@ export function TokenSelectorScreen(props: {
     >
       {filteredWallets.length === 0 ? (
         <Container flex="column" gap="xs" py="lg">
-          <Text size="xs" color="secondaryText" center>
+          <Text center color="secondaryText" size="xs">
             No suitable payment token found
             <br />
             in connected wallets
@@ -125,97 +125,97 @@ export function TokenSelectorScreen(props: {
             if (!wallet) return null;
             return (
               <WalletRowWithBalances
-                key={w.id}
-                wallet={wallet}
+                address={address}
                 balances={balances}
                 client={props.client}
-                address={address}
+                key={w.id}
                 onClick={(wallet, token, chain) => {
                   trackPayEvent({
-                    event: "choose_payment_method_token",
-                    client: props.client,
-                    walletAddress: activeAccount?.address,
-                    walletType: activeWallet?.id,
                     chainId: chain.id,
+                    client: props.client,
+                    event: "choose_payment_method_token",
                     fromToken: isNativeToken(token) ? undefined : token.address,
+                    toChainId: props.toChain.id,
                     toToken: isNativeToken(props.toToken)
                       ? undefined
                       : props.toToken.address,
-                    toChainId: props.toChain.id,
+                    walletAddress: activeAccount?.address,
+                    walletType: activeWallet?.id,
                   });
                   props.onSelectToken(wallet, token, chain);
                 }}
+                wallet={wallet}
               />
             );
           })}
           {filteredWallets.length > 0 && <TextDivider text="OR" />}
           <Button
-            variant="secondary"
+            bg="tertiaryBg"
             fullWidth
             onClick={() => {
               trackPayEvent({
-                event: "choose_payment_method_another_wallet",
                 client: props.client,
-                walletAddress: activeAccount?.address,
-                walletType: activeWallet?.id,
+                event: "choose_payment_method_another_wallet",
                 toChainId: props.toChain.id,
                 toToken: isNativeToken(props.toToken)
                   ? undefined
                   : props.toToken.address,
+                walletAddress: activeAccount?.address,
+                walletType: activeWallet?.id,
               });
               props.onConnect();
             }}
-            bg="tertiaryBg"
             style={{
               border: `1px solid ${theme.colors.borderColor}`,
               padding: spacing.sm,
             }}
+            variant="secondary"
           >
             <Container
-              flex="row"
-              gap="sm"
               center="y"
-              expand
               color="secondaryIconColor"
+              expand
+              flex="row"
+              gap="sm"
             >
               <OutlineWalletIcon size={iconSize.md} />
-              <Text size="sm" color="primaryText">
+              <Text color="primaryText" size="sm">
                 Pay with another wallet
               </Text>
             </Container>
           </Button>
           {props.fiatSupported && (
             <Button
-              variant="secondary"
+              bg="tertiaryBg"
               fullWidth
               onClick={() => {
                 trackPayEvent({
-                  event: "choose_payment_method_with_card",
                   client: props.client,
-                  walletAddress: activeAccount?.address,
-                  walletType: activeWallet?.id,
+                  event: "choose_payment_method_with_card",
                   toChainId: props.toChain.id,
                   toToken: isNativeToken(props.toToken)
                     ? undefined
                     : props.toToken.address,
+                  walletAddress: activeAccount?.address,
+                  walletType: activeWallet?.id,
                 });
                 props.onPayWithFiat();
               }}
-              bg="tertiaryBg"
               style={{
                 border: `1px solid ${theme.colors.borderColor}`,
                 padding: spacing.sm,
               }}
+              variant="secondary"
             >
               <Container
-                flex="row"
-                gap="sm"
                 center="y"
-                expand
                 color="secondaryIconColor"
+                expand
+                flex="row"
+                gap="sm"
               >
-                <CardStackIcon width={iconSize.md} height={iconSize.md} />
-                <Text size="sm" color="primaryText">
+                <CardStackIcon height={iconSize.md} width={iconSize.md} />
+                <Text color="primaryText" size="sm">
                   Pay with card
                 </Text>
               </Container>
@@ -245,34 +245,34 @@ function WalletRowWithBalances(props: {
     <Container
       flex="column"
       style={{
-        borderRadius: radius.lg,
         border: `1px solid ${theme.colors.borderColor}`,
+        borderRadius: radius.lg,
       }}
     >
       <Container
+        bg="tertiaryBg"
         flex="row"
         gap="sm"
-        bg="tertiaryBg"
         style={{
-          justifyContent: "space-between",
-          borderTopRightRadius: radius.lg,
+          borderBottom: `1px solid ${theme.colors.borderColor}`,
           borderTopLeftRadius: radius.lg,
+          borderTopRightRadius: radius.lg,
+          justifyContent: "space-between",
           padding: spacing.sm,
           paddingRight: spacing.xs,
-          borderBottom: `1px solid ${theme.colors.borderColor}`,
         }}
       >
         <WalletRow {...props} />
         {!isActiveAccount && (
           <Button
-            variant="ghost"
             onClick={() => disconnect(props.wallet)}
             style={{
-              padding: spacing.xxs,
               color: theme.colors.secondaryText,
+              padding: spacing.xxs,
             }}
+            variant="ghost"
           >
-            <Cross2Icon width={iconSize.sm} height={iconSize.sm} />
+            <Cross2Icon height={iconSize.sm} width={iconSize.sm} />
           </Button>
         )}
       </Container>
@@ -281,27 +281,27 @@ function WalletRowWithBalances(props: {
           displayedBalances.map((b, idx) => (
             <TokenBalanceRow
               client={props.client}
-              onClick={() => props.onClick(props.wallet, b.token, b.chain)}
               key={`${b.token.address}-${b.chain.id}`}
-              tokenBalance={b}
-              wallet={props.wallet}
+              onClick={() => props.onClick(props.wallet, b.token, b.chain)}
               style={{
-                borderTopLeftRadius: 0,
-                borderTopRightRadius: 0,
-                borderBottomRightRadius:
-                  idx === displayedBalances.length - 1 ? radius.lg : 0,
-                borderBottomLeftRadius:
-                  idx === displayedBalances.length - 1 ? radius.lg : 0,
                 borderBottom:
                   idx === displayedBalances.length - 1
                     ? "none"
                     : `1px solid ${theme.colors.borderColor}`,
+                borderBottomLeftRadius:
+                  idx === displayedBalances.length - 1 ? radius.lg : 0,
+                borderBottomRightRadius:
+                  idx === displayedBalances.length - 1 ? radius.lg : 0,
+                borderTopLeftRadius: 0,
+                borderTopRightRadius: 0,
               }}
+              tokenBalance={b}
+              wallet={props.wallet}
             />
           ))
         ) : (
           <Container style={{ padding: spacing.sm }}>
-            <Text size="sm" color="secondaryText">
+            <Text color="secondaryText" size="sm">
               Insufficient Funds
             </Text>
           </Container>
@@ -323,36 +323,36 @@ function TokenBalanceRow(props: {
   return (
     <StyledButton
       onClick={() => onClick(tokenBalance.token, wallet)}
-      variant="secondary"
       style={{
         ...style,
         display: "flex",
         justifyContent: "space-between",
         minWidth: 0, // Needed for text truncation to work
       }}
+      variant="secondary"
     >
       <Container
-        flex="row"
         center="y"
+        flex="row"
         gap="sm"
         style={{
           flex: "1 1 50%",
-          minWidth: 0,
+          flexWrap: "nowrap",
           maxWidth: "50%",
+          minWidth: 0,
           overflow: "hidden",
-          flexWrap: "nowrap",
         }}
       >
         <TokenIcon
-          token={tokenBalance.token}
           chain={tokenBalance.chain}
-          size="md"
           client={client}
+          size="md"
+          token={tokenBalance.token}
         />
         <Container flex="column" gap="4xs" style={{ minWidth: 0 }}>
           <Text
-            size="xs"
             color="primaryText"
+            size="xs"
             style={{
               overflow: "hidden",
               textOverflow: "ellipsis",
@@ -377,21 +377,21 @@ function TokenBalanceRow(props: {
       </Container>
 
       <Container
-        flex="row"
         center="y"
-        gap="4xs"
         color="secondaryText"
+        flex="row"
+        gap="4xs"
         style={{
           flex: "1 1 50%",
+          flexWrap: "nowrap",
+          justifyContent: "flex-end",
           maxWidth: "50%",
           minWidth: 0,
-          justifyContent: "flex-end",
-          flexWrap: "nowrap",
         }}
       >
         <Container
-          flex="column"
           color="secondaryText"
+          flex="column"
           gap="4xs"
           style={{
             alignItems: "flex-end",
@@ -400,8 +400,8 @@ function TokenBalanceRow(props: {
           }}
         >
           <Text
-            size="xs"
             color="primaryText"
+            size="xs"
             style={{
               overflow: "hidden",
               textOverflow: "ellipsis",
@@ -411,17 +411,17 @@ function TokenBalanceRow(props: {
             {formatTokenBalance(tokenBalance.balance, true, 2)}
           </Text>
           <FiatValue
-            tokenAmount={tokenBalance.balance.displayValue}
-            token={tokenBalance.token}
             chain={tokenBalance.chain}
             client={client}
             size="xs"
+            token={tokenBalance.token}
+            tokenAmount={tokenBalance.balance.displayValue}
           />
         </Container>
         <ChevronRightIcon
-          width={iconSize.md}
           height={iconSize.md}
           style={{ flexShrink: 0 }}
+          width={iconSize.md}
         />
       </Container>
     </StyledButton>
@@ -431,17 +431,17 @@ function TokenBalanceRow(props: {
 const StyledButton = /* @__PURE__ */ styled(Button)((props) => {
   const theme = useCustomTheme();
   return {
-    background: "transparent",
-    justifyContent: "space-between",
-    flexWrap: "nowrap",
-    flexDirection: "row",
-    padding: spacing.sm,
-    paddingRight: spacing.xs,
-    gap: spacing.sm,
     "&:hover": {
       background: theme.colors.secondaryButtonBg,
       transform: "scale(1.01)",
     },
+    background: "transparent",
+    flexDirection: "row",
+    flexWrap: "nowrap",
+    gap: spacing.sm,
+    justifyContent: "space-between",
+    padding: spacing.sm,
+    paddingRight: spacing.xs,
     transition: "background 200ms ease, transform 150ms ease",
     ...props.style,
   };
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx
index e90cb641fdf..6fee5b8fa07 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx
@@ -24,12 +24,12 @@ import type { Address } from "../../../../../../../utils/address.js";
 import { toWei } from "../../../../../../../utils/units.js";
 import { iconSize } from "../../../../../../core/design-system/index.js";
 import type { PayUIOptions } from "../../../../../../core/hooks/connection/ConnectButtonProps.js";
+import { Container, ModalHeader } from "../../../../components/basic.js";
+import { Button } from "../../../../components/buttons.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { Spinner } from "../../../../components/Spinner.js";
 import { StepBar } from "../../../../components/StepBar.js";
 import { SwitchNetworkButton } from "../../../../components/SwitchNetwork.js";
-import { Container, ModalHeader } from "../../../../components/basic.js";
-import { Button } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
 import { type ERC20OrNativeToken, isNativeToken } from "../../nativeToken.js";
 import { Step } from "../Stepper.js";
@@ -84,33 +84,33 @@ export function TransferConfirmationScreen(
   >({ id: "idle" });
 
   const transferQuery = useQuery({
-    queryKey: [
-      "transfer",
-      isNativeToken(token) ? NATIVE_TOKEN_ADDRESS : token.address,
-      tokenAmount,
-      receiverAddress,
-      payer.account.address,
-      payOptions?.purchaseData,
-    ],
     queryFn: async () => {
       const transferResponse = await getBuyWithCryptoTransfer({
-        client,
-        fromAddress: payer.account.address,
-        toAddress: receiverAddress,
-        chainId: chain.id,
-        tokenAddress: isNativeToken(token)
-          ? NATIVE_TOKEN_ADDRESS
-          : token.address,
         amount: tokenAmount,
-        purchaseData: payOptions?.purchaseData,
+        chainId: chain.id,
+        client,
         feePayer:
           payOptions?.mode === "direct_payment"
             ? payOptions.paymentInfo.feePayer
             : undefined,
+        fromAddress: payer.account.address,
         paymentLinkId: paymentLinkId,
+        purchaseData: payOptions?.purchaseData,
+        toAddress: receiverAddress,
+        tokenAddress: isNativeToken(token)
+          ? NATIVE_TOKEN_ADDRESS
+          : token.address,
       });
       return transferResponse;
     },
+    queryKey: [
+      "transfer",
+      isNativeToken(token) ? NATIVE_TOKEN_ADDRESS : token.address,
+      tokenAmount,
+      receiverAddress,
+      payer.account.address,
+      payOptions?.purchaseData,
+    ],
     refetchInterval: 30 * 1000,
   });
 
@@ -122,21 +122,21 @@ export function TransferConfirmationScreen(
         status.error.toLowerCase().includes("user denied")
       ) {
         return {
-          title: "Failed to Approve",
           message: "Your wallet rejected the approval request.",
+          title: "Failed to Approve",
         };
       }
       if (status.error.toLowerCase().includes("insufficient funds for gas")) {
         return {
-          title: "Insufficient Native Funds",
           message:
             "You do not have enough native funds to approve the transaction.",
+          title: "Insufficient Native Funds",
         };
       }
       return {
-        title: "Failed to Approve",
         message:
           "Your wallet failed to approve the transaction for an unknown reason. Please try again or contact support.",
+        title: "Failed to Approve",
       };
     }
 
@@ -151,21 +151,21 @@ export function TransferConfirmationScreen(
         status.error.toLowerCase().includes("user denied")
       ) {
         return {
-          title: "Failed to Confirm",
           message: "Your wallet rejected the confirmation request.",
+          title: "Failed to Confirm",
         };
       }
       if (status.error.toLowerCase().includes("insufficient funds for gas")) {
         return {
-          title: "Insufficient Native Funds",
           message:
             "You do not have enough native funds to confirm the transaction.",
+          title: "Insufficient Native Funds",
         };
       }
       return {
-        title: "Failed to Confirm",
         message:
           "Your wallet failed to confirm the transaction for an unknown reason. Please try again or contact support.",
+        title: "Failed to Confirm",
       };
     }
 
@@ -175,10 +175,10 @@ export function TransferConfirmationScreen(
   if (transferQuery.isLoading) {
     return (
       <Container p="lg">
-        <ModalHeader title={title} onBack={onBack} />
-        <Container flex="column" center="both" style={{ minHeight: "300px" }}>
+        <ModalHeader onBack={onBack} title={title} />
+        <Container center="both" flex="column" style={{ minHeight: "300px" }}>
           <Spacer y="xl" />
-          <Spinner size="xl" color="secondaryText" />
+          <Spinner color="secondaryText" size="xl" />
           <Spacer y="xl" />
         </Container>
       </Container>
@@ -190,12 +190,12 @@ export function TransferConfirmationScreen(
 
   return (
     <Container p="lg">
-      <ModalHeader title={title} onBack={onBack} />
+      <ModalHeader onBack={onBack} title={title} />
       <Spacer y="xl" />
 
       {transactionMode ? (
         <>
-          <StepBar steps={2} currentStep={step === "transfer" ? 1 : 2} />
+          <StepBar currentStep={step === "transfer" ? 1 : 2} steps={2} />
           <Spacer y="sm" />
           <Text size="sm">
             {step === "transfer"
@@ -212,15 +212,15 @@ export function TransferConfirmationScreen(
       )}
 
       <SwapSummary
-        sender={payer.account.address}
-        receiver={receiverAddress}
         client={client}
-        fromToken={token}
-        fromChain={chain}
-        toToken={token}
-        toChain={chain}
         fromAmount={transactionMode ? tokenAmount : transferFromAmountWithFees}
+        fromChain={chain}
+        fromToken={token}
+        receiver={receiverAddress}
+        sender={payer.account.address}
         toAmount={tokenAmount}
+        toChain={chain}
+        toToken={token}
       />
 
       <Spacer y="lg" />
@@ -229,24 +229,24 @@ export function TransferConfirmationScreen(
         <>
           <Spacer y="sm" />
           <Container
-            gap="sm"
+            center="y"
+            color="accentText"
             flex="row"
+            gap="sm"
             style={{
               justifyContent: "space-between",
             }}
-            center="y"
-            color="accentText"
           >
             <Step
-              isDone={step === "execute"}
               isActive={step === "transfer"}
+              isDone={step === "execute"}
               label={step === "transfer" ? "Transfer" : "Done"}
             />
             <ConnectorLine />
             <Step
+              isActive={step === "execute"}
               isDone={false}
               label="Finalize"
-              isActive={step === "execute"}
             />
           </Container>
           <Spacer y="lg" />
@@ -256,8 +256,8 @@ export function TransferConfirmationScreen(
       {uiErrorMessage && (
         <>
           <ErrorText
-            title={uiErrorMessage.title}
             message={uiErrorMessage.message}
+            title={uiErrorMessage.title}
           />
           <Spacer y="md" />
         </>
@@ -265,8 +265,8 @@ export function TransferConfirmationScreen(
 
       {!transactionMode && step === "execute" && status.id === "done" && (
         <>
-          <Container flex="row" gap="xs" center="both" color="success">
-            <CheckCircledIcon width={iconSize.sm} height={iconSize.sm} />
+          <Container center="both" color="success" flex="row" gap="xs">
+            <CheckCircledIcon height={iconSize.sm} width={iconSize.sm} />
             <Text color="success" size="sm">
               Payment completed
             </Text>
@@ -279,16 +279,16 @@ export function TransferConfirmationScreen(
       {payer.chain.id !== chain.id ? (
         <SwitchNetworkButton
           fullWidth
-          variant="accent"
           switchChain={async () => {
             await props.payer.wallet.switchChain(chain);
           }}
+          variant="accent"
         />
       ) : (
         <Button
-          variant="accent"
-          fullWidth
           disabled={status.id === "pending"}
+          fullWidth
+          gap="xs"
           onClick={async () => {
             if (step === "execute") {
               onDone();
@@ -302,19 +302,19 @@ export function TransferConfirmationScreen(
               if (transactionMode) {
                 const transaction = isNativeToken(token)
                   ? prepareTransaction({
-                      client,
                       chain,
+                      client,
                       to: receiverAddress,
                       value: toWei(tokenAmount),
                     })
                   : transfer({
+                      amount: tokenAmount,
                       contract: getContract({
                         address: token.address,
                         chain: chain,
                         client: client,
                       }),
                       to: receiverAddress,
-                      amount: tokenAmount,
                     });
                 const [txResult, tokenMetadata] = await Promise.all([
                   sendAndConfirmTransaction({
@@ -333,23 +333,23 @@ export function TransferConfirmationScreen(
                 ]);
                 trackPayEvent({
                   client: props.client,
-                  walletAddress: payer.account.address,
-                  walletType: payer.wallet.id,
+                  event: "transfer_confirmation_success_transaction_mode",
                   toChainId: chain.id,
                   toToken: isNativeToken(token) ? undefined : token.address,
-                  event: "transfer_confirmation_success_transaction_mode",
+                  walletAddress: payer.account.address,
+                  walletType: payer.wallet.id,
                 });
                 // its the last step before the transaction, so propagate onPurchaseSuccess here
                 props.onSuccess?.(
                   transferBuyWithCryptoQuote({
-                    token,
                     chain,
-                    tokenMetadata,
+                    fromAddress: payer.account.address,
+                    toAddress: receiverAddress,
+                    token,
                     tokenAmount: transactionMode
                       ? tokenAmount
                       : transferFromAmountWithFees,
-                    fromAddress: payer.account.address,
-                    toAddress: receiverAddress,
+                    tokenMetadata,
                     transaction: txResult,
                   }),
                 );
@@ -367,15 +367,15 @@ export function TransferConfirmationScreen(
                   // check allowance
                   const prevAllowance = await allowance({
                     contract: getContract({
-                      client: client,
                       address: transferResponse.approvalData.tokenAddress,
                       chain: getCachedChain(
                         transferResponse.approvalData.chainId,
                       ),
+                      client: client,
                     }),
+                    owner: payer.account.address,
                     spender: transferResponse.approvalData
                       .spenderAddress as Address,
-                    owner: payer.account.address,
                   });
 
                   if (
@@ -385,25 +385,25 @@ export function TransferConfirmationScreen(
                     setStep("approve");
                     trackPayEvent({
                       client: props.client,
-                      walletAddress: payer.account.address,
-                      walletType: payer.wallet.id,
+                      event: "prompt_transfer_approval",
                       toChainId: chain.id,
                       toToken: isNativeToken(token) ? undefined : token.address,
-                      event: "prompt_transfer_approval",
+                      walletAddress: payer.account.address,
+                      walletType: payer.wallet.id,
                     });
                     const transaction = approve({
+                      amountWei: BigInt(
+                        transferResponse.approvalData.amountWei,
+                      ),
                       contract: getContract({
-                        client: client,
                         address: transferResponse.approvalData.tokenAddress,
                         chain: getCachedChain(
                           transferResponse.approvalData.chainId,
                         ),
+                        client: client,
                       }),
                       spender: transferResponse.approvalData
                         .spenderAddress as Address,
-                      amountWei: BigInt(
-                        transferResponse.approvalData.amountWei,
-                      ),
                     });
                     // approve the transfer
                     await sendAndConfirmTransaction({
@@ -412,22 +412,22 @@ export function TransferConfirmationScreen(
                     });
                     trackPayEvent({
                       client: props.client,
-                      walletAddress: payer.account.address,
-                      walletType: payer.wallet.id,
+                      event: "transfer_approval_success",
                       toChainId: chain.id,
                       toToken: isNativeToken(token) ? undefined : token.address,
-                      event: "transfer_approval_success",
+                      walletAddress: payer.account.address,
+                      walletType: payer.wallet.id,
                     });
                   }
                 }
 
                 trackPayEvent({
                   client: props.client,
-                  walletAddress: payer.account.address,
-                  walletType: payer.wallet.id,
+                  event: "prompt_transfer_confirmation",
                   toChainId: chain.id,
                   toToken: isNativeToken(token) ? undefined : token.address,
-                  event: "prompt_transfer_confirmation",
+                  walletAddress: payer.account.address,
+                  walletType: payer.wallet.id,
                 });
 
                 setStep("transfer");
@@ -443,23 +443,23 @@ export function TransferConfirmationScreen(
 
                 trackPayEvent({
                   client: props.client,
-                  walletAddress: payer.account.address,
-                  walletType: payer.wallet.id,
+                  event: "transfer_confirmation_success",
                   toChainId: chain.id,
                   toToken: isNativeToken(token) ? undefined : token.address,
-                  event: "transfer_confirmation_success",
+                  walletAddress: payer.account.address,
+                  walletType: payer.wallet.id,
                 });
               }
               // biome-ignore lint/suspicious/noExplicitAny: catch multiple errors
             } catch (e: any) {
               console.error(e);
               setStatus({
-                id: "error",
                 error: "error" in e ? e.error?.message : e?.message,
+                id: "error",
               });
             }
           }}
-          gap="xs"
+          variant="accent"
         >
           {step === "execute" && (status.id === "done" ? "Done" : "Continue")}
           {step === "transfer" &&
@@ -467,7 +467,7 @@ export function TransferConfirmationScreen(
           {step === "approve" &&
             (status.id === "pending" ? "Approving" : "Approve")}
           {status.id === "pending" && (
-            <Spinner size="sm" color="accentButtonText" />
+            <Spinner color="accentButtonText" size="sm" />
           )}
         </Button>
       )}
@@ -494,65 +494,65 @@ function transferBuyWithCryptoQuote(args: {
     transaction,
   } = args;
   return {
-    status: "COMPLETED",
-    subStatus: "SUCCESS",
-    swapType: "TRANSFER",
+    fromAddress,
     quote: {
       createdAt: new Date().toISOString(),
+      estimated: {
+        durationSeconds: 0,
+        feesUSDCents: 0,
+        fromAmountUSDCents: 0,
+        gasCostUSDCents: 0,
+        slippageBPS: 0,
+        toAmountMinUSDCents: 0,
+        toAmountUSDCents: 0,
+      },
+      fromAmount: tokenAmount,
+      fromAmountWei: toWei(tokenAmount).toString(),
       fromToken: {
         chainId: chain.id,
-        tokenAddress: isNativeToken(token)
-          ? NATIVE_TOKEN_ADDRESS
-          : token.address,
         decimals: tokenMetadata.decimals,
-        symbol: tokenMetadata.symbol,
         name: tokenMetadata.name,
         priceUSDCents: 0,
-      },
-      toToken: {
-        chainId: chain.id,
+        symbol: tokenMetadata.symbol,
         tokenAddress: isNativeToken(token)
           ? NATIVE_TOKEN_ADDRESS
           : token.address,
-        decimals: tokenMetadata.decimals,
-        symbol: tokenMetadata.symbol,
-        name: tokenMetadata.name,
-        priceUSDCents: 0,
       },
-      fromAmountWei: toWei(tokenAmount).toString(),
-      fromAmount: tokenAmount,
-      toAmountWei: toWei(tokenAmount).toString(),
       toAmount: tokenAmount,
       toAmountMin: tokenAmount,
       toAmountMinWei: toWei(tokenAmount).toString(),
-      estimated: {
-        feesUSDCents: 0,
-        gasCostUSDCents: 0,
-        slippageBPS: 0,
-        toAmountMinUSDCents: 0,
-        toAmountUSDCents: 0,
-        fromAmountUSDCents: 0,
-        durationSeconds: 0,
+      toAmountWei: toWei(tokenAmount).toString(),
+      toToken: {
+        chainId: chain.id,
+        decimals: tokenMetadata.decimals,
+        name: tokenMetadata.name,
+        priceUSDCents: 0,
+        symbol: tokenMetadata.symbol,
+        tokenAddress: isNativeToken(token)
+          ? NATIVE_TOKEN_ADDRESS
+          : token.address,
       },
     },
-    fromAddress,
-    toAddress,
     source: {
-      transactionHash: transaction.transactionHash,
       amount: tokenAmount,
-      amountWei: toWei(tokenAmount).toString(),
       amountUSDCents: 0,
+      amountWei: toWei(tokenAmount).toString(),
       completedAt: new Date().toISOString(),
       token: {
         chainId: chain.id,
-        tokenAddress: isNativeToken(token)
-          ? NATIVE_TOKEN_ADDRESS
-          : token.address,
         decimals: tokenMetadata.decimals,
-        symbol: tokenMetadata.symbol,
         name: tokenMetadata.name,
         priceUSDCents: 0,
+        symbol: tokenMetadata.symbol,
+        tokenAddress: isNativeToken(token)
+          ? NATIVE_TOKEN_ADDRESS
+          : token.address,
       },
+      transactionHash: transaction.transactionHash,
     },
+    status: "COMPLETED",
+    subStatus: "SUCCESS",
+    swapType: "TRANSFER",
+    toAddress,
   };
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferFlow.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferFlow.tsx
index ba70459892f..54a4cb3f01b 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferFlow.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferFlow.tsx
@@ -32,17 +32,17 @@ export function TransferFlow(props: TransferFlowProps) {
   if (transferTxHash) {
     return (
       <SwapStatusScreen
-        title={props.title}
+        client={props.client}
+        fromChain={props.chain}
+        isEmbed={props.isEmbed}
         onBack={props.onBack}
+        onDone={props.onDone}
+        onSuccess={props.onSuccess}
         onTryAgain={props.onTryAgain}
+        quote={undefined}
         swapTxHash={transferTxHash}
-        fromChain={props.chain}
-        client={props.client}
-        onDone={props.onDone}
+        title={props.title}
         transactionMode={false}
-        isEmbed={props.isEmbed}
-        quote={undefined}
-        onSuccess={props.onSuccess}
       />
     );
   }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.tsx
index f015ef35586..8c5a8a16245 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.tsx
@@ -12,10 +12,10 @@ import {
   useWalletInfo,
 } from "../../../../../../core/utils/wallet.js";
 import { useProfiles } from "../../../../../hooks/wallets/useProfiles.js";
-import { Skeleton } from "../../../../components/Skeleton.js";
-import { WalletImage } from "../../../../components/WalletImage.js";
 import { Container } from "../../../../components/basic.js";
+import { Skeleton } from "../../../../components/Skeleton.js";
 import { Text } from "../../../../components/text.js";
+import { WalletImage } from "../../../../components/WalletImage.js";
 import { OutlineWalletIcon } from "../../../icons/OutlineWalletIcon.js";
 
 export function WalletRow(props: {
@@ -40,41 +40,41 @@ export function WalletRow(props: {
       : undefined;
   const walletInfo = useWalletInfo(wallet?.id);
   const ensNameQuery = useEnsName({
-    client,
     address,
+    client,
   });
   const addressOrENS = address
     ? ensNameQuery.data || shortenAddress(address)
     : "";
   return (
     <Container flex="row" style={{ justifyContent: "space-between" }}>
-      <Container flex="row" center="y" gap="md" color="secondaryText">
+      <Container center="y" color="secondaryText" flex="row" gap="md">
         {wallet ? (
           <WalletImage
+            client={props.client}
             id={wallet.id}
             size={iconSize[props.iconSize || "md"]}
-            client={props.client}
           />
         ) : (
           <OutlineWalletIcon size={iconSize[props.iconSize || "md"]} />
         )}
         <Container flex="column" gap="3xs">
           {props.label ? (
-            <Text size="xs" color="secondaryText">
+            <Text color="secondaryText" size="xs">
               {props.label}
             </Text>
           ) : null}
           <Text
-            size={props.textSize || "xs"}
             color="primaryText"
-            style={{ fontWeight: 600, fontFamily: "monospace" }}
+            size={props.textSize || "xs"}
+            style={{ fontFamily: "monospace", fontWeight: 600 }}
           >
             {addressOrENS || shortenAddress(props.address)}
           </Text>
           {profile.isLoading ? (
-            <Skeleton width="100px" height={fontSize.sm} />
+            <Skeleton height={fontSize.sm} width="100px" />
           ) : email || walletInfo?.data?.name ? (
-            <Text size="xs" color="secondaryText">
+            <Text color="secondaryText" size="xs">
               {email || walletInfo?.data?.name}
             </Text>
           ) : null}
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.tsx
index 2e10c3d2dcf..2e1931eac9c 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.tsx
@@ -64,33 +64,24 @@ export function useWalletsAndBalances(props: {
   const chainInfo = useChainMetadata(props.toChain);
 
   return useQuery({
-    queryKey: [
-      "wallets-and-balances",
-      props.sourceSupportedTokens,
-      props.toChain.id,
-      props.toToken,
-      props.mode,
-      activeAccount?.address,
-      connectedWallets.map((w) => w.getAccount()?.address),
-    ],
     enabled:
       !!props.sourceSupportedTokens && !!chainInfo.data && !!activeAccount,
     queryFn: async () => {
       const entries = await Promise.all(
         connectedWallets.map(async (wallet) => {
           const balances = await fetchBalancesForWallet({
-            wallet,
             accountAddress: activeAccount?.address,
+            client: props.client,
+            mode: props.mode,
             sourceSupportedTokens: props.sourceSupportedTokens || [],
             toChain: props.toChain,
             toToken: props.toToken,
-            mode: props.mode,
-            client: props.client,
+            wallet,
           });
           return [
             {
-              id: wallet.id,
               address: wallet.getAccount()?.address || "",
+              id: wallet.id,
             } as WalletKey,
             balances,
           ] as const;
@@ -102,6 +93,15 @@ export function useWalletsAndBalances(props: {
       }
       return map;
     },
+    queryKey: [
+      "wallets-and-balances",
+      props.sourceSupportedTokens,
+      props.toChain.id,
+      props.toToken,
+      props.mode,
+      activeAccount?.address,
+      connectedWallets.map((w) => w.getAccount()?.address),
+    ],
   });
 }
 
@@ -147,9 +147,9 @@ async function fetchBalancesForWallet({
 
       while (true) {
         const batch = await getOwnedTokens({
-          ownerAddress: account.address,
           chains: chunk,
           client,
+          ownerAddress: account.address,
           queryOptions: {
             limit,
             page,
@@ -186,9 +186,9 @@ async function fetchBalancesForWallet({
   const destinationToken = isNativeToken(toToken)
     ? {
         address: NATIVE_TOKEN_ADDRESS,
+        icon: toChain.icon?.url,
         name: toChain.nativeCurrency?.name || "",
         symbol: toChain.nativeCurrency?.symbol || "",
-        icon: toChain.icon?.url,
       }
     : toToken;
 
@@ -228,8 +228,8 @@ async function fetchBalancesForWallet({
             const balance = await getWalletBalance({
               address: account.address,
               chain,
-              tokenAddress: isNative ? undefined : token.address,
               client,
+              tokenAddress: isNative ? undefined : token.address,
             });
 
             const include =
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/useSwapSupportedChains.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/useSwapSupportedChains.ts
index 2f61f5e6416..4b8fdd1ba65 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/useSwapSupportedChains.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/useSwapSupportedChains.ts
@@ -32,11 +32,11 @@ async function fetchBuySupportedDestinations({
     async () => {
       const routes = await Bridge.routes({
         client,
+        limit: 1_000_000,
+        maxSteps: 1,
         originChainId,
         originTokenAddress,
-        maxSteps: 1,
         sortBy: "popularity",
-        limit: 1_000_000,
       });
       const tokens = new Set<string>();
       const chains = new Set<number>();
@@ -71,9 +71,9 @@ async function fetchBuySupportedDestinations({
               // We support both options for all tokens
               buyWithCryptoEnabled: true,
               buyWithFiatEnabled: true,
+              icon: route.destinationToken.iconUri,
               name: route.destinationToken.name,
               symbol: route.destinationToken.symbol,
-              icon: route.destinationToken.iconUri,
             },
           ];
         }
@@ -99,10 +99,10 @@ export function useBuySupportedDestinations(
   _isTestMode?: boolean,
 ) {
   return useQuery({
-    queryKey: ["destination-tokens", client],
     queryFn: async () => {
       return fetchBuySupportedDestinations({ client });
     },
+    queryKey: ["destination-tokens", client],
   });
 }
 
@@ -112,15 +112,14 @@ export function useBuySupportedSources(options: {
   destinationTokenAddress: string;
 }) {
   return useQuery({
-    queryKey: ["source-tokens", options],
     queryFn: async () => {
       const routes = await Bridge.routes({
         client: options.client,
         destinationChainId: options.destinationChainId,
         destinationTokenAddress: options.destinationTokenAddress,
+        limit: 50,
         maxSteps: 1,
         sortBy: "popularity",
-        limit: 50,
       });
 
       const tokens = new Set<string>();
@@ -156,9 +155,9 @@ export function useBuySupportedSources(options: {
               // We support both options for all tokens
               buyWithCryptoEnabled: true,
               buyWithFiatEnabled: true,
+              icon: route.originToken.iconUri,
               name: route.originToken.name,
               symbol: route.originToken.symbol,
-              icon: route.originToken.iconUri,
             },
           ];
         }
@@ -169,5 +168,6 @@ export function useBuySupportedSources(options: {
         tokens: originTokens[chainId] || [],
       }));
     },
+    queryKey: ["source-tokens", options],
   });
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/types.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/types.ts
index f4d64d81e17..b0979d31a0b 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/types.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/types.ts
@@ -1,6 +1,8 @@
 import type { Chain } from "../../../../../../chains/types.js";
-import type { Wallet } from "../../../../../../wallets/interfaces/wallet.js";
-import type { Account } from "../../../../../../wallets/interfaces/wallet.js";
+import type {
+  Account,
+  Wallet,
+} from "../../../../../../wallets/interfaces/wallet.js";
 
 export type PayerInfo = {
   wallet: Wallet;
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Details/WalletManagerScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Details/WalletManagerScreen.tsx
index 512e7a137cd..7eda04bff6a 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Details/WalletManagerScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Details/WalletManagerScreen.tsx
@@ -18,19 +18,19 @@ import { useActiveWallet } from "../../../../../core/hooks/wallets/useActiveWall
 import { useConnectedWallets } from "../../../../../core/hooks/wallets/useConnectedWallets.js";
 import { useDisconnect } from "../../../../../core/hooks/wallets/useDisconnect.js";
 import { useSetActiveWallet } from "../../../../../core/hooks/wallets/useSetActiveWallet.js";
+import { Container, Line, ModalHeader } from "../../../components/basic.js";
+import { Button, IconButton } from "../../../components/buttons.js";
 import { Skeleton } from "../../../components/Skeleton.js";
 import { Spacer } from "../../../components/Spacer.js";
 import { ToolTip } from "../../../components/Tooltip.js";
-import { WalletImage } from "../../../components/WalletImage.js";
-import { Container, Line, ModalHeader } from "../../../components/basic.js";
-import { Button, IconButton } from "../../../components/buttons.js";
 import { Text } from "../../../components/text.js";
+import { WalletImage } from "../../../components/WalletImage.js";
 import { WalletButtonEl } from "../../WalletEntryButton.js";
+import { formatTokenBalance } from "../formatTokenBalance.js";
 import {
   WalletSwitcherConnectionScreen,
   type WalletSwitcherConnectionScreenProps,
 } from "../WalletSwitcherConnectionScreen.js";
-import { formatTokenBalance } from "../formatTokenBalance.js";
 
 export function WalletManagerScreen(
   props: Omit<
@@ -67,7 +67,7 @@ export function WalletManagerScreen(
   return (
     <Container>
       <Container p="lg">
-        <ModalHeader title="Wallets" onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title="Wallets" />
       </Container>
 
       <Line />
@@ -85,14 +85,14 @@ export function WalletManagerScreen(
             .map((w) => {
               return (
                 <WalletManangerButton
-                  key={w.id}
+                  chain={props.activeChain}
                   client={props.client}
                   // address={address || ""}
+                  key={w.id}
                   onClick={() => {
                     setActive(w);
                     props.onBack();
                   }}
-                  chain={props.activeChain}
                   wallet={w}
                 />
               );
@@ -105,14 +105,14 @@ export function WalletManagerScreen(
       <Container p="lg">
         {!hideConnectButton && (
           <Button
-            variant="accent"
             fullWidth
+            gap="xs"
             onClick={() => {
               setScreen("connect");
             }}
-            gap="xs"
+            variant="accent"
           >
-            <PlusIcon width={iconSize.sm} height={iconSize.sm} />
+            <PlusIcon height={iconSize.sm} width={iconSize.sm} />
             Connect Wallet
           </Button>
         )}
@@ -150,17 +150,17 @@ function WalletManangerButton(props: {
           justifyContent: "space-between",
         }}
       >
-        <Container flex="row" gap="md" center="y">
+        <Container center="y" flex="row" gap="md">
           <WalletImage client={props.client} id={walletId} size={iconSize.lg} />
 
           <Container flex="column" gap="4xs">
             <Text color="primaryText">{shortenAddress(address || "")}</Text>
             {balanceQuery.data ? (
-              <Text size="xs" color="secondaryText" weight={400}>
+              <Text color="secondaryText" size="xs" weight={400}>
                 {formatTokenBalance(balanceQuery.data)}
               </Text>
             ) : (
-              <Skeleton width="100px" height={fontSize.sm} />
+              <Skeleton height={fontSize.sm} width="100px" />
             )}
           </Container>
         </Container>
@@ -169,16 +169,16 @@ function WalletManangerButton(props: {
       <div
         style={{
           position: "absolute",
-          zIndex: 1,
           right: spacing.xxs,
           top: "50%",
           transform: "translateY(-50%)",
+          zIndex: 1,
         }}
       >
         {activeWallet?.id === props.wallet.id ? (
           <ToolTip tip="Active Wallet">
             <IconButton>
-              <CheckIcon width={iconSize.md} height={iconSize.md} />
+              <CheckIcon height={iconSize.md} width={iconSize.md} />
             </IconButton>
           </ToolTip>
         ) : (
@@ -189,11 +189,11 @@ function WalletManangerButton(props: {
               }}
             >
               <MinusIcon
-                width={iconSize.md}
                 height={iconSize.md}
                 style={{
                   color: theme.colors.secondaryText,
                 }}
+                width={iconSize.md}
               />
             </IconButton>
           </ToolTip>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkProfileScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkProfileScreen.tsx
index caed3ecfb32..0b28690045b 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkProfileScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkProfileScreen.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { CrossCircledIcon } from "@radix-ui/react-icons";
 import { useQueryClient } from "@tanstack/react-query";
-import { Suspense, lazy } from "react";
+import { lazy, Suspense } from "react";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { isEcosystemWallet } from "../../../../../wallets/ecosystem/is-ecosystem-wallet.js";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
@@ -44,24 +44,24 @@ export function LinkProfileScreen(props: {
     return (
       <Suspense fallback={<LoadingScreen />}>
         <InAppWalletConnectUI
-          walletConnect={props.walletConnect}
-          wallet={wallet as Wallet<"inApp">}
+          chain={chain}
+          client={props.client}
+          connectLocale={props.locale}
           done={() => {
             setTimeout(() => {
               queryClient.invalidateQueries({ queryKey: ["profiles"] });
             }, 500);
             props.onBack();
           }}
-          connectLocale={props.locale}
-          client={props.client}
-          size="compact"
-          chain={chain}
+          goBack={props.onBack}
+          isLinking={true}
           meta={{
-            title: props.locale.manageWallet.linkProfile,
             showThirdwebBranding: false,
+            title: props.locale.manageWallet.linkProfile,
           }}
-          isLinking={true}
-          goBack={props.onBack}
+          size="compact"
+          wallet={wallet as Wallet<"inApp">}
+          walletConnect={props.walletConnect}
         />
       </Suspense>
     );
@@ -71,24 +71,24 @@ export function LinkProfileScreen(props: {
     return (
       <Suspense fallback={<LoadingScreen />}>
         <EcosystemWalletConnectUI
-          wallet={wallet as Wallet<EcosystemWalletId>}
+          chain={chain}
+          client={props.client}
+          connectLocale={props.locale}
           done={() => {
             setTimeout(() => {
               queryClient.invalidateQueries({ queryKey: ["profiles"] });
             }, 500);
             props.onBack();
           }}
-          connectLocale={props.locale}
-          client={props.client}
-          size="compact"
-          chain={chain}
+          goBack={props.onBack}
+          isLinking={true}
           meta={{
-            title: props.locale.manageWallet.linkProfile,
             showThirdwebBranding: false,
+            title: props.locale.manageWallet.linkProfile,
           }}
+          size="compact"
+          wallet={wallet as Wallet<EcosystemWalletId>}
           walletConnect={props.walletConnect}
-          isLinking={true}
-          goBack={props.onBack}
         />
       </Suspense>
     );
@@ -102,23 +102,23 @@ export function LinkProfileScreen(props: {
     >
       <Container p="lg">
         <ModalHeader
-          title={props.locale.manageWallet.linkProfile}
           onBack={props.onBack}
+          title={props.locale.manageWallet.linkProfile}
         />
       </Container>
       <Line />
       <Container
+        center="both"
+        color="secondaryText"
         flex="column"
         gap="md"
-        center="both"
         px="xl"
-        color="secondaryText"
         style={{
           flex: "1",
           minHeight: "250px",
         }}
       >
-        <CrossCircledIcon width={iconSize.xl} height={iconSize.xl} />
+        <CrossCircledIcon height={iconSize.xl} width={iconSize.xl} />
         <Text center>This wallet does not support account linking</Text>
       </Container>
     </Container>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.test.tsx
index bbb62df1dd3..d62053b8fe2 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.test.tsx
@@ -18,8 +18,7 @@ describe("LinkedProfilesScreen", () => {
   };
 
   const mockProps = {
-    onBack: vi.fn(),
-    setScreen: vi.fn(),
+    client: mockClient,
     locale: {
       manageWallet: {
         linkedProfiles: "Linked Profiles",
@@ -27,7 +26,8 @@ describe("LinkedProfilesScreen", () => {
       },
       // biome-ignore lint/suspicious/noExplicitAny: Mocking data
     } as any,
-    client: mockClient,
+    onBack: vi.fn(),
+    setScreen: vi.fn(),
   };
 
   beforeEach(() => {
@@ -41,7 +41,7 @@ describe("LinkedProfilesScreen", () => {
   describe("getProfileDisplayName", () => {
     it("should display email for email profile type", () => {
       vi.mocked(useProfiles).mockReturnValue({
-        data: [{ type: "email", details: { email: "test@example.com" } }],
+        data: [{ details: { email: "test@example.com" }, type: "email" }],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
       } as any);
@@ -52,7 +52,7 @@ describe("LinkedProfilesScreen", () => {
 
     it("should display email for google profile type", () => {
       vi.mocked(useProfiles).mockReturnValue({
-        data: [{ type: "google", details: { email: "google@example.com" } }],
+        data: [{ details: { email: "google@example.com" }, type: "google" }],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
       } as any);
@@ -63,7 +63,7 @@ describe("LinkedProfilesScreen", () => {
 
     it("should display phone number for phone profile type", () => {
       vi.mocked(useProfiles).mockReturnValue({
-        data: [{ type: "phone", details: { phone: "+1234567890" } }],
+        data: [{ details: { phone: "+1234567890" }, type: "phone" }],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
       } as any);
@@ -76,8 +76,8 @@ describe("LinkedProfilesScreen", () => {
       vi.mocked(useProfiles).mockReturnValue({
         data: [
           {
-            type: "wallet",
             details: { address: "0x1234567890abcdef1234567890abcdef12345678" },
+            type: "wallet",
           },
         ],
         isLoading: false,
@@ -90,7 +90,7 @@ describe("LinkedProfilesScreen", () => {
 
     it("should display email for cognito profile type", () => {
       vi.mocked(useProfiles).mockReturnValue({
-        data: [{ type: "cognito", details: { email: "cognito@example.com" } }],
+        data: [{ details: { email: "cognito@example.com" }, type: "cognito" }],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
       } as any);
@@ -101,7 +101,7 @@ describe("LinkedProfilesScreen", () => {
 
     it("should capitalize unknown profile types", () => {
       vi.mocked(useProfiles).mockReturnValue({
-        data: [{ type: "unknown", details: {} }],
+        data: [{ details: {}, type: "unknown" }],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
       } as any);
@@ -112,7 +112,7 @@ describe("LinkedProfilesScreen", () => {
 
     it("should not display guest profiles", () => {
       vi.mocked(useProfiles).mockReturnValue({
-        data: [{ type: "guest", details: {} }],
+        data: [{ details: {}, type: "guest" }],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
       } as any);
@@ -124,8 +124,8 @@ describe("LinkedProfilesScreen", () => {
     it("should render unlink button when there are multiple profiles", () => {
       vi.mocked(useProfiles).mockReturnValue({
         data: [
-          { type: "email", details: { email: "test@example.com" } },
-          { type: "google", details: { email: "google@example.com" } },
+          { details: { email: "test@example.com" }, type: "email" },
+          { details: { email: "google@example.com" }, type: "google" },
         ],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
@@ -137,7 +137,7 @@ describe("LinkedProfilesScreen", () => {
 
     it("should not render unlink button when there is only one profile", () => {
       vi.mocked(useProfiles).mockReturnValue({
-        data: [{ type: "email", details: { email: "test@example.com" } }],
+        data: [{ details: { email: "test@example.com" }, type: "email" }],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
       } as any);
@@ -148,7 +148,7 @@ describe("LinkedProfilesScreen", () => {
 
     it("should not display custom_jwt profiles", () => {
       vi.mocked(useProfiles).mockReturnValue({
-        data: [{ type: "custom_jwt", details: {} }],
+        data: [{ details: {}, type: "custom_jwt" }],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
       } as any);
@@ -160,9 +160,9 @@ describe("LinkedProfilesScreen", () => {
     it("should display profiles that are not guest or custom_jwt", () => {
       vi.mocked(useProfiles).mockReturnValue({
         data: [
-          { type: "email", details: { email: "test@example.com" } },
-          { type: "custom_jwt", details: {} },
-          { type: "guest", details: {} },
+          { details: { email: "test@example.com" }, type: "email" },
+          { details: {}, type: "custom_jwt" },
+          { details: {}, type: "guest" },
         ],
         isLoading: false,
         // biome-ignore lint/suspicious/noExplicitAny: Mocking data
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.tsx
index e90ef00ca3f..b2b1eaf0e3d 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.tsx
@@ -9,18 +9,18 @@ import { useSocialProfiles } from "../../../../core/social/useSocialProfiles.js"
 import { getSocialIcon } from "../../../../core/utils/walletIcon.js";
 import { useProfiles } from "../../../hooks/wallets/useProfiles.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
-import { Img } from "../../components/Img.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { IconButton } from "../../components/buttons.js";
+import { Img } from "../../components/Img.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 import { Blobbie } from "../Blobbie.js";
-import { MenuButton } from "../MenuButton.js";
 import { AddUserIcon } from "../icons/AddUserIcon.js";
 import { EmailIcon } from "../icons/EmailIcon.js";
 import { FingerPrintIcon } from "../icons/FingerPrintIcon.js";
 import { PhoneIcon } from "../icons/PhoneIcon.js";
 import type { ConnectLocale } from "../locale/types.js";
+import { MenuButton } from "../MenuButton.js";
 import type { WalletDetailsModalScreen } from "./types.js";
 
 function getProfileDisplayName(profile: Profile) {
@@ -68,8 +68,8 @@ export function LinkedProfilesScreen(props: {
     >
       <Container p="lg">
         <ModalHeader
-          title={props.locale.manageWallet.linkedProfiles}
           onBack={props.onBack}
+          title={props.locale.manageWallet.linkedProfiles}
         />
       </Container>
       <Line />
@@ -106,10 +106,10 @@ export function LinkedProfilesScreen(props: {
             )
             .map((profile) => (
               <LinkedProfile
-                key={`${JSON.stringify(profile)}`}
+                client={props.client}
                 enableUnlinking={connectedProfiles.length > 1}
+                key={`${JSON.stringify(profile)}`}
                 profile={profile}
-                client={props.client}
               />
             ))}
         </Container>
@@ -129,38 +129,38 @@ function LinkedProfile({
   client: ThirdwebClient;
 }) {
   const { data: socialProfiles } = useSocialProfiles({
-    client,
     address: profile.details.address,
+    client,
   });
   const { mutate: unlinkProfileMutation, isPending } = useUnlinkProfile();
 
   return (
     <MenuButton
+      as={"div"}
+      disabled
       style={{
-        fontSize: fontSize.sm,
         cursor: "default",
-      }}
-      as={"div"}
-      disabled // disabled until we have more data to show on a dedicated profile screen
+        fontSize: fontSize.sm,
+      }} // disabled until we have more data to show on a dedicated profile screen
     >
       {socialProfiles?.some((p) => p.avatar) ? (
         <Img
-          src={socialProfiles?.find((p) => p.avatar)?.avatar}
-          width={iconSize.lg}
+          client={client}
           height={iconSize.lg}
           loading="eager"
-          client={client}
+          src={socialProfiles?.find((p) => p.avatar)?.avatar}
           style={{
             borderRadius: "100%",
           }}
+          width={iconSize.lg}
         />
       ) : profile.details.address !== undefined ? (
         <Container
           style={{
-            width: "32px",
-            height: "32px",
             borderRadius: "100%",
+            height: "32px",
             overflow: "hidden",
+            width: "32px",
           }}
         >
           <Blobbie address={profile.details.address} size={32} />
@@ -173,20 +173,20 @@ function LinkedProfile({
         <PhoneIcon size={iconSize.lg} />
       ) : (
         <Img
-          src={getSocialIcon(profile.type)}
-          width={iconSize.lg}
+          client={client}
           height={iconSize.lg}
           loading="eager"
-          client={client}
+          src={getSocialIcon(profile.type)}
+          width={iconSize.lg}
         />
       )}
       <div
         style={{
+          alignItems: "center",
           display: "flex",
           flexDirection: "row",
-          justifyContent: "space-between",
-          alignItems: "center",
           flexGrow: 1,
+          justifyContent: "space-between",
         }}
       >
         <Text color="primaryText">
@@ -195,9 +195,9 @@ function LinkedProfile({
         </Text>
         <div
           style={{
+            alignItems: "center",
             display: "flex",
             flexDirection: "row",
-            alignItems: "center",
             gap: "8px",
           }}
         >
@@ -209,9 +209,9 @@ function LinkedProfile({
             )}
           {enableUnlinking && (
             <IconButton
-              autoFocus
-              type="button"
               aria-label="Unlink"
+              autoFocus
+              disabled={isPending}
               onClick={() =>
                 unlinkProfileMutation({
                   client,
@@ -221,14 +221,14 @@ function LinkedProfile({
               style={{
                 pointerEvents: "auto",
               }}
-              disabled={isPending}
+              type="button"
             >
               <Cross2Icon
-                width={iconSize.md}
                 height={iconSize.md}
                 style={{
                   color: "inherit",
                 }}
+                width={iconSize.md}
               />
             </IconButton>
           )}
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.test.tsx
index 4c1e6d8cc28..6a46861f778 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.test.tsx
@@ -10,11 +10,11 @@ vi.mock("../../../../core/hooks/wallets/useAdminWallet");
 
 describe("ManageWalletScreen", () => {
   const mockProps = {
-    onBack: vi.fn(),
-    setScreen: vi.fn(),
+    client: TEST_CLIENT,
     closeModal: vi.fn(),
     locale: en,
-    client: TEST_CLIENT,
+    onBack: vi.fn(),
+    setScreen: vi.fn(),
   };
 
   beforeEach(() => {
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx
index 240f120c567..75af4f1743c 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx
@@ -7,14 +7,14 @@ import { fontSize, iconSize } from "../../../../core/design-system/index.js";
 import type { ConnectButton_detailsModalOptions } from "../../../../core/hooks/connection/ConnectButtonProps.js";
 import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
 import { useAdminWallet } from "../../../../core/hooks/wallets/useAdminWallet.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../components/basic.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
-import { MenuButton } from "../MenuButton.js";
 import { KeyIcon } from "../icons/KeyIcon.js";
 import { MultiUserIcon } from "../icons/MultiUserIcon.js";
 import { WalletConnectIcon } from "../icons/WalletConnectIcon.js";
 import type { ConnectLocale } from "../locale/types.js";
+import { MenuButton } from "../MenuButton.js";
 import type { WalletDetailsModalScreen } from "./types.js";
 
 /**
@@ -40,8 +40,8 @@ export function ManageWalletScreen(props: {
     >
       <Container p="lg">
         <ModalHeader
-          title={props.locale.manageWallet.title}
           onBack={props.onBack}
+          title={props.locale.manageWallet.title}
         />
       </Container>
       <Line />
@@ -53,7 +53,7 @@ export function ManageWalletScreen(props: {
         }}
       >
         <Spacer y="md" />
-        <Container style={{ position: "relative", height: "250px" }}>
+        <Container style={{ height: "250px", position: "relative" }}>
           {/* Switch Metamask Account (only shows if the active wallet is MetaMask) */}
           <SwitchMetamaskAccount
             closeModal={props.closeModal}
@@ -137,7 +137,6 @@ function SwitchMetamaskAccount(props: {
 
   return (
     <MenuButton
-      type="button"
       onClick={async () => {
         await injectedMetamaskProvider.request({
           method: "wallet_requestPermissions",
@@ -145,8 +144,9 @@ function SwitchMetamaskAccount(props: {
         });
         props.closeModal();
       }}
+      type="button"
     >
-      <ShuffleIcon width={iconSize.md} height={iconSize.md} />
+      <ShuffleIcon height={iconSize.md} width={iconSize.md} />
       <Text color="primaryText">{connectLocale.switchAccount}</Text>
     </MenuButton>
   );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/PrivateKey.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/PrivateKey.test.tsx
index 2366271cccf..524c31877d5 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/PrivateKey.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/PrivateKey.test.tsx
@@ -11,9 +11,9 @@ describe("PrivateKey screen", () => {
   it("should render the iframe", () => {
     const { container } = render(
       <PrivateKey
-        onBack={() => {}}
         client={client}
         connectLocale={en}
+        onBack={() => {}}
         theme="dark"
         wallet={createWallet("io.metamask")}
       />,
@@ -27,9 +27,9 @@ describe("PrivateKey screen", () => {
     expect(() =>
       render(
         <PrivateKey
-          onBack={() => {}}
           client={client}
           connectLocale={en}
+          onBack={() => {}}
           theme="dark"
         />,
       ),
@@ -39,9 +39,9 @@ describe("PrivateKey screen", () => {
   it("should render the modal title", () => {
     const { container } = render(
       <PrivateKey
-        onBack={() => {}}
         client={client}
         connectLocale={en}
+        onBack={() => {}}
         theme="dark"
         wallet={createWallet("io.metamask")}
       />,
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/PrivateKey.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/PrivateKey.tsx
index c9734449218..61e0957ca84 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/PrivateKey.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/PrivateKey.tsx
@@ -7,9 +7,9 @@ import { isEcosystemWallet } from "../../../../../wallets/ecosystem/is-ecosystem
 import { ClientScopedStorage } from "../../../../../wallets/in-app/core/authentication/client-scoped-storage.js";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
 import type { Theme } from "../../../../core/design-system/index.js";
+import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Spinner } from "../../components/Spinner.js";
-import { Container, Line, ModalHeader } from "../../components/basic.js";
 import type { ConnectLocale } from "../locale/types.js";
 
 /**
@@ -23,6 +23,8 @@ export function PrivateKey(props: {
   connectLocale: ConnectLocale;
 }) {
   const [isLoading, setLoading] = useState(true);
+  const baseDomain = getThirdwebBaseUrl("inAppWallet");
+
   useEffect(() => {
     const loginReady = async (e: MessageEvent<{ eventType: string }>) => {
       if (
@@ -44,19 +46,19 @@ export function PrivateKey(props: {
 
           const clientStorage = new ClientScopedStorage({
             clientId: props.client.clientId,
-            storage: webLocalStorage,
             ecosystem: isEcosystemWallet(props.wallet)
               ? {
                   id: props.wallet.id,
                   partnerId: props.wallet.getConfig()?.partnerId,
                 }
               : undefined,
+            storage: webLocalStorage,
           });
           if (iframe?.contentWindow) {
             iframe.contentWindow.postMessage(
               {
-                eventType: "initExportPrivateKey",
                 authToken: await clientStorage.getAuthCookie(),
+                eventType: "initExportPrivateKey",
               },
               e.origin,
             );
@@ -69,13 +71,12 @@ export function PrivateKey(props: {
     return () => {
       window.removeEventListener("message", loginReady);
     };
-  }, [props.wallet, props.client.clientId]);
+  }, [props.wallet, props.client.clientId, baseDomain]);
 
   if (!props.wallet) {
     throw new Error("[PrivateKey] No wallet found");
   }
 
-  const baseDomain = getThirdwebBaseUrl("inAppWallet");
   const ecosystem = isEcosystemWallet(props.wallet)
     ? { id: props.wallet.id, partnerId: props.wallet.getConfig()?.partnerId }
     : undefined;
@@ -88,8 +89,8 @@ export function PrivateKey(props: {
     >
       <Container p="lg">
         <ModalHeader
-          title={props.connectLocale.manageWallet.exportPrivateKey}
           onBack={props.onBack}
+          title={props.connectLocale.manageWallet.exportPrivateKey}
         />
       </Container>
       <Line />
@@ -101,39 +102,31 @@ export function PrivateKey(props: {
         }}
       >
         <Spacer y="md" />
-        <Container style={{ position: "relative", height: "250px" }}>
+        <Container style={{ height: "250px", position: "relative" }}>
           {isLoading ? (
             <Container
               center="both"
               flex="column"
-              style={{ position: "absolute", width: "100%", height: "100%" }}
+              style={{ height: "100%", position: "absolute", width: "100%" }}
             >
-              <Spinner size="lg" color="primaryButtonBg" />
+              <Spinner color="primaryButtonBg" size="lg" />
             </Container>
-          ) : (
-            <></>
-          )}
+          ) : null}
 
           <Container
             style={{
-              position: "absolute",
               height: "100%",
+              position: "absolute",
               width: "100%",
               zIndex: 11,
             }}
           >
             <iframe
+              allow="clipboard-read; clipboard-write"
               id={`export-wallet-${props.wallet.id}`}
-              title="Export In-App Wallet"
-              style={{
-                width: "100%",
-                height: "250px",
-                visibility: isLoading ? "hidden" : "unset",
-              }}
               onLoad={() => {
                 setLoading(false);
               }}
-              allow="clipboard-read; clipboard-write"
               src={`${baseDomain}/sdk/2022-08-12/embedded-wallet/export-private-key?clientId=${
                 props.client.clientId
               }&theme=${
@@ -141,6 +134,12 @@ export function PrivateKey(props: {
               }${ecosystem ? `&ecosystemId=${ecosystem.id}` : ""}${
                 ecosystem?.partnerId ? `&partnerId=${ecosystem.partnerId}` : ""
               }`}
+              style={{
+                height: "250px",
+                visibility: isLoading ? "hidden" : "unset",
+                width: "100%",
+              }}
+              title="Export In-App Wallet"
             />
           </Container>
         </Container>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.test.tsx
index b644e185ae8..52bd0b07fc1 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.test.tsx
@@ -9,7 +9,7 @@ const client = TEST_CLIENT;
 describe("ReceiveFunds screen", () => {
   it("should render a title with locale.title", () => {
     const { container } = render(
-      <ReceiveFunds onBack={() => {}} client={client} connectLocale={en} />,
+      <ReceiveFunds client={client} connectLocale={en} onBack={() => {}} />,
     );
     const element = container.querySelector("h2");
     expect(element).not.toBe(null);
@@ -18,7 +18,7 @@ describe("ReceiveFunds screen", () => {
 
   it("should render a span with locale.instruction", () => {
     const { container } = render(
-      <ReceiveFunds onBack={() => {}} client={client} connectLocale={en} />,
+      <ReceiveFunds client={client} connectLocale={en} onBack={() => {}} />,
     );
     const element = container.querySelector(
       "span.receive_fund_screen_instruction",
@@ -29,7 +29,7 @@ describe("ReceiveFunds screen", () => {
 
   it("should render the CopyIcon", () => {
     const { container } = render(
-      <ReceiveFunds onBack={() => {}} client={client} connectLocale={en} />,
+      <ReceiveFunds client={client} connectLocale={en} onBack={() => {}} />,
     );
     const element = container.querySelector("svg.tw-copy-icon");
     expect(element).not.toBe(null);
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.tsx
index 56f7b82cb87..7aad13133cd 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.tsx
@@ -8,12 +8,12 @@ import {
 } from "../../../../core/design-system/index.js";
 import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import { shortenString } from "../../../../core/utils/addresses.js";
+import { Container, ModalHeader } from "../../components/basic.js";
 import { CopyIcon } from "../../components/CopyIcon.js";
 import { QRCode } from "../../components/QRCode.js";
 import { Spacer } from "../../components/Spacer.js";
-import { WalletImage } from "../../components/WalletImage.js";
-import { Container, ModalHeader } from "../../components/basic.js";
 import { Text } from "../../components/text.js";
+import { WalletImage } from "../../components/WalletImage.js";
 import { StyledButton } from "../../design-system/elements.js";
 import { useClipboard } from "../../hooks/useCopyClipboard.js";
 import type { ConnectLocale } from "../locale/types.js";
@@ -36,23 +36,23 @@ export function ReceiveFunds(props: {
 
   return (
     <Container p="lg">
-      <ModalHeader title={locale.title} onBack={props.onBack} />
+      <ModalHeader onBack={props.onBack} title={locale.title} />
 
       <Spacer y="xl" />
 
-      <Container flex="row" center="x">
+      <Container center="x" flex="row">
         <QRCode
-          qrCodeUri={address}
-          size={310}
           QRIcon={
             props.walletId && (
               <WalletImage
+                client={client}
                 id={props.walletId}
                 size={iconSize.xxl}
-                client={client}
               />
             )
           }
+          qrCodeUri={address}
+          size={310}
         />
       </Container>
       <Spacer y="xl" />
@@ -62,19 +62,19 @@ export function ReceiveFunds(props: {
           {shortenString(address || "")}
         </Text>
         <CopyIcon
+          hasCopied={hasCopied}
           text={address || ""}
           tip="Copy address"
-          hasCopied={hasCopied}
         />
       </WalletAddressContainer>
 
       <Spacer y="lg" />
 
       <Text
-        multiline
-        center
         balance
+        center
         className="receive_fund_screen_instruction"
+        multiline
       >
         {locale.instruction}
       </Text>
@@ -85,18 +85,18 @@ export function ReceiveFunds(props: {
 const WalletAddressContainer = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
+    "&:hover": {
+      borderColor: theme.colors.accentText,
+    },
     all: "unset",
-    width: "100%",
+    border: `1px solid ${theme.colors.borderColor}`,
+    borderRadius: radius.md,
     boxSizing: "border-box",
     cursor: "pointer",
-    padding: spacing.md,
     display: "flex",
     justifyContent: "space-between",
-    border: `1px solid ${theme.colors.borderColor}`,
-    borderRadius: radius.md,
+    padding: spacing.md,
     transition: "border-color 200ms ease",
-    "&:hover": {
-      borderColor: theme.colors.accentText,
-    },
+    width: "100%",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.test.tsx
index b3abe942c31..b631b025ccb 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.test.tsx
@@ -20,15 +20,15 @@ describe("SendFunds screen", () => {
     vi.mocked(useActiveWalletChain).mockReturnValue(base);
     const { container } = render(
       <SendFundsForm
-        token={{ nativeToken: true }}
-        onTokenSelect={() => {}}
-        receiverAddress={TEST_ACCOUNT_A.address}
-        setReceiverAddress={() => {}}
         amount={"1"}
-        setAmount={() => {}}
-        onBack={() => {}}
         client={client}
         connectLocale={en}
+        onBack={() => {}}
+        onTokenSelect={() => {}}
+        receiverAddress={TEST_ACCOUNT_A.address}
+        setAmount={() => {}}
+        setReceiverAddress={() => {}}
+        token={{ nativeToken: true }}
       />,
     );
     const element = container.querySelector("h2");
@@ -47,15 +47,15 @@ describe("SendFunds screen", () => {
     vi.mocked(useActiveWalletChain).mockReturnValue(base);
     const { container } = render(
       <SendFundsForm
-        token={{ nativeToken: true }}
-        onTokenSelect={() => {}}
-        receiverAddress={TEST_ACCOUNT_A.address}
-        setReceiverAddress={() => {}}
         amount={"1"}
-        setAmount={() => {}}
-        onBack={() => {}}
         client={client}
         connectLocale={en}
+        onBack={() => {}}
+        onTokenSelect={() => {}}
+        receiverAddress={TEST_ACCOUNT_A.address}
+        setAmount={() => {}}
+        setReceiverAddress={() => {}}
+        token={{ nativeToken: true }}
       />,
     );
     const element = container.querySelector(
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.tsx
index b97b123f216..5ffc50d57c9 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.tsx
@@ -1,5 +1,5 @@
 import { CheckCircledIcon, CrossCircledIcon } from "@radix-ui/react-icons";
-import { useState } from "react";
+import { useId, useState } from "react";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import {
   fontSize,
@@ -11,22 +11,22 @@ import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccoun
 import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
 import { useSendToken } from "../../../../core/hooks/wallets/useSendToken.js";
 import {
-  type SupportedTokens,
   defaultTokens,
+  type SupportedTokens,
 } from "../../../../core/utils/defaultTokens.js";
+import { Container, ModalHeader } from "../../components/basic.js";
+import { Button } from "../../components/buttons.js";
+import { Input, Label } from "../../components/formElements.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Spinner } from "../../components/Spinner.js";
 import { TokenIcon } from "../../components/TokenIcon.js";
-import { Container, ModalHeader } from "../../components/basic.js";
-import { Button } from "../../components/buttons.js";
-import { Input, Label } from "../../components/formElements.js";
 import { Text } from "../../components/text.js";
 import { StyledDiv } from "../../design-system/elements.js";
 import type { ConnectLocale } from "../locale/types.js";
-import { TokenSelector } from "./TokenSelector.js";
 import { formatTokenBalance } from "./formatTokenBalance.js";
 import { type ERC20OrNativeToken, NATIVE_TOKEN } from "./nativeToken.js";
+import { TokenSelector } from "./TokenSelector.js";
 
 type TXError = Error & { data?: { message?: string } };
 
@@ -74,7 +74,9 @@ export function SendFunds(props: {
   if (screen === "tokenSelector" && chain) {
     return (
       <TokenSelector
-        tokenList={tokenList}
+        chain={chain}
+        client={client}
+        connectLocale={connectLocale}
         onBack={() => {
           setScreen("base");
         }}
@@ -82,26 +84,24 @@ export function SendFunds(props: {
           setToken(_token);
           setScreen("base");
         }}
-        chain={chain}
-        connectLocale={connectLocale}
-        client={client}
+        tokenList={tokenList}
       />
     );
   }
 
   return (
     <SendFundsForm
-      token={token}
+      amount={amount}
+      client={client}
+      connectLocale={connectLocale}
+      onBack={props.onBack}
       onTokenSelect={() => {
         setScreen("tokenSelector");
       }}
       receiverAddress={receiverAddress}
-      setReceiverAddress={setReceiverAddress}
-      amount={amount}
       setAmount={setAmount}
-      onBack={props.onBack}
-      client={client}
-      connectLocale={connectLocale}
+      setReceiverAddress={setReceiverAddress}
+      token={token}
     />
   );
 }
@@ -129,10 +129,10 @@ export function SendFundsForm(props: {
   const activeChain = useActiveWalletChain();
 
   const balanceQuery = useWalletBalance({
-    chain,
-    tokenAddress: tokenAddress,
     address: activeAccount?.address,
+    chain,
     client: props.client,
+    tokenAddress: tokenAddress,
   });
 
   const { receiverAddress, setReceiverAddress, amount, setAmount } = props;
@@ -160,32 +160,36 @@ export function SendFundsForm(props: {
     return message;
   }
 
+  const tokenId = useId();
+  const receiverId = useId();
+  const amountId = useId();
+
   if (!activeChain) {
     return null; // this should never happen
   }
 
   if (sendTokenMutation.isError) {
     return (
-      <Container p="lg" animate="fadein">
+      <Container animate="fadein" p="lg">
         <ModalHeader
-          title={locale.title}
           onBack={() => {
             sendTokenMutation.reset();
           }}
+          title={locale.title}
         />
         <Spacer y="xl" />
         <Container
-          flex="column"
-          gap="lg"
           animate="fadein"
           center="both"
+          color="danger"
+          flex="column"
+          gap="lg"
           style={{
             minHeight: "200px",
           }}
-          color="danger"
         >
-          <CrossCircledIcon width={iconSize.xl} height={iconSize.xl} />
-          <Text center multiline color="danger">
+          <CrossCircledIcon height={iconSize.xl} width={iconSize.xl} />
+          <Text center color="danger" multiline>
             {getErrorMessage(sendTokenMutation.error)}
           </Text>
         </Container>
@@ -195,24 +199,24 @@ export function SendFundsForm(props: {
 
   if (sendTokenMutation.isSuccess) {
     return (
-      <Container p="lg" animate="fadein">
+      <Container animate="fadein" p="lg">
         <ModalHeader
-          title={locale.title}
           onBack={() => {
             sendTokenMutation.reset();
           }}
+          title={locale.title}
         />
         <Container
-          flex="column"
-          gap="lg"
           animate="fadein"
           center="both"
+          color="success"
+          flex="column"
+          gap="lg"
           style={{
             minHeight: "250px",
           }}
-          color="success"
         >
-          <CheckCircledIcon width={iconSize.xl} height={iconSize.xl} />
+          <CheckCircledIcon height={iconSize.xl} width={iconSize.xl} />
           <Text color="success"> {locale.successMessage} </Text>
         </Container>
       </Container>
@@ -228,8 +232,8 @@ export function SendFundsForm(props: {
     balanceQuery?.data?.symbol;
 
   return (
-    <Container p="lg" animate="fadein">
-      <ModalHeader title={locale.title} onBack={props.onBack} />
+    <Container animate="fadein" p="lg">
+      <ModalHeader onBack={props.onBack} title={locale.title} />
       <Spacer y="xl" />
 
       <form
@@ -238,31 +242,31 @@ export function SendFundsForm(props: {
         }}
       >
         {/* Token  */}
-        <Label htmlFor="token" color="secondaryText">
+        <Label color="secondaryText" htmlFor={tokenId}>
           {locale.token}
         </Label>
         <Spacer y="sm" />
         <Button
-          id="token"
-          variant="outline"
           fullWidth
+          id={tokenId}
+          onClick={props.onTokenSelect}
           style={{
-            justifyContent: "flex-start",
             gap: spacing.sm,
+            justifyContent: "flex-start",
             padding: spacing.sm,
           }}
-          onClick={props.onTokenSelect}
+          variant="outline"
         >
           <TokenIcon
-            token={props.token}
             chain={activeChain}
-            size="lg"
             client={props.client}
+            size="lg"
+            token={props.token}
           />
 
           <Container flex="column" gap="xs">
             {tokenName ? (
-              <Text size="sm" color="primaryText">
+              <Text color="primaryText" size="sm">
                 {tokenName}
               </Text>
             ) : (
@@ -280,38 +284,38 @@ export function SendFundsForm(props: {
         <Spacer y="lg" />
 
         {/* Send to  */}
-        <Label htmlFor="receiver" color="secondaryText">
+        <Label color="secondaryText" htmlFor={receiverId}>
           {locale.sendTo}
         </Label>
         <Spacer y="sm" />
         <Input
-          required
-          id="receiver"
-          placeholder="0x... or ENS name"
-          variant="outline"
-          value={receiverAddress}
+          id={receiverId}
           onChange={(e) => {
             setReceiverAddress(e.target.value);
           }}
+          placeholder="0x... or ENS name"
+          required
+          value={receiverAddress}
+          variant="outline"
         />
 
         <Spacer y="lg" />
 
         {/* Amount  */}
-        <Label htmlFor="amount" color="secondaryText">
+        <Label color="secondaryText" htmlFor={amountId}>
           {locale.amount}
         </Label>
         <Spacer y="sm" />
         <Container relative>
           <Input
-            required
-            type="number"
-            id="amount"
-            variant="outline"
-            value={amount}
+            id={amountId}
             onChange={(e) => {
               setAmount(e.target.value);
             }}
+            required
+            type="number"
+            value={amount}
+            variant="outline"
           />
           <CurrencyBadge>
             <Text size="xs"> {tokenSymbol} </Text>
@@ -322,18 +326,16 @@ export function SendFundsForm(props: {
 
         {/* Submit */}
         <Button
-          fullWidth
-          variant="accent"
-          type="submit"
           className="tw-sendfunds-screen-send-button"
+          fullWidth
           onClick={async () => {
             if (!receiverAddress || !amount) {
               return;
             }
 
             await sendTokenMutation.mutateAsync({
-              receiverAddress,
               amount,
+              receiverAddress,
               tokenAddress: tokenAddress,
             });
           }}
@@ -342,9 +344,11 @@ export function SendFundsForm(props: {
             gap: spacing.sm,
             padding: spacing.md,
           }}
+          type="submit"
+          variant="accent"
         >
           {sendTokenMutation.isPending && (
-            <Spinner size="sm" color="accentButtonText" />
+            <Spinner color="accentButtonText" size="sm" />
           )}
           {sendTokenMutation.isPending ? locale.sending : locale.submitButton}
         </Button>
@@ -355,7 +359,7 @@ export function SendFundsForm(props: {
 
 const CurrencyBadge = /* @__PURE__ */ StyledDiv({
   position: "absolute",
+  right: spacing.sm,
   top: "50%",
   transform: "translateY(-50%)",
-  right: spacing.sm,
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SignatureScreen.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SignatureScreen.test.tsx
index b21ede963ab..d3099fac1f1 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SignatureScreen.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SignatureScreen.test.tsx
@@ -38,27 +38,27 @@ vi.mock("../../../../core/hooks/wallets/useAdminWallet", () => ({
 }));
 
 const mockConnectLocale = {
+  agreement: {
+    and: "and",
+    prefix: "By connecting, you agree to our",
+    privacyPolicy: "Privacy Policy",
+    termsOfService: "Terms of Service",
+  },
   signatureScreen: {
-    title: "Sign In",
     instructionScreen: {
-      title: "Sign Message",
+      disconnectWallet: "Disconnect",
       instruction: "Please sign the message",
       signInButton: "Sign In",
-      disconnectWallet: "Disconnect",
+      title: "Sign Message",
     },
     signingScreen: {
-      title: "Signing",
-      inProgress: "Signing in progress...",
       failedToSignIn: "Failed to sign in",
+      inProgress: "Signing in progress...",
       prompt: "Please check your wallet",
+      title: "Signing",
       tryAgain: "Try Again",
     },
-  },
-  agreement: {
-    prefix: "By connecting, you agree to our",
-    termsOfService: "Terms of Service",
-    and: "and",
-    privacyPolicy: "Privacy Policy",
+    title: "Sign In",
   },
 } as unknown as ConnectLocale;
 
@@ -74,11 +74,11 @@ describe("Signature screen", () => {
     it("renders initial state correctly", () => {
       const { getByTestId } = render(
         <SignatureScreen
-          onDone={() => {}}
-          modalSize="wide"
-          connectLocale={mockConnectLocale}
-          client={TEST_CLIENT}
           auth={mockAuth}
+          client={TEST_CLIENT}
+          connectLocale={mockConnectLocale}
+          modalSize="wide"
+          onDone={() => {}}
         />,
         { setConnectedWallet: true },
       );
@@ -91,11 +91,11 @@ describe("Signature screen", () => {
       const onDoneMock = vi.fn();
       const { getByRole, getByText } = render(
         <SignatureScreen
-          onDone={onDoneMock}
-          modalSize="wide"
-          connectLocale={mockConnectLocale}
-          client={TEST_CLIENT}
           auth={mockAuth}
+          client={TEST_CLIENT}
+          connectLocale={mockConnectLocale}
+          modalSize="wide"
+          onDone={onDoneMock}
         />,
         { setConnectedWallet: true },
       );
@@ -113,11 +113,11 @@ describe("Signature screen", () => {
       mockAuth.doLogin.mockRejectedValueOnce(new Error("Signing failed"));
       const { getByTestId, getByRole, getByText } = render(
         <SignatureScreen
-          onDone={() => {}}
-          modalSize="wide"
-          connectLocale={mockConnectLocale}
-          client={TEST_CLIENT}
           auth={mockAuth}
+          client={TEST_CLIENT}
+          connectLocale={mockConnectLocale}
+          modalSize="wide"
+          onDone={() => {}}
         />,
         { setConnectedWallet: true },
       );
@@ -147,11 +147,11 @@ describe("Signature screen", () => {
 
     const { queryByTestId } = render(
       <SignatureScreen
-        onDone={() => {}}
-        modalSize="wide"
-        connectLocale={mockConnectLocale}
-        client={TEST_CLIENT}
         auth={mockAuth}
+        client={TEST_CLIENT}
+        connectLocale={mockConnectLocale}
+        modalSize="wide"
+        onDone={() => {}}
       />,
       { setConnectedWallet: true },
     );
@@ -164,11 +164,11 @@ describe("Signature screen", () => {
       it("automatically triggers sign in on mount", async () => {
         render(
           <SignatureScreen
-            onDone={() => {}}
-            modalSize="wide"
-            connectLocale={mockConnectLocale}
-            client={TEST_CLIENT}
             auth={mockAuth}
+            client={TEST_CLIENT}
+            connectLocale={mockConnectLocale}
+            modalSize="wide"
+            onDone={() => {}}
           />,
           { setConnectedWallet: true },
         );
@@ -181,11 +181,11 @@ describe("Signature screen", () => {
       it("shows signing message during signing state", async () => {
         const { getByText } = render(
           <SignatureScreen
-            onDone={() => {}}
-            modalSize="wide"
-            connectLocale={mockConnectLocale}
-            client={TEST_CLIENT}
             auth={mockAuth}
+            client={TEST_CLIENT}
+            connectLocale={mockConnectLocale}
+            modalSize="wide"
+            onDone={() => {}}
           />,
           { setConnectedWallet: true },
         );
@@ -202,11 +202,11 @@ describe("Signature screen", () => {
 
         const { getByText, getByRole } = render(
           <SignatureScreen
-            onDone={() => {}}
-            modalSize="wide"
-            connectLocale={mockConnectLocale}
-            client={TEST_CLIENT}
             auth={mockAuth}
+            client={TEST_CLIENT}
+            connectLocale={mockConnectLocale}
+            modalSize="wide"
+            onDone={() => {}}
           />,
           { setConnectedWallet: true },
         );
@@ -229,11 +229,11 @@ describe("Signature screen", () => {
 
         const { getByRole, getByText } = render(
           <SignatureScreen
-            onDone={() => {}}
-            modalSize="wide"
-            connectLocale={mockConnectLocale}
-            client={TEST_CLIENT}
             auth={mockAuth}
+            client={TEST_CLIENT}
+            connectLocale={mockConnectLocale}
+            modalSize="wide"
+            onDone={() => {}}
           />,
           { setConnectedWallet: true },
         );
@@ -269,11 +269,11 @@ describe("Signature screen", () => {
 
         const { getByTestId } = render(
           <SignatureScreen
-            onDone={() => {}}
-            modalSize="wide"
-            connectLocale={mockConnectLocale}
-            client={TEST_CLIENT}
             auth={mockAuth}
+            client={TEST_CLIENT}
+            connectLocale={mockConnectLocale}
+            modalSize="wide"
+            onDone={() => {}}
           />,
           { setConnectedWallet: true },
         );
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SignatureScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SignatureScreen.tsx
index 28d85cf768d..fcc03be16f6 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SignatureScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SignatureScreen.tsx
@@ -17,15 +17,15 @@ import { useAdminWallet } from "../../../../core/hooks/wallets/useAdminWallet.js
 import { useDisconnect } from "../../../../core/hooks/wallets/useDisconnect.js";
 import { wait } from "../../../../core/utils/wait.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
-import { Spacer } from "../../components/Spacer.js";
-import { Spinner } from "../../components/Spinner.js";
-import { WalletImage } from "../../components/WalletImage.js";
 import { Container, ModalHeader } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
+import { Spacer } from "../../components/Spacer.js";
+import { Spinner } from "../../components/Spinner.js";
 import { Text } from "../../components/text.js";
+import { WalletImage } from "../../components/WalletImage.js";
 import { StyledDiv } from "../../design-system/elements.js";
-import { TOS } from "../Modal/TOS.js";
 import type { ConnectLocale } from "../locale/types.js";
+import { TOS } from "../Modal/TOS.js";
 import { WalletLogoSpinner } from "./WalletLogoSpinner.js";
 
 type Status = "signing" | "failed" | "idle";
@@ -83,10 +83,10 @@ export const SignatureScreen: React.FC<{
   ) {
     return (
       <HeadlessSignIn
+        connectLocale={connectLocale}
         error={error}
         signIn={signIn}
         status={status}
-        connectLocale={connectLocale}
         wallet={wallet}
       />
     );
@@ -97,7 +97,7 @@ export const SignatureScreen: React.FC<{
   };
 
   return (
-    <Container animate="fadein" fullHeight flex="column">
+    <Container animate="fadein" flex="column" fullHeight>
       <Container
         p="lg"
         style={{
@@ -108,44 +108,43 @@ export const SignatureScreen: React.FC<{
       </Container>
 
       <Container
+        center="y"
+        expand
+        flex="column"
+        px={modalSize === "compact" ? "lg" : "xxl"}
         style={{
-          paddingTop: 0,
           paddingBottom: spacing.xl,
+          paddingTop: 0,
         }}
-        flex="column"
-        px={modalSize === "compact" ? "lg" : "xxl"}
-        center="y"
-        expand
       >
         {status === "idle" ? (
           <>
-            <Container flex="row" center="x" animate="fadein" py="3xl">
+            <Container animate="fadein" center="x" flex="row" py="3xl">
               <PulsatingContainer>
-                <WalletImage id={wallet.id} client={props.client} size="80" />
+                <WalletImage client={props.client} id={wallet.id} size="80" />
               </PulsatingContainer>
             </Container>
 
-            <Text center multiline balance>
+            <Text balance center multiline>
               {locale.instructionScreen.instruction}
             </Text>
             <Spacer y="lg" />
             <Button
-              fullWidth
-              variant="accent"
               data-testid="sign-in-button"
+              fullWidth
               onClick={signIn}
               style={{
                 alignItems: "center",
                 padding: spacing.md,
               }}
+              variant="accent"
             >
               {connectLocale.signatureScreen.instructionScreen.signInButton}
             </Button>
             <Spacer y="sm" />
             <Button
-              fullWidth
-              variant="secondary"
               data-testid="disconnect-button"
+              fullWidth
               onClick={() => {
                 onClose?.();
                 disconnect(wallet);
@@ -154,6 +153,7 @@ export const SignatureScreen: React.FC<{
                 alignItems: "center",
                 padding: spacing.md,
               }}
+              variant="secondary"
             >
               {connectLocale.signatureScreen.instructionScreen.disconnectWallet}
             </Button>
@@ -168,15 +168,15 @@ export const SignatureScreen: React.FC<{
               />
             </Container>
 
-            <Container flex="column" gap="md" animate="fadein" key={status}>
-              <Text size="lg" center color="primaryText">
+            <Container animate="fadein" flex="column" gap="md" key={status}>
+              <Text center color="primaryText" size="lg">
                 {status === "failed"
                   ? error || locale.signingScreen.failedToSignIn
                   : locale.signingScreen.inProgress}
               </Text>
 
               {status === "signing" && (
-                <Text center multiline balance>
+                <Text balance center multiline>
                   {connectLocale.signatureScreen.signingScreen.prompt}
                 </Text>
               )}
@@ -186,21 +186,20 @@ export const SignatureScreen: React.FC<{
                   <Spacer y="sm" />
                   <Button
                     fullWidth
-                    variant="accent"
                     onClick={handleRetry}
                     style={{
-                      gap: spacing.xs,
                       alignItems: "center",
+                      gap: spacing.xs,
                       padding: spacing.md,
                     }}
+                    variant="accent"
                   >
-                    <ReloadIcon width={iconSize.sm} height={iconSize.sm} />
+                    <ReloadIcon height={iconSize.sm} width={iconSize.sm} />
                     {locale.signingScreen.tryAgain}
                   </Button>
                   <Spacer y="sm" />
                   <Button
                     fullWidth
-                    variant="secondary"
                     onClick={() => {
                       disconnect(wallet);
                     }}
@@ -208,6 +207,7 @@ export const SignatureScreen: React.FC<{
                       alignItems: "center",
                       padding: spacing.md,
                     }}
+                    variant="secondary"
                   >
                     {locale.instructionScreen.disconnectWallet}
                   </Button>
@@ -219,11 +219,11 @@ export const SignatureScreen: React.FC<{
       </Container>
 
       {(termsOfServiceUrl || privacyPolicyUrl) && (
-        <Container p="md" animate="fadein">
+        <Container animate="fadein" p="md">
           <TOS
-            termsOfServiceUrl={termsOfServiceUrl}
-            privacyPolicyUrl={privacyPolicyUrl}
             locale={connectLocale.agreement}
+            privacyPolicyUrl={privacyPolicyUrl}
+            termsOfServiceUrl={termsOfServiceUrl}
           />
         </Container>
       )}
@@ -265,53 +265,53 @@ function HeadlessSignIn({
   }, [signIn]);
 
   return (
-    <Container p="lg" fullHeight flex="column" animate="fadein">
+    <Container animate="fadein" flex="column" fullHeight p="lg">
       <ModalHeader title={locale.signingScreen.title} />
       <Container
+        center="both"
         expand
         flex="row"
-        center="both"
         style={{
           minHeight: "250px",
         }}
       >
-        {status === "signing" && <Spinner size="xl" color="accentText" />}
+        {status === "signing" && <Spinner color="accentText" size="xl" />}
 
         {status === "failed" && (
           <Container>
             <Spacer y="lg" />
-            <Text size="lg" center color="danger">
+            <Text center color="danger" size="lg">
               {error || locale.signingScreen.failedToSignIn}
             </Text>
 
             <Spacer y="lg" />
             <Button
               fullWidth
-              variant="accent"
               onClick={() => {
                 signIn();
               }}
               style={{
-                gap: spacing.xs,
                 alignItems: "center",
+                gap: spacing.xs,
                 padding: spacing.md,
               }}
+              variant="accent"
             >
-              <ReloadIcon width={iconSize.sm} height={iconSize.sm} />
+              <ReloadIcon height={iconSize.sm} width={iconSize.sm} />
               {locale.signingScreen.tryAgain}
             </Button>
             <Spacer y="sm" />
             <Button
+              data-testid="disconnect-button"
               fullWidth
-              variant="secondary"
               onClick={() => {
                 disconnect(wallet);
               }}
-              data-testid="disconnect-button"
               style={{
                 alignItems: "center",
                 padding: spacing.md,
               }}
+              variant="secondary"
             >
               {locale.instructionScreen.disconnectWallet}
             </Button>
@@ -335,19 +335,19 @@ const pulseAnimation = keyframes`
 const PulsatingContainer = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
-    position: "relative",
     "&::before": {
+      animation: `${pulseAnimation} 2s cubic-bezier(0.175, 0.885, 0.32, 1.1) infinite`,
+      background: theme.colors.accentText,
+      borderRadius: radius.xl,
+      bottom: 0,
       content: '""',
       display: "block",
-      position: "absolute",
       left: 0,
-      top: 0,
-      bottom: 0,
+      position: "absolute",
       right: 0,
-      background: theme.colors.accentText,
-      animation: `${pulseAnimation} 2s cubic-bezier(0.175, 0.885, 0.32, 1.1) infinite`,
+      top: 0,
       zIndex: -1,
-      borderRadius: radius.xl,
     },
+    position: "relative",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/StartScreen.test.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/StartScreen.test.tsx
index d08244660ab..b049bc7da17 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/StartScreen.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/StartScreen.test.tsx
@@ -10,20 +10,20 @@ describe("StartScreen", () => {
   it("should render an image for the welcome screen", () => {
     const { container } = render(
       <StartScreen
-        connectLocale={en}
         client={client}
+        connectLocale={en}
+        meta={{
+          privacyPolicyUrl: "https://privacy.com",
+          showThirdwebBranding: false,
+          termsOfServiceUrl: "https://cat.com",
+        }}
         welcomeScreen={{
           img: {
+            height: 100,
             src: "https://cat.png",
             width: 100,
-            height: 100,
           },
         }}
-        meta={{
-          showThirdwebBranding: false,
-          termsOfServiceUrl: "https://cat.com",
-          privacyPolicyUrl: "https://privacy.com",
-        }}
       />,
     );
 
@@ -36,14 +36,14 @@ describe("StartScreen", () => {
   it("should render new-to-wallet link", () => {
     const { container } = render(
       <StartScreen
-        connectLocale={en}
         client={client}
-        welcomeScreen={undefined}
+        connectLocale={en}
         meta={{
+          privacyPolicyUrl: "https://privacy.com",
           showThirdwebBranding: false,
           termsOfServiceUrl: "https://cat.com",
-          privacyPolicyUrl: "https://privacy.com",
         }}
+        welcomeScreen={undefined}
       />,
     );
 
@@ -55,14 +55,14 @@ describe("StartScreen", () => {
   it("should render an svg icon if a custom image is not passed", () => {
     const { container } = render(
       <StartScreen
-        connectLocale={en}
         client={client}
-        welcomeScreen={undefined}
+        connectLocale={en}
         meta={{
+          privacyPolicyUrl: "https://privacy.com",
           showThirdwebBranding: false,
           termsOfServiceUrl: "https://cat.com",
-          privacyPolicyUrl: "https://privacy.com",
         }}
+        welcomeScreen={undefined}
       />,
     );
     const svg = container.querySelector("svg");
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/StartScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/StartScreen.tsx
index 8b34f9e5525..680e3f94712 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/StartScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/StartScreen.tsx
@@ -2,16 +2,15 @@ import { keyframes } from "@emotion/react";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { useCustomTheme } from "../../../../core/design-system/CustomThemeProvider.js";
 import { spacing } from "../../../../core/design-system/index.js";
+import { Container } from "../../components/basic.js";
 import { Img } from "../../components/Img.js";
 import { Spacer } from "../../components/Spacer.js";
-import { Container } from "../../components/basic.js";
-import { Link } from "../../components/text.js";
-import { Text } from "../../components/text.js";
+import { Link, Text } from "../../components/text.js";
 import { StyledDiv } from "../../design-system/elements.js";
-import { TOS } from "../Modal/TOS.js";
-import { PoweredByThirdweb } from "../PoweredByTW.js";
 import { GlobeIcon } from "../icons/GlobalIcon.js";
 import type { ConnectLocale } from "../locale/types.js";
+import { TOS } from "../Modal/TOS.js";
+import { PoweredByThirdweb } from "../PoweredByTW.js";
 import type { WelcomeScreen } from "./types.js";
 
 /**
@@ -48,23 +47,23 @@ export function StartScreen(props: {
   const showTOS = props.meta.termsOfServiceUrl || props.meta.privacyPolicyUrl;
 
   return (
-    <Container fullHeight animate="fadein" flex="column">
+    <Container animate="fadein" flex="column" fullHeight>
       <Container
+        center="both"
         expand
         flex="column"
-        center="both"
+        p="lg"
         style={{
           minHeight: "300px",
         }}
-        p="lg"
       >
-        <Container flex="row" center="x">
+        <Container center="x" flex="row">
           {img ? (
             <Img
+              client={props.client}
+              height={img.height ? String(img.height) : undefined}
               src={img.src}
               width={img.width ? String(img.width) : undefined}
-              height={img.height ? String(img.height) : undefined}
-              client={props.client}
             />
           ) : (
             <GlobalContainer>
@@ -75,7 +74,7 @@ export function StartScreen(props: {
 
         <Spacer y="xxl" />
 
-        <Text center color="primaryText" weight={600} multiline>
+        <Text center color="primaryText" multiline weight={600}>
           {title}
         </Text>
 
@@ -94,21 +93,21 @@ export function StartScreen(props: {
         <Spacer y="lg" />
 
         <Link
-          target="_blank"
           center
           href="https://blog.thirdweb.com/web3-wallet/"
+          target="_blank"
         >
           {props.connectLocale.newToWallets}
         </Link>
       </Container>
 
-      <Container py="lg" flex="column" gap="lg">
+      <Container flex="column" gap="lg" py="lg">
         <div>
           {showTOS && (
             <TOS
-              termsOfServiceUrl={props.meta.termsOfServiceUrl}
-              privacyPolicyUrl={props.meta.privacyPolicyUrl}
               locale={props.connectLocale.agreement}
+              privacyPolicyUrl={props.meta.privacyPolicyUrl}
+              termsOfServiceUrl={props.meta.termsOfServiceUrl}
             />
           )}
 
@@ -139,8 +138,8 @@ const floatingAnimation = keyframes`
 const GlobalContainer = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
+    animation: `${floatingAnimation} 2s ease infinite alternate`,
     color: theme.colors.accentText,
     filter: `drop-shadow(0px 6px 10px ${theme.colors.accentText})`,
-    animation: `${floatingAnimation} 2s ease infinite alternate`,
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/TokenSelector.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/TokenSelector.tsx
index afc0ebf8293..af35e30289a 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/TokenSelector.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/TokenSelector.tsx
@@ -19,22 +19,22 @@ import {
 import { useTokenInfo } from "../../../../core/hooks/others/useTokenInfo.js";
 import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import type { TokenInfo } from "../../../../core/utils/defaultTokens.js";
+import { Container, Line, ModalHeader } from "../../components/basic.js";
+import { Button } from "../../components/buttons.js";
 import { ChainIcon } from "../../components/ChainIcon.js";
+import { Input } from "../../components/formElements.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Spinner } from "../../components/Spinner.js";
 import { TokenIcon } from "../../components/TokenIcon.js";
-import { Container, Line, ModalHeader } from "../../components/basic.js";
-import { Button } from "../../components/buttons.js";
-import { Input } from "../../components/formElements.js";
 import { Text } from "../../components/text.js";
-import { ChainButton, NetworkSelectorContent } from "../NetworkSelector.js";
 import type { ConnectLocale } from "../locale/types.js";
+import { ChainButton, NetworkSelectorContent } from "../NetworkSelector.js";
 import { formatTokenBalance } from "./formatTokenBalance.js";
 import {
   type ERC20OrNativeToken,
-  NATIVE_TOKEN,
   isNativeToken,
+  NATIVE_TOKEN,
 } from "./nativeToken.js";
 
 // Note: TokenSelector can be used when wallet may or may not be connected
@@ -67,8 +67,8 @@ export function TokenSelector(props: {
   // otherwise it loads the token with given address
   const tokenQuery = useTokenInfo({
     chain: chain,
-    tokenAddress: input,
     client: props.client,
+    tokenAddress: input,
   });
 
   const locale = props.connectLocale.sendFundsScreen;
@@ -101,30 +101,30 @@ export function TokenSelector(props: {
   if (screen === "select-chain" && chainSelection) {
     return (
       <NetworkSelectorContent
+        chains={chainSelection.chains}
         client={props.client}
+        closeModal={() => setScreen("base")}
         connectLocale={props.connectLocale}
-        showTabs={false}
-        onBack={() => setScreen("base")}
         // pass swap supported chains
-        chains={chainSelection.chains}
-        closeModal={() => setScreen("base")}
         networkSelector={{
           renderChain(renderChainProps) {
             return (
               <ChainButton
                 chain={renderChainProps.chain}
+                client={props.client}
                 confirming={false}
-                switchingFailed={false}
+                connectLocale={props.connectLocale}
                 onClick={() => {
                   chainSelection.select(renderChainProps.chain);
                   setScreen("base");
                 }}
-                client={props.client}
-                connectLocale={props.connectLocale}
+                switchingFailed={false}
               />
             );
           },
         }}
+        onBack={() => setScreen("base")}
+        showTabs={false}
       />
     );
   }
@@ -159,15 +159,15 @@ export function TokenSelector(props: {
             <Spacer y="xxs" />
             <SelectTokenBtn
               fullWidth
-              variant="secondary"
               onClick={() => {
                 setScreen("select-chain");
               }}
+              variant="secondary"
             >
               <ChainIcon
                 chainIconUrl={chainIconQuery.url}
-                size={iconSize.lg}
                 client={props.client}
+                size={iconSize.lg}
               />
 
               {chainNameQuery.name ? (
@@ -179,11 +179,11 @@ export function TokenSelector(props: {
               )}
 
               <ChevronDownIcon
-                width={iconSize.sm}
                 height={iconSize.sm}
                 style={{
                   marginLeft: "auto",
                 }}
+                width={iconSize.sm}
               />
             </SelectTokenBtn>
             <Spacer y="xl" />
@@ -194,12 +194,12 @@ export function TokenSelector(props: {
         <Container px="lg">
           <Spacer y="xs" />
           <Input
-            placeholder={locale.searchToken}
-            variant="outline"
-            value={input}
             onChange={(e) => {
               setInput(e.target.value);
             }}
+            placeholder={locale.searchToken}
+            value={input}
+            variant="outline"
           />
         </Container>
 
@@ -212,29 +212,29 @@ export function TokenSelector(props: {
             px="lg"
             scrollY
             style={{
-              paddingTop: 0,
               paddingBottom: spacing.lg,
+              paddingTop: 0,
             }}
           >
             {!input && (
               <SelectTokenButton
+                chain={props.chain}
+                client={props.client}
                 onClick={() => {
                   props.onTokenSelect(NATIVE_TOKEN);
                 }}
-                chain={props.chain}
                 token={NATIVE_TOKEN}
-                client={props.client}
               />
             )}
 
             {filteredList.map((token) => {
               return (
                 <SelectTokenButton
-                  onClick={() => props.onTokenSelect(token)}
-                  token={token}
-                  key={token.address}
                   chain={props.chain}
                   client={props.client}
+                  key={token.address}
+                  onClick={() => props.onTokenSelect(token)}
+                  token={token}
                 />
               );
             })}
@@ -244,34 +244,34 @@ export function TokenSelector(props: {
         {filteredList.length === 0 && tokenQuery.isLoading && input && (
           <Container
             animate="fadein"
-            p="lg"
+            center="both"
+            color="secondaryText"
             flex="column"
             gap="md"
-            center="both"
+            p="lg"
             style={{
               minHeight: "200px",
               paddingTop: 0,
             }}
-            color="secondaryText"
           >
-            <Spinner size="lg" color="accentText" />
+            <Spinner color="accentText" size="lg" />
           </Container>
         )}
 
         {filteredList.length === 0 && !tokenQuery.isLoading && input && (
           <Container
             animate="fadein"
-            p="lg"
+            center="both"
+            color="secondaryText"
             flex="column"
             gap="md"
-            center="both"
+            p="lg"
             style={{
               minHeight: "200px",
               paddingTop: 0,
             }}
-            color="secondaryText"
           >
-            <CrossCircledIcon width={iconSize.lg} height={iconSize.lg} />
+            <CrossCircledIcon height={iconSize.lg} width={iconSize.lg} />
             {locale.noTokensFound}
           </Container>
         )}
@@ -291,8 +291,8 @@ function SelectTokenButton(props: {
   const account = useActiveAccount();
   const tokenInfoQuery = useTokenInfo({
     chain: props.chain,
-    tokenAddress: isNativeToken(props.token) ? undefined : props.token.address,
     client: props.client,
+    tokenAddress: isNativeToken(props.token) ? undefined : props.token.address,
   });
 
   const tokenName = isNativeToken(props.token)
@@ -300,17 +300,17 @@ function SelectTokenButton(props: {
     : props.token.name;
 
   return (
-    <SelectTokenBtn fullWidth variant="secondary" onClick={props.onClick}>
+    <SelectTokenBtn fullWidth onClick={props.onClick} variant="secondary">
       <TokenIcon
-        token={props.token}
         chain={props.chain}
-        size="lg"
         client={props.client}
+        size="lg"
+        token={props.token}
       />
 
       <Container flex="column" gap="4xs">
         {tokenName ? (
-          <Text size="sm" color="primaryText">
+          <Text color="primaryText" size="sm">
             {tokenName}
           </Text>
         ) : (
@@ -339,7 +339,6 @@ function TokenBalance(props: {
   tokenAddress?: string;
 }) {
   const tokenBalanceQuery = useQuery({
-    queryKey: ["tokenBalance", props],
     queryFn: async () => {
       return getTokenBalance({
         account: props.account,
@@ -348,6 +347,7 @@ function TokenBalance(props: {
         tokenAddress: props.tokenAddress,
       });
     },
+    queryKey: ["tokenBalance", props],
   });
 
   if (tokenBalanceQuery.data) {
@@ -360,14 +360,14 @@ function TokenBalance(props: {
 const SelectTokenBtn = /* @__PURE__ */ styled(Button)(() => {
   const theme = useCustomTheme();
   return {
-    background: theme.colors.tertiaryBg,
-    justifyContent: "flex-start",
-    gap: spacing.sm,
-    padding: spacing.sm,
     "&:hover": {
       background: theme.colors.secondaryButtonBg,
       transform: "scale(1.01)",
     },
+    background: theme.colors.tertiaryBg,
+    gap: spacing.sm,
+    justifyContent: "flex-start",
+    padding: spacing.sm,
     transition: "background 200ms ease, transform 150ms ease",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewAssets.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewAssets.tsx
index 45d523657c3..8d15d13282f 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewAssets.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewAssets.tsx
@@ -1,19 +1,19 @@
 import { useMemo, useState } from "react";
 import type { ThirdwebClient } from "../../../../../client/client.js";
-import { type Theme, iconSize } from "../../../../core/design-system/index.js";
+import { iconSize, type Theme } from "../../../../core/design-system/index.js";
 import type {
   SupportedNFTs,
   SupportedTokens,
 } from "../../../../core/utils/defaultTokens.js";
+import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Spacer } from "../../components/Spacer.js";
 import Tabs from "../../components/Tabs.js";
-import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { CoinsIcon } from "../icons/CoinsIcon.js";
 import { ImageIcon } from "../icons/ImageIcon.js";
 import type { ConnectLocale } from "../locale/types.js";
+import type { WalletDetailsModalScreen } from "./types.js";
 import { ViewNFTsContent } from "./ViewNFTs.js";
 import { ViewTokensContent } from "./ViewTokens.js";
-import type { WalletDetailsModalScreen } from "./types.js";
 
 /**
  * @internal
@@ -82,8 +82,8 @@ export function ViewAssets(props: {
     >
       <Container p="lg">
         <ModalHeader
-          title={connectLocale.viewFunds.viewAssets}
           onBack={props.onBack}
+          title={connectLocale.viewFunds.viewAssets}
         />
       </Container>
       <Line />
@@ -95,7 +95,7 @@ export function ViewAssets(props: {
         }}
       >
         <Spacer y="md" />
-        <Tabs options={options} selected={activeTab} onSelect={setActiveTab}>
+        <Tabs onSelect={setActiveTab} options={options} selected={activeTab}>
           <Container
             scrollY
             style={{
@@ -111,10 +111,10 @@ export function ViewAssets(props: {
             )}
             {activeTab === "NFTs" && (
               <ViewNFTsContent
-                supportedNFTs={props.supportedNFTs}
                 client={props.client}
-                theme={props.theme}
                 connectLocale={connectLocale}
+                supportedNFTs={props.supportedNFTs}
+                theme={props.theme}
               />
             )}
           </Container>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewNFTs.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewNFTs.tsx
index fa07321d0a2..5d485bca09a 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewNFTs.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewNFTs.tsx
@@ -14,11 +14,11 @@ import type { Theme } from "../../../../core/design-system/index.js";
 import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
 import type { SupportedNFTs } from "../../../../core/utils/defaultTokens.js";
-import { MediaRenderer } from "../../MediaRenderer/MediaRenderer.js";
+import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";
-import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Text } from "../../components/text.js";
+import { MediaRenderer } from "../../MediaRenderer/MediaRenderer.js";
 import type { ConnectLocale } from "../locale/types.js";
 
 const fetchNFTs = async (
@@ -45,17 +45,17 @@ const fetchNFTs = async (
     });
     return result.map((nft) => ({
       ...nft,
-      quantityOwned: BigInt(1),
       address: contract.address,
       chain,
+      quantityOwned: BigInt(1),
     }));
   }
 
   const erc1155 = await isERC1155({ contract }).catch(() => false);
   if (erc1155) {
     const result = await getErc1155OwnedNFTs({
-      contract,
       address: owner,
+      contract,
     });
     return result.map((nft) => ({ ...nft, address: contract.address, chain }));
   }
@@ -83,8 +83,8 @@ export function ViewNFTs(props: {
     >
       <Container p="lg">
         <ModalHeader
-          title={props.connectLocale.viewFunds.viewNFTs}
           onBack={props.onBack}
+          title={props.connectLocale.viewFunds.viewNFTs}
         />
       </Container>
       <Line />
@@ -112,7 +112,7 @@ export function ViewNFTsContent(props: {
   const activeChain = useActiveWalletChain();
 
   const nftQuery = useQuery({
-    queryKey: ["nfts", activeChain?.id, activeAccount?.address],
+    enabled: !!activeChain && !!activeAccount,
     queryFn: async (): Promise<
       (NFT & { chain: Chain; address: Address; quantityOwned: bigint })[]
     > => {
@@ -124,8 +124,8 @@ export function ViewNFTsContent(props: {
       }
 
       const result = await getOwnedNFTs({
-        client: props.client,
         chains: [activeChain],
+        client: props.client,
         ownerAddress: activeAccount.address,
       });
 
@@ -133,13 +133,13 @@ export function ViewNFTsContent(props: {
         .filter((nft) => !!nft.metadata.name && !!nft.metadata.image)
         .map((nft) => {
           return {
-            chain: getCachedChain(nft.chainId),
             address: nft.tokenAddress as Address,
+            chain: getCachedChain(nft.chainId),
             ...nft,
           };
         });
     },
-    enabled: !!activeChain && !!activeAccount,
+    queryKey: ["nfts", activeChain?.id, activeAccount?.address],
   });
 
   if (!activeChain?.id || !activeAccount?.address) {
@@ -158,13 +158,13 @@ export function ViewNFTsContent(props: {
     <>
       {nftQuery.error ? (
         <Container center="both" py="lg">
-          <Text size="sm" color="secondaryText" center>
+          <Text center color="secondaryText" size="sm">
             Error loading NFTs
           </Text>
         </Container>
       ) : nftQuery.data?.length === 0 && !nftQuery.isLoading ? (
         <Container center="both" py="lg">
-          <Text size="sm" color="secondaryText" center>
+          <Text center color="secondaryText" size="sm">
             No NFTs found on this chain
           </Text>
         </Container>
@@ -172,8 +172,8 @@ export function ViewNFTsContent(props: {
         <Container
           style={{
             display: "grid",
-            gridTemplateColumns: "1fr 1fr",
             gap: "12px",
+            gridTemplateColumns: "1fr 1fr",
           }}
         >
           {nftQuery.isLoading || !filteredNFTs ? (
@@ -187,8 +187,8 @@ export function ViewNFTsContent(props: {
               <NftCard
                 key={`${nft.chain.id}:${nft.address}:${nft.id}`}
                 {...nft}
-                client={props.client}
                 chain={nft.chain}
+                client={props.client}
                 theme={props.theme}
               />
             ))
@@ -213,54 +213,54 @@ function NftCard(
   const content = (
     <div
       style={{
+        alignItems: "center",
         display: "flex",
-        width: "150px",
         flexDirection: "column",
         gap: "4px",
-        alignItems: "center",
+        width: "150px",
       }}
     >
       <div
         style={{
-          position: "relative",
+          alignItems: "center",
+          background:
+            theme === "light" ? "rgba(0, 0, 0, 0.10)" : "rgba(0, 0, 0, 0.20)",
+          borderRadius: "8px",
           display: "flex",
           flexShrink: 0,
-          alignItems: "center",
-          width: "150px",
           height: "150px",
-          borderRadius: "8px",
           overflow: "hidden",
-          background:
-            theme === "light" ? "rgba(0, 0, 0, 0.10)" : "rgba(0, 0, 0, 0.20)",
+          position: "relative",
+          width: "150px",
         }}
       >
         {props.metadata.image && (
           <MediaRenderer
+            client={props.client}
             src={props.metadata.image}
             style={{
-              width: "100%",
               height: "100%",
+              width: "100%",
             }}
-            client={props.client}
           />
         )}
         {props.quantityOwned > 1 && (
           <div
             style={{
-              position: "absolute",
-              bottom: "4px",
-              right: "4px",
+              alignItems: "center",
               background:
                 themeObject?.colors?.modalBg ??
                 (theme === "light" ? "white" : "black"),
+              borderRadius: "100%",
+              bottom: "4px",
+              display: "flex",
               fontSize: "10px",
-              padding: "4px 4px",
-              width: "20px",
               height: "20px",
-              display: "flex",
-              alignItems: "center",
               justifyContent: "center",
-              borderRadius: "100%",
+              padding: "4px 4px",
+              position: "absolute",
+              right: "4px",
+              width: "20px",
             }}
           >
             {props.quantityOwned.toString()}
@@ -269,24 +269,24 @@ function NftCard(
         {props.chain.icon && (
           <img
             alt={props.chain.name}
+            src={props.chain.icon.url}
             style={{
-              position: "absolute",
               bottom: "4px",
+              height: "20px",
               left: "4px",
+              position: "absolute",
               width: "20px",
-              height: "20px",
             }}
-            src={props.chain.icon.url}
           />
         )}
       </div>
       <Text
-        size="xs"
         color="primaryText"
+        size="xs"
         style={{
           fontWeight: 600,
-          textAlign: "center",
           maxLines: 2,
+          textAlign: "center",
         }}
       >
         {props.metadata.name}
@@ -298,8 +298,8 @@ function NftCard(
     return (
       <a
         href={`https://thirdweb.com/${props.chain.id}/${props.address}/nfts/${props.id}`}
-        target="_blank"
         rel="noreferrer"
+        target="_blank"
       >
         {content}
       </a>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewTokens.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewTokens.tsx
index 9f1d69c6a0e..b7f9186e6f6 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewTokens.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ViewTokens.tsx
@@ -7,20 +7,20 @@ import { useWalletBalance } from "../../../../core/hooks/others/useWalletBalance
 import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
 import {
-  type SupportedTokens,
   defaultTokens,
+  type SupportedTokens,
 } from "../../../../core/utils/defaultTokens.js";
+import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";
 import { TokenIcon } from "../../components/TokenIcon.js";
-import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Text } from "../../components/text.js";
 import type { ConnectLocale } from "../locale/types.js";
 import { formatTokenBalance } from "./formatTokenBalance.js";
 import {
   type ERC20OrNativeToken,
-  NATIVE_TOKEN,
   isNativeToken,
+  NATIVE_TOKEN,
 } from "./nativeToken.js";
 
 /**
@@ -40,8 +40,8 @@ export function ViewTokens(props: {
     >
       <Container p="lg">
         <ModalHeader
-          title={props.connectLocale.viewFunds.viewTokens}
           onBack={props.onBack}
+          title={props.connectLocale.viewFunds.viewTokens}
         />
       </Container>
       <Line />
@@ -74,7 +74,11 @@ export function ViewTokensContent(props: {
     (activeChain?.id ? supportedTokens[activeChain.id] : undefined) || [];
 
   const erc20TokensQuery = useQuery({
-    queryKey: ["tokens", activeChain?.id, account?.address],
+    // only fetch tokens if no explicit supported tokens are provided
+    enabled:
+      !!activeChain &&
+      !!account &&
+      (!props.supportedTokens || !props.supportedTokens[activeChain.id]),
     queryFn: async () => {
       if (!activeChain) {
         throw new Error("No active chain");
@@ -85,8 +89,8 @@ export function ViewTokensContent(props: {
       }
 
       const result = await getOwnedTokens({
-        client: props.client,
         chains: [activeChain],
+        client: props.client,
         ownerAddress: account.address,
       });
 
@@ -97,11 +101,7 @@ export function ViewTokensContent(props: {
           ),
       );
     },
-    // only fetch tokens if no explicit supported tokens are provided
-    enabled:
-      !!activeChain &&
-      !!account &&
-      (!props.supportedTokens || !props.supportedTokens[activeChain.id]),
+    queryKey: ["tokens", activeChain?.id, account?.address],
   });
 
   if (!activeChain || !account) {
@@ -110,18 +110,18 @@ export function ViewTokensContent(props: {
   return (
     <>
       <TokenInfo
-        token={NATIVE_TOKEN}
         chain={activeChain}
         client={props.client}
+        token={NATIVE_TOKEN}
       />
 
       {tokenList.map((token) => {
         return (
           <TokenInfo
-            token={token}
-            key={token.address}
             chain={activeChain}
             client={props.client}
+            key={token.address}
+            token={token}
           />
         );
       })}
@@ -136,15 +136,15 @@ export function ViewTokensContent(props: {
       {erc20TokensQuery.data?.map((token) => {
         return (
           <TokenInfo
+            balanceData={token}
+            chain={activeChain}
+            client={props.client}
+            key={token.tokenAddress}
             token={{
               address: token.tokenAddress,
               name: token.name ?? "",
               symbol: token.symbol ?? "",
             }}
-            key={token.tokenAddress}
-            chain={activeChain}
-            client={props.client}
-            balanceData={token}
           />
         );
       })}
@@ -168,10 +168,10 @@ function TokenInfo(props: {
     {
       address: account?.address,
       chain: props.chain,
+      client: props.client,
       tokenAddress: isNativeToken(props.token)
         ? undefined
         : props.token.address,
-      client: props.client,
     },
     {
       enabled: props.balanceData === undefined,
@@ -185,15 +185,15 @@ function TokenInfo(props: {
   return (
     <Container flex="row" gap="sm" p="sm">
       <TokenIcon
-        token={props.token}
         chain={props.chain}
-        size="lg"
         client={props.client}
+        size="lg"
+        token={props.token}
       />
 
       <Container flex="column" gap="xxs">
         {tokenName ? (
-          <Text size="sm" color="primaryText">
+          <Text color="primaryText" size="sm">
             {tokenName}
           </Text>
         ) : (
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletConnectDisconnectScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletConnectDisconnectScreen.tsx
index 6cc297a32e8..88bfbf3df7e 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletConnectDisconnectScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletConnectDisconnectScreen.tsx
@@ -3,9 +3,9 @@ import { ReloadIcon } from "@radix-ui/react-icons";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import type { WalletConnectSession } from "../../../../../wallets/wallet-connect/receiver/types.js";
 import { iconSize, spacing } from "../../../../core/design-system/index.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 import { WalletLogoSpinner } from "./WalletLogoSpinner.js";
 
@@ -26,7 +26,7 @@ export function WalletConnectDisconnectScreen(props: {
       }}
     >
       <Container p="lg">
-        <ModalHeader title="Connect an App" onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title="Connect an App" />
       </Container>
       <Line />
       <Container
@@ -38,11 +38,12 @@ export function WalletConnectDisconnectScreen(props: {
       >
         <Container py="lg" style={{ position: "relative" }}>
           <Container py="md">
+            {/** biome-ignore lint/nursery/useUniqueElementIds: "id" is not a html attribute here - TODO: stop using 'id' as a prop on JSX elements */}
             <WalletLogoSpinner
               client={props.client}
               error={!!props.error}
-              id="walletConnect"
               hideSpinner={true}
+              id="walletConnect"
             />
           </Container>
           <Container
@@ -58,32 +59,32 @@ export function WalletConnectDisconnectScreen(props: {
                 </Text>
                 <Spacer y="xl" />
                 <Button
-                  variant="accent"
                   fullWidth
                   onClick={() => {
                     props.disconnect();
                   }}
+                  variant="accent"
                 >
                   Disconnect
                 </Button>
               </>
             ) : (
               <>
-                <Text center balance multiline size="sm">
+                <Text balance center multiline size="sm">
                   {props.error}
                 </Text>
                 <Spacer y="md" />
-                <Container flex="row" center="x" animate="fadein">
+                <Container animate="fadein" center="x" flex="row">
                   <Button
                     fullWidth
-                    variant="accent"
                     onClick={() => props.disconnect()}
                     style={{
-                      gap: spacing.xs,
                       alignItems: "center",
+                      gap: spacing.xs,
                     }}
+                    variant="accent"
                   >
-                    <ReloadIcon width={iconSize.sm} height={iconSize.sm} />
+                    <ReloadIcon height={iconSize.sm} width={iconSize.sm} />
                     Retry
                   </Button>
                 </Container>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletConnectReceiverScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletConnectReceiverScreen.tsx
index 9f953a4b02e..bbf0ef2f2c0 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletConnectReceiverScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletConnectReceiverScreen.tsx
@@ -13,9 +13,9 @@ import {
 import { iconSize, spacing } from "../../../../core/design-system/index.js";
 import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
 import { InputSelectionUI } from "../../../wallets/in-app/InputSelectionUI.js";
-import { Spacer } from "../../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
+import { Spacer } from "../../components/Spacer.js";
 import { Text } from "../../components/text.js";
 import { WalletConnectDisconnectScreen } from "./WalletConnectDisconnectScreen.js";
 import { WalletLogoSpinner } from "./WalletLogoSpinner.js";
@@ -34,14 +34,13 @@ export function WalletConnectReceiverScreen(props: {
   const queryClient = useQueryClient();
 
   const { data: walletConnectClient } = useQuery({
-    queryKey: ["walletConnectClient"],
+    enabled: !!activeWallet,
     queryFn: async () => {
       if (!activeWallet) return;
       try {
         const client = await createWalletConnectClient({
-          wallet: activeWallet,
-          client: props.client,
           chains: props.chains,
+          client: props.client,
           onConnect: () => {
             setLoading(false);
             queryClient.invalidateQueries({
@@ -58,6 +57,7 @@ export function WalletConnectReceiverScreen(props: {
             setErrorConnecting(error.message);
             setLoading(false);
           },
+          wallet: activeWallet,
         });
         return client;
       } catch {
@@ -65,18 +65,18 @@ export function WalletConnectReceiverScreen(props: {
         return;
       }
     },
+    queryKey: ["walletConnectClient"],
     retry: false,
-    enabled: !!activeWallet,
   });
 
   const { data: session, refetch: refetchSession } = useQuery({
-    queryKey: ["walletConnectSession"],
+    enabled: !!walletConnectClient,
     queryFn: async () => {
       if (!walletConnectClient) return null;
       const sessions = await getActiveWalletConnectSessions();
       return sessions[0] || null;
     },
-    enabled: !!walletConnectClient,
+    queryKey: ["walletConnectSession"],
   });
 
   const { mutateAsync: disconnect } = useMutation({
@@ -87,6 +87,10 @@ export function WalletConnectReceiverScreen(props: {
         walletConnectClient: walletConnectClient,
       });
     },
+    onError: (error) => {
+      console.error(error);
+      setErrorConnecting(error.message);
+    },
     onSuccess: () => {
       setErrorConnecting(false);
       queryClient.invalidateQueries({
@@ -94,10 +98,6 @@ export function WalletConnectReceiverScreen(props: {
       });
       refetchSession();
     },
-    onError: (error) => {
-      console.error(error);
-      setErrorConnecting(error.message);
-    },
   });
 
   if (session) {
@@ -118,7 +118,7 @@ export function WalletConnectReceiverScreen(props: {
       }}
     >
       <Container p="lg">
-        <ModalHeader title="Connect an App" onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title="Connect an App" />
       </Container>
       <Line />
       <Container
@@ -130,11 +130,12 @@ export function WalletConnectReceiverScreen(props: {
       >
         <Container py="sm" style={{ position: "relative" }}>
           <Container py="md">
+            {/** biome-ignore lint/nursery/useUniqueElementIds: "id" is not a html attribute here - TODO: stop using 'id' as a prop on JSX elements */}
             <WalletLogoSpinner
               client={props.client}
               error={!!errorConnecting}
-              id="walletConnect"
               hideSpinner={!loading}
+              id="walletConnect"
             />
           </Container>
           <Container
@@ -150,10 +151,11 @@ export function WalletConnectReceiverScreen(props: {
                 </Text>
                 <Spacer y="xl" />
                 <InputSelectionUI
-                  type="text"
                   disabled={
                     loading || !!errorConnecting || !walletConnectClient
                   }
+                  emptyErrorMessage="Please enter a valid URI"
+                  name="wcUri"
                   onSelect={async (value) => {
                     setLoading(true);
                     if (!walletConnectClient) {
@@ -172,28 +174,27 @@ export function WalletConnectReceiverScreen(props: {
                     }
                   }}
                   placeholder="WalletConnect URI"
-                  name="wcUri"
-                  emptyErrorMessage="Please enter a valid URI"
                   submitButtonText="Connect"
+                  type="text"
                 />
               </>
             ) : (
               <>
-                <Text center balance multiline size="sm">
+                <Text balance center multiline size="sm">
                   {errorConnecting}
                 </Text>
                 <Spacer y="md" />
-                <Container flex="row" center="x" animate="fadein">
+                <Container animate="fadein" center="x" flex="row">
                   <Button
                     fullWidth
-                    variant="accent"
                     onClick={() => setErrorConnecting(false)}
                     style={{
-                      gap: spacing.xs,
                       alignItems: "center",
+                      gap: spacing.xs,
                     }}
+                    variant="accent"
                   >
-                    <ReloadIcon width={iconSize.sm} height={iconSize.sm} />
+                    <ReloadIcon height={iconSize.sm} width={iconSize.sm} />
                     Retry
                   </Button>
                 </Container>
@@ -205,9 +206,9 @@ export function WalletConnectReceiverScreen(props: {
       <Container>
         <Spacer y="lg" />
         <Line />
-        <Container flex="row" center="x" p="lg">
+        <Container center="x" flex="row" p="lg">
           <a href="https://blog.thirdweb.com/p/a62c0ef4-1d8f-424d-95b9-a006e5239849/">
-            <Button variant="link" onClick={() => {}}>
+            <Button onClick={() => {}} variant="link">
               Where do I find the URI?
             </Button>
           </a>
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletLogoSpinner.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletLogoSpinner.tsx
index 39385203fa4..9ade4342822 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletLogoSpinner.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletLogoSpinner.tsx
@@ -28,38 +28,38 @@ export function WalletLogoSpinner(props: {
       <div
         data-container
         style={{
-          position: "relative",
+          alignItems: "center",
           display: "flex",
           justifyContent: "center",
-          alignItems: "center",
+          position: "relative",
         }}
       >
         <div data-img-container>
           {!props.hideSpinner && (
             <svg
-              viewBox="0 0 110 110"
+              role="presentation"
               style={{
                 display: props.error ? "none" : "block",
               }}
-              role="presentation"
+              viewBox="0 0 110 110"
             >
               <rect
-                x="2"
-                y="2"
-                width="106"
+                fill="none"
                 height="106"
                 rx={loaderRadius}
                 strokeDasharray={`${dashArrayStart} ${dashArrayEnd}`}
                 strokeDashoffset={dashOffset}
                 strokeLinecap="round"
-                fill="none"
                 strokeWidth={4}
+                width="106"
+                x="2"
+                y="2"
               />
             </svg>
           )}
 
           <WalletBg>
-            <WalletImage id={props.id} size="68" client={props.client} />
+            <WalletImage client={props.client} id={props.id} size="68" />
           </WalletBg>
         </div>
       </div>
@@ -70,13 +70,13 @@ export function WalletLogoSpinner(props: {
 const WalletBg = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
+    alignItems: "center",
     background: theme.colors.tertiaryBg,
-    borderRadius: "13px",
     border: `1px solid ${theme.colors.borderColor}`,
-    padding: spacing.xs,
+    borderRadius: "13px",
     display: "flex",
     justifyContent: "center",
-    alignItems: "center",
+    padding: spacing.xs,
   };
 });
 
@@ -117,15 +117,10 @@ const pulseAnimation = keyframes`
 const LogoContainer = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
-    display: "flex",
-    justifyContent: "center",
-    position: "relative",
-    borderRadius: radius.xl,
-
     "[data-img-container]": {
+      alignItems: "center",
       display: "flex",
       justifyContent: "center",
-      alignItems: "center",
       position: "relative",
     },
 
@@ -134,32 +129,36 @@ const LogoContainer = /* @__PURE__ */ StyledDiv((_) => {
     },
 
     "&[data-error='true'] [data-img-container]::before": {
-      content: '""',
-      position: "absolute",
-      inset: 0,
-      background: theme.colors.danger,
       animation: `${pulseAnimation} 1.5s ease infinite`,
+      background: theme.colors.danger,
       borderRadius: "20px",
-      zIndex: -1,
-    },
-
-    svg: {
+      content: '""',
+      inset: 0,
       position: "absolute",
-      /* can't use inset because safari doesn't like it */
-      left: "-8px",
-      top: "-8px",
-      width: "calc(100% + 16px)",
-      height: "calc(100% + 16px)",
-      animation: `${fadeInAnimation} 400ms ease`,
+      zIndex: -1,
     },
+    borderRadius: radius.xl,
+    display: "flex",
 
     img: {
       zIndex: 100,
     },
+    justifyContent: "center",
+    position: "relative",
 
     rect: {
       animation: `${dashRotateAnimation} 1.2s linear infinite`,
       stroke: theme.colors.accentText,
     },
+
+    svg: {
+      animation: `${fadeInAnimation} 400ms ease`,
+      height: "calc(100% + 16px)",
+      /* can't use inset because safari doesn't like it */
+      left: "-8px",
+      position: "absolute",
+      top: "-8px",
+      width: "calc(100% + 16px)",
+    },
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletSwitcherConnectionScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletSwitcherConnectionScreen.tsx
index 14c06251e83..6a68edb83b0 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletSwitcherConnectionScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletSwitcherConnectionScreen.tsx
@@ -7,9 +7,9 @@ import type { AppMetadata } from "../../../../../wallets/types.js";
 import type { WalletId } from "../../../../../wallets/wallet-types.js";
 import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
 import { useConnectedWallets } from "../../../../core/hooks/wallets/useConnectedWallets.js";
+import type { ConnectLocale } from "../locale/types.js";
 import { ConnectModalContent } from "../Modal/ConnectModalContent.js";
 import { useSetupScreen } from "../Modal/screen.js";
-import type { ConnectLocale } from "../locale/types.js";
 
 export type WalletSwitcherConnectionScreenProps = {
   chain: Chain | undefined;
@@ -46,8 +46,8 @@ export function WalletSwitcherConnectionScreen(
 
   const screenSetup = useSetupScreen({
     size: "compact",
-    welcomeScreen: undefined,
     wallets: wallets,
+    welcomeScreen: undefined,
   });
 
   return (
@@ -63,6 +63,10 @@ export function WalletSwitcherConnectionScreen(
       meta={{
         showThirdwebBranding: false,
       }}
+      modalHeader={{
+        onBack: props.onBack,
+        title: "Connect",
+      }}
       onClose={() => {}}
       onConnect={(w) => {
         props.onSelect(w);
@@ -70,18 +74,14 @@ export function WalletSwitcherConnectionScreen(
       }}
       recommendedWallets={props.recommendedWallets}
       screenSetup={screenSetup}
-      welcomeScreen={undefined}
-      wallets={wallets}
       setModalVisibility={() => {}}
       shouldSetActive={false}
       showAllWallets={props.showAllWallets}
       size="compact"
       walletConnect={props.walletConnect}
-      modalHeader={{
-        title: "Connect",
-        onBack: props.onBack,
-      }}
       walletIdsToHide={connectedWallets.map((x) => x.id)}
+      wallets={wallets}
+      welcomeScreen={undefined}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletTransactionHistory.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletTransactionHistory.tsx
index 5158b2286e1..de3d28ff1c6 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletTransactionHistory.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletTransactionHistory.tsx
@@ -7,9 +7,9 @@ import { ethereum } from "../../../../../chains/chain-definitions/ethereum.js";
 import { getCachedChain } from "../../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import {
-  type StoredTransaction,
   getPastTransactions,
   getTransactionStore,
+  type StoredTransaction,
 } from "../../../../../transaction/transaction-store.js";
 import { shortenHex } from "../../../../../utils/address.js";
 import { formatExplorerTxUrl } from "../../../../../utils/url.js";
@@ -21,12 +21,12 @@ import {
   useChainIconUrl,
 } from "../../../../core/hooks/others/useChainQuery.js";
 import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
+import { Container } from "../../components/basic.js";
+import { Button } from "../../components/buttons.js";
 import { ChainIcon } from "../../components/ChainIcon.js";
 import { ChainName } from "../../components/ChainName.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Spinner } from "../../components/Spinner.js";
-import { Container } from "../../components/basic.js";
-import { Button } from "../../components/buttons.js";
 import { Text } from "../../components/text.js";
 import type { ConnectLocale } from "../locale/types.js";
 
@@ -44,14 +44,14 @@ export function WalletTransactionHistory(props: {
     transactionStore.getValue,
   );
   const historicalTxQuery = useQuery({
-    queryKey: ["transactions", props.address, activeChain],
+    enabled: !!activeChain,
     queryFn: () =>
       getPastTransactions({
-        walletAddress: props.address,
         chain: activeChain || ethereum,
         client: props.client,
+        walletAddress: props.address,
       }),
-    enabled: !!activeChain,
+    queryKey: ["transactions", props.address, activeChain],
   });
   const transactions = [
     ...[...reverseChronologicalTransactions].reverse(),
@@ -59,22 +59,22 @@ export function WalletTransactionHistory(props: {
   ];
   return (
     <Container
-      scrollY
       flex="column"
       fullHeight
+      scrollY
       style={{
-        minHeight: "250px",
         maxHeight: "370px",
+        minHeight: "250px",
         paddingBottom: spacing.lg,
       }}
     >
-      <Container flex="column" gap="xs" expand>
+      <Container expand flex="column" gap="xs">
         {historicalTxQuery.isLoading && (
           <Container
-            flex="column"
-            gap="md"
             center="both"
             color="secondaryText"
+            flex="column"
+            gap="md"
             style={{
               flex: "1",
               minHeight: "250px",
@@ -86,16 +86,16 @@ export function WalletTransactionHistory(props: {
         )}
         {!historicalTxQuery.isLoading && transactions.length === 0 ? (
           <Container
-            flex="column"
-            gap="md"
             center="both"
             color="secondaryText"
+            flex="column"
+            gap="md"
             style={{
               flex: "1",
               minHeight: "250px",
             }}
           >
-            <CrossCircledIcon width={iconSize.xl} height={iconSize.xl} />
+            <CrossCircledIcon height={iconSize.xl} width={iconSize.xl} />
             <Text>No Transactions</Text>
           </Container>
         ) : (
@@ -108,9 +108,9 @@ export function WalletTransactionHistory(props: {
             {transactions.map((tx) => {
               return (
                 <TransactionButton
-                  key={tx.transactionHash}
-                  explorerUrl={chainExplorers.explorers[0]?.url}
                   client={props.client}
+                  explorerUrl={chainExplorers.explorers[0]?.url}
+                  key={tx.transactionHash}
                   tx={tx}
                 />
               );
@@ -132,27 +132,27 @@ function TransactionButton(props: {
     isLoading,
     error,
   } = useWaitForReceipt({
-    transactionHash: props.tx.transactionHash,
     chain: getCachedChain(props.tx.chainId),
     client: props.client,
     queryOptions: {
       enabled: props.tx.receipt === undefined,
     },
+    transactionHash: props.tx.transactionHash,
   });
   const chainIconQuery = useChainIconUrl(getCachedChain(props.tx.chainId));
   const receipt = props.tx.receipt ?? fetchedReceipt;
 
   const content = (
     <TxButton
-      variant="secondary"
       fullWidth
       style={{
         paddingBlock: spacing.sm,
       }}
+      variant="secondary"
     >
       <Container
-        flex="row"
         center="y"
+        flex="row"
         gap="md"
         style={{
           flex: 1,
@@ -160,27 +160,27 @@ function TransactionButton(props: {
       >
         <ChainIcon
           chainIconUrl={chainIconQuery.url}
-          size={iconSize.lg}
           client={props.client}
+          size={iconSize.lg}
         />
         <div
           style={{
-            flex: 1,
             display: "flex",
+            flex: 1,
             flexDirection: "column",
             justifyContent: "center",
           }}
         >
           {/* Row 1 */}
           <Container
+            center="y"
             flex="row"
             gap="xs"
-            center="y"
             style={{
               justifyContent: "space-between",
             }}
           >
-            <Text size="sm" color="primaryText">
+            <Text color="primaryText" size="sm">
               {receipt?.to
                 ? `Interacted with ${shortenHex(receipt?.to, 4)}`
                 : `Hash: ${shortenHex(props.tx.transactionHash, 4)}`}
@@ -191,8 +191,8 @@ function TransactionButton(props: {
 
           {/* Row 2 */}
           <Container
-            flex="row"
             center="y"
+            flex="row"
             gap="xxs"
             style={{
               justifyContent: "space-between",
@@ -200,24 +200,24 @@ function TransactionButton(props: {
           >
             <ChainName
               chain={getCachedChain(props.tx.chainId)}
-              size="xs"
               client={props.client}
+              size="xs"
             />
           </Container>
         </div>
       </Container>
 
       {/* Status */}
-      <Container flex="row" gap="xxs" center="y">
-        {isLoading && <Spinner size="sm" color="primaryText" />}
+      <Container center="y" flex="row" gap="xxs">
+        {isLoading && <Spinner color="primaryText" size="sm" />}
         {!isLoading && receipt && receipt.status === "success" && (
-          <Text size="md" color="success">
-            <CheckIcon width={iconSize.md} height={iconSize.md} />
+          <Text color="success" size="md">
+            <CheckIcon height={iconSize.md} width={iconSize.md} />
           </Text>
         )}
         {(error || (!isLoading && receipt && receipt.status !== "success")) && (
-          <Text size="md" color="danger">
-            <CrossCircledIcon width={iconSize.md} height={iconSize.md} />
+          <Text color="danger" size="md">
+            <CrossCircledIcon height={iconSize.md} width={iconSize.md} />
           </Text>
         )}
       </Container>
@@ -228,8 +228,8 @@ function TransactionButton(props: {
     return (
       <a
         href={formatExplorerTxUrl(props.explorerUrl, props.tx.transactionHash)}
-        target="_blank"
         rel="noreferrer"
+        target="_blank"
       >
         {content}
       </a>
@@ -242,10 +242,10 @@ function TransactionButton(props: {
 const TxButton = /* @__PURE__ */ styled(Button)(() => {
   const theme = useCustomTheme();
   return {
-    background: theme.colors.tertiaryBg,
     "&:hover": {
       background: theme.colors.secondaryButtonBg,
     },
+    background: theme.colors.tertiaryBg,
     height: "62px",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/formatTokenBalance.test.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/formatTokenBalance.test.ts
index 0378f7b5c28..697846550ed 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/formatTokenBalance.test.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/formatTokenBalance.test.ts
@@ -3,10 +3,10 @@ import { formatTokenBalance } from "./formatTokenBalance.js";
 
 describe("formatTokenBalance", () => {
   const mockBalanceData = {
-    symbol: "ETH",
-    name: "Ethereum",
     decimals: 18,
     displayValue: "1.23456789",
+    name: "Ethereum",
+    symbol: "ETH",
   };
 
   it("formats balance with symbol by default", () => {
@@ -51,8 +51,8 @@ describe("formatTokenBalance", () => {
   it("handles different token symbols", () => {
     const usdcBalance = {
       ...mockBalanceData,
-      symbol: "USDC",
       displayValue: "100.5",
+      symbol: "USDC",
     };
     const result = formatTokenBalance(usdcBalance);
     expect(result).toBe("100.5 USDC");
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/nativeToken.test.ts b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/nativeToken.test.ts
index cf16c579ef1..af0ad270561 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/nativeToken.test.ts
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/nativeToken.test.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from "vitest";
 import { NATIVE_TOKEN_ADDRESS } from "../../../../../constants/addresses.js";
 import {
+  isNativeToken,
   NATIVE_TOKEN,
   type NativeToken,
-  isNativeToken,
 } from "./nativeToken.js"; // Replace with the actual file name// Assuming this is defined in a constants file
 
 describe("isNativeToken", () => {
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/useConnectModal.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/useConnectModal.tsx
index 9214dd56b43..c7258d0f29f 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/useConnectModal.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/useConnectModal.tsx
@@ -12,9 +12,9 @@ import { SetRootElementContext } from "../../../core/providers/RootElementContex
 import { WalletUIStatesProvider } from "../../providers/wallet-ui-states-provider.js";
 import { canFitWideModal } from "../../utils/canFitWideModal.js";
 import type { LocaleId } from "../types.js";
-import ConnectModal from "./Modal/ConnectModal.js";
 import { getConnectLocale } from "./locale/getConnectLocale.js";
 import type { ConnectLocale } from "./locale/types.js";
+import ConnectModal from "./Modal/ConnectModal.js";
 import type { WelcomeScreen } from "./screens/types.js";
 
 /**
@@ -63,16 +63,16 @@ export function useConnectModal() {
             setRootEl(
               <Modal
                 {...props}
+                connectLocale={locale}
+                onClose={() => {
+                  reject();
+                  cleanup();
+                }}
                 onConnect={(w) => {
                   if (props.auth) return;
                   resolve(w);
                   cleanup();
                 }}
-                onClose={() => {
-                  reject();
-                  cleanup();
-                }}
-                connectLocale={locale}
               />,
             );
           })
@@ -127,26 +127,26 @@ function Modal(
   ]);
 
   return (
-    <WalletUIStatesProvider theme={props.theme} isOpen={true}>
+    <WalletUIStatesProvider isOpen={true} theme={props.theme}>
       <ConnectModal
-        onClose={props.onClose}
-        shouldSetActive={props.setActive === undefined ? true : props.setActive}
         accountAbstraction={props.accountAbstraction}
         auth={props.auth}
         chain={props.chain}
+        chains={props.chains}
         client={props.client}
         connectLocale={props.connectLocale}
-        meta={meta}
-        size={size}
-        welcomeScreen={props.welcomeScreen}
+        hiddenWallets={props.hiddenWallets}
         localeId={props.locale || "en_US"}
+        meta={meta}
+        onClose={props.onClose}
         onConnect={props.onConnect}
         recommendedWallets={props.recommendedWallets}
+        shouldSetActive={props.setActive === undefined ? true : props.setActive}
         showAllWallets={props.showAllWallets}
-        hiddenWallets={props.hiddenWallets}
-        wallets={wallets}
-        chains={props.chains}
+        size={size}
         walletConnect={props.walletConnect}
+        wallets={wallets}
+        welcomeScreen={props.welcomeScreen}
       />
     </WalletUIStatesProvider>
   );
diff --git a/packages/thirdweb/src/react/web/ui/MediaRenderer/MediaRenderer.test.tsx b/packages/thirdweb/src/react/web/ui/MediaRenderer/MediaRenderer.test.tsx
index bd22e175e6e..1684bfaf052 100644
--- a/packages/thirdweb/src/react/web/ui/MediaRenderer/MediaRenderer.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/MediaRenderer/MediaRenderer.test.tsx
@@ -100,7 +100,7 @@ describe("MediaRenderer", () => {
     it("renders with custom src and alt", () => {
       const src = "https://example.com/file";
       const alt = "Custom File Name";
-      render(<LinkPlayer src={src} alt={alt} />);
+      render(<LinkPlayer alt={alt} src={src} />);
 
       const linkElement = screen.getByText(alt);
       expect(linkElement).toBeInTheDocument();
@@ -111,7 +111,7 @@ describe("MediaRenderer", () => {
       const customStyle = { backgroundColor: "red" };
       const customClassName = "custom-class";
       const { container } = render(
-        <LinkPlayer style={customStyle} className={customClassName} />,
+        <LinkPlayer className={customClassName} style={customStyle} />,
       );
 
       const outerDiv = container.querySelector(".custom-class");
@@ -152,7 +152,7 @@ describe("MediaRenderer", () => {
     it("applies custom src and alt", () => {
       const src = "https://example.com/video";
       const alt = "Custom Video";
-      render(<IframePlayer src={src} alt={alt} />);
+      render(<IframePlayer alt={alt} src={src} />);
 
       const iframe = screen.getByTitle(alt);
       expect(iframe).toBeInTheDocument();
@@ -191,7 +191,7 @@ describe("MediaRenderer", () => {
     it("applies custom style", () => {
       const customStyle = { backgroundColor: "red" };
       const { container } = render(
-        <IframePlayer style={customStyle} className="iframe-test" />,
+        <IframePlayer className="iframe-test" style={customStyle} />,
       );
 
       const element = container.querySelector(".iframe-test");
@@ -210,7 +210,7 @@ describe("MediaRenderer", () => {
 
     it("respects requireInteraction prop", () => {
       render(
-        <IframePlayer src="https://example.com/video" requireInteraction />,
+        <IframePlayer requireInteraction src="https://example.com/video" />,
       );
 
       const iframe = screen.getByTitle("thirdweb iframe player");
@@ -227,8 +227,8 @@ describe("MediaRenderer", () => {
     render(
       <MediaRenderer
         client={TEST_CLIENT}
-        src={three3dModelLink}
         poster={imageLink}
+        src={three3dModelLink}
       />,
     );
     await waitFor(() => {
diff --git a/packages/thirdweb/src/react/web/ui/MediaRenderer/MediaRenderer.tsx b/packages/thirdweb/src/react/web/ui/MediaRenderer/MediaRenderer.tsx
index 13fce13972d..abeedf36e19 100644
--- a/packages/thirdweb/src/react/web/ui/MediaRenderer/MediaRenderer.tsx
+++ b/packages/thirdweb/src/react/web/ui/MediaRenderer/MediaRenderer.tsx
@@ -87,7 +87,7 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
     );
 
     if (!mediaInfoIsFetched || !src) {
-      return <div style={style} className={className} />;
+      return <div className={className} style={style} />;
     }
 
     if (mediaInfo.mimeType) {
@@ -95,13 +95,13 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
       if (mediaInfo.mimeType.startsWith("text/html")) {
         return (
           <IframePlayer
-            style={mergedStyle}
-            src={mediaInfo.url}
+            alt={alt}
+            className={className}
             poster={possiblePosterSrc.url}
             ref={ref as unknown as React.ForwardedRef<HTMLIFrameElement>}
             requireInteraction={requireInteraction}
-            className={className}
-            alt={alt}
+            src={mediaInfo.url}
+            style={mergedStyle}
           />
         );
       }
@@ -116,12 +116,12 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
         if (possiblePosterSrc.mimeType?.startsWith("image/")) {
           return (
             <ImageRenderer
-              style={mergedStyle}
-              src={possiblePosterSrc.url}
               alt={alt}
-              ref={ref as unknown as React.ForwardedRef<HTMLImageElement>}
               className={className}
               height={height}
+              ref={ref as unknown as React.ForwardedRef<HTMLImageElement>}
+              src={possiblePosterSrc.url}
+              style={mergedStyle}
               width={width}
             />
           );
@@ -132,17 +132,17 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
       if (mediaInfo.mimeType.startsWith("video")) {
         return (
           <VideoPlayer
-            style={mergedStyle}
-            src={mediaInfo.url}
-            ref={ref as unknown as React.ForwardedRef<HTMLVideoElement>}
+            className={className}
+            controls={controls}
             poster={
               possiblePosterSrc.mimeType?.startsWith("image/")
                 ? possiblePosterSrc.url
                 : undefined
             }
+            ref={ref as unknown as React.ForwardedRef<HTMLVideoElement>}
             requireInteraction={requireInteraction}
-            className={className}
-            controls={controls}
+            src={mediaInfo.url}
+            style={mergedStyle}
           />
         );
       }
@@ -151,15 +151,15 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
       if (mediaInfo.mimeType.startsWith("audio")) {
         return (
           <AudioPlayer
-            style={mergedStyle}
-            src={mediaInfo.url}
-            poster={possiblePosterSrc.url}
             alt={alt}
-            ref={ref as unknown as React.ForwardedRef<HTMLAudioElement>}
             className={className}
+            controls={controls}
             height={height}
+            poster={possiblePosterSrc.url}
+            ref={ref as unknown as React.ForwardedRef<HTMLAudioElement>}
+            src={mediaInfo.url}
+            style={mergedStyle}
             width={width}
-            controls={controls}
           />
         );
       }
@@ -168,12 +168,12 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
       if (mediaInfo.mimeType.startsWith("image/")) {
         return (
           <ImageRenderer
-            style={mergedStyle}
-            src={mediaInfo.url}
             alt={alt}
-            ref={ref as unknown as React.ForwardedRef<HTMLImageElement>}
             className={className}
             height={height}
+            ref={ref as unknown as React.ForwardedRef<HTMLImageElement>}
+            src={mediaInfo.url}
+            style={mergedStyle}
             width={width}
           />
         );
@@ -183,11 +183,11 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
     // unknown mime types or no mime type
     return (
       <LinkPlayer
-        style={mergedStyle}
-        src={mediaInfo.url}
         alt={alt}
-        ref={ref as unknown as React.Ref<HTMLAnchorElement>}
         className={className}
+        ref={ref as unknown as React.Ref<HTMLAnchorElement>}
+        src={mediaInfo.url}
+        style={mergedStyle}
       />
     );
   }))();
@@ -205,35 +205,35 @@ const PlayButton: React.FC<PlayButtonProps> = ({ onClick, isPlaying }) => {
   const onMouseUp = () => setIsHovering(true);
   return (
     <button
-      type="button"
+      onClick={onClick}
+      onMouseDown={onMouseDown}
+      onMouseEnter={onMouseEnter}
+      onMouseLeave={onMouseLeave}
+      onMouseUp={onMouseUp}
       style={{
-        position: "absolute",
+        backgroundColor: "#fff",
+        border: "1px solid rgb(229, 232, 235)",
+        borderRadius: "50%",
         bottom: 0,
+        color: "rgb(138, 147, 155)",
+        cursor: "pointer",
+        display: "grid",
+        height: "32px",
+        padding: 0,
+        placeItems: "center",
+        position: "absolute",
         right: 0,
         transform: "translate(-25%, -25%)",
         width: "32px",
-        height: "32px",
         zIndex: 3,
-        backgroundColor: "#fff",
-        color: "rgb(138, 147, 155)",
-        display: "grid",
-        placeItems: "center",
-        borderRadius: "50%",
-        border: "1px solid rgb(229, 232, 235)",
-        cursor: "pointer",
-        padding: 0,
         ...(isHovering
           ? {
-              color: "rgb(53, 56, 64)",
               boxShadow: "rgb(4 17 29 / 25%) 0px 0px 8px 0px",
+              color: "rgb(53, 56, 64)",
             }
           : {}),
       }}
-      onClick={onClick}
-      onMouseEnter={onMouseEnter}
-      onMouseLeave={onMouseLeave}
-      onMouseDown={onMouseDown}
-      onMouseUp={onMouseUp}
+      type="button"
     >
       {!isPlaying ? <CarbonPlayFilledAlt /> : <CarbonPauseFilled />}
     </button>
@@ -254,27 +254,27 @@ const ImageRenderer = /* @__PURE__ */ (() =>
     if (error) {
       return (
         <LinkPlayer
-          style={style}
-          src={src}
           alt={alt}
-          ref={ref as unknown as React.Ref<HTMLAnchorElement>}
           className={className}
+          ref={ref as unknown as React.Ref<HTMLAnchorElement>}
+          src={src}
+          style={style}
         />
       );
     }
 
     return (
       <img
-        style={style}
-        src={src ?? undefined}
         alt={alt}
-        ref={ref}
         className={className}
         height={height}
-        width={width}
         onError={() => {
           setError(true);
         }}
+        ref={ref}
+        src={src ?? undefined}
+        style={style}
+        width={width}
       />
     );
   }))();
@@ -335,26 +335,23 @@ const VideoPlayer = /* @__PURE__ */ (() =>
     if (error) {
       return (
         <LinkPlayer
-          style={style}
-          src={src}
           alt={alt}
-          ref={ref as unknown as React.Ref<HTMLAnchorElement>}
           className={className}
+          ref={ref as unknown as React.Ref<HTMLAnchorElement>}
+          src={src}
+          style={style}
         />
       );
     }
 
     return (
-      <div style={{ position: "relative", ...style }} className={className}>
+      <div className={className} style={{ position: "relative", ...style }}>
         <video
-          ref={mergeRefs([videoRef, ref])}
-          src={src ?? undefined}
-          poster={poster ?? undefined}
-          loop
-          playsInline
+          controls={controls}
           controlsList="nodownload"
+          height={height}
+          loop
           muted={muted}
-          preload={poster ? "metadata" : "auto"}
           onCanPlay={() => {
             if (playing) {
               videoRef.current?.play();
@@ -363,44 +360,47 @@ const VideoPlayer = /* @__PURE__ */ (() =>
           onError={() => {
             setError(true);
           }}
-          width={width}
-          height={height}
-          controls={controls}
+          playsInline
+          poster={poster ?? undefined}
+          preload={poster ? "metadata" : "auto"}
+          ref={mergeRefs([videoRef, ref])}
+          src={src ?? undefined}
           style={{
             height: "100%",
-            width: "100%",
             objectFit: "contain",
-            zIndex: 1,
-            transition: "opacity .5s",
             opacity: !poster ? 1 : playing ? 1 : 0,
+            transition: "opacity .5s",
+            width: "100%",
+            zIndex: 1,
           }}
+          width={width}
         />
         {poster && (
           <img
+            alt={alt}
             src={poster}
             style={{
+              bottom: 0,
+              height: "100%",
+              left: 0,
               objectFit: "contain",
+              opacity: playing ? 0 : 1,
               pointerEvents: "none",
               position: "absolute",
+              right: 0,
+              top: 0,
+              transition: "opacity .5s",
               width: "100%",
-              height: "100%",
               zIndex: 2,
-              transition: "opacity .5s",
-              opacity: playing ? 0 : 1,
-              top: 0,
-              left: 0,
-              right: 0,
-              bottom: 0,
             }}
-            alt={alt}
           />
         )}
         <PlayButton
+          isPlaying={playing}
           onClick={() => {
             setPlaying((prev) => !prev);
             setMuted(false);
           }}
-          isPlaying={playing}
         />
       </div>
     );
@@ -443,40 +443,40 @@ const AudioPlayer = /* @__PURE__ */ (() =>
     if (error) {
       return (
         <LinkPlayer
-          style={style}
-          src={src}
           alt={alt}
-          ref={ref as unknown as React.Ref<HTMLAnchorElement>}
           className={className}
+          ref={ref as unknown as React.Ref<HTMLAnchorElement>}
+          src={src}
+          style={style}
         />
       );
     }
 
     return (
-      <div style={{ position: "relative", ...style }} className={className}>
+      <div className={className} style={{ position: "relative", ...style }}>
         {poster ? (
           <img
+            alt={alt}
             height={height}
-            width={width}
             src={poster}
             style={{
               height: "100%",
-              width: "100%",
-              pointerEvents: "none",
               objectFit: "contain",
+              pointerEvents: "none",
+              width: "100%",
             }}
-            alt={alt}
+            width={width}
           />
         ) : (
           <div
             style={{
-              width: "100%",
-              height: "100%",
+              backgroundColor: "#fff",
+              color: "rgb(138, 147, 155)",
               display: "grid",
+              height: "100%",
               placeItems: "center",
               pointerEvents: "none",
-              backgroundColor: "#fff",
-              color: "rgb(138, 147, 155)",
+              width: "100%",
             }}
           >
             <CarbonDocumentAudio style={{ height: "64px", width: "64px" }} />
@@ -484,30 +484,30 @@ const AudioPlayer = /* @__PURE__ */ (() =>
         )}
 
         <PlayButton
+          isPlaying={playing}
           onClick={() => {
             setPlaying((prev) => !prev);
             setMuted(false);
           }}
-          isPlaying={playing}
         />
         <audio
-          ref={mergeRefs([audioRef, ref])}
-          src={src ?? undefined}
-          loop
-          playsInline
           controls={controls}
+          controlsList="nodownload"
+          loop
           muted={muted}
+          onError={() => {
+            setError(true);
+          }}
+          playsInline
           preload="none"
-          controlsList="nodownload"
+          ref={mergeRefs([audioRef, ref])}
+          src={src ?? undefined}
           style={{
-            position: "absolute",
             opacity: 0,
             pointerEvents: "none",
-            zIndex: -1,
+            position: "absolute",
             visibility: "hidden",
-          }}
-          onError={() => {
-            setError(true);
+            zIndex: -1,
           }}
         />
       </div>
@@ -539,46 +539,46 @@ export const IframePlayer = /* @__PURE__ */ (() =>
     return (
       <div style={{ position: "relative", ...style }} {...restProps}>
         <iframe
-          title={alt || "thirdweb iframe player"}
-          src={playing ? (src ?? undefined) : undefined}
+          allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
           ref={ref}
+          sandbox="allow-scripts"
+          src={playing ? (src ?? undefined) : undefined}
           style={{
-            objectFit: "contain",
-            zIndex: 1,
+            border: "none",
             height: "100%",
-            width: "100%",
-            transition: "opacity .5s",
+            objectFit: "contain",
             opacity: !poster ? 1 : playing ? 1 : 0,
-            border: "none",
+            transition: "opacity .5s",
+            width: "100%",
+            zIndex: 1,
           }}
-          sandbox="allow-scripts"
-          allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+          title={alt || "thirdweb iframe player"}
         />
         {poster && (
           <img
+            alt={alt}
             src={poster}
             style={{
+              bottom: 0,
+              height: "100%",
+              left: 0,
               objectFit: "contain",
+              opacity: playing ? 0 : 1,
               pointerEvents: "none",
               position: "absolute",
+              right: 0,
+              top: 0,
+              transition: "opacity .5s",
               width: "100%",
-              height: "100%",
               zIndex: 2,
-              transition: "opacity .5s",
-              opacity: playing ? 0 : 1,
-              top: 0,
-              left: 0,
-              right: 0,
-              bottom: 0,
             }}
-            alt={alt}
           />
         )}
         <PlayButton
+          isPlaying={playing}
           onClick={() => {
             setPlaying((prev) => !prev);
           }}
-          isPlaying={playing}
         />
       </div>
     );
@@ -593,43 +593,43 @@ export const LinkPlayer = /* @__PURE__ */ (() =>
     Pick<MediaRendererProps, "src" | "alt" | "style" | "className">
   >(function Link_Player({ src, alt, style, className }, ref) {
     return (
-      <div style={{ position: "relative", ...style }} className={className}>
+      <div className={className} style={{ position: "relative", ...style }}>
         <div
           style={{
-            width: "100%",
-            height: "100%",
-            display: "grid",
-            placeItems: "center",
             backgroundColor: "#fff",
             color: "rgb(138, 147, 155)",
+            display: "grid",
+            height: "100%",
+            placeItems: "center",
+            width: "100%",
           }}
         >
           <div
             style={{
+              alignItems: "center",
               display: "flex",
               flexDirection: "column",
-              gap: "8px",
-              alignItems: "center",
               flexWrap: "nowrap",
+              gap: "8px",
             }}
           >
             <CarbonDocumentUnknown
               style={{
+                aspectRatio: "1",
                 maxWidth: "128px",
                 minWidth: "48px",
                 width: "50%",
-                aspectRatio: "1",
               }}
             />
             <a
+              href={src ?? undefined}
+              ref={ref as unknown as React.LegacyRef<HTMLAnchorElement>}
               rel="noopener noreferrer"
               style={{
-                textDecoration: "underline",
                 color: "rgb(138, 147, 155)",
+                textDecoration: "underline",
               }}
-              href={src ?? undefined}
               target="_blank"
-              ref={ref as unknown as React.LegacyRef<HTMLAnchorElement>}
             >
               {alt || "File"}
             </a>
diff --git a/packages/thirdweb/src/react/web/ui/MediaRenderer/icons.tsx b/packages/thirdweb/src/react/web/ui/MediaRenderer/icons.tsx
index 40358a6f620..4b7cefb1539 100644
--- a/packages/thirdweb/src/react/web/ui/MediaRenderer/icons.tsx
+++ b/packages/thirdweb/src/react/web/ui/MediaRenderer/icons.tsx
@@ -9,20 +9,20 @@ export const CarbonDocumentUnknown: React.FC<SVGProps<SVGSVGElement>> = (
 ) => {
   return (
     <svg
-      width="16"
       height="16"
-      viewBox="0 0 32 32"
       role="presentation"
+      viewBox="0 0 32 32"
+      width="16"
       {...props}
     >
-      <circle cx="9" cy="28.5" r="1.5" fill="currentColor" />
+      <circle cx="9" cy="28.5" fill="currentColor" r="1.5" />
       <path
-        fill="currentColor"
         d="M10 25H8v-4h2a2 2 0 0 0 0-4H8a2.002 2.002 0 0 0-2 2v.5H4V19a4.005 4.005 0 0 1 4-4h2a4 4 0 0 1 0 8Z"
+        fill="currentColor"
       />
       <path
-        fill="currentColor"
         d="m27.7 9.3l-7-7A.908.908 0 0 0 20 2H10a2.006 2.006 0 0 0-2 2v8h2V4h8v6a2.006 2.006 0 0 0 2 2h6v16H14v2h12a2.006 2.006 0 0 0 2-2V10a.91.91 0 0 0-.3-.7ZM20 10V4.4l5.6 5.6Z"
+        fill="currentColor"
       />
     </svg>
   );
@@ -36,19 +36,19 @@ export const CarbonDocumentAudio: React.FC<SVGProps<SVGSVGElement>> = (
 ) => {
   return (
     <svg
-      width="16"
       height="16"
-      viewBox="0 0 32 32"
       role="presentation"
+      viewBox="0 0 32 32"
+      width="16"
       {...props}
     >
       <path
-        fill="currentColor"
         d="M29 31a.999.999 0 0 1-.625-.22L23.65 27H20a1 1 0 0 1-1-1v-5a1 1 0 0 1 1-1h3.65l4.726-3.78A1 1 0 0 1 30 17v13a1 1 0 0 1-1 1Zm-8-6h3a1 1 0 0 1 .625.22L28 27.92v-8.84l-3.376 2.7A1 1 0 0 1 24 22h-3Z"
+        fill="currentColor"
       />
       <path
-        fill="currentColor"
         d="M16 28H8V4h8v6a2.006 2.006 0 0 0 2 2h6v3h2v-5a.91.91 0 0 0-.3-.7l-7-7A.909.909 0 0 0 18 2H8a2.006 2.006 0 0 0-2 2v24a2.006 2.006 0 0 0 2 2h8Zm2-23.6l5.6 5.6H18Z"
+        fill="currentColor"
       />
     </svg>
   );
@@ -60,15 +60,15 @@ export const CarbonDocumentAudio: React.FC<SVGProps<SVGSVGElement>> = (
 export const CarbonPauseFilled: React.FC<SVGProps<SVGSVGElement>> = (props) => {
   return (
     <svg
-      width="16"
       height="16"
-      viewBox="0 0 32 32"
       role="presentation"
+      viewBox="0 0 32 32"
+      width="16"
       {...props}
     >
       <path
-        fill="currentColor"
         d="M12 6h-2a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2zm10 0h-2a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2z"
+        fill="currentColor"
       />
     </svg>
   );
@@ -82,15 +82,15 @@ export const CarbonPlayFilledAlt: React.FC<SVGProps<SVGSVGElement>> = (
 ) => {
   return (
     <svg
-      width="16"
       height="16"
-      viewBox="0 0 32 32"
       role="presentation"
+      viewBox="0 0 32 32"
+      width="16"
       {...props}
     >
       <path
-        fill="currentColor"
         d="M7 28a1 1 0 0 1-1-1V5a1 1 0 0 1 1.482-.876l20 11a1 1 0 0 1 0 1.752l-20 11A1 1 0 0 1 7 28Z"
+        fill="currentColor"
       />
     </svg>
   );
diff --git a/packages/thirdweb/src/react/web/ui/MediaRenderer/mime/mime.test.ts b/packages/thirdweb/src/react/web/ui/MediaRenderer/mime/mime.test.ts
index 26d95a29dd8..c85543fc3dd 100644
--- a/packages/thirdweb/src/react/web/ui/MediaRenderer/mime/mime.test.ts
+++ b/packages/thirdweb/src/react/web/ui/MediaRenderer/mime/mime.test.ts
@@ -56,7 +56,6 @@ describe("getMimeTypeFromUrl", () => {
   });
 
   it("should return correct mime type for all defined extensions", () => {
-    // biome-ignore lint/complexity/noForEach: Relax just a test
     Object.entries(extensionsToMimeType).forEach(([extension, mimeType]) => {
       expect(getMimeTypeFromUrl(`https://example.com/file.${extension}`)).toBe(
         mimeType,
diff --git a/packages/thirdweb/src/react/web/ui/MediaRenderer/mime/types.ts b/packages/thirdweb/src/react/web/ui/MediaRenderer/mime/types.ts
index 4f962c0285e..c79a4e512e4 100644
--- a/packages/thirdweb/src/react/web/ui/MediaRenderer/mime/types.ts
+++ b/packages/thirdweb/src/react/web/ui/MediaRenderer/mime/types.ts
@@ -9,63 +9,60 @@ const IMG_JPEG = "image/jpeg";
 export const extensionsToMimeType: Record<string, string> = {
   // audio
   "*3gpp": "audio/3gpp",
-  adp: "audio/adpcm",
-  amr: "audio/amr",
-  au: "audio/basic",
-  snd: "audio/basic",
-  mid: AUDIO_MIDI,
-  midi: AUDIO_MIDI,
-  kar: AUDIO_MIDI,
-  rmi: AUDIO_MIDI,
-  mxmf: "audio/mobile-xmf",
+  "*jpm": "video/jpm",
   "*mp3": "audio/mp3",
-  m4a: "audio/mp4",
-  mp4a: "audio/mp4",
-  mpga: AUDIO_MPEG,
-  mp2: AUDIO_MPEG,
-  mp2a: AUDIO_MPEG,
-  mp3: AUDIO_MPEG,
-  m2a: AUDIO_MPEG,
-  m3a: AUDIO_MPEG,
-  oga: AUDIO_OG,
-  ogg: AUDIO_OG,
-  spx: AUDIO_OG,
-  opus: AUDIO_OG,
-  s3m: "audio/s3m",
-  sil: "audio/silk",
-  wav: "audio/wav",
   "*wav": "audio/wave",
-  weba: "audio/webm",
-  // images
-  xm: "audio/xm",
-  exr: "image/aces",
+  "*x3db": "model/x3d+binary",
+  "*x3dv": "model/x3d+vrml",
+  "3g2": "video/3gpp2",
+  // videos
+  "3gp": "video/3gpp",
+  "3gpp": "video/3gpp",
+  // 3d models
+  "3mf": "model/3mf",
+  adp: "audio/adpcm",
+  amr: "audio/amr",
   apng: "image/apng",
+  au: "audio/basic",
   avif: "image/avif",
   bmp: "image/bmp",
   cgm: "image/cgm",
   drle: "image/dicom-rle",
   emf: "image/emf",
+  exr: "image/aces",
   fits: "image/fits",
   g3: "image/g3fax",
   gif: "image/gif",
+  glb: "model/gltf-binary",
+  gltf: "model/gltf+json",
+  h261: "video/h261",
+  h263: "video/h263",
+  h264: "video/h264",
   heic: "image/heic",
   heics: "image/heic-sequence",
   heif: "image/heif",
   heifs: "image/heif-sequence",
   hej2: "image/hej2k",
   hsj2: "image/hsj2",
+  htm: "text/html",
+  // html
+  html: "text/html",
   ief: "image/ief",
+  iges: "model/iges",
+  igs: "model/iges",
+  jhc: "image/jphc",
   jls: "image/jls",
   jp2: "image/jp2",
-  jpg2: "image/jp2",
+  jpe: IMG_JPEG,
   jpeg: IMG_JPEG,
+  jpf: "image/jpx",
   jpg: IMG_JPEG,
-  jpe: IMG_JPEG,
+  jpg2: "image/jp2",
+  jpgm: "video/jpm",
+  jpgv: "video/jpeg",
   jph: "image/jph",
-  jhc: "image/jphc",
   jpm: "image/jpm",
   jpx: "image/jpx",
-  jpf: "image/jpx",
   jxr: "image/jxr",
   jxra: "image/jxra",
   jxrs: "image/jxrs",
@@ -73,69 +70,72 @@ export const extensionsToMimeType: Record<string, string> = {
   jxsc: "image/jxsc",
   jxsi: "image/jxsi",
   jxss: "image/jxss",
+  kar: AUDIO_MIDI,
   ktx: "image/ktx",
   ktx2: "image/ktx2",
+  m1v: "video/mpeg",
+  m2a: AUDIO_MPEG,
+  m2v: "video/mpeg",
+  m3a: AUDIO_MPEG,
+  m4a: "audio/mp4",
+  m4s: "video/iso.segment",
+  mesh: "model/mesh",
+  mid: AUDIO_MIDI,
+  midi: AUDIO_MIDI,
+  mj2: "video/mj2",
+  mjp2: "video/mj2",
+  mkv: "video/x-matroska",
+  mov: "video/quicktime",
+  mp2: AUDIO_MPEG,
+  mp2a: AUDIO_MPEG,
+  mp3: AUDIO_MPEG,
+  mp4: "video/mp4",
+  mp4a: "audio/mp4",
+  mp4v: "video/mp4",
+  mpe: "video/mpeg",
+  mpeg: "video/mpeg",
+  mpg: "video/mpeg",
+  mpg4: "video/mp4",
+  mpga: AUDIO_MPEG,
+  msh: "model/mesh",
+  mtl: "model/mtl",
+  mxmf: "audio/mobile-xmf",
+  obj: "model/obj",
+  oga: AUDIO_OG,
+  ogg: AUDIO_OG,
+  ogv: "video/ogg",
+  opus: AUDIO_OG,
   png: "image/png",
+  qt: "video/quicktime",
+  rmi: AUDIO_MIDI,
+  s3m: "audio/s3m",
   sgi: "image/sgi",
+  shtml: "text/html",
+  sil: "audio/silk",
+  silo: "model/mesh",
+  snd: "audio/basic",
+  spx: AUDIO_OG,
+  stl: "model/stl",
   svg: "image/svg+xml",
   svgz: "image/svg+xml",
   t38: "image/t38",
+  tfx: "image/tiff-fx",
   tif: "image/tiff",
   tiff: "image/tiff",
-  tfx: "image/tiff-fx",
+  ts: "video/mp2t",
+  vrml: "model/vrml",
+  wav: "audio/wav",
+  weba: "audio/webm",
+  webm: "video/webm",
   webp: "image/webp",
   wmf: "image/wmf",
-  // 3d models
-  "3mf": "model/3mf",
-  gltf: "model/gltf+json",
-  glb: "model/gltf-binary",
-  igs: "model/iges",
-  iges: "model/iges",
-  msh: "model/mesh",
-  mesh: "model/mesh",
-  silo: "model/mesh",
-  mtl: "model/mtl",
-  obj: "model/obj",
-  stl: "model/stl",
   wrl: "model/vrml",
-  vrml: "model/vrml",
-  "*x3db": "model/x3d+binary",
-  x3dbz: "model/x3d+binary",
+  x3d: "model/x3d+xml",
   x3db: "model/x3d+fastinfoset",
-  "*x3dv": "model/x3d+vrml",
+  x3dbz: "model/x3d+binary",
+  x3dv: "model/x3d-vrml",
   x3dvz: "model/x3d+vrml",
-  x3d: "model/x3d+xml",
   x3dz: "model/x3d+xml",
-  x3dv: "model/x3d-vrml",
-  // html
-  html: "text/html",
-  htm: "text/html",
-  shtml: "text/html",
-  // videos
-  "3gp": "video/3gpp",
-  "3gpp": "video/3gpp",
-  "3g2": "video/3gpp2",
-  h261: "video/h261",
-  h263: "video/h263",
-  h264: "video/h264",
-  m4s: "video/iso.segment",
-  jpgv: "video/jpeg",
-  "*jpm": "video/jpm",
-  jpgm: "video/jpm",
-  mj2: "video/mj2",
-  mjp2: "video/mj2",
-  ts: "video/mp2t",
-  mp4: "video/mp4",
-  mp4v: "video/mp4",
-  mpg4: "video/mp4",
-  mpeg: "video/mpeg",
-  mpg: "video/mpeg",
-  mpe: "video/mpeg",
-  m1v: "video/mpeg",
-  m2v: "video/mpeg",
-  ogv: "video/ogg",
-  qt: "video/quicktime",
-  mov: "video/quicktime",
-  webm: "video/webm",
-  mkv: "video/x-matroska",
+  // images
+  xm: "audio/xm",
 };
diff --git a/packages/thirdweb/src/react/web/ui/MediaRenderer/useResolvedMediaType.test.tsx b/packages/thirdweb/src/react/web/ui/MediaRenderer/useResolvedMediaType.test.tsx
index 38622c005b7..997ff5cc251 100644
--- a/packages/thirdweb/src/react/web/ui/MediaRenderer/useResolvedMediaType.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/MediaRenderer/useResolvedMediaType.test.tsx
@@ -19,8 +19,8 @@ describe("useResolvedMediaType", () => {
     expect(
       resolveMediaTypeFromUri({
         client,
-        uri: "ipfs://test",
         gatewayUrl: "https://cf-ipfs.com/ipfs/",
+        uri: "ipfs://test",
       }),
     ).toBe("https://cf-ipfs.com/ipfs/test");
   });
diff --git a/packages/thirdweb/src/react/web/ui/MediaRenderer/useResolvedMediaType.ts b/packages/thirdweb/src/react/web/ui/MediaRenderer/useResolvedMediaType.ts
index 6725c87ef6b..8ba11a6e797 100644
--- a/packages/thirdweb/src/react/web/ui/MediaRenderer/useResolvedMediaType.ts
+++ b/packages/thirdweb/src/react/web/ui/MediaRenderer/useResolvedMediaType.ts
@@ -19,7 +19,7 @@ export function useResolvedMediaType(
       return "";
     }
     if (uri.startsWith("ar://")) {
-      return resolveArweaveScheme({ uri, gatewayUrl });
+      return resolveArweaveScheme({ gatewayUrl, uri });
     }
     if (gatewayUrl) {
       return uri.replace("ipfs://", gatewayUrl);
@@ -35,18 +35,18 @@ export function useResolvedMediaType(
   }, [uri, gatewayUrl, client]);
 
   const resolvedMimeType = useQuery({
-    queryKey: ["mime-type", resolvedUrl],
-    queryFn: () => resolveMimeType(resolvedUrl),
     enabled: !!resolvedUrl && !mimeType,
     initialData: mimeType,
+    queryFn: () => resolveMimeType(resolvedUrl),
+    queryKey: ["mime-type", resolvedUrl],
   });
 
   return {
+    isFetched: resolvedMimeType.isFetched || !!mimeType,
     mediaInfo: {
-      url: resolvedUrl,
-      mimeType: resolvedMimeType.data || "image/", // default to image if no mime type is found
+      mimeType: resolvedMimeType.data || "image/",
+      url: resolvedUrl, // default to image if no mime type is found
     },
-    isFetched: resolvedMimeType.isFetched || !!mimeType,
   };
 }
 
@@ -63,7 +63,7 @@ export function resolveMediaTypeFromUri(props: {
     return "";
   }
   if (uri.startsWith("ar://")) {
-    return resolveArweaveScheme({ uri, gatewayUrl });
+    return resolveArweaveScheme({ gatewayUrl, uri });
   }
   if (gatewayUrl) {
     return uri.replace("ipfs://", gatewayUrl);
diff --git a/packages/thirdweb/src/react/web/ui/PayEmbed.tsx b/packages/thirdweb/src/react/web/ui/PayEmbed.tsx
index 3ecc56cfa9b..1936cf43d89 100644
--- a/packages/thirdweb/src/react/web/ui/PayEmbed.tsx
+++ b/packages/thirdweb/src/react/web/ui/PayEmbed.tsx
@@ -26,8 +26,8 @@ import { AutoConnect } from "../../web/ui/AutoConnect/AutoConnect.js";
 import { BuyWidget } from "./Bridge/BuyWidget.js";
 import { CheckoutWidget } from "./Bridge/CheckoutWidget.js";
 import { TransactionWidget } from "./Bridge/TransactionWidget.js";
-import { EmbedContainer } from "./ConnectWallet/Modal/ConnectEmbed.js";
 import { useConnectLocale } from "./ConnectWallet/locale/getConnectLocale.js";
+import { EmbedContainer } from "./ConnectWallet/Modal/ConnectEmbed.js";
 import BuyScreen from "./ConnectWallet/screens/Buy/BuyScreen.js";
 import { DynamicHeight } from "./components/DynamicHeight.js";
 import { Spinner } from "./components/Spinner.js";
@@ -353,14 +353,14 @@ export function PayEmbed(props: PayEmbedProps) {
   ) {
     return (
       <BuyWidget
-        title={metadata?.name || "Buy"}
-        chain={props.payOptions.prefillBuy.chain}
         amount={props.payOptions.prefillBuy.amount || "0.01"}
+        chain={props.payOptions.prefillBuy.chain}
+        client={props.client}
+        theme={theme}
+        title={metadata?.name || "Buy"}
         tokenAddress={
           props.payOptions.prefillBuy.token?.address as Address | undefined
         }
-        client={props.client}
-        theme={theme}
       />
     );
   }
@@ -368,17 +368,17 @@ export function PayEmbed(props: PayEmbedProps) {
   if (props.payOptions?.mode === "direct_payment") {
     return (
       <CheckoutWidget
-        name={metadata?.name || "Checkout"}
+        amount={(props.payOptions.paymentInfo as { amount: string }).amount}
+        chain={props.payOptions.paymentInfo.chain}
+        client={props.client}
         description={metadata?.description}
         image={metadata?.image}
-        chain={props.payOptions.paymentInfo.chain}
+        name={metadata?.name || "Checkout"}
+        seller={props.payOptions.paymentInfo.sellerAddress as Address}
+        theme={theme}
         tokenAddress={
           props.payOptions.paymentInfo.token?.address as Address | undefined
         }
-        amount={(props.payOptions.paymentInfo as { amount: string }).amount}
-        seller={props.payOptions.paymentInfo.sellerAddress as Address}
-        client={props.client}
-        theme={theme}
       />
     );
   }
@@ -386,12 +386,12 @@ export function PayEmbed(props: PayEmbedProps) {
   if (props.payOptions?.mode === "transaction") {
     return (
       <TransactionWidget
-        title={metadata?.name}
+        client={props.client}
         description={metadata?.description}
         image={metadata?.image}
-        transaction={props.payOptions.transaction}
-        client={props.client}
         theme={theme}
+        title={metadata?.name}
+        transaction={props.payOptions.transaction}
       />
     );
   }
@@ -400,13 +400,13 @@ export function PayEmbed(props: PayEmbedProps) {
     content = (
       <div
         style={{
-          minHeight: "350px",
+          alignItems: "center",
           display: "flex",
           justifyContent: "center",
-          alignItems: "center",
+          minHeight: "350px",
         }}
       >
-        <Spinner size="xl" color="secondaryText" />
+        <Spinner color="secondaryText" size="xl" />
       </div>
     );
   } else {
@@ -415,26 +415,26 @@ export function PayEmbed(props: PayEmbedProps) {
         <AutoConnect client={props.client} siweAuth={siweAuth} />
         {screen === "buy" && (
           <BuyScreen
-            title={metadata?.name || "Buy"}
-            isEmbed={true}
-            supportedTokens={props.supportedTokens}
-            theme={theme}
             client={props.client}
             connectLocale={localeQuery.data}
+            connectOptions={props.connectOptions}
             hiddenWallets={props.hiddenWallets}
+            isEmbed={true}
+            onBack={undefined}
+            onDone={() => {
+              if (props.payOptions?.mode === "transaction") {
+                setScreen("execute-tx");
+              }
+            }}
             paymentLinkId={props.paymentLinkId}
             payOptions={
               props.payOptions || {
                 mode: "fund_wallet",
               }
             }
-            onDone={() => {
-              if (props.payOptions?.mode === "transaction") {
-                setScreen("execute-tx");
-              }
-            }}
-            connectOptions={props.connectOptions}
-            onBack={undefined}
+            supportedTokens={props.supportedTokens}
+            theme={theme}
+            title={metadata?.name || "Buy"}
           />
         )}
       </>
@@ -444,9 +444,9 @@ export function PayEmbed(props: PayEmbedProps) {
   return (
     <CustomThemeProvider theme={theme}>
       <EmbedContainer
+        className={props.className}
         modalSize="compact"
         style={props.style}
-        className={props.className}
       >
         <DynamicHeight>{content}</DynamicHeight>
       </EmbedContainer>
diff --git a/packages/thirdweb/src/react/web/ui/SiteEmbed.test.tsx b/packages/thirdweb/src/react/web/ui/SiteEmbed.test.tsx
index dbfebf9c10d..ec9c24a5540 100644
--- a/packages/thirdweb/src/react/web/ui/SiteEmbed.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/SiteEmbed.test.tsx
@@ -7,7 +7,7 @@ describe("SiteEmbed", () => {
   it("renders iframe with correct src", () => {
     const testUrl = "https://thirdweb.com/";
     const { container } = render(
-      <SiteEmbed src={testUrl} client={TEST_CLIENT} />,
+      <SiteEmbed client={TEST_CLIENT} src={testUrl} />,
     );
 
     const iframe = container.querySelector("iframe");
@@ -18,14 +18,14 @@ describe("SiteEmbed", () => {
     const testUrl = "https://thirdweb.com/";
     expect(() =>
       // biome-ignore lint/suspicious/noExplicitAny: testing invalid input
-      render(<SiteEmbed src={testUrl} client={{} as any} />),
+      render(<SiteEmbed client={{} as any} src={testUrl} />),
     ).toThrow("The SiteEmbed client must have a clientId");
   });
 
   it("uses inApp wallet when wallet is a smart wallet", async () => {
     const testUrl = "https://thirdweb.com/";
     const { container } = render(
-      <SiteEmbed src={testUrl} client={TEST_CLIENT} />,
+      <SiteEmbed client={TEST_CLIENT} src={testUrl} />,
       {
         setConnectedWallet: true,
         walletId: "smart",
diff --git a/packages/thirdweb/src/react/web/ui/SiteEmbed.tsx b/packages/thirdweb/src/react/web/ui/SiteEmbed.tsx
index f57e8393a58..ed0a2c4cde5 100644
--- a/packages/thirdweb/src/react/web/ui/SiteEmbed.tsx
+++ b/packages/thirdweb/src/react/web/ui/SiteEmbed.tsx
@@ -48,10 +48,7 @@ export function SiteEmbed({
   const activeWallet = useActiveWallet();
   const walletId = activeWallet?.id;
 
-  const {
-    data: { authProvider, authCookie } = {},
-  } = useQuery({
-    queryKey: ["site-embed", walletId, src, client.clientId, ecosystem],
+  const { data: { authProvider, authCookie } = {} } = useQuery({
     enabled:
       activeWallet &&
       (isEcosystemWallet(activeWallet) ||
@@ -59,16 +56,17 @@ export function SiteEmbed({
         walletId === "smart"),
     queryFn: async () => {
       const storage = new ClientScopedStorage({
-        storage: webLocalStorage,
         clientId: client.clientId,
         ecosystem,
+        storage: webLocalStorage,
       });
 
       const authProvider = await getLastAuthProvider(webLocalStorage);
       const authCookie = await storage.getAuthCookie();
 
-      return { authProvider, authCookie };
+      return { authCookie, authProvider };
     },
+    queryKey: ["site-embed", walletId, src, client.clientId, ecosystem],
   });
 
   const url = new URL(src);
@@ -84,10 +82,10 @@ export function SiteEmbed({
 
   return (
     <iframe
+      allowFullScreen
+      height="100%"
       src={encodeURI(url.toString())}
       width="100%"
-      height="100%"
-      allowFullScreen
       {...props}
     />
   );
diff --git a/packages/thirdweb/src/react/web/ui/SiteLink.test.tsx b/packages/thirdweb/src/react/web/ui/SiteLink.test.tsx
index b916adad253..daf5dfe9cd3 100644
--- a/packages/thirdweb/src/react/web/ui/SiteLink.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/SiteLink.test.tsx
@@ -7,7 +7,7 @@ describe("SiteLink", () => {
   it("renders anchor with correct href", () => {
     const testUrl = "https://example.com/";
     const { container } = render(
-      <SiteLink href={testUrl} client={TEST_CLIENT}>
+      <SiteLink client={TEST_CLIENT} href={testUrl}>
         Test Link
       </SiteLink>,
     );
@@ -23,7 +23,7 @@ describe("SiteLink", () => {
     expect(() =>
       render(
         // biome-ignore lint/suspicious/noExplicitAny: testing invalid input
-        <SiteLink href={testUrl} client={{} as any}>
+        <SiteLink client={{} as any} href={testUrl}>
           Test Link
         </SiteLink>,
       ),
@@ -33,7 +33,7 @@ describe("SiteLink", () => {
   it("adds wallet params to url when wallet is connected", async () => {
     const testUrl = "https://example.com/";
     const { container } = render(
-      <SiteLink href={testUrl} client={TEST_CLIENT}>
+      <SiteLink client={TEST_CLIENT} href={testUrl}>
         Test Link
       </SiteLink>,
       {
@@ -49,7 +49,7 @@ describe("SiteLink", () => {
   it("uses inApp wallet when wallet is a smart wallet", async () => {
     const testUrl = "https://example.com/";
     const { container } = render(
-      <SiteLink href={testUrl} client={TEST_CLIENT}>
+      <SiteLink client={TEST_CLIENT} href={testUrl}>
         Test Link
       </SiteLink>,
       {
diff --git a/packages/thirdweb/src/react/web/ui/SiteLink.tsx b/packages/thirdweb/src/react/web/ui/SiteLink.tsx
index a30ef72f257..078ff2f9833 100644
--- a/packages/thirdweb/src/react/web/ui/SiteLink.tsx
+++ b/packages/thirdweb/src/react/web/ui/SiteLink.tsx
@@ -48,10 +48,7 @@ export function SiteLink({
   const activeWallet = useActiveWallet();
   const walletId = activeWallet?.id;
 
-  const {
-    data: { authProvider, authCookie } = {},
-  } = useQuery({
-    queryKey: ["site-link", walletId, href, client.clientId, ecosystem],
+  const { data: { authProvider, authCookie } = {} } = useQuery({
     enabled:
       activeWallet &&
       (isEcosystemWallet(activeWallet) ||
@@ -59,16 +56,17 @@ export function SiteLink({
         walletId === "smart"),
     queryFn: async () => {
       const storage = new ClientScopedStorage({
-        storage: webLocalStorage,
         clientId: client.clientId,
         ecosystem,
+        storage: webLocalStorage,
       });
 
       const authProvider = await getLastAuthProvider(webLocalStorage);
       const authCookie = await storage.getAuthCookie();
 
-      return { authProvider, authCookie };
+      return { authCookie, authProvider };
     },
+    queryKey: ["site-link", walletId, href, client.clientId, ecosystem],
   });
 
   const url = new URL(href);
diff --git a/packages/thirdweb/src/react/web/ui/TransactionButton/DepositScreen.tsx b/packages/thirdweb/src/react/web/ui/TransactionButton/DepositScreen.tsx
index bfdad370482..d7153ec81e2 100644
--- a/packages/thirdweb/src/react/web/ui/TransactionButton/DepositScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/TransactionButton/DepositScreen.tsx
@@ -22,15 +22,15 @@ import { useTransactionCostAndData } from "../ConnectWallet/screens/Buy/main/use
 import { WalletRow } from "../ConnectWallet/screens/Buy/swap/WalletRow.js";
 import { formatTokenBalance } from "../ConnectWallet/screens/formatTokenBalance.js";
 import { isNativeToken } from "../ConnectWallet/screens/nativeToken.js";
+import { Container, ModalHeader } from "../components/basic.js";
+import { Button } from "../components/buttons.js";
 import { CopyIcon } from "../components/CopyIcon.js";
 import { QRCode } from "../components/QRCode.js";
 import { Skeleton } from "../components/Skeleton.js";
 import { Spacer } from "../components/Spacer.js";
-import { WalletImage } from "../components/WalletImage.js";
-import { Container, ModalHeader } from "../components/basic.js";
-import { Button } from "../components/buttons.js";
 import { Text } from "../components/text.js";
 import { TokenSymbol } from "../components/token/TokenSymbol.js";
+import { WalletImage } from "../components/WalletImage.js";
 import { StyledButton, StyledDiv } from "../design-system/elements.js";
 import { useClipboard } from "../hooks/useCopyClipboard.js";
 
@@ -48,25 +48,25 @@ const pulseAnimation = keyframes`
 const WaitingBadge = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
-    display: "flex",
+    "&::before": {
+      animation: `${pulseAnimation} 1s infinite`,
+      backgroundColor: theme.colors.accentText,
+      borderRadius: "50%",
+      content: '""',
+      height: "8px",
+      width: "8px",
+    },
     alignItems: "center",
-    gap: spacing.sm,
     backgroundColor: theme.colors.tertiaryBg,
     border: `1px solid ${theme.colors.borderColor}`,
-    padding: `${spacing.md} ${spacing.sm}`,
     borderRadius: radius.lg,
     color: theme.colors.secondaryText,
+    display: "flex",
     fontSize: fontSize.sm,
     fontWeight: 500,
+    gap: spacing.sm,
+    padding: `${spacing.md} ${spacing.sm}`,
     position: "relative" as const,
-    "&::before": {
-      content: '""',
-      width: "8px",
-      height: "8px",
-      borderRadius: "50%",
-      backgroundColor: theme.colors.accentText,
-      animation: `${pulseAnimation} 1s infinite`,
-    },
   };
 });
 
@@ -94,10 +94,10 @@ export function DepositScreen(props: {
     isFetching: transactionCostAndDataFetching,
     refetch: transactionCostAndDataRefetch,
   } = useTransactionCostAndData({
-    transaction: props.tx,
     account: activeAccount,
-    supportedDestinations: [],
     refetchIntervalMs: 10_000,
+    supportedDestinations: [],
+    transaction: props.tx,
   });
   const theme = useCustomTheme();
   const sponsoredTransactionsEnabled =
@@ -106,16 +106,16 @@ export function DepositScreen(props: {
   if (transactionCostAndDataError) {
     return (
       <Container
+        center="both"
+        flex="row"
+        fullHeight
         style={{
           minHeight: "350px",
         }}
-        fullHeight
-        flex="row"
-        center="both"
       >
         <ErrorState
-          title={transactionCostAndDataError?.message || "Something went wrong"}
           onTryAgain={transactionCostAndDataRefetch}
+          title={transactionCostAndDataError?.message || "Something went wrong"}
         />
       </Container>
     );
@@ -144,14 +144,14 @@ export function DepositScreen(props: {
 
   return (
     <Container p="lg">
-      <ModalHeader title={"Insufficient funds"} onBack={props.onBack} />
+      <ModalHeader onBack={props.onBack} title={"Insufficient funds"} />
 
       <Spacer y="lg" />
 
       <Container flex="column" gap="sm">
         {insufficientFunds && (
           <div>
-            <Text size="xs" center color="danger" multiline>
+            <Text center color="danger" multiline size="xs">
               You need{" "}
               {formatNumber(
                 Number.parseFloat(
@@ -166,62 +166,62 @@ export function DepositScreen(props: {
         <Container
           flex="row"
           style={{
-            justifyContent: "space-between",
-            padding: spacing.sm,
-            borderRadius: `${radius.md} ${radius.md} 0 0`,
             border: `1px solid ${theme.colors.borderColor}`,
             borderBottom: "none",
+            borderRadius: `${radius.md} ${radius.md} 0 0`,
+            justifyContent: "space-between",
+            padding: spacing.sm,
           }}
         >
           {activeAccount && (
             <WalletRow
               address={activeAccount?.address}
-              iconSize="md"
               client={client}
+              iconSize="md"
             />
           )}
           {transactionCostAndData.walletBalance.value !== undefined &&
           !transactionCostAndDataFetching ? (
-            <Container flex="row" gap="3xs" center="y">
-              <Text size="xs" color="secondaryText" weight={500}>
+            <Container center="y" flex="row" gap="3xs">
+              <Text color="secondaryText" size="xs" weight={500}>
                 {formatTokenBalance(
                   transactionCostAndData.walletBalance,
                   false,
                 )}
               </Text>
               <TokenSymbol
-                token={transactionCostAndData.token}
                 chain={props.tx.chain}
-                size="xs"
                 color="secondaryText"
+                size="xs"
+                token={transactionCostAndData.token}
               />
             </Container>
           ) : (
-            <Container flex="row" gap="3xs" center="y">
-              <Skeleton width="70px" height={fontSize.xs} />
+            <Container center="y" flex="row" gap="3xs">
+              <Skeleton height={fontSize.xs} width="70px" />
             </Container>
           )}
         </Container>
       </Container>
 
       <WalletAddressContainer onClick={onCopy}>
-        <Container flex="column" gap="md" center="both" expand>
-          <Container flex="row" center="x">
+        <Container center="both" expand flex="column" gap="md">
+          <Container center="x" flex="row">
             <QRCode
-              qrCodeUri={address}
-              size={250}
               QRIcon={
                 activeWallet && (
                   <WalletImage
+                    client={client}
                     id={activeWallet.id}
                     size={iconSize.xl}
-                    client={client}
                   />
                 )
               }
+              qrCodeUri={address}
+              size={250}
             />
           </Container>
-          <Container flex="row" center="x" gap="xs">
+          <Container center="x" flex="row" gap="xs">
             <Text
               color="primaryText"
               size="md"
@@ -232,9 +232,9 @@ export function DepositScreen(props: {
               {address ? shortenAddress(address) : ""}
             </Text>
             <CopyIcon
+              hasCopied={hasCopied}
               text={address || ""}
               tip="Copy address"
-              hasCopied={hasCopied}
             />
           </Container>
         </Container>
@@ -243,11 +243,11 @@ export function DepositScreen(props: {
       <Spacer y="md" />
 
       <Text
-        multiline
-        center
         balance
-        size="sm"
+        center
         className="receive_fund_screen_instruction"
+        multiline
+        size="sm"
       >
         {locale.instruction}
       </Text>
@@ -259,17 +259,17 @@ export function DepositScreen(props: {
           Waiting for funds on {transactionCostAndData.chainMetadata.name}...
         </WaitingBadge>
       ) : (
-        <Button variant="accent" onClick={props.onDone} fullWidth>
+        <Button fullWidth onClick={props.onDone} variant="accent">
           Continue
         </Button>
       )}
       {insufficientFunds && isTestnet && (
         <>
           <Spacer y="md" />
-          <Button variant="link" onClick={openFaucetLink} fullWidth>
-            <Container flex="row" center="x" gap="xs" color="accentText">
+          <Button fullWidth onClick={openFaucetLink} variant="link">
+            <Container center="x" color="accentText" flex="row" gap="xs">
               <CoinsIcon size={iconSize.sm} />
-              <Text size="xs" color="accentText" weight={500} center>
+              <Text center color="accentText" size="xs" weight={500}>
                 Get testnet funds
               </Text>
             </Container>
@@ -283,18 +283,18 @@ export function DepositScreen(props: {
 const WalletAddressContainer = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
+    "&:hover": {
+      borderColor: theme.colors.accentText,
+    },
     all: "unset",
-    width: "100%",
+    border: `1px solid ${theme.colors.borderColor}`,
+    borderRadius: `0 0 ${radius.md} ${radius.md}`,
     boxSizing: "border-box",
     cursor: "pointer",
-    padding: spacing.md,
     display: "flex",
     justifyContent: "space-between",
-    border: `1px solid ${theme.colors.borderColor}`,
-    borderRadius: `0 0 ${radius.md} ${radius.md}`,
+    padding: spacing.md,
     transition: "border-color 200ms ease",
-    "&:hover": {
-      borderColor: theme.colors.accentText,
-    },
+    width: "100%",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/TransactionButton/ExecutingScreen.tsx b/packages/thirdweb/src/react/web/ui/TransactionButton/ExecutingScreen.tsx
index 0322b6caae4..5270a22bd72 100644
--- a/packages/thirdweb/src/react/web/ui/TransactionButton/ExecutingScreen.tsx
+++ b/packages/thirdweb/src/react/web/ui/TransactionButton/ExecutingScreen.tsx
@@ -10,10 +10,10 @@ import { iconSize } from "../../../core/design-system/index.js";
 import { useChainExplorers } from "../../../core/hooks/others/useChainQuery.js";
 import { useSendTransaction } from "../../hooks/transaction/useSendTransaction.js";
 import { AccentFailIcon } from "../ConnectWallet/icons/AccentFailIcon.js";
-import { Spacer } from "../components/Spacer.js";
-import { Spinner } from "../components/Spinner.js";
 import { Container, ModalHeader } from "../components/basic.js";
 import { Button } from "../components/buttons.js";
+import { Spacer } from "../components/Spacer.js";
+import { Spinner } from "../components/Spinner.js";
 import { Text } from "../components/text.js";
 
 export function ExecutingTxScreen(props: {
@@ -63,34 +63,34 @@ export function ExecutingTxScreen(props: {
 
   return (
     <Container p="lg">
-      <ModalHeader title="Transaction" onBack={props.onBack} />
+      <ModalHeader onBack={props.onBack} title="Transaction" />
 
       <Spacer y="xxl" />
 
-      <Container flex="row" center="x">
-        {status === "loading" && <Spinner size="xxl" color="accentText" />}
+      <Container center="x" flex="row">
+        {status === "loading" && <Spinner color="accentText" size="xxl" />}
         {status === "failed" && <AccentFailIcon size={iconSize["3xl"]} />}
         {status === "sent" && (
           <Container
             center="both"
             flex="row"
             style={{
-              width: "64px",
-              height: "64px",
-              borderRadius: "50%",
+              animation: "successBounce 0.6s ease-out",
               backgroundColor: theme.colors.tertiaryBg,
-              marginBottom: "16px",
               border: `2px solid ${theme.colors.success}`,
-              animation: "successBounce 0.6s ease-out",
+              borderRadius: "50%",
+              height: "64px",
+              marginBottom: "16px",
+              width: "64px",
             }}
           >
             <CheckIcon
-              width={iconSize.xl}
-              height={iconSize.xl}
               color={theme.colors.success}
+              height={iconSize.xl}
               style={{
                 animation: "checkAppear 0.3s ease-out 0.3s both",
               }}
+              width={iconSize.xl}
             />
           </Container>
         )}
@@ -98,20 +98,20 @@ export function ExecutingTxScreen(props: {
 
       <Spacer y="md" />
 
-      <Text color="primaryText" center size="lg">
+      <Text center color="primaryText" size="lg">
         {status === "loading" && "Sending transaction"}
         {status === "failed" && "Transaction failed"}
         {status === "sent" && "Transaction sent"}
       </Text>
       <Spacer y="sm" />
-      <Text color="danger" center size="sm">
+      <Text center color="danger" size="sm">
         {status === "failed" && txError ? txError.message || "" : ""}
       </Text>
 
       <Spacer y="xl" />
 
       {status === "failed" && (
-        <Button variant="accent" fullWidth onClick={sendTx}>
+        <Button fullWidth onClick={sendTx} variant="accent">
           Try Again
         </Button>
       )}
@@ -121,8 +121,9 @@ export function ExecutingTxScreen(props: {
           {txHash && (
             <>
               <Button
-                variant="secondary"
+                color="primaryText"
                 fullWidth
+                gap="xs"
                 onClick={() => {
                   props.windowAdapter.open(
                     formatExplorerTxUrl(
@@ -131,16 +132,15 @@ export function ExecutingTxScreen(props: {
                     ),
                   );
                 }}
-                gap="xs"
-                color="primaryText"
+                variant="secondary"
               >
                 View on Explorer
-                <ExternalLinkIcon width={iconSize.sm} height={iconSize.sm} />
+                <ExternalLinkIcon height={iconSize.sm} width={iconSize.sm} />
               </Button>
               <Spacer y="sm" />
             </>
           )}
-          <Button variant="accent" fullWidth onClick={props.closeModal}>
+          <Button fullWidth onClick={props.closeModal} variant="accent">
             Done
           </Button>
         </>
diff --git a/packages/thirdweb/src/react/web/ui/TransactionButton/TransactionButton.test.tsx b/packages/thirdweb/src/react/web/ui/TransactionButton/TransactionButton.test.tsx
index b20b9f05f48..ab221e1137b 100644
--- a/packages/thirdweb/src/react/web/ui/TransactionButton/TransactionButton.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/TransactionButton/TransactionButton.test.tsx
@@ -20,8 +20,8 @@ vi.mock("../../../../transaction/actions/send-transaction.js", () => ({
 }));
 
 const TRANSFER_TX = prepareTransaction({
-  client: TEST_CLIENT,
   chain: ANVIL_CHAIN,
+  client: TEST_CLIENT,
   to: TEST_ACCOUNT_A.address,
   value: BigInt(toWei("100")),
 });
diff --git a/packages/thirdweb/src/react/web/ui/TransactionButton/TransactionModal.tsx b/packages/thirdweb/src/react/web/ui/TransactionButton/TransactionModal.tsx
index c8ace7fa0e3..5c7f458bd33 100644
--- a/packages/thirdweb/src/react/web/ui/TransactionButton/TransactionModal.tsx
+++ b/packages/thirdweb/src/react/web/ui/TransactionButton/TransactionModal.tsx
@@ -40,40 +40,40 @@ export function TransactionModal(props: ModalProps) {
   const wallet = useActiveWallet();
 
   useQuery({
-    queryKey: ["transaction-modal-event", props.txId],
+    enabled: !!wallet && !!account,
     queryFn: async () => {
       if (!account || !wallet) {
         throw new Error(); // never happens, because enabled is false
       }
       trackPayEvent({
         client: props.client,
-        walletAddress: account.address,
-        walletType: wallet.id,
-        toChainId: props.tx.chain.id,
-        toToken: props.tx.erc20Value
-          ? (await resolvePromisedValue(props.tx.erc20Value))?.tokenAddress
-          : undefined,
         event:
           props.modalMode === "buy"
             ? "open_pay_transaction_modal"
             : "open_pay_deposit_modal",
+        toChainId: props.tx.chain.id,
+        toToken: props.tx.erc20Value
+          ? (await resolvePromisedValue(props.tx.erc20Value))?.tokenAddress
+          : undefined,
+        walletAddress: account.address,
+        walletType: wallet.id,
       });
 
       return null;
     },
-    enabled: !!wallet && !!account,
+    queryKey: ["transaction-modal-event", props.txId],
   });
 
   return (
     <CustomThemeProvider theme={props.theme}>
       <Modal
         open={true}
-        size="compact"
         setOpen={(_open) => {
           if (!_open) {
             props.onClose();
           }
         }}
+        size="compact"
       >
         <TransactionModalContent {...props} />
       </Modal>
@@ -92,9 +92,9 @@ function TransactionModalContent(props: ModalProps & { onBack?: () => void }) {
   if (screen === "execute-tx") {
     return (
       <ExecutingTxScreen
-        tx={props.tx}
         closeModal={props.onClose}
         onTxSent={props.onTxSent}
+        tx={props.tx}
         windowAdapter={webWindowAdapter}
       />
     );
@@ -104,12 +104,12 @@ function TransactionModalContent(props: ModalProps & { onBack?: () => void }) {
     return (
       <DepositScreen
         client={props.client}
-        onBack={props.onBack}
-        tx={props.tx}
         connectLocale={localeQuery.data}
+        onBack={props.onBack}
         onDone={() => {
           setScreen("execute-tx");
         }}
+        tx={props.tx}
       />
     );
   }
@@ -117,21 +117,21 @@ function TransactionModalContent(props: ModalProps & { onBack?: () => void }) {
   return (
     <BridgeOrchestrator
       client={props.client}
-      uiOptions={{
-        mode: "transaction",
-        transaction: props.tx,
-      }}
       connectLocale={localeQuery.data}
+      connectOptions={undefined}
+      onCancel={props.onClose}
       onComplete={() => {
         setScreen("execute-tx");
       }}
       onError={(_error) => {}}
-      onCancel={props.onClose}
-      connectOptions={undefined}
-      receiverAddress={undefined}
-      purchaseData={undefined}
       paymentLinkId={undefined}
       presetOptions={undefined}
+      purchaseData={undefined}
+      receiverAddress={undefined}
+      uiOptions={{
+        mode: "transaction",
+        transaction: props.tx,
+      }}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/ui/TransactionButton/index.tsx b/packages/thirdweb/src/react/web/ui/TransactionButton/index.tsx
index 69d2be76c60..96ccfc8fdbf 100644
--- a/packages/thirdweb/src/react/web/ui/TransactionButton/index.tsx
+++ b/packages/thirdweb/src/react/web/ui/TransactionButton/index.tsx
@@ -6,8 +6,8 @@ import {
 } from "../../../core/hooks/transaction/transaction-button-utils.js";
 import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
 import { useSendTransaction } from "../../hooks/transaction/useSendTransaction.js";
-import { Spinner } from "../components/Spinner.js";
 import { Button } from "../components/buttons.js";
+import { Spinner } from "../components/Spinner.js";
 
 /**
  * TransactionButton component is used to render a button that triggers a transaction.
@@ -134,10 +134,15 @@ import { Button } from "../components/buttons.js";
 export function TransactionButton(props: TransactionButtonProps) {
   const {
     children,
+    // biome-ignore lint/correctness/noUnusedVariables: TODO
     transaction,
+    // biome-ignore lint/correctness/noUnusedVariables: TODO
     onTransactionSent,
+    // biome-ignore lint/correctness/noUnusedVariables: TODO
     onTransactionConfirmed,
+    // biome-ignore lint/correctness/noUnusedVariables: TODO
     onError,
+    // biome-ignore lint/correctness/noUnusedVariables: TODO
     onClick,
     gasless,
     payModal,
@@ -155,18 +160,18 @@ export function TransactionButton(props: TransactionButtonProps) {
   return (
     <CustomThemeProvider theme={props.theme}>
       <Button
-        gap="xs"
-        disabled={!account || disabled || isPending}
-        variant="primary"
-        unstyled={unstyled}
         data-is-loading={isPending}
+        disabled={!account || disabled || isPending}
+        gap="xs"
         onClick={() => handleClick()}
+        unstyled={unstyled}
+        variant="primary"
         {...buttonProps}
         style={
           !unstyled
             ? {
-                opacity: !account || disabled ? 0.5 : 1,
                 minWidth: "165px",
+                opacity: !account || disabled ? 0.5 : 1,
                 position: "relative",
                 ...buttonProps.style,
               }
@@ -182,16 +187,16 @@ export function TransactionButton(props: TransactionButtonProps) {
         {isPending && (
           <div
             style={{
-              position: "absolute",
-              display: "flex",
               alignItems: "center",
-              height: "100%",
-              top: 0,
               bottom: 0,
+              display: "flex",
+              height: "100%",
               margin: "auto",
+              position: "absolute",
+              top: 0,
             }}
           >
-            <Spinner size="md" color="primaryButtonText" />
+            <Spinner color="primaryButtonText" size="md" />
           </div>
         )}
       </Button>
diff --git a/packages/thirdweb/src/react/web/ui/components/ChainActiveDot.tsx b/packages/thirdweb/src/react/web/ui/components/ChainActiveDot.tsx
index af7015e08eb..5fe09315136 100644
--- a/packages/thirdweb/src/react/web/ui/components/ChainActiveDot.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/ChainActiveDot.tsx
@@ -6,12 +6,12 @@ import { StyledDiv } from "../design-system/elements.js";
  * @internal
  */
 export const ChainActiveDot = /* @__PURE__ */ StyledDiv({
-  width: "28%",
-  height: "28%",
+  backgroundColor: "#00d395",
   borderRadius: "50%",
-  position: "absolute",
   bottom: 0,
-  right: 0,
-  backgroundColor: "#00d395",
   boxShadow: "0 0 0 2px var(--bg)",
+  height: "28%",
+  position: "absolute",
+  right: 0,
+  width: "28%",
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/ChainIcon.test.tsx b/packages/thirdweb/src/react/web/ui/components/ChainIcon.test.tsx
index 185cc3a650d..4be7bd71fe6 100644
--- a/packages/thirdweb/src/react/web/ui/components/ChainIcon.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/ChainIcon.test.tsx
@@ -14,14 +14,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("ChainIcon-legacy", () => {
 
   it("getSrcChainIcon should return the resolved url", () => {
     const resolvedUrl = getSrcChainIcon({
-      client,
       chainIconUrl: TEST_CONTRACT_URI,
+      client,
     });
     expect(resolvedUrl.startsWith("https://")).toBe(true);
   });
 
   it("getSrcChainIcon should return the fallbackChainIcon if fails to resolve", () => {
-    expect(getSrcChainIcon({ client, chainIconUrl: "test" })).toBe(
+    expect(getSrcChainIcon({ chainIconUrl: "test", client })).toBe(
       fallbackChainIcon,
     );
   });
@@ -46,10 +46,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("ChainIcon-legacy", () => {
   it("should render ChainActiveDot if the `active` prop is set to true", () => {
     const { container } = render(
       <ChainIcon
+        active
         chainIconUrl="ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/ethereum/512.png"
         client={client}
         size="lg"
-        active
       />,
     );
     const activeDot = container.querySelector(
diff --git a/packages/thirdweb/src/react/web/ui/components/ChainIcon.tsx b/packages/thirdweb/src/react/web/ui/components/ChainIcon.tsx
index f68ba8e2027..a97eb3bf785 100644
--- a/packages/thirdweb/src/react/web/ui/components/ChainIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/ChainIcon.tsx
@@ -1,9 +1,9 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { resolveScheme } from "../../../../utils/ipfs.js";
-import { ChainActiveDot } from "./ChainActiveDot.js";
-import { Img } from "./Img.js";
 import { Container } from "./basic.js";
+import { ChainActiveDot } from "./ChainActiveDot.js";
 import { fallbackChainIcon } from "./fallbackChainIcon.js";
+import { Img } from "./Img.js";
 
 /**
  * This component (file) will eventually be replaced with the ChainIcon prebuilt version.
@@ -20,18 +20,18 @@ export const ChainIcon: React.FC<{
   return (
     <Container
       style={{
-        position: "relative",
+        alignItems: "center",
         display: "flex",
         flexShrink: 0,
-        alignItems: "center",
+        position: "relative",
       }}
     >
       <Img
+        client={props.client}
+        fallbackImage={fallbackChainIcon}
+        height={props.size}
         src={getSrcChainIcon(props)}
         width={props.size}
-        height={props.size}
-        fallbackImage={fallbackChainIcon}
-        client={props.client}
       />
       {props.active && (
         <ChainActiveDot className="tw-chain-active-dot-legacy-chain-icon" />
@@ -53,8 +53,8 @@ export const getSrcChainIcon = (props: {
   }
   try {
     return resolveScheme({
-      uri: url,
       client: props.client,
+      uri: url,
     });
   } catch {
     return fallbackChainIcon;
diff --git a/packages/thirdweb/src/react/web/ui/components/ChainName.tsx b/packages/thirdweb/src/react/web/ui/components/ChainName.tsx
index d685e066660..56b7ebe32c9 100644
--- a/packages/thirdweb/src/react/web/ui/components/ChainName.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/ChainName.tsx
@@ -20,13 +20,13 @@ export const ChainName: React.FC<{
 
   if (name) {
     return (
-      <Text size={props.size} color={props.color} style={props.style}>
+      <Text color={props.color} size={props.size} style={props.style}>
         {props.short ? shorterChainName(name) : name}
       </Text>
     );
   }
 
-  return <Skeleton width="50px" height={fontSize[props.size]} />;
+  return <Skeleton height={fontSize[props.size]} width="50px" />;
 };
 
 export function shorterChainName(name: string) {
diff --git a/packages/thirdweb/src/react/web/ui/components/CopyIcon.tsx b/packages/thirdweb/src/react/web/ui/components/CopyIcon.tsx
index d788446bb1a..a8b38b99ddf 100644
--- a/packages/thirdweb/src/react/web/ui/components/CopyIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/CopyIcon.tsx
@@ -1,8 +1,8 @@
 "use client";
 import { CheckIcon, CopyIcon as CopyIconSVG } from "@radix-ui/react-icons";
 import { useClipboard } from "../hooks/useCopyClipboard.js";
-import { ToolTip } from "./Tooltip.js";
 import { Container } from "./basic.js";
+import { ToolTip } from "./Tooltip.js";
 
 /**
  * @internal
@@ -18,25 +18,26 @@ export const CopyIcon: React.FC<{
   const showCheckIcon = props.hasCopied || hasCopied;
 
   return (
+    // biome-ignore lint/a11y/noStaticElementInteractions: TODO
     <div
       onClick={onCopy}
-      style={{
-        display: "flex",
-        alignItems: "center",
-        justifyContent: "center",
-      }}
       onKeyDown={(e) => {
         if (e.key === "Enter" || e.key === " ") {
           onCopy();
         }
       }}
+      style={{
+        alignItems: "center",
+        display: "flex",
+        justifyContent: "center",
+      }}
     >
-      <ToolTip tip={props.tip} side={props.side} align={props.align}>
+      <ToolTip align={props.align} side={props.side} tip={props.tip}>
         <div>
           <Container
+            center="both"
             color={showCheckIcon ? "success" : undefined}
             flex="row"
-            center="both"
           >
             {showCheckIcon ? (
               <CheckIcon className="tw-check-icon" />
diff --git a/packages/thirdweb/src/react/web/ui/components/Drawer.tsx b/packages/thirdweb/src/react/web/ui/components/Drawer.tsx
index 9ebd0b2a356..c32feb592b6 100644
--- a/packages/thirdweb/src/react/web/ui/components/Drawer.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Drawer.tsx
@@ -12,10 +12,10 @@ import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.
 import { iconSize, radius } from "../../../core/design-system/index.js";
 import { fadeInAnimation } from "../design-system/animations.js";
 import { StyledDiv } from "../design-system/elements.js";
-import { DynamicHeight } from "./DynamicHeight.js";
-import { CrossContainer } from "./Modal.js";
 import { Container } from "./basic.js";
 import { IconButton } from "./buttons.js";
+import { DynamicHeight } from "./DynamicHeight.js";
+import { CrossContainer } from "./Modal.js";
 
 type DrawerProps = {
   children: React.ReactNode;
@@ -33,16 +33,16 @@ export const Drawer = /* @__PURE__ */ forwardRef<HTMLDivElement, DrawerProps>(
           <Container p="lg">
             <CrossContainer>
               <IconButton
-                type="button"
                 aria-label="Close"
                 onClick={props.close}
+                type="button"
               >
                 <Cross2Icon
-                  width={iconSize.md}
                   height={iconSize.md}
                   style={{
                     color: "inherit",
                   }}
+                  width={iconSize.md}
                 />
               </IconButton>
             </CrossContainer>
@@ -58,16 +58,16 @@ export const Drawer = /* @__PURE__ */ forwardRef<HTMLDivElement, DrawerProps>(
 const DrawerContainer = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
-    zIndex: 10000,
+    animation: `${drawerOpenAnimation} 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.1)`,
+    background: theme.colors.modalBg,
+    borderTop: `1px solid ${theme.colors.borderColor}`,
     borderTopLeftRadius: radius.xl,
     borderTopRightRadius: radius.xl,
-    background: theme.colors.modalBg,
-    position: "absolute",
     bottom: 0,
     left: 0,
+    position: "absolute",
     right: 0,
-    animation: `${drawerOpenAnimation} 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.1)`,
-    borderTop: `1px solid ${theme.colors.borderColor}`,
+    zIndex: 10000,
   };
 });
 
@@ -85,11 +85,11 @@ const drawerOpenAnimation = keyframes`
 export const DrawerOverlay = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
+    animation: `${fadeInAnimation} 400ms cubic-bezier(0.16, 1, 0.3, 1)`,
     backgroundColor: theme.colors.modalOverlayBg,
-    zIndex: 9999,
-    position: "absolute",
     inset: 0,
-    animation: `${fadeInAnimation} 400ms cubic-bezier(0.16, 1, 0.3, 1)`,
+    position: "absolute",
+    zIndex: 9999,
   };
 });
 
@@ -106,13 +106,13 @@ export function useDrawer() {
     return new Promise<void>((resolve) => {
       if (drawerRef.current) {
         const animOptions = {
+          duration: 300,
           easing: "cubic-bezier(0.175, 0.885, 0.32, 1.1)",
           fill: "forwards",
-          duration: 300,
         } as const;
 
         const closeAnimation = drawerRef.current.animate(
-          [{ transform: "translateY(100%)", opacity: 0 }],
+          [{ opacity: 0, transform: "translateY(100%)" }],
           animOptions,
         );
 
@@ -163,9 +163,9 @@ export function useDrawer() {
   }, [isOpen, setIsOpen]);
 
   return {
-    drawerRef,
     drawerOverlayRef,
-    setIsOpen,
+    drawerRef,
     isOpen,
+    setIsOpen,
   };
 }
diff --git a/packages/thirdweb/src/react/web/ui/components/DynamicHeight.tsx b/packages/thirdweb/src/react/web/ui/components/DynamicHeight.tsx
index 9b688e5d6b2..aaacbf792ab 100644
--- a/packages/thirdweb/src/react/web/ui/components/DynamicHeight.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/DynamicHeight.tsx
@@ -14,10 +14,10 @@ export function DynamicHeight(props: {
   return (
     <div
       style={{
+        boxSizing: "border-box",
         height: height ? `${height}px` : "auto",
-        transition: "height 210ms cubic-bezier(0.175, 0.885, 0.32, 1.1)",
         overflow: "hidden",
-        boxSizing: "border-box",
+        transition: "height 210ms cubic-bezier(0.175, 0.885, 0.32, 1.1)",
       }}
     >
       <div
@@ -56,5 +56,5 @@ function useHeightObserver() {
     };
   }, []);
 
-  return { height, elementRef: elementRef };
+  return { elementRef: elementRef, height };
 }
diff --git a/packages/thirdweb/src/react/web/ui/components/IconContainer.tsx b/packages/thirdweb/src/react/web/ui/components/IconContainer.tsx
index 8980a3810bf..b38b4dbe590 100644
--- a/packages/thirdweb/src/react/web/ui/components/IconContainer.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/IconContainer.tsx
@@ -13,15 +13,15 @@ export const IconContainer: React.FC<{
   return (
     <div
       style={{
-        position: "relative",
-        overflow: "hidden",
+        alignItems: "center",
+        border: `1px solid ${theme.colors.borderColor}`,
+        borderRadius: "100%",
         display: "flex",
-        justifyItems: "center",
         flexShrink: 0,
-        alignItems: "center",
+        justifyItems: "center",
+        overflow: "hidden",
         padding: props.padding ?? "6px",
-        borderRadius: "100%",
-        border: `1px solid ${theme.colors.borderColor}`,
+        position: "relative",
         ...props.style,
       }}
     >
diff --git a/packages/thirdweb/src/react/web/ui/components/Img.tsx b/packages/thirdweb/src/react/web/ui/components/Img.tsx
index 41e8bd7afae..61febafea32 100644
--- a/packages/thirdweb/src/react/web/ui/components/Img.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Img.tsx
@@ -26,14 +26,14 @@ export const Img: React.FC<{
   const heightPx = `${props.height || props.width}px`;
 
   if (propSrc === undefined) {
-    return <Skeleton width={widthPx} height={heightPx} />;
+    return <Skeleton height={heightPx} width={widthPx} />;
   }
 
   const getSrc = () => {
     try {
       return resolveScheme({
-        uri: propSrc,
         client: props.client,
+        uri: propSrc,
       });
     } catch {
       return props.src;
@@ -45,49 +45,49 @@ export const Img: React.FC<{
   return (
     <div
       style={{
-        position: "relative",
+        alignItems: "center",
         display: "inline-flex",
         flexShrink: 0,
-        alignItems: "center",
         justifyItems: "center",
+        position: "relative",
       }}
     >
-      {!isLoaded && <Skeleton width={widthPx} height={heightPx} />}
+      {!isLoaded && <Skeleton height={heightPx} width={widthPx} />}
       <img
+        alt={props.alt || ""}
+        className={props.className}
+        decoding="async"
+        draggable={false}
+        height={props.height}
+        key={src}
+        loading={props.loading}
+        onError={(e) => {
+          if (
+            props.fallbackImage &&
+            e.currentTarget.src !== props.fallbackImage
+          ) {
+            e.currentTarget.src = props.fallbackImage;
+          }
+        }}
         onLoad={() => {
           setIsLoaded(true);
         }}
-        key={src}
-        width={props.width}
-        height={props.height}
         src={src}
-        alt={props.alt || ""}
-        loading={props.loading}
-        decoding="async"
         style={{
-          objectFit: "contain",
           height: !isLoaded
             ? 0
             : props.height
               ? `${props.height}px`
               : undefined,
-          width: !isLoaded ? 0 : props.width ? `${props.width}px` : undefined,
-          userSelect: "none",
-          visibility: isLoaded ? "visible" : "hidden",
+          objectFit: "contain",
           opacity: isLoaded ? 1 : 0,
           transition: "opacity 0.4s ease",
+          userSelect: "none",
+          visibility: isLoaded ? "visible" : "hidden",
+          width: !isLoaded ? 0 : props.width ? `${props.width}px` : undefined,
           ...props.style,
         }}
-        draggable={false}
-        className={props.className}
-        onError={(e) => {
-          if (
-            props.fallbackImage &&
-            e.currentTarget.src !== props.fallbackImage
-          ) {
-            e.currentTarget.src = props.fallbackImage;
-          }
-        }}
+        width={props.width}
       />
     </div>
   );
diff --git a/packages/thirdweb/src/react/web/ui/components/Modal.tsx b/packages/thirdweb/src/react/web/ui/components/Modal.tsx
index 0028879ab78..9e12d87e1b3 100644
--- a/packages/thirdweb/src/react/web/ui/components/Modal.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Modal.tsx
@@ -20,10 +20,10 @@ import {
   wideModalMaxHeight,
 } from "../ConnectWallet/constants.js";
 import { StyledDiv } from "../design-system/elements.js";
-import { DynamicHeight } from "./DynamicHeight.js";
-import { Overlay } from "./Overlay.js";
 import { noScrollBar } from "./basic.js";
 import { IconButton } from "./buttons.js";
+import { DynamicHeight } from "./DynamicHeight.js";
+import { Overlay } from "./Overlay.js";
 
 /**
  * @internal
diff --git a/packages/thirdweb/src/react/web/ui/components/OTPInput.tsx b/packages/thirdweb/src/react/web/ui/components/OTPInput.tsx
index dd5ceaa3e40..7c0ef823d98 100644
--- a/packages/thirdweb/src/react/web/ui/components/OTPInput.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/OTPInput.tsx
@@ -23,22 +23,22 @@ export function OTPInput(props: {
   return (
     <OTPInputContainer>
       <InputOTP
+        maxLength={6}
+        onChange={(newValue) => {
+          props.setValue(newValue);
+        }}
         onComplete={() => {
           props.onEnter();
         }}
-        maxLength={6}
-        value={props.value}
         render={({ slots }) => (
-          <Container flex="row" gap="xs" center="both">
+          <Container center="both" flex="row" gap="xs">
             {slots.map((slot, idx) => (
               // biome-ignore lint/suspicious/noArrayIndexKey: index is the only valid key here
               <Slot key={idx} {...slot} isInvalid={props.isInvalid} />
             ))}
           </Container>
         )}
-        onChange={(newValue) => {
-          props.setValue(newValue);
-        }}
+        value={props.value}
       />
     </OTPInputContainer>
   );
@@ -71,45 +71,45 @@ const caretBlink = keyframes`
 const FakeCaret = StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
-    position: "absolute",
-    pointerEvents: "none",
-    inset: 0,
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center",
-    animation: `${caretBlink} 1s infinite`,
     "&::before": {
+      backgroundColor: theme.colors.primaryText,
       content: "''",
       display: "block",
-      width: "1.5px",
       height: "1em",
-      backgroundColor: theme.colors.primaryText,
+      width: "1.5px",
     },
+    alignItems: "center",
+    animation: `${caretBlink} 1s infinite`,
+    display: "flex",
+    inset: 0,
+    justifyContent: "center",
+    pointerEvents: "none",
+    position: "absolute",
   };
 });
 
 const OTPInputBox = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
-    position: "relative",
-    width: "40px",
-    height: "40px",
-    textAlign: "center",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center",
-    fontSize: fontSize.md,
-    padding: spacing.xs,
-    boxSizing: "border-box",
-    transition: "color 200ms ease",
-    border: `2px solid ${theme.colors.borderColor}`,
     "&[data-active='true']": {
       borderColor: theme.colors.accentText,
     },
-    color: theme.colors.primaryText,
-    borderRadius: radius.lg,
     "&[data-error='true']": {
       borderColor: theme.colors.danger,
     },
+    alignItems: "center",
+    border: `2px solid ${theme.colors.borderColor}`,
+    borderRadius: radius.lg,
+    boxSizing: "border-box",
+    color: theme.colors.primaryText,
+    display: "flex",
+    fontSize: fontSize.md,
+    height: "40px",
+    justifyContent: "center",
+    padding: spacing.xs,
+    position: "relative",
+    textAlign: "center",
+    transition: "color 200ms ease",
+    width: "40px",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/Overlay.tsx b/packages/thirdweb/src/react/web/ui/components/Overlay.tsx
index d216009123c..87fa7ed2273 100644
--- a/packages/thirdweb/src/react/web/ui/components/Overlay.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Overlay.tsx
@@ -6,11 +6,11 @@ import { StyledDiv } from "../design-system/elements.js";
 export const Overlay = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
-    backgroundColor: theme.colors.modalOverlayBg,
-    zIndex: 9999,
-    position: "fixed",
-    inset: 0,
     animation: `${fadeInAnimation} 400ms cubic-bezier(0.16, 1, 0.3, 1)`,
     backdropFilter: "blur(10px)",
+    backgroundColor: theme.colors.modalOverlayBg,
+    inset: 0,
+    position: "fixed",
+    zIndex: 9999,
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/QRCode.tsx b/packages/thirdweb/src/react/web/ui/components/QRCode.tsx
index 8835bf262ff..fd4aa70f0c1 100644
--- a/packages/thirdweb/src/react/web/ui/components/QRCode.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/QRCode.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { keyframes } from "@emotion/react";
 import type React from "react";
-import { Suspense, lazy } from "react";
+import { lazy, Suspense } from "react";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
 import { radius } from "../../../core/design-system/index.js";
 import { fadeInAnimation } from "../design-system/animations.js";
@@ -24,8 +24,8 @@ export const QRCode = (props: {
   const placeholder = (
     <QRPlaceholder
       style={{
-        width: `${size}px`,
         height: `${size}px`,
+        width: `${size}px`,
       }}
     >
       <span data-v1 />
@@ -38,19 +38,19 @@ export const QRCode = (props: {
   return (
     <div
       style={{
-        position: "relative",
         display: "flex",
         justifyContent: "center",
+        position: "relative",
       }}
     >
       {props.qrCodeUri ? (
         <Suspense fallback={placeholder}>
           <QRCodeContainer>
             <QRCodeRenderer
-              uri={props.qrCodeUri}
-              size={size + 20}
-              ecl="M"
               clearSize={props.QRIcon ? 70 : undefined}
+              ecl="M"
+              size={size + 20}
+              uri={props.qrCodeUri}
             />
           </QRCodeContainer>
         </Suspense>
@@ -64,23 +64,23 @@ export const QRCode = (props: {
 };
 
 const IconContainer = /* @__PURE__ */ StyledDiv({
+  alignContent: "center",
+  display: "flex",
+  justifyContent: "center",
+  left: "50%",
   position: "absolute",
   top: "50%",
-  left: "50%",
   transform: "translate(-50%, -50%)",
-  display: "flex",
-  justifyContent: "center",
-  alignContent: "center",
   zIndex: 1000,
 });
 
 const QRCodeContainer = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
-    animation: `${fadeInAnimation} 600ms ease`,
-    "--ck-qr-dot-color": theme.colors.primaryText,
     "--ck-body-background": theme.colors.modalBg,
     "--ck-qr-background": theme.colors.modalBg,
+    "--ck-qr-dot-color": theme.colors.primaryText,
+    animation: `${fadeInAnimation} 600ms ease`,
   };
 });
 
@@ -92,70 +92,70 @@ const PlaceholderKeyframes = keyframes`
 const QRPlaceholder = /* @__PURE__ */ StyledDiv((_) => {
   const theme = useCustomTheme();
   return {
-    "--color": theme.colors.skeletonBg,
     "--bg": theme.colors.modalBg,
-    overflow: "hidden",
-    position: "relative",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center",
-    borderRadius: radius.md,
+    "--color": theme.colors.skeletonBg,
+    "&::after": {
+      animation: `${PlaceholderKeyframes} 1000ms linear infinite both`,
+      background:
+        "linear-gradient(90deg, transparent 50%, var(--color), transparent)",
+      backgroundSize: "200% 100%",
+      content: '""',
+      inset: 0,
+      position: "absolute",
+      transform: "scale(1.5) rotate(45deg)",
+      zIndex: 100,
+    },
+    "&:before": {
+      background: "repeat",
+      backgroundImage: "radial-gradient(var(--color) 41%, transparent 41%)",
+      backgroundSize: "1.888% 1.888%",
+      content: '""',
+      inset: 0,
+      position: "absolute",
+      zIndex: 3,
+    },
     "> div": {
-      zIndex: 4,
-      position: "relative",
-      width: "28%",
-      height: "28%",
-      borderRadius: "5px",
       background: "var(--bg)",
+      borderRadius: "5px",
       boxShadow: "0 0 0 7px var(--bg)",
+      height: "28%",
+      position: "relative",
+      width: "28%",
+      zIndex: 4,
     },
     "> span": {
-      zIndex: 4,
-      position: "absolute",
-      background: "var(--color)",
-      borderRadius: "12px",
-      width: "13.25%",
-      height: "13.25%",
-      boxShadow: "0 0 0 4px var(--bg)",
       "&:before": {
-        content: '""',
-        position: "absolute",
-        inset: "9px",
         borderRadius: "3px",
         boxShadow: "0 0 0 4px var(--bg)",
+        content: '""',
+        inset: "9px",
+        position: "absolute",
       },
       "&[data-v1]": {
-        top: 0,
         left: 0,
+        top: 0,
       },
       "&[data-v2]": {
-        top: 0,
         right: 0,
+        top: 0,
       },
       "&[data-v3]": {
         bottom: 0,
         left: 0,
       },
-    },
-    "&:before": {
-      zIndex: 3,
-      content: '""',
-      position: "absolute",
-      inset: 0,
-      background: "repeat",
-      backgroundSize: "1.888% 1.888%",
-      backgroundImage: "radial-gradient(var(--color) 41%, transparent 41%)",
-    },
-    "&::after": {
-      zIndex: 100,
-      content: '""',
+      background: "var(--color)",
+      borderRadius: "12px",
+      boxShadow: "0 0 0 4px var(--bg)",
+      height: "13.25%",
       position: "absolute",
-      inset: 0,
-      transform: "scale(1.5) rotate(45deg)",
-      background:
-        "linear-gradient(90deg, transparent 50%, var(--color), transparent)",
-      backgroundSize: "200% 100%",
-      animation: `${PlaceholderKeyframes} 1000ms linear infinite both`,
+      width: "13.25%",
+      zIndex: 4,
     },
+    alignItems: "center",
+    borderRadius: radius.md,
+    display: "flex",
+    justifyContent: "center",
+    overflow: "hidden",
+    position: "relative",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/QRCode/QRCodeRenderer.tsx b/packages/thirdweb/src/react/web/ui/components/QRCode/QRCodeRenderer.tsx
index b97561446d9..d77068d856e 100644
--- a/packages/thirdweb/src/react/web/ui/components/QRCode/QRCodeRenderer.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/QRCode/QRCodeRenderer.tsx
@@ -28,7 +28,7 @@ function QRCodeRenderer({
 
   const dots = useMemo(() => {
     const dotsArray: ReactElement[] = [];
-    const matrix = encode(uri, { ecc: ecl, border: 0 }).data;
+    const matrix = encode(uri, { border: 0, ecc: ecl }).data;
     const cellSize = size / matrix.length;
     const qrList = [
       { x: 0, y: 0 },
@@ -42,16 +42,16 @@ function QRCodeRenderer({
       for (let i = 0; i < 3; i++) {
         dotsArray.push(
           <rect
-            key={`${i}-${x}-${y}`}
             fill={
               i % 2 !== 0
                 ? "var(--ck-qr-background, var(--ck-body-background))"
                 : "var(--ck-qr-dot-color)"
             }
+            height={cellSize * (7 - i * 2)}
+            key={`${i}-${x}-${y}`}
             rx={(i - 2) * -5 + (i === 0 ? 2 : 3)}
             ry={(i - 2) * -5 + (i === 0 ? 2 : 3)}
             width={cellSize * (7 - i * 2)}
-            height={cellSize * (7 - i * 2)}
             x={x1 + cellSize * i}
             y={y1 + cellSize * i}
           />,
@@ -66,16 +66,16 @@ function QRCodeRenderer({
         <>
           <rect
             fill={imageBackground}
+            height={cellSize * (7 - 0 * 2)}
             rx={(0 - 2) * -5 + 2}
             ry={(0 - 2) * -5 + 2}
             width={cellSize * (7 - 0 * 2)}
-            height={cellSize * (7 - 0 * 2)}
             x={x1 + cellSize * 0}
             y={y1 + cellSize * 0}
           />
           <foreignObject
-            width={cellSize * (7 - 0 * 2)}
             height={cellSize * (7 - 0 * 2)}
+            width={cellSize * (7 - 0 * 2)}
             x={x1 + cellSize * 0}
             y={y1 + cellSize * 0}
           >
@@ -114,13 +114,13 @@ function QRCodeRenderer({
             ) {
               dotsArray.push(
                 <circle
+                  cx={i * cellSize + cellSize / 2}
+                  cy={j * cellSize + cellSize / 2}
+                  fill="var(--ck-qr-dot-color)"
                   key={`circle-${i}-${
                     // biome-ignore lint/suspicious/noArrayIndexKey: its the only thing available for the key here
                     j
                   }`}
-                  cx={i * cellSize + cellSize / 2}
-                  cy={j * cellSize + cellSize / 2}
-                  fill="var(--ck-qr-dot-color)"
                   r={cellSize / 3}
                 />,
               );
@@ -136,13 +136,13 @@ function QRCodeRenderer({
   return (
     <svg
       height={size}
-      width={size}
-      viewBox={`0 0 ${size} ${size}`}
+      role="presentation"
       style={{
-        width: size,
         height: size,
+        width: size,
       }}
-      role="presentation"
+      viewBox={`0 0 ${size} ${size}`}
+      width={size}
     >
       <rect fill="transparent" height={size} width={size} />
       {dots}
diff --git a/packages/thirdweb/src/react/web/ui/components/Skeleton.tsx b/packages/thirdweb/src/react/web/ui/components/Skeleton.tsx
index 27da4359721..89e404deb63 100644
--- a/packages/thirdweb/src/react/web/ui/components/Skeleton.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Skeleton.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { keyframes } from "@emotion/react";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
-import { type Theme, radius } from "../../../core/design-system/index.js";
+import { radius, type Theme } from "../../../core/design-system/index.js";
 import { StyledDiv } from "../design-system/elements.js";
 
 /**
@@ -15,12 +15,12 @@ export const Skeleton: React.FC<{
 }> = (props) => {
   return (
     <SkeletonDiv
+      className={props.className || ""}
       color={props.color}
       style={{
         height: props.height,
         width: props.width || "auto",
       }}
-      className={props.className || ""}
     />
   );
 };
@@ -35,14 +35,12 @@ const skeletonAnimation = keyframes`
 `;
 
 const SkeletonDiv = /* @__PURE__ */ StyledDiv(
-  (props: {
-    color?: keyof Theme["colors"];
-  }) => {
+  (props: { color?: keyof Theme["colors"] }) => {
     const theme = useCustomTheme();
     return {
-      backgroundSize: "200% 200%",
-      backgroundColor: theme.colors[props.color || "skeletonBg"],
       animation: `${skeletonAnimation} 500ms ease-in-out infinite alternate`,
+      backgroundColor: theme.colors[props.color || "skeletonBg"],
+      backgroundSize: "200% 200%",
       borderRadius: radius.sm,
     };
   },
diff --git a/packages/thirdweb/src/react/web/ui/components/Spinner.tsx b/packages/thirdweb/src/react/web/ui/components/Spinner.tsx
index 71315386abb..11153f1ac75 100644
--- a/packages/thirdweb/src/react/web/ui/components/Spinner.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Spinner.tsx
@@ -1,8 +1,8 @@
 "use client";
 import { keyframes } from "@emotion/react";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
-import { iconSize } from "../../../core/design-system/index.js";
 import type { Theme } from "../../../core/design-system/index.js";
+import { iconSize } from "../../../core/design-system/index.js";
 import { StyledCircle, StyledSvg } from "../design-system/elements.js";
 
 /**
@@ -16,16 +16,16 @@ export const Spinner: React.FC<{
   return (
     <Svg
       style={{
-        width: `${iconSize[props.size]}px`,
         height: `${iconSize[props.size]}px`,
+        width: `${iconSize[props.size]}px`,
       }}
       viewBox="0 0 50 50"
     >
       <Circle
         cx="25"
         cy="25"
-        r="20"
         fill="none"
+        r="20"
         stroke={props.color ? theme.colors[props.color] : "currentColor"}
         strokeWidth={Number(iconSize[props.size]) > 64 ? "2" : "4"}
       />
@@ -57,11 +57,11 @@ const rotateAnimation = keyframes`
 
 const Svg = /* @__PURE__ */ StyledSvg({
   animation: `${rotateAnimation} 2s linear infinite`,
-  width: "1em",
   height: "1em",
+  width: "1em",
 });
 
 const Circle = /* @__PURE__ */ StyledCircle({
-  strokeLinecap: "round",
   animation: `${dashAnimation} 1.5s ease-in-out infinite`,
+  strokeLinecap: "round",
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/StepBar.tsx b/packages/thirdweb/src/react/web/ui/components/StepBar.tsx
index f8db12e60cd..ef527afae20 100644
--- a/packages/thirdweb/src/react/web/ui/components/StepBar.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/StepBar.tsx
@@ -7,15 +7,15 @@ export function StepBar(props: { steps: number; currentStep: number }) {
       bg="tertiaryBg"
       flex="row"
       style={{
-        height: "8px",
         borderRadius: radius.lg,
+        height: "8px",
       }}
     >
       <Container
         bg="accentText"
         style={{
-          width: `${(props.currentStep / props.steps) * 95}%`,
           borderRadius: radius.lg,
+          width: `${(props.currentStep / props.steps) * 95}%`,
         }}
       >
         {null}
diff --git a/packages/thirdweb/src/react/web/ui/components/SwitchNetwork.tsx b/packages/thirdweb/src/react/web/ui/components/SwitchNetwork.tsx
index 082fc400705..99dc6698dce 100644
--- a/packages/thirdweb/src/react/web/ui/components/SwitchNetwork.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/SwitchNetwork.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
-import { Spinner } from "./Spinner.js";
 import { Button, type ButtonProps } from "./buttons.js";
+import { Spinner } from "./Spinner.js";
 
 export function SwitchNetworkButton(
   props: ButtonProps & {
@@ -25,7 +25,7 @@ export function SwitchNetworkButton(
       {isSwitching ? (
         <>
           Switching
-          <Spinner size="sm" color="accentButtonText" />
+          <Spinner color="accentButtonText" size="sm" />
         </>
       ) : (
         "Switch Network"
diff --git a/packages/thirdweb/src/react/web/ui/components/Tabs.tsx b/packages/thirdweb/src/react/web/ui/components/Tabs.tsx
index 657f903b02d..da31b0163de 100644
--- a/packages/thirdweb/src/react/web/ui/components/Tabs.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Tabs.tsx
@@ -2,9 +2,9 @@ import type React from "react";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
 import { radius, spacing } from "../../../core/design-system/index.js";
 import { Text } from "../components/text.js";
-import { Spacer } from "./Spacer.js";
 import { Container } from "./basic.js";
 import { Button } from "./buttons.js";
+import { Spacer } from "./Spacer.js";
 
 export default function Tabs({
   selected,
@@ -21,38 +21,38 @@ export default function Tabs({
   return (
     <div>
       <Container
-        flex="row"
+        bg="secondaryButtonBg"
         center="y"
-        style={{ width: "100%", borderRadius: radius.lg }}
+        flex="row"
         p="xxs"
-        bg="secondaryButtonBg"
+        style={{ borderRadius: radius.lg, width: "100%" }}
       >
         {options.map((option) => (
           <Button
-            variant="accent"
-            type="button"
             key={option.value}
             onClick={() => onSelect(option.value)}
             style={{
-              flex: 1,
-              paddingBlock: spacing.sm,
-              display: "flex",
               alignItems: "center",
-              justifyContent: "center",
-              position: "relative",
-              borderRadius: radius.md,
               backgroundColor:
                 option.value === selected
                   ? theme.colors.modalBg
                   : "transparent",
+              borderRadius: radius.md,
+              display: "flex",
+              flex: 1,
+              justifyContent: "center",
+              paddingBlock: spacing.sm,
+              position: "relative",
             }}
+            type="button"
+            variant="accent"
           >
             <Text
               color={
                 option.value === selected ? "primaryText" : "secondaryText"
               }
-              style={{ textAlign: "center" }}
               size="sm"
+              style={{ textAlign: "center" }}
             >
               {option.label}
             </Text>
diff --git a/packages/thirdweb/src/react/web/ui/components/TextDivider.tsx b/packages/thirdweb/src/react/web/ui/components/TextDivider.tsx
index 1454b982f81..c64a846daed 100644
--- a/packages/thirdweb/src/react/web/ui/components/TextDivider.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/TextDivider.tsx
@@ -25,15 +25,15 @@ export const TextDivider = (props: {
 const TextDividerEl = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
-    display: "flex",
-    alignItems: "center",
-    color: theme.colors.secondaryText,
-    fontSize: fontSize.sm,
     "&::before, &::after": {
+      borderBottom: `1px solid ${theme.colors.separatorLine}`,
       content: '""',
       flex: 1,
-      borderBottom: `1px solid ${theme.colors.separatorLine}`,
     },
+    alignItems: "center",
+    color: theme.colors.secondaryText,
+    display: "flex",
+    fontSize: fontSize.sm,
     span: {
       margin: "0 16px",
     },
diff --git a/packages/thirdweb/src/react/web/ui/components/TokenIcon.tsx b/packages/thirdweb/src/react/web/ui/components/TokenIcon.tsx
index cb9ef79cc77..bef838fa444 100644
--- a/packages/thirdweb/src/react/web/ui/components/TokenIcon.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/TokenIcon.tsx
@@ -8,11 +8,11 @@ import { useChainMetadata } from "../../../core/hooks/others/useChainQuery.js";
 import { genericTokenIcon } from "../../../core/utils/walletIcon.js";
 import { CoinsIcon } from "../ConnectWallet/icons/CoinsIcon.js";
 import {
-  type NativeToken,
   isNativeToken,
+  type NativeToken,
 } from "../ConnectWallet/screens/nativeToken.js";
-import { Img } from "./Img.js";
 import { Container } from "./basic.js";
+import { Img } from "./Img.js";
 /**
  * @internal
  */
@@ -44,17 +44,17 @@ export function TokenIcon(props: {
 
   return tokenImage ? (
     <Img
+      client={props.client}
+      fallbackImage={genericTokenIcon}
+      height={iconSize[props.size]}
       src={tokenImage}
       width={iconSize[props.size]}
-      height={iconSize[props.size]}
-      fallbackImage={genericTokenIcon}
-      client={props.client}
     />
   ) : (
     <Container
       center="both"
-      style={{ width: iconSize[props.size], height: iconSize[props.size] }}
       color="secondaryText"
+      style={{ height: iconSize[props.size], width: iconSize[props.size] }}
     >
       <CoinsIcon size={iconSize[props.size]} />
     </Container>
diff --git a/packages/thirdweb/src/react/web/ui/components/Tooltip.tsx b/packages/thirdweb/src/react/web/ui/components/Tooltip.tsx
index bfc81cfac17..13d32f073cb 100644
--- a/packages/thirdweb/src/react/web/ui/components/Tooltip.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Tooltip.tsx
@@ -26,9 +26,9 @@ export const ToolTip: React.FC<{
         <RadixTooltip.Trigger asChild>{props.children}</RadixTooltip.Trigger>
         <RadixTooltip.Portal>
           <TooltipContent
-            sideOffset={props.sideOffset || 6}
             align={props.align || "center"}
             side={props.side || "top"}
+            sideOffset={props.sideOffset || 6}
           >
             {props.tip}
             <TooltipArrow />
@@ -54,18 +54,18 @@ const TooltipContent = /* @__PURE__ */ (() =>
   styled(RadixTooltip.Content)((_) => {
     const theme = useCustomTheme();
     return {
+      animation: `${slideUpAndFade} 200ms cubic-bezier(0.16, 1, 0.3, 1)`,
       background: theme.colors.tooltipBg,
-      color: theme.colors.tooltipText,
       borderRadius: radius.sm,
-      padding: `${spacing.xs} ${spacing.sm}`,
-      fontSize: fontSize.sm,
       boxShadow: shadow.sm,
+      color: theme.colors.tooltipText,
+      fontSize: fontSize.sm,
+      lineHeight: 1.5,
+      maxWidth: "300px",
+      padding: `${spacing.xs} ${spacing.sm}`,
       userSelect: "none",
       willChange: "transform, opacity",
-      animation: `${slideUpAndFade} 200ms cubic-bezier(0.16, 1, 0.3, 1)`,
       zIndex: 999999999999999,
-      maxWidth: "300px",
-      lineHeight: 1.5,
     };
   }))();
 
diff --git a/packages/thirdweb/src/react/web/ui/components/WalletImage.tsx b/packages/thirdweb/src/react/web/ui/components/WalletImage.tsx
index 98b38f7ecbd..86514a53907 100644
--- a/packages/thirdweb/src/react/web/ui/components/WalletImage.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/WalletImage.tsx
@@ -54,10 +54,10 @@ export function WalletImage(props: {
         const lastAuthProvider = await getLastAuthProvider(storage);
         image = lastAuthProvider
           ? {
-              uri: getSocialIcon(lastAuthProvider),
               authProvider: lastAuthProvider as AuthOption,
+              uri: getSocialIcon(lastAuthProvider),
             }
-          : { uri: "", authProvider: "wallet" };
+          : { authProvider: "wallet", uri: "" };
       } else {
         const mipdImage = getInstalledWalletProviders().find(
           (x) => x.info.rdns === activeEOAId,
@@ -78,47 +78,47 @@ export function WalletImage(props: {
   }, [props.id, activeWallet]);
 
   if (image?.authProvider === "email") {
-    return <EmailIcon size={props.size} color={theme.colors.accentText} />;
+    return <EmailIcon color={theme.colors.accentText} size={props.size} />;
   }
 
   if (image?.authProvider === "phone") {
-    return <PhoneIcon size={props.size} color={theme.colors.accentText} />;
+    return <PhoneIcon color={theme.colors.accentText} size={props.size} />;
   }
 
   if (image?.authProvider === "passkey") {
     return (
-      <FingerPrintIcon size={props.size} color={theme.colors.accentText} />
+      <FingerPrintIcon color={theme.colors.accentText} size={props.size} />
     );
   }
 
   if (image?.authProvider === "wallet") {
     return (
-      <OutlineWalletIcon size={props.size} color={theme.colors.accentText} />
+      <OutlineWalletIcon color={theme.colors.accentText} size={props.size} />
     );
   }
 
   if (image?.authProvider === "guest") {
-    return <GuestIcon size={props.size} color={theme.colors.accentText} />;
+    return <GuestIcon color={theme.colors.accentText} size={props.size} />;
   }
 
   if (image?.uri) {
     return (
       <Img
-        src={image.uri}
-        width={props.size}
+        client={props.client}
         height={props.size}
         loading="eager"
-        client={props.client}
+        src={image.uri}
         style={{
           borderRadius: radius.md,
           ...props.style,
         }}
+        width={props.size}
       />
     );
   }
 
   return (
-    <WalletImageQuery id={props.id} size={props.size} client={props.client} />
+    <WalletImageQuery client={props.client} id={props.id} size={props.size} />
   );
 }
 
@@ -133,9 +133,9 @@ function WalletImageQuery(props: {
     return (
       <Img
         client={props.client}
+        height={props.size}
         src={genericWalletIcon}
         width={props.size}
-        height={props.size}
       />
     );
   }
diff --git a/packages/thirdweb/src/react/web/ui/components/basic.tsx b/packages/thirdweb/src/react/web/ui/components/basic.tsx
index d0486ebc47e..4ce5a16fd5d 100644
--- a/packages/thirdweb/src/react/web/ui/components/basic.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/basic.tsx
@@ -1,7 +1,7 @@
 "use client";
 import type { CSSObject } from "@emotion/react";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
-import { type Theme, spacing } from "../../../core/design-system/index.js";
+import { spacing, type Theme } from "../../../core/design-system/index.js";
 import {
   fadeInAnimation,
   floatDownAnimation,
@@ -22,11 +22,11 @@ export const ScreenBottomContainer = /* @__PURE__ */ StyledDiv((_) => {
 });
 
 export const noScrollBar = /* @__PURE__ */ {
-  scrollbarWidth: "none",
   "&::-webkit-scrollbar": {
-    width: 0,
     display: "none",
+    width: 0,
   },
+  scrollbarWidth: "none",
 } satisfies CSSObject;
 
 /**
@@ -41,8 +41,8 @@ export function ModalHeader(props: {
   return (
     <div
       style={{
-        display: "flex",
         alignItems: "center",
+        display: "flex",
         justifyContent: props.leftAligned ? "flex-start" : "center",
         position: "relative",
       }}
@@ -51,13 +51,13 @@ export function ModalHeader(props: {
         <BackButton
           onClick={onBack}
           style={{
-            position: "absolute",
             left: 0,
+            position: "absolute",
             top: 0,
           }}
         />
       )}
-      <Container flex="row" gap="xs" center="both">
+      <Container center="both" flex="row" gap="xs">
         {typeof title === "string" ? <ModalTitle>{title}</ModalTitle> : title}
       </Container>
     </div>
@@ -67,8 +67,8 @@ export function ModalHeader(props: {
 export const Line = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
-    height: "1px",
     background: theme.colors.separatorLine,
+    height: "1px",
   };
 });
 
@@ -163,11 +163,11 @@ export function Container(props: {
 
   return (
     <Box
-      data-scrolly={props.scrollY}
-      data-animate={props.animate}
       bg={props.bg}
-      color={props.color}
       borderColor={props.borderColor}
+      color={props.color}
+      data-animate={props.animate}
+      data-scrolly={props.scrollY}
       style={{
         ...styles,
         ...props.style,
@@ -187,26 +187,26 @@ type BoxProps = {
 const Box = /* @__PURE__ */ StyledDiv<BoxProps>((props) => {
   const theme = useCustomTheme();
   return {
-    color: props.color ? theme.colors[props.color] : "inherit",
-    background: props.bg ? theme.colors[props.bg] : undefined,
-    borderColor: props.borderColor
-      ? theme.colors[props.borderColor]
-      : undefined,
     "&[data-animate='fadein']": {
-      opacity: 0,
       animation: `${fadeInAnimation} 350ms ease forwards`,
-    },
-    "&[data-animate='floatup']": {
       opacity: 0,
-      animation: `${floatUpAnimation} 350ms ease forwards`,
     },
     "&[data-animate='floatdown']": {
-      opacity: 0,
       animation: `${floatDownAnimation} 350ms ease forwards`,
+      opacity: 0,
+    },
+    "&[data-animate='floatup']": {
+      animation: `${floatUpAnimation} 350ms ease forwards`,
+      opacity: 0,
     },
     "&[data-scrolly='true']": {
       overflowY: "auto",
       ...noScrollBar,
     },
+    background: props.bg ? theme.colors[props.bg] : undefined,
+    borderColor: props.borderColor
+      ? theme.colors[props.borderColor]
+      : undefined,
+    color: props.color ? theme.colors[props.color] : "inherit",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/buttons.tsx b/packages/thirdweb/src/react/web/ui/components/buttons.tsx
index 31cfc847543..70af6273071 100644
--- a/packages/thirdweb/src/react/web/ui/components/buttons.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/buttons.tsx
@@ -1,10 +1,10 @@
 "use client";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
 import {
-  type Theme,
   fontSize,
   radius,
   spacing,
+  type Theme,
 } from "../../../core/design-system/index.js";
 import { StyledButton } from "../design-system/elements.js";
 
@@ -22,24 +22,23 @@ export const Button = /* @__PURE__ */ StyledButton((props: ButtonProps) => {
     return {};
   }
   return {
-    all: "unset",
-    cursor: "pointer",
-    display: "inline-flex",
+    "&:active": {
+      transform: "translateY(1px)",
+    },
+    "&[data-disabled='true']": {
+      "&:hover": {
+        borderColor: "transparent",
+      },
+      background: theme.colors.tertiaryBg,
+      borderColor: "transparent",
+      boxShadow: "none",
+      color: theme.colors.secondaryText,
+    },
+    "&[disabled]": {
+      cursor: "not-allowed",
+    },
     alignItems: "center",
-    justifyContent: "center",
-    borderRadius: radius.md,
-    padding: `${fontSize.sm} ${fontSize.sm}`,
-    fontSize: fontSize.sm,
-    fontWeight: 500,
-    boxSizing: "border-box",
-    WebkitTapHighlightColor: "transparent",
-    lineHeight: "normal",
-    flexShrink: 0,
-    transition: "border 200ms ease",
-    gap: (props.gap && spacing[props.gap]) || 0,
-    width: props.fullWidth ? "100%" : undefined,
-    textAlign: "center",
-    maxWidth: "100%",
+    all: "unset",
     background: (() => {
       if (props.bg) {
         return theme.colors[props.bg];
@@ -55,6 +54,8 @@ export const Button = /* @__PURE__ */ StyledButton((props: ButtonProps) => {
           return "none";
       }
     })(),
+    borderRadius: radius.md,
+    boxSizing: "border-box",
     color: (() => {
       switch (props.variant) {
         case "primary":
@@ -72,40 +73,39 @@ export const Button = /* @__PURE__ */ StyledButton((props: ButtonProps) => {
           return theme.colors.primaryButtonText;
       }
     })(),
-    "&:active": {
-      transform: "translateY(1px)",
-    },
-    "&[disabled]": {
-      cursor: "not-allowed",
-    },
-    "&[data-disabled='true']": {
-      background: theme.colors.tertiaryBg,
-      color: theme.colors.secondaryText,
-      borderColor: "transparent",
-      boxShadow: "none",
-      "&:hover": {
-        borderColor: "transparent",
-      },
-    },
+    cursor: "pointer",
+    display: "inline-flex",
+    flexShrink: 0,
+    fontSize: fontSize.sm,
+    fontWeight: 500,
+    gap: (props.gap && spacing[props.gap]) || 0,
+    justifyContent: "center",
+    lineHeight: "normal",
+    maxWidth: "100%",
+    padding: `${fontSize.sm} ${fontSize.sm}`,
+    textAlign: "center",
+    transition: "border 200ms ease",
+    WebkitTapHighlightColor: "transparent",
+    width: props.fullWidth ? "100%" : undefined,
     ...(() => {
       if (props.variant === "outline") {
         return {
-          border: `1px solid ${theme.colors.borderColor}`,
           "&:hover": {
             borderColor: theme.colors.accentText,
           },
           '&[aria-selected="true"]': {
             borderColor: theme.colors.accentText,
           },
+          border: `1px solid ${theme.colors.borderColor}`,
         };
       }
 
       if (props.variant === "ghost") {
         return {
-          border: "1px solid transparent",
           "&:hover": {
             borderColor: theme.colors.accentText,
           },
+          border: "1px solid transparent",
         };
       }
 
@@ -127,10 +127,10 @@ export const Button = /* @__PURE__ */ StyledButton((props: ButtonProps) => {
 
       if (props.variant === "link") {
         return {
-          padding: 0,
           "&:hover": {
             color: theme.colors.primaryText,
           },
+          padding: 0,
         };
       }
 
@@ -144,16 +144,6 @@ export const ButtonLink = /* @__PURE__ */ (() => Button.withComponent("a"))();
 export const IconButton = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
-    all: "unset",
-    cursor: "pointer",
-    display: "inline-flex",
-    alignItems: "center",
-    justifyContent: "center",
-    borderRadius: radius.sm,
-    WebkitTapHighlightColor: "transparent",
-    color: theme.colors.secondaryIconColor,
-    padding: "2px",
-    transition: "background 200ms ease, color 200ms ease",
     "&:hover": {
       background: theme.colors.secondaryIconHoverBg,
       color: theme.colors.secondaryIconHoverColor,
@@ -161,5 +151,15 @@ export const IconButton = /* @__PURE__ */ StyledButton((_) => {
     "&[disabled]": {
       cursor: "not-allowed",
     },
+    alignItems: "center",
+    all: "unset",
+    borderRadius: radius.sm,
+    color: theme.colors.secondaryIconColor,
+    cursor: "pointer",
+    display: "inline-flex",
+    justifyContent: "center",
+    padding: "2px",
+    transition: "background 200ms ease, color 200ms ease",
+    WebkitTapHighlightColor: "transparent",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/formElements.tsx b/packages/thirdweb/src/react/web/ui/components/formElements.tsx
index 5172e61aec2..1758ba9eaca 100644
--- a/packages/thirdweb/src/react/web/ui/components/formElements.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/formElements.tsx
@@ -1,10 +1,10 @@
 "use client";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
 import {
-  type Theme,
   fontSize,
   radius,
   spacing,
+  type Theme,
 } from "../../../core/design-system/index.js";
 import {
   StyledDiv,
@@ -19,9 +19,9 @@ type LabelProps = {
 export const Label = /* @__PURE__ */ StyledLabel((props: LabelProps) => {
   const theme = useCustomTheme();
   return {
-    fontSize: fontSize.sm,
     color: theme.colors[props.color || "primaryText"],
     display: "block",
+    fontSize: fontSize.sm,
     fontWeight: 500,
   };
 });
@@ -35,52 +35,30 @@ type InputProps = {
 export const Input = /* @__PURE__ */ StyledInput<InputProps>((props) => {
   const theme = useCustomTheme();
   return {
-    fontSize: fontSize.md,
-    fontFamily: "inherit",
-    display: "block",
-    padding: props.sm ? spacing.sm : fontSize.sm,
-    boxSizing: "border-box",
-    width: "100%",
-    outline: "none",
-    border: "none",
-    borderRadius: radius.md,
-    color: theme.colors.primaryText,
-    WebkitAppearance: "none",
-    appearance: "none",
-    background: "transparent",
-    "&::placeholder": {
-      color: theme.colors.secondaryText,
-    },
-    boxShadow: `0 0 0 1.5px ${
-      props.variant === "outline" ? theme.colors.borderColor : "transparent"
-    }`,
     "&:-webkit-autofill": {
-      WebkitTextFillColor: theme.colors.primaryText,
-      WebkitBoxShadow: `0 0 0px 1000px ${theme.colors.inputAutofillBg} inset !important`,
       boxShadow: `0 0 0px 1000px ${theme.colors.inputAutofillBg} inset !important`,
       transition: "background-color 5000s ease-in-out 0s",
+      WebkitBoxShadow: `0 0 0px 1000px ${theme.colors.inputAutofillBg} inset !important`,
+      WebkitTextFillColor: theme.colors.primaryText,
     },
     "&:-webkit-autofill:focus": {
-      WebkitBoxShadow: `0 0 0px 1000px ${
+      boxShadow: `0 0 0px 1000px ${
         theme.colors.inputAutofillBg
       } inset, 0 0 0 2px ${
         props.variant === "outline" ? theme.colors.accentText : "transparent"
       } !important`,
-      boxShadow: `0 0 0px 1000px ${
+      WebkitBoxShadow: `0 0 0px 1000px ${
         theme.colors.inputAutofillBg
       } inset, 0 0 0 2px ${
         props.variant === "outline" ? theme.colors.accentText : "transparent"
       } !important`,
     },
-    "&[data-placeholder='true']": {
+    "&::placeholder": {
       color: theme.colors.secondaryText,
     },
     "&:focus": {
       boxShadow: `0 0 0 2px ${theme.colors.accentText}`,
     },
-    "&[data-focus='false']:focus": {
-      boxShadow: "none",
-    },
     "&:not([type='password'])": {
       overflow: "hidden",
       textOverflow: "ellipsis",
@@ -89,18 +67,40 @@ export const Input = /* @__PURE__ */ StyledInput<InputProps>((props) => {
     "&[data-error='true']": {
       boxShadow: `0 0 0 2px ${theme.colors.danger} !important`,
     },
+    "&[data-focus='false']:focus": {
+      boxShadow: "none",
+    },
+    "&[data-placeholder='true']": {
+      color: theme.colors.secondaryText,
+    },
     "&[disabled]": {
       cursor: "not-allowed",
     },
-    "&[type='number']::-webkit-outer-spin-button, &[type='number']::-webkit-inner-spin-button":
-      {
-        WebkitAppearance: "none",
-        margin: 0,
-      },
     "&[type='number']": {
       appearance: "none",
       MozAppearance: "textfield",
     },
+    "&[type='number']::-webkit-outer-spin-button, &[type='number']::-webkit-inner-spin-button":
+      {
+        margin: 0,
+        WebkitAppearance: "none",
+      },
+    appearance: "none",
+    background: "transparent",
+    border: "none",
+    borderRadius: radius.md,
+    boxShadow: `0 0 0 1.5px ${
+      props.variant === "outline" ? theme.colors.borderColor : "transparent"
+    }`,
+    boxSizing: "border-box",
+    color: theme.colors.primaryText,
+    display: "block",
+    fontFamily: "inherit",
+    fontSize: fontSize.md,
+    outline: "none",
+    padding: props.sm ? spacing.sm : fontSize.sm,
+    WebkitAppearance: "none",
+    width: "100%",
   };
 });
 
@@ -108,18 +108,18 @@ export const Input = /* @__PURE__ */ StyledInput<InputProps>((props) => {
 export const InputContainer = /* @__PURE__ */ StyledDiv(() => {
   const theme = useCustomTheme();
   return {
-    display: "flex",
-    borderRadius: radius.md,
-    boxShadow: `0 0 0px 1px ${theme.colors.borderColor}`,
     "&:focus-within": {
       boxShadow: `0 0 0px 1px ${theme.colors.accentText}`,
     },
-    "input:focus": {
-      boxShadow: "none",
-    },
     // show error ring on container instead of input
     "&[data-error='true']": {
       boxShadow: `0 0 0px 1px ${theme.colors.danger}`,
     },
+    borderRadius: radius.md,
+    boxShadow: `0 0 0px 1px ${theme.colors.borderColor}`,
+    display: "flex",
+    "input:focus": {
+      boxShadow: "none",
+    },
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/modalElements.tsx b/packages/thirdweb/src/react/web/ui/components/modalElements.tsx
index cd75b5c9041..9f6c931481d 100644
--- a/packages/thirdweb/src/react/web/ui/components/modalElements.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/modalElements.tsx
@@ -8,11 +8,11 @@ import { IconButton } from "./buttons.js";
 export const ModalTitle = /* @__PURE__ */ StyledH2((_) => {
   const theme = useCustomTheme();
   return {
-    margin: 0,
-    fontWeight: 600,
-    fontSize: fontSize.lg,
     color: theme.colors.primaryText,
+    fontSize: fontSize.lg,
+    fontWeight: 600,
     lineHeight: 1.3,
+    margin: 0,
     textAlign: "left",
   };
 });
@@ -30,7 +30,7 @@ export const BackButton: React.FC<{
       style={{ transform: "translateX(-25%)", ...props.style }}
       type="button"
     >
-      <ChevronLeftIcon width={iconSize.md} height={iconSize.md} />
+      <ChevronLeftIcon height={iconSize.md} width={iconSize.md} />
     </IconButton>
   );
 };
diff --git a/packages/thirdweb/src/react/web/ui/components/text.tsx b/packages/thirdweb/src/react/web/ui/components/text.tsx
index 6fcd87395cc..63ad1a8cc09 100644
--- a/packages/thirdweb/src/react/web/ui/components/text.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/text.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
-import { type Theme, fontSize } from "../../../core/design-system/index.js";
+import { fontSize, type Theme } from "../../../core/design-system/index.js";
 import { StyledAnchor, StyledSpan } from "../design-system/elements.js";
 
 export type TextProps = {
@@ -17,17 +17,17 @@ export type TextProps = {
 export const Text = /* @__PURE__ */ StyledSpan<TextProps>((p) => {
   const theme = useCustomTheme();
   return {
-    fontSize: fontSize[p.size || "md"],
     color: theme.colors[p.color || "secondaryText"],
-    margin: 0,
     display: p.inline ? "inline" : "block",
+    fontSize: fontSize[p.size || "md"],
     fontWeight: p.weight || 500,
     lineHeight: p.multiline ? 1.5 : "normal",
-    textAlign: p.center ? "center" : "left",
-    textWrap: p.balance ? "balance" : "inherit",
+    margin: 0,
     maxWidth: "100%",
     overflow: "hidden",
+    textAlign: p.center ? "center" : "left",
     textOverflow: "ellipsis",
+    textWrap: p.balance ? "balance" : "inherit",
   };
 });
 
@@ -44,19 +44,19 @@ type LinkProps = {
 export const Link = /* @__PURE__ */ StyledAnchor<LinkProps>((p) => {
   const theme = useCustomTheme();
   return {
+    "&:hover": {
+      color: theme.colors[p.hoverColor || "primaryText"],
+      textDecoration: "none",
+    },
     all: "unset",
-    cursor: "pointer",
     color: theme.colors[p.color || "accentText"],
-    fontSize: fontSize[p.size || "md"],
-    textDecoration: "none",
-    textAlign: p.center ? "center" : "left",
+    cursor: "pointer",
     display: p.inline ? "inline" : "block",
+    fontSize: fontSize[p.size || "md"],
     fontWeight: p.weight || 500,
     lineHeight: "normal",
+    textAlign: p.center ? "center" : "left",
+    textDecoration: "none",
     transition: "color 0.2s ease",
-    "&:hover": {
-      color: theme.colors[p.hoverColor || "primaryText"],
-      textDecoration: "none",
-    },
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/token/TokenRow.tsx b/packages/thirdweb/src/react/web/ui/components/token/TokenRow.tsx
index 131790627a7..a0b2cba2b87 100644
--- a/packages/thirdweb/src/react/web/ui/components/token/TokenRow.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/token/TokenRow.tsx
@@ -12,9 +12,9 @@ import {
 import { useChainName } from "../../../../core/hooks/others/useChainQuery.js";
 import { PayTokenIcon } from "../../ConnectWallet/screens/Buy/PayTokenIcon.js";
 import type { ERC20OrNativeToken } from "../../ConnectWallet/screens/nativeToken.js";
-import { Skeleton } from "../Skeleton.js";
 import { Container } from "../basic.js";
 import { Button } from "../buttons.js";
+import { Skeleton } from "../Skeleton.js";
 import { Text } from "../text.js";
 import { TokenSymbol } from "./TokenSymbol.js";
 
@@ -33,23 +33,23 @@ export function TokenRow(props: {
   if (!props.token || !props.chain) {
     return (
       <Button
-        variant="secondary"
         fullWidth
+        gap="xxs"
+        onClick={props.onSelectToken}
         style={{
           fontSize: fontSize.sm,
           justifyContent: "space-between",
-          paddingTop: spacing.md,
           paddingBottom: spacing.md,
+          paddingTop: spacing.md,
           ...props.style,
         }}
-        gap="xxs"
-        onClick={props.onSelectToken}
+        variant="secondary"
       >
-        <Text size="sm" color="primaryText">
+        <Text color="primaryText" size="sm">
           Select payment token
         </Text>
         <Container color="primaryText">
-          <ChevronDownIcon width={iconSize.sm} height={iconSize.sm} />
+          <ChevronDownIcon height={iconSize.sm} width={iconSize.sm} />
         </Container>
       </Button>
     );
@@ -57,22 +57,22 @@ export function TokenRow(props: {
 
   return (
     <TokenButton
-      variant="secondary"
+      disabled={props.freezeChainAndToken}
       fullWidth
+      gap="xxs"
+      onClick={props.onSelectToken}
       style={{
         fontSize: fontSize.sm,
         ...props.style,
       }}
-      gap="xxs"
-      onClick={props.onSelectToken}
-      disabled={props.freezeChainAndToken}
+      variant="secondary"
     >
-      <Container flex="row" center="y" gap="sm">
+      <Container center="y" flex="row" gap="sm">
         <PayTokenIcon
-          token={props.token}
           chain={props.chain}
-          size="md"
           client={props.client}
+          size="md"
+          token={props.token}
         />
 
         <Container flex="column" gap="4xs">
@@ -80,43 +80,43 @@ export function TokenRow(props: {
           <Container flex="column" gap="4xs">
             {props.isLoading ? (
               <Skeleton
-                width="120px"
-                height={fontSize.md}
                 color="borderColor"
+                height={fontSize.md}
+                width="120px"
               />
             ) : props.value ? (
-              <Container flex="row" gap="xxs" center="y" color="primaryText">
+              <Container center="y" color="primaryText" flex="row" gap="xxs">
                 <Text
-                  size="md"
                   color={props.value ? "primaryText" : "secondaryText"}
+                  size="md"
                 >
                   {formatNumber(Number(props.value), 6) || ""}
                 </Text>
                 <TokenSymbol
-                  token={props.token}
                   chain={props.chain}
                   color="secondaryText"
                   size="sm"
+                  token={props.token}
                 />
               </Container>
             ) : (
-              <TokenSymbol token={props.token} chain={props.chain} size="sm" />
+              <TokenSymbol chain={props.chain} size="sm" token={props.token} />
             )}
           </Container>
 
           {/* Network Name */}
           {name ? (
-            <Text size="xs" color="secondaryText">
+            <Text color="secondaryText" size="xs">
               {name}
             </Text>
           ) : (
-            <Skeleton width="90px" height={fontSize.xs} />
+            <Skeleton height={fontSize.xs} width="90px" />
           )}
         </Container>
       </Container>
       {!props.freezeChainAndToken && (
         <Container color="primaryText">
-          <ChevronDownIcon width={iconSize.sm} height={iconSize.sm} />
+          <ChevronDownIcon height={iconSize.sm} width={iconSize.sm} />
         </Container>
       )}
     </TokenButton>
@@ -129,7 +129,7 @@ const TokenButton = /* @__PURE__ */ styled(Button)(() => {
     background: theme.colors.tertiaryBg,
     border: `1px solid ${theme.colors.borderColor}`,
     justifyContent: "space-between",
-    transition: "background 0.3s",
     padding: spacing.sm,
+    transition: "background 0.3s",
   };
 });
diff --git a/packages/thirdweb/src/react/web/ui/components/token/TokenSymbol.tsx b/packages/thirdweb/src/react/web/ui/components/token/TokenSymbol.tsx
index da419ec87e0..6c6165ac40b 100644
--- a/packages/thirdweb/src/react/web/ui/components/token/TokenSymbol.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/token/TokenSymbol.tsx
@@ -1,6 +1,6 @@
 "use client";
 import type { Chain } from "../../../../../chains/types.js";
-import { type Theme, fontSize } from "../../../../core/design-system/index.js";
+import { fontSize, type Theme } from "../../../../core/design-system/index.js";
 import { useChainSymbol } from "../../../../core/hooks/others/useChainQuery.js";
 import {
   type ERC20OrNativeToken,
@@ -22,9 +22,9 @@ export function TokenSymbol(props: {
   if (!isNativeToken(props.token)) {
     return (
       <Text
-        size={props.size}
         color={props.color || "primaryText"}
         inline={props.inline}
+        size={props.size}
       >
         {props.token.symbol}
       </Text>
@@ -34,9 +34,9 @@ export function TokenSymbol(props: {
   return (
     <NativeTokenSymbol
       chain={props.chain}
-      size={props.size}
       color={props.color}
       inline={props.inline}
+      size={props.size}
     />
   );
 }
@@ -50,14 +50,14 @@ function NativeTokenSymbol(props: {
   const chainSymbolQuery = useChainSymbol(props.chain);
 
   if (chainSymbolQuery.isLoading) {
-    return <Skeleton width="70px" height={fontSize[props.size]} />;
+    return <Skeleton height={fontSize[props.size]} width="70px" />;
   }
 
   return (
     <Text
-      size={props.size}
       color={props.color || "primaryText"}
       inline={props.inline}
+      size={props.size}
     >
       {chainSymbolQuery.symbol ?? "ETH"}
     </Text>
diff --git a/packages/thirdweb/src/react/web/ui/hooks/useCopyClipboard.ts b/packages/thirdweb/src/react/web/ui/hooks/useCopyClipboard.ts
index d258fc76ad3..49ee90a267e 100644
--- a/packages/thirdweb/src/react/web/ui/hooks/useCopyClipboard.ts
+++ b/packages/thirdweb/src/react/web/ui/hooks/useCopyClipboard.ts
@@ -27,5 +27,5 @@ export function useClipboard(text: string) {
     };
   }, [hasCopied]);
 
-  return { onCopy, hasCopied };
+  return { hasCopied, onCopy };
 }
diff --git a/packages/thirdweb/src/react/web/ui/hooks/useDebouncedValue.test.tsx b/packages/thirdweb/src/react/web/ui/hooks/useDebouncedValue.test.tsx
index 60c67921cba..12f41490531 100644
--- a/packages/thirdweb/src/react/web/ui/hooks/useDebouncedValue.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/hooks/useDebouncedValue.test.tsx
@@ -19,13 +19,13 @@ describe("useDebouncedValue", () => {
   it("should debounce value changes", () => {
     const { result, rerender } = renderHook(
       ({ value, delay }) => useDebouncedValue(value, delay),
-      { initialProps: { value: "initial", delay: 1000 } },
+      { initialProps: { delay: 1000, value: "initial" } },
     );
 
     expect(result.current).toBe("initial");
 
     // Change the value
-    rerender({ value: "changed", delay: 1000 });
+    rerender({ delay: 1000, value: "changed" });
 
     // The value should not change immediately
     expect(result.current).toBe("initial");
@@ -58,12 +58,12 @@ describe("useDebouncedValue", () => {
   it("should handle multiple rapid changes", () => {
     const { result, rerender } = renderHook(
       ({ value, delay }) => useDebouncedValue(value, delay),
-      { initialProps: { value: "initial", delay: 1000 } },
+      { initialProps: { delay: 1000, value: "initial" } },
     );
 
-    rerender({ value: "change1", delay: 1000 });
-    rerender({ value: "change2", delay: 1000 });
-    rerender({ value: "change3", delay: 1000 });
+    rerender({ delay: 1000, value: "change1" });
+    rerender({ delay: 1000, value: "change2" });
+    rerender({ delay: 1000, value: "change3" });
 
     expect(result.current).toBe("initial");
 
@@ -77,10 +77,10 @@ describe("useDebouncedValue", () => {
   it("should respect changing delay times", () => {
     const { result, rerender } = renderHook(
       ({ value, delay }) => useDebouncedValue(value, delay),
-      { initialProps: { value: "initial", delay: 1000 } },
+      { initialProps: { delay: 1000, value: "initial" } },
     );
 
-    rerender({ value: "changed", delay: 500 });
+    rerender({ delay: 500, value: "changed" });
 
     act(() => {
       vi.advanceTimersByTime(600);
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Account/avatar.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Account/avatar.tsx
index 74d7283662c..fd205bc743b 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Account/avatar.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Account/avatar.tsx
@@ -163,18 +163,12 @@ export function AccountAvatar({
 }: AccountAvatarProps) {
   const { address, client } = useAccountContext();
   const avatarQuery = useQuery({
-    queryKey: [
-      "account-avatar",
-      address,
-      { socialType },
-      { resolverAddress, resolverChain },
-    ],
     queryFn: async (): Promise<string> => {
       const [socialData, ensName] = await Promise.all([
         getSocialProfiles({ address, client }),
         resolveName({
-          client,
           address: address || "",
+          client,
           resolverAddress,
           resolverChain,
         }),
@@ -210,6 +204,12 @@ export function AccountAvatar({
 
       throw new Error("Failed to resolve social + ens avatar");
     },
+    queryKey: [
+      "account-avatar",
+      address,
+      { socialType },
+      { resolverAddress, resolverChain },
+    ],
     retry: false,
     ...queryOptions,
   });
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Account/balance.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Account/balance.test.tsx
index 4d62dd69525..f090074c496 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Account/balance.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Account/balance.test.tsx
@@ -24,9 +24,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
         <AccountProvider address={VITALIK_WALLET} client={TEST_CLIENT}>
           <AccountBalance
             chain={ethereum}
-            loadingComponent={<span />}
             fallbackComponent={<span />}
             formatFn={() => "nope"}
+            loadingComponent={<span />}
           />
         </AccountProvider>
       </QueryClientProvider>,
@@ -38,9 +38,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
 
   it("`loadAccountBalance` should fetch the native balance properly", async () => {
     const result = await loadAccountBalance({
-      client: TEST_CLIENT,
-      chain: ethereum,
       address: VITALIK_WALLET,
+      chain: ethereum,
+      client: TEST_CLIENT,
     });
 
     expect(Number.isNaN(result.balance)).toBe(false);
@@ -49,9 +49,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
 
   it("`loadAccountBalance` should fetch the token balance properly", async () => {
     const result = await loadAccountBalance({
-      client: TEST_CLIENT,
-      chain: ethereum,
       address: VITALIK_WALLET,
+      chain: ethereum,
+      client: TEST_CLIENT,
       // USDC
       tokenAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
     });
@@ -62,9 +62,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
 
   it("`loadAccountBalance` should fetch the fiat balance properly", async () => {
     const result = await loadAccountBalance({
-      client: TEST_CLIENT,
-      chain: ethereum,
       address: VITALIK_WALLET,
+      chain: ethereum,
+      client: TEST_CLIENT,
       showBalanceInFiat: "USD",
     });
 
@@ -75,10 +75,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
   it("`loadAccountBalance` should throw if `tokenAddress` is mistakenly passed as native token", async () => {
     await expect(
       loadAccountBalance({
-        client: TEST_CLIENT,
         address: VITALIK_WALLET,
-        tokenAddress: NATIVE_TOKEN_ADDRESS,
         chain: ethereum,
+        client: TEST_CLIENT,
+        tokenAddress: NATIVE_TOKEN_ADDRESS,
       }),
     ).rejects.toThrowError(
       `Invalid tokenAddress - cannot be ${NATIVE_TOKEN_ADDRESS}`,
@@ -88,10 +88,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
   it("`loadAccountBalance` should throw if `address` is not a valid evm address", async () => {
     await expect(
       loadAccountBalance({
-        client: TEST_CLIENT,
         // biome-ignore lint/suspicious/noExplicitAny: for the test
         address: "haha" as any,
         chain: ethereum,
+        client: TEST_CLIENT,
       }),
     ).rejects.toThrowError("Invalid wallet address. Expected an EVM address");
   });
@@ -99,11 +99,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
   it("`loadAccountBalance` should throw if `tokenAddress` is passed but is not a valid evm address", async () => {
     await expect(
       loadAccountBalance({
-        client: TEST_CLIENT,
         address: VITALIK_WALLET,
+        chain: ethereum,
+        client: TEST_CLIENT,
         // biome-ignore lint/suspicious/noExplicitAny: for the test
         tokenAddress: "haha" as any,
-        chain: ethereum,
       }),
     ).rejects.toThrowError(
       "Invalid tokenAddress. Expected an EVM contract address",
@@ -114,24 +114,24 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
     expect(
       formatAccountTokenBalance({
         balance: 1.1999,
-        symbol: "ETH",
         decimals: 1,
+        symbol: "ETH",
       }),
     ).toBe("1.2 ETH");
   });
 
   it("`formatAccountFiatBalance` should display fiat symbol followed by a rounded-up fiat value", () => {
     expect(
-      formatAccountFiatBalance({ balance: 55.001, symbol: "$", decimals: 0 }),
+      formatAccountFiatBalance({ balance: 55.001, decimals: 0, symbol: "$" }),
     ).toBe("$55");
   });
 
   it("`loadAccountBalance` should throw if failed to load tokenBalance (native token)", async () => {
     await expect(
       loadAccountBalance({
-        client: TEST_CLIENT,
         address: VITALIK_WALLET,
         chain: defineChain(-1),
+        client: TEST_CLIENT,
       }),
     ).rejects.toThrowError(
       `Failed to retrieve native token balance for address: ${VITALIK_WALLET} on chainId:-1`,
@@ -141,9 +141,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
   it("`loadAccountBalance` should throw if failed to load tokenBalance (erc20 token)", async () => {
     await expect(
       loadAccountBalance({
-        client: TEST_CLIENT,
         address: VITALIK_WALLET,
         chain: defineChain(-1),
+        client: TEST_CLIENT,
         tokenAddress: "0xFfEBd97b29AD3b2BecF8E554e4a638A56C6Bbd59",
       }),
     ).rejects.toThrowError(
@@ -154,9 +154,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
   it("if fetching fiat value then it should throw if failed to resolve (native token)", async () => {
     await expect(
       loadAccountBalance({
-        client: TEST_CLIENT,
         address: VITALIK_WALLET,
         chain: sepolia,
+        client: TEST_CLIENT,
         showBalanceInFiat: "USD",
       }),
     ).rejects.toThrowError(
@@ -167,9 +167,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("AccountBalance component", () => {
   it("if fetching fiat value then it should throw if failed to resolve (erc20 token)", async () => {
     await expect(
       loadAccountBalance({
-        client: TEST_CLIENT,
         address: VITALIK_WALLET,
         chain: sepolia,
+        client: TEST_CLIENT,
         showBalanceInFiat: "USD",
         // this is a random erc20 token on sepolia that vitalik's wallet owns
         tokenAddress: "0xFfEBd97b29AD3b2BecF8E554e4a638A56C6Bbd59",
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Account/balance.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Account/balance.tsx
index 8b6d096e335..be3660fa85a 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Account/balance.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Account/balance.tsx
@@ -11,9 +11,9 @@ import { useAccountContext } from "../../../../core/account/provider.js";
 import {
   type AccountBalanceInfo,
   formatAccountFiatBalance,
+  formatAccountTokenBalance,
   loadAccountBalance,
 } from "../../../../core/utils/account.js";
-import { formatAccountTokenBalance } from "../../../../core/utils/account.js";
 
 /**
  * Props for the AccountBalance component
@@ -172,6 +172,14 @@ export function AccountBalance({
   const walletChain = useActiveWalletChain();
   const chainToLoad = chain || walletChain;
   const balanceQuery = useQuery({
+    queryFn: async (): Promise<AccountBalanceInfo> =>
+      loadAccountBalance({
+        address: getAddress(address),
+        chain: chainToLoad,
+        client,
+        showBalanceInFiat,
+        tokenAddress: tokenAddress ? getAddress(tokenAddress) : undefined,
+      }),
     queryKey: [
       "internal_account_balance",
       chainToLoad?.id || -1,
@@ -179,14 +187,6 @@ export function AccountBalance({
       { tokenAddress },
       showBalanceInFiat,
     ] as const,
-    queryFn: async (): Promise<AccountBalanceInfo> =>
-      loadAccountBalance({
-        chain: chainToLoad,
-        client,
-        address: getAddress(address),
-        tokenAddress: tokenAddress ? getAddress(tokenAddress) : undefined,
-        showBalanceInFiat,
-      }),
     retry: false,
     ...queryOptions,
   });
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Account/name.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Account/name.tsx
index 2156ce31473..fde341c9328 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Account/name.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Account/name.tsx
@@ -138,18 +138,12 @@ export function AccountName({
 }: AccountNameProps) {
   const { address, client } = useAccountContext();
   const nameQuery = useQuery({
-    queryKey: [
-      "account-name",
-      address,
-      { socialType },
-      { resolverAddress, resolverChain },
-    ],
     queryFn: async () => {
       const [socialData, ensName] = await Promise.all([
         getSocialProfiles({ address, client }),
         resolveName({
-          client,
           address,
+          client,
           resolverAddress,
           resolverChain,
         }),
@@ -165,6 +159,12 @@ export function AccountName({
       }
       return formatFn ? formatFn(name) : name;
     },
+    queryKey: [
+      "account-name",
+      address,
+      { socialType },
+      { resolverAddress, resolverChain },
+    ],
     retry: false,
     ...queryOptions,
   });
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Chain/icon.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Chain/icon.test.tsx
index 8b4172ab6e8..5a4d7d77efe 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Chain/icon.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Chain/icon.test.tsx
@@ -46,13 +46,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("ChainIcon", () => {
 
   it("fetchChainIcon should return a resolved url from the chain object, NOT the ipfs uri", async () => {
     const mockEthereum = defineChain({
-      id: 1,
-      name: "Ethereum",
-      nativeCurrency: {
-        name: "Ether",
-        symbol: "ETH",
-        decimals: 18,
-      },
       blockExplorers: [
         {
           name: "Etherscan",
@@ -60,10 +53,17 @@ describe.runIf(process.env.TW_SECRET_KEY)("ChainIcon", () => {
         },
       ],
       icon: {
-        url: "ipfs://QmdwQDr6vmBtXmK2TmknkEuZNoaDqTasFdZdu3DRw8b2wt",
         format: "png",
-        width: 100,
         height: 100,
+        url: "ipfs://QmdwQDr6vmBtXmK2TmknkEuZNoaDqTasFdZdu3DRw8b2wt",
+        width: 100,
+      },
+      id: 1,
+      name: "Ethereum",
+      nativeCurrency: {
+        decimals: 18,
+        name: "Ether",
+        symbol: "ETH",
       },
     });
     const resolvedUrl = await fetchChainIcon({ chain: mockEthereum, client });
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Chain/icon.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Chain/icon.tsx
index 3ba2cba59f9..de034bdb771 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Chain/icon.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Chain/icon.tsx
@@ -123,8 +123,8 @@ export function ChainIcon({
 }: ChainIconProps) {
   const { chain } = useChainContext();
   const iconQuery = useQuery({
-    queryKey: getQueryKeys({ chainId: chain.id, iconResolver }),
     queryFn: async () => fetchChainIcon({ chain, client, iconResolver }),
+    queryKey: getQueryKeys({ chainId: chain.id, iconResolver }),
     ...queryOptions,
   });
 
@@ -156,7 +156,7 @@ export async function fetchChainIcon(props: {
   }
   // Check if the chain object already has "icon"
   if (chain.icon?.url) {
-    return resolveScheme({ uri: chain.icon.url, client });
+    return resolveScheme({ client, uri: chain.icon.url });
   }
   const possibleUrl = await getChainMetadata(chain)
     .then((data) => data.icon?.url)
@@ -164,7 +164,7 @@ export async function fetchChainIcon(props: {
   if (!possibleUrl) {
     throw new Error("Failed to resolve icon for chain");
   }
-  return resolveScheme({ uri: possibleUrl, client });
+  return resolveScheme({ client, uri: possibleUrl });
 }
 
 /**
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Chain/name.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Chain/name.tsx
index 55751afce2f..c48698d4acf 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Chain/name.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Chain/name.tsx
@@ -157,8 +157,8 @@ export function ChainName({
 }: ChainNameProps) {
   const { chain } = useChainContext();
   const nameQuery = useQuery({
-    queryKey: getQueryKeys({ chainId: chain.id, nameResolver }),
     queryFn: async () => fetchChainName({ chain, nameResolver }),
+    queryKey: getQueryKeys({ chainId: chain.id, nameResolver }),
     ...queryOptions,
   });
 
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/description.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/description.test.tsx
index c63d0bc613b..3c3e3d60140 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/description.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/description.test.tsx
@@ -28,8 +28,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTDescription", () => {
   it("fetchNftDescription should respect descriptionResolver as a string", async () => {
     const desc = await fetchNftDescription({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       descriptionResolver: "string",
+      tokenId: 0n,
     });
     expect(desc).toBe("string");
   });
@@ -37,8 +37,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTDescription", () => {
   it("fetchNftDescription should respect descriptionResolver as a non-async function", async () => {
     const desc = await fetchNftDescription({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       descriptionResolver: () => "non-async",
+      tokenId: 0n,
     });
     expect(desc).toBe("non-async");
   });
@@ -46,8 +46,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTDescription", () => {
   it("fetchNftDescription should respect descriptionResolver as a async function", async () => {
     const desc = await fetchNftDescription({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       descriptionResolver: async () => "async",
+      tokenId: 0n,
     });
     expect(desc).toBe("async");
   });
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/description.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/description.tsx
index 81e5825c8c5..02705c7b2d7 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/description.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/description.tsx
@@ -92,6 +92,8 @@ export function NFTDescription({
 }: NFTDescriptionProps) {
   const { contract, tokenId } = useNFTContext();
   const descQuery = useQuery({
+    queryFn: async (): Promise<string> =>
+      fetchNftDescription({ contract, descriptionResolver, tokenId }),
     queryKey: [
       "_internal_nft_description_",
       contract.chain.id,
@@ -106,8 +108,6 @@ export function NFTDescription({
               : undefined,
       },
     ],
-    queryFn: async (): Promise<string> =>
-      fetchNftDescription({ descriptionResolver, contract, tokenId }),
     ...queryOptions,
   });
 
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/media.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/media.test.tsx
index fe69a71d131..e00adf6d248 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/media.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/media.test.tsx
@@ -16,8 +16,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
       tokenId: 0n,
     });
     expect(desc).toStrictEqual({
-      src: "ipfs://QmUEfFfwAh4wyB5UfHCVPUxis4j4Q4kJXtm5x5p3g1fVUn",
       poster: undefined,
+      src: "ipfs://QmUEfFfwAh4wyB5UfHCVPUxis4j4Q4kJXtm5x5p3g1fVUn",
     });
   });
 
@@ -27,46 +27,46 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
       tokenId: 0n,
     });
     expect(desc).toStrictEqual({
-      src: "ipfs://QmeGCqV1mSHTZrvuFzW1XZdCRRGXB6AmSotTqHoxA2xfDo/1.mp4",
       poster: "ipfs://QmeGCqV1mSHTZrvuFzW1XZdCRRGXB6AmSotTqHoxA2xfDo/0.png",
+      src: "ipfs://QmeGCqV1mSHTZrvuFzW1XZdCRRGXB6AmSotTqHoxA2xfDo/1.mp4",
     });
   });
 
   it("fetchNftMedia should respect mediaResolver as a string", async () => {
     const desc = await fetchNftMedia({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       mediaResolver: {
-        src: "string",
         poster: undefined,
+        src: "string",
       },
+      tokenId: 0n,
     });
-    expect(desc).toStrictEqual({ src: "string", poster: undefined });
+    expect(desc).toStrictEqual({ poster: undefined, src: "string" });
   });
 
   it("fetchNftMedia should respect mediaResolver as a non-async function", async () => {
     const desc = await fetchNftMedia({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       mediaResolver: () => ({
-        src: "non-async",
         poster: undefined,
+        src: "non-async",
       }),
+      tokenId: 0n,
     });
-    expect(desc).toStrictEqual({ src: "non-async", poster: undefined });
+    expect(desc).toStrictEqual({ poster: undefined, src: "non-async" });
   });
 
   it("fetchNftMedia should respect mediaResolver as a async function", async () => {
     const desc = await fetchNftMedia({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       mediaResolver: async () =>
         await {
-          src: "async",
           poster: undefined,
+          src: "async",
         },
+      tokenId: 0n,
     });
-    expect(desc).toStrictEqual({ src: "async", poster: undefined });
+    expect(desc).toStrictEqual({ poster: undefined, src: "async" });
   });
 
   it("fetchNftMedia should throw error if failed to resolve nft info", async () => {
@@ -82,8 +82,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
     expect(
       getQueryKey({
         chainId: 1,
-        tokenId: 1n,
         contractAddress: testContractAddress,
+        tokenId: 1n,
       }),
     ).toStrictEqual([
       "_internal_nft_media_",
@@ -99,13 +99,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
   it("getQueryKey should work with mediaResolver being an object", () => {
     expect(
       getQueryKey({
-        contractAddress: testContractAddress,
         chainId: 1,
-        tokenId: 1n,
+        contractAddress: testContractAddress,
         mediaResolver: {
-          src: "test",
           poster: "test",
+          src: "test",
         },
+        tokenId: 1n,
       }),
     ).toStrictEqual([
       "_internal_nft_media_",
@@ -114,8 +114,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
       "1",
       {
         resolver: {
-          src: "test",
           poster: "test",
+          src: "test",
         },
       },
     ]);
@@ -123,16 +123,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
 
   it("getQueryKey should work with mediaResolver being a function", () => {
     const fn = () => ({
-      src: "test",
       poster: "test",
+      src: "test",
     });
     const fnId = getFunctionId(fn);
     expect(
       getQueryKey({
         chainId: 1,
         contractAddress: testContractAddress,
-        tokenId: 1n,
         mediaResolver: fn,
+        tokenId: 1n,
       }),
     ).toStrictEqual([
       "_internal_nft_media_",
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/media.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/media.tsx
index a927a52b1d8..4072d9ffddc 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/media.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/media.tsx
@@ -132,14 +132,14 @@ export function NFTMedia({
 }: NFTMediaProps) {
   const { contract, tokenId } = useNFTContext();
   const mediaQuery = useQuery({
+    queryFn: async (): Promise<NFTMediaInfo> =>
+      fetchNftMedia({ contract, mediaResolver, tokenId }),
     queryKey: getQueryKey({
-      contractAddress: contract.address,
       chainId: contract.chain.id,
-      tokenId,
+      contractAddress: contract.address,
       mediaResolver,
+      tokenId,
     }),
-    queryFn: async (): Promise<NFTMediaInfo> =>
-      fetchNftMedia({ mediaResolver, contract, tokenId }),
     ...queryOptions,
   });
 
@@ -154,8 +154,8 @@ export function NFTMedia({
   return (
     <MediaRenderer
       client={contract.client}
-      src={mediaQuery.data.src}
       poster={mediaQuery.data.poster}
+      src={mediaQuery.data.src}
       {...mediaRendererProps}
     />
   );
@@ -216,14 +216,14 @@ export async function fetchNftMedia(props: {
   const image = nft.metadata.image || nft.metadata.image_url;
   if (animation_url) {
     return {
-      src: animation_url,
       poster: image || undefined,
+      src: animation_url,
     };
   }
   if (image) {
     return {
-      src: image,
       poster: undefined,
+      src: image,
     };
   }
   throw new Error("Failed to resolve NFT media");
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/name.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/name.test.tsx
index 27d286fe28b..26ff04c46b5 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/name.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/name.test.tsx
@@ -29,8 +29,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
   it("fetchNftName should respect nameResolver as a string", async () => {
     const desc = await fetchNftName({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       nameResolver: "string",
+      tokenId: 0n,
     });
     expect(desc).toBe("string");
   });
@@ -38,8 +38,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
   it("fetchNftName should respect nameResolver as a non-async function", async () => {
     const desc = await fetchNftName({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       nameResolver: () => "non-async",
+      tokenId: 0n,
     });
     expect(desc).toBe("non-async");
   });
@@ -47,8 +47,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
   it("fetchNftName should respect nameResolver as a async function", async () => {
     const desc = await fetchNftName({
       contract: DOODLES_CONTRACT,
-      tokenId: 0n,
       nameResolver: async () => "async",
+      tokenId: 0n,
     });
     expect(desc).toBe("async");
   });
@@ -66,8 +66,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
     expect(
       getQueryKey({
         chainId: 1,
-        tokenId: 1n,
         contractAddress: testContractAddress,
+        tokenId: 1n,
       }),
     ).toStrictEqual([
       "_internal_nft_name_",
@@ -82,9 +82,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
     expect(
       getQueryKey({
         chainId: 1,
-        tokenId: 1n,
-        nameResolver: "test",
         contractAddress: testContractAddress,
+        nameResolver: "test",
+        tokenId: 1n,
       }),
     ).toStrictEqual([
       "_internal_nft_name_",
@@ -101,9 +101,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
     expect(
       getQueryKey({
         chainId: 1,
-        tokenId: 1n,
-        nameResolver: fn,
         contractAddress: testContractAddress,
+        nameResolver: fn,
+        tokenId: 1n,
       }),
     ).toStrictEqual([
       "_internal_nft_name_",
@@ -120,9 +120,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
     expect(
       getQueryKey({
         chainId: 1,
-        tokenId: 1n,
-        nameResolver: fn,
         contractAddress: testContractAddress,
+        nameResolver: fn,
+        tokenId: 1n,
       }),
     ).toStrictEqual([
       "_internal_nft_name_",
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/name.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/name.tsx
index 5486abcff50..a6ad8152921 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/NFT/name.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/NFT/name.tsx
@@ -94,14 +94,14 @@ export function NFTName({
   const { contract, tokenId } = useNFTContext();
 
   const nameQuery = useQuery({
+    queryFn: async (): Promise<string> =>
+      fetchNftName({ contract, nameResolver, tokenId }),
     queryKey: getQueryKey({
-      contractAddress: contract.address,
       chainId: contract.chain.id,
-      tokenId,
+      contractAddress: contract.address,
       nameResolver,
+      tokenId,
     }),
-    queryFn: async (): Promise<string> =>
-      fetchNftName({ nameResolver, contract, tokenId }),
     ...queryOptions,
   });
 
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Token/icon.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Token/icon.tsx
index 0be981d8ee1..82ad22fb890 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Token/icon.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Token/icon.tsx
@@ -118,19 +118,6 @@ export function TokenIcon({
 }: TokenIconProps) {
   const { address, client, chain } = useTokenContext();
   const iconQuery = useQuery({
-    queryKey: [
-      "_internal_token_icon_",
-      chain.id,
-      address,
-      {
-        resolver:
-          typeof iconResolver === "string"
-            ? iconResolver
-            : typeof iconResolver === "function"
-              ? getFunctionId(iconResolver)
-              : undefined,
-      },
-    ] as const,
     queryFn: async () => {
       if (typeof iconResolver === "string") {
         return iconResolver;
@@ -145,7 +132,7 @@ export function TokenIcon({
         if (!possibleUrl) {
           throw new Error("Failed to resolve icon for native token");
         }
-        return resolveScheme({ uri: possibleUrl, client });
+        return resolveScheme({ client, uri: possibleUrl });
       }
 
       // Try to get the icon from the contractURI
@@ -165,10 +152,23 @@ export function TokenIcon({
       }
 
       return resolveScheme({
-        uri: contractMetadata.image,
         client,
+        uri: contractMetadata.image,
       });
     },
+    queryKey: [
+      "_internal_token_icon_",
+      chain.id,
+      address,
+      {
+        resolver:
+          typeof iconResolver === "string"
+            ? iconResolver
+            : typeof iconResolver === "function"
+              ? getFunctionId(iconResolver)
+              : undefined,
+      },
+    ] as const,
     ...queryOptions,
   });
 
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Token/name.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Token/name.test.tsx
index 1c4585de5ea..d4f9f767fa4 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Token/name.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Token/name.test.tsx
@@ -16,8 +16,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
   it("fetchTokenName should respect the nameResolver being a string", async () => {
     const res = await fetchTokenName({
       address: "thing",
-      client,
       chain: ANVIL_CHAIN,
+      client,
       nameResolver: "tw",
     });
     expect(res).toBe("tw");
@@ -26,8 +26,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
   it("fetchTokenName should respect the nameResolver being a non-async function", async () => {
     const res = await fetchTokenName({
       address: "thing",
-      client,
       chain: ANVIL_CHAIN,
+      client,
       nameResolver: () => "tw",
     });
 
@@ -37,8 +37,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
   it("fetchTokenName should respect the nameResolver being an async function", async () => {
     const res = await fetchTokenName({
       address: "thing",
-      client,
       chain: ANVIL_CHAIN,
+      client,
       nameResolver: async () => {
         await new Promise((resolve) => setTimeout(resolve, 2000));
         return "tw";
@@ -51,8 +51,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
   it("fetchTokenName should work for contract with `name` function", async () => {
     const res = await fetchTokenName({
       address: USDT_CONTRACT.address,
-      client,
       chain: USDT_CONTRACT.chain,
+      client,
     });
 
     expect(res).toBe("Tether USD");
@@ -61,8 +61,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
   it("fetchTokenName should work for native token", async () => {
     const res = await fetchTokenName({
       address: NATIVE_TOKEN_ADDRESS,
-      client,
       chain: ethereum,
+      client,
     });
 
     expect(res).toBe("Ether");
@@ -76,8 +76,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
     await expect(
       fetchTokenName({
         address: UNISWAPV3_FACTORY_CONTRACT.address,
-        client,
         chain: UNISWAPV3_FACTORY_CONTRACT.chain,
+        client,
       }),
     ).rejects.toThrowError(
       "Failed to resolve name from both name() and contract metadata",
@@ -85,7 +85,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
   });
 
   it("getQueryKeys should work without resolver", () => {
-    expect(getQueryKeys({ chainId: 1, address: "0x" })).toStrictEqual([
+    expect(getQueryKeys({ address: "0x", chainId: 1 })).toStrictEqual([
       "_internal_token_name_",
       1,
       "0x",
@@ -97,7 +97,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
 
   it("getQueryKeys should work with resolver being a string", () => {
     expect(
-      getQueryKeys({ chainId: 1, address: "0x", nameResolver: "tw" }),
+      getQueryKeys({ address: "0x", chainId: 1, nameResolver: "tw" }),
     ).toStrictEqual([
       "_internal_token_name_",
       1,
@@ -112,7 +112,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
     const fn = () => "tw";
     const fnId = getFunctionId(fn);
     expect(
-      getQueryKeys({ chainId: 1, address: "0x", nameResolver: fn }),
+      getQueryKeys({ address: "0x", chainId: 1, nameResolver: fn }),
     ).toStrictEqual([
       "_internal_token_name_",
       1,
@@ -131,8 +131,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenName component", () => {
     const fnId = getFunctionId(fn);
     expect(
       getQueryKeys({
-        chainId: 1,
         address: "0x",
+        chainId: 1,
         nameResolver: fn,
       }),
     ).toStrictEqual([
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Token/name.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Token/name.tsx
index 75925b8b0ec..69c7c9f6677 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Token/name.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Token/name.tsx
@@ -160,9 +160,9 @@ export function TokenName({
 }: TokenNameProps) {
   const { address, client, chain } = useTokenContext();
   const nameQuery = useQuery({
-    queryKey: getQueryKeys({ chainId: chain.id, nameResolver, address }),
     queryFn: async () =>
       fetchTokenName({ address, chain, client, nameResolver }),
+    queryKey: getQueryKeys({ address, chainId: chain.id, nameResolver }),
     ...queryOptions,
   });
 
@@ -204,7 +204,7 @@ export async function fetchTokenName(props: {
 
   // Try to fetch the name from both the `name` function and the contract metadata
   // then prioritize its result
-  const contract = getContract({ address, client, chain });
+  const contract = getContract({ address, chain, client });
   const [_name, contractMetadata] = await Promise.all([
     name({ contract }).catch(() => undefined),
     getContractMetadata({ contract }).catch(() => undefined),
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Token/provider.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Token/provider.test.tsx
index 0af0fe8b412..cb2bffee685 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Token/provider.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Token/provider.test.tsx
@@ -12,8 +12,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenProvider component", () => {
     render(
       <TokenProvider
         address={NATIVE_TOKEN_ADDRESS}
-        client={TEST_CLIENT}
         chain={ethereum}
+        client={TEST_CLIENT}
       >
         <div>Child Component</div>
       </TokenProvider>,
@@ -26,8 +26,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenProvider component", () => {
     render(
       <TokenProvider
         address={NATIVE_TOKEN_ADDRESS}
-        client={TEST_CLIENT}
         chain={ethereum}
+        client={TEST_CLIENT}
       >
         <TokenName />
         <TokenSymbol />
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Token/symbol.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Token/symbol.test.tsx
index 497cfce10ea..8cc2b7066e7 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Token/symbol.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Token/symbol.test.tsx
@@ -16,8 +16,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
   it("fetchTokenSymbol should respect the symbolResolver being a string", async () => {
     const res = await fetchTokenSymbol({
       address: "thing",
-      client,
       chain: ANVIL_CHAIN,
+      client,
       symbolResolver: "tw",
     });
     expect(res).toBe("tw");
@@ -26,8 +26,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
   it("fetchTokenSymbol should respect the symbolResolver being a non-async function", async () => {
     const res = await fetchTokenSymbol({
       address: "thing",
-      client,
       chain: ANVIL_CHAIN,
+      client,
       symbolResolver: () => "tw",
     });
 
@@ -37,8 +37,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
   it("fetchTokenSymbol should respect the symbolResolver being an async function", async () => {
     const res = await fetchTokenSymbol({
       address: "thing",
-      client,
       chain: ANVIL_CHAIN,
+      client,
       symbolResolver: async () => {
         await new Promise((resolve) => setTimeout(resolve, 2000));
         return "tw";
@@ -51,8 +51,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
   it("fetchTokenSymbol should work for contract with `symbol` function", async () => {
     const res = await fetchTokenSymbol({
       address: USDT_CONTRACT.address,
-      client,
       chain: USDT_CONTRACT.chain,
+      client,
     });
 
     expect(res).toBe("USDT");
@@ -61,8 +61,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
   it("fetchTokenSymbol should work for native token", async () => {
     const res = await fetchTokenSymbol({
       address: NATIVE_TOKEN_ADDRESS,
-      client,
       chain: ethereum,
+      client,
     });
 
     expect(res).toBe("ETH");
@@ -76,8 +76,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
     await expect(
       fetchTokenSymbol({
         address: UNISWAPV3_FACTORY_CONTRACT.address,
-        client,
         chain: UNISWAPV3_FACTORY_CONTRACT.chain,
+        client,
       }),
     ).rejects.toThrowError(
       "Failed to resolve symbol from both symbol() and contract metadata",
@@ -85,7 +85,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
   });
 
   it("getQueryKeys should work without resolver", () => {
-    expect(getQueryKeys({ chainId: 1, address: "0x" })).toStrictEqual([
+    expect(getQueryKeys({ address: "0x", chainId: 1 })).toStrictEqual([
       "_internal_token_symbol_",
       1,
       "0x",
@@ -97,7 +97,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
 
   it("getQueryKeys should work with resolver being a string", () => {
     expect(
-      getQueryKeys({ chainId: 1, address: "0x", symbolResolver: "tw" }),
+      getQueryKeys({ address: "0x", chainId: 1, symbolResolver: "tw" }),
     ).toStrictEqual([
       "_internal_token_symbol_",
       1,
@@ -112,7 +112,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
     const fn = () => "tw";
     const fnId = getFunctionId(fn);
     expect(
-      getQueryKeys({ chainId: 1, address: "0x", symbolResolver: fn }),
+      getQueryKeys({ address: "0x", chainId: 1, symbolResolver: fn }),
     ).toStrictEqual([
       "_internal_token_symbol_",
       1,
@@ -131,8 +131,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenSymbol component", () => {
     const fnId = getFunctionId(fn);
     expect(
       getQueryKeys({
-        chainId: 1,
         address: "0x",
+        chainId: 1,
         symbolResolver: fn,
       }),
     ).toStrictEqual([
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Token/symbol.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Token/symbol.tsx
index 95908ddab2e..80417aa069a 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Token/symbol.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Token/symbol.tsx
@@ -157,9 +157,9 @@ export function TokenSymbol({
 }: TokenSymbolProps) {
   const { address, client, chain } = useTokenContext();
   const symbolQuery = useQuery({
-    queryKey: getQueryKeys({ chainId: chain.id, address, symbolResolver }),
     queryFn: async () =>
-      fetchTokenSymbol({ symbolResolver, address, chain, client }),
+      fetchTokenSymbol({ address, chain, client, symbolResolver }),
+    queryKey: getQueryKeys({ address, chainId: chain.id, symbolResolver }),
     ...queryOptions,
   });
 
@@ -201,7 +201,7 @@ export async function fetchTokenSymbol(props: {
 
   // Try to fetch the symbol from both the `symbol` function and the contract metadata
   // then prioritize its result
-  const contract = getContract({ address, client, chain });
+  const contract = getContract({ address, chain, client });
   const [_symbol, contractMetadata] = await Promise.all([
     symbol({ contract }).catch(() => undefined),
     getContractMetadata({ contract }).catch(() => undefined),
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/icon.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/icon.test.tsx
index 33849d4cc7b..b9b280fb0e7 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/icon.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/icon.test.tsx
@@ -19,6 +19,7 @@ describe("WalletIcon", () => {
 
   it("should render an image", async () => {
     const { container } = render(
+      // biome-ignore lint/nursery/useUniqueElementIds: "id" is not a html attribute here - TODO: stop using 'id' as a prop on JSX elements
       <WalletProvider id="io.cosmostation">
         <WalletIcon />
       </WalletProvider>,
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/name.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/name.test.tsx
index cf1396025a8..2fddd1a855e 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/name.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/name.test.tsx
@@ -23,7 +23,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("WalletName", () => {
 
   it("fetchWalletName should work with formatFn", async () => {
     const formatFn = (str: string) => `${str} Wallet`;
-    expect(await fetchWalletName({ id: "io.metamask", formatFn })).toBe(
+    expect(await fetchWalletName({ formatFn, id: "io.metamask" })).toBe(
       "MetaMask Wallet",
     );
   });
@@ -38,7 +38,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("WalletName", () => {
   it("getQueryKeys should work WITH a formatFn", () => {
     const fn = (str: string) => `test:${str}`;
     const fnId = getFunctionId(fn);
-    expect(getQueryKeys({ id: "ai.hacken", formatFn: fn })).toStrictEqual([
+    expect(getQueryKeys({ formatFn: fn, id: "ai.hacken" })).toStrictEqual([
       "walletName",
       "ai.hacken",
       { resolver: fnId },
@@ -47,6 +47,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("WalletName", () => {
 
   it("should render a span", async () => {
     const { container } = render(
+      // biome-ignore lint/nursery/useUniqueElementIds: "id" is not a html attribute here - TODO: stop using 'id' as a prop on JSX elements
       <WalletProvider id="io.metamask">
         <WalletName />
       </WalletProvider>,
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/name.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/name.tsx
index edd42d224a7..f1cbca86289 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/name.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/Wallet/name.tsx
@@ -103,7 +103,7 @@ export function WalletName({
   formatFn,
   ...restProps
 }: WalletNameProps) {
-  const nameQuery = useWalletName({ queryOptions, formatFn });
+  const nameQuery = useWalletName({ formatFn, queryOptions });
   if (nameQuery.isLoading) {
     return loadingComponent || null;
   }
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/BuyDirectListingButton.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/BuyDirectListingButton.test.tsx
index 6bb36ce0414..f268d854489 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/BuyDirectListingButton.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/BuyDirectListingButton.test.tsx
@@ -13,8 +13,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("BuyDirectListingButton", () => {
   it("should render", () => {
     render(
       <BuyDirectListingButton
-        client={client}
         chain={sepolia}
+        client={client}
         contractAddress={marketplaceAddress}
         listingId={1n}
       >
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/index.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/index.tsx
index 51a73da4b00..daf77cce7c3 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/index.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/BuyDirectListingButton/index.tsx
@@ -92,8 +92,8 @@ export function BuyDirectListingButton(props: BuyDirectListingButtonProps) {
   const account = useActiveAccount();
   const contract = getContract({
     address: contractAddress,
-    client,
     chain,
+    client,
   });
 
   const { data: payMetadata } = useReadContract(getPayMetadata, {
@@ -158,8 +158,8 @@ export function BuyDirectListingButton(props: BuyDirectListingButtonProps) {
     });
 
     const approveTx = await getApprovalForTransaction({
-      transaction: buyTx,
       account,
+      transaction: buyTx,
     });
 
     if (approveTx) {
@@ -191,10 +191,10 @@ async function getPayMetadata(
 ): Promise<{ name?: string; image?: string }> {
   const listing = await getListing(options);
   if (!listing) {
-    return { name: undefined, image: undefined };
+    return { image: undefined, name: undefined };
   }
   return {
-    name: listing.asset?.metadata?.name,
     image: listing.asset?.metadata?.image,
+    name: listing.asset?.metadata?.name,
   };
 }
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/ClaimButton/ClaimButton.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/ClaimButton/ClaimButton.test.tsx
index a52b4fc6df9..155b48b0828 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/ClaimButton/ClaimButton.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/ClaimButton/ClaimButton.test.tsx
@@ -28,20 +28,20 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
 
   it("should work for an NFT Drop contract", async () => {
     const address = await deployERC721Contract({
-      client,
-      chain,
       account,
-      type: "DropERC721",
+      chain,
+      client,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "DropERC721",
     });
-    const contract = getContract({ address, client, chain });
+    const contract = getContract({ address, chain, client });
     const result = await getERC721ClaimTo({
-      contract,
       account,
-      claimParams: { type: "ERC721", quantity: 1n },
+      claimParams: { quantity: 1n, type: "ERC721" },
+      contract,
     });
 
     expect(result.to).toBe(address);
@@ -52,10 +52,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
     // should also render <ClaimButton />
     render(
       <ClaimButton
-        client={client}
         chain={chain}
-        contractAddress={address}
         claimParams={{ quantity: 1n, type: "ERC721" }}
+        client={client}
+        contractAddress={address}
       >
         Claim
       </ClaimButton>,
@@ -66,20 +66,20 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
 
   it("should work for an Edition Drop contract", async () => {
     const address = await deployERC1155Contract({
-      client,
-      chain,
       account,
-      type: "DropERC1155",
+      chain,
+      client,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "DropERC1155",
     });
-    const contract = getContract({ address, client, chain });
+    const contract = getContract({ address, chain, client });
     const result = await getERC1155ClaimTo({
-      contract,
       account,
-      claimParams: { type: "ERC1155", quantity: 1n, tokenId: 0n },
+      claimParams: { quantity: 1n, tokenId: 0n, type: "ERC1155" },
+      contract,
     });
     expect(result.to).toBe(address);
     expect(result.chain.id).toBe(chain.id);
@@ -89,10 +89,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
     // should also render <ClaimButton />
     render(
       <ClaimButton
-        client={client}
         chain={chain}
+        claimParams={{ quantity: 1n, tokenId: 0n, type: "ERC1155" }}
+        client={client}
         contractAddress={address}
-        claimParams={{ quantity: 1n, type: "ERC1155", tokenId: 0n }}
       >
         Claim
       </ClaimButton>,
@@ -103,42 +103,42 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
 
   it("should throw an error if claim quantity / quantityInWei is not passed", async () => {
     const address = await deployERC20Contract({
-      client,
-      chain,
       account,
-      type: "DropERC20",
+      chain,
+      client,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "DropERC20",
     });
     const contract = getContract({ address, chain, client });
     await expect(
       getERC20ClaimTo({
-        contract,
         account,
         // @ts-ignore Intended for the test
         claimParams: { type: "ERC20" },
+        contract,
       }),
     ).rejects.toThrowError("Missing quantity or quantityInWei");
   });
 
   it("should work for an Token Drop contract + quantity", async () => {
     const address = await deployERC20Contract({
-      client,
-      chain,
       account,
-      type: "DropERC20",
+      chain,
+      client,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "DropERC20",
     });
     const contract = getContract({ address, chain, client });
     const result = await getERC20ClaimTo({
-      contract,
       account,
-      claimParams: { type: "ERC20", quantity: "1" },
+      claimParams: { quantity: "1", type: "ERC20" },
+      contract,
     });
     expect(result.to).toBe(address);
     expect(result.chain.id).toBe(chain.id);
@@ -148,10 +148,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
     // should also render <ClaimButton />
     render(
       <ClaimButton
-        client={client}
         chain={chain}
-        contractAddress={address}
         claimParams={{ quantity: "100", type: "ERC20" }}
+        client={client}
+        contractAddress={address}
       >
         Claim
       </ClaimButton>,
@@ -162,20 +162,20 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
 
   it("should work for an Token Drop contract + quantityInWei", async () => {
     const address = await deployERC20Contract({
-      client,
-      chain,
       account,
-      type: "DropERC20",
+      chain,
+      client,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "DropERC20",
     });
     const contract = getContract({ address, chain, client });
     const result = await getERC20ClaimTo({
-      contract,
       account,
-      claimParams: { type: "ERC20", quantityInWei: 1000000n },
+      claimParams: { quantityInWei: 1000000n, type: "ERC20" },
+      contract,
     });
     expect(result.to).toBe(address);
     expect(result.chain.id).toBe(chain.id);
@@ -185,10 +185,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
     // should also render <ClaimButton />
     render(
       <ClaimButton
-        client={client}
         chain={chain}
-        contractAddress={address}
         claimParams={{ quantityInWei: 1000000n, type: "ERC20" }}
+        client={client}
+        contractAddress={address}
       >
         Claim
       </ClaimButton>,
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx
index 9ee37855f15..7776526376c 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../../../../contract/contract.js";
 import { getContractMetadata } from "../../../../../../extensions/common/read/getContractMetadata.js";
 import { getNFT } from "../../../../../../extensions/erc1155/read/getNFT.js";
@@ -114,16 +114,16 @@ export function ClaimButton(props: ClaimButtonProps) {
   const defaultPayModalMetadata = payModal ? payModal.metadata : undefined;
   const contract = getContract({
     address: contractAddress,
-    client,
     chain,
+    client,
   });
 
   const { data: payMetadata } = useReadContract(getPayMetadata, {
     contract,
-    tokenId: claimParams.type === "ERC1155" ? claimParams.tokenId : undefined,
     queryOptions: {
       enabled: !defaultPayModalMetadata,
     },
+    tokenId: claimParams.type === "ERC1155" ? claimParams.tokenId : undefined,
   });
   const account = useActiveAccount();
   const { mutateAsync } = useSendAndConfirmTransaction();
@@ -139,17 +139,17 @@ export function ClaimButton(props: ClaimButtonProps) {
         }
         const [claimTx, { getApprovalForTransaction }] = await Promise.all([
           getClaimTransaction({
-            contract,
             account,
             claimParams,
+            contract,
           }),
           import(
             "../../../../../../extensions/erc20/write/getApprovalForTransaction.js"
           ),
         ]);
         const approveTx = await getApprovalForTransaction({
-          transaction: claimTx,
           account,
+          transaction: claimTx,
         });
         if (approveTx) {
           await mutateAsync(approveTx);
@@ -202,11 +202,11 @@ async function getClaimTransaction({
 }): Promise<PreparedTransaction> {
   switch (claimParams.type) {
     case "ERC721":
-      return await getERC721ClaimTo({ contract, account, claimParams });
+      return await getERC721ClaimTo({ account, claimParams, contract });
     case "ERC1155":
-      return await getERC1155ClaimTo({ contract, account, claimParams });
+      return await getERC1155ClaimTo({ account, claimParams, contract });
     case "ERC20": {
-      return await getERC20ClaimTo({ contract, account, claimParams });
+      return await getERC20ClaimTo({ account, claimParams, contract });
     }
     default:
       throw new Error(
@@ -233,9 +233,9 @@ export async function getERC721ClaimTo({
 
   return claimTo({
     contract,
-    to: claimParams.to || account?.address || "",
-    quantity: claimParams.quantity,
     from: claimParams.from,
+    quantity: claimParams.quantity,
+    to: claimParams.to || account?.address || "",
   });
 }
 
@@ -257,10 +257,10 @@ export async function getERC1155ClaimTo({
 
   return claimTo({
     contract,
-    to: claimParams.to || account?.address || "",
+    from: claimParams.from,
     quantity: claimParams.quantity,
+    to: claimParams.to || account?.address || "",
     tokenId: claimParams.tokenId,
-    from: claimParams.from,
   });
 }
 
@@ -285,17 +285,17 @@ export async function getERC20ClaimTo({
   if ("quantity" in claimParams) {
     return claimTo({
       contract,
-      to: claimParams.to || account?.address || "",
-      quantity: claimParams.quantity,
       from: claimParams.from,
+      quantity: claimParams.quantity,
+      to: claimParams.to || account?.address || "",
     });
   }
   if ("quantityInWei" in claimParams) {
     return claimTo({
       contract,
-      to: claimParams.to || account?.address || "",
-      quantityInWei: claimParams.quantityInWei,
       from: claimParams.from,
+      quantityInWei: claimParams.quantityInWei,
+      to: claimParams.to || account?.address || "",
     });
   }
   throw new Error("Missing quantity or quantityInWei");
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/CreateDirectListingButton.test.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/CreateDirectListingButton.test.tsx
index 99ad63f7552..6588e19d88e 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/CreateDirectListingButton.test.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/CreateDirectListingButton.test.tsx
@@ -13,12 +13,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("BuyDirectListingButton", () => {
   it("should render", () => {
     render(
       <CreateDirectListingButton
-        client={client}
+        assetContractAddress="0x3cf279b3248E164F3e5C341826B878d350EC6AB1"
         chain={sepolia}
+        client={client}
         contractAddress={marketplaceAddress}
-        assetContractAddress="0x3cf279b3248E164F3e5C341826B878d350EC6AB1"
-        tokenId={0n}
         pricePerToken="0.1"
+        tokenId={0n}
       >
         Sell NFT
       </CreateDirectListingButton>,
diff --git a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/index.tsx b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/index.tsx
index 2dfb96c8c95..877e19bbff3 100644
--- a/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/index.tsx
+++ b/packages/thirdweb/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/index.tsx
@@ -83,10 +83,10 @@ export function CreateDirectListingButton(
   });
   const { data: payMetadata } = useReadContract(getPayMetadata, {
     contract: nftContract,
-    tokenId,
     queryOptions: {
       enabled: !defaultPayModalMetadata,
     },
+    tokenId,
   });
   const { mutateAsync } = useSendAndConfirmTransaction();
 
@@ -118,9 +118,9 @@ export function CreateDirectListingButton(
       });
       if (!isApproved) {
         const transaction = setApprovalForAll({
+          approved: true,
           contract: nftContract,
           operator: marketplaceContract.address,
-          approved: true,
         });
         await mutateAsync(transaction);
       }
@@ -152,9 +152,9 @@ export function CreateDirectListingButton(
           marketplaceContract.address.toLowerCase()
       ) {
         const transaction = setApprovalForAll({
+          approved: true,
           contract: nftContract,
           operator: marketplaceContract.address,
-          approved: true,
         });
         await mutateAsync(transaction);
       }
@@ -169,11 +169,11 @@ export function CreateDirectListingButton(
 
   return (
     <TransactionButton
-      transaction={() => prepareTransaction()}
       payModal={{
         metadata: defaultPayModalMetadata || payMetadata,
         ...payModal,
       }}
+      transaction={() => prepareTransaction()}
       {...props}
     >
       {children}
diff --git a/packages/thirdweb/src/react/web/utils/canFitWideModal.test.tsx b/packages/thirdweb/src/react/web/utils/canFitWideModal.test.tsx
index 728f207e475..37151cdd234 100644
--- a/packages/thirdweb/src/react/web/utils/canFitWideModal.test.tsx
+++ b/packages/thirdweb/src/react/web/utils/canFitWideModal.test.tsx
@@ -6,8 +6,8 @@ describe("canFitWideModal", () => {
   it("should return true if window width is >= wideModalScreenThreshold", () => {
     // Mock the window object and set innerWidth
     Object.defineProperty(window, "innerWidth", {
-      writable: true,
       value: wideModalScreenThreshold,
+      writable: true,
     });
     expect(canFitWideModal()).toBe(true);
     window.innerWidth = wideModalScreenThreshold + 1;
@@ -17,8 +17,8 @@ describe("canFitWideModal", () => {
   it("returns false if window width is < wideModalScreenThreshold", () => {
     // Mock the window object and set innerWidth
     Object.defineProperty(window, "innerWidth", {
-      writable: true,
       value: wideModalScreenThreshold - 1,
+      writable: true,
     });
     expect(canFitWideModal()).toBe(false);
   });
diff --git a/packages/thirdweb/src/react/web/utils/errors.ts b/packages/thirdweb/src/react/web/utils/errors.ts
index d308410b197..55cd5df53c9 100644
--- a/packages/thirdweb/src/react/web/utils/errors.ts
+++ b/packages/thirdweb/src/react/web/utils/errors.ts
@@ -6,29 +6,37 @@ type UiError = {
   message: string;
 };
 
-// biome-ignore lint/suspicious/noExplicitAny: <explanation>
-export function getErrorMessage(err: any): UiError {
+export function getErrorMessage(err: unknown): UiError {
   if (err instanceof ApiError) {
     if (err.code === "INTERNAL_SERVER_ERROR") {
       return {
         code: "INTERNAL_SERVER_ERROR",
-        title: "Failed to Find Quote",
         message: "An unknown error occurred. Please try again.",
+        title: "Failed to Find Quote",
       };
     }
     return {
       code: err.code,
-      title: "Failed to Find Quote",
       message: getErrorMessageFromBridgeApiError(err),
+      title: "Failed to Find Quote",
+    };
+  }
+
+  if (err instanceof Error) {
+    return {
+      code: "UNABLE_TO_GET_PRICE_QUOTE",
+      message:
+        err.message ||
+        "We couldn't get a quote for this token pair. Select another token or pay with card.",
+      title: "Failed to Find Quote",
     };
   }
 
   return {
     code: "UNABLE_TO_GET_PRICE_QUOTE",
-    title: "Failed to Find Quote",
     message:
-      err.message ||
       "We couldn't get a quote for this token pair. Select another token or pay with card.",
+    title: "Failed to Find Quote",
   };
 }
 
diff --git a/packages/thirdweb/src/react/web/utils/resolveMimeType.test.ts b/packages/thirdweb/src/react/web/utils/resolveMimeType.test.ts
index d51d347ca1f..e0d89cb750f 100644
--- a/packages/thirdweb/src/react/web/utils/resolveMimeType.test.ts
+++ b/packages/thirdweb/src/react/web/utils/resolveMimeType.test.ts
@@ -29,8 +29,8 @@ describe("resolveMimeType", () => {
   it("should fetch mime type from server if not available from URL", async () => {
     vi.mocked(getMimeTypeFromUrl).mockReturnValue(null);
     global.fetch = vi.fn().mockResolvedValue({
-      ok: true,
       headers: new Headers({ "content-type": "application/json" }),
+      ok: true,
     });
 
     const result = await resolveMimeType("https://example.com/data.json");
@@ -53,8 +53,8 @@ describe("resolveMimeType", () => {
   it("should return undefined if content-type header is missing", async () => {
     vi.mocked(getMimeTypeFromUrl).mockReturnValue(null);
     global.fetch = vi.fn().mockResolvedValue({
-      ok: true,
       headers: new Headers(),
+      ok: true,
     });
 
     const result = await resolveMimeType("https://example.com/noheader");
diff --git a/packages/thirdweb/src/react/web/utils/usePreloadWalletProviders.ts b/packages/thirdweb/src/react/web/utils/usePreloadWalletProviders.ts
index f8be5d8f0d1..d826da3e5b6 100644
--- a/packages/thirdweb/src/react/web/utils/usePreloadWalletProviders.ts
+++ b/packages/thirdweb/src/react/web/utils/usePreloadWalletProviders.ts
@@ -11,7 +11,6 @@ export function usePreloadWalletProviders({ wallets }: { wallets: Wallet[] }) {
         (w) => w.id === COINBASE || w.id === "inApp" || isEcosystemWallet(w.id),
       )
       .map((w) => ({
-        queryKey: ["preload-wallet", w.id],
         queryFn: async () => {
           switch (true) {
             case COINBASE === w.id: {
@@ -30,6 +29,7 @@ export function usePreloadWalletProviders({ wallets }: { wallets: Wallet[] }) {
             }
           }
         },
+        queryKey: ["preload-wallet", w.id],
       })),
   });
 }
diff --git a/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletConnectUI.tsx b/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletConnectUI.tsx
index bd2fdb31123..0697579422f 100644
--- a/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletConnectUI.tsx
+++ b/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletConnectUI.tsx
@@ -8,8 +8,8 @@ import {
   useSetSelectionData,
 } from "../../providers/wallet-ui-states-provider.js";
 import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
-import { WalletAuth } from "../in-app/WalletAuth.js";
 import { useInAppWalletLocale } from "../in-app/useInAppWalletLocale.js";
+import { WalletAuth } from "../in-app/WalletAuth.js";
 import type { ConnectWalletSelectUIState } from "../shared/ConnectWalletSocialOptions.js";
 import { GuestLogin } from "../shared/GuestLogin.js";
 import { LoadingScreen } from "../shared/LoadingScreen.js";
@@ -71,15 +71,15 @@ function EcosystemWalletConnectUI(props: {
   if (otpUserInfo) {
     return (
       <OTPLoginUI
-        userInfo={otpUserInfo}
-        locale={locale}
-        done={done}
-        goBack={goBackToMain}
-        wallet={props.wallet}
         chain={props.chain}
         client={props.client}
-        size={props.size}
+        done={done}
+        goBack={goBackToMain}
         isLinking={props.isLinking}
+        locale={locale}
+        size={props.size}
+        userInfo={otpUserInfo}
+        wallet={props.wallet}
       />
     );
   }
@@ -87,14 +87,14 @@ function EcosystemWalletConnectUI(props: {
   if (state?.passkeyLogin) {
     return (
       <PassKeyLogin
-        locale={props.connectLocale}
-        wallet={props.wallet}
-        done={done}
-        onBack={goBackToMain}
         chain={props.chain}
         client={props.client}
-        size={props.size}
+        done={done}
         isLinking={props.isLinking}
+        locale={props.connectLocale}
+        onBack={goBackToMain}
+        size={props.size}
+        wallet={props.wallet}
       />
     );
   }
@@ -102,17 +102,17 @@ function EcosystemWalletConnectUI(props: {
   if (state?.socialLogin) {
     return (
       <SocialLogin
-        socialAuth={state.socialLogin.type}
-        locale={locale}
-        done={done}
-        goBack={goBackToMain}
-        wallet={props.wallet}
-        state={state}
         chain={props.chain}
         client={props.client}
-        size={props.size}
         connectLocale={props.connectLocale}
+        done={done}
+        goBack={goBackToMain}
         isLinking={props.isLinking}
+        locale={locale}
+        size={props.size}
+        socialAuth={state.socialLogin.type}
+        state={state}
+        wallet={props.wallet}
       />
     );
   }
@@ -120,17 +120,17 @@ function EcosystemWalletConnectUI(props: {
   if (state?.walletLogin) {
     return (
       <WalletAuth
-        meta={props.meta}
         chain={props.chain}
-        inAppLocale={locale}
-        walletConnect={props.walletConnect}
-        wallet={props.wallet}
         client={props.client}
-        size={props.size}
         done={done}
-        onBack={goBackToMain || (() => setSelectionData({}))}
-        locale={props.connectLocale}
+        inAppLocale={locale}
         isLinking={state.walletLogin.linking}
+        locale={props.connectLocale}
+        meta={props.meta}
+        onBack={goBackToMain || (() => setSelectionData({}))}
+        size={props.size}
+        wallet={props.wallet}
+        walletConnect={props.walletConnect}
       />
     );
   }
@@ -138,31 +138,31 @@ function EcosystemWalletConnectUI(props: {
   if (state?.guestLogin) {
     return (
       <GuestLogin
-        locale={locale}
+        client={props.client}
+        connectLocale={props.connectLocale}
         done={done}
         goBack={goBackToMain}
-        wallet={props.wallet}
-        state={state}
-        client={props.client}
+        locale={locale}
         size={props.size}
-        connectLocale={props.connectLocale}
+        state={state}
+        wallet={props.wallet}
       />
     );
   }
 
   return (
     <EcosystemWalletFormUIScreen
-      select={() => {}}
-      locale={locale}
-      done={done}
-      goBack={props.goBack}
-      wallet={props.wallet}
       chain={props.chain}
       client={props.client}
-      size={props.size}
       connectLocale={props.connectLocale}
-      meta={props.meta}
+      done={done}
+      goBack={props.goBack}
       isLinking={props.isLinking}
+      locale={locale}
+      meta={props.meta}
+      select={() => {}}
+      size={props.size}
+      wallet={props.wallet}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletFormUI.tsx b/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletFormUI.tsx
index 1666345e2fc..be469f5f5ee 100644
--- a/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletFormUI.tsx
+++ b/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletFormUI.tsx
@@ -4,12 +4,12 @@ import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import type { EcosystemWalletId } from "../../../../wallets/wallet-types.js";
-import { TOS } from "../../ui/ConnectWallet/Modal/TOS.js";
+import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
 import { useScreenContext } from "../../ui/ConnectWallet/Modal/screen.js";
+import { TOS } from "../../ui/ConnectWallet/Modal/TOS.js";
 import { PoweredByThirdweb } from "../../ui/ConnectWallet/PoweredByTW.js";
-import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
-import { Spacer } from "../../ui/components/Spacer.js";
 import { Container, ModalHeader } from "../../ui/components/basic.js";
+import { Spacer } from "../../ui/components/Spacer.js";
 import { ConnectWalletSocialOptions } from "../shared/ConnectWalletSocialOptions.js";
 import type { InAppWalletLocale } from "../shared/locale/types.js";
 import { EcosystemWalletHeader } from "./EcosystemWalletHeader.js";
@@ -51,18 +51,18 @@ export function EcosystemWalletFormUIScreen(props: EcosystemWalletFormUIProps) {
 
   return (
     <Container
-      fullHeight
+      animate="fadein"
       flex="column"
+      fullHeight
       p="lg"
-      animate="fadein"
       style={{
         minHeight: "250px",
       }}
     >
       {props.isLinking ? (
         <ModalHeader
-          title={props.connectLocale.manageWallet.linkProfile}
           onBack={onBack}
+          title={props.connectLocale.manageWallet.linkProfile}
         />
       ) : (
         <EcosystemWalletHeader
@@ -74,9 +74,9 @@ export function EcosystemWalletFormUIScreen(props: EcosystemWalletFormUIProps) {
       <Spacer y="lg" />
 
       <Container
+        center="y"
         expand
         flex="column"
-        center="y"
         p={isCompact ? undefined : "lg"}
       >
         <ConnectWalletSocialOptions
@@ -92,14 +92,14 @@ export function EcosystemWalletFormUIScreen(props: EcosystemWalletFormUIProps) {
 
       <Container flex="column" gap="lg">
         <TOS
-          termsOfServiceUrl={props.meta.termsOfServiceUrl}
-          privacyPolicyUrl={props.meta.privacyPolicyUrl}
+          isApproved={isApproved}
           locale={props.connectLocale.agreement}
-          requireApproval={props.meta.requireApproval}
           onApprove={() => {
             setIsApproved(!isApproved);
           }}
-          isApproved={isApproved}
+          privacyPolicyUrl={props.meta.privacyPolicyUrl}
+          requireApproval={props.meta.requireApproval}
+          termsOfServiceUrl={props.meta.termsOfServiceUrl}
         />
 
         {props.meta.showThirdwebBranding !== false && <PoweredByThirdweb />}
diff --git a/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletHeader.tsx b/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletHeader.tsx
index ee5c00ec45a..1cd21d537e3 100644
--- a/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletHeader.tsx
+++ b/packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletHeader.tsx
@@ -4,10 +4,10 @@ import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import type { EcosystemWalletId } from "../../../../wallets/wallet-types.js";
 import { iconSize, radius } from "../../../core/design-system/index.js";
 import { useWalletInfo } from "../../../core/utils/wallet.js";
-import { Img } from "../../ui/components/Img.js";
-import { Skeleton } from "../../ui/components/Skeleton.js";
 import { ModalHeader } from "../../ui/components/basic.js";
+import { Img } from "../../ui/components/Img.js";
 import { ModalTitle } from "../../ui/components/modalElements.js";
+import { Skeleton } from "../../ui/components/Skeleton.js";
 
 /**
  * @internal
@@ -21,6 +21,7 @@ export function EcosystemWalletHeader(props: {
 
   return (
     <ModalHeader
+      leftAligned
       onBack={props.onBack}
       title={
         walletInfo.isLoading ? (
@@ -29,20 +30,19 @@ export function EcosystemWalletHeader(props: {
           <>
             {!walletInfo.data?.image_id ? null : (
               <Img
+                client={props.client}
+                height={iconSize.md}
                 src={walletInfo.data?.image_id}
                 style={{
                   borderRadius: radius.sm,
                 }}
                 width={iconSize.md}
-                height={iconSize.md}
-                client={props.client}
               />
             )}
             <ModalTitle>{walletInfo.data?.name}</ModalTitle>
           </>
         )
       }
-      leftAligned
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/wallets/in-app/CountrySelector.tsx b/packages/thirdweb/src/react/web/wallets/in-app/CountrySelector.tsx
index 3952eddb56c..ebcbc6beb54 100644
--- a/packages/thirdweb/src/react/web/wallets/in-app/CountrySelector.tsx
+++ b/packages/thirdweb/src/react/web/wallets/in-app/CountrySelector.tsx
@@ -45,16 +45,15 @@ export function CountrySelector({
   return (
     <>
       <Select
-        ref={selectRef}
         name="countries"
-        id="countries"
-        value={countryCode}
         onChange={(e) => {
           setCountryCode(e.target.value);
         }}
+        ref={selectRef}
         style={{
           padding: `${spacing.sm} ${spacing.md}`,
         }}
+        value={countryCode}
       >
         <Option
           style={{
@@ -82,39 +81,39 @@ export function CountrySelector({
 const Option = /* @__PURE__ */ StyledOption(() => {
   const theme = useCustomTheme();
   return {
-    color: theme.colors.primaryText,
-    background: theme.colors.modalBg,
-    transition: "background 0.3s ease",
     "&:hover": {
       background: theme.colors.tertiaryBg,
     },
+    background: theme.colors.modalBg,
+    color: theme.colors.primaryText,
+    transition: "background 0.3s ease",
   };
 });
 
 const Select = /* @__PURE__ */ StyledSelect((_) => {
   const theme = useCustomTheme();
   return {
-    display: "block",
-    padding: spacing.sm,
-    boxSizing: "border-box",
-    outline: "none",
-    border: "none",
-    borderRadius: radius.lg,
-    color: theme.colors.primaryText,
-    WebkitAppearance: "none",
-    appearance: "none",
-    cursor: "pointer",
-    background: "transparent",
     "&::placeholder": {
       color: theme.colors.secondaryText,
     },
     "&[disabled]": {
       cursor: "not-allowed",
     },
-    minWidth: "0px",
+    appearance: "none",
+    background: "transparent",
+    border: "none",
+    borderRadius: radius.lg,
+    boxSizing: "border-box",
+    color: theme.colors.primaryText,
+    cursor: "pointer",
+    display: "block",
     maxWidth: "90px",
-    textOverflow: "ellipsis",
+    minWidth: "0px",
+    outline: "none",
     overflow: "hidden",
+    padding: spacing.sm,
+    textOverflow: "ellipsis",
+    WebkitAppearance: "none",
     whiteSpace: "nowrap",
   };
 });
diff --git a/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletConnectUI.tsx b/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletConnectUI.tsx
index 765bb7f116f..f9dfdd591c3 100644
--- a/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletConnectUI.tsx
+++ b/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletConnectUI.tsx
@@ -6,8 +6,8 @@ import {
   useSelectionData,
   useSetSelectionData,
 } from "../../providers/wallet-ui-states-provider.js";
-import { useScreenContext } from "../../ui/ConnectWallet/Modal/screen.js";
 import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
+import { useScreenContext } from "../../ui/ConnectWallet/Modal/screen.js";
 import type { ConnectWalletSelectUIState } from "../shared/ConnectWalletSocialOptions.js";
 import { GuestLogin } from "../shared/GuestLogin.js";
 import { LoadingScreen } from "../shared/LoadingScreen.js";
@@ -15,8 +15,8 @@ import { OTPLoginUI } from "../shared/OTPLoginUI.js";
 import { PassKeyLogin } from "../shared/PassKeyLogin.js";
 import { SocialLogin } from "../shared/SocialLogin.js";
 import { InAppWalletFormUIScreen } from "./InAppWalletFormUI.js";
-import { WalletAuth } from "./WalletAuth.js";
 import { useInAppWalletLocale } from "./useInAppWalletLocale.js";
+import { WalletAuth } from "./WalletAuth.js";
 
 /**
  *
@@ -76,15 +76,15 @@ function InAppWalletConnectUI(props: {
   if (otpUserInfo) {
     return (
       <OTPLoginUI
-        userInfo={otpUserInfo}
-        locale={locale}
-        done={done}
-        goBack={goBackToMain}
-        wallet={props.wallet}
         chain={props.chain}
         client={props.client}
-        size={props.size}
+        done={done}
+        goBack={goBackToMain}
         isLinking={props.isLinking}
+        locale={locale}
+        size={props.size}
+        userInfo={otpUserInfo}
+        wallet={props.wallet}
       />
     );
   }
@@ -92,14 +92,14 @@ function InAppWalletConnectUI(props: {
   if (state?.passkeyLogin) {
     return (
       <PassKeyLogin
-        locale={props.connectLocale}
-        wallet={props.wallet}
-        done={done}
-        onBack={goBackToMain}
         chain={props.chain}
         client={props.client}
-        size={props.size}
+        done={done}
         isLinking={props.isLinking}
+        locale={props.connectLocale}
+        onBack={goBackToMain}
+        size={props.size}
+        wallet={props.wallet}
       />
     );
   }
@@ -107,17 +107,17 @@ function InAppWalletConnectUI(props: {
   if (state?.walletLogin) {
     return (
       <WalletAuth
-        meta={props.meta}
-        inAppLocale={locale}
-        walletConnect={props.walletConnect}
-        wallet={props.wallet}
-        client={props.client}
-        size={props.size}
         chain={props.chain}
+        client={props.client}
         done={done}
-        onBack={goBackToMain || (() => setSelectionData({}))}
-        locale={props.connectLocale}
+        inAppLocale={locale}
         isLinking={state.walletLogin.linking}
+        locale={props.connectLocale}
+        meta={props.meta}
+        onBack={goBackToMain || (() => setSelectionData({}))}
+        size={props.size}
+        wallet={props.wallet}
+        walletConnect={props.walletConnect}
       />
     );
   }
@@ -125,17 +125,17 @@ function InAppWalletConnectUI(props: {
   if (state?.socialLogin) {
     return (
       <SocialLogin
-        socialAuth={state.socialLogin.type}
-        locale={locale}
-        done={done}
-        goBack={goBackToMain}
-        wallet={props.wallet}
-        state={state}
         chain={props.chain}
         client={props.client}
-        size={props.size}
         connectLocale={props.connectLocale}
+        done={done}
+        goBack={goBackToMain}
         isLinking={props.isLinking}
+        locale={locale}
+        size={props.size}
+        socialAuth={state.socialLogin.type}
+        state={state}
+        wallet={props.wallet}
       />
     );
   }
@@ -143,31 +143,31 @@ function InAppWalletConnectUI(props: {
   if (state?.guestLogin) {
     return (
       <GuestLogin
-        locale={locale}
+        client={props.client}
+        connectLocale={props.connectLocale}
         done={done}
         goBack={goBackToMain}
-        wallet={props.wallet}
-        state={state}
-        client={props.client}
+        locale={locale}
         size={props.size}
-        connectLocale={props.connectLocale}
+        state={state}
+        wallet={props.wallet}
       />
     );
   }
 
   return (
     <InAppWalletFormUIScreen
-      select={() => {}}
+      chain={props.chain}
+      client={props.client}
       connectLocale={props.connectLocale}
-      inAppWalletLocale={locale}
       done={done}
       goBack={props.goBack}
-      wallet={props.wallet}
-      client={props.client}
+      inAppWalletLocale={locale}
+      isLinking={props.isLinking}
       meta={props.meta}
+      select={() => {}}
       size={props.size}
-      chain={props.chain}
-      isLinking={props.isLinking}
+      wallet={props.wallet}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletFormUI.tsx b/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletFormUI.tsx
index 58117d87a7a..881042feee5 100644
--- a/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletFormUI.tsx
+++ b/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletFormUI.tsx
@@ -4,14 +4,14 @@ import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import { iconSize } from "../../../core/design-system/index.js";
-import { TOS } from "../../ui/ConnectWallet/Modal/TOS.js";
+import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
 import { useScreenContext } from "../../ui/ConnectWallet/Modal/screen.js";
+import { TOS } from "../../ui/ConnectWallet/Modal/TOS.js";
 import { PoweredByThirdweb } from "../../ui/ConnectWallet/PoweredByTW.js";
-import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
-import { Img } from "../../ui/components/Img.js";
-import { Spacer } from "../../ui/components/Spacer.js";
 import { Container, ModalHeader } from "../../ui/components/basic.js";
+import { Img } from "../../ui/components/Img.js";
 import { ModalTitle } from "../../ui/components/modalElements.js";
+import { Spacer } from "../../ui/components/Spacer.js";
 import { ConnectWalletSocialOptions } from "../shared/ConnectWalletSocialOptions.js";
 import type { InAppWalletLocale } from "../shared/locale/types.js";
 
@@ -52,10 +52,10 @@ export function InAppWalletFormUIScreen(props: InAppWalletFormUIProps) {
 
   return (
     <Container
-      fullHeight
+      animate="fadein"
       flex="column"
+      fullHeight
       p="lg"
-      animate="fadein"
       style={{
         minHeight: "250px",
       }}
@@ -64,16 +64,16 @@ export function InAppWalletFormUIScreen(props: InAppWalletFormUIProps) {
         (isInitialScreen ? (
           <>
             <ModalHeader
-              onBack={onBack}
               leftAligned={!props.isLinking}
+              onBack={onBack}
               title={
                 <>
                   {!props.meta?.titleIconUrl ? null : (
                     <Img
+                      client={props.client}
+                      height={iconSize.md}
                       src={props.meta?.titleIconUrl}
                       width={iconSize.md}
-                      height={iconSize.md}
-                      client={props.client}
                     />
                   )}
                   <ModalTitle>
@@ -89,15 +89,15 @@ export function InAppWalletFormUIScreen(props: InAppWalletFormUIProps) {
           <ModalHeader onBack={onBack} title={props.inAppWalletLocale.signIn} />
         ))}
       <Container
+        center="y"
         expand
         flex="column"
-        center="y"
         p={isCompact ? undefined : "lg"}
       >
         <ConnectWalletSocialOptions
           {...props}
-          locale={props.inAppWalletLocale}
           disabled={props.meta?.requireApproval && !isApproved}
+          locale={props.inAppWalletLocale}
         />
       </Container>
 
@@ -107,14 +107,14 @@ export function InAppWalletFormUIScreen(props: InAppWalletFormUIProps) {
           props.meta?.privacyPolicyUrl) && <Spacer y="xl" />}
       <Container flex="column" gap="lg">
         <TOS
-          termsOfServiceUrl={props.meta?.termsOfServiceUrl}
-          privacyPolicyUrl={props.meta?.privacyPolicyUrl}
+          isApproved={isApproved}
           locale={props.connectLocale.agreement}
-          requireApproval={props.meta?.requireApproval}
           onApprove={() => {
             setIsApproved(!isApproved);
           }}
-          isApproved={isApproved}
+          privacyPolicyUrl={props.meta?.privacyPolicyUrl}
+          requireApproval={props.meta?.requireApproval}
+          termsOfServiceUrl={props.meta?.termsOfServiceUrl}
         />
 
         {props.meta?.showThirdwebBranding !== false && <PoweredByThirdweb />}
diff --git a/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletSelectionUI.tsx b/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletSelectionUI.tsx
index 363ea06630b..8a525995111 100644
--- a/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletSelectionUI.tsx
+++ b/packages/thirdweb/src/react/web/wallets/in-app/InAppWalletSelectionUI.tsx
@@ -3,10 +3,10 @@ import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import { useSetSelectionData } from "../../providers/wallet-ui-states-provider.js";
-import { useScreenContext } from "../../ui/ConnectWallet/Modal/screen.js";
-import { WalletEntryButton } from "../../ui/ConnectWallet/WalletEntryButton.js";
 import { reservedScreens } from "../../ui/ConnectWallet/constants.js";
 import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
+import { useScreenContext } from "../../ui/ConnectWallet/Modal/screen.js";
+import { WalletEntryButton } from "../../ui/ConnectWallet/WalletEntryButton.js";
 import { ConnectWalletSocialOptions } from "../shared/ConnectWalletSocialOptions.js";
 import { LoadingScreen } from "../shared/LoadingScreen.js";
 import { useInAppWalletLocale } from "./useInAppWalletLocale.js";
@@ -41,16 +41,16 @@ function InAppWalletSelectionUI(props: {
   ) {
     return (
       <WalletEntryButton
-        wallet={props.wallet}
+        badge={undefined}
+        client={props.client}
+        connectLocale={props.connectLocale}
+        isActive={screen === props.wallet}
+        recommendedWallets={props.recommendedWallets}
         selectWallet={() => {
           setData({});
           props.select();
         }}
-        client={props.client}
-        connectLocale={props.connectLocale}
-        recommendedWallets={props.recommendedWallets}
-        isActive={screen === props.wallet}
-        badge={undefined}
+        wallet={props.wallet}
       />
     );
   }
@@ -61,15 +61,15 @@ function InAppWalletSelectionUI(props: {
 
   return (
     <ConnectWalletSocialOptions
+      chain={props.chain}
+      client={props.client}
       disabled={props.disabled}
-      locale={locale}
-      wallet={props.wallet}
       done={props.done}
-      select={props.select}
       goBack={props.goBack}
-      chain={props.chain}
-      client={props.client}
+      locale={locale}
+      select={props.select}
       size={props.size}
+      wallet={props.wallet}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/wallets/in-app/InputSelectionUI.test.tsx b/packages/thirdweb/src/react/web/wallets/in-app/InputSelectionUI.test.tsx
index 5adab29d9f3..8150b67ae5a 100644
--- a/packages/thirdweb/src/react/web/wallets/in-app/InputSelectionUI.test.tsx
+++ b/packages/thirdweb/src/react/web/wallets/in-app/InputSelectionUI.test.tsx
@@ -16,12 +16,12 @@ describe("InputSelectionUI", () => {
     render(
       <InputSelectionUI
         defaultSmsCountryCode="CA"
+        format="phone"
+        name=""
         onSelect={vi.fn()}
         placeholder=""
-        name=""
-        type=""
         submitButtonText=""
-        format="phone"
+        type=""
       />,
     );
 
@@ -31,12 +31,12 @@ describe("InputSelectionUI", () => {
   it('should initialize countryCodeInfo with "US +1" if defaultSmsCountryCode is not provided', () => {
     render(
       <InputSelectionUI
+        format="phone"
+        name=""
         onSelect={vi.fn()}
         placeholder=""
-        name=""
-        type=""
         submitButtonText=""
-        format="phone"
+        type=""
       />,
     );
 
@@ -49,13 +49,13 @@ describe("InputSelectionUI", () => {
 
     render(
       <InputSelectionUI
+        allowedSmsCountryCodes={["IN", "BR"]}
+        format="phone"
+        name=""
         onSelect={vi.fn()}
         placeholder=""
-        name=""
-        type=""
         submitButtonText=""
-        format="phone"
-        allowedSmsCountryCodes={["IN", "BR"]}
+        type=""
       />,
     );
 
diff --git a/packages/thirdweb/src/react/web/wallets/in-app/InputSelectionUI.tsx b/packages/thirdweb/src/react/web/wallets/in-app/InputSelectionUI.tsx
index 762f86791e3..cae7bb03a9d 100644
--- a/packages/thirdweb/src/react/web/wallets/in-app/InputSelectionUI.tsx
+++ b/packages/thirdweb/src/react/web/wallets/in-app/InputSelectionUI.tsx
@@ -6,9 +6,9 @@ import {
   radius,
   spacing,
 } from "../../../core/design-system/index.js";
-import { Spacer } from "../../ui/components/Spacer.js";
 import { IconButton } from "../../ui/components/buttons.js";
 import { Input, InputContainer } from "../../ui/components/formElements.js";
+import { Spacer } from "../../ui/components/Spacer.js";
 import { Text } from "../../ui/components/text.js";
 import { CountrySelector, getCountrySelector } from "./CountrySelector.js";
 import type { SupportedSmsCountry } from "./supported-sms-countries.js";
@@ -63,34 +63,23 @@ export function InputSelectionUI(props: {
       }}
     >
       <InputContainer
+        data-error={renderingError}
         style={{
-          position: "relative",
           display: "flex",
           flexDirection: "row",
+          position: "relative",
         }}
-        data-error={renderingError}
       >
         {props.format === "phone" && (
           <CountrySelector
+            allowedCountryCodes={props.allowedSmsCountryCodes}
             countryCode={countryCodeInfo}
             setCountryCode={setCountryCodeInfo}
-            allowedCountryCodes={props.allowedSmsCountryCodes}
           />
         )}
         <Input
-          tabIndex={-1}
-          placeholder={props.placeholder}
-          style={{
-            flexGrow: 1,
-            padding: `${spacing.sm} ${
-              props.format === "phone" ? 0 : spacing.sm
-            }`,
-          }}
-          variant="transparent"
-          type={props.type}
-          name={props.name}
-          value={input}
           disabled={props.disabled}
+          name={props.name}
           onChange={(e) => {
             setInput(e.target.value);
             if (props.errorMessage) {
@@ -104,16 +93,27 @@ export function InputSelectionUI(props: {
               handleSelect();
             }
           }}
+          placeholder={props.placeholder}
+          style={{
+            flexGrow: 1,
+            padding: `${spacing.sm} ${
+              props.format === "phone" ? 0 : spacing.sm
+            }`,
+          }}
+          tabIndex={-1}
+          type={props.type}
+          value={input}
+          variant="transparent"
         />
         <IconButton
-          onClick={handleSelect}
           disabled={props.disabled}
+          onClick={handleSelect}
           style={{
-            padding: spacing.sm,
             borderRadius: `0 ${radius.md} ${radius.md} 0`,
+            padding: spacing.sm,
           }}
         >
-          <ArrowRightIcon width={iconSize.md} height={iconSize.md} />
+          <ArrowRightIcon height={iconSize.md} width={iconSize.md} />
         </IconButton>
       </InputContainer>
 
diff --git a/packages/thirdweb/src/react/web/wallets/in-app/WalletAuth.tsx b/packages/thirdweb/src/react/web/wallets/in-app/WalletAuth.tsx
index dad46bf86dc..408136edbd8 100644
--- a/packages/thirdweb/src/react/web/wallets/in-app/WalletAuth.tsx
+++ b/packages/thirdweb/src/react/web/wallets/in-app/WalletAuth.tsx
@@ -9,12 +9,12 @@ import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import type { EcosystemWalletId } from "../../../../wallets/wallet-types.js";
 import { iconSize } from "../../../core/design-system/index.js";
 import { useAddConnectedWallet } from "../../../core/hooks/wallets/useAddConnectedWallet.js";
+import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
 import AllWalletsUI from "../../ui/ConnectWallet/Modal/AllWalletsUI.js";
 import { WalletSelector } from "../../ui/ConnectWallet/WalletSelector.js";
-import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
+import { Container, ModalHeader } from "../../ui/components/basic.js";
 import { Spacer } from "../../ui/components/Spacer.js";
 import { WalletImage } from "../../ui/components/WalletImage.js";
-import { Container, ModalHeader } from "../../ui/components/basic.js";
 import { ErrorState } from "../shared/ErrorState.js";
 import { LoadingScreen } from "../shared/LoadingScreen.js";
 import { LoadingState } from "../shared/LoadingState.js";
@@ -67,18 +67,18 @@ export function WalletAuth(props: {
     try {
       if (props.isLinking) {
         await linkProfile({
+          chain: props.chain || wallet.getChain() || defineChain(1),
           client: props.client,
+          ecosystem,
           strategy: "wallet",
           wallet: walletToLink,
-          chain: props.chain || wallet.getChain() || defineChain(1),
-          ecosystem,
         });
       } else {
         await wallet.connect({
+          chain: props.chain || walletToLink.getChain() || defineChain(1),
           client: props.client,
           strategy: "wallet",
           wallet: walletToLink,
-          chain: props.chain || walletToLink.getChain() || defineChain(1),
         });
       }
       addConnectedWallet(walletToLink);
@@ -94,74 +94,74 @@ export function WalletAuth(props: {
       return (
         <Suspense fallback={<LoadingScreen />}>
           <AllWalletsUI
+            client={props.client}
+            connectLocale={props.locale}
+            disableSelectionDataReset={true}
             onBack={() => setShowAll(false)}
             onSelect={async (newWallet) => {
               login(newWallet);
               setShowAll(false);
             }}
-            client={props.client}
-            connectLocale={props.locale}
             recommendedWallets={undefined}
-            specifiedWallets={[]}
             size={props.size}
-            disableSelectionDataReset={true}
+            specifiedWallets={[]}
           />
         </Suspense>
       );
     }
     return (
       <WalletSelector
-        title={props.locale.connectAWallet}
-        wallets={getDefaultWallets()}
-        selectWallet={async (newWallet) => {
-          login(newWallet);
-        }}
-        onShowAll={() => {
-          setShowAll(true);
-        }}
-        done={() => {}}
-        goBack={back}
-        setModalVisibility={() => {}}
+        chain={wallet.getChain()}
+        chains={[]}
         client={props.client}
         connectLocale={props.locale}
+        disableSelectionDataReset={true}
+        done={() => {}}
+        goBack={back}
         hideHeader={false}
-        recommendedWallets={undefined}
-        chain={wallet.getChain()}
-        showAllWallets={true}
-        chains={[]}
-        size={props.size}
         meta={props.meta || {}}
-        walletConnect={props.walletConnect}
         modalHeader={{
+          onBack: back,
           title: props.isLinking
             ? props.inAppLocale.linkWallet
             : props.inAppLocale.signInWithWallet,
-          onBack: back,
         }}
+        onShowAll={() => {
+          setShowAll(true);
+        }}
+        recommendedWallets={undefined}
+        selectWallet={async (newWallet) => {
+          login(newWallet);
+        }}
+        setModalVisibility={() => {}}
+        showAllWallets={true}
+        size={props.size}
+        title={props.locale.connectAWallet}
+        walletConnect={props.walletConnect}
         walletIdsToHide={["inApp"]}
-        disableSelectionDataReset={true}
+        wallets={getDefaultWallets()}
       />
     );
   }
 
   return (
-    <Container animate="fadein" fullHeight flex="column">
+    <Container animate="fadein" flex="column" fullHeight>
       <Container p="lg">
         <ModalHeader
+          onBack={back}
           title={
             props.isLinking
               ? props.inAppLocale.linkWallet
               : props.inAppLocale.signInWithWallet
           }
-          onBack={back}
         />
       </Container>
 
       <Container
-        px={props.size === "wide" ? "xxl" : "lg"}
+        center="y"
         expand
         flex="column"
-        center="y"
+        px={props.size === "wide" ? "xxl" : "lg"}
       >
         <div>
           {status === "error" ? (
@@ -178,19 +178,17 @@ export function WalletAuth(props: {
               <Spacer y="lg" />
             </>
           ) : (
-            <>
-              <LoadingState
-                title="Sign in with your wallet"
-                subtitle="A pop-up prompt will appear to sign-in and verify your wallet"
-                icon={
-                  <WalletImage
-                    id={walletToConnect.current.id ?? ""}
-                    size={iconSize.xl}
-                    client={props.client}
-                  />
-                }
-              />
-            </>
+            <LoadingState
+              icon={
+                <WalletImage
+                  client={props.client}
+                  id={walletToConnect.current.id ?? ""}
+                  size={iconSize.xl}
+                />
+              }
+              subtitle="A pop-up prompt will appear to sign-in and verify your wallet"
+              title="Sign in with your wallet"
+            />
           )}
         </div>
       </Container>
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/br.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/br.ts
index e06704c6f08..7465ea05837 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/br.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/br.ts
@@ -5,23 +5,23 @@ import type { InjectedWalletLocale } from "./types.js";
  */
 const injectedWalletLocalePtBr = (wallet: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "Aguardando Confirmação",
     failed: "Falha na conexão",
+    inProgress: "Aguardando Confirmação",
     instruction: `Aceite a solicitação de conexão no ${wallet}`,
     retry: "Tentar novamente",
   },
+  download: {
+    android: "Baixar no Google Play",
+    chrome: "Baixar extensão para Chrome",
+    iOS: "Baixar na App Store",
+  },
+  getStartedLink: `Não tem o ${wallet}?`,
   getStartedScreen: {
     instruction: `Escaneie o código QR para baixar o aplicativo ${wallet}`,
   },
   scanScreen: {
     instruction: `Escaneie o código QR com o aplicativo ${wallet} para conectar`,
   },
-  getStartedLink: `Não tem o ${wallet}?`,
-  download: {
-    chrome: "Baixar extensão para Chrome",
-    android: "Baixar no Google Play",
-    iOS: "Baixar na App Store",
-  },
 });
 
 export default injectedWalletLocalePtBr;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/de.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/de.ts
index fa4036400dd..3f3396aa751 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/de.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/de.ts
@@ -5,23 +5,23 @@ import type { InjectedWalletLocale } from "./types.js";
  */
 const injectedWalletLocaleEn = (wallet: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "Verbindung wird hergestellt",
     failed: "Verbindung fehlgeschlagen",
+    inProgress: "Verbindung wird hergestellt",
     instruction: `Akzeptiere die Verbindung in ${wallet}`,
     retry: "Erneut versuchen",
   },
+  download: {
+    android: "Von Google Play herunterladen",
+    chrome: "Chrome Extension installieren",
+    iOS: "Von App Store herunterladen",
+  },
+  getStartedLink: `Du hast ${wallet} nicht?`,
   getStartedScreen: {
     instruction: `Scanne den QR Code um ${wallet} herunterzuladen`,
   },
   scanScreen: {
     instruction: `Scanne den QR Code um ${wallet} zu verbinden`,
   },
-  getStartedLink: `Du hast ${wallet} nicht?`,
-  download: {
-    chrome: "Chrome Extension installieren",
-    android: "Von Google Play herunterladen",
-    iOS: "Von App Store herunterladen",
-  },
 });
 
 export default injectedWalletLocaleEn;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/en.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/en.ts
index 62bcd49986c..be961b7970b 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/en.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/en.ts
@@ -5,23 +5,23 @@ import type { InjectedWalletLocale } from "./types.js";
  */
 const injectedWalletLocaleEn = (wallet: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "Awaiting Confirmation",
     failed: "Connection failed",
+    inProgress: "Awaiting Confirmation",
     instruction: `Accept the connection request in ${wallet}`,
     retry: "Try Again",
   },
+  download: {
+    android: "Download on Google Play",
+    chrome: "Download Chrome Extension",
+    iOS: "Download on App Store",
+  },
+  getStartedLink: `Don't have ${wallet}?`,
   getStartedScreen: {
     instruction: `Scan the QR code to download the ${wallet} app`,
   },
   scanScreen: {
     instruction: `Scan the QR code with the ${wallet} app to connect`,
   },
-  getStartedLink: `Don't have ${wallet}?`,
-  download: {
-    chrome: "Download Chrome Extension",
-    android: "Download on Google Play",
-    iOS: "Download on App Store",
-  },
 });
 
 export default injectedWalletLocaleEn;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/es.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/es.ts
index 581c9b46718..0437feac4ad 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/es.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/es.ts
@@ -5,23 +5,23 @@ import type { InjectedWalletLocale } from "./types.js";
  */
 const injectedWalletLocaleEs = (walletName: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "Esperando confirmación",
     failed: "Conexión fallida",
+    inProgress: "Esperando confirmación",
     instruction: `Acepta la solicitud de conexión en tu cartera ${walletName}`,
     retry: "Intentar de nuevo",
   },
+  download: {
+    android: "Descargar en Google Play",
+    chrome: "Descargar extensión para Chrome",
+    iOS: "Descargar en App Store",
+  },
+  getStartedLink: `¿No tienes la cartera ${walletName}?`,
   getStartedScreen: {
     instruction: `Escanea el código QR para descargar la aplicación ${walletName}`,
   },
   scanScreen: {
     instruction: `Escanea el código QR con la aplicación de cartera ${walletName} para conectarte`,
   },
-  getStartedLink: `¿No tienes la cartera ${walletName}?`,
-  download: {
-    chrome: "Descargar extensión para Chrome",
-    android: "Descargar en Google Play",
-    iOS: "Descargar en App Store",
-  },
 });
 
 export default injectedWalletLocaleEs;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/fr.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/fr.ts
index a63ee939897..65b59b8e627 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/fr.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/fr.ts
@@ -5,23 +5,23 @@ import type { InjectedWalletLocale } from "./types.js";
  */
 const injectedWalletLocaleEn = (wallet: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "En attente de confirmation",
     failed: "Connexion échouée",
+    inProgress: "En attente de confirmation",
     instruction: `Acceptez la demande de connexion dans ${wallet}`,
     retry: "Réessayer",
   },
+  download: {
+    android: "Télécharger sur Google Play",
+    chrome: "Télécharger l'extension Chrome",
+    iOS: "Télécharger sur l'App Store",
+  },
+  getStartedLink: `Vous n'avez pas ${wallet} ?`,
   getStartedScreen: {
     instruction: `Scannez le code QR pour télécharger l'application ${wallet}`,
   },
   scanScreen: {
     instruction: `Scannez le code QR avec l'application ${wallet} pour vous connecter`,
   },
-  getStartedLink: `Vous n'avez pas ${wallet} ?`,
-  download: {
-    chrome: "Télécharger l'extension Chrome",
-    android: "Télécharger sur Google Play",
-    iOS: "Télécharger sur l'App Store",
-  },
 });
 
 export default injectedWalletLocaleEn;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/getInjectedWalletLocale.test.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/getInjectedWalletLocale.test.ts
index 51b44af7645..46b5214c91c 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/getInjectedWalletLocale.test.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/getInjectedWalletLocale.test.ts
@@ -13,15 +13,15 @@ import tl from "./tl.js";
 import vi from "./vi.js";
 
 const locales: { locale: LocaleId; content: object }[] = [
-  { locale: "es_ES", content: es },
-  { locale: "ja_JP", content: ja },
-  { locale: "tl_PH", content: tl },
-  { locale: "vi_VN", content: vi },
-  { locale: "de_DE", content: de },
-  { locale: "ko_KR", content: kr },
-  { locale: "fr_FR", content: fr },
-  { locale: "ru_RU", content: ru },
-  { locale: "pt_BR", content: br },
+  { content: es, locale: "es_ES" },
+  { content: ja, locale: "ja_JP" },
+  { content: tl, locale: "tl_PH" },
+  { content: vi, locale: "vi_VN" },
+  { content: de, locale: "de_DE" },
+  { content: kr, locale: "ko_KR" },
+  { content: fr, locale: "fr_FR" },
+  { content: ru, locale: "ru_RU" },
+  { content: br, locale: "pt_BR" },
 ];
 
 describe("getInjectedWalletLocale", () => {
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/ja.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/ja.ts
index 1a323ba9352..608d405d68d 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/ja.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/ja.ts
@@ -1,25 +1,26 @@
 import type { InjectedWalletLocale } from "./types.js";
+
 /**
  * @internal
  */
 const injectedWalletLocale = (wallet: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "確認を待っています",
     failed: "接続に失敗しました",
+    inProgress: "確認を待っています",
     instruction: `${wallet}で接続リクエストを承認してください`,
     retry: "再試行",
   },
+  download: {
+    android: "Google Playでダウンロード",
+    chrome: "Chrome拡張機能をダウンロード",
+    iOS: "App Storeでダウンロード",
+  },
+  getStartedLink: `${wallet}をお持ちではありませんか？`,
   getStartedScreen: {
     instruction: `QRコードをスキャンして${wallet}アプリをダウンロードしてください`,
   },
   scanScreen: {
     instruction: `${wallet}アプリでQRコードをスキャンして接続してください`,
   },
-  getStartedLink: `${wallet}をお持ちではありませんか？`,
-  download: {
-    chrome: "Chrome拡張機能をダウンロード",
-    android: "Google Playでダウンロード",
-    iOS: "App Storeでダウンロード",
-  },
 });
 export default injectedWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/kr.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/kr.ts
index 08867ed4253..032087fc348 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/kr.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/kr.ts
@@ -1,25 +1,26 @@
 import type { InjectedWalletLocale } from "./types.js";
+
 /**
  * @internal
  */
 const injectedWalletLocale = (wallet: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "확인 대기 중",
     failed: "연결 실패",
+    inProgress: "확인 대기 중",
     instruction: `${wallet}에서 연결 요청을 수락하세요`,
     retry: "다시 시도하세요",
   },
+  download: {
+    android: "Google Play에서 다운로드",
+    chrome: "Chrome 확장 프로그램 다운로드",
+    iOS: "App Store에서 다운로드",
+  },
+  getStartedLink: `Don't have ${wallet}?`,
   getStartedScreen: {
     instruction: `Scan the QR code to download the ${wallet} app`,
   },
   scanScreen: {
     instruction: `Scan the QR code with the ${wallet} app to connect`,
   },
-  getStartedLink: `Don't have ${wallet}?`,
-  download: {
-    chrome: "Chrome 확장 프로그램 다운로드",
-    android: "Google Play에서 다운로드",
-    iOS: "App Store에서 다운로드",
-  },
 });
 export default injectedWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/ru.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/ru.ts
index 851136ebf2a..6565746cf8e 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/ru.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/ru.ts
@@ -5,23 +5,23 @@ import type { InjectedWalletLocale } from "./types.js";
  */
 const injectedWalletLocaleRu = (wallet: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "Ожидание подтверждения",
     failed: "Подключение не удалось",
+    inProgress: "Ожидание подтверждения",
     instruction: `Примите запрос на подключение в ${wallet}`,
     retry: "Попробовать снова",
   },
+  download: {
+    android: "Скачать в Google Play",
+    chrome: "Скачать расширение для Chrome",
+    iOS: "Скачать в App Store",
+  },
+  getStartedLink: `Ещё нет ${wallet}?`,
   getStartedScreen: {
     instruction: `Отсканируйте QR-код, чтобы скачать приложение ${wallet}`,
   },
   scanScreen: {
     instruction: `Для подключения отсканируйте QR-код с помощью приложения ${wallet}`,
   },
-  getStartedLink: `Ещё нет ${wallet}?`,
-  download: {
-    chrome: "Скачать расширение для Chrome",
-    android: "Скачать в Google Play",
-    iOS: "Скачать в App Store",
-  },
 });
 
 export default injectedWalletLocaleRu;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/tl.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/tl.ts
index 928044e2547..4a1873b0302 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/tl.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/tl.ts
@@ -5,23 +5,23 @@ import type { InjectedWalletLocale } from "./types.js";
  */
 const injectedWalletLocaleTl = (walletName: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "Naghihintay ng Kumpirmasyon",
     failed: "Nabigo ang Pagkakonekta",
+    inProgress: "Naghihintay ng Kumpirmasyon",
     instruction: `Tanggapin ang connection request sa ${walletName} wallet`,
     retry: "Subukan Muli",
   },
+  download: {
+    android: "I-download sa Google Play",
+    chrome: "I-download ang Chrome Extension",
+    iOS: "I-download sa App Store",
+  },
+  getStartedLink: `Wala kang ${walletName} wallet?`,
   getStartedScreen: {
     instruction: `I-scan ang QR code para ma-download ang ${walletName} app`,
   },
   scanScreen: {
     instruction: `I-scan ang QR code gamit ang ${walletName} app para makonekta`,
   },
-  getStartedLink: `Wala kang ${walletName} wallet?`,
-  download: {
-    chrome: "I-download ang Chrome Extension",
-    android: "I-download sa Google Play",
-    iOS: "I-download sa App Store",
-  },
 });
 
 export default injectedWalletLocaleTl;
diff --git a/packages/thirdweb/src/react/web/wallets/injected/locale/vi.ts b/packages/thirdweb/src/react/web/wallets/injected/locale/vi.ts
index 668f8e19fd0..191fbabcc7e 100644
--- a/packages/thirdweb/src/react/web/wallets/injected/locale/vi.ts
+++ b/packages/thirdweb/src/react/web/wallets/injected/locale/vi.ts
@@ -5,23 +5,23 @@ import type { InjectedWalletLocale } from "./types.js";
  */
 const injectedWalletLocaleVi = (wallet: string): InjectedWalletLocale => ({
   connectionScreen: {
-    inProgress: "Đang đợi xác nhận",
     failed: "Kết nối thất bại",
+    inProgress: "Đang đợi xác nhận",
     instruction: `Kết nối bằng ứng dụng ${wallet}`,
     retry: "Thử lại",
   },
+  download: {
+    android: "Tải trên Google Play",
+    chrome: "Tải cho trình duyệt Chrome",
+    iOS: "Tải trên App Store",
+  },
+  getStartedLink: `Tôi không có ứng dụng ${wallet}`,
   getStartedScreen: {
     instruction: `Quét mã QR để tải ứng dụng ${wallet}`,
   },
   scanScreen: {
     instruction: `Quét mã QR bằng ứng dụng ${wallet} để kết nối`,
   },
-  getStartedLink: `Tôi không có ứng dụng ${wallet}`,
-  download: {
-    chrome: "Tải cho trình duyệt Chrome",
-    android: "Tải trên Google Play",
-    iOS: "Tải trên App Store",
-  },
 });
 
 export default injectedWalletLocaleVi;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/CoinbaseSDKConnection.tsx b/packages/thirdweb/src/react/web/wallets/shared/CoinbaseSDKConnection.tsx
index ea96d2ce0df..d156b247f6d 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/CoinbaseSDKConnection.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/CoinbaseSDKConnection.tsx
@@ -27,8 +27,8 @@ function ExternalWalletConnectUI(props: {
     setErrorConnecting(false);
     wallet
       .connect({
-        client: props.client,
         chain: props.chain,
+        client: props.client,
       })
       .then(() => {
         done();
@@ -50,21 +50,21 @@ function ExternalWalletConnectUI(props: {
 
   return (
     <ConnectingScreen
+      client={props.client}
+      errorConnecting={errorConnecting}
       locale={{
+        failed: locale.connectionScreen.failed,
         getStartedLink: locale.getStartedLink,
+        inProgress: locale.connectionScreen.inProgress,
         instruction: locale.connectionScreen.instruction,
         tryAgain: locale.connectionScreen.retry,
-        inProgress: locale.connectionScreen.inProgress,
-        failed: locale.connectionScreen.failed,
       }}
       onBack={onBack}
-      walletName={walletInfo.name}
-      walletId={wallet.id}
-      errorConnecting={errorConnecting}
-      onRetry={connect}
       onGetStarted={onGetStarted}
-      client={props.client}
+      onRetry={connect}
       size={props.size}
+      walletId={wallet.id}
+      walletName={walletInfo.name}
     />
   );
 }
diff --git a/packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.test.tsx b/packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.test.tsx
index a6f01db1787..a82d21f3ba1 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.test.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.test.tsx
@@ -14,14 +14,14 @@ describe("ConnectWalletSocialOptions", () => {
   const mockDone = vi.fn();
 
   const defaultProps = {
-    select: mockSelect,
-    done: mockDone,
-    locale: en,
     chain: undefined,
     client: TEST_CLIENT,
-    size: "compact" as const,
-    isLinking: false,
     disabled: false,
+    done: mockDone,
+    isLinking: false,
+    locale: en,
+    select: mockSelect,
+    size: "compact" as const,
   };
 
   it("renders Sign in with Wallet button when enabled and not linking", () => {
diff --git a/packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx b/packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx
index 240f23b8eb9..69124ad4c43 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx
@@ -26,17 +26,17 @@ import {
 import { setLastAuthProvider } from "../../../core/utils/storage.js";
 import { socialIcons } from "../../../core/utils/walletIcon.js";
 import { useSetSelectionData } from "../../providers/wallet-ui-states-provider.js";
-import { WalletTypeRowButton } from "../../ui/ConnectWallet/WalletTypeRowButton.js";
 import { EmailIcon } from "../../ui/ConnectWallet/icons/EmailIcon.js";
 import { FingerPrintIcon } from "../../ui/ConnectWallet/icons/FingerPrintIcon.js";
 import { GuestIcon } from "../../ui/ConnectWallet/icons/GuestIcon.js";
 import { OutlineWalletIcon } from "../../ui/ConnectWallet/icons/OutlineWalletIcon.js";
 import { PhoneIcon } from "../../ui/ConnectWallet/icons/PhoneIcon.js";
+import { WalletTypeRowButton } from "../../ui/ConnectWallet/WalletTypeRowButton.js";
+import { Container } from "../../ui/components/basic.js";
+import { Button } from "../../ui/components/buttons.js";
 import { Img } from "../../ui/components/Img.js";
 import { Spacer } from "../../ui/components/Spacer.js";
 import { TextDivider } from "../../ui/components/TextDivider.js";
-import { Container } from "../../ui/components/basic.js";
-import { Button } from "../../ui/components/buttons.js";
 import { InputSelectionUI } from "../in-app/InputSelectionUI.js";
 import { validateEmail } from "../in-app/validateEmail.js";
 import { LoadingScreen } from "./LoadingScreen.js";
@@ -106,22 +106,22 @@ export const ConnectWalletSocialOptions = (
   );
 
   const loginMethodsLabel = {
-    google: locale.signInWithGoogle,
-    facebook: locale.signInWithFacebook,
     apple: locale.signInWithApple,
-    discord: locale.signInWithDiscord,
-    line: "LINE",
-    x: "X",
     coinbase: "Coinbase",
+    discord: locale.signInWithDiscord,
+    facebook: locale.signInWithFacebook,
     farcaster: "Farcaster",
-    telegram: "Telegram",
     github: "GitHub",
-    twitch: "Twitch",
+    google: locale.signInWithGoogle,
+    line: "LINE",
     steam: "Steam",
+    telegram: "Telegram",
+    twitch: "Twitch",
+    x: "X",
   };
 
   const { data: ecosystemAuthOptions, isLoading } = useQuery({
-    queryKey: ["auth-options", wallet.id],
+    enabled: isEcosystemWallet(wallet),
     queryFn: async () => {
       if (isEcosystemWallet(wallet)) {
         const options = await getEcosystemInfo(wallet.id);
@@ -129,7 +129,7 @@ export const ConnectWalletSocialOptions = (
       }
       return null;
     },
-    enabled: isEcosystemWallet(wallet),
+    queryKey: ["auth-options", wallet.id],
     retry: false,
   });
   const authOptions = isEcosystemWallet(wallet)
@@ -212,10 +212,10 @@ export const ConnectWalletSocialOptions = (
 
   const handleGuestLogin = async () => {
     const connectOptions = {
+      chain: props.chain,
       client: props.client,
       ecosystem: ecosystemInfo,
       strategy: "guest" as const,
-      chain: props.chain,
     };
     const connectPromise = (async () => {
       const result = await wallet.connect(connectOptions);
@@ -246,17 +246,17 @@ export const ConnectWalletSocialOptions = (
         authOption: strategy,
         client: props.client,
         ecosystem: ecosystemInfo,
-        redirectUrl: walletConfig?.auth?.redirectUrl,
         mode: authMode,
+        redirectUrl: walletConfig?.auth?.redirectUrl,
       });
     }
 
     try {
       const socialLoginWindow = openOauthSignInWindow({
         authOption: strategy,
-        themeObj,
         client: props.client,
         ecosystem: ecosystemInfo,
+        themeObj,
       });
       if (!socialLoginWindow) {
         throw new Error("Failed to open login window");
@@ -264,12 +264,12 @@ export const ConnectWalletSocialOptions = (
       const connectOptions = {
         chain: props.chain,
         client: props.client,
-        strategy,
-        openedWindow: socialLoginWindow,
         closeOpenedWindow: (openedWindow: Window) => {
           openedWindow.close();
         },
         ecosystem: ecosystemInfo,
+        openedWindow: socialLoginWindow,
+        strategy,
       };
 
       const connectPromise = (() => {
@@ -287,8 +287,8 @@ export const ConnectWalletSocialOptions = (
 
       setData({
         socialLogin: {
-          type: strategy,
           connectionPromise: connectPromise,
+          type: strategy,
         },
       });
 
@@ -330,12 +330,12 @@ export const ConnectWalletSocialOptions = (
       {optionalImageMetadata && (
         <>
           <Img
-            client={props.client}
-            src={optionalImageMetadata.src}
             alt={optionalImageMetadata.alt}
-            width={`${optionalImageMetadata.width}`}
+            client={props.client}
             height={`${optionalImageMetadata.height}`}
+            src={optionalImageMetadata.src}
             style={{ margin: "auto" }}
+            width={`${optionalImageMetadata.width}`}
           />
           <Spacer y="xxs" />
         </>
@@ -359,21 +359,21 @@ export const ConnectWalletSocialOptions = (
                   <SocialButton
                     aria-label={`Login with ${loginMethod}`}
                     data-variant={showOnlyIcons ? "icon" : "full"}
-                    key={loginMethod}
-                    variant="outline"
                     disabled={props.disabled}
+                    key={loginMethod}
                     onClick={() => {
                       handleSocialLogin(loginMethod as SocialAuthOption);
                     }}
                     style={{
                       flexGrow: socialLogins.length < 7 ? 1 : 0,
                     }}
+                    variant="outline"
                   >
                     <Img
+                      client={props.client}
+                      height={imgIconSize}
                       src={socialIcons[loginMethod as SocialAuthOption]}
                       width={imgIconSize}
-                      height={imgIconSize}
-                      client={props.client}
                     />
                     {!showOnlyIcons &&
                       `${socialLogins.length === 1 ? "Continue with " : ""}${loginMethodsLabel[loginMethod as SocialAuthOption]}`}
@@ -393,13 +393,8 @@ export const ConnectWalletSocialOptions = (
       {isEmailEnabled &&
         (inputMode === "email" ? (
           <InputSelectionUI
-            type={type}
-            onSelect={(value) => {
-              setData({ emailLogin: value });
-              props.select();
-            }}
-            placeholder={placeholder}
-            name="email"
+            disabled={props.disabled}
+            emptyErrorMessage={emptyErrorMessage}
             errorMessage={(input) => {
               const isValidEmail = validateEmail(input.toLowerCase());
               if (!isValidEmail) {
@@ -407,36 +402,40 @@ export const ConnectWalletSocialOptions = (
               }
               return undefined;
             }}
-            disabled={props.disabled}
-            emptyErrorMessage={emptyErrorMessage}
+            name="email"
+            onSelect={(value) => {
+              setData({ emailLogin: value });
+              props.select();
+            }}
+            placeholder={placeholder}
             submitButtonText={locale.submitEmail}
+            type={type}
           />
         ) : (
           <WalletTypeRowButton
             client={props.client}
+            disabled={props.disabled}
             icon={EmailIcon}
             onClick={() => {
               setManualInputMode("email");
             }}
             title={locale.emailPlaceholder}
-            disabled={props.disabled}
           />
         ))}
       {isPhoneEnabled &&
         (inputMode === "phone" ? (
           <InputSelectionUI
-            format="phone"
-            type={type}
-            onSelect={(value) => {
-              // removes white spaces and special characters
-              setData({ phoneLogin: value.replace(/[-\(\) ]/g, "") });
-              props.select();
-            }}
-            placeholder={placeholder}
-            name="phone"
+            allowedSmsCountryCodes={
+              wallet.getConfig()?.auth?.allowedSmsCountryCodes
+            }
+            defaultSmsCountryCode={
+              wallet.getConfig()?.auth?.defaultSmsCountryCode
+            }
+            disabled={props.disabled}
+            emptyErrorMessage={emptyErrorMessage}
             errorMessage={(_input) => {
               // removes white spaces and special characters
-              const input = _input.replace(/[-\(\) ]/g, "");
+              const input = _input.replace(/[-() ]/g, "");
               const isPhone = /^[0-9]+$/.test(input);
 
               if (!isPhone && isPhoneEnabled) {
@@ -445,37 +444,38 @@ export const ConnectWalletSocialOptions = (
 
               return undefined;
             }}
-            disabled={props.disabled}
-            emptyErrorMessage={emptyErrorMessage}
+            format="phone"
+            name="phone"
+            onSelect={(value) => {
+              // removes white spaces and special characters
+              setData({ phoneLogin: value.replace(/[-() ]/g, "") });
+              props.select();
+            }}
+            placeholder={placeholder}
             submitButtonText={locale.submitEmail}
-            defaultSmsCountryCode={
-              wallet.getConfig()?.auth?.defaultSmsCountryCode
-            }
-            allowedSmsCountryCodes={
-              wallet.getConfig()?.auth?.allowedSmsCountryCodes
-            }
+            type={type}
           />
         ) : (
           <WalletTypeRowButton
             client={props.client}
+            disabled={props.disabled}
             icon={PhoneIcon}
             onClick={() => {
               setManualInputMode("phone");
             }}
             title={locale.phonePlaceholder}
-            disabled={props.disabled}
           />
         ))}
 
       {passKeyEnabled && (
         <WalletTypeRowButton
           client={props.client}
+          disabled={props.disabled}
           icon={FingerPrintIcon}
           onClick={() => {
             handlePassKeyLogin();
           }}
           title={locale.passkey}
-          disabled={props.disabled}
         />
       )}
 
@@ -495,12 +495,12 @@ export const ConnectWalletSocialOptions = (
       {guestEnabled && (
         <WalletTypeRowButton
           client={props.client}
+          disabled={props.disabled}
           icon={GuestIcon}
           onClick={() => {
             handleGuestLogin();
           }}
           title={locale.loginAsGuest}
-          disabled={props.disabled}
         />
       )}
 
@@ -520,12 +520,12 @@ export const ConnectWalletSocialOptions = (
 
 const SocialButtonRow = (props: { children: React.ReactNode[] }) => (
   <Container
-    flex="row"
     center="x"
+    flex="row"
     gap={props.children.length > 4 ? "xs" : "sm"}
     style={{
-      justifyContent: "center",
       display: "flex",
+      justifyContent: "center",
       ...{
         "& > *": {
           flexBasis: `${100 / props.children.length}%`,
@@ -540,16 +540,16 @@ const SocialButtonRow = (props: { children: React.ReactNode[] }) => (
 
 const SocialButton = /* @__PURE__ */ styled(Button)({
   "&[data-variant='full']": {
+    "&:active": {
+      boxShadow: "none",
+    },
     display: "flex",
-    justifyContent: "flex-start",
-    padding: spacing.md,
-    gap: spacing.sm,
     fontSize: fontSize.md,
     fontWeight: 500,
+    gap: spacing.sm,
+    justifyContent: "flex-start",
+    padding: spacing.md,
     transition: "background-color 0.2s ease",
-    "&:active": {
-      boxShadow: "none",
-    },
   },
   "&[data-variant='icon']": {
     padding: spacing.sm,
diff --git a/packages/thirdweb/src/react/web/wallets/shared/ConnectingScreen.tsx b/packages/thirdweb/src/react/web/wallets/shared/ConnectingScreen.tsx
index b8bf17cde4a..a920910580d 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/ConnectingScreen.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/ConnectingScreen.tsx
@@ -3,9 +3,9 @@ import type { ThirdwebClient } from "../../../../client/client.js";
 import type { WalletId } from "../../../../wallets/wallet-types.js";
 import { iconSize, spacing } from "../../../core/design-system/index.js";
 import { WalletLogoSpinner } from "../../ui/ConnectWallet/screens/WalletLogoSpinner.js";
-import { Spacer } from "../../ui/components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../ui/components/basic.js";
 import { Button } from "../../ui/components/buttons.js";
+import { Spacer } from "../../ui/components/Spacer.js";
 import { Text } from "../../ui/components/text.js";
 
 /**
@@ -31,20 +31,20 @@ export const ConnectingScreen: React.FC<{
   const { locale } = props;
 
   return (
-    <Container animate="fadein" fullHeight flex="column">
+    <Container animate="fadein" flex="column" fullHeight>
       <Container
         p="lg"
         style={{
           paddingBottom: 0,
         }}
       >
-        <ModalHeader title={props.walletName} onBack={props.onBack} />
+        <ModalHeader onBack={props.onBack} title={props.walletName} />
       </Container>
 
       <Container
-        flex="column"
         center="y"
         expand
+        flex="column"
         px={props.size === "compact" ? "lg" : "xxl"}
         relative
         style={{
@@ -76,17 +76,17 @@ export const ConnectingScreen: React.FC<{
               {locale.instruction}
             </Text>
           ) : (
-            <Container flex="row" center="x" animate="fadein">
+            <Container animate="fadein" center="x" flex="row">
               <Button
                 fullWidth
-                variant="accent"
                 onClick={props.onRetry}
                 style={{
-                  gap: spacing.xs,
                   alignItems: "center",
+                  gap: spacing.xs,
                 }}
+                variant="accent"
               >
-                <ReloadIcon width={iconSize.sm} height={iconSize.sm} />
+                <ReloadIcon height={iconSize.sm} width={iconSize.sm} />
                 {locale.tryAgain}
               </Button>
             </Container>
@@ -98,8 +98,8 @@ export const ConnectingScreen: React.FC<{
         <>
           <Spacer y="xl" />
           <Line />
-          <Container flex="row" center="x" p="lg">
-            <Button variant="link" onClick={props.onGetStarted}>
+          <Container center="x" flex="row" p="lg">
+            <Button onClick={props.onGetStarted} variant="link">
               {locale.getStartedLink}
             </Button>
           </Container>
diff --git a/packages/thirdweb/src/react/web/wallets/shared/ErrorState.tsx b/packages/thirdweb/src/react/web/wallets/shared/ErrorState.tsx
index 20d36448675..dc1344a0d46 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/ErrorState.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/ErrorState.tsx
@@ -1,18 +1,15 @@
 import { iconSize } from "../../../../react/core/design-system/index.js";
 import { AccentFailIcon } from "../../ui/ConnectWallet/icons/AccentFailIcon.js";
-import { Spacer } from "../../ui/components/Spacer.js";
 import { Container } from "../../ui/components/basic.js";
 import { Button } from "../../ui/components/buttons.js";
+import { Spacer } from "../../ui/components/Spacer.js";
 import { Text } from "../../ui/components/text.js";
 
-export function ErrorState(props: {
-  onTryAgain: () => void;
-  title: string;
-}) {
+export function ErrorState(props: { onTryAgain: () => void; title: string }) {
   return (
     <Container animate="fadein">
       <Spacer y="xxl" />
-      <Container flex="row" center="x">
+      <Container center="x" flex="row">
         <AccentFailIcon size={iconSize["3xl"]} />
       </Container>
       <Spacer y="lg" />
@@ -21,7 +18,7 @@ export function ErrorState(props: {
       </Text>
       <Spacer y="xl" />
       <Spacer y="xxl" />
-      <Button variant="accent" fullWidth onClick={props.onTryAgain}>
+      <Button fullWidth onClick={props.onTryAgain} variant="accent">
         Try Again
       </Button>
     </Container>
diff --git a/packages/thirdweb/src/react/web/wallets/shared/GetStartedScreen.tsx b/packages/thirdweb/src/react/web/wallets/shared/GetStartedScreen.tsx
index e0cf3368281..26acec24779 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/GetStartedScreen.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/GetStartedScreen.tsx
@@ -14,11 +14,11 @@ import {
 import { AppleIcon } from "../../ui/ConnectWallet/icons/AppleIcon.js";
 import { ChromeIcon } from "../../ui/ConnectWallet/icons/ChromeIcon.js";
 import { PlayStoreIcon } from "../../ui/ConnectWallet/icons/PlayStoreIcon.js";
+import { Container, ModalHeader } from "../../ui/components/basic.js";
 import { QRCode } from "../../ui/components/QRCode.js";
 import { Spacer } from "../../ui/components/Spacer.js";
-import { WalletImage } from "../../ui/components/WalletImage.js";
-import { Container, ModalHeader } from "../../ui/components/basic.js";
 import { Text } from "../../ui/components/text.js";
+import { WalletImage } from "../../ui/components/WalletImage.js";
 import { StyledButton } from "../../ui/design-system/elements.js";
 import type { InjectedWalletLocale } from "../injected/locale/types.js";
 
@@ -53,35 +53,35 @@ export const GetStartedScreen: React.FC<{
     : undefined;
 
   return (
-    <Container fullHeight flex="column" animate="fadein">
+    <Container animate="fadein" flex="column" fullHeight>
       <Container expand flex="column" p="lg">
         {showScreen === "android-scan" && walletInfo.app.android && (
           <InstallScanScreen
-            platformIcon={<PlayStoreIcon size={iconSize.md} />}
-            url={walletInfo.app.android}
-            platform="Google Play"
-            walletName={walletInfo.name}
-            walletId={wallet.id}
-            onBack={handleBack}
+            client={client}
             locale={{
               scanToDownload: locale.getStartedScreen.instruction,
             }}
-            client={client}
+            onBack={handleBack}
+            platform="Google Play"
+            platformIcon={<PlayStoreIcon size={iconSize.md} />}
+            url={walletInfo.app.android}
+            walletId={wallet.id}
+            walletName={walletInfo.name}
           />
         )}
 
         {showScreen === "ios-scan" && walletInfo.app.ios && (
           <InstallScanScreen
-            platformIcon={<AppleIcon size={iconSize.md} />}
-            url={walletInfo.app.ios}
-            platform="App Store"
-            walletName={walletInfo.name}
-            walletId={wallet.id}
-            onBack={handleBack}
+            client={client}
             locale={{
               scanToDownload: locale.getStartedScreen.instruction,
             }}
-            client={client}
+            onBack={handleBack}
+            platform="App Store"
+            platformIcon={<AppleIcon size={iconSize.md} />}
+            url={walletInfo.app.ios}
+            walletId={wallet.id}
+            walletName={walletInfo.name}
           />
         )}
 
@@ -93,10 +93,10 @@ export const GetStartedScreen: React.FC<{
             <Spacer y="xl" />
 
             <Container
-              expand
               animate="fadein"
-              flex="column"
               center="y"
+              expand
+              flex="column"
               style={{
                 minHeight: "250px",
               }}
@@ -175,31 +175,31 @@ const InstallScanScreen: React.FC<{
 }> = (props) => {
   return (
     <Container animate="fadein" expand>
-      <ModalHeader title={props.walletName} onBack={props.onBack} />
+      <ModalHeader onBack={props.onBack} title={props.walletName} />
       <Spacer y="xl" />
 
       <Container
-        flex="column"
-        expand
         center="both"
+        expand
+        flex="column"
         style={{
           textAlign: "center",
         }}
       >
         <QRCode
-          qrCodeUri={props.url}
           QRIcon={
             <WalletImage
+              client={props.client}
               id={props.walletId}
               size={iconSize.xxl}
-              client={props.client}
             />
           }
+          qrCodeUri={props.url}
         />
 
         <Spacer y="xl" />
 
-        <Text multiline center balance>
+        <Text balance center multiline>
           {props.locale.scanToDownload}
         </Text>
 
@@ -212,24 +212,24 @@ const InstallScanScreen: React.FC<{
 const ButtonLink = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
+    "&:hover": {
+      background: theme.colors.secondaryButtonHoverBg,
+      color: theme.colors.primaryText,
+      textDecoration: "none",
+    },
+    alignItems: "center",
     all: "unset",
-    textDecoration: "none",
-    padding: `${spacing.sm} ${spacing.md}`,
+    background: theme.colors.secondaryButtonBg,
     borderRadius: radius.sm,
-    display: "flex",
-    alignItems: "center",
-    gap: spacing.md,
-    cursor: "pointer",
     boxSizing: "border-box",
-    width: "100%",
-    fontWeight: 500,
     color: theme.colors.secondaryButtonText,
-    background: theme.colors.secondaryButtonBg,
+    cursor: "pointer",
+    display: "flex",
+    fontWeight: 500,
+    gap: spacing.md,
+    padding: `${spacing.sm} ${spacing.md}`,
+    textDecoration: "none",
     transition: "100ms ease",
-    "&:hover": {
-      background: theme.colors.secondaryButtonHoverBg,
-      textDecoration: "none",
-      color: theme.colors.primaryText,
-    },
+    width: "100%",
   };
 });
diff --git a/packages/thirdweb/src/react/web/wallets/shared/GuestLogin.tsx b/packages/thirdweb/src/react/web/wallets/shared/GuestLogin.tsx
index efc9cdbfed0..8e3d57b694d 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/GuestLogin.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/GuestLogin.tsx
@@ -6,10 +6,10 @@ import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wa
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import { setLastAuthProvider } from "../../../core/utils/storage.js";
 import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
-import { Spacer } from "../../ui/components/Spacer.js";
-import { Spinner } from "../../ui/components/Spinner.js";
 import { Container, ModalHeader } from "../../ui/components/basic.js";
 import { Button } from "../../ui/components/buttons.js";
+import { Spacer } from "../../ui/components/Spacer.js";
+import { Spinner } from "../../ui/components/Spinner.js";
 import { Text } from "../../ui/components/text.js";
 import type { ConnectWalletSelectUIState } from "./ConnectWalletSocialOptions.js";
 import type { InAppWalletLocale } from "./locale/types.js";
@@ -93,33 +93,33 @@ export function GuestLogin(props: {
   return (
     <Container animate="fadein" flex="column" fullHeight>
       <Container
-        flex="column"
         expand
+        flex="column"
         p="lg"
         style={{
           paddingBottom: 0,
         }}
       >
         {props.goBack && (
-          <ModalHeader title={locale.title} onBack={props.goBack} />
+          <ModalHeader onBack={props.goBack} title={locale.title} />
         )}
 
         {props.size === "compact" ? <Spacer y="xl" /> : null}
 
         <Container
-          flex="column"
           center="both"
           expand
+          flex="column"
           style={{
-            textAlign: "center",
             minHeight: "250px",
+            textAlign: "center",
           }}
         >
           {status !== "error" && (
             <Container animate="fadein">
               <Text
-                color="primaryText"
                 center
+                color="primaryText"
                 multiline
                 style={{
                   maxWidth: "250px",
@@ -129,7 +129,7 @@ export function GuestLogin(props: {
               </Text>
               <Spacer y="xl" />
               <Container center="x" flex="row">
-                <Spinner size="lg" color="accentText" />
+                <Spinner color="accentText" size="lg" />
               </Container>
 
               <Spacer y="xxl" />
@@ -146,7 +146,7 @@ export function GuestLogin(props: {
                 <Text color="danger">{locale.failed}</Text>
               )}
               <Spacer y="lg" />
-              <Button variant="primary" onClick={handleGuestLogin}>
+              <Button onClick={handleGuestLogin} variant="primary">
                 {locale.retry}
               </Button>
               <Spacer y="xxl" />
diff --git a/packages/thirdweb/src/react/web/wallets/shared/LoadingScreen.tsx b/packages/thirdweb/src/react/web/wallets/shared/LoadingScreen.tsx
index 672bf9779a5..1ed1d5753f1 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/LoadingScreen.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/LoadingScreen.tsx
@@ -1,5 +1,5 @@
-import { Spinner } from "../../ui/components/Spinner.js";
 import { Container } from "../../ui/components/basic.js";
+import { Spinner } from "../../ui/components/Spinner.js";
 
 /**
  * @internal
@@ -7,14 +7,14 @@ import { Container } from "../../ui/components/basic.js";
 export function LoadingScreen(props: { height?: string }) {
   return (
     <Container
+      center="both"
+      flex="row"
+      fullHeight
       style={{
         minHeight: props.height || "350px",
       }}
-      fullHeight
-      flex="row"
-      center="both"
     >
-      <Spinner size="xl" color="secondaryText" />
+      <Spinner color="secondaryText" size="xl" />
     </Container>
   );
 }
diff --git a/packages/thirdweb/src/react/web/wallets/shared/LoadingState.tsx b/packages/thirdweb/src/react/web/wallets/shared/LoadingState.tsx
index bdeb0bc2947..28cc1005f7a 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/LoadingState.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/LoadingState.tsx
@@ -1,7 +1,7 @@
 import type { ReactNode } from "react";
+import { Container } from "../../ui/components/basic.js";
 import { Spacer } from "../../ui/components/Spacer.js";
 import { Spinner } from "../../ui/components/Spinner.js";
-import { Container } from "../../ui/components/basic.js";
 import { Text } from "../../ui/components/text.js";
 
 export function LoadingState(props: {
@@ -13,19 +13,19 @@ export function LoadingState(props: {
     <Container animate="fadein">
       <Spacer y="xxl" />
       <Container
-        flex="row"
         center="x"
+        flex="row"
         style={{
           position: "relative",
         }}
       >
-        <Spinner size="4xl" color="accentText" />
+        <Spinner color="accentText" size="4xl" />
         <Container
           color="accentText"
           style={{
+            left: "50%",
             position: "absolute",
             top: "50%",
-            left: "50%",
             transform: "translate(-50%, -50%)",
           }}
         >
@@ -37,7 +37,7 @@ export function LoadingState(props: {
         {props.title}
       </Text>
       <Spacer y="md" />
-      <Text multiline center>
+      <Text center multiline>
         {props.subtitle}
       </Text>
       <Spacer y="xxl" />
diff --git a/packages/thirdweb/src/react/web/wallets/shared/OTPLoginUI.tsx b/packages/thirdweb/src/react/web/wallets/shared/OTPLoginUI.tsx
index dc8c387aef3..bb173048bb5 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/OTPLoginUI.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/OTPLoginUI.tsx
@@ -12,12 +12,12 @@ import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
 import { fontSize } from "../../../core/design-system/index.js";
 import { setLastAuthProvider } from "../../../core/utils/storage.js";
+import { Container, Line, ModalHeader } from "../../ui/components/basic.js";
+import { Button } from "../../ui/components/buttons.js";
 import { FadeIn } from "../../ui/components/FadeIn.js";
 import { OTPInput } from "../../ui/components/OTPInput.js";
 import { Spacer } from "../../ui/components/Spacer.js";
 import { Spinner } from "../../ui/components/Spinner.js";
-import { Container, Line, ModalHeader } from "../../ui/components/basic.js";
-import { Button } from "../../ui/components/buttons.js";
 import { Text } from "../../ui/components/text.js";
 import { StyledButton } from "../../ui/design-system/elements.js";
 import type { InAppWalletLocale } from "./locale/types.js";
@@ -71,19 +71,19 @@ export function OTPLoginUI(props: {
     try {
       if ("email" in userInfo) {
         await preAuthenticate({
+          client: props.client,
           ecosystem,
           email: userInfo.email,
           strategy: "email",
-          client: props.client,
         });
         setAccountStatus("sent");
         setCountdown(60); // Start 60-second countdown
       } else if ("phone" in userInfo) {
         await preAuthenticate({
+          client: props.client,
           ecosystem,
           phoneNumber: userInfo.phone,
           strategy: "phone",
-          client: props.client,
         });
         setAccountStatus("sent");
         setCountdown(60); // Start 60-second countdown
@@ -101,19 +101,19 @@ export function OTPLoginUI(props: {
     if ("email" in userInfo) {
       await wallet.connect({
         chain: props.chain,
-        strategy: "email",
+        client: props.client,
         email: userInfo.email,
+        strategy: "email",
         verificationCode: otp,
-        client: props.client,
       });
       await setLastAuthProvider("email", webLocalStorage);
     } else if ("phone" in userInfo) {
       await wallet.connect({
         chain: props.chain,
-        strategy: "phone",
+        client: props.client,
         phoneNumber: userInfo.phone,
+        strategy: "phone",
         verificationCode: otp,
-        client: props.client,
       });
       await setLastAuthProvider("phone", webLocalStorage);
     } else {
@@ -125,18 +125,18 @@ export function OTPLoginUI(props: {
     if ("email" in userInfo) {
       await linkProfile({
         client: props.client,
-        strategy: "email",
+        ecosystem,
         email: userInfo.email,
+        strategy: "email",
         verificationCode: otp,
-        ecosystem,
       });
     } else if ("phone" in userInfo) {
       await linkProfile({
         client: props.client,
-        strategy: "phone",
+        ecosystem,
         phoneNumber: userInfo.phone,
+        strategy: "phone",
         verificationCode: otp,
-        ecosystem,
       });
     }
   }
@@ -206,18 +206,18 @@ export function OTPLoginUI(props: {
 
   if (screen === "base") {
     return (
-      <Container fullHeight flex="column" animate="fadein">
+      <Container animate="fadein" flex="column" fullHeight>
         <Container p="lg">
-          <ModalHeader title={locale.signIn} onBack={goBack} />
+          <ModalHeader onBack={goBack} title={locale.signIn} />
         </Container>
 
-        <Container expand flex="column" center="y">
+        <Container center="y" expand flex="column">
           <form
             onSubmit={(e) => {
               e.preventDefault();
             }}
           >
-            <Container flex="column" center="x" px="lg">
+            <Container center="x" flex="column" px="lg">
               {!isWideModal && <Spacer y="xl" />}
               <Text>{locale.emailLoginScreen.enterCodeSendTo}</Text>
               <Spacer y="sm" />
@@ -228,22 +228,22 @@ export function OTPLoginUI(props: {
             </Container>
 
             <OTPInput
-              isInvalid={verifyStatus === "invalid"}
               digits={6}
-              value={otpInput}
+              isInvalid={verifyStatus === "invalid"}
+              onEnter={() => {
+                verify(otpInput);
+              }}
               setValue={(value) => {
                 setOtpInput(value);
                 setVerifyStatus("idle"); // reset error
               }}
-              onEnter={() => {
-                verify(otpInput);
-              }}
+              value={otpInput}
             />
 
             {verifyStatus === "invalid" && (
               <FadeIn>
                 <Spacer y="md" />
-                <Text size="sm" color="danger" center>
+                <Text center color="danger" size="sm">
                   {locale.emailLoginScreen.invalidCode}
                 </Text>
               </FadeIn>
@@ -252,7 +252,7 @@ export function OTPLoginUI(props: {
             {verifyStatus === "linking_error" && (
               <FadeIn>
                 <Spacer y="md" />
-                <Text size="sm" color="danger" center>
+                <Text center color="danger" size="sm">
                   {error || "Failed to verify code"}
                 </Text>
               </FadeIn>
@@ -261,7 +261,7 @@ export function OTPLoginUI(props: {
             {verifyStatus === "payment_required" && (
               <FadeIn>
                 <Spacer y="md" />
-                <Text size="sm" color="danger" center>
+                <Text center color="danger" size="sm">
                   {locale.maxAccountsExceeded}
                 </Text>
               </FadeIn>
@@ -271,20 +271,18 @@ export function OTPLoginUI(props: {
 
             <Container px={isWideModal ? "xxl" : "lg"}>
               {verifyStatus === "verifying" ? (
-                <>
-                  <Container flex="row" center="x" animate="fadein">
-                    <Spinner size="lg" color="accentText" />
-                  </Container>
-                </>
+                <Container animate="fadein" center="x" flex="row">
+                  <Spinner color="accentText" size="lg" />
+                </Container>
               ) : (
                 <Container animate="fadein" key="btn-container">
                   <Button
                     onClick={() => verify(otpInput)}
-                    variant="accent"
-                    type="submit"
                     style={{
                       width: "100%",
                     }}
+                    type="submit"
+                    variant="accent"
                   >
                     {locale.emailLoginScreen.verify}
                   </Button>
@@ -296,35 +294,35 @@ export function OTPLoginUI(props: {
 
             {!isWideModal && <Line />}
 
-            <Container p={isWideModal ? undefined : "lg"} gap="xs">
+            <Container gap="xs" p={isWideModal ? undefined : "lg"}>
               {accountStatus === "error" && (
-                <Text size="sm" center color="danger">
+                <Text center color="danger" size="sm">
                   {locale.emailLoginScreen.failedToSendCode}
                 </Text>
               )}
 
               {accountStatus === "sending" && (
                 <Container
-                  flex="row"
                   center="both"
+                  flex="row"
                   gap="xs"
                   style={{
                     textAlign: "center",
                   }}
                 >
                   <Text size="sm">{locale.emailLoginScreen.sendingCode}</Text>
-                  <Spinner size="xs" color="secondaryText" />
+                  <Spinner color="secondaryText" size="xs" />
                 </Container>
               )}
 
               {accountStatus !== "sending" && (
                 <LinkButton
                   onClick={countdown === 0 ? sendEmailOrSms : undefined}
-                  type="button"
                   style={{
-                    opacity: countdown > 0 ? 0.5 : 1,
                     cursor: countdown > 0 ? "default" : "pointer",
+                    opacity: countdown > 0 ? 0.5 : 1,
                   }}
+                  type="button"
                 >
                   {countdown > 0
                     ? `Resend code in ${countdown} seconds`
@@ -344,15 +342,15 @@ export function OTPLoginUI(props: {
 const LinkButton = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
+    "&:hover": {
+      color: theme.colors.primaryText,
+    },
     all: "unset",
     color: theme.colors.accentText,
-    fontSize: fontSize.sm,
     cursor: "pointer",
-    textAlign: "center",
+    fontSize: fontSize.sm,
     fontWeight: 500,
+    textAlign: "center",
     width: "100%",
-    "&:hover": {
-      color: theme.colors.primaryText,
-    },
   };
 });
diff --git a/packages/thirdweb/src/react/web/wallets/shared/PassKeyLogin.tsx b/packages/thirdweb/src/react/web/wallets/shared/PassKeyLogin.tsx
index e39a1b3dcdf..8cbd1c17659 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/PassKeyLogin.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/PassKeyLogin.tsx
@@ -10,9 +10,9 @@ import { iconSize } from "../../../core/design-system/index.js";
 import { setLastAuthProvider } from "../../../core/utils/storage.js";
 import { FingerPrintIcon } from "../../ui/ConnectWallet/icons/FingerPrintIcon.js";
 import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
-import { Spacer } from "../../ui/components/Spacer.js";
 import { Container, ModalHeader } from "../../ui/components/basic.js";
 import { Button } from "../../ui/components/buttons.js";
+import { Spacer } from "../../ui/components/Spacer.js";
 import { ErrorState } from "./ErrorState.js";
 import { LoadingScreen } from "./LoadingScreen.js";
 import { LoadingState } from "./LoadingState.js";
@@ -61,23 +61,23 @@ export function PassKeyLogin(props: {
   }, [client, wallet.id]);
 
   return (
-    <Container animate="fadein" fullHeight flex="column">
+    <Container animate="fadein" flex="column" fullHeight>
       <Container p="lg">
         <ModalHeader
+          onBack={props.onBack}
           title={
             props.isLinking
               ? locale.passkeys.linkPasskey
               : locale.passkeys.title
           }
-          onBack={props.onBack}
         />
       </Container>
 
       <Container
-        px={size === "wide" ? "xxl" : "lg"}
+        center="y"
         expand
         flex="column"
-        center="y"
+        px={size === "wide" ? "xxl" : "lg"}
       >
         <div>
           {screen === "loading" && (
@@ -100,24 +100,24 @@ export function PassKeyLogin(props: {
 
           {screen === "login" && (
             <LoginScreen
-              wallet={wallet}
+              chain={chain}
               client={client}
               done={done}
+              isLinking={props.isLinking}
               onCreate={() => {
                 setScreen("signup");
               }}
-              chain={chain}
-              isLinking={props.isLinking}
+              wallet={wallet}
             />
           )}
 
           {screen === "signup" && (
             <SignupScreen
-              wallet={wallet}
+              chain={chain}
               client={client}
               done={done}
-              chain={chain}
               isLinking={props.isLinking}
+              wallet={wallet}
             />
           )}
         </div>
@@ -152,10 +152,10 @@ function LoginScreen(props: {
         });
       } else {
         await wallet.connect({
+          chain,
           client: client,
           strategy: "passkey",
           type: "sign-in",
-          chain,
         });
         await setLastAuthProvider("passkey", webLocalStorage);
       }
@@ -179,9 +179,9 @@ function LoginScreen(props: {
   if (status === "loading") {
     return (
       <LoadingState
-        title="Requesting Passkey"
-        subtitle="A pop-up prompt will appear to sign-in and verify your passkey"
         icon={<FingerPrintIcon size={iconSize.xxl} />}
+        subtitle="A pop-up prompt will appear to sign-in and verify your passkey"
+        title="Requesting Passkey"
       />
     );
   }
@@ -191,7 +191,7 @@ function LoginScreen(props: {
       <>
         <ErrorState onTryAgain={login} title={error || "Failed to Login"} />
         <Spacer y="sm" />
-        <Button variant="outline" fullWidth onClick={props.onCreate}>
+        <Button fullWidth onClick={props.onCreate} variant="outline">
           Create a new Passkey
         </Button>
         <Spacer y="lg" />
@@ -225,16 +225,16 @@ function SignupScreen(props: {
       if (props.isLinking) {
         await linkProfile({
           client,
+          ecosystem,
           strategy: "passkey",
           type: "sign-up",
-          ecosystem,
         });
       } else {
         await wallet.connect({
+          chain,
           client: client,
           strategy: "passkey",
           type: "sign-up",
-          chain,
         });
         await setLastAuthProvider("passkey", webLocalStorage);
       }
@@ -261,9 +261,9 @@ function SignupScreen(props: {
   if (status === "loading") {
     return (
       <LoadingState
-        title="Creating Passkey"
-        subtitle="A pop-up prompt will appear to sign-in and verify your passkey"
         icon={<FingerPrintIcon size={iconSize.xxl} />}
+        subtitle="A pop-up prompt will appear to sign-in and verify your passkey"
+        title="Creating Passkey"
       />
     );
   }
@@ -290,18 +290,18 @@ function SelectLoginMethod(props: {
   return (
     <Container>
       <Spacer y="xxl" />
-      <Container flex="row" center="x" color="accentText">
+      <Container center="x" color="accentText" flex="row">
         <FingerPrintIcon size={iconSize["4xl"]} />
       </Container>
       <Spacer y="xl" />
       <Spacer y="xxl" />
 
-      <Button variant="accent" onClick={props.onSignup} fullWidth>
+      <Button fullWidth onClick={props.onSignup} variant="accent">
         Create a Passkey
       </Button>
 
       <Spacer y="sm" />
-      <Button variant="outline" onClick={props.onSignin} fullWidth>
+      <Button fullWidth onClick={props.onSignin} variant="outline">
         I have a Passkey
       </Button>
 
diff --git a/packages/thirdweb/src/react/web/wallets/shared/ScanScreen.tsx b/packages/thirdweb/src/react/web/wallets/shared/ScanScreen.tsx
index 10778319622..7f1b10ffd04 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/ScanScreen.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/ScanScreen.tsx
@@ -9,16 +9,16 @@ import {
   spacing,
 } from "../../../core/design-system/index.js";
 import { AccentFailIcon } from "../../ui/ConnectWallet/icons/AccentFailIcon.js";
-import { QRCode } from "../../ui/components/QRCode.js";
-import { Spacer } from "../../ui/components/Spacer.js";
-import { WalletImage } from "../../ui/components/WalletImage.js";
 import {
   Container,
   ModalHeader,
   ScreenBottomContainer,
 } from "../../ui/components/basic.js";
 import { Button } from "../../ui/components/buttons.js";
+import { QRCode } from "../../ui/components/QRCode.js";
+import { Spacer } from "../../ui/components/Spacer.js";
 import { Text } from "../../ui/components/text.js";
+import { WalletImage } from "../../ui/components/WalletImage.js";
 
 /**
  * @internal
@@ -40,14 +40,14 @@ export const ScanScreen: React.FC<{
   const [linkCopied, setLinkCopied] = useState(false);
 
   return (
-    <Container fullHeight flex="column" animate="fadein">
+    <Container animate="fadein" flex="column" fullHeight>
       <Container p="lg">
         <ModalHeader onBack={props.onBack} title={props.walletName} />
       </Container>
 
       <Spacer y="sm" />
 
-      <Container expand flex="column" px="lg" center="both">
+      <Container center="both" expand flex="column" px="lg">
         {!props.error && (
           <div
             style={{
@@ -55,26 +55,20 @@ export const ScanScreen: React.FC<{
             }}
           >
             <QRCode
-              qrCodeUri={props.qrCodeUri}
               QRIcon={
                 <WalletImage
-                  size={iconSize.xxl}
-                  id={props.walletId}
                   client={client}
+                  id={props.walletId}
+                  size={iconSize.xxl}
                 />
               }
+              qrCodeUri={props.qrCodeUri}
             />
 
             <Spacer y="xs" />
 
             <Button
               disabled={props.qrCodeUri === undefined}
-              variant="link"
-              style={{
-                fontSize: "12px",
-                opacity: props.qrCodeUri === undefined ? 0.5 : 1,
-                cursor: props.qrCodeUri === undefined ? "default" : "pointer",
-              }}
               onClick={() => {
                 navigator.clipboard
                   .writeText(props.qrCodeUri as string) // should always be string since the button is disabled otherwise
@@ -86,11 +80,17 @@ export const ScanScreen: React.FC<{
                     console.error("Failed to copy link to clipboard", err);
                   });
               }}
+              style={{
+                cursor: props.qrCodeUri === undefined ? "default" : "pointer",
+                fontSize: "12px",
+                opacity: props.qrCodeUri === undefined ? 0.5 : 1,
+              }}
+              variant="link"
             >
               {linkCopied ? (
-                <CheckIcon width={14} height={14} />
+                <CheckIcon height={14} width={14} />
               ) : (
-                <CopyIcon width={14} height={14} />
+                <CopyIcon height={14} width={14} />
               )}
               <span style={{ padding: "0 4px" }}>Copy Link</span>
             </Button>
@@ -98,9 +98,9 @@ export const ScanScreen: React.FC<{
             <Spacer y="lg" />
 
             <Text
+              balance
               center
               multiline
-              balance
               style={{
                 paddingInline: spacing.lg,
               }}
@@ -118,16 +118,16 @@ export const ScanScreen: React.FC<{
             }}
           >
             <Spacer y="xxl" />
-            <Container flex="row" center="x">
+            <Container center="x" flex="row">
               <AccentFailIcon size={iconSize["3xl"]} />
             </Container>
             <Spacer y="lg" />
-            <Text center size="lg" color="primaryText">
+            <Text center color="primaryText" size="lg">
               Connection Failed
             </Text>
             <Spacer y="3xl" />
 
-            <Button fullWidth variant="accent" onClick={props.onRetry}>
+            <Button fullWidth onClick={props.onRetry} variant="accent">
               Try again
             </Button>
           </Container>
@@ -143,12 +143,12 @@ export const ScanScreen: React.FC<{
           }}
         >
           <Button
-            variant="link"
             onClick={props.onGetStarted}
             style={{
               fontSize: fontSize.sm,
               textAlign: "center",
             }}
+            variant="link"
           >
             {props.getStartedLink}
           </Button>
diff --git a/packages/thirdweb/src/react/web/wallets/shared/SocialLogin.tsx b/packages/thirdweb/src/react/web/wallets/shared/SocialLogin.tsx
index 8d9644a4015..5f304b86656 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/SocialLogin.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/SocialLogin.tsx
@@ -11,10 +11,10 @@ import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
 import { setLastAuthProvider } from "../../../core/utils/storage.js";
 import type { ConnectLocale } from "../../ui/ConnectWallet/locale/types.js";
-import { Spacer } from "../../ui/components/Spacer.js";
-import { Spinner } from "../../ui/components/Spinner.js";
 import { Container, ModalHeader } from "../../ui/components/basic.js";
 import { Button } from "../../ui/components/buttons.js";
+import { Spacer } from "../../ui/components/Spacer.js";
+import { Spinner } from "../../ui/components/Spinner.js";
 import { Text } from "../../ui/components/text.js";
 import type { ConnectWalletSelectUIState } from "./ConnectWalletSocialOptions.js";
 import type { InAppWalletLocale } from "./locale/types.js";
@@ -69,17 +69,17 @@ export function SocialLogin(props: {
         authOption: props.socialAuth,
         client: props.client,
         ecosystem,
-        redirectUrl: walletConfig?.auth?.redirectUrl,
         mode: walletConfig?.auth?.mode,
+        redirectUrl: walletConfig?.auth?.redirectUrl,
       });
     }
 
     try {
       const socialWindow = openOauthSignInWindow({
         authOption: props.socialAuth,
-        themeObj,
         client: props.client,
         ecosystem,
+        themeObj,
       });
 
       if (!socialWindow) {
@@ -90,12 +90,12 @@ export function SocialLogin(props: {
       if (props.isLinking) {
         await linkProfile({
           client: props.client,
-          strategy: props.socialAuth,
-          openedWindow: socialWindow,
           closeOpenedWindow: (openedWindow) => {
             openedWindow.close();
           },
           ecosystem,
+          openedWindow: socialWindow,
+          strategy: props.socialAuth,
         }).catch((e) => {
           setAuthError(e.message);
           throw e;
@@ -103,12 +103,12 @@ export function SocialLogin(props: {
       } else {
         await wallet.connect({
           chain: props.chain,
-          strategy: props.socialAuth,
-          openedWindow: socialWindow,
+          client: props.client,
           closeOpenedWindow: (openedWindow) => {
             openedWindow.close();
           },
-          client: props.client,
+          openedWindow: socialWindow,
+          strategy: props.socialAuth,
         });
       }
 
@@ -156,8 +156,8 @@ export function SocialLogin(props: {
   return (
     <Container animate="fadein" flex="column" fullHeight>
       <Container
-        flex="column"
         expand
+        flex="column"
         p="lg"
         style={{
           paddingBottom: 0,
@@ -165,31 +165,31 @@ export function SocialLogin(props: {
       >
         {props.goBack && (
           <ModalHeader
+            onBack={props.goBack}
             title={
               props.isLinking
                 ? props.connectLocale.manageWallet.linkProfile
                 : locale.title
             }
-            onBack={props.goBack}
           />
         )}
 
         {props.size === "compact" ? <Spacer y="xl" /> : null}
 
         <Container
-          flex="column"
           center="both"
           expand
+          flex="column"
           style={{
-            textAlign: "center",
             minHeight: "250px",
+            textAlign: "center",
           }}
         >
           {status !== "error" && (
             <Container animate="fadein">
               <Text
-                color="primaryText"
                 center
+                color="primaryText"
                 multiline
                 style={{
                   maxWidth: "250px",
@@ -199,7 +199,7 @@ export function SocialLogin(props: {
               </Text>
               <Spacer y="xl" />
               <Container center="x" flex="row">
-                <Spinner size="lg" color="accentText" />
+                <Spinner color="accentText" size="lg" />
               </Container>
 
               <Spacer y="xxl" />
@@ -216,7 +216,7 @@ export function SocialLogin(props: {
                 <Text color="danger">{locale.failed}</Text>
               )}
               <Spacer y="lg" />
-              <Button variant="primary" onClick={handleSocialLogin}>
+              <Button onClick={handleSocialLogin} variant="primary">
                 {locale.retry}
               </Button>
               <Spacer y="xxl" />
diff --git a/packages/thirdweb/src/react/web/wallets/shared/WalletConnectConnection.tsx b/packages/thirdweb/src/react/web/wallets/shared/WalletConnectConnection.tsx
index 7f8d086c6f0..7a37e665ce1 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/WalletConnectConnection.tsx
+++ b/packages/thirdweb/src/react/web/wallets/shared/WalletConnectConnection.tsx
@@ -46,8 +46,6 @@ export const WalletConnectConnection: React.FC<{
         chain: props.chain,
         client: props.client,
         walletConnect: {
-          projectId: props.walletConnect?.projectId,
-          showQrModal: false,
           onDisplayUri(uri) {
             const preferNative =
               walletInfo.mobile.native || walletInfo.mobile.universal;
@@ -82,6 +80,8 @@ export const WalletConnectConnection: React.FC<{
             }
           },
           optionalChains: props.chains,
+          projectId: props.walletConnect?.projectId,
+          showQrModal: false,
         },
       })
       .then(() => {
@@ -114,38 +114,38 @@ export const WalletConnectConnection: React.FC<{
   if (isMobile()) {
     return (
       <ConnectingScreen
+        client={props.client}
+        errorConnecting={errorConnecting}
         locale={{
+          failed: locale.connectionScreen.failed,
           getStartedLink: locale.getStartedLink,
+          inProgress: locale.connectionScreen.inProgress,
           instruction: locale.connectionScreen.instruction,
           tryAgain: locale.connectionScreen.retry,
-          inProgress: locale.connectionScreen.inProgress,
-          failed: locale.connectionScreen.failed,
         }}
         onBack={onBack}
-        walletName={walletInfo.name}
-        walletId={wallet.id}
-        errorConnecting={errorConnecting}
-        onRetry={connect}
         onGetStarted={onGetStarted}
-        client={props.client}
+        onRetry={connect}
         size={props.size}
+        walletId={wallet.id}
+        walletName={walletInfo.name}
       />
     );
   }
 
   return (
     <ScanScreen
-      qrScanInstruction={locale.scanScreen.instruction}
+      client={props.client}
+      connectModalSize={props.size}
+      error={errorConnecting}
+      getStartedLink={locale.getStartedLink}
       onBack={onBack}
       onGetStarted={onGetStarted}
+      onRetry={connect}
       qrCodeUri={qrCodeUri}
-      walletName={walletInfo.name}
+      qrScanInstruction={locale.scanScreen.instruction}
       walletId={wallet.id}
-      getStartedLink={locale.getStartedLink}
-      error={errorConnecting}
-      onRetry={connect}
-      client={props.client}
-      connectModalSize={props.size}
+      walletName={walletInfo.name}
     />
   );
 };
@@ -195,9 +195,9 @@ export const WalletConnectStandaloneConnection: React.FC<{
         .connect({
           chain: props.chain,
           client: props.client,
+          optionalChains: props.chains,
           projectId: props.walletConnect?.projectId,
           showQrModal: true,
-          optionalChains: props.chains,
         })
         .then(() => {
           wcModalClosed = true;
@@ -215,12 +215,10 @@ export const WalletConnectStandaloneConnection: React.FC<{
         .connect({
           chain: props.chain,
           client: props.client,
-          projectId: props.walletConnect?.projectId,
-          showQrModal: false,
           onDisplayUri(uri) {
             const platformUris = {
-              ios: walletInfo.mobile.native || "",
               android: walletInfo.mobile.universal || "",
+              ios: walletInfo.mobile.native || "",
               other: walletInfo.mobile.universal || "",
             };
 
@@ -242,6 +240,8 @@ export const WalletConnectStandaloneConnection: React.FC<{
             }
           },
           optionalChains: props.chains,
+          projectId: props.walletConnect?.projectId,
+          showQrModal: false,
         })
         .then(() => {
           done();
@@ -275,36 +275,36 @@ export const WalletConnectStandaloneConnection: React.FC<{
   if (isMobile()) {
     return (
       <ConnectingScreen
+        client={props.client}
+        errorConnecting={errorConnecting}
         locale={{
+          failed: locale.connectionScreen.failed,
           getStartedLink: locale.getStartedLink,
+          inProgress: locale.connectionScreen.inProgress,
           instruction: locale.connectionScreen.instruction,
           tryAgain: locale.connectionScreen.retry,
-          inProgress: locale.connectionScreen.inProgress,
-          failed: locale.connectionScreen.failed,
         }}
         onBack={onBack}
-        walletName={walletInfo.name}
-        walletId={wallet.id}
-        errorConnecting={errorConnecting}
         onRetry={connect}
-        client={props.client}
         size={props.size}
+        walletId={wallet.id}
+        walletName={walletInfo.name}
       />
     );
   }
 
   return (
     <ScanScreen
-      qrScanInstruction={locale.scanScreen.instruction}
+      client={props.client}
+      connectModalSize={props.size}
+      error={errorConnecting}
+      getStartedLink={locale.getStartedLink}
       onBack={onBack}
+      onRetry={connect}
       qrCodeUri={qrCodeUri}
-      walletName={walletInfo.name}
+      qrScanInstruction={locale.scanScreen.instruction}
       walletId={wallet.id}
-      getStartedLink={locale.getStartedLink}
-      error={errorConnecting}
-      onRetry={connect}
-      client={props.client}
-      connectModalSize={props.size}
+      walletName={walletInfo.name}
     />
   );
 };
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/br.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/br.ts
index 48f9d56f274..51fd9f01968 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/br.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/br.ts
@@ -1,62 +1,62 @@
 import type { InAppWalletLocale } from "./types.js";
 
 export default {
-  signInWithGoogle: "Google",
-  signInWithFacebook: "Facebook",
-  signInWithApple: "Apple",
-  signInWithDiscord: "Discord",
-  emailPlaceholder: "Endereço de e-mail",
-  submitEmail: "Continuar",
-  signIn: "Entrar",
-  or: "ou",
-  emailRequired: "Endereço de e-mail é obrigatório",
-  invalidEmail: "Endereço de e-mail inválido",
-  maxAccountsExceeded:
-    "Número máximo de contas excedido. Por favor, notifique o desenvolvedor do aplicativo.",
-  socialLoginScreen: {
-    title: "Entrar",
-    instruction: "Faça login na sua conta no pop-up",
-    failed: "Falha ao entrar",
-    retry: "Tentar novamente",
+  createPassword: {
+    confirmation: "Eu salvei minha senha",
+    failedToSetPassword: "Falha ao definir senha",
+    inputPlaceholder: "Digite sua senha",
+    instruction:
+      "Defina uma senha para sua conta. Você precisará dessa senha ao conectar-se de um novo dispositivo.",
+    saveInstruction: "Certifique-se de salvá-la",
+    submitButton: "Definir senha",
+    title: "Criar senha",
   },
   emailLoginScreen: {
-    title: "Entrar",
     enterCodeSendTo: "Digite o código de verificação enviado para",
-    newDeviceDetected: "Novo dispositivo detectado",
     enterRecoveryCode:
       "Digite o código de recuperação enviado por e-mail quando você se cadastrou",
+    failedToSendCode: "Falha ao enviar código de verificação",
     invalidCode: "Código de verificação inválido",
     invalidCodeOrRecoveryCode:
       "Código de verificação ou código de recuperação inválido",
-    verify: "Verificar",
-    failedToSendCode: "Falha ao enviar código de verificação",
-    sendingCode: "Enviando código de verificação",
+    newDeviceDetected: "Novo dispositivo detectado",
     resendCode: "Reenviar código de verificação",
+    sendingCode: "Enviando código de verificação",
+    title: "Entrar",
+    verify: "Verificar",
   },
-  createPassword: {
-    title: "Criar senha",
-    instruction:
-      "Defina uma senha para sua conta. Você precisará dessa senha ao conectar-se de um novo dispositivo.",
-    saveInstruction: "Certifique-se de salvá-la",
-    inputPlaceholder: "Digite sua senha",
-    confirmation: "Eu salvei minha senha",
-    submitButton: "Definir senha",
-    failedToSetPassword: "Falha ao definir senha",
-  },
+  emailPlaceholder: "Endereço de e-mail",
+  emailRequired: "Endereço de e-mail é obrigatório",
   enterPassword: {
-    title: "Digite a senha",
-    instruction: "Digite a senha da sua conta",
     inputPlaceholder: "Digite sua senha",
+    instruction: "Digite a senha da sua conta",
     submitButton: "Verificar",
+    title: "Digite a senha",
     wrongPassword: "Senha incorreta",
   },
-  signInWithEmail: "Entrar com e-mail",
+  invalidEmail: "Endereço de e-mail inválido",
   invalidPhone: "Número de telefone inválido",
+  linkWallet: "Vincular uma carteira",
+  loginAsGuest: "Continuar como convidado",
+  maxAccountsExceeded:
+    "Número máximo de contas excedido. Por favor, notifique o desenvolvedor do aplicativo.",
+  or: "ou",
+  passkey: "Chave de acesso",
   phonePlaceholder: "Número de telefone",
-  signInWithPhone: "Entrar com número de telefone",
   phoneRequired: "Número de telefone é obrigatório",
-  passkey: "Chave de acesso",
+  signIn: "Entrar",
+  signInWithApple: "Apple",
+  signInWithDiscord: "Discord",
+  signInWithEmail: "Entrar com e-mail",
+  signInWithFacebook: "Facebook",
+  signInWithGoogle: "Google",
+  signInWithPhone: "Entrar com número de telefone",
   signInWithWallet: "Entrar com carteira",
-  linkWallet: "Vincular uma carteira",
-  loginAsGuest: "Continuar como convidado",
+  socialLoginScreen: {
+    failed: "Falha ao entrar",
+    instruction: "Faça login na sua conta no pop-up",
+    retry: "Tentar novamente",
+    title: "Entrar",
+  },
+  submitEmail: "Continuar",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/de.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/de.ts
index 3edf70f72dc..b0a52308c8d 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/de.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/de.ts
@@ -1,62 +1,62 @@
 import type { InAppWalletLocale } from "./types.js";
 
 export default {
-  signInWithGoogle: "Google",
-  signInWithFacebook: "Facebook",
-  signInWithApple: "Apple",
-  signInWithDiscord: "Discord",
-  emailPlaceholder: "E-Mail Adresse",
-  submitEmail: "Weiter",
-  signIn: "Anmelden",
-  or: "Oder",
-  emailRequired: "E-Mail Adresse ist erforderlich",
-  invalidEmail: "Ungültige E-Mail Adresse",
-  maxAccountsExceeded:
-    "Maximale Anzahl von Konten überschritten. Bitte informiere den App-Entwickler.",
-  socialLoginScreen: {
-    title: "Anmelden",
-    instruction: "Melde dich im Popup Fenster an",
-    failed: "Anmeldung fehlgeschlagen",
-    retry: "Erneut versuchen",
+  createPassword: {
+    confirmation: "Ich habe mein Passwort gespeichert",
+    failedToSetPassword: "Passwort festlegen fehlgeschlagen",
+    inputPlaceholder: "Gib dein Passwort ein",
+    instruction:
+      "Lege ein Passwort für dein Konto fest. Du benötigst dieses Passwort, um dich von einem neuen Gerät aus anzumelden.",
+    saveInstruction: "Stelle sicher, dass du es gespeichert hast",
+    submitButton: "Passwort festlegen",
+    title: "Passwort erstellen",
   },
   emailLoginScreen: {
-    title: "Anmelden",
     enterCodeSendTo: "Gib den Bestätigungscode ein. Gesendet an",
-    newDeviceDetected: "Neues Gerät erkannt",
     enterRecoveryCode:
       "Gib den Wiederherstellungscode ein, der dir per E-Mail zugesandt wurde, als du dich zum ersten Mal angemeldet hast",
+    failedToSendCode: "Bestätigungscode konnte nicht gesendet werden",
     invalidCode: "Ungültiger Bestätigungscode",
     invalidCodeOrRecoveryCode:
       "Ungültiger Bestätigungscode oder Wiederherstellungscode",
-    verify: "Bestätigen",
-    failedToSendCode: "Bestätigungscode konnte nicht gesendet werden",
-    sendingCode: "Bestätigungscode wird gesendet",
+    newDeviceDetected: "Neues Gerät erkannt",
     resendCode: "Bestätigungscode erneut senden",
+    sendingCode: "Bestätigungscode wird gesendet",
+    title: "Anmelden",
+    verify: "Bestätigen",
   },
-  createPassword: {
-    title: "Passwort erstellen",
-    instruction:
-      "Lege ein Passwort für dein Konto fest. Du benötigst dieses Passwort, um dich von einem neuen Gerät aus anzumelden.",
-    saveInstruction: "Stelle sicher, dass du es gespeichert hast",
-    inputPlaceholder: "Gib dein Passwort ein",
-    confirmation: "Ich habe mein Passwort gespeichert",
-    submitButton: "Passwort festlegen",
-    failedToSetPassword: "Passwort festlegen fehlgeschlagen",
-  },
+  emailPlaceholder: "E-Mail Adresse",
+  emailRequired: "E-Mail Adresse ist erforderlich",
   enterPassword: {
-    title: "Passwort eingeben",
-    instruction: "Gib das Passwort für dein Konto ein",
     inputPlaceholder: "Gib dein Passwort ein",
+    instruction: "Gib das Passwort für dein Konto ein",
     submitButton: "Überprüfen",
+    title: "Passwort eingeben",
     wrongPassword: "Falsches Passwort",
   },
-  signInWithEmail: "Mit E-Mail Adresse anmelden",
+  invalidEmail: "Ungültige E-Mail Adresse",
   invalidPhone: "Ungültige Telefonnummer",
-  phonePlaceholder: "Telefonnummer",
-  signInWithPhone: "Mit Telefonnummer anmelden",
-  phoneRequired: "Telefonnummer ist erforderlich",
-  passkey: "Passkey",
   linkWallet: "Verknüpfen Sie eine Brieftasche",
   loginAsGuest: "Melden Sie sich als Gast an",
+  maxAccountsExceeded:
+    "Maximale Anzahl von Konten überschritten. Bitte informiere den App-Entwickler.",
+  or: "Oder",
+  passkey: "Passkey",
+  phonePlaceholder: "Telefonnummer",
+  phoneRequired: "Telefonnummer ist erforderlich",
+  signIn: "Anmelden",
+  signInWithApple: "Apple",
+  signInWithDiscord: "Discord",
+  signInWithEmail: "Mit E-Mail Adresse anmelden",
+  signInWithFacebook: "Facebook",
+  signInWithGoogle: "Google",
+  signInWithPhone: "Mit Telefonnummer anmelden",
   signInWithWallet: "Mit Wallet anmelden",
+  socialLoginScreen: {
+    failed: "Anmeldung fehlgeschlagen",
+    instruction: "Melde dich im Popup Fenster an",
+    retry: "Erneut versuchen",
+    title: "Anmelden",
+  },
+  submitEmail: "Weiter",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/en.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/en.ts
index b1385514c81..9b80a3ba6f3 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/en.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/en.ts
@@ -1,61 +1,61 @@
 import type { InAppWalletLocale } from "./types.js";
 
 export default {
-  signInWithGoogle: "Google",
-  signInWithFacebook: "Facebook",
-  signInWithApple: "Apple",
-  signInWithDiscord: "Discord",
-  emailPlaceholder: "Email address",
-  submitEmail: "Continue",
-  signIn: "Sign in",
-  or: "or",
-  emailRequired: "Email address is required",
-  invalidEmail: "Invalid email address",
-  maxAccountsExceeded:
-    "Maximum number of accounts exceeded. Please notify the app developer.",
-  socialLoginScreen: {
-    title: "Sign in",
-    instruction: "Sign into your account in the pop-up",
-    failed: "Failed to sign in",
-    retry: "Retry",
+  createPassword: {
+    confirmation: "I have saved my password",
+    failedToSetPassword: "Failed to set password",
+    inputPlaceholder: "Enter your password",
+    instruction:
+      "Set a password for your account. You will need this password when connecting from a new device.",
+    saveInstruction: "Make sure to save it",
+    submitButton: "Set Password",
+    title: "Create Password",
   },
   emailLoginScreen: {
-    title: "Sign in",
     enterCodeSendTo: "Enter the verification code sent to",
-    newDeviceDetected: "New device detected",
     enterRecoveryCode:
       "Enter the recovery code emailed to you when you first signed up",
+    failedToSendCode: "Failed to send verification code",
     invalidCode: "Invalid verification code",
     invalidCodeOrRecoveryCode: "Invalid verification code or Recovery code",
-    verify: "Verify",
-    failedToSendCode: "Failed to send verification code",
-    sendingCode: "Sending verification code",
+    newDeviceDetected: "New device detected",
     resendCode: "Resend verification code",
+    sendingCode: "Sending verification code",
+    title: "Sign in",
+    verify: "Verify",
   },
-  createPassword: {
-    title: "Create Password",
-    instruction:
-      "Set a password for your account. You will need this password when connecting from a new device.",
-    saveInstruction: "Make sure to save it",
-    inputPlaceholder: "Enter your password",
-    confirmation: "I have saved my password",
-    submitButton: "Set Password",
-    failedToSetPassword: "Failed to set password",
-  },
+  emailPlaceholder: "Email address",
+  emailRequired: "Email address is required",
   enterPassword: {
-    title: "Enter Password",
-    instruction: "Enter the password for your account",
     inputPlaceholder: "Enter your password",
+    instruction: "Enter the password for your account",
     submitButton: "Verify",
+    title: "Enter Password",
     wrongPassword: "Wrong password",
   },
-  signInWithEmail: "Sign in with Email",
+  invalidEmail: "Invalid email address",
   invalidPhone: "Invalid phone number",
+  linkWallet: "Link a Wallet",
+  loginAsGuest: "Continue as guest",
+  maxAccountsExceeded:
+    "Maximum number of accounts exceeded. Please notify the app developer.",
+  or: "or",
+  passkey: "Passkey",
   phonePlaceholder: "Phone number",
-  signInWithPhone: "Sign in with phone number",
   phoneRequired: "Phone number is required",
-  passkey: "Passkey",
+  signIn: "Sign in",
+  signInWithApple: "Apple",
+  signInWithDiscord: "Discord",
+  signInWithEmail: "Sign in with Email",
+  signInWithFacebook: "Facebook",
+  signInWithGoogle: "Google",
+  signInWithPhone: "Sign in with phone number",
   signInWithWallet: "Sign in with Wallet",
-  linkWallet: "Link a Wallet",
-  loginAsGuest: "Continue as guest",
+  socialLoginScreen: {
+    failed: "Failed to sign in",
+    instruction: "Sign into your account in the pop-up",
+    retry: "Retry",
+    title: "Sign in",
+  },
+  submitEmail: "Continue",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/es.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/es.ts
index cfde08e04f6..5819a431066 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/es.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/es.ts
@@ -1,61 +1,61 @@
 import type { InAppWalletLocale } from "./types.js";
 
 export default {
-  signInWithGoogle: "Iniciar sesión con Google",
-  signInWithFacebook: "Iniciar sesión con Facebook",
-  signInWithApple: "Iniciar sesión con Apple",
-  signInWithDiscord: "Iniciar sesión con Discord",
-  emailPlaceholder: "Ingresa tu dirección de correo electrónico",
-  submitEmail: "Continuar",
-  signIn: "Iniciar sesión",
-  emailRequired: "Se requiere dirección de correo electrónico",
-  invalidEmail: "Dirección de correo electrónico inválida",
-  maxAccountsExceeded: "Número máximo de cuentas alcanzado",
-  or: "O",
-  socialLoginScreen: {
-    title: "Iniciar sesión",
-    instruction: "Inicie sesión en su cuenta en la ventana abierta",
-    failed: "Error al iniciar sesión",
-    retry: "Reintentar",
+  createPassword: {
+    confirmation: "He guardado mi contraseña",
+    failedToSetPassword: "Error al establecer la contraseña",
+    inputPlaceholder: "Ingrese su contraseña",
+    instruction:
+      "Establezca una contraseña para su cuenta. Necesitará esta contraseña cuando se conecte desde un nuevo dispositivo.",
+    saveInstruction: "Asegúrese de guardarla",
+    submitButton: "Establecer contraseña",
+    title: "Crear contraseña",
   },
   emailLoginScreen: {
-    title: "Iniciar sesión",
     enterCodeSendTo: "Ingresa el código de verificación enviado a",
-    newDeviceDetected: "Nuevo dispositivo detectado",
     enterRecoveryCode:
       "Ingresa el código de recuperación que se te envió por correo electrónico cuando te registraste por primera vez",
+    failedToSendCode: "Error al enviar el código de verificación",
     invalidCode: "Código de verificación inválido",
     invalidCodeOrRecoveryCode:
       "Código de verificación o de recuperación inválido",
-    verify: "Verificar",
-    failedToSendCode: "Error al enviar el código de verificación",
-    sendingCode: "Enviando código de verificación",
+    newDeviceDetected: "Nuevo dispositivo detectado",
     resendCode: "Reenviar código de verificación",
+    sendingCode: "Enviando código de verificación",
+    title: "Iniciar sesión",
+    verify: "Verificar",
   },
-  createPassword: {
-    title: "Crear contraseña",
-    instruction:
-      "Establezca una contraseña para su cuenta. Necesitará esta contraseña cuando se conecte desde un nuevo dispositivo.",
-    saveInstruction: "Asegúrese de guardarla",
-    inputPlaceholder: "Ingrese su contraseña",
-    confirmation: "He guardado mi contraseña",
-    submitButton: "Establecer contraseña",
-    failedToSetPassword: "Error al establecer la contraseña",
-  },
+  emailPlaceholder: "Ingresa tu dirección de correo electrónico",
+  emailRequired: "Se requiere dirección de correo electrónico",
   enterPassword: {
-    title: "Ingrese la contraseña",
-    instruction: "Ingrese la contraseña de su cuenta",
     inputPlaceholder: "Ingrese su contraseña",
+    instruction: "Ingrese la contraseña de su cuenta",
     submitButton: "Verificar",
+    title: "Ingrese la contraseña",
     wrongPassword: "Contraseña incorrecta",
   },
+  invalidEmail: "Dirección de correo electrónico inválida",
   invalidPhone: "Número de teléfono inválido",
+  linkWallet: "Vincular una billetera",
+  loginAsGuest: "Inicia sesión como invitado",
+  maxAccountsExceeded: "Número máximo de cuentas alcanzado",
+  or: "O",
+  passkey: "Clave de acceso",
   phonePlaceholder: "Ingresa tu número de teléfono",
-  signInWithPhone: "Iniciar sesión con número de teléfono",
   phoneRequired: "Se requiere número de teléfono",
+  signIn: "Iniciar sesión",
+  signInWithApple: "Iniciar sesión con Apple",
+  signInWithDiscord: "Iniciar sesión con Discord",
   signInWithEmail: "Iniciar sesión con correo electrónico",
-  passkey: "Clave de acceso",
-  linkWallet: "Vincular una billetera",
-  loginAsGuest: "Inicia sesión como invitado",
+  signInWithFacebook: "Iniciar sesión con Facebook",
+  signInWithGoogle: "Iniciar sesión con Google",
+  signInWithPhone: "Iniciar sesión con número de teléfono",
   signInWithWallet: "Iniciar sesión con billetera",
+  socialLoginScreen: {
+    failed: "Error al iniciar sesión",
+    instruction: "Inicie sesión en su cuenta en la ventana abierta",
+    retry: "Reintentar",
+    title: "Iniciar sesión",
+  },
+  submitEmail: "Continuar",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/fr.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/fr.ts
index dc6c17e16e9..f3bea468a2e 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/fr.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/fr.ts
@@ -1,62 +1,62 @@
 import type { InAppWalletLocale } from "./types.js";
 
 export default {
-  signInWithGoogle: "Google",
-  signInWithFacebook: "Facebook",
-  signInWithApple: "Apple",
-  signInWithDiscord: "Discord",
-  emailPlaceholder: "E-mail",
-  submitEmail: "Continuer",
-  signIn: "Se connecter",
-  or: "Ou",
-  emailRequired: "L'adresse e-mail est requise",
-  invalidEmail: "Adresse e-mail invalide",
-  maxAccountsExceeded:
-    "Nombre maximum de comptes dépassé. Veuillez en informer le développeur de l'application.",
-  socialLoginScreen: {
-    title: "Se connecter",
-    instruction: "Connectez-vous à votre compte dans la fenêtre pop-up",
-    failed: "Échec de la connexion",
-    retry: "Réessayer",
+  createPassword: {
+    confirmation: "J'ai sauvegardé mon mot de passe",
+    failedToSetPassword: "Échec de la définition du mot de passe",
+    inputPlaceholder: "Entrez votre mot de passe",
+    instruction:
+      "Définissez un mot de passe pour votre compte. Vous aurez besoin de ce mot de passe lorsque vous vous connecterez depuis un nouvel appareil.",
+    saveInstruction: "Assurez-vous de le sauvegarder",
+    submitButton: "Définir le mot de passe",
+    title: "Créer un mot de passe",
   },
   emailLoginScreen: {
-    title: "Se connecter",
     enterCodeSendTo: "Entrez le code de vérification envoyé à",
-    newDeviceDetected: "Nouvel appareil détecté",
     enterRecoveryCode:
       "Entrez le code de récupération qui vous a été envoyé par e-mail lors de votre inscription",
+    failedToSendCode: "Échec de l'envoi du code de vérification",
     invalidCode: "Code de vérification invalide",
     invalidCodeOrRecoveryCode:
       "Code de vérification ou code de récupération invalide",
-    verify: "Vérifier",
-    failedToSendCode: "Échec de l'envoi du code de vérification",
-    sendingCode: "Envoi du code de vérification",
+    newDeviceDetected: "Nouvel appareil détecté",
     resendCode: "Renvoyer le code de vérification",
+    sendingCode: "Envoi du code de vérification",
+    title: "Se connecter",
+    verify: "Vérifier",
   },
-  createPassword: {
-    title: "Créer un mot de passe",
-    instruction:
-      "Définissez un mot de passe pour votre compte. Vous aurez besoin de ce mot de passe lorsque vous vous connecterez depuis un nouvel appareil.",
-    saveInstruction: "Assurez-vous de le sauvegarder",
-    inputPlaceholder: "Entrez votre mot de passe",
-    confirmation: "J'ai sauvegardé mon mot de passe",
-    submitButton: "Définir le mot de passe",
-    failedToSetPassword: "Échec de la définition du mot de passe",
-  },
+  emailPlaceholder: "E-mail",
+  emailRequired: "L'adresse e-mail est requise",
   enterPassword: {
-    title: "Entrer le mot de passe",
-    instruction: "Entrez le mot de passe de votre compte",
     inputPlaceholder: "Entrez votre mot de passe",
+    instruction: "Entrez le mot de passe de votre compte",
     submitButton: "Vérifier",
+    title: "Entrer le mot de passe",
     wrongPassword: "Mot de passe incorrect",
   },
-  signInWithEmail: "Se connecter avec e-mail",
+  invalidEmail: "Adresse e-mail invalide",
   invalidPhone: "Numéro de téléphone invalide",
-  phonePlaceholder: "Téléphone",
-  signInWithPhone: "Se connecter avec le numéro de téléphone",
-  phoneRequired: "Le numéro de téléphone est requis",
-  passkey: "Passkey",
   linkWallet: "Lier un portefeuille",
   loginAsGuest: "Connectez-vous en tant qu'invité",
+  maxAccountsExceeded:
+    "Nombre maximum de comptes dépassé. Veuillez en informer le développeur de l'application.",
+  or: "Ou",
+  passkey: "Passkey",
+  phonePlaceholder: "Téléphone",
+  phoneRequired: "Le numéro de téléphone est requis",
+  signIn: "Se connecter",
+  signInWithApple: "Apple",
+  signInWithDiscord: "Discord",
+  signInWithEmail: "Se connecter avec e-mail",
+  signInWithFacebook: "Facebook",
+  signInWithGoogle: "Google",
+  signInWithPhone: "Se connecter avec le numéro de téléphone",
   signInWithWallet: "Se connecter avec portefeuille",
+  socialLoginScreen: {
+    failed: "Échec de la connexion",
+    instruction: "Connectez-vous à votre compte dans la fenêtre pop-up",
+    retry: "Réessayer",
+    title: "Se connecter",
+  },
+  submitEmail: "Continuer",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/ja.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/ja.ts
index f72070b661b..b9aaff05b1c 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/ja.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/ja.ts
@@ -1,60 +1,60 @@
 import type { InAppWalletLocale } from "./types.js";
 export default {
-  signInWithGoogle: "Google",
-  signInWithFacebook: "Facebook",
-  signInWithApple: "Apple",
-  signInWithDiscord: "Discord",
-  emailPlaceholder: "メールアドレス",
-  submitEmail: "続行",
-  signIn: "サインイン",
-  or: "または",
-  emailRequired: "メールアドレスは必須です",
-  invalidEmail: "無効なメールアドレス",
-  maxAccountsExceeded:
-    "アカウントの最大数を超えました。アプリ開発者に通知してください。",
-  socialLoginScreen: {
-    title: "サインイン",
-    instruction: "ポップアップでアカウントにサインインしてください",
-    failed: "サインインに失敗しました",
-    retry: "再試行",
+  createPassword: {
+    confirmation: "パスワードを保存しました",
+    failedToSetPassword: "パスワードの設定に失敗しました",
+    inputPlaceholder: "パスワードを入力してください",
+    instruction:
+      "アカウントのパスワードを設定してください。新しいデバイスから接続する際にこのパスワードが必要です。",
+    saveInstruction: "必ず保存してください",
+    submitButton: "パスワードを設定",
+    title: "パスワードを作成",
   },
   emailLoginScreen: {
-    title: "サインイン",
     enterCodeSendTo: "送信された確認コードを入力してください",
-    newDeviceDetected: "新しいデバイスが検出されました",
     enterRecoveryCode:
       "初回サインアップ時に送信されたリカバリーコードを入力してください",
+    failedToSendCode: "確認コードの送信に失敗しました",
     invalidCode: "無効な確認コード",
     invalidCodeOrRecoveryCode: "無効な確認コードまたはリカバリーコード",
-    verify: "確認",
-    failedToSendCode: "確認コードの送信に失敗しました",
-    sendingCode: "確認コードを送信中",
+    newDeviceDetected: "新しいデバイスが検出されました",
     resendCode: "確認コードを再送",
+    sendingCode: "確認コードを送信中",
+    title: "サインイン",
+    verify: "確認",
   },
-  createPassword: {
-    title: "パスワードを作成",
-    instruction:
-      "アカウントのパスワードを設定してください。新しいデバイスから接続する際にこのパスワードが必要です。",
-    saveInstruction: "必ず保存してください",
-    inputPlaceholder: "パスワードを入力してください",
-    confirmation: "パスワードを保存しました",
-    submitButton: "パスワードを設定",
-    failedToSetPassword: "パスワードの設定に失敗しました",
-  },
+  emailPlaceholder: "メールアドレス",
+  emailRequired: "メールアドレスは必須です",
   enterPassword: {
-    title: "パスワードを入力",
-    instruction: "アカウントのパスワードを入力してください",
     inputPlaceholder: "パスワードを入力してください",
+    instruction: "アカウントのパスワードを入力してください",
     submitButton: "確認",
+    title: "パスワードを入力",
     wrongPassword: "パスワードが間違っています",
   },
-  signInWithEmail: "メールでサインイン",
+  invalidEmail: "無効なメールアドレス",
   invalidPhone: "無効な電話番号",
-  phonePlaceholder: "電話番号",
-  signInWithPhone: "電話番号でサインイン",
-  phoneRequired: "電話番号は必須です",
-  passkey: "パスキー",
   linkWallet: "ウォレットをリンクする",
   loginAsGuest: "ゲストとしてログイン",
+  maxAccountsExceeded:
+    "アカウントの最大数を超えました。アプリ開発者に通知してください。",
+  or: "または",
+  passkey: "パスキー",
+  phonePlaceholder: "電話番号",
+  phoneRequired: "電話番号は必須です",
+  signIn: "サインイン",
+  signInWithApple: "Apple",
+  signInWithDiscord: "Discord",
+  signInWithEmail: "メールでサインイン",
+  signInWithFacebook: "Facebook",
+  signInWithGoogle: "Google",
+  signInWithPhone: "電話番号でサインイン",
   signInWithWallet: "ウォレットでログイン",
+  socialLoginScreen: {
+    failed: "サインインに失敗しました",
+    instruction: "ポップアップでアカウントにサインインしてください",
+    retry: "再試行",
+    title: "サインイン",
+  },
+  submitEmail: "続行",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/kr.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/kr.ts
index 153d6f8f95a..9a1b466a139 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/kr.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/kr.ts
@@ -1,58 +1,58 @@
 import type { InAppWalletLocale } from "./types.js";
 export default {
-  signInWithGoogle: "Google",
-  signInWithFacebook: "Facebook",
-  signInWithApple: "Apple",
-  signInWithDiscord: "Discord",
-  emailPlaceholder: "이메일 주소",
-  submitEmail: "계속하기",
-  signIn: "로그인",
-  or: "Or",
-  emailRequired: "이메일 주소가 필요합니다",
-  invalidEmail: "잘못된 이메일 주소",
-  maxAccountsExceeded: "계정 최대 수를 초과했습니다. 앱 개발자에게 알려주세요.",
-  socialLoginScreen: {
-    title: "로그인",
-    instruction: "팝업 창에서 계정에 로그인하세요",
-    failed: "로그인에 실패했습니다",
-    retry: "다시 시도",
+  createPassword: {
+    confirmation: "비밀번호를 저장했습니다",
+    failedToSetPassword: "비밀번호 설정 실패",
+    inputPlaceholder: "비밀번호를 입력하세요",
+    instruction:
+      "계정의 비밀번호를 설정하세요. 새 기기에서 연결할 때 이 비밀번호가 필요합니다.",
+    saveInstruction: "반드시 저장하세요",
+    submitButton: "비밀번호 설정",
+    title: "비밀번호 생성",
   },
   emailLoginScreen: {
-    title: "로그인",
     enterCodeSendTo: "전송된 인증 코드를 입력하세요",
-    newDeviceDetected: "새 기기가 감지되었습니다",
     enterRecoveryCode: "처음 가입할 때 이메일로 전송된 복구 코드를 입력하세요",
+    failedToSendCode: "인증 코드 전송에 실패했습니다",
     invalidCode: "잘못된 인증 코드",
     invalidCodeOrRecoveryCode: "잘못된 인증 코드 또는 복구 코드",
-    verify: "확인",
-    failedToSendCode: "인증 코드 전송에 실패했습니다",
-    sendingCode: "인증 코드 전송 중",
+    newDeviceDetected: "새 기기가 감지되었습니다",
     resendCode: "인증 코드 다시 보내기",
+    sendingCode: "인증 코드 전송 중",
+    title: "로그인",
+    verify: "확인",
   },
-  createPassword: {
-    title: "비밀번호 생성",
-    instruction:
-      "계정의 비밀번호를 설정하세요. 새 기기에서 연결할 때 이 비밀번호가 필요합니다.",
-    saveInstruction: "반드시 저장하세요",
-    inputPlaceholder: "비밀번호를 입력하세요",
-    confirmation: "비밀번호를 저장했습니다",
-    submitButton: "비밀번호 설정",
-    failedToSetPassword: "비밀번호 설정 실패",
-  },
+  emailPlaceholder: "이메일 주소",
+  emailRequired: "이메일 주소가 필요합니다",
   enterPassword: {
-    title: "비밀번호를 입력하세요",
-    instruction: "계정의 비밀번호를 입력하세요",
     inputPlaceholder: "비밀번호를 입력하세요",
+    instruction: "계정의 비밀번호를 입력하세요",
     submitButton: "확인",
+    title: "비밀번호를 입력하세요",
     wrongPassword: "잘못된 비밀번호",
   },
-  signInWithEmail: "이메일로 로그인",
+  invalidEmail: "잘못된 이메일 주소",
   invalidPhone: "잘못된 전화번호",
-  phonePlaceholder: "전화번호",
-  signInWithPhone: "전화번호로 로그인",
-  phoneRequired: "전화번호가 필요합니다",
-  passkey: "비밀번호",
   linkWallet: "지갑 연결",
   loginAsGuest: "게스트로 로그인",
+  maxAccountsExceeded: "계정 최대 수를 초과했습니다. 앱 개발자에게 알려주세요.",
+  or: "Or",
+  passkey: "비밀번호",
+  phonePlaceholder: "전화번호",
+  phoneRequired: "전화번호가 필요합니다",
+  signIn: "로그인",
+  signInWithApple: "Apple",
+  signInWithDiscord: "Discord",
+  signInWithEmail: "이메일로 로그인",
+  signInWithFacebook: "Facebook",
+  signInWithGoogle: "Google",
+  signInWithPhone: "전화번호로 로그인",
   signInWithWallet: "지갑으로 로그인",
+  socialLoginScreen: {
+    failed: "로그인에 실패했습니다",
+    instruction: "팝업 창에서 계정에 로그인하세요",
+    retry: "다시 시도",
+    title: "로그인",
+  },
+  submitEmail: "계속하기",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/ru.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/ru.ts
index c72dca695f3..b10d9c59ca1 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/ru.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/ru.ts
@@ -1,62 +1,62 @@
 import type { InAppWalletLocale } from "./types.js";
 
 export default {
-  signInWithGoogle: "Google",
-  signInWithFacebook: "Facebook",
-  signInWithApple: "Apple",
-  signInWithDiscord: "Discord",
-  emailPlaceholder: "Адрес электронной почты",
-  submitEmail: "Продолжить",
-  signIn: "Войти",
-  or: "или",
-  emailRequired: "Требуется адрес электронной почты",
-  invalidEmail: "Неверный адрес электронной почты",
-  maxAccountsExceeded:
-    "Превышено максимальное количество аккаунтов. Пожалуйста, сообщите разработчику приложения.",
-  socialLoginScreen: {
-    title: "Войти",
-    instruction: "Войдите в свой аккаунт во всплывающем окне",
-    failed: "Не удалось войти",
-    retry: "Повторить попытку",
+  createPassword: {
+    confirmation: "Я сохранил свой пароль",
+    failedToSetPassword: "Не удалось установить пароль",
+    inputPlaceholder: "Введите ваш пароль",
+    instruction:
+      "Установите пароль для вашего аккаунта. Этот пароль понадобится при подключении с нового устройства.",
+    saveInstruction: "Обязательно сохраните его",
+    submitButton: "Установить пароль",
+    title: "Создать пароль",
   },
   emailLoginScreen: {
-    title: "Войти",
     enterCodeSendTo: "Введите код подтверждения, отправленный на",
-    newDeviceDetected: "Обнаружено новое устройство",
     enterRecoveryCode:
       "Введите код восстановления, отправленный вам по электронной почте при первой регистрации",
+    failedToSendCode: "Не удалось отправить код подтверждения",
     invalidCode: "Неверный код подтверждения",
     invalidCodeOrRecoveryCode:
       "Неверный код подтверждения или код восстановления",
-    verify: "Подтвердить",
-    failedToSendCode: "Не удалось отправить код подтверждения",
-    sendingCode: "Отправка кода подтверждения",
+    newDeviceDetected: "Обнаружено новое устройство",
     resendCode: "Повторно отправить код подтверждения",
+    sendingCode: "Отправка кода подтверждения",
+    title: "Войти",
+    verify: "Подтвердить",
   },
-  createPassword: {
-    title: "Создать пароль",
-    instruction:
-      "Установите пароль для вашего аккаунта. Этот пароль понадобится при подключении с нового устройства.",
-    saveInstruction: "Обязательно сохраните его",
-    inputPlaceholder: "Введите ваш пароль",
-    confirmation: "Я сохранил свой пароль",
-    submitButton: "Установить пароль",
-    failedToSetPassword: "Не удалось установить пароль",
-  },
+  emailPlaceholder: "Адрес электронной почты",
+  emailRequired: "Требуется адрес электронной почты",
   enterPassword: {
-    title: "Введите пароль",
-    instruction: "Введите пароль для вашего аккаунта",
     inputPlaceholder: "Введите ваш пароль",
+    instruction: "Введите пароль для вашего аккаунта",
     submitButton: "Подтвердить",
+    title: "Введите пароль",
     wrongPassword: "Неверный пароль",
   },
-  signInWithEmail: "Войти с помощью электронной почты",
+  invalidEmail: "Неверный адрес электронной почты",
   invalidPhone: "Недействительный номер телефона",
+  linkWallet: "Привязать кошелек",
+  loginAsGuest: "Продолжить как гость",
+  maxAccountsExceeded:
+    "Превышено максимальное количество аккаунтов. Пожалуйста, сообщите разработчику приложения.",
+  or: "или",
+  passkey: "Ключ доступа",
   phonePlaceholder: "Номер телефона",
-  signInWithPhone: "Войти с помощью номера телефона",
   phoneRequired: "Требуется номер телефона",
-  passkey: "Ключ доступа",
+  signIn: "Войти",
+  signInWithApple: "Apple",
+  signInWithDiscord: "Discord",
+  signInWithEmail: "Войти с помощью электронной почты",
+  signInWithFacebook: "Facebook",
+  signInWithGoogle: "Google",
+  signInWithPhone: "Войти с помощью номера телефона",
   signInWithWallet: "Войти с помощью кошелька",
-  linkWallet: "Привязать кошелек",
-  loginAsGuest: "Продолжить как гость",
+  socialLoginScreen: {
+    failed: "Не удалось войти",
+    instruction: "Войдите в свой аккаунт во всплывающем окне",
+    retry: "Повторить попытку",
+    title: "Войти",
+  },
+  submitEmail: "Продолжить",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/tl.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/tl.ts
index 099b14766dc..79bdef21990 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/tl.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/tl.ts
@@ -1,61 +1,61 @@
 import type { InAppWalletLocale } from "./types.js";
 
 export default {
-  signInWithGoogle: "Mag-sign in gamit ang Google",
-  signInWithFacebook: "Mag-sign in gamit ang Facebook",
-  signInWithApple: "Mag-sign in gamit ang Apple",
-  signInWithDiscord: "Mag-sign in gamit ang Discord",
-  emailPlaceholder: "Ilagay ang iyong email address",
-  submitEmail: "Magpatuloy",
-  signIn: "Mag-sign in",
-  emailRequired: "Kinakailangan ang email address",
-  invalidEmail: "Hindi wastong email address",
-  maxAccountsExceeded: "Naabot mo na ang maximum na bilang ng accounts",
-  or: "O",
-  socialLoginScreen: {
-    title: "Mag-sign in",
-    instruction: "Mag-sign in sa iyong account sa pop-up",
-    failed: "Hindi nagawa ang pag-sign in",
-    retry: "Subukan muli",
+  createPassword: {
+    confirmation: "Na-save ko na ang aking password",
+    failedToSetPassword: "Hindi nagawa ang pagtakda ng password",
+    inputPlaceholder: "Ilagay ang iyong password",
+    instruction:
+      "Itakda ang isang password para sa iyong account. Kakailanganin mo ang password na ito kapag kumokonekta mula sa isang bagong device.",
+    saveInstruction: "Siguraduhing ito ay na-save",
+    submitButton: "Itakda ang Password",
+    title: "Lumikha ng Password",
   },
   emailLoginScreen: {
-    title: "Mag-sign in",
     enterCodeSendTo: "Ilagay ang verification code na ipinadala sa",
-    newDeviceDetected: "Natuklasan ang bagong device",
     enterRecoveryCode:
       "Ilagay ang recovery code na ipinadala sa iyo noong unang pag-sign up",
+    failedToSendCode: "Hindi nagawa ang pagpapadala ng verification code",
     invalidCode: "Hindi wastong verification code",
     invalidCodeOrRecoveryCode:
       "Hindi wastong verification code o recovery code",
-    verify: "Patunayan",
-    failedToSendCode: "Hindi nagawa ang pagpapadala ng verification code",
-    sendingCode: "Nagpapadala ng verification code",
+    newDeviceDetected: "Natuklasan ang bagong device",
     resendCode: "Ipadala muli ang verification code",
+    sendingCode: "Nagpapadala ng verification code",
+    title: "Mag-sign in",
+    verify: "Patunayan",
   },
-  createPassword: {
-    title: "Lumikha ng Password",
-    instruction:
-      "Itakda ang isang password para sa iyong account. Kakailanganin mo ang password na ito kapag kumokonekta mula sa isang bagong device.",
-    saveInstruction: "Siguraduhing ito ay na-save",
-    inputPlaceholder: "Ilagay ang iyong password",
-    confirmation: "Na-save ko na ang aking password",
-    submitButton: "Itakda ang Password",
-    failedToSetPassword: "Hindi nagawa ang pagtakda ng password",
-  },
+  emailPlaceholder: "Ilagay ang iyong email address",
+  emailRequired: "Kinakailangan ang email address",
   enterPassword: {
-    title: "Ilagay ang Password",
-    instruction: "Ilagay ang password para sa iyong account",
     inputPlaceholder: "Ilagay ang iyong password",
+    instruction: "Ilagay ang password para sa iyong account",
     submitButton: "Patunayan",
+    title: "Ilagay ang Password",
     wrongPassword: "Maling password",
   },
-  signInWithEmail: "Mag-sign in gamit ang email",
+  invalidEmail: "Hindi wastong email address",
   invalidPhone: "Hindi wastong numero ng telepono",
-  phonePlaceholder: "Ilagay ang iyong numero ng telepono",
-  signInWithPhone: "Mag-login gamit ang numero ng telepono",
-  phoneRequired: "Kinakailangan ang numero ng telepono",
-  passkey: "Passkey",
   linkWallet: "Mag-link ng Wallet",
   loginAsGuest: "Mag-login bilang bisita",
+  maxAccountsExceeded: "Naabot mo na ang maximum na bilang ng accounts",
+  or: "O",
+  passkey: "Passkey",
+  phonePlaceholder: "Ilagay ang iyong numero ng telepono",
+  phoneRequired: "Kinakailangan ang numero ng telepono",
+  signIn: "Mag-sign in",
+  signInWithApple: "Mag-sign in gamit ang Apple",
+  signInWithDiscord: "Mag-sign in gamit ang Discord",
+  signInWithEmail: "Mag-sign in gamit ang email",
+  signInWithFacebook: "Mag-sign in gamit ang Facebook",
+  signInWithGoogle: "Mag-sign in gamit ang Google",
+  signInWithPhone: "Mag-login gamit ang numero ng telepono",
   signInWithWallet: "Mag-login gamit ang Wallet",
+  socialLoginScreen: {
+    failed: "Hindi nagawa ang pag-sign in",
+    instruction: "Mag-sign in sa iyong account sa pop-up",
+    retry: "Subukan muli",
+    title: "Mag-sign in",
+  },
+  submitEmail: "Magpatuloy",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/locale/vi.ts b/packages/thirdweb/src/react/web/wallets/shared/locale/vi.ts
index 5a0907733a5..c55e1ec9b1d 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/locale/vi.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/locale/vi.ts
@@ -1,61 +1,61 @@
 import type { InAppWalletLocale } from "./types.js";
 
 export default {
-  signInWithGoogle: "Google",
-  signInWithFacebook: "Facebook",
-  signInWithApple: "Apple",
-  signInWithDiscord: "Discord",
-  emailPlaceholder: "Địa chỉ email",
-  submitEmail: "Tiếp tục",
-  signIn: "Đăng nhập",
-  or: "Hoặc",
-  emailRequired: "Vui lòng nhập địa chỉ email",
-  invalidEmail: "Địa chỉ email không hợp lệ",
-  maxAccountsExceeded:
-    "Số tài khoản vượt quá mức quy định. Vui lòng liên hệ với lập trình viên của ứng dụng này",
-  socialLoginScreen: {
-    title: "Đăng nhập",
-    instruction: "Đăng nhập ở cửa sổ hiện lên",
-    failed: "Đăng nhập thất bại",
-    retry: "Thử lại",
+  createPassword: {
+    confirmation: "Tôi đã sao lưu mật khẩu",
+    failedToSetPassword: "Đặt mật khẩu thất bại",
+    inputPlaceholder: "Nhập mật khẩu của bạn",
+    instruction:
+      "Đặt mật khẩu cho tài khoản của bạn. Bạn cần mật khẩu này mỗi khi đăng nhập trên một thiết bị mới",
+    saveInstruction: "Vui lòng sao lưu mật khẩu",
+    submitButton: "Đặt mật khẩu",
+    title: "Tạo mật khẩu",
   },
   emailLoginScreen: {
-    title: "Đăng nhập",
     enterCodeSendTo: "Nhập mã xác nhận được gửi tới",
-    newDeviceDetected: "Bạn đang đăng nhập trên một thiết bị mới",
     enterRecoveryCode:
       "Nhập mã khôi phục mà bạn nhận được khi đăng nhập lần đầu",
+    failedToSendCode: "Gửi mã xác nhận thất bại",
     invalidCode: "Mã xác nhận không hợp lệ",
     invalidCodeOrRecoveryCode: "Mã xác nhận hoặc mã khôi phục bị sai",
-    verify: "Xác nhận",
-    failedToSendCode: "Gửi mã xác nhận thất bại",
-    sendingCode: "Đang gửi mã xác nhận",
+    newDeviceDetected: "Bạn đang đăng nhập trên một thiết bị mới",
     resendCode: "Gửi lại mã xác nhận",
+    sendingCode: "Đang gửi mã xác nhận",
+    title: "Đăng nhập",
+    verify: "Xác nhận",
   },
-  createPassword: {
-    title: "Tạo mật khẩu",
-    instruction:
-      "Đặt mật khẩu cho tài khoản của bạn. Bạn cần mật khẩu này mỗi khi đăng nhập trên một thiết bị mới",
-    saveInstruction: "Vui lòng sao lưu mật khẩu",
-    inputPlaceholder: "Nhập mật khẩu của bạn",
-    confirmation: "Tôi đã sao lưu mật khẩu",
-    submitButton: "Đặt mật khẩu",
-    failedToSetPassword: "Đặt mật khẩu thất bại",
-  },
+  emailPlaceholder: "Địa chỉ email",
+  emailRequired: "Vui lòng nhập địa chỉ email",
   enterPassword: {
-    title: "Nhập mật khẩu",
-    instruction: "Nhập mật khẩu cho tài khoản của bạn",
     inputPlaceholder: "Nhập mật khẩu của bạn",
+    instruction: "Nhập mật khẩu cho tài khoản của bạn",
     submitButton: "Xác nhân",
+    title: "Nhập mật khẩu",
     wrongPassword: "Sai mật khẩu",
   },
-  signInWithEmail: "Đăng nhập bằng email",
+  invalidEmail: "Địa chỉ email không hợp lệ",
   invalidPhone: "Số điện thoại không hợp lệ",
-  phonePlaceholder: "Số điện thoại",
-  signInWithPhone: "Đăng nhập bằng số điện thoại",
-  phoneRequired: "Vui lòng nhập số điện thoại",
-  passkey: "Passkey",
   linkWallet: "Link a Wallet",
   loginAsGuest: "Đăng nhập với tư cách khách",
+  maxAccountsExceeded:
+    "Số tài khoản vượt quá mức quy định. Vui lòng liên hệ với lập trình viên của ứng dụng này",
+  or: "Hoặc",
+  passkey: "Passkey",
+  phonePlaceholder: "Số điện thoại",
+  phoneRequired: "Vui lòng nhập số điện thoại",
+  signIn: "Đăng nhập",
+  signInWithApple: "Apple",
+  signInWithDiscord: "Discord",
+  signInWithEmail: "Đăng nhập bằng email",
+  signInWithFacebook: "Facebook",
+  signInWithGoogle: "Google",
+  signInWithPhone: "Đăng nhập bằng số điện thoại",
   signInWithWallet: "Đăng nhập bằng Wallet",
+  socialLoginScreen: {
+    failed: "Đăng nhập thất bại",
+    instruction: "Đăng nhập ở cửa sổ hiện lên",
+    retry: "Thử lại",
+    title: "Đăng nhập",
+  },
+  submitEmail: "Tiếp tục",
 } satisfies InAppWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/shared/oauthSignIn.ts b/packages/thirdweb/src/react/web/wallets/shared/oauthSignIn.ts
index 60bcab12926..9d47f3924ed 100644
--- a/packages/thirdweb/src/react/web/wallets/shared/oauthSignIn.ts
+++ b/packages/thirdweb/src/react/web/wallets/shared/oauthSignIn.ts
@@ -21,9 +21,9 @@ function getBodyTitle(authOption: InAppWalletSocialAuth) {
 function getWidthAndHeight(authOption: InAppWalletSocialAuth) {
   switch (authOption) {
     case "facebook":
-      return { width: 715, height: 555 };
+      return { height: 555, width: 715 };
     default:
-      return { width: 350, height: 500 };
+      return { height: 500, width: 350 };
   }
 }
 
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/br.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/br.ts
index a0e2bc6fe0a..542c39a7c82 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/br.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/br.ts
@@ -4,9 +4,9 @@ const smartWalletLocalePtBr: SmartWalletLocale = {
   connecting: "Conectando à Conta Inteligente",
   failedToConnect: "Falha ao conectar à Conta Inteligente",
   wrongNetworkScreen: {
-    title: "Rede Incorreta",
-    subtitle: "Sua carteira não está conectada à rede requerida",
     failedToSwitch: "Falha ao mudar de rede",
+    subtitle: "Sua carteira não está conectada à rede requerida",
+    title: "Rede Incorreta",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/de.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/de.ts
index d5635832504..f5c0472bc72 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/de.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/de.ts
@@ -4,9 +4,9 @@ const smartWalletLocalEn: SmartWalletLocale = {
   connecting: "Verbindung zum Smart Account wird hergestellt",
   failedToConnect: "Verbindung zum Smart Account fehlgeschlagen",
   wrongNetworkScreen: {
-    title: "Falsches Netzwerk",
-    subtitle: "Dein Wallet ist nicht mit dem erforderlichen Netzwerk verbunden",
     failedToSwitch: "Netzwerkwechsel fehlgeschlagen",
+    subtitle: "Dein Wallet ist nicht mit dem erforderlichen Netzwerk verbunden",
+    title: "Falsches Netzwerk",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/en.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/en.ts
index f9244bca639..77b191b1919 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/en.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/en.ts
@@ -4,9 +4,9 @@ const smartWalletLocalEn: SmartWalletLocale = {
   connecting: "Connecting to Smart Account",
   failedToConnect: "Failed to connect to Smart Account",
   wrongNetworkScreen: {
-    title: "Wrong Network",
-    subtitle: "Your wallet is not connected to the required network",
     failedToSwitch: "Failed to switch network",
+    subtitle: "Your wallet is not connected to the required network",
+    title: "Wrong Network",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/es.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/es.ts
index 93efa323402..49104080768 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/es.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/es.ts
@@ -4,9 +4,9 @@ const smartWalletLocaleEs: SmartWalletLocale = {
   connecting: "Conectando a Smart Account",
   failedToConnect: "Error al conectar con Smart Account",
   wrongNetworkScreen: {
-    title: "Red incorrecta",
-    subtitle: "Tu cartera no está conectada a la red requerida",
     failedToSwitch: "Error al cambiar de red",
+    subtitle: "Tu cartera no está conectada a la red requerida",
+    title: "Red incorrecta",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/fr.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/fr.ts
index 09525a9951b..f49369b5d12 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/fr.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/fr.ts
@@ -4,9 +4,9 @@ const smartWalletLocalEn: SmartWalletLocale = {
   connecting: "Connexion au compte intelligent",
   failedToConnect: "Échec de la connexion au compte intelligent",
   wrongNetworkScreen: {
-    title: "Mauvais réseau",
-    subtitle: "Votre portefeuille n'est pas connecté au réseau requis",
     failedToSwitch: "Échec du changement de réseau",
+    subtitle: "Votre portefeuille n'est pas connecté au réseau requis",
+    title: "Mauvais réseau",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/getSmartWalletLocale.test.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/getSmartWalletLocale.test.ts
index 21a40fa9dd0..96ced5a916d 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/getSmartWalletLocale.test.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/getSmartWalletLocale.test.ts
@@ -13,15 +13,15 @@ import tl from "./tl.js";
 import vi from "./vi.js";
 
 const locales: { locale: LocaleId; content: object }[] = [
-  { locale: "es_ES", content: es },
-  { locale: "ja_JP", content: ja },
-  { locale: "tl_PH", content: tl },
-  { locale: "vi_VN", content: vi },
-  { locale: "de_DE", content: de },
-  { locale: "ko_KR", content: kr },
-  { locale: "fr_FR", content: fr },
-  { locale: "ru_RU", content: ru },
-  { locale: "pt_BR", content: br },
+  { content: es, locale: "es_ES" },
+  { content: ja, locale: "ja_JP" },
+  { content: tl, locale: "tl_PH" },
+  { content: vi, locale: "vi_VN" },
+  { content: de, locale: "de_DE" },
+  { content: kr, locale: "ko_KR" },
+  { content: fr, locale: "fr_FR" },
+  { content: ru, locale: "ru_RU" },
+  { content: br, locale: "pt_BR" },
 ];
 
 describe("getInjectedWalletLocale", () => {
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/ja.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/ja.ts
index 65d20c5943a..0f160967a3c 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/ja.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/ja.ts
@@ -1,11 +1,12 @@
 import type { SmartWalletLocale } from "./types.js";
+
 const smartWalletLocale: SmartWalletLocale = {
   connecting: "スマートアカウントに接続中",
   failedToConnect: "スマートアカウントへの接続に失敗しました",
   wrongNetworkScreen: {
-    title: "ネットワークが違います",
-    subtitle: "ウォレットが必要なネットワークに接続されていません",
     failedToSwitch: "ネットワークの切り替えに失敗しました",
+    subtitle: "ウォレットが必要なネットワークに接続されていません",
+    title: "ネットワークが違います",
   },
 };
 export default smartWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/kr.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/kr.ts
index 2dad3a6a966..64bcba8d35b 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/kr.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/kr.ts
@@ -1,11 +1,12 @@
 import type { SmartWalletLocale } from "./types.js";
+
 const smartWalletLocale: SmartWalletLocale = {
   connecting: "스마트 계정에 연결 중",
   failedToConnect: "스마트 계정에 연결하지 못했습니다",
   wrongNetworkScreen: {
-    title: "잘못된 네트워크",
-    subtitle: "지갑이 필요한 네트워크에 연결되어 있지 않습니다",
     failedToSwitch: "네트워크 전환 실패",
+    subtitle: "지갑이 필요한 네트워크에 연결되어 있지 않습니다",
+    title: "잘못된 네트워크",
   },
 };
 export default smartWalletLocale;
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/ru.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/ru.ts
index 8d048291c13..82504875c57 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/ru.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/ru.ts
@@ -4,9 +4,9 @@ const smartWalletLocalRu: SmartWalletLocale = {
   connecting: "Подключение к смарт-аккаунту",
   failedToConnect: "Не удалось подключиться к смарт-аккаунту",
   wrongNetworkScreen: {
-    title: "Неверная сеть",
-    subtitle: "Ваш кошелек не подключен к нужной сети",
     failedToSwitch: "Не удалось сменить сеть",
+    subtitle: "Ваш кошелек не подключен к нужной сети",
+    title: "Неверная сеть",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/tl.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/tl.ts
index eadb12aa598..f59706ebffa 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/tl.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/tl.ts
@@ -4,9 +4,9 @@ const smartWalletLocaleTl: SmartWalletLocale = {
   connecting: "Kumokonekta sa Smart Account",
   failedToConnect: "Hindi nagawa ang pagkonekta sa Smart Account",
   wrongNetworkScreen: {
-    title: "Maling Network",
-    subtitle: "Hindi konektado ang iyong wallet sa kinakailangang network",
     failedToSwitch: "Hindi nagawa ang pagpapalit ng network",
+    subtitle: "Hindi konektado ang iyong wallet sa kinakailangang network",
+    title: "Maling Network",
   },
 };
 
diff --git a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/vi.ts b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/vi.ts
index cc9babe327b..2f003b125ff 100644
--- a/packages/thirdweb/src/react/web/wallets/smartWallet/locale/vi.ts
+++ b/packages/thirdweb/src/react/web/wallets/smartWallet/locale/vi.ts
@@ -4,9 +4,9 @@ const smartWalletLocalVi: SmartWalletLocale = {
   connecting: "Đang kết nối Tài Khoản Thông Minh",
   failedToConnect: "Kết nối Tài Khoản Thông Minh thất bại",
   wrongNetworkScreen: {
-    title: "Sai mạng lưới",
-    subtitle: "Vui lòng chuyển sang mạng lưới được yêu cầu",
     failedToSwitch: "Chuyển mạng lưới thất bại",
+    subtitle: "Vui lòng chuyển sang mạng lưới được yêu cầu",
+    title: "Sai mạng lưới",
   },
 };
 
diff --git a/packages/thirdweb/src/rpc/actions/eth_call.ts b/packages/thirdweb/src/rpc/actions/eth_call.ts
index dd5fb432416..904e363caa1 100644
--- a/packages/thirdweb/src/rpc/actions/eth_call.ts
+++ b/packages/thirdweb/src/rpc/actions/eth_call.ts
@@ -42,8 +42,8 @@ function encodeStateOverrides(overrides: StateOverride): RpcStateOverride {
         address,
         {
           balance: override.balance ? numberToHex(override.balance) : undefined,
-          nonce: override.nonce ? numberToHex(override.nonce) : undefined,
           code: override.code,
+          nonce: override.nonce ? numberToHex(override.nonce) : undefined,
           state: override.state,
           stateDiff: override.stateDiff,
         },
diff --git a/packages/thirdweb/src/rpc/actions/eth_getBlockByHash.ts b/packages/thirdweb/src/rpc/actions/eth_getBlockByHash.ts
index b41c2aacb6c..00339726001 100644
--- a/packages/thirdweb/src/rpc/actions/eth_getBlockByHash.ts
+++ b/packages/thirdweb/src/rpc/actions/eth_getBlockByHash.ts
@@ -1,9 +1,9 @@
 import {
   type EIP1193RequestFn,
   type EIP1474Methods,
+  formatBlock,
   type GetBlockReturnType,
   type Hash,
-  formatBlock,
 } from "viem";
 
 type GetBlockByHashParams<TIncludeTransactions extends boolean = false> = {
diff --git a/packages/thirdweb/src/rpc/actions/eth_getBlockByNumber.ts b/packages/thirdweb/src/rpc/actions/eth_getBlockByNumber.ts
index 51021914413..e87d90c4429 100644
--- a/packages/thirdweb/src/rpc/actions/eth_getBlockByNumber.ts
+++ b/packages/thirdweb/src/rpc/actions/eth_getBlockByNumber.ts
@@ -2,8 +2,8 @@ import {
   type BlockTag,
   type EIP1193RequestFn,
   type EIP1474Methods,
-  type GetBlockReturnType,
   formatBlock,
+  type GetBlockReturnType,
 } from "viem";
 import { numberToHex } from "../../utils/encoding/hex.js";
 
diff --git a/packages/thirdweb/src/rpc/actions/eth_getLogs.ts b/packages/thirdweb/src/rpc/actions/eth_getLogs.ts
index 2d5ab82298a..e1e1e322fe8 100644
--- a/packages/thirdweb/src/rpc/actions/eth_getLogs.ts
+++ b/packages/thirdweb/src/rpc/actions/eth_getLogs.ts
@@ -3,10 +3,10 @@ import {
   type BlockTag,
   type EIP1193RequestFn,
   type EIP1474Methods,
+  formatLog,
   type Hash,
   type LogTopic,
   type RpcLog,
-  formatLog,
 } from "viem";
 import { type Address, getAddress } from "../../utils/address.js";
 import { numberToHex } from "../../utils/encoding/hex.js";
@@ -79,8 +79,8 @@ export async function eth_getLogs(
       topics: LogTopic[];
       blockHash: `0x${string}`;
     } = {
-      topics,
       blockHash: params.blockHash,
+      topics,
     };
     if (params.address) {
       param.address = getAddress(params.address);
diff --git a/packages/thirdweb/src/rpc/actions/eth_getTransactionByHash.ts b/packages/thirdweb/src/rpc/actions/eth_getTransactionByHash.ts
index ec63cdc85c0..540e250e0c3 100644
--- a/packages/thirdweb/src/rpc/actions/eth_getTransactionByHash.ts
+++ b/packages/thirdweb/src/rpc/actions/eth_getTransactionByHash.ts
@@ -1,9 +1,9 @@
 import {
   type EIP1193RequestFn,
   type EIP1474Methods,
+  formatTransaction,
   type Hash,
   type Transaction,
-  formatTransaction,
 } from "viem";
 
 type GetTransactionByHashParameters = {
diff --git a/packages/thirdweb/src/rpc/actions/eth_getTransactionReceipt.ts b/packages/thirdweb/src/rpc/actions/eth_getTransactionReceipt.ts
index f0723ffe0c8..24690105aa7 100644
--- a/packages/thirdweb/src/rpc/actions/eth_getTransactionReceipt.ts
+++ b/packages/thirdweb/src/rpc/actions/eth_getTransactionReceipt.ts
@@ -1,9 +1,9 @@
 import {
   type EIP1193RequestFn,
   type EIP1474Methods,
+  formatTransactionReceipt,
   type GetTransactionReceiptParameters,
   type TransactionReceipt,
-  formatTransactionReceipt,
 } from "viem";
 
 /**
diff --git a/packages/thirdweb/src/rpc/fetch-rpc.ts b/packages/thirdweb/src/rpc/fetch-rpc.ts
index 4d5524526bc..2f2c306c8c2 100644
--- a/packages/thirdweb/src/rpc/fetch-rpc.ts
+++ b/packages/thirdweb/src/rpc/fetch-rpc.ts
@@ -60,15 +60,15 @@ export async function fetchRpc(
   options: FetchRpcOptions,
 ): Promise<RpcResponse[]> {
   const response = await getClientFetch(client)(rpcUrl, {
+    body: stringify(options.requests),
     headers: {
       ...client.config?.rpc?.fetch?.headers,
       "Content-Type": "application/json",
     },
-    body: stringify(options.requests),
+    keepalive: client.config?.rpc?.fetch?.keepalive,
     method: "POST",
     requestTimeoutMs:
       options.requestTimeoutMs ?? client.config?.rpc?.fetch?.requestTimeoutMs,
-    keepalive: client.config?.rpc?.fetch?.keepalive,
   });
 
   if (!response.ok) {
@@ -95,15 +95,15 @@ export async function fetchSingleRpc(
   options: FetchSingleRpcOptions,
 ): Promise<RpcResponse> {
   const response = await getClientFetch(client)(rpcUrl, {
+    body: stringify(options.request),
     headers: {
       ...(client.config?.rpc?.fetch?.headers || {}),
       "Content-Type": "application/json",
     },
-    body: stringify(options.request),
+    keepalive: client.config?.rpc?.fetch?.keepalive,
     method: "POST",
     requestTimeoutMs:
       options.requestTimeoutMs ?? client.config?.rpc?.fetch?.requestTimeoutMs,
-    keepalive: client.config?.rpc?.fetch?.keepalive,
   });
 
   if (!response.ok) {
diff --git a/packages/thirdweb/src/rpc/rpc.ts b/packages/thirdweb/src/rpc/rpc.ts
index fe29c18622f..b79b31b4434 100644
--- a/packages/thirdweb/src/rpc/rpc.ts
+++ b/packages/thirdweb/src/rpc/rpc.ts
@@ -1,10 +1,9 @@
 import type { EIP1193RequestFn, EIP1474Methods } from "viem";
-import type { ThirdwebClient } from "../client/client.js";
-
 import type { Chain } from "../chains/types.js";
 import { getRpcUrlForChain } from "../chains/utils.js";
+import type { ThirdwebClient } from "../client/client.js";
 import { stringify } from "../utils/json.js";
-import { type RpcRequest, fetchRpc, fetchSingleRpc } from "./fetch-rpc.js";
+import { fetchRpc, fetchSingleRpc, type RpcRequest } from "./fetch-rpc.js";
 
 const RPC_CLIENT_MAP = new WeakMap();
 
@@ -71,8 +70,8 @@ export function getRpcClient(
   const rpcClient: EIP1193RequestFn<EIP1474Methods> = (() => {
     // we can do this upfront because it cannot change later
     const rpcUrl = getRpcUrlForChain({
-      client: options.client,
       chain: options.chain,
+      client: options.client,
     });
 
     const batchSize =
@@ -223,7 +222,7 @@ export function getRpcClient(
       });
       inflightRequests.set(requestKey, promise);
       // @ts-expect-error - they *are* definitely assigned within the promise constructor
-      pendingBatch.push({ request, resolve, reject, requestKey });
+      pendingBatch.push({ reject, request, requestKey, resolve });
       if (batchSize > 1) {
         // if there is no timeout, set one
         if (!pendingBatchTimeout) {
diff --git a/packages/thirdweb/src/rpc/watchBlockNumber.test.ts b/packages/thirdweb/src/rpc/watchBlockNumber.test.ts
index ce6ffd3fb29..bdc5f4ed24b 100644
--- a/packages/thirdweb/src/rpc/watchBlockNumber.test.ts
+++ b/packages/thirdweb/src/rpc/watchBlockNumber.test.ts
@@ -18,8 +18,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
   it("should set up the watcher", () => {
     const onNewBlockNumber = vi.fn();
     const unwatch = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: baseSepolia,
+      client: TEST_CLIENT,
       onNewBlockNumber,
     });
 
@@ -31,8 +31,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
 
   it("should call the onNewBlockNumber callback", async () => {
     const unwatch = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       onNewBlockNumber,
     });
 
@@ -47,13 +47,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
 
   it("should re-use the same watcher for multiple calls", async () => {
     const unwatch = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       onNewBlockNumber,
     });
     const unwatch2 = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       onNewBlockNumber: onNewBlockNumber2,
     });
 
@@ -73,8 +73,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
 
   it("should stop polling when unsubscribed", async () => {
     const unwatch = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       onNewBlockNumber,
     });
 
@@ -95,8 +95,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
 
   it("should re-start from a fresh block when fully unsubscribed and re-subscribed", async () => {
     const unwatch = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       onNewBlockNumber,
     });
 
@@ -117,8 +117,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
     expect(onNewBlockNumber).toHaveBeenCalledTimes(0);
 
     const unwatch2 = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: baseSepolia,
+      client: TEST_CLIENT,
       onNewBlockNumber,
     });
 
@@ -136,8 +136,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
 
   it("should re-start from latestBlockNumber if provided", async () => {
     const unwatch = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       onNewBlockNumber,
     });
 
@@ -158,10 +158,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
     expect(onNewBlockNumber).toHaveBeenCalledTimes(0);
 
     const unwatch2 = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: baseSepolia,
-      onNewBlockNumber,
+      client: TEST_CLIENT,
       latestBlockNumber: lastBlockNumber,
+      onNewBlockNumber,
     });
 
     await mineBlock(ANVIL_CHAIN);
@@ -177,10 +177,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("watch block number", () => {
 
   it("should start from latestBlockNumber", async () => {
     const unwatch = watchBlockNumber({
-      client: TEST_CLIENT,
       chain: baseSepolia,
-      onNewBlockNumber,
+      client: TEST_CLIENT,
       latestBlockNumber: 9342233n,
+      onNewBlockNumber,
     });
 
     await wait(500);
diff --git a/packages/thirdweb/src/rpc/watchBlockNumber.ts b/packages/thirdweb/src/rpc/watchBlockNumber.ts
index ddc71ee039c..7c93f89b239 100644
--- a/packages/thirdweb/src/rpc/watchBlockNumber.ts
+++ b/packages/thirdweb/src/rpc/watchBlockNumber.ts
@@ -42,7 +42,7 @@ function createBlockNumberPoller(
   let lastBlockNumber: bigint | undefined;
   let lastBlockAt: number | undefined;
 
-  const rpcRequest = getRpcClient({ client, chain });
+  const rpcRequest = getRpcClient({ chain, client });
 
   /**
    * TODO: document
@@ -67,7 +67,7 @@ function createBlockNumberPoller(
           newBlockNumbers = [blockNumber];
         }
         lastBlockNumber = blockNumber;
-        const currentTime = new Date().getTime();
+        const currentTime = Date.now();
         if (lastBlockAt) {
           // if we skipped a block we need to adjust the block time down to that level
           const blockTime =
diff --git a/packages/thirdweb/src/storage/download.test.ts b/packages/thirdweb/src/storage/download.test.ts
index 74a1df4e6f4..41ba8deafe8 100644
--- a/packages/thirdweb/src/storage/download.test.ts
+++ b/packages/thirdweb/src/storage/download.test.ts
@@ -1,4 +1,4 @@
-import { http, HttpResponse } from "msw";
+import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import { handlers as storageHandlers } from "../../test/src/mocks/storage.js";
@@ -22,8 +22,8 @@ describe.skip("download", () => {
     server.use(
       http.get("https://*.ipfscdn.io/ipfs/:hash/:id", () => {
         return new HttpResponse(mockContent, {
-          status: 200,
           headers: { "Content-Type": "text/plain" },
+          status: 200,
         });
       }),
     );
@@ -42,8 +42,8 @@ describe.skip("download", () => {
     server.use(
       http.get("https://arweave.net/:id", () => {
         return new HttpResponse(mockContent, {
-          status: 200,
           headers: { "Content-Type": "text/plain" },
+          status: 200,
         });
       }),
     );
@@ -62,8 +62,8 @@ describe.skip("download", () => {
     server.use(
       http.get("https://example.com/file.txt", () => {
         return new HttpResponse(mockContent, {
-          status: 200,
           headers: { "Content-Type": "text/plain" },
+          status: 200,
         });
       }),
     );
@@ -103,8 +103,8 @@ describe.skip("download", () => {
     await expect(
       download({
         client: mockClient,
-        uri: "ipfs://QmTest1234567890TestHash/file.txt",
         requestTimeoutMs: 500,
+        uri: "ipfs://QmTest1234567890TestHash/file.txt",
       }),
     ).rejects.toThrow("timeout");
   });
diff --git a/packages/thirdweb/src/storage/download.ts b/packages/thirdweb/src/storage/download.ts
index 355a197b19f..84cfae8235d 100644
--- a/packages/thirdweb/src/storage/download.ts
+++ b/packages/thirdweb/src/storage/download.ts
@@ -74,9 +74,9 @@ export async function download(options: DownloadOptions) {
     const data = getFromMockStorage(hash);
     if (data) {
       return {
+        json: () => Promise.resolve(data),
         ok: true,
         status: 200,
-        json: () => Promise.resolve(data),
       } as Response;
     }
   }
@@ -90,8 +90,8 @@ export async function download(options: DownloadOptions) {
   }
 
   const res = await getClientFetch(options.client)(url, {
-    keepalive: options.client.config?.storage?.fetch?.keepalive,
     headers: options.client.config?.storage?.fetch?.headers,
+    keepalive: options.client.config?.storage?.fetch?.keepalive,
     requestTimeoutMs:
       options.requestTimeoutMs ??
       options.client.config?.storage?.fetch?.requestTimeoutMs ??
diff --git a/packages/thirdweb/src/storage/upload/helpers.ts b/packages/thirdweb/src/storage/upload/helpers.ts
index 37211200337..ded1e474cf3 100644
--- a/packages/thirdweb/src/storage/upload/helpers.ts
+++ b/packages/thirdweb/src/storage/upload/helpers.ts
@@ -139,8 +139,8 @@ export function buildFormData(
   }
 
   const metadata = {
-    name: "Storage SDK",
     keyvalues: { ...options?.metadata },
+    name: "Storage SDK",
   };
   form.append("pinataMetadata", JSON.stringify(metadata));
 
@@ -154,9 +154,9 @@ export function buildFormData(
   }
 
   return {
-    form,
     // encode the file names on the way out (which is what the upload backend expects)
     fileNames: fileNames.map((fName) => encodeURIComponent(fName)),
+    form,
   };
 }
 
diff --git a/packages/thirdweb/src/storage/upload/mobile.ts b/packages/thirdweb/src/storage/upload/mobile.ts
index bdd7c3cb77d..4ada88b5059 100644
--- a/packages/thirdweb/src/storage/upload/mobile.ts
+++ b/packages/thirdweb/src/storage/upload/mobile.ts
@@ -122,24 +122,24 @@ export async function uploadBatchMobile(
   // assume an array of things
 
   const metadata = {
-    name: METADATA_NAME,
     keyvalues: { ...options?.metadata },
+    name: METADATA_NAME,
   };
 
   const fetchBody = JSON.stringify({
-    metadata: metadata,
     content: data,
+    metadata: metadata,
   });
 
   try {
     const res = await getClientFetch(client)(
       `https://${getThirdwebDomains().storage}/ipfs/batch-pin-json`,
       {
-        method: "POST",
+        body: fetchBody,
         headers: {
           "Content-Type": "application/json",
         },
-        body: fetchBody,
+        method: "POST",
       },
     );
 
@@ -178,7 +178,7 @@ function buildFormData(
   >();
   const fileNames: string[] = [];
   for (let i = 0; i < files.length; i++) {
-    // biome-ignore lint/style/noNonNullAssertion: <explanation>
+    // biome-ignore lint/style/noNonNullAssertion: TODO
     const file = files[i]!;
     let fileName = "";
 
@@ -219,8 +219,8 @@ function buildFormData(
   }
 
   const metadata = {
-    name: METADATA_NAME,
     keyvalues: { ...options?.metadata },
+    name: METADATA_NAME,
   };
   form.append("pinataMetadata", JSON.stringify(metadata));
 
@@ -232,8 +232,8 @@ function buildFormData(
   );
 
   return {
-    form,
     // encode the file names on the way out (which is what the upload backend expects)
     fileNames: fileNames.map((fName) => encodeURIComponent(fName)),
+    form,
   };
 }
diff --git a/packages/thirdweb/src/storage/upload/web-node.test.ts b/packages/thirdweb/src/storage/upload/web-node.test.ts
index aab8093e961..71b3d4272c5 100644
--- a/packages/thirdweb/src/storage/upload/web-node.test.ts
+++ b/packages/thirdweb/src/storage/upload/web-node.test.ts
@@ -1,4 +1,4 @@
-import { http, HttpResponse } from "msw";
+import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import { handlers as storageHandlers } from "../../../test/src/mocks/storage.js";
diff --git a/packages/thirdweb/src/storage/upload/web-node.ts b/packages/thirdweb/src/storage/upload/web-node.ts
index b6cf900b7ef..599b045ac1a 100644
--- a/packages/thirdweb/src/storage/upload/web-node.ts
+++ b/packages/thirdweb/src/storage/upload/web-node.ts
@@ -3,7 +3,7 @@ import { getThirdwebDomains } from "../../utils/domains.js";
 import { getClientFetch } from "../../utils/fetch.js";
 import { IS_TEST } from "../../utils/process.js";
 import { addToMockStorage } from "../mock.js";
-import type { UploadOptions, UploadableFile } from "./types.js";
+import type { UploadableFile, UploadOptions } from "./types.js";
 
 export async function uploadBatch<const TFiles extends UploadableFile[]>(
   client: ThirdwebClient,
@@ -20,9 +20,9 @@ export async function uploadBatch<const TFiles extends UploadableFile[]>(
   const res = await getClientFetch(client)(
     `https://${getThirdwebDomains().storage}/ipfs/upload`,
     {
-      method: "POST",
-      headers,
       body: form,
+      headers,
+      method: "POST",
       requestTimeoutMs:
         client.config?.storage?.fetch?.requestTimeoutMs || 120000,
       // force auth token usage for storage uploads
diff --git a/packages/thirdweb/src/stories/Bridge/BridgeOrchestrator.stories.tsx b/packages/thirdweb/src/stories/Bridge/BridgeOrchestrator.stories.tsx
index af8088b7fbd..173c4b6b249 100644
--- a/packages/thirdweb/src/stories/Bridge/BridgeOrchestrator.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/BridgeOrchestrator.stories.tsx
@@ -1,5 +1,4 @@
 import type { Meta, StoryObj } from "@storybook/react";
-import {} from "../../react/core/design-system/CustomThemeProvider.js";
 import type { Theme } from "../../react/core/design-system/index.js";
 import {
   BridgeOrchestrator,
@@ -36,10 +35,30 @@ const BridgeOrchestratorWithTheme = (
 };
 
 const meta = {
-  title: "Bridge/BridgeOrchestrator",
+  args: {
+    client: storyClient,
+    onCancel: () => {},
+    onComplete: () => {},
+    onError: (error) => console.error("Bridge error:", error),
+    theme: "dark",
+    uiOptions: FUND_WALLET_UI_OPTIONS.usdcDefault,
+  },
+  argTypes: {
+    onCancel: { action: "flow cancelled" },
+    onComplete: { action: "flow completed" },
+    onError: { action: "error occurred" },
+    presetOptions: {
+      control: "object",
+      description: "Quick buy options",
+    },
+    theme: {
+      control: "select",
+      description: "Theme for the component",
+      options: ["light", "dark"],
+    },
+  },
   component: BridgeOrchestratorWithTheme,
   parameters: {
-    layout: "fullscreen",
     docs: {
       description: {
         component:
@@ -56,30 +75,10 @@ const meta = {
           "Each state can transition to the **Error** state, which provides retry functionality.",
       },
     },
+    layout: "fullscreen",
   },
   tags: ["autodocs"],
-  args: {
-    client: storyClient,
-    uiOptions: FUND_WALLET_UI_OPTIONS.usdcDefault,
-    onComplete: () => {},
-    onError: (error) => console.error("Bridge error:", error),
-    onCancel: () => {},
-    theme: "dark",
-  },
-  argTypes: {
-    theme: {
-      control: "select",
-      options: ["light", "dark"],
-      description: "Theme for the component",
-    },
-    presetOptions: {
-      control: "object",
-      description: "Quick buy options",
-    },
-    onComplete: { action: "flow completed" },
-    onError: { action: "error occurred" },
-    onCancel: { action: "flow cancelled" },
-  },
+  title: "Bridge/BridgeOrchestrator",
 } satisfies Meta<typeof BridgeOrchestratorWithTheme>;
 
 export default meta;
@@ -90,17 +89,17 @@ type Story = StoryObj<typeof meta>;
  */
 export const Light: Story = {
   args: {
-    theme: "light",
-    uiOptions: FUND_WALLET_UI_OPTIONS.usdcDefault,
-    presetOptions: undefined,
+    connectLocale: undefined,
+    connectOptions: undefined,
+    onCancel: undefined,
     onComplete: undefined,
     onError: undefined,
-    onCancel: undefined,
-    receiverAddress: undefined,
-    connectOptions: undefined,
-    connectLocale: undefined,
-    purchaseData: undefined,
     paymentLinkId: undefined,
+    presetOptions: undefined,
+    purchaseData: undefined,
+    receiverAddress: undefined,
+    theme: "light",
+    uiOptions: FUND_WALLET_UI_OPTIONS.usdcDefault,
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -112,17 +111,17 @@ export const Light: Story = {
  */
 export const Dark: Story = {
   args: {
-    theme: "dark",
-    uiOptions: FUND_WALLET_UI_OPTIONS.usdcDefault,
-    presetOptions: undefined,
+    connectLocale: undefined,
+    connectOptions: undefined,
+    onCancel: undefined,
     onComplete: undefined,
     onError: undefined,
-    onCancel: undefined,
-    receiverAddress: undefined,
-    connectOptions: undefined,
-    connectLocale: undefined,
-    purchaseData: undefined,
     paymentLinkId: undefined,
+    presetOptions: undefined,
+    purchaseData: undefined,
+    receiverAddress: undefined,
+    theme: "dark",
+    uiOptions: FUND_WALLET_UI_OPTIONS.usdcDefault,
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -134,17 +133,17 @@ export const Dark: Story = {
  */
 export const DirectPayment: Story = {
   args: {
-    theme: "dark",
-    uiOptions: DIRECT_PAYMENT_UI_OPTIONS.digitalArt,
-    presetOptions: undefined,
+    connectLocale: undefined,
+    connectOptions: undefined,
+    onCancel: undefined,
     onComplete: undefined,
     onError: undefined,
-    onCancel: undefined,
-    receiverAddress: undefined,
-    connectOptions: undefined,
-    connectLocale: undefined,
-    purchaseData: undefined,
     paymentLinkId: undefined,
+    presetOptions: undefined,
+    purchaseData: undefined,
+    receiverAddress: undefined,
+    theme: "dark",
+    uiOptions: DIRECT_PAYMENT_UI_OPTIONS.digitalArt,
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -162,17 +161,17 @@ export const DirectPayment: Story = {
  */
 export const DirectPaymentLight: Story = {
   args: {
-    theme: "light",
-    uiOptions: DIRECT_PAYMENT_UI_OPTIONS.concertTicket,
-    presetOptions: undefined,
+    connectLocale: undefined,
+    connectOptions: undefined,
+    onCancel: undefined,
     onComplete: undefined,
     onError: undefined,
-    onCancel: undefined,
-    receiverAddress: undefined,
-    connectOptions: undefined,
-    connectLocale: undefined,
-    purchaseData: undefined,
     paymentLinkId: undefined,
+    presetOptions: undefined,
+    purchaseData: undefined,
+    receiverAddress: undefined,
+    theme: "light",
+    uiOptions: DIRECT_PAYMENT_UI_OPTIONS.concertTicket,
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -190,17 +189,17 @@ export const DirectPaymentLight: Story = {
  */
 export const Transaction: Story = {
   args: {
-    theme: "dark",
-    uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
-    presetOptions: undefined,
+    connectLocale: undefined,
+    connectOptions: undefined,
+    onCancel: undefined,
     onComplete: undefined,
     onError: undefined,
-    onCancel: undefined,
-    receiverAddress: undefined,
-    connectOptions: undefined,
-    connectLocale: undefined,
-    purchaseData: undefined,
     paymentLinkId: undefined,
+    presetOptions: undefined,
+    purchaseData: undefined,
+    receiverAddress: undefined,
+    theme: "dark",
+    uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -218,17 +217,17 @@ export const Transaction: Story = {
  */
 export const TransactionLight: Story = {
   args: {
-    theme: "light",
-    uiOptions: TRANSACTION_UI_OPTIONS.erc20Transfer,
-    presetOptions: undefined,
+    connectLocale: undefined,
+    connectOptions: undefined,
+    onCancel: undefined,
     onComplete: undefined,
     onError: undefined,
-    onCancel: undefined,
-    receiverAddress: undefined,
-    connectOptions: undefined,
-    connectLocale: undefined,
-    purchaseData: undefined,
     paymentLinkId: undefined,
+    presetOptions: undefined,
+    purchaseData: undefined,
+    receiverAddress: undefined,
+    theme: "light",
+    uiOptions: TRANSACTION_UI_OPTIONS.erc20Transfer,
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -243,17 +242,17 @@ export const TransactionLight: Story = {
 
 export const CustompresetOptions: Story = {
   args: {
-    theme: "dark",
-    uiOptions: FUND_WALLET_UI_OPTIONS.ethDefault,
-    presetOptions: [1, 2, 3],
+    connectLocale: undefined,
+    connectOptions: undefined,
+    onCancel: undefined,
     onComplete: undefined,
     onError: undefined,
-    onCancel: undefined,
-    receiverAddress: undefined,
-    connectOptions: undefined,
-    connectLocale: undefined,
-    purchaseData: undefined,
     paymentLinkId: undefined,
+    presetOptions: [1, 2, 3],
+    purchaseData: undefined,
+    receiverAddress: undefined,
+    theme: "dark",
+    uiOptions: FUND_WALLET_UI_OPTIONS.ethDefault,
   },
   parameters: {
     backgrounds: { default: "dark" },
diff --git a/packages/thirdweb/src/stories/Bridge/DirectPayment.stories.tsx b/packages/thirdweb/src/stories/Bridge/DirectPayment.stories.tsx
index 1f90fc4150c..55ae734758e 100644
--- a/packages/thirdweb/src/stories/Bridge/DirectPayment.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/DirectPayment.stories.tsx
@@ -23,10 +23,29 @@ const DirectPaymentWithTheme = (props: DirectPaymentWithThemeProps) => {
 };
 
 const meta = {
-  title: "Bridge/DirectPayment",
+  args: {
+    client: storyClient,
+    onContinue: (_amount, _token, _receiverAddress) => {},
+    theme: "dark",
+    uiOptions: DIRECT_PAYMENT_UI_OPTIONS.digitalArt,
+  },
+  argTypes: {
+    onContinue: {
+      action: "continue clicked",
+      description: "Called when user continues with the payment",
+    },
+    theme: {
+      control: "select",
+      description: "Theme for the component",
+      options: ["light", "dark"],
+    },
+    uiOptions: {
+      description:
+        "UI configuration for direct payment mode including payment info and metadata",
+    },
+  },
   component: DirectPaymentWithTheme,
   parameters: {
-    layout: "centered",
     docs: {
       description: {
         component:
@@ -40,29 +59,10 @@ const meta = {
           "This component is used in the 'direct_payment' mode of BridgeOrchestrator for purchasing specific items or services. It now accepts uiOptions directly to configure payment info and metadata.",
       },
     },
+    layout: "centered",
   },
   tags: ["autodocs"],
-  args: {
-    client: storyClient,
-    uiOptions: DIRECT_PAYMENT_UI_OPTIONS.digitalArt,
-    onContinue: (_amount, _token, _receiverAddress) => {},
-    theme: "dark",
-  },
-  argTypes: {
-    theme: {
-      control: "select",
-      options: ["light", "dark"],
-      description: "Theme for the component",
-    },
-    onContinue: {
-      action: "continue clicked",
-      description: "Called when user continues with the payment",
-    },
-    uiOptions: {
-      description:
-        "UI configuration for direct payment mode including payment info and metadata",
-    },
-  },
+  title: "Bridge/DirectPayment",
 } satisfies Meta<typeof DirectPaymentWithTheme>;
 
 export default meta;
diff --git a/packages/thirdweb/src/stories/Bridge/ErrorBanner.stories.tsx b/packages/thirdweb/src/stories/Bridge/ErrorBanner.stories.tsx
index 69ce8143254..b790ba84762 100644
--- a/packages/thirdweb/src/stories/Bridge/ErrorBanner.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/ErrorBanner.stories.tsx
@@ -31,33 +31,33 @@ const ErrorBannerWithTheme = (props: ErrorBannerWithThemeProps) => {
 };
 
 const meta = {
-  title: "Bridge/ErrorBanner",
-  component: ErrorBannerWithTheme,
-  parameters: {
-    layout: "centered",
-    docs: {
-      description: {
-        component:
-          "Error banner component that displays user-friendly error messages with retry functionality and optional cancel action.",
-      },
-    },
-  },
-  tags: ["autodocs"],
   args: {
     error: mockNetworkError,
-    onRetry: () => {},
     onCancel: () => {},
+    onRetry: () => {},
     theme: "dark",
   },
   argTypes: {
+    onCancel: { action: "cancel clicked" },
+    onRetry: { action: "retry clicked" },
     theme: {
       control: "select",
-      options: ["light", "dark"],
       description: "Theme for the component",
+      options: ["light", "dark"],
     },
-    onRetry: { action: "retry clicked" },
-    onCancel: { action: "cancel clicked" },
   },
+  component: ErrorBannerWithTheme,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "Error banner component that displays user-friendly error messages with retry functionality and optional cancel action.",
+      },
+    },
+    layout: "centered",
+  },
+  tags: ["autodocs"],
+  title: "Bridge/ErrorBanner",
 } satisfies Meta<typeof ErrorBannerWithTheme>;
 
 export default meta;
@@ -83,8 +83,8 @@ export const Dark: Story = {
 
 export const NetworkError: Story = {
   args: {
-    theme: "dark",
     error: mockNetworkError,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -93,8 +93,8 @@ export const NetworkError: Story = {
 
 export const NetworkErrorLight: Story = {
   args: {
-    theme: "light",
     error: mockNetworkError,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -103,8 +103,8 @@ export const NetworkErrorLight: Story = {
 
 export const UserRejectedError: Story = {
   args: {
-    theme: "dark",
     error: mockUserRejectedError,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -113,8 +113,8 @@ export const UserRejectedError: Story = {
 
 export const UserRejectedErrorLight: Story = {
   args: {
-    theme: "light",
     error: mockUserRejectedError,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -123,8 +123,8 @@ export const UserRejectedErrorLight: Story = {
 
 export const InsufficientFundsError: Story = {
   args: {
-    theme: "dark",
     error: mockInsufficientFundsError,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -133,8 +133,8 @@ export const InsufficientFundsError: Story = {
 
 export const InsufficientFundsErrorLight: Story = {
   args: {
-    theme: "light",
     error: mockInsufficientFundsError,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -143,9 +143,9 @@ export const InsufficientFundsErrorLight: Story = {
 
 export const WithoutCancelButton: Story = {
   args: {
-    theme: "dark",
     error: mockGenericError,
     onCancel: undefined,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -154,9 +154,9 @@ export const WithoutCancelButton: Story = {
 
 export const WithoutCancelButtonLight: Story = {
   args: {
-    theme: "light",
     error: mockGenericError,
     onCancel: undefined,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -165,8 +165,8 @@ export const WithoutCancelButtonLight: Story = {
 
 export const EmptyMessage: Story = {
   args: {
-    theme: "dark",
     error: new Error(""),
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -175,8 +175,8 @@ export const EmptyMessage: Story = {
 
 export const EmptyMessageLight: Story = {
   args: {
-    theme: "light",
     error: new Error(""),
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
diff --git a/packages/thirdweb/src/stories/Bridge/FundWallet.stories.tsx b/packages/thirdweb/src/stories/Bridge/FundWallet.stories.tsx
index 224e30cf87a..050d4982246 100644
--- a/packages/thirdweb/src/stories/Bridge/FundWallet.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/FundWallet.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import type { Theme } from "../../react/core/design-system/index.js";
-import { FundWallet } from "../../react/web/ui/Bridge/FundWallet.js";
 import type { FundWalletProps } from "../../react/web/ui/Bridge/FundWallet.js";
+import { FundWallet } from "../../react/web/ui/Bridge/FundWallet.js";
 import { ModalThemeWrapper, storyClient } from "../utils.js";
 import { FUND_WALLET_UI_OPTIONS, RECEIVER_ADDRESSES } from "./fixtures.js";
 
@@ -21,48 +21,48 @@ const FundWalletWithTheme = (props: FundWalletWithThemeProps) => {
 };
 
 const meta = {
-  title: "Bridge/FundWallet",
-  component: FundWalletWithTheme,
-  parameters: {
-    layout: "centered",
-    docs: {
-      description: {
-        component:
-          "FundWallet component allows users to specify the amount they want to add to their wallet. This is the first screen in the fund_wallet flow before method selection.\n\n" +
-          "## Features\n" +
-          "- **Token Selection**: Choose from different tokens (ETH, USDC, UNI)\n" +
-          "- **Amount Input**: Enter custom amount or use quick options\n" +
-          "- **Receiver Address**: Optional receiver address (defaults to connected wallet)\n" +
-          "- **Quick Options**: Preset amounts for faster selection\n" +
-          "- **Theme Support**: Works with both light and dark themes\n\n" +
-          "This component now accepts uiOptions directly to configure the destination token, initial amount, and quick options.",
-      },
-    },
-  },
-  tags: ["autodocs"],
   args: {
-    uiOptions: FUND_WALLET_UI_OPTIONS.ethDefault,
     client: storyClient,
     onContinue: (amount, token, receiverAddress) => {
       alert(`Continue with ${amount} ${token.symbol} to ${receiverAddress}`);
     },
     receiverAddress: RECEIVER_ADDRESSES.primary,
     theme: "dark",
+    uiOptions: FUND_WALLET_UI_OPTIONS.ethDefault,
   },
   argTypes: {
+    onContinue: { action: "continue clicked" },
+    receiverAddress: {
+      description: "Optional receiver address (defaults to connected wallet)",
+    },
     theme: {
       control: "select",
-      options: ["light", "dark"],
       description: "Theme for the component",
+      options: ["light", "dark"],
     },
-    onContinue: { action: "continue clicked" },
     uiOptions: {
       description: "UI configuration for fund wallet mode",
     },
-    receiverAddress: {
-      description: "Optional receiver address (defaults to connected wallet)",
+  },
+  component: FundWalletWithTheme,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "FundWallet component allows users to specify the amount they want to add to their wallet. This is the first screen in the fund_wallet flow before method selection.\n\n" +
+          "## Features\n" +
+          "- **Token Selection**: Choose from different tokens (ETH, USDC, UNI)\n" +
+          "- **Amount Input**: Enter custom amount or use quick options\n" +
+          "- **Receiver Address**: Optional receiver address (defaults to connected wallet)\n" +
+          "- **Quick Options**: Preset amounts for faster selection\n" +
+          "- **Theme Support**: Works with both light and dark themes\n\n" +
+          "This component now accepts uiOptions directly to configure the destination token, initial amount, and quick options.",
+      },
     },
+    layout: "centered",
   },
+  tags: ["autodocs"],
+  title: "Bridge/FundWallet",
 } satisfies Meta<typeof FundWalletWithTheme>;
 
 export default meta;
@@ -70,9 +70,9 @@ type Story = StoryObj<typeof meta>;
 
 export const Light: Story = {
   args: {
+    receiverAddress: undefined,
     theme: "light",
     uiOptions: FUND_WALLET_UI_OPTIONS.ethDefault,
-    receiverAddress: undefined,
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -86,9 +86,9 @@ export const Light: Story = {
 
 export const Dark: Story = {
   args: {
+    receiverAddress: undefined,
     theme: "dark",
     uiOptions: FUND_WALLET_UI_OPTIONS.ethDefault,
-    receiverAddress: undefined,
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -102,9 +102,9 @@ export const Dark: Story = {
 
 export const WithInitialAmount: Story = {
   args: {
+    receiverAddress: RECEIVER_ADDRESSES.secondary,
     theme: "dark",
     uiOptions: FUND_WALLET_UI_OPTIONS.ethWithAmount,
-    receiverAddress: RECEIVER_ADDRESSES.secondary,
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -119,9 +119,9 @@ export const WithInitialAmount: Story = {
 
 export const WithInitialAmountLight: Story = {
   args: {
+    receiverAddress: RECEIVER_ADDRESSES.secondary,
     theme: "light",
     uiOptions: FUND_WALLET_UI_OPTIONS.ethWithAmount,
-    receiverAddress: RECEIVER_ADDRESSES.secondary,
   },
   parameters: {
     backgrounds: { default: "light" },
diff --git a/packages/thirdweb/src/stories/Bridge/PaymentDetails.stories.tsx b/packages/thirdweb/src/stories/Bridge/PaymentDetails.stories.tsx
index aeb9e3632e5..f95893cae68 100644
--- a/packages/thirdweb/src/stories/Bridge/PaymentDetails.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/PaymentDetails.stories.tsx
@@ -8,58 +8,58 @@ import {
 import { stringify } from "../../utils/json.js";
 import { ModalThemeWrapper, storyClient } from "../utils.js";
 import {
-  DIRECT_PAYMENT_UI_OPTIONS,
-  STORY_MOCK_WALLET,
-  TRANSACTION_UI_OPTIONS,
-  USDC,
   buyWithApprovalQuote,
   complexBuyQuote,
+  DIRECT_PAYMENT_UI_OPTIONS,
   longTextBuyQuote,
   onrampWithSwapsQuote,
+  STORY_MOCK_WALLET,
   simpleBuyQuote,
   simpleOnrampQuote,
+  TRANSACTION_UI_OPTIONS,
+  USDC,
 } from "./fixtures.js";
 
 const fiatPaymentMethod: PaymentMethod = {
-  type: "fiat",
   currency: "USD",
   onramp: "coinbase",
   payerWallet: STORY_MOCK_WALLET,
+  type: "fiat",
 };
 
 const cryptoPaymentMethod: PaymentMethod = JSON.parse(
   stringify({
-    type: "wallet",
-    payerWallet: STORY_MOCK_WALLET,
     balance: 100000000n,
     originToken: {
-      chainId: 1,
       address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      name: "USD Coin",
-      symbol: "USDC",
+      chainId: 1,
       decimals: 6,
-      priceUsd: 1.0,
       iconUri:
         "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+      name: "USD Coin",
+      priceUsd: 1.0,
+      symbol: "USDC",
     },
+    payerWallet: STORY_MOCK_WALLET,
+    type: "wallet",
   }),
 );
 
 const ethCryptoPaymentMethod: PaymentMethod = JSON.parse(
   stringify({
-    type: "wallet",
-    payerWallet: STORY_MOCK_WALLET,
     balance: 1000000000000000000n,
     originToken: {
-      chainId: 1,
       address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      name: "Ethereum",
-      symbol: "ETH",
+      chainId: 1,
       decimals: 18,
-      priceUsd: 2500.0,
       iconUri:
         "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+      name: "Ethereum",
+      priceUsd: 2500.0,
+      symbol: "ETH",
     },
+    payerWallet: STORY_MOCK_WALLET,
+    type: "wallet",
   }),
 );
 
@@ -79,39 +79,39 @@ const PaymentDetailsWithTheme = (props: PaymentDetailsWithThemeProps) => {
 };
 
 const meta = {
-  title: "Bridge/PaymentDetails",
-  component: PaymentDetailsWithTheme,
-  parameters: {
-    layout: "centered",
-    docs: {
-      description: {
-        component:
-          "Route preview screen that displays prepared quote details, fees, estimated time, and transaction steps for user confirmation.",
-      },
-    },
-  },
-  tags: ["autodocs"],
   args: {
-    preparedQuote: simpleOnrampQuote,
-    onConfirm: () => {},
     onBack: () => {},
+    onConfirm: () => {},
     onError: (error) => console.error("Error:", error),
+    preparedQuote: simpleOnrampQuote,
     theme: "dark",
     uiOptions: {
-      mode: "fund_wallet",
       destinationToken: USDC,
+      mode: "fund_wallet",
     },
   },
   argTypes: {
+    onBack: { action: "back clicked" },
+    onConfirm: { action: "route confirmed" },
+    onError: { action: "error occurred" },
     theme: {
       control: "select",
-      options: ["light", "dark"],
       description: "Theme for the component",
+      options: ["light", "dark"],
     },
-    onConfirm: { action: "route confirmed" },
-    onBack: { action: "back clicked" },
-    onError: { action: "error occurred" },
   },
+  component: PaymentDetailsWithTheme,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "Route preview screen that displays prepared quote details, fees, estimated time, and transaction steps for user confirmation.",
+      },
+    },
+    layout: "centered",
+  },
+  tags: ["autodocs"],
+  title: "Bridge/PaymentDetails",
 } satisfies Meta<typeof PaymentDetailsWithTheme>;
 
 export default meta;
@@ -119,10 +119,10 @@ type Story = StoryObj<typeof meta>;
 
 export const OnrampSimple: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleOnrampQuote,
-    paymentMethod: fiatPaymentMethod,
     client: storyClient,
+    paymentMethod: fiatPaymentMethod,
+    preparedQuote: simpleOnrampQuote,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -137,10 +137,10 @@ export const OnrampSimple: Story = {
 
 export const OnrampSimpleLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleOnrampQuote,
-    paymentMethod: fiatPaymentMethod,
     client: storyClient,
+    paymentMethod: fiatPaymentMethod,
+    preparedQuote: simpleOnrampQuote,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -154,10 +154,10 @@ export const OnrampSimpleLight: Story = {
 
 export const OnrampSimpleDirectPayment: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleOnrampQuote,
-    paymentMethod: fiatPaymentMethod,
     client: storyClient,
+    paymentMethod: fiatPaymentMethod,
+    preparedQuote: simpleOnrampQuote,
+    theme: "dark",
     uiOptions: DIRECT_PAYMENT_UI_OPTIONS.credits,
   },
   parameters: {
@@ -173,10 +173,10 @@ export const OnrampSimpleDirectPayment: Story = {
 
 export const OnrampSimpleLightDirectPayment: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleOnrampQuote,
-    paymentMethod: fiatPaymentMethod,
     client: storyClient,
+    paymentMethod: fiatPaymentMethod,
+    preparedQuote: simpleOnrampQuote,
+    theme: "light",
     uiOptions: DIRECT_PAYMENT_UI_OPTIONS.concertTicket,
   },
   parameters: {
@@ -191,10 +191,10 @@ export const OnrampSimpleLightDirectPayment: Story = {
 
 export const OnrampWithSwaps: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: onrampWithSwapsQuote,
-    paymentMethod: fiatPaymentMethod,
     client: storyClient,
+    paymentMethod: fiatPaymentMethod,
+    preparedQuote: onrampWithSwapsQuote,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -209,10 +209,10 @@ export const OnrampWithSwaps: Story = {
 
 export const OnrampWithSwapsLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: onrampWithSwapsQuote,
-    paymentMethod: fiatPaymentMethod,
     client: storyClient,
+    paymentMethod: fiatPaymentMethod,
+    preparedQuote: onrampWithSwapsQuote,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -226,10 +226,10 @@ export const OnrampWithSwapsLight: Story = {
 
 export const BuySimple: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -244,10 +244,10 @@ export const BuySimple: Story = {
 
 export const BuySimpleLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -261,10 +261,10 @@ export const BuySimpleLight: Story = {
 
 export const BuySimpleDirectPayment: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "dark",
     uiOptions: DIRECT_PAYMENT_UI_OPTIONS.digitalArt,
   },
   parameters: {
@@ -280,10 +280,10 @@ export const BuySimpleDirectPayment: Story = {
 
 export const BuySimpleLightDirectPayment: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "light",
     uiOptions: DIRECT_PAYMENT_UI_OPTIONS.subscription,
   },
   parameters: {
@@ -298,10 +298,10 @@ export const BuySimpleLightDirectPayment: Story = {
 
 export const BuyWithLongText: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: longTextBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: longTextBuyQuote,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -315,10 +315,10 @@ export const BuyWithLongText: Story = {
 
 export const BuyWithApproval: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: buyWithApprovalQuote,
-    paymentMethod: cryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: cryptoPaymentMethod,
+    preparedQuote: buyWithApprovalQuote,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -333,10 +333,10 @@ export const BuyWithApproval: Story = {
 
 export const BuyWithApprovalLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: buyWithApprovalQuote,
-    paymentMethod: cryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: cryptoPaymentMethod,
+    preparedQuote: buyWithApprovalQuote,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -350,10 +350,10 @@ export const BuyWithApprovalLight: Story = {
 
 export const BuyComplex: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: complexBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: complexBuyQuote,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -368,10 +368,10 @@ export const BuyComplex: Story = {
 
 export const BuyComplexLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: complexBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: complexBuyQuote,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -388,10 +388,10 @@ export const BuyComplexLight: Story = {
 
 export const TransactionEthTransfer: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "dark",
     uiOptions: TRANSACTION_UI_OPTIONS.ethTransfer,
   },
   parameters: {
@@ -407,10 +407,10 @@ export const TransactionEthTransfer: Story = {
 
 export const TransactionEthTransferLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "light",
     uiOptions: TRANSACTION_UI_OPTIONS.ethTransfer,
   },
   parameters: {
@@ -426,10 +426,10 @@ export const TransactionEthTransferLight: Story = {
 
 export const TransactionERC20Transfer: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: cryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: cryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "dark",
     uiOptions: TRANSACTION_UI_OPTIONS.erc20Transfer,
   },
   parameters: {
@@ -445,10 +445,10 @@ export const TransactionERC20Transfer: Story = {
 
 export const TransactionERC20TransferLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: cryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: cryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "light",
     uiOptions: TRANSACTION_UI_OPTIONS.erc20Transfer,
   },
   parameters: {
@@ -464,10 +464,10 @@ export const TransactionERC20TransferLight: Story = {
 
 export const TransactionContractInteraction: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "dark",
     uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
   },
   parameters: {
@@ -483,10 +483,10 @@ export const TransactionContractInteraction: Story = {
 
 export const TransactionContractInteractionLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleBuyQuote,
-    paymentMethod: ethCryptoPaymentMethod,
     client: storyClient,
+    paymentMethod: ethCryptoPaymentMethod,
+    preparedQuote: simpleBuyQuote,
+    theme: "light",
     uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
   },
   parameters: {
diff --git a/packages/thirdweb/src/stories/Bridge/PaymentSelection.stories.tsx b/packages/thirdweb/src/stories/Bridge/PaymentSelection.stories.tsx
index 8126617b63a..f43f242c763 100644
--- a/packages/thirdweb/src/stories/Bridge/PaymentSelection.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/PaymentSelection.stories.tsx
@@ -24,59 +24,59 @@ const PaymentSelectionWithTheme = (props: PaymentSelectionWithThemeProps) => {
 };
 
 const meta = {
-  title: "Bridge/PaymentSelection",
-  component: PaymentSelectionWithTheme,
-  parameters: {
-    layout: "centered",
-    docs: {
-      description: {
-        component:
-          "Payment method selection screen with a 2-step flow:\n\n" +
-          "**Step 1:** Choose payment method - shows connected wallets, connect wallet option, and pay with fiat option\n\n" +
-          "**Step 2a:** If wallet selected - shows available origin tokens for bridging to the destination token (fetches real routes data from the Bridge API)\n\n" +
-          "**Step 2b:** If fiat selected - shows onramp provider options (Coinbase, Stripe, Transak)\n\n" +
-          "The component intelligently manages wallet context and provides proper error handling for each step.",
-      },
-    },
-  },
-  tags: ["autodocs"],
   args: {
-    destinationToken: USDC,
     client: storyClient,
-    onPaymentMethodSelected: (_paymentMethod) => {},
+    connectLocale: en,
+    destinationAmount: "1",
+    destinationToken: USDC,
     onError: (error) => console.error("Error:", error),
+    onPaymentMethodSelected: (_paymentMethod) => {},
     theme: "dark",
-    destinationAmount: "1",
-    connectLocale: en,
   },
   argTypes: {
-    theme: {
-      control: "select",
-      options: ["light", "dark"],
-      description: "Theme for the component",
-    },
-    destinationToken: {
-      description: "The target token to bridge to",
+    connectLocale: {
+      description: "Locale for connecting wallets",
     },
     destinationAmount: {
       description: "Amount of destination token to bridge",
     },
-    onPaymentMethodSelected: {
-      action: "payment method selected",
-      description: "Called when user selects a wallet token or fiat provider",
+    destinationToken: {
+      description: "The target token to bridge to",
+    },
+    onBack: {
+      action: "back clicked",
+      description: "Called when user wants to go back (only shown in Step 1)",
     },
     onError: {
       action: "error occurred",
       description: "Called when an error occurs during the flow",
     },
-    onBack: {
-      action: "back clicked",
-      description: "Called when user wants to go back (only shown in Step 1)",
+    onPaymentMethodSelected: {
+      action: "payment method selected",
+      description: "Called when user selects a wallet token or fiat provider",
     },
-    connectLocale: {
-      description: "Locale for connecting wallets",
+    theme: {
+      control: "select",
+      description: "Theme for the component",
+      options: ["light", "dark"],
     },
   },
+  component: PaymentSelectionWithTheme,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "Payment method selection screen with a 2-step flow:\n\n" +
+          "**Step 1:** Choose payment method - shows connected wallets, connect wallet option, and pay with fiat option\n\n" +
+          "**Step 2a:** If wallet selected - shows available origin tokens for bridging to the destination token (fetches real routes data from the Bridge API)\n\n" +
+          "**Step 2b:** If fiat selected - shows onramp provider options (Coinbase, Stripe, Transak)\n\n" +
+          "The component intelligently manages wallet context and provides proper error handling for each step.",
+      },
+    },
+    layout: "centered",
+  },
+  tags: ["autodocs"],
+  title: "Bridge/PaymentSelection",
 } satisfies Meta<typeof PaymentSelectionWithTheme>;
 
 export default meta;
@@ -114,8 +114,8 @@ export const Dark: Story = {
 
 export const WithBackButton: Story = {
   args: {
-    theme: "dark",
     onBack: () => {},
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -130,8 +130,8 @@ export const WithBackButton: Story = {
 
 export const WithBackButtonLight: Story = {
   args: {
-    theme: "light",
     onBack: () => {},
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -146,8 +146,8 @@ export const WithBackButtonLight: Story = {
 
 export const DifferentDestinationToken: Story = {
   args: {
-    theme: "dark",
     destinationToken: UNI,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -162,8 +162,8 @@ export const DifferentDestinationToken: Story = {
 
 export const LargeAmount: Story = {
   args: {
-    theme: "dark",
     destinationAmount: "1000",
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
diff --git a/packages/thirdweb/src/stories/Bridge/StepRunner.stories.tsx b/packages/thirdweb/src/stories/Bridge/StepRunner.stories.tsx
index b23cedbd0ba..6f6fc34812f 100644
--- a/packages/thirdweb/src/stories/Bridge/StepRunner.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/StepRunner.stories.tsx
@@ -38,10 +38,27 @@ const StepRunnerWithTheme = (props: StepRunnerWithThemeProps) => {
 };
 
 const meta = {
-  title: "Bridge/StepRunner",
+  args: {
+    client: storyClient,
+    onCancel: () => {},
+    onComplete: (_completedStatuses: CompletedStatusResult[]) => {},
+    onError: (error: Error) => console.error("Error:", error),
+    theme: "dark",
+    wallet: STORY_MOCK_WALLET,
+    windowAdapter: mockWindowAdapter,
+  },
+  argTypes: {
+    onCancel: { action: "execution cancelled" },
+    onComplete: { action: "execution completed" },
+    onError: { action: "error occurred" },
+    theme: {
+      control: "select",
+      description: "Theme for the component",
+      options: ["light", "dark"],
+    },
+  },
   component: StepRunnerWithTheme,
   parameters: {
-    layout: "centered",
     docs: {
       description: {
         component:
@@ -62,27 +79,10 @@ const meta = {
           "This component is typically used within the BridgeOrchestrator after route preparation.",
       },
     },
+    layout: "centered",
   },
   tags: ["autodocs"],
-  args: {
-    wallet: STORY_MOCK_WALLET,
-    client: storyClient,
-    windowAdapter: mockWindowAdapter,
-    onComplete: (_completedStatuses: CompletedStatusResult[]) => {},
-    onError: (error: Error) => console.error("Error:", error),
-    onCancel: () => {},
-    theme: "dark",
-  },
-  argTypes: {
-    theme: {
-      control: "select",
-      options: ["light", "dark"],
-      description: "Theme for the component",
-    },
-    onComplete: { action: "execution completed" },
-    onError: { action: "error occurred" },
-    onCancel: { action: "execution cancelled" },
-  },
+  title: "Bridge/StepRunner",
 } satisfies Meta<typeof StepRunnerWithTheme>;
 
 export default meta;
@@ -90,8 +90,8 @@ type Story = StoryObj<typeof meta>;
 
 export const Light: Story = {
   args: {
-    theme: "light",
     request: simpleBuyRequest,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -100,8 +100,8 @@ export const Light: Story = {
 
 export const Dark: Story = {
   args: {
-    theme: "dark",
     request: simpleBuyRequest,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
diff --git a/packages/thirdweb/src/stories/Bridge/SuccessScreen.stories.tsx b/packages/thirdweb/src/stories/Bridge/SuccessScreen.stories.tsx
index 1d11e8d3161..dc2e24bb8a7 100644
--- a/packages/thirdweb/src/stories/Bridge/SuccessScreen.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/SuccessScreen.stories.tsx
@@ -10,41 +10,40 @@ import {
 import { ModalThemeWrapper } from "../utils.js";
 import {
   FUND_WALLET_UI_OPTIONS,
-  TRANSACTION_UI_OPTIONS,
   simpleBuyQuote,
   simpleOnrampQuote,
+  TRANSACTION_UI_OPTIONS,
 } from "./fixtures.js";
 
 const mockBuyCompletedStatuses: CompletedStatusResult[] = JSON.parse(
   stringify([
     {
-      type: "buy",
-      status: "COMPLETED",
-      paymentId: "payment-12345",
-      originAmount: 1000000000000000000n,
       destinationAmount: 100000000n,
-      originChainId: 1,
       destinationChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      destinationToken: {
+        address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+        chainId: 1,
+        decimals: 6,
+        name: "USD Coin",
+        priceUsd: 1,
+        symbol: "USDC",
+      },
       destinationTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      originAmount: 1000000000000000000n,
+      originChainId: 1,
       originToken: {
-        chainId: 1,
         address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-        symbol: "ETH",
-        name: "Ethereum",
+        chainId: 1,
         decimals: 18,
+        name: "Ethereum",
         priceUsd: 2500,
+        symbol: "ETH",
       },
-      destinationToken: {
-        chainId: 1,
-        address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        symbol: "USDC",
-        name: "USD Coin",
-        decimals: 6,
-        priceUsd: 1,
-      },
-      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      paymentId: "payment-12345",
       receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+      status: "COMPLETED",
       transactions: [
         {
           chainId: 1,
@@ -52,6 +51,7 @@ const mockBuyCompletedStatuses: CompletedStatusResult[] = JSON.parse(
             "0x1234567890abcdef1234567890abcdef12345678901234567890abcdef123456",
         },
       ],
+      type: "buy",
     },
   ]),
 );
@@ -59,7 +59,9 @@ const mockBuyCompletedStatuses: CompletedStatusResult[] = JSON.parse(
 const mockOnrampCompletedStatuses: CompletedStatusResult[] = JSON.parse(
   stringify([
     {
-      type: "onramp",
+      purchaseData: {
+        orderId: "stripe-order-abc123",
+      },
       status: "COMPLETED",
       transactions: [
         {
@@ -68,9 +70,7 @@ const mockOnrampCompletedStatuses: CompletedStatusResult[] = JSON.parse(
             "0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
         },
       ],
-      purchaseData: {
-        orderId: "stripe-order-abc123",
-      },
+      type: "onramp",
     },
   ]),
 );
@@ -91,34 +91,34 @@ const SuccessScreenWithTheme = (props: SuccessScreenWithThemeProps) => {
 };
 
 const meta = {
-  title: "Bridge/SuccessScreen",
-  component: SuccessScreenWithTheme,
-  parameters: {
-    layout: "centered",
-    docs: {
-      description: {
-        component:
-          "Success screen that displays completion confirmation with transaction summary, payment details, and action buttons for next steps. Includes animated success icon and detailed transaction view.",
-      },
-    },
-  },
-  tags: ["autodocs"],
   args: {
-    preparedQuote: simpleBuyQuote,
     completedStatuses: mockBuyCompletedStatuses,
     onDone: () => {},
+    preparedQuote: simpleBuyQuote,
     theme: "dark",
-    windowAdapter: webWindowAdapter,
     uiOptions: FUND_WALLET_UI_OPTIONS.ethDefault,
+    windowAdapter: webWindowAdapter,
   },
   argTypes: {
+    onDone: { action: "success screen closed" },
     theme: {
       control: "select",
-      options: ["light", "dark"],
       description: "Theme for the component",
+      options: ["light", "dark"],
     },
-    onDone: { action: "success screen closed" },
   },
+  component: SuccessScreenWithTheme,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "Success screen that displays completion confirmation with transaction summary, payment details, and action buttons for next steps. Includes animated success icon and detailed transaction view.",
+      },
+    },
+    layout: "centered",
+  },
+  tags: ["autodocs"],
+  title: "Bridge/SuccessScreen",
 } satisfies Meta<typeof SuccessScreenWithTheme>;
 
 export default meta;
@@ -144,9 +144,9 @@ export const DefaultLight: Story = {
 
 export const OnrampPayment: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleOnrampQuote,
     completedStatuses: mockOnrampCompletedStatuses,
+    preparedQuote: simpleOnrampQuote,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -161,9 +161,9 @@ export const OnrampPayment: Story = {
 
 export const OnrampPaymentLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleOnrampQuote,
     completedStatuses: mockOnrampCompletedStatuses,
+    preparedQuote: simpleOnrampQuote,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -172,12 +172,12 @@ export const OnrampPaymentLight: Story = {
 
 export const ComplexPayment: Story = {
   args: {
-    theme: "dark",
-    preparedQuote: simpleOnrampQuote,
     completedStatuses: [
       ...mockOnrampCompletedStatuses,
       ...mockBuyCompletedStatuses,
     ],
+    preparedQuote: simpleOnrampQuote,
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -192,12 +192,12 @@ export const ComplexPayment: Story = {
 
 export const ComplexPaymentLight: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleOnrampQuote,
     completedStatuses: [
       ...mockOnrampCompletedStatuses,
       ...mockBuyCompletedStatuses,
     ],
+    preparedQuote: simpleOnrampQuote,
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -206,9 +206,9 @@ export const ComplexPaymentLight: Story = {
 
 export const TransactionPayment: Story = {
   args: {
-    theme: "light",
-    preparedQuote: simpleBuyQuote,
     completedStatuses: mockBuyCompletedStatuses,
+    preparedQuote: simpleBuyQuote,
+    theme: "light",
     uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
   },
   parameters: {
diff --git a/packages/thirdweb/src/stories/Bridge/TransactionPayment.stories.tsx b/packages/thirdweb/src/stories/Bridge/TransactionPayment.stories.tsx
index 0a8deb13b92..fae6654db70 100644
--- a/packages/thirdweb/src/stories/Bridge/TransactionPayment.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/TransactionPayment.stories.tsx
@@ -27,10 +27,29 @@ const TransactionPaymentWithTheme = (
 };
 
 const meta = {
-  title: "Bridge/TransactionPayment",
+  args: {
+    client: storyClient,
+    onContinue: (_amount, _token, _receiverAddress) => {},
+    theme: "dark",
+    uiOptions: TRANSACTION_UI_OPTIONS.ethTransfer,
+  },
+  argTypes: {
+    onContinue: {
+      action: "continue clicked",
+      description: "Called when user continues with the transaction",
+    },
+    theme: {
+      control: "select",
+      description: "Theme for the component",
+      options: ["light", "dark"],
+    },
+    uiOptions: {
+      description:
+        "UI configuration for transaction mode including prepared transaction",
+    },
+  },
   component: TransactionPaymentWithTheme,
   parameters: {
-    layout: "centered",
     docs: {
       description: {
         component:
@@ -45,29 +64,10 @@ const meta = {
           "This component now accepts uiOptions directly to configure the transaction and metadata. Supports both native token and ERC20 token transactions with proper function name extraction.",
       },
     },
+    layout: "centered",
   },
   tags: ["autodocs"],
-  args: {
-    uiOptions: TRANSACTION_UI_OPTIONS.ethTransfer,
-    client: storyClient,
-    onContinue: (_amount, _token, _receiverAddress) => {},
-    theme: "dark",
-  },
-  argTypes: {
-    theme: {
-      control: "select",
-      options: ["light", "dark"],
-      description: "Theme for the component",
-    },
-    onContinue: {
-      action: "continue clicked",
-      description: "Called when user continues with the transaction",
-    },
-    uiOptions: {
-      description:
-        "UI configuration for transaction mode including prepared transaction",
-    },
-  },
+  title: "Bridge/TransactionPayment",
 } satisfies Meta<typeof TransactionPaymentWithTheme>;
 
 export default meta;
@@ -75,8 +75,8 @@ type Story = StoryObj<typeof meta>;
 
 export const EthereumTransfer: Story = {
   args: {
-    uiOptions: TRANSACTION_UI_OPTIONS.ethTransfer,
     theme: "dark",
+    uiOptions: TRANSACTION_UI_OPTIONS.ethTransfer,
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -91,8 +91,8 @@ export const EthereumTransfer: Story = {
 
 export const EthereumTransferLight: Story = {
   args: {
-    uiOptions: TRANSACTION_UI_OPTIONS.ethTransfer,
     theme: "light",
+    uiOptions: TRANSACTION_UI_OPTIONS.ethTransfer,
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -107,8 +107,8 @@ export const EthereumTransferLight: Story = {
 
 export const ERC20TokenTransfer: Story = {
   args: {
-    uiOptions: TRANSACTION_UI_OPTIONS.erc20Transfer,
     theme: "dark",
+    uiOptions: TRANSACTION_UI_OPTIONS.erc20Transfer,
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -123,8 +123,8 @@ export const ERC20TokenTransfer: Story = {
 
 export const ERC20TokenTransferLight: Story = {
   args: {
-    uiOptions: TRANSACTION_UI_OPTIONS.erc20Transfer,
     theme: "light",
+    uiOptions: TRANSACTION_UI_OPTIONS.erc20Transfer,
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -139,8 +139,8 @@ export const ERC20TokenTransferLight: Story = {
 
 export const ContractInteraction: Story = {
   args: {
-    uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
     theme: "dark",
+    uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -155,8 +155,8 @@ export const ContractInteraction: Story = {
 
 export const ContractInteractionLight: Story = {
   args: {
-    uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
     theme: "light",
+    uiOptions: TRANSACTION_UI_OPTIONS.contractInteraction,
   },
   parameters: {
     backgrounds: { default: "light" },
diff --git a/packages/thirdweb/src/stories/Bridge/UnsupportedTokenScreen.stories.tsx b/packages/thirdweb/src/stories/Bridge/UnsupportedTokenScreen.stories.tsx
index 71dc490b325..15989042387 100644
--- a/packages/thirdweb/src/stories/Bridge/UnsupportedTokenScreen.stories.tsx
+++ b/packages/thirdweb/src/stories/Bridge/UnsupportedTokenScreen.stories.tsx
@@ -26,18 +26,6 @@ const UnsupportedTokenScreenWithTheme = (
 };
 
 const meta = {
-  title: "Bridge/UnsupportedTokenScreen",
-  component: UnsupportedTokenScreenWithTheme,
-  parameters: {
-    layout: "centered",
-    docs: {
-      description: {
-        component:
-          "Screen displayed when a token is being indexed or when using an unsupported testnet. Shows loading state for indexing tokens or error state for testnets.",
-      },
-    },
-  },
-  tags: ["autodocs"],
   args: {
     chain: defineChain(1), // Ethereum mainnet
     theme: "dark",
@@ -45,10 +33,22 @@ const meta = {
   argTypes: {
     theme: {
       control: "select",
-      options: ["light", "dark"],
       description: "Theme for the component",
+      options: ["light", "dark"],
     },
   },
+  component: UnsupportedTokenScreenWithTheme,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "Screen displayed when a token is being indexed or when using an unsupported testnet. Shows loading state for indexing tokens or error state for testnets.",
+      },
+    },
+    layout: "centered",
+  },
+  tags: ["autodocs"],
+  title: "Bridge/UnsupportedTokenScreen",
 } satisfies Meta<typeof UnsupportedTokenScreenWithTheme>;
 
 export default meta;
@@ -56,8 +56,8 @@ type Story = StoryObj<typeof meta>;
 
 export const TokenNotSupported: Story = {
   args: {
-    theme: "dark",
-    chain: defineChain(1), // Ethereum mainnet - will show indexing spinner
+    chain: defineChain(1),
+    theme: "dark", // Ethereum mainnet - will show indexing spinner
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -72,8 +72,8 @@ export const TokenNotSupported: Story = {
 
 export const TokenNotSupportedLight: Story = {
   args: {
-    theme: "light",
-    chain: defineChain(1), // Ethereum mainnet - will show indexing spinner
+    chain: defineChain(1),
+    theme: "light", // Ethereum mainnet - will show indexing spinner
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -88,8 +88,8 @@ export const TokenNotSupportedLight: Story = {
 
 export const TestnetNotSupported: Story = {
   args: {
-    theme: "dark",
-    chain: defineChain(11155111), // Sepolia testnet - will show error state
+    chain: defineChain(11155111),
+    theme: "dark", // Sepolia testnet - will show error state
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -104,8 +104,8 @@ export const TestnetNotSupported: Story = {
 
 export const TestnetNotSupportedLight: Story = {
   args: {
-    theme: "light",
-    chain: defineChain(11155111), // Sepolia testnet - will show error state
+    chain: defineChain(11155111),
+    theme: "light", // Sepolia testnet - will show error state
   },
   parameters: {
     backgrounds: { default: "light" },
diff --git a/packages/thirdweb/src/stories/Bridge/fixtures.ts b/packages/thirdweb/src/stories/Bridge/fixtures.ts
index 0b3f8cae16a..79d9e034ebf 100644
--- a/packages/thirdweb/src/stories/Bridge/fixtures.ts
+++ b/packages/thirdweb/src/stories/Bridge/fixtures.ts
@@ -1,15 +1,17 @@
 import { stringify } from "viem";
 import type { Token } from "../../bridge/index.js";
-import { baseSepolia } from "../../chains/chain-definitions/base-sepolia.js";
 import { base } from "../../chains/chain-definitions/base.js";
+import { baseSepolia } from "../../chains/chain-definitions/base-sepolia.js";
 import { polygon } from "../../chains/chain-definitions/polygon.js";
 import { defineChain } from "../../chains/utils.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
 import { getContract } from "../../contract/contract.js";
 import { claimTo } from "../../extensions/erc20/drops/write/claimTo.js";
 import { transfer } from "../../extensions/erc20/write/transfer.js";
-import type { BridgePrepareResult } from "../../react/core/hooks/useBridgePrepare.js";
-import type { BridgePrepareRequest } from "../../react/core/hooks/useBridgePrepare.js";
+import type {
+  BridgePrepareRequest,
+  BridgePrepareResult,
+} from "../../react/core/hooks/useBridgePrepare.js";
 import { getDefaultToken } from "../../react/core/utils/defaultTokens.js";
 import type { UIOptions } from "../../react/web/ui/Bridge/BridgeOrchestrator.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
@@ -19,44 +21,44 @@ import { storyClient } from "../utils.js";
 
 export const ETH: Token = {
   address: NATIVE_TOKEN_ADDRESS,
-  name: "Ethereum",
-  symbol: "ETH",
   chainId: 10,
   decimals: 18,
-  priceUsd: 1000,
   iconUri:
     "https://coin-images.coingecko.com/coins/images/279/large/ethereum.png",
+  name: "Ethereum",
+  priceUsd: 1000,
+  symbol: "ETH",
 };
 
 export const USDC: Token = {
   address: getDefaultToken(base, "USDC")?.address ?? "",
-  name: "USD Coin",
-  symbol: "USDC",
   chainId: base.id,
   decimals: 6,
-  priceUsd: 1,
   iconUri:
     "https://coin-images.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+  name: "USD Coin",
+  priceUsd: 1,
+  symbol: "USDC",
 };
 
 export const UNI: Token = {
   address: "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984",
-  name: "Uniswap",
-  symbol: "UNI",
   chainId: 10,
   decimals: 18,
-  priceUsd: 1000,
   iconUri:
     "https://coin-images.coingecko.com/coins/images/12504/large/uniswap-uni.png",
+  name: "Uniswap",
+  priceUsd: 1000,
+  symbol: "UNI",
 };
 
 const createStoryMockWallet = (): Wallet => {
   const mockAccount: Account = {
     address: "0x1234567890123456789012345678901234567890" as `0x${string}`,
     sendTransaction: async () => ({
-      transactionHash: "0xmockhash123" as `0x${string}`,
       chain: defineChain(1),
       client: storyClient,
+      transactionHash: "0xmockhash123" as `0x${string}`,
     }),
     signMessage: async () => "0xsignature" as `0x${string}`,
     signTypedData: async () => "0xsignature" as `0x${string}`,
@@ -64,15 +66,15 @@ const createStoryMockWallet = (): Wallet => {
 
   // Simple mock wallet implementation for storybook display only
   return {
-    id: "inApp",
-    getAccount: () => mockAccount,
-    getChain: async () => defineChain(1),
     autoConnect: async () => mockAccount,
     connect: async () => mockAccount,
     disconnect: async () => {},
-    switchChain: async () => {},
-    subscribe: () => () => {},
+    getAccount: () => mockAccount,
+    getChain: async () => defineChain(1),
     getConfig: () => ({}),
+    id: "inApp",
+    subscribe: () => () => {},
+    switchChain: async () => {},
   } as unknown as Wallet;
 };
 
@@ -81,573 +83,573 @@ export const STORY_MOCK_WALLET = createStoryMockWallet();
 // Simple onramp quote with no extra steps
 export const simpleOnrampQuote: BridgePrepareResult = JSON.parse(
   stringify({
-    type: "onramp",
-    id: "onramp-simple-123",
-    link: "https://stripe.com/session/simple",
     currency: "USD",
     currencyAmount: 50.0,
-    destinationAmount: 50000000n, // 50 USDC
+    destinationAmount: 50000000n,
     destinationToken: {
-      chainId: 137,
       address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-      name: "USD Coin (PoS)",
-      symbol: "USDC",
+      chainId: 137,
       decimals: 6,
-      priceUsd: 1.0,
       iconUri:
         "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+      name: "USD Coin (PoS)",
+      priceUsd: 1.0,
+      symbol: "USDC",
     },
-    timestamp: Date.now(),
-    steps: [], // No additional steps needed
+    id: "onramp-simple-123",
     intent: {
-      onramp: "stripe",
+      amount: 50000000n,
       chainId: 137,
-      tokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+      onramp: "stripe",
       receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-      amount: 50000000n,
-    },
+      tokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+    }, // 50 USDC
+    link: "https://stripe.com/session/simple",
+    steps: [],
+    timestamp: Date.now(), // No additional steps needed
+    type: "onramp",
   }),
 );
 
 // Onramp quote with 2 extra swap steps
 export const onrampWithSwapsQuote: BridgePrepareResult = JSON.parse(
   stringify({
-    type: "onramp",
-    id: "onramp-swaps-456",
-    link: "https://stripe.com/session/swaps",
     currency: "EUR",
     currencyAmount: 100.0,
-    destinationAmount: 1000000000000000000n, // 1 ETH
+    destinationAmount: 1000000000000000000n,
     destinationToken: {
-      chainId: 1,
       address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      name: "Ethereum",
-      symbol: "ETH",
+      chainId: 1,
       decimals: 18,
+      name: "Ethereum",
       priceUsd: 2500.0,
+      symbol: "ETH",
     },
-    timestamp: Date.now(),
+    id: "onramp-swaps-456",
+    intent: {
+      amount: 1000000000000000000n,
+      chainId: 1,
+      onramp: "stripe",
+      receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+      tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+    }, // 1 ETH
+    link: "https://stripe.com/session/swaps",
     steps: [
       {
-        originToken: {
+        destinationAmount: 44000000000000000n,
+        destinationToken: {
+          address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
           chainId: 137,
+          decimals: 18,
+          name: "Wrapped Ether",
+          priceUsd: 2500.0,
+          symbol: "WETH",
+        },
+        estimatedExecutionTimeMs: 30000, // 110 USDC
+        originAmount: 110000000n, // 0.044 WETH
+        originToken: {
           address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-          name: "USD Coin (PoS)",
-          symbol: "USDC",
+          chainId: 137,
           decimals: 6,
-          priceUsd: 1.0,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+          name: "USD Coin (PoS)",
+          priceUsd: 1.0,
+          symbol: "USDC",
         },
-        destinationToken: {
-          chainId: 137,
-          address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
-          name: "Wrapped Ether",
-          symbol: "WETH",
-          decimals: 18,
-          priceUsd: 2500.0,
-        },
-        originAmount: 110000000n, // 110 USDC
-        destinationAmount: 44000000000000000n, // 0.044 WETH
-        estimatedExecutionTimeMs: 30000,
         transactions: [
           {
             action: "approval",
-            id: "0x1a2b3c",
-            to: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-            data: "0x095ea7b3",
+            chain: defineChain(137),
             chainId: 137,
             client: storyClient,
-            chain: defineChain(137),
+            data: "0x095ea7b3",
+            id: "0x1a2b3c",
+            to: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
           },
           {
             action: "buy",
-            id: "0x4d5e6f",
-            to: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-            data: "0x472b43f3",
+            chain: defineChain(137),
             chainId: 137,
             client: storyClient,
-            chain: defineChain(137),
+            data: "0x472b43f3",
+            id: "0x4d5e6f",
+            to: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
           },
         ],
       },
       {
-        originToken: {
-          chainId: 137,
-          address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
-          name: "Wrapped Ether",
-          symbol: "WETH",
-          decimals: 18,
-          priceUsd: 2500.0,
-        },
+        destinationAmount: 1000000000000000000n,
         destinationToken: {
-          chainId: 1,
           address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+          chainId: 1,
+          decimals: 18,
           name: "Ethereum",
+          priceUsd: 2500.0,
           symbol: "ETH",
+        },
+        estimatedExecutionTimeMs: 180000, // 0.044 WETH
+        originAmount: 44000000000000000n, // 1 ETH
+        originToken: {
+          address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
+          chainId: 137,
           decimals: 18,
+          name: "Wrapped Ether",
           priceUsd: 2500.0,
+          symbol: "WETH",
         },
-        originAmount: 44000000000000000n, // 0.044 WETH
-        destinationAmount: 1000000000000000000n, // 1 ETH
-        estimatedExecutionTimeMs: 180000,
         transactions: [
           {
             action: "approval",
-            id: "0x7g8h9i",
-            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-            data: "0x095ea7b3",
+            chain: defineChain(137),
             chainId: 137,
             client: storyClient,
-            chain: defineChain(137),
+            data: "0x095ea7b3",
+            id: "0x7g8h9i",
+            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
           },
           {
             action: "transfer",
-            id: "0xj1k2l3",
-            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-            data: "0x3593564c",
+            chain: defineChain(137),
             chainId: 137,
             client: storyClient,
-            chain: defineChain(137),
+            data: "0x3593564c",
+            id: "0xj1k2l3",
+            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
           },
         ],
       },
     ],
-    intent: {
-      onramp: "stripe",
-      chainId: 1,
-      tokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-      receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-      amount: 1000000000000000000n,
-    },
+    timestamp: Date.now(),
+    type: "onramp",
   }),
 );
 
 // Simple buy quote with single step (no approval needed)
 export const simpleBuyQuote: BridgePrepareResult = JSON.parse(
   stringify({
-    type: "buy",
-    originAmount: 1000000000000000000n, // 1 ETH
-    destinationAmount: 100000000n, // 100 USDC
-    timestamp: Date.now(),
-    estimatedExecutionTimeMs: 60000,
+    destinationAmount: 100000000n,
+    estimatedExecutionTimeMs: 60000, // 1 ETH
+    intent: {
+      amount: 100000000n,
+      destinationChainId: 1,
+      destinationTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      receiver: "0x2247d5d238d0f9d37184d8332aE0289d1aD9991b",
+      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+    }, // 100 USDC
+    originAmount: 1000000000000000000n,
     steps: [
       {
-        originToken: {
+        destinationAmount: 100000000n,
+        destinationToken: {
+          address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
           chainId: 1,
-          address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-          name: "Ethereum",
-          symbol: "ETH",
-          decimals: 18,
-          priceUsd: 2500.0,
+          decimals: 6,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
-        },
-        destinationToken: {
-          chainId: 1,
-          address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
           name: "USD Coin",
-          symbol: "USDC",
-          decimals: 6,
           priceUsd: 1.0,
+          symbol: "USDC",
+        },
+        estimatedExecutionTimeMs: 60000,
+        originAmount: 1000000000000000000n,
+        originToken: {
+          address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+          chainId: 1,
+          decimals: 18,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+          name: "Ethereum",
+          priceUsd: 2500.0,
+          symbol: "ETH",
         },
-        originAmount: 1000000000000000000n,
-        destinationAmount: 100000000n,
-        estimatedExecutionTimeMs: 60000,
         transactions: [
           {
             action: "buy",
+            chain: defineChain(1),
+            chainId: 1,
+            client: storyClient,
+            data: "0x472b43f3",
             id: "0xsingle123",
             to: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-            data: "0x472b43f3",
             value: 1000000000000000000n,
-            chainId: 1,
-            client: storyClient,
-            chain: defineChain(1),
           },
         ],
       },
     ],
-    intent: {
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      destinationChainId: 1,
-      destinationTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      amount: 100000000n,
-      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-      receiver: "0x2247d5d238d0f9d37184d8332aE0289d1aD9991b",
-    },
+    timestamp: Date.now(),
+    type: "buy",
   }),
 );
 
 export const longTextBuyQuote: BridgePrepareResult = JSON.parse(
   stringify({
-    type: "buy",
-    originAmount: 1000000000000000000n, // 1 ETH
     destinationAmount: 1000394284092830482309n,
-    timestamp: Date.now(),
-    estimatedExecutionTimeMs: 60000,
+    estimatedExecutionTimeMs: 60000, // 1 ETH
+    intent: {
+      amount: 100000000n,
+      destinationChainId: 1,
+      destinationTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+    },
+    originAmount: 1000000000000000000n,
     steps: [
       {
-        originToken: {
-          chainId: 1,
-          address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-          name: "Ethereum",
-          symbol: "ETH",
-          decimals: 18,
-          priceUsd: 2500.0,
-          iconUri:
-            "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
-        },
+        destinationAmount: 1000394284092830482309n,
         destinationToken: {
-          chainId: 42793,
           address: "0x796Ea11Fa2dD751eD01b53C372fFDB4AAa8f00F9",
-          name: "USD Coin (USDC.e on Etherlink)",
-          symbol: "USDC.e",
+          chainId: 42793,
           decimals: 6,
-          priceUsd: 1.0,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+          name: "USD Coin (USDC.e on Etherlink)",
+          priceUsd: 1.0,
+          symbol: "USDC.e",
         },
-        originAmount: 1000000000000000000n,
-        destinationAmount: 1000394284092830482309n,
         estimatedExecutionTimeMs: 60000,
+        originAmount: 1000000000000000000n,
+        originToken: {
+          address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+          chainId: 1,
+          decimals: 18,
+          iconUri:
+            "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+          name: "Ethereum",
+          priceUsd: 2500.0,
+          symbol: "ETH",
+        },
         transactions: [
           {
             action: "buy",
+            chain: defineChain(1),
+            chainId: 1,
+            client: storyClient,
+            data: "0x472b43f3",
             id: "0xsingle123",
             to: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-            data: "0x472b43f3",
             value: 1000000000000000000n,
-            chainId: 1,
-            client: storyClient,
-            chain: defineChain(1),
           },
         ],
       },
     ],
-    intent: {
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      destinationChainId: 1,
-      destinationTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      amount: 100000000n,
-      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-      receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-    },
+    timestamp: Date.now(),
+    type: "buy",
   }),
 );
 
 // Buy quote with approval + buy in single step
 export const buyWithApprovalQuote: BridgePrepareResult = JSON.parse(
   stringify({
-    type: "buy",
-    originAmount: 100000000n, // 100 USDC
-    destinationAmount: 100000000n, // 100 USDC on different chain
-    timestamp: Date.now(),
-    estimatedExecutionTimeMs: 120000,
+    destinationAmount: 100000000n,
+    estimatedExecutionTimeMs: 120000, // 100 USDC
+    intent: {
+      amount: 100000000n,
+      destinationChainId: 137,
+      destinationTokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+      originChainId: 1,
+      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+    }, // 100 USDC on different chain
+    originAmount: 100000000n,
     steps: [
       {
-        originToken: {
-          chainId: 1,
-          address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-          name: "USD Coin",
-          symbol: "USDC",
+        destinationAmount: 100000000n,
+        destinationToken: {
+          address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+          chainId: 137,
           decimals: 6,
-          priceUsd: 1.0,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
-        },
-        destinationToken: {
-          chainId: 137,
-          address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
           name: "USD Coin (PoS)",
+          priceUsd: 1.0,
           symbol: "USDC",
+        },
+        estimatedExecutionTimeMs: 120000,
+        originAmount: 100000000n,
+        originToken: {
+          address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+          chainId: 1,
           decimals: 6,
-          priceUsd: 1.0,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+          name: "USD Coin",
+          priceUsd: 1.0,
+          symbol: "USDC",
         },
-        originAmount: 100000000n,
-        destinationAmount: 100000000n,
-        estimatedExecutionTimeMs: 120000,
         transactions: [
           {
             action: "approval",
-            id: "0xapproval789",
-            to: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-            data: "0x095ea7b3",
+            chain: defineChain(1),
             chainId: 1,
             client: storyClient,
-            chain: defineChain(1),
+            data: "0x095ea7b3",
+            id: "0xapproval789",
+            to: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
           },
           {
             action: "buy",
-            id: "0xbuy456",
-            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-            data: "0x3593564c",
+            chain: defineChain(1),
             chainId: 1,
             client: storyClient,
-            chain: defineChain(1),
+            data: "0x3593564c",
+            id: "0xbuy456",
+            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
           },
         ],
       },
     ],
-    intent: {
-      originChainId: 1,
-      originTokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      destinationChainId: 137,
-      destinationTokenAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-      amount: 100000000n,
-      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-      receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-    },
+    timestamp: Date.now(),
+    type: "buy",
   }),
 );
 
 // Complex buy quote with 3 steps, each with approval + buy
 export const complexBuyQuote: BridgePrepareResult = JSON.parse(
   stringify({
-    type: "buy",
-    originAmount: 1000000000000000000n, // 1 ETH
-    destinationAmount: 1000000000000000000n, // 1 ETH on final chain
-    timestamp: Date.now(),
-    estimatedExecutionTimeMs: 300000,
+    destinationAmount: 1000000000000000000n,
+    estimatedExecutionTimeMs: 300000, // 1 ETH
+    intent: {
+      amount: 1000000000000000000n,
+      destinationChainId: 42161,
+      destinationTokenAddress: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
+      originChainId: 1,
+      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+      receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+    }, // 1 ETH on final chain
+    originAmount: 1000000000000000000n,
     steps: [
       {
-        originToken: {
-          chainId: 1,
-          address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-          name: "Ethereum",
-          symbol: "ETH",
-          decimals: 18,
-          priceUsd: 2500.0,
-        },
+        destinationAmount: 2500000000n,
         destinationToken: {
-          chainId: 1,
           address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-          name: "USD Coin",
-          symbol: "USDC",
+          chainId: 1,
           decimals: 6,
-          priceUsd: 1.0,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+          name: "USD Coin",
+          priceUsd: 1.0,
+          symbol: "USDC",
         },
-        originAmount: 1000000000000000000n,
-        destinationAmount: 2500000000n, // 2500 USDC
         estimatedExecutionTimeMs: 60000,
+        originAmount: 1000000000000000000n, // 2500 USDC
+        originToken: {
+          address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+          chainId: 1,
+          decimals: 18,
+          name: "Ethereum",
+          priceUsd: 2500.0,
+          symbol: "ETH",
+        },
         transactions: [
           {
             action: "approval",
-            id: "0xstep1approval",
-            to: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
-            data: "0x095ea7b3",
+            chain: defineChain(1),
             chainId: 1,
             client: storyClient,
-            chain: defineChain(1),
+            data: "0x095ea7b3",
+            id: "0xstep1approval",
+            to: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
           },
           {
             action: "buy",
+            chain: defineChain(1),
+            chainId: 1,
+            client: storyClient,
+            data: "0x7ff36ab5",
             id: "0xstep1buy",
             to: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
-            data: "0x7ff36ab5",
             value: 1000000000000000000n,
-            chainId: 1,
-            client: storyClient,
-            chain: defineChain(1),
           },
         ],
       },
       {
-        originToken: {
-          chainId: 1,
-          address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-          name: "USD Coin",
-          symbol: "USDC",
+        destinationAmount: 2495000000n,
+        destinationToken: {
+          address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+          chainId: 137,
           decimals: 6,
-          priceUsd: 1.0,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
-        },
-        destinationToken: {
-          chainId: 137,
-          address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
           name: "USD Coin (PoS)",
+          priceUsd: 1.0,
           symbol: "USDC",
+        },
+        estimatedExecutionTimeMs: 180000,
+        originAmount: 2500000000n, // 2495 USDC (after bridge fees)
+        originToken: {
+          address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+          chainId: 1,
           decimals: 6,
-          priceUsd: 1.0,
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+          name: "USD Coin",
+          priceUsd: 1.0,
+          symbol: "USDC",
         },
-        originAmount: 2500000000n,
-        destinationAmount: 2495000000n, // 2495 USDC (after bridge fees)
-        estimatedExecutionTimeMs: 180000,
         transactions: [
           {
             action: "approval",
-            id: "0xstep2approval",
-            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-            data: "0x095ea7b3",
+            chain: defineChain(1),
             chainId: 1,
             client: storyClient,
-            chain: defineChain(1),
+            data: "0x095ea7b3",
+            id: "0xstep2approval",
+            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
           },
           {
             action: "transfer",
-            id: "0xstep2bridge",
-            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-            data: "0x3593564c",
+            chain: defineChain(1),
             chainId: 1,
             client: storyClient,
-            chain: defineChain(1),
+            data: "0x3593564c",
+            id: "0xstep2bridge",
+            to: "0x3fc91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
           },
         ],
       },
       {
-        originToken: {
-          chainId: 137,
-          address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-          name: "USD Coin (PoS)",
-          symbol: "USDC",
-          decimals: 6,
-          priceUsd: 1.0,
-          iconUri:
-            "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
-        },
+        destinationAmount: 1000000000000000000n,
         destinationToken: {
-          chainId: 43114,
           address: "0x62D0A8458eD7719FDAF978fe5929C6D342B0bFcE",
-          symbol: "BEAM",
-          name: "Beam",
+          chainId: 43114,
           decimals: 18,
-          priceUsd: 0.00642458,
           iconUri:
             "https://coin-images.coingecko.com/coins/images/32417/small/cgicon.png?1747892021",
+          name: "Beam",
+          priceUsd: 0.00642458,
+          symbol: "BEAM",
         },
-        originAmount: 2495000000n,
-        destinationAmount: 1000000000000000000n, // 1 BEAM
         estimatedExecutionTimeMs: 60000,
+        originAmount: 2495000000n, // 1 BEAM
+        originToken: {
+          address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+          chainId: 137,
+          decimals: 6,
+          iconUri:
+            "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+          name: "USD Coin (PoS)",
+          priceUsd: 1.0,
+          symbol: "USDC",
+        },
         transactions: [
           {
             action: "approval",
-            id: "0xstep3approval",
-            to: "0x1111111254fb6c44bAC0beD2854e76F90643097d",
-            data: "0x095ea7b3",
+            chain: defineChain(137),
             chainId: 137,
             client: storyClient,
-            chain: defineChain(137),
+            data: "0x095ea7b3",
+            id: "0xstep3approval",
+            to: "0x1111111254fb6c44bAC0beD2854e76F90643097d",
           },
           {
             action: "buy",
-            id: "0xstep3buy",
-            to: "0x1111111254fb6c44bAC0beD2854e76F90643097d",
-            data: "0x12aa3caf",
+            chain: defineChain(137),
             chainId: 137,
             client: storyClient,
-            chain: defineChain(137),
+            data: "0x12aa3caf",
+            id: "0xstep3buy",
+            to: "0x1111111254fb6c44bAC0beD2854e76F90643097d",
           },
         ],
       },
     ],
-    intent: {
-      originChainId: 1,
-      originTokenAddress: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      destinationChainId: 42161,
-      destinationTokenAddress: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
-      amount: 1000000000000000000n,
-      sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-      receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-    },
+    timestamp: Date.now(),
+    type: "buy",
   }),
 );
 export const simpleBuyRequest: BridgePrepareRequest = {
-  type: "buy",
-  originChainId: 1,
-  originTokenAddress: NATIVE_TOKEN_ADDRESS,
+  amount: toWei("0.01"),
+  client: storyClient,
   destinationChainId: 10,
   destinationTokenAddress: NATIVE_TOKEN_ADDRESS,
-  amount: toWei("0.01"),
-  sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+  originChainId: 1,
+  originTokenAddress: NATIVE_TOKEN_ADDRESS,
   receiver: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
-  client: storyClient,
+  sender: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD",
+  type: "buy",
 };
 
 // ========== PREPARED TRANSACTIONS FOR TRANSACTION PAYMENT ========== //
 
 // mintTo raw transaction
 const ethTransferTransaction = prepareTransaction({
-  to: "0x87C52295891f208459F334975a3beE198fE75244",
-  data: "0x449a52f80000000000000000000000008447c7a30d18e9adf2abe362689fc994cc6a340d00000000000000000000000000000000000000000000000000038d7ea4c68000",
   chain: baseSepolia,
   client: storyClient,
+  data: "0x449a52f80000000000000000000000008447c7a30d18e9adf2abe362689fc994cc6a340d00000000000000000000000000000000000000000000000000038d7ea4c68000",
+  to: "0x87C52295891f208459F334975a3beE198fE75244",
 });
 
 // ERC20 token transaction with value
 const erc20Transaction = transfer({
+  amount: 100,
   contract: getContract({
-    client: storyClient,
     address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
     chain: base,
+    client: storyClient,
   }),
   to: "0x2247d5d238d0f9d37184d8332aE0289d1aD9991b",
-  amount: 100,
 });
 
 // claimTo on Polygon
 const contractInteractionTransaction = claimTo({
   contract: getContract({
-    client: storyClient,
     address: "0x683f91F407301b90e501492F8A26A3498D8d9638",
     chain: polygon,
+    client: storyClient,
   }),
-  to: "0x2247d5d238d0f9d37184d8332aE0289d1aD9991b",
   quantity: "10",
+  to: "0x2247d5d238d0f9d37184d8332aE0289d1aD9991b",
 });
 
 // ========== COMMON DUMMY DATA FOR STORYBOOK ========== //
 
 // Common receiver addresses for testing
 export const RECEIVER_ADDRESSES = {
+  physical: "0x5555666677778888999900001111222233334444" as const,
   primary: "0x2247d5d238d0f9d37184d8332aE0289d1aD9991b" as const,
   secondary: "0xa3841994009B4fEabb01ebcC62062F9E56F701CD" as const,
   seller: "0x1234567890123456789012345678901234567890" as const,
   subscription: "0x9876543210987654321098765432109876543210" as const,
-  physical: "0x5555666677778888999900001111222233334444" as const,
 };
 
 // Product metadata for direct payments
 const PRODUCT_METADATA = {
-  digitalArt: {
-    name: "Premium Digital Art NFT",
-    image:
-      "https://images.unsplash.com/photo-1465101046530-73398c7f28ca?w=500&h=300&fit=crop",
-    description: "This is a premium digital art by a famous artist",
-  },
   concertTicket: {
-    name: "Concert Ticket - The Midnight Live",
+    description: "Concert ticket for the upcoming show",
     image:
       "https://images.unsplash.com/photo-1501281668745-f7f57925c3b4?w=500&h=300&fit=crop",
-    description: "Concert ticket for the upcoming show",
+    name: "Concert Ticket - The Midnight Live",
   },
-  subscription: {
-    name: "Premium Streaming Service - Monthly",
-    image:
-      "https://images.unsplash.com/photo-1611162617474-5b21e879e113?w=500&h=300&fit=crop",
+  credits: {
     description:
-      "Get unlimited access to our premium streaming service with this monthly subscription. Enjoy ad-free viewing, exclusive content, and the ability to download shows for offline viewing.",
+      "Add credits to your account for future billing cycles. Credits are non-refundable and do not expire.",
+    name: "Thirdweb Credits",
+  },
+  digitalArt: {
+    description: "This is a premium digital art by a famous artist",
+    image:
+      "https://images.unsplash.com/photo-1465101046530-73398c7f28ca?w=500&h=300&fit=crop",
+    name: "Premium Digital Art NFT",
   },
   sneakers: {
-    name: "Limited Edition Sneakers",
     image:
       "https://images.unsplash.com/photo-1549298916-b41d501d3772?w=500&h=300&fit=crop",
+    name: "Limited Edition Sneakers",
   },
-  credits: {
-    name: "Thirdweb Credits",
+  subscription: {
     description:
-      "Add credits to your account for future billing cycles. Credits are non-refundable and do not expire.",
+      "Get unlimited access to our premium streaming service with this monthly subscription. Enjoy ad-free viewing, exclusive content, and the ability to download shows for offline viewing.",
+    image:
+      "https://images.unsplash.com/photo-1611162617474-5b21e879e113?w=500&h=300&fit=crop",
+    name: "Premium Streaming Service - Monthly",
   },
 };
 
@@ -662,35 +664,35 @@ export const FUND_WALLET_UI_OPTIONS: Record<
   FundWalletUIOptions
 > = {
   ethDefault: {
-    mode: "fund_wallet" as const,
     destinationToken: ETH,
     metadata: {
-      title: "Fund Wallet",
       description: "Add funds to your wallet",
+      title: "Fund Wallet",
     },
+    mode: "fund_wallet" as const,
   },
   ethWithAmount: {
-    mode: "fund_wallet" as const,
     destinationToken: ETH,
     initialAmount: "0.001",
     metadata: {
-      title: "Fund Wallet",
       description: "Add funds to your wallet",
+      title: "Fund Wallet",
     },
-  },
-  usdcDefault: {
     mode: "fund_wallet" as const,
-    destinationToken: USDC,
-    initialAmount: "5",
   },
   uniLarge: {
-    mode: "fund_wallet" as const,
     destinationToken: UNI,
     initialAmount: "150000",
     metadata: {
-      title: "Fund Wallet",
       description: "Add UNI tokens to your wallet",
+      title: "Fund Wallet",
     },
+    mode: "fund_wallet" as const,
+  },
+  usdcDefault: {
+    destinationToken: USDC,
+    initialAmount: "5",
+    mode: "fund_wallet" as const,
   },
 };
 
@@ -699,73 +701,73 @@ export const DIRECT_PAYMENT_UI_OPTIONS: Record<
   "digitalArt" | "concertTicket" | "subscription" | "sneakers" | "credits",
   DirectPaymentUIOptions
 > = {
-  digitalArt: {
-    mode: "direct_payment" as const,
-    paymentInfo: {
-      sellerAddress: RECEIVER_ADDRESSES.seller,
-      token: ETH,
-      amount: "0.1",
-      feePayer: "sender" as const,
-    },
+  concertTicket: {
     metadata: {
-      title: "Purchase Digital Art",
-      description: "Buy premium digital art NFT",
-      image: PRODUCT_METADATA.digitalArt.image,
+      description: "Get your ticket for The Midnight Live",
+      image: PRODUCT_METADATA.concertTicket.image,
+      title: "Buy Concert Ticket",
     },
-  },
-  concertTicket: {
     mode: "direct_payment" as const,
     paymentInfo: {
-      sellerAddress: RECEIVER_ADDRESSES.primary,
-      token: USDC,
       amount: "25.00",
       feePayer: "receiver" as const,
+      sellerAddress: RECEIVER_ADDRESSES.primary,
+      token: USDC,
     },
+  },
+  credits: {
     metadata: {
-      title: "Buy Concert Ticket",
-      description: "Get your ticket for The Midnight Live",
-      image: PRODUCT_METADATA.concertTicket.image,
+      description: PRODUCT_METADATA.credits.description,
+      title: "Add Credits",
     },
-  },
-  subscription: {
     mode: "direct_payment" as const,
     paymentInfo: {
-      sellerAddress: RECEIVER_ADDRESSES.subscription,
+      amount: "25",
+      feePayer: "receiver" as const,
+      sellerAddress: RECEIVER_ADDRESSES.physical,
       token: USDC,
-      amount: "9.99",
-      feePayer: "sender" as const,
     },
+  },
+  digitalArt: {
     metadata: {
-      title: "Subscribe to Premium",
-      description: PRODUCT_METADATA.subscription.description,
-      image: PRODUCT_METADATA.subscription.image,
+      description: "Buy premium digital art NFT",
+      image: PRODUCT_METADATA.digitalArt.image,
+      title: "Purchase Digital Art",
     },
-  },
-  sneakers: {
     mode: "direct_payment" as const,
     paymentInfo: {
-      sellerAddress: RECEIVER_ADDRESSES.physical,
+      amount: "0.1",
+      feePayer: "sender" as const,
+      sellerAddress: RECEIVER_ADDRESSES.seller,
       token: ETH,
-      amount: "0.05",
-      feePayer: "receiver" as const,
     },
+  },
+  sneakers: {
     metadata: {
-      title: "Buy Sneakers",
       description: "Limited edition sneakers",
       image: PRODUCT_METADATA.sneakers.image,
+      title: "Buy Sneakers",
     },
-  },
-  credits: {
     mode: "direct_payment" as const,
     paymentInfo: {
-      sellerAddress: RECEIVER_ADDRESSES.physical,
-      token: USDC,
-      amount: "25",
+      amount: "0.05",
       feePayer: "receiver" as const,
+      sellerAddress: RECEIVER_ADDRESSES.physical,
+      token: ETH,
     },
+  },
+  subscription: {
     metadata: {
-      title: "Add Credits",
-      description: PRODUCT_METADATA.credits.description,
+      description: PRODUCT_METADATA.subscription.description,
+      image: PRODUCT_METADATA.subscription.image,
+      title: "Subscribe to Premium",
+    },
+    mode: "direct_payment" as const,
+    paymentInfo: {
+      amount: "9.99",
+      feePayer: "sender" as const,
+      sellerAddress: RECEIVER_ADDRESSES.subscription,
+      token: USDC,
     },
   },
 };
@@ -775,28 +777,28 @@ export const TRANSACTION_UI_OPTIONS: Record<
   "ethTransfer" | "erc20Transfer" | "contractInteraction",
   TransactionUIOptions
 > = {
-  ethTransfer: {
-    mode: "transaction" as const,
-    transaction: ethTransferTransaction,
+  contractInteraction: {
     metadata: {
-      title: "Execute Transaction",
-      description: "Review and execute transaction",
+      description: "Interact with smart contract",
+      title: "Contract Interaction",
     },
+    mode: "transaction" as const,
+    transaction: contractInteractionTransaction,
   },
   erc20Transfer: {
-    mode: "transaction" as const,
-    transaction: erc20Transaction,
     metadata: {
-      title: "Token Transfer",
       description: "Transfer ERC20 tokens",
+      title: "Token Transfer",
     },
-  },
-  contractInteraction: {
     mode: "transaction" as const,
-    transaction: contractInteractionTransaction,
+    transaction: erc20Transaction,
+  },
+  ethTransfer: {
     metadata: {
-      title: "Contract Interaction",
-      description: "Interact with smart contract",
+      description: "Review and execute transaction",
+      title: "Execute Transaction",
     },
+    mode: "transaction" as const,
+    transaction: ethTransferTransaction,
   },
 };
diff --git a/packages/thirdweb/src/stories/ConnectButton/hideButtons.stories.tsx b/packages/thirdweb/src/stories/ConnectButton/hideButtons.stories.tsx
index 2189452ccc7..d34d24ee5d6 100644
--- a/packages/thirdweb/src/stories/ConnectButton/hideButtons.stories.tsx
+++ b/packages/thirdweb/src/stories/ConnectButton/hideButtons.stories.tsx
@@ -3,14 +3,14 @@ import { ConnectButton } from "../../react/web/ui/ConnectWallet/ConnectButton.js
 import { storyClient } from "../utils.js";
 
 const meta = {
-  title: "Connect/ConnectButton/hide buttons",
+  args: {
+    client: storyClient,
+  },
   component: ConnectButton,
   parameters: {
     layout: "centered",
   },
-  args: {
-    client: storyClient,
-  },
+  title: "Connect/ConnectButton/hide buttons",
 } satisfies Meta<typeof ConnectButton>;
 
 type Story = StoryObj<typeof meta>;
@@ -46,8 +46,8 @@ export const HideBuy: Story = {
 export const HideSendReceive: Story = {
   args: {
     detailsModal: {
-      hideSendFunds: true,
       hideReceiveFunds: true,
+      hideSendFunds: true,
     },
   },
 };
@@ -55,8 +55,8 @@ export const HideSendReceive: Story = {
 export const HideSendBuy: Story = {
   args: {
     detailsModal: {
-      hideSendFunds: true,
       hideBuyFunds: true,
+      hideSendFunds: true,
     },
   },
 };
@@ -64,8 +64,8 @@ export const HideSendBuy: Story = {
 export const HideReceiveBuy: Story = {
   args: {
     detailsModal: {
-      hideReceiveFunds: true,
       hideBuyFunds: true,
+      hideReceiveFunds: true,
     },
   },
 };
@@ -73,9 +73,9 @@ export const HideReceiveBuy: Story = {
 export const HideSendReceiveBuy: Story = {
   args: {
     detailsModal: {
-      hideSendFunds: true,
-      hideReceiveFunds: true,
       hideBuyFunds: true,
+      hideReceiveFunds: true,
+      hideSendFunds: true,
     },
   },
 };
diff --git a/packages/thirdweb/src/stories/ConnectButton/themes.stories.tsx b/packages/thirdweb/src/stories/ConnectButton/themes.stories.tsx
index af92a96e9a2..b32008417af 100644
--- a/packages/thirdweb/src/stories/ConnectButton/themes.stories.tsx
+++ b/packages/thirdweb/src/stories/ConnectButton/themes.stories.tsx
@@ -3,14 +3,14 @@ import { ConnectButton } from "../../react/web/ui/ConnectWallet/ConnectButton.js
 import { storyClient } from "../utils.js";
 
 const meta = {
-  title: "Connect/ConnectButton/themes",
+  args: {
+    client: storyClient,
+  },
   component: ConnectButton,
   parameters: {
     layout: "centered",
   },
-  args: {
-    client: storyClient,
-  },
+  title: "Connect/ConnectButton/themes",
 } satisfies Meta<typeof ConnectButton>;
 
 type Story = StoryObj<typeof meta>;
diff --git a/packages/thirdweb/src/stories/PayEmbed.stories.ts b/packages/thirdweb/src/stories/PayEmbed.stories.ts
index 2da67934afb..7990885f998 100644
--- a/packages/thirdweb/src/stories/PayEmbed.stories.ts
+++ b/packages/thirdweb/src/stories/PayEmbed.stories.ts
@@ -3,15 +3,15 @@ import { PayEmbed } from "../react/web/ui/PayEmbed.js";
 import { storyClient } from "./utils.js";
 
 const meta = {
-  title: "Connect/PayEmbed",
+  args: {
+    client: storyClient,
+  },
   component: PayEmbed,
   parameters: {
     layout: "centered",
   },
   tags: ["autodocs"],
-  args: {
-    client: storyClient,
-  },
+  title: "Connect/PayEmbed",
 } satisfies Meta<typeof PayEmbed>;
 
 type Story = StoryObj<typeof meta>;
@@ -24,12 +24,12 @@ export const Dark: Story = {
 
 export const FiatTestMode: Story = {
   args: {
-    theme: "dark",
     payOptions: {
       buyWithFiat: {
         testMode: true,
       },
     },
+    theme: "dark",
   },
 };
 
diff --git a/packages/thirdweb/src/stories/TokenBalanceRow.stories.tsx b/packages/thirdweb/src/stories/TokenBalanceRow.stories.tsx
index dc9e46e5b70..93710ae62a2 100644
--- a/packages/thirdweb/src/stories/TokenBalanceRow.stories.tsx
+++ b/packages/thirdweb/src/stories/TokenBalanceRow.stories.tsx
@@ -37,42 +37,48 @@ const TokenBalanceRowWithTheme = (props: TokenBalanceRowWithThemeProps) => {
 };
 
 const meta = {
-  title: "Bridge/TokenBalanceRow",
-  component: TokenBalanceRowWithTheme,
-  parameters: {
-    layout: "centered",
-    docs: {
-      description: {
-        component:
-          "A row component that displays token balance information including token icon, symbol, chain, balance amount and fiat value. Used in bridge interfaces for token selection.",
-      },
-    },
-  },
-  tags: ["autodocs"],
   args: {
-    client: storyClient,
-    token: ETH,
-    chain: ethereum,
     amount: dummyBalanceETH,
+    chain: ethereum,
+    client: storyClient,
     onClick: (_token: Token) => {},
     theme: "dark",
+    token: ETH,
   },
   argTypes: {
+    onClick: {
+      action: "clicked",
+      description: "Callback function when token row is clicked",
+    },
     theme: {
       control: "select",
-      options: ["light", "dark"],
       description: "Theme for the component",
+      options: ["light", "dark"],
     },
-    onClick: {
-      action: "clicked",
-      description: "Callback function when token row is clicked",
+  },
+  component: TokenBalanceRowWithTheme,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "A row component that displays token balance information including token icon, symbol, chain, balance amount and fiat value. Used in bridge interfaces for token selection.",
+      },
     },
+    layout: "centered",
   },
+  tags: ["autodocs"],
+  title: "Bridge/TokenBalanceRow",
 } satisfies Meta<typeof TokenBalanceRowWithTheme>;
 
 type Story = StoryObj<typeof meta>;
 
 export const TokenList: Story = {
+  args: {
+    theme: "light",
+  },
+  parameters: {
+    backgrounds: { default: "light" },
+  },
   render: (args) => (
     <CustomThemeProvider theme={args.theme}>
       <div
@@ -80,46 +86,46 @@ export const TokenList: Story = {
           display: "flex",
           flexDirection: "column",
           gap: "8px",
-          minWidth: "400px",
           maxWidth: "500px",
+          minWidth: "400px",
         }}
       >
         <TokenBalanceRow
-          client={args.client}
-          token={ETH}
           amount={dummyBalanceETH}
+          client={args.client}
           onClick={args.onClick}
+          token={ETH}
         />
         <TokenBalanceRow
-          client={args.client}
-          token={ETH}
           amount={dummyBalanceETH}
+          client={args.client}
           onClick={args.onClick}
+          token={ETH}
         />
         <TokenBalanceRow
-          client={args.client}
-          token={USDC}
           amount={dummyBalanceUSDC}
+          client={args.client}
           onClick={args.onClick}
+          token={USDC}
         />
         <TokenBalanceRow
-          client={args.client}
-          token={UNI}
           amount={dummyBalanceLowUNI}
+          client={args.client}
           onClick={args.onClick}
+          token={UNI}
         />
       </div>
     </CustomThemeProvider>
   ),
+};
+
+export const DarkTokenList: Story = {
   args: {
-    theme: "light",
+    theme: "dark",
   },
   parameters: {
-    backgrounds: { default: "light" },
+    backgrounds: { default: "dark" },
   },
-};
-
-export const DarkTokenList: Story = {
   render: (args) => (
     <CustomThemeProvider theme={args.theme}>
       <div
@@ -127,43 +133,37 @@ export const DarkTokenList: Story = {
           display: "flex",
           flexDirection: "column",
           gap: "8px",
-          minWidth: "400px",
           maxWidth: "500px",
+          minWidth: "400px",
         }}
       >
         <TokenBalanceRow
-          client={args.client}
-          token={ETH}
           amount={dummyBalanceETH}
+          client={args.client}
           onClick={args.onClick}
+          token={ETH}
         />
         <TokenBalanceRow
-          client={args.client}
-          token={ETH}
           amount={dummyBalanceETH}
+          client={args.client}
           onClick={args.onClick}
+          token={ETH}
         />
         <TokenBalanceRow
-          client={args.client}
-          token={USDC}
           amount={dummyBalanceUSDC}
+          client={args.client}
           onClick={args.onClick}
+          token={USDC}
         />
         <TokenBalanceRow
-          client={args.client}
-          token={UNI}
           amount={dummyBalanceLowUNI}
+          client={args.client}
           onClick={args.onClick}
+          token={UNI}
         />
       </div>
     </CustomThemeProvider>
   ),
-  args: {
-    theme: "dark",
-  },
-  parameters: {
-    backgrounds: { default: "dark" },
-  },
 };
 
 export default meta;
diff --git a/packages/thirdweb/src/stories/WalletRow.stories.tsx b/packages/thirdweb/src/stories/WalletRow.stories.tsx
index ebe21bb060d..56cfb783bbd 100644
--- a/packages/thirdweb/src/stories/WalletRow.stories.tsx
+++ b/packages/thirdweb/src/stories/WalletRow.stories.tsx
@@ -26,48 +26,48 @@ const WalletRowWithTheme = (props: WalletRowWithThemeProps) => {
 };
 
 const meta = {
-  title: "Connect/WalletRow",
-  component: WalletRowWithTheme,
-  parameters: {
-    layout: "centered",
-    docs: {
-      description: {
-        component:
-          "A reusable component that displays wallet information including address, wallet type, and optional ENS name or email.",
-      },
-    },
-  },
-  tags: ["autodocs"],
   args: {
-    client: storyClient,
-    address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045", // Vitalik's address for ENS demo
+    address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
+    client: storyClient, // Vitalik's address for ENS demo
     theme: "dark",
   },
   argTypes: {
-    theme: {
-      control: "select",
-      options: ["light", "dark"],
-      description: "Theme for the component",
+    address: {
+      control: "text",
+      description: "Wallet address to display",
     },
     iconSize: {
       control: "select",
-      options: ["xs", "sm", "md", "lg", "xl"],
       description: "Size of the wallet icon",
-    },
-    textSize: {
-      control: "select",
       options: ["xs", "sm", "md", "lg", "xl"],
-      description: "Size of the main address text",
     },
     label: {
       control: "text",
       description: "Optional label to display above the address",
     },
-    address: {
-      control: "text",
-      description: "Wallet address to display",
+    textSize: {
+      control: "select",
+      description: "Size of the main address text",
+      options: ["xs", "sm", "md", "lg", "xl"],
+    },
+    theme: {
+      control: "select",
+      description: "Theme for the component",
+      options: ["light", "dark"],
     },
   },
+  component: WalletRowWithTheme,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          "A reusable component that displays wallet information including address, wallet type, and optional ENS name or email.",
+      },
+    },
+    layout: "centered",
+  },
+  tags: ["autodocs"],
+  title: "Connect/WalletRow",
 } satisfies Meta<typeof WalletRowWithTheme>;
 
 type Story = StoryObj<typeof meta>;
@@ -92,9 +92,9 @@ export const Dark: Story = {
 
 export const WithLabel: Story = {
   args: {
-    theme: "dark",
-    label: "Recipient Wallet",
     address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
+    label: "Recipient Wallet",
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -103,11 +103,11 @@ export const WithLabel: Story = {
 
 export const LargeSize: Story = {
   args: {
-    theme: "light",
+    address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
     iconSize: "lg",
-    textSize: "md",
     label: "Primary Wallet",
-    address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
+    textSize: "md",
+    theme: "light",
   },
   parameters: {
     backgrounds: { default: "light" },
@@ -116,10 +116,10 @@ export const LargeSize: Story = {
 
 export const SmallSize: Story = {
   args: {
-    theme: "dark",
+    address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
     iconSize: "sm",
     textSize: "xs",
-    address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
+    theme: "dark",
   },
   parameters: {
     backgrounds: { default: "dark" },
@@ -127,6 +127,12 @@ export const SmallSize: Story = {
 };
 
 export const DifferentAddresses: Story = {
+  args: {
+    theme: "dark",
+  },
+  parameters: {
+    backgrounds: { default: "dark" },
+  },
   render: (args) => (
     <CustomThemeProvider theme={args.theme}>
       <div
@@ -138,29 +144,23 @@ export const DifferentAddresses: Story = {
         }}
       >
         <WalletRow
-          client={args.client}
           address="0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045"
+          client={args.client}
           label="ENS Example (vitalik.eth)"
         />
         <WalletRow
-          client={args.client}
           address="0x4fA9230f4E8978462cE7Bf8e6b5a2588da5F4264"
+          client={args.client}
           label="Regular Address"
         />
         <WalletRow
-          client={args.client}
           address="0x4fA9230f4E8978462cE7Bf8e6b5a2588da5F4264"
+          client={args.client}
           label="Short Address"
         />
       </div>
     </CustomThemeProvider>
   ),
-  args: {
-    theme: "dark",
-  },
-  parameters: {
-    backgrounds: { default: "dark" },
-  },
 };
 
 export default meta;
diff --git a/packages/thirdweb/src/stories/utils.tsx b/packages/thirdweb/src/stories/utils.tsx
index 28d8d004339..1b496a82f8a 100644
--- a/packages/thirdweb/src/stories/utils.tsx
+++ b/packages/thirdweb/src/stories/utils.tsx
@@ -33,11 +33,11 @@ const ModalWrapper = (props: { children: React.ReactNode }) => {
   return (
     <div
       style={{
-        width: 400,
-        margin: "16px auto",
         backgroundColor: theme.colors.modalBg,
         borderRadius: radius.md,
         boxShadow: `0 0 0 1px ${theme.colors.borderColor}`,
+        margin: "16px auto",
+        width: 400,
       }}
     >
       {props.children}
diff --git a/packages/thirdweb/src/transaction/actions/encode.bench.ts b/packages/thirdweb/src/transaction/actions/encode.bench.ts
index fbb5d462f9c..e6e012f9d18 100644
--- a/packages/thirdweb/src/transaction/actions/encode.bench.ts
+++ b/packages/thirdweb/src/transaction/actions/encode.bench.ts
@@ -4,11 +4,10 @@ import {
   USDT_CONTRACT,
   USDT_CONTRACT_WITH_ABI,
 } from "../../../test/src/test-contracts.js";
+import { prepareMethod } from "../../utils/abi/prepare-method.js";
 import { prepareContractCall } from "../prepare-contract-call.js";
 import { encode } from "./encode.js";
 
-import { prepareMethod } from "../../utils/abi/prepare-method.js";
-
 bench("encode tx (human readable)", async () => {
   const tx = prepareContractCall({
     contract: { ...USDT_CONTRACT },
@@ -22,14 +21,14 @@ bench("encode tx (json abi)", async () => {
   const tx = prepareContractCall({
     contract: { ...USDT_CONTRACT },
     method: {
-      name: "transfer",
-      type: "function",
       inputs: [
         { name: "to", type: "address" },
         { name: "value", type: "uint256" },
       ],
+      name: "transfer",
       outputs: [],
       stateMutability: "payable",
+      type: "function",
     },
     params: [VITALIK_WALLET, 100n],
   });
diff --git a/packages/thirdweb/src/transaction/actions/encode.test.ts b/packages/thirdweb/src/transaction/actions/encode.test.ts
index 83ff0971217..8fc51cdf0fc 100644
--- a/packages/thirdweb/src/transaction/actions/encode.test.ts
+++ b/packages/thirdweb/src/transaction/actions/encode.test.ts
@@ -76,9 +76,9 @@ describe("transaction: encode", () => {
   it("extraCallData | should encode correctly (human-readable)", async () => {
     const tx = prepareContractCall({
       contract: USDT_CONTRACT,
+      extraCallData,
       method: "function transfer(address, uint256) returns (bool)",
       params: [TEST_WALLET_A, 100n],
-      extraCallData,
     });
     const encoded = await encode(tx);
     expect(encoded).toEqual(expectedFinalData);
@@ -87,6 +87,7 @@ describe("transaction: encode", () => {
   it("extraCallData | should encode correctly (transaction abi)", async () => {
     const tx = prepareContractCall({
       contract: USDT_CONTRACT,
+      extraCallData,
       method: {
         inputs: [
           { internalType: "address", name: "to", type: "address" },
@@ -98,7 +99,6 @@ describe("transaction: encode", () => {
         type: "function",
       },
       params: [TEST_WALLET_A, 100n],
-      extraCallData,
     });
     const encoded = await encode(tx);
     expect(encoded).toEqual(expectedFinalData);
@@ -107,9 +107,9 @@ describe("transaction: encode", () => {
   it("extraCallData | should encode correctly (contract abi)", async () => {
     const tx = prepareContractCall({
       contract: USDT_CONTRACT_WITH_ABI,
+      extraCallData,
       method: "transfer",
       params: [TEST_WALLET_A, 100n],
-      extraCallData,
     });
     const encoded = await encode(tx);
     expect(encoded).toEqual(expectedFinalData);
@@ -117,9 +117,9 @@ describe("transaction: encode", () => {
   it("extraCallData | should encode correctly (auto-abi)", async () => {
     const tx = prepareContractCall({
       contract: USDT_CONTRACT,
+      extraCallData,
       method: resolveMethod("transfer"),
       params: [TEST_WALLET_A, 100n],
-      extraCallData,
     });
     const encoded = await encode(tx);
     expect(encoded).toEqual(expectedFinalData);
@@ -137,9 +137,9 @@ describe("transaction: encode", () => {
     const txWithExtraData = prepareTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
+      extraCallData,
       to: TEST_WALLET_B,
       value: toWei("0.1"),
-      extraCallData,
     });
 
     const encoded2 = await encode(txWithExtraData);
@@ -161,9 +161,9 @@ describe("transaction: encode", () => {
     const tx = prepareTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
+      data: extraCallData,
       to: TEST_WALLET_B,
       value: toWei("0.1"),
-      data: extraCallData,
     });
     const _hex = await getDataFromTx(tx);
     expect(_hex).toBe(extraCallData);
@@ -184,10 +184,10 @@ describe("transaction: encode", () => {
     const tx = prepareTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
-      to: TEST_WALLET_B,
-      value: toWei("0.1"),
       data: toHex("getExtraCallDataFromTx-should-not-return-this"),
       extraCallData,
+      to: TEST_WALLET_B,
+      value: toWei("0.1"),
     });
     const result = await getExtraCallDataFromTx(tx);
     expect(result).toBe(extraCallData);
@@ -197,11 +197,11 @@ describe("transaction: encode", () => {
     const tx = prepareTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
-      to: TEST_WALLET_B,
-      value: toWei("0.1"),
       data: toHex("getExtraCallDataFromTx-should-not-return-this"),
       // @ts-ignore Intentionally for the test purpose
       extraCallData: "I'm a cat",
+      to: TEST_WALLET_B,
+      value: toWei("0.1"),
     });
     await expect(getExtraCallDataFromTx(tx)).rejects.toThrowError(
       "Invalid extra calldata - must be a hex string",
diff --git a/packages/thirdweb/src/transaction/actions/estimate-gas-cost.test.ts b/packages/thirdweb/src/transaction/actions/estimate-gas-cost.test.ts
index c26f461aa0a..2c8880e422d 100644
--- a/packages/thirdweb/src/transaction/actions/estimate-gas-cost.test.ts
+++ b/packages/thirdweb/src/transaction/actions/estimate-gas-cost.test.ts
@@ -33,8 +33,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("estimateGasCost", () => {
       const tx = prepareTransaction({
         chain: FORKED_ETHEREUM_CHAIN,
         client: TEST_CLIENT,
-        value: 0n,
         to: TEST_WALLET_B,
+        value: 0n,
       });
       const result = await estimateGasCost({
         transaction: tx,
@@ -53,8 +53,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("estimateGasCost", () => {
       const tx = prepareTransaction({
         chain: FORKED_OPTIMISM_CHAIN,
         client: TEST_CLIENT,
-        value: 0n,
         to: TEST_WALLET_B,
+        value: 0n,
       });
       const result = await estimateGasCost({
         transaction: tx,
diff --git a/packages/thirdweb/src/transaction/actions/estimate-gas-cost.ts b/packages/thirdweb/src/transaction/actions/estimate-gas-cost.ts
index a4d5dfe9f1a..4869d81c084 100644
--- a/packages/thirdweb/src/transaction/actions/estimate-gas-cost.ts
+++ b/packages/thirdweb/src/transaction/actions/estimate-gas-cost.ts
@@ -32,7 +32,7 @@ export async function estimateGasCost(
   const from = options.from ?? options.account?.address ?? undefined;
   const gasLimit =
     (await resolvePromisedValue(transaction.gas)) ||
-    (await estimateGas({ transaction, from }));
+    (await estimateGas({ from, transaction }));
   const fees = await getDefaultGasOverrides(
     transaction.client,
     transaction.chain,
diff --git a/packages/thirdweb/src/transaction/actions/estimate-gas.test.ts b/packages/thirdweb/src/transaction/actions/estimate-gas.test.ts
index 23d3c828064..17a63373e5b 100644
--- a/packages/thirdweb/src/transaction/actions/estimate-gas.test.ts
+++ b/packages/thirdweb/src/transaction/actions/estimate-gas.test.ts
@@ -13,8 +13,8 @@ it.runIf(process.env.TW_SECRET_KEY)(
       params: [TEST_WALLET_B, 100n],
     });
     const gasEstimate = await estimateGas({
-      transaction: tx,
       from: TEST_WALLET_A,
+      transaction: tx,
     });
     expect(gasEstimate).toMatchInlineSnapshot("48297n");
   },
diff --git a/packages/thirdweb/src/transaction/actions/estimate-gas.ts b/packages/thirdweb/src/transaction/actions/estimate-gas.ts
index 58f19bf01f8..737052de088 100644
--- a/packages/thirdweb/src/transaction/actions/estimate-gas.ts
+++ b/packages/thirdweb/src/transaction/actions/estimate-gas.ts
@@ -92,8 +92,8 @@ export async function estimateGas(
         return gas;
       } catch (error) {
         throw await extractError({
-          error,
           contract: options.transaction.__contract,
+          error,
           fromAddress,
         });
       }
@@ -120,17 +120,17 @@ export async function estimateGas(
       let gas = await eth_estimateGas(
         rpcRequest,
         formatTransactionRequest({
-          to: toAddress ? getAddress(toAddress) : undefined,
-          data: encodedData,
-          from: fromAddress ? getAddress(fromAddress) : undefined,
-          value,
           authorizationList: authorizationList?.map((auth) => ({
             ...auth,
+            contractAddress: getAddress(auth.address),
+            nonce: Number(auth.nonce),
             r: ox__Hex.fromNumber(auth.r),
             s: ox__Hex.fromNumber(auth.s),
-            nonce: Number(auth.nonce),
-            contractAddress: getAddress(auth.address),
           })),
+          data: encodedData,
+          from: fromAddress ? getAddress(fromAddress) : undefined,
+          to: toAddress ? getAddress(toAddress) : undefined,
+          value,
           ...(authorizationList && authorizationList?.length > 0
             ? {
                 gas:
@@ -149,8 +149,8 @@ export async function estimateGas(
       return gas;
     } catch (error) {
       throw await extractError({
-        error,
         contract: options.transaction.__contract,
+        error,
         fromAddress,
       });
     }
diff --git a/packages/thirdweb/src/transaction/actions/gasless/providers/biconomy.test.ts b/packages/thirdweb/src/transaction/actions/gasless/providers/biconomy.test.ts
index 60c0394a337..9fbb9c4646c 100644
--- a/packages/thirdweb/src/transaction/actions/gasless/providers/biconomy.test.ts
+++ b/packages/thirdweb/src/transaction/actions/gasless/providers/biconomy.test.ts
@@ -6,8 +6,8 @@ import {
   TEST_ACCOUNT_B,
 } from "../../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../../contract/contract.js";
 import { mintTo } from "../../../../extensions/erc20/write/mintTo.js";
 import { transfer } from "../../../../extensions/erc20/write/transfer.js";
@@ -33,12 +33,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareBiconomyTransaction", () => {
     });
     // mint some tokens to the account
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: mintTo({
-        contract: erc20Contract,
         amount: "1000",
+        contract: erc20Contract,
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
   }, 60_000);
   it("should prepare a Biconomy transaction", async () => {
@@ -50,21 +50,21 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareBiconomyTransaction", () => {
 
     // seralizable transaction
     const serializableTransaction = await toSerializableTransaction({
-      transaction,
       from: TEST_ACCOUNT_A.address,
+      transaction,
     });
 
     const result = await prepareBiconomyTransaction({
       account: TEST_ACCOUNT_A,
-      serializableTransaction,
-      transaction,
       gasless: {
         apiId: "TEST_ID",
         apiKey: "TEST_KEY",
+        provider: "biconomy",
         // mainnet forwarder address
         relayerForwarderAddress: "0x84a0856b038eaAd1cC7E297cF34A7e72685A8693",
-        provider: "biconomy",
       },
+      serializableTransaction,
+      transaction,
     });
 
     const [request, signature] = result;
diff --git a/packages/thirdweb/src/transaction/actions/gasless/providers/biconomy.ts b/packages/thirdweb/src/transaction/actions/gasless/providers/biconomy.ts
index 793a6023950..2046d835ee0 100644
--- a/packages/thirdweb/src/transaction/actions/gasless/providers/biconomy.ts
+++ b/packages/thirdweb/src/transaction/actions/gasless/providers/biconomy.ts
@@ -62,15 +62,15 @@ export async function prepareBiconomyTransaction({
     Math.floor(Date.now() / 1000) + (gasless.deadlineSeconds ?? 3600);
 
   const request = {
+    batchId: BATCH_ID,
+    batchNonce: nonce,
+    data: serializableTransaction.data,
+    deadline: deadline,
     from: account.address,
     to: serializableTransaction.to,
     token: ZERO_ADDRESS,
-    txGas: serializableTransaction.gas,
     tokenGasPrice: 0n,
-    batchId: BATCH_ID,
-    batchNonce: nonce,
-    deadline: deadline,
-    data: serializableTransaction.data,
+    txGas: serializableTransaction.gas,
   };
 
   if (!request.to) {
@@ -124,18 +124,18 @@ export async function relayBiconomyTransaction(
   const response = await fetch(
     "https://api.biconomy.io/api/v2/meta-tx/native",
     {
-      method: "POST",
       body: stringify({
         apiId: options.gasless.apiId,
-        params: [request, signature],
         from: request.from,
-        to: request.to,
         gasLimit: request.txGas,
+        params: [request, signature],
+        to: request.to,
       }),
       headers: {
-        "x-api-key": options.gasless.apiKey,
         "Content-Type": "application/json;charset=utf-8",
+        "x-api-key": options.gasless.apiKey,
       },
+      method: "POST",
     },
   );
   if (!response.ok) {
@@ -145,9 +145,9 @@ export async function relayBiconomyTransaction(
   const transactionHash = json.txHash;
   if (isHex(transactionHash)) {
     return {
-      transactionHash: transactionHash,
       chain: options.transaction.chain,
       client: options.transaction.client,
+      transactionHash: transactionHash,
     };
   }
   throw new Error(`Failed to send transaction: ${stringify(json)}`);
diff --git a/packages/thirdweb/src/transaction/actions/gasless/providers/engine.test.ts b/packages/thirdweb/src/transaction/actions/gasless/providers/engine.test.ts
index 1b640b50c83..d350aef70a6 100644
--- a/packages/thirdweb/src/transaction/actions/gasless/providers/engine.test.ts
+++ b/packages/thirdweb/src/transaction/actions/gasless/providers/engine.test.ts
@@ -6,8 +6,8 @@ import {
   TEST_ACCOUNT_B,
 } from "../../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../../contract/contract.js";
 import { polygon } from "../../../../exports/chains.js";
 import { generateAccount } from "../../../../exports/wallets.js";
@@ -37,12 +37,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareengineTransaction", () => {
     });
     // mint some tokens to the account
     await sendAndConfirmTransaction({
+      account: TEST_ACCOUNT_A,
       transaction: mintTo({
-        contract: erc20Contract,
         amount: "1000",
+        contract: erc20Contract,
         to: TEST_ACCOUNT_A.address,
       }),
-      account: TEST_ACCOUNT_A,
     });
   }, 60_000);
 
@@ -55,20 +55,20 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareengineTransaction", () => {
 
     // seralizable transaction
     const serializableTransaction = await toSerializableTransaction({
-      transaction,
       from: TEST_ACCOUNT_A.address,
+      transaction,
     });
 
     const result = await prepareEngineTransaction({
       account: TEST_ACCOUNT_A,
-      serializableTransaction,
-      transaction,
       gasless: {
         provider: "engine",
-        relayerUrl: "https://safe-transaction.engine.com/api/v1",
         // mainnet forwarder address
         relayerForwarderAddress: "0xc82BbE41f2cF04e3a8efA18F7032BDD7f6d98a81",
+        relayerUrl: "https://safe-transaction.engine.com/api/v1",
       },
+      serializableTransaction,
+      transaction,
     });
 
     const { message, messageType, signature } = result;
@@ -91,22 +91,22 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareengineTransaction", () => {
       client: TEST_CLIENT,
     });
     const transaction = add({
-      contract: multichainRegistry,
       chainId: 1337n,
+      contract: multichainRegistry,
       deployer: TEST_ACCOUNT_A.address,
       deployment: (await generateAccount({ client: TEST_CLIENT })).address,
       metadataUri: "",
     });
     const res = await sendTransaction({
       account: TEST_ACCOUNT_A,
-      transaction,
       gasless: {
+        experimentalChainlessSupport: true,
         provider: "engine",
+        relayerForwarderAddress: "0x409d530a6961297ece29121dbee2c917c3398659",
         relayerUrl:
           "https://checkout.engine.thirdweb.com/relayer/0c2bdd3a-307f-4243-b6e5-5ba495222d2b",
-        relayerForwarderAddress: "0x409d530a6961297ece29121dbee2c917c3398659",
-        experimentalChainlessSupport: true,
       },
+      transaction,
     });
     expect(res.transactionHash).toBeDefined();
     expect(res.transactionHash.length).toBe(66);
diff --git a/packages/thirdweb/src/transaction/actions/gasless/providers/engine.ts b/packages/thirdweb/src/transaction/actions/gasless/providers/engine.ts
index ab0f115741e..cd3756f61e4 100644
--- a/packages/thirdweb/src/transaction/actions/gasless/providers/engine.ts
+++ b/packages/thirdweb/src/transaction/actions/gasless/providers/engine.ts
@@ -68,20 +68,20 @@ export async function prepareEngineTransaction({
     // chainless support!
     if (gasless.experimentalChainlessSupport) {
       const message = {
+        chainid: BigInt(transaction.chain.id),
+        data: serializableTransaction.data,
         from: account.address,
-        to: serializableTransaction.to,
-        value: 0n,
         gas: serializableTransaction.gas,
         nonce: nonce,
-        data: serializableTransaction.data,
-        chainid: BigInt(transaction.chain.id),
+        to: serializableTransaction.to,
+        value: 0n,
       } as const;
       return [
         await account.signTypedData({
           domain: {
             name: "GSNv2 Forwarder",
-            version: "0.0.1",
             verifyingContract: forrwaderContract.address,
+            version: "0.0.1",
           },
           message,
           primaryType: "ForwardRequest",
@@ -92,20 +92,20 @@ export async function prepareEngineTransaction({
     }
     // else non-chainless support
     const message = {
+      data: serializableTransaction.data,
       from: account.address,
-      to: serializableTransaction.to,
-      value: 0n,
       gas: serializableTransaction.gas,
       nonce: nonce,
-      data: serializableTransaction.data,
+      to: serializableTransaction.to,
+      value: 0n,
     } as const;
     return [
       await account.signTypedData({
         domain: {
-          name: gasless.domainName ?? "GSNv2 Forwarder",
-          version: gasless.domainVersion ?? "0.0.1",
           chainId: transaction.chain.id,
+          name: gasless.domainName ?? "GSNv2 Forwarder",
           verifyingContract: forrwaderContract.address,
+          version: gasless.domainVersion ?? "0.0.1",
         },
         message,
         primaryType: "ForwardRequest",
@@ -117,7 +117,7 @@ export async function prepareEngineTransaction({
   // TODO: handle special case for `approve` -> `permit`
   const messageType = "forward";
 
-  return { message, signature, messageType } as const;
+  return { message, messageType, signature } as const;
 }
 
 const ForwardRequest = [
@@ -149,16 +149,16 @@ export async function relayEngineTransaction(
     await prepareEngineTransaction(options);
 
   const response = await fetch(options.gasless.relayerUrl, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
+      forwarderAddress: options.gasless.relayerForwarderAddress,
       request: message,
-      type: messageType,
       signature,
-      forwarderAddress: options.gasless.relayerForwarderAddress,
+      type: messageType,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
 
   if (!response.ok) {
@@ -177,9 +177,9 @@ export async function relayEngineTransaction(
     const receipt = await fetchReceipt({ options, queueId });
     if (receipt) {
       return {
-        transactionHash: receipt.transactionHash,
         chain: options.transaction.chain,
         client: options.transaction.client,
+        transactionHash: receipt.transactionHash,
       };
     }
     await new Promise((resolve) => setTimeout(resolve, interval));
@@ -213,8 +213,8 @@ async function fetchReceipt(args: {
       throw new Error("Transaction execution cancelled.");
     case "mined": {
       const receipt = await waitForReceipt({
-        client: options.transaction.client,
         chain: options.transaction.chain,
+        client: options.transaction.client,
         transactionHash: result.transactionHash,
       });
       return receipt;
diff --git a/packages/thirdweb/src/transaction/actions/gasless/providers/openzeppelin.test.ts b/packages/thirdweb/src/transaction/actions/gasless/providers/openzeppelin.test.ts
index 91a392777c4..260c93239fb 100644
--- a/packages/thirdweb/src/transaction/actions/gasless/providers/openzeppelin.test.ts
+++ b/packages/thirdweb/src/transaction/actions/gasless/providers/openzeppelin.test.ts
@@ -6,8 +6,8 @@ import {
   TEST_ACCOUNT_B,
 } from "../../../../../test/src/test-wallets.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../../contract/contract.js";
 import { mintTo } from "../../../../extensions/erc20/write/mintTo.js";
 import { transfer } from "../../../../extensions/erc20/write/transfer.js";
@@ -35,12 +35,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       });
       // mint some tokens to the account
       await sendAndConfirmTransaction({
+        account: TEST_ACCOUNT_A,
         transaction: mintTo({
-          contract: erc20Contract,
           amount: "1000",
+          contract: erc20Contract,
           to: TEST_ACCOUNT_A.address,
         }),
-        account: TEST_ACCOUNT_A,
       });
     }, 60_000);
 
@@ -53,20 +53,20 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
       // seralizable transaction
       const serializableTransaction = await toSerializableTransaction({
-        transaction,
         from: TEST_ACCOUNT_A.address,
+        transaction,
       });
 
       const result = await prepareOpenZeppelinTransaction({
         account: TEST_ACCOUNT_A,
-        serializableTransaction,
-        transaction,
         gasless: {
           provider: "openzeppelin",
-          relayerUrl: "https://safe-transaction.openzeppelin.com/api/v1",
           // mainnet forwarder address
           relayerForwarderAddress: "0xc82BbE41f2cF04e3a8efA18F7032BDD7f6d98a81",
+          relayerUrl: "https://safe-transaction.openzeppelin.com/api/v1",
         },
+        serializableTransaction,
+        transaction,
       });
 
       const { message, messageType, signature } = result;
diff --git a/packages/thirdweb/src/transaction/actions/gasless/providers/openzeppelin.ts b/packages/thirdweb/src/transaction/actions/gasless/providers/openzeppelin.ts
index af5b11482d1..425d4f8fb9d 100644
--- a/packages/thirdweb/src/transaction/actions/gasless/providers/openzeppelin.ts
+++ b/packages/thirdweb/src/transaction/actions/gasless/providers/openzeppelin.ts
@@ -66,20 +66,20 @@ export async function prepareOpenZeppelinTransaction({
     // chainless support!
     if (gasless.experimentalChainlessSupport) {
       const message = {
+        chainid: BigInt(transaction.chain.id),
+        data: serializableTransaction.data,
         from: account.address,
-        to: serializableTransaction.to,
-        value: 0n,
         gas: serializableTransaction.gas,
         nonce: nonce,
-        data: serializableTransaction.data,
-        chainid: BigInt(transaction.chain.id),
+        to: serializableTransaction.to,
+        value: 0n,
       } as const;
       return [
         await account.signTypedData({
           domain: {
             name: "GSNv2 Forwarder",
-            version: "0.0.1",
             verifyingContract: forrwaderContract.address,
+            version: "0.0.1",
           },
           message,
           primaryType: "ForwardRequest",
@@ -90,20 +90,20 @@ export async function prepareOpenZeppelinTransaction({
     }
     // else non-chainless support
     const message = {
+      data: serializableTransaction.data,
       from: account.address,
-      to: serializableTransaction.to,
-      value: 0n,
       gas: serializableTransaction.gas,
       nonce: nonce,
-      data: serializableTransaction.data,
+      to: serializableTransaction.to,
+      value: 0n,
     } as const;
     return [
       await account.signTypedData({
         domain: {
-          name: gasless.domainName ?? "GSNv2 Forwarder",
-          version: gasless.domainVersion ?? "0.0.1",
           chainId: transaction.chain.id,
+          name: gasless.domainName ?? "GSNv2 Forwarder",
           verifyingContract: forrwaderContract.address,
+          version: gasless.domainVersion ?? "0.0.1",
         },
         message,
         primaryType: "ForwardRequest",
@@ -115,7 +115,7 @@ export async function prepareOpenZeppelinTransaction({
   // TODO: handle special case for `approve` -> `permit`
   const messageType = "forward";
 
-  return { message, signature, messageType } as const;
+  return { message, messageType, signature } as const;
 }
 
 const ForwardRequest = [
@@ -147,13 +147,13 @@ export async function relayOpenZeppelinTransaction(
     await prepareOpenZeppelinTransaction(options);
 
   const response = await fetch(options.gasless.relayerUrl, {
-    method: "POST",
     body: stringify({
+      forwarderAddress: options.gasless.relayerForwarderAddress,
       request: message,
-      type: messageType,
       signature,
-      forwarderAddress: options.gasless.relayerForwarderAddress,
+      type: messageType,
     }),
+    method: "POST",
   });
 
   if (!response.ok) {
@@ -166,9 +166,9 @@ export async function relayOpenZeppelinTransaction(
   const transactionHash = JSON.parse(json.result).txHash;
   if (isHex(transactionHash)) {
     return {
-      transactionHash,
       chain: options.transaction.chain,
       client: options.transaction.client,
+      transactionHash,
     };
   }
 
diff --git a/packages/thirdweb/src/transaction/actions/gasless/send-gasless-transaction.ts b/packages/thirdweb/src/transaction/actions/gasless/send-gasless-transaction.ts
index e43187db346..80c87dfc6ee 100644
--- a/packages/thirdweb/src/transaction/actions/gasless/send-gasless-transaction.ts
+++ b/packages/thirdweb/src/transaction/actions/gasless/send-gasless-transaction.ts
@@ -42,9 +42,9 @@ export async function sendGaslessTransaction({
     );
     result = await relayBiconomyTransaction({
       account,
-      transaction,
-      serializableTransaction,
       gasless,
+      serializableTransaction,
+      transaction,
     });
   }
 
@@ -55,9 +55,9 @@ export async function sendGaslessTransaction({
     );
     result = await relayOpenZeppelinTransaction({
       account,
-      transaction,
-      serializableTransaction,
       gasless,
+      serializableTransaction,
+      transaction,
     });
   }
 
@@ -65,9 +65,9 @@ export async function sendGaslessTransaction({
     const { relayEngineTransaction } = await import("./providers/engine.js");
     result = await relayEngineTransaction({
       account,
-      transaction,
-      serializableTransaction,
       gasless,
+      serializableTransaction,
+      transaction,
     });
   }
 
@@ -76,8 +76,8 @@ export async function sendGaslessTransaction({
   }
   addTransactionToStore({
     address: account.address,
-    transactionHash: result.transactionHash,
     chainId: transaction.chain.id,
+    transactionHash: result.transactionHash,
   });
   return result;
 }
diff --git a/packages/thirdweb/src/transaction/actions/send-and-confirm-transaction.test.ts b/packages/thirdweb/src/transaction/actions/send-and-confirm-transaction.test.ts
index f00b0997b95..63e7f5dcb7c 100644
--- a/packages/thirdweb/src/transaction/actions/send-and-confirm-transaction.test.ts
+++ b/packages/thirdweb/src/transaction/actions/send-and-confirm-transaction.test.ts
@@ -11,8 +11,8 @@ describe("sendAndConfirmTransaction", () => {
     const transaction = prepareTransaction({
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      value: 100n,
       to: TEST_WALLET_B,
+      value: 100n,
     });
     const res = await sendAndConfirmTransaction({
       account: TEST_ACCOUNT_A,
diff --git a/packages/thirdweb/src/transaction/actions/send-batch-transaction.ts b/packages/thirdweb/src/transaction/actions/send-batch-transaction.ts
index 9825c7fd62b..f888b3234ab 100644
--- a/packages/thirdweb/src/transaction/actions/send-batch-transaction.ts
+++ b/packages/thirdweb/src/transaction/actions/send-batch-transaction.ts
@@ -53,11 +53,11 @@ export async function sendBatchTransaction(
           resolvePromisedValue(tx.value),
         ]);
         const serializedTx: SendTransactionOption = {
-          data,
+          accessList,
           chainId: tx.chain.id,
+          data,
           to,
           value,
-          accessList,
         };
         return serializedTx;
       }),
diff --git a/packages/thirdweb/src/transaction/actions/send-transaction.test.ts b/packages/thirdweb/src/transaction/actions/send-transaction.test.ts
index 49ffa4f0e40..19a3a2fb762 100644
--- a/packages/thirdweb/src/transaction/actions/send-transaction.test.ts
+++ b/packages/thirdweb/src/transaction/actions/send-transaction.test.ts
@@ -17,8 +17,8 @@ describe("sendTransaction", () => {
     const transaction = prepareTransaction({
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      value: 100n,
       to: TEST_WALLET_B,
+      value: 100n,
     });
     const res = await sendTransaction({
       account: TEST_ACCOUNT_A,
@@ -32,8 +32,8 @@ describe("sendTransaction", () => {
     const transaction = prepareTransaction({
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      value: 100n,
       to: TEST_WALLET_B,
+      value: 100n,
     });
     await sendTransaction({
       account: TEST_ACCOUNT_A,
diff --git a/packages/thirdweb/src/transaction/actions/send-transaction.ts b/packages/thirdweb/src/transaction/actions/send-transaction.ts
index 2f1fda38ae0..bab98d3832f 100644
--- a/packages/thirdweb/src/transaction/actions/send-transaction.ts
+++ b/packages/thirdweb/src/transaction/actions/send-transaction.ts
@@ -196,8 +196,8 @@ export async function sendTransaction(
   }
 
   const serializableTransaction = await toSerializableTransaction({
-    transaction: transaction,
     from: account,
+    transaction: transaction,
   });
   // branch for gasless transactions
   if (gasless) {
@@ -207,9 +207,9 @@ export async function sendTransaction(
     );
     return sendGaslessTransaction({
       account,
-      transaction,
-      serializableTransaction,
       gasless,
+      serializableTransaction,
+      transaction,
     });
   }
 
@@ -217,8 +217,8 @@ export async function sendTransaction(
   // Store the transaction
   addTransactionToStore({
     address: account.address,
-    transactionHash: result.transactionHash,
     chainId: transaction.chain.id,
+    transactionHash: result.transactionHash,
   });
   return { ...result, chain: transaction.chain, client: transaction.client };
 }
diff --git a/packages/thirdweb/src/transaction/actions/sign-transaction.test.ts b/packages/thirdweb/src/transaction/actions/sign-transaction.test.ts
index 257d96aeb73..ae08bbceb6c 100644
--- a/packages/thirdweb/src/transaction/actions/sign-transaction.test.ts
+++ b/packages/thirdweb/src/transaction/actions/sign-transaction.test.ts
@@ -18,8 +18,8 @@ describe("eip1559", () => {
 
   test("default", () => {
     const signature = signTransaction({
-      transaction: BASE_EIP1559_TRANSACTION,
       privateKey: ANVIL_PKEY_A,
+      transaction: BASE_EIP1559_TRANSACTION,
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -29,11 +29,11 @@ describe("eip1559", () => {
 
   test("with maxFeePerGas", () => {
     const signature = signTransaction({
+      privateKey: ANVIL_PKEY_A,
       transaction: {
         ...BASE_EIP1559_TRANSACTION,
         maxFeePerGas: 1n,
       },
-      privateKey: ANVIL_PKEY_A,
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -43,12 +43,12 @@ describe("eip1559", () => {
 
   test("with maxPriorityFeePerGas", () => {
     const signature = signTransaction({
+      privateKey: ANVIL_PKEY_A,
       transaction: {
         ...BASE_EIP1559_TRANSACTION,
         maxFeePerGas: fromGwei("20"),
         maxPriorityFeePerGas: fromGwei("2"),
       },
-      privateKey: ANVIL_PKEY_A,
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -58,6 +58,7 @@ describe("eip1559", () => {
 
   test("with accessList", () => {
     const signature = signTransaction({
+      privateKey: ANVIL_PKEY_A,
       transaction: {
         ...BASE_EIP1559_TRANSACTION,
         accessList: [
@@ -70,7 +71,6 @@ describe("eip1559", () => {
           },
         ],
       },
-      privateKey: ANVIL_PKEY_A,
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -80,11 +80,11 @@ describe("eip1559", () => {
 
   test("with data", () => {
     const signature = signTransaction({
+      privateKey: ANVIL_PKEY_A,
       transaction: {
         ...BASE_EIP1559_TRANSACTION,
         data: "0x1234",
       },
-      privateKey: ANVIL_PKEY_A,
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -102,8 +102,8 @@ describe("eip2930", () => {
 
   test("default", () => {
     const signature = signTransaction({
-      transaction: BASE_EIP2930_TRANSACTION,
       privateKey: ANVIL_PKEY_A,
+      transaction: BASE_EIP2930_TRANSACTION,
     });
     expect(signature).toMatchInlineSnapshot(
       '"0x01f84f0182031180825208808080c080a089cebce5c7f728febd1060b55837c894ec2a79dd7854350abce252fc2de96b5da039f2782c70b92f4b1916aa8db91453c7229f33458bd091b3e10a40f9a7e443d2"',
@@ -112,9 +112,9 @@ describe("eip2930", () => {
 
   test("with accessList and gasPrice", () => {
     const signature = signTransaction({
+      privateKey: ANVIL_PKEY_A,
       transaction: {
         ...BASE_EIP2930_TRANSACTION,
-        gasPrice: fromGwei("2"),
         accessList: [
           {
             address: ZERO_ADDRESS,
@@ -123,8 +123,8 @@ describe("eip2930", () => {
             ],
           },
         ],
+        gasPrice: fromGwei("2"),
       },
-      privateKey: ANVIL_PKEY_A,
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -134,11 +134,11 @@ describe("eip2930", () => {
 
   test("with data", () => {
     const signature = signTransaction({
+      privateKey: ANVIL_PKEY_A,
       transaction: {
         ...BASE_EIP2930_TRANSACTION,
         data: "0x1234",
       },
-      privateKey: ANVIL_PKEY_A,
     });
 
     expect(signature).toMatchInlineSnapshot(
@@ -156,8 +156,8 @@ describe("legacy", () => {
 
   test("default", () => {
     const signature = signTransaction({
-      transaction: BASE_LEGACY_TRANSACTION,
       privateKey: ANVIL_PKEY_A,
+      transaction: BASE_LEGACY_TRANSACTION,
     });
     expect(signature).toMatchInlineSnapshot(
       '"0xf85182031184773594008252088080801ba0462e5dabe6d0e82ac9d2832d5ecc815e317669ae2eb018c2a07ae6f3a4763618a003214adcddee51ee1d46cb12a694f5520c851581fe53c543c8999d45fa18de07"',
@@ -167,10 +167,10 @@ describe("legacy", () => {
   test("with gasPrice", () => {
     expect(
       signTransaction({
+        privateKey: ANVIL_PKEY_A,
         transaction: {
           gasPrice: fromGwei("2"),
         },
-        privateKey: ANVIL_PKEY_A,
       }),
     ).toMatchInlineSnapshot(
       '"0xf84d808477359400808080801ba07abf45a28c3ce5a1d79d5ab5362878be5411ac51b3c2316670e1263936ef869ea001ca38d1782880bff3e2056f4949e75418858195b06fa8b6b13910a789e51989"',
diff --git a/packages/thirdweb/src/transaction/actions/simulate.test.ts b/packages/thirdweb/src/transaction/actions/simulate.test.ts
index fe8cc89f264..c4acc2c9e54 100644
--- a/packages/thirdweb/src/transaction/actions/simulate.test.ts
+++ b/packages/thirdweb/src/transaction/actions/simulate.test.ts
@@ -12,8 +12,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("simulate", async () => {
       params: [TEST_WALLET_B, 100n],
     });
     const result = await simulateTransaction({
-      transaction: tx,
       from: TEST_WALLET_A,
+      transaction: tx,
     });
     expect(result).toMatchInlineSnapshot("[]");
   });
@@ -25,8 +25,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("simulate", async () => {
       params: [TEST_WALLET_B],
     });
     const result = await simulateTransaction({
-      transaction: tx,
       from: TEST_WALLET_A,
+      transaction: tx,
     });
     expect(result).toMatchInlineSnapshot("1609000000n");
   });
diff --git a/packages/thirdweb/src/transaction/actions/simulate.ts b/packages/thirdweb/src/transaction/actions/simulate.ts
index a2a29ec362b..a2c0404c49b 100644
--- a/packages/thirdweb/src/transaction/actions/simulate.ts
+++ b/packages/thirdweb/src/transaction/actions/simulate.ts
@@ -61,11 +61,11 @@ export async function simulateTransaction<
   const from = options.from ?? options.account?.address ?? undefined;
 
   const serializedTx = formatTransactionRequest({
+    accessList,
     data,
     from: from ? getAddress(from) : undefined,
     to: to ? getAddress(to) : undefined,
     value,
-    accessList,
   });
 
   const rpcRequest = getRpcClient(options.transaction);
@@ -87,8 +87,8 @@ export async function simulateTransaction<
     return decoded as ReadContractResult<PreparedMethod<abiFn>[2]>;
   } catch (error) {
     throw await extractError({
-      error,
       contract: options.transaction.__contract,
+      error,
       fromAddress: from,
     });
   }
diff --git a/packages/thirdweb/src/transaction/actions/to-serializable-transaction.test.ts b/packages/thirdweb/src/transaction/actions/to-serializable-transaction.test.ts
index d1ef8bc824f..2417ab2f8e8 100644
--- a/packages/thirdweb/src/transaction/actions/to-serializable-transaction.test.ts
+++ b/packages/thirdweb/src/transaction/actions/to-serializable-transaction.test.ts
@@ -18,10 +18,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("toSerializableTransaction", () => {
   let transaction: PreparedTransaction;
   beforeAll(() => {
     transaction = prepareTransaction({
-      to: TEST_WALLET_B,
       chain: FORKED_ETHEREUM_CHAIN,
-      value: toWei("10"),
       client: TEST_CLIENT,
+      to: TEST_WALLET_B,
+      value: toWei("10"),
     });
   });
 
@@ -286,11 +286,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("toSerializableTransaction", () => {
       });
 
       const serializableTransaction = await toSerializableTransaction({
+        from: TEST_ACCOUNT_A,
         transaction: {
           ...transaction,
           authorizationList: [authorization],
         },
-        from: TEST_ACCOUNT_A,
       });
 
       expect(serializableTransaction.authorizationList).toMatchInlineSnapshot(`
@@ -318,11 +318,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("toSerializableTransaction", () => {
       });
 
       const serializableTransaction = await toSerializableTransaction({
+        from: TEST_ACCOUNT_A,
         transaction: {
           ...transaction,
           authorizationList: async () => Promise.resolve([authorization]),
         },
-        from: TEST_ACCOUNT_A,
       });
 
       expect(serializableTransaction.authorizationList).toMatchInlineSnapshot(`
@@ -350,8 +350,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("toSerializableTransaction", () => {
       const serializableTransaction = await toSerializableTransaction({
         transaction: {
           ...transaction,
-          gas,
           extraGas: BigInt(50_000),
+          gas,
         },
       });
       expect(serializableTransaction.gas).toBe(gas + BigInt(50_000));
@@ -361,8 +361,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("toSerializableTransaction", () => {
       const serializableTransaction = await toSerializableTransaction({
         transaction: {
           ...transaction,
-          gas,
           extraGas: () => Promise.resolve(BigInt(50_000)),
+          gas,
         },
       });
       expect(serializableTransaction.gas).toBe(gas + BigInt(50_000));
@@ -372,8 +372,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("toSerializableTransaction", () => {
       const serializableTransaction = await toSerializableTransaction({
         transaction: {
           ...transaction,
-          gas,
           extraGas: () => Promise.resolve(undefined),
+          gas,
         },
       });
 
@@ -474,10 +474,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("toSerializableTransaction", () => {
   test("should respect 0 maxPriorityFeePerGas chains", async () => {
     const serializableTransaction = await toSerializableTransaction({
       transaction: prepareTransaction({
-        to: TEST_WALLET_B,
         chain: arbitrumSepolia,
-        value: 0n,
         client: TEST_CLIENT,
+        to: TEST_WALLET_B,
+        value: 0n,
       }),
     });
 
diff --git a/packages/thirdweb/src/transaction/actions/to-serializable-transaction.ts b/packages/thirdweb/src/transaction/actions/to-serializable-transaction.ts
index f2ed26a5039..509286d624d 100644
--- a/packages/thirdweb/src/transaction/actions/to-serializable-transaction.ts
+++ b/packages/thirdweb/src/transaction/actions/to-serializable-transaction.ts
@@ -55,13 +55,13 @@ export async function toSerializableTransaction(
       "./zksync/send-eip712-transaction.js"
     );
     const { gas, maxFeePerGas, maxPriorityFeePerGas } = await getZkGasFees({
-      transaction: options.transaction,
       from:
         typeof options.from === "string" // Is this just an address?
           ? getAddress(options.from)
           : options.from !== undefined // Is this an account?
             ? getAddress(options.from.address)
             : undefined,
+      transaction: options.transaction,
     });
     // passing these values here will avoid re-fetching them below
     options.transaction = {
@@ -128,15 +128,15 @@ export async function toSerializableTransaction(
   }
 
   return {
-    to,
+    accessList,
+    authorizationList,
     chainId,
     data,
     gas,
     nonce,
-    accessList,
-    value,
-    authorizationList,
+    to,
     type,
+    value,
     ...feeData,
   } satisfies SerializableTransaction;
 }
diff --git a/packages/thirdweb/src/transaction/actions/wait-for-tx-receipt.test.ts b/packages/thirdweb/src/transaction/actions/wait-for-tx-receipt.test.ts
index 1e6e789817d..8037f804833 100644
--- a/packages/thirdweb/src/transaction/actions/wait-for-tx-receipt.test.ts
+++ b/packages/thirdweb/src/transaction/actions/wait-for-tx-receipt.test.ts
@@ -10,29 +10,29 @@ import { waitForReceipt } from "./wait-for-tx-receipt.js";
 const MOCK_TX_HASH = "0x1234567890abcdef";
 
 const MOCK_SUCCESS_RECEIPT: TransactionReceipt = {
-  transactionHash: MOCK_TX_HASH,
-  blockNumber: 1234n,
-  status: "success",
+  blobGasPrice: 123456n,
+  blobGasUsed: 123456n,
   blockHash: "0xabcdef1234567890",
+  blockNumber: 1234n,
   contractAddress: "0x1234567890abcdef",
   cumulativeGasUsed: 123456n,
+  effectiveGasPrice: 123456n,
   from: "0xabcdef1234567890",
   gasUsed: 123456n,
   logs: [],
   logsBloom: "0xabcdef1234567890",
+  root: "0xabcdef1234567890",
+  status: "success",
   to: "0x1234567890abcdef",
+  transactionHash: MOCK_TX_HASH,
   transactionIndex: 1234,
-  effectiveGasPrice: 123456n,
   type: "legacy",
-  root: "0xabcdef1234567890",
-  blobGasPrice: 123456n,
-  blobGasUsed: 123456n,
 };
 
 const TRANSACTION = transfer({
-  to: TEST_WALLET_B,
   amount: 100,
   contract: USDT_CONTRACT,
+  to: TEST_WALLET_B,
 });
 
 const mockEthGetTransactionReceipt = vi.spyOn(
@@ -92,8 +92,8 @@ describe("waitForReceipt", () => {
     const result = waitForReceipt({
       chain: TRANSACTION.chain,
       client: TRANSACTION.client,
-      transactionHash: MOCK_TX_HASH,
       maxBlocksWaitTime: 10,
+      transactionHash: MOCK_TX_HASH,
     });
 
     for (let i = 1; i <= 10 + 1; i++) {
diff --git a/packages/thirdweb/src/transaction/actions/wait-for-tx-receipt.ts b/packages/thirdweb/src/transaction/actions/wait-for-tx-receipt.ts
index c918e0337a9..db928a448c9 100644
--- a/packages/thirdweb/src/transaction/actions/wait-for-tx-receipt.ts
+++ b/packages/thirdweb/src/transaction/actions/wait-for-tx-receipt.ts
@@ -58,14 +58,14 @@ export function waitForReceipt(
       );
     }
 
-    const request = getRpcClient({ client, chain });
+    const request = getRpcClient({ chain, client });
 
     // start at -1 because the first block doesn't count
     let blocksWaited = -1;
 
     const unwatch = watchBlockNumber({
-      client: client,
       chain: chain,
+      client: client,
       onNewBlockNumber: async () => {
         blocksWaited++;
         if (blocksWaited >= maxBlocksWaitTime) {
diff --git a/packages/thirdweb/src/transaction/actions/zksync/getEip721Domain.ts b/packages/thirdweb/src/transaction/actions/zksync/getEip721Domain.ts
index bb548218315..d8ad4ef3000 100644
--- a/packages/thirdweb/src/transaction/actions/zksync/getEip721Domain.ts
+++ b/packages/thirdweb/src/transaction/actions/zksync/getEip721Domain.ts
@@ -17,10 +17,12 @@ export const getEip712Domain = (transaction: EIP721TransactionSerializable) => {
 
   return {
     domain: {
+      chainId: transaction.chainId,
       name: "zkSync",
       version: "2",
-      chainId: transaction.chainId,
     },
+    message: message,
+    primaryType: "Transaction",
     types: {
       Transaction: [
         { name: "txType", type: "uint256" },
@@ -38,8 +40,6 @@ export const getEip712Domain = (transaction: EIP721TransactionSerializable) => {
         { name: "paymasterInput", type: "bytes" },
       ],
     },
-    primaryType: "Transaction",
-    message: message,
   };
 };
 
@@ -62,18 +62,18 @@ function transactionToMessage(
   } = transaction;
 
   return {
-    txType: 113n,
+    data: data ? data : "0x0",
+    factoryDeps: factoryDeps?.map((dep) => toHex(hashBytecode(dep))) ?? [],
     from: BigInt(from),
-    to: to ? BigInt(to) : 0n,
     gasLimit: gas ?? 0n,
     gasPerPubdataByteLimit: gasPerPubdata ?? gasPerPubdataDefault,
     maxFeePerGas: maxFeePerGas ?? 0n,
     maxPriorityFeePerGas: maxPriorityFeePerGas ?? 0n,
-    paymaster: paymaster ? BigInt(paymaster) : 0n,
     nonce: nonce ? BigInt(nonce) : 0n,
-    value: value ?? 0n,
-    data: data ? data : "0x0",
-    factoryDeps: factoryDeps?.map((dep) => toHex(hashBytecode(dep))) ?? [],
+    paymaster: paymaster ? BigInt(paymaster) : 0n,
     paymasterInput: paymasterInput ? paymasterInput : "0x",
+    to: to ? BigInt(to) : 0n,
+    txType: 113n,
+    value: value ?? 0n,
   };
 }
diff --git a/packages/thirdweb/src/transaction/actions/zksync/send-eip712-transaction.test.ts b/packages/thirdweb/src/transaction/actions/zksync/send-eip712-transaction.test.ts
index 4e8479600bc..2bfc7fb979d 100644
--- a/packages/thirdweb/src/transaction/actions/zksync/send-eip712-transaction.test.ts
+++ b/packages/thirdweb/src/transaction/actions/zksync/send-eip712-transaction.test.ts
@@ -15,13 +15,13 @@ describe("sendEip712Transaction", () => {
     const transaction = prepareTransaction({
       chain: zkSyncSepolia, // TODO make zksync fork chain work
       client: TEST_CLIENT,
-      value: 0n,
-      to: TEST_ACCOUNT_B.address,
       eip712: {
         paymaster: "0xbA226d47Cbb2731CBAA67C916c57d68484AA269F",
         paymasterInput:
           "0x8c5a344500000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",
       },
+      to: TEST_ACCOUNT_B.address,
+      value: 0n,
     });
     const res = await sendEip712Transaction({
       account: TEST_ACCOUNT_A,
@@ -32,21 +32,21 @@ describe("sendEip712Transaction", () => {
 
   it.skip("should deploy a published autofactory contract on zksync", async () => {
     const address = await deployPublishedContract({
-      client: TEST_CLIENT,
-      chain: zkSyncSepolia, // TODO make zksync fork chain work
       account: TEST_ACCOUNT_A,
+      chain: zkSyncSepolia, // TODO make zksync fork chain work
+      client: TEST_CLIENT,
       contractId: "DropERC721",
       contractParams: {
-        defaultAdmin: TEST_ACCOUNT_A.address, // defaultAdmin
-        name: "test", // name
-        symbol: "test", // symbol
-        contractURI: "", // contractURI
-        trustedForwarders: [], // trustedForwarders
-        saleRecipient: TEST_ACCOUNT_A.address, // saleRecipient
+        contractURI: "", // defaultAdmin
+        defaultAdmin: TEST_ACCOUNT_A.address, // name
+        name: "test", // symbol
+        platformFeeBps: 0n, // contractURI
+        platformFeeRecipient: TEST_ACCOUNT_A.address, // trustedForwarders
+        royaltyBps: 0n, // saleRecipient
         royaltyRecipient: TEST_ACCOUNT_A.address, // royaltyRecipient
-        royaltyBps: 0n, // royaltyBps
-        platformFeeBps: 0n, // platformFeeBps
-        platformFeeRecipient: TEST_ACCOUNT_A.address, // platformFeeRecipient
+        saleRecipient: TEST_ACCOUNT_A.address, // royaltyBps
+        symbol: "test", // platformFeeBps
+        trustedForwarders: [], // platformFeeRecipient
       },
     });
     expect(address).toBeDefined();
diff --git a/packages/thirdweb/src/transaction/actions/zksync/send-eip712-transaction.ts b/packages/thirdweb/src/transaction/actions/zksync/send-eip712-transaction.ts
index 83cfc233883..1d77c4fa06e 100644
--- a/packages/thirdweb/src/transaction/actions/zksync/send-eip712-transaction.ts
+++ b/packages/thirdweb/src/transaction/actions/zksync/send-eip712-transaction.ts
@@ -49,17 +49,17 @@ export async function sendEip712Transaction(
 
   const hash = await signEip712Transaction({
     account,
-    eip712Transaction,
     chainId: transaction.chain.id,
+    eip712Transaction,
   });
 
   const rpc = getRpcClient(transaction);
   const result = await eth_sendRawTransaction(rpc, hash);
 
   return {
-    transactionHash: result,
     chain: transaction.chain,
     client: transaction.client,
+    transactionHash: result,
   };
 }
 
@@ -94,24 +94,24 @@ export async function populateEip712Transaction(
 ): Promise<EIP721TransactionSerializable> {
   const { account, transaction } = options;
   const { gas, maxFeePerGas, maxPriorityFeePerGas, gasPerPubdata } =
-    await getZkGasFees({ transaction, from: getAddress(account.address) });
+    await getZkGasFees({ from: getAddress(account.address), transaction });
 
   // serialize the transaction (with fees, gas, nonce)
   const serializableTransaction = await toSerializableTransaction({
+    from: account.address,
     transaction: {
       ...transaction,
       gas,
       maxFeePerGas,
       maxPriorityFeePerGas,
     },
-    from: account.address,
   });
 
   return {
     ...serializableTransaction,
     ...transaction.eip712,
-    gasPerPubdata,
     from: account.address as Hex,
+    gasPerPubdata,
   };
 }
 
@@ -179,7 +179,7 @@ export async function getZkGasFees(args: {
     maxPriorityFeePerGas === undefined
   ) {
     const rpc = getRpcClient(transaction);
-    const params = await formatTransaction({ transaction, from });
+    const params = await formatTransaction({ from, transaction });
     const result = (await rpc({
       // biome-ignore lint/suspicious/noExplicitAny: TODO add to RPC method types
       method: "zks_estimateFee" as any,
@@ -203,9 +203,9 @@ export async function getZkGasFees(args: {
   }
   return {
     gas,
+    gasPerPubdata,
     maxFeePerGas,
     maxPriorityFeePerGas,
-    gasPerPubdata,
   };
 }
 
@@ -222,18 +222,18 @@ async function formatTransaction(args: {
   ]);
   const gasPerPubdata = eip712?.gasPerPubdata;
   return {
-    from,
-    to,
     data,
-    value,
-    gasPerPubdata,
     eip712Meta: {
       ...eip712,
-      gasPerPubdata: gasPerPubdata || 50000n,
       factoryDeps: eip712?.factoryDeps?.map((dep) =>
         Array.from(hexToBytes(dep)),
       ),
+      gasPerPubdata: gasPerPubdata || 50000n,
     },
+    from,
+    gasPerPubdata,
+    to,
     type: "0x71",
+    value,
   };
 }
diff --git a/packages/thirdweb/src/transaction/extract-error.ts b/packages/thirdweb/src/transaction/extract-error.ts
index 404725c651a..90377e84131 100644
--- a/packages/thirdweb/src/transaction/extract-error.ts
+++ b/packages/thirdweb/src/transaction/extract-error.ts
@@ -1,5 +1,5 @@
 import type { Abi } from "abitype";
-import { type Hex, decodeErrorResult, stringify } from "viem";
+import { decodeErrorResult, type Hex, stringify } from "viem";
 import { isInsufficientFundsError } from "../analytics/track/helpers.js";
 import { trackInsufficientFundsError } from "../analytics/track/transaction.js";
 import { resolveContractAbi } from "../contract/actions/resolve-abi.js";
@@ -20,15 +20,15 @@ export async function extractError<abi extends Abi>(args: {
   // Track insufficient funds errors during transaction preparation
   if (isInsufficientFundsError(error) && contract) {
     trackInsufficientFundsError({
+      chainId: contract.chain?.id,
       client: contract.client,
+      contractAddress: contract.address,
       error,
       walletAddress: fromAddress,
-      chainId: contract.chain?.id,
-      contractAddress: contract.address,
     });
   }
 
-  const result = await extractErrorResult({ error, contract });
+  const result = await extractErrorResult({ contract, error });
   if (result) {
     return new TransactionError(result, contract);
   }
@@ -54,8 +54,8 @@ export async function extractErrorResult<abi extends Abi>(args: {
           abi = await resolveContractAbi(contract).catch(() => undefined);
         }
         const parsedError = decodeErrorResult({
-          data: errorObj.data,
           abi,
+          data: errorObj.data,
         });
         return `${parsedError.errorName}${parsedError.args ? ` - ${parsedError.args}` : ""}`;
       }
diff --git a/packages/thirdweb/src/transaction/prepare-contract-call.ts b/packages/thirdweb/src/transaction/prepare-contract-call.ts
index babec090c03..0dd40e81f2d 100644
--- a/packages/thirdweb/src/transaction/prepare-contract-call.ts
+++ b/packages/thirdweb/src/transaction/prepare-contract-call.ts
@@ -227,8 +227,6 @@ export function prepareContractCall<
   return prepareTransaction(
     {
       ...rest,
-      // these always inferred from the contract
-      to: contract.address,
       chain: contract.chain,
       client: contract.client,
       data: async () => {
@@ -253,10 +251,12 @@ export function prepareContractCall<
             await resolvePromisedValue(params ?? []),
           ).slice(2)) as `${(typeof preparedM)[0]}${string}`;
       },
+      // these always inferred from the contract
+      to: contract.address,
     },
     {
-      preparedMethod: preparedMethodPromise,
       contract: contract,
+      preparedMethod: preparedMethodPromise,
     },
   );
 }
diff --git a/packages/thirdweb/src/transaction/prepare-transaction.test.ts b/packages/thirdweb/src/transaction/prepare-transaction.test.ts
index 26c676b1f4f..4820c830caa 100644
--- a/packages/thirdweb/src/transaction/prepare-transaction.test.ts
+++ b/packages/thirdweb/src/transaction/prepare-transaction.test.ts
@@ -32,11 +32,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareTransaction", () => {
       },
     });
     const preparedTx = prepareTransaction({
+      authorizationList: [authorization],
       chain: defineChain(911867),
       client: TEST_CLIENT,
       to: TEST_WALLET_B,
       value: 0n,
-      authorizationList: [authorization],
     });
 
     const serializableTx = await toSerializableTransaction({
@@ -58,8 +58,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareTransaction", () => {
         value: toWei("0.1"),
       });
       const estimate = await estimateGas({
-        transaction: preparedTx,
         from: TEST_WALLET_A,
+        transaction: preparedTx,
       });
       // TODO: figure out why this is not `21000n`?
       // - a raw transfer SHOULD be 21000gwei always?
diff --git a/packages/thirdweb/src/transaction/prepare-transaction.ts b/packages/thirdweb/src/transaction/prepare-transaction.ts
index f309be24dcd..79ccc49e715 100644
--- a/packages/thirdweb/src/transaction/prepare-transaction.ts
+++ b/packages/thirdweb/src/transaction/prepare-transaction.ts
@@ -38,11 +38,11 @@ export type StaticPrepareTransactionOptions = {
 type TransactionType = "legacy" | "eip1559" | "eip2930" | "eip4844" | "eip7702";
 
 export const TransactionTypeMap: Record<TransactionType, number> = {
-  legacy: 0,
   eip1559: 1,
   eip2930: 2,
   eip4844: 3,
   eip7702: 4,
+  legacy: 0,
 };
 
 export type EIP712TransactionOptions = {
diff --git a/packages/thirdweb/src/transaction/read-contract.test.ts b/packages/thirdweb/src/transaction/read-contract.test.ts
index f2de3cd0e7a..41a68062965 100644
--- a/packages/thirdweb/src/transaction/read-contract.test.ts
+++ b/packages/thirdweb/src/transaction/read-contract.test.ts
@@ -11,9 +11,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("transaction: read", () => {
   it("should read from the contract correctly", async () => {
     const result = await readContract({
       contract: USDT_CONTRACT,
+      from: VITALIK_WALLET,
       method: "function balanceOf(address) returns (uint256)",
       params: [VITALIK_WALLET],
-      from: VITALIK_WALLET,
     });
     expect(result).toMatchInlineSnapshot("1544900798n");
   });
diff --git a/packages/thirdweb/src/transaction/read-contract.ts b/packages/thirdweb/src/transaction/read-contract.ts
index daff9a09a08..c549eac1a20 100644
--- a/packages/thirdweb/src/transaction/read-contract.ts
+++ b/packages/thirdweb/src/transaction/read-contract.ts
@@ -6,17 +6,8 @@ import {
   type ExtractAbiFunctionNames,
   parseAbiItem,
 } from "abitype";
-import { type TransactionRequest, decodeAbiParameters } from "viem";
+import { decodeAbiParameters, type TransactionRequest } from "viem";
 import type { ThirdwebContract } from "../contract/contract.js";
-import { isAbiFunction } from "./utils.js";
-
-import type { PrepareTransactionOptions } from "./prepare-transaction.js";
-import type {
-  BaseTransactionOptions,
-  ParamsOption,
-  ParseMethod,
-} from "./types.js";
-
 import { eth_call } from "../rpc/actions/eth_call.js";
 import { getRpcClient } from "../rpc/rpc.js";
 import { encodeAbiParameters } from "../utils/abi/encodeAbiParameters.js";
@@ -26,6 +17,13 @@ import {
 } from "../utils/abi/prepare-method.js";
 import { getAddress } from "../utils/address.js";
 import type { Hex } from "../utils/encoding/hex.js";
+import type { PrepareTransactionOptions } from "./prepare-transaction.js";
+import type {
+  BaseTransactionOptions,
+  ParamsOption,
+  ParseMethod,
+} from "./types.js";
+import { isAbiFunction } from "./utils.js";
 
 export type ReadContractResult<outputs extends readonly AbiParameter[]> = // if the outputs are 0 length, return never, invalid case
   outputs extends { length: 0 }
@@ -214,8 +212,8 @@ export async function readContract<
 
   const result = await eth_call(rpcRequest, {
     data: encodedData,
-    to: contract.address,
     from: options.from ? getAddress(options.from) : undefined,
+    to: contract.address,
   });
   // use the prepared method to decode the result
   const decoded = decodeAbiParameters(resolvedPreparedMethod[2], result);
diff --git a/packages/thirdweb/src/transaction/serialize-transaction.test.ts b/packages/thirdweb/src/transaction/serialize-transaction.test.ts
index fd3255329b0..82b87212406 100644
--- a/packages/thirdweb/src/transaction/serialize-transaction.test.ts
+++ b/packages/thirdweb/src/transaction/serialize-transaction.test.ts
@@ -4,19 +4,17 @@ import * as ox__TransactionEnvelopeEip2930 from "ox/TransactionEnvelopeEip2930";
 import * as ox__TransactionEnvelopeEip7702 from "ox/TransactionEnvelopeEip7702";
 import * as ox__TransactionEnvelopeLegacy from "ox/TransactionEnvelopeLegacy";
 import { assertType, describe, expect, test } from "vitest";
-
-import { type Address, checksumAddress } from "../utils/address.js";
-import { fromGwei, toWei } from "../utils/units.js";
-import { serializeTransaction } from "./serialize-transaction.js";
-
 import { wagmiTokenContractConfig } from "../../test/src/abis/wagmiToken.js";
 import { ANVIL_PKEY_A, TEST_ACCOUNT_B } from "../../test/src/test-wallets.js";
+import { type Address, checksumAddress } from "../utils/address.js";
 import { keccak256 } from "../utils/hashing/keccak256.js";
 import { sign } from "../utils/signatures/sign.js";
+import { fromGwei, toWei } from "../utils/units.js";
+import { serializeTransaction } from "./serialize-transaction.js";
 
 const BASE_TRANSACTION = {
-  to: checksumAddress(TEST_ACCOUNT_B.address),
   nonce: 785,
+  to: checksumAddress(TEST_ACCOUNT_B.address),
   value: toWei("1"),
 } as const;
 
@@ -63,11 +61,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("eip1559", () => {
 
   test("default (all zeros)", () => {
     const baseEip1559Zero = {
-      to: TEST_ACCOUNT_B.address as Address,
-      nonce: 0,
       chainId: 1,
       maxFeePerGas: 0n,
       maxPriorityFeePerGas: 0n,
+      nonce: 0,
+      to: TEST_ACCOUNT_B.address as Address,
       value: 0n,
     };
 
@@ -285,7 +283,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("eip1559", () => {
 describe("eip2930", () => {
   const BASE_EIP2930_TRANSACTION = {
     ...BASE_TRANSACTION,
-    chainId: 1,
     accessList: [
       {
         address: "0x1234512345123451234512345123451234512345",
@@ -294,6 +291,7 @@ describe("eip2930", () => {
         ],
       },
     ],
+    chainId: 1,
     gasPrice: fromGwei("2"),
   } as const;
 
@@ -316,12 +314,12 @@ describe("eip2930", () => {
 
   test("default (all zeros)", () => {
     const baseEip2930Zero = {
-      to: checksumAddress(TEST_ACCOUNT_B.address),
-      nonce: 0,
+      accessList: [],
       chainId: 1,
-      value: 0n,
       gasPrice: 0n,
-      accessList: [],
+      nonce: 0,
+      to: checksumAddress(TEST_ACCOUNT_B.address),
+      value: 0n,
     };
 
     const serialized = serializeTransaction({
@@ -344,7 +342,6 @@ describe("eip2930", () => {
 
   test("minimal (w/ accessList & gasPrice)", () => {
     const args = {
-      chainId: 1,
       accessList: [
         {
           address: "0x0000000000000000000000000000000000000000",
@@ -353,6 +350,7 @@ describe("eip2930", () => {
           ],
         },
       ],
+      chainId: 1,
       gasPrice: fromGwei("2"),
     } as const;
     const serialized = serializeTransaction({
@@ -663,10 +661,10 @@ describe("legacy", () => {
 
   test("default (all zeros)", () => {
     const baseLegacyZero = {
-      to: checksumAddress(TEST_ACCOUNT_B.address),
+      gasPrice: 0n,
       nonce: 0,
+      to: checksumAddress(TEST_ACCOUNT_B.address),
       value: 0n,
-      gasPrice: 0n,
     };
 
     const serialized = serializeTransaction({
@@ -777,9 +775,9 @@ describe("legacy", () => {
       nonce: BigInt(BASE_LEGACY_TRANSACTION.nonce),
       r: ox__Hex.toBigInt(signature.r),
       s: ox__Hex.toBigInt(signature.s),
+      type: "legacy",
       v: 28,
       yParity: 1,
-      type: "legacy",
     });
   });
 
@@ -831,9 +829,9 @@ describe("legacy", () => {
       nonce: BigInt(args.nonce),
       r: ox__Hex.toBigInt(signature.r),
       s: ox__Hex.toBigInt(signature.s),
-      yParity: 0,
       type: "legacy",
       v: 173,
+      yParity: 0,
     });
   });
 
diff --git a/packages/thirdweb/src/transaction/transaction-store.test.ts b/packages/thirdweb/src/transaction/transaction-store.test.ts
index 6fd07ecc076..61fc73a3a94 100644
--- a/packages/thirdweb/src/transaction/transaction-store.test.ts
+++ b/packages/thirdweb/src/transaction/transaction-store.test.ts
@@ -18,33 +18,33 @@ describe("transaction-store", () => {
   it("should update transactions on completion", async () => {
     addTransactionToStore({
       address: TEST_ACCOUNT_A.address as Address,
-      transactionHash: MOCK_TX_HASH,
       chainId: ANVIL_CHAIN.id,
+      transactionHash: MOCK_TX_HASH,
     });
 
     const transactions = getTransactionStore(TEST_ACCOUNT_A.address as Address);
     expect(transactions.getValue()).toEqual([
       {
-        transactionHash: MOCK_TX_HASH,
         chainId: ANVIL_CHAIN.id,
+        transactionHash: MOCK_TX_HASH,
       },
     ]);
 
     addTransactionToStore({
       address: TEST_ACCOUNT_A.address,
-      transactionHash: "0xabc",
       chainId: 1,
+      transactionHash: "0xabc",
     });
 
     const transactions2 = getTransactionStore(TEST_ACCOUNT_A.address);
     expect(transactions2.getValue()).toEqual([
       {
-        transactionHash: MOCK_TX_HASH,
         chainId: ANVIL_CHAIN.id,
+        transactionHash: MOCK_TX_HASH,
       },
       {
-        transactionHash: "0xabc",
         chainId: 1,
+        transactionHash: "0xabc",
       },
     ]);
   });
diff --git a/packages/thirdweb/src/transaction/transaction-store.ts b/packages/thirdweb/src/transaction/transaction-store.ts
index 95976bdb5fd..f24349134a5 100644
--- a/packages/thirdweb/src/transaction/transaction-store.ts
+++ b/packages/thirdweb/src/transaction/transaction-store.ts
@@ -1,7 +1,7 @@
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
 import { getTransactions } from "../insight/get-transactions.js";
-import { type Store, createStore } from "../reactive/store.js";
+import { createStore, type Store } from "../reactive/store.js";
 import type { Hex } from "../utils/encoding/hex.js";
 
 export type StoredTransaction = {
@@ -57,7 +57,7 @@ export function addTransactionToStore(options: {
 
   tranasctionStore.setValue([
     ...tranasctionStore.getValue(),
-    { transactionHash, chainId },
+    { chainId, transactionHash },
   ]);
 
   transactionsByAddress.set(address, tranasctionStore);
@@ -76,20 +76,20 @@ export async function getPastTransactions(options: {
     (Date.now() - 1 * 30 * 24 * 60 * 60 * 1000) / 1000,
   );
   const result = await getTransactions({
-    client,
-    walletAddress,
     chains: [chain],
+    client,
     queryOptions: {
       filter_block_timestamp_gte: oneMonthsAgoInSeconds,
       limit: 20,
     },
+    walletAddress,
   });
   return result.map((tx) => ({
-    transactionHash: tx.hash as Hex,
     chainId: tx.chain_id,
     receipt: {
       status: tx.status === 1 ? "success" : "failed",
       to: tx.to_address,
     },
+    transactionHash: tx.hash as Hex,
   }));
 }
diff --git a/packages/thirdweb/src/transaction/utils.ts b/packages/thirdweb/src/transaction/utils.ts
index de8df87c4cd..cb7a149d96e 100644
--- a/packages/thirdweb/src/transaction/utils.ts
+++ b/packages/thirdweb/src/transaction/utils.ts
@@ -21,8 +21,8 @@ export async function getTransactionGasCost(
 ) {
   try {
     const gasCost = await estimateGasCost({
-      transaction: tx,
       from,
+      transaction: tx,
     });
 
     const bufferCost = gasCost.wei / 10n;
@@ -37,8 +37,8 @@ export async function getTransactionGasCost(
     }
     // fallback if both fail, use the tx value + 1M * gas price
     const gasPrice = await getGasPrice({
-      client: tx.client,
       chain: tx.chain,
+      client: tx.client,
     });
 
     return 1_000_000n * gasPrice;
diff --git a/packages/thirdweb/src/utils/abi/encodeAbiParameters.ts b/packages/thirdweb/src/utils/abi/encodeAbiParameters.ts
index 078fe6781e3..885fbbe2791 100644
--- a/packages/thirdweb/src/utils/abi/encodeAbiParameters.ts
+++ b/packages/thirdweb/src/utils/abi/encodeAbiParameters.ts
@@ -1,14 +1,14 @@
 import type {
   AbiParameter,
-  AbiParameterToPrimitiveType,
   AbiParametersToPrimitiveTypes,
+  AbiParameterToPrimitiveType,
 } from "abitype";
 import * as ox__Hex from "ox/Hex";
 import { isAddress } from "../address.js";
 import { byteSize } from "../encoding/helpers/byte-size.js";
 import {
-  type Hex,
   boolToHex,
+  type Hex,
   numberToHex,
   padHex,
   stringToHex,
@@ -256,8 +256,8 @@ function encodeNumber(
   return {
     dynamic: false,
     encoded: numberToHex(value, {
-      size: 32,
       signed,
+      size: 32,
     }),
   };
 }
diff --git a/packages/thirdweb/src/utils/abi/normalizeFunctionParams.test.ts b/packages/thirdweb/src/utils/abi/normalizeFunctionParams.test.ts
index 79ed5fc09ff..5ede1ea0cb8 100644
--- a/packages/thirdweb/src/utils/abi/normalizeFunctionParams.test.ts
+++ b/packages/thirdweb/src/utils/abi/normalizeFunctionParams.test.ts
@@ -21,10 +21,10 @@ describe("normalizeFunctionParams", () => {
         { name: "_param1", type: "uint256" },
         { name: "_param2", type: "string" },
       ],
-      type: "function",
-      stateMutability: "pure",
       name: "test",
       outputs: [],
+      stateMutability: "pure",
+      type: "function",
     };
     const params = {
       param1: 123,
@@ -41,10 +41,10 @@ describe("normalizeFunctionParams", () => {
         { name: "_param1", type: "uint256" },
         { name: "_param2", type: "string" },
       ],
-      type: "function",
-      stateMutability: "pure",
       name: "test",
       outputs: [],
+      stateMutability: "pure",
+      type: "function",
     };
     const params = {
       _param1: 123,
@@ -58,10 +58,10 @@ describe("normalizeFunctionParams", () => {
   it("should throw an error if a parameter name is missing", () => {
     let abiFunction: AbiFunction = {
       inputs: [{ name: undefined, type: "uint256" }],
-      type: "function",
-      stateMutability: "pure",
       name: "test",
       outputs: [],
+      stateMutability: "pure",
+      type: "function",
     };
 
     expect(() => normalizeFunctionParams(abiFunction, {})).toThrow(
@@ -70,10 +70,10 @@ describe("normalizeFunctionParams", () => {
 
     abiFunction = {
       inputs: [{ name: "", type: "uint256" }],
-      type: "function",
-      stateMutability: "pure",
       name: "test",
       outputs: [],
+      stateMutability: "pure",
+      type: "function",
     };
 
     expect(() => normalizeFunctionParams(abiFunction, {})).toThrow(
@@ -82,10 +82,10 @@ describe("normalizeFunctionParams", () => {
 
     abiFunction = {
       inputs: [{ name: undefined, type: "uint256" }],
-      type: "function",
-      stateMutability: "pure",
       name: "test",
       outputs: [],
+      stateMutability: "pure",
+      type: "function",
     };
 
     const normalized = normalizeFunctionParams(abiFunction, { "*": 123 });
@@ -98,9 +98,9 @@ describe("normalizeFunctionParams", () => {
     const abiFunction: AbiFunction = {
       inputs: [{ name: "_param1", type: "uint256" }],
       name: "testFunction",
-      type: "function",
-      stateMutability: "pure",
       outputs: [],
+      stateMutability: "pure",
+      type: "function",
     };
 
     expect(() => normalizeFunctionParams(abiFunction, {})).toThrow(
@@ -114,10 +114,10 @@ describe("normalizeFunctionParams", () => {
         { name: "_param1", type: "uint256" },
         { name: "_param2", type: "string" },
       ],
-      type: "function",
-      stateMutability: "pure",
       name: "test",
       outputs: [],
+      stateMutability: "pure",
+      type: "function",
     };
     const params = {
       param1: 123,
diff --git a/packages/thirdweb/src/utils/address.ts b/packages/thirdweb/src/utils/address.ts
index 259d92d1ce5..8d3260ff1b7 100644
--- a/packages/thirdweb/src/utils/address.ts
+++ b/packages/thirdweb/src/utils/address.ts
@@ -52,15 +52,15 @@ export function checksumAddress(address: string): Address {
 
   const address_ = hexAddress.split("");
   for (let i = 0; i < 40; i += 2) {
-    // biome-ignore lint/style/noNonNullAssertion: <explanation>
+    // biome-ignore lint/style/noNonNullAssertion: TODO
     if (hash[i >> 1]! >> 4 >= 8 && address[i]) {
-      // biome-ignore lint/style/noNonNullAssertion: <explanation>
+      // biome-ignore lint/style/noNonNullAssertion: TODO
       address_[i] = address_[i]!.toUpperCase();
     }
 
-    // biome-ignore lint/style/noNonNullAssertion: <explanation>
+    // biome-ignore lint/style/noNonNullAssertion: TODO
     if ((hash[i >> 1]! & 0x0f) >= 8 && address[i + 1]) {
-      // biome-ignore lint/style/noNonNullAssertion: <explanation>
+      // biome-ignore lint/style/noNonNullAssertion: TODO
       address_[i + 1] = address_[i + 1]!.toUpperCase();
     }
   }
diff --git a/packages/thirdweb/src/utils/any-evm/compute-deployment-address.ts b/packages/thirdweb/src/utils/any-evm/compute-deployment-address.ts
index 80338db8929..58ed5966e4a 100644
--- a/packages/thirdweb/src/utils/any-evm/compute-deployment-address.ts
+++ b/packages/thirdweb/src/utils/any-evm/compute-deployment-address.ts
@@ -1,4 +1,4 @@
-import { type Hex, encodePacked } from "viem";
+import { encodePacked, type Hex } from "viem";
 import { getAddress } from "../address.js";
 import { ensureBytecodePrefix } from "../bytecode/prefix.js";
 import { isHex } from "../encoding/hex.js";
diff --git a/packages/thirdweb/src/utils/any-evm/compute-published-contract-address.ts b/packages/thirdweb/src/utils/any-evm/compute-published-contract-address.ts
index a4733a719f2..6e9f9849d7e 100644
--- a/packages/thirdweb/src/utils/any-evm/compute-published-contract-address.ts
+++ b/packages/thirdweb/src/utils/any-evm/compute-published-contract-address.ts
@@ -44,10 +44,10 @@ export async function computePublishedContractAddress(args: {
     version: args.version,
   });
   return computeContractAddress({
-    client: args.client,
     chain: args.chain,
-    contractMetadata,
+    client: args.client,
     constructorParams: args.constructorParams,
+    contractMetadata,
     salt: args.salt,
   });
 }
diff --git a/packages/thirdweb/src/utils/any-evm/compute-published-contract-deploy-info.ts b/packages/thirdweb/src/utils/any-evm/compute-published-contract-deploy-info.ts
index 7bc63eb34af..21051f86cbe 100644
--- a/packages/thirdweb/src/utils/any-evm/compute-published-contract-deploy-info.ts
+++ b/packages/thirdweb/src/utils/any-evm/compute-published-contract-deploy-info.ts
@@ -37,10 +37,10 @@ export async function computeDeploymentInfoFromContractId(args: {
     version: args.version,
   });
   return computeDeploymentInfoFromMetadata({
-    client,
     chain,
-    contractMetadata,
+    client,
     constructorParams,
+    contractMetadata,
     salt,
   });
 }
@@ -63,8 +63,8 @@ export async function computeDeploymentInfoFromMetadata(args: {
     processedConstructorParams = {};
     for (const key in definedConstructorParams) {
       processedConstructorParams[key] = await computeRefDeployments({
-        client,
         chain,
+        client,
         paramValue: definedConstructorParams[key] as
           | string
           | ImplementationConstructorParam,
@@ -74,21 +74,21 @@ export async function computeDeploymentInfoFromMetadata(args: {
 
   const isStylus = contractMetadata.metadata.language === "rust";
   return computeDeploymentInfoFromBytecode({
-    client: args.client,
-    chain: args.chain,
     abi: args.contractMetadata.abi,
     bytecode: await fetchBytecodeFromCompilerMetadata({
-      compilerMetadata: args.contractMetadata,
-      client: args.client,
       chain: args.chain,
+      client: args.client,
+      compilerMetadata: args.contractMetadata,
     }),
+    chain: args.chain,
+    client: args.client,
     constructorParams: processedConstructorParams,
-    salt: args.salt,
     extraDataWithUri: isStylus
       ? encodeExtraDataWithUri({
           metadataUri: contractMetadata.metadataUri,
         })
       : undefined,
+    salt: args.salt,
   });
 }
 
@@ -103,8 +103,8 @@ export async function computeDeploymentInfoFromBytecode(args: {
 }) {
   const { client, chain, constructorParams, salt, extraDataWithUri } = args;
   const create2FactoryAddress = await computeCreate2FactoryAddress({
-    client,
     chain,
+    client,
   });
   const bytecode = ensureBytecodePrefix(args.bytecode);
   const constructorAbi = args.abi.find((abi) => abi.type === "constructor") as
@@ -125,10 +125,10 @@ export async function computeDeploymentInfoFromBytecode(args: {
     : initBytecodeWithsalt;
   return {
     bytecode,
-    initCalldata,
-    encodedArgs,
     create2FactoryAddress,
-    salt,
+    encodedArgs,
     extraDataWithUri,
+    initCalldata,
+    salt,
   };
 }
diff --git a/packages/thirdweb/src/utils/any-evm/deploy-metadata.ts b/packages/thirdweb/src/utils/any-evm/deploy-metadata.ts
index 1ca04a82416..11ff5cb0ffb 100644
--- a/packages/thirdweb/src/utils/any-evm/deploy-metadata.ts
+++ b/packages/thirdweb/src/utils/any-evm/deploy-metadata.ts
@@ -26,8 +26,8 @@ export async function fetchDeployMetadata(
   options: FetchDeployMetadataOptions,
 ): Promise<FetchDeployMetadataResult> {
   const rawMeta: RawCompilerMetadata = await download({
-    uri: options.uri,
     client: options.client,
+    uri: options.uri,
   }).then((r) => r.json());
 
   const metadataUri = rawMeta.metadataUri;
@@ -39,8 +39,8 @@ export async function fetchDeployMetadata(
   return {
     ...rawMeta,
     ...parsedMeta,
-    version: rawMeta.version,
     name: rawMeta.name,
+    version: rawMeta.version,
   };
 }
 
@@ -89,8 +89,8 @@ export async function fetchBytecodeFromCompilerMetadata(options: {
         );
       }
       const deployBytecode = await download({
-        uri: bytecodeUri,
         client,
+        uri: bytecodeUri,
       }).then((res) => res.text() as Promise<Hex>);
 
       return deployBytecode;
diff --git a/packages/thirdweb/src/utils/any-evm/encode-extra-data-with-uri.ts b/packages/thirdweb/src/utils/any-evm/encode-extra-data-with-uri.ts
index 056cf8fad04..b5d1766ac81 100644
--- a/packages/thirdweb/src/utils/any-evm/encode-extra-data-with-uri.ts
+++ b/packages/thirdweb/src/utils/any-evm/encode-extra-data-with-uri.ts
@@ -1,9 +1,7 @@
 import { encodePacked } from "ox/AbiParameters";
 import { numberToHex, stringToHex } from "../encoding/hex.js";
 
-export function encodeExtraDataWithUri(options: {
-  metadataUri: string;
-}) {
+export function encodeExtraDataWithUri(options: { metadataUri: string }) {
   const uriHex = stringToHex(options.metadataUri);
   const lengthHex = numberToHex(uriHex.replace("0x", "").length / 2, {
     size: 1,
diff --git a/packages/thirdweb/src/utils/any-evm/keyless-transaction.test.ts b/packages/thirdweb/src/utils/any-evm/keyless-transaction.test.ts
index c2fbf759196..9dc3185e83f 100644
--- a/packages/thirdweb/src/utils/any-evm/keyless-transaction.test.ts
+++ b/packages/thirdweb/src/utils/any-evm/keyless-transaction.test.ts
@@ -8,10 +8,10 @@ import { getKeylessTransaction } from "./keyless-transaction.js";
 
 describe("getKeylessTransaction", () => {
   const mockTransaction = {
-    to: "0x1234567890123456789012345678901234567890",
-    value: 1000n,
     chainId: 1,
     gasPrice: 10n,
+    to: "0x1234567890123456789012345678901234567890",
+    value: 1000n,
   };
 
   const mockSignature = {
@@ -36,15 +36,15 @@ describe("getKeylessTransaction", () => {
     });
 
     const result = await getKeylessTransaction({
-      transaction: mockTransaction,
       signature: mockSignature,
+      transaction: mockTransaction,
     });
 
     expect(result.signerAddress).toBe(expectedAddress);
     expect(result.transaction).toBe(
       serializeTransaction({
-        transaction: mockTransaction,
         signature: mockSignature,
+        transaction: mockTransaction,
       }),
     );
   });
@@ -58,9 +58,9 @@ describe("getKeylessTransaction", () => {
 
     await expect(
       getKeylessTransaction({
-        transaction: mockTransaction,
         // biome-ignore lint/suspicious/noExplicitAny: Testing invalid data
         signature: invalidSignature as any,
+        transaction: mockTransaction,
       }),
     ).rejects.toThrow();
   });
@@ -70,9 +70,9 @@ describe("getKeylessTransaction", () => {
 
     await expect(
       getKeylessTransaction({
-        transaction: mockTransaction,
         // biome-ignore lint/suspicious/noExplicitAny: Testing invalid data
         signature: invalidSignature as any,
+        transaction: mockTransaction,
       }),
     ).rejects.toThrow();
   });
@@ -82,9 +82,9 @@ describe("getKeylessTransaction", () => {
 
     await expect(
       getKeylessTransaction({
+        signature: mockSignature,
         // biome-ignore lint/suspicious/noExplicitAny: Testing invalid data
         transaction: invalidTransaction as any,
-        signature: mockSignature,
       }),
     ).rejects.toThrow();
   });
diff --git a/packages/thirdweb/src/utils/any-evm/keyless-transaction.ts b/packages/thirdweb/src/utils/any-evm/keyless-transaction.ts
index 717adbfd13f..faece61ec9e 100644
--- a/packages/thirdweb/src/utils/any-evm/keyless-transaction.ts
+++ b/packages/thirdweb/src/utils/any-evm/keyless-transaction.ts
@@ -63,8 +63,8 @@ export async function getKeylessTransaction(
   // 3. Create the signed serialized txn string.
   // To be sent directly to the chain using a provider.
   const transaction = serializeTransaction({
-    transaction: options.transaction,
     signature: options.signature,
+    transaction: options.transaction,
   });
 
   return {
diff --git a/packages/thirdweb/src/utils/any-evm/zksync/computeDeploymentAddress.ts b/packages/thirdweb/src/utils/any-evm/zksync/computeDeploymentAddress.ts
index bc6b307fc43..457076c697f 100644
--- a/packages/thirdweb/src/utils/any-evm/zksync/computeDeploymentAddress.ts
+++ b/packages/thirdweb/src/utils/any-evm/zksync/computeDeploymentAddress.ts
@@ -20,9 +20,9 @@ export function computeDeploymentAddress(
     : keccakId("thirdweb");
 
   return create2Address({
-    sender: options.create2FactoryAddress,
     bytecodeHash: options.bytecodeHash,
-    salt: saltHash,
     input: options.encodedArgs,
+    salt: saltHash,
+    sender: options.create2FactoryAddress,
   });
 }
diff --git a/packages/thirdweb/src/utils/any-evm/zksync/constants.ts b/packages/thirdweb/src/utils/any-evm/zksync/constants.ts
index 51e9e5fd275..734f9d3699b 100644
--- a/packages/thirdweb/src/utils/any-evm/zksync/constants.ts
+++ b/packages/thirdweb/src/utils/any-evm/zksync/constants.ts
@@ -3,7 +3,6 @@ export const ZKSYNC_SINGLETON_FACTORY =
 export const CONTRACT_DEPLOYER_ADDRESS =
   "0x0000000000000000000000000000000000008006" as const;
 export const KNOWN_CODES_STORAGE = "0x0000000000000000000000000000000000008004";
-// biome-ignore lint/nursery/noProcessEnv: Used for testing
 export const PUBLISHED_PRIVATE_KEY = process.env.ZKSYNC_PUBLISHED_PRIVATE_KEY;
 
 export const singletonFactoryAbi = [
diff --git a/packages/thirdweb/src/utils/arweave.test.ts b/packages/thirdweb/src/utils/arweave.test.ts
index 8aa326377ab..cd85a04b676 100644
--- a/packages/thirdweb/src/utils/arweave.test.ts
+++ b/packages/thirdweb/src/utils/arweave.test.ts
@@ -26,7 +26,7 @@ describe("resolveArweaveScheme", () => {
   it("should resolve when passing a custom gatewayUrl WITHOUT a trailing slash", () => {
     const gatewayUrl = "https://customArweave-gateway.com";
     const uri = "ar://...";
-    const url = resolveArweaveScheme({ uri, gatewayUrl });
+    const url = resolveArweaveScheme({ gatewayUrl, uri });
     expect(url).toMatchInlineSnapshot(
       `"https://customArweave-gateway.com/..."`,
     );
@@ -35,7 +35,7 @@ describe("resolveArweaveScheme", () => {
   it("should resolve when passing a custom gatewayUrl WITH a trailing slash", () => {
     const gatewayUrl = "https://customArweave-gateway.com/";
     const uri = "ar://...";
-    const url = resolveArweaveScheme({ uri, gatewayUrl });
+    const url = resolveArweaveScheme({ gatewayUrl, uri });
     expect(url).toMatchInlineSnapshot(
       `"https://customArweave-gateway.com/..."`,
     );
diff --git a/packages/thirdweb/src/utils/bytecode/cbor-decode.ts b/packages/thirdweb/src/utils/bytecode/cbor-decode.ts
index 56811156512..8becca015f3 100644
--- a/packages/thirdweb/src/utils/bytecode/cbor-decode.ts
+++ b/packages/thirdweb/src/utils/bytecode/cbor-decode.ts
@@ -1,3 +1,5 @@
+/* biome-ignore-all lint: IGNORED */
+
 // original source: https://github.com/kriszyp/cbor-x/blob/master/decode.js
 // heavily modified to remove all non-essential code
 
@@ -28,62 +30,62 @@ let packedValues;
 let dataView;
 
 const defaultOptions = {
-  useRecords: false,
   mapsAsObjects: true,
+  useRecords: false,
 };
 
 function readFixedString(length) {
-	let result
-	if (length < 16) {
-		if (result = shortStringInJS(length))
-			return result
-	}
-	if (length > 64 && decoder)
-		return decoder.decode(src.subarray(position, position += length))
-	const end = position + length
-	const units = []
-	result = ''
-	while (position < end) {
-		const byte1 = src[position++]
-		if ((byte1 & 0x80) === 0) {
-			// 1 byte
-			units.push(byte1)
-		} else if ((byte1 & 0xe0) === 0xc0) {
-			// 2 bytes
-			const byte2 = src[position++] & 0x3f
-			units.push(((byte1 & 0x1f) << 6) | byte2)
-		} else if ((byte1 & 0xf0) === 0xe0) {
-			// 3 bytes
-			const byte2 = src[position++] & 0x3f
-			const byte3 = src[position++] & 0x3f
-			units.push(((byte1 & 0x1f) << 12) | (byte2 << 6) | byte3)
-		} else if ((byte1 & 0xf8) === 0xf0) {
-			// 4 bytes
-			const byte2 = src[position++] & 0x3f
-			const byte3 = src[position++] & 0x3f
-			const byte4 = src[position++] & 0x3f
-			let unit = ((byte1 & 0x07) << 0x12) | (byte2 << 0x0c) | (byte3 << 0x06) | byte4
-			if (unit > 0xffff) {
-				unit -= 0x10000
-				units.push(((unit >>> 10) & 0x3ff) | 0xd800)
-				unit = 0xdc00 | (unit & 0x3ff)
-			}
-			units.push(unit)
-		} else {
-			units.push(byte1)
-		}
+  let result;
+  if (length < 16) {
+    if ((result = shortStringInJS(length))) return result;
+  }
+  if (length > 64 && decoder)
+    return decoder.decode(src.subarray(position, (position += length)));
+  const end = position + length;
+  const units = [];
+  result = "";
+  while (position < end) {
+    const byte1 = src[position++];
+    if ((byte1 & 0x80) === 0) {
+      // 1 byte
+      units.push(byte1);
+    } else if ((byte1 & 0xe0) === 0xc0) {
+      // 2 bytes
+      const byte2 = src[position++] & 0x3f;
+      units.push(((byte1 & 0x1f) << 6) | byte2);
+    } else if ((byte1 & 0xf0) === 0xe0) {
+      // 3 bytes
+      const byte2 = src[position++] & 0x3f;
+      const byte3 = src[position++] & 0x3f;
+      units.push(((byte1 & 0x1f) << 12) | (byte2 << 6) | byte3);
+    } else if ((byte1 & 0xf8) === 0xf0) {
+      // 4 bytes
+      const byte2 = src[position++] & 0x3f;
+      const byte3 = src[position++] & 0x3f;
+      const byte4 = src[position++] & 0x3f;
+      let unit =
+        ((byte1 & 0x07) << 0x12) | (byte2 << 0x0c) | (byte3 << 0x06) | byte4;
+      if (unit > 0xffff) {
+        unit -= 0x10000;
+        units.push(((unit >>> 10) & 0x3ff) | 0xd800);
+        unit = 0xdc00 | (unit & 0x3ff);
+      }
+      units.push(unit);
+    } else {
+      units.push(byte1);
+    }
 
-		if (units.length >= 0x1000) {
-			result += fromCharCode.apply(String, units)
-			units.length = 0
-		}
-	}
+    if (units.length >= 0x1000) {
+      result += fromCharCode.apply(String, units);
+      units.length = 0;
+    }
+  }
 
-	if (units.length > 0) {
-		result += fromCharCode.apply(String, units)
-	}
+  if (units.length > 0) {
+    result += fromCharCode.apply(String, units);
+  }
 
-	return result
+  return result;
 }
 
 class Decoder {
@@ -95,7 +97,7 @@ class Decoder {
     return key;
   }
 
-  decode(source, end? = -1) {
+  decode(source, end = -1) {
     srcEnd = end > -1 ? end : source.length;
     position = 0;
     stringPosition = 0;
@@ -122,9 +124,11 @@ class Decoder {
         throw error;
       }
       throw new Error(
-        `Source must be a Uint8Array or Buffer but was a ${source && typeof source === "object"
+        `Source must be a Uint8Array or Buffer but was a ${
+          source && typeof source === "object"
             ? source.constructor.name
-            : typeof source}`,
+            : typeof source
+        }`,
       );
     }
     if (this instanceof Decoder) {
@@ -230,7 +234,8 @@ function read() {
         }
       }
       return readFixedString(token);
-    case 4: { // array
+    case 4: {
+      // array
       const array = new Array(token);
       for (let i = 0; i < token; i++) {
         array[i] = read();
@@ -238,7 +243,8 @@ function read() {
       return array;
     }
 
-    case 5: { // map
+    case 5: {
+      // map
       const object = {};
       for (let i = 0; i < token; i++) {
         object[safeKey(read())] = read();
@@ -287,143 +293,135 @@ function shortStringInJS(length) {
       if (length === 0) {
         return "";
       }
-        const a = src[position++];
-        if ((a & 0x80) > 1) {
-          position -= 1;
-          return;
-        }
-        return fromCharCode(a);
-    }
       const a = src[position++];
-      const b = src[position++];
-      if ((a & 0x80) > 0 || (b & 0x80) > 0) {
-        position -= 2;
-        return;
-      }
-      if (length < 3) {
-        return fromCharCode(a, b);
-      }
-      const c = src[position++];
-      if ((c & 0x80) > 0) {
-        position -= 3;
+      if ((a & 0x80) > 1) {
+        position -= 1;
         return;
       }
-      return fromCharCode(a, b, c);
-  }
+      return fromCharCode(a);
+    }
     const a = src[position++];
     const b = src[position++];
+    if ((a & 0x80) > 0 || (b & 0x80) > 0) {
+      position -= 2;
+      return;
+    }
+    if (length < 3) {
+      return fromCharCode(a, b);
+    }
     const c = src[position++];
-    const d = src[position++];
-    if ((a & 0x80) > 0 || (b & 0x80) > 0 || (c & 0x80) > 0 || (d & 0x80) > 0) {
-      position -= 4;
+    if ((c & 0x80) > 0) {
+      position -= 3;
       return;
     }
-    if (length < 6) {
-      if (length === 4) {
-        return fromCharCode(a, b, c, d);
-      }
-        const e = src[position++];
-        if ((e & 0x80) > 0) {
-          position -= 5;
-          return;
-        }
-        return fromCharCode(a, b, c, d, e);
-    }if (length < 8) {
-      const e = src[position++];
-      const f = src[position++];
-      if ((e & 0x80) > 0 || (f & 0x80) > 0) {
-        position -= 6;
-        return;
-      }
-      if (length < 7) {
-        return fromCharCode(a, b, c, d, e, f);
-      }
-      const g = src[position++];
-      if ((g & 0x80) > 0) {
-        position -= 7;
-        return;
-      }
-      return fromCharCode(a, b, c, d, e, f, g);
+    return fromCharCode(a, b, c);
+  }
+  const a = src[position++];
+  const b = src[position++];
+  const c = src[position++];
+  const d = src[position++];
+  if ((a & 0x80) > 0 || (b & 0x80) > 0 || (c & 0x80) > 0 || (d & 0x80) > 0) {
+    position -= 4;
+    return;
+  }
+  if (length < 6) {
+    if (length === 4) {
+      return fromCharCode(a, b, c, d);
     }
-      const e = src[position++];
-      const f = src[position++];
-      const g = src[position++];
-      const h = src[position++];
-      if (
-        (e & 0x80) > 0 ||
-        (f & 0x80) > 0 ||
-        (g & 0x80) > 0 ||
-        (h & 0x80) > 0
-      ) {
-        position -= 8;
-        return;
-      }
-      if (length < 10) {
-        if (length === 8) {
-          return fromCharCode(a, b, c, d, e, f, g, h);
-        }
-          const i = src[position++];
-          if ((i & 0x80) > 0) {
-            position -= 9;
-            return;
-          }
-          return fromCharCode(a, b, c, d, e, f, g, h, i);
-      }if (length < 12) {
-        const i = src[position++];
-        const j = src[position++];
-        if ((i & 0x80) > 0 || (j & 0x80) > 0) {
-          position -= 10;
-          return;
-        }
-        if (length < 11) {
-          return fromCharCode(a, b, c, d, e, f, g, h, i, j);
-        }
-        const k = src[position++];
-        if ((k & 0x80) > 0) {
-          position -= 11;
-          return;
-        }
-        return fromCharCode(a, b, c, d, e, f, g, h, i, j, k);
-      }
-        const i = src[position++];
-        const j = src[position++];
-        const k = src[position++];
-        const l = src[position++];
-        if (
-          (i & 0x80) > 0 ||
-          (j & 0x80) > 0 ||
-          (k & 0x80) > 0 ||
-          (l & 0x80) > 0
-        ) {
-          position -= 12;
-          return;
-        }
-        if (length < 14) {
-          if (length === 12) {
-            return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l);
-          }
-            const m = src[position++];
-            if ((m & 0x80) > 0) {
-              position -= 13;
-              return;
-            }
-            return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m);
-        }
-          const m = src[position++];
-          const n = src[position++];
-          if ((m & 0x80) > 0 || (n & 0x80) > 0) {
-            position -= 14;
-            return;
-          }
-          if (length < 15) {
-            return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n);
-          }
-          const o = src[position++];
-          if ((o & 0x80) > 0) {
-            position -= 15;
-            return;
-          }
-          return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o);
+    const e = src[position++];
+    if ((e & 0x80) > 0) {
+      position -= 5;
+      return;
+    }
+    return fromCharCode(a, b, c, d, e);
+  }
+  if (length < 8) {
+    const e = src[position++];
+    const f = src[position++];
+    if ((e & 0x80) > 0 || (f & 0x80) > 0) {
+      position -= 6;
+      return;
+    }
+    if (length < 7) {
+      return fromCharCode(a, b, c, d, e, f);
+    }
+    const g = src[position++];
+    if ((g & 0x80) > 0) {
+      position -= 7;
+      return;
+    }
+    return fromCharCode(a, b, c, d, e, f, g);
+  }
+  const e = src[position++];
+  const f = src[position++];
+  const g = src[position++];
+  const h = src[position++];
+  if ((e & 0x80) > 0 || (f & 0x80) > 0 || (g & 0x80) > 0 || (h & 0x80) > 0) {
+    position -= 8;
+    return;
+  }
+  if (length < 10) {
+    if (length === 8) {
+      return fromCharCode(a, b, c, d, e, f, g, h);
+    }
+    const i = src[position++];
+    if ((i & 0x80) > 0) {
+      position -= 9;
+      return;
+    }
+    return fromCharCode(a, b, c, d, e, f, g, h, i);
+  }
+  if (length < 12) {
+    const i = src[position++];
+    const j = src[position++];
+    if ((i & 0x80) > 0 || (j & 0x80) > 0) {
+      position -= 10;
+      return;
+    }
+    if (length < 11) {
+      return fromCharCode(a, b, c, d, e, f, g, h, i, j);
+    }
+    const k = src[position++];
+    if ((k & 0x80) > 0) {
+      position -= 11;
+      return;
+    }
+    return fromCharCode(a, b, c, d, e, f, g, h, i, j, k);
+  }
+  const i = src[position++];
+  const j = src[position++];
+  const k = src[position++];
+  const l = src[position++];
+  if ((i & 0x80) > 0 || (j & 0x80) > 0 || (k & 0x80) > 0 || (l & 0x80) > 0) {
+    position -= 12;
+    return;
+  }
+  if (length < 14) {
+    if (length === 12) {
+      return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l);
+    }
+    const m = src[position++];
+    if ((m & 0x80) > 0) {
+      position -= 13;
+      return;
+    }
+    return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m);
+  }
+  const m = src[position++];
+  const n = src[position++];
+  if ((m & 0x80) > 0 || (n & 0x80) > 0) {
+    position -= 14;
+    return;
+  }
+  if (length < 15) {
+    return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n);
+  }
+  const o = src[position++];
+  if ((o & 0x80) > 0) {
+    position -= 15;
+    return;
+  }
+  return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o);
 }
 
 function readBin(length) {
@@ -505,4 +503,4 @@ for (let i = 0; i < 256; i++) {
     Number(`1e${Math.floor(45.15 - i * 0.30103)}`))();
 }
 const defaultDecoder = new Decoder();
-export const decode = defaultDecoder.decode;
\ No newline at end of file
+export const decode = defaultDecoder.decode;
diff --git a/packages/thirdweb/src/utils/bytecode/extractMinimalProxyImplementationAddress.ts b/packages/thirdweb/src/utils/bytecode/extractMinimalProxyImplementationAddress.ts
index 9c6b3646ca9..b877d9cb4c6 100644
--- a/packages/thirdweb/src/utils/bytecode/extractMinimalProxyImplementationAddress.ts
+++ b/packages/thirdweb/src/utils/bytecode/extractMinimalProxyImplementationAddress.ts
@@ -14,7 +14,6 @@ export function extractMinimalProxyImplementationAddress(
   bytecode: string,
 ): string | undefined {
   if (!bytecode.startsWith("0x")) {
-    // biome-ignore lint/style/noParameterAssign: perf
     bytecode = `0x${bytecode}`;
   }
   // EIP-1167 clone minimal proxy - https://eips.ethereum.org/EIPS/eip-1167
diff --git a/packages/thirdweb/src/utils/bytecode/handleBeaconProxyPattern.test.ts b/packages/thirdweb/src/utils/bytecode/handleBeaconProxyPattern.test.ts
index 00fd883a915..8e9e5045679 100644
--- a/packages/thirdweb/src/utils/bytecode/handleBeaconProxyPattern.test.ts
+++ b/packages/thirdweb/src/utils/bytecode/handleBeaconProxyPattern.test.ts
@@ -23,8 +23,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       // which was the original issue we were trying to fix
       const mockContract = {
         address: "0x0000000000000000000000000000000000000001",
-        client: TEST_CLIENT,
         chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       } as const;
 
       // Mock getBytecode to return a minimal proxy bytecode that will trigger the beacon check
diff --git a/packages/thirdweb/src/utils/bytecode/resolveImplementation.test.ts b/packages/thirdweb/src/utils/bytecode/resolveImplementation.test.ts
index 574c57b31b2..cd4843e093a 100644
--- a/packages/thirdweb/src/utils/bytecode/resolveImplementation.test.ts
+++ b/packages/thirdweb/src/utils/bytecode/resolveImplementation.test.ts
@@ -28,7 +28,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect((await resolved).address).to.equal(NFT_DROP_IMPLEMENTATION);
     });
 
-    it("should extract implementation address for matic proxy contract", async () => {
+    // currently disabled because it's flaky
+    it.skip("should extract implementation address for matic proxy contract", async () => {
       const resolved = resolveImplementation(POLYGON_USDT_PROXY_CONTRACT);
       expect((await resolved).address).to.equal(
         POLYGON_USDT_IMPLEMENTATION.toLowerCase(),
@@ -44,28 +45,28 @@ describe.runIf(process.env.TW_SECRET_KEY)(
 
     it("should extract implementation address for ERC1967 proxy contract", async () => {
       const implementationAddress = await deployContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
+        abi: [],
         account: TEST_ACCOUNT_A,
         bytecode: DUMMY_BYTECODE,
-        abi: [],
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
       });
 
       const proxyAddress = await deployContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
+        abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
         account: TEST_ACCOUNT_A,
         bytecode: ERC1967_PROXY_BYTECODE,
-        abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
         constructorParams: {
-          logic: implementationAddress,
           data: "0x",
+          logic: implementationAddress,
         },
       });
 
       const proxy = getContract({
-        chain: ANVIL_CHAIN,
         address: proxyAddress,
+        chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
       });
 
diff --git a/packages/thirdweb/src/utils/bytecode/resolveImplementation.ts b/packages/thirdweb/src/utils/bytecode/resolveImplementation.ts
index d4a792874c1..e2ab742fc53 100644
--- a/packages/thirdweb/src/utils/bytecode/resolveImplementation.ts
+++ b/packages/thirdweb/src/utils/bytecode/resolveImplementation.ts
@@ -1,5 +1,5 @@
 import { getBytecode } from "../../contract/actions/get-bytecode.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { eth_getStorageAt } from "../../rpc/actions/eth_getStorageAt.js";
 import { getRpcClient } from "../../rpc/rpc.js";
 import { readContract } from "../../transaction/read-contract.js";
@@ -52,7 +52,6 @@ export async function resolveImplementation(
   if (beacon && beacon !== AddressZero) {
     // In case of a BeaconProxy, it is setup as BeaconProxy --> Beacon --> Implementation
     // Hence we replace the proxy address with Beacon address, and continue further resolving below
-    // biome-ignore lint/style/noParameterAssign: we purposefully mutate the contract object here
     contract = getContract({
       ...contract,
       address: beacon,
@@ -100,8 +99,8 @@ async function getBeaconFromStorageSlot(
    * bytes32(uint256(keccak256('eip1967.proxy.beacon')) - 1))
    */
   const rpcRequest = getRpcClient({
-    client: contract.client,
     chain: contract.chain,
+    client: contract.client,
   });
 
   try {
@@ -124,8 +123,8 @@ async function getImplementationFromStorageSlot(
   contract: ThirdwebContract<any>,
 ): Promise<string | undefined> {
   const rpcRequest = getRpcClient({
-    client: contract.client,
     chain: contract.chain,
+    client: contract.client,
   });
 
   try {
@@ -161,17 +160,17 @@ async function getImplementationFromStorageSlot(
 }
 
 const UPGRADEABLE_PROXY_ABI = {
-  type: "function",
-  name: "implementation",
   inputs: [],
+  name: "implementation",
   outputs: [
     {
-      type: "address",
-      name: "",
       internalType: "address",
+      name: "",
+      type: "address",
     },
   ],
   stateMutability: "view",
+  type: "function",
 } as const;
 
 async function getImplementationFromContractCall(
diff --git a/packages/thirdweb/src/utils/contract/fetch-contract-metadata.test.ts b/packages/thirdweb/src/utils/contract/fetch-contract-metadata.test.ts
index 7b644ef4d0b..45ebcc6e40d 100644
--- a/packages/thirdweb/src/utils/contract/fetch-contract-metadata.test.ts
+++ b/packages/thirdweb/src/utils/contract/fetch-contract-metadata.test.ts
@@ -8,8 +8,8 @@ import {
 describe("fetchContractMetadata", () => {
   it("should return a json object from a valid base64 encoded json", async () => {
     const validContractMetadata = {
-      name: "contract name",
       description: "contract description",
+      name: "contract name",
     };
     const contractURIBase64 = `data:application/json;base64,${btoa(
       JSON.stringify(validContractMetadata),
diff --git a/packages/thirdweb/src/utils/domain.test.ts b/packages/thirdweb/src/utils/domain.test.ts
index 4dbb5201935..8c22e32f024 100644
--- a/packages/thirdweb/src/utils/domain.test.ts
+++ b/packages/thirdweb/src/utils/domain.test.ts
@@ -8,16 +8,16 @@ import {
 
 describe("Thirdweb Domains", () => {
   const defaultDomains = {
-    rpc: "rpc.thirdweb.com",
-    social: "social.thirdweb.com",
+    analytics: "c.thirdweb.com",
+    bridge: "bridge.thirdweb.com",
+    bundler: "bundler.thirdweb.com",
+    engineCloud: "engine.thirdweb.com",
     inAppWallet: "embedded-wallet.thirdweb.com",
+    insight: "insight.thirdweb.com",
     pay: "pay.thirdweb.com",
+    rpc: "rpc.thirdweb.com",
+    social: "social.thirdweb.com",
     storage: "storage.thirdweb.com",
-    bundler: "bundler.thirdweb.com",
-    analytics: "c.thirdweb.com",
-    insight: "insight.thirdweb.com",
-    engineCloud: "engine.thirdweb.com",
-    bridge: "bridge.thirdweb.com",
   };
 
   beforeEach(() => {
@@ -34,14 +34,14 @@ describe("Thirdweb Domains", () => {
   describe("setThirdwebDomains", () => {
     it("should override specific domains while keeping others as default", () => {
       setThirdwebDomains({
-        rpc: "custom.rpc.com",
         analytics: "custom.analytics.com",
+        rpc: "custom.rpc.com",
       });
 
       expect(getThirdwebDomains()).toEqual({
         ...defaultDomains,
-        rpc: "custom.rpc.com",
         analytics: "custom.analytics.com",
+        rpc: "custom.rpc.com",
       });
     });
 
diff --git a/packages/thirdweb/src/utils/domains.ts b/packages/thirdweb/src/utils/domains.ts
index f7f123c2d2a..9e345046ee9 100644
--- a/packages/thirdweb/src/utils/domains.ts
+++ b/packages/thirdweb/src/utils/domains.ts
@@ -63,30 +63,30 @@ const DEFAULT_ENGINE_CLOUD_URL = "engine.thirdweb.com";
 const DEFAULT_BRIDGE_URL = "bridge.thirdweb.com";
 
 let domains: { [k in keyof DomainOverrides]-?: string } = {
-  rpc: DEFAULT_RPC_URL,
+  analytics: DEFAULT_ANALYTICS_URL,
+  bridge: DEFAULT_BRIDGE_URL,
+  bundler: DEFAULT_BUNDLER_URL,
+  engineCloud: DEFAULT_ENGINE_CLOUD_URL,
   inAppWallet: DEFAULT_IN_APP_WALLET_URL,
-  social: DEFAULT_SOCIAL_URL,
+  insight: DEFAULT_INSIGHT_URL,
   pay: DEFAULT_PAY_URL,
+  rpc: DEFAULT_RPC_URL,
+  social: DEFAULT_SOCIAL_URL,
   storage: DEFAULT_STORAGE_URL,
-  bundler: DEFAULT_BUNDLER_URL,
-  analytics: DEFAULT_ANALYTICS_URL,
-  insight: DEFAULT_INSIGHT_URL,
-  engineCloud: DEFAULT_ENGINE_CLOUD_URL,
-  bridge: DEFAULT_BRIDGE_URL,
 };
 
 export const setThirdwebDomains = (DomainOverrides: DomainOverrides) => {
   domains = {
-    rpc: DomainOverrides.rpc ?? DEFAULT_RPC_URL,
+    analytics: DomainOverrides.analytics ?? DEFAULT_ANALYTICS_URL,
+    bridge: DomainOverrides.bridge ?? DEFAULT_BRIDGE_URL,
+    bundler: DomainOverrides.bundler ?? DEFAULT_BUNDLER_URL,
+    engineCloud: DomainOverrides.engineCloud ?? DEFAULT_ENGINE_CLOUD_URL,
     inAppWallet: DomainOverrides.inAppWallet ?? DEFAULT_IN_APP_WALLET_URL,
-    social: DomainOverrides.social ?? DEFAULT_SOCIAL_URL,
+    insight: DomainOverrides.insight ?? DEFAULT_INSIGHT_URL,
     pay: DomainOverrides.pay ?? DEFAULT_PAY_URL,
+    rpc: DomainOverrides.rpc ?? DEFAULT_RPC_URL,
+    social: DomainOverrides.social ?? DEFAULT_SOCIAL_URL,
     storage: DomainOverrides.storage ?? DEFAULT_STORAGE_URL,
-    bundler: DomainOverrides.bundler ?? DEFAULT_BUNDLER_URL,
-    analytics: DomainOverrides.analytics ?? DEFAULT_ANALYTICS_URL,
-    insight: DomainOverrides.insight ?? DEFAULT_INSIGHT_URL,
-    engineCloud: DomainOverrides.engineCloud ?? DEFAULT_ENGINE_CLOUD_URL,
-    bridge: DomainOverrides.bridge ?? DEFAULT_BRIDGE_URL,
   };
 };
 
diff --git a/packages/thirdweb/src/utils/encoding/hex.test.ts b/packages/thirdweb/src/utils/encoding/hex.test.ts
index cf8488d4de9..befb4d9b217 100644
--- a/packages/thirdweb/src/utils/encoding/hex.test.ts
+++ b/packages/thirdweb/src/utils/encoding/hex.test.ts
@@ -8,7 +8,7 @@ describe("hex.ts", () => {
   });
 
   it("should convert", () => {
-    const result = numberToHex(100n, { size: 32, signed: false });
+    const result = numberToHex(100n, { signed: false, size: 32 });
     expect(result).toBe(
       "0x0000000000000000000000000000000000000000000000000000000000000064",
     );
@@ -48,7 +48,7 @@ describe("hex.ts", () => {
    */
   it("should work with string !!!!", () => {
     // @ts-ignore Intentional
-    const result = numberToHex("100", { size: 32, signed: false });
+    const result = numberToHex("100", { signed: false, size: 32 });
     expect(result).toBe(
       "0x0000000000000000000000000000000000000000000000000000000000000064",
     );
@@ -146,7 +146,7 @@ describe("fromHex WITH parameter", () => {
     expect(
       fromHex(
         "0x0000000000000000000000000000000000000000000000000000000000000001",
-        { to: "number", size: 32 },
+        { size: 32, to: "number" },
       ),
     ).toBe(1);
   });
@@ -155,7 +155,7 @@ describe("fromHex WITH parameter", () => {
     expect(
       fromHex(
         "0x0000000000000000000000000000000000000000000000000000000000000001",
-        { to: "bigint", size: 32 },
+        { size: 32, to: "bigint" },
       ),
     ).toBe(1n);
   });
@@ -164,7 +164,7 @@ describe("fromHex WITH parameter", () => {
     expect(
       fromHex(
         "0x3100000000000000000000000000000000000000000000000000000000000000",
-        { to: "string", size: 32 },
+        { size: 32, to: "string" },
       ),
     ).toBe("1");
   });
@@ -173,7 +173,7 @@ describe("fromHex WITH parameter", () => {
     expect(
       fromHex(
         "0x0000000000000000000000000000000000000000000000000000000000000001",
-        { to: "boolean", size: 32 },
+        { size: 32, to: "boolean" },
       ),
     ).toBe(true);
   });
@@ -182,7 +182,7 @@ describe("fromHex WITH parameter", () => {
     expect(
       fromHex(
         "0x0000000000000000000000000000000000000000000000000000000000000000",
-        { to: "boolean", size: 32 },
+        { size: 32, to: "boolean" },
       ),
     ).toBe(false);
   });
@@ -191,7 +191,7 @@ describe("fromHex WITH parameter", () => {
     expect(
       fromHex(
         "0x2aff008040000000000000000000000000000000000000000000000000000000",
-        { to: "bytes", size: 32 },
+        { size: 32, to: "bytes" },
       ).toString(),
     ).toStrictEqual(
       "42,255,0,128,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
@@ -205,13 +205,13 @@ describe("padHex", () => {
   });
 
   it("should produce correct result if padding direction is right", () => {
-    expect(padHex("0x1", { size: 10, dir: "right" })).toBe(
+    expect(padHex("0x1", { dir: "right", size: 10 })).toBe(
       "0x10000000000000000000",
     );
   });
 
   it("should produce correct result if padding direction is Left", () => {
-    expect(padHex("0x1", { size: 10, dir: "left" })).toBe(
+    expect(padHex("0x1", { dir: "left", size: 10 })).toBe(
       "0x00000000000000000001",
     );
   });
diff --git a/packages/thirdweb/src/utils/encoding/hex.ts b/packages/thirdweb/src/utils/encoding/hex.ts
index b42d362dc35..8182e5f0805 100644
--- a/packages/thirdweb/src/utils/encoding/hex.ts
+++ b/packages/thirdweb/src/utils/encoding/hex.ts
@@ -1,5 +1,6 @@
 import * as ox__Hex from "ox/Hex";
-export { isHex, type IsHexOptions } from "./helpers/is-hex.js";
+
+export { type IsHexOptions, isHex } from "./helpers/is-hex.js";
 
 export type Hex = ox__Hex.Hex;
 
diff --git a/packages/thirdweb/src/utils/encoding/to-bytes.ts b/packages/thirdweb/src/utils/encoding/to-bytes.ts
index 7e2531f5d95..5abd38c3692 100644
--- a/packages/thirdweb/src/utils/encoding/to-bytes.ts
+++ b/packages/thirdweb/src/utils/encoding/to-bytes.ts
@@ -1,7 +1,6 @@
 import * as ox__Bytes from "ox/Bytes";
 import { isHex } from "./helpers/is-hex.js";
-import type { Hex } from "./hex.js";
-import type { NumberToHexOpts } from "./hex.js";
+import type { Hex, NumberToHexOpts } from "./hex.js";
 
 export type ToBytesParameters = {
   /** Size of the output bytes. */
diff --git a/packages/thirdweb/src/utils/extensions/airdrop/fetch-proofs-erc1155.ts b/packages/thirdweb/src/utils/extensions/airdrop/fetch-proofs-erc1155.ts
index 0a057e1793f..577ac6788d2 100644
--- a/packages/thirdweb/src/utils/extensions/airdrop/fetch-proofs-erc1155.ts
+++ b/packages/thirdweb/src/utils/extensions/airdrop/fetch-proofs-erc1155.ts
@@ -112,8 +112,8 @@ export async function fetchProofsERC1155(options: {
 
   return {
     proof,
+    quantity: BigInt(entry.amount),
     recipient: recipient as Address,
     tokenId: BigInt(entry.tokenId),
-    quantity: BigInt(entry.amount),
   };
 }
diff --git a/packages/thirdweb/src/utils/extensions/airdrop/fetch-proofs-erc20.ts b/packages/thirdweb/src/utils/extensions/airdrop/fetch-proofs-erc20.ts
index fdc3b31a39a..7f046555ba7 100644
--- a/packages/thirdweb/src/utils/extensions/airdrop/fetch-proofs-erc20.ts
+++ b/packages/thirdweb/src/utils/extensions/airdrop/fetch-proofs-erc20.ts
@@ -121,7 +121,7 @@ export async function fetchProofsERC20(options: {
 
   return {
     proof,
-    recipient: recipient as Address,
     quantity,
+    recipient: recipient as Address,
   };
 }
diff --git a/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc1155.ts b/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc1155.ts
index 203472be6a8..1db3051bd84 100644
--- a/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc1155.ts
+++ b/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc1155.ts
@@ -50,9 +50,9 @@ export async function processSnapshotERC1155(options: {
   const shardsToUpload = [];
   for (const [shardId, entries] of Object.entries(shards)) {
     const data: ShardDataERC1155 = {
+      entries,
       // biome-ignore lint/style/noNonNullAssertion: we know this is in bounds
       proofs: tree.getHexProof(roots[shardId]!),
-      entries,
     };
     shardsToUpload.push({
       data: stringify(data),
@@ -79,12 +79,12 @@ export async function processSnapshotERC1155(options: {
   });
   // 7. assmeble the final sharded merkle tree info
   const shardedMerkleInfo: ShardedMerkleTreeInfo = {
-    merkleRoot: tree.getHexRoot(),
     baseUri,
+    isShardedMerkleTree: true,
+    merkleRoot: tree.getHexRoot(),
     originalEntriesUri,
     shardNybbles,
     tokenDecimals: 0,
-    isShardedMerkleTree: true,
   };
   // 8. upload the final sharded merkle tree info
   const finalUri = await upload({
diff --git a/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc20.ts b/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc20.ts
index f97cdaea39b..de00f56f753 100644
--- a/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc20.ts
+++ b/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc20.ts
@@ -52,9 +52,9 @@ export async function processSnapshotERC20(options: {
   const shardsToUpload = [];
   for (const [shardId, entries] of Object.entries(shards)) {
     const data: ShardDataERC20 = {
+      entries,
       // biome-ignore lint/style/noNonNullAssertion: we know this is in bounds
       proofs: tree.getHexProof(roots[shardId]!),
-      entries,
     };
     shardsToUpload.push({
       data: stringify(data),
@@ -81,12 +81,12 @@ export async function processSnapshotERC20(options: {
   });
   // 7. assmeble the final sharded merkle tree info
   const shardedMerkleInfo: ShardedMerkleTreeInfo = {
-    merkleRoot: tree.getHexRoot(),
     baseUri,
+    isShardedMerkleTree: true,
+    merkleRoot: tree.getHexRoot(),
     originalEntriesUri,
     shardNybbles,
     tokenDecimals: options.tokenDecimals,
-    isShardedMerkleTree: true,
   };
   // 8. upload the final sharded merkle tree info
   const finalUri = await upload({
diff --git a/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc721.ts b/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc721.ts
index 1803431afb6..183bbdb2d58 100644
--- a/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc721.ts
+++ b/packages/thirdweb/src/utils/extensions/airdrop/process-snapshot-erc721.ts
@@ -50,9 +50,9 @@ export async function processSnapshotERC721(options: {
   const shardsToUpload = [];
   for (const [shardId, entries] of Object.entries(shards)) {
     const data: ShardDataERC721 = {
+      entries,
       // biome-ignore lint/style/noNonNullAssertion: we know this is in bounds
       proofs: tree.getHexProof(roots[shardId]!),
-      entries,
     };
     shardsToUpload.push({
       data: stringify(data),
@@ -79,12 +79,12 @@ export async function processSnapshotERC721(options: {
   });
   // 7. assmeble the final sharded merkle tree info
   const shardedMerkleInfo: ShardedMerkleTreeInfo = {
-    merkleRoot: tree.getHexRoot(),
     baseUri,
+    isShardedMerkleTree: true,
+    merkleRoot: tree.getHexRoot(),
     originalEntriesUri,
     shardNybbles,
     tokenDecimals: 0,
-    isShardedMerkleTree: true,
   };
   // 8. upload the final sharded merkle tree info
   const finalUri = await upload({
diff --git a/packages/thirdweb/src/utils/extensions/convert-erc20-amount.ts b/packages/thirdweb/src/utils/extensions/convert-erc20-amount.ts
index e3c02aff5ab..f2e716f07c6 100644
--- a/packages/thirdweb/src/utils/extensions/convert-erc20-amount.ts
+++ b/packages/thirdweb/src/utils/extensions/convert-erc20-amount.ts
@@ -30,9 +30,9 @@ export async function convertErc20Amount(
       }
       // otherwise get the decimals of the currency
       const currencyContract = getContract({
-        client: options.client,
-        chain: options.chain,
         address: options.erc20Address,
+        chain: options.chain,
+        client: options.client,
       });
       const { decimals } = await import(
         "../../extensions/erc20/read/decimals.js"
diff --git a/packages/thirdweb/src/utils/extensions/drops/fetch-proofs-for-claimers.ts b/packages/thirdweb/src/utils/extensions/drops/fetch-proofs-for-claimers.ts
index de36f8c828f..cce70b7ac9a 100644
--- a/packages/thirdweb/src/utils/extensions/drops/fetch-proofs-for-claimers.ts
+++ b/packages/thirdweb/src/utils/extensions/drops/fetch-proofs-for-claimers.ts
@@ -1,8 +1,8 @@
 import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import {
-  ZERO_ADDRESS,
   isNativeTokenAddress,
+  ZERO_ADDRESS,
 } from "../../../constants/addresses.js";
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import { MerkleTree } from "../../../merkletree/MerkleTree.js";
@@ -63,9 +63,9 @@ export async function fetchProofsForClaimer(options: {
   const hashedEntries = await Promise.all(
     shardData.entries.map(async (entry) => {
       return hashEntryFn({
-        entry,
         chain: contract.chain,
         client: contract.client,
+        entry,
         tokenDecimals: options.tokenDecimals,
       });
     }),
@@ -81,9 +81,9 @@ export async function fetchProofsForClaimer(options: {
   const proof = tree
     .getHexProof(
       await hashEntryFn({
-        entry,
         chain: contract.chain,
         client: contract.client,
+        entry,
         tokenDecimals: options.tokenDecimals,
       }),
     )
@@ -110,15 +110,15 @@ export async function fetchProofsForClaimer(options: {
   })();
 
   return {
+    currency: currencyAddress,
+    pricePerToken: convertQuantity({
+      quantity: entry.price || "unlimited",
+      tokenDecimals: currencyDecimals,
+    }),
     proof,
     quantityLimitPerWallet: convertQuantity({
       quantity: entry.maxClaimable || "unlimited",
       tokenDecimals: options.tokenDecimals,
     }),
-    pricePerToken: convertQuantity({
-      quantity: entry.price || "unlimited",
-      tokenDecimals: currencyDecimals,
-    }),
-    currency: currencyAddress,
   };
 }
diff --git a/packages/thirdweb/src/utils/extensions/drops/get-claim-params.ts b/packages/thirdweb/src/utils/extensions/drops/get-claim-params.ts
index 9b818b74ef7..720c8947ac8 100644
--- a/packages/thirdweb/src/utils/extensions/drops/get-claim-params.ts
+++ b/packages/thirdweb/src/utils/extensions/drops/get-claim-params.ts
@@ -1,7 +1,7 @@
 import { maxUint256, padHex } from "viem";
 import {
-  ZERO_ADDRESS,
   isNativeTokenAddress,
+  ZERO_ADDRESS,
 } from "../../../constants/addresses.js";
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import { getContractMetadata } from "../../../extensions/common/read/getContractMetadata.js";
@@ -104,9 +104,9 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
     if (!cc.merkleRoot || cc.merkleRoot === padHex("0x", { size: 32 })) {
       return {
         currency: ZERO_ADDRESS,
+        pricePerToken: maxUint256,
         proof: [],
         quantityLimitPerWallet: 0n,
-        pricePerToken: maxUint256,
       } satisfies OverrideProof;
     }
     // lazy-load the fetchProofsForClaimer function if we need it
@@ -124,15 +124,15 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
     if (!snapshotUri) {
       return {
         currency: ZERO_ADDRESS,
+        pricePerToken: maxUint256,
         proof: [],
         quantityLimitPerWallet: 0n,
-        pricePerToken: maxUint256,
       } satisfies OverrideProof;
     }
 
     const allowListProof = await fetchProofsForClaimer({
-      contract: options.contract,
-      claimer: options.from || options.to, // receiver and claimer can be different, always prioritize the claimer for allowlists
+      claimer: options.from || options.to,
+      contract: options.contract, // receiver and claimer can be different, always prioritize the claimer for allowlists
       merkleTreeUri: snapshotUri,
       tokenDecimals,
     });
@@ -140,9 +140,9 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
     if (!allowListProof) {
       return {
         currency: ZERO_ADDRESS,
+        pricePerToken: maxUint256,
         proof: [],
         quantityLimitPerWallet: 0n,
-        pricePerToken: maxUint256,
       } satisfies OverrideProof;
     }
     // otherwise return the proof
@@ -173,16 +173,16 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
       : undefined;
 
   return {
-    receiver: options.to,
-    tokenId: options.type === "erc1155" ? options.tokenId : undefined,
-    quantity: options.quantity,
-    currency,
-    pricePerToken,
     allowlistProof,
+    currency,
     data: "0x" as Hex,
     overrides: {
-      value,
       erc20Value,
+      value,
     },
+    pricePerToken,
+    quantity: options.quantity,
+    receiver: options.to,
+    tokenId: options.type === "erc1155" ? options.tokenId : undefined,
   };
 }
diff --git a/packages/thirdweb/src/utils/extensions/drops/get-multicall-set-claim-claim-conditon-transactions.ts b/packages/thirdweb/src/utils/extensions/drops/get-multicall-set-claim-claim-conditon-transactions.ts
index 83812845612..53b7fa23f88 100644
--- a/packages/thirdweb/src/utils/extensions/drops/get-multicall-set-claim-claim-conditon-transactions.ts
+++ b/packages/thirdweb/src/utils/extensions/drops/get-multicall-set-claim-claim-conditon-transactions.ts
@@ -24,9 +24,9 @@ export async function getMulticallSetClaimConditionTransactions(options: {
       let merkleRoot: string = phase.merkleRootHash || toHex("", { size: 32 });
       if (phase.overrideList) {
         const { shardedMerkleInfo, uri } = await processOverrideList({
-          overrides: phase.overrideList,
-          client: options.contract.client,
           chain: options.contract.chain,
+          client: options.contract.client,
+          overrides: phase.overrideList,
           tokenDecimals: options.tokenDecimals,
         });
         merkleInfos[shardedMerkleInfo.merkleRoot] = uri;
@@ -43,18 +43,18 @@ export async function getMulticallSetClaimConditionTransactions(options: {
         });
       }
       return {
-        startTimestamp: dateToSeconds(phase.startTime ?? new Date(0)),
         currency: phase.currencyAddress || NATIVE_TOKEN_ADDRESS,
+        maxClaimableSupply: phase.maxClaimableSupply ?? maxUint256,
+        merkleRoot,
+        metadata,
         pricePerToken: await convertErc20Amount({
+          amount: phase.price?.toString() ?? "0",
           chain: options.contract.chain,
           client: options.contract.client,
           erc20Address: phase.currencyAddress || NATIVE_TOKEN_ADDRESS,
-          amount: phase.price?.toString() ?? "0",
         }),
-        maxClaimableSupply: phase.maxClaimableSupply ?? maxUint256,
         quantityLimitPerWallet: phase.maxClaimablePerWallet ?? maxUint256,
-        merkleRoot,
-        metadata,
+        startTimestamp: dateToSeconds(phase.startTime ?? new Date(0)),
         supplyClaimed: 0n,
       } as GeneratedParams["phases"][number];
     }),
@@ -104,18 +104,18 @@ export async function getMulticallSetClaimConditionTransactions(options: {
         throw new Error("No phase provided");
       }
       encodedSetClaimConditions = encodeSetClaimConditions({
-        tokenId: options.tokenId,
         phase,
         resetClaimEligibility: options.resetClaimEligibility || false,
+        tokenId: options.tokenId,
       });
     } else {
       const { encodeSetClaimConditions } = await import(
         "../../../extensions/erc1155/__generated__/IDrop1155/write/setClaimConditions.js"
       );
       encodedSetClaimConditions = encodeSetClaimConditions({
-        tokenId: options.tokenId,
         phases: sortedPhases,
         resetClaimEligibility: options.resetClaimEligibility || false,
+        tokenId: options.tokenId,
       });
     }
   } else {
diff --git a/packages/thirdweb/src/utils/extensions/drops/hash-entry.ts b/packages/thirdweb/src/utils/extensions/drops/hash-entry.ts
index ba84da71846..8841e4e0d35 100644
--- a/packages/thirdweb/src/utils/extensions/drops/hash-entry.ts
+++ b/packages/thirdweb/src/utils/extensions/drops/hash-entry.ts
@@ -2,8 +2,8 @@ import { encodePacked } from "viem";
 import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import {
-  ZERO_ADDRESS,
   isNativeTokenAddress,
+  ZERO_ADDRESS,
 } from "../../../constants/addresses.js";
 import { getAddress } from "../../address.js";
 import { keccak256 } from "../../hashing/keccak256.js";
diff --git a/packages/thirdweb/src/utils/extensions/drops/process-override-list.ts b/packages/thirdweb/src/utils/extensions/drops/process-override-list.ts
index 3c503729137..3b8ac485b6c 100644
--- a/packages/thirdweb/src/utils/extensions/drops/process-override-list.ts
+++ b/packages/thirdweb/src/utils/extensions/drops/process-override-list.ts
@@ -46,9 +46,9 @@ export async function processOverrideList(options: {
         await Promise.all(
           entries.map(async (entry) => {
             return hashEntryFn({
-              entry,
               chain: options.chain,
               client: options.client,
+              entry,
               tokenDecimals: options.tokenDecimals,
             });
           }),
@@ -63,9 +63,9 @@ export async function processOverrideList(options: {
   const shardsToUpload = [];
   for (const [shardId, entries] of Object.entries(shards)) {
     const data: ShardData = {
+      entries,
       // biome-ignore lint/style/noNonNullAssertion: we know this is in bounds
       proofs: tree.getHexProof(roots[shardId]!),
-      entries,
     };
     shardsToUpload.push({
       data: stringify(data),
@@ -92,12 +92,12 @@ export async function processOverrideList(options: {
   });
   // 7. assemble the final sharded merkle tree info
   const shardedMerkleInfo: ShardedMerkleTreeInfo = {
-    merkleRoot: tree.getHexRoot(),
     baseUri,
+    isShardedMerkleTree: true,
+    merkleRoot: tree.getHexRoot(),
     originalEntriesUri,
     shardNybbles,
     tokenDecimals: options.tokenDecimals,
-    isShardedMerkleTree: true,
   };
   // 8. upload the final sharded merkle tree info
   const finalUri = await upload({
diff --git a/packages/thirdweb/src/utils/extensions/resolve-currency-value.ts b/packages/thirdweb/src/utils/extensions/resolve-currency-value.ts
index c185cf3d470..fddf3243f9b 100644
--- a/packages/thirdweb/src/utils/extensions/resolve-currency-value.ts
+++ b/packages/thirdweb/src/utils/extensions/resolve-currency-value.ts
@@ -34,10 +34,10 @@ export async function resolveCurrencyValue(options: {
     ]);
 
     return {
-      name,
       decimals,
-      symbol,
       displayValue: toTokens(options.wei, decimals),
+      name,
+      symbol,
       value: options.wei,
     };
   }
@@ -57,10 +57,10 @@ export async function resolveCurrencyValue(options: {
   const metadata = await getCurrencyMetadata({ contract });
 
   return {
-    name: metadata.name,
     decimals: metadata.decimals,
-    symbol: metadata.symbol,
     displayValue: toTokens(options.wei, metadata.decimals),
+    name: metadata.name,
+    symbol: metadata.symbol,
     value: options.wei,
   };
 }
diff --git a/packages/thirdweb/src/utils/fetch.test.ts b/packages/thirdweb/src/utils/fetch.test.ts
index 7a88bac9ee4..8f510c52c59 100644
--- a/packages/thirdweb/src/utils/fetch.test.ts
+++ b/packages/thirdweb/src/utils/fetch.test.ts
@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { ThirdwebClient } from "../client/client.js";
 import type { Ecosystem } from "../wallets/in-app/core/wallet/types.js";
 import {
-  IS_THIRDWEB_URL_CACHE,
   getClientFetch,
+  IS_THIRDWEB_URL_CACHE,
   isThirdwebUrl,
 } from "./fetch.js";
 
diff --git a/packages/thirdweb/src/utils/fetch.ts b/packages/thirdweb/src/utils/fetch.ts
index cffc639da2a..61005c73c4c 100644
--- a/packages/thirdweb/src/utils/fetch.ts
+++ b/packages/thirdweb/src/utils/fetch.ts
@@ -3,9 +3,9 @@ import { version } from "../version.js";
 import type { Ecosystem } from "../wallets/in-app/core/wallet/types.js";
 import { LruMap } from "./caching/lru.js";
 import {
-  type OperatingSystem,
   detectOS,
   detectPlatform,
+  type OperatingSystem,
 } from "./detect-platform.js";
 import { getServiceKey } from "./domains.js";
 import { isJWT } from "./jwt/is-jwt.js";
@@ -213,7 +213,7 @@ export function getPlatformHeaders() {
     os = detectOS(navigator.userAgent);
   }
 
-  let bundleId: string | undefined = undefined;
+  let bundleId: string | undefined;
   if (typeof globalThis !== "undefined" && "Application" in globalThis) {
     // shims use wallet connect RN module which injects Application info in globalThis
     // biome-ignore lint/suspicious/noExplicitAny: get around globalThis typing
@@ -221,10 +221,10 @@ export function getPlatformHeaders() {
   }
 
   previousPlatform = Object.entries({
+    "x-sdk-name": SDK_NAME,
+    "x-sdk-os": os ? parseOs(os) : "unknown",
     "x-sdk-platform": detectPlatform(),
     "x-sdk-version": version,
-    "x-sdk-os": os ? parseOs(os) : "unknown",
-    "x-sdk-name": SDK_NAME,
     ...(bundleId ? { "x-bundle-id": bundleId } : {}),
   });
 
diff --git a/packages/thirdweb/src/utils/hashing/hashTypedData.test.ts b/packages/thirdweb/src/utils/hashing/hashTypedData.test.ts
index a33f6cc92d9..e23ca367468 100644
--- a/packages/thirdweb/src/utils/hashing/hashTypedData.test.ts
+++ b/packages/thirdweb/src/utils/hashing/hashTypedData.test.ts
@@ -1,6 +1,5 @@
-import { expect, test } from "vitest";
-
 import { pad } from "viem";
+import { expect, test } from "vitest";
 import { typedData } from "../../../test/src/typed-data.js";
 import { toHex } from "../encoding/hex.js";
 import { hashTypedData } from "./hashTypedData.js";
@@ -62,11 +61,11 @@ test("domain: empty name", () => {
 
 test("minimal valid typed message", () => {
   const hash = hashTypedData({
+    domain: {},
+    primaryType: "EIP712Domain",
     types: {
       EIP712Domain: [],
     },
-    primaryType: "EIP712Domain",
-    domain: {},
   });
 
   expect(hash).toMatchInlineSnapshot(
@@ -76,6 +75,14 @@ test("minimal valid typed message", () => {
 
 test("typed message with a domain separator that uses all fields.", () => {
   const hash = hashTypedData({
+    domain: {
+      chainId: 1n,
+      name: "example.metamask.io",
+      salt: pad(toHex(new Uint8Array([1, 2, 3])), { dir: "right" }),
+      verifyingContract: "0x0000000000000000000000000000000000000000",
+      version: "1",
+    },
+    primaryType: "EIP712Domain",
     types: {
       EIP712Domain: [
         {
@@ -100,14 +107,6 @@ test("typed message with a domain separator that uses all fields.", () => {
         },
       ],
     },
-    primaryType: "EIP712Domain",
-    domain: {
-      name: "example.metamask.io",
-      version: "1",
-      chainId: 1n,
-      verifyingContract: "0x0000000000000000000000000000000000000000",
-      salt: pad(toHex(new Uint8Array([1, 2, 3])), { dir: "right" }),
-    },
   });
 
   expect(hash).toMatchInlineSnapshot(
@@ -117,6 +116,15 @@ test("typed message with a domain separator that uses all fields.", () => {
 
 test("typed message with only custom domain separator fields", () => {
   const hash = hashTypedData({
+    domain: {
+      customChainId: 1n,
+      customName: "example.metamask.io",
+      customSalt: pad(toHex(new Uint8Array([1, 2, 3])), { dir: "right" }),
+      customVerifyingContract: "0x0000000000000000000000000000000000000000",
+      customVersion: "1",
+      extraField: "stuff",
+    },
+    primaryType: "EIP712Domain",
     types: {
       EIP712Domain: [
         {
@@ -145,15 +153,6 @@ test("typed message with only custom domain separator fields", () => {
         },
       ],
     },
-    primaryType: "EIP712Domain",
-    domain: {
-      customName: "example.metamask.io",
-      customVersion: "1",
-      customChainId: 1n,
-      customVerifyingContract: "0x0000000000000000000000000000000000000000",
-      customSalt: pad(toHex(new Uint8Array([1, 2, 3])), { dir: "right" }),
-      extraField: "stuff",
-    },
   });
 
   expect(hash).toMatchInlineSnapshot(
@@ -163,6 +162,17 @@ test("typed message with only custom domain separator fields", () => {
 
 test("typed message with data", () => {
   const hash = hashTypedData({
+    domain: {
+      chainId: 1n,
+      name: "example.metamask.io",
+      salt: pad(toHex(new Uint8Array([1, 2, 3])), { dir: "right" }),
+      verifyingContract: "0x0000000000000000000000000000000000000000",
+      version: "1",
+    },
+    message: {
+      data: "Hello!",
+    },
+    primaryType: "Message",
     types: {
       EIP712Domain: [
         {
@@ -188,17 +198,6 @@ test("typed message with data", () => {
       ],
       Message: [{ name: "data", type: "string" }],
     },
-    primaryType: "Message",
-    domain: {
-      name: "example.metamask.io",
-      version: "1",
-      chainId: 1n,
-      verifyingContract: "0x0000000000000000000000000000000000000000",
-      salt: pad(toHex(new Uint8Array([1, 2, 3])), { dir: "right" }),
-    },
-    message: {
-      data: "Hello!",
-    },
   });
 
   expect(hash).toMatchInlineSnapshot(
diff --git a/packages/thirdweb/src/utils/hashing/hashTypedData.ts b/packages/thirdweb/src/utils/hashing/hashTypedData.ts
index bfb5d3efc26..c5ededee907 100644
--- a/packages/thirdweb/src/utils/hashing/hashTypedData.ts
+++ b/packages/thirdweb/src/utils/hashing/hashTypedData.ts
@@ -83,9 +83,9 @@ function encodeData({
   if (!types[primaryType]) throw new Error("Invalid types");
   for (const field of types[primaryType]) {
     const [type, value] = encodeField({
-      types,
       name: field.name,
       type: field.type,
+      types,
       value: data[field.name],
     });
     encodedTypes.push(type);
diff --git a/packages/thirdweb/src/utils/ipfs.ts b/packages/thirdweb/src/utils/ipfs.ts
index e8457d78a32..f2f48379bb7 100644
--- a/packages/thirdweb/src/utils/ipfs.ts
+++ b/packages/thirdweb/src/utils/ipfs.ts
@@ -33,7 +33,7 @@ export function resolveScheme(options: ResolveSchemeOptions) {
     const clientId = options.client.clientId;
     const cid = findIPFSCidFromUri(options.uri);
 
-    let bundleId: string | undefined = undefined;
+    let bundleId: string | undefined;
     if (typeof globalThis !== "undefined" && "Application" in globalThis) {
       // shims use wallet connect RN module which injects Application info in globalThis
       // biome-ignore lint/suspicious/noExplicitAny: get around globalThis typing
@@ -108,19 +108,15 @@ export async function uploadOrExtractURIs<
  * @internal
  */
 export function getBaseUriFromBatch(uris: string | string[]): string {
-  // biome-ignore lint/style/noParameterAssign: lemme do my stuff
   uris = Array.isArray(uris) ? uris : [uris];
   const [base, ...rest] = uris.map((uri) => {
     // remove query parameters
-    // biome-ignore lint/style/noParameterAssign: lemme do my stuff
     [uri] = uri.split("?") as [string];
     // remove fragments
-    // biome-ignore lint/style/noParameterAssign: lemme do my stuff
     [uri] = uri.split("#") as [string];
 
     // if the URI ends with a `/`, remove it
     if (uri.endsWith("/")) {
-      // biome-ignore lint/style/noParameterAssign: lemme do my stuff
       uri = uri.slice(0, -1);
     }
 
diff --git a/packages/thirdweb/src/utils/json.test.ts b/packages/thirdweb/src/utils/json.test.ts
index e01d7bb2d46..dc2519b776b 100644
--- a/packages/thirdweb/src/utils/json.test.ts
+++ b/packages/thirdweb/src/utils/json.test.ts
@@ -5,22 +5,22 @@ import { stringify } from "./json.js";
 it("default", () => {
   expect(
     stringify({
-      foo: "bar",
       baz: {
         value: 69n,
       },
+      foo: "bar",
     }),
-  ).toEqual('{"foo":"bar","baz":{"value":"69"}}');
+  ).toMatchInlineSnapshot(`"{"baz":{"value":"69"},"foo":"bar"}"`);
 });
 
 it("args: replacer", () => {
   expect(
     stringify(
       {
-        foo: "bar",
         baz: {
           value: 69n,
         },
+        foo: "bar",
       },
       (key, value) => {
         if (key === "value") {
@@ -29,27 +29,27 @@ it("args: replacer", () => {
         return value;
       },
     ),
-  ).toEqual('{"foo":"bar","baz":{"value":"69!"}}');
+  ).toMatchInlineSnapshot(`"{"baz":{"value":"69!"},"foo":"bar"}"`);
 });
 
 it("args: space", () => {
   expect(
     stringify(
       {
-        foo: "bar",
         baz: {
           value: 69n,
         },
+        foo: "bar",
       },
       null,
       2,
     ),
   ).toMatchInlineSnapshot(`
     "{
-      "foo": "bar",
       "baz": {
         "value": "69"
-      }
+      },
+      "foo": "bar"
     }"
   `);
 });
diff --git a/packages/thirdweb/src/utils/jwt/encode-jwt.ts b/packages/thirdweb/src/utils/jwt/encode-jwt.ts
index 82bb079081e..ba8599a9869 100644
--- a/packages/thirdweb/src/utils/jwt/encode-jwt.ts
+++ b/packages/thirdweb/src/utils/jwt/encode-jwt.ts
@@ -66,14 +66,14 @@ export async function encodeJWT(options: EncodeJWTParams) {
 
 async function ensureJWTPayload(payload: JWTPayloadInput): Promise<JWTPayload> {
   return {
-    iss: payload.iss,
-    sub: payload.sub,
     aud: payload.aud,
+    ctx: payload.ctx,
     exp: Math.floor(payload.exp.getTime() / 1000),
-    nbf: Math.floor(payload.nbf.getTime() / 1000),
     iat: Math.floor(payload.iat.getTime() / 1000),
+    iss: payload.iss,
     // default to uuid if jti is not provided
     jti: payload.jti || (await randomBytesHex()),
-    ctx: payload.ctx,
+    nbf: Math.floor(payload.nbf.getTime() / 1000),
+    sub: payload.sub,
   };
 }
diff --git a/packages/thirdweb/src/utils/jwt/refresh-jwt.ts b/packages/thirdweb/src/utils/jwt/refresh-jwt.ts
index 53b25d80ea3..b0f028c3b82 100644
--- a/packages/thirdweb/src/utils/jwt/refresh-jwt.ts
+++ b/packages/thirdweb/src/utils/jwt/refresh-jwt.ts
@@ -30,15 +30,15 @@ export async function refreshJWT(options: RefreshJWTParams): Promise<string> {
   const { account, jwt, expirationTime = DEFAULT_EXPIRATION_TIME } = options;
   const payload = decodeJWT(jwt).payload;
   return encodeJWT({
+    account,
     payload: {
-      iss: payload.iss,
-      sub: payload.sub,
       aud: payload.aud,
-      nbf: new Date(),
+      ctx: payload.ctx,
       exp: new Date(Date.now() + expirationTime),
       iat: new Date(),
-      ctx: payload.ctx,
+      iss: payload.iss,
+      nbf: new Date(),
+      sub: payload.sub,
     },
-    account,
   });
 }
diff --git a/packages/thirdweb/src/utils/nft/parseNft.test.ts b/packages/thirdweb/src/utils/nft/parseNft.test.ts
index 898caa9d3ef..1968960bc30 100644
--- a/packages/thirdweb/src/utils/nft/parseNft.test.ts
+++ b/packages/thirdweb/src/utils/nft/parseNft.test.ts
@@ -18,43 +18,43 @@ const client = TEST_CLIENT;
 describe("parseNft", () => {
   it("should parse ERC721 token", () => {
     const option: ParseNFTOptions = {
+      chainId: 1,
+      tokenAddress: "0x1234567890123456789012345678901234567890",
       tokenId: 0n,
       tokenUri: "ipfs://",
       type: "ERC721",
-      tokenAddress: "0x1234567890123456789012345678901234567890",
-      chainId: 1,
     };
     const result = parseNFT(base, option);
     const expectedResult: NFT = {
+      chainId: option.chainId,
+      id: option.tokenId,
       metadata: base,
       owner: option.owner ?? null,
-      id: option.tokenId,
+      tokenAddress: option.tokenAddress,
       tokenURI: option.tokenUri,
       type: option.type,
-      tokenAddress: option.tokenAddress,
-      chainId: option.chainId,
     };
     expect(result).toMatchObject(expectedResult);
   });
 
   it("should parse ERC1155 token", () => {
     const option: ParseNFTOptions = {
+      chainId: 1,
+      supply: 10n,
+      tokenAddress: "0x1234567890123456789012345678901234567890",
       tokenId: 0n,
       tokenUri: "ipfs://",
       type: "ERC1155",
-      supply: 10n,
-      tokenAddress: "0x1234567890123456789012345678901234567890",
-      chainId: 1,
     };
     const expectedResult: NFT = {
+      chainId: option.chainId,
+      id: option.tokenId,
       metadata: base,
       owner: option.owner ?? null,
-      id: option.tokenId,
-      tokenURI: option.tokenUri,
-      type: option.type,
       supply: option.supply,
       tokenAddress: option.tokenAddress,
-      chainId: option.chainId,
+      tokenURI: option.tokenUri,
+      type: option.type,
     };
     const result = parseNFT(base, option);
     expect(result).toMatchObject(expectedResult);
diff --git a/packages/thirdweb/src/utils/nft/parseNft.ts b/packages/thirdweb/src/utils/nft/parseNft.ts
index 4b5a5c78ab5..6b9d2ca6227 100644
--- a/packages/thirdweb/src/utils/nft/parseNft.ts
+++ b/packages/thirdweb/src/utils/nft/parseNft.ts
@@ -88,24 +88,24 @@ export function parseNFT(base: NFTMetadata, options: ParseNFTOptions): NFT {
   switch (options.type) {
     case "ERC721":
       return {
+        chainId: options.chainId,
+        id: options.tokenId,
         metadata: base,
         owner: options?.owner ?? null,
-        id: options.tokenId,
+        tokenAddress: options.tokenAddress,
         tokenURI: options.tokenUri,
         type: options.type,
-        tokenAddress: options.tokenAddress,
-        chainId: options.chainId,
       };
     case "ERC1155":
       return {
+        chainId: options.chainId,
+        id: options.tokenId,
         metadata: base,
         owner: options?.owner ?? null,
-        id: options.tokenId,
-        tokenURI: options.tokenUri,
-        type: options.type,
         supply: options.supply,
         tokenAddress: options.tokenAddress,
-        chainId: options.chainId,
+        tokenURI: options.tokenUri,
+        type: options.type,
       };
     default:
       throw new Error("Invalid NFT type");
@@ -165,9 +165,9 @@ export async function parseNftUri(options: {
   }
   const chain = getCachedChain(Number(chainID));
   const contract = getContract({
-    client: options.client,
-    chain,
     address: contractAddress,
+    chain,
+    client: options.client,
   });
   switch (erc_namespace) {
     case "erc721": {
diff --git a/packages/thirdweb/src/utils/process.ts b/packages/thirdweb/src/utils/process.ts
index 825e2ef5348..7d5b0d5723e 100644
--- a/packages/thirdweb/src/utils/process.ts
+++ b/packages/thirdweb/src/utils/process.ts
@@ -1,7 +1,4 @@
 export const IS_DEV =
-  // biome-ignore lint/nursery/noProcessEnv: ok in this file
   process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 
-export const IS_TEST =
-  // biome-ignore lint/nursery/noProcessEnv: ok in this file
-  process.env.NODE_ENV === "test";
+export const IS_TEST = process.env.NODE_ENV === "test";
diff --git a/packages/thirdweb/src/utils/promise/p-limit.test.ts b/packages/thirdweb/src/utils/promise/p-limit.test.ts
index 62b9734c353..bf1e0cdbca2 100644
--- a/packages/thirdweb/src/utils/promise/p-limit.test.ts
+++ b/packages/thirdweb/src/utils/promise/p-limit.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { Queue, pLimit } from "./p-limit.js";
+import { pLimit, Queue } from "./p-limit.js";
 
 describe("p-limit queue", () => {
   it("should enqueue and dequeue items in the correct order", () => {
diff --git a/packages/thirdweb/src/utils/promise/p-limit.ts b/packages/thirdweb/src/utils/promise/p-limit.ts
index fdff51bf9fb..411e3443cc0 100644
--- a/packages/thirdweb/src/utils/promise/p-limit.ts
+++ b/packages/thirdweb/src/utils/promise/p-limit.ts
@@ -1,3 +1,5 @@
+/* biome-ignore-all lint: IGNORED */
+
 // source code of yocto-queue + modified to add types
 // https://github.com/sindresorhus/yocto-queue
 class Node<T> {
@@ -182,14 +184,14 @@ export function pLimit(concurrency: number): LimitFunction {
     activeCount: {
       get: () => activeCount,
     },
-    pendingCount: {
-      get: () => queue.size,
-    },
     clearQueue: {
       value() {
         queue.clear();
       },
     },
+    pendingCount: {
+      get: () => queue.size,
+    },
   });
 
   return generator as LimitFunction;
diff --git a/packages/thirdweb/src/utils/promise/withCache.ts b/packages/thirdweb/src/utils/promise/withCache.ts
index 0c0a5be385a..b5603908f14 100644
--- a/packages/thirdweb/src/utils/promise/withCache.ts
+++ b/packages/thirdweb/src/utils/promise/withCache.ts
@@ -56,7 +56,7 @@ export async function withCache<TData>(
   // If the max age is 0, the cache is disabled.
   const response = cache.response.get();
   if (response && cacheTime > 0) {
-    const age = new Date().getTime() - response.created.getTime();
+    const age = Date.now() - response.created.getTime();
     if (age < cacheTime) {
       return response.data;
     }
diff --git a/packages/thirdweb/src/utils/retry.test.ts b/packages/thirdweb/src/utils/retry.test.ts
index a6774e309a7..ff758cd5c81 100644
--- a/packages/thirdweb/src/utils/retry.test.ts
+++ b/packages/thirdweb/src/utils/retry.test.ts
@@ -4,7 +4,7 @@ import { retry } from "./retry.js";
 describe("retry", () => {
   it("should successfully resolve the promise without retries if no error is thrown", async () => {
     const mockFn = vi.fn().mockResolvedValue("success");
-    await expect(retry(mockFn, { retries: 1, delay: 100 })).resolves.toBe(
+    await expect(retry(mockFn, { delay: 100, retries: 1 })).resolves.toBe(
       "success",
     );
     expect(mockFn).toHaveBeenCalledTimes(1);
@@ -18,7 +18,7 @@ describe("retry", () => {
       .mockRejectedValueOnce(error)
       .mockResolvedValue("success");
 
-    await expect(retry(mockFn, { retries: 3, delay: 0 })).resolves.toBe(
+    await expect(retry(mockFn, { delay: 0, retries: 3 })).resolves.toBe(
       "success",
     );
     expect(mockFn).toHaveBeenCalledTimes(3);
@@ -28,7 +28,7 @@ describe("retry", () => {
     const error = new Error("Persistent error");
     const mockFn = vi.fn().mockRejectedValue(error);
 
-    await expect(retry(mockFn, { retries: 2, delay: 0 })).rejects.toThrow();
+    await expect(retry(mockFn, { delay: 0, retries: 2 })).rejects.toThrow();
     expect(mockFn).toHaveBeenCalledTimes(2);
   });
 
@@ -42,7 +42,7 @@ describe("retry", () => {
 
     const delay = 100;
     const startTime = Date.now();
-    await retry(mockFn, { retries: 3, delay });
+    await retry(mockFn, { delay, retries: 3 });
     const endTime = Date.now();
 
     expect(endTime - startTime).toBeGreaterThanOrEqual(2 * delay);
diff --git a/packages/thirdweb/src/utils/royalty-engine.ts b/packages/thirdweb/src/utils/royalty-engine.ts
index e78c4feb224..f7878584a2d 100644
--- a/packages/thirdweb/src/utils/royalty-engine.ts
+++ b/packages/thirdweb/src/utils/royalty-engine.ts
@@ -11,10 +11,10 @@ export function getRoyaltyEngineV1ByChainId(chainId: number): string {
 
 const ROYALTY_ENGINE_V1_ADDRESS: Record<number, string> = /* @__PURE__ */ {
   1: "0x0385603ab55642cb4dd5de3ae9e306809991804f",
+  10: "0xEF770dFb6D5620977213f55f99bfd781D04BBE15",
   56: "0xEF770dFb6D5620977213f55f99bfd781D04BBE15",
   137: "0x28EdFcF0Be7E86b07493466e7631a213bDe8eEF2",
   8453: "0xEF770dFb6D5620977213f55f99bfd781D04BBE15",
-  43114: "0xEF770dFb6D5620977213f55f99bfd781D04BBE15",
-  10: "0xEF770dFb6D5620977213f55f99bfd781D04BBE15",
   42161: "0xEF770dFb6D5620977213f55f99bfd781D04BBE15",
+  43114: "0xEF770dFb6D5620977213f55f99bfd781D04BBE15",
 };
diff --git a/packages/thirdweb/src/utils/signatures/helpers/parse-typed-data.test.ts b/packages/thirdweb/src/utils/signatures/helpers/parse-typed-data.test.ts
index b327c0ee055..0f2e6a6c72b 100644
--- a/packages/thirdweb/src/utils/signatures/helpers/parse-typed-data.test.ts
+++ b/packages/thirdweb/src/utils/signatures/helpers/parse-typed-data.test.ts
@@ -7,8 +7,8 @@ describe("parseTypedData", () => {
       domain: {
         chainId: "0x1" as unknown as number,
       },
-      types: {},
       primaryType: "EIP712Domain" as const,
+      types: {},
     };
 
     const result = parseTypedData(typedData);
@@ -20,8 +20,8 @@ describe("parseTypedData", () => {
       domain: {
         chainId: 1,
       },
-      types: {},
       primaryType: "EIP712Domain" as const,
+      types: {},
     };
 
     const result = parseTypedData(typedData);
@@ -31,8 +31,8 @@ describe("parseTypedData", () => {
   test("returns typed data unchanged if chainId is undefined", () => {
     const typedData = {
       domain: {},
-      types: {},
       primaryType: "EIP712Domain" as const,
+      types: {},
     };
 
     const result = parseTypedData(typedData);
@@ -45,8 +45,8 @@ describe("parseTypedData", () => {
         chainId: "0x1" as unknown as number,
         name: "Test",
       },
-      types: {},
       primaryType: "EIP712Domain" as const,
+      types: {},
     };
 
     const result = parseTypedData(typedData);
diff --git a/packages/thirdweb/src/utils/signatures/resolve-signature.ts b/packages/thirdweb/src/utils/signatures/resolve-signature.ts
index 69bf5f21a9e..3af1c17b8e9 100644
--- a/packages/thirdweb/src/utils/signatures/resolve-signature.ts
+++ b/packages/thirdweb/src/utils/signatures/resolve-signature.ts
@@ -73,7 +73,6 @@ export async function resolveSignature(hexSig: string): Promise<{
   event: EventString | null;
 }> {
   if (hexSig.startsWith("0x")) {
-    // biome-ignore lint/style/noParameterAssign: modifying in-place for performance
     hexSig = hexSig.slice(2);
   }
   const all = await Promise.all([
@@ -81,8 +80,8 @@ export async function resolveSignature(hexSig: string): Promise<{
     resolveEventSignature(hexSig),
   ]);
   return {
-    function: all[0],
     event: all[1],
+    function: all[0],
   };
 }
 
@@ -103,20 +102,20 @@ export async function resolveSignatures(hexSigs: string[]): Promise<{
   events: EventString[];
 }> {
   // dedupe hexSigs
-  // biome-ignore lint/style/noParameterAssign: modifying in-place for performance
+
   hexSigs = Array.from(new Set(hexSigs));
   const all = await Promise.all(
     hexSigs.map((hexSig) => resolveSignature(hexSig)),
   );
   return {
-    functions: all
-      .map((x) => x.function)
-      .filter((x) => x !== null)
-      .sort() as FunctionString[],
     events: all
       .map((x) => x.event)
       .filter((x) => x !== null)
       .sort() as EventString[],
+    functions: all
+      .map((x) => x.function)
+      .filter((x) => x !== null)
+      .sort() as FunctionString[],
   };
 }
 
diff --git a/packages/thirdweb/src/utils/signatures/sign-message.test.ts b/packages/thirdweb/src/utils/signatures/sign-message.test.ts
index 34718acd684..fcbc043ebc1 100644
--- a/packages/thirdweb/src/utils/signatures/sign-message.test.ts
+++ b/packages/thirdweb/src/utils/signatures/sign-message.test.ts
@@ -59,24 +59,24 @@ describe("signMessage", async () => {
 
   test("account", async () => {
     const basicSignature = await signMessage({
-      message: "hello world",
       account: TEST_ACCOUNT_A,
+      message: "hello world",
     });
     expect(basicSignature).toMatchInlineSnapshot(
       '"0xa461f509887bd19e312c0c58467ce8ff8e300d3c1a90b608a760c5b80318eaf15fe57c96f9175d6cd4daad4663763baa7e78836e067d0163e9a2ccf2ff753f5b1b"',
     );
 
     const emojiSignature = await signMessage({
-      message: "🤯",
       account: TEST_ACCOUNT_A,
+      message: "🤯",
     });
     expect(emojiSignature).toMatchInlineSnapshot(
       '"0xc0cd7599731c37aa4c0815a89dc8dcb4ce479f83df7ee8ffc606a9ef29323e814b54bb8935b56e7c690f1ee4c6290da5c2f6df6fc3443fbe96bb1846a2c4fefc1c"',
     );
 
     const addressSignature = await signMessage({
-      message: "0x787037Ba5b7eA8a8737627FfB67d35FdCaAd9A18",
       account: TEST_ACCOUNT_A,
+      message: "0x787037Ba5b7eA8a8737627FfB67d35FdCaAd9A18",
     });
     expect(addressSignature).toMatchInlineSnapshot(
       '"0x151436da0ef734f06ae71f4b907a062fa5683b40af4221e86dfe5f2fc9f09ffa40c90fee4a0e48311506b84dc6f20e513dc4dc434f0f70a03af6ff3e22c7b7591c"',
diff --git a/packages/thirdweb/src/utils/signatures/sign-message.ts b/packages/thirdweb/src/utils/signatures/sign-message.ts
index 18a461975d0..9f8d15cdbfc 100644
--- a/packages/thirdweb/src/utils/signatures/sign-message.ts
+++ b/packages/thirdweb/src/utils/signatures/sign-message.ts
@@ -54,7 +54,10 @@ export function signMessage({ message, privateKey }: SignMessageOptions): Hex;
 export function signMessage({
   message,
   account,
-}: { message: Message; account: Account }): Promise<Hex>;
+}: {
+  message: Message;
+  account: Account;
+}): Promise<Hex>;
 
 export function signMessage(
   options: SignMessageOptions | { message: Message; account: Account },
diff --git a/packages/thirdweb/src/utils/signatures/sign-typed-data.test.ts b/packages/thirdweb/src/utils/signatures/sign-typed-data.test.ts
index a6783871138..bd6c810485e 100644
--- a/packages/thirdweb/src/utils/signatures/sign-typed-data.test.ts
+++ b/packages/thirdweb/src/utils/signatures/sign-typed-data.test.ts
@@ -20,12 +20,12 @@ test("default", async () => {
 test("minimal", async () => {
   expect(
     signTypedData({
+      domain: {},
+      primaryType: "EIP712Domain",
+      privateKey: ANVIL_PKEY_A,
       types: {
         EIP712Domain: [],
       },
-      primaryType: "EIP712Domain",
-      domain: {},
-      privateKey: ANVIL_PKEY_A,
     }),
   ).toEqual(
     "0xda87197eb020923476a6d0149ca90bc1c894251cc30b38e0dd2cdd48567e12386d3ed40a509397410a4fd2d66e1300a39ac42f828f8a5a2cb948b35c22cf29e81c",
@@ -146,17 +146,17 @@ test("domain: salt", async () => {
 test("mixed-case strings and addresses", async () => {
   const typedData = (name: string, addr: string) =>
     ({
+      message: {
+        addr,
+        name,
+      },
+      primaryType: "WalletData",
       types: {
         WalletData: [
           { name: "name", type: "string" },
           { name: "addr", type: "address" },
         ],
       },
-      message: {
-        name,
-        addr,
-      },
-      primaryType: "WalletData",
     }) as const;
 
   const name = "0xDEADBEEF";
diff --git a/packages/thirdweb/src/utils/storage/inMemoryStorage.ts b/packages/thirdweb/src/utils/storage/inMemoryStorage.ts
index 7496e07b19b..a5d38d56163 100644
--- a/packages/thirdweb/src/utils/storage/inMemoryStorage.ts
+++ b/packages/thirdweb/src/utils/storage/inMemoryStorage.ts
@@ -6,10 +6,10 @@ export const inMemoryStorage: AsyncStorage = {
   getItem: async (key: string) => {
     return store.get(key) ?? null;
   },
-  setItem: async (key: string, value: string) => {
-    store.set(key, value);
-  },
   removeItem: async (key: string) => {
     store.delete(key);
   },
+  setItem: async (key: string, value: string) => {
+    store.set(key, value);
+  },
 };
diff --git a/packages/thirdweb/src/utils/storage/nativeStorage.ts b/packages/thirdweb/src/utils/storage/nativeStorage.ts
index 29916fd8f04..9b75a793f91 100644
--- a/packages/thirdweb/src/utils/storage/nativeStorage.ts
+++ b/packages/thirdweb/src/utils/storage/nativeStorage.ts
@@ -6,12 +6,12 @@ export const nativeLocalStorage: IStorage = {
     // @ts-ignore - default import buils but ts doesn't like it
     return AsyncStorage.getItem(key);
   },
-  async setItem(key: string, value: string) {
-    // @ts-ignore - default import buils but ts doesn't like it
-    await AsyncStorage.setItem(key, value);
-  },
   async removeItem(key: string) {
     // @ts-ignore - default import buils but ts doesn't like it
     await AsyncStorage.removeItem(key);
   },
+  async setItem(key: string, value: string) {
+    // @ts-ignore - default import buils but ts doesn't like it
+    await AsyncStorage.setItem(key, value);
+  },
 };
diff --git a/packages/thirdweb/src/utils/storage/webStorage.ts b/packages/thirdweb/src/utils/storage/webStorage.ts
index 5a09a218fd4..310973e79d6 100644
--- a/packages/thirdweb/src/utils/storage/webStorage.ts
+++ b/packages/thirdweb/src/utils/storage/webStorage.ts
@@ -12,6 +12,11 @@ export const webLocalStorage: AsyncStorage = {
 
     return null;
   },
+  async removeItem(key: string) {
+    if (typeof window !== "undefined" && window.localStorage) {
+      localStorage.removeItem(key);
+    }
+  },
   async setItem(key: string, value: string) {
     try {
       if (typeof window !== "undefined" && window.localStorage) {
@@ -21,9 +26,4 @@ export const webLocalStorage: AsyncStorage = {
       // ignore
     }
   },
-  async removeItem(key: string) {
-    if (typeof window !== "undefined" && window.localStorage) {
-      localStorage.removeItem(key);
-    }
-  },
 };
diff --git a/packages/thirdweb/src/utils/timeoutPromise.test.ts b/packages/thirdweb/src/utils/timeoutPromise.test.ts
index 94670537504..9e400316a38 100644
--- a/packages/thirdweb/src/utils/timeoutPromise.test.ts
+++ b/packages/thirdweb/src/utils/timeoutPromise.test.ts
@@ -2,8 +2,8 @@ import { describe, expect, it, vi } from "vitest";
 import { timeoutPromise } from "./timeoutPromise.js";
 
 const options = {
-  ms: 100,
   message: "Timeout",
+  ms: 100,
 };
 
 describe("timeoutPromise", () => {
diff --git a/packages/thirdweb/src/utils/tiny-emitter.ts b/packages/thirdweb/src/utils/tiny-emitter.ts
index 1914f1b4a12..6dac819e999 100644
--- a/packages/thirdweb/src/utils/tiny-emitter.ts
+++ b/packages/thirdweb/src/utils/tiny-emitter.ts
@@ -35,6 +35,14 @@ export function createEmitter<
   >();
 
   return {
+    emit(event, data) {
+      const subscribers = subsribers.get(event);
+      if (subscribers) {
+        for (const cb of subscribers) {
+          cb(data);
+        }
+      }
+    },
     subscribe(event, cb) {
       if (!subsribers.has(event)) {
         subsribers.set(event, new Set([cb]));
@@ -49,13 +57,5 @@ export function createEmitter<
         }
       };
     },
-    emit(event, data) {
-      const subscribers = subsribers.get(event);
-      if (subscribers) {
-        for (const cb of subscribers) {
-          cb(data);
-        }
-      }
-    },
   };
 }
diff --git a/packages/thirdweb/src/utils/url.test.ts b/packages/thirdweb/src/utils/url.test.ts
index b74c6ea71bc..18fbcec6d20 100644
--- a/packages/thirdweb/src/utils/url.test.ts
+++ b/packages/thirdweb/src/utils/url.test.ts
@@ -56,8 +56,8 @@ describe("Utility functions tests", () => {
     it("should format a valid HTTP URL with a WalletConnect URI", () => {
       const result = formatUniversalUrl("https://example.com", "wc:uri");
       expect(result).toEqual({
-        redirect: "https://example.com/wc?uri=wc%3Auri",
         href: "https://example.com/",
+        redirect: "https://example.com/wc?uri=wc%3Auri",
       });
     });
   });
@@ -66,8 +66,8 @@ describe("Utility functions tests", () => {
     it("should format a valid native URL with a WalletConnect URI", () => {
       const result = formatNativeUrl("custom://example", "wc:uri");
       expect(result).toEqual({
-        redirect: "custom://example/wc?uri=wc%3Auri",
         href: "custom://example/",
+        redirect: "custom://example/wc?uri=wc%3Auri",
       });
     });
   });
@@ -76,16 +76,16 @@ describe("Utility functions tests", () => {
     it("should call formatUniversalUrl for HTTP URLs", () => {
       const result = formatWalletConnectUrl("https://example.com", "wc:uri");
       expect(result).toEqual({
-        redirect: "https://example.com/wc?uri=wc%3Auri",
         href: "https://example.com/",
+        redirect: "https://example.com/wc?uri=wc%3Auri",
       });
     });
 
     it("should call formatNativeUrl for non-HTTP URLs", () => {
       const result = formatWalletConnectUrl("custom://example", "wc:uri");
       expect(result).toEqual({
-        redirect: "custom://example/wc?uri=wc%3Auri",
         href: "custom://example/",
+        redirect: "custom://example/wc?uri=wc%3Auri",
       });
     });
   });
diff --git a/packages/thirdweb/src/utils/url.ts b/packages/thirdweb/src/utils/url.ts
index 51516916989..bb9bf739f6d 100644
--- a/packages/thirdweb/src/utils/url.ts
+++ b/packages/thirdweb/src/utils/url.ts
@@ -27,8 +27,8 @@ export function formatUniversalUrl(
   const encodedWcUrl = encodeURIComponent(wcUri);
 
   return {
-    redirect: `${safeAppUrl}wc?uri=${encodedWcUrl}`,
     href: safeAppUrl,
+    redirect: `${safeAppUrl}wc?uri=${encodedWcUrl}`,
   };
 }
 
@@ -50,8 +50,8 @@ export function formatNativeUrl(appUrl: string, wcUri: string): LinkingRecord {
   const encodedWcUrl = encodeURIComponent(wcUri);
 
   return {
-    redirect: `${safeAppUrl}wc?uri=${encodedWcUrl}`,
     href: safeAppUrl,
+    redirect: `${safeAppUrl}wc?uri=${encodedWcUrl}`,
   };
 }
 
diff --git a/packages/thirdweb/src/wallets/__generated__/getWalletInfo.ts b/packages/thirdweb/src/wallets/__generated__/getWalletInfo.ts
index 58543a8313c..8734bfa19ae 100644
--- a/packages/thirdweb/src/wallets/__generated__/getWalletInfo.ts
+++ b/packages/thirdweb/src/wallets/__generated__/getWalletInfo.ts
@@ -1,3 +1,4 @@
+/* biome-ignore-all lint: IGNORED */
 // This file is auto-generated by the `scripts/wallets/generate.ts` script.
 // Do not modify this file manually.
 import { isEcosystemWallet } from "../ecosystem/is-ecosystem-wallet.js";
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet-infos.ts b/packages/thirdweb/src/wallets/__generated__/wallet-infos.ts
index 4e4074ad9f5..4ce056d5648 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet-infos.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet-infos.ts
@@ -15,2144 +15,2144 @@ export type MinimalWalletInfo = {
  */
 const ALL_MINIMAL_WALLET_INFOS = [
   {
+    hasMobileSupport: true,
     id: "io.metamask",
     name: "MetaMask",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.trustwallet.app",
     name: "Trust Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bitget.web3",
     name: "Bitget Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.okex.wallet",
     name: "OKX Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.binance.wallet",
     name: "Binance Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.safepal",
     name: "SafePal",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "pro.tokenpocket",
     name: "TokenPocket",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bybit",
     name: "Bybit Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.uniswap",
     name: "Uniswap Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.zerion.wallet",
     name: "Zerion",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "me.rainbow",
     name: "Rainbow",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ledger",
     name: "Ledger Live",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.crypto.wallet",
     name: "Crypto.com Onchain",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.kraken",
     name: "Kraken Wallet ",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.1inch.wallet",
     name: "1inch Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "im.token",
     name: "imToken",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "global.safe",
     name: "Safe",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.timelesswallet",
     name: "Timeless X",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.roninchain.wallet",
     name: "Ronin Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.elrond.maiar.wallet",
     name: "xPortal",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.backpack",
     name: "Backpack",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.exodus",
     name: "Exodus",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.fireblocks",
     name: "Fireblocks",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "ag.jup",
     name: "Jupiter",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.blockchain",
     name: "Blockchain.com",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.magiceden.wallet",
     name: "Magic Eden",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bifrostwallet",
     name: "Bifrost Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.tangem",
     name: "Tangem Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.wemixplay",
     name: "WEMIX Play",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.robinhood.wallet",
     name: "Robinhood Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bitcoin",
     name: "Bitcoin.com Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.mathwallet",
     name: "MathWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "network.blackfort",
     name: "BlackFort Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.keplr",
     name: "Keplr",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bee",
     name: "BeeWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.veworld",
     name: "VeWorld Mobile",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bestwallet",
     name: "Best Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.fastex.wallet",
     name: "Yo Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.valoraapp",
     name: "Valora",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "id.co.pintu",
     name: "Pintu",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.core.extension",
     name: "Core",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.opera",
     name: "Opera Crypto Browser",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.girin",
     name: "Girin Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "dev.auroracloud",
     name: "Aurora Pass",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.chain",
     name: "Chain",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.wombat",
     name: "Wombat",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "me.haha",
     name: "HaHa",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.huddln",
     name: "Huddln",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "so.onekey.app.wallet",
     name: "OneKey",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.subwallet",
     name: "SubWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "pk.modular",
     name: "Modular Wallet Prod",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.dcentwallet",
     name: "D'CENT Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.internetmoney",
     name: "Internet Money Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.hashpack.wallet",
     name: "HashPack",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.kabila",
     name: "Kabila Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.sabay.wallet",
     name: "Sabay Wallet App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.mewwallet",
     name: "MEW wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.tokoin",
     name: "Tokoin | My-T Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.atomicwallet",
     name: "Atomic Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.leapwallet",
     name: "Leap",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.novawallet",
     name: "Nova Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.flowfoundation.wallet",
     name: "Flow Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.gooddollar",
     name: "GoodDollar",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "network.cvl",
     name: "CVL Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bitso",
     name: "Bitso Web3 Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.zengo",
     name: "Zengo Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.klipwallet",
     name: "Klip",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.argent",
     name: "Argent",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.everspace",
     name: "Everspace",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.enjin",
     name: "Enjin Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.uniultra.wallet",
     name: "U2U Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "social.halo",
     name: "Halo Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "tech.okto",
     name: "Okto",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.kriptomat",
     name: "Kriptomat",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "co.xellar",
     name: "Xellar",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "network.haqq",
     name: "HAQQ Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.oxalus",
     name: "Oxalus Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ullapay",
     name: "WOW EARN",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.alephium",
     name: "Alephium Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.frontier.wallet",
     name: "Frontier",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "network.over",
     name: "OverFlex",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "money.unstoppable",
     name: "Unstoppable Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "me.iopay",
     name: "ioPay",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.tomi",
     name: "tomi Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.coca",
     name: "COCA Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.coin98",
     name: "Coin98 Super Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.thorwallet",
     name: "THORWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.monarchwallet",
     name: "Monarch Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.loopring.wallet",
     name: "Loopring",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "one.metapro.wallet",
     name: "metapro wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.burritowallet",
     name: "Burrito",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.mtpelerin",
     name: "Bridge Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.pluswallet",
     name: "Plus Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "cc.localtrade.lab",
     name: "LocalTrade Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.uptn.dapp-web",
     name: "UPTN",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.herewallet",
     name: "HERE Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.xcapit",
     name: "Xcapit",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.zeal",
     name: "Zeal",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.oasys-wallet",
     name: "Oasys Passport",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.coolbitx.cwsapp",
     name: "CoolWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.linen",
     name: "Linen",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.nabox",
     name: "Nabox",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "co.family.wallet",
     name: "Family",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.krystal",
     name: "Krystal",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ellipal",
     name: "ELLIPAL",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.yusetoken",
     name: "Yuse Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.walletnow",
     name: "NOW Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.saakuru.app",
     name: "Saakuru All-in-One crypto App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.foxwallet",
     name: "FoxWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.withpaper",
     name: "Paper",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.ricewallet",
     name: "RiceWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.okse",
     name: "Okse Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.aktionariat",
     name: "Aktionariat",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.cypherhq",
     name: "Cypher Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.paybolt",
     name: "PayBolt",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.compasswallet",
     name: "Compass Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.plasma-wallet",
     name: "Plasma Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.cosmostation",
     name: "Cosmostation",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.bytebank",
     name: "ByteBank",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.unstoppabledomains",
     name: "Unstoppable Domains",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.koalawallet",
     name: "Koala Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.optowallet",
     name: "Opto Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.miraiapp",
     name: "Mirai App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.beewallet",
     name: "Bee Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.sequence",
     name: "Sequence Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.fizen",
     name: "Fizen Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "it.airgap",
     name: "AirGap Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.thepulsewallet",
     name: "The Pulse Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.holdstation",
     name: "Holdstation Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.coinomi",
     name: "Coinomi",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.trusteeglobal",
     name: "Trustee Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.wallacy",
     name: "Wallacy",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "technology.jambo",
     name: "Jambo",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.bladewallet",
     name: "Blade Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.keyring",
     name: "KEYRING PRO",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.abra",
     name: "Abra Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.premanft",
     name: "PREMA Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "finance.voltage",
     name: "Volt Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.bitizen",
     name: "Bitizen",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.wigwam.wallet",
     name: "Wigwam",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.ultimate",
     name: "Ultimate",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.cakewallet",
     name: "Cake Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.fizzwallet",
     name: "Fizz",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.kucoin",
     name: "KuCoin Web3 Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.stickey",
     name: "Stickey Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.neonwallet",
     name: "Neon Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.coinstats",
     name: "CoinStats",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "ai.pundi",
     name: "Pundi Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ripio",
     name: "Ripio Portal",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "co.arculus",
     name: "Arculus Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.harti",
     name: "HARTi Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.gemwallet",
     name: "Gem Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.dttd",
     name: "DTTD",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.zelcore",
     name: "Zelcore",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.thetatoken",
     name: "Theta Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.blocto",
     name: "Blocto",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.tellaw",
     name: "Tellaw Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.ctrl",
     name: "Ctrl Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "is.callback",
     name: "Callback",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.summonersarena",
     name: "SA ASSISTANT",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.safemoon",
     name: "SafeMoon",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "world.ixo",
     name: "Impact Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bitpie",
     name: "Bitpie",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "net.gateweb3",
     name: "GateWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.wallypto",
     name: "Wallypto",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.alpha-u.wallet.web",
     name: "αU wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.lif3",
     name: "Lif3 Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.ammer",
     name: "Ammer Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "us.binance",
     name: "Binance.US",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bitpay",
     name: "BitPay Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "co.muza",
     name: "MUZA",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "jp.co.rakuten-wallet",
     name: "Rakuten Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.ryipay",
     name: "RYIPAY",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.dota168",
     name: "MetaWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.alphawallet",
     name: "AlphaWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.noone",
     name: "Noone Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.myabcwallet",
     name: "ABC Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.wallet3",
     name: "Wallet 3",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.coininn",
     name: "Coininn Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ambire",
     name: "Ambire Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "cc.avacus",
     name: "Avacus",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "me.easy",
     name: "EASY",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.utorg",
     name: "UTORG",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.scramberry",
     name: "ScramberryWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.saitamatoken",
     name: "SaitaPro",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.secuxtech",
     name: "SecuX",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "finance.openwallet",
     name: "Open Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.shido",
     name: "Shido App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.unitywallet",
     name: "Unity Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.onto",
     name: "ONTO",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.companyname.swaptobe",
     name: "TobeWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.midoin",
     name: "midoin",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.hyperpay",
     name: "HyperPay",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "id.competence",
     name: "Competence.id",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.tradestrike",
     name: "StrikeX Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "llc.besc",
     name: "BeanBag",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "baby.smart",
     name: "Smart.Baby",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.coinsdo",
     name: "CoinWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ivirse",
     name: "IApp",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "ch.dssecurity",
     name: "DS Security SA",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.concordium",
     name: "Concordium",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.zkape",
     name: "Ape Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.status",
     name: "Status",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.pitaka",
     name: "Pitaka",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.ozonewallet",
     name: "OzoneWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.mugambo",
     name: "rss wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "network.mrhb",
     name: "Sahal Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.crossmint",
     name: "Crossmint",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.konio",
     name: "Konio",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.legionnetwork",
     name: "LegionNetwork",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.meld.app",
     name: "MELDapp",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.pltwallet",
     name: "PLTwallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.authentrend",
     name: "AT.Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.pockie",
     name: "pockie",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.klever",
     name: "Klever Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.kelp",
     name: "Kelp",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.ethermail",
     name: "EtherMail",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "pro.fintoken",
     name: "FINTOKEN",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.paliwallet",
     name: "Pali Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "vc.uincubator.api",
     name: "UIIC",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.unagi.unawallet",
     name: "una Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.liberawallet",
     name: "Libera",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.armana.portal",
     name: "Armana Portal",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.nash",
     name: "Nash",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.x9wallet",
     name: "X9Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.kigo",
     name: "Kigo",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "world.dosi.vault",
     name: "DOSI Vault",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.nonbank",
     name: "NonBank",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.hbwallet",
     name: "HB WALLET",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.getcogni",
     name: "Cogni ",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "gg.indi",
     name: "IndiGG",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.qubic.wallet",
     name: "Qubic Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.fxwallet",
     name: "FxWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.sinum",
     name: "Sinum",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.kryptogo",
     name: "KryptoGO Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "finance.soulswap.app",
     name: "SoulSwap",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.shapeshift",
     name: "ShapeShift",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.ready",
     name: "Ready",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.shefi",
     name: "SheFi",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "money.keychain",
     name: "Keychain",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.beexo",
     name: "Beexo",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "live.superex",
     name: "SuperWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.getclave",
     name: "Clave",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bettatrade",
     name: "Bettatrade",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.neopin",
     name: "NEOPIN",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "online.puzzle",
     name: "Puzzle Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.echooo",
     name: "Echooo Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.get-verso",
     name: "Verso",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.wemix",
     name: "WemixWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.trinity-tech",
     name: "Essentials",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.trustasset",
     name: "Trust Asset Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.dfinnwallet",
     name: "Dfinn Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bmawallet",
     name: "BMA Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.transi",
     name: "Transi",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.safecryptowallet",
     name: "SafeWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "finance.plena",
     name: "Plena-App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.certhis",
     name: "Certhis",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "inc.tomo",
     name: "Tomo Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "me.komet.app",
     name: "Komet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.pandoshi",
     name: "Pandoshi Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.guardiianwallet",
     name: "GUARDIIAN Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bscecowallet",
     name: "BSC Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "co.lifedefi",
     name: "Life DeFi",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.zypto",
     name: "Zypto",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.broearn",
     name: "Broearn Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.ttmwallet",
     name: "MDAO Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.tastycrypto",
     name: "tastycrypto",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ipmb",
     name: "IPMB Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.nestwallet",
     name: "Nest Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.nicegram",
     name: "Nicegram Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ballet",
     name: "Ballet Crypto",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.omni",
     name: "Omni",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.paraswap",
     name: "ParaSwap Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "one.mixin.messenger",
     name: "Mixin Messenger",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.cryptokara",
     name: "Cryptokara",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.caesiumlab",
     name: "Caesium",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.nodle",
     name: "Nodle",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.universaleverything",
     name: "UniversalProfiles",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "finance.islamicoin",
     name: "ISLAMIwallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.thirdweb",
     name: "thirdweb",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.opz",
     name: "OPZ Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "fun.tobi",
     name: "Tobi",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "trade.flooz.wallet",
     name: "Flooz",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.talkapp",
     name: "T+ Wallet ",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.plutope",
     name: "Plutope",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.ecoinwallet",
     name: "ECOIN Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.poolsmobility.wallet",
     name: "poolswallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.roam.wallet",
     name: "Roam",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.dextrade",
     name: "DexTrade",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.gamic",
     name: "Gamic",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "world.fncy",
     name: "Fncy Mobile Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.m1nty",
     name: "M1NTY",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.3swallet",
     name: "3S Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.catecoin",
     name: "Catecoin Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.payperless",
     name: "Payperless",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.coincircle",
     name: "CoinCircle",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.helixid",
     name: "helix id",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.passpay",
     name: "PassPay Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.kresus",
     name: "Kresus SuperApp",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.nufinetes",
     name: "Nufinetes",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "world.qoin",
     name: "Qoin Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.copiosa",
     name: "Copiosa",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.ancrypto",
     name: "Ancrypto",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.keeper-wallet",
     name: "Keeper",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.bharatbox",
     name: "BharatBox App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.orion",
     name: "Orion",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.cryptnox",
     name: "Cryptnox Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "zone.bitverse",
     name: "Bitverse",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "cc.dropp",
     name: "Dropp",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.sinohope",
     name: "Sinohope",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "ai.hacken",
     name: "hAI by Hacken",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "net.spatium",
     name: "Spatium",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.bitnovo",
     name: "Bitnovo Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "co.swopme",
     name: "SWOP",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "land.liker",
     name: "LikerLand App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.owallet",
     name: "OWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.dolletwallet",
     name: "Dollet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "net.shinobi-wallet",
     name: "Shinobi-Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.azcoiner",
     name: "AZCoiner",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.pierwallet",
     name: "pier",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.talken",
     name: "Talken Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.passwallet.app",
     name: "Pass App: Web3 Smart Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.coinex.wallet",
     name: "CoinEx Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "pub.dg",
     name: "DGPub App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.xverse",
     name: "Xverse",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "nl.greenhood.wallet",
     name: "Greenhood",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.flash-wallet",
     name: "Flash Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.vgxfoundation",
     name: "VGX Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.arianee",
     name: "Arianee Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "ai.spotonchain.platform",
     name: "Spot On Chain App",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.tiduswallet",
     name: "Tidus Wallet ",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "technology.obvious",
     name: "Obvious",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.daffione",
     name: "DaffiOne",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.webauth",
     name: "WebAuth",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.tofee",
     name: "Tofee Wallet Official",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.didwallet",
     name: "DIDWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "xyz.bonuz",
     name: "Bonuz Social Smart Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "social.gm2",
     name: "GM² Social",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "co.cyber.wallet",
     name: "CyberWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "me.astrox",
     name: "Me Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "fi.pillar",
     name: "Pillar",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.buzz-up",
     name: "BUZZUP",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.moonstake",
     name: "MOONSTAKE",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.hippowallet",
     name: "Hippo Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.amazewallet",
     name: "AmazeWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.kriptonio",
     name: "Kriptonio",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.altme",
     name: "Altme",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.ukiss",
     name: "UKISS Hub",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "fi.dropmate",
     name: "Dropmate",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.zelus",
     name: "Zelus Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.xucre",
     name: "Xucre",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "net.myrenegade",
     name: "Renegade",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "net.stasis",
     name: "Stasis Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.clingon",
     name: "Cling Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.humbl",
     name: "HUMBL WALLET",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.peakdefi",
     name: "PEAKDEFI",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "network.dgg",
     name: "DGG Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "finance.panaroma",
     name: "Panaroma Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.icewal",
     name: "icewal",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.streakk",
     name: "Streakk Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "network.gridlock",
     name: "Gridlock Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "network.trustkeys",
     name: "TrustKeys Web3 SocialFi",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "finance.slingshot",
     name: "Slingshot Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.mpcvault.broswerplugin",
     name: "MPCVault | Team crypto wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "digital.minerva",
     name: "Minerva Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "finance.porta",
     name: "PortaWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.earthwallet",
     name: "Earth Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.clot",
     name: "Clot",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.alicebob",
     name: "Alicebob Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "net.spatium.wallet",
     name: "Spatium",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "id.plumaa",
     name: "Plumaa ID",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.apollox",
     name: "ApolloX",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.legacynetwork",
     name: "Legacy Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.ethos",
     name: "Ethos Self-Custody Vault",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.rktechworks",
     name: "ID Pocket",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.greengloryglobal",
     name: "Blockaura",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "co.filwallet",
     name: "FILWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "money.snowball",
     name: "Snowball",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.ennowallet",
     name: "Enno Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.safematrix",
     name: "Safematrix",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "pro.assure",
     name: "Assure",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.edge",
     name: "Edge Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.neftipedia",
     name: "NeftiWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.goldbit",
     name: "GoldBit",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.coingrig",
     name: "Coingrig",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.xfun",
     name: "XFUN Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.antiersolutions",
     name: "Ancrypto Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.itoken",
     name: "iToken Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.cardstack",
     name: "Card Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.slavi",
     name: "Slavi Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "tech.defiantapp",
     name: "Defiant",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "app.imem",
     name: "iMe",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.socios.app",
     name: "Socios.com - Wallet & Tokens",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.bimwallet",
     name: "BIM Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.adftechnology",
     name: "ADF Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.reown.appkit-lab",
     name: "Flutter Sample Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.reown",
     name: "React Native Sample Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.reown.docs",
     name: "Kotlin Sample Internal Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.yowallet",
     name: "YoWallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "org.hot-labs",
     name: "HOT Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "ai.purewallet",
     name: "PureWallet app",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "io.walletverse",
     name: "Walletverse",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "com.berasig",
     name: "BeraSig",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: false,
     id: "app.phantom",
     name: "Phantom",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.coinbase.wallet",
     name: "Coinbase Wallet",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "io.rabby",
     name: "Rabby",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.brave.wallet",
     name: "Brave Wallet",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.moongate.one",
     name: "MG",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "tech.levain",
     name: "Levain",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.enkrypt",
     name: "Enkrypt",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.scramble",
     name: "Scramble",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "io.finoa",
     name: "FinoaConnect",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.blanqlabs.wallet",
     name: "Blanq",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.walletconnect.com",
     name: "SampleW",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "app.nightly",
     name: "Nightly",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.blazpay.wallet",
     name: "Blazpay",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "io.getjoin.prd",
     name: "JOIN MOBILE APP",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "xyz.talisman",
     name: "Talisman Wallet",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "eu.flashsoft.clear-wallet",
     name: "clear-wallet",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "app.berasig",
     name: "BeraSig",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.wallet.reown",
     name: "Leather",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "com.lootrush",
     name: "LootRush",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "xyz.dawnwallet",
     name: "Dawn Wallet",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: false,
     id: "xyz.abs",
     name: "Abstract Global Wallet",
-    hasMobileSupport: false,
   },
   {
+    hasMobileSupport: true,
     id: "smart",
     name: "Smart Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "inApp",
     name: "In-App Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: true,
     id: "embedded",
     name: "In-App Wallet",
-    hasMobileSupport: true,
   },
   {
+    hasMobileSupport: false,
     id: "walletConnect",
     name: "WalletConnect",
-    hasMobileSupport: false,
   },
 ] as const satisfies MinimalWalletInfo[];
 
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/ag.jup/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/ag.jup/index.ts
index e354ddc1ca4..fe17079f76c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/ag.jup/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/ag.jup/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "ag.jup",
-  name: "Jupiter",
-  homepage: "https://jup.ag/mobile",
-  image_id: "7601bec3-144f-4c9d-30a1-2d4a372ede00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/jupiter-solana-swap-wallet/id6484069059",
     android:
       "https://play.google.com/store/apps/details?id=ag.jup.jupiter.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/jupiter-solana-swap-wallet/id6484069059",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "jupiter://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://jup.ag/mobile",
+  id: "ag.jup",
+  image_id: "7601bec3-144f-4c9d-30a1-2d4a372ede00",
+  mobile: {
+    native: "jupiter://",
+    universal: null,
+  },
+  name: "Jupiter",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/ai.hacken/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/ai.hacken/index.ts
index 6c5c434e53a..852fd3a0a10 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/ai.hacken/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/ai.hacken/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "ai.hacken",
-  name: "hAI by Hacken",
-  homepage: "https://hacken.ai",
-  image_id: "d2ff6baf-5051-4bf2-edec-32450b451000",
   app: {
-    browser: "https://hacken.ai",
-    ios: "https://apps.apple.com/us/app/hai-by-hacken/id1501384789",
     android:
       "https://play.google.com/store/apps/details?id=com.hackenai.hackenaiapp&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://hacken.ai",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/hai-by-hacken/id1501384789",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "hai://",
-    universal: "https://hacken.ai",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://hacken.ai",
+  id: "ai.hacken",
+  image_id: "d2ff6baf-5051-4bf2-edec-32450b451000",
+  mobile: {
+    native: "hai://",
+    universal: "https://hacken.ai",
+  },
+  name: "hAI by Hacken",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/ai.pundi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/ai.pundi/index.ts
index aca83d9bfab..3e7c9d64e7f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/ai.pundi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/ai.pundi/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "ai.pundi",
-  name: "Pundi Wallet",
-  homepage: "https://pundi.ai/",
-  image_id: "f095abd7-575e-4851-cf9c-79c2c4e4cc00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/f-x-wallet-by-function-x-labs/id1504798360",
     android:
       "https://play.google.com/store/apps/details?id=com.pundix.functionx",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/f-x-wallet-by-function-x-labs/id1504798360",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "fxwallet://",
-    universal: "https://fx.wallet/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://pundi.ai/",
+  id: "ai.pundi",
+  image_id: "f095abd7-575e-4851-cf9c-79c2c4e4cc00",
+  mobile: {
+    native: "fxwallet://",
+    universal: "https://fx.wallet/wc",
+  },
+  name: "Pundi Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/ai.purewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/ai.purewallet/index.ts
index 5cb41c75e2e..b40b790b7b1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/ai.purewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/ai.purewallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "ai.purewallet",
-  name: "PureWallet app",
-  homepage: "https://purewallet.ai",
-  image_id: "4e97b9d6-60eb-42cd-6256-5cd7205e3f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/purewallet/id6738949168?platform=iphone",
     android:
       "https://play.google.com/store/apps/details?id=com.nslab.purewalletp&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/purewallet/id6738949168?platform=iphone",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "purewalletp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://purewallet.ai",
+  id: "ai.purewallet",
+  image_id: "4e97b9d6-60eb-42cd-6256-5cd7205e3f00",
+  mobile: {
+    native: "purewalletp://",
+    universal: null,
+  },
+  name: "PureWallet app",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/ai.spotonchain.platform/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/ai.spotonchain.platform/index.ts
index b492e364c6f..bb81a24c09f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/ai.spotonchain.platform/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/ai.spotonchain.platform/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "ai.spotonchain.platform",
-  name: "Spot On Chain App",
-  homepage: "https://platform.spotonchain.ai",
-  image_id: "1bcb5ed6-f6c9-4b0d-f891-b70c48b93d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/spot-on-chain/id6449733489",
     android:
       "https://play.google.com/store/apps/details?id=network.spotonchain",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/spot-on-chain/id6449733489",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "spotonchain://",
-    universal: "https://spotonchain.ai/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://platform.spotonchain.ai",
+  id: "ai.spotonchain.platform",
+  image_id: "1bcb5ed6-f6c9-4b0d-f891-b70c48b93d00",
+  mobile: {
+    native: "spotonchain://",
+    universal: "https://spotonchain.ai/",
+  },
+  name: "Spot On Chain App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.ammer/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.ammer/index.ts
index 816207d47f9..827e3053229 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.ammer/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.ammer/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.ammer",
-  name: "Ammer Wallet",
-  homepage: "https://ammer.app/",
-  image_id: "7d38dd8e-92ee-44bf-1ca4-818531de1900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ammer-wallet/id1599698329",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ammer-wallet/id1599698329",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ammerwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ammer.app/",
+  id: "app.ammer",
+  image_id: "7d38dd8e-92ee-44bf-1ca4-818531de1900",
+  mobile: {
+    native: "ammerwallet://",
+    universal: null,
+  },
+  name: "Ammer Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.backpack/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.backpack/index.ts
index ad600ebdaa2..3dc57acf72a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.backpack/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.backpack/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.backpack",
-  name: "Backpack",
-  homepage: "https://backpack.app",
-  image_id: "71ca9daf-a31e-4d2a-fd01-f5dc2dc66900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/backpack-wallet-exchange/id6445964121",
     android:
       "https://play.google.com/store/apps/details?id=app.backpack.mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/backpack/aflkmfhebedbjioipglgcbcmnbpgliof",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/backpack-wallet-exchange/id6445964121",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "app.backpack",
-  mobile: {
-    native: "backpack://",
-    universal: "https://backpack.app/ul/v1",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://backpack.app",
+  id: "app.backpack",
+  image_id: "71ca9daf-a31e-4d2a-fd01-f5dc2dc66900",
+  mobile: {
+    native: "backpack://",
+    universal: "https://backpack.app/ul/v1",
+  },
+  name: "Backpack",
+  rdns: "app.backpack",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.beewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.beewallet/index.ts
index 224b0d9504e..28f3a6c6d2f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.beewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.beewallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.beewallet",
-  name: "Bee Wallet",
-  homepage: "https://www.beewallet.app",
-  image_id: "f90bc33f-f085-40cf-7538-fae5ae84f900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/lt/app/bee-for-uniswap-pancakeswap/id1617257467",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/lt/app/bee-for-uniswap-pancakeswap/id1617257467",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "beewallet.app://",
-    universal: "https://beewallet.app/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.beewallet.app",
+  id: "app.beewallet",
+  image_id: "f90bc33f-f085-40cf-7538-fae5ae84f900",
+  mobile: {
+    native: "beewallet.app://",
+    universal: "https://beewallet.app/wc",
+  },
+  name: "Bee Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.berasig/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.berasig/index.ts
index 67cd6c71f9d..08e5fb82ace 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.berasig/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.berasig/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.berasig",
-  name: "BeraSig",
-  homepage: "https://www.berasig.com/",
-  image_id: "4b9e9716-c86d-4f1e-4bcc-12af74af7400",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/berasig/ckedkkegjbflcfblcjklibnedmfjppbj",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "app.berasig",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://www.berasig.com/",
+  id: "app.berasig",
+  image_id: "4b9e9716-c86d-4f1e-4bcc-12af74af7400",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "BeraSig",
+  rdns: "app.berasig",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.catecoin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.catecoin/index.ts
index 82f452bcb8b..3f7c4d5505f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.catecoin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.catecoin/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.catecoin",
-  name: "Catecoin Wallet",
-  homepage: "https://catecoin.app",
-  image_id: "d017bc54-db4d-4f07-2de2-69790ce92400",
   app: {
-    browser: "https://wallet.catecoin.club/",
-    ios: "https://apps.apple.com/app/id1637850589?platform=iphone",
     android:
       "https://play.google.com/store/apps/details?id=com.crypto.wallet.catecoin",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: "https://wallet.catecoin.club/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1637850589?platform=iphone",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "catecoin://",
-    universal: "https://catecoin.app/apple-app-site-association",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.catecoin.club/",
   },
+  homepage: "https://catecoin.app",
+  id: "app.catecoin",
+  image_id: "d017bc54-db4d-4f07-2de2-69790ce92400",
+  mobile: {
+    native: "catecoin://",
+    universal: "https://catecoin.app/apple-app-site-association",
+  },
+  name: "Catecoin Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.clot/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.clot/index.ts
index f193267518c..ff2eea31723 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.clot/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.clot/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.clot",
-  name: "Clot",
-  homepage: "https://clot.app",
-  image_id: "a7d2716d-69b8-4422-9797-ed63b1f9c000",
   app: {
-    browser: "https://clot.app",
-    ios: "https://apps.apple.com/app/clot-wallet/id1584113315",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://clot.app",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/clot-wallet/id1584113315",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "clot://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://clot.app",
   },
+  homepage: "https://clot.app",
+  id: "app.clot",
+  image_id: "a7d2716d-69b8-4422-9797-ed63b1f9c000",
+  mobile: {
+    native: "clot://",
+    universal: null,
+  },
+  name: "Clot",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.coinstats/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.coinstats/index.ts
index 258ec1fd940..7d2ef780aad 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.coinstats/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.coinstats/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.coinstats",
-  name: "CoinStats",
-  homepage: "https://coinstats.app",
-  image_id: "b2a00908-f144-4a49-cc0a-9d7422ad5e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id1247849330",
     android:
       "https://play.google.com/store/apps/details?id=com.coinstats.crypto.portfolio",
-    mac: "https://apps.apple.com/us/app/id1247849330",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id1247849330",
+    linux: null,
+    mac: "https://apps.apple.com/us/app/id1247849330",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "coinstats://",
-    universal: "http://coinstats.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "coinstats://",
     universal: null,
   },
+  homepage: "https://coinstats.app",
+  id: "app.coinstats",
+  image_id: "b2a00908-f144-4a49-cc0a-9d7422ad5e00",
+  mobile: {
+    native: "coinstats://",
+    universal: "http://coinstats.app",
+  },
+  name: "CoinStats",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.core.extension/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.core.extension/index.ts
index c07ab12a991..e9ca0402ff0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.core.extension/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.core.extension/index.ts
@@ -2,36 +2,36 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.core.extension",
-  name: "Core",
-  homepage:
-    "https://core.app/?utm_source=referral&utm_medium=website&utm_campaign=walletconnect",
-  image_id: "aec2da5c-8867-4a53-8f3d-4d547a30b400",
   app: {
-    browser:
-      "https://core.app/?utm_source=referral&utm_medium=website&utm_campaign=walletconnect",
-    ios: "https://apps.apple.com/us/app/core-crypto-wallet-nfts/id6443685999",
     android:
       "https://play.google.com/store/apps/details?id=com.avaxwallet&hl=en_US&gl=US",
-    mac: null,
-    windows:
+    browser:
       "https://core.app/?utm_source=referral&utm_medium=website&utm_campaign=walletconnect",
-    linux: null,
     chrome:
       "https://chrome.google.com/webstore/detail/core-crypto-wallet-nft-ex/agoakfejjabomempkjlepdflaleeobhb",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/core-crypto-wallet-nfts/id6443685999",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "app.core.extension",
-  mobile: {
-    native: "core://",
-    universal: "https://core.app",
+    safari: null,
+    windows:
+      "https://core.app/?utm_source=referral&utm_medium=website&utm_campaign=walletconnect",
   },
   desktop: {
     native: "core://",
     universal:
       "https://core.app/?utm_source=referral&utm_medium=website&utm_campaign=walletconnect",
   },
+  homepage:
+    "https://core.app/?utm_source=referral&utm_medium=website&utm_campaign=walletconnect",
+  id: "app.core.extension",
+  image_id: "aec2da5c-8867-4a53-8f3d-4d547a30b400",
+  mobile: {
+    native: "core://",
+    universal: "https://core.app",
+  },
+  name: "Core",
+  rdns: "app.core.extension",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.dfinnwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.dfinnwallet/index.ts
index e9a7c7f85e0..5fa899c7480 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.dfinnwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.dfinnwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.dfinnwallet",
-  name: "Dfinn Wallet",
-  homepage: "https://dfinnwallet.app",
-  image_id: "9a9c59ce-6346-4af8-db19-778533fb6000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/dfinn-wallet/id6451134219",
     android: "https://play.google.com/store/apps/details?id=money.dfinn.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/dfinn-wallet/id6451134219",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "dfinnwallet://",
-    universal: "https://dfinnwallet-link.vercel.app/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://dfinnwallet.app",
+  id: "app.dfinnwallet",
+  image_id: "9a9c59ce-6346-4af8-db19-778533fb6000",
+  mobile: {
+    native: "dfinnwallet://",
+    universal: "https://dfinnwallet-link.vercel.app/",
+  },
+  name: "Dfinn Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.edge/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.edge/index.ts
index 1a62449e3c3..1416ba3de81 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.edge/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.edge/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.edge",
-  name: "Edge Wallet",
-  homepage: "https://edge.app/",
-  image_id: "f601bc29-4298-422f-dbf7-34dac2884f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/edge-bitcoin-wallet/id1344400091",
     android: "https://play.google.com/store/apps/details?id=co.edgesecure.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/edge-bitcoin-wallet/id1344400091",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "edge://",
-    universal: "https://deep.edge.app/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://edge.app/",
+  id: "app.edge",
+  image_id: "f601bc29-4298-422f-dbf7-34dac2884f00",
+  mobile: {
+    native: "edge://",
+    universal: "https://deep.edge.app/wc",
+  },
+  name: "Edge Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.everspace/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.everspace/index.ts
index 22bfb1f33d8..fe001c1e7c9 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.everspace/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.everspace/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.everspace",
-  name: "Everspace",
-  homepage: "https://everspace.app",
-  image_id: "80eaa630-6392-4b0a-a604-0a0f808e4d00",
   app: {
-    browser: "https://everspace.app/",
-    ios: "https://apps.apple.com/ru/app/everspace/id1585434994?l=en",
     android: "https://play.google.com/store/apps/details?id=com.oberton.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://everspace.app/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ru/app/everspace/id1585434994?l=en",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "everspace://",
-    universal: "https://everspace.app/deeplink",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://everspace.app/",
   },
+  homepage: "https://everspace.app",
+  id: "app.everspace",
+  image_id: "80eaa630-6392-4b0a-a604-0a0f808e4d00",
+  mobile: {
+    native: "everspace://",
+    universal: "https://everspace.app/deeplink",
+  },
+  name: "Everspace",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.fizzwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.fizzwallet/index.ts
index 69d2b749363..3c622fcad00 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.fizzwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.fizzwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.fizzwallet",
-  name: "Fizz",
-  homepage: "https://www.fizzwallet.app/",
-  image_id: "f9d4db84-2e9f-4fbe-684f-c1e921c98800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kr/app/fizz-fun-ezzy-crypto-wallet/id6447460538",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kr/app/fizz-fun-ezzy-crypto-wallet/id6447460538",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "fizz://wallet-connect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.fizzwallet.app/",
+  id: "app.fizzwallet",
+  image_id: "f9d4db84-2e9f-4fbe-684f-c1e921c98800",
+  mobile: {
+    native: "fizz://wallet-connect",
+    universal: null,
+  },
+  name: "Fizz",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.gamic/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.gamic/index.ts
index ef756263b94..28626fc94de 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.gamic/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.gamic/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.gamic",
-  name: "Gamic",
-  homepage: "https://gamic.app",
-  image_id: "cf404c15-391c-4144-1ec0-17f1b119ed00",
   app: {
-    browser: "https://gamic.app/",
-    ios: "https://apps.apple.com/us/app/gamic-spaces-chat-connect/id1673683070",
     android:
       "https://play.google.com/store/apps/details?id=app.gamic.guild.gamic_guild_mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://gamic.app/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/gamic-spaces-chat-connect/id1673683070",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "gamic://",
-    universal: "https://www.gamic.app/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "gamic://",
     universal: "https://gamic.app/",
   },
+  homepage: "https://gamic.app",
+  id: "app.gamic",
+  image_id: "cf404c15-391c-4144-1ec0-17f1b119ed00",
+  mobile: {
+    native: "gamic://",
+    universal: "https://www.gamic.app/wc",
+  },
+  name: "Gamic",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.girin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.girin/index.ts
index a04096ecff3..9ed434d0131 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.girin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.girin/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.girin",
-  name: "Girin Wallet",
-  homepage: "https://girin.app",
-  image_id: "4a7f0768-f2b9-48be-f4a1-44c4c158e700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kr/app/girin-wallet/id6670226485",
     android: "https://play.google.com/store/apps/details?id=app.girinwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kr/app/girin-wallet/id6670226485",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "girinwallet://",
     universal: null,
   },
-  desktop: {
+  homepage: "https://girin.app",
+  id: "app.girin",
+  image_id: "4a7f0768-f2b9-48be-f4a1-44c4c158e700",
+  mobile: {
     native: "girinwallet://",
     universal: null,
   },
+  name: "Girin Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.hbwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.hbwallet/index.ts
index cf5920de462..f8f17ade946 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.hbwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.hbwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.hbwallet",
-  name: "HB WALLET",
-  homepage: "https://hbwallet.app",
-  image_id: "f134f8a2-cf58-44dd-7626-dc2cd21a3800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ethereum-wallet-hb-wallet/id1273639572",
     android:
       "https://play.google.com/store/apps/details?id=co.bacoor.android.hbwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ethereum-wallet-hb-wallet/id1273639572",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "hbwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://hbwallet.app",
+  id: "app.hbwallet",
+  image_id: "f134f8a2-cf58-44dd-7626-dc2cd21a3800",
+  mobile: {
+    native: "hbwallet://",
+    universal: null,
+  },
+  name: "HB WALLET",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.herewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.herewallet/index.ts
index bce8d877335..d0e49a42d56 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.herewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.herewallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.herewallet",
-  name: "HERE Wallet",
-  homepage: "https://herewallet.app",
-  image_id: "21cadc07-2f45-4860-3358-83a2057b6300",
   app: {
-    browser: null,
-    ios: "https://download.herewallet.app?ios",
     android: "https://download.herewallet.app?android",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://download.herewallet.app?ios",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "herewallet://",
-    universal: "https://my.herewallet",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://herewallet.app",
+  id: "app.herewallet",
+  image_id: "21cadc07-2f45-4860-3358-83a2057b6300",
+  mobile: {
+    native: "herewallet://",
+    universal: "https://my.herewallet",
+  },
+  name: "HERE Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.imem/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.imem/index.ts
index 2dd136b0c3e..380842bcf3b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.imem/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.imem/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.imem",
-  name: "iMe",
-  homepage: "https://imem.app/",
-  image_id: "25aa3abf-901b-4d82-bb89-c5ade54c0c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ime-messenger/id1450480822",
     android: "https://play.google.com/store/apps/details?id=com.iMe.android",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ime-messenger/id1450480822",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://imem.app/",
+  id: "app.imem",
+  image_id: "25aa3abf-901b-4d82-bb89-c5ade54c0c00",
+  mobile: {
+    native: "wc://",
+    universal: null,
+  },
+  name: "iMe",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.kabila/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.kabila/index.ts
index 8deec15cf80..dcae1cff79c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.kabila/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.kabila/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.kabila",
-  name: "Kabila Wallet",
-  homepage: "https://kabila.app/",
-  image_id: "e6263e25-7f31-4186-5ad4-75e17312c500",
   app: {
-    browser: "https://wallet.kabila.app/",
-    ios: "https://apps.apple.com/es/app/kabila-wallet/id6467106529",
     android:
       "https://play.google.com/store/apps/details?id=wallet.kabila.app&hl=es_419&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet.kabila.app/",
     chrome:
       "https://chromewebstore.google.com/detail/kabila-wallet/cnoepnljjcacmnjnopbhjelpmfokpijm",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/es/app/kabila-wallet/id6467106529",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://wallet.kabila.app",
   },
-  desktop: {
+  homepage: "https://kabila.app/",
+  id: "app.kabila",
+  image_id: "e6263e25-7f31-4186-5ad4-75e17312c500",
+  mobile: {
     native: null,
     universal: "https://wallet.kabila.app",
   },
+  name: "Kabila Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.keeper-wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.keeper-wallet/index.ts
index f5605557a29..203325ea26d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.keeper-wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.keeper-wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.keeper-wallet",
-  name: "Keeper",
-  homepage: "https://keeper-wallet.app",
-  image_id: "41f6ac85-8f4e-4d9f-b37b-92b43fa7f400",
   app: {
+    android: "https://play.google.com/store/apps/details?id=app.keeper.wallet",
     browser:
       "https://chrome.google.com/webstore/detail/keeper-wallet/lpilbniiabackdjcionkobglmddfbcjo",
-    ios: "https://apps.apple.com/us/app/keeper-wallet/id6444443920",
-    android: "https://play.google.com/store/apps/details?id=app.keeper.wallet",
-    mac: "",
-    windows: null,
-    linux: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/keeper-wallet/id6444443920",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://link.keeper-wallet.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal:
       "https://chrome.google.com/webstore/detail/keeper-wallet/lpilbniiabackdjcionkobglmddfbcjo",
   },
+  homepage: "https://keeper-wallet.app",
+  id: "app.keeper-wallet",
+  image_id: "41f6ac85-8f4e-4d9f-b37b-92b43fa7f400",
+  mobile: {
+    native: null,
+    universal: "https://link.keeper-wallet.app",
+  },
+  name: "Keeper",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.keplr/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.keplr/index.ts
index 44e6bb65b75..28cf8f7e372 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.keplr/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.keplr/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.keplr",
-  name: "Keplr",
-  homepage: "https://keplr.app",
-  image_id: "527324b0-3849-462b-9a1a-72b53bdfea00",
   app: {
-    browser: "https://wallet.keplr.app",
-    ios: "https://apps.apple.com/us/app/keplr-wallet/id1567851089",
     android:
       "https://play.google.com/store/apps/details?id=com.chainapsis.keplr&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet.keplr.app",
     chrome:
       "https://chrome.google.com/webstore/detail/keplr/dmkamcknogkgcdfhhbddcghachkejeap?hl=en",
-    firefox: "https://addons.mozilla.org/en-US/firefox/addon/keplr/",
-    safari: null,
     edge: "https://microsoftedge.microsoft.com/addons/detail/keplr/ocodgmmffbkkeecmadcijjhkmeohinei",
+    firefox: "https://addons.mozilla.org/en-US/firefox/addon/keplr/",
+    ios: "https://apps.apple.com/us/app/keplr-wallet/id1567851089",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "app.keplr",
-  mobile: {
-    native: "keplrwallet://wcV2",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.keplr.app",
   },
+  homepage: "https://keplr.app",
+  id: "app.keplr",
+  image_id: "527324b0-3849-462b-9a1a-72b53bdfea00",
+  mobile: {
+    native: "keplrwallet://wcV2",
+    universal: null,
+  },
+  name: "Keplr",
+  rdns: "app.keplr",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.keyring/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.keyring/index.ts
index 08a1249181d..e8442247eab 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.keyring/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.keyring/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.keyring",
-  name: "KEYRING PRO",
-  homepage: "https://keyring.app/",
-  image_id: "dda0f0fb-34e8-4a57-dcea-b008e7d1ff00",
   app: {
-    browser: "https://keyring.app/",
-    ios: "https://apps.apple.com/us/app/keyring-pro-wallet-management/id1546824976",
     android: "https://play.google.com/store/apps/details?id=co.bacoor.keyring",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://keyring.app/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/keyring-pro-wallet-management/id1546824976",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "keyring://",
-    universal: "https://keyring.app/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://keyring.app/",
   },
+  homepage: "https://keyring.app/",
+  id: "app.keyring",
+  image_id: "dda0f0fb-34e8-4a57-dcea-b008e7d1ff00",
+  mobile: {
+    native: "keyring://",
+    universal: "https://keyring.app/",
+  },
+  name: "KEYRING PRO",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.krystal/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.krystal/index.ts
index ad028f184ec..5bbbb92bc6b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.krystal/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.krystal/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.krystal",
-  name: "Krystal",
-  homepage: "https://krystal.app/",
-  image_id: "d2b59965-4eb8-4828-d3d4-fbc0b3379e00",
   app: {
-    browser: "https://defi.krystal.app/",
-    ios: "https://apps.apple.com/us/app/krystal-one-platform-all-defi/id1558105691",
     android: "https://play.google.com/store/apps/details?id=com.kyrd.krystal",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://defi.krystal.app/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/krystal-one-platform-all-defi/id1558105691",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "krystalwallet://",
-    universal: "https://wallet.krystal.app/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://defi.krystal.app/",
   },
+  homepage: "https://krystal.app/",
+  id: "app.krystal",
+  image_id: "d2b59965-4eb8-4828-d3d4-fbc0b3379e00",
+  mobile: {
+    native: "krystalwallet://",
+    universal: "https://wallet.krystal.app/",
+  },
+  name: "Krystal",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.linen/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.linen/index.ts
index cb39b9ecf66..58580fb3c1b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.linen/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.linen/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.linen",
-  name: "Linen",
-  homepage: "https://linen.app/",
-  image_id: "aff3e4e1-92a9-4066-f48f-3591947cf200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/linen-app-investing-in-defi/id1480509067",
     android: "https://play.google.com/store/apps/details?id=app.linen.wallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/linen-app-investing-in-defi/id1480509067",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "linen://",
-    universal: "https://linen.app/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://linen.app/",
+  id: "app.linen",
+  image_id: "aff3e4e1-92a9-4066-f48f-3591947cf200",
+  mobile: {
+    native: "linen://",
+    universal: "https://linen.app/",
+  },
+  name: "Linen",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.m1nty/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.m1nty/index.ts
index a4a3ac341b9..c14f1a8402a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.m1nty/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.m1nty/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.m1nty",
-  name: "M1NTY",
-  homepage: "https://m1nty.app",
-  image_id: "6ccb7754-acd8-4de2-797e-a587a53d3900",
   app: {
-    browser: "https://m1nty.app",
-    ios: "https://apps.apple.com/app/m1nty/id1643737318",
     android: "https://play.google.com/store/apps/details?id=app.m1nty.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://m1nty.app",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/m1nty/id1643737318",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "m1nty://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://m1nty.app",
   },
+  homepage: "https://m1nty.app",
+  id: "app.m1nty",
+  image_id: "6ccb7754-acd8-4de2-797e-a587a53d3900",
+  mobile: {
+    native: "m1nty://",
+    universal: null,
+  },
+  name: "M1NTY",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.nicegram/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.nicegram/index.ts
index 1bfc056357a..7af9ff0f541 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.nicegram/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.nicegram/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.nicegram",
-  name: "Nicegram Wallet",
-  homepage: "https://nicegram.app",
-  image_id: "929745a4-5830-480b-f6ab-bb3a854bc700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/apple-store/id1608870673",
     android: "https://play.google.com/store/apps/details?id=app.nicegram",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/apple-store/id1608870673",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ncg://wallet/home",
-    universal: "https://nicegram.app/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://nicegram.app",
+  id: "app.nicegram",
+  image_id: "929745a4-5830-480b-f6ab-bb3a854bc700",
+  mobile: {
+    native: "ncg://wallet/home",
+    universal: "https://nicegram.app/",
+  },
+  name: "Nicegram Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.nightly/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.nightly/index.ts
index e281ff51bce..b6c4fb8d8e0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.nightly/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.nightly/index.ts
@@ -2,33 +2,33 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.nightly",
-  name: "Nightly",
-  homepage: "https://nightly.app",
-  image_id: "7fb6e288-6d7e-4f29-d934-8b3f229c2d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/pl/app/nightly-multichain-wallet/id6444768157",
     android:
       "https://play.google.com/store/apps/details?id=com.nightlymobile&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/nightly/fiikommddbeccaoicoejoniammnalkfa",
-    firefox: null,
-    safari: null,
     edge: "https://chromewebstore.google.com/detail/nightly/fiikommddbeccaoicoejoniammnalkfa",
+    firefox: null,
+    ios: "https://apps.apple.com/pl/app/nightly-multichain-wallet/id6444768157",
+    linux: null,
+    mac: null,
     opera:
       "https://chromewebstore.google.com/detail/nightly/fiikommddbeccaoicoejoniammnalkfa",
+    safari: null,
+    windows: null,
   },
-  rdns: "app.nightly",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://nightly.app",
+  id: "app.nightly",
+  image_id: "7fb6e288-6d7e-4f29-d934-8b3f229c2d00",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Nightly",
+  rdns: "app.nightly",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.omni/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.omni/index.ts
index c842d21c552..6df8f363cdd 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.omni/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.omni/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.omni",
-  name: "Omni",
-  homepage: "https://omni.app",
-  image_id: "2cd67b4c-282b-4809-e7c0-a88cd5116f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/de/app/steakwallet/id1569375204?l=en",
     android: "https://play.google.com/store/apps/details?id=fi.steakwallet.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/de/app/steakwallet/id1569375204?l=en",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "omni://",
-    universal: "https://links.omni.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://omni.app",
+  id: "app.omni",
+  image_id: "2cd67b4c-282b-4809-e7c0-a88cd5116f00",
+  mobile: {
+    native: "omni://",
+    universal: "https://links.omni.app",
+  },
+  name: "Omni",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.onto/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.onto/index.ts
index b0427951cb2..b826eba5142 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.onto/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.onto/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.onto",
-  name: "ONTO",
-  homepage: "https://onto.app",
-  image_id: "14934596-632e-4b29-d45f-61109e959000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/onto-an-ontology-dapp/id1436009823",
     android:
       "https://play.google.com/store/apps/details?id=com.github.ontio.onto",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/onto-an-ontology-dapp/id1436009823",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ontoprovider://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://onto.app",
+  id: "app.onto",
+  image_id: "14934596-632e-4b29-d45f-61109e959000",
+  mobile: {
+    native: "ontoprovider://",
+    universal: null,
+  },
+  name: "ONTO",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.phantom/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.phantom/index.ts
index 407bf75dc31..90fe8d05ec1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.phantom/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.phantom/index.ts
@@ -2,34 +2,34 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.phantom",
-  name: "Phantom",
-  homepage: "https://phantom.app/",
-  image_id: "b6ec7b81-bb4f-427d-e290-7631e6e50d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/phantom-crypto-wallet/id1598432977",
     android: "https://play.google.com/store/apps/details?id=app.phantom&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/phantom/bfnaelmomeimhlpmgjnjophhpkkoljpa",
-    firefox: "https://addons.mozilla.org/en-US/firefox/addon/phantom-app/",
-    safari: null,
     edge: "https://chrome.google.com/webstore/detail/phantom/bfnaelmomeimhlpmgjnjophhpkkoljpa",
+    firefox: "https://addons.mozilla.org/en-US/firefox/addon/phantom-app/",
+    ios: "https://apps.apple.com/us/app/phantom-crypto-wallet/id1598432977",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "app.phantom",
-  mobile: {
-    native: null,
-    universal: null,
+  deepLink: {
+    mobile: "https://phantom.app/ul/browse/",
   },
   desktop: {
     native: null,
     universal: null,
   },
-  deepLink: {
-    mobile: "https://phantom.app/ul/browse/",
+  homepage: "https://phantom.app/",
+  id: "app.phantom",
+  image_id: "b6ec7b81-bb4f-427d-e290-7631e6e50d00",
+  mobile: {
+    native: null,
+    universal: null,
   },
+  name: "Phantom",
+  rdns: "app.phantom",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.pluswallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.pluswallet/index.ts
index 6809ec6a508..b7057fc28b6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.pluswallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.pluswallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.pluswallet",
-  name: "Plus Wallet",
-  homepage: "https://pluswallet.app",
-  image_id: "2c21491b-58ce-47bb-ace9-bdef71f43600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/plus-wallet-app/id6467651848",
     android: "https://play.google.com/store/apps/details?id=com.PlusWallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/plus-wallet-app/id6467651848",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "pluswallet://",
-    universal: "https://pluswallet.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://pluswallet.app",
+  id: "app.pluswallet",
+  image_id: "2c21491b-58ce-47bb-ace9-bdef71f43600",
+  mobile: {
+    native: "pluswallet://",
+    universal: "https://pluswallet.app",
+  },
+  name: "Plus Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.qubic.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.qubic.wallet/index.ts
index 4d62f297c9e..37bcf7a4794 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.qubic.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.qubic.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.qubic.wallet",
-  name: "Qubic Wallet",
-  homepage: "https://wallet.qubic.app",
-  image_id: "535c91a5-a43c-4104-233c-439449ffcd00",
   app: {
-    browser: "https://wallet.qubic.app",
-    ios: "https://apps.apple.com/app/qubic-%E6%9C%80%E7%B0%A1%E5%96%AE%E4%B8%8A%E6%89%8B%E7%9A%84%E8%99%9B%E6%93%AC%E8%B2%A8%E5%B9%A3%E9%8C%A2%E5%8C%85/id1563987988?itsct=apps_box_link&itscg=30200",
     android: "https://play.google.com/store/apps/details?id=app.qubic.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet.qubic.app",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/qubic-%E6%9C%80%E7%B0%A1%E5%96%AE%E4%B8%8A%E6%89%8B%E7%9A%84%E8%99%9B%E6%93%AC%E8%B2%A8%E5%B9%A3%E9%8C%A2%E5%8C%85/id1563987988?itsct=apps_box_link&itscg=30200",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "qubic://",
-    universal: "https://wallet.qubic.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.qubic.app",
   },
+  homepage: "https://wallet.qubic.app",
+  id: "app.qubic.wallet",
+  image_id: "535c91a5-a43c-4104-233c-439449ffcd00",
+  mobile: {
+    native: "qubic://",
+    universal: "https://wallet.qubic.app",
+  },
+  name: "Qubic Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.ryipay/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.ryipay/index.ts
index 9f275e59eb2..2bbb09d5a76 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.ryipay/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.ryipay/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.ryipay",
-  name: "RYIPAY",
-  homepage: "https://ryipay.app/",
-  image_id: "2f0918f7-f135-4b62-4765-ac183f14e500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ryipay-wallet/id1620995066",
     android: "https://play.google.com/store/apps/details?id=io.ryi.pay",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ryipay-wallet/id1620995066",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ryipay://",
-    universal: "https://ryipay.page.link/3N7P",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ryipay.app/",
+  id: "app.ryipay",
+  image_id: "2f0918f7-f135-4b62-4765-ac183f14e500",
+  mobile: {
+    native: "ryipay://",
+    universal: "https://ryipay.page.link/3N7P",
+  },
+  name: "RYIPAY",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.sinum/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.sinum/index.ts
index fd88cf788d3..bf80ca36d1f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.sinum/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.sinum/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.sinum",
-  name: "Sinum",
-  homepage: "https://sinum.app/",
-  image_id: "560d5efa-3fd1-4ac4-9229-f720395ab500",
   app: {
-    browser: "https://app.sinum.io",
-    ios: "https://apps.apple.com/gb/app/sinumapp/id6466151819?mt=8",
     android:
       "https://play.google.com/store/apps/details?id=io.sinum.wallet&referrer=af_tranid%3DnU7l_g2aK5j8sdqWOykU7g%26c%3DMAIN+WEBSITE+TO+ANDROID%26pid%3DMAIN+ANDROID&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.sinum.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/gb/app/sinumapp/id6466151819?mt=8",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "sinum://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.sinum.io",
   },
+  homepage: "https://sinum.app/",
+  id: "app.sinum",
+  image_id: "560d5efa-3fd1-4ac4-9229-f720395ab500",
+  mobile: {
+    native: "sinum://",
+    universal: null,
+  },
+  name: "Sinum",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.status/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.status/index.ts
index a9683b18acc..9c05403b07d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.status/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.status/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.status",
-  name: "Status",
-  homepage: "https://status.app/",
-  image_id: "1e5fb93a-3a0a-40b9-8a86-b14a775aae00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/status-gateway-to-ethereum/id1178893006",
     android: "https://play.google.com/store/apps/details?id=im.status.ethereum",
-    mac: "https://status.app/help/getting-started",
-    windows: "https://status.app/help/getting-started",
-    linux: "https://status.app/help/getting-started",
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/kahehnbpamjplefhpkhafinaodkkenpg",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/status-gateway-to-ethereum/id1178893006",
+    linux: "https://status.app/help/getting-started",
+    mac: "https://status.app/help/getting-started",
     opera: null,
-  },
-  rdns: "app.status",
-  mobile: {
-    native: "status-app://",
-    universal: "https://status.app",
+    safari: null,
+    windows: "https://status.app/help/getting-started",
   },
   desktop: {
     native: "status-app://",
     universal: null,
   },
+  homepage: "https://status.app/",
+  id: "app.status",
+  image_id: "1e5fb93a-3a0a-40b9-8a86-b14a775aae00",
+  mobile: {
+    native: "status-app://",
+    universal: "https://status.app",
+  },
+  name: "Status",
+  rdns: "app.status",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.stickey/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.stickey/index.ts
index b459ffec84d..3c0dc344863 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.stickey/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.stickey/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.stickey",
-  name: "Stickey Wallet",
-  homepage: "https://stickey.app",
-  image_id: "12aab9fb-f3d4-4248-10e0-4eda17a5de00",
   app: {
-    browser: "https://stickey.app",
-    ios: "https://apps.apple.com/app/id1671113083",
     android: "https://play.google.com/store/apps/details?id=app.stickey",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://stickey.app",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1671113083",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "stickyapp://",
     universal: "https://stickeyapp.page.link",
   },
-  desktop: {
+  homepage: "https://stickey.app",
+  id: "app.stickey",
+  image_id: "12aab9fb-f3d4-4248-10e0-4eda17a5de00",
+  mobile: {
     native: "stickyapp://",
     universal: "https://stickeyapp.page.link",
   },
+  name: "Stickey Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.subwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.subwallet/index.ts
index a7265afb2f8..1171a919c91 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.subwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.subwallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.subwallet",
-  name: "SubWallet",
-  homepage: "https://www.subwallet.app/",
-  image_id: "03f5c08c-fb30-46a0-ca5c-d8fdd7250b00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/subwallet-polkadot-wallet/id1633050285",
     android:
       "https://play.google.com/store/apps/details?id=app.subwallet.mobile&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/subwallet-polkadot-wallet/onhogfjeacnfoofkfgppdlbmlmnplgbn",
-    firefox: "https://addons.mozilla.org/en-US/firefox/addon/subwallet/",
-    safari: null,
     edge: null,
+    firefox: "https://addons.mozilla.org/en-US/firefox/addon/subwallet/",
+    ios: "https://apps.apple.com/us/app/subwallet-polkadot-wallet/id1633050285",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "app.subwallet",
-  mobile: {
-    native: "subwallet://",
-    universal: "https://mobile.subwallet.app/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "subwallet://",
     universal: null,
   },
+  homepage: "https://www.subwallet.app/",
+  id: "app.subwallet",
+  image_id: "03f5c08c-fb30-46a0-ca5c-d8fdd7250b00",
+  mobile: {
+    native: "subwallet://",
+    universal: "https://mobile.subwallet.app/",
+  },
+  name: "SubWallet",
+  rdns: "app.subwallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.tofee/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.tofee/index.ts
index 8e24ef9b904..8708af383d6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.tofee/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.tofee/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.tofee",
-  name: "Tofee Wallet Official",
-  homepage: "https://tofee.app/",
-  image_id: "d4dbb723-b1ec-4cfc-daab-1d559a151f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/in/app/tofee/id6504269605",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/tofee/id6504269605",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "tofee://wallet",
-    universal: "https://tofee.app/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://tofee.app/",
+  id: "app.tofee",
+  image_id: "d4dbb723-b1ec-4cfc-daab-1d559a151f00",
+  mobile: {
+    native: "tofee://wallet",
+    universal: "https://tofee.app/",
+  },
+  name: "Tofee Wallet Official",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.ultimate/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.ultimate/index.ts
index 8ba5923d2b3..0ef4d97d89b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.ultimate/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.ultimate/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.ultimate",
-  name: "Ultimate",
-  homepage: "https://ultimate.app/",
-  image_id: "1ed9823d-64dd-4ab6-2f3f-22c8ff228f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id1629053410",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1629053410",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ultimate://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ultimate.app/",
+  id: "app.ultimate",
+  image_id: "1ed9823d-64dd-4ab6-2f3f-22c8ff228f00",
+  mobile: {
+    native: "ultimate://",
+    universal: null,
+  },
+  name: "Ultimate",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.utorg/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.utorg/index.ts
index fb617819c42..3b399e3fc06 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.utorg/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.utorg/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.utorg",
-  name: "UTORG",
-  homepage: "https://utorg.app",
-  image_id: "39c77c0b-d6ea-419d-92b7-513a5eac2c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/utorg-bitcoin-crypto-wallet/id6444720908",
     android: "https://play.google.com/store/apps/details?id=com.utorg",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/utorg-bitcoin-crypto-wallet/id6444720908",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "utorg://mainactivity",
-    universal: "https://link.utorg.com/zp0f",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "utorg://mainactivity",
     universal: null,
   },
+  homepage: "https://utorg.app",
+  id: "app.utorg",
+  image_id: "39c77c0b-d6ea-419d-92b7-513a5eac2c00",
+  mobile: {
+    native: "utorg://mainactivity",
+    universal: "https://link.utorg.com/zp0f",
+  },
+  name: "UTORG",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.walletnow/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.walletnow/index.ts
index 28f36066c0c..3ab910024e6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.walletnow/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.walletnow/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.walletnow",
-  name: "NOW Wallet",
-  homepage: "https://walletnow.app/",
-  image_id: "b6ee4efc-f53e-475b-927b-a7ded6211700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/now-wallet-bitcoin-crypto/id1591216386",
     android: "https://play.google.com/store/apps/details?id=com.nowwallet",
-    mac: "https://apps.apple.com/app/now-wallet-bitcoin-crypto/id1591216386",
-    windows: "https://apps.microsoft.com/detail/xpdc4v0j3zkvhh",
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/now-wallet-bitcoin-crypto/id1591216386",
+    linux: null,
+    mac: "https://apps.apple.com/app/now-wallet-bitcoin-crypto/id1591216386",
     opera: null,
+    safari: null,
+    windows: "https://apps.microsoft.com/detail/xpdc4v0j3zkvhh",
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "nowwallet://",
     universal: "https://walletnow.app.link",
   },
-  desktop: {
+  homepage: "https://walletnow.app/",
+  id: "app.walletnow",
+  image_id: "b6ee4efc-f53e-475b-927b-a7ded6211700",
+  mobile: {
     native: "nowwallet://",
     universal: "https://walletnow.app.link",
   },
+  name: "NOW Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.wombat/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.wombat/index.ts
index d92099ef6c4..fcf9ef3dd53 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.wombat/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.wombat/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.wombat",
-  name: "Wombat",
-  homepage: "https://wombat.app",
-  image_id: "e675efa3-4ffc-4199-9c22-b9692baea900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/wombat-home-of-nft-gaming/id1474392110",
     android:
       "https://play.google.com/store/apps/details?id=io.getwombat.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/wombat-home-of-nft-gaming/id1474392110",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wombat-wc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "wombat://",
     universal: null,
   },
+  homepage: "https://wombat.app",
+  id: "app.wombat",
+  image_id: "e675efa3-4ffc-4199-9c22-b9692baea900",
+  mobile: {
+    native: "wombat-wc://",
+    universal: null,
+  },
+  name: "Wombat",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.xverse/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.xverse/index.ts
index 2635cdc4e29..a3e663006c5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.xverse/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.xverse/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.xverse",
-  name: "Xverse",
-  homepage: "https://www.xverse.app/",
-  image_id: "785e20ef-c68c-4a85-6cb9-053443871e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/xverse-wallet-buy-bitcoin/id1552272513",
     android:
       "https://play.google.com/store/apps/details?id=com.secretkeylabs.xverse",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/xverse-wallet-buy-bitcoin/idnnbdplmphpflfnlkomgpfbpcgelopg",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/xverse-wallet-buy-bitcoin/id1552272513",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "xverse://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.xverse.app/",
+  id: "app.xverse",
+  image_id: "785e20ef-c68c-4a85-6cb9-053443871e00",
+  mobile: {
+    native: "xverse://",
+    universal: null,
+  },
+  name: "Xverse",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/app.zeal/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/app.zeal/index.ts
index 41e6527a533..5c35f262fb5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/app.zeal/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/app.zeal/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "app.zeal",
-  name: "Zeal",
-  homepage: "https://www.zeal.app/",
-  image_id: "5416fb0b-9aec-4ffe-b7cd-c04c79ea4300",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/zeal-wallet/heamnjbnflcikcggoiplibfommfbkjpj?hl=en&authuser=0",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "app.zeal",
-  mobile: {
-    native: "zeal://walletconnect/",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.zeal.app/",
+  id: "app.zeal",
+  image_id: "5416fb0b-9aec-4ffe-b7cd-c04c79ea4300",
+  mobile: {
+    native: "zeal://walletconnect/",
+    universal: null,
+  },
+  name: "Zeal",
+  rdns: "app.zeal",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/baby.smart/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/baby.smart/index.ts
index 544dd232d14..6056c72d75c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/baby.smart/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/baby.smart/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "baby.smart",
-  name: "Smart.Baby",
-  homepage: "https://smart.baby",
-  image_id: "7f408502-e3d1-48f1-a81f-654a3f338f00",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://smartbaby.oss-cn-hongkong.aliyuncs.com/wallet/20230912/e94cee9101074e54a717415cccd11a87.apk",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "smartbody://?uri=",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://smart.baby",
+  id: "baby.smart",
+  image_id: "7f408502-e3d1-48f1-a81f-654a3f338f00",
+  mobile: {
+    native: "smartbody://?uri=",
+    universal: null,
+  },
+  name: "Smart.Baby",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/cc.avacus/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/cc.avacus/index.ts
index cd31f882947..608a7b2a2de 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/cc.avacus/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/cc.avacus/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "cc.avacus",
-  name: "Avacus",
-  homepage: "https://avacus.cc",
-  image_id: "a7106965-91cc-4a73-4688-c5c72ae0ed00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id6449657442",
     android: "https://play.google.com/store/apps/details?id=io.sowaka.avacus",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id6449657442",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "avacus://",
-    universal: "https://avacus.app.link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://avacus.cc",
+  id: "cc.avacus",
+  image_id: "a7106965-91cc-4a73-4688-c5c72ae0ed00",
+  mobile: {
+    native: "avacus://",
+    universal: "https://avacus.app.link",
+  },
+  name: "Avacus",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/cc.dropp/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/cc.dropp/index.ts
index 2b0be4552f6..ab726f19436 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/cc.dropp/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/cc.dropp/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "cc.dropp",
-  name: "Dropp",
-  homepage: "https://dropp.cc/",
-  image_id: "526fb7ea-d0da-482a-ac84-7e38afea1700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/dropp-cc/id1544894404",
     android: "https://play.google.com/store/apps/details?id=cc.dropp.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/dropp-extension/hgfpnmhnmmneldokmpncjmeijkapgbbf?hl=en-US",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/dropp-cc/id1544894404",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "dropp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://dropp.cc/",
+  id: "cc.dropp",
+  image_id: "526fb7ea-d0da-482a-ac84-7e38afea1700",
+  mobile: {
+    native: "dropp://",
+    universal: null,
+  },
+  name: "Dropp",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/cc.localtrade.lab/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/cc.localtrade.lab/index.ts
index 0d11789f1da..e8b2ab03e9a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/cc.localtrade.lab/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/cc.localtrade.lab/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "cc.localtrade.lab",
-  name: "LocalTrade Wallet",
-  homepage: "https://lab.localtrade.cc",
-  image_id: "fcc60983-74ae-484a-4242-87cb6f05f100",
   app: {
-    browser: "https://docs.localtrade.cc/products/defi-wallet-mvp-for-ios",
-    ios: "https://apps.apple.com/app/localtrade-defi-wallet/id1602772298",
     android:
       "https://play.google.com/store/apps/details?id=com.localtrade.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://docs.localtrade.cc/products/defi-wallet-mvp-for-ios",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/localtrade-defi-wallet/id1602772298",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://ws.lab.localtrade.cc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://docs.localtrade.cc/products/defi-wallet-mvp-for-ios",
   },
+  homepage: "https://lab.localtrade.cc",
+  id: "cc.localtrade.lab",
+  image_id: "fcc60983-74ae-484a-4242-87cb6f05f100",
+  mobile: {
+    native: null,
+    universal: "https://ws.lab.localtrade.cc",
+  },
+  name: "LocalTrade Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/ch.dssecurity/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/ch.dssecurity/index.ts
index c107280db1f..ce30702991b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/ch.dssecurity/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/ch.dssecurity/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "ch.dssecurity",
-  name: "DS Security SA",
-  homepage: "https://www.dssecurity.ch",
-  image_id: "149a10a6-8914-44ea-424a-236017890100",
   app: {
+    android: "https://dssecurity.ch",
     browser:
       "https://wiki.polygon.technology/docs/tools/wallets/metamask/config-polygon-on-metamask#polygon-scan",
-    ios: "https://dssecurity.ch",
-    android: "https://dssecurity.ch",
-    mac: "https://dssecurity.ch",
-    windows: "https://dssecurity.ch",
-    linux: "https://dssecurity.ch",
     chrome: "https://dssecurity.ch",
-    firefox: "https://dssecurity.ch",
-    safari: "https://dssecurity.ch",
     edge: "https://dssecurity.ch",
+    firefox: "https://dssecurity.ch",
+    ios: "https://dssecurity.ch",
+    linux: "https://dssecurity.ch",
+    mac: "https://dssecurity.ch",
     opera: "https://dssecurity.ch",
+    safari: "https://dssecurity.ch",
+    windows: "https://dssecurity.ch",
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://www.coinbase.com/wallet/",
   },
-  desktop: {
+  homepage: "https://www.dssecurity.ch",
+  id: "ch.dssecurity",
+  image_id: "149a10a6-8914-44ea-424a-236017890100",
+  mobile: {
     native: null,
     universal: "https://www.coinbase.com/wallet/",
   },
+  name: "DS Security SA",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/co.arculus/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/co.arculus/index.ts
index 5517fed4768..8e6a76a586a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/co.arculus/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/co.arculus/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "co.arculus",
-  name: "Arculus Wallet",
-  homepage: "https://www.arculus.co",
-  image_id: "f78dab27-7165-4a3d-fdb1-fcff06c0a700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/arculus-wallet/id1575425801",
     android:
       "https://play.google.com/store/apps/details?id=co.arculus.wallet.android&hl=en_US&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/arculus-wallet/id1575425801",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "arculuswc://",
-    universal: "https://gw.arculus.co/app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.arculus.co",
+  id: "co.arculus",
+  image_id: "f78dab27-7165-4a3d-fdb1-fcff06c0a700",
+  mobile: {
+    native: "arculuswc://",
+    universal: "https://gw.arculus.co/app",
+  },
+  name: "Arculus Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/co.cyber.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/co.cyber.wallet/index.ts
index 37d1f0922c3..c7da0b7c1d0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/co.cyber.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/co.cyber.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "co.cyber.wallet",
-  name: "CyberWallet",
-  homepage: "https://wallet.cyber.co",
-  image_id: "24887576-8e74-4518-36b3-3c5e13f11a00",
   app: {
-    browser: null,
-    ios: "https://wallet.cyber.co",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://wallet.cyber.co",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://wallet.cyber.co",
   },
-  desktop: {
+  homepage: "https://wallet.cyber.co",
+  id: "co.cyber.wallet",
+  image_id: "24887576-8e74-4518-36b3-3c5e13f11a00",
+  mobile: {
     native: null,
     universal: "https://wallet.cyber.co",
   },
+  name: "CyberWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/co.family.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/co.family.wallet/index.ts
index 704d745434f..701c7d19429 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/co.family.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/co.family.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "co.family.wallet",
-  name: "Family",
-  homepage: "https://family.co",
-  image_id: "18ba1b99-6268-4d7e-bead-260e978b1a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/family-ethereum-wallet/id1606779267",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/family-ethereum-wallet/id1606779267",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "co.family.wallet",
-  mobile: {
-    native: "familywallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://family.co",
+  id: "co.family.wallet",
+  image_id: "18ba1b99-6268-4d7e-bead-260e978b1a00",
+  mobile: {
+    native: "familywallet://",
+    universal: null,
+  },
+  name: "Family",
+  rdns: "co.family.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/co.filwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/co.filwallet/index.ts
index 796fc949a89..739e3ab641b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/co.filwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/co.filwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "co.filwallet",
-  name: "FILWallet",
-  homepage: "https://filwallet.co/",
-  image_id: "f400f6c2-ca6c-487b-654d-e119af247500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/filwallet-io/id1572930901",
     android: "https://filwallet.co/",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/filwallet-io/id1572930901",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://h5.filwallet.co",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://filwallet.co/",
+  id: "co.filwallet",
+  image_id: "f400f6c2-ca6c-487b-654d-e119af247500",
+  mobile: {
+    native: null,
+    universal: "https://h5.filwallet.co",
+  },
+  name: "FILWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/co.lifedefi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/co.lifedefi/index.ts
index de7159f2a33..5ce517da43e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/co.lifedefi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/co.lifedefi/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "co.lifedefi",
-  name: "Life DeFi",
-  homepage: "https://lifedefi.co",
-  image_id: "d249af4f-e9b8-498d-cbc3-9eab04568700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ca/app/life-the-defi-wallet/id1591427970",
     android:
       "https://play.google.com/store/apps/details?id=life.lifecrypto.app&hl=en_US&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ca/app/life-the-defi-wallet/id1591427970",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "w3akvrn:/",
     universal: null,
   },
-  desktop: {
+  homepage: "https://lifedefi.co",
+  id: "co.lifedefi",
+  image_id: "d249af4f-e9b8-498d-cbc3-9eab04568700",
+  mobile: {
     native: "w3akvrn:/",
     universal: null,
   },
+  name: "Life DeFi",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/co.muza/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/co.muza/index.ts
index b0baa36e81f..8881c4fa887 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/co.muza/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/co.muza/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "co.muza",
-  name: "MUZA",
-  homepage: "https://muza.co",
-  image_id: "f8516ff9-ca2e-4b59-65f6-ed8ef438f100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/th/app/muza-wallet-nft-web3/id6450735857",
     android:
       "https://play.google.com/store/apps/details?id=com.muza.muza&pcampaignid=web_share",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/th/app/muza-wallet-nft-web3/id6450735857",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "muza://",
-    universal: "https://muza.co/app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "muza://",
     universal: null,
   },
+  homepage: "https://muza.co",
+  id: "co.muza",
+  image_id: "f8516ff9-ca2e-4b59-65f6-ed8ef438f100",
+  mobile: {
+    native: "muza://",
+    universal: "https://muza.co/app",
+  },
+  name: "MUZA",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/co.swopme/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/co.swopme/index.ts
index 19138c1054d..5dc9d727032 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/co.swopme/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/co.swopme/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "co.swopme",
-  name: "SWOP",
-  homepage: "https://swopme.co/",
-  image_id: "6e773b07-efcc-40eb-b3a2-300efc5df800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/swop-connecting-the-world/id1593201322",
     android:
       "https://play.google.com/store/apps/details?id=com.travisheron.swopapp&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/swop-connecting-the-world/id1593201322",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "swopapp://",
-    universal: "https://swopme.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://swopme.co/",
+  id: "co.swopme",
+  image_id: "6e773b07-efcc-40eb-b3a2-300efc5df800",
+  mobile: {
+    native: "swopapp://",
+    universal: "https://swopme.app",
+  },
+  name: "SWOP",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/co.xellar/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/co.xellar/index.ts
index 6b554c6d10b..11ca4acae9f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/co.xellar/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/co.xellar/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "co.xellar",
-  name: "Xellar",
-  homepage: "https://xellar.co",
-  image_id: "67b5a91d-a9ce-4268-d73d-b2f924a0b400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/xellar-crypto-wallet/id1671215861",
     android: "https://play.google.com/store/apps/details?id=com.xellar.wallets",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/xellar-crypto-wallet/id1671215861",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "xellar://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://xellar.co",
+  id: "co.xellar",
+  image_id: "67b5a91d-a9ce-4268-d73d-b2f924a0b400",
+  mobile: {
+    native: "xellar://",
+    universal: null,
+  },
+  name: "Xellar",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.3swallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.3swallet/index.ts
index d0cb0aab934..220abf92be3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.3swallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.3swallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.3swallet",
-  name: "3S Wallet",
-  homepage: "https://3swallet.com/",
-  image_id: "f3b6a89d-ec8f-49dc-e07f-6bf723e1e500",
   app: {
-    browser: "https://3swallet.com/",
-    ios: "https://apps.apple.com/us/app/3s-wallet-crypto-wallet/id1622316272",
     android: "https://play.google.com/store/apps/details?id=network.bho.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://3swallet.com/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/3s-wallet-crypto-wallet/id1622316272",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bhcwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://3swallet.com/",
   },
+  homepage: "https://3swallet.com/",
+  id: "com.3swallet",
+  image_id: "f3b6a89d-ec8f-49dc-e07f-6bf723e1e500",
+  mobile: {
+    native: "bhcwallet://",
+    universal: null,
+  },
+  name: "3S Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.abra/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.abra/index.ts
index f6ed5288a83..dacbafb15e8 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.abra/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.abra/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.abra",
-  name: "Abra Wallet",
-  homepage: "https://abra.com",
-  image_id: "2219db01-e0c9-471c-5def-fd3b4e7a7a00",
   app: {
-    browser: "https://abra.com",
-    ios: "https://abra.com",
     android: "https://abra.com",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://abra.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://abra.com",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "abra://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://abra.com",
   },
+  homepage: "https://abra.com",
+  id: "com.abra",
+  image_id: "2219db01-e0c9-471c-5def-fd3b4e7a7a00",
+  mobile: {
+    native: "abra://",
+    universal: null,
+  },
+  name: "Abra Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.adftechnology/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.adftechnology/index.ts
index d172340149f..b81ad490b22 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.adftechnology/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.adftechnology/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.adftechnology",
-  name: "ADF Wallet",
-  homepage: "https://www.adftechnology.com/",
-  image_id: "28acc8ed-a0e7-4004-1968-c54869fa2100",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=com.adf.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "adf://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.adftechnology.com/",
+  id: "com.adftechnology",
+  image_id: "28acc8ed-a0e7-4004-1968-c54869fa2100",
+  mobile: {
+    native: "adf://",
+    universal: null,
+  },
+  name: "ADF Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.aktionariat/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.aktionariat/index.ts
index a534d154b6b..32af2b3b5dc 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.aktionariat/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.aktionariat/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.aktionariat",
-  name: "Aktionariat",
-  homepage: "https://aktionariat.com/",
-  image_id: "6d18e8ea-b536-4038-c5bf-94a499d5a400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ch/app/aktionariat/id1518326813",
     android:
       "https://play.google.com/store/apps/details?id=com.aktionariat.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ch/app/aktionariat/id1518326813",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "aktionariat://",
-    universal: "https://app.aktionariat.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://aktionariat.com/",
+  id: "com.aktionariat",
+  image_id: "6d18e8ea-b536-4038-c5bf-94a499d5a400",
+  mobile: {
+    native: "aktionariat://",
+    universal: "https://app.aktionariat.com",
+  },
+  name: "Aktionariat",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.alicebob/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.alicebob/index.ts
index 24f48deb522..b9eebcb015c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.alicebob/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.alicebob/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.alicebob",
-  name: "Alicebob Wallet",
-  homepage: "https://alicebob.com/",
-  image_id: "15be8ddd-0bef-4948-56d1-6101347a6b00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/alicebob-crypto-btc-wallet/id6467197622",
     android:
       "https://play.google.com/store/apps/details?id=com.crypto.ab.wallet.app",
-    mac: "https://apps.apple.com/us/app/alicebob-crypto-btc-wallet/id6467197622",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/alicebob-wallet/mjmpkbeecljmaoojijflpfpmpdhnpabd",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/alicebob-crypto-btc-wallet/id6467197622",
+    linux: null,
+    mac: "https://apps.apple.com/us/app/alicebob-crypto-btc-wallet/id6467197622",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "crypto.ab.wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://alicebob.com/",
+  id: "com.alicebob",
+  image_id: "15be8ddd-0bef-4948-56d1-6101347a6b00",
+  mobile: {
+    native: "crypto.ab.wallet://",
+    universal: null,
+  },
+  name: "Alicebob Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.alphawallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.alphawallet/index.ts
index 027c4d37d59..f14c593604a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.alphawallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.alphawallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.alphawallet",
-  name: "AlphaWallet",
-  homepage: "https://alphawallet.com/",
-  image_id: "5b1cddfb-056e-4e78-029a-54de5d70c500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/alphawallet-eth-wallet/id1358230430",
     android:
       "https://play.google.com/store/apps/details?id=io.stormbird.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/alphawallet-eth-wallet/id1358230430",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "awallet://",
-    universal: "https://aw.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://alphawallet.com/",
+  id: "com.alphawallet",
+  image_id: "5b1cddfb-056e-4e78-029a-54de5d70c500",
+  mobile: {
+    native: "awallet://",
+    universal: "https://aw.app",
+  },
+  name: "AlphaWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.amazewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.amazewallet/index.ts
index b1017df7b70..59b071ae7f0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.amazewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.amazewallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.amazewallet",
-  name: "AmazeWallet",
-  homepage: "https://amazewallet.com/",
-  image_id: "38495eb4-efcf-47cb-be73-a695510f9f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/gb/app/amazewallet/id1622941204",
     android:
       "https://play.google.com/store/apps/details?id=com.mining.amaze.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/gb/app/amazewallet/id1622941204",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "amazeapp://amazewallet.com",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://amazewallet.com/",
+  id: "com.amazewallet",
+  image_id: "38495eb4-efcf-47cb-be73-a695510f9f00",
+  mobile: {
+    native: "amazeapp://amazewallet.com",
+    universal: null,
+  },
+  name: "AmazeWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ambire/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ambire/index.ts
index 680cfdd52c4..da0cef7ad80 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ambire/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ambire/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ambire",
-  name: "Ambire Wallet",
-  homepage: "https://www.ambire.com",
-  image_id: "c39b3a16-1a38-4588-f089-cb7aeb584700",
   app: {
-    browser: "https://wallet.ambire.com",
-    ios: "https://apps.apple.com/bg/app/ambire-smart-crypto-wallet/id6444863857",
     android:
       "https://play.google.com/store/apps/details?id=com.ambire.wallet&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet.ambire.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/bg/app/ambire-smart-crypto-wallet/id6444863857",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ambire://",
-    universal: "https://mobile.ambire.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.ambire.com",
   },
+  homepage: "https://www.ambire.com",
+  id: "com.ambire",
+  image_id: "c39b3a16-1a38-4588-f089-cb7aeb584700",
+  mobile: {
+    native: "ambire://",
+    universal: "https://mobile.ambire.com",
+  },
+  name: "Ambire Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.antiersolutions/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.antiersolutions/index.ts
index c5fa0404ce2..c49b4023650 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.antiersolutions/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.antiersolutions/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.antiersolutions",
-  name: "Ancrypto Wallet",
-  homepage: "https://www.antiersolutions.com/",
-  image_id: "d4382329-e288-4d7a-0ac8-3eb0facfb900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/in/app/ancrypto-wallet/id1453657650",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/ancrypto-wallet/id1453657650",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ancrypto://app",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.antiersolutions.com/",
+  id: "com.antiersolutions",
+  image_id: "d4382329-e288-4d7a-0ac8-3eb0facfb900",
+  mobile: {
+    native: "ancrypto://app",
+    universal: null,
+  },
+  name: "Ancrypto Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.apollox/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.apollox/index.ts
index f08fc966986..898df24a4f1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.apollox/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.apollox/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.apollox",
-  name: "ApolloX",
-  homepage: "https://www.apollox.com/en",
-  image_id: "80ab63a2-1b32-4140-3577-9fbc8ea82e00",
   app: {
-    browser: "https://www.apollox.com/en",
-    ios: "https://apps.apple.com/us/app/apx-apollox/id1589405398",
     android:
       "https://play.google.com/store/apps/details?id=com.apollox.android",
-    mac: "https://www.apollox.com/en",
-    windows: null,
-    linux: null,
+    browser: "https://www.apollox.com/en",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/apx-apollox/id1589405398",
+    linux: null,
+    mac: "https://www.apollox.com/en",
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://app.apollox.finance",
   },
-  desktop: {
+  homepage: "https://www.apollox.com/en",
+  id: "com.apollox",
+  image_id: "80ab63a2-1b32-4140-3577-9fbc8ea82e00",
+  mobile: {
     native: null,
     universal: "https://app.apollox.finance",
   },
+  name: "ApolloX",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.authentrend/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.authentrend/index.ts
index cbc1f518a78..8e0d6d84828 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.authentrend/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.authentrend/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.authentrend",
-  name: "AT.Wallet",
-  homepage: "https://authentrend.com/at-wallet/",
-  image_id: "98bd3b9a-097e-4743-8808-986b4ad1ad00",
   app: {
-    browser: "https://authentrend.com/at-wallet/",
-    ios: "https://apps.apple.com/app/at-wallet/id1479171310",
     android:
       "https://play.google.com/store/apps/details?id=com.authentrend.atwallet",
-    mac: "https://apps.apple.com/app/at-wallet/id1490097962",
-    windows: null,
-    linux: null,
+    browser: "https://authentrend.com/at-wallet/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/at-wallet/id1479171310",
+    linux: null,
+    mac: "https://apps.apple.com/app/at-wallet/id1490097962",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "atwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "atwallet://",
     universal: "https://apps.apple.com/us/app/at-wallet/id1490097962?mt=12",
   },
+  homepage: "https://authentrend.com/at-wallet/",
+  id: "com.authentrend",
+  image_id: "98bd3b9a-097e-4743-8808-986b4ad1ad00",
+  mobile: {
+    native: "atwallet://",
+    universal: null,
+  },
+  name: "AT.Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.azcoiner/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.azcoiner/index.ts
index 0dfd688b484..62d64b485b7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.azcoiner/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.azcoiner/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.azcoiner",
-  name: "AZCoiner",
-  homepage: "https://azcoiner.com/",
-  image_id: "c6601184-7eb7-46c9-f6ad-0808cfd16100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/vn/app/azcoiner/id6467728839?l=vi",
     android:
       "https://play.google.com/store/apps/details?id=com.azc.azcoiner&hl=vi-VN",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/vn/app/azcoiner/id6467728839?l=vi",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "azcoiner://",
-    universal: "https://azcoiner.com/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://azcoiner.com/",
+  id: "com.azcoiner",
+  image_id: "c6601184-7eb7-46c9-f6ad-0808cfd16100",
+  mobile: {
+    native: "azcoiner://",
+    universal: "https://azcoiner.com/",
+  },
+  name: "AZCoiner",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ballet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ballet/index.ts
index 359f59c5645..6ed505130e5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ballet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ballet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ballet",
-  name: "Ballet Crypto",
-  homepage: "https://www.ballet.com",
-  image_id: "fd46e96d-350d-4922-a4a9-b2bfe7c92400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id1474912942",
     android: "https://play.google.com/store/apps/details?id=com.balletcrypto",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id1474912942",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "balletcrypto://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ballet.com",
+  id: "com.ballet",
+  image_id: "fd46e96d-350d-4922-a4a9-b2bfe7c92400",
+  mobile: {
+    native: "balletcrypto://",
+    universal: null,
+  },
+  name: "Ballet Crypto",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bee/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bee/index.ts
index 10db976daae..c390de3a79f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bee/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bee/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bee",
-  name: "BeeWallet",
-  homepage: "https://www.bee.com/en",
-  image_id: "77743ed9-5ac6-48f7-867d-0f98e481b500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id1529988919",
     android: "https://play.google.com/store/apps/details?id=network.bee.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/bee-wallet/nankopfjhdflikcokhgohiaoehnjfako",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1529988919",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bee://",
-    universal: "https://main.apple.bee9527.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.bee.com/en",
+  id: "com.bee",
+  image_id: "77743ed9-5ac6-48f7-867d-0f98e481b500",
+  mobile: {
+    native: "bee://",
+    universal: "https://main.apple.bee9527.com",
+  },
+  name: "BeeWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.beexo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.beexo/index.ts
index bd8100db6ff..6498417e41e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.beexo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.beexo/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.beexo",
-  name: "Beexo",
-  homepage: "https://beexo.com/",
-  image_id: "7074bf0c-d0f7-4d86-2dc4-28430d629d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ar/app/beexo-wallet/id1533311061",
     android: "https://play.google.com/store/apps/details?id=com.beexo",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ar/app/beexo-wallet/id1533311061",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "beexo://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.beexo.com/",
   },
+  homepage: "https://beexo.com/",
+  id: "com.beexo",
+  image_id: "7074bf0c-d0f7-4d86-2dc4-28430d629d00",
+  mobile: {
+    native: "beexo://",
+    universal: null,
+  },
+  name: "Beexo",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.berasig/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.berasig/index.ts
index a718b9d4d8b..125470cdbaa 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.berasig/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.berasig/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.berasig",
-  name: "BeraSig",
-  homepage: "https://berasig.com",
-  image_id: "41e234a7-d00e-4b08-f90b-0d5e86231c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/berasig-wallet-on-berachain/id6502052535",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/berasig-wallet-on-berachain/id6502052535",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "berasig://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://berasig.com",
+  id: "com.berasig",
+  image_id: "41e234a7-d00e-4b08-f90b-0d5e86231c00",
+  mobile: {
+    native: "berasig://",
+    universal: null,
+  },
+  name: "BeraSig",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bestwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bestwallet/index.ts
index 04a1b4c1744..bd6c6b1401f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bestwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bestwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bestwallet",
-  name: "Best Wallet",
-  homepage: "https://bestwallet.com/",
-  image_id: "7f9574ed-eb42-4e04-0888-be2939936700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/best-wallet/id6451312105",
     android:
       "https://play.google.com/store/apps/details?id=com.bestwallet.mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/best-wallet/id6451312105",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bw://app/connect",
-    universal: "https://best-wallet-prod.web.app/connect",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bestwallet.com/",
+  id: "com.bestwallet",
+  image_id: "7f9574ed-eb42-4e04-0888-be2939936700",
+  mobile: {
+    native: "bw://app/connect",
+    universal: "https://best-wallet-prod.web.app/connect",
+  },
+  name: "Best Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bettatrade/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bettatrade/index.ts
index af7e0628021..28c4bfd96c9 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bettatrade/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bettatrade/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bettatrade",
-  name: "Bettatrade",
-  homepage: "https://bettatrade.com",
-  image_id: "938053f6-6e81-4d58-4033-8ae8625e5f00",
   app: {
-    browser: "https://apps.apple.com/us/app/bettatrade/id6474153866",
-    ios: "https://apps.apple.com/us/app/bettatrade/id6474153866",
     android:
       "https://play.google.com/store/apps/details?id=com.wallet.Bettatrade",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://apps.apple.com/us/app/bettatrade/id6474153866",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/bettatrade/id6474153866",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bettatrade://",
-    universal: "https://bettatrade.page.link/Fc4u",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://apps.apple.com/us/app/bettatrade/id6474153866",
   },
+  homepage: "https://bettatrade.com",
+  id: "com.bettatrade",
+  image_id: "938053f6-6e81-4d58-4033-8ae8625e5f00",
+  mobile: {
+    native: "bettatrade://",
+    universal: "https://bettatrade.page.link/Fc4u",
+  },
+  name: "Bettatrade",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bifrostwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bifrostwallet/index.ts
index 5b58203121a..2a466bba89a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bifrostwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bifrostwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bifrostwallet",
-  name: "Bifrost Wallet",
-  homepage: "https://bifrostwallet.com",
-  image_id: "86be07e2-6652-4fd1-5f33-651682c95400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/bifrost-wallet/id1577198351",
     android:
       "https://play.google.com/store/apps/details?id=com.bifrostwallet.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/bifrost-wallet/id1577198351",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.bifrostwallet",
-  mobile: {
-    native: "bifrostwallet://",
-    universal: "https://app.bifrostwallet.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bifrostwallet.com",
+  id: "com.bifrostwallet",
+  image_id: "86be07e2-6652-4fd1-5f33-651682c95400",
+  mobile: {
+    native: "bifrostwallet://",
+    universal: "https://app.bifrostwallet.com",
+  },
+  name: "Bifrost Wallet",
+  rdns: "com.bifrostwallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.binance.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.binance.wallet/index.ts
index 4d6cf5ccda1..e88c45c79b4 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.binance.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.binance.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.binance.wallet",
-  name: "Binance Wallet",
-  homepage: "https://www.binance.com/en/web3wallet",
-  image_id: "3d7eb880-7654-431f-ed84-a25712b45200",
   app: {
-    browser: "https://www.binance.com/en/web3wallet",
-    ios: "https://www.binance.com/en/download",
     android: "https://www.binance.com/en/download",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.binance.com/en/web3wallet",
     chrome: "https://www.binance.com/en/download",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://www.binance.com/en/download",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.binance.wallet",
-  mobile: {
-    native: "bnc://app.binance.com/cedefi/",
-    universal: "https://app.binance.com/cedefi",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://www.binance.com/en/web3wallet",
   },
+  homepage: "https://www.binance.com/en/web3wallet",
+  id: "com.binance.wallet",
+  image_id: "3d7eb880-7654-431f-ed84-a25712b45200",
+  mobile: {
+    native: "bnc://app.binance.com/cedefi/",
+    universal: "https://app.binance.com/cedefi",
+  },
+  name: "Binance Wallet",
+  rdns: "com.binance.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitcoin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitcoin/index.ts
index 233df4dc43e..cefe29c4b0e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitcoin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitcoin/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bitcoin",
-  name: "Bitcoin.com Wallet",
-  homepage: "https://www.bitcoin.com/",
-  image_id: "0d7938e1-9b3b-4d8b-177b-98188c4cf400",
   app: {
-    browser: "https://wallet.bitcoin.com/",
-    ios: "https://apps.apple.com/us/app/bitcoin-wallet-by-bitcoin-com/id1252903728",
     android:
       "https://play.google.com/store/apps/details?id=com.bitcoin.mwallet",
-    mac: "https://apps.apple.com/us/app/bitcoin-wallet-by-bitcoin-com/id1252903728",
-    windows: "https://wallet.bitcoin.com/",
-    linux: "https://wallet.bitcoin.com/",
+    browser: "https://wallet.bitcoin.com/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/bitcoin-wallet-by-bitcoin-com/id1252903728",
+    linux: "https://wallet.bitcoin.com/",
+    mac: "https://apps.apple.com/us/app/bitcoin-wallet-by-bitcoin-com/id1252903728",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bitcoincom://",
-    universal: "https://wallet.bitcoin.com/",
+    safari: null,
+    windows: "https://wallet.bitcoin.com/",
   },
   desktop: {
     native: null,
     universal: "https://wallet.bitcoin.com/",
   },
+  homepage: "https://www.bitcoin.com/",
+  id: "com.bitcoin",
+  image_id: "0d7938e1-9b3b-4d8b-177b-98188c4cf400",
+  mobile: {
+    native: "bitcoincom://",
+    universal: "https://wallet.bitcoin.com/",
+  },
+  name: "Bitcoin.com Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitget.web3/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitget.web3/index.ts
index a626068f5ef..672893a8fe5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitget.web3/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitget.web3/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bitget.web3",
-  name: "Bitget Wallet",
-  homepage: "https://web3.bitget.com",
-  image_id: "ac927cca-531b-40e1-0ff2-4eefe946d100",
   app: {
-    browser: "https://bitkeep.com",
-    ios: "https://web3.bitget.com/en/wallet-download?type=0",
     android: "https://web3.bitget.com/en/wallet-download?type=0",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://bitkeep.com",
     chrome:
       "https://chrome.google.com/webstore/detail/bitkeep-crypto-nft-wallet/jiidiaalihmmhddjgbnbgdfflelocpak",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://web3.bitget.com/en/wallet-download?type=0",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bitkeep://",
-    universal: "https://bkapp.vip",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://web3.bitget.com",
+  id: "com.bitget.web3",
+  image_id: "ac927cca-531b-40e1-0ff2-4eefe946d100",
+  mobile: {
+    native: "bitkeep://",
+    universal: "https://bkapp.vip",
+  },
+  name: "Bitget Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitnovo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitnovo/index.ts
index 64fbaa0e4a8..dd806ed5009 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitnovo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitnovo/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bitnovo",
-  name: "Bitnovo Wallet",
-  homepage: "https://bitnovo.com",
-  image_id: "c22b2af0-15a0-4e35-3417-1378b8239100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/es/app/bitnovo-compra-bitcoin/id1553430666",
     android: "https://play.google.com/store/apps/details?id=com.bitnovo.Wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/es/app/bitnovo-compra-bitcoin/id1553430666",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bitnovowallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bitnovo.com",
+  id: "com.bitnovo",
+  image_id: "c22b2af0-15a0-4e35-3417-1378b8239100",
+  mobile: {
+    native: "bitnovowallet://",
+    universal: null,
+  },
+  name: "Bitnovo Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitpay/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitpay/index.ts
index a750cd29206..0695081c736 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitpay/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitpay/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bitpay",
-  name: "BitPay Wallet",
-  homepage: "https://bitpay.com/wallet",
-  image_id: "553e8fff-37c9-4a62-5bfe-02ff22e1e200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/bitpay-bitcoin-wallet-card/id1149581638?platform=iphone",
     android: "https://play.google.com/store/apps/details?id=com.bitpay.wallet",
-    mac: "https://apps.apple.com/us/app/bitpay-bitcoin-wallet-card/id1149581638?platform=ipad",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/bitpay-bitcoin-wallet-card/id1149581638?platform=iphone",
+    linux: null,
+    mac: "https://apps.apple.com/us/app/bitpay-bitcoin-wallet-card/id1149581638?platform=ipad",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bitpay://",
-    universal: "https://link.bitpay.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bitpay.com/wallet",
+  id: "com.bitpay",
+  image_id: "553e8fff-37c9-4a62-5bfe-02ff22e1e200",
+  mobile: {
+    native: "bitpay://",
+    universal: "https://link.bitpay.com",
+  },
+  name: "BitPay Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitpie/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitpie/index.ts
index 5e5f802d327..f5f3b7253e7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitpie/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitpie/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bitpie",
-  name: "Bitpie",
-  homepage: "https://bitpie.com",
-  image_id: "e6dce4ec-a1a8-49e6-d8e1-8329fdd5c700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/bitpie-universal-crypto-wallet/id1481314229",
     android: "https://bitpie.com/android/",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/bitpie-universal-crypto-wallet/id1481314229",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bitpiewc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bitpie.com",
+  id: "com.bitpie",
+  image_id: "e6dce4ec-a1a8-49e6-d8e1-8329fdd5c700",
+  mobile: {
+    native: "bitpiewc://",
+    universal: null,
+  },
+  name: "Bitpie",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitso/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitso/index.ts
index 89c5d28301b..bffcfad28d5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bitso/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bitso/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bitso",
-  name: "Bitso Web3 Wallet",
-  homepage: "https://bitso.com/web3-wallet",
-  image_id: "7e4953fb-de22-4761-1ff6-8c494549aa00",
   app: {
-    browser: "https://bitso.com/web3-wallet",
-    ios: "https://apps.apple.com/br/app/bitso-%C3%A9-f%C3%A1cil-comprar-bitcoin/id1292836438",
     android: "https://play.google.com/store/apps/details?id=com.bitso.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://bitso.com/web3-wallet",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/br/app/bitso-%C3%A9-f%C3%A1cil-comprar-bitcoin/id1292836438",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bitso://bitso.com/web3-wallet",
-    universal: "https://bitso.com/web3-wallet",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://bitso.com/web3-wallet",
   },
+  homepage: "https://bitso.com/web3-wallet",
+  id: "com.bitso",
+  image_id: "7e4953fb-de22-4761-1ff6-8c494549aa00",
+  mobile: {
+    native: "bitso://bitso.com/web3-wallet",
+    universal: "https://bitso.com/web3-wallet",
+  },
+  name: "Bitso Web3 Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.blanqlabs.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.blanqlabs.wallet/index.ts
index 8c00d86a0bb..556e7fbc343 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.blanqlabs.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.blanqlabs.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.blanqlabs.wallet",
-  name: "Blanq",
-  homepage: "https://www.blanqlabs.com",
-  image_id: "d02dcb81-d279-4414-627a-681dcad51200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/blanq-wallet-buy-store-crypto/id6470715307",
     android: "https://play.google.com/store/apps/details?id=xyz.blanq.mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/blanq-wallet-buy-store-crypto/id6470715307",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.blanqlabs.wallet",
-  mobile: {
-    native: null,
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.blanq.app",
   },
+  homepage: "https://www.blanqlabs.com",
+  id: "com.blanqlabs.wallet",
+  image_id: "d02dcb81-d279-4414-627a-681dcad51200",
+  mobile: {
+    native: null,
+    universal: null,
+  },
+  name: "Blanq",
+  rdns: "com.blanqlabs.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.blazpay.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.blazpay.wallet/index.ts
index 07234543f54..1dbfa6a696e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.blazpay.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.blazpay.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.blazpay.wallet",
-  name: "Blazpay",
-  homepage: "https://blazpay.com/download",
-  image_id: "ba0ed3d1-e94c-408d-c8f5-a384edcba700",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/blazpay/cecndeddohekaklkfehmcnhejflmclhc",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "com.blazpay.wallet",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://blazpay.com/download",
+  id: "com.blazpay.wallet",
+  image_id: "ba0ed3d1-e94c-408d-c8f5-a384edcba700",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Blazpay",
+  rdns: "com.blazpay.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.blockchain/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.blockchain/index.ts
index ac042ffc2a1..dd0358e858b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.blockchain/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.blockchain/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.blockchain",
-  name: "Blockchain.com",
-  homepage: "https://www.blockchain.com/en/app",
-  image_id: "6f913b80-86c0-46f9-61ca-cc90a1805900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/blockchain-bitcoin-wallet/id493253309",
     android:
       "https://play.google.com/store/apps/details?id=piuk.blockchain.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/blockchain-bitcoin-wallet/id493253309",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "blockchain-wallet://",
-    universal: "https://www.blockchain.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.blockchain.com/en/app",
+  id: "com.blockchain",
+  image_id: "6f913b80-86c0-46f9-61ca-cc90a1805900",
+  mobile: {
+    native: "blockchain-wallet://",
+    universal: "https://www.blockchain.com",
+  },
+  name: "Blockchain.com",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bmawallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bmawallet/index.ts
index 71cd01b53b6..b26cd220f24 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bmawallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bmawallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bmawallet",
-  name: "BMA Wallet",
-  homepage: "https://bmawallet.com/",
-  image_id: "5d8240f7-1d58-4ada-12b3-0b5e7d5b1300",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=com.bmawallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bmawalletapp://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bmawallet.com/",
+  id: "com.bmawallet",
+  image_id: "5d8240f7-1d58-4ada-12b3-0b5e7d5b1300",
+  mobile: {
+    native: "bmawalletapp://walletconnect",
+    universal: null,
+  },
+  name: "BMA Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.brave.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.brave.wallet/index.ts
index 1c38ff51165..74756fa5e12 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.brave.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.brave.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.brave.wallet",
-  name: "Brave Wallet",
-  homepage: "https://brave.com/wallet/",
-  image_id: "8cecad66-73e3-46ee-f45f-01503c032f00",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "https://brave.com/wallet/",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "com.brave.wallet",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://brave.com/wallet/",
+  id: "com.brave.wallet",
+  image_id: "8cecad66-73e3-46ee-f45f-01503c032f00",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Brave Wallet",
+  rdns: "com.brave.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.broearn/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.broearn/index.ts
index 5d7d5e4610a..1a368561a2b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.broearn/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.broearn/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.broearn",
-  name: "Broearn Wallet",
-  homepage: "https://www.broearn.com",
-  image_id: "b3c2c77c-a8cf-46e1-095a-77f0a3891500",
   app: {
-    browser: "https://www.broearn.com",
-    ios: "https://apps.apple.com/us/app/broearn/id6444156587",
     android:
       "https://play.google.com/store/apps/details?id=com.broearn.browser",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.broearn.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/broearn/id6444156587",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "broearn://wallet/",
-    universal: "https://www.broearn.com/link/wallet",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://www.broearn.com",
   },
+  homepage: "https://www.broearn.com",
+  id: "com.broearn",
+  image_id: "b3c2c77c-a8cf-46e1-095a-77f0a3891500",
+  mobile: {
+    native: "broearn://wallet/",
+    universal: "https://www.broearn.com/link/wallet",
+  },
+  name: "Broearn Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bscecowallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bscecowallet/index.ts
index 82434a250b8..8dcc16fdab3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bscecowallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bscecowallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bscecowallet",
-  name: "BSC Wallet",
-  homepage: "https://bscecowallet.com",
-  image_id: "63fe9162-b352-4a2c-1da1-a31d48008e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/bsc-wallet-bnb-chain/id6445821381",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/bsc-wallet-bnb-chain/id6445821381",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bscwalletapp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bscecowallet.com",
+  id: "com.bscecowallet",
+  image_id: "63fe9162-b352-4a2c-1da1-a31d48008e00",
+  mobile: {
+    native: "bscwalletapp://",
+    universal: null,
+  },
+  name: "BSC Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.burritowallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.burritowallet/index.ts
index 7653c4bea6b..a82bbcfdc90 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.burritowallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.burritowallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.burritowallet",
-  name: "Burrito",
-  homepage: "https://burritowallet.com",
-  image_id: "7eec7187-3f48-4fda-53bb-b0ad55749a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/burrito-wallet/id6449563083",
     android:
       "https://play.google.com/store/apps/details?id=com.burritowallet.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/burrito-wallet/id6449563083",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "burrito://",
-    universal: "https://app.burritowallet.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://burritowallet.com",
+  id: "com.burritowallet",
+  image_id: "7eec7187-3f48-4fda-53bb-b0ad55749a00",
+  mobile: {
+    native: "burrito://",
+    universal: "https://app.burritowallet.com",
+  },
+  name: "Burrito",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.bybit/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.bybit/index.ts
index a6d03536558..9c71cf0f66c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.bybit/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.bybit/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.bybit",
-  name: "Bybit Wallet",
-  homepage: "https://www.bybit.com/web3/",
-  image_id: "fa6b5b14-b135-43ea-b6c4-f33570dd5a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/US/app/id1488296980",
     android:
       "https://play.google.com/store/apps/details?id=com.bybit.app&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/bybit-wallet/pdliaogehgdbhbnmkklieghmmjkpigpa",
-    firefox: null,
-    safari: null,
     edge: "https://chrome.google.com/webstore/detail/bybit-wallet/pdliaogehgdbhbnmkklieghmmjkpigpa",
+    firefox: null,
+    ios: "https://apps.apple.com/US/app/id1488296980",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.bybit",
-  mobile: {
-    native: "bybitapp://open/route?targetUrl=by://web3/walletconnect/",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.bybit.com/web3/",
+  id: "com.bybit",
+  image_id: "fa6b5b14-b135-43ea-b6c4-f33570dd5a00",
+  mobile: {
+    native: "bybitapp://open/route?targetUrl=by://web3/walletconnect/",
+    universal: null,
+  },
+  name: "Bybit Wallet",
+  rdns: "com.bybit",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.caesiumlab/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.caesiumlab/index.ts
index 41b8ccc664a..6db40a4e7b1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.caesiumlab/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.caesiumlab/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.caesiumlab",
-  name: "Caesium",
-  homepage: "https://caesiumlab.com/",
-  image_id: "b3a456db-43c7-463c-cc3c-8c550c5b9500",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=com.csm_app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "caesium-app://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://caesiumlab.com/",
+  id: "com.caesiumlab",
+  image_id: "b3a456db-43c7-463c-cc3c-8c550c5b9500",
+  mobile: {
+    native: "caesium-app://walletconnect",
+    universal: null,
+  },
+  name: "Caesium",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.cakewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.cakewallet/index.ts
index 6dbebce4c4b..8ca009922b4 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.cakewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.cakewallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.cakewallet",
-  name: "Cake Wallet",
-  homepage: "https://cakewallet.com/",
-  image_id: "b05af25b-fa4d-4f91-a4cb-2f8f7d544000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/cake-wallet/id1334702542?platform=iphone",
     android:
       "https://play.google.com/store/apps/details?id=com.cakewallet.cake_wallet",
-    mac: "https://apps.apple.com/us/app/cake-wallet/id1334702542?platform=mac",
-    windows: null,
-    linux: "https://github.com/cake-tech/cake_wallet/releases/tag/v4.10.0",
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/cake-wallet/id1334702542?platform=iphone",
+    linux: "https://github.com/cake-tech/cake_wallet/releases/tag/v4.10.0",
+    mac: "https://apps.apple.com/us/app/cake-wallet/id1334702542?platform=mac",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "cakewallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://cakewallet.com/",
+  id: "com.cakewallet",
+  image_id: "b05af25b-fa4d-4f91-a4cb-2f8f7d544000",
+  mobile: {
+    native: "cakewallet://",
+    universal: null,
+  },
+  name: "Cake Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.cardstack/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.cardstack/index.ts
index 362188df85c..6557e61ed7e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.cardstack/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.cardstack/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.cardstack",
-  name: "Card Wallet",
-  homepage: "https://cardstack.com/earn-together",
-  image_id: "325428cf-c212-4d83-a434-7f48902d2c00",
   app: {
-    browser: null,
-    ios: "https://cardstack.com/ios",
     android: "https://cardstack.com/android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://cardstack.com/ios",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "cardwallet://",
-    universal: "https://wallet.cardstack.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://cardstack.com/earn-together",
+  id: "com.cardstack",
+  image_id: "325428cf-c212-4d83-a434-7f48902d2c00",
+  mobile: {
+    native: "cardwallet://",
+    universal: "https://wallet.cardstack.com",
+  },
+  name: "Card Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.chain/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.chain/index.ts
index 04f7266b4b2..010d62c6fad 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.chain/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.chain/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.chain",
-  name: "Chain",
-  homepage: "https://chain.com",
-  image_id: "f9f3d8da-e791-47d2-98c2-031712617e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id6444779277",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id6444779277",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "chainapp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://chain.com",
+  id: "com.chain",
+  image_id: "f9f3d8da-e791-47d2-98c2-031712617e00",
+  mobile: {
+    native: "chainapp://",
+    universal: null,
+  },
+  name: "Chain",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coin98/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coin98/index.ts
index 8d0a650629d..6de74ef8c81 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coin98/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coin98/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coin98",
-  name: "Coin98 Super Wallet",
-  homepage: "https://coin98.com/wallet",
-  image_id: "e7c6d5d0-b986-4348-de22-fc940e1aee00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/vn/app/coin98-wallet/id1561969966",
     android:
       "https://play.google.com/store/apps/details?id=coin98.crypto.finance.media&hl=vi&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/coin98-wallet/aeachknmefphepccionboohckonoeemg",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/vn/app/coin98-wallet/id1561969966",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.coin98",
-  mobile: {
-    native: "coin98://",
-    universal: "https://coin98.com/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://coin98.com/wallet",
+  id: "com.coin98",
+  image_id: "e7c6d5d0-b986-4348-de22-fc940e1aee00",
+  mobile: {
+    native: "coin98://",
+    universal: "https://coin98.com/",
+  },
+  name: "Coin98 Super Wallet",
+  rdns: "com.coin98",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coinbase.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coinbase.wallet/index.ts
index cd6cfe750e4..c6bdc8139a8 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coinbase.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coinbase.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coinbase.wallet",
-  name: "Coinbase Wallet",
-  homepage: "https://www.coinbase.com/wallet/",
-  image_id: "a5ebc364-8f91-4200-fcc6-be81310a0000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/apple-store/id1278383455",
     android: "https://play.google.com/store/apps/details?id=org.toshi",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad?hl=en",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/apple-store/id1278383455",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "com.coinbase.wallet",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://www.coinbase.com/wallet/",
+  id: "com.coinbase.wallet",
+  image_id: "a5ebc364-8f91-4200-fcc6-be81310a0000",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Coinbase Wallet",
+  rdns: "com.coinbase.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coincircle/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coincircle/index.ts
index f0f6f19da20..56fcac5e3f7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coincircle/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coincircle/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coincircle",
-  name: "CoinCircle",
-  homepage: "https://coincircle.com",
-  image_id: "eae63a23-c7ba-4f7e-24b3-e6fc69215d00",
   app: {
-    browser: "https://coincircle.com",
-    ios: "https://coincircle.com/app",
     android: "https://coincircle.com/app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://coincircle.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://coincircle.com/app",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://coincircle.com/app/walletconnect",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://coincircle.com",
   },
+  homepage: "https://coincircle.com",
+  id: "com.coincircle",
+  image_id: "eae63a23-c7ba-4f7e-24b3-e6fc69215d00",
+  mobile: {
+    native: null,
+    universal: "https://coincircle.com/app/walletconnect",
+  },
+  name: "CoinCircle",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coinex.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coinex.wallet/index.ts
index ee36361a447..6ff01498a58 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coinex.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coinex.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coinex.wallet",
-  name: "CoinEx Wallet",
-  homepage: "https://wallet.coinex.com/en/",
-  image_id: "67650667-cc52-4e7f-2d4b-26fcdb160100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/coinex-wallet-crypto-defi/id1462031389",
     android: "https://play.google.com/store/apps/details?id=com.viabtc.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/coinex-wallet-crypto-defi/id1462031389",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "myApp://https://wallet.coinex.com",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallet.coinex.com/en/",
+  id: "com.coinex.wallet",
+  image_id: "67650667-cc52-4e7f-2d4b-26fcdb160100",
+  mobile: {
+    native: "myApp://https://wallet.coinex.com",
+    universal: null,
+  },
+  name: "CoinEx Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coingrig/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coingrig/index.ts
index 6d62d0891bc..203f1daa120 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coingrig/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coingrig/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coingrig",
-  name: "Coingrig",
-  homepage: "https://coingrig.com",
-  image_id: "18e38e41-a387-4402-ca31-6d2d5eb91100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/coingrig-crypto-btc-wallet/id1583464451",
     android: "https://play.google.com/store/apps/details?id=com.coingrig",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/coingrig-crypto-btc-wallet/id1583464451",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "coingrig://",
-    universal: "https://link.coingrig.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://coingrig.com",
+  id: "com.coingrig",
+  image_id: "18e38e41-a387-4402-ca31-6d2d5eb91100",
+  mobile: {
+    native: "coingrig://",
+    universal: "https://link.coingrig.com",
+  },
+  name: "Coingrig",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coininn/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coininn/index.ts
index 6ed55fec8bf..3e6b77e0c2d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coininn/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coininn/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coininn",
-  name: "Coininn Wallet",
-  homepage: "https://www.coininn.com/coinwallet",
-  image_id: "52efd5a7-65fa-428d-668c-f53ceb4b5f00",
   app: {
-    browser: null,
-    ios: "https://itunes.apple.com/app/id6448525015",
     android: "https://play.google.com/store/apps/details?id=com.coininn.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/app/id6448525015",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "coininn_wallet_wc://request",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.coininn.com/coinwallet",
+  id: "com.coininn",
+  image_id: "52efd5a7-65fa-428d-668c-f53ceb4b5f00",
+  mobile: {
+    native: "coininn_wallet_wc://request",
+    universal: null,
+  },
+  name: "Coininn Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coinomi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coinomi/index.ts
index f34426febde..3dc08af4fce 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coinomi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coinomi/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coinomi",
-  name: "Coinomi",
-  homepage: "https://www.coinomi.com",
-  image_id: "3b446d16-a908-40c8-5835-9a6efe90dd00",
   app: {
-    browser: null,
-    ios: "https://itunes.apple.com/app/coinomi-wallet/id1333588809",
     android: "https://play.google.com/store/apps/details?id=com.coinomi.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/app/coinomi-wallet/id1333588809",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "coinomi://",
-    universal: "https://coinomi.page.link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.coinomi.com",
+  id: "com.coinomi",
+  image_id: "3b446d16-a908-40c8-5835-9a6efe90dd00",
+  mobile: {
+    native: "coinomi://",
+    universal: "https://coinomi.page.link",
+  },
+  name: "Coinomi",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coinsdo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coinsdo/index.ts
index a1a02db9b62..8be72434758 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coinsdo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coinsdo/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coinsdo",
-  name: "CoinWallet",
-  homepage: "https://www.coinsdo.com",
-  image_id: "1c0cd352-ce8e-4bcc-f91d-8763eab60b00",
   app: {
-    browser: "https://www.coinsdo.com/wallet_coinsdo.html",
-    ios: "https://apps.apple.com/us/app/coinsdo-wallet-btc-eth-wallet/id6479635869",
     android: "https://play.google.com/store/apps/details?id=com.coinsdo.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.coinsdo.com/wallet_coinsdo.html",
     chrome:
       "https://chromewebstore.google.com/detail/coinwallet-btc-crypto-wal/oafedfoadhdjjcipmcbecikgokpaphjk",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/coinsdo-wallet-btc-eth-wallet/id6479635869",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "coinwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "coinwallet://",
     universal: "https://www.coinsdo.com/wallet_coinsdo.html",
   },
+  homepage: "https://www.coinsdo.com",
+  id: "com.coinsdo",
+  image_id: "1c0cd352-ce8e-4bcc-f91d-8763eab60b00",
+  mobile: {
+    native: "coinwallet://",
+    universal: null,
+  },
+  name: "CoinWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.companyname.swaptobe/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.companyname.swaptobe/index.ts
index d73f548222f..6517c9e0e46 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.companyname.swaptobe/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.companyname.swaptobe/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.companyname.swaptobe",
-  name: "TobeWallet",
-  homepage: "https://testnet.tobechain.net/testnet/faucet/",
-  image_id: "ccfadd90-2fe4-41c0-4762-32e1cf9b2700",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.companyname.swaptobe&hl=vi",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "com.companyname.swaptobe",
-  mobile: {
+  desktop: {
     native: "tobewallet://",
     universal: null,
   },
-  desktop: {
+  homepage: "https://testnet.tobechain.net/testnet/faucet/",
+  id: "com.companyname.swaptobe",
+  image_id: "ccfadd90-2fe4-41c0-4762-32e1cf9b2700",
+  mobile: {
     native: "tobewallet://",
     universal: null,
   },
+  name: "TobeWallet",
+  rdns: "com.companyname.swaptobe",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.concordium/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.concordium/index.ts
index 5c3fd585745..4885e45d599 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.concordium/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.concordium/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.concordium",
-  name: "Concordium",
-  homepage: "https://concordium.com/",
-  image_id: "b1ca907e-2f5f-42a8-d11c-86a15a291600",
   app: {
-    browser: "https://concordium.com/",
-    ios: "https://apps.apple.com/us/app/concordium-blockchain-wallet/id6444703764",
     android:
       "https://play.google.com/store/apps/details?id=software.concordium.mobilewallet.seedphrase.mainnet&pli=1",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: "https://concordium.com/",
     chrome:
       "https://chrome.google.com/webstore/detail/concordium-wallet/mnnkpffndmickbiakofclnpoiajlegmg?hl=en-US",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/concordium-blockchain-wallet/id6444703764",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "concordiumwallet://",
-    universal: "https://wallet.concordium.software",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://concordium.com/",
   },
+  homepage: "https://concordium.com/",
+  id: "com.concordium",
+  image_id: "b1ca907e-2f5f-42a8-d11c-86a15a291600",
+  mobile: {
+    native: "concordiumwallet://",
+    universal: "https://wallet.concordium.software",
+  },
+  name: "Concordium",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.coolbitx.cwsapp/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.coolbitx.cwsapp/index.ts
index 290f97a57cd..e25935b01f6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.coolbitx.cwsapp/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.coolbitx.cwsapp/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.coolbitx.cwsapp",
-  name: "CoolWallet",
-  homepage: "https://coolwallet.io/",
-  image_id: "f581365d-e844-4d21-8e35-44a755a32d00",
   app: {
-    browser: null,
-    ios: "https://itunes.apple.com/us/app/coolwallet-s-2018/id1328764142",
     android:
       "https://play.google.com/store/apps/details?id=com.coolbitx.cwsapp",
-    mac: "https://itunes.apple.com/us/app/coolwallet-s-2018/id1328764142",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/us/app/coolwallet-s-2018/id1328764142",
+    linux: null,
+    mac: "https://itunes.apple.com/us/app/coolwallet-s-2018/id1328764142",
     opera: null,
-  },
-  rdns: "com.coolbitx.cwsapp",
-  mobile: {
-    native: "coolwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://coolwallet.io/",
+  id: "com.coolbitx.cwsapp",
+  image_id: "f581365d-e844-4d21-8e35-44a755a32d00",
+  mobile: {
+    native: "coolwallet://",
+    universal: null,
+  },
+  name: "CoolWallet",
+  rdns: "com.coolbitx.cwsapp",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.crossmint/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.crossmint/index.ts
index 1b05ff7233e..947854178eb 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.crossmint/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.crossmint/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.crossmint",
-  name: "Crossmint",
-  homepage: "https://www.crossmint.com/",
-  image_id: "8ad627ec-cbcd-4878-ec5c-3df588055200",
   app: {
-    browser: "https://www.crossmint.com",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.crossmint.com",
     chrome: "https://www.crossmint.com",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://www.crossmint.com",
   },
-  desktop: {
+  homepage: "https://www.crossmint.com/",
+  id: "com.crossmint",
+  image_id: "8ad627ec-cbcd-4878-ec5c-3df588055200",
+  mobile: {
     native: null,
     universal: "https://www.crossmint.com",
   },
+  name: "Crossmint",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.cryptnox/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.cryptnox/index.ts
index eac39cf5a6c..670ee1ac433 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.cryptnox/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.cryptnox/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.cryptnox",
-  name: "Cryptnox Wallet",
-  homepage: "https://cryptnox.com",
-  image_id: "2947b7c8-8966-4485-a98d-25fe43c16700",
   app: {
-    browser: "https://cryptnox.com",
-    ios: "https://apps.apple.com/app/id1583011693",
     android:
       "https://play.google.com/store/apps/details?id=com.cryptnox.cryptnoxwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://cryptnox.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1583011693",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "cryptnox://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://cryptnox.com",
   },
+  homepage: "https://cryptnox.com",
+  id: "com.cryptnox",
+  image_id: "2947b7c8-8966-4485-a98d-25fe43c16700",
+  mobile: {
+    native: "cryptnox://",
+    universal: null,
+  },
+  name: "Cryptnox Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.crypto.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.crypto.wallet/index.ts
index b359feefc0f..9fa7a8c2e49 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.crypto.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.crypto.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.crypto.wallet",
-  name: "Crypto.com Onchain",
-  homepage: "https://crypto.com/onchain",
-  image_id: "4903acdd-6463-44b6-3cf9-f23f4c75ca00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/US/app/id1512048310?mt=8",
     android: "https://play.google.com/store/apps/details?id=com.defi.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/cryptocom-wallet-extensio/hifafgmccdpekplomjjkcfgodnhcellj",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/US/app/id1512048310?mt=8",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.crypto.wallet",
-  mobile: {
-    native: "dfw://",
-    universal: "https://wallet.crypto.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://crypto.com/onchain",
+  id: "com.crypto.wallet",
+  image_id: "4903acdd-6463-44b6-3cf9-f23f4c75ca00",
+  mobile: {
+    native: "dfw://",
+    universal: "https://wallet.crypto.com",
+  },
+  name: "Crypto.com Onchain",
+  rdns: "com.crypto.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.cryptokara/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.cryptokara/index.ts
index 77eb5518107..7122546cb22 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.cryptokara/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.cryptokara/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.cryptokara",
-  name: "Cryptokara",
-  homepage: "https://cryptokara.com",
-  image_id: "028ef53f-b5d9-4a63-2bf0-d384c8522500",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.cryptokara&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "com.cryptokara",
+  desktop: {
+    native: null,
+    universal: null,
+  },
+  homepage: "https://cryptokara.com",
+  id: "com.cryptokara",
+  image_id: "028ef53f-b5d9-4a63-2bf0-d384c8522500",
   mobile: {
     native: "cryptokara://StartScreen",
     universal:
       "https://play.google.com/store/apps/details?id=com.cryptokara&hl=en_US",
   },
-  desktop: {
-    native: null,
-    universal: null,
-  },
+  name: "Cryptokara",
+  rdns: "com.cryptokara",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.daffione/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.daffione/index.ts
index 977244d751a..4b0704b3751 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.daffione/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.daffione/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.daffione",
-  name: "DaffiOne",
-  homepage: "https://www.daffione.com/",
-  image_id: "1e87bcb9-452c-4ad7-471c-130ae0115000",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=com.me.daffione",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "DaffiOne:// wc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.daffione.com/",
+  id: "com.daffione",
+  image_id: "1e87bcb9-452c-4ad7-471c-130ae0115000",
+  mobile: {
+    native: "DaffiOne:// wc://",
+    universal: null,
+  },
+  name: "DaffiOne",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.dcentwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.dcentwallet/index.ts
index f6e0f9f9b10..7c6a023f9f5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.dcentwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.dcentwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.dcentwallet",
-  name: "D'CENT Wallet",
-  homepage: "https://dcentwallet.com",
-  image_id: "0b0ca1f1-1e43-4429-7b23-2e0ce4b1b700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/dcent-hardware-wallet/id1447206611",
     android:
       "https://play.google.com/store/apps/details?id=com.kr.iotrust.dcent.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/dcent-hardware-wallet/id1447206611",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "dcent://",
-    universal: "https://link.dcentwallet.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://dcentwallet.com",
+  id: "com.dcentwallet",
+  image_id: "0b0ca1f1-1e43-4429-7b23-2e0ce4b1b700",
+  mobile: {
+    native: "dcent://",
+    universal: "https://link.dcentwallet.com",
+  },
+  name: "D'CENT Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.dextrade/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.dextrade/index.ts
index f0e6795edbf..6363670d575 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.dextrade/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.dextrade/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.dextrade",
-  name: "DexTrade",
-  homepage: "https://dextrade.com",
-  image_id: "d33237c0-a4e1-4339-9db8-a1087311c400",
   app: {
-    browser: "https://pwa.dextrade.com",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://pwa.dextrade.com",
     chrome:
       "https://chromewebstore.google.com/detail/dextrade/nmladckinifchdidkoaagbcpnieocoah?hl=en",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "com.dextrade",
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://pwa.dextrade.com",
   },
-  desktop: {
+  homepage: "https://dextrade.com",
+  id: "com.dextrade",
+  image_id: "d33237c0-a4e1-4339-9db8-a1087311c400",
+  mobile: {
     native: null,
     universal: "https://pwa.dextrade.com",
   },
+  name: "DexTrade",
+  rdns: "com.dextrade",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.dolletwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.dolletwallet/index.ts
index b3f817c1f6c..1e59f68d5c9 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.dolletwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.dolletwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.dolletwallet",
-  name: "Dollet",
-  homepage: "https://dolletwallet.com/",
-  image_id: "21679e58-e829-44f6-78d3-6a9d6e9ce900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/dollet/id6451143361",
     android:
       "https://play.google.com/store/apps/details?id=com.dolllet.mainnet&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/dollet/id6451143361",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "dolletwc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://dolletwallet.com/",
+  id: "com.dolletwallet",
+  image_id: "21679e58-e829-44f6-78d3-6a9d6e9ce900",
+  mobile: {
+    native: "dolletwc://",
+    universal: null,
+  },
+  name: "Dollet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ellipal/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ellipal/index.ts
index b01624548fa..9c4f90d8450 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ellipal/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ellipal/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ellipal",
-  name: "ELLIPAL",
-  homepage: "https://www.ellipal.com",
-  image_id: "0a5b45a1-c974-4f41-6c14-376714478c00",
   app: {
-    browser: null,
-    ios: "https://itunes.apple.com/us/app/ellipal/id1426179665?l=zh&ls=1&mt=8",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/us/app/ellipal/id1426179665?l=zh&ls=1&mt=8",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ELLIPAL://",
-    universal: "https://www.ellipal.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ellipal.com",
+  id: "com.ellipal",
+  image_id: "0a5b45a1-c974-4f41-6c14-376714478c00",
+  mobile: {
+    native: "ELLIPAL://",
+    universal: "https://www.ellipal.com",
+  },
+  name: "ELLIPAL",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.elrond.maiar.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.elrond.maiar.wallet/index.ts
index 50bdd37f881..6d6066bc074 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.elrond.maiar.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.elrond.maiar.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.elrond.maiar.wallet",
-  name: "xPortal",
-  homepage: "https://xportal.com",
-  image_id: "1bc53e49-1e7f-4129-4c87-3f8c7b91cb00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ro/app/xportal/id1519405832",
     android:
       "https://play.google.com/store/apps/details?id=com.elrond.maiar.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "-",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ro/app/xportal/id1519405832",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.elrond.maiar.wallet",
-  mobile: {
-    native: "xportal://",
-    universal: "https://xport.al",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://xportal.com",
+  id: "com.elrond.maiar.wallet",
+  image_id: "1bc53e49-1e7f-4129-4c87-3f8c7b91cb00",
+  mobile: {
+    native: "xportal://",
+    universal: "https://xport.al",
+  },
+  name: "xPortal",
+  rdns: "com.elrond.maiar.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.enkrypt/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.enkrypt/index.ts
index 882c6e3cf81..580ad2fbaf6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.enkrypt/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.enkrypt/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.enkrypt",
-  name: "Enkrypt",
-  homepage: "https://www.enkrypt.com",
-  image_id: "5aafd680-95a8-41e6-6df0-632ea23f4700",
   app: {
-    browser: "https://google.com",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://google.com",
     chrome:
       "https://chromewebstore.google.com/detail/enkrypt-multichain-crypto/kkpllkodjeloidieedojogacfhpaihoh",
+    edge: "https://microsoftedge.microsoft.com/addons/detail/gfenajajnjjmmdojhdjmnngomkhlnfjl",
     firefox: "https://addons.mozilla.org/en-US/firefox/addon/enkrypt/",
+    ios: null,
+    linux: null,
+    mac: null,
+    opera: "https://addons.opera.com/en/extensions/details/enkrypt/",
     safari:
       "https://apps.apple.com/us/app/enkrypt-web3-wallet/id1640164309?mt=12",
-    edge: "https://microsoftedge.microsoft.com/addons/detail/gfenajajnjjmmdojhdjmnngomkhlnfjl",
-    opera: "https://addons.opera.com/en/extensions/details/enkrypt/",
-  },
-  rdns: "com.enkrypt",
-  mobile: {
-    native: null,
-    universal: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://google.com",
   },
+  homepage: "https://www.enkrypt.com",
+  id: "com.enkrypt",
+  image_id: "5aafd680-95a8-41e6-6df0-632ea23f4700",
+  mobile: {
+    native: null,
+    universal: null,
+  },
+  name: "Enkrypt",
+  rdns: "com.enkrypt",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ennowallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ennowallet/index.ts
index 2c659f799fe..0e687d364ee 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ennowallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ennowallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ennowallet",
-  name: "Enno Wallet",
-  homepage: "https://www.ennowallet.com",
-  image_id: "ae4f5167-0b61-43bd-7d76-1f8579271000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/enno-wallet/id1577011660#iosmph",
     android:
       "https://play.google.com/store/apps/details?id=com.app.awqsome.ennowallet#gpmph",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/enno-wallet/id1577011660#iosmph",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ennowallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ennowallet.com",
+  id: "com.ennowallet",
+  image_id: "ae4f5167-0b61-43bd-7d76-1f8579271000",
+  mobile: {
+    native: "ennowallet://",
+    universal: null,
+  },
+  name: "Enno Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.exodus/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.exodus/index.ts
index 6d0d2ba4202..56dc26f8709 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.exodus/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.exodus/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.exodus",
-  name: "Exodus",
-  homepage: "https://exodus.com/",
-  image_id: "4c16cad4-cac9-4643-6726-c696efaf5200",
   app: {
-    browser: "https://exodus.com/download/",
-    ios: "https://apps.apple.com/us/app/exodus-crypto-bitcoin-wallet/id1414384820",
     android:
       "https://play.google.com/store/apps/details?id=exodusmovement.exodus&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://exodus.com/download/",
     chrome:
       "https://chrome.google.com/webstore/detail/exodus-web3-wallet/aholpfdialjgjfhomihkjbmgjidlcdno",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/exodus-crypto-bitcoin-wallet/id1414384820",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "exodus://",
-    universal: "https://exodus.com/m",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://exodus.com/",
+  id: "com.exodus",
+  image_id: "4c16cad4-cac9-4643-6726-c696efaf5200",
+  mobile: {
+    native: "exodus://",
+    universal: "https://exodus.com/m",
+  },
+  name: "Exodus",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.fastex.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.fastex.wallet/index.ts
index eb564c38d08..e1aea991a1b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.fastex.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.fastex.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.fastex.wallet",
-  name: "Yo Wallet",
-  homepage: "https://yowallet.io",
-  image_id: "a38db32b-8291-4d25-9aae-4bf4b6e6f300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/fastex-wallet/id6474118944",
     android: "https://play.google.com/store/apps/details?id=com.yowallet.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/fastex-wallet/id6474118944",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.fastex.wallet",
-  mobile: {
-    native: "yo-wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://yowallet.io",
+  id: "com.fastex.wallet",
+  image_id: "a38db32b-8291-4d25-9aae-4bf4b6e6f300",
+  mobile: {
+    native: "yo-wallet://",
+    universal: null,
+  },
+  name: "Yo Wallet",
+  rdns: "com.fastex.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.fireblocks/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.fireblocks/index.ts
index 93a7b4d29b2..fe84565acf2 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.fireblocks/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.fireblocks/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.fireblocks",
-  name: "Fireblocks",
-  homepage: "https://www.fireblocks.com/",
-  image_id: "7e1514ba-932d-415d-1bdb-bccb6c2cbc00",
   app: {
-    browser: "https://console.fireblocks.io/",
-    ios: "https://apps.apple.com/us/app/fireblocks/id1439296596",
     android:
       "https://play.google.com/store/apps/details?id=com.fireblocks.client&gl=IL",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://console.fireblocks.io/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/fireblocks/id1439296596",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "fireblocks-wc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://console.fireblocks.io/v2/",
   },
+  homepage: "https://www.fireblocks.com/",
+  id: "com.fireblocks",
+  image_id: "7e1514ba-932d-415d-1bdb-bccb6c2cbc00",
+  mobile: {
+    native: "fireblocks-wc://",
+    universal: null,
+  },
+  name: "Fireblocks",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.flash-wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.flash-wallet/index.ts
index 4fc0468d5dc..daf398efba3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.flash-wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.flash-wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.flash-wallet",
-  name: "Flash Wallet",
-  homepage: "https://flash-wallet.com/",
-  image_id: "ded6d2d1-85b0-4eac-5582-3aaeefa8ba00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/pk/app/flash-wallet/id6461013442",
     android:
       "https://play.google.com/store/apps/details?id=com.flashwallet.production",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/pk/app/flash-wallet/id6461013442",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "flashwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://flash-wallet.com/",
+  id: "com.flash-wallet",
+  image_id: "ded6d2d1-85b0-4eac-5582-3aaeefa8ba00",
+  mobile: {
+    native: "flashwallet://",
+    universal: null,
+  },
+  name: "Flash Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.flowfoundation.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.flowfoundation.wallet/index.ts
index b02d914b3e6..33b40be9965 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.flowfoundation.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.flowfoundation.wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.flowfoundation.wallet",
-  name: "Flow Wallet",
-  homepage: "https://wallet.flow.com/",
-  image_id: "f67a1db8-5704-4353-ead8-bd85c02a8700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ca/app/flow-wallet-nfts-and-crypto/id6478996750",
     android:
       "https://play.google.com/store/apps/details?id=com.flowfoundation.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/flow-reference/hpclkefagolihohboafpheddmmgdffjm",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ca/app/flow-wallet-nfts-and-crypto/id6478996750",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.flowfoundation.wallet",
-  mobile: {
-    native: "frw://",
-    universal: "https://frw-link.lilico.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallet.flow.com/",
+  id: "com.flowfoundation.wallet",
+  image_id: "f67a1db8-5704-4353-ead8-bd85c02a8700",
+  mobile: {
+    native: "frw://",
+    universal: "https://frw-link.lilico.app",
+  },
+  name: "Flow Wallet",
+  rdns: "com.flowfoundation.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.foxwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.foxwallet/index.ts
index 12e6c8e7f03..1b79dfeb3a3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.foxwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.foxwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.foxwallet",
-  name: "FoxWallet",
-  homepage: "http://foxwallet.com",
-  image_id: "d673068d-1acf-4372-76ee-8eb931c59e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/foxwallet-crypto-web3/id1590983231",
     android: "https://play.google.com/store/apps/details?id=com.foxwallet.play",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/foxwallet-crypto-web3/id1590983231",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "foxwallet://",
-    universal: "https://link.foxwallet.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "http://foxwallet.com",
+  id: "com.foxwallet",
+  image_id: "d673068d-1acf-4372-76ee-8eb931c59e00",
+  mobile: {
+    native: "foxwallet://",
+    universal: "https://link.foxwallet.com",
+  },
+  name: "FoxWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.fxwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.fxwallet/index.ts
index b64c884fa35..cf6db60b4a0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.fxwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.fxwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.fxwallet",
-  name: "FxWallet",
-  homepage: "https://www.fxwallet.com",
-  image_id: "46a80541-e639-483d-e230-731fcbf13000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/fxwallet/id1560943983",
     android: "https://play.google.com/store/apps/details?id=com.fxfi.fxwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/fxwallet/id1560943983",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "fxwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.fxwallet.com",
+  id: "com.fxwallet",
+  image_id: "46a80541-e639-483d-e230-731fcbf13000",
+  mobile: {
+    native: "fxwallet://",
+    universal: null,
+  },
+  name: "FxWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.gemwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.gemwallet/index.ts
index 9699e5a4f17..bb9277620a8 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.gemwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.gemwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.gemwallet",
-  name: "Gem Wallet",
-  homepage: "https://gemwallet.com",
-  image_id: "28f1b431-9d2a-4083-1bf8-5958939a2300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/apple-store/id6448712670?mt=8",
     android:
       "https://play.google.com/store/apps/details?id=com.gemwallet.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/apple-store/id6448712670?mt=8",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "gem://",
-    universal: "https://gemwallet.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://gemwallet.com",
+  id: "com.gemwallet",
+  image_id: "28f1b431-9d2a-4083-1bf8-5958939a2300",
+  mobile: {
+    native: "gem://",
+    universal: "https://gemwallet.com",
+  },
+  name: "Gem Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.get-verso/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.get-verso/index.ts
index 0a972846c15..9ef47567be6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.get-verso/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.get-verso/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.get-verso",
-  name: "Verso",
-  homepage: "https://get-verso.com",
-  image_id: "109d7c90-86ed-4ee0-e17d-3c87624ddf00",
   app: {
-    browser: "https://get-verso.com",
-    ios: "https://apps.apple.com/app/btu-protocol/id1539304605",
     android:
       "https://play.google.com/store/apps/details?id=com.btuprotocol.btu_wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://get-verso.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/btu-protocol/id1539304605",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "verso://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://get-verso.com",
   },
+  homepage: "https://get-verso.com",
+  id: "com.get-verso",
+  image_id: "109d7c90-86ed-4ee0-e17d-3c87624ddf00",
+  mobile: {
+    native: "verso://",
+    universal: null,
+  },
+  name: "Verso",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.getcogni/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.getcogni/index.ts
index 8584e8fe6c2..62b8a43bcfd 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.getcogni/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.getcogni/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.getcogni",
-  name: "Cogni ",
-  homepage: "https://www.getcogni.com/",
-  image_id: "b650cd08-21eb-4769-8ef9-96feb6e38e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/cogni-mobile-banking/id1483957512",
     android: "https://play.google.com/store/apps/details?id=com.getcogni.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/cogni-mobile-banking/id1483957512",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "getcogni://web3/",
-    universal: "https://getcogni.com/web3_wc_connect",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.getcogni.com/",
+  id: "com.getcogni",
+  image_id: "b650cd08-21eb-4769-8ef9-96feb6e38e00",
+  mobile: {
+    native: "getcogni://web3/",
+    universal: "https://getcogni.com/web3_wc_connect",
+  },
+  name: "Cogni ",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.greengloryglobal/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.greengloryglobal/index.ts
index 393608b9dc5..1c3321a229b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.greengloryglobal/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.greengloryglobal/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.greengloryglobal",
-  name: "Blockaura",
-  homepage: "https://greengloryglobal.com/",
-  image_id: "8cc7ddbc-a257-4383-4f84-3847e707bb00",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.blockaura_classic",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "blockaura://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://greengloryglobal.com/",
+  id: "com.greengloryglobal",
+  image_id: "8cc7ddbc-a257-4383-4f84-3847e707bb00",
+  mobile: {
+    native: "blockaura://walletconnect",
+    universal: null,
+  },
+  name: "Blockaura",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.hashpack.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.hashpack.wallet/index.ts
index b284f05e6bf..05fbf52a96c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.hashpack.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.hashpack.wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.hashpack.wallet",
-  name: "HashPack",
-  homepage: "https://hashpack.app",
-  image_id: "8d55dd5a-7c9f-4929-d2d1-00564e41ac00",
   app: {
-    browser: "https://wallet.hashpack.app/",
-    ios: "https://apps.apple.com/app/id6444389849",
     android:
       "https://play.google.com/store/apps/details?id=app.hashpack.wallet.twa",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet.hashpack.app/",
     chrome:
       "https://chrome.google.com/webstore/detail/hashpack/gjagmgiddbbciopjhllkdnddhcglnemk",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id6444389849",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.hashpack.wallet",
-  mobile: {
-    native: "hashpack://",
-    universal: "https://link.hashpack.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://link.hashpack.app",
   },
+  homepage: "https://hashpack.app",
+  id: "com.hashpack.wallet",
+  image_id: "8d55dd5a-7c9f-4929-d2d1-00564e41ac00",
+  mobile: {
+    native: "hashpack://",
+    universal: "https://link.hashpack.app",
+  },
+  name: "HashPack",
+  rdns: "com.hashpack.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.holdstation/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.holdstation/index.ts
index 2b4bd57140e..4d0f7504f15 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.holdstation/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.holdstation/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.holdstation",
-  name: "Holdstation Wallet",
-  homepage: "https://www.holdstation.com",
-  image_id: "dba228fc-d0c9-497b-903e-843ad1076e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/holdstation-web3-wallet/id6444925618",
     android: "https://play.google.com/store/apps/details?id=io.holdstation",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/holdstation-web3-wallet/id6444925618",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "holdstation://",
-    universal: "https://staging-referral.holdstation.com/wallet-connect?uri=",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.holdstation.com",
+  id: "com.holdstation",
+  image_id: "dba228fc-d0c9-497b-903e-843ad1076e00",
+  mobile: {
+    native: "holdstation://",
+    universal: "https://staging-referral.holdstation.com/wallet-connect?uri=",
+  },
+  name: "Holdstation Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.humbl/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.humbl/index.ts
index 32053c177ba..7b0bd3e5d94 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.humbl/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.humbl/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.humbl",
-  name: "HUMBL WALLET",
-  homepage: "https://www.humbl.com",
-  image_id: "1ac55ba2-aa98-4ed0-59b3-b3155dea4200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/humbl-wallet/id1627171234",
     android:
       "https://play.google.com/store/apps/details?id=com.humbl.wallet.app&hl=en_US&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/humbl-wallet/id1627171234",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "humblwallet://",
-    universal: "https://wallet.search3.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.humbl.com",
+  id: "com.humbl",
+  image_id: "1ac55ba2-aa98-4ed0-59b3-b3155dea4200",
+  mobile: {
+    native: "humblwallet://",
+    universal: "https://wallet.search3.com",
+  },
+  name: "HUMBL WALLET",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.icewal/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.icewal/index.ts
index f9614916499..6f7f2378257 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.icewal/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.icewal/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.icewal",
-  name: "icewal",
-  homepage: "https://icewal.com",
-  image_id: "bbfa8e6a-984d-4955-c919-8181e8bc9e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/uk/app/icewal/id1629607532",
     android: "https://play.google.com/store/apps/details?id=com.icecorp.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/uk/app/icewal/id1629607532",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "icewal://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://icewal.com",
+  id: "com.icewal",
+  image_id: "bbfa8e6a-984d-4955-c919-8181e8bc9e00",
+  mobile: {
+    native: "icewal://",
+    universal: null,
+  },
+  name: "icewal",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ipmb/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ipmb/index.ts
index e4b0e7e1adb..ee513333768 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ipmb/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ipmb/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ipmb",
-  name: "IPMB Wallet",
-  homepage: "https://www.ipmb.com",
-  image_id: "846ae068-c112-412a-c103-7aa414bc9400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/gb/app/ipmb-wallet/id6474244533",
     android: "https://play.google.com/store/apps/details?id=com.ipmb.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/ipmb-wallet/gohpeceldnpglangfimhdjlfhgalohco",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/gb/app/ipmb-wallet/id6474244533",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "com.ipmb.app://walletcon",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ipmb.com",
+  id: "com.ipmb",
+  image_id: "846ae068-c112-412a-c103-7aa414bc9400",
+  mobile: {
+    native: "com.ipmb.app://walletcon",
+    universal: null,
+  },
+  name: "IPMB Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.itoken/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.itoken/index.ts
index 38bd41a86be..47fed913df0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.itoken/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.itoken/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.itoken",
-  name: "iToken Wallet",
-  homepage: "https://www.itoken.com/",
-  image_id: "5cd60c34-038d-470c-c024-d58f64260200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id1433883012",
     android:
       "https://play.google.com/store/apps/details?id=com.huobionchainwallet.gp",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id1433883012",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "huobiwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.itoken.com/",
+  id: "com.itoken",
+  image_id: "5cd60c34-038d-470c-c024-d58f64260200",
+  mobile: {
+    native: "huobiwallet://",
+    universal: null,
+  },
+  name: "iToken Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ivirse/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ivirse/index.ts
index 691215d61aa..84472eac44d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ivirse/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ivirse/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ivirse",
-  name: "IApp",
-  homepage: "https://ivirse.com",
-  image_id: "5da95e88-2d6c-4880-e6d8-b6a8d0663900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/vn/app/oomy/id6446265246",
     android: "https://play.google.com/store/apps/details?id=com.ivirse.figame",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/vn/app/oomy/id6446265246",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ivirse://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ivirse.com",
+  id: "com.ivirse",
+  image_id: "5da95e88-2d6c-4880-e6d8-b6a8d0663900",
+  mobile: {
+    native: "ivirse://",
+    universal: null,
+  },
+  name: "IApp",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.klipwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.klipwallet/index.ts
index 989f52f580d..459ca6d9785 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.klipwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.klipwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.klipwallet",
-  name: "Klip",
-  homepage: "https://klipwallet.com/",
-  image_id: "f7b6b2a6-ebe7-4779-6ad1-79a3142e6b00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kr/app/클립-klip/id1627665524",
     android: "https://play.google.com/store/apps/details?id=com.klipwallet.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kr/app/클립-klip/id1627665524",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "klipwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://klipwallet.com/",
+  id: "com.klipwallet",
+  image_id: "f7b6b2a6-ebe7-4779-6ad1-79a3142e6b00",
+  mobile: {
+    native: "klipwallet://",
+    universal: null,
+  },
+  name: "Klip",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.kraken/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.kraken/index.ts
index c8b3c6028a6..8f988d5f11a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.kraken/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.kraken/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.kraken",
-  name: "Kraken Wallet ",
-  homepage: "https://www.kraken.com/wallet",
-  image_id: "3f4e6025-d008-4edc-1fbd-19f54294a900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/kraken-wallet/id1626327149",
     android:
       "https://play.google.com/store/apps/details?id=com.kraken.superwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/kraken-wallet/id1626327149",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "krakenwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.kraken.com/wallet",
+  id: "com.kraken",
+  image_id: "3f4e6025-d008-4edc-1fbd-19f54294a900",
+  mobile: {
+    native: "krakenwallet://",
+    universal: null,
+  },
+  name: "Kraken Wallet ",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.kresus/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.kresus/index.ts
index 16d4baf7d84..9f5a13935bc 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.kresus/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.kresus/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.kresus",
-  name: "Kresus SuperApp",
-  homepage: "https://www.kresus.com/",
-  image_id: "ee242aea-3ffd-4ad8-db88-e29a1ccd2000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/kresus-crypto-nft-superapp/id6444355152?referrer=singular_click_id%3Da713aaae-ea8e-4919-882d-a053ad9a8278",
     android:
       "https://play.google.com/store/apps/details?id=com.kresus.superapp&pli=1",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/kresus-crypto-nft-superapp/id6444355152?referrer=singular_click_id%3Da713aaae-ea8e-4919-882d-a053ad9a8278",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "com.kresus.superapp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.kresus.com/",
+  id: "com.kresus",
+  image_id: "ee242aea-3ffd-4ad8-db88-e29a1ccd2000",
+  mobile: {
+    native: "com.kresus.superapp://",
+    universal: null,
+  },
+  name: "Kresus SuperApp",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.kriptonio/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.kriptonio/index.ts
index df4e304a9e2..e4abb9f4288 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.kriptonio/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.kriptonio/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.kriptonio",
-  name: "Kriptonio",
-  homepage: "https://kriptonio.com",
-  image_id: "331e57d3-d157-4bc3-8ea5-48a03f705e00",
   app: {
-    browser: "https://kriptonio.com",
-    ios: "https://apps.apple.com/hr/app/kriptonio/id6444807361",
     android:
       "https://play.google.com/store/apps/details?id=com.kriptonio.mobile.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://kriptonio.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/hr/app/kriptonio/id6444807361",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "kriptonio://",
-    universal: "https://app.kriptonio.com/mobile",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://kriptonio.com",
   },
+  homepage: "https://kriptonio.com",
+  id: "com.kriptonio",
+  image_id: "331e57d3-d157-4bc3-8ea5-48a03f705e00",
+  mobile: {
+    native: "kriptonio://",
+    universal: "https://app.kriptonio.com/mobile",
+  },
+  name: "Kriptonio",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.kryptogo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.kryptogo/index.ts
index 20b792bbf1d..e7e4f0b34e5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.kryptogo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.kryptogo/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.kryptogo",
-  name: "KryptoGO Wallet",
-  homepage: "https://kryptogo.com/wallet",
-  image_id: "4eb31988-f494-403c-6127-cfcef036ac00",
   app: {
-    browser: "https://kryptogo.com/wallet",
-    ios: "https://apps.apple.com/il/app/kryptogo/id1593830910",
     android:
       "https://play.google.com/store/apps/details?id=com.kryptogo.walletapp",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://kryptogo.com/wallet",
     chrome:
       "https://chrome.google.com/webstore/detail/bgaihnkooadagpjddlcaleaopmkjadfl",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/il/app/kryptogo/id1593830910",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "kryptogo://",
-    universal: "https://kryptogo.page.link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://kryptogo.com/wallet",
   },
+  homepage: "https://kryptogo.com/wallet",
+  id: "com.kryptogo",
+  image_id: "4eb31988-f494-403c-6127-cfcef036ac00",
+  mobile: {
+    native: "kryptogo://",
+    universal: "https://kryptogo.page.link",
+  },
+  name: "KryptoGO Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.kucoin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.kucoin/index.ts
index 480bdb77fe4..5ed785a56ee 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.kucoin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.kucoin/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.kucoin",
-  name: "KuCoin Web3 Wallet",
-  homepage: "https://www.kucoin.com",
-  image_id: "70d8a90b-457b-4c04-4bc3-791e97caab00",
   app: {
-    browser: "https://www.kucoin.com",
-    ios: "https://www.kucoin.com/download",
     android: "https://www.kucoin.com/download",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.kucoin.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://www.kucoin.com/download",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "kucoin:///wallet/walletConnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.kucoin.com",
+  id: "com.kucoin",
+  image_id: "70d8a90b-457b-4c04-4bc3-791e97caab00",
+  mobile: {
+    native: "kucoin:///wallet/walletConnect",
+    universal: null,
+  },
+  name: "KuCoin Web3 Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ledger/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ledger/index.ts
index 2875cc69a5e..d56911cce85 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ledger/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ledger/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ledger",
-  name: "Ledger Live",
-  homepage: "https://www.ledger.com/ledger-live",
-  image_id: "c20e1cec-05e8-4ac6-a086-7ce355092400",
   app: {
-    browser: null,
-    ios: "https://itunes.apple.com/app/id1361671700",
     android: "https://play.google.com/store/apps/details?id=com.ledger.live",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/app/id1361671700",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "ledgerlive://",
     universal: null,
   },
-  desktop: {
+  homepage: "https://www.ledger.com/ledger-live",
+  id: "com.ledger",
+  image_id: "c20e1cec-05e8-4ac6-a086-7ce355092400",
+  mobile: {
     native: "ledgerlive://",
     universal: null,
   },
+  name: "Ledger Live",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.liberawallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.liberawallet/index.ts
index bff7431bfa6..031cb7841e7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.liberawallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.liberawallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.liberawallet",
-  name: "Libera",
-  homepage: "https://liberawallet.com",
-  image_id: "9485d17f-c413-47fe-ebee-a876a9dc9100",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.impactmarket.mobile&&pli=1",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "libera://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://liberawallet.com",
+  id: "com.liberawallet",
+  image_id: "9485d17f-c413-47fe-ebee-a876a9dc9100",
+  mobile: {
+    native: "libera://",
+    universal: null,
+  },
+  name: "Libera",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.lif3/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.lif3/index.ts
index 842e2174f76..ea546db1b47 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.lif3/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.lif3/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.lif3",
-  name: "Lif3 Wallet",
-  homepage: "https://lif3.com/",
-  image_id: "1a89c0ec-9059-4515-afb6-8204d49f0900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/lif3/id6444389674",
     android: "https://play.google.com/store/apps/details?id=com.lif3.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/lif3/id6444389674",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "lif3wallet://walletview",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://lif3.com/",
+  id: "com.lif3",
+  image_id: "1a89c0ec-9059-4515-afb6-8204d49f0900",
+  mobile: {
+    native: "lif3wallet://walletview",
+    universal: null,
+  },
+  name: "Lif3 Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.lootrush/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.lootrush/index.ts
index b46da7d425c..22a82734b9a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.lootrush/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.lootrush/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.lootrush",
-  name: "LootRush",
-  homepage: "https://www.lootrush.com/lootrush-wallet",
-  image_id: "lootrush.svg",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/lootrush-wallet/lfmmjkfllhmfmkcobchabopkcefjkoip",
-    firefox: "https://addons.mozilla.org/en-US/firefox/addon/lootrush-wallet/",
-    safari: null,
     edge: null,
+    firefox: "https://addons.mozilla.org/en-US/firefox/addon/lootrush-wallet/",
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "com.lootrush",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://www.lootrush.com/lootrush-wallet",
+  id: "com.lootrush",
+  image_id: "lootrush.svg",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "LootRush",
+  rdns: "com.lootrush",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.meld.app/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.meld.app/index.ts
index 8fa996b9a63..627e97cdf54 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.meld.app/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.meld.app/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.meld.app",
-  name: "MELDapp",
-  homepage: "https://app.meld.com",
-  image_id: "7946da4c-c8b7-4037-f044-8c3f7f1cb200",
   app: {
-    browser: "https://app.meld.com",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.meld.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.meld.app",
-  mobile: {
-    native: "meld://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.meld.com",
   },
+  homepage: "https://app.meld.com",
+  id: "com.meld.app",
+  image_id: "7946da4c-c8b7-4037-f044-8c3f7f1cb200",
+  mobile: {
+    native: "meld://walletconnect",
+    universal: null,
+  },
+  name: "MELDapp",
+  rdns: "com.meld.app",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.mewwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.mewwallet/index.ts
index 4c619af98e6..f6eef0e64eb 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.mewwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.mewwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.mewwallet",
-  name: "MEW wallet",
-  homepage: "https://mewwallet.com",
-  image_id: "e2024511-2c9b-46d7-3111-52df3d241700",
   app: {
-    browser: "https://download.mewwallet.com/?source=wc",
-    ios: "https://apps.apple.com/app/id1464614025",
     android:
       "https://play.google.com/store/apps/details?id=com.myetherwallet.mewwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://download.mewwallet.com/?source=wc",
     chrome: null,
-    firefox: null,
-    safari: "https://apps.apple.com/app/id1464614025",
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1464614025",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "mewwallet://",
-    universal: "https://mewwallet.com",
+    safari: "https://apps.apple.com/app/id1464614025",
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://download.mewwallet.com/?source=wc",
   },
+  homepage: "https://mewwallet.com",
+  id: "com.mewwallet",
+  image_id: "e2024511-2c9b-46d7-3111-52df3d241700",
+  mobile: {
+    native: "mewwallet://",
+    universal: "https://mewwallet.com",
+  },
+  name: "MEW wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.midoin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.midoin/index.ts
index 28eae88d7b1..687f7505400 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.midoin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.midoin/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.midoin",
-  name: "midoin",
-  homepage: "https://midoin.com",
-  image_id: "9728246c-9504-4b0f-9881-ed848c9fa000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/midoin/id1374974523",
     android: "https://play.google.com/store/apps/details?id=com.midoin",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/midoin/id1374974523",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "midoin://",
-    universal: "https://midoin.app.link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://midoin.com",
+  id: "com.midoin",
+  image_id: "9728246c-9504-4b0f-9881-ed848c9fa000",
+  mobile: {
+    native: "midoin://",
+    universal: "https://midoin.app.link",
+  },
+  name: "midoin",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.monarchwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.monarchwallet/index.ts
index 09910db8bc9..3ace8e49d28 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.monarchwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.monarchwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.monarchwallet",
-  name: "Monarch Wallet",
-  homepage: "https://monarchwallet.com",
-  image_id: "c664d955-8a1e-4460-3917-4cfcf198f000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/monarch-wallet/id1386397997",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/monarch-wallet/id1386397997",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://monarchwallet.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://monarchwallet.com",
+  id: "com.monarchwallet",
+  image_id: "c664d955-8a1e-4460-3917-4cfcf198f000",
+  mobile: {
+    native: null,
+    universal: "https://monarchwallet.com",
+  },
+  name: "Monarch Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.moongate.one/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.moongate.one/index.ts
index e641cb77284..1b2f86cd43c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.moongate.one/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.moongate.one/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.moongate.one",
-  name: "MG",
-  homepage: "https://moongate.one",
-  image_id: "84946308-413c-4191-5414-a325547a5c00",
   app: {
-    browser: "https://wallet.moongate.one/",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet.moongate.one/",
     chrome: "https://wallet.moongate.one/",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.moongate.one",
-  mobile: {
-    native: null,
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.moongate.one/",
   },
+  homepage: "https://moongate.one",
+  id: "com.moongate.one",
+  image_id: "84946308-413c-4191-5414-a325547a5c00",
+  mobile: {
+    native: null,
+    universal: null,
+  },
+  name: "MG",
+  rdns: "com.moongate.one",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.mpcvault.broswerplugin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.mpcvault.broswerplugin/index.ts
index 5b3ae61d1a3..04928002984 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.mpcvault.broswerplugin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.mpcvault.broswerplugin/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.mpcvault.broswerplugin",
-  name: "MPCVault | Team crypto wallet",
-  homepage: "https://mpcvault.com",
-  image_id: "3cbf71ea-c90b-427c-6b2c-a9a7c7c0d500",
   app: {
-    browser: "https://console.mpcvault.com",
-    ios: "https://apps.apple.com/us/app/mpcvault/id1622756458",
     android:
       "https://play.google.com/store/apps/details?id=com.mpcvault.mobileapp.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://console.mpcvault.com",
     chrome:
       "https://chromewebstore.google.com/detail/mpcvault/jgfmfplofjigjfokigdiaiibhonfnedj",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/mpcvault/id1622756458",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.mpcvault.broswerplugin",
-  mobile: {
-    native: "com.mpcvault.mobileapp://wccallback",
-    universal: "https://ulink.mpcvault.com/wccallback",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "com.mpcvault.mobileapp://wccallback",
     universal: "https://console.mpcvault.com",
   },
+  homepage: "https://mpcvault.com",
+  id: "com.mpcvault.broswerplugin",
+  image_id: "3cbf71ea-c90b-427c-6b2c-a9a7c7c0d500",
+  mobile: {
+    native: "com.mpcvault.mobileapp://wccallback",
+    universal: "https://ulink.mpcvault.com/wccallback",
+  },
+  name: "MPCVault | Team crypto wallet",
+  rdns: "com.mpcvault.broswerplugin",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.mtpelerin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.mtpelerin/index.ts
index a1a22e5c595..3e5533ca9da 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.mtpelerin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.mtpelerin/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.mtpelerin",
-  name: "Bridge Wallet",
-  homepage: "https://mtpelerin.com",
-  image_id: "20c3072e-c92e-4902-d4b9-cb2b6ab29100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/bridge-wallet/id1481859680",
     android:
       "https://play.google.com/store/apps/details?id=com.mtpelerin.bridge&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/bridge-wallet/id1481859680",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://bridge.mtpelerin.com/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://mtpelerin.com",
+  id: "com.mtpelerin",
+  image_id: "20c3072e-c92e-4902-d4b9-cb2b6ab29100",
+  mobile: {
+    native: null,
+    universal: "https://bridge.mtpelerin.com/wc",
+  },
+  name: "Bridge Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.neftipedia/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.neftipedia/index.ts
index a82a17c88d6..7cb7f169a5e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.neftipedia/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.neftipedia/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.neftipedia",
-  name: "NeftiWallet",
-  homepage: "https://neftipedia.com/",
-  image_id: "1f812dec-be3d-446c-52f7-a79eb0dd5400",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=com.NEFTiPEDiA.mp",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "nefti://nefti.id/asset/",
-    universal: "https://nefti.id/asset/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://neftipedia.com/",
+  id: "com.neftipedia",
+  image_id: "1f812dec-be3d-446c-52f7-a79eb0dd5400",
+  mobile: {
+    native: "nefti://nefti.id/asset/",
+    universal: "https://nefti.id/asset/",
+  },
+  name: "NeftiWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.neonwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.neonwallet/index.ts
index 31c67fc774a..d85f6820e49 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.neonwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.neonwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.neonwallet",
-  name: "Neon Wallet",
-  homepage: "https://neonwallet.com",
-  image_id: "322bd6f0-09b5-4595-cb15-0dfab8054800",
   app: {
-    browser: "https://neonwallet.com/",
-    ios: "https://apps.apple.com/my/app/neon-wallet-mobile/id1530111452",
     android:
       "https://play.google.com/store/apps/details?id=neo.org.freewallet.app&hl=pt_BR&gl=US",
-    mac: "https://neonwallet.com/",
-    windows: "https://neonwallet.com/",
-    linux: "https://neonwallet.com/",
+    browser: "https://neonwallet.com/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/my/app/neon-wallet-mobile/id1530111452",
+    linux: "https://neonwallet.com/",
+    mac: "https://neonwallet.com/",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "neon://uri=",
-    universal: null,
+    safari: null,
+    windows: "https://neonwallet.com/",
   },
   desktop: {
     native: "neon://uri=",
     universal: "https://neonwallet.com/",
   },
+  homepage: "https://neonwallet.com",
+  id: "com.neonwallet",
+  image_id: "322bd6f0-09b5-4595-cb15-0dfab8054800",
+  mobile: {
+    native: "neon://uri=",
+    universal: null,
+  },
+  name: "Neon Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.nodle/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.nodle/index.ts
index 45afd6abb32..6d5d3dba28f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.nodle/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.nodle/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.nodle",
-  name: "Nodle",
-  homepage: "https://www.nodle.com/products/cash_app",
-  image_id: "39badb5c-adeb-4188-c803-a63a5cffdf00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/nodle-app-to-earn-crypto/id1480763553",
     android: "https://play.google.com/store/apps/details?id=io.nodle.cash",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/nodle-app-to-earn-crypto/id1480763553",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "nodle://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.nodle.com/products/cash_app",
+  id: "com.nodle",
+  image_id: "39badb5c-adeb-4188-c803-a63a5cffdf00",
+  mobile: {
+    native: "nodle://",
+    universal: null,
+  },
+  name: "Nodle",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.nufinetes/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.nufinetes/index.ts
index fec1a1b0c00..a743a6cbdd5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.nufinetes/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.nufinetes/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.nufinetes",
-  name: "Nufinetes",
-  homepage: "https://www.nufinetes.com",
-  image_id: "4bb6c1ca-4196-4ba3-ece2-c3d335e1f800",
   app: {
-    browser: "https://www.nufinetes.com",
-    ios: "https://apps.apple.com/us/app/nufinetes/id1609562349",
     android:
       "https://play.google.com/store/apps/details?id=com.vimworld.wallet",
-    mac: "https://apps.apple.com/us/app/nufinetes-desktop/id1629768725",
-    windows:
-      "https://d3va9f6jgm4z2y.cloudfront.net/nufinetes-prod/Nufinetes_Windows_latest.exe",
-    linux: null,
+    browser: "https://www.nufinetes.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/nufinetes/id1609562349",
+    linux: null,
+    mac: "https://apps.apple.com/us/app/nufinetes-desktop/id1629768725",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "vimwallet://",
-    universal: "https://apple.vimworld.org",
+    safari: null,
+    windows:
+      "https://d3va9f6jgm4z2y.cloudfront.net/nufinetes-prod/Nufinetes_Windows_latest.exe",
   },
   desktop: {
     native: "vimwallet://",
     universal: "https://www.nufinetes.com",
   },
+  homepage: "https://www.nufinetes.com",
+  id: "com.nufinetes",
+  image_id: "4bb6c1ca-4196-4ba3-ece2-c3d335e1f800",
+  mobile: {
+    native: "vimwallet://",
+    universal: "https://apple.vimworld.org",
+  },
+  name: "Nufinetes",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.oasys-wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.oasys-wallet/index.ts
index 52e76c5df1e..dd21a4a9c3c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.oasys-wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.oasys-wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.oasys-wallet",
-  name: "Oasys Passport",
-  homepage: "https://www.oasys-wallet.com/",
-  image_id: "43eb1fb9-e0db-4c9b-d864-4d7fc5abcc00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/jp/app/oasys-passport/id6449960854",
     android:
       "https://play.google.com/store/apps/details?id=com.oasys_wallet.oas_app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/jp/app/oasys-passport/id6449960854",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "oasys-wallet://",
-    universal: "https://www.oasys-wallet.com/wc/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.oasys-wallet.com/",
+  id: "com.oasys-wallet",
+  image_id: "43eb1fb9-e0db-4c9b-d864-4d7fc5abcc00",
+  mobile: {
+    native: "oasys-wallet://",
+    universal: "https://www.oasys-wallet.com/wc/",
+  },
+  name: "Oasys Passport",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.okex.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.okex.wallet/index.ts
index 923ff7e7149..c4597c8ecf9 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.okex.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.okex.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.okex.wallet",
-  name: "OKX Wallet",
-  homepage: "https://www.okx.com/web3",
-  image_id: "b011bd5a-a887-44e2-12b0-39efbd9e5600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/okx-buy-bitcoin-eth-crypto/id1327268470",
     android: "https://play.google.com/store/apps/details?id=com.okinc.okex.gp",
-    mac: "https://www.okx.com/download",
-    windows: "https://www.okx.com/download",
-    linux: "https://www.okx.com/download",
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/okx-wallet/mcohilncbfahbmgdjkbpemcciiolgcge",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/okx-buy-bitcoin-eth-crypto/id1327268470",
+    linux: "https://www.okx.com/download",
+    mac: "https://www.okx.com/download",
     opera: null,
-  },
-  rdns: "com.okex.wallet",
-  mobile: {
-    native: "okex://main",
-    universal: "https://www.okx.com/download",
+    safari: null,
+    windows: "https://www.okx.com/download",
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.okx.com/web3",
+  id: "com.okex.wallet",
+  image_id: "b011bd5a-a887-44e2-12b0-39efbd9e5600",
+  mobile: {
+    native: "okex://main",
+    universal: "https://www.okx.com/download",
+  },
+  name: "OKX Wallet",
+  rdns: "com.okex.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.opera/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.opera/index.ts
index 81515700959..5ffee89b97c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.opera/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.opera/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.opera",
-  name: "Opera Crypto Browser",
-  homepage: "http://opera.com",
-  image_id: "877fa1a4-304d-4d45-ca8e-f76d1a556f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/itunes-u/id1604311726?action=write-review",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "https://www.opera.com/crypto/next",
-    firefox: "https://www.opera.com/crypto/next",
-    safari: "https://www.opera.com/crypto/next",
     edge: "https://www.opera.com/crypto/next",
+    firefox: "https://www.opera.com/crypto/next",
+    ios: "https://apps.apple.com/us/app/itunes-u/id1604311726?action=write-review",
+    linux: null,
+    mac: null,
     opera: "https://www.opera.com/crypto/next",
-  },
-  rdns: null,
-  mobile: {
-    native: "cryptobrowser://",
-    universal: null,
+    safari: "https://www.opera.com/crypto/next",
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "http://opera.com",
+  id: "com.opera",
+  image_id: "877fa1a4-304d-4d45-ca8e-f76d1a556f00",
+  mobile: {
+    native: "cryptobrowser://",
+    universal: null,
+  },
+  name: "Opera Crypto Browser",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.optowallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.optowallet/index.ts
index d59d9dddf7a..8676bac66cb 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.optowallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.optowallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.optowallet",
-  name: "Opto Wallet",
-  homepage: "https://optowallet.com/",
-  image_id: "3df102e4-e435-49dd-d4b1-5ea74ebed500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/opto-wallet/id6443854537",
     android: "https://play.google.com/store/apps/details?id=app.opto.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/opto-wallet/id6443854537",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "opto://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://optowallet.com/",
+  id: "com.optowallet",
+  image_id: "3df102e4-e435-49dd-d4b1-5ea74ebed500",
+  mobile: {
+    native: "opto://",
+    universal: null,
+  },
+  name: "Opto Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.opz/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.opz/index.ts
index 644bd2f33fe..0c020f30cb1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.opz/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.opz/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.opz",
-  name: "OPZ Wallet",
-  homepage: "https://www.opz.com/",
-  image_id: "bb347024-46c1-4be1-dd1f-98e6c51f8600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/opz-crypto-btc-wallet/id6463236757",
     android: "https://play.google.com/store/apps/details?id=com.opz.dev&pli=1",
-    mac: null,
-    windows: null,
-    linux: "https://www.opz.com/apps/",
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/opz-crypto-btc-wallet/id6463236757",
+    linux: "https://www.opz.com/apps/",
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "opz-wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.opz.com/",
+  id: "com.opz",
+  image_id: "bb347024-46c1-4be1-dd1f-98e6c51f8600",
+  mobile: {
+    native: "opz-wallet://",
+    universal: null,
+  },
+  name: "OPZ Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.paliwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.paliwallet/index.ts
index 6fa0ce9cba3..6b2b9071fd8 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.paliwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.paliwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.paliwallet",
-  name: "Pali Wallet",
-  homepage: "https://paliwallet.com",
-  image_id: "4672cbde-0f96-42f3-84a0-524e9ad70a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/pali-wallet-dex-nft-defi/id6447639615",
     android: "https://play.google.com/store/apps/details?id=io.paliwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "https://play.google.com/store/apps/details?id=io.paliwallet",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/pali-wallet-dex-nft-defi/id6447639615",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "paliwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://paliwallet.com",
+  id: "com.paliwallet",
+  image_id: "4672cbde-0f96-42f3-84a0-524e9ad70a00",
+  mobile: {
+    native: "paliwallet://",
+    universal: null,
+  },
+  name: "Pali Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.pandoshi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.pandoshi/index.ts
index 1facf221019..04873057c80 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.pandoshi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.pandoshi/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.pandoshi",
-  name: "Pandoshi Wallet",
-  homepage: "https://pandoshi.com",
-  image_id: "d5be0305-ff38-4412-6089-a94c2e445300",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.pandoshi.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "pandoshiwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://pandoshi.com",
+  id: "com.pandoshi",
+  image_id: "d5be0305-ff38-4412-6089-a94c2e445300",
+  mobile: {
+    native: "pandoshiwallet://",
+    universal: null,
+  },
+  name: "Pandoshi Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.passwallet.app/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.passwallet.app/index.ts
index aa56f5ce050..a8304f36e75 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.passwallet.app/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.passwallet.app/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.passwallet.app",
-  name: "Pass App: Web3 Smart Wallet",
-  homepage: "https://pass.app/",
-  image_id: "fbca9015-a370-4961-d25f-130e302d9600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/il/app/pass-app-web3-smart-wallet/id6670792141",
     android:
       "https://play.google.com/store/apps/details?id=com.passwallet.app&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/il/app/pass-app-web3-smart-wallet/id6670792141",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.passwallet.app",
-  mobile: {
-    native: "passwallet://",
-    universal: "https://pass.app/connect",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://pass.app/",
+  id: "com.passwallet.app",
+  image_id: "fbca9015-a370-4961-d25f-130e302d9600",
+  mobile: {
+    native: "passwallet://",
+    universal: "https://pass.app/connect",
+  },
+  name: "Pass App: Web3 Smart Wallet",
+  rdns: "com.passwallet.app",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.paybolt/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.paybolt/index.ts
index 7d8be5b070a..58310e8788d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.paybolt/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.paybolt/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.paybolt",
-  name: "PayBolt",
-  homepage: "https://www.paybolt.com",
-  image_id: "cc8f4e0c-56a8-465a-6cb6-3e9d60846500",
   app: {
-    browser: "https://www.paybolt.com",
-    ios: "https://apps.apple.com/app/paybolt-crypto/id1599880290",
     android:
       "https://play.google.com/store/apps/details?id=com.fincrypt.paybolt",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.paybolt.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/paybolt-crypto/id1599880290",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "paybolt://Wallet",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://www.paybolt.com",
   },
+  homepage: "https://www.paybolt.com",
+  id: "com.paybolt",
+  image_id: "cc8f4e0c-56a8-465a-6cb6-3e9d60846500",
+  mobile: {
+    native: "paybolt://Wallet",
+    universal: null,
+  },
+  name: "PayBolt",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.payperless/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.payperless/index.ts
index 1f9edd53546..d5baf53e661 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.payperless/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.payperless/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.payperless",
-  name: "Payperless",
-  homepage: "https://payperless.com",
-  image_id: "4a867e30-44c9-4627-6281-33457b8e2100",
   app: {
-    browser: "https://payperless.com",
-    ios: "https://apps.apple.com/us/app/payperless-wallet/id1552741313",
     android:
       "https://play.google.com/store/apps/details?id=com.payperless.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://payperless.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/payperless-wallet/id1552741313",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: " payperless.com://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://payperless.com",
   },
+  homepage: "https://payperless.com",
+  id: "com.payperless",
+  image_id: "4a867e30-44c9-4627-6281-33457b8e2100",
+  mobile: {
+    native: " payperless.com://",
+    universal: null,
+  },
+  name: "Payperless",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.peakdefi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.peakdefi/index.ts
index cc4164bacf8..33ec05f6001 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.peakdefi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.peakdefi/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.peakdefi",
-  name: "PEAKDEFI",
-  homepage: "https://peakdefi.com/",
-  image_id: "918006e2-2f6d-4233-0e72-10c2caaed500",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.peakdefiwallet&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://peakdefi.com/",
+  id: "com.peakdefi",
+  image_id: "918006e2-2f6d-4233-0e72-10c2caaed500",
+  mobile: {
+    native: "wc://",
+    universal: null,
+  },
+  name: "PEAKDEFI",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.pierwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.pierwallet/index.ts
index f4f68e0a881..a42f56d283d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.pierwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.pierwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.pierwallet",
-  name: "pier",
-  homepage: "https://www.pierwallet.com",
-  image_id: "cf3f0da1-40ec-4940-aebe-df075513d100",
   app: {
-    browser: "https://www.pierwallet.com",
-    ios: "https://apps.apple.com/lb/app/id1613187762",
     android: "https://play.google.com/store/apps/details?id=one.nobank.app",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: "https://www.pierwallet.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/lb/app/id1613187762",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://pierwallet.xyz/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://www.pierwallet.com",
   },
+  homepage: "https://www.pierwallet.com",
+  id: "com.pierwallet",
+  image_id: "cf3f0da1-40ec-4940-aebe-df075513d100",
+  mobile: {
+    native: null,
+    universal: "https://pierwallet.xyz/wc",
+  },
+  name: "pier",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.plasma-wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.plasma-wallet/index.ts
index 9305dddbe4d..191cd95e350 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.plasma-wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.plasma-wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.plasma-wallet",
-  name: "Plasma Wallet",
-  homepage: "https://plasma-wallet.com",
-  image_id: "c268e78d-ffb0-4c8b-5cad-04c3add48500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/plasmapay-defi-crypto-wallet/id1461735396",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/plasmapay-defi-crypto-wallet/id1461735396",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "plasmawallet://",
-    universal: "https://plasma-wallet.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://plasma-wallet.com",
+  id: "com.plasma-wallet",
+  image_id: "c268e78d-ffb0-4c8b-5cad-04c3add48500",
+  mobile: {
+    native: "plasmawallet://",
+    universal: "https://plasma-wallet.com",
+  },
+  name: "Plasma Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.poolsmobility.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.poolsmobility.wallet/index.ts
index 63010e8e5a9..7033a2e4161 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.poolsmobility.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.poolsmobility.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.poolsmobility.wallet",
-  name: "poolswallet",
-  homepage: "https://wallet.poolsmobility.com/",
-  image_id: "1bd15c9e-cd7c-48e2-af7d-47fda2236600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/pools-wallet/id6446882533",
     android:
       "https://play.google.com/store/apps/details?id=com.wallet.pools&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/pools-wallet/id6446882533",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "poolswallet://deeplink.poolsmobility.com",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallet.poolsmobility.com/",
+  id: "com.poolsmobility.wallet",
+  image_id: "1bd15c9e-cd7c-48e2-af7d-47fda2236600",
+  mobile: {
+    native: "poolswallet://deeplink.poolsmobility.com",
+    universal: null,
+  },
+  name: "poolswallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.premanft/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.premanft/index.ts
index 0bf5189208e..6a4b2717965 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.premanft/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.premanft/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.premanft",
-  name: "PREMA Wallet",
-  homepage: "https://premanft.com/",
-  image_id: "6487869b-1165-4f30-aa3a-115665be8300",
   app: {
-    browser: "https://premanft.com/",
-    ios: "https://apps.apple.com/us/app/prema%E3%82%A6%E3%82%A9%E3%83%AC%E3%83%83%E3%83%88-%E3%83%9E%E3%83%AB%E3%83%81%E3%83%81%E3%82%A7%E3%83%BC%E3%83%B3%E3%82%A2%E3%83%97%E3%83%AA/id1603556315",
     android:
       "https://play.google.com/store/apps/details?id=co.jp.xcreation.premawallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: "https://premanft.com/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/prema%E3%82%A6%E3%82%A9%E3%83%AC%E3%83%83%E3%83%88-%E3%83%9E%E3%83%AB%E3%83%81%E3%83%81%E3%82%A7%E3%83%BC%E3%83%B3%E3%82%A2%E3%83%97%E3%83%AA/id1603556315",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "premawallet://",
-    universal: "https://premanft.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://premanft.com/",
   },
+  homepage: "https://premanft.com/",
+  id: "com.premanft",
+  image_id: "6487869b-1165-4f30-aa3a-115665be8300",
+  mobile: {
+    native: "premawallet://",
+    universal: "https://premanft.com",
+  },
+  name: "PREMA Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.reown.appkit-lab/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.reown.appkit-lab/index.ts
index 88263ae362d..c47f0791b27 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.reown.appkit-lab/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.reown.appkit-lab/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.reown.appkit-lab",
-  name: "Flutter Sample Wallet",
-  homepage: "https://appkit-lab.reown.com/flutter_walletkit",
-  image_id: "db10ede4-39c3-48ff-f85b-de9b5f17d000",
   app: {
-    browser: null,
-    ios: "https://testflight.apple.com/join/ABbjL9Yu",
     android: "https://appdistribution.firebase.dev/i/86311d3c1caf8ea9",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://testflight.apple.com/join/ABbjL9Yu",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wcflutterwallet-internal://",
-    universal: "https://appkit-lab.reown.com/flutter_walletkit_internal",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "wcflutterwallet://",
     universal: "https://lab.web3modal.com/walletkit_flutter",
   },
+  homepage: "https://appkit-lab.reown.com/flutter_walletkit",
+  id: "com.reown.appkit-lab",
+  image_id: "db10ede4-39c3-48ff-f85b-de9b5f17d000",
+  mobile: {
+    native: "wcflutterwallet-internal://",
+    universal: "https://appkit-lab.reown.com/flutter_walletkit_internal",
+  },
+  name: "Flutter Sample Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.reown.docs/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.reown.docs/index.ts
index 3c0d9174a81..eb5598c3fda 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.reown.docs/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.reown.docs/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.reown.docs",
-  name: "Kotlin Sample Internal Wallet",
-  homepage: "https://docs.reown.com/walletkit/android/installation",
-  image_id: "2e3866ec-a700-48a2-2db8-7c6af6481900",
   app: {
-    browser: null,
-    ios: null,
     android: "https://github.com/reown-com/reown-kotlin",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "kotlin-web3wallet://",
-    universal: "https://appkit-lab.reown.com/wallet_internal",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://docs.reown.com/walletkit/android/installation",
+  id: "com.reown.docs",
+  image_id: "2e3866ec-a700-48a2-2db8-7c6af6481900",
+  mobile: {
+    native: "kotlin-web3wallet://",
+    universal: "https://appkit-lab.reown.com/wallet_internal",
+  },
+  name: "Kotlin Sample Internal Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.reown/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.reown/index.ts
index a31287d6fba..52abbbb2764 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.reown/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.reown/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.reown",
-  name: "React Native Sample Wallet",
-  homepage: "https://reown.com/walletkit",
-  image_id: "78bbcc97-c450-4685-5faa-276ef8fc5f00",
   app: {
-    browser: null,
-    ios: "https://testflight.apple.com/join/kdlGVGLo",
     android: "https://appdistribution.firebase.dev/i/e7711e780547234e",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://testflight.apple.com/join/kdlGVGLo",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "rn-web3wallet-internal://",
-    universal: "https://appkit-lab.reown.com/rn_walletkit_internal",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://reown.com/walletkit",
+  id: "com.reown",
+  image_id: "78bbcc97-c450-4685-5faa-276ef8fc5f00",
+  mobile: {
+    native: "rn-web3wallet-internal://",
+    universal: "https://appkit-lab.reown.com/rn_walletkit_internal",
+  },
+  name: "React Native Sample Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ripio/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ripio/index.ts
index 0c878aca014..fea0a9f87c5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ripio/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ripio/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ripio",
-  name: "Ripio Portal",
-  homepage: "https://ripio.com/portal",
-  image_id: "fd56c695-ce58-4df5-1625-767571c80700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ar/app/ripio-comprar-bitcoin-y-eth/id1221006761",
     android:
       "https://play.google.com/store/apps/details?id=com.ripio.android&hl=en&gl=US",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/ripio-portal/ddamhapapianibkkkcclabgicmpnpdnj",
-    firefox: null,
-    safari: null,
     edge: "https://chrome.google.com/webstore/detail/ripio-portal/ddamhapapianibkkkcclabgicmpnpdnj",
+    firefox: null,
+    ios: "https://apps.apple.com/ar/app/ripio-comprar-bitcoin-y-eth/id1221006761",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ripio://portal",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ripio.com/portal",
+  id: "com.ripio",
+  image_id: "fd56c695-ce58-4df5-1625-767571c80700",
+  mobile: {
+    native: "ripio://portal",
+    universal: null,
+  },
+  name: "Ripio Portal",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.rktechworks/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.rktechworks/index.ts
index 4052754d72d..898f5026015 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.rktechworks/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.rktechworks/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.rktechworks",
-  name: "ID Pocket",
-  homepage: "https://rktechworks.com/idpocket",
-  image_id: "c227ee0a-5127-4707-ded9-c3cd81348d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id-pocket/id1549462128",
     android:
       "https://play.google.com/store/apps/details?id=com.rktechworks.idpocket",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id-pocket/id1549462128",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://rktechworks.com/idpocket",
+  id: "com.rktechworks",
+  image_id: "c227ee0a-5127-4707-ded9-c3cd81348d00",
+  mobile: {
+    native: "wc://",
+    universal: null,
+  },
+  name: "ID Pocket",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.robinhood.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.robinhood.wallet/index.ts
index 0df07af0b68..f415e7b1faa 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.robinhood.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.robinhood.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.robinhood.wallet",
-  name: "Robinhood Wallet",
-  homepage: "https://robinhood.com/web3-wallet/",
-  image_id: "dfe0e3e3-5746-4e2b-12ad-704608531500",
   app: {
-    browser: "https://robinhood.com/web3-wallet/",
-    ios: "https://robinhood.com/web3-wallet/",
     android:
       "https://play.google.com/store/apps/details?id=com.robinhood.gateway",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://robinhood.com/web3-wallet/",
     chrome: "https://robinhood.com/web3-wallet/",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://robinhood.com/web3-wallet/",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.robinhood.wallet",
-  mobile: {
-    native: "robinhood-wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://robinhood.com/web3-wallet/",
+  id: "com.robinhood.wallet",
+  image_id: "dfe0e3e3-5746-4e2b-12ad-704608531500",
+  mobile: {
+    native: "robinhood-wallet://",
+    universal: null,
+  },
+  name: "Robinhood Wallet",
+  rdns: "com.robinhood.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.roninchain.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.roninchain.wallet/index.ts
index 954e6978803..50183e0fb68 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.roninchain.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.roninchain.wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.roninchain.wallet",
-  name: "Ronin Wallet",
-  homepage: "https://wallet.roninchain.com/",
-  image_id: "689f6eb4-0378-41e1-0993-0767400cb600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ronin-wallet/id1592675001",
     android:
       "https://play.google.com/store/apps/details?id=com.skymavis.genesis",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/ronin-wallet/fnjhmkhhmkbjkkabndcnnogagogbneec",
-    firefox: "https://addons.mozilla.org/firefox/addon/ronin-wallet/",
-    safari: null,
     edge: "https://microsoftedge.microsoft.com/addons/detail/ronin-wallet/kjmoohlgokccodicjjfebfomlbljgfhk",
+    firefox: "https://addons.mozilla.org/firefox/addon/ronin-wallet/",
+    ios: "https://apps.apple.com/us/app/ronin-wallet/id1592675001",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.roninchain.wallet",
-  mobile: {
-    native: "roninwallet://",
-    universal: "https://wallet.roninchain.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallet.roninchain.com/",
+  id: "com.roninchain.wallet",
+  image_id: "689f6eb4-0378-41e1-0993-0767400cb600",
+  mobile: {
+    native: "roninwallet://",
+    universal: "https://wallet.roninchain.com",
+  },
+  name: "Ronin Wallet",
+  rdns: "com.roninchain.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.saakuru.app/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.saakuru.app/index.ts
index ea9ff69bb83..7929450ddbd 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.saakuru.app/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.saakuru.app/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.saakuru.app",
-  name: "Saakuru All-in-One crypto App",
-  homepage: "https://app.saakuru.com",
-  image_id: "bb9120f9-9757-4aae-0378-3e4dc2f82100",
   app: {
-    browser: "https://getmeta.one/",
-    ios: "https://apps.apple.com/us/app/saakuru-all-in-one-crypto-app/id1627212812",
     android:
       "https://play.google.com/store/apps/details?id=ventures.aag.metaone",
-    mac: "https://apps.apple.com/lt/app/saakuru-all-in-one-crypto-app/id1627212812",
-    windows: null,
-    linux: null,
+    browser: "https://getmeta.one/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/saakuru-all-in-one-crypto-app/id1627212812",
+    linux: null,
+    mac: "https://apps.apple.com/lt/app/saakuru-all-in-one-crypto-app/id1627212812",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "metaone://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://getmeta.one/",
   },
+  homepage: "https://app.saakuru.com",
+  id: "com.saakuru.app",
+  image_id: "bb9120f9-9757-4aae-0378-3e4dc2f82100",
+  mobile: {
+    native: "metaone://",
+    universal: null,
+  },
+  name: "Saakuru All-in-One crypto App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.sabay.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.sabay.wallet/index.ts
index f6abcf61e0e..f95a04cf4ee 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.sabay.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.sabay.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.sabay.wallet",
-  name: "Sabay Wallet App",
-  homepage: "https://wallet.sabay.com",
-  image_id: "c4df7014-abaf-4016-8180-fb994804b400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kh/app/sabay-wallet/id6449341309",
     android:
       "https://play.google.com/store/apps/details?id=kh.com.sabay.sabaywallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kh/app/sabay-wallet/id6449341309",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "myApp://kh.com.sabay.sabaywallet",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallet.sabay.com",
+  id: "com.sabay.wallet",
+  image_id: "c4df7014-abaf-4016-8180-fb994804b400",
+  mobile: {
+    native: "myApp://kh.com.sabay.sabaywallet",
+    universal: null,
+  },
+  name: "Sabay Wallet App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.safemoon/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.safemoon/index.ts
index bd252f3a469..a51159c68af 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.safemoon/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.safemoon/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.safemoon",
-  name: "SafeMoon",
-  homepage: "https://safemoon.com/",
-  image_id: "ea0140c7-787c-43a4-838f-d5ab6a342000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/safemoon/id1579735495",
     android:
       "https://play.google.com/store/apps/details?id=net.safemoon.androidwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/safemoon/id1579735495",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "safemoon://",
     universal: "https://safemoon.com/wc/wc",
   },
-  desktop: {
+  homepage: "https://safemoon.com/",
+  id: "com.safemoon",
+  image_id: "ea0140c7-787c-43a4-838f-d5ab6a342000",
+  mobile: {
     native: "safemoon://",
     universal: "https://safemoon.com/wc/wc",
   },
+  name: "SafeMoon",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.safepal/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.safepal/index.ts
index f82f0627cf2..3e55c89bd7c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.safepal/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.safepal/index.ts
@@ -2,34 +2,34 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.safepal",
-  name: "SafePal",
-  homepage: "https://safepal.com/",
-  image_id: "4e7d6f52-f663-4fc1-4b88-eebe7fc72800",
   app: {
+    android: "https://play.google.com/store/apps/details?id=io.safepal.wallet",
     browser:
       "https://chrome.google.com/webstore/detail/safepal-extension-wallet/lgmpcpglpngdoalbgeoldeajfclnhafa",
-    ios: "https://apps.apple.com/app/safepal-wallet/id1548297139",
-    android: "https://play.google.com/store/apps/details?id=io.safepal.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
     chrome:
       "https://chrome.google.com/webstore/detail/safepal-extension-wallet/lgmpcpglpngdoalbgeoldeajfclnhafa",
+    edge: "https://microsoftedge.microsoft.com/addons/detail/safepal%E6%8F%92%E4%BB%B6%E9%92%B1%E5%8C%85/apenkfbbpmhihehmihndmmcdanacolnh",
     firefox:
       "https://addons.mozilla.org/firefox/addon/safepal-extension-wallet",
-    safari: null,
-    edge: "https://microsoftedge.microsoft.com/addons/detail/safepal%E6%8F%92%E4%BB%B6%E9%92%B1%E5%8C%85/apenkfbbpmhihehmihndmmcdanacolnh",
+    ios: "https://apps.apple.com/app/safepal-wallet/id1548297139",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "safepalwallet://",
-    universal: "https://link.safepal.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal:
       "https://chrome.google.com/webstore/detail/safepal-extension-wallet/lgmpcpglpngdoalbgeoldeajfclnhafa",
   },
+  homepage: "https://safepal.com/",
+  id: "com.safepal",
+  image_id: "4e7d6f52-f663-4fc1-4b88-eebe7fc72800",
+  mobile: {
+    native: "safepalwallet://",
+    universal: "https://link.safepal.io",
+  },
+  name: "SafePal",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.saitamatoken/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.saitamatoken/index.ts
index fd51b199065..4ba24751bc6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.saitamatoken/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.saitamatoken/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.saitamatoken",
-  name: "SaitaPro",
-  homepage: "https://www.saitamatoken.com/saitapro/",
-  image_id: "fedd85cd-fa5e-4c66-0b05-1ff2ce864e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/saitapro/id1636523777",
     android:
       "https://play.google.com/store/apps/details?id=com.saitapro&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/saitapro/id1636523777",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "SaitaPro://app",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.saitamatoken.com/saitapro/",
+  id: "com.saitamatoken",
+  image_id: "fedd85cd-fa5e-4c66-0b05-1ff2ce864e00",
+  mobile: {
+    native: "SaitaPro://app",
+    universal: null,
+  },
+  name: "SaitaPro",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.scramble/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.scramble/index.ts
index 06a26f291cf..29aa68d0359 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.scramble/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.scramble/index.ts
@@ -2,34 +2,34 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.scramble",
-  name: "Scramble",
-  homepage: "https://scramble-wallet.com",
-  image_id: "c00ef3da-aacb-4c27-66ae-3cb9537a4800",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/scramble-evm-btc-polkadot/dfkkefmblkgnecepjogenokjpagglfhj",
+    edge: "https://chrome.google.com/webstore/detail/scramble-evm-btc-polkadot/dfkkefmblkgnecepjogenokjpagglfhj",
     firefox:
       "https://addons.mozilla.org/en-US/firefox/addon/scramble-multichain-wallet/",
-    safari:
-      "https://apps.apple.com/at/app/scramble-multichain-wallet/id6463812878?mt=12",
-    edge: "https://chrome.google.com/webstore/detail/scramble-evm-btc-polkadot/dfkkefmblkgnecepjogenokjpagglfhj",
+    ios: null,
+    linux: null,
+    mac: null,
     opera:
       "https://chrome.google.com/webstore/detail/scramble-evm-btc-polkadot/dfkkefmblkgnecepjogenokjpagglfhj",
+    safari:
+      "https://apps.apple.com/at/app/scramble-multichain-wallet/id6463812878?mt=12",
+    windows: null,
   },
-  rdns: "com.scramble",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://scramble-wallet.com",
+  id: "com.scramble",
+  image_id: "c00ef3da-aacb-4c27-66ae-3cb9537a4800",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Scramble",
+  rdns: "com.scramble",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.secuxtech/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.secuxtech/index.ts
index bf730b75e67..086c3156bf7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.secuxtech/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.secuxtech/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.secuxtech",
-  name: "SecuX",
-  homepage: "https://secuxtech.com/",
-  image_id: "98183be0-3125-45ee-a6b6-fbd47ebefd00",
   app: {
-    browser: "https://wallet.secuxtech.com/secuxess/#/",
-    ios: "https://apps.apple.com/tw/app/secux-mobile/id1477437607",
     android:
       "https://play.google.com/store/apps/details?id=com.secuxapp&hl=zh_TW&gl=US&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet.secuxtech.com/secuxess/#/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/tw/app/secux-mobile/id1477437607",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "secux://",
-    universal: "https://wsweb.secuxtech.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.secuxtech.com/secuxess/#/",
   },
+  homepage: "https://secuxtech.com/",
+  id: "com.secuxtech",
+  image_id: "98183be0-3125-45ee-a6b6-fbd47ebefd00",
+  mobile: {
+    native: "secux://",
+    universal: "https://wsweb.secuxtech.com",
+  },
+  name: "SecuX",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.shapeshift/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.shapeshift/index.ts
index 30cb6a8be89..f77d63e0e6e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.shapeshift/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.shapeshift/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.shapeshift",
-  name: "ShapeShift",
-  homepage: "https://shapeshift.com",
-  image_id: "957c34b2-7210-475a-0734-689dfcabc400",
   app: {
-    browser: "https://app.shapeshift.com",
-    ios: "https://apps.apple.com/us/app/shapeshift-crypto-platform/id996569075",
     android:
       "https://play.google.com/store/apps/details?id=com.shapeshift.droid_shapeshift&hl=en_US&gl=US&pli=1",
-    mac: "https://apps.apple.com/us/app/shapeshift-crypto-platform/id996569075",
-    windows: null,
-    linux: null,
+    browser: "https://app.shapeshift.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/shapeshift-crypto-platform/id996569075",
+    linux: null,
+    mac: "https://apps.apple.com/us/app/shapeshift-crypto-platform/id996569075",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "shapeshift://",
-    universal: "https://shapeshift.app.link/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.shapeshift.com",
   },
+  homepage: "https://shapeshift.com",
+  id: "com.shapeshift",
+  image_id: "957c34b2-7210-475a-0734-689dfcabc400",
+  mobile: {
+    native: "shapeshift://",
+    universal: "https://shapeshift.app.link/",
+  },
+  name: "ShapeShift",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.sinohope/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.sinohope/index.ts
index a503b2a16ca..d35304d50f8 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.sinohope/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.sinohope/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.sinohope",
-  name: "Sinohope",
-  homepage: "https://www.sinohope.com/",
-  image_id: "06d056b9-aba7-453c-ddaf-a077a448ea00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/sinohope-hotgroup-wallet/id1672956199",
     android:
       "https://play.google.com/store/apps/details?id=com.sinohope.mpcwallet.app",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/sinohope-hotgroup-wallet/id1672956199",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "sinohopeapp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.sinohope.com/",
+  id: "com.sinohope",
+  image_id: "06d056b9-aba7-453c-ddaf-a077a448ea00",
+  mobile: {
+    native: "sinohopeapp://",
+    universal: null,
+  },
+  name: "Sinohope",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.socios.app/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.socios.app/index.ts
index d028041c1e8..8440dde34ef 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.socios.app/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.socios.app/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.socios.app",
-  name: "Socios.com - Wallet & Tokens",
-  homepage: "https://app.socios.com",
-  image_id: "eb55679f-9462-45e2-e0ec-dfb851f9e700",
   app: {
-    browser: "https://app.socios.com",
-    ios: "https://apps.apple.com/app/id1464868277",
     android: "https://play.google.com/store/apps/details?id=com.socios&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.socios.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1464868277",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "socios-mob://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.socios.com",
   },
+  homepage: "https://app.socios.com",
+  id: "com.socios.app",
+  image_id: "eb55679f-9462-45e2-e0ec-dfb851f9e700",
+  mobile: {
+    native: "socios-mob://",
+    universal: null,
+  },
+  name: "Socios.com - Wallet & Tokens",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.tangem/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.tangem/index.ts
index 9c6b56c0ad4..3817f4295ee 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.tangem/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.tangem/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.tangem",
-  name: "Tangem Wallet",
-  homepage: "https://tangem.com",
-  image_id: "80679c6f-bb0b-43d0-83e0-462ac268b600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/uz/app/tangem/id1354868448",
     android: "https://play.google.com/store/apps/details?id=com.tangem.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/uz/app/tangem/id1354868448",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "tangem://",
-    universal: "https://app.tangem.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://tangem.com",
+  id: "com.tangem",
+  image_id: "80679c6f-bb0b-43d0-83e0-462ac268b600",
+  mobile: {
+    native: "tangem://",
+    universal: "https://app.tangem.com",
+  },
+  name: "Tangem Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.tastycrypto/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.tastycrypto/index.ts
index 4533514c554..993372a2354 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.tastycrypto/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.tastycrypto/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.tastycrypto",
-  name: "tastycrypto",
-  homepage: "https://www.tastycrypto.com/",
-  image_id: "357878c9-a195-4102-8f69-55eb2c578700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/tastycrypto-crypto-wallet/id1670102186",
     android:
       "https://play.google.com/store/apps/details?id=com.tastycrypto&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/tastycrypto-crypto-wallet/id1670102186",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "tastycrypto://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.tastycrypto.com/",
+  id: "com.tastycrypto",
+  image_id: "357878c9-a195-4102-8f69-55eb2c578700",
+  mobile: {
+    native: "tastycrypto://",
+    universal: null,
+  },
+  name: "tastycrypto",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.tellaw/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.tellaw/index.ts
index e03e784331d..94057174d10 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.tellaw/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.tellaw/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.tellaw",
-  name: "Tellaw Wallet",
-  homepage: "https://www.tellaw.com/",
-  image_id: "c1cb03f5-e1c2-4c3e-86e1-9a90565ea300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id6446802245",
     android: "https://play.google.com/store/apps/details?id=com.tellaw.tellaw",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id6446802245",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "tellaw://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.tellaw.com/",
+  id: "com.tellaw",
+  image_id: "c1cb03f5-e1c2-4c3e-86e1-9a90565ea300",
+  mobile: {
+    native: "tellaw://walletconnect",
+    universal: null,
+  },
+  name: "Tellaw Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.thirdweb/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.thirdweb/index.ts
index 7d1850288b3..872463985c9 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.thirdweb/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.thirdweb/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.thirdweb",
-  name: "thirdweb",
-  homepage: "https://thirdweb.com",
-  image_id: "c8d820ec-54fb-4c0e-210e-5cbbf92e1000",
   app: {
-    browser: "https://thirdweb.com",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://thirdweb.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://ews.thirdweb.com",
   },
-  desktop: {
+  homepage: "https://thirdweb.com",
+  id: "com.thirdweb",
+  image_id: "c8d820ec-54fb-4c0e-210e-5cbbf92e1000",
+  mobile: {
     native: null,
     universal: "https://ews.thirdweb.com",
   },
+  name: "thirdweb",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.tiduswallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.tiduswallet/index.ts
index fda53133030..4e8f87570fd 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.tiduswallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.tiduswallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.tiduswallet",
-  name: "Tidus Wallet ",
-  homepage: "https://tiduswallet.com/",
-  image_id: "797bd108-d862-4d1b-d339-883de9a75000",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=co.nycrypto.tiduswallet&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "tiduswallet://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://tiduswallet.com/",
+  id: "com.tiduswallet",
+  image_id: "797bd108-d862-4d1b-d339-883de9a75000",
+  mobile: {
+    native: "tiduswallet://walletconnect",
+    universal: null,
+  },
+  name: "Tidus Wallet ",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.tomi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.tomi/index.ts
index 52200035ba2..fe08b37c739 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.tomi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.tomi/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.tomi",
-  name: "tomi Wallet",
-  homepage: "https://tomi.com/wallet",
-  image_id: "e0592a0e-1909-4a73-7955-2dbf9caac200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/tomipay-digital-payment-system/id1643501440",
     android:
       "https://play.google.com/store/apps/details?id=com.tomiapp.production",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/tomipay/feoojlbclclaoifjiedeeenhldlenopl",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/tomipay-digital-payment-system/id1643501440",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "tomiwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://tomi.com/wallet",
+  id: "com.tomi",
+  image_id: "e0592a0e-1909-4a73-7955-2dbf9caac200",
+  mobile: {
+    native: "tomiwallet://",
+    universal: null,
+  },
+  name: "tomi Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.trusteeglobal/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.trusteeglobal/index.ts
index 7ca5238b4de..720d65253b8 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.trusteeglobal/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.trusteeglobal/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.trusteeglobal",
-  name: "Trustee Wallet",
-  homepage: "https://trusteeglobal.com",
-  image_id: "853e6f0a-ccb6-4b7e-e73b-89171a4e0a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/trustee-wallet/id1462924276",
     android: "https://play.google.com/store/apps/details?id=com.trusteewallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/trustee-wallet/id1462924276",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "tw://",
-    universal: "https://trusteeglobal.com/link/Pxxum8Yt",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://trusteeglobal.com",
+  id: "com.trusteeglobal",
+  image_id: "853e6f0a-ccb6-4b7e-e73b-89171a4e0a00",
+  mobile: {
+    native: "tw://",
+    universal: "https://trusteeglobal.com/link/Pxxum8Yt",
+  },
+  name: "Trustee Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.trustwallet.app/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.trustwallet.app/index.ts
index cff395003d1..9126950eb96 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.trustwallet.app/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.trustwallet.app/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.trustwallet.app",
-  name: "Trust Wallet",
-  homepage: "https://trustwallet.com/",
-  image_id: "3386dde1-8b24-48c8-4b81-16979e342000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/apple-store/id1288339409",
     android:
       "https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/trust-wallet/egjidjbpglichdcondbcbdnbeeppgdph",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/apple-store/id1288339409",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.trustwallet.app",
-  mobile: {
-    native: "trust://",
-    universal: "https://link.trustwallet.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://trustwallet.com/",
+  id: "com.trustwallet.app",
+  image_id: "3386dde1-8b24-48c8-4b81-16979e342000",
+  mobile: {
+    native: "trust://",
+    universal: "https://link.trustwallet.com",
+  },
+  name: "Trust Wallet",
+  rdns: "com.trustwallet.app",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.ullapay/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.ullapay/index.ts
index 5bc981ec35e..a714dcc09b8 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.ullapay/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.ullapay/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.ullapay",
-  name: "WOW EARN",
-  homepage: "https://www.ullapay.com/",
-  image_id: "1985a753-7fd8-4d75-4c50-7998ea68a800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id6443434220",
     android:
       "https://play.google.com/store/apps/details?id=com.hxg.wallet&pli=1",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id6443434220",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ullawallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ullapay.com/",
+  id: "com.ullapay",
+  image_id: "1985a753-7fd8-4d75-4c50-7998ea68a800",
+  mobile: {
+    native: "ullawallet://",
+    universal: null,
+  },
+  name: "WOW EARN",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.unitywallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.unitywallet/index.ts
index 40f2398431f..ed9407d5484 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.unitywallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.unitywallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.unitywallet",
-  name: "Unity Wallet",
-  homepage: "https://unitywallet.com",
-  image_id: "09b4aad3-c007-40e7-ec8f-6a62585e6900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/savl-wallet-bitcoin-solana/id1369912925",
     android: "https://play.google.com/store/apps/details?id=com.savl",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/savl-wallet-bitcoin-solana/id1369912925",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "savl://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://unitywallet.com",
+  id: "com.unitywallet",
+  image_id: "09b4aad3-c007-40e7-ec8f-6a62585e6900",
+  mobile: {
+    native: "savl://",
+    universal: null,
+  },
+  name: "Unity Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.unstoppabledomains/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.unstoppabledomains/index.ts
index 403bcbac054..f8f6d4e7125 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.unstoppabledomains/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.unstoppabledomains/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.unstoppabledomains",
-  name: "Unstoppable Domains",
-  homepage: "https://unstoppabledomains.com/",
-  image_id: "4725dda0-4471-4d0f-7adf-6bbe8b929c00",
   app: {
-    browser: "https://unstoppabledomains.com/",
-    ios: "https://apps.apple.com/us/app/unstoppable-domains/id1544748602",
     android:
       "https://play.google.com/store/apps/details?id=com.unstoppabledomains.manager",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://unstoppabledomains.com/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/unstoppable-domains/id1544748602",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "unstoppabledomains://",
-    universal: "https://unstoppabledomains.com/mobile",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://unstoppabledomains.com/",
   },
+  homepage: "https://unstoppabledomains.com/",
+  id: "com.unstoppabledomains",
+  image_id: "4725dda0-4471-4d0f-7adf-6bbe8b929c00",
+  mobile: {
+    native: "unstoppabledomains://",
+    universal: "https://unstoppabledomains.com/mobile",
+  },
+  name: "Unstoppable Domains",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.valoraapp/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.valoraapp/index.ts
index 548e34ea04f..884ba932b67 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.valoraapp/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.valoraapp/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.valoraapp",
-  name: "Valora",
-  homepage: "https://valoraapp.com",
-  image_id: "a03bfa44-ce98-4883-9b2a-75e2b68f5700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id1520414263",
     android: "https://play.google.com/store/apps/details?id=co.clabs.valora",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1520414263",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "celo://wallet",
-    universal: "https://valoraapp.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://valoraapp.com",
+  id: "com.valoraapp",
+  image_id: "a03bfa44-ce98-4883-9b2a-75e2b68f5700",
+  mobile: {
+    native: "celo://wallet",
+    universal: "https://valoraapp.com",
+  },
+  name: "Valora",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.veworld/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.veworld/index.ts
index d9c5ffb6529..14230274354 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.veworld/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.veworld/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.veworld",
-  name: "VeWorld Mobile",
-  homepage: "https://veworld.com",
-  image_id: "afa5084b-02da-4dd4-418b-9f6410e34e00",
   app: {
-    browser: null,
-    ios: "https://www.veworld.com/",
     android: "https://www.veworld.com/",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://www.veworld.com/",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "veworld://org.vechain.veworld.app/",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://veworld.com",
+  id: "com.veworld",
+  image_id: "afa5084b-02da-4dd4-418b-9f6410e34e00",
+  mobile: {
+    native: "veworld://org.vechain.veworld.app/",
+    universal: null,
+  },
+  name: "VeWorld Mobile",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.vgxfoundation/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.vgxfoundation/index.ts
index f81ea9c0464..ec204538f7c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.vgxfoundation/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.vgxfoundation/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.vgxfoundation",
-  name: "VGX Wallet",
-  homepage: "https://vgxfoundation.com/",
-  image_id: "91035734-c365-4341-6835-c056a22cc200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/safemoon/id1579735495",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/safemoon/id1579735495",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "safemoon://",
     universal: "https://safemoon.com/wc/wc",
   },
-  desktop: {
+  homepage: "https://vgxfoundation.com/",
+  id: "com.vgxfoundation",
+  image_id: "91035734-c365-4341-6835-c056a22cc200",
+  mobile: {
     native: "safemoon://",
     universal: "https://safemoon.com/wc/wc",
   },
+  name: "VGX Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.wallet.reown/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.wallet.reown/index.ts
index 10b91eab8b5..4f07efc9dd3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.wallet.reown/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.wallet.reown/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.wallet.reown",
-  name: "Leather",
-  homepage: "https://leather.io/",
-  image_id: "0153454e-9313-4441-b6cf-838e3d023000",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/leather/ldinpeekobnhjjdofggfgjlcehhmanlj",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "com.wallet.reown",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://leather.io/",
+  id: "com.wallet.reown",
+  image_id: "0153454e-9313-4441-b6cf-838e3d023000",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Leather",
+  rdns: "com.wallet.reown",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.walletconnect.com/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.walletconnect.com/index.ts
index 453e6d0d813..f8fc5f06159 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.walletconnect.com/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.walletconnect.com/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.walletconnect.com",
-  name: "SampleW",
-  homepage: "https://walletconnect.com",
-  image_id: "171f0822-acf5-4eba-4392-a2d16db90400",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "https://cloud.walletconnect.com",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.walletconnect.com",
-  mobile: {
-    native: null,
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "sampleW://",
     universal: "https://wallet-connect.sampleW.com",
   },
+  homepage: "https://walletconnect.com",
+  id: "com.walletconnect.com",
+  image_id: "171f0822-acf5-4eba-4392-a2d16db90400",
+  mobile: {
+    native: null,
+    universal: null,
+  },
+  name: "SampleW",
+  rdns: "com.walletconnect.com",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.webauth/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.webauth/index.ts
index 1c59e7ce497..0142c86e1b8 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.webauth/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.webauth/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.webauth",
-  name: "WebAuth",
-  homepage: "https://webauth.com",
-  image_id: "93fcd24e-431d-421f-32c2-9563d725c800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/webauth/id1594500069",
     android:
       "https://play.google.com/store/apps/details?id=com.metallicus.webauth&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/webauth/id1594500069",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "proton://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://webauth.com",
+  id: "com.webauth",
+  image_id: "93fcd24e-431d-421f-32c2-9563d725c800",
+  mobile: {
+    native: "proton://",
+    universal: null,
+  },
+  name: "WebAuth",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.wemix/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.wemix/index.ts
index 6ad1108768f..fadd20147b6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.wemix/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.wemix/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.wemix",
-  name: "WemixWallet",
-  homepage: "https://www.wemix.com/",
-  image_id: "2439d9a4-2c1e-4d29-3bc6-654fc23a4b00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kr/app/wemix-wallet/id1628230003",
     android:
       "https://play.google.com/store/apps/details?id=com.wemixfoundation.wemixwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kr/app/wemix-wallet/id1628230003",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wemixwallet30://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.wemix.com/",
+  id: "com.wemix",
+  image_id: "2439d9a4-2c1e-4d29-3bc6-654fc23a4b00",
+  mobile: {
+    native: "wemixwallet30://",
+    universal: null,
+  },
+  name: "WemixWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.wemixplay/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.wemixplay/index.ts
index aeefd9f724e..390c69a1004 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.wemixplay/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.wemixplay/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.wemixplay",
-  name: "WEMIX Play",
-  homepage: "https://wemixplay.com/",
-  image_id: "3d7b7226-3005-4ace-4a35-d5f67aee2300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id6547834517",
     android:
       "https://play.google.com/store/apps/details?id=com.wemade.wemixplay",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id6547834517",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wpapp://wemixplay.com/",
-    universal: "https://wemixplay.onelink.me/Bq1n/cssdwedi",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wemixplay.com/",
+  id: "com.wemixplay",
+  image_id: "3d7b7226-3005-4ace-4a35-d5f67aee2300",
+  mobile: {
+    native: "wpapp://wemixplay.com/",
+    universal: "https://wemixplay.onelink.me/Bq1n/cssdwedi",
+  },
+  name: "WEMIX Play",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.wigwam.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.wigwam.wallet/index.ts
index 468d5444c01..8fa1f9c3f92 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.wigwam.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.wigwam.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.wigwam.wallet",
-  name: "Wigwam",
-  homepage: "https://wigwam.app",
-  image_id: "6200b005-f202-41d5-7bd9-966c970f6700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id6630381643",
     android: "https://play.google.com/store/apps/details?id=com.wigwamapp",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/wigwam-%E2%80%94-web3-wallet/lccbohhgfkdikahanoclbdmaolidjdfl",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id6630381643",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.wigwam.wallet",
-  mobile: {
-    native: "wigwam://",
-    universal: "https://wigwam.app/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wigwam.app",
+  id: "com.wigwam.wallet",
+  image_id: "6200b005-f202-41d5-7bd9-966c970f6700",
+  mobile: {
+    native: "wigwam://",
+    universal: "https://wigwam.app/",
+  },
+  name: "Wigwam",
+  rdns: "com.wigwam.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.withpaper/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.withpaper/index.ts
index 2666b56f2aa..31f0494fa5c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.withpaper/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.withpaper/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.withpaper",
-  name: "Paper",
-  homepage: "https://withpaper.com",
-  image_id: "37d7a10f-d94d-4a56-c30e-267e8afbd500",
   app: {
-    browser: "https://withpaper.com",
-    ios: null,
     android: null,
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: "https://withpaper.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: "",
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://withpaper.com",
   },
-  desktop: {
+  homepage: "https://withpaper.com",
+  id: "com.withpaper",
+  image_id: "37d7a10f-d94d-4a56-c30e-267e8afbd500",
+  mobile: {
     native: null,
     universal: "https://withpaper.com",
   },
+  name: "Paper",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.x9wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.x9wallet/index.ts
index 447daf7dc40..4f784967c49 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.x9wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.x9wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.x9wallet",
-  name: "X9Wallet",
-  homepage: "https://x9wallet.com",
-  image_id: "f64f7bf8-62ea-4d1e-087b-82d374d04d00",
   app: {
-    browser: null,
-    ios: "https://expo.dev/accounts/teza8899x/projects/x9wallet/updates/d8aa245f-076d-4634-b2ba-e23489b04dde",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://expo.dev/accounts/teza8899x/projects/x9wallet/updates/d8aa245f-076d-4634-b2ba-e23489b04dde",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "x9wallet://a",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://x9wallet.com",
+  id: "com.x9wallet",
+  image_id: "f64f7bf8-62ea-4d1e-087b-82d374d04d00",
+  mobile: {
+    native: "x9wallet://a",
+    universal: null,
+  },
+  name: "X9Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.xcapit/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.xcapit/index.ts
index 26d1b0254b9..4e509ee8d01 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.xcapit/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.xcapit/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.xcapit",
-  name: "Xcapit",
-  homepage: "https://xcapit.com/",
-  image_id: "17f59b75-21b0-4b3f-b024-fe4b9b8d2300",
   app: {
-    browser: "https://app.xcapit.com/",
-    ios: "https://apps.apple.com/ar/app/xcapit/id1545648148",
     android: "https://play.google.com/store/apps/details?id=com.xcapit.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.xcapit.com/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ar/app/xcapit/id1545648148",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://app.xcapit.com/links",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.xcapit.com/",
   },
+  homepage: "https://xcapit.com/",
+  id: "com.xcapit",
+  image_id: "17f59b75-21b0-4b3f-b024-fe4b9b8d2300",
+  mobile: {
+    native: null,
+    universal: "https://app.xcapit.com/links",
+  },
+  name: "Xcapit",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.zengo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.zengo/index.ts
index 31d56b3639b..cb2f154e63e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.zengo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.zengo/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.zengo",
-  name: "Zengo Wallet",
-  homepage: "https://zengo.com/",
-  image_id: "6133c399-ae32-4eba-0c5a-0fb84492bf00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/zengo-crypto-bitcoin-wallet/id1440147115",
     android: "https://play.google.com/store/apps/details?id=com.zengo.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/zengo-crypto-bitcoin-wallet/id1440147115",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "zengo://get.zengo.com/",
-    universal: "https://get.zengo.com/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://zengo.com/",
+  id: "com.zengo",
+  image_id: "6133c399-ae32-4eba-0c5a-0fb84492bf00",
+  mobile: {
+    native: "zengo://get.zengo.com/",
+    universal: "https://get.zengo.com/",
+  },
+  name: "Zengo Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/com.zypto/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/com.zypto/index.ts
index 59040291c94..4923f5e6eb2 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/com.zypto/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/com.zypto/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "com.zypto",
-  name: "Zypto",
-  homepage: "https://zypto.com",
-  image_id: "4f6ae851-7fe6-41ac-5714-3a910b2ff400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/zypto-all-in-one-crypto-wallet/id6463755992",
     android: "https://play.google.com/store/apps/details?id=com.zypto&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/zypto-all-in-one-crypto-wallet/id6463755992",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "com.zypto",
-  mobile: {
-    native: "zypto://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://zypto.com",
+  id: "com.zypto",
+  image_id: "4f6ae851-7fe6-41ac-5714-3a910b2ff400",
+  mobile: {
+    native: "zypto://",
+    universal: null,
+  },
+  name: "Zypto",
+  rdns: "com.zypto",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/dev.auroracloud/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/dev.auroracloud/index.ts
index f1b47a947ba..3e63a258093 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/dev.auroracloud/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/dev.auroracloud/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "dev.auroracloud",
-  name: "Aurora Pass",
-  homepage: "https://auroracloud.dev/pass",
-  image_id: "6d93eeba-edce-431c-4293-e25784e61f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/aurora-pass-web3-wallet/id6447244286",
     android:
       "https://play.google.com/store/apps/details?id=aurora.pass.android.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/aurora-pass-web3-wallet/id6447244286",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "aurora-pass://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://auroracloud.dev/pass",
+  id: "dev.auroracloud",
+  image_id: "6d93eeba-edce-431c-4293-e25784e61f00",
+  mobile: {
+    native: "aurora-pass://",
+    universal: null,
+  },
+  name: "Aurora Pass",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/digital.minerva/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/digital.minerva/index.ts
index 908b8a563cc..11ddd099846 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/digital.minerva/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/digital.minerva/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "digital.minerva",
-  name: "Minerva Wallet",
-  homepage: "https://minerva.digital/",
-  image_id: "b57b2163-1bd8-4f6b-3311-470767e6d200",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=digital.minerva",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "minerva://",
-    universal: "https://minerva.digital",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://minerva.digital/",
+  id: "digital.minerva",
+  image_id: "b57b2163-1bd8-4f6b-3311-470767e6d200",
+  mobile: {
+    native: "minerva://",
+    universal: "https://minerva.digital",
+  },
+  name: "Minerva Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/eu.flashsoft.clear-wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/eu.flashsoft.clear-wallet/index.ts
index 49026a5f97d..dfd9617d90b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/eu.flashsoft.clear-wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/eu.flashsoft.clear-wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "eu.flashsoft.clear-wallet",
-  name: "clear-wallet",
-  homepage: "https://clear-wallet.flashsoft.eu",
-  image_id: "a6d4c2de-1bd9-404f-f3d2-3d2ed9bf5000",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/clear-evm-wallet-clw/djlahdpfkflehaepgohnnodmaajabdlg?hl=en&authuser=0",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "eu.flashsoft.clear-wallet",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://clear-wallet.flashsoft.eu",
+  id: "eu.flashsoft.clear-wallet",
+  image_id: "a6d4c2de-1bd9-404f-f3d2-3d2ed9bf5000",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "clear-wallet",
+  rdns: "eu.flashsoft.clear-wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/fi.dropmate/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/fi.dropmate/index.ts
index e7c9599350d..fee7069f43c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/fi.dropmate/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/fi.dropmate/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "fi.dropmate",
-  name: "Dropmate",
-  homepage: "https://dropmate.fi",
-  image_id: "bf19fe4b-d712-45e8-95f2-b7be36e4c400",
   app: {
-    browser: null,
-    ios: "https://testflight.apple.com/join/KHOMtqE4",
     android: "https://play.google.com/store/apps/details?id=app.dropmate",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://testflight.apple.com/join/KHOMtqE4",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "dropmate://app",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://dropmate.fi",
+  id: "fi.dropmate",
+  image_id: "bf19fe4b-d712-45e8-95f2-b7be36e4c400",
+  mobile: {
+    native: "dropmate://app",
+    universal: null,
+  },
+  name: "Dropmate",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/fi.pillar/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/fi.pillar/index.ts
index 4d1bf8a952d..42e1248760c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/fi.pillar/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/fi.pillar/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "fi.pillar",
-  name: "Pillar",
-  homepage: "https://pillar.fi",
-  image_id: "87737170-f79f-4359-338b-7c30856c9f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/apple-store/id1346582238?pt=118878535&ct=pillar.fi&mt=8",
     android:
       "https://play.google.com/store/apps/details?id=com.pillarproject.wallet&referrer=utm_source%3Dpillar.fi%26utm_medium%3Ddownload%26utm_campaign%3Dandroid",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/apple-store/id1346582238?pt=118878535&ct=pillar.fi&mt=8",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "pillarwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://pillar.fi",
+  id: "fi.pillar",
+  image_id: "87737170-f79f-4359-338b-7c30856c9f00",
+  mobile: {
+    native: "pillarwallet://",
+    universal: null,
+  },
+  name: "Pillar",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/finance.islamicoin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/finance.islamicoin/index.ts
index d56b3c45b98..793d1882684 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/finance.islamicoin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/finance.islamicoin/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "finance.islamicoin",
-  name: "ISLAMIwallet",
-  homepage: "https://islamicoin.finance/islamiwallet",
-  image_id: "8d723c78-28ad-4610-901f-ea391d7e8d00",
   app: {
-    browser: "https://islamiwallet.com",
-    ios: "https://apps.apple.com/lb/app/islamiwallet/id1631212925",
     android: "https://play.google.com/store/apps/details?id=com.islami.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://islamiwallet.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/lb/app/islamiwallet/id1631212925",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "islamiwallet://islami.com/path/",
-    universal: "https://islamicoin.finance/.well-known/assetlinks.json",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://islamiwallet.com",
   },
+  homepage: "https://islamicoin.finance/islamiwallet",
+  id: "finance.islamicoin",
+  image_id: "8d723c78-28ad-4610-901f-ea391d7e8d00",
+  mobile: {
+    native: "islamiwallet://islami.com/path/",
+    universal: "https://islamicoin.finance/.well-known/assetlinks.json",
+  },
+  name: "ISLAMIwallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/finance.openwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/finance.openwallet/index.ts
index ca4d384da86..67e5ce02b35 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/finance.openwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/finance.openwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "finance.openwallet",
-  name: "Open Wallet",
-  homepage: "https://openwallet.finance",
-  image_id: "68a3c433-d944-4bf6-5093-4ac415fd5400",
   app: {
-    browser: "https://openwallet.finance/",
-    ios: "https://apps.apple.com/ee/app/open-wallet-keyless-mastery/id6502636684",
     android:
       "https://play.google.com/store/apps/details?id=com.finverselabs.openwallet&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://openwallet.finance/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ee/app/open-wallet-keyless-mastery/id6502636684",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "x-app-open-wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://openwallet.finance/",
   },
+  homepage: "https://openwallet.finance",
+  id: "finance.openwallet",
+  image_id: "68a3c433-d944-4bf6-5093-4ac415fd5400",
+  mobile: {
+    native: "x-app-open-wallet://",
+    universal: null,
+  },
+  name: "Open Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/finance.panaroma/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/finance.panaroma/index.ts
index 696187a2c34..85b1e597dcb 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/finance.panaroma/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/finance.panaroma/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "finance.panaroma",
-  name: "Panaroma Wallet",
-  homepage: "https://panaroma.finance",
-  image_id: "4394f728-0c57-4560-acba-48bfd82ddf00",
   app: {
-    browser: null,
-    ios: null,
     android: "http://play.google.com/store/apps/details?id=com.panaroma.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "panaromawallet://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://panaroma.finance",
+  id: "finance.panaroma",
+  image_id: "4394f728-0c57-4560-acba-48bfd82ddf00",
+  mobile: {
+    native: "panaromawallet://walletconnect",
+    universal: null,
+  },
+  name: "Panaroma Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/finance.plena/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/finance.plena/index.ts
index eef7f1477c1..6b038092993 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/finance.plena/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/finance.plena/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "finance.plena",
-  name: "Plena-App",
-  homepage: "https://plena.finance",
-  image_id: "9ba07b43-3db1-4e8d-100e-8c91d8430c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/plena-smartest-defi-wallet/id1608061460",
     android: "https://play.google.com/store/apps/details?id=com.plena",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/plena-smartest-defi-wallet/id1608061460",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "com.plena://auth,org.plenafinance.app://auth",
-    universal: "https://plena.page.link/JNPe",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://plena.finance",
+  id: "finance.plena",
+  image_id: "9ba07b43-3db1-4e8d-100e-8c91d8430c00",
+  mobile: {
+    native: "com.plena://auth,org.plenafinance.app://auth",
+    universal: "https://plena.page.link/JNPe",
+  },
+  name: "Plena-App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/finance.porta/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/finance.porta/index.ts
index 64ac988a417..ab70a07984d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/finance.porta/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/finance.porta/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "finance.porta",
-  name: "PortaWallet",
-  homepage: "https://porta.finance",
-  image_id: "07bc52e6-c402-439d-faea-a5736cd25300",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.wallet.porta.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "porta://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://porta.finance",
+  id: "finance.porta",
+  image_id: "07bc52e6-c402-439d-faea-a5736cd25300",
+  mobile: {
+    native: "porta://",
+    universal: null,
+  },
+  name: "PortaWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/finance.slingshot/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/finance.slingshot/index.ts
index 313bd32381b..ce1c1259609 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/finance.slingshot/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/finance.slingshot/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "finance.slingshot",
-  name: "Slingshot Wallet",
-  homepage: "https://slingshot.finance/",
-  image_id: "10c75467-6612-48ad-b97b-63985e922200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/apple-store/id1633406472",
     android:
       "https://play.google.com/store/apps/details?id=com.slingshot.finance",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/apple-store/id1633406472",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "slingshot://",
-    universal: "https://app.slingshot.finance",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://slingshot.finance/",
+  id: "finance.slingshot",
+  image_id: "10c75467-6612-48ad-b97b-63985e922200",
+  mobile: {
+    native: "slingshot://",
+    universal: "https://app.slingshot.finance",
+  },
+  name: "Slingshot Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/finance.soulswap.app/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/finance.soulswap.app/index.ts
index 3aec73c084b..0b43de01350 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/finance.soulswap.app/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/finance.soulswap.app/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "finance.soulswap.app",
-  name: "SoulSwap",
-  homepage: "https://app.soulswap.finance",
-  image_id: "24fc6e6e-a276-4c95-fa77-91ec1097d600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/soulwallet-defi-portal/id6469735252",
     android: null,
-    mac: "https://apps.apple.com/us/app/soulwallet-defi-portal/id6469735252",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "https://apps.apple.com/us/app/soulwallet-defi-portal/id6469735252",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/soulwallet-defi-portal/id6469735252",
+    linux: null,
+    mac: "https://apps.apple.com/us/app/soulwallet-defi-portal/id6469735252",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "soulwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://app.soulswap.finance",
+  id: "finance.soulswap.app",
+  image_id: "24fc6e6e-a276-4c95-fa77-91ec1097d600",
+  mobile: {
+    native: "soulwallet://",
+    universal: null,
+  },
+  name: "SoulSwap",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/finance.voltage/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/finance.voltage/index.ts
index f1a422e4f49..a60cbf4c8de 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/finance.voltage/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/finance.voltage/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "finance.voltage",
-  name: "Volt Wallet",
-  homepage: "https://voltage.finance",
-  image_id: "ffddf01a-337f-45c1-61c9-f6d3dd3d3c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/volt-wallet/id6444159237",
     android:
       "https://play.google.com/store/apps/details?id=finance.voltage.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/volt-wallet/id6444159237",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "volt://",
-    universal: "https://get.voltage.finance",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://voltage.finance",
+  id: "finance.voltage",
+  image_id: "ffddf01a-337f-45c1-61c9-f6d3dd3d3c00",
+  mobile: {
+    native: "volt://",
+    universal: "https://get.voltage.finance",
+  },
+  name: "Volt Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/fun.tobi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/fun.tobi/index.ts
index 5f398598099..5bb27b216ab 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/fun.tobi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/fun.tobi/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "fun.tobi",
-  name: "Tobi",
-  homepage: "https://tobi.fun",
-  image_id: "3cd2d066-56f7-4272-4a98-b39b41ea8200",
   app: {
-    browser: "https://t.me/TobiWalletBot",
-    ios: "https://t.me/TobiWalletBot",
     android: "https://t.me/TobiWalletBot",
-    mac: "https://t.me/TobiWalletBot",
-    windows: null,
-    linux: null,
+    browser: "https://t.me/TobiWalletBot",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://t.me/TobiWalletBot",
+    linux: null,
+    mac: "https://t.me/TobiWalletBot",
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://api.tobiwallet.app/dapp/wallet-connect/redirect",
   },
-  desktop: {
+  homepage: "https://tobi.fun",
+  id: "fun.tobi",
+  image_id: "3cd2d066-56f7-4272-4a98-b39b41ea8200",
+  mobile: {
     native: null,
     universal: "https://api.tobiwallet.app/dapp/wallet-connect/redirect",
   },
+  name: "Tobi",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/gg.indi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/gg.indi/index.ts
index 5a70ab4b0a9..c600ee8940b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/gg.indi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/gg.indi/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "gg.indi",
-  name: "IndiGG",
-  homepage: "https://indi.gg",
-  image_id: "8e90a32f-130d-4317-7294-4884510aa300",
   app: {
-    browser: "https://indi.gg/",
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.indiggcommunity&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://indi.gg/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "indigg://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://indi.gg/",
   },
+  homepage: "https://indi.gg",
+  id: "gg.indi",
+  image_id: "8e90a32f-130d-4317-7294-4884510aa300",
+  mobile: {
+    native: "indigg://walletconnect",
+    universal: null,
+  },
+  name: "IndiGG",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/global.safe/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/global.safe/index.ts
index d4de66964e4..6820abe730c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/global.safe/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/global.safe/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "global.safe",
-  name: "Safe",
-  homepage: "https://safe.global/",
-  image_id: "a578bd45-b418-4111-2c56-8ddcd1417c00",
   app: {
-    browser: "https://app.safe.global/",
-    ios: "https://apps.apple.com/app/id1515759131",
     android: "https://play.google.com/store/apps/details?id=io.gnosis.safe",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.safe.global/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1515759131",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "safe://",
-    universal: "https://app.safe.global/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.safe.global/",
   },
+  homepage: "https://safe.global/",
+  id: "global.safe",
+  image_id: "a578bd45-b418-4111-2c56-8ddcd1417c00",
+  mobile: {
+    native: "safe://",
+    universal: "https://app.safe.global/",
+  },
+  name: "Safe",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/id.co.pintu/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/id.co.pintu/index.ts
index b0874cb61c9..1255446357c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/id.co.pintu/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/id.co.pintu/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "id.co.pintu",
-  name: "Pintu",
-  homepage: "https://pintu.co.id/",
-  image_id: "b9c5dfd6-ca26-46c2-bc79-bc2570495800",
   app: {
-    browser: "https://pintu.co.id/",
-    ios: "https://apps.apple.com/id/app/pintu-buy-invest-crypto/id1494119678",
     android:
       "https://play.google.com/store/apps/details?id=com.valar.pintu&hl=en&gl=US",
-    mac: "https://apps.apple.com/id/app/pintu-buy-invest-crypto/id1494119678",
-    windows: null,
-    linux: null,
+    browser: "https://pintu.co.id/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/id/app/pintu-buy-invest-crypto/id1494119678",
+    linux: null,
+    mac: "https://apps.apple.com/id/app/pintu-buy-invest-crypto/id1494119678",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "pintu://web3wallet",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://pintu.co.id/",
   },
+  homepage: "https://pintu.co.id/",
+  id: "id.co.pintu",
+  image_id: "b9c5dfd6-ca26-46c2-bc79-bc2570495800",
+  mobile: {
+    native: "pintu://web3wallet",
+    universal: null,
+  },
+  name: "Pintu",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/id.competence/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/id.competence/index.ts
index 481fdef5662..447a7a973f3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/id.competence/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/id.competence/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "id.competence",
-  name: "Competence.id",
-  homepage: "https://competence.id",
-  image_id: "ac1de66e-a82c-4cc5-f460-86b640e56500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/competenceid/id6448860364",
     android: "https://play.google.com/store/apps/details?id=id.competence",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/competenceid/id6448860364",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "competenceid://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://competence.id",
+  id: "id.competence",
+  image_id: "ac1de66e-a82c-4cc5-f460-86b640e56500",
+  mobile: {
+    native: "competenceid://",
+    universal: null,
+  },
+  name: "Competence.id",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/id.plumaa/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/id.plumaa/index.ts
index 7e6d4232398..f03209bba2c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/id.plumaa/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/id.plumaa/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "id.plumaa",
-  name: "Plumaa ID",
-  homepage: "https://plumaa.id",
-  image_id: "dd6271ac-f9ba-4580-4db2-484bf4d0fc00",
   app: {
-    browser: "https://app.plumaa.id",
-    ios: "https://apps.apple.com/mx/app/plumaa-id/id6475269207",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.plumaa.id",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/mx/app/plumaa-id/id6475269207",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "plumaa://",
     universal: "https://api.plumaa.id/app/",
   },
-  desktop: {
+  homepage: "https://plumaa.id",
+  id: "id.plumaa",
+  image_id: "dd6271ac-f9ba-4580-4db2-484bf4d0fc00",
+  mobile: {
     native: "plumaa://",
     universal: "https://api.plumaa.id/app/",
   },
+  name: "Plumaa ID",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/im.token/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/im.token/index.ts
index 21bc1f25e84..bdd9afec027 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/im.token/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/im.token/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "im.token",
-  name: "imToken",
-  homepage: "https://token.im/",
-  image_id: "67336675-0daa-489b-6885-cb95234bc400",
   app: {
-    browser: "https://token.im/",
-    ios: "https://apps.apple.com/us/app/imtoken2/id1384798940",
     android: "https://play.google.com/store/apps/details?id=im.token.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://token.im/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/imtoken2/id1384798940",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "imtokenv2://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://token.im/",
   },
+  homepage: "https://token.im/",
+  id: "im.token",
+  image_id: "67336675-0daa-489b-6885-cb95234bc400",
+  mobile: {
+    native: "imtokenv2://",
+    universal: null,
+  },
+  name: "imToken",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/inc.tomo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/inc.tomo/index.ts
index bba58f286f7..2c356e4e99f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/inc.tomo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/inc.tomo/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "inc.tomo",
-  name: "Tomo Wallet",
-  homepage: "https://tomo.inc",
-  image_id: "95c9f957-b1e4-4619-fa7c-a77569d2fe00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/tomo-inc/id6468010287",
     android: "https://play.google.com/store/apps/details?id=tomo.app.unyx",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/tomo-wallet/pfccjkejcgoppjnllalolplgogenfojk",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/tomo-inc/id6468010287",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "inc.tomo",
-  mobile: {
-    native: "tomo://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://tomo.inc",
+  id: "inc.tomo",
+  image_id: "95c9f957-b1e4-4619-fa7c-a77569d2fe00",
+  mobile: {
+    native: "tomo://",
+    universal: null,
+  },
+  name: "Tomo Wallet",
+  rdns: "inc.tomo",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.1inch.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.1inch.wallet/index.ts
index 152b37a762e..d2b5aed009d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.1inch.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.1inch.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.1inch.wallet",
-  name: "1inch Wallet",
-  homepage: "http://wallet.1inch.io",
-  image_id: "6c9f7cd6-c3d7-4b54-6f9d-663fe4b56000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391",
     android: "https://play.google.com/store/apps/details?id=io.oneinch.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "oneinch://",
-    universal: "https://wallet.1inch.io/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "http://wallet.1inch.io",
+  id: "io.1inch.wallet",
+  image_id: "6c9f7cd6-c3d7-4b54-6f9d-663fe4b56000",
+  mobile: {
+    native: "oneinch://",
+    universal: "https://wallet.1inch.io/",
+  },
+  name: "1inch Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.alpha-u.wallet.web/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.alpha-u.wallet.web/index.ts
index be18db2cf6b..4287a5f9055 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.alpha-u.wallet.web/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.alpha-u.wallet.web/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.alpha-u.wallet.web",
-  name: "αU wallet",
-  homepage: "https://web.wallet.alpha-u.io/intro.html",
-  image_id: "40489ba1-6eb0-49a1-a9d4-439fefe52000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/jp/app/%CE%B1u-wallet/id6444401106",
     android: "https://play.google.com/store/apps/details?id=com.kddi.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "nothing",
-    firefox: "nothing",
-    safari: "nothing",
     edge: "nothing",
+    firefox: "nothing",
+    ios: "https://apps.apple.com/jp/app/%CE%B1u-wallet/id6444401106",
+    linux: null,
+    mac: null,
     opera: "nothing",
+    safari: "nothing",
+    windows: null,
   },
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
+  homepage: "https://web.wallet.alpha-u.io/intro.html",
+  id: "io.alpha-u.wallet.web",
+  image_id: "40489ba1-6eb0-49a1-a9d4-439fefe52000",
   mobile: {
     native: "alpha-u-wallet://",
     universal:
       "https://alphauwallet.page.link/?apn=com.kddi.wallet&ibi=com.kddi.wallet&isi=6444401106&link=https://web.wallet.alpha-u.io/intro.html",
   },
-  desktop: {
-    native: null,
-    universal: null,
-  },
+  name: "αU wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.altme/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.altme/index.ts
index 4817f27efb0..25823fd837c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.altme/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.altme/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.altme",
-  name: "Altme",
-  homepage: "https://altme.io/",
-  image_id: "7eeac6e8-6852-4d09-8579-e229fd6b9a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/fr/app/altme/id1633216869",
     android:
       "https://play.google.com/store/apps/details?id=co.altme.alt.me.altme",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/fr/app/altme/id1633216869",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wc-altme://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://altme.io/",
+  id: "io.altme",
+  image_id: "7eeac6e8-6852-4d09-8579-e229fd6b9a00",
+  mobile: {
+    native: "wc-altme://",
+    universal: null,
+  },
+  name: "Altme",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.ancrypto/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.ancrypto/index.ts
index 31590108ddf..84920edd3ef 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.ancrypto/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.ancrypto/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.ancrypto",
-  name: "Ancrypto",
-  homepage: "https://www.ancrypto.io/",
-  image_id: "8dee1c33-b277-4a5a-5ddd-5e70fd9d1800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/in/app/ancrypto/id1660898349",
     android: "https://play.google.com/store/apps/details?id=com.ancryptoWallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/ancrypto/id1660898349",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ancrypto://app",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ancrypto.io/",
+  id: "io.ancrypto",
+  image_id: "8dee1c33-b277-4a5a-5ddd-5e70fd9d1800",
+  mobile: {
+    native: "ancrypto://app",
+    universal: null,
+  },
+  name: "Ancrypto",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.armana.portal/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.armana.portal/index.ts
index e26796deb09..ff75c613170 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.armana.portal/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.armana.portal/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.armana.portal",
-  name: "Armana Portal",
-  homepage: "https://portal.armana.io",
-  image_id: "fe3c264d-b595-437d-e5f9-5e5833dd4300",
   app: {
-    browser: "https://arman.io/mint",
-    ios: "https://apps.apple.com/us/app/armana-portal/id6448726023",
     android: "https://play.google.com/store/apps/details?id=io.armana.portal",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://arman.io/mint",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/armana-portal/id6448726023",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "armanaportal://",
-    universal: "https://portal.armana.io/wc?uri=",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://arman.io/mint",
   },
+  homepage: "https://portal.armana.io",
+  id: "io.armana.portal",
+  image_id: "fe3c264d-b595-437d-e5f9-5e5833dd4300",
+  mobile: {
+    native: "armanaportal://",
+    universal: "https://portal.armana.io/wc?uri=",
+  },
+  name: "Armana Portal",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.atomicwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.atomicwallet/index.ts
index 4b73d49c61a..eb7fce5a781 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.atomicwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.atomicwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.atomicwallet",
-  name: "Atomic Wallet",
-  homepage: "https://atomicwallet.io",
-  image_id: "7eca0311-abf5-4902-43e9-51858403e200",
   app: {
-    browser: "https://atomicwallet.io",
-    ios: "https://apps.apple.com/us/app/atomic-wallet/id1478257827",
     android: "https://play.google.com/store/apps/details?id=io.atomicwallet",
-    mac: "https://atomicwallet.io/downloads",
-    windows: "https://atomicwallet.io/downloads",
-    linux: "https://atomicwallet.io/downloads",
+    browser: "https://atomicwallet.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/atomic-wallet/id1478257827",
+    linux: "https://atomicwallet.io/downloads",
+    mac: "https://atomicwallet.io/downloads",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "atomicwallet://",
-    universal: null,
+    safari: null,
+    windows: "https://atomicwallet.io/downloads",
   },
   desktop: {
     native: "atomicwallet://",
     universal:
       "https://chromewebstore.google.com/detail/atomic-wallet/gjnckgkfmgmibbkoficdidcljeaaaheg",
   },
+  homepage: "https://atomicwallet.io",
+  id: "io.atomicwallet",
+  image_id: "7eca0311-abf5-4902-43e9-51858403e200",
+  mobile: {
+    native: "atomicwallet://",
+    universal: null,
+  },
+  name: "Atomic Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.bharatbox/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.bharatbox/index.ts
index d9e6c82a1e6..4d34be70348 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.bharatbox/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.bharatbox/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.bharatbox",
-  name: "BharatBox App",
-  homepage: "https://bharatbox.io/",
-  image_id: "8bef836e-9d6a-4318-ebda-930c39246300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/bharatbox/id6472478382",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/bharatbox/id6472478382",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bharatbox://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bharatbox.io/",
+  id: "io.bharatbox",
+  image_id: "8bef836e-9d6a-4318-ebda-930c39246300",
+  mobile: {
+    native: "bharatbox://",
+    universal: null,
+  },
+  name: "BharatBox App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.bimwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.bimwallet/index.ts
index b3ba17264f3..0bbc8aa6df4 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.bimwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.bimwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.bimwallet",
-  name: "BIM Wallet",
-  homepage: "https://www.bimwallet.io/",
-  image_id: "dae5a6bb-ac44-4d75-8c25-a361801d3b00",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=io.bimwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bimwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.bimwallet.io/",
+  id: "io.bimwallet",
+  image_id: "dae5a6bb-ac44-4d75-8c25-a361801d3b00",
+  mobile: {
+    native: "bimwallet://",
+    universal: null,
+  },
+  name: "BIM Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.bladewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.bladewallet/index.ts
index 737dfd18f23..518924aec43 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.bladewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.bladewallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.bladewallet",
-  name: "Blade Wallet",
-  homepage: "https://bladewallet.io",
-  image_id: "8fa87652-b043-4992-3a45-78e438d1cd00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/apple-store/id1623849951",
     android:
       "https://play.google.com/store/apps/details?id=org.bladelabs.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/blade-%E2%80%93-hedera-web3-digit/abogmiocnneedmmepnohnhlijcjpcifd",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/apple-store/id1623849951",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "org.bladelabs.bladewallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://welcome.bladewallet.io/",
   },
+  homepage: "https://bladewallet.io",
+  id: "io.bladewallet",
+  image_id: "8fa87652-b043-4992-3a45-78e438d1cd00",
+  mobile: {
+    native: "org.bladelabs.bladewallet://",
+    universal: null,
+  },
+  name: "Blade Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.blocto/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.blocto/index.ts
index b8685b41e85..c6eacde17d7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.blocto/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.blocto/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.blocto",
-  name: "Blocto",
-  homepage: "https://blocto.io/",
-  image_id: "374258d3-c749-4f37-7815-77e61f798c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id1481181682",
     android:
       "https://play.google.com/store/apps/details?id=com.portto.blocto&hl=en&gl=US",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1481181682",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "blocto://",
-    universal: "https://blocto.app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://blocto.io/",
+  id: "io.blocto",
+  image_id: "374258d3-c749-4f37-7815-77e61f798c00",
+  mobile: {
+    native: "blocto://",
+    universal: "https://blocto.app",
+  },
+  name: "Blocto",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.buzz-up/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.buzz-up/index.ts
index 70fd029593a..622deb17005 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.buzz-up/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.buzz-up/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.buzz-up",
-  name: "BUZZUP",
-  homepage: "https://buzz-up.io",
-  image_id: "fb24f0a3-83f5-43e7-2204-25c6348f0000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/6479512180",
     android: "https://play.google.com/store/apps/details?id=io.chainon.lsyim",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/6479512180",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "buzzup://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://buzz-up.io",
+  id: "io.buzz-up",
+  image_id: "fb24f0a3-83f5-43e7-2204-25c6348f0000",
+  mobile: {
+    native: "buzzup://",
+    universal: null,
+  },
+  name: "BUZZUP",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.certhis/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.certhis/index.ts
index adf899e0416..7dfff90c89b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.certhis/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.certhis/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.certhis",
-  name: "Certhis",
-  homepage: "https://certhis.io",
-  image_id: "fbd441cc-e861-46dc-48ae-a04228ddb500",
   app: {
-    browser: "https://explorer.certhis.io",
-    ios: null,
     android: null,
-    mac: "",
-    windows: null,
-    linux: "https://certhis.io/",
+    browser: "https://explorer.certhis.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: "https://certhis.io/",
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://certhis.io/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://certhis.io",
   },
+  homepage: "https://certhis.io",
+  id: "io.certhis",
+  image_id: "fbd441cc-e861-46dc-48ae-a04228ddb500",
+  mobile: {
+    native: null,
+    universal: "https://certhis.io/",
+  },
+  name: "Certhis",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.clingon/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.clingon/index.ts
index 37892b09c4a..f0605ff2190 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.clingon/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.clingon/index.ts
@@ -2,33 +2,33 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.clingon",
-  name: "Cling Wallet",
-  homepage: "https://clingon.io",
-  image_id: "2d8006c3-852b-458a-d6b0-916c5ba76800",
   app: {
-    browser:
-      "https://chrome.google.com/webstore/detail/cling-wallet/kppgpfphbmbcgeglphjnhnhibonmebkn?hl=ko",
-    ios: "https://apps.apple.com/us/app/cling-wallet/id6443952504",
     android:
       "https://play.google.com/store/apps/details?id=com.carrieverse.cling.wallet&hl=en_US&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser:
+      "https://chrome.google.com/webstore/detail/cling-wallet/kppgpfphbmbcgeglphjnhnhibonmebkn?hl=ko",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/cling-wallet/id6443952504",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "cling://",
-    universal: "https://cling.carrieverse.com/apple-app-site-association",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal:
       "https://chrome.google.com/webstore/detail/cling-wallet/kppgpfphbmbcgeglphjnhnhibonmebkn?hl=ko",
   },
+  homepage: "https://clingon.io",
+  id: "io.clingon",
+  image_id: "2d8006c3-852b-458a-d6b0-916c5ba76800",
+  mobile: {
+    native: "cling://",
+    universal: "https://cling.carrieverse.com/apple-app-site-association",
+  },
+  name: "Cling Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.compasswallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.compasswallet/index.ts
index fd5cd7e1acf..c199b989200 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.compasswallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.compasswallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.compasswallet",
-  name: "Compass Wallet",
-  homepage: "https://compasswallet.io/",
-  image_id: "1d7dea00-96be-4ce8-ca15-d14bddbb5000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/compass-wallet-for-sei/id6450257441",
     android:
       "https://play.google.com/store/apps/details?id=io.leapwallet.compass",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/compass-wallet-for-sei/anokgmphncpekkhclmingpimjmcooifb",
-    firefox: null,
-    safari: null,
     edge: "https://chromewebstore.google.com/detail/compass-wallet-for-sei/anokgmphncpekkhclmingpimjmcooifb",
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/compass-wallet-for-sei/id6450257441",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "leapcompass://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://compasswallet.io/",
+  id: "io.compasswallet",
+  image_id: "1d7dea00-96be-4ce8-ca15-d14bddbb5000",
+  mobile: {
+    native: "leapcompass://",
+    universal: null,
+  },
+  name: "Compass Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.copiosa/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.copiosa/index.ts
index 1ec7e9ebc68..1ea3b75ebc9 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.copiosa/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.copiosa/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.copiosa",
-  name: "Copiosa",
-  homepage: "https://copiosa.io",
-  image_id: "cae1be94-9f53-4eba-b915-f6e381d5a500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/gb/app/copiosa-crypto-wallet/id6443951470",
     android:
       "https://play.google.com/store/apps/details?id=io.copiosa.exchange",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/gb/app/copiosa-crypto-wallet/id6443951470",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "copiosa://",
-    universal: "https://copiosa.io/action/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://copiosa.io",
+  id: "io.copiosa",
+  image_id: "cae1be94-9f53-4eba-b915-f6e381d5a500",
+  mobile: {
+    native: "copiosa://",
+    universal: "https://copiosa.io/action/",
+  },
+  name: "Copiosa",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.cosmostation/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.cosmostation/index.ts
index 6c59128ceb4..2be68499f4e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.cosmostation/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.cosmostation/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.cosmostation",
-  name: "Cosmostation",
-  homepage: "https://www.cosmostation.io/",
-  image_id: "ea26c3c8-adb6-4dc4-ee02-35d6eee02800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kr/app/cosmostation/id1459830339",
     android:
       "https://play.google.com/store/apps/details?id=wannabit.io.cosmostaion",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kr/app/cosmostation/id1459830339",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "cosmostation://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.cosmostation.io/",
+  id: "io.cosmostation",
+  image_id: "ea26c3c8-adb6-4dc4-ee02-35d6eee02800",
+  mobile: {
+    native: "cosmostation://",
+    universal: null,
+  },
+  name: "Cosmostation",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.cypherhq/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.cypherhq/index.ts
index 0e7a01d099c..ce3368e5c09 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.cypherhq/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.cypherhq/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.cypherhq",
-  name: "Cypher Wallet",
-  homepage: "https://cypherhq.io",
-  image_id: "7bce0965-a4cc-4aad-6217-009d51017500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/cypherd-wallet/id1604120414",
     android:
       "https://play.google.com/store/apps/details?id=com.cypherd.androidwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/cypher-wallet/niiaamnmgebpeejeemoifgdndgeaekhe",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/cypherd-wallet/id1604120414",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "cypherwallet://",
     universal: null,
   },
-  desktop: {
+  homepage: "https://cypherhq.io",
+  id: "io.cypherhq",
+  image_id: "7bce0965-a4cc-4aad-6217-009d51017500",
+  mobile: {
     native: "cypherwallet://",
     universal: null,
   },
+  name: "Cypher Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.didwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.didwallet/index.ts
index 04de94dbd8f..e33b17689ee 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.didwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.didwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.didwallet",
-  name: "DIDWallet",
-  homepage: "https://www.didwallet.io/",
-  image_id: "bc66fa57-46f4-4e17-6cb7-5f2d9af9c000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id1460083542",
     android:
       "https://play.google.com/store/apps/details?id=com.arcblock.wallet.app.product",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1460083542",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "abt://didwallet.io/i",
-    universal: "https://didwallet.io/i",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.didwallet.io/",
+  id: "io.didwallet",
+  image_id: "bc66fa57-46f4-4e17-6cb7-5f2d9af9c000",
+  mobile: {
+    native: "abt://didwallet.io/i",
+    universal: "https://didwallet.io/i",
+  },
+  name: "DIDWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.dttd/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.dttd/index.ts
index ca04ac0230a..dbddf263a32 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.dttd/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.dttd/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.dttd",
-  name: "DTTD",
-  homepage: "https://www.dttd.io/",
-  image_id: "4a1da9d0-1a81-4e51-4758-b2157f4e6000",
   app: {
-    browser: null,
-    ios: "https://hop.dttd.app/appstoredownload",
     android: "https://hop.dttd.app/googleplaydownload",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://hop.dttd.app/appstoredownload",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "dotted://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.dttd.io/",
+  id: "io.dttd",
+  image_id: "4a1da9d0-1a81-4e51-4758-b2157f4e6000",
+  mobile: {
+    native: "dotted://",
+    universal: null,
+  },
+  name: "DTTD",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.earthwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.earthwallet/index.ts
index 464322b0a9d..fc978541de2 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.earthwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.earthwallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.earthwallet",
-  name: "Earth Wallet",
-  homepage: "https://www.earthwallet.io/",
-  image_id: "d3f724c4-f99b-476f-10f8-12aa4af13800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/earth-wallet/id1638414929",
     android: "https://play.google.com/store/apps/details?id=earth.wallet.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/earth-wallet/agkfnefiabmfpanochlcakggnkdfmmjd",
+    edge: null,
     firefox:
       "https://chrome.google.com/webstore/detail/earth-wallet/agkfnefiabmfpanochlcakggnkdfmmjd",
-    safari: null,
-    edge: null,
+    ios: "https://apps.apple.com/app/earth-wallet/id1638414929",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "earthwallet://",
     universal: "https://wallet.earth",
   },
-  desktop: {
+  homepage: "https://www.earthwallet.io/",
+  id: "io.earthwallet",
+  image_id: "d3f724c4-f99b-476f-10f8-12aa4af13800",
+  mobile: {
     native: "earthwallet://",
     universal: "https://wallet.earth",
   },
+  name: "Earth Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.enjin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.enjin/index.ts
index 7e70ee54178..7602ce53e2c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.enjin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.enjin/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.enjin",
-  name: "Enjin Wallet",
-  homepage: "https://enjin.io/products/wallet",
-  image_id: "add9626b-a5fa-4c12-178c-e5584e6dcd00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/enjin-nft-crypto-wallet/id1349078375",
     android:
       "https://play.google.com/store/apps/details?id=com.enjin.mobile.wallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/enjin-nft-crypto-wallet/id1349078375",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "enjinwallet://",
-    universal: "https://deeplink.wallet.enjin.io/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://enjin.io/products/wallet",
+  id: "io.enjin",
+  image_id: "add9626b-a5fa-4c12-178c-e5584e6dcd00",
+  mobile: {
+    native: "enjinwallet://",
+    universal: "https://deeplink.wallet.enjin.io/",
+  },
+  name: "Enjin Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.ethermail/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.ethermail/index.ts
index 1eaba800dd1..18e47f47d29 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.ethermail/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.ethermail/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.ethermail",
-  name: "EtherMail",
-  homepage: "https://ethermail.io",
-  image_id: "7f3205c6-6051-4cdb-8ef8-84334a7c7f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ethermail/id6451305966",
     android:
       "https://play.google.com/store/apps/details?id=com.ethermail.ethermail_android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ethermail/id6451305966",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ethermail://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ethermail.io",
+  id: "io.ethermail",
+  image_id: "7f3205c6-6051-4cdb-8ef8-84334a7c7f00",
+  mobile: {
+    native: "ethermail://",
+    universal: null,
+  },
+  name: "EtherMail",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.ethos/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.ethos/index.ts
index f439cb07b74..2712e66f18b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.ethos/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.ethos/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.ethos",
-  name: "Ethos Self-Custody Vault",
-  homepage: "https://www.ethos.io/",
-  image_id: "8bc7fb62-6f6b-4473-2e4a-5691a646fc00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ethos-self-custody-vault/id6450948705",
     android:
       "https://play.google.com/store/apps/details?id=com.ethos2.prod&hl=en_US&gl=US&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ethos-self-custody-vault/id6450948705",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "myapp://home",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ethos.io/",
+  id: "io.ethos",
+  image_id: "8bc7fb62-6f6b-4473-2e4a-5691a646fc00",
+  mobile: {
+    native: "myapp://home",
+    universal: null,
+  },
+  name: "Ethos Self-Custody Vault",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.finoa/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.finoa/index.ts
index e7b772013e3..b1c5471d089 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.finoa/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.finoa/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.finoa",
-  name: "FinoaConnect",
-  homepage: "https://app.finoa.io/",
-  image_id: "b7a0c6fe-10bd-423c-6aa5-0637bd2b9900",
   app: {
-    browser: "https://app.finoa.io/",
-    ios: "https://apps.apple.com/us/app/finoa-2fa/id1484058524",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.finoa.io/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/finoa-2fa/id1484058524",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "io.finoa",
-  mobile: {
-    native: null,
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.finoa.io/",
   },
+  homepage: "https://app.finoa.io/",
+  id: "io.finoa",
+  image_id: "b7a0c6fe-10bd-423c-6aa5-0637bd2b9900",
+  mobile: {
+    native: null,
+    universal: null,
+  },
+  name: "FinoaConnect",
+  rdns: "io.finoa",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.fizen/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.fizen/index.ts
index 2774c03e2be..928854b416c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.fizen/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.fizen/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.fizen",
-  name: "Fizen Wallet",
-  homepage: "https://fizen.io",
-  image_id: "1160bfa2-b669-42ba-b224-13edcd40c700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/fizen-wallet/id1621269508",
     android:
       "https://play.google.com/store/apps/details?id=com.fizen.io.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/fizen-wallet/id1621269508",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "fw://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://fizen.io",
+  id: "io.fizen",
+  image_id: "1160bfa2-b669-42ba-b224-13edcd40c700",
+  mobile: {
+    native: "fw://",
+    universal: null,
+  },
+  name: "Fizen Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.getclave/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.getclave/index.ts
index 480f3d89c37..37dbf3dc8c3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.getclave/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.getclave/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.getclave",
-  name: "Clave",
-  homepage: "https://getclave.io",
-  image_id: "f1c538df-15d9-4448-542f-b7b358e95d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/gr/app/clave-smart-wallet/id6449253761",
     android: "https://play.google.com/store/apps/details?id=com.clave.mobile",
-    mac: "https://apps.apple.com/gr/app/clave-smart-wallet/id6449253761",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/gr/app/clave-smart-wallet/id6449253761",
+    linux: null,
+    mac: "https://apps.apple.com/gr/app/clave-smart-wallet/id6449253761",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "clave://link/wc/",
-    universal: "https://getclave.io/link/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "clave://link/wc/",
     universal: "https://getclave.io/link",
   },
+  homepage: "https://getclave.io",
+  id: "io.getclave",
+  image_id: "f1c538df-15d9-4448-542f-b7b358e95d00",
+  mobile: {
+    native: "clave://link/wc/",
+    universal: "https://getclave.io/link/wc",
+  },
+  name: "Clave",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.getjoin.prd/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.getjoin.prd/index.ts
index 99ee60cb632..2058998af0f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.getjoin.prd/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.getjoin.prd/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.getjoin.prd",
-  name: "JOIN MOBILE APP",
-  homepage: "https://getjoin.io",
-  image_id: "bd200406-7b27-452f-bb23-14e22ac47500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/mk/app/join-wallet/id6590635145?uo=2",
     android: "https://play.google.com/store/apps/details?id=io.getjoin.prd",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/mk/app/join-wallet/id6590635145?uo=2",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "io.getjoin.prd",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://getjoin.io",
+  id: "io.getjoin.prd",
+  image_id: "bd200406-7b27-452f-bb23-14e22ac47500",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "JOIN MOBILE APP",
+  rdns: "io.getjoin.prd",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.goldbit/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.goldbit/index.ts
index 80cc734dce3..49e89086e2d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.goldbit/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.goldbit/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.goldbit",
-  name: "GoldBit",
-  homepage: "http://goldbit.io/gbapp.php",
-  image_id: "11974ef1-21ab-4806-a2b1-362c31499900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/tw/app/goldbit錢包/id1551914030",
     android:
       "https://play.google.com/store/apps/details?id=com.goldbitpro.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/tw/app/goldbit錢包/id1551914030",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "goldbit://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "http://goldbit.io/gbapp.php",
+  id: "io.goldbit",
+  image_id: "11974ef1-21ab-4806-a2b1-362c31499900",
+  mobile: {
+    native: "goldbit://",
+    universal: null,
+  },
+  name: "GoldBit",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.guardiianwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.guardiianwallet/index.ts
index 26028a760f8..897094a3406 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.guardiianwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.guardiianwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.guardiianwallet",
-  name: "GUARDIIAN Wallet",
-  homepage: "https://guardiianwallet.io/",
-  image_id: "4f095c1d-8a31-4af8-ab58-57e82a398e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/pk/app/guardiian-wallet/id6478384338",
     android: "https://play.google.com/store/apps/details?id=com.gardianwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/pk/app/guardiian-wallet/id6478384338",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "guardiianwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://guardiianwallet.io/",
+  id: "io.guardiianwallet",
+  image_id: "4f095c1d-8a31-4af8-ab58-57e82a398e00",
+  mobile: {
+    native: "guardiianwallet://",
+    universal: null,
+  },
+  name: "GUARDIIAN Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.harti/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.harti/index.ts
index c7d441fea43..dcb0e11a60e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.harti/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.harti/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.harti",
-  name: "HARTi Wallet",
-  homepage: "https://harti.io/",
-  image_id: "d0407f26-fe0b-4f3c-43c3-69bc8fef2e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/jp/app/harti/id1599921940?l=en",
     android:
       "https://play.google.com/store/apps/details?id=app.harti&hl=ja&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/jp/app/harti/id1599921940?l=en",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "HARTi://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://harti.io/",
+  id: "io.harti",
+  image_id: "d0407f26-fe0b-4f3c-43c3-69bc8fef2e00",
+  mobile: {
+    native: "HARTi://",
+    universal: null,
+  },
+  name: "HARTi Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.helixid/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.helixid/index.ts
index b16bf9d1377..17bc59bcf60 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.helixid/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.helixid/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.helixid",
-  name: "helix id",
-  homepage: "https://helixid.io/",
-  image_id: "4083ef71-8389-4682-ded6-0099236d2e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/de/app/helix-id/id1469238013?l=en",
     android:
       "https://play.google.com/store/apps/details?id=com.io.helix.id&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/de/app/helix-id/id1469238013?l=en",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "helix-id://helix-id.com",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://helixid.io/",
+  id: "io.helixid",
+  image_id: "4083ef71-8389-4682-ded6-0099236d2e00",
+  mobile: {
+    native: "helix-id://helix-id.com",
+    universal: null,
+  },
+  name: "helix id",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.hippowallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.hippowallet/index.ts
index 2f38f984abd..d9c658fa2c6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.hippowallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.hippowallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.hippowallet",
-  name: "Hippo Wallet",
-  homepage: "https://hippowallet.io",
-  image_id: "f9570968-45f7-47c1-3189-98cf60e25c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ae/app/hippo-wallet/id1613041499",
     android:
       "https://play.google.com/store/apps/details?id=com.blockchaincommodities.hippo_wallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/hippo-wallet/hddkffjleepiafmkhcneldjipkfkkofk",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ae/app/hippo-wallet/id1613041499",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "hippowallet://",
-    universal: "https://hippowallet.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://hippowallet.io",
+  id: "io.hippowallet",
+  image_id: "f9570968-45f7-47c1-3189-98cf60e25c00",
+  mobile: {
+    native: "hippowallet://",
+    universal: "https://hippowallet.io",
+  },
+  name: "Hippo Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.huddln/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.huddln/index.ts
index c19124fcc26..6f0b4173f1f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.huddln/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.huddln/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.huddln",
-  name: "Huddln",
-  homepage: "https://www.huddln.io",
-  image_id: "7ba1571c-10c4-4284-b438-04dac27cb700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/huddln-nft-social-network/id1503825604",
     android:
       "https://play.google.com/store/apps/details?id=com.huddln&hl=en_US&gl=US",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/huddln-nft-social-network/id1503825604",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "huddln://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.huddln.io",
+  id: "io.huddln",
+  image_id: "7ba1571c-10c4-4284-b438-04dac27cb700",
+  mobile: {
+    native: "huddln://",
+    universal: null,
+  },
+  name: "Huddln",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.hyperpay/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.hyperpay/index.ts
index 9f567074954..1d93aaa92d4 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.hyperpay/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.hyperpay/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.hyperpay",
-  name: "HyperPay",
-  homepage: "https://www.hyperpay.io/",
-  image_id: "44abbf25-f8c4-4d04-0ce7-a695e00d8e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ae/app/hyperpay-bitcoin-crypto-wallet/id1354755812",
     android:
       "https://play.google.com/store/apps/details?id=com.legendwd.hyperpayW&hl&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ae/app/hyperpay-bitcoin-crypto-wallet/id1354755812",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "hyperPay://",
     universal: null,
   },
-  desktop: {
+  homepage: "https://www.hyperpay.io/",
+  id: "io.hyperpay",
+  image_id: "44abbf25-f8c4-4d04-0ce7-a695e00d8e00",
+  mobile: {
     native: "hyperPay://",
     universal: null,
   },
+  name: "HyperPay",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.internetmoney/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.internetmoney/index.ts
index b0e58b3f3b3..a9f2d3c8b59 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.internetmoney/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.internetmoney/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.internetmoney",
-  name: "Internet Money Wallet",
-  homepage: "https://internetmoney.io",
-  image_id: "204b2240-5ce4-4996-6ec4-f06a22726900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id1641771042",
     android:
       "https://play.google.com/store/apps/details?id=com.internetmoneywallet.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/ckklhkaabbmdjkahiaaplikpdddkenic",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id1641771042",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "internetmoney://",
-    universal: "https://internetmoney.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://internetmoney.io",
   },
+  homepage: "https://internetmoney.io",
+  id: "io.internetmoney",
+  image_id: "204b2240-5ce4-4996-6ec4-f06a22726900",
+  mobile: {
+    native: "internetmoney://",
+    universal: "https://internetmoney.io",
+  },
+  name: "Internet Money Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.kigo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.kigo/index.ts
index 6e308a4b2aa..ae662fb12ed 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.kigo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.kigo/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.kigo",
-  name: "Kigo",
-  homepage: "https://kigo.io",
-  image_id: "ad83d869-de11-4685-2a24-d3ce93a86400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/kigo-digital/id6449599872",
     android: "https://play.google.com/store/apps/details?id=com.augeo.kigo",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/kigo-digital/id6449599872",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "kigo-mobile-app://",
-    universal: "https://kigo-digital.app.link/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://kigo.io",
+  id: "io.kigo",
+  image_id: "ad83d869-de11-4685-2a24-d3ce93a86400",
+  mobile: {
+    native: "kigo-mobile-app://",
+    universal: "https://kigo-digital.app.link/",
+  },
+  name: "Kigo",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.klever/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.klever/index.ts
index 5bf0b0cf3dc..38bd0359021 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.klever/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.klever/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.klever",
-  name: "Klever Wallet",
-  homepage: "https://klever.io/",
-  image_id: "2e181ba3-bf6f-4599-5349-f7409bc62100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/klever-wallet/id1615064243",
     android:
       "https://play.google.com/store/apps/details?id=finance.klever.bitcoin.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/klever-wallet/id1615064243",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "klever-wallet://dp/walletconnect",
-    universal: "https://klever.page.link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://klever.io/",
+  id: "io.klever",
+  image_id: "2e181ba3-bf6f-4599-5349-f7409bc62100",
+  mobile: {
+    native: "klever-wallet://dp/walletconnect",
+    universal: "https://klever.page.link",
+  },
+  name: "Klever Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.koalawallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.koalawallet/index.ts
index 951e54590a2..f5e4bdadefc 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.koalawallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.koalawallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.koalawallet",
-  name: "Koala Wallet",
-  homepage: "https://koalawallet.io/",
-  image_id: "0d222367-ffaf-4402-3873-fdc80e521b00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/koala-wallet/id1627486259",
     android:
       "https://play.google.com/store/apps/details?id=com.eucalyptuslabs.kowallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/koala-wallet/lnnnmfcpbkafcpgdilckhmhbkkbpkmid",
-    firefox: null,
-    safari: null,
     edge: "https://chrome.google.com/webstore/detail/koala-wallet/lnnnmfcpbkafcpgdilckhmhbkkbpkmid",
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/koala-wallet/id1627486259",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "kowallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://koalawallet.io/",
+  id: "io.koalawallet",
+  image_id: "0d222367-ffaf-4402-3873-fdc80e521b00",
+  mobile: {
+    native: "kowallet://",
+    universal: null,
+  },
+  name: "Koala Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.konio/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.konio/index.ts
index 4e7070e46d7..03caa5e4669 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.konio/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.konio/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.konio",
-  name: "Konio",
-  homepage: "https://konio.io",
-  image_id: "305dadb1-395e-4ca8-d4d0-d8ad0cc37000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/konio/id6453561342",
     android: "https://play.google.com/store/apps/details?id=com.adrihoke.konio",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/konio/id6453561342",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "konio://",
-    universal: "https://konio.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://konio.io",
+  id: "io.konio",
+  image_id: "305dadb1-395e-4ca8-d4d0-d8ad0cc37000",
+  mobile: {
+    native: "konio://",
+    universal: "https://konio.io",
+  },
+  name: "Konio",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.kriptomat/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.kriptomat/index.ts
index 60a76f3186d..a916a30b1f9 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.kriptomat/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.kriptomat/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.kriptomat",
-  name: "Kriptomat",
-  homepage: "https://kriptomat.io/web3/",
-  image_id: "774110aa-70f6-4d0c-210f-ab434838fa00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id1440135740",
     android: "https://play.google.com/store/apps/details?id=io.kriptomat.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1440135740",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "kriptomatapp://wallet-connect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://kriptomat.io/web3/",
+  id: "io.kriptomat",
+  image_id: "774110aa-70f6-4d0c-210f-ab434838fa00",
+  mobile: {
+    native: "kriptomatapp://wallet-connect",
+    universal: null,
+  },
+  name: "Kriptomat",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.leapwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.leapwallet/index.ts
index a78debc7fd4..fe9f0727969 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.leapwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.leapwallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.leapwallet",
-  name: "Leap",
-  homepage: "https://leapwallet.io/",
-  image_id: "d64ae9c7-c0be-495d-041e-35c6bb2cc100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/in/app/leap-cosmos/id1642465549/",
     android:
       "https://play.google.com/store/apps/details?id=io.leapwallet.cosmos",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/leap-cosmos-wallet/fcfcfllfndlomdhbehjjcoimbgofdncg",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/leap-cosmos/id1642465549/",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "leapcosmos://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://leapwallet.io/",
+  id: "io.leapwallet",
+  image_id: "d64ae9c7-c0be-495d-041e-35c6bb2cc100",
+  mobile: {
+    native: "leapcosmos://",
+    universal: null,
+  },
+  name: "Leap",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.legacynetwork/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.legacynetwork/index.ts
index 9db639c54a8..63c43fb6e8a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.legacynetwork/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.legacynetwork/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.legacynetwork",
-  name: "Legacy Wallet",
-  homepage: "https://www.legacynetwork.io/",
-  image_id: "ed181b1b-e4c0-4a2e-4a4c-f380a9f13c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/legacy-wallet/id6443578674",
     android:
       "https://play.google.com/store/apps/details?id=io.legacynetwork.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/legacy-wallet/ammjlinfekkoockogfhdkgcohjlbhmff",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/legacy-wallet/id6443578674",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "legacy://network.io",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.legacynetwork.io/",
+  id: "io.legacynetwork",
+  image_id: "ed181b1b-e4c0-4a2e-4a4c-f380a9f13c00",
+  mobile: {
+    native: "legacy://network.io",
+    universal: null,
+  },
+  name: "Legacy Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.legionnetwork/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.legionnetwork/index.ts
index a2db9e9f1da..59153aba4d4 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.legionnetwork/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.legionnetwork/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.legionnetwork",
-  name: "LegionNetwork",
-  homepage: "https://www.legionnetwork.io/",
-  image_id: "26044229-4a61-4b14-a2ed-5413fe435a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/gb/app/legion-network-crypto-superapp/id1602921528",
     android:
       "https://play.google.com/store/apps/details?id=com.legion.production&pcampaignid=web_share",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/gb/app/legion-network-crypto-superapp/id1602921528",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "legionapp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.legionnetwork.io/",
+  id: "io.legionnetwork",
+  image_id: "26044229-4a61-4b14-a2ed-5413fe435a00",
+  mobile: {
+    native: "legionapp://",
+    universal: null,
+  },
+  name: "LegionNetwork",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.loopring.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.loopring.wallet/index.ts
index e678dfa76a0..bc73bd447a6 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.loopring.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.loopring.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.loopring.wallet",
-  name: "Loopring",
-  homepage: "https://loopring.io/",
-  image_id: "2103feda-4fc8-4635-76a7-02a4ed998000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/loopring-smart-wallet/id1550921126",
     android:
       "https://play.google.com/store/apps/details?id=loopring.defi.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/loopring-smart-wallet/id1550921126",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "io.loopring.wallet",
-  mobile: {
-    native: "loopring://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://loopring.io/",
+  id: "io.loopring.wallet",
+  image_id: "2103feda-4fc8-4635-76a7-02a4ed998000",
+  mobile: {
+    native: "loopring://",
+    universal: null,
+  },
+  name: "Loopring",
+  rdns: "io.loopring.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.magiceden.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.magiceden.wallet/index.ts
index ab939197a36..fb3611c6946 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.magiceden.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.magiceden.wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.magiceden.wallet",
-  name: "Magic Eden",
-  homepage: "https://wallet.magiceden.io/",
-  image_id: "62040f22-2ffd-4942-92fc-71ce68c64300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/magic-eden-wallet/id6478631482",
     android:
       "https://play.google.com/store/apps/details?id=com.magiceden.wallet&hl=en_US?utm_source=website&utm_medium=internal&utm_campaign=mobile-wallet-ga&utm_content=button",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/magic-eden-wallet/mkpegjkblkkefacfnmkajcjmabijhclg",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/magic-eden-wallet/id6478631482",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "io.magiceden.wallet",
-  mobile: {
-    native: "magiceden://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallet.magiceden.io/",
+  id: "io.magiceden.wallet",
+  image_id: "62040f22-2ffd-4942-92fc-71ce68c64300",
+  mobile: {
+    native: "magiceden://",
+    universal: null,
+  },
+  name: "Magic Eden",
+  rdns: "io.magiceden.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.metamask/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.metamask/index.ts
index 17d56439a58..ad1bf3b92c1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.metamask/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.metamask/index.ts
@@ -2,34 +2,34 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.metamask",
-  name: "MetaMask",
-  homepage: "https://metamask.io/",
-  image_id: "e30d09fe-c0dd-4b61-81e2-d6dc09eb9700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/metamask/id1438144202",
     android: "https://play.google.com/store/apps/details?id=io.metamask",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn",
-    firefox: "https://addons.mozilla.org/en-US/firefox/addon/ether-metamask/",
-    safari: null,
     edge: "https://microsoftedge.microsoft.com/addons/detail/metamask/ejbalbakoplchlghecdalmeeeajnimhm?hl=en-US",
+    firefox: "https://addons.mozilla.org/en-US/firefox/addon/ether-metamask/",
+    ios: "https://apps.apple.com/us/app/metamask/id1438144202",
+    linux: null,
+    mac: null,
     opera: "https://addons.opera.com/en-gb/extensions/details/metamask-10/",
+    safari: null,
+    windows: null,
   },
-  rdns: "io.metamask",
-  mobile: {
-    native: "metamask://",
-    universal: "https://metamask.app.link",
+  deepLink: {
+    mobile: "https://metamask.app.link/dapp/",
   },
   desktop: {
     native: null,
     universal: null,
   },
-  deepLink: {
-    mobile: "https://metamask.app.link/dapp/",
+  homepage: "https://metamask.io/",
+  id: "io.metamask",
+  image_id: "e30d09fe-c0dd-4b61-81e2-d6dc09eb9700",
+  mobile: {
+    native: "metamask://",
+    universal: "https://metamask.app.link",
   },
+  name: "MetaMask",
+  rdns: "io.metamask",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.miraiapp/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.miraiapp/index.ts
index 46dff16bb96..f401e113aa7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.miraiapp/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.miraiapp/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.miraiapp",
-  name: "Mirai App",
-  homepage: "https://miraiapp.io",
-  image_id: "0c8022b0-d5a3-4561-64d5-a3e60d1ed500",
   app: {
-    browser: "https://miraiapp.io",
-    ios: "https://apps.apple.com/vn/app/mirai-app-mpc-powered-wallet/id6472134236",
     android: "https://play.google.com/store/apps/details?id=co.mirailabs.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://miraiapp.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/vn/app/mirai-app-mpc-powered-wallet/id6472134236",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "miraiapp://",
-    universal: "https://go.miraiapp.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://miraiapp.io",
   },
+  homepage: "https://miraiapp.io",
+  id: "io.miraiapp",
+  image_id: "0c8022b0-d5a3-4561-64d5-a3e60d1ed500",
+  mobile: {
+    native: "miraiapp://",
+    universal: "https://go.miraiapp.io",
+  },
+  name: "Mirai App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.moonstake/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.moonstake/index.ts
index 8350747353e..647d1ddc6c0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.moonstake/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.moonstake/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.moonstake",
-  name: "MOONSTAKE",
-  homepage: "https://moonstake.io",
-  image_id: "22374fae-244c-4224-2e3d-c14912f98a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/moonstake-wallet/id1502532651",
     android:
       "https://play.google.com/store/apps/details?id=io.moonstake.wallet&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/moonstake-wallet/id1502532651",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "moonstake://",
-    universal: "https://moonstake.io/launchApp",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://moonstake.io",
+  id: "io.moonstake",
+  image_id: "22374fae-244c-4224-2e3d-c14912f98a00",
+  mobile: {
+    native: "moonstake://",
+    universal: "https://moonstake.io/launchApp",
+  },
+  name: "MOONSTAKE",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.myabcwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.myabcwallet/index.ts
index 00d18a76f2e..2c3bdae77b2 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.myabcwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.myabcwallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.myabcwallet",
-  name: "ABC Wallet",
-  homepage: "https://myabcwallet.io/",
-  image_id: "e689ea2b-cd49-4a1d-7812-424a0e0d9200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/abc-wallet-safe-web3-wallet/id1642837445",
     android:
       "https://play.google.com/store/apps/details?id=io.myabcwallet.mpc&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/abc-wallet-safe-web3-wallet/id1642837445",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
+  homepage: "https://myabcwallet.io/",
+  id: "io.myabcwallet",
+  image_id: "e689ea2b-cd49-4a1d-7812-424a0e0d9200",
   mobile: {
     native: "abc-wallet://abcwc",
     universal:
       "https://abcwalletconnect.page.link/?apn=io.myabcwallet.mpc&ibi=io.myabcwallet.mpc&isi=1642837445&efr=1&ofl=https://myabcwallet.io/download&link=https://myabcwallet.io",
   },
-  desktop: {
-    native: null,
-    universal: null,
-  },
+  name: "ABC Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.nabox/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.nabox/index.ts
index 9f4b440faeb..fa0c2f24fd5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.nabox/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.nabox/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.nabox",
-  name: "Nabox",
-  homepage: "https://nabox.io/",
-  image_id: "3b75e9f7-2ca8-4a33-ed2b-4e8a0c048d00",
   app: {
+    android: "https://play.google.com/store/apps/details?id=com.wallet.nabox",
     browser:
       "https://chrome.google.com/webstore/detail/nabox-wallet/nknhiehlklippafakaeklbeglecifhad?hl=en",
-    ios: "https://testflight.apple.com/join/Ux18h5Nv",
-    android: "https://play.google.com/store/apps/details?id=com.wallet.nabox",
-    mac: null,
-    windows: null,
-    linux: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://testflight.apple.com/join/Ux18h5Nv",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://nabox.io/app/*",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal:
       "https://chrome.google.com/webstore/detail/nabox-wallet/nknhiehlklippafakaeklbeglecifhad?hl=en",
   },
+  homepage: "https://nabox.io/",
+  id: "io.nabox",
+  image_id: "3b75e9f7-2ca8-4a33-ed2b-4e8a0c048d00",
+  mobile: {
+    native: null,
+    universal: "https://nabox.io/app/*",
+  },
+  name: "Nabox",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.nash/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.nash/index.ts
index ddadf7320d7..d1e4e2ec3cc 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.nash/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.nash/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.nash",
-  name: "Nash",
-  homepage: "https://nash.io",
-  image_id: "65c53de2-05fd-4a62-5f9c-979dcb406c00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/nl/app/nash-spend-save-invest/id1475759236",
     android: "https://play.google.com/store/apps/details?id=io.nash.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/nl/app/nash-spend-save-invest/id1475759236",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "nash://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://nash.io",
+  id: "io.nash",
+  image_id: "65c53de2-05fd-4a62-5f9c-979dcb406c00",
+  mobile: {
+    native: "nash://",
+    universal: null,
+  },
+  name: "Nash",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.neopin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.neopin/index.ts
index 9cf35654a33..266eed1f44d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.neopin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.neopin/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.neopin",
-  name: "NEOPIN",
-  homepage: "https://neopin.io/",
-  image_id: "424c54b5-b786-4c14-871f-61d5c5ded800",
   app: {
-    browser: null,
-    ios: "https://itunes.apple.com/app/id1600381072",
     android:
       "https://play.google.com/store/apps/details?id=com.blockchain.crypto.wallet.neopin",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/app/id1600381072",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "nptwc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://neopin.io/",
+  id: "io.neopin",
+  image_id: "424c54b5-b786-4c14-871f-61d5c5ded800",
+  mobile: {
+    native: "nptwc://",
+    universal: null,
+  },
+  name: "NEOPIN",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.nonbank/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.nonbank/index.ts
index 993d15aeb9a..f7917f6e6ee 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.nonbank/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.nonbank/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.nonbank",
-  name: "NonBank",
-  homepage: "https://nonbank.io/",
-  image_id: "fe06c7ed-3df1-4cc7-9686-c920914abd00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/nonbank-defi-crypto-wallet-app/id6477441479",
     android: "https://play.google.com/store/apps/details?id=io.nonbank",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/nonbank-defi-crypto-wallet-app/id6477441479",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "nonbank://",
-    universal: "https://id.nonbank.io/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://nonbank.io/",
+  id: "io.nonbank",
+  image_id: "fe06c7ed-3df1-4cc7-9686-c920914abd00",
+  mobile: {
+    native: "nonbank://",
+    universal: "https://id.nonbank.io/wc",
+  },
+  name: "NonBank",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.noone/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.noone/index.ts
index e065ec4ef67..1015416a3ae 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.noone/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.noone/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.noone",
-  name: "Noone Wallet",
-  homepage: "https://noone.io/",
-  image_id: "fbae89d3-d6cb-4b98-bd1c-b2007b61ed00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/noone-wallet/id1668333995",
     android:
       "https://play.google.com/store/apps/details?id=io.noone.androidwallet&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/noone-wallet/bgfhmafjampalkbjicjcjiikhlaggdnm",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/noone-wallet/id1668333995",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "crypto.noone.wallet://walletcon",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://noone.io/",
+  id: "io.noone",
+  image_id: "fbae89d3-d6cb-4b98-bd1c-b2007b61ed00",
+  mobile: {
+    native: "crypto.noone.wallet://walletcon",
+    universal: null,
+  },
+  name: "Noone Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.novawallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.novawallet/index.ts
index fb51ac08b6a..50708a8314d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.novawallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.novawallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.novawallet",
-  name: "Nova Wallet",
-  homepage: "https://novawallet.io",
-  image_id: "4f159b10-419b-483a-f2bf-da3d17855e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/nova-polkadot-kusama-wallet/id1597119355",
     android:
       "https://play.google.com/store/apps/details?id=io.novafoundation.nova.market",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/nova-polkadot-kusama-wallet/id1597119355",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "novawallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://novawallet.io",
+  id: "io.novawallet",
+  image_id: "4f159b10-419b-483a-f2bf-da3d17855e00",
+  mobile: {
+    native: "novawallet://",
+    universal: null,
+  },
+  name: "Nova Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.okse/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.okse/index.ts
index 24271347b60..6a0c6fa8ad1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.okse/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.okse/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.okse",
-  name: "Okse Wallet",
-  homepage: "https://okse.io",
-  image_id: "8a1b36d5-7f40-403a-7000-5d30f9181200",
   app: {
-    browser: "https://okse.io",
-    ios: "https://apps.apple.com/us/app/okse-wallet-card/id1555914591",
     android: "https://play.google.com/store/apps/details?id=wallet.okse.io",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://okse.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/okse-wallet-card/id1555914591",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "oksewallet://",
-    universal: "https://okse.io/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://okse.io",
   },
+  homepage: "https://okse.io",
+  id: "io.okse",
+  image_id: "8a1b36d5-7f40-403a-7000-5d30f9181200",
+  mobile: {
+    native: "oksewallet://",
+    universal: "https://okse.io/",
+  },
+  name: "Okse Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.owallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.owallet/index.ts
index aeded1d5cf3..06ec1bfdc6e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.owallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.owallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.owallet",
-  name: "OWallet",
-  homepage: "https://owallet.io",
-  image_id: "68489978-9f79-47f4-fd59-86a29df9bf00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/owallet/id1626035069",
     android: "https://play.google.com/store/apps/details?id=com.io.owallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/owallet/hhejbopdnpbjgomhpmegemnjogflenga",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/owallet/id1626035069",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "owallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://owallet.io",
+  id: "io.owallet",
+  image_id: "68489978-9f79-47f4-fd59-86a29df9bf00",
+  mobile: {
+    native: "owallet://",
+    universal: null,
+  },
+  name: "OWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.oxalus/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.oxalus/index.ts
index 33062b321e2..6dceac25526 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.oxalus/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.oxalus/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.oxalus",
-  name: "Oxalus Wallet",
-  homepage: "https://oxalus.io/wallet",
-  image_id: "a6e22fcb-6b69-45d2-b52d-a4a347a21e00",
   app: {
-    browser: "https://oxalus.io/",
-    ios: "https://apps.apple.com/vn/app/oxalus-wallet/id1620111723",
     android: "https://play.google.com/store/apps/details?id=io.oxalus.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://oxalus.io/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/vn/app/oxalus-wallet/id1620111723",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: "https://oxalus.io/",
+  },
+  homepage: "https://oxalus.io/wallet",
+  id: "io.oxalus",
+  image_id: "a6e22fcb-6b69-45d2-b52d-a4a347a21e00",
   mobile: {
     native: "oxalus://",
     universal:
       "https://oxalus.page.link/?apn=io.oxalus.wallet&isi=1620111723&ibi=io.oxalus.wallet&link=https://deeplink.oxalus.io",
   },
-  desktop: {
-    native: null,
-    universal: "https://oxalus.io/",
-  },
+  name: "Oxalus Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.ozonewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.ozonewallet/index.ts
index 1f57f5cce45..6f085e1723b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.ozonewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.ozonewallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.ozonewallet",
-  name: "OzoneWallet",
-  homepage: "https://ozonewallet.io/",
-  image_id: "4eb57479-515a-463a-9fcb-c20e9cc60c00",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.chiatk.apps.ozone1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "chiawallet://ozonewallet.io",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ozonewallet.io/",
+  id: "io.ozonewallet",
+  image_id: "4eb57479-515a-463a-9fcb-c20e9cc60c00",
+  mobile: {
+    native: "chiawallet://ozonewallet.io",
+    universal: null,
+  },
+  name: "OzoneWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.paraswap/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.paraswap/index.ts
index 03a2b073acd..8af79cbffad 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.paraswap/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.paraswap/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.paraswap",
-  name: "ParaSwap Wallet",
-  homepage: "https://paraswap.io",
-  image_id: "73dc6b30-b644-46e6-020c-5926851df600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/paraswap-multichain-wallet/id1584610690",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/paraswap-multichain-wallet/id1584610690",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "paraswap://",
-    universal: "https://wallet.paraswap.io/#/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://paraswap.io",
+  id: "io.paraswap",
+  image_id: "73dc6b30-b644-46e6-020c-5926851df600",
+  mobile: {
+    native: "paraswap://",
+    universal: "https://wallet.paraswap.io/#/",
+  },
+  name: "ParaSwap Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.passpay/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.passpay/index.ts
index d796a12391c..15bb733fc70 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.passpay/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.passpay/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.passpay",
-  name: "PassPay Wallet",
-  homepage: "https://www.passpay.io/",
-  image_id: "a1c337f5-c156-4ce8-763b-b4cc65f1c200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/US/app/passpay-wallet-nft-%E4%BB%AE%E6%83%B3%E9%80%9A%E8%B2%A8-%E3%82%A6%E3%82%A9%E3%83%AC%E3%83%83%E3%83%88/id1645009398",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/US/app/passpay-wallet-nft-%E4%BB%AE%E6%83%B3%E9%80%9A%E8%B2%A8-%E3%82%A6%E3%82%A9%E3%83%AC%E3%83%83%E3%83%88/id1645009398",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "com.wallet.passpay://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.passpay.io/",
+  id: "io.passpay",
+  image_id: "a1c337f5-c156-4ce8-763b-b4cc65f1c200",
+  mobile: {
+    native: "com.wallet.passpay://",
+    universal: null,
+  },
+  name: "PassPay Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.pitaka/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.pitaka/index.ts
index d2e6f7fc193..03421732ac2 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.pitaka/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.pitaka/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.pitaka",
-  name: "Pitaka",
-  homepage: "https://pitaka.io",
-  image_id: "c816aeae-e0d1-4c52-f37a-efde6df1ee00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ph/app/pitaka-blockchain-wallet/id1644341925",
     android: "https://play.google.com/store/apps/details?id=com.pitakamobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ph/app/pitaka-blockchain-wallet/id1644341925",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "pitaka://",
-    universal: "https://app.pitaka.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://pitaka.io",
+  id: "io.pitaka",
+  image_id: "c816aeae-e0d1-4c52-f37a-efde6df1ee00",
+  mobile: {
+    native: "pitaka://",
+    universal: "https://app.pitaka.io",
+  },
+  name: "Pitaka",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.pltwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.pltwallet/index.ts
index 13cedbe76d9..c4caeac9968 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.pltwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.pltwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.pltwallet",
-  name: "PLTwallet",
-  homepage: "https://pltwallet.io/",
-  image_id: "a5d9dd15-8cef-42de-8bed-09e01a8b0200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/id1581055631",
     android:
       "https://play.google.com/store/apps/details?id=com.palettechain.wallet&hl=ja&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/id1581055631",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "pltwallet://",
-    universal: "https://pltwallet.io/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://pltwallet.io/",
+  id: "io.pltwallet",
+  image_id: "a5d9dd15-8cef-42de-8bed-09e01a8b0200",
+  mobile: {
+    native: "pltwallet://",
+    universal: "https://pltwallet.io/",
+  },
+  name: "PLTwallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.plutope/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.plutope/index.ts
index cead285d57a..5db85cd8895 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.plutope/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.plutope/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.plutope",
-  name: "Plutope",
-  homepage: "https://www.plutope.io/",
-  image_id: "77aab1ef-28e8-4473-b91a-a566fd910900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/in/app/plutope-crypto-wallet/id6466782831",
     android:
       "https://play.google.com/store/apps/details?id=com.app.plutope&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/plutope-crypto-wallet/id6466782831",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "plutope://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.plutope.io/",
+  id: "io.plutope",
+  image_id: "77aab1ef-28e8-4473-b91a-a566fd910900",
+  mobile: {
+    native: "plutope://",
+    universal: null,
+  },
+  name: "Plutope",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.pockie/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.pockie/index.ts
index f4e1b2f5b41..a543dd2a32b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.pockie/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.pockie/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.pockie",
-  name: "pockie",
-  homepage: "https://www.pockie.io/ko",
-  image_id: "a761beae-1e7e-4402-bcc5-a896a92bfb00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kr/app/pockie/id6448715234",
     android:
       "https://play.google.com/store/apps/details?id=com.pilab.pockie&hl=en-KR",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kr/app/pockie/id6448715234",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "pockie://",
-    universal: "https://pockie.app.link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.pockie.io/ko",
+  id: "io.pockie",
+  image_id: "a761beae-1e7e-4402-bcc5-a896a92bfb00",
+  mobile: {
+    native: "pockie://",
+    universal: "https://pockie.app.link",
+  },
+  name: "pockie",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.rabby/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.rabby/index.ts
index ffcad3849f3..6cea751fa55 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.rabby/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.rabby/index.ts
@@ -2,33 +2,33 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.rabby",
-  name: "Rabby",
-  homepage: "https://rabby.io/",
-  image_id: "255e6ba2-8dfd-43ad-e88e-57cbb98f6800",
   app: {
+    android: null,
     browser:
       "https://chrome.google.com/webstore/detail/rabby/acmacodkjbdgmoleebolmdjonilkdbch",
-    ios: null,
-    android: null,
-    mac: null,
-    windows: null,
-    linux: null,
     chrome:
       "https://chrome.google.com/webstore/detail/rabby-wallet/acmacodkjbdgmoleebolmdjonilkdbch",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "io.rabby",
-  mobile: {
-    native: null,
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal:
       "https://chrome.google.com/webstore/detail/rabby/acmacodkjbdgmoleebolmdjonilkdbch",
   },
+  homepage: "https://rabby.io/",
+  id: "io.rabby",
+  image_id: "255e6ba2-8dfd-43ad-e88e-57cbb98f6800",
+  mobile: {
+    native: null,
+    universal: null,
+  },
+  name: "Rabby",
+  rdns: "io.rabby",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.ready/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.ready/index.ts
index d311f6743c9..d8689b4b69e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.ready/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.ready/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.ready",
-  name: "Ready",
-  homepage: "https://ready.io/",
-  image_id: "00ba080d-fb0a-4a31-940e-f75388500500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ready-next-gen-messenger/id1668536401",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ready-next-gen-messenger/id1668536401",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "readywallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ready.io/",
+  id: "io.ready",
+  image_id: "00ba080d-fb0a-4a31-940e-f75388500500",
+  mobile: {
+    native: "readywallet://",
+    universal: null,
+  },
+  name: "Ready",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.ricewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.ricewallet/index.ts
index cb4c3515c85..f63c5ced82b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.ricewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.ricewallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.ricewallet",
-  name: "RiceWallet",
-  homepage: "https://ricewallet.io/",
-  image_id: "df94578e-19be-4f00-258f-2470343e7b00",
   app: {
-    browser: "https://ricewallet.io",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://ricewallet.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ricewallet://",
-    universal: "https://ricewallet.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://ricewallet.io",
   },
+  homepage: "https://ricewallet.io/",
+  id: "io.ricewallet",
+  image_id: "df94578e-19be-4f00-258f-2470343e7b00",
+  mobile: {
+    native: "ricewallet://",
+    universal: "https://ricewallet.io",
+  },
+  name: "RiceWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.safecryptowallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.safecryptowallet/index.ts
index df50fa34344..5291dd2ba32 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.safecryptowallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.safecryptowallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.safecryptowallet",
-  name: "SafeWallet",
-  homepage: "https://safecryptowallet.io",
-  image_id: "c4f43408-612b-4777-c9d6-a022934ce600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/safe-crypto-wallet-blockchain/id6449599259?mt=8&shortlink=4ybm9n4d&c=safe+wallet&pid=clickwebsite&af_xp=custom&source_caller=ui",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/safe-crypto-wallet-blockchain/id6449599259?mt=8&shortlink=4ybm9n4d&c=safe+wallet&pid=clickwebsite&af_xp=custom&source_caller=ui",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "safewallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://safecryptowallet.io",
+  id: "io.safecryptowallet",
+  image_id: "c4f43408-612b-4777-c9d6-a022934ce600",
+  mobile: {
+    native: "safewallet://",
+    universal: null,
+  },
+  name: "SafeWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.safematrix/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.safematrix/index.ts
index 8c76b42677c..8e5fbb9ca0b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.safematrix/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.safematrix/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.safematrix",
-  name: "Safematrix",
-  homepage: "https://safematrix.io/",
-  image_id: "48ea5de9-869a-4994-2402-97afba060900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/sg/app/safematrix/id1613333481",
     android: "https://download.safematrix.io/abm/safematrix.apk",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/sg/app/safematrix/id1613333481",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://safematrix.io/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://safematrix.io/",
+  id: "io.safematrix",
+  image_id: "48ea5de9-869a-4994-2402-97afba060900",
+  mobile: {
+    native: null,
+    universal: "https://safematrix.io/",
+  },
+  name: "Safematrix",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.scramberry/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.scramberry/index.ts
index 7a599de2311..e8a5d36715c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.scramberry/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.scramberry/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.scramberry",
-  name: "ScramberryWallet",
-  homepage: "https://scramberry.io/ja/wallet/",
-  image_id: "2398a924-62b4-4f64-4a59-7ae7a293ce00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/jp/app/scramberry-wallet/id6468808512",
     android:
       "https://play.google.com/store/apps/details?id=io.scramberry.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/jp/app/scramberry-wallet/id6468808512",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "io.scramberry.v7bmfgda1vo42ue385xc://deeplink",
-    universal: "https://link1.bsg.scramberry.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://scramberry.io/ja/wallet/",
+  id: "io.scramberry",
+  image_id: "2398a924-62b4-4f64-4a59-7ae7a293ce00",
+  mobile: {
+    native: "io.scramberry.v7bmfgda1vo42ue385xc://deeplink",
+    universal: "https://link1.bsg.scramberry.io",
+  },
+  name: "ScramberryWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.shido/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.shido/index.ts
index 6f9d4530b4a..f33eaf2fc6e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.shido/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.shido/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.shido",
-  name: "Shido App",
-  homepage: "https://www.shido.io/",
-  image_id: "673b4fdc-8c65-41e0-d0f8-c2eb6c8e5500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/shido-app/id6473452165",
     android:
       "https://play.google.com/store/apps/details?id=com.shido.wallet&hl=en&gl=US&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/shido-app/id6473452165",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "shido://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.shido.io/",
+  id: "io.shido",
+  image_id: "673b4fdc-8c65-41e0-d0f8-c2eb6c8e5500",
+  mobile: {
+    native: "shido://",
+    universal: null,
+  },
+  name: "Shido App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.slavi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.slavi/index.ts
index 8a314045a0f..5dea1ba8dc2 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.slavi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.slavi/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.slavi",
-  name: "Slavi Wallet",
-  homepage: "https://slavi.io/",
-  image_id: "282ce060-0beb-4236-b7b0-1b34cc6c8f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/en/app/slavi-wallet/id1610125496?l=en",
     android:
       "https://play.google.com/store/apps/details?id=com.defiwalletmobile",
-    mac: "https://apps.apple.com/en/app/slavi-wallet/id1610125496?l=en",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/en/app/slavi-wallet/id1610125496?l=en",
+    linux: null,
+    mac: "https://apps.apple.com/en/app/slavi-wallet/id1610125496?l=en",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "slaviwallet://",
-    universal: "https://www.slaviwallet.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://slavi.io/",
+  id: "io.slavi",
+  image_id: "282ce060-0beb-4236-b7b0-1b34cc6c8f00",
+  mobile: {
+    native: "slaviwallet://",
+    universal: "https://www.slaviwallet.io",
+  },
+  name: "Slavi Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.streakk/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.streakk/index.ts
index 4e587c51540..67c5d157052 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.streakk/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.streakk/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.streakk",
-  name: "Streakk Wallet",
-  homepage: "https://streakk.io/",
-  image_id: "45ec6eb9-d7fe-4b9b-6dbf-cc675c5d1d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/in/app/streakk-wallet/id1636671089",
     android: "https://play.google.com/store/apps/details?id=com.streakk",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/streakk-wallet/id1636671089",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "streakk://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://streakk.io/",
+  id: "io.streakk",
+  image_id: "45ec6eb9-d7fe-4b9b-6dbf-cc675c5d1d00",
+  mobile: {
+    native: "streakk://",
+    universal: null,
+  },
+  name: "Streakk Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.summonersarena/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.summonersarena/index.ts
index 74466ef4566..0722d11e54e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.summonersarena/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.summonersarena/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.summonersarena",
-  name: "SA ASSISTANT",
-  homepage: "https://summonersarena.io/",
-  image_id: "7954b508-9ff0-4416-9aba-16209b571000",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.onechain.saas&hl=en-VN",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "saas://success",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://summonersarena.io/",
+  id: "io.summonersarena",
+  image_id: "7954b508-9ff0-4416-9aba-16209b571000",
+  mobile: {
+    native: "saas://success",
+    universal: null,
+  },
+  name: "SA ASSISTANT",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.talken/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.talken/index.ts
index aa84dc28ad0..e2d7e0cd713 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.talken/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.talken/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.talken",
-  name: "Talken Wallet",
-  homepage: "https://talken.io/",
-  image_id: "3c49e8e7-a4d8-4810-23ef-0a0102cce100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kr/app/talken-web3-wallet-nft-suite/id1459475831",
     android: "https://play.google.com/store/search?q=talken&c=apps&hl=en-KR",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kr/app/talken-web3-wallet-nft-suite/id1459475831",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "talken-wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://talken.io/",
+  id: "io.talken",
+  image_id: "3c49e8e7-a4d8-4810-23ef-0a0102cce100",
+  mobile: {
+    native: "talken-wallet://",
+    universal: null,
+  },
+  name: "Talken Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.tokoin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.tokoin/index.ts
index 9aa753be2b2..b539c7e73fd 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.tokoin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.tokoin/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.tokoin",
-  name: "Tokoin | My-T Wallet",
-  homepage: "https://tokoin.io",
-  image_id: "88a2518c-16c2-4ee3-4699-1a1c6903bc00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/my/app/tokow/id1489276175",
     android: "https://play.google.com/store/apps/details?id=com.tokoin.wallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/my/app/tokow/id1489276175",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "mtwallet://app",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://tokoin.io",
+  id: "io.tokoin",
+  image_id: "88a2518c-16c2-4ee3-4699-1a1c6903bc00",
+  mobile: {
+    native: "mtwallet://app",
+    universal: null,
+  },
+  name: "Tokoin | My-T Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.tradestrike/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.tradestrike/index.ts
index a44cd049d6a..1525bbfe5c4 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.tradestrike/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.tradestrike/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.tradestrike",
-  name: "StrikeX Wallet",
-  homepage: "https://tradestrike.io/",
-  image_id: "f81642e4-2355-454a-25f5-72e27f2c6f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/strikex-wallet/id6443517613",
     android: "https://play.google.com/store/apps/details?id=com.tradestrike",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/strikex-wallet/id6443517613",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "strikex://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://tradestrike.io/",
+  id: "io.tradestrike",
+  image_id: "f81642e4-2355-454a-25f5-72e27f2c6f00",
+  mobile: {
+    native: "strikex://",
+    universal: null,
+  },
+  name: "StrikeX Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.transi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.transi/index.ts
index 387ff6ab19d..326c4e3f383 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.transi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.transi/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.transi",
-  name: "Transi",
-  homepage: "https://www.transi.io/",
-  image_id: "a567089d-69d5-47f6-fd99-db47a448ab00",
   app: {
-    browser: "https://www.transi.io/TransiWallet",
-    ios: "https://apps.apple.com/us/app/transi-chat/id1662471884",
     android: "https://www.transi.io/TransiWallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.transi.io/TransiWallet",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/transi-chat/id1662471884",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "transi://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://www.transi.io/TransiWallet",
   },
+  homepage: "https://www.transi.io/",
+  id: "io.transi",
+  image_id: "a567089d-69d5-47f6-fd99-db47a448ab00",
+  mobile: {
+    native: "transi://",
+    universal: null,
+  },
+  name: "Transi",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.trinity-tech/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.trinity-tech/index.ts
index b91252e662e..433a30be78c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.trinity-tech/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.trinity-tech/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.trinity-tech",
-  name: "Essentials",
-  homepage: "https://www.trinity-tech.io/essentials",
-  image_id: "058878f4-7364-4e01-434f-2cc09a15cf00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/elastos-essentials/id1568931743",
     android:
       "https://play.google.com/store/apps/details?id=org.elastos.essentials.app",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/elastos-essentials/id1568931743",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://essentials.web3essentials.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.trinity-tech.io/essentials",
+  id: "io.trinity-tech",
+  image_id: "058878f4-7364-4e01-434f-2cc09a15cf00",
+  mobile: {
+    native: null,
+    universal: "https://essentials.web3essentials.io",
+  },
+  name: "Essentials",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.trustasset/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.trustasset/index.ts
index 4d8dc4041b0..7f90946566a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.trustasset/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.trustasset/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.trustasset",
-  name: "Trust Asset Wallet",
-  homepage: "https://trustasset.io/",
-  image_id: "f64fabc5-1e3f-4ad4-7362-747abd1bc000",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=com.trustassetapp&hl=en_IN&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "trustassetapp://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://trustasset.io/",
+  id: "io.trustasset",
+  image_id: "f64fabc5-1e3f-4ad4-7362-747abd1bc000",
+  mobile: {
+    native: "trustassetapp://walletconnect",
+    universal: null,
+  },
+  name: "Trust Asset Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.ttmwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.ttmwallet/index.ts
index ce3cb6c870f..0684e6881ac 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.ttmwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.ttmwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.ttmwallet",
-  name: "MDAO Wallet",
-  homepage: "https://ttmwallet.io/",
-  image_id: "82014e92-838b-4e75-e77e-76cdc5539d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ru/app/ttm-wallet/id1540851562",
     android:
       "https://play.google.com/store/apps/details?id=com.ttmbank.wallet.app&hl=ru&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ru/app/ttm-wallet/id1540851562",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ttmwalletapp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ttmwallet.io/",
+  id: "io.ttmwallet",
+  image_id: "82014e92-838b-4e75-e77e-76cdc5539d00",
+  mobile: {
+    native: "ttmwalletapp://",
+    universal: null,
+  },
+  name: "MDAO Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.ukiss/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.ukiss/index.ts
index b10179cf474..f0618dfeb5e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.ukiss/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.ukiss/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.ukiss",
-  name: "UKISS Hub",
-  homepage: "https://www.ukiss.io",
-  image_id: "23f4c933-68e6-46f9-75b6-2d2905ca1300",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=io.ukiss.uhub.mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ukisshub://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ukiss.io",
+  id: "io.ukiss",
+  image_id: "23f4c933-68e6-46f9-75b6-2d2905ca1300",
+  mobile: {
+    native: "ukisshub://",
+    universal: null,
+  },
+  name: "UKISS Hub",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.unagi.unawallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.unagi.unawallet/index.ts
index 6dced82ca2f..cce86d39926 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.unagi.unawallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.unagi.unawallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.unagi.unawallet",
-  name: "una Wallet",
-  homepage: "https://unawallet.unagi.io",
-  image_id: "78118aa8-8dfc-4742-86f7-b51d34e7cf00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/una-wallet/id6456397239",
     android: "https://play.google.com/store/apps/details?id=app.unawallet.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/una-wallet/id6456397239",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "unaWallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://unawallet.unagi.io",
+  id: "io.unagi.unawallet",
+  image_id: "78118aa8-8dfc-4742-86f7-b51d34e7cf00",
+  mobile: {
+    native: "unaWallet://",
+    universal: null,
+  },
+  name: "una Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.universaleverything/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.universaleverything/index.ts
index 49ceeba3453..75c36ee1fd0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.universaleverything/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.universaleverything/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.universaleverything",
-  name: "UniversalProfiles",
-  homepage: "https://universaleverything.io",
-  image_id: "4537fb11-ada3-4009-37c2-c70ed4b46300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/universalprofiles/id6702018631",
     android:
       "https://play.google.com/store/apps/details?id=io.universaleverything.universalprofiles",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/universalprofiles/id6702018631",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "io.universaleverything.universalprofiles://wallet-connect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://universaleverything.io",
+  id: "io.universaleverything",
+  image_id: "4537fb11-ada3-4009-37c2-c70ed4b46300",
+  mobile: {
+    native: "io.universaleverything.universalprofiles://wallet-connect",
+    universal: null,
+  },
+  name: "UniversalProfiles",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.uptn.dapp-web/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.uptn.dapp-web/index.ts
index e807169c261..cec2896cf72 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.uptn.dapp-web/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.uptn.dapp-web/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.uptn.dapp-web",
-  name: "UPTN",
-  homepage: "https://dapp-web.uptn.io",
-  image_id: "5e656c3e-96ae-484f-c0c6-37bc908daa00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/kr/app/id6444606758",
     android: "https://play.google.com/store/apps/details?id=io.uptn.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/kr/app/id6444606758",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "uptn://dapp-web.uptn.io/",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://dapp-web.uptn.io",
+  id: "io.uptn.dapp-web",
+  image_id: "5e656c3e-96ae-484f-c0c6-37bc908daa00",
+  mobile: {
+    native: "uptn://dapp-web.uptn.io/",
+    universal: null,
+  },
+  name: "UPTN",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.wallacy/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.wallacy/index.ts
index 1741b93002b..5922060f832 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.wallacy/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.wallacy/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.wallacy",
-  name: "Wallacy",
-  homepage: "https://wallacy.io",
-  image_id: "9496c3d8-8b60-495f-bd55-c3af19519d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/wallacy-crypto-btc-wallet/id6448592576",
     android:
       "https://play.google.com/store/apps/details?id=io.wallacy.cryptowallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/wallacy-crypto-btc-wallet/id6448592576",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "wallacy://",
     universal: null,
   },
-  desktop: {
+  homepage: "https://wallacy.io",
+  id: "io.wallacy",
+  image_id: "9496c3d8-8b60-495f-bd55-c3af19519d00",
+  mobile: {
     native: "wallacy://",
     universal: null,
   },
+  name: "Wallacy",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.wallet3/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.wallet3/index.ts
index c9357a69e4b..98bf683dc85 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.wallet3/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.wallet3/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.wallet3",
-  name: "Wallet 3",
-  homepage: "https://wallet3.io",
-  image_id: "34ab7558-9e64-4436-f4e6-9069f2533d00",
   app: {
-    browser: "https://wallet3.io",
-    ios: "https://itunes.apple.com/us/app/wallet-3/id1597395741",
     android:
       "https://play.google.com/store/apps/details?id=jp.co.chainbow.wallet3.mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet3.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/us/app/wallet-3/id1597395741",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wallet3://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "wallet3://",
     universal: "https://wallet3.io",
   },
+  homepage: "https://wallet3.io",
+  id: "io.wallet3",
+  image_id: "34ab7558-9e64-4436-f4e6-9069f2533d00",
+  mobile: {
+    native: "wallet3://",
+    universal: null,
+  },
+  name: "Wallet 3",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.walletverse/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.walletverse/index.ts
index 86260b5caa0..694f0e75f54 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.walletverse/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.walletverse/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.walletverse",
-  name: "Walletverse",
-  homepage: "https://walletverse.io/",
-  image_id: "ca91138e-0546-4cfe-071d-2181241dc600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/wallet-verse-defi-buy-crypto/id6462672660",
     android: "https://play.google.com/store/apps/details?id=com.walletverse",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/wallet-verse-defi-buy-crypto/id6462672660",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "walletverse://",
-    universal: "https://walletverse.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://walletverse.io/",
+  id: "io.walletverse",
+  image_id: "ca91138e-0546-4cfe-071d-2181241dc600",
+  mobile: {
+    native: "walletverse://",
+    universal: "https://walletverse.io",
+  },
+  name: "Walletverse",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.wallypto/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.wallypto/index.ts
index 4f01f5e0cf7..4a1acb204d5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.wallypto/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.wallypto/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.wallypto",
-  name: "Wallypto",
-  homepage: "https://wallypto.io",
-  image_id: "00684f38-f9f9-40b6-6b6e-33891434f400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/wallypto-blockchain-wallet/id1639302472",
     android: "https://play.google.com/store/apps/details?id=xyz.wallypto",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/wallypto-blockchain-wallet/id1639302472",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wallypto://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallypto.io",
+  id: "io.wallypto",
+  image_id: "00684f38-f9f9-40b6-6b6e-33891434f400",
+  mobile: {
+    native: "wallypto://",
+    universal: null,
+  },
+  name: "Wallypto",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.xfun/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.xfun/index.ts
index ce58781a691..7209acde784 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.xfun/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.xfun/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.xfun",
-  name: "XFUN Wallet",
-  homepage: "https://xfun.io",
-  image_id: "a665f8f3-09ef-4d17-2bd0-26dca4518400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/xfun-wallet/id1612225910",
     android: "https://play.google.com/store/apps/details?id=com.xfun.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/xfun-wallet/id1612225910",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "xfunwallet://",
-    universal: "https://xfun.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://xfun.io",
+  id: "io.xfun",
+  image_id: "a665f8f3-09ef-4d17-2bd0-26dca4518400",
+  mobile: {
+    native: "xfunwallet://",
+    universal: "https://xfun.io",
+  },
+  name: "XFUN Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.xucre/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.xucre/index.ts
index 5b2228cd168..3da23eacc5f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.xucre/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.xucre/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.xucre",
-  name: "Xucre",
-  homepage: "https://www.xucre.io",
-  image_id: "6a560c0d-817d-4f62-ef21-b91636b30f00",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=xucre.expo.client",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "xucre.expo.client://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.xucre.io",
+  id: "io.xucre",
+  image_id: "6a560c0d-817d-4f62-ef21-b91636b30f00",
+  mobile: {
+    native: "xucre.expo.client://",
+    universal: null,
+  },
+  name: "Xucre",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.yowallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.yowallet/index.ts
index 30262e52135..31688b29576 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.yowallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.yowallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.yowallet",
-  name: "YoWallet",
-  homepage: "https://yowallet.io",
-  image_id: "750079a0-6372-4e32-d1af-fe8ec2bbe400",
   app: {
-    browser: "https://yowallet.io",
-    ios: "https://apps.apple.com/us/app/yowallet/id6474118944",
     android:
       "https://play.google.com/store/apps/details?id=com.yowallet.app&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://yowallet.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/yowallet/id6474118944",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "yo-wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://yowallet.io",
+  id: "io.yowallet",
+  image_id: "750079a0-6372-4e32-d1af-fe8ec2bbe400",
+  mobile: {
+    native: "yo-wallet://",
+    universal: null,
+  },
+  name: "YoWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.yusetoken/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.yusetoken/index.ts
index 65c771899e9..420ffd0ad41 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.yusetoken/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.yusetoken/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.yusetoken",
-  name: "Yuse Wallet",
-  homepage: "https://yusetoken.io/",
-  image_id: "2cd61458-59c2-4208-c8ee-98b5e0076b00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/yuse-wallet/id6449364813",
     android: "https://play.google.com/store/apps/details?id=com.yuse.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/yuse-wallet/id6449364813",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "yuse://wallet://",
-    universal: "https://yusewallet.page.link/tobR",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://yusetoken.io/",
+  id: "io.yusetoken",
+  image_id: "2cd61458-59c2-4208-c8ee-98b5e0076b00",
+  mobile: {
+    native: "yuse://wallet://",
+    universal: "https://yusewallet.page.link/tobR",
+  },
+  name: "Yuse Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.zelcore/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.zelcore/index.ts
index cbb071005ab..ba6c66a8e27 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.zelcore/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.zelcore/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.zelcore",
-  name: "Zelcore",
-  homepage: "https://zelcore.io",
-  image_id: "1b9e652e-1667-425a-f828-707bf9b05400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/zelcore/id1436296839",
     android:
       "https://play.google.com/store/apps/details?id=com.zelcash.zelcore",
-    mac: null,
-    windows: null,
-    linux: "https://zelcore.io/downloads/",
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/zelcore/id1436296839",
+    linux: "https://zelcore.io/downloads/",
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "zel://",
     universal: null,
   },
-  desktop: {
+  homepage: "https://zelcore.io",
+  id: "io.zelcore",
+  image_id: "1b9e652e-1667-425a-f828-707bf9b05400",
+  mobile: {
     native: "zel://",
     universal: null,
   },
+  name: "Zelcore",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.zelus/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.zelus/index.ts
index f35c80012ae..9aac752d24f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.zelus/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.zelus/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.zelus",
-  name: "Zelus Wallet",
-  homepage: "https://zelus.io",
-  image_id: "a173eba6-05b4-43f4-0df6-400563637b00",
   app: {
-    browser: "https://rollingloud.bridge.zelus.io",
-    ios: "https://apps.apple.com/us/app/zelus/id1588430343",
     android: "https://play.google.com/store/apps/details?id=com.zelus.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://rollingloud.bridge.zelus.io",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/zelus/id1588430343",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "zeluswallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://rollingloud.bridge.zelus.io",
   },
+  homepage: "https://zelus.io",
+  id: "io.zelus",
+  image_id: "a173eba6-05b4-43f4-0df6-400563637b00",
+  mobile: {
+    native: "zeluswallet://",
+    universal: null,
+  },
+  name: "Zelus Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.zerion.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.zerion.wallet/index.ts
index 99c1a3fbd51..e16421a8e9a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.zerion.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.zerion.wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.zerion.wallet",
-  name: "Zerion",
-  homepage: "https://zerion.io/",
-  image_id: "77c1d3dd-0213-400a-f9cc-bfd524c47f00",
   app: {
-    browser: "https://app.zerion.io",
-    ios: "https://apps.apple.com/app/id1456732565",
     android:
       "https://play.google.com/store/apps/details?id=io.zerion.android&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.zerion.io",
     chrome:
       "https://chrome.google.com/webstore/detail/zerion-wallet-for-web3-nf/klghhnkeealcohjjanjjdaeeggmfmlpl",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1456732565",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "io.zerion.wallet",
-  mobile: {
-    native: "zerion://",
-    universal: "https://wallet.zerion.io/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "zerion://",
     universal: "https://wallet.zerion.io",
   },
+  homepage: "https://zerion.io/",
+  id: "io.zerion.wallet",
+  image_id: "77c1d3dd-0213-400a-f9cc-bfd524c47f00",
+  mobile: {
+    native: "zerion://",
+    universal: "https://wallet.zerion.io/wc",
+  },
+  name: "Zerion",
+  rdns: "io.zerion.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/io.zkape/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/io.zkape/index.ts
index 1a9b30a9c4a..9273549d05f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/io.zkape/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/io.zkape/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "io.zkape",
-  name: "Ape Wallet",
-  homepage: "https://www.zkape.io",
-  image_id: "ea66f627-cc46-41c4-8287-dae2f379f700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/ape-layer2-wallet/id6450944029",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ape-layer2-wallet/id6450944029",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ape://",
-    universal: "https://zkape.io",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.zkape.io",
+  id: "io.zkape",
+  image_id: "ea66f627-cc46-41c4-8287-dae2f379f700",
+  mobile: {
+    native: "ape://",
+    universal: "https://zkape.io",
+  },
+  name: "Ape Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/is.callback/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/is.callback/index.ts
index e73249ffd78..5c453e6c0a7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/is.callback/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/is.callback/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "is.callback",
-  name: "Callback",
-  homepage: "https://callback.is",
-  image_id: "9f50c7a7-2384-4efe-89c3-01e0fec2b700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/en/app/callback-original-stickers/id1543659456",
     android:
       "https://play.google.com/store/apps/details?id=com.thebasicsmeishi",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/en/app/callback-original-stickers/id1543659456",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "callback://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://callback.is",
+  id: "is.callback",
+  image_id: "9f50c7a7-2384-4efe-89c3-01e0fec2b700",
+  mobile: {
+    native: "callback://",
+    universal: null,
+  },
+  name: "Callback",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/it.airgap/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/it.airgap/index.ts
index a4fd59c6c46..c7a47c18366 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/it.airgap/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/it.airgap/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "it.airgap",
-  name: "AirGap Wallet",
-  homepage: "https://airgap.it",
-  image_id: "76bfe8cd-cf3f-4341-c33c-60da01065000",
   app: {
-    browser: "https://wallet.airgap.it",
-    ios: "https://itunes.apple.com/us/app/airgap-wallet/id1420996542?l=de&ls=1&mt=8",
     android: "https://play.google.com/store/apps/details?id=it.airgap.wallet",
-    mac: "https://github.com/airgap-it/airgap-wallet/releases",
-    windows: "https://github.com/airgap-it/airgap-wallet/releases",
-    linux: "https://github.com/airgap-it/airgap-wallet/releases",
+    browser: "https://wallet.airgap.it",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/us/app/airgap-wallet/id1420996542?l=de&ls=1&mt=8",
+    linux: "https://github.com/airgap-it/airgap-wallet/releases",
+    mac: "https://github.com/airgap-it/airgap-wallet/releases",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "airgap-wallet://",
-    universal: null,
+    safari: null,
+    windows: "https://github.com/airgap-it/airgap-wallet/releases",
   },
   desktop: {
     native: null,
     universal: "https://wallet.airgap.it",
   },
+  homepage: "https://airgap.it",
+  id: "it.airgap",
+  image_id: "76bfe8cd-cf3f-4341-c33c-60da01065000",
+  mobile: {
+    native: "airgap-wallet://",
+    universal: null,
+  },
+  name: "AirGap Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/jp.co.rakuten-wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/jp.co.rakuten-wallet/index.ts
index d4e4274c406..c05ac7b3b63 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/jp.co.rakuten-wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/jp.co.rakuten-wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "jp.co.rakuten-wallet",
-  name: "Rakuten Wallet",
-  homepage: "https://www.rakuten-wallet.co.jp/web3/",
-  image_id: "a7b5c4b1-8b55-4b6c-af68-4b2786480600",
   app: {
-    browser: "https://www.rakuten-wallet.co.jp/",
-    ios: "https://apps.apple.com/jp/app/id6504903632",
     android:
       "https://play.google.com/store/apps/details?id=jp.co.rakuten.web3wallet.crypto",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.rakuten-wallet.co.jp/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/jp/app/id6504903632",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "rakutenwalletweb3://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.rakuten-wallet.co.jp/web3/",
+  id: "jp.co.rakuten-wallet",
+  image_id: "a7b5c4b1-8b55-4b6c-af68-4b2786480600",
+  mobile: {
+    native: "rakutenwalletweb3://",
+    universal: null,
+  },
+  name: "Rakuten Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/land.liker/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/land.liker/index.ts
index d030dba00b6..df7bd1cb94f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/land.liker/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/land.liker/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "land.liker",
-  name: "LikerLand App",
-  homepage: "https://liker.land/getapp",
-  image_id: "501fa316-f0df-4a1b-ead6-5523251b7100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/liker-land/id1248232355",
     android: "https://play.google.com/store/apps/details?id=com.oice",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/liker-land/id1248232355",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "com.oice://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://liker.land/getapp",
+  id: "land.liker",
+  image_id: "501fa316-f0df-4a1b-ead6-5523251b7100",
+  mobile: {
+    native: "com.oice://",
+    universal: null,
+  },
+  name: "LikerLand App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/live.superex/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/live.superex/index.ts
index 4c3f713ad25..077db98c78c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/live.superex/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/live.superex/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "live.superex",
-  name: "SuperWallet",
-  homepage: "https://superex.live",
-  image_id: "e8f30122-5537-4b38-d6d5-9cae46771800",
   app: {
-    browser: "https://superex.com",
-    ios: "https://apps.apple.com/us/app/superex/id1601589888",
     android: "https://play.google.com/store/apps/details?id=com.superex.ex",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://superex.com",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/superex/id1601589888",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "superwallet://",
-    universal: "https://www.superex.live",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://superex.com",
   },
+  homepage: "https://superex.live",
+  id: "live.superex",
+  image_id: "e8f30122-5537-4b38-d6d5-9cae46771800",
+  mobile: {
+    native: "superwallet://",
+    universal: "https://www.superex.live",
+  },
+  name: "SuperWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/llc.besc/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/llc.besc/index.ts
index 02d8be32a1b..3071607f81b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/llc.besc/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/llc.besc/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "llc.besc",
-  name: "BeanBag",
-  homepage: "https://besc.llc",
-  image_id: "5fad49d2-a138-47bb-ac87-6368d8bd9000",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=com.beanbag.wallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: "",
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
+  homepage: "https://besc.llc",
+  id: "llc.besc",
+  image_id: "5fad49d2-a138-47bb-ac87-6368d8bd9000",
   mobile: {
     native: "beanbag://wallet/connect",
     universal:
       "https://play.google.com/store/apps/details?id=com.beanbag.wallet",
   },
-  desktop: {
-    native: null,
-    universal: null,
-  },
+  name: "BeanBag",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/me.astrox/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/me.astrox/index.ts
index 66914fd01e5..e6609a82d1a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/me.astrox/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/me.astrox/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "me.astrox",
-  name: "Me Wallet",
-  homepage: "https://astrox.me/",
-  image_id: "e9666b15-4296-4384-3661-7e99a5f2a900",
   app: {
-    browser: "https://app.astrox.me/",
-    ios: "https://apps.apple.com/us/app/astrox-me-wallet/id1634031707",
     android: "https://play.google.com/store/apps/details?id=com.astrox.me",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.astrox.me/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/astrox-me-wallet/id1634031707",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "astrox://me/wcx",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.astrox.me/",
   },
+  homepage: "https://astrox.me/",
+  id: "me.astrox",
+  image_id: "e9666b15-4296-4384-3661-7e99a5f2a900",
+  mobile: {
+    native: "astrox://me/wcx",
+    universal: null,
+  },
+  name: "Me Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/me.easy/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/me.easy/index.ts
index 50534ebf23f..eb124262798 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/me.easy/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/me.easy/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "me.easy",
-  name: "EASY",
-  homepage: "https://easy.me",
-  image_id: "62feb41a-be1f-4b1c-e089-27f97c0e8d00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/easy-web3-social-wallet/id1641192503",
     android: "https://play.google.com/store/apps/details?id=co.theeasy.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/easy-web3-social-wallet/id1641192503",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "co.theeasy.app://",
-    universal: "https://link.easy.me",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://easy.me",
+  id: "me.easy",
+  image_id: "62feb41a-be1f-4b1c-e089-27f97c0e8d00",
+  mobile: {
+    native: "co.theeasy.app://",
+    universal: "https://link.easy.me",
+  },
+  name: "EASY",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/me.haha/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/me.haha/index.ts
index 546e1479d93..7ba11aea93b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/me.haha/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/me.haha/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "me.haha",
-  name: "HaHa",
-  homepage: "https://www.haha.me",
-  image_id: "79285c9f-2630-451e-0680-c71b42fb7400",
   app: {
-    browser: "https://www.haha.me",
-    ios: "https://apps.apple.com/us/app/haha-crypto-portfolio-tracker/id1591158244",
     android: "https://play.google.com/store/apps/details?id=com.permutize.haha",
-    mac: "https://apps.apple.com/us/app/haha-crypto-portfolio-tracker/id1591158244",
-    windows: null,
-    linux: null,
+    browser: "https://www.haha.me",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/haha-crypto-portfolio-tracker/id1591158244",
+    linux: null,
+    mac: "https://apps.apple.com/us/app/haha-crypto-portfolio-tracker/id1591158244",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "haha://",
-    universal: "https://haha.me",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://www.haha.me",
   },
+  homepage: "https://www.haha.me",
+  id: "me.haha",
+  image_id: "79285c9f-2630-451e-0680-c71b42fb7400",
+  mobile: {
+    native: "haha://",
+    universal: "https://haha.me",
+  },
+  name: "HaHa",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/me.iopay/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/me.iopay/index.ts
index 318949920f5..c9e680e872e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/me.iopay/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/me.iopay/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "me.iopay",
-  name: "ioPay",
-  homepage: "https://iopay.me/",
-  image_id: "411d80d0-3a75-4932-560f-565d8c715e00",
   app: {
-    browser: "https://iopay.me/",
-    ios: "https://apps.apple.com/app/apple-store/id1478086371",
     android: "https://play.google.com/store/apps/details?id=io.iotex.iopay.gp",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://iopay.me/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/apple-store/id1478086371",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "iopay://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://iopay.me/",
   },
+  homepage: "https://iopay.me/",
+  id: "me.iopay",
+  image_id: "411d80d0-3a75-4932-560f-565d8c715e00",
+  mobile: {
+    native: "iopay://",
+    universal: null,
+  },
+  name: "ioPay",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/me.komet.app/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/me.komet.app/index.ts
index 50ec706d81f..8e3ec9c345b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/me.komet.app/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/me.komet.app/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "me.komet.app",
-  name: "Komet",
-  homepage: "https://komet.me",
-  image_id: "a2e9aaed-20f6-4da9-3ca3-448a1fc00b00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/in/app/komet/id6448238558",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/komet-wallet/anmkkggohcdelhaholjialcfgdbcegbo",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/komet/id6448238558",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "me.komet.app",
-  mobile: {
-    native: "komet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://komet.me",
+  id: "me.komet.app",
+  image_id: "a2e9aaed-20f6-4da9-3ca3-448a1fc00b00",
+  mobile: {
+    native: "komet://",
+    universal: null,
+  },
+  name: "Komet",
+  rdns: "me.komet.app",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/me.rainbow/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/me.rainbow/index.ts
index 66ac97e296e..c935a3ee011 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/me.rainbow/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/me.rainbow/index.ts
@@ -2,33 +2,33 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "me.rainbow",
-  name: "Rainbow",
-  homepage: "https://rainbow.me/",
-  image_id: "a9978739-0685-43d5-bb3c-c11545d91300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/apple-store/id1457119021?pt=119997837&ct=wc&mt=8",
     android:
       "https://play.google.com/store/apps/details?id=me.rainbow&referrer=utm_source%3Dwc%26utm_medium%3Dconnector%26utm_campaign%3Dwc",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/rainbow/opfgelmcmbiajamepnmloijbpoleiama?utm_source=wc&utm_medium=connector&utm_campaign=wc",
+    edge: "https://microsoftedge.microsoft.com/addons/detail/rainbow/cpojfbodiccabbabgimdeohkkpjfpbnf?utm_source=wc&utm_medium=connector&utm_campaign=wc",
     firefox:
       "https://addons.mozilla.org/en-US/firefox/addon/rainbow-extension/?utm_source=wc&utm_medium=connector&utm_campaign=wc",
-    safari: null,
-    edge: "https://microsoftedge.microsoft.com/addons/detail/rainbow/cpojfbodiccabbabgimdeohkkpjfpbnf?utm_source=wc&utm_medium=connector&utm_campaign=wc",
+    ios: "https://apps.apple.com/app/apple-store/id1457119021?pt=119997837&ct=wc&mt=8",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "me.rainbow",
-  mobile: {
-    native: "rainbow://",
-    universal: "https://rnbwapp.com",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://rainbow.me/",
+  id: "me.rainbow",
+  image_id: "a9978739-0685-43d5-bb3c-c11545d91300",
+  mobile: {
+    native: "rainbow://",
+    universal: "https://rnbwapp.com",
+  },
+  name: "Rainbow",
+  rdns: "me.rainbow",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/money.keychain/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/money.keychain/index.ts
index 7ab902369ee..71120d55775 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/money.keychain/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/money.keychain/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "money.keychain",
-  name: "Keychain",
-  homepage: "http://keychain.money/",
-  image_id: "2b6e9e4b-7dca-45dd-45d5-d96f45010200",
   app: {
-    browser: "https://app.keychain.money/",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.keychain.money/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://app.keychain.money/",
   },
-  desktop: {
+  homepage: "http://keychain.money/",
+  id: "money.keychain",
+  image_id: "2b6e9e4b-7dca-45dd-45d5-d96f45010200",
+  mobile: {
     native: null,
     universal: "https://app.keychain.money/",
   },
+  name: "Keychain",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/money.snowball/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/money.snowball/index.ts
index 1c676e7e997..2f11fd4f995 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/money.snowball/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/money.snowball/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "money.snowball",
-  name: "Snowball",
-  homepage: "https://snowball.money/",
-  image_id: "313faea4-af8c-41f4-0ed8-98be5d048e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/snowball-smart-defi-wallet/id1449662311",
     android:
       "https://play.google.com/store/apps/details?id=money.snowball.defi",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/snowball-smart-defi-wallet/id1449662311",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: null,
-    universal: "https://app.snowball.exchange/app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://snowball.money/",
+  id: "money.snowball",
+  image_id: "313faea4-af8c-41f4-0ed8-98be5d048e00",
+  mobile: {
+    native: null,
+    universal: "https://app.snowball.exchange/app",
+  },
+  name: "Snowball",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/money.unstoppable/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/money.unstoppable/index.ts
index 6cbb99711af..8ea77953afb 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/money.unstoppable/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/money.unstoppable/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "money.unstoppable",
-  name: "Unstoppable Wallet",
-  homepage: "https://unstoppable.money/",
-  image_id: "a63cbfce-0726-4f94-9187-a761afb94400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/unstoppable-crypto-wallet/id1447619907",
     android:
       "https://play.google.com/store/apps/details?id=io.horizontalsystems.bankwallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/unstoppable-crypto-wallet/id1447619907",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "unstoppable.money://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://unstoppable.money/",
+  id: "money.unstoppable",
+  image_id: "a63cbfce-0726-4f94-9187-a761afb94400",
+  mobile: {
+    native: "unstoppable.money://",
+    universal: null,
+  },
+  name: "Unstoppable Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/net.gateweb3/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/net.gateweb3/index.ts
index 24ba6edf1e8..582442fac32 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/net.gateweb3/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/net.gateweb3/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "net.gateweb3",
-  name: "GateWallet",
-  homepage: "https://www.gateweb3.net/web3",
-  image_id: "6e528abf-7a7d-47bd-d84d-481f169b1200",
   app: {
-    browser: null,
-    ios: "https://www.gate.io/mobileapp",
     android: "https://www.gate.io/mobileapp",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://www.gate.io/mobileapp",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "gtweb3wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "gtweb3wallet://",
     universal: "https://www.gateweb3.net/web3",
   },
+  homepage: "https://www.gateweb3.net/web3",
+  id: "net.gateweb3",
+  image_id: "6e528abf-7a7d-47bd-d84d-481f169b1200",
+  mobile: {
+    native: "gtweb3wallet://",
+    universal: null,
+  },
+  name: "GateWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/net.myrenegade/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/net.myrenegade/index.ts
index e60ea68bae5..91587902727 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/net.myrenegade/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/net.myrenegade/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "net.myrenegade",
-  name: "Renegade",
-  homepage: "https://www.myrenegade.net",
-  image_id: "6ce2caa3-c597-445a-b61f-0b46b5c15000",
   app: {
-    browser: "https://wallet.myrenegade.net",
-    ios: "https://apps.apple.com/us/app/myrenegade/id1670346221",
     android: "https://play.google.com/store/apps/details?id=com.app.renegade",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wallet.myrenegade.net",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/myrenegade/id1670346221",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "renegade-web3wallet://",
-    universal: "https://webapp.myrenegade.net",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.myrenegade.net",
+  id: "net.myrenegade",
+  image_id: "6ce2caa3-c597-445a-b61f-0b46b5c15000",
+  mobile: {
+    native: "renegade-web3wallet://",
+    universal: "https://webapp.myrenegade.net",
+  },
+  name: "Renegade",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/net.shinobi-wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/net.shinobi-wallet/index.ts
index 77a007fbbb7..aceb68f49db 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/net.shinobi-wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/net.shinobi-wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "net.shinobi-wallet",
-  name: "Shinobi-Wallet",
-  homepage: "https://shinobi-wallet.net/",
-  image_id: "685c986c-3e80-4701-cec6-cd247ba1a700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/fgraph/id1572609905",
     android:
       "https://play.google.com/store/apps/details?id=io.fgraph.shinobiwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/fgraph/id1572609905",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "shinobi-wallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://shinobi-wallet.net/",
+  id: "net.shinobi-wallet",
+  image_id: "685c986c-3e80-4701-cec6-cd247ba1a700",
+  mobile: {
+    native: "shinobi-wallet://",
+    universal: null,
+  },
+  name: "Shinobi-Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/net.spatium.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/net.spatium.wallet/index.ts
index 49afa3760fd..c117bb4913b 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/net.spatium.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/net.spatium.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "net.spatium.wallet",
-  name: "Spatium",
-  homepage: "https://wallet.spatium.net",
-  image_id: "8b966926-cdcf-4eae-1432-b400fe014700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ru/app/spatium/id6476919875",
     android: "https://play.google.com/store/apps/details?id=net.spatium.next",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ru/app/spatium/id6476919875",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "spatium-next://",
-    universal: "https://link.spatium.net",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallet.spatium.net",
+  id: "net.spatium.wallet",
+  image_id: "8b966926-cdcf-4eae-1432-b400fe014700",
+  mobile: {
+    native: "spatium-next://",
+    universal: "https://link.spatium.net",
+  },
+  name: "Spatium",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/net.spatium/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/net.spatium/index.ts
index 39e6ade1676..17d8950c418 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/net.spatium/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/net.spatium/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "net.spatium",
-  name: "Spatium",
-  homepage: "https://spatium.net",
-  image_id: "51867bee-2963-4071-d67a-1fdcaa451f00",
   app: {
-    browser: "https://spatium.net",
-    ios: "https://apps.apple.com/ru/app/spatium/id1404844195",
     android:
       "https://play.google.com/store/apps/details?id=capital.spatium.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://spatium.net",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ru/app/spatium/id1404844195",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "spatium://",
-    universal: "https://link.spatium.net",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://spatium.net",
   },
+  homepage: "https://spatium.net",
+  id: "net.spatium",
+  image_id: "51867bee-2963-4071-d67a-1fdcaa451f00",
+  mobile: {
+    native: "spatium://",
+    universal: "https://link.spatium.net",
+  },
+  name: "Spatium",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/net.stasis/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/net.stasis/index.ts
index 5014962ca8a..8bfe2339297 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/net.stasis/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/net.stasis/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "net.stasis",
-  name: "Stasis Wallet",
-  homepage: "https://stasis.net/",
-  image_id: "d83223cf-f29a-4757-a21e-8913b12f9f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/stasis-wallet/id1371949230",
     android:
       "https://play.google.com/store/apps/details?id=com.stasis.stasiswallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/stasis-wallet/id1371949230",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "stasis://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://stasis.net/",
+  id: "net.stasis",
+  image_id: "d83223cf-f29a-4757-a21e-8913b12f9f00",
+  mobile: {
+    native: "stasis://",
+    universal: null,
+  },
+  name: "Stasis Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/network.blackfort/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/network.blackfort/index.ts
index 8529ca440b1..25c17fb9dd3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/network.blackfort/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/network.blackfort/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "network.blackfort",
-  name: "BlackFort Wallet",
-  homepage: "https://blackfort.network",
-  image_id: "f2cf0909-3e1e-4f67-8c3f-2b69f7a5eb00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/pl/app/blackfort-wallet/id6447954137",
     android:
       "https://play.google.com/store/apps/details?id=exchange.blackfort.blackfortwallet&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/pl/app/blackfort-wallet/id6447954137",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "blackfortwc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://blackfort.network",
+  id: "network.blackfort",
+  image_id: "f2cf0909-3e1e-4f67-8c3f-2b69f7a5eb00",
+  mobile: {
+    native: "blackfortwc://",
+    universal: null,
+  },
+  name: "BlackFort Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/network.cvl/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/network.cvl/index.ts
index 6d04077ad79..58a0797492a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/network.cvl/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/network.cvl/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "network.cvl",
-  name: "CVL Wallet",
-  homepage: "https://cvl.network",
-  image_id: "e4eff15a-35d5-49fe-047f-33e331f46400",
   app: {
-    browser: "https://app.cvl.network/",
-    ios: "https://apps.apple.com/ru/app/cvl-wallet/id6444357628",
     android:
       "https://play.google.com/store/apps/details?id=llp.bc_group.cvl_wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.cvl.network/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ru/app/cvl-wallet/id6444357628",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://app.cvl.network/",
   },
-  desktop: {
+  homepage: "https://cvl.network",
+  id: "network.cvl",
+  image_id: "e4eff15a-35d5-49fe-047f-33e331f46400",
+  mobile: {
     native: null,
     universal: "https://app.cvl.network/",
   },
+  name: "CVL Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/network.dgg/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/network.dgg/index.ts
index b76b4022b4e..6df10488ede 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/network.dgg/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/network.dgg/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "network.dgg",
-  name: "DGG Wallet",
-  homepage: "https://dgg.network",
-  image_id: "e4cbed08-8839-4bce-875f-d8917ceb7e00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/nl/app/dgg-wallet-nfts-games/id1659618218",
     android:
       "https://play.google.com/store/apps/details?id=network.dgg.wallet&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "https://apps.apple.com/nl/app/dgg-wallet-nfts-games/id1659618218",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/nl/app/dgg-wallet-nfts-games/id1659618218",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "dgg://",
-    universal: "https://dggnetwork.app.link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://dgg.network",
+  id: "network.dgg",
+  image_id: "e4cbed08-8839-4bce-875f-d8917ceb7e00",
+  mobile: {
+    native: "dgg://",
+    universal: "https://dggnetwork.app.link",
+  },
+  name: "DGG Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/network.gridlock/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/network.gridlock/index.ts
index fd45d6a4049..1df274574f5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/network.gridlock/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/network.gridlock/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "network.gridlock",
-  name: "Gridlock Wallet",
-  homepage: "https://gridlock.network/",
-  image_id: "471e6f61-b95a-453c-670c-029ef3b2bd00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/gridlock-secure-crypto-wallet/id1567057330",
     android:
       "https://play.google.com/store/apps/details?id=network.gridlock.AppGridlock",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/gridlock-secure-crypto-wallet/id1567057330",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "network.gridlock.AppGridlock://",
-    universal: "https://gridlock.page.link/Fihx",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://gridlock.network/",
+  id: "network.gridlock",
+  image_id: "471e6f61-b95a-453c-670c-029ef3b2bd00",
+  mobile: {
+    native: "network.gridlock.AppGridlock://",
+    universal: "https://gridlock.page.link/Fihx",
+  },
+  name: "Gridlock Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/network.haqq/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/network.haqq/index.ts
index a2e833d1024..bef41fb0198 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/network.haqq/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/network.haqq/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "network.haqq",
-  name: "HAQQ Wallet",
-  homepage: "https://haqq.network/wallet",
-  image_id: "99fe539d-6a2a-4f52-2211-42fd04a9f300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/haqq-wallet-by-bored-gen/id6443843352",
     android: "https://play.google.com/store/apps/details?id=com.haqq.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/haqq-wallet-by-bored-gen/id6443843352",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "haqq://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://haqq.network/wallet",
+  id: "network.haqq",
+  image_id: "99fe539d-6a2a-4f52-2211-42fd04a9f300",
+  mobile: {
+    native: "haqq://",
+    universal: null,
+  },
+  name: "HAQQ Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/network.mrhb/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/network.mrhb/index.ts
index cdf015753e5..a3503f3c3d0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/network.mrhb/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/network.mrhb/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "network.mrhb",
-  name: "Sahal Wallet",
-  homepage: "https://mrhb.network",
-  image_id: "afa1e46a-331a-418f-ef1f-a29f76def100",
   app: {
-    browser: "https://mrhb.network",
-    ios: "https://apps.apple.com/gb/app/sahal-wallet/id1602366920",
     android:
       "https://play.google.com/store/apps/details?id=sahal.wallet.app&gl=GB",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://mrhb.network",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/gb/app/sahal-wallet/id1602366920",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "sahalwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "sahalwallet://",
     universal: "https://sahalwallet.app",
   },
+  homepage: "https://mrhb.network",
+  id: "network.mrhb",
+  image_id: "afa1e46a-331a-418f-ef1f-a29f76def100",
+  mobile: {
+    native: "sahalwallet://",
+    universal: null,
+  },
+  name: "Sahal Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/network.over/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/network.over/index.ts
index b07f1aa42d0..beed23c2fa0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/network.over/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/network.over/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "network.over",
-  name: "OverFlex",
-  homepage: "https://over.network/overflex",
-  image_id: "ac442ec8-206d-4885-41dc-005aa94bc500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/overwallet-for-over-protocol/id6447250892",
     android:
       "https://play.google.com/store/apps/details?id=com.superblock.overmobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/overwallet-for-over-protocol/id6447250892",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "overflex://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://over.network/overflex",
+  id: "network.over",
+  image_id: "ac442ec8-206d-4885-41dc-005aa94bc500",
+  mobile: {
+    native: "overflex://",
+    universal: null,
+  },
+  name: "OverFlex",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/network.trustkeys/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/network.trustkeys/index.ts
index 3410d122108..44cac833e22 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/network.trustkeys/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/network.trustkeys/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "network.trustkeys",
-  name: "TrustKeys Web3 SocialFi",
-  homepage: "https://trustkeys.network",
-  image_id: "35644c6b-c6f3-4e45-b68b-e888c21afd00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/vn/app/trustkeys-web3-socialfi/id1601968967",
     android:
       "https://play.google.com/store/apps/details?id=com.trustkeysnetwork",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/vn/app/trustkeys-web3-socialfi/id1601968967",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "TKwc://",
-    universal: "https://trustkeys.network/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://trustkeys.network",
+  id: "network.trustkeys",
+  image_id: "35644c6b-c6f3-4e45-b68b-e888c21afd00",
+  mobile: {
+    native: "TKwc://",
+    universal: "https://trustkeys.network/",
+  },
+  name: "TrustKeys Web3 SocialFi",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/nl.greenhood.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/nl.greenhood.wallet/index.ts
index 0f0405562fc..06ae6e749e1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/nl.greenhood.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/nl.greenhood.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "nl.greenhood.wallet",
-  name: "Greenhood",
-  homepage: "https://www.greenhood.nl",
-  image_id: "7b6aaa4d-fa17-4cc6-71e1-79f2e68c0900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/greenhood-wallet/id1661248135",
     android:
       "https://play.google.com/store/apps/details?id=com.greehood.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/greenhood-wallet/id1661248135",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "nl.greenhood.wallet",
-  mobile: {
-    native: "greenhood://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.greenhood.nl",
+  id: "nl.greenhood.wallet",
+  image_id: "7b6aaa4d-fa17-4cc6-71e1-79f2e68c0900",
+  mobile: {
+    native: "greenhood://",
+    universal: null,
+  },
+  name: "Greenhood",
+  rdns: "nl.greenhood.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/one.metapro.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/one.metapro.wallet/index.ts
index 69cb56b4e4d..b4f4e28ade3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/one.metapro.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/one.metapro.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "one.metapro.wallet",
-  name: "metapro wallet",
-  homepage: "https://wallet.metapro.one",
-  image_id: "20775b9e-c38f-4173-509f-896a84593b00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/metapro-wallet/id1628087356",
     android:
       "https://play.google.com/store/apps/details?id=com.metapro.app&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/metapro-wallet/id1628087356",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "metapro://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://wallet.metapro.one",
+  id: "one.metapro.wallet",
+  image_id: "20775b9e-c38f-4173-509f-896a84593b00",
+  mobile: {
+    native: "metapro://",
+    universal: null,
+  },
+  name: "metapro wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/one.mixin.messenger/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/one.mixin.messenger/index.ts
index 57a6bb2beeb..ce28ac61082 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/one.mixin.messenger/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/one.mixin.messenger/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "one.mixin.messenger",
-  name: "Mixin Messenger",
-  homepage: "https://messenger.mixin.one",
-  image_id: "c5516ab5-57c3-45ec-09e2-b149c9709600",
   app: {
-    browser: "https://mixin.one",
-    ios: "https://apps.apple.com/app/mixin/id1322324266",
     android:
       "https://play.google.com/store/apps/details?id=one.mixin.messenger",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://mixin.one",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/mixin/id1322324266",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "one.mixin.messenger",
-  mobile: {
-    native: "mixin://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://mixin.one",
   },
+  homepage: "https://messenger.mixin.one",
+  id: "one.mixin.messenger",
+  image_id: "c5516ab5-57c3-45ec-09e2-b149c9709600",
+  mobile: {
+    native: "mixin://",
+    universal: null,
+  },
+  name: "Mixin Messenger",
+  rdns: "one.mixin.messenger",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/online.puzzle/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/online.puzzle/index.ts
index f05a1722dbb..c95dd59a9f0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/online.puzzle/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/online.puzzle/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "online.puzzle",
-  name: "Puzzle Wallet",
-  homepage: "https://puzzle.online",
-  image_id: "08cb0a68-6271-4e25-90c3-bcc3c0226a00",
   app: {
-    browser: "https://jigsaw-dev.puzzle.online",
-    ios: "https://apps.apple.com/au/app/puzzle-aleo-wallet/id6450268321",
     android: "https://play.google.com/store/apps/details?id=online.puzzle",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://jigsaw-dev.puzzle.online",
     chrome:
       "https://chromewebstore.google.com/detail/puzzle-aleo-wallet/fdchdcpieegfofnofhgdombfckhbcokj",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/au/app/puzzle-aleo-wallet/id6450268321",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "puzzleapp://",
-    universal: "https://jigsaw-dev.puzzle.online/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://walletconnect.puzzle.online",
   },
+  homepage: "https://puzzle.online",
+  id: "online.puzzle",
+  image_id: "08cb0a68-6271-4e25-90c3-bcc3c0226a00",
+  mobile: {
+    native: "puzzleapp://",
+    universal: "https://jigsaw-dev.puzzle.online/",
+  },
+  name: "Puzzle Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.alephium/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.alephium/index.ts
index f1d26f14aed..a1e78d2b794 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.alephium/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.alephium/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.alephium",
-  name: "Alephium Wallet",
-  homepage: "https://alephium.org/",
-  image_id: "3ece76f1-fc71-4fad-2d28-707f5a8d2300",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/alephium-wallet/id6469043072",
     android:
       "https://play.google.com/store/apps/details?id=org.alephium.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/alephium-wallet/id6469043072",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "alephium://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://alephium.org/",
+  id: "org.alephium",
+  image_id: "3ece76f1-fc71-4fad-2d28-707f5a8d2300",
+  mobile: {
+    native: "alephium://",
+    universal: null,
+  },
+  name: "Alephium Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.arianee/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.arianee/index.ts
index 791dce3f80b..6c6331a814a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.arianee/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.arianee/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.arianee",
-  name: "Arianee Wallet",
-  homepage: "https://arianee.org",
-  image_id: "13b7fe36-909a-4c83-4f06-5740829a3900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/fr/app/arianee-wallet/id1435782507",
     android:
       "https://play.google.com/store/apps/details?id=com.arianee.wallet&hl=ln&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/fr/app/arianee-wallet/id1435782507",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "com.arianee.wallet://",
-    universal: "https://i.arian.ee",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://arianee.org",
+  id: "org.arianee",
+  image_id: "13b7fe36-909a-4c83-4f06-5740829a3900",
+  mobile: {
+    native: "com.arianee.wallet://",
+    universal: "https://i.arian.ee",
+  },
+  name: "Arianee Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.bitizen/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.bitizen/index.ts
index 45b3b1fa586..126541f6c8d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.bitizen/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.bitizen/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.bitizen",
-  name: "Bitizen",
-  homepage: "https://bitizen.org/",
-  image_id: "75dd1471-77e9-4811-ce57-ec8fc980ec00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/bitizen-defi-web3-eth-wallet/id1598283542",
     android: "https://play.google.com/store/apps/details?id=org.bitizen.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "https://bitizen.org/",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/bitizen-defi-web3-eth-wallet/id1598283542",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bitizen://wallet/",
-    universal: "https://bitizen.org/wallet/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bitizen.org/",
+  id: "org.bitizen",
+  image_id: "75dd1471-77e9-4811-ce57-ec8fc980ec00",
+  mobile: {
+    native: "bitizen://wallet/",
+    universal: "https://bitizen.org/wallet/",
+  },
+  name: "Bitizen",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.bytebank/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.bytebank/index.ts
index 995f51219ca..f64d3980298 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.bytebank/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.bytebank/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.bytebank",
-  name: "ByteBank",
-  homepage: "https://www.bytebank.org/",
-  image_id: "bc7aacd6-b2e2-4146-7d21-06e0c5d44f00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/sg/app/hideout-wallet/id1620315192?l=zh",
     android: "https://play.google.com/store/apps/details?id=com.hideout.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/sg/app/hideout-wallet/id1620315192?l=zh",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "hideoutWallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.bytebank.org/",
+  id: "org.bytebank",
+  image_id: "bc7aacd6-b2e2-4146-7d21-06e0c5d44f00",
+  mobile: {
+    native: "hideoutWallet://",
+    universal: null,
+  },
+  name: "ByteBank",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.dota168/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.dota168/index.ts
index 47b33ebe114..09848dac08d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.dota168/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.dota168/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.dota168",
-  name: "MetaWallet",
-  homepage: "http://www.dota168.org/",
-  image_id: "a18337ad-433f-47c0-ea57-8a6199835e00",
   app: {
-    browser: null,
-    ios: null,
     android: "http://www.dota168.org/",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: "http://www.dota168.org/",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "metawallet://com.metawallet.client",
-    universal: "http://www.dota168.org/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: "metawallet://",
     universal: "http://www.dota168.org/",
   },
+  homepage: "http://www.dota168.org/",
+  id: "org.dota168",
+  image_id: "a18337ad-433f-47c0-ea57-8a6199835e00",
+  mobile: {
+    native: "metawallet://com.metawallet.client",
+    universal: "http://www.dota168.org/",
+  },
+  name: "MetaWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.ecoinwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.ecoinwallet/index.ts
index 3750468bc9b..b4572e4f348 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.ecoinwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.ecoinwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.ecoinwallet",
-  name: "ECOIN Wallet",
-  homepage: "https://ecoinwallet.org",
-  image_id: "9639c263-d590-4862-ba9f-d5c7c1878d00",
   app: {
-    browser: null,
-    ios: null,
     android:
       "https://play.google.com/store/apps/details?id=org.ecoinwallet&referrer=utm_source%3Dwalletconnect%26utm_medium%3Dreown%26utm_content%3Dlink",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "ecoinwallet://",
-    universal: "https://ecoinwallet.org/link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ecoinwallet.org",
+  id: "org.ecoinwallet",
+  image_id: "9639c263-d590-4862-ba9f-d5c7c1878d00",
+  mobile: {
+    native: "ecoinwallet://",
+    universal: "https://ecoinwallet.org/link",
+  },
+  name: "ECOIN Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.gooddollar/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.gooddollar/index.ts
index 17d22ab0f7d..bc0e4dd7689 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.gooddollar/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.gooddollar/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.gooddollar",
-  name: "GoodDollar",
-  homepage: "https://gooddollar.org",
-  image_id: "371ab65b-e2c8-4843-f18a-cbcf2ba2ed00",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=org.gooddollar",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: "",
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: "gooddollar://",
     universal: "https://wallet.gooddollar.org/",
   },
-  desktop: {
+  homepage: "https://gooddollar.org",
+  id: "org.gooddollar",
+  image_id: "371ab65b-e2c8-4843-f18a-cbcf2ba2ed00",
+  mobile: {
     native: "gooddollar://",
     universal: "https://wallet.gooddollar.org/",
   },
+  name: "GoodDollar",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.hot-labs/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.hot-labs/index.ts
index d7297a02db4..c62c5fdcf0c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.hot-labs/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.hot-labs/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.hot-labs",
-  name: "HOT Wallet",
-  homepage: "https://hot-labs.org/wallet",
-  image_id: "809867ce-345f-4180-033a-165019d4c700",
   app: {
-    browser: "https://t.me/hot_wallet/app",
-    ios: "https://apps.apple.com/us/app/hot-wallet/id6740916148",
     android:
       "https://play.google.com/store/apps/details?id=app.herewallet.hot&hl=en_US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://t.me/hot_wallet/app",
     chrome:
       "https://chromewebstore.google.com/detail/hot-wallet/mpeengabcnhhjjgleiodimegnkpcenbk?pli=1",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/hot-wallet/id6740916148",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "hotwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://t.me/hot_wallet/app",
   },
+  homepage: "https://hot-labs.org/wallet",
+  id: "org.hot-labs",
+  image_id: "809867ce-345f-4180-033a-165019d4c700",
+  mobile: {
+    native: "hotwallet://",
+    universal: null,
+  },
+  name: "HOT Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.kelp/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.kelp/index.ts
index 395ac673b4d..e4e1c8c71d4 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.kelp/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.kelp/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.kelp",
-  name: "Kelp",
-  homepage: "https://kelp.org",
-  image_id: "1854e47d-3804-4e92-e455-06829b64b100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/kelp/id1632857274",
     android: "https://play.google.com/store/apps/details?id=com.app.kelpa",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/kelp/id1632857274",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "link.kelp.finance://walletconnect",
-    universal: "https://link.kelp.finance/walletconnect",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://kelp.org",
+  id: "org.kelp",
+  image_id: "1854e47d-3804-4e92-e455-06829b64b100",
+  mobile: {
+    native: "link.kelp.finance://walletconnect",
+    universal: "https://link.kelp.finance/walletconnect",
+  },
+  name: "Kelp",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.mathwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.mathwallet/index.ts
index 1dddd0e7208..9563a9ae9ba 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.mathwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.mathwallet/index.ts
@@ -2,34 +2,34 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.mathwallet",
-  name: "MathWallet",
-  homepage: "https://mathwallet.org/",
-  image_id: "26a8f588-3231-4411-60ce-5bb6b805a700",
   app: {
-    browser:
-      "https://chrome.google.com/webstore/detail/math-wallet/afbcbjpbpfadlkmhmclhkeeodmamcflc",
-    ios: "https://apps.apple.com/us/app/mathwallet5/id1582612388",
     android:
       "https://play.google.com/store/apps/details?id=com.mathwallet.android",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser:
+      "https://chrome.google.com/webstore/detail/math-wallet/afbcbjpbpfadlkmhmclhkeeodmamcflc",
     chrome:
       "https://chrome.google.com/webstore/detail/math-wallet/afbcbjpbpfadlkmhmclhkeeodmamcflc",
-    firefox: null,
-    safari: null,
     edge: "https://microsoftedge.microsoft.com/addons/detail/math-wallet/dfeccadlilpndjjohbjdblepmjeahlmm",
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/mathwallet5/id1582612388",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "mathwallet://",
-    universal: "https://www.mathwallet.org",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal:
       "https://chrome.google.com/webstore/detail/math-wallet/afbcbjpbpfadlkmhmclhkeeodmamcflc",
   },
+  homepage: "https://mathwallet.org/",
+  id: "org.mathwallet",
+  image_id: "26a8f588-3231-4411-60ce-5bb6b805a700",
+  mobile: {
+    native: "mathwallet://",
+    universal: "https://www.mathwallet.org",
+  },
+  name: "MathWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.mugambo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.mugambo/index.ts
index 50e386a06a8..096df74e079 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.mugambo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.mugambo/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.mugambo",
-  name: "rss wallet",
-  homepage: "https://mugambo.org",
-  image_id: "920c743d-950f-4d53-64ec-d342e272e500",
   app: {
-    browser: null,
-    ios: null,
     android: "https://bo.centapey.com/rsswallet_2.0.2.3.apk",
-    mac: null,
-    windows: null,
-    linux: "https://bo.centapey.com/rsswallet_2.0.2.3.apk",
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: "https://bo.centapey.com/rsswallet_2.0.2.3.apk",
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "rsswallet://rss.app.link",
-    universal: "https://rss.app.link/rsswallet",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://mugambo.org",
+  id: "org.mugambo",
+  image_id: "920c743d-950f-4d53-64ec-d342e272e500",
+  mobile: {
+    native: "rsswallet://rss.app.link",
+    universal: "https://rss.app.link/rsswallet",
+  },
+  name: "rss wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.shefi/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.shefi/index.ts
index 75e865d1b99..7b01a97073d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.shefi/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.shefi/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.shefi",
-  name: "SheFi",
-  homepage: "https://www.shefi.org",
-  image_id: "a1a909e8-526b-4452-8788-5bb21e2b9e00",
   app: {
-    browser: null,
-    ios: "https://testflight.apple.com/join/CEmx1nCa",
     android: "https://play.google.com/store/apps/details?id=org.shefi.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://testflight.apple.com/join/CEmx1nCa",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "shefi://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.shefi.org",
+  id: "org.shefi",
+  image_id: "a1a909e8-526b-4452-8788-5bb21e2b9e00",
+  mobile: {
+    native: "shefi://",
+    universal: null,
+  },
+  name: "SheFi",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.talkapp/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.talkapp/index.ts
index 2d9737cd30f..1201a083404 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.talkapp/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.talkapp/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.talkapp",
-  name: "T+ Wallet ",
-  homepage: "https://www.talkapp.org/",
-  image_id: "c08ff28f-5a52-4bf2-e63a-205905fd5800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/hk/app/talk-%E5%8A%A0%E5%AF%86%E8%B2%A8%E5%B9%A3%E4%BA%A4%E6%98%93%E5%8F%8Aai%E8%81%8A%E5%A4%A9%E9%80%9A%E8%A8%8A%E8%BB%9F%E4%BB%B6/id1547227377",
     android:
       "https://play.google.com/store/apps/details?id=org.talkapp&hl=en&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/hk/app/talk-%E5%8A%A0%E5%AF%86%E8%B2%A8%E5%B9%A3%E4%BA%A4%E6%98%93%E5%8F%8Aai%E8%81%8A%E5%A4%A9%E9%80%9A%E8%A8%8A%E8%BB%9F%E4%BB%B6/id1547227377",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "talkapp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.talkapp.org/",
+  id: "org.talkapp",
+  image_id: "c08ff28f-5a52-4bf2-e63a-205905fd5800",
+  mobile: {
+    native: "talkapp://",
+    universal: null,
+  },
+  name: "T+ Wallet ",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.thepulsewallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.thepulsewallet/index.ts
index 1230259f067..496d75d785c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.thepulsewallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.thepulsewallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.thepulsewallet",
-  name: "The Pulse Wallet",
-  homepage: "https://thepulsewallet.org/",
-  image_id: "1f3d46b8-2569-4601-5084-845f7e64da00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/vn/app/pulse-wallet/id6458346951",
     android:
       "https://play.google.com/store/apps/details?id=com.wallet.thepulse",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/vn/app/pulse-wallet/id6458346951",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wallet.pulse://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://thepulsewallet.org/",
+  id: "org.thepulsewallet",
+  image_id: "1f3d46b8-2569-4601-5084-845f7e64da00",
+  mobile: {
+    native: "wallet.pulse://",
+    universal: null,
+  },
+  name: "The Pulse Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.thetatoken/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.thetatoken/index.ts
index 34bc7d0e8a2..abafcd897d4 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.thetatoken/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.thetatoken/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.thetatoken",
-  name: "Theta Wallet",
-  homepage: "https://www.thetatoken.org/wallet",
-  image_id: "d4afb810-5925-4f00-4ebb-d180fcf29000",
   app: {
-    browser: "https://wallet.thetatoken.org",
-    ios: "https://apps.apple.com/app/theta-wallet/id1451094550",
     android:
       "https://play.google.com/store/apps/details?id=org.theta.wallet&pli=1",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: "https://wallet.thetatoken.org",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/theta-wallet/id1451094550",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wc://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.thetatoken.org",
   },
+  homepage: "https://www.thetatoken.org/wallet",
+  id: "org.thetatoken",
+  image_id: "d4afb810-5925-4f00-4ebb-d180fcf29000",
+  mobile: {
+    native: "wc://",
+    universal: null,
+  },
+  name: "Theta Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.thorwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.thorwallet/index.ts
index 04ce14b2e65..ec0efd3f875 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.thorwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.thorwallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.thorwallet",
-  name: "THORWallet",
-  homepage: "https://www.thorwallet.org/",
-  image_id: "45165bea-fdae-454e-7caa-31681f255200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/ch/app/thorwallet-defi-wallet/id1592064324",
     android:
       "https://play.google.com/store/apps/details?id=defisuisse.thorwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/ch/app/thorwallet-defi-wallet/id1592064324",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "thorwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.thorwallet.org/",
+  id: "org.thorwallet",
+  image_id: "45165bea-fdae-454e-7caa-31681f255200",
+  mobile: {
+    native: "thorwallet://",
+    universal: null,
+  },
+  name: "THORWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/org.uniswap/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/org.uniswap/index.ts
index 8ae0f6bb769..5196a6a2877 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/org.uniswap/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/org.uniswap/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "org.uniswap",
-  name: "Uniswap Wallet",
-  homepage: "https://uniswap.org",
-  image_id: "6033c33c-0773-48e3-a12f-e7fbf409e700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/uniswap-wallet/id6443944476",
     android: "https://play.google.com/store/apps/details?id=com.uniswap.mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/uniswap-wallet/id6443944476",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "uniswap://",
-    universal: "https://uniswap.org/app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://uniswap.org",
+  id: "org.uniswap",
+  image_id: "6033c33c-0773-48e3-a12f-e7fbf409e700",
+  mobile: {
+    native: "uniswap://",
+    universal: "https://uniswap.org/app",
+  },
+  name: "Uniswap Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/pk.modular/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/pk.modular/index.ts
index a700e5dfaad..59bbf4f89f7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/pk.modular/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/pk.modular/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "pk.modular",
-  name: "Modular Wallet Prod",
-  homepage: "https://modular.pk",
-  image_id: "70485da2-2568-463d-722c-25082997cc00",
   app: {
-    browser: "https://modular.pk",
-    ios: "https://testflight.apple.com/join/Zbf6wZaP",
     android: "https://play.google.com/store/apps/details?id=com.modular",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://modular.pk",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://testflight.apple.com/join/Zbf6wZaP",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "modularwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://modular.pk",
   },
+  homepage: "https://modular.pk",
+  id: "pk.modular",
+  image_id: "70485da2-2568-463d-722c-25082997cc00",
+  mobile: {
+    native: "modularwallet://",
+    universal: null,
+  },
+  name: "Modular Wallet Prod",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/pro.assure/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/pro.assure/index.ts
index 529ae663c86..a53382b069f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/pro.assure/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/pro.assure/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "pro.assure",
-  name: "Assure",
-  homepage: "https://www.assure.pro",
-  image_id: "64db7104-c8b7-44ea-e102-11ce87124200",
   app: {
-    browser: null,
-    ios: "http://itunes.apple.com/app/id1604825026",
     android: "https://play.google.com/store/apps/details?id=com.neuxs.assure",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "http://itunes.apple.com/app/id1604825026",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "assure://",
-    universal: "https://www.assure.pro/Official",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.assure.pro",
+  id: "pro.assure",
+  image_id: "64db7104-c8b7-44ea-e102-11ce87124200",
+  mobile: {
+    native: "assure://",
+    universal: "https://www.assure.pro/Official",
+  },
+  name: "Assure",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/pro.fintoken/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/pro.fintoken/index.ts
index 9c3cb52de47..cd77a602fe2 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/pro.fintoken/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/pro.fintoken/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "pro.fintoken",
-  name: "FINTOKEN",
-  homepage: "https://fintoken.pro/",
-  image_id: "420ababa-3c29-4711-4487-84b93bfa5900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/fintoken-web3-crypto-wallet/id6447503215",
     android:
       "https://play.google.com/store/apps/details?id=com.digitalasset.fintoken&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/fintoken-web3-crypto-wallet/id6447503215",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "fintoken://",
-    universal: "https://ios.fintoken.pro/app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://fintoken.pro/",
+  id: "pro.fintoken",
+  image_id: "420ababa-3c29-4711-4487-84b93bfa5900",
+  mobile: {
+    native: "fintoken://",
+    universal: "https://ios.fintoken.pro/app",
+  },
+  name: "FINTOKEN",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/pro.tokenpocket/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/pro.tokenpocket/index.ts
index d1fc68e0854..b5419a9e01c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/pro.tokenpocket/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/pro.tokenpocket/index.ts
@@ -2,33 +2,33 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "pro.tokenpocket",
-  name: "TokenPocket",
-  homepage: "https://tokenpocket.pro/",
-  image_id: "d8e930b6-ccde-471e-ecbe-6967b1c0c400",
   app: {
+    android: "https://play.google.com/store/apps/details?id=vip.mytokenpocket",
     browser:
       "https://chrome.google.com/webstore/detail/tokenpocket/mfgccjchihfkkindfppnaooecgfneiii",
-    ios: "https://apps.apple.com/us/app/tp-wallet/id6444625622?l=en",
-    android: "https://play.google.com/store/apps/details?id=vip.mytokenpocket",
-    mac: null,
-    windows: null,
-    linux: null,
     chrome:
       "https://chrome.google.com/webstore/detail/tokenpocket/mfgccjchihfkkindfppnaooecgfneiii",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/tp-wallet/id6444625622?l=en",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "pro.tokenpocket",
-  mobile: {
-    native: "tpoutside://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal:
       "https://chrome.google.com/webstore/detail/tokenpocket/mfgccjchihfkkindfppnaooecgfneiii",
   },
+  homepage: "https://tokenpocket.pro/",
+  id: "pro.tokenpocket",
+  image_id: "d8e930b6-ccde-471e-ecbe-6967b1c0c400",
+  mobile: {
+    native: "tpoutside://",
+    universal: null,
+  },
+  name: "TokenPocket",
+  rdns: "pro.tokenpocket",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/pub.dg/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/pub.dg/index.ts
index c2acba1b73f..6e24ff53c93 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/pub.dg/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/pub.dg/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "pub.dg",
-  name: "DGPub App",
-  homepage: "https://dg.pub",
-  image_id: "9d9a2700-4ab0-4c1c-4acf-8ed0037cc500",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/jo/app/dg-pub-a-gateway-to-web3/id6478573535",
     android:
       "https://play.google.com/store/apps/details?id=pub.dg.wallet&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/jo/app/dg-pub-a-gateway-to-web3/id6478573535",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "dgpub://",
-    universal: "https://dgpub.app.link",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://dg.pub",
+  id: "pub.dg",
+  image_id: "9d9a2700-4ab0-4c1c-4acf-8ed0037cc500",
+  mobile: {
+    native: "dgpub://",
+    universal: "https://dgpub.app.link",
+  },
+  name: "DGPub App",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/so.onekey.app.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/so.onekey.app.wallet/index.ts
index 1a87d60a45b..a442879493c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/so.onekey.app.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/so.onekey.app.wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "so.onekey.app.wallet",
-  name: "OneKey",
-  homepage: "https://onekey.so",
-  image_id: "2067c771-93e8-4b32-b388-b2a0e1d4dc00",
   app: {
-    browser: "https://onekey.so",
-    ios: "https://apps.apple.com/us/app/onekey-open-source-wallet/id1609559473",
     android:
       "https://play.google.com/store/apps/details?id=so.onekey.app.wallet&hl=en_US&gl=US",
-    mac: "https://github.com/OneKeyHQ/app-monorepo/releases",
-    windows: "https://github.com/OneKeyHQ/app-monorepo/releases",
-    linux: "https://github.com/OneKeyHQ/app-monorepo/releases",
+    browser: "https://onekey.so",
     chrome:
       "https://chrome.google.com/webstore/detail/onekey/jnmbobjmhlngoefaiojfljckilhhlhcj",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/onekey-open-source-wallet/id1609559473",
+    linux: "https://github.com/OneKeyHQ/app-monorepo/releases",
+    mac: "https://github.com/OneKeyHQ/app-monorepo/releases",
     opera: null,
+    safari: null,
+    windows: "https://github.com/OneKeyHQ/app-monorepo/releases",
   },
-  rdns: "so.onekey.app.wallet",
-  mobile: {
+  desktop: {
     native: "onekey-wallet://",
     universal: "https://app.onekey.so/wc/connect",
   },
-  desktop: {
+  homepage: "https://onekey.so",
+  id: "so.onekey.app.wallet",
+  image_id: "2067c771-93e8-4b32-b388-b2a0e1d4dc00",
+  mobile: {
     native: "onekey-wallet://",
     universal: "https://app.onekey.so/wc/connect",
   },
+  name: "OneKey",
+  rdns: "so.onekey.app.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/social.gm2/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/social.gm2/index.ts
index fe3329d2b17..169ecb594a1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/social.gm2/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/social.gm2/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "social.gm2",
-  name: "GM² Social",
-  homepage: "https://gm2.social/",
-  image_id: "f5c2218d-56b4-4fc8-63bf-0ece7276d600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/gm-social/id6502584673",
     android:
       "https://play.google.com/store/apps/details?id=com.gm2.app.prod&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/gm-social/id6502584673",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "gm2://home",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://gm2.social/",
+  id: "social.gm2",
+  image_id: "f5c2218d-56b4-4fc8-63bf-0ece7276d600",
+  mobile: {
+    native: "gm2://home",
+    universal: null,
+  },
+  name: "GM² Social",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/social.halo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/social.halo/index.ts
index 70ffab3158e..4f51459a06f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/social.halo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/social.halo/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "social.halo",
-  name: "Halo Wallet",
-  homepage: "https://halo.social/",
-  image_id: "80583973-8b44-4bef-0af9-099cfdbed600",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/hk/app/id1633572905",
     android: "https://play.google.com/store/apps/details?id=com.kucoin.wallet",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/halo-wallet/nbdpmlhambbdkhkmbfpljckjcmgibalo",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/hk/app/id1633572905",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "halowallet://",
-    universal: "https://link.kuwallet.com/universallink",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://halo.social/",
+  id: "social.halo",
+  image_id: "80583973-8b44-4bef-0af9-099cfdbed600",
+  mobile: {
+    native: "halowallet://",
+    universal: "https://link.kuwallet.com/universallink",
+  },
+  name: "Halo Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/tech.defiantapp/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/tech.defiantapp/index.ts
index 8fa2c4fdb7b..8483b62872d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/tech.defiantapp/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/tech.defiantapp/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "tech.defiantapp",
-  name: "Defiant",
-  homepage: "https://www.defiantapp.tech/",
-  image_id: "11a96ca4-3592-42ae-c781-2b7265ec9200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/defiant-wallet/id1559622756",
     android:
       "https://play.google.com/store/apps/details?id=ar.com.andinasmart.defiant&hl=en",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/defiant-wallet/id1559622756",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "defiantapp://",
-    universal: "https://defiantapp.tech/",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.defiantapp.tech/",
+  id: "tech.defiantapp",
+  image_id: "11a96ca4-3592-42ae-c781-2b7265ec9200",
+  mobile: {
+    native: "defiantapp://",
+    universal: "https://defiantapp.tech/",
+  },
+  name: "Defiant",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/tech.levain/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/tech.levain/index.ts
index 4124c69495f..35f5153e1af 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/tech.levain/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/tech.levain/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "tech.levain",
-  name: "Levain",
-  homepage: "https://levain.tech/",
-  image_id: "504f6043-9d47-4dd9-5332-49ea67e93100",
   app: {
-    browser: "https://app.levain.tech/",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://app.levain.tech/",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "tech.levain",
-  mobile: {
-    native: null,
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://app.levain.tech/",
   },
+  homepage: "https://levain.tech/",
+  id: "tech.levain",
+  image_id: "504f6043-9d47-4dd9-5332-49ea67e93100",
+  mobile: {
+    native: null,
+    universal: null,
+  },
+  name: "Levain",
+  rdns: "tech.levain",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/tech.okto/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/tech.okto/index.ts
index e376b98a557..95ca95889f7 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/tech.okto/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/tech.okto/index.ts
@@ -2,33 +2,33 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "tech.okto",
-  name: "Okto",
-  homepage: "https://okto.tech/",
-  image_id: "154c69b7-9bb1-4010-5b4c-6b37eeda8900",
   app: {
-    browser:
-      "https://okto.go.link/?adj_t=j39b9kp&adj_fallback=https%3A%2F%2Fokto.tech&adj_redirect_macos=https%3A%2F%2Fokto.tech",
-    ios: "https://apps.apple.com/in/app/okto-wallet/id6450688229",
     android:
       "https://play.google.com/store/apps/details?id=com.coindcx.okto&hl=en_IN&gl=US",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser:
+      "https://okto.go.link/?adj_t=j39b9kp&adj_fallback=https%3A%2F%2Fokto.tech&adj_redirect_macos=https%3A%2F%2Fokto.tech",
     chrome: "https://okto.tech/",
-    firefox: null,
-    safari: "https://okto.tech/",
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/okto-wallet/id6450688229",
+    linux: null,
+    mac: "",
     opera: null,
+    safari: "https://okto.tech/",
+    windows: null,
   },
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: "https://okto.tech/",
+  },
+  homepage: "https://okto.tech/",
+  id: "tech.okto",
+  image_id: "154c69b7-9bb1-4010-5b4c-6b37eeda8900",
   mobile: {
     native: "okto://",
     universal:
       "https://okto.go.link/?adj_t=j39b9kp&adj_fallback=https%3A%2F%2Fokto.tech&adj_redirect_macos=https%3A%2F%2Fokto.tech",
   },
-  desktop: {
-    native: null,
-    universal: "https://okto.tech/",
-  },
+  name: "Okto",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/technology.jambo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/technology.jambo/index.ts
index 93aecaaedc0..5fe9273b042 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/technology.jambo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/technology.jambo/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "technology.jambo",
-  name: "Jambo",
-  homepage: "https://www.jambo.technology/",
-  image_id: "b0fd39a1-d147-4bf7-4cb5-68a294b26f00",
   app: {
-    browser: null,
-    ios: null,
     android: "https://play.google.com/store/apps/details?id=com.jambo",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "jbw://walletconnect",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.jambo.technology/",
+  id: "technology.jambo",
+  image_id: "b0fd39a1-d147-4bf7-4cb5-68a294b26f00",
+  mobile: {
+    native: "jbw://walletconnect",
+    universal: null,
+  },
+  name: "Jambo",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/technology.obvious/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/technology.obvious/index.ts
index 6f091955c81..83752eb0b12 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/technology.obvious/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/technology.obvious/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "technology.obvious",
-  name: "Obvious",
-  homepage: "https://obvious.technology",
-  image_id: "fe1b9394-55af-4828-a70d-5c5b7de6b200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/in/app/obvious-crypto-wallet/id1643088398",
     android:
       "https://play.google.com/store/apps/details?id=com.hashhalli.obvious",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/in/app/obvious-crypto-wallet/id1643088398",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "obvious://",
-    universal: "https://wallet.obvious.technology",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://obvious.technology",
+  id: "technology.obvious",
+  image_id: "fe1b9394-55af-4828-a70d-5c5b7de6b200",
+  mobile: {
+    native: "obvious://",
+    universal: "https://wallet.obvious.technology",
+  },
+  name: "Obvious",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/trade.flooz.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/trade.flooz.wallet/index.ts
index f38d983d35b..8ed570fc31e 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/trade.flooz.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/trade.flooz.wallet/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "trade.flooz.wallet",
-  name: "Flooz",
-  homepage: "https://wallet.flooz.trade",
-  image_id: "0a04f368-4f56-4c12-0bfa-93b14bb20800",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/id1621027074",
     android:
       "https://play.google.com/store/apps/details?id=wallet.flooz.mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1621027074",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "floozwallet://",
-    universal: "https://wallet.flooz.trade/wc",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://wallet.flooz.trade/",
   },
+  homepage: "https://wallet.flooz.trade",
+  id: "trade.flooz.wallet",
+  image_id: "0a04f368-4f56-4c12-0bfa-93b14bb20800",
+  mobile: {
+    native: "floozwallet://",
+    universal: "https://wallet.flooz.trade/wc",
+  },
+  name: "Flooz",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/us.binance/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/us.binance/index.ts
index 3dc4cc2be11..5629e561e68 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/us.binance/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/us.binance/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "us.binance",
-  name: "Binance.US",
-  homepage: "https://binance.us",
-  image_id: "48aa1a7d-c5fe-4ad6-c2f2-e5684b296900",
   app: {
-    browser: null,
-    ios: "https://itunes.apple.com/app/id1492670702",
     android: "https://play.google.com/store/apps/details?id=com.binance.us",
-    mac: "",
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/app/id1492670702",
+    linux: null,
+    mac: "",
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bncus://binance.us",
-    universal: "https://binance.us/universal_JHHGDSKDJ",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://binance.us",
+  id: "us.binance",
+  image_id: "48aa1a7d-c5fe-4ad6-c2f2-e5684b296900",
+  mobile: {
+    native: "bncus://binance.us",
+    universal: "https://binance.us/universal_JHHGDSKDJ",
+  },
+  name: "Binance.US",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/vc.uincubator.api/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/vc.uincubator.api/index.ts
index 46aedbf7eb3..a41ec852b4a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/vc.uincubator.api/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/vc.uincubator.api/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "vc.uincubator.api",
-  name: "UIIC",
-  homepage: "https://api.uincubator.vc/download/?company_id=NTU2NjIwMDA=",
-  image_id: "cdd77592-c1ba-4dc2-f2a6-c454e2c19800",
   app: {
-    browser: null,
-    ios: null,
     android: "https://api.uincubator.vc/download/?company_id=NTU2NjIwMDA=",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "uiwallet://?uri=",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://api.uincubator.vc/download/?company_id=NTU2NjIwMDA=",
+  id: "vc.uincubator.api",
+  image_id: "cdd77592-c1ba-4dc2-f2a6-c454e2c19800",
+  mobile: {
+    native: "uiwallet://?uri=",
+    universal: null,
+  },
+  name: "UIIC",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/world.dosi.vault/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/world.dosi.vault/index.ts
index c37a47b5731..29d311f485d 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/world.dosi.vault/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/world.dosi.vault/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "world.dosi.vault",
-  name: "DOSI Vault",
-  homepage: "https://vault.dosi.world/",
-  image_id: "0a0d223e-6bf7-4e12-a5b4-1720deb02000",
   app: {
-    browser: "https://vault.dosi.world/",
-    ios: "https://apps.apple.com/kr/app/dosi-vault/id1664013594",
     android: "https://play.google.com/store/apps/details?id=world.dosi.vault",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://vault.dosi.world/",
     chrome:
       "https://chrome.google.com/webstore/detail/dosi-vault/blpiicikpimmklhoiploliaenjmecabp?hl=en",
+    edge: null,
     firefox:
       "https://addons.mozilla.org/ko/firefox/addon/dosi-vault/?utm_source=addons.mozilla.org&utm_medium=referral&utm_content=search",
-    safari: null,
-    edge: null,
+    ios: "https://apps.apple.com/kr/app/dosi-vault/id1664013594",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "app.dosivault://",
-    universal: "https://dosivault.page.link/qL6j",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://vault.dosi.world/",
   },
+  homepage: "https://vault.dosi.world/",
+  id: "world.dosi.vault",
+  image_id: "0a0d223e-6bf7-4e12-a5b4-1720deb02000",
+  mobile: {
+    native: "app.dosivault://",
+    universal: "https://dosivault.page.link/qL6j",
+  },
+  name: "DOSI Vault",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/world.fncy/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/world.fncy/index.ts
index 92cb064e838..06f913c2fb1 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/world.fncy/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/world.fncy/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "world.fncy",
-  name: "Fncy Mobile Wallet",
-  homepage: "https://fncy.world",
-  image_id: "c1c8d374-dff3-419c-96af-3515d0192100",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/fncy-blockchain-platform/id1613707166",
     android:
       "https://play.google.com/store/apps/details?id=com.metaverse.world.cube&hl=en_US&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/fncy-blockchain-platform/id1613707166",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "metaCubeWallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://fncy.world",
+  id: "world.fncy",
+  image_id: "c1c8d374-dff3-419c-96af-3515d0192100",
+  mobile: {
+    native: "metaCubeWallet://",
+    universal: null,
+  },
+  name: "Fncy Mobile Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/world.ixo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/world.ixo/index.ts
index 8d7c2e53a6c..8b4ff838cd5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/world.ixo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/world.ixo/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "world.ixo",
-  name: "Impact Wallet",
-  homepage: "https://www.ixo.world/",
-  image_id: "afc85418-2ca6-46cf-cfb9-daf6bc43e400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/impacts-x/id6444948058",
     android: "https://play.google.com/store/apps/details?id=com.ixo.mobile",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/impacts-x/id6444948058",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "impactsx://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.ixo.world/",
+  id: "world.ixo",
+  image_id: "afc85418-2ca6-46cf-cfb9-daf6bc43e400",
+  mobile: {
+    native: "impactsx://",
+    universal: null,
+  },
+  name: "Impact Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/world.qoin/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/world.qoin/index.ts
index 592d9d138fb..1b1d5e998a3 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/world.qoin/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/world.qoin/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "world.qoin",
-  name: "Qoin Wallet",
-  homepage: "https://qoin.world",
-  image_id: "0490da30-b59c-4365-fef8-33a3e0aa4700",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/au/app/qoin-wallet/id1483718254",
     android: "https://play.google.com/store/apps/details?id=com.qoin.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/au/app/qoin-wallet/id1483718254",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "wcqoin://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://qoin.world",
+  id: "world.qoin",
+  image_id: "0490da30-b59c-4365-fef8-33a3e0aa4700",
+  mobile: {
+    native: "wcqoin://",
+    universal: null,
+  },
+  name: "Qoin Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.abs/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.abs/index.ts
index 7100900faab..e199feb1e8a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.abs/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.abs/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.abs",
-  name: "Abstract Global Wallet",
-  homepage: "https://abs.xyz/",
-  image_id: "abstract.png",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "xyz.abs",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://abs.xyz/",
+  id: "xyz.abs",
+  image_id: "abstract.png",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Abstract Global Wallet",
+  rdns: "xyz.abs",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.argent/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.argent/index.ts
index 00e0448525f..9e2bf2ee343 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.argent/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.argent/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.argent",
-  name: "Argent",
-  homepage: "https://www.argent.xyz",
-  image_id: "215158d2-614b-49c9-410f-77aa661c3900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/argent-defi-in-a-tap/id1358741926",
     android:
       "https://play.google.com/store/apps/details?id=im.argent.contractwalletclient&hl=en&gl=US&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/argent-defi-in-a-tap/id1358741926",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "argent://app/",
-    universal: "https://www.argent.xyz/app",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.argent.xyz",
+  id: "xyz.argent",
+  image_id: "215158d2-614b-49c9-410f-77aa661c3900",
+  mobile: {
+    native: "argent://app/",
+    universal: "https://www.argent.xyz/app",
+  },
+  name: "Argent",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.bonuz/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.bonuz/index.ts
index 41b361fc373..a153103d18a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.bonuz/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.bonuz/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.bonuz",
-  name: "Bonuz Social Smart Wallet",
-  homepage: "https://bonuz.xyz",
-  image_id: "eb376138-c5b9-4d82-c610-c98c9c218a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/eg/app/bonuz-social-smart-wallet/id1637687439",
     android: "https://play.google.com/store/apps/details?id=market.bonuz.app",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/eg/app/bonuz-social-smart-wallet/id1637687439",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "bonuzapp://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://bonuz.xyz",
+  id: "xyz.bonuz",
+  image_id: "eb376138-c5b9-4d82-c610-c98c9c218a00",
+  mobile: {
+    native: "bonuzapp://",
+    universal: null,
+  },
+  name: "Bonuz Social Smart Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.coca/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.coca/index.ts
index d8d0ec5033c..b5765cbf9e0 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.coca/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.coca/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.coca",
-  name: "COCA Wallet",
-  homepage: "https://www.coca.xyz/",
-  image_id: "34c9a3a1-a331-4c30-f7bc-182861ccca00",
   app: {
-    browser: "https://wirexapp.com/wirex-wallet",
-    ios: "https://apps.apple.com/app/id1594165139",
     android: "https://play.google.com/store/apps/details?id=com.wirex.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://wirexapp.com/wirex-wallet",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/id1594165139",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: "https://wirexapp.com/wirex-wallet",
+  },
+  homepage: "https://www.coca.xyz/",
+  id: "xyz.coca",
+  image_id: "34c9a3a1-a331-4c30-f7bc-182861ccca00",
   mobile: {
     native: "wirexwallet://",
     universal:
       "https://wwallet.app.link/wc?uri=wc:00e46b69-d0cc-4b3e-b6a2-cee442f97188@1?bridge=https%3A%2F%2Fbridge.walletconnect.org&key=91303dedf64285cbbaf9120f6e9d160a5c8aa3deb67017a3874cd272323f48ae",
   },
-  desktop: {
-    native: null,
-    universal: "https://wirexapp.com/wirex-wallet",
-  },
+  name: "COCA Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.ctrl/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.ctrl/index.ts
index 4576de9825a..3d7e351bc2c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.ctrl/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.ctrl/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.ctrl",
-  name: "Ctrl Wallet",
-  homepage: "https://ctrl.xyz/",
-  image_id: "749856b0-3f0e-4876-4d0f-27835310db00",
   app: {
-    browser: "https://ctrl.xyz/",
-    ios: "https://apps.apple.com/us/app/ctrl-wallet/id6630386336",
     android: "https://play.google.com/store/apps/details?id=xyz.ctrl.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://ctrl.xyz/",
     chrome:
       "https://chrome.google.com/webstore/detail/ctrl-wallet/hmeobnfnfcmdkdcmlblgagmfpfboieaf?hl=en",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/ctrl-wallet/id6630386336",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "xyz.ctrl",
-  mobile: {
-    native: "ctrl-mobile://",
-    universal: "https://ctrl.xyz/deeplink/wallet",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://ctrl.xyz/",
+  id: "xyz.ctrl",
+  image_id: "749856b0-3f0e-4876-4d0f-27835310db00",
+  mobile: {
+    native: "ctrl-mobile://",
+    universal: "https://ctrl.xyz/deeplink/wallet",
+  },
+  name: "Ctrl Wallet",
+  rdns: "xyz.ctrl",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.dawnwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.dawnwallet/index.ts
index 6a461fe5b9d..270c884253a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.dawnwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.dawnwallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.dawnwallet",
-  name: "Dawn Wallet",
-  homepage: "https://www.dawnwallet.xyz",
-  image_id: "dawn.svg",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/dawn-ethereum-wallet/id1673143782",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: "https://apps.apple.com/us/app/dawn-ethereum-wallet/id1673143782",
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/dawn-ethereum-wallet/id1673143782",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: "https://apps.apple.com/us/app/dawn-ethereum-wallet/id1673143782",
+    windows: null,
   },
-  rdns: "xyz.dawnwallet",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://www.dawnwallet.xyz",
+  id: "xyz.dawnwallet",
+  image_id: "dawn.svg",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Dawn Wallet",
+  rdns: "xyz.dawnwallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.echooo/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.echooo/index.ts
index 02cb9b9cd7e..29f04d8a2d9 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.echooo/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.echooo/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.echooo",
-  name: "Echooo Wallet",
-  homepage: "https://www.echooo.xyz/",
-  image_id: "a7b1de20-bafd-4ab9-c31d-7d398cc90a00",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/echooo-crypto-aa-wallet-defi/id6446883725",
     android:
       "https://play.google.com/store/apps/details?id=com.smartwallet.app&hl=en_US&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/echooo-wallet/lcmncloheoekhbmljjlhdlaobkedjbgd",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/echooo-crypto-aa-wallet-defi/id6446883725",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "echooo://echooo.valleysound.xyz/vss/walletconnect",
-    universal: "https://api.valleysound.xyz/vss/*",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://www.echooo.xyz/",
+  id: "xyz.echooo",
+  image_id: "a7b1de20-bafd-4ab9-c31d-7d398cc90a00",
+  mobile: {
+    native: "echooo://echooo.valleysound.xyz/vss/walletconnect",
+    universal: "https://api.valleysound.xyz/vss/*",
+  },
+  name: "Echooo Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.frontier.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.frontier.wallet/index.ts
index 28d71cae719..e2679b04d23 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.frontier.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.frontier.wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.frontier.wallet",
-  name: "Frontier",
-  homepage: "https://www.frontier.xyz",
-  image_id: "a78c4d48-32c1-4a9d-52f2-ec7ee08ce200",
   app: {
-    browser: "https://www.frontier.xyz/download",
-    ios: "https://apps.apple.com/us/app/frontier-defi-wallet/id1482380988",
     android:
       "https://play.google.com/store/apps/details?id=com.frontierwallet&hl=en_IN&gl=US",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: "https://www.frontier.xyz/download",
     chrome:
       "https://chrome.google.com/webstore/detail/frontier-wallet/kppfdiipphfccemcignhifpjkapfbihd",
-    firefox: null,
-    safari: null,
     edge: "https://chrome.google.com/webstore/detail/frontier-wallet/kppfdiipphfccemcignhifpjkapfbihd",
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/frontier-defi-wallet/id1482380988",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "xyz.frontier.wallet",
-  mobile: {
-    native: "frontier://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: "https://www.frontier.xyz/download",
   },
+  homepage: "https://www.frontier.xyz",
+  id: "xyz.frontier.wallet",
+  image_id: "a78c4d48-32c1-4a9d-52f2-ec7ee08ce200",
+  mobile: {
+    native: "frontier://",
+    universal: null,
+  },
+  name: "Frontier",
+  rdns: "xyz.frontier.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.nestwallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.nestwallet/index.ts
index b05a2a06753..f532dade649 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.nestwallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.nestwallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.nestwallet",
-  name: "Nest Wallet",
-  homepage: "https://nestwallet.xyz",
-  image_id: "9f471f97-0b62-4af9-6198-fc9c4bd58000",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/nest-wallet/id6451122334",
     android:
       "https://play.google.com/store/apps/details?id=xyz.nestwallet.nestwallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/nest-wallet/cmoakldedjfnjofgbbfenefcagmedlga",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/nest-wallet/id6451122334",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: "xyz.nestwallet",
-  mobile: {
-    native: "nestwallet://",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://nestwallet.xyz",
+  id: "xyz.nestwallet",
+  image_id: "9f471f97-0b62-4af9-6198-fc9c4bd58000",
+  mobile: {
+    native: "nestwallet://",
+    universal: null,
+  },
+  name: "Nest Wallet",
+  rdns: "xyz.nestwallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.orion/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.orion/index.ts
index 00e2cbf998f..95580b863e5 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.orion/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.orion/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.orion",
-  name: "Orion",
-  homepage: "https://orion.xyz",
-  image_id: "85007828-9522-4517-6a55-6f376de8a500",
   app: {
-    browser: null,
-    ios: "https://itunes.apple.com/app/id1659758160",
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://itunes.apple.com/app/id1659758160",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "orion://wc?",
-    universal: null,
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://orion.xyz",
+  id: "xyz.orion",
+  image_id: "85007828-9522-4517-6a55-6f376de8a500",
+  mobile: {
+    native: "orion://wc?",
+    universal: null,
+  },
+  name: "Orion",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.roam.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.roam.wallet/index.ts
index d5eb2f7977f..397472a572a 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.roam.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.roam.wallet/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.roam.wallet",
-  name: "Roam",
-  homepage: "https://roam.xyz",
-  image_id: "a4500b0c-47e3-4c4a-207e-d72a57f1ca00",
   app: {
-    browser: null,
-    ios: "https://testflight.apple.com/join/hM8Ba1Qd",
     android: "https://google.com",
-    mac: "https://google.com",
-    windows: "https://google.com",
-    linux: "https://google.com",
+    browser: null,
     chrome: "Roam.xyz",
-    firefox: "https://google.com",
-    safari: "https://google.com",
     edge: "https://google.com",
+    firefox: "https://google.com",
+    ios: "https://testflight.apple.com/join/hM8Ba1Qd",
+    linux: "https://google.com",
+    mac: "https://google.com",
     opera: "https://google.com",
+    safari: "https://google.com",
+    windows: "https://google.com",
   },
-  rdns: "xyz.roam.wallet",
-  mobile: {
+  desktop: {
     native: "roam://",
     universal: null,
   },
-  desktop: {
+  homepage: "https://roam.xyz",
+  id: "xyz.roam.wallet",
+  image_id: "a4500b0c-47e3-4c4a-207e-d72a57f1ca00",
+  mobile: {
     native: "roam://",
     universal: null,
   },
+  name: "Roam",
+  rdns: "xyz.roam.wallet",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.sequence/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.sequence/index.ts
index 71f7d5d40db..ee6332c0995 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.sequence/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.sequence/index.ts
@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.sequence",
-  name: "Sequence Wallet",
-  homepage: "https://sequence.xyz/",
-  image_id: "b2d5c39c-a485-4efa-5736-a782204e4a00",
   app: {
-    browser: "https://sequence.app",
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: "https://sequence.app/",
+    browser: "https://sequence.app",
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: "https://sequence.app/",
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: "https://sequence.app",
   },
-  desktop: {
+  homepage: "https://sequence.xyz/",
+  id: "xyz.sequence",
+  image_id: "b2d5c39c-a485-4efa-5736-a782204e4a00",
+  mobile: {
     native: null,
     universal: "https://sequence.app",
   },
+  name: "Sequence Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.talisman/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.talisman/index.ts
index 6bd474826c1..164cda72071 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.talisman/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.talisman/index.ts
@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.talisman",
-  name: "Talisman Wallet",
-  homepage: "https://talisman.xyz",
-  image_id: "ba290222-c3f3-4194-23bf-28ba7587af00",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chromewebstore.google.com/detail/talisman-wallet/fijngjgcjhjmmpcmkeiomlglpeiijkld",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: "xyz.talisman",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://talisman.xyz",
+  id: "xyz.talisman",
+  image_id: "ba290222-c3f3-4194-23bf-28ba7587af00",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Talisman Wallet",
+  rdns: "xyz.talisman",
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.timelesswallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.timelesswallet/index.ts
index c12d2e62003..a9c8f2a810c 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.timelesswallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.timelesswallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.timelesswallet",
-  name: "Timeless X",
-  homepage: "https://timelesswallet.xyz",
-  image_id: "7870d465-6028-49cb-6667-d0a2cc509400",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/us/app/timeless-x/id6470180600",
     android:
       "https://play.google.com/store/apps/details?id=xyz.timelesswallet.aa",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/ifcpkdgcgcepjdkfcogehpnhpipejgho",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/us/app/timeless-x/id6470180600",
+    linux: null,
+    mac: null,
     opera: null,
-  },
-  rdns: null,
-  mobile: {
-    native: "timeless-x://connect",
-    universal: "https://timelesswallet.xyz/x",
+    safari: null,
+    windows: null,
   },
   desktop: {
     native: null,
     universal: null,
   },
+  homepage: "https://timelesswallet.xyz",
+  id: "xyz.timelesswallet",
+  image_id: "7870d465-6028-49cb-6667-d0a2cc509400",
+  mobile: {
+    native: "timeless-x://connect",
+    universal: "https://timelesswallet.xyz/x",
+  },
+  name: "Timeless X",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.uniultra.wallet/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.uniultra.wallet/index.ts
index 43852d316c9..0ead7bdb09f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/xyz.uniultra.wallet/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/xyz.uniultra.wallet/index.ts
@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "xyz.uniultra.wallet",
-  name: "U2U Wallet",
-  homepage: "https://wallet.uniultra.xyz/",
-  image_id: "03bca3fc-c191-4877-592d-0b0d6557c900",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/vn/app/u2u-wallet/id6446194312?l=vi",
     android: "https://play.google.com/store/apps/details?id=org.u2u.wallet",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/u2u-wallet/ebjfhkbnnbjhcedilbedghedfgiaioed",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/vn/app/u2u-wallet/id6446194312?l=vi",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
+  homepage: "https://wallet.uniultra.xyz/",
+  id: "xyz.uniultra.wallet",
+  image_id: "03bca3fc-c191-4877-592d-0b0d6557c900",
   mobile: {
     native: "u2uwc://",
     universal:
       "https://u2u.page.link/?apn=org.u2u.wallet&isi=6446194312&ibi=org.uniultra.wallet&link=https://uniultra.xyz/?referrer%3D",
   },
-  desktop: {
-    native: null,
-    universal: null,
-  },
+  name: "U2U Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/__generated__/wallet/zone.bitverse/index.ts b/packages/thirdweb/src/wallets/__generated__/wallet/zone.bitverse/index.ts
index c09f9514d20..1e30bfce09f 100644
--- a/packages/thirdweb/src/wallets/__generated__/wallet/zone.bitverse/index.ts
+++ b/packages/thirdweb/src/wallets/__generated__/wallet/zone.bitverse/index.ts
@@ -2,33 +2,33 @@
 // Do not modify this file manually.
 
 export const wallet = {
-  id: "zone.bitverse",
-  name: "Bitverse",
-  homepage: "https://www.bitverse.zone",
-  image_id: "5851c585-0f2b-41a1-a36a-221a18af5200",
   app: {
-    browser: null,
-    ios: "https://apps.apple.com/app/1645515614",
     android:
       "https://play.google.com/store/apps/details?id=com.bitverse.app&pli=1",
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome:
       "https://chrome.google.com/webstore/detail/bitverse-wallet/gkeelndblnomfmjnophbhfhcjbcnemka",
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: "https://apps.apple.com/app/1645515614",
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
+  homepage: "https://www.bitverse.zone",
+  id: "zone.bitverse",
+  image_id: "5851c585-0f2b-41a1-a36a-221a18af5200",
   mobile: {
     native: "bitverseapp://open/wallet",
     universal:
       "https://bitverseapp.page.link/?apn=com.bitverse.app&afl=https://bitverse.zone/download?deeplink%3Dbitverseapp://open/wallet&isi=1645515614&ibi=com.bitverse.app&link=https://bitverse.zone/download?deeplink%3Dbitverseapp://open/wallet?uri=",
   },
-  desktop: {
-    native: null,
-    universal: null,
-  },
+  name: "Bitverse",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/coinbase/coinbase-mobile.test.ts b/packages/thirdweb/src/wallets/coinbase/coinbase-mobile.test.ts
index baa014e89f0..63baeb51bbd 100644
--- a/packages/thirdweb/src/wallets/coinbase/coinbase-mobile.test.ts
+++ b/packages/thirdweb/src/wallets/coinbase/coinbase-mobile.test.ts
@@ -17,10 +17,10 @@ vi.mock("@mobile-wallet-protocol/client", () => ({
       };
     }
   },
+  handleResponse: vi.fn(),
   Wallets: {
     CoinbaseSmartWallet: {},
   },
-  handleResponse: vi.fn(),
 }));
 
 vi.mock("@coinbase/wallet-mobile-sdk", () => ({
@@ -48,8 +48,8 @@ describe("Coinbase Mobile", () => {
 
   test("getCoinbaseMobileProvider initializes smart wallet provider", async () => {
     const options: CoinbaseWalletCreationOptions = {
-      walletConfig: { options: "smartWalletOnly" },
       mobileConfig: { callbackURL: "https://example.com" },
+      walletConfig: { options: "smartWalletOnly" },
     };
 
     provider = await getCoinbaseMobileProvider(options);
diff --git a/packages/thirdweb/src/wallets/coinbase/coinbase-mobile.ts b/packages/thirdweb/src/wallets/coinbase/coinbase-mobile.ts
index f3425715786..1fad6dbd744 100644
--- a/packages/thirdweb/src/wallets/coinbase/coinbase-mobile.ts
+++ b/packages/thirdweb/src/wallets/coinbase/coinbase-mobile.ts
@@ -50,10 +50,10 @@ async function initSmartWalletProvider(
   }
   const sdk = new EIP1193Provider({
     metadata: {
-      name: options?.appMetadata?.name || "thirdweb powered app",
       chainIds: options?.chains?.map((c) => c.id),
       customScheme: appDeeplinkUrl,
       logoUrl: options?.appMetadata?.logoUrl,
+      name: options?.appMetadata?.name || "thirdweb powered app",
     },
     wallet: Wallets.CoinbaseSmartWallet, // TODO support both smart and EOA once the SDK supports it
   });
@@ -72,8 +72,8 @@ async function initCoinbaseAppProvider(
   const { configure } = await import("@coinbase/wallet-mobile-sdk");
   configure({
     callbackURL: new URL(appDeeplinkUrl),
-    hostURL: new URL("https://wallet.coinbase.com/wsegue"),
     hostPackageName: "org.toshi",
+    hostURL: new URL("https://wallet.coinbase.com/wsegue"),
   });
   let CoinbaseWalletMobileSDK = (
     await import(
@@ -94,7 +94,7 @@ async function initCoinbaseAppProvider(
   }
   const chain = options.chains?.[0];
   return new CoinbaseWalletMobileSDK({
-    jsonRpcUrl: chain?.rpc,
     chainId: chain?.id,
+    jsonRpcUrl: chain?.rpc,
   });
 }
diff --git a/packages/thirdweb/src/wallets/coinbase/coinbase-wallet.ts b/packages/thirdweb/src/wallets/coinbase/coinbase-wallet.ts
index 54aeb2106ce..041f6afaf1a 100644
--- a/packages/thirdweb/src/wallets/coinbase/coinbase-wallet.ts
+++ b/packages/thirdweb/src/wallets/coinbase/coinbase-wallet.ts
@@ -21,8 +21,8 @@ export function coinbaseWalletSDK(args: {
 }): Wallet<typeof COINBASE> {
   const { createOptions } = args;
   const emitter = createWalletEmitter<typeof COINBASE>();
-  let account: Account | undefined = undefined;
-  let chain: Chain | undefined = undefined;
+  let account: Account | undefined;
+  let chain: Chain | undefined;
 
   function reset() {
     account = undefined;
@@ -53,18 +53,6 @@ export function coinbaseWalletSDK(args: {
   });
 
   return {
-    id: COINBASE,
-    subscribe: emitter.subscribe,
-    getChain() {
-      if (!chain) {
-        return undefined;
-      }
-
-      chain = getCachedChainIfExists(chain.id) || chain;
-      return chain;
-    },
-    getConfig: () => createOptions,
-    getAccount: () => account,
     autoConnect: async (options) => {
       const { autoConnectCoinbaseWalletSDK } = await import(
         "./coinbase-web.js"
@@ -78,10 +66,10 @@ export function coinbaseWalletSDK(args: {
       handleDisconnect = doDisconnect;
       handleSwitchChain = doSwitchChain;
       trackConnect({
+        chainId: chain.id,
         client: options.client,
-        walletType: COINBASE,
         walletAddress: account.address,
-        chainId: chain.id,
+        walletType: COINBASE,
       });
       // return account
       return account;
@@ -98,10 +86,10 @@ export function coinbaseWalletSDK(args: {
       handleDisconnect = doDisconnect;
       handleSwitchChain = doSwitchChain;
       trackConnect({
+        chainId: chain.id,
         client: options.client,
-        walletType: COINBASE,
         walletAddress: account.address,
-        chainId: chain.id,
+        walletType: COINBASE,
       });
       // return account
       return account;
@@ -110,14 +98,26 @@ export function coinbaseWalletSDK(args: {
       reset();
       await handleDisconnect();
     },
-    switchChain: async (newChain) => {
-      await handleSwitchChain(newChain);
+    getAccount: () => account,
+    getChain() {
+      if (!chain) {
+        return undefined;
+      }
+
+      chain = getCachedChainIfExists(chain.id) || chain;
+      return chain;
     },
+    getConfig: () => createOptions,
+    id: COINBASE,
     onConnectRequested: async () => {
       if (args.onConnectRequested) {
         const provider = await args.providerFactory();
         return args.onConnectRequested?.(provider);
       }
     },
+    subscribe: emitter.subscribe,
+    switchChain: async (newChain) => {
+      await handleSwitchChain(newChain);
+    },
   };
 }
diff --git a/packages/thirdweb/src/wallets/coinbase/coinbase-web.test.ts b/packages/thirdweb/src/wallets/coinbase/coinbase-web.test.ts
index 638b363a42e..6d8627e0c07 100644
--- a/packages/thirdweb/src/wallets/coinbase/coinbase-web.test.ts
+++ b/packages/thirdweb/src/wallets/coinbase/coinbase-web.test.ts
@@ -16,10 +16,10 @@ vi.mock("@coinbase/wallet-sdk", () => ({
   default: class {
     makeWeb3Provider() {
       return {
-        request: vi.fn(),
+        disconnect: vi.fn(),
         on: vi.fn(),
         removeListener: vi.fn(),
-        disconnect: vi.fn(),
+        request: vi.fn(),
       };
     }
   },
@@ -32,9 +32,9 @@ vi.mock("../../utils/address.js", () => ({
 vi.mock("../../chains/utils.js", () => ({
   getCachedChain: vi.fn((chainId) => ({ id: chainId })),
   getChainMetadata: vi.fn(async (_chain) => ({
-    name: "Test Chain",
-    nativeCurrency: { name: "Test Coin", symbol: "TC", decimals: 18 },
     explorers: [{ url: "https://explorer.test" }],
+    name: "Test Chain",
+    nativeCurrency: { decimals: 18, name: "Test Coin", symbol: "TC" },
   })),
 }));
 
@@ -46,15 +46,15 @@ vi.mock("ox/Hex", async () => {
   const actualModule = await vi.importActual("ox/Hex");
   return {
     ...actualModule,
-    validate: vi.fn(() => true),
     toNumber: vi.fn((hex) => Number.parseInt(hex, 16)),
+    validate: vi.fn(() => true),
   };
 });
 
 vi.mock("ox/TypedData", () => ({
   extractEip712DomainTypes: vi.fn(() => []),
-  validate: vi.fn(),
   serialize: vi.fn(() => "serializedData"),
+  validate: vi.fn(),
 }));
 
 describe("Coinbase Web", () => {
diff --git a/packages/thirdweb/src/wallets/coinbase/coinbase-web.ts b/packages/thirdweb/src/wallets/coinbase/coinbase-web.ts
index 8bdf65b731b..c01ccd33d54 100644
--- a/packages/thirdweb/src/wallets/coinbase/coinbase-web.ts
+++ b/packages/thirdweb/src/wallets/coinbase/coinbase-web.ts
@@ -16,8 +16,11 @@ import {
 } from "../../utils/encoding/hex.js";
 import { parseTypedData } from "../../utils/signatures/helpers/parse-typed-data.js";
 import { COINBASE } from "../constants.js";
-import type { Account, Wallet } from "../interfaces/wallet.js";
-import type { SendTransactionOption } from "../interfaces/wallet.js";
+import type {
+  Account,
+  SendTransactionOption,
+  Wallet,
+} from "../interfaces/wallet.js";
 import type { AppMetadata, DisconnectFn, SwitchChainFn } from "../types.js";
 import { getValidPublicRPCUrl } from "../utils/chains.js";
 import { getDefaultAppMetadata } from "../utils/defaultDappMetadata.js";
@@ -136,12 +139,12 @@ export async function getCoinbaseWebProvider(
 
     // @ts-expect-error This import error is not visible to TypeScript
     const client = new CoinbaseWalletSDK({
-      appName: options?.appMetadata?.name || getDefaultAppMetadata().name,
       appChainIds: options?.chains
         ? options.chains.map((c) => c.id)
         : undefined,
       appLogoUrl:
         options?.appMetadata?.logoUrl || getDefaultAppMetadata().logoUrl,
+      appName: options?.appMetadata?.name || getDefaultAppMetadata().name,
     });
 
     const provider = client.makeWeb3Provider(options?.walletConfig);
@@ -174,29 +177,34 @@ function createAccount({
 }) {
   const account: Account = {
     address: getAddress(address),
+    onTransactionRequested: async () => {
+      // make sure to show the coinbase popup BEFORE doing any transaction preprocessing
+      // otherwise the popup might get blocked in safari
+      await showCoinbasePopup(provider);
+    },
     async sendTransaction(tx: SendTransactionOption) {
       const transactionHash = (await provider.request({
         method: "eth_sendTransaction",
         params: [
           {
             accessList: tx.accessList,
-            value: tx.value ? numberToHex(tx.value) : undefined,
-            gas: tx.gas ? numberToHex(tx.gas) : undefined,
+            data: tx.data,
             from: getAddress(address),
+            gas: tx.gas ? numberToHex(tx.gas) : undefined,
             to: tx.to as Address,
-            data: tx.data,
+            value: tx.value ? numberToHex(tx.value) : undefined,
           },
         ],
       })) as Hex;
 
       trackTransaction({
-        client: client,
         chainId: tx.chainId,
-        walletAddress: getAddress(address),
-        walletType: COINBASE,
-        transactionHash,
+        client: client,
         contractAddress: tx.to ?? undefined,
         gasPrice: tx.gasPrice,
+        transactionHash,
+        walletAddress: getAddress(address),
+        walletType: COINBASE,
       });
 
       return {
@@ -261,11 +269,6 @@ function createAccount({
       }
       return res;
     },
-    onTransactionRequested: async () => {
-      // make sure to show the coinbase popup BEFORE doing any transaction preprocessing
-      // otherwise the popup might get blocked in safari
-      await showCoinbasePopup(provider);
-    },
   };
 
   return account;
@@ -278,7 +281,7 @@ function onConnect(
   emitter: WalletEmitter<typeof COINBASE>,
   client: ThirdwebClient,
 ): [Account, Chain, DisconnectFn, SwitchChainFn] {
-  const account = createAccount({ provider, address, client });
+  const account = createAccount({ address, client, provider });
 
   async function disconnect() {
     provider.removeListener("accountsChanged", onAccountsChanged);
@@ -295,9 +298,9 @@ function onConnect(
   function onAccountsChanged(accounts: string[]) {
     if (accounts[0]) {
       const newAccount = createAccount({
-        provider,
         address: getAddress(accounts[0]),
         client,
+        provider,
       });
       emitter.emit("accountChanged", newAccount);
       emitter.emit("accountsChanged", accounts);
@@ -413,11 +416,11 @@ async function switchChainCoinbaseWalletSDK(
         method: "wallet_addEthereumChain",
         params: [
           {
+            blockExplorerUrls: apiChain.explorers?.map((x) => x.url) || [],
             chainId: chainIdHex,
             chainName: apiChain.name,
-            nativeCurrency: apiChain.nativeCurrency,
-            rpcUrls: getValidPublicRPCUrl(apiChain), // no client id on purpose here
-            blockExplorerUrls: apiChain.explorers?.map((x) => x.url) || [],
+            nativeCurrency: apiChain.nativeCurrency, // no client id on purpose here
+            rpcUrls: getValidPublicRPCUrl(apiChain),
           },
         ],
       });
diff --git a/packages/thirdweb/src/wallets/connection/autoConnect.test.ts b/packages/thirdweb/src/wallets/connection/autoConnect.test.ts
index fe19f1d2e31..608b8b29baf 100644
--- a/packages/thirdweb/src/wallets/connection/autoConnect.test.ts
+++ b/packages/thirdweb/src/wallets/connection/autoConnect.test.ts
@@ -17,8 +17,8 @@ vi.mock("./autoConnectCore.js");
 describe("autoConnect", () => {
   const mockWallet = createWalletAdapter({
     adaptedAccount: TEST_ACCOUNT_A,
-    client: TEST_CLIENT,
     chain: ethereum,
+    client: TEST_CLIENT,
     onDisconnect: () => {},
     switchChain: () => {},
   });
@@ -37,22 +37,22 @@ describe("autoConnect", () => {
     });
 
     expect(autoConnectCore).toHaveBeenCalledWith({
-      storage: webLocalStorage,
+      createWalletFn: createWallet,
+      getInstalledWallets: expect.any(Function),
+      manager: expect.any(Object),
       props: {
         client: TEST_CLIENT,
         wallets: [mockWallet],
       },
-      createWalletFn: createWallet,
-      getInstalledWallets: expect.any(Function),
-      manager: expect.any(Object),
+      storage: webLocalStorage,
     });
     expect(result).toBe(true);
   });
 
   it("should use default wallets when no wallets are provided", async () => {
     await autoConnect({
-      wallets: [],
       client: TEST_CLIENT,
+      wallets: [],
     });
 
     expect(autoConnectCore).toHaveBeenCalledWith(
diff --git a/packages/thirdweb/src/wallets/connection/autoConnect.ts b/packages/thirdweb/src/wallets/connection/autoConnect.ts
index 69155d20260..af586ba410e 100644
--- a/packages/thirdweb/src/wallets/connection/autoConnect.ts
+++ b/packages/thirdweb/src/wallets/connection/autoConnect.ts
@@ -43,11 +43,6 @@ export async function autoConnect(
   const wallets = props.wallets || getDefaultWallets(props);
   const manager = createConnectionManager(webLocalStorage);
   const result = await autoConnectCore({
-    storage: webLocalStorage,
-    props: {
-      ...props,
-      wallets,
-    },
     createWalletFn: createWallet,
     getInstalledWallets: () => {
       const specifiedWalletIds = new Set(wallets.map((x) => x.id));
@@ -60,6 +55,11 @@ export async function autoConnect(
       return installedWallets;
     },
     manager,
+    props: {
+      ...props,
+      wallets,
+    },
+    storage: webLocalStorage,
   });
   return result;
 }
diff --git a/packages/thirdweb/src/wallets/connection/autoConnectCore.test.ts b/packages/thirdweb/src/wallets/connection/autoConnectCore.test.ts
index 0819fe1b448..2a04deb6864 100644
--- a/packages/thirdweb/src/wallets/connection/autoConnectCore.test.ts
+++ b/packages/thirdweb/src/wallets/connection/autoConnectCore.test.ts
@@ -27,31 +27,31 @@ describe("useAutoConnectCore", () => {
     vi.mocked(getUrlToken).mockReturnValue({});
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
 
     expect(
       await autoConnectCore({
-        force: true,
-        storage: mockStorage,
-        props: {
-          wallets: [wallet],
-          client: TEST_CLIENT,
-        },
         createWalletFn: (id: WalletId) =>
           createWalletAdapter({
             adaptedAccount: TEST_ACCOUNT_A,
-            client: TEST_CLIENT,
             chain: ethereum,
+            client: TEST_CLIENT,
             onDisconnect: () => {
               console.warn(id);
             },
             switchChain: () => {},
           }),
+        force: true,
         manager,
+        props: {
+          client: TEST_CLIENT,
+          wallets: [wallet],
+        },
+        storage: mockStorage,
       }),
     ).toBe(false);
   });
@@ -61,31 +61,31 @@ describe("useAutoConnectCore", () => {
 
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
 
     expect(
       await autoConnectCore({
-        force: true,
-        storage: mockStorage,
-        props: {
-          wallets: [wallet],
-          client: TEST_CLIENT,
-        },
         createWalletFn: (id: WalletId) =>
           createWalletAdapter({
             adaptedAccount: TEST_ACCOUNT_A,
-            client: TEST_CLIENT,
             chain: ethereum,
+            client: TEST_CLIENT,
             onDisconnect: () => {
               console.warn(id);
             },
             switchChain: () => {},
           }),
+        force: true,
         manager,
+        props: {
+          client: TEST_CLIENT,
+          wallets: [wallet],
+        },
+        storage: mockStorage,
       }),
     ).toBe(false);
   });
@@ -94,8 +94,8 @@ describe("useAutoConnectCore", () => {
     const mockAuthCookie = "mock-auth-cookie";
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -105,14 +105,14 @@ describe("useAutoConnectCore", () => {
     });
 
     await autoConnectCore({
+      createWalletFn: () => wallet,
       force: true,
-      storage: mockStorage,
+      manager,
       props: {
-        wallets: [wallet],
         client: TEST_CLIENT,
+        wallets: [wallet],
       },
-      createWalletFn: () => wallet,
-      manager,
+      storage: mockStorage,
     });
 
     const storedCookie = await mockStorage.getItem(
@@ -124,8 +124,8 @@ describe("useAutoConnectCore", () => {
   it("should handle error when manager connection fails", async () => {
     const wallet1 = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -142,14 +142,14 @@ describe("useAutoConnectCore", () => {
     const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
     await autoConnectCore({
+      createWalletFn: () => wallet1,
       force: true,
-      storage: mockStorage,
+      manager,
       props: {
-        wallets: [wallet1],
         client: TEST_CLIENT,
+        wallets: [wallet1],
       },
-      createWalletFn: () => wallet1,
-      manager,
+      storage: mockStorage,
     });
     expect(addConnectedWalletSpy).toHaveBeenCalled();
 
@@ -163,16 +163,16 @@ describe("useAutoConnectCore", () => {
   it("should connect multiple wallets correctly", async () => {
     const wallet1 = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
 
     const wallet2 = createWalletAdapter({
       adaptedAccount: { ...TEST_ACCOUNT_A, address: "0x123" },
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -187,14 +187,14 @@ describe("useAutoConnectCore", () => {
     const addConnectedWalletSpy = vi.spyOn(manager, "addConnectedWallet");
 
     await autoConnectCore({
+      createWalletFn: () => wallet1,
       force: true,
-      storage: mockStorage,
+      manager,
       props: {
-        wallets: [wallet1, wallet2],
         client: TEST_CLIENT,
+        wallets: [wallet1, wallet2],
       },
-      createWalletFn: () => wallet1,
-      manager,
+      storage: mockStorage,
     });
 
     expect(addConnectedWalletSpy).toHaveBeenCalledWith(wallet2);
@@ -204,8 +204,8 @@ describe("useAutoConnectCore", () => {
     const mockOnConnect = vi.fn();
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -217,15 +217,15 @@ describe("useAutoConnectCore", () => {
       JSON.stringify([wallet.id]),
     );
     await autoConnectCore({
+      createWalletFn: () => wallet,
       force: true,
-      storage: mockStorage,
+      manager,
       props: {
-        wallets: [wallet],
         client: TEST_CLIENT,
         onConnect: mockOnConnect,
+        wallets: [wallet],
       },
-      createWalletFn: () => wallet,
-      manager,
+      storage: mockStorage,
     });
 
     expect(mockOnConnect).toHaveBeenCalledWith(wallet);
@@ -238,8 +238,8 @@ describe("useAutoConnectCore", () => {
     });
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -251,15 +251,15 @@ describe("useAutoConnectCore", () => {
       JSON.stringify([wallet.id]),
     );
     await autoConnectCore({
+      createWalletFn: () => wallet,
       force: true,
-      storage: mockStorage,
+      manager,
       props: {
-        wallets: [wallet],
         client: TEST_CLIENT,
         onConnect: mockOnConnect,
+        wallets: [wallet],
       },
-      createWalletFn: () => wallet,
-      manager,
+      storage: mockStorage,
     });
 
     expect(mockOnConnect).toHaveBeenCalledWith(wallet);
@@ -268,8 +268,8 @@ describe("useAutoConnectCore", () => {
   it("should call setLastAuthProvider if authProvider is present", async () => {
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -285,15 +285,15 @@ describe("useAutoConnectCore", () => {
       JSON.stringify([wallet.id]),
     );
     await autoConnectCore({
+      createWalletFn: () => wallet,
       force: true,
-      storage: mockStorage,
+      manager,
       props: {
-        wallets: [wallet],
         client: TEST_CLIENT,
+        wallets: [wallet],
       },
-      createWalletFn: () => wallet,
-      manager,
       setLastAuthProvider: mockSetLastAuthProvider,
+      storage: mockStorage,
     });
 
     expect(mockSetLastAuthProvider).toHaveBeenCalledWith("email", mockStorage);
@@ -302,8 +302,8 @@ describe("useAutoConnectCore", () => {
   it("should set connection status to disconnect if no connectedWallet is returned", async () => {
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
@@ -319,14 +319,14 @@ describe("useAutoConnectCore", () => {
       .mockResolvedValueOnce(null as unknown as Wallet);
 
     await autoConnectCore({
+      createWalletFn: () => wallet,
       force: true,
-      storage: mockStorage,
+      manager,
       props: {
-        wallets: [wallet],
         client: TEST_CLIENT,
+        wallets: [wallet],
       },
-      createWalletFn: () => wallet,
-      manager,
+      storage: mockStorage,
     });
 
     expect(addConnectedWalletSpy).toHaveBeenCalled();
@@ -339,16 +339,16 @@ describe("useAutoConnectCore", () => {
 describe("handleWalletConnection", () => {
   const wallet = createWalletAdapter({
     adaptedAccount: TEST_ACCOUNT_A,
-    client: TEST_CLIENT,
     chain: ethereum,
+    client: TEST_CLIENT,
     onDisconnect: () => {},
     switchChain: () => {},
   });
   it("should return the correct result", async () => {
     const result = await handleWalletConnection({
+      authResult: undefined,
       client: TEST_CLIENT,
       lastConnectedChain: ethereum,
-      authResult: undefined,
       wallet,
     });
 
diff --git a/packages/thirdweb/src/wallets/connection/autoConnectCore.ts b/packages/thirdweb/src/wallets/connection/autoConnectCore.ts
index 3f4bd11974b..71649c9fba7 100644
--- a/packages/thirdweb/src/wallets/connection/autoConnectCore.ts
+++ b/packages/thirdweb/src/wallets/connection/autoConnectCore.ts
@@ -41,7 +41,7 @@ type AutoConnectCoreProps = {
   force?: boolean;
 };
 
-let lastAutoConnectionResultPromise: Promise<boolean> | undefined = undefined;
+let lastAutoConnectionResultPromise: Promise<boolean> | undefined;
 
 /**
  * @internal
@@ -89,7 +89,6 @@ const _autoConnectCore = async ({
   const wallet = wallets.find((w) => w.id === urlToken?.walletId);
   if (urlToken?.authCookie && wallet) {
     const clientStorage = new ClientScopedStorage({
-      storage,
       clientId: props.client.clientId,
       ecosystem: isEcosystemWallet(wallet)
         ? {
@@ -97,6 +96,7 @@ const _autoConnectCore = async ({
             partnerId: wallet.getConfig()?.partnerId,
           }
         : undefined,
+      storage,
     });
     await clientStorage.saveAuthCookie(urlToken.authCookie);
   }
@@ -130,14 +130,14 @@ const _autoConnectCore = async ({
     manager.activeWalletConnectionStatusStore.setValue("connecting"); // only set connecting status if we are connecting the last active EOA
     await timeoutPromise(
       handleWalletConnection({
-        wallet: activeWallet,
+        authResult: urlToken?.authResult,
         client: props.client,
         lastConnectedChain,
-        authResult: urlToken?.authResult,
+        wallet: activeWallet,
       }),
       {
-        ms: timeout,
         message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
+        ms: timeout,
       },
     ).catch((err) => {
       console.warn(err.message);
@@ -151,8 +151,8 @@ const _autoConnectCore = async ({
       const connectedWallet = await (connectOverride
         ? connectOverride(activeWallet)
         : manager.connect(activeWallet, {
-            client: props.client,
             accountAbstraction: props.accountAbstraction,
+            client: props.client,
           }));
       if (connectedWallet) {
         autoConnected = true;
@@ -181,10 +181,10 @@ const _autoConnectCore = async ({
   for (const wallet of otherWallets) {
     try {
       await handleWalletConnection({
-        wallet,
+        authResult: urlToken?.authResult,
         client: props.client,
         lastConnectedChain,
-        authResult: urlToken?.authResult,
+        wallet,
       });
       manager.addConnectedWallet(wallet);
     } catch {
@@ -196,10 +196,10 @@ const _autoConnectCore = async ({
   const isIAW =
     activeWallet &&
     isInAppSigner({
-      wallet: activeWallet,
       connectedWallets: activeWallet
         ? [activeWallet, ...otherWallets]
         : otherWallets,
+      wallet: activeWallet,
     });
   if (
     isIAW &&
@@ -225,8 +225,8 @@ export async function handleWalletConnection(props: {
   lastConnectedChain: Chain | undefined;
 }) {
   return props.wallet.autoConnect({
-    client: props.client,
-    chain: props.lastConnectedChain,
     authResult: props.authResult,
+    chain: props.lastConnectedChain,
+    client: props.client,
   });
 }
diff --git a/packages/thirdweb/src/wallets/create-wallet.ts b/packages/thirdweb/src/wallets/create-wallet.ts
index aa91ba785ca..985dabea11f 100644
--- a/packages/thirdweb/src/wallets/create-wallet.ts
+++ b/packages/thirdweb/src/wallets/create-wallet.ts
@@ -1,21 +1,13 @@
-import type { Chain } from "../chains/types.js";
-import type {
-  InjectedSupportedWalletIds,
-  WCSupportedWalletIds,
-} from "./__generated__/wallet-ids.js";
-import type { Account, Wallet } from "./interfaces/wallet.js";
-import type {
-  CreateWalletArgs,
-  EcosystemWalletId,
-  WalletAutoConnectionOption,
-  WalletId,
-} from "./wallet-types.js";
-
 import { trackConnect } from "../analytics/track/connect.js";
+import type { Chain } from "../chains/types.js";
 import { getCachedChainIfExists } from "../chains/utils.js";
 import { webLocalStorage } from "../utils/storage/webStorage.js";
 import { isMobile } from "../utils/web/isMobile.js";
 import { openWindow } from "../utils/web/openWindow.js";
+import type {
+  InjectedSupportedWalletIds,
+  WCSupportedWalletIds,
+} from "./__generated__/wallet-ids.js";
 import { coinbaseWalletSDK } from "./coinbase/coinbase-wallet.js";
 import { getCoinbaseWebProvider } from "./coinbase/coinbase-web.js";
 import { COINBASE } from "./constants.js";
@@ -23,9 +15,16 @@ import { isEcosystemWallet } from "./ecosystem/is-ecosystem-wallet.js";
 import { ecosystemWallet } from "./in-app/web/ecosystem.js";
 import { inAppWallet } from "./in-app/web/in-app.js";
 import { getInjectedProvider } from "./injected/index.js";
+import type { Account, Wallet } from "./interfaces/wallet.js";
 import { smartWallet } from "./smart/smart-wallet.js";
 import type { WCConnectOptions } from "./wallet-connect/types.js";
 import { createWalletEmitter } from "./wallet-emitter.js";
+import type {
+  CreateWalletArgs,
+  EcosystemWalletId,
+  WalletAutoConnectionOption,
+  WalletId,
+} from "./wallet-types.js";
 
 // TODO: figure out how to define the type without tuple args type and using function overloads
 
@@ -172,7 +171,6 @@ export function createWallet<const ID extends WalletId>(
       const options = creationOptions as CreateWalletArgs<typeof COINBASE>[1];
       return coinbaseWalletSDK({
         createOptions: options,
-        providerFactory: () => getCoinbaseWebProvider(options),
         onConnectRequested: async (provider) => {
           // on the web, make sure to show the coinbase popup IMMEDIATELY on connection requested
           // otherwise the popup might get blocked in safari
@@ -181,6 +179,7 @@ export function createWallet<const ID extends WalletId>(
           const { showCoinbasePopup } = await import("./coinbase/utils.js");
           return showCoinbasePopup(provider);
         },
+        providerFactory: () => getCoinbaseWebProvider(options),
       }) as Wallet<ID>;
     }
     /**
@@ -188,9 +187,9 @@ export function createWallet<const ID extends WalletId>(
      */
     default: {
       const emitter = createWalletEmitter<ID>();
-      let account: Account | undefined = undefined;
-      let chain: Chain | undefined = undefined;
-      let unsubscribeChain: (() => void) | undefined = undefined;
+      let account: Account | undefined;
+      let chain: Chain | undefined;
+      let unsubscribeChain: (() => void) | undefined;
 
       function reset() {
         account = undefined;
@@ -219,18 +218,6 @@ export function createWallet<const ID extends WalletId>(
         : undefined;
 
       const wallet: Wallet<ID> = {
-        id,
-        subscribe: emitter.subscribe,
-        getConfig: () => args[1],
-        getChain() {
-          if (!chain) {
-            return undefined;
-          }
-
-          chain = getCachedChainIfExists(chain.id) || chain;
-          return chain;
-        },
-        getAccount: () => account,
         autoConnect: async (
           options: WalletAutoConnectionOption<
             WCSupportedWalletIds | InjectedSupportedWalletIds
@@ -249,11 +236,11 @@ export function createWallet<const ID extends WalletId>(
               doDisconnect,
               doSwitchChain,
             ] = await autoConnectEip1193Wallet({
-              id: id as InjectedSupportedWalletIds,
-              provider: getInjectedProvider(id),
-              emitter,
               chain: options.chain,
               client: options.client,
+              emitter,
+              id: id as InjectedSupportedWalletIds,
+              provider: getInjectedProvider(id),
             });
             // set the states
             account = connectedAccount;
@@ -264,10 +251,10 @@ export function createWallet<const ID extends WalletId>(
               chain = newChain;
             });
             trackConnect({
+              chainId: chain.id,
               client: options.client,
-              walletType: id,
               walletAddress: account.address,
-              chainId: chain.id,
+              walletType: id,
             });
             // return account
             return account;
@@ -296,10 +283,10 @@ export function createWallet<const ID extends WalletId>(
             handleDisconnect = doDisconnect;
             handleSwitchChain = doSwitchChain;
             trackConnect({
+              chainId: chain.id,
               client: options.client,
-              walletType: id,
               walletAddress: account.address,
-              chainId: chain.id,
+              walletType: id,
             });
             // return account
             return account;
@@ -330,10 +317,10 @@ export function createWallet<const ID extends WalletId>(
             handleDisconnect = doDisconnect;
             handleSwitchChain = doSwitchChain;
             trackConnect({
+              chainId: chain.id,
               client: wcOptions.client,
-              walletType: id,
               walletAddress: account.address,
-              chainId: chain.id,
+              walletType: id,
             });
             return account;
           }
@@ -342,8 +329,8 @@ export function createWallet<const ID extends WalletId>(
             const { client, chain: _chain, ...walletConnectOptions } = options;
 
             return wcConnect({
-              client,
               chain: _chain,
+              client,
               walletConnect: {
                 ...walletConnectOptions,
               },
@@ -366,11 +353,11 @@ export function createWallet<const ID extends WalletId>(
               doDisconnect,
               doSwitchChain,
             ] = await connectEip1193Wallet({
-              id: id as InjectedSupportedWalletIds,
-              provider: getInjectedProvider(id),
-              client: options.client,
               chain: options.chain,
+              client: options.client,
               emitter,
+              id: id as InjectedSupportedWalletIds,
+              provider: getInjectedProvider(id),
             });
             // set the states
             account = connectedAccount;
@@ -381,10 +368,10 @@ export function createWallet<const ID extends WalletId>(
               chain = newChain;
             });
             trackConnect({
+              chainId: chain.id,
               client: options.client,
-              walletType: id,
               walletAddress: account.address,
-              chainId: chain.id,
+              walletType: id,
             });
             // return account
             return account;
@@ -400,6 +387,18 @@ export function createWallet<const ID extends WalletId>(
           reset();
           await handleDisconnect();
         },
+        getAccount: () => account,
+        getChain() {
+          if (!chain) {
+            return undefined;
+          }
+
+          chain = getCachedChainIfExists(chain.id) || chain;
+          return chain;
+        },
+        getConfig: () => args[1],
+        id,
+        subscribe: emitter.subscribe,
         switchChain: (c) => handleSwitchChain(c),
       };
       return wallet;
diff --git a/packages/thirdweb/src/wallets/custom/adapter/index.ts b/packages/thirdweb/src/wallets/custom/adapter/index.ts
index 614605e1211..b84d48bb143 100644
--- a/packages/thirdweb/src/wallets/custom/adapter/index.ts
+++ b/packages/thirdweb/src/wallets/custom/adapter/index.ts
@@ -1,27 +1,27 @@
 export const wallet = {
-  id: "adapter",
-  name: "Wallet",
-  homepage: "https://thirdweb.com",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://thirdweb.com",
+  id: "adapter",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Wallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/custom/embedded/index.ts b/packages/thirdweb/src/wallets/custom/embedded/index.ts
index f154dc408c9..53700fe7f89 100644
--- a/packages/thirdweb/src/wallets/custom/embedded/index.ts
+++ b/packages/thirdweb/src/wallets/custom/embedded/index.ts
@@ -1,27 +1,27 @@
 export const wallet = {
-  id: "embedded",
-  name: "Social Login",
-  homepage: "https://thirdweb.com",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://thirdweb.com",
+  id: "embedded",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Social Login",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/custom/inApp/index.ts b/packages/thirdweb/src/wallets/custom/inApp/index.ts
index e77369f1fe2..e57cabafd2e 100644
--- a/packages/thirdweb/src/wallets/custom/inApp/index.ts
+++ b/packages/thirdweb/src/wallets/custom/inApp/index.ts
@@ -1,27 +1,27 @@
 export const wallet = {
-  id: "inApp",
-  name: "Social Login",
-  homepage: "https://thirdweb.com",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://thirdweb.com",
+  id: "inApp",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "Social Login",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/custom/smart/index.ts b/packages/thirdweb/src/wallets/custom/smart/index.ts
index 85f2320893a..b250c120045 100644
--- a/packages/thirdweb/src/wallets/custom/smart/index.ts
+++ b/packages/thirdweb/src/wallets/custom/smart/index.ts
@@ -1,27 +1,27 @@
 export const wallet = {
-  id: "smart",
-  name: "SmartWallet",
-  homepage: "https://thirdweb.com",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://thirdweb.com",
+  id: "smart",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "SmartWallet",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/custom/walletConnect/index.ts b/packages/thirdweb/src/wallets/custom/walletConnect/index.ts
index 627c9a5a41f..85222b75917 100644
--- a/packages/thirdweb/src/wallets/custom/walletConnect/index.ts
+++ b/packages/thirdweb/src/wallets/custom/walletConnect/index.ts
@@ -1,27 +1,27 @@
 export const wallet = {
-  id: "walletConnect",
-  name: "WalletConnect",
-  homepage: "https://walletconnect.com",
   app: {
-    browser: null,
-    ios: null,
     android: null,
-    mac: null,
-    windows: null,
-    linux: null,
+    browser: null,
     chrome: null,
-    firefox: null,
-    safari: null,
     edge: null,
+    firefox: null,
+    ios: null,
+    linux: null,
+    mac: null,
     opera: null,
+    safari: null,
+    windows: null,
   },
-  rdns: null,
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  desktop: {
+  homepage: "https://walletconnect.com",
+  id: "walletConnect",
+  mobile: {
     native: null,
     universal: null,
   },
+  name: "WalletConnect",
+  rdns: null,
 } as const;
diff --git a/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-info.test.ts b/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-info.test.ts
index 15e46815775..350d400855d 100644
--- a/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-info.test.ts
+++ b/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-info.test.ts
@@ -13,9 +13,9 @@ describe("getEcosystemWalletInfo", () => {
   it("should fetch wallet metadata successfully", async () => {
     const walletId = "ecosystem.123";
     const mockResponse = {
-      name: "Test Wallet",
-      imageUrl: "http://example.com/image.png",
       homepage: "http://example.com",
+      imageUrl: "http://example.com/image.png",
+      name: "Test Wallet",
     };
     const fetchMock = vi.fn().mockResolvedValue({
       json: () => Promise.resolve(mockResponse),
@@ -27,32 +27,32 @@ describe("getEcosystemWalletInfo", () => {
 
     expect(fetchMock).toHaveBeenCalled();
     expect(result).toEqual({
-      id: walletId,
-      name: "Test Wallet",
-      image_id: "http://example.com/image.png",
-      homepage: "http://example.com",
-      rdns: null,
       app: {
+        android: null,
         browser: null,
+        chrome: null,
+        edge: null,
+        firefox: null,
         ios: null,
-        android: null,
-        mac: null,
-        windows: null,
         linux: null,
+        mac: null,
         opera: null,
-        chrome: null,
-        firefox: null,
         safari: null,
-        edge: null,
+        windows: null,
       },
-      mobile: {
+      desktop: {
         native: null,
         universal: null,
       },
-      desktop: {
+      homepage: "http://example.com",
+      id: walletId,
+      image_id: "http://example.com/image.png",
+      mobile: {
         native: null,
         universal: null,
       },
+      name: "Test Wallet",
+      rdns: null,
     });
   });
 });
diff --git a/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-info.ts b/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-info.ts
index 9536c8d698c..14f3333fe0a 100644
--- a/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-info.ts
+++ b/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-info.ts
@@ -17,31 +17,31 @@ export async function getEcosystemWalletInfo(
   const data = await getEcosystemInfo(walletId);
 
   return {
-    id: walletId,
-    name: data.name,
-    image_id: data.imageUrl || "",
-    homepage: data.homepage || "",
-    rdns: null,
     app: {
+      android: null,
       browser: null,
+      chrome: null,
+      edge: null,
+      firefox: null,
       ios: null,
-      android: null,
-      mac: null,
-      windows: null,
       linux: null,
+      mac: null,
       opera: null,
-      chrome: null,
-      firefox: null,
       safari: null,
-      edge: null,
+      windows: null,
     },
-    mobile: {
+    desktop: {
       native: null,
       universal: null,
     },
-    desktop: {
+    homepage: data.homepage || "",
+    id: walletId,
+    image_id: data.imageUrl || "",
+    mobile: {
       native: null,
       universal: null,
     },
+    name: data.name,
+    rdns: null,
   };
 }
diff --git a/packages/thirdweb/src/wallets/eip5792/get-calls-status.test.ts b/packages/thirdweb/src/wallets/eip5792/get-calls-status.test.ts
index 6a57d79d803..16b8f20f55e 100644
--- a/packages/thirdweb/src/wallets/eip5792/get-calls-status.test.ts
+++ b/packages/thirdweb/src/wallets/eip5792/get-calls-status.test.ts
@@ -16,23 +16,23 @@ const RAW_UNSUPPORTED_ERROR = {
 const SEND_CALLS_OPTIONS: Omit<SendCallsOptions, "wallet"> = {
   calls: [
     {
-      to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
-      data: "0xabcdef",
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      data: "0xabcdef",
+      to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
     },
     {
-      to: "0xa922b54716264130634d6ff183747a8ead91a40b",
-      value: 123n,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
+      to: "0xa922b54716264130634d6ff183747a8ead91a40b",
+      value: 123n,
     },
   ],
 };
 
 const mocks = vi.hoisted(() => ({
-  injectedRequest: vi.fn(),
   getTransactionReceipt: vi.fn(),
+  injectedRequest: vi.fn(),
 }));
 
 vi.mock("../injected/index.js", () => {
@@ -46,14 +46,14 @@ vi.mock("../injected/index.js", () => {
 vi.mock("../../rpc/actions/eth_getTransactionReceipt.js", () => {
   return {
     eth_getTransactionReceipt: mocks.getTransactionReceipt.mockResolvedValue({
-      logs: [],
-      status: "success",
       blockHash:
         "0xf19bbafd9fd0124ec110b848e8de4ab4f62bf60c189524e54213285e7f540d4a",
       blockNumber: 12345n,
+      gasUsed: 12345n,
+      logs: [],
+      status: "success",
       transactionHash:
         "0x9b7bb827c2e5e3c1a0a44dc53e573aa0b3af3bd1f9f5ed03071b100bb039eaff",
-      gasUsed: 12345n,
     }),
   };
 });
@@ -87,9 +87,9 @@ describe.sequential("injected wallet", async () => {
     wallet.getAccount = vi.fn().mockReturnValue(undefined);
 
     const promise = getCallsStatus({
-      wallet: wallet,
       client: TEST_CLIENT,
       id: "test",
+      wallet: wallet,
     });
 
     await expect(promise).rejects.toMatchInlineSnapshot(
@@ -100,14 +100,14 @@ describe.sequential("injected wallet", async () => {
   test("should successfully make request", async () => {
     wallet.getAccount = vi.fn().mockReturnValue(TEST_ACCOUNT_A);
     mocks.injectedRequest.mockResolvedValue({
-      status: "CONFIRMED",
       receipts: [],
+      status: "CONFIRMED",
     });
 
     const result = await getCallsStatus({
-      wallet: wallet,
       client: TEST_CLIENT,
       id: "test",
+      wallet: wallet,
     });
 
     expect(mocks.injectedRequest).toHaveBeenCalledWith({
@@ -131,9 +131,9 @@ describe.sequential("injected wallet", async () => {
     wallet.getAccount = vi.fn().mockReturnValue(TEST_ACCOUNT_A);
 
     const promise = getCallsStatus({
-      wallet: wallet,
       client: TEST_CLIENT,
       id: "test",
+      wallet: wallet,
     });
 
     await expect(promise).rejects.toMatchInlineSnapshot(
@@ -213,9 +213,9 @@ describe.sequential("in-app wallet", async () => {
 
   test("unknown bundle id should fail", async () => {
     const promise = getCallsStatus({
-      wallet: wallet,
       client: TEST_CLIENT,
       id: "unknown",
+      wallet: wallet,
     });
 
     await expect(promise).rejects.toMatchInlineSnapshot(
@@ -227,9 +227,9 @@ describe.sequential("in-app wallet", async () => {
     wallet.getChain = vi.fn().mockReturnValue(undefined);
 
     const promise = getCallsStatus({
-      wallet: wallet,
       client: TEST_CLIENT,
       id: "test",
+      wallet: wallet,
     });
 
     await expect(promise).rejects.toMatchInlineSnapshot(
diff --git a/packages/thirdweb/src/wallets/eip5792/get-calls-status.ts b/packages/thirdweb/src/wallets/eip5792/get-calls-status.ts
index 17f9acf5fbc..df78cf106a6 100644
--- a/packages/thirdweb/src/wallets/eip5792/get-calls-status.ts
+++ b/packages/thirdweb/src/wallets/eip5792/get-calls-status.ts
@@ -1,6 +1,5 @@
 import type { ThirdwebClient } from "../../client/client.js";
-import { hexToBigInt } from "../../utils/encoding/hex.js";
-import { hexToNumber } from "../../utils/encoding/hex.js";
+import { hexToBigInt, hexToNumber } from "../../utils/encoding/hex.js";
 import { isCoinbaseSDKWallet } from "../coinbase/coinbase-web.js";
 import { isInAppWallet } from "../in-app/core/wallet/index.js";
 import { getInjectedProvider } from "../injected/index.js";
@@ -65,7 +64,7 @@ export async function getCallsStatus({
     const { inAppWalletGetCallsStatus } = await import(
       "../in-app/core/eip5972/in-app-wallet-calls.js"
     );
-    return inAppWalletGetCallsStatus({ wallet, client, id });
+    return inAppWalletGetCallsStatus({ client, id, wallet });
   }
 
   if (isWalletConnect(wallet)) {
@@ -120,8 +119,8 @@ export async function getCallsStatus({
           gasUsed: hexToBigInt(receipt.gasUsed),
           status: receiptStatuses[receipt.status as "0x0" | "0x1"],
         })) ?? [],
-      statusCode,
       status,
+      statusCode,
       version,
     };
   } catch (error) {
diff --git a/packages/thirdweb/src/wallets/eip5792/get-capabilities.test.ts b/packages/thirdweb/src/wallets/eip5792/get-capabilities.test.ts
index a7735021b04..8d51b0c3c8b 100644
--- a/packages/thirdweb/src/wallets/eip5792/get-capabilities.test.ts
+++ b/packages/thirdweb/src/wallets/eip5792/get-capabilities.test.ts
@@ -121,12 +121,12 @@ describe.sequential("in-app wallet", async () => {
 
     expect(capabilities).toEqual({
       [ANVIL_CHAIN.id]: {
-        paymasterService: {
-          supported: false,
-        },
         atomic: {
           status: "unsupported",
         },
+        paymasterService: {
+          supported: false,
+        },
       },
     });
   });
@@ -147,8 +147,8 @@ describe.sequential("in-app wallet", async () => {
     test("with sponsorGas should support paymasterService and atomicBatch", async () => {
       wallet = createWallet("inApp", {
         smartAccount: {
-          sponsorGas: true,
           chain: ANVIL_CHAIN,
+          sponsorGas: true,
         },
       });
 
@@ -164,12 +164,12 @@ describe.sequential("in-app wallet", async () => {
 
       expect(capabilities).toEqual({
         [ANVIL_CHAIN.id]: {
-          paymasterService: {
-            supported: true,
-          },
           atomic: {
             status: "supported",
           },
+          paymasterService: {
+            supported: true,
+          },
         },
       });
     });
@@ -177,8 +177,8 @@ describe.sequential("in-app wallet", async () => {
     test("without sponsorGas should support atomicBatch", async () => {
       wallet = createWallet("inApp", {
         smartAccount: {
-          sponsorGas: false,
           chain: ANVIL_CHAIN,
+          sponsorGas: false,
         },
       });
       wallet.getAccount = vi.fn().mockReturnValue({
@@ -193,12 +193,12 @@ describe.sequential("in-app wallet", async () => {
 
       expect(capabilities).toEqual({
         [ANVIL_CHAIN.id]: {
-          paymasterService: {
-            supported: false,
-          },
           atomic: {
             status: "supported",
           },
+          paymasterService: {
+            supported: false,
+          },
         },
       });
     });
@@ -256,12 +256,12 @@ describe.sequential("smart wallet", async () => {
 
     expect(capabilities).toEqual({
       [FORKED_ETHEREUM_CHAIN.id]: {
-        paymasterService: {
-          supported: true,
-        },
         atomic: {
           status: "supported",
         },
+        paymasterService: {
+          supported: true,
+        },
       },
     });
   });
diff --git a/packages/thirdweb/src/wallets/eip5792/send-calls.test.ts b/packages/thirdweb/src/wallets/eip5792/send-calls.test.ts
index aaecfa70c9a..cb9cf850002 100644
--- a/packages/thirdweb/src/wallets/eip5792/send-calls.test.ts
+++ b/packages/thirdweb/src/wallets/eip5792/send-calls.test.ts
@@ -23,8 +23,8 @@ import { type SendCallsOptions, sendCalls } from "./send-calls.js";
 const SEND_CALLS_OPTIONS: Omit<SendCallsOptions, "wallet"> = {
   calls: [
     {
-      to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
       data: "0xabcdef" as const,
+      to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
     },
     {
       to: "0xa922b54716264130634d6ff183747a8ead91a40b",
@@ -41,10 +41,10 @@ const RAW_UNSUPPORTED_ERROR = {
 };
 
 const mocks = vi.hoisted(() => ({
+  eth_estimateGas: vi.fn(),
   injectedRequest: vi.fn(),
   sendAndConfirmTransaction: vi.fn(),
   sendBatchTransaction: vi.fn(),
-  eth_estimateGas: vi.fn(),
 }));
 
 vi.mock("../injected/index.js", () => {
@@ -119,13 +119,13 @@ describe.sequential("injected wallet", () => {
           atomicRequired: false,
           calls: [
             {
-              to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
               data: "0xabcdef",
+              to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
               value: undefined,
             },
             {
-              to: "0xa922b54716264130634d6ff183747a8ead91a40b",
               data: "0x",
+              to: "0xa922b54716264130634d6ff183747a8ead91a40b",
               value: numberToHex(123n),
             },
           ],
@@ -143,20 +143,20 @@ describe.sequential("injected wallet", () => {
     wallet.getAccount = vi.fn().mockReturnValue(TEST_ACCOUNT_A);
 
     const preparedTx = approve({
-      contract: USDT_CONTRACT,
       amount: 100,
+      contract: USDT_CONTRACT,
       spender: TEST_ACCOUNT_B.address,
     });
     const preparedTx2 = approve({
-      contract: USDT_CONTRACT,
       amount: 100,
+      contract: USDT_CONTRACT,
       spender: TEST_ACCOUNT_C.address,
     });
 
     const result = await sendCalls({
-      wallet,
-      chain: ANVIL_CHAIN,
       calls: [preparedTx, preparedTx2],
+      chain: ANVIL_CHAIN,
+      wallet,
     });
 
     expect(result.id).toEqual("0x123456");
@@ -167,13 +167,13 @@ describe.sequential("injected wallet", () => {
           atomicRequired: false,
           calls: [
             {
-              to: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
               data: "0x095ea7b300000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000005f5e100",
+              to: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
               value: undefined,
             },
             {
-              to: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
               data: "0x095ea7b30000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc0000000000000000000000000000000000000000000000000000000005f5e100",
+              to: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
               value: undefined,
             },
           ],
@@ -189,8 +189,8 @@ describe.sequential("injected wallet", () => {
   test("should override chainId", async () => {
     wallet.getChain = vi.fn().mockReturnValue(ANVIL_CHAIN);
     const result = await sendCalls({
-      wallet,
       chain: sepolia,
+      wallet,
       ...SEND_CALLS_OPTIONS,
     });
 
@@ -202,14 +202,14 @@ describe.sequential("injected wallet", () => {
           atomicRequired: false,
           calls: [
             {
-              to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
               data: "0xabcdef",
+              to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
               value: undefined,
             },
             {
+              data: "0x",
               to: "0xa922b54716264130634d6ff183747a8ead91a40b",
               value: numberToHex(123n),
-              data: "0x",
             },
           ],
           capabilities: undefined,
diff --git a/packages/thirdweb/src/wallets/eip5792/send-calls.ts b/packages/thirdweb/src/wallets/eip5792/send-calls.ts
index a5c5d0af2ef..a4e616e4d0d 100644
--- a/packages/thirdweb/src/wallets/eip5792/send-calls.ts
+++ b/packages/thirdweb/src/wallets/eip5792/send-calls.ts
@@ -162,7 +162,7 @@ export async function sendCalls<const ID extends WalletId>(
       "../in-app/core/eip5972/in-app-wallet-calls.js"
     );
     const id = await inAppWalletSendCalls({ account, calls });
-    return { id, client, chain, wallet };
+    return { chain, client, id, wallet };
   }
 
   const preparedCalls: EIP5792Call[] = await Promise.all(
@@ -179,8 +179,8 @@ export async function sendCalls<const ID extends WalletId>(
       ]);
 
       return {
-        to: _to as Address,
         data: _data as Hex,
+        to: _to as Address,
         value:
           typeof _value === "bigint" || typeof _value === "number"
             ? numberToHex(_value)
@@ -191,13 +191,13 @@ export async function sendCalls<const ID extends WalletId>(
 
   const injectedWalletCallParams: WalletSendCallsParameters = [
     {
-      from: getAddress(account.address),
+      // see: https://eips.ethereum.org/EIPS/eip-5792#wallet_sendcalls
+      atomicRequired: options.atomicRequired ?? false,
       calls: preparedCalls,
       capabilities,
-      version,
       chainId: numberToHex(chain.id),
-      // see: https://eips.ethereum.org/EIPS/eip-5792#wallet_sendcalls
-      atomicRequired: options.atomicRequired ?? false,
+      from: getAddress(account.address),
+      version,
     },
   ];
 
@@ -222,9 +222,9 @@ export async function sendCalls<const ID extends WalletId>(
       params: injectedWalletCallParams as ViemWalletSendCallsParameters, // The viem type definition is slightly different
     });
     if (typeof callId === "object" && "id" in callId) {
-      return { id: callId.id, client, chain, wallet };
+      return { chain, client, id: callId.id, wallet };
     }
-    return { id: callId, client, chain, wallet };
+    return { chain, client, id: callId, wallet };
   } catch (error) {
     if (/unsupport|not support/i.test((error as Error).message)) {
       throw new Error(
diff --git a/packages/thirdweb/src/wallets/eip5792/show-calls-status.test.ts b/packages/thirdweb/src/wallets/eip5792/show-calls-status.test.ts
index 598542cafdd..e56fc4044d0 100644
--- a/packages/thirdweb/src/wallets/eip5792/show-calls-status.test.ts
+++ b/packages/thirdweb/src/wallets/eip5792/show-calls-status.test.ts
@@ -26,7 +26,7 @@ describe.sequential("injected wallet", async () => {
   const wallet: Wallet<typeof METAMASK> = createWallet(METAMASK);
 
   test("should run", async () => {
-    await showCallsStatus({ wallet, id: "test" });
+    await showCallsStatus({ id: "test", wallet });
 
     expect(mocks.injectedRequest).toHaveBeenCalledWith({
       method: "wallet_showCallsStatus",
@@ -37,8 +37,8 @@ describe.sequential("injected wallet", async () => {
   test("without support returns clean failed response", async () => {
     mocks.injectedRequest.mockRejectedValue(RAW_UNSUPPORTED_ERROR);
     const promise = showCallsStatus({
-      wallet: wallet as Wallet<InjectedSupportedWalletIds>,
       id: "test",
+      wallet: wallet as Wallet<InjectedSupportedWalletIds>,
     });
 
     await expect(promise).rejects.toMatchInlineSnapshot(
@@ -52,8 +52,8 @@ describe.sequential("other wallets", async () => {
 
   test("do not support", async () => {
     const promise = showCallsStatus({
-      wallet: wallet as Wallet<InjectedSupportedWalletIds>,
       id: "test",
+      wallet: wallet as Wallet<InjectedSupportedWalletIds>,
     });
 
     await expect(promise).rejects.toMatchInlineSnapshot(
diff --git a/packages/thirdweb/src/wallets/eip5792/wait-for-calls-receipt.test.ts b/packages/thirdweb/src/wallets/eip5792/wait-for-calls-receipt.test.ts
index 5284ab3b8c0..acade1f6d83 100644
--- a/packages/thirdweb/src/wallets/eip5792/wait-for-calls-receipt.test.ts
+++ b/packages/thirdweb/src/wallets/eip5792/wait-for-calls-receipt.test.ts
@@ -12,34 +12,34 @@ import { waitForCallsReceipt } from "./wait-for-calls-receipt.js";
 const MOCK_CALL_ID = "0x1234567890abcdef";
 
 const MOCK_SUCCESS_RECEIPT: GetCallsStatusResponse = {
-  status: "success",
+  atomic: false,
+  chainId: 1,
+  id: MOCK_CALL_ID,
   receipts: [
     {
-      logs: [],
-      status: "success",
       blockHash:
         "0xf19bbafd9fd0124ec110b848e8de4ab4f62bf60c189524e54213285e7f540d4a",
       blockNumber: 12345n,
+      gasUsed: 12345n,
+      logs: [],
+      status: "success",
       transactionHash:
         "0x9b7bb827c2e5e3c1a0a44dc53e573aa0b3af3bd1f9f5ed03071b100bb039eaff",
-      gasUsed: 12345n,
     },
   ],
-  atomic: false,
-  chainId: 1,
-  id: MOCK_CALL_ID,
-  version: "2.0.0",
+  status: "success",
   statusCode: 200,
+  version: "2.0.0",
 };
 
 const MOCK_PENDING_RECEIPT: GetCallsStatusResponse = {
-  status: "pending",
-  receipts: [],
   atomic: false,
   chainId: 1,
   id: MOCK_CALL_ID,
-  version: "2.0.0",
+  receipts: [],
+  status: "pending",
   statusCode: 100,
+  version: "2.0.0",
 };
 
 const mockGetCallsStatus = vi.spyOn(getCallsStatusExports, "getCallsStatus");
@@ -90,8 +90,8 @@ describe("waitForBundle", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       id: MOCK_CALL_ID,
-      wallet,
       maxBlocksWaitTime: 10,
+      wallet,
     });
 
     for (let i = 1; i <= 10 + 1; i++) {
diff --git a/packages/thirdweb/src/wallets/eip5792/wait-for-calls-receipt.ts b/packages/thirdweb/src/wallets/eip5792/wait-for-calls-receipt.ts
index 07a2e01169c..521962a9c3b 100644
--- a/packages/thirdweb/src/wallets/eip5792/wait-for-calls-receipt.ts
+++ b/packages/thirdweb/src/wallets/eip5792/wait-for-calls-receipt.ts
@@ -5,6 +5,7 @@ import type { Prettify } from "../../utils/type-utils.js";
 import type { Wallet } from "../interfaces/wallet.js";
 import { getCallsStatus } from "./get-calls-status.js";
 import type { GetCallsStatusResponse } from "./types.js";
+
 const DEFAULT_MAX_BLOCKS_WAIT_TIME = 100;
 
 const map = new Map<string, Promise<GetCallsStatusResponse>>();
@@ -69,8 +70,8 @@ export function waitForCallsReceipt(
     let blocksWaited = -1;
 
     const unwatch = watchBlockNumber({
-      client: client,
       chain: chain,
+      client: client,
       onNewBlockNumber: async () => {
         blocksWaited++;
         if (blocksWaited >= maxBlocksWaitTime) {
@@ -82,9 +83,9 @@ export function waitForCallsReceipt(
         }
         try {
           const result = await getCallsStatus({
-            wallet,
             client,
             id,
+            wallet,
           });
           if (result.status === "success" || result.status === "failure") {
             // stop the polling
diff --git a/packages/thirdweb/src/wallets/engine/engine-account.test.ts b/packages/thirdweb/src/wallets/engine/engine-account.test.ts
index a2c92a2a188..3290ea8ab86 100644
--- a/packages/thirdweb/src/wallets/engine/engine-account.test.ts
+++ b/packages/thirdweb/src/wallets/engine/engine-account.test.ts
@@ -17,10 +17,10 @@ describe.runIf(
     process.env.ENGINE_WALLET_ADDRESS,
 )("Engine", () => {
   const engineAcc = engineAccount({
-    engineUrl: process.env.ENGINE_URL as string,
     authToken: process.env.ENGINE_AUTH_TOKEN as string,
-    walletAddress: process.env.ENGINE_WALLET_ADDRESS as string,
     chain: sepolia,
+    engineUrl: process.env.ENGINE_URL as string,
+    walletAddress: process.env.ENGINE_WALLET_ADDRESS as string,
   });
 
   it("should sign a message", async () => {
@@ -41,8 +41,8 @@ describe.runIf(
     const tx = await sendTransaction({
       account: engineAcc,
       transaction: {
-        client: TEST_CLIENT,
         chain: sepolia,
+        client: TEST_CLIENT,
         to: TEST_ACCOUNT_B.address,
         value: 0n,
       },
@@ -52,15 +52,15 @@ describe.runIf(
 
   it("should send a extension tx", async () => {
     const nftContract = getContract({
-      client: TEST_CLIENT,
-      chain: sepolia,
       address: "0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8",
+      chain: sepolia,
+      client: TEST_CLIENT,
     });
     const claimTx = claimTo({
       contract: nftContract,
+      quantity: 1n,
       to: TEST_ACCOUNT_B.address,
       tokenId: 0n,
-      quantity: 1n,
     });
     const tx = await sendTransaction({
       account: engineAcc,
@@ -75,13 +75,13 @@ describe.runIf(
     });
     const smart = smartWallet({
       chain: sepolia,
-      sponsorGas: true,
       sessionKey: {
         address: process.env.ENGINE_WALLET_ADDRESS_EOA as string,
         permissions: {
           approvedTargets: "*",
         },
       },
+      sponsorGas: true,
     });
     const smartAccount = await smart.connect({
       client: TEST_CLIENT,
@@ -89,19 +89,19 @@ describe.runIf(
     });
 
     const engineAcc = engineAccount({
-      engineUrl: process.env.ENGINE_URL as string,
       authToken: process.env.ENGINE_AUTH_TOKEN as string,
-      walletAddress: process.env.ENGINE_WALLET_ADDRESS_EOA as string,
       chain: sepolia,
+      engineUrl: process.env.ENGINE_URL as string,
       overrides: {
         accountAddress: smartAccount.address,
       },
+      walletAddress: process.env.ENGINE_WALLET_ADDRESS_EOA as string,
     });
     const tx = await sendTransaction({
       account: engineAcc,
       transaction: {
-        client: TEST_CLIENT,
         chain: sepolia,
+        client: TEST_CLIENT,
         to: TEST_ACCOUNT_B.address,
         value: 0n,
       },
diff --git a/packages/thirdweb/src/wallets/engine/index.ts b/packages/thirdweb/src/wallets/engine/index.ts
index f056bbb4f2e..d6342338ce8 100644
--- a/packages/thirdweb/src/wallets/engine/index.ts
+++ b/packages/thirdweb/src/wallets/engine/index.ts
@@ -75,9 +75,9 @@ export function engineAccount(options: EngineAccountOptions): Account {
 
   // these are shared across all methods
   const headers: HeadersInit = {
-    "x-backend-wallet-address": walletAddress,
     Authorization: `Bearer ${authToken}`,
     "Content-Type": "application/json",
+    "x-backend-wallet-address": walletAddress,
   };
 
   if (overrides?.accountAddress) {
@@ -97,27 +97,27 @@ export function engineAccount(options: EngineAccountOptions): Account {
       ENGINE_URL.pathname = `/backend-wallet/${transaction.chainId}/send-transaction`;
 
       const engineData: Record<string, unknown> = {
-        // add to address if we have it (is optional to pass to engine)
-        toAddress: transaction.to || undefined,
-        // engine wants a hex string here so we serialize it
-        data: transaction.data || "0x",
-        // value is always required
-        value: transaction.value ?? 0n,
         // optional authorization list
         authorizationList: transaction.authorizationList,
+        // engine wants a hex string here so we serialize it
+        data: transaction.data || "0x",
+        // add to address if we have it (is optional to pass to engine)
+        toAddress: transaction.to || undefined,
 
         txOverrides: {
           gas: transaction.gas,
           value: transaction.value,
         },
+        // value is always required
+        value: transaction.value ?? 0n,
       };
 
       // TODO: gas overrides etc?
 
       const engineRes = await fetch(ENGINE_URL, {
-        method: "POST",
-        headers,
         body: stringify(engineData),
+        headers,
+        method: "POST",
       });
       if (!engineRes.ok) {
         const body = await engineRes.text();
@@ -138,8 +138,8 @@ export function engineAccount(options: EngineAccountOptions): Account {
 
       while (Date.now() - startTime < TIMEOUT_IN_MS) {
         const queueRes = await fetch(ENGINE_URL, {
-          method: "GET",
           headers,
+          method: "GET",
         });
         if (!queueRes.ok) {
           const body = await queueRes.text();
@@ -185,13 +185,13 @@ export function engineAccount(options: EngineAccountOptions): Account {
       const ENGINE_URL = new URL(engineUrl);
       ENGINE_URL.pathname = "/backend-wallet/sign-message";
       const engineRes = await fetch(ENGINE_URL, {
-        method: "POST",
-        headers,
         body: stringify({
-          message: engineMessage,
-          isBytes,
           chainId: chain?.id,
+          isBytes,
+          message: engineMessage,
         }),
+        headers,
+        method: "POST",
       });
       if (!engineRes.ok) {
         const body = await engineRes.text();
@@ -208,15 +208,15 @@ export function engineAccount(options: EngineAccountOptions): Account {
       const ENGINE_URL = new URL(engineUrl);
       ENGINE_URL.pathname = "/backend-wallet/sign-typed-data";
       const engineRes = await fetch(ENGINE_URL, {
-        method: "POST",
-        headers,
         body: stringify({
+          chainId: chain?.id,
           domain: _typedData.domain,
+          primaryType: _typedData.primaryType,
           types: _typedData.types,
           value: _typedData.message,
-          primaryType: _typedData.primaryType,
-          chainId: chain?.id,
         }),
+        headers,
+        method: "POST",
       });
       if (!engineRes.ok) {
         const body = await engineRes.text();
diff --git a/packages/thirdweb/src/wallets/in-app/core/actions/generate-wallet.enclave.ts b/packages/thirdweb/src/wallets/in-app/core/actions/generate-wallet.enclave.ts
index 02bfb292912..d20dc65e5f3 100644
--- a/packages/thirdweb/src/wallets/in-app/core/actions/generate-wallet.enclave.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/actions/generate-wallet.enclave.ts
@@ -21,12 +21,12 @@ export async function generateWallet({
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/generate`,
     {
-      method: "POST",
       headers: {
+        Authorization: `Bearer embedded-wallet-token:${authToken}`,
         "Content-Type": "application/json",
         "x-thirdweb-client-id": client.clientId,
-        Authorization: `Bearer embedded-wallet-token:${authToken}`,
       },
+      method: "POST",
     },
   );
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/actions/get-enclave-user-status.ts b/packages/thirdweb/src/wallets/in-app/core/actions/get-enclave-user-status.ts
index 55fec4a5c93..46ba2c4ca37 100644
--- a/packages/thirdweb/src/wallets/in-app/core/actions/get-enclave-user-status.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/actions/get-enclave-user-status.ts
@@ -22,11 +22,11 @@ export async function getUserStatus({
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/accounts`,
     {
-      method: "GET",
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer embedded-wallet-token:${authToken}`,
+        "Content-Type": "application/json",
       },
+      method: "GET",
     },
   );
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/actions/sign-authorization.enclave.ts b/packages/thirdweb/src/wallets/in-app/core/actions/sign-authorization.enclave.ts
index c3d13c3bf30..161b655df9e 100644
--- a/packages/thirdweb/src/wallets/in-app/core/actions/sign-authorization.enclave.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/actions/sign-authorization.enclave.ts
@@ -31,13 +31,13 @@ export async function signAuthorization({
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/sign-authorization`,
     {
-      method: "POST",
+      body: stringify(body),
       headers: {
+        Authorization: `Bearer embedded-wallet-token:${authToken}`,
         "Content-Type": "application/json",
         "x-thirdweb-client-id": client.clientId,
-        Authorization: `Bearer embedded-wallet-token:${authToken}`,
       },
-      body: stringify(body),
+      method: "POST",
     },
   );
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/actions/sign-message.enclave.ts b/packages/thirdweb/src/wallets/in-app/core/actions/sign-message.enclave.ts
index 58a7ac1c9e7..1958369ba5e 100644
--- a/packages/thirdweb/src/wallets/in-app/core/actions/sign-message.enclave.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/actions/sign-message.enclave.ts
@@ -29,20 +29,20 @@ export async function signMessage({
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/sign-message`,
     {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-thirdweb-client-id": client.clientId,
-        Authorization: `Bearer embedded-wallet-token:${authToken}`,
-      },
       body: stringify({
         messagePayload: {
-          message,
+          chainId,
           isRaw,
+          message,
           originalMessage,
-          chainId,
         },
       }),
+      headers: {
+        Authorization: `Bearer embedded-wallet-token:${authToken}`,
+        "Content-Type": "application/json",
+        "x-thirdweb-client-id": client.clientId,
+      },
+      method: "POST",
     },
   );
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/actions/sign-transaction.enclave.ts b/packages/thirdweb/src/wallets/in-app/core/actions/sign-transaction.enclave.ts
index 1cfeff04a84..57005551390 100644
--- a/packages/thirdweb/src/wallets/in-app/core/actions/sign-transaction.enclave.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/actions/sign-transaction.enclave.ts
@@ -25,15 +25,15 @@ export async function signTransaction({
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/sign-transaction`,
     {
-      method: "POST",
+      body: stringify({
+        transactionPayload: payload,
+      }),
       headers: {
+        Authorization: `Bearer embedded-wallet-token:${authToken}`,
         "Content-Type": "application/json",
         "x-thirdweb-client-id": client.clientId,
-        Authorization: `Bearer embedded-wallet-token:${authToken}`,
       },
-      body: stringify({
-        transactionPayload: payload,
-      }),
+      method: "POST",
     },
   );
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/actions/sign-typed-data.enclave.ts b/packages/thirdweb/src/wallets/in-app/core/actions/sign-typed-data.enclave.ts
index 43e890d1743..71c146984ff 100644
--- a/packages/thirdweb/src/wallets/in-app/core/actions/sign-typed-data.enclave.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/actions/sign-typed-data.enclave.ts
@@ -28,15 +28,15 @@ export async function signTypedData<
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/sign-typed-data`,
     {
-      method: "POST",
+      body: stringify({
+        ...payload,
+      }),
       headers: {
+        Authorization: `Bearer embedded-wallet-token:${authToken}`,
         "Content-Type": "application/json",
         "x-thirdweb-client-id": client.clientId,
-        Authorization: `Bearer embedded-wallet-token:${authToken}`,
       },
-      body: stringify({
-        ...payload,
-      }),
+      method: "POST",
     },
   );
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/authEndpoint.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/authEndpoint.ts
index 0a8b879f791..4ddf35f9b93 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/authEndpoint.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/authEndpoint.ts
@@ -14,14 +14,14 @@ export async function authEndpoint(args: {
   const clientFetch = getClientFetch(args.client, args.ecosystem);
 
   const res = await clientFetch(ROUTE_AUTH_ENDPOINT_CALLBACK, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
-      payload: args.payload,
       developerClientId: args.client.clientId,
+      payload: args.payload,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
 
   if (!res.ok) {
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/backend.test.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/backend.test.ts
index f848ba4fc36..5862ce5e0ca 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/backend.test.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/backend.test.ts
@@ -13,14 +13,14 @@ describe("backendAuthenticate", () => {
   it("should successfully authenticate and return token", async () => {
     // Mock response data
     const mockResponse = {
-      token: "mock-token",
       cookieString: "mock-cookie",
+      token: "mock-token",
     };
 
     // Mock fetch implementation
     const mockFetch = vi.fn().mockResolvedValue({
-      ok: true,
       json: () => Promise.resolve(mockResponse),
+      ok: true,
     });
 
     // Mock dependencies
@@ -34,11 +34,11 @@ describe("backendAuthenticate", () => {
 
     // Verify the fetch call
     expect(mockFetch).toHaveBeenCalledWith("/auth/login", {
-      method: "POST",
+      body: stringify({ walletSecret: "test-secret" }),
       headers: {
         "Content-Type": "application/json",
       },
-      body: stringify({ walletSecret: "test-secret" }),
+      method: "POST",
     });
 
     // Verify response
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/backend.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/backend.ts
index a4855f196d3..16a0a86c27a 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/backend.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/backend.ts
@@ -21,13 +21,13 @@ export async function backendAuthenticate(args: {
     ecosystem: args.ecosystem,
   });
   const res = await clientFetch(`${path}`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
       walletSecret: args.walletSecret,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
 
   if (!res.ok) {
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/guest.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/guest.ts
index 0cfea932e23..bdc8c0755ba 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/guest.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/guest.ts
@@ -18,9 +18,9 @@ export async function guestAuthenticate(args: {
   ecosystem?: Ecosystem;
 }): Promise<AuthStoredTokenWithCookieReturnType> {
   const storage = new ClientScopedStorage({
-    storage: args.storage,
     clientId: args.client.clientId,
     ecosystem: args.ecosystem,
+    storage: args.storage,
   });
 
   let sessionId = await storage.getGuestSessionId();
@@ -36,13 +36,13 @@ export async function guestAuthenticate(args: {
     ecosystem: args.ecosystem,
   });
   const res = await clientFetch(`${path}`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
       sessionId,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
 
   if (!res.ok) {
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/jwt.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/jwt.ts
index 4acc3eb1a01..77e83289024 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/jwt.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/jwt.ts
@@ -14,14 +14,14 @@ export async function customJwt(args: {
   const clientFetch = getClientFetch(args.client, args.ecosystem);
 
   const res = await clientFetch(ROUTE_AUTH_JWT_CALLBACK, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
-      jwt: args.jwt,
       developerClientId: args.client.clientId,
+      jwt: args.jwt,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
 
   if (!res.ok) {
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.test.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.test.ts
index 366821c4db6..ed23e0ac714 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.test.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.test.ts
@@ -18,9 +18,9 @@ describe("Account linking functions", () => {
   } as unknown as ClientScopedStorage;
   const mockFetch = vi.fn();
   const mockLinkedAccounts = [
-    { type: "email", details: { email: "user@example.com" } },
-    { type: "phone", details: { phone: "1234567890" } },
-    { type: "wallet", details: { address: "0x123456789" } },
+    { details: { email: "user@example.com" }, type: "email" },
+    { details: { phone: "1234567890" }, type: "phone" },
+    { details: { address: "0x123456789" }, type: "wallet" },
   ] satisfies Profile[];
 
   beforeEach(() => {
@@ -28,8 +28,8 @@ describe("Account linking functions", () => {
     vi.mocked(getClientFetch).mockReturnValue(mockFetch);
     vi.mocked(mockStorage.getAuthCookie).mockResolvedValue("mock-token");
     mockFetch.mockResolvedValue({
-      ok: true,
       json: () => Promise.resolve({ linkedAccounts: mockLinkedAccounts }),
+      ok: true,
     });
   });
 
@@ -37,21 +37,21 @@ describe("Account linking functions", () => {
     it("should successfully link an account", async () => {
       const result = await linkAccount({
         client: mockClient,
-        tokenToLink: "token-to-link",
         storage: mockStorage,
+        tokenToLink: "token-to-link",
       });
 
       expect(mockFetch).toHaveBeenCalledWith(
         "https://embedded-wallet.thirdweb.com/api/2024-05-05/account/connect",
         {
-          method: "POST",
+          body: JSON.stringify({
+            accountAuthTokenToConnect: "token-to-link",
+          }),
           headers: {
             Authorization: "Bearer iaw-auth-token:mock-token",
             "Content-Type": "application/json",
           },
-          body: JSON.stringify({
-            accountAuthTokenToConnect: "token-to-link",
-          }),
+          method: "POST",
         },
       );
       expect(result).toEqual(mockLinkedAccounts);
@@ -63,8 +63,8 @@ describe("Account linking functions", () => {
       await expect(
         linkAccount({
           client: mockClient,
-          tokenToLink: "token-to-link",
           storage: mockStorage,
+          tokenToLink: "token-to-link",
         }),
       ).rejects.toThrow("Failed to link account, no user logged in");
     });
@@ -72,8 +72,8 @@ describe("Account linking functions", () => {
 
   describe("unlinkAccount", () => {
     const profileToUnlink = {
-      type: "email",
       details: { email: "user@example.com" },
+      type: "email",
     } satisfies Profile;
     it("should successfully unlink an account", async () => {
       const result = await unlinkAccount({
@@ -85,16 +85,16 @@ describe("Account linking functions", () => {
       expect(mockFetch).toHaveBeenCalledWith(
         "https://embedded-wallet.thirdweb.com/api/2024-05-05/account/disconnect",
         {
-          method: "POST",
+          body: JSON.stringify({
+            allowAccountDeletion: false,
+            details: profileToUnlink.details,
+            type: profileToUnlink.type,
+          }),
           headers: {
             Authorization: "Bearer iaw-auth-token:mock-token",
             "Content-Type": "application/json",
           },
-          body: JSON.stringify({
-            type: profileToUnlink.type,
-            details: profileToUnlink.details,
-            allowAccountDeletion: false,
-          }),
+          method: "POST",
         },
       );
       expect(result).toEqual(mockLinkedAccounts);
@@ -102,25 +102,25 @@ describe("Account linking functions", () => {
 
     it("should successfully unlink an account with allowAccountDeletion", async () => {
       const result = await unlinkAccount({
+        allowAccountDeletion: true,
         client: mockClient,
         profileToUnlink,
         storage: mockStorage,
-        allowAccountDeletion: true,
       });
 
       expect(mockFetch).toHaveBeenCalledWith(
         "https://embedded-wallet.thirdweb.com/api/2024-05-05/account/disconnect",
         {
-          method: "POST",
+          body: JSON.stringify({
+            allowAccountDeletion: true,
+            details: profileToUnlink.details,
+            type: profileToUnlink.type,
+          }),
           headers: {
             Authorization: "Bearer iaw-auth-token:mock-token",
             "Content-Type": "application/json",
           },
-          body: JSON.stringify({
-            type: profileToUnlink.type,
-            details: profileToUnlink.details,
-            allowAccountDeletion: true,
-          }),
+          method: "POST",
         },
       );
       expect(result).toEqual(mockLinkedAccounts);
@@ -139,8 +139,8 @@ describe("Account linking functions", () => {
     });
     it("should handle API errors", async () => {
       mockFetch.mockResolvedValue({
-        ok: false,
         json: () => Promise.resolve({ message: "API Error" }),
+        ok: false,
       });
 
       await expect(
@@ -163,11 +163,11 @@ describe("Account linking functions", () => {
       expect(mockFetch).toHaveBeenCalledWith(
         "https://embedded-wallet.thirdweb.com/api/2024-05-05/accounts",
         {
-          method: "GET",
           headers: {
             Authorization: "Bearer iaw-auth-token:mock-token",
             "Content-Type": "application/json",
           },
+          method: "GET",
         },
       );
       expect(result).toEqual(mockLinkedAccounts);
@@ -175,8 +175,8 @@ describe("Account linking functions", () => {
 
     it("should handle API errors", async () => {
       mockFetch.mockResolvedValue({
-        ok: false,
         json: () => Promise.resolve({ message: "API Error" }),
+        ok: false,
       });
 
       await expect(
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.ts
index e888a9b0f84..9519af310a1 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.ts
@@ -38,11 +38,11 @@ export async function linkAccount({
   const linkedDetailsResp = await clientFetch(
     `${IN_APP_URL}/api/2024-05-05/account/connect`,
     {
-      method: "POST",
-      headers,
       body: stringify({
         accountAuthTokenToConnect: tokenToLink,
       }),
+      headers,
+      method: "POST",
     },
   );
 
@@ -90,13 +90,13 @@ export async function unlinkAccount({
   const linkedDetailsResp = await clientFetch(
     `${IN_APP_URL}/api/2024-05-05/account/disconnect`,
     {
-      method: "POST",
-      headers,
       body: stringify({
-        type: profileToUnlink.type,
-        details: profileToUnlink.details,
         allowAccountDeletion,
+        details: profileToUnlink.details,
+        type: profileToUnlink.type,
       }),
+      headers,
+      method: "POST",
     },
   );
 
@@ -140,8 +140,8 @@ export async function getLinkedProfilesInternal({
   const linkedAccountsResp = await clientFetch(
     `${IN_APP_URL}/api/2024-05-05/accounts`,
     {
-      method: "GET",
       headers,
+      method: "GET",
     },
   );
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/passkeys.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/passkeys.ts
index a61bc8b1c80..f9458a464c5 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/passkeys.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/passkeys.ts
@@ -77,8 +77,8 @@ export async function registerPasskey(options: {
 
   // 2. initiate registration
   const registration = await options.passkeyClient.register({
-    name: generatedName,
     challenge,
+    name: generatedName,
     rp: options.rp,
   });
 
@@ -92,25 +92,25 @@ export async function registerPasskey(options: {
 
   // 3. send the registration object to the server
   const verifRes = await fetchWithId(getVerificationPath(), {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      ...customHeaders,
-    },
     body: stringify({
-      type: "sign-up",
       authenticatorData: registration.authenticatorData,
-      credentialId: registration.credentialId,
-      serverVerificationId: challengeData.serverVerificationId,
       clientData: registration.clientData,
-      username: generatedName,
       credential: {
-        publicKey: registration.credential.publicKey,
         algorithm: registration.credential.algorithm,
+        publicKey: registration.credential.publicKey,
       },
+      credentialId: registration.credentialId,
       origin: registration.origin,
       rpId: options.rp.id,
+      serverVerificationId: challengeData.serverVerificationId,
+      type: "sign-up",
+      username: generatedName,
     }),
+    headers: {
+      "Content-Type": "application/json",
+      ...customHeaders,
+    },
+    method: "POST",
   });
   const verifData = await verifRes.json();
 
@@ -148,8 +148,8 @@ export async function loginWithPasskey(options: {
   const challenge = challengeData.challenge;
   // 2. initiate login
   const authentication = await options.passkeyClient.authenticate({
-    credentialId: credentialId ?? undefined,
     challenge,
+    credentialId: credentialId ?? undefined,
     rp: options.rp,
   });
 
@@ -162,21 +162,21 @@ export async function loginWithPasskey(options: {
   }
 
   const verifRes = await fetchWithId(getVerificationPath(), {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      ...customHeaders,
-    },
     body: stringify({
-      type: "sign-in",
       authenticatorData: authentication.authenticatorData,
-      credentialId: authentication.credentialId,
-      serverVerificationId: challengeData.serverVerificationId,
       clientData: authentication.clientData,
-      signature: authentication.signature,
+      credentialId: authentication.credentialId,
       origin: authentication.origin,
       rpId: options.rp.id,
+      serverVerificationId: challengeData.serverVerificationId,
+      signature: authentication.signature,
+      type: "sign-in",
     }),
+    headers: {
+      "Content-Type": "application/json",
+      ...customHeaders,
+    },
+    method: "POST",
   });
 
   const verifData = await verifRes.json();
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/siwe.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/siwe.ts
index 246dbc85a1a..21f8f5abe4e 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/siwe.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/siwe.ts
@@ -21,7 +21,7 @@ export async function siweAuthenticate(args: {
   const { wallet, chain, client, ecosystem } = args;
   // only connect if the wallet doesn't already have an account
   const account =
-    wallet.getAccount() || (await wallet.connect({ client, chain }));
+    wallet.getAccount() || (await wallet.connect({ chain, client }));
   const clientFetch = getClientFetch(client, ecosystem);
 
   const payload = await (async () => {
@@ -38,7 +38,7 @@ export async function siweAuthenticate(args: {
 
     return (await res.json()) satisfies LoginPayload;
   })();
-  const { signature } = await signLoginPayload({ payload, account });
+  const { signature } = await signLoginPayload({ account, payload });
 
   const authResult = await (async () => {
     const path = getLoginCallbackUrl({
@@ -49,14 +49,14 @@ export async function siweAuthenticate(args: {
     const res = await clientFetch(
       `${path}&signature=${signature}&payload=${encodeURIComponent(payload)}`,
       {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
         body: stringify({
-          signature,
           payload,
+          signature,
         }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+        method: "POST",
       },
     );
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/authentication/types.ts b/packages/thirdweb/src/wallets/in-app/core/authentication/types.ts
index 3425c7ce64c..9b078279671 100644
--- a/packages/thirdweb/src/wallets/in-app/core/authentication/types.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/authentication/types.ts
@@ -1,8 +1,7 @@
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Address } from "../../../../utils/address.js";
-import type { Account } from "../../../interfaces/wallet.js";
-import type { Wallet } from "../../../interfaces/wallet.js";
+import type { Account, Wallet } from "../../../interfaces/wallet.js";
 import type { AuthOption, OAuthOption } from "../../../types.js";
 import type { Ecosystem } from "../wallet/types.js";
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts b/packages/thirdweb/src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts
index 324cbacd430..c940d4dffa8 100644
--- a/packages/thirdweb/src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts
@@ -68,22 +68,22 @@ export async function inAppWalletGetCallsStatus(args: {
     throw new Error("Failed to get calls status, unknown bundle id");
   }
 
-  const request = getRpcClient({ client, chain });
+  const request = getRpcClient({ chain, client });
   let status: "pending" | "success" | "failure" = "success";
   const receipts: (WalletCallReceipt<bigint, "success" | "reverted"> | null)[] =
     await Promise.all(
       bundle.map((hash) =>
         eth_getTransactionReceipt(request, { hash })
           .then((receipt) => ({
+            blockHash: receipt.blockHash,
+            blockNumber: receipt.blockNumber,
+            gasUsed: receipt.gasUsed,
             logs: receipt.logs.map((l) => ({
               address: l.address,
               data: l.data,
               topics: l.topics,
             })),
             status: receipt.status,
-            blockHash: receipt.blockHash,
-            blockNumber: receipt.blockNumber,
-            gasUsed: receipt.gasUsed,
             transactionHash: receipt.transactionHash,
           }))
           .catch(() => {
@@ -94,12 +94,12 @@ export async function inAppWalletGetCallsStatus(args: {
     );
 
   return {
-    status,
-    statusCode: 200,
     atomic: false,
     chainId: chain.id,
     id,
-    version: "2.0.0",
     receipts: receipts.filter((r) => r !== null),
+    status,
+    statusCode: 200,
+    version: "2.0.0",
   };
 }
diff --git a/packages/thirdweb/src/wallets/in-app/core/eip5972/in-app-wallet-capabilities.ts b/packages/thirdweb/src/wallets/in-app/core/eip5972/in-app-wallet-capabilities.ts
index 8d671b730a7..e377580e727 100644
--- a/packages/thirdweb/src/wallets/in-app/core/eip5972/in-app-wallet-capabilities.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/eip5972/in-app-wallet-capabilities.ts
@@ -33,15 +33,15 @@ export function inAppWalletGetCapabilities(args: {
 
   return {
     [chain.id]: {
-      paymasterService: {
-        supported: sponsorGas,
-      },
       atomic: {
         status:
           account?.sendBatchTransaction !== undefined
             ? "supported"
             : "unsupported",
       },
+      paymasterService: {
+        supported: sponsorGas,
+      },
     },
   };
 }
diff --git a/packages/thirdweb/src/wallets/in-app/core/eip7702/minimal-account.ts b/packages/thirdweb/src/wallets/in-app/core/eip7702/minimal-account.ts
index 745fe0164f5..9fbf05a1cf4 100644
--- a/packages/thirdweb/src/wallets/in-app/core/eip7702/minimal-account.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/eip7702/minimal-account.ts
@@ -4,8 +4,8 @@ import { getCachedChain } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getBytecode } from "../../../../contract/actions/get-bytecode.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../../contract/contract.js";
 import { execute } from "../../../../extensions/erc7702/__generated__/MinimalAccount/write/execute.js";
 import type { SignedAuthorization } from "../../../../transaction/actions/eip7702/authorization.js";
@@ -41,11 +41,11 @@ export const create7702MinimalAccount = (args: {
     const chain = getCachedChain(firstTx.chainId);
     const eoaContract = getContract({
       address: adminAccount.address,
-      client,
       chain,
+      client,
     });
     // check if account has been delegated already
-    let authorization: SignedAuthorization | undefined = undefined;
+    let authorization: SignedAuthorization | undefined;
     const isMinimalAccount = await is7702MinimalAccount(eoaContract);
     if (!isMinimalAccount) {
       // if not, sign authorization
@@ -66,49 +66,49 @@ export const create7702MinimalAccount = (args: {
       // send transaction from executor, needs signature
       const wrappedCalls = {
         calls: txs.map((tx) => ({
-          target: getAddress(tx.to ?? ""), // will throw if undefined address
+          data: tx.data ?? "0x", // will throw if undefined address
+          target: getAddress(tx.to ?? ""),
           value: tx.value ?? 0n,
-          data: tx.data ?? "0x",
         })),
         uid: randomBytesHex(),
       };
       const signature = await adminAccount.signTypedData({
         domain: {
-          name: "MinimalAccount",
-          version: "1",
           chainId: firstTx.chainId,
+          name: "MinimalAccount",
           verifyingContract: eoaContract.address,
+          version: "1",
         },
+        message: wrappedCalls,
+        primaryType: "WrappedCalls",
         types: {
-          WrappedCalls: [
-            { name: "calls", type: "Call[]" },
-            { name: "uid", type: "bytes32" },
-          ],
           Call: [
             { name: "target", type: "address" },
             { name: "value", type: "uint256" },
             { name: "data", type: "bytes" },
           ],
+          WrappedCalls: [
+            { name: "calls", type: "Call[]" },
+            { name: "uid", type: "bytes32" },
+          ],
         },
-        message: wrappedCalls,
-        primaryType: "WrappedCalls",
       });
 
       const result = await executeWithSignature({
-        eoaAddress: getAddress(adminAccount.address),
-        wrappedCalls,
-        signature,
         authorization,
+        eoaAddress: getAddress(adminAccount.address),
         options: {
-          client,
           chain: getCachedChain(firstTx.chainId),
+          client,
         },
+        signature,
+        wrappedCalls,
       });
 
       const transactionHash = await waitForTransactionHash({
         options: {
-          client,
           chain: getCachedChain(firstTx.chainId),
+          client,
         },
         transactionId: result.transactionId,
       });
@@ -119,37 +119,37 @@ export const create7702MinimalAccount = (args: {
     // send transaction from EOA
     // wrap txs in a single execute call to the MinimalAccount
     const executeTx = execute({
-      contract: eoaContract,
       calls: txs.map((tx) => ({
+        data: tx.data ?? "0x",
         target: tx.to ?? "",
         value: tx.value ?? 0n,
-        data: tx.data ?? "0x",
       })),
+      contract: eoaContract,
       overrides: {
-        value: txs.reduce((acc, tx) => acc + (tx.value ?? 0n), 0n),
         authorizationList: authorization ? [authorization] : undefined,
+        value: txs.reduce((acc, tx) => acc + (tx.value ?? 0n), 0n),
       },
     });
     // re-estimate gas for the entire batch + authorization
     const serializedTx = await toSerializableTransaction({
-      transaction: executeTx,
       from: adminAccount.address,
+      transaction: executeTx,
     });
     return adminAccount.sendTransaction(serializedTx);
   };
 
   const minimalAccount: Account = {
     address: adminAccount.address,
-    sendTransaction: async (
-      tx: SendTransactionOption,
-    ): Promise<SendTransactionResult> => {
-      return _sendTxWithAuthorization([tx]);
-    },
     sendBatchTransaction: async (
       txs: SendTransactionOption[],
     ): Promise<SendTransactionResult> => {
       return _sendTxWithAuthorization(txs);
     },
+    sendTransaction: async (
+      tx: SendTransactionOption,
+    ): Promise<SendTransactionResult> => {
+      return _sendTxWithAuthorization([tx]);
+    },
     signMessage: ({
       message,
       originalMessage,
@@ -159,7 +159,7 @@ export const create7702MinimalAccount = (args: {
       originalMessage?: string;
       chainId?: number;
     }): Promise<Hex> =>
-      adminAccount.signMessage({ message, originalMessage, chainId }),
+      adminAccount.signMessage({ chainId, message, originalMessage }),
     signTypedData: <
       const typedData extends TypedData | Record<string, unknown>,
       primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
diff --git a/packages/thirdweb/src/wallets/in-app/core/users/getUser.test.ts b/packages/thirdweb/src/wallets/in-app/core/users/getUser.test.ts
index 725528744c9..1baa17c10b5 100644
--- a/packages/thirdweb/src/wallets/in-app/core/users/getUser.test.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/users/getUser.test.ts
@@ -41,16 +41,16 @@ describe("getUser", () => {
 
   it("should call the correct URL with email", async () => {
     mockFetch.mockResolvedValueOnce({
-      ok: true,
       json: async () => [
         {
-          userId: "user1",
-          walletAddress: "0x123",
-          email: "test@test.com",
           createdAt: "2023-01-01T00:00:00Z",
+          email: "test@test.com",
           linkedAccounts: [],
+          userId: "user1",
+          walletAddress: "0x123",
         },
       ],
+      ok: true,
     });
 
     const result = await getUser({
@@ -62,26 +62,26 @@ describe("getUser", () => {
       "https://embedded-wallet.thirdweb.com/api/2023-11-30/embedded-wallet/user-details?queryBy=email&email=test%40test.com",
     );
     expect(result).toEqual({
-      userId: "user1",
-      walletAddress: "0x123",
-      email: "test@test.com",
       createdAt: "2023-01-01T00:00:00Z",
+      email: "test@test.com",
       profiles: [],
+      userId: "user1",
+      walletAddress: "0x123",
     });
   });
 
   it("should call the correct URL with phone", async () => {
     mockFetch.mockResolvedValueOnce({
-      ok: true,
       json: async () => [
         {
-          userId: "user1",
-          walletAddress: "0x123",
-          phone: "+1234567890",
           createdAt: "2023-01-01T00:00:00Z",
           linkedAccounts: [],
+          phone: "+1234567890",
+          userId: "user1",
+          walletAddress: "0x123",
         },
       ],
+      ok: true,
     });
 
     const result = await getUser({
@@ -93,32 +93,32 @@ describe("getUser", () => {
       "https://embedded-wallet.thirdweb.com/api/2023-11-30/embedded-wallet/user-details?queryBy=phone&phone=%2B1234567890",
     );
     expect(result).toEqual({
-      userId: "user1",
-      walletAddress: "0x123",
-      phone: "+1234567890",
       createdAt: "2023-01-01T00:00:00Z",
+      phone: "+1234567890",
       profiles: [],
+      userId: "user1",
+      walletAddress: "0x123",
     });
   });
 
   it("should call the correct URL with id", async () => {
     mockFetch.mockResolvedValueOnce({
-      ok: true,
       json: async () => [
         {
-          userId: "user1",
-          walletAddress: "0x123",
           createdAt: "2023-01-01T00:00:00Z",
           linkedAccounts: [
             {
-              type: "id",
               details: {
                 id: "0x456",
               },
+              type: "id",
             },
           ],
+          userId: "user1",
+          walletAddress: "0x123",
         },
       ],
+      ok: true,
     });
 
     const result = await getUser({
@@ -130,38 +130,38 @@ describe("getUser", () => {
       "https://embedded-wallet.thirdweb.com/api/2023-11-30/embedded-wallet/user-details?queryBy=id&id=user1",
     );
     expect(result).toEqual({
-      userId: "user1",
-      walletAddress: "0x123",
       createdAt: "2023-01-01T00:00:00Z",
       profiles: [
         {
-          type: "id",
           details: {
             id: "0x456",
           },
+          type: "id",
         },
       ],
+      userId: "user1",
+      walletAddress: "0x123",
     });
   });
 
   it("should call the correct URL with externalWalletAddress", async () => {
     mockFetch.mockResolvedValueOnce({
-      ok: true,
       json: async () => [
         {
-          userId: "user1",
-          walletAddress: "0x123",
           createdAt: "2023-01-01T00:00:00Z",
           linkedAccounts: [
             {
-              type: "siwe",
               details: {
                 address: "0x456",
               },
+              type: "siwe",
             },
           ],
+          userId: "user1",
+          walletAddress: "0x123",
         },
       ],
+      ok: true,
     });
 
     const result = await getUser({
@@ -173,17 +173,17 @@ describe("getUser", () => {
       "https://embedded-wallet.thirdweb.com/api/2023-11-30/embedded-wallet/user-details?queryBy=externalWalletAddress&externalWalletAddress=0x456",
     );
     expect(result).toEqual({
-      userId: "user1",
-      walletAddress: "0x123",
       createdAt: "2023-01-01T00:00:00Z",
       profiles: [
         {
-          type: "wallet",
           details: {
             address: "0x456",
           },
+          type: "wallet",
         },
       ],
+      userId: "user1",
+      walletAddress: "0x123",
     });
   });
 
@@ -205,8 +205,8 @@ describe("getUser", () => {
 
   it("should return null if no user is found", async () => {
     mockFetch.mockResolvedValueOnce({
-      ok: true,
       json: async () => [],
+      ok: true,
     });
 
     const result = await getUser({
diff --git a/packages/thirdweb/src/wallets/in-app/core/users/getUser.ts b/packages/thirdweb/src/wallets/in-app/core/users/getUser.ts
index 203456a8e03..485c6a1e8cf 100644
--- a/packages/thirdweb/src/wallets/in-app/core/users/getUser.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/users/getUser.ts
@@ -113,18 +113,18 @@ export async function getUser({
 
   return (
     data.map((item) => ({
-      userId: item.userId,
-      walletAddress: item.walletAddress,
-      smartAccountAddress: item.smartAccountAddress,
+      createdAt: item.createdAt,
       email: item.email,
       phone: item.phone,
-      createdAt: item.createdAt,
       profiles: item.linkedAccounts.map((profile) => {
         return {
-          type: (profile.type as string) === "siwe" ? "wallet" : profile.type,
           details: profile.details,
+          type: (profile.type as string) === "siwe" ? "wallet" : profile.type,
         };
       }),
+      smartAccountAddress: item.smartAccountAddress,
+      userId: item.userId,
+      walletAddress: item.walletAddress,
     }))[0] || null
   );
 }
diff --git a/packages/thirdweb/src/wallets/in-app/core/wallet/enclave-wallet.ts b/packages/thirdweb/src/wallets/in-app/core/wallet/enclave-wallet.ts
index 58d71be41e0..dc57b31478b 100644
--- a/packages/thirdweb/src/wallets/in-app/core/wallet/enclave-wallet.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/wallet/enclave-wallet.ts
@@ -105,22 +105,22 @@ export class EnclaveWallet implements IWebWallet {
       phoneNumber: userStatus.linkedAccounts.find(
         (account) => account.details.phone !== undefined,
       )?.details.phone,
-      userWalletId: userStatus.id || "",
       recoveryShareManagement: "ENCLAVE",
+      userWalletId: userStatus.id || "",
     };
 
     if (!wallet) {
       return {
-        status: "Logged In, Wallet Uninitialized",
         authDetails,
+        status: "Logged In, Wallet Uninitialized",
       };
     }
 
     return {
+      account: await this.getAccount(),
+      authDetails,
       status: "Logged In, Wallet Initialized",
       walletAddress: wallet.address,
-      authDetails,
-      account: await this.getAccount(),
     };
   }
 
@@ -136,13 +136,12 @@ export class EnclaveWallet implements IWebWallet {
 
     const _signTransaction = async (tx: SendTransactionOption) => {
       const rpcRequest = getRpcClient({
-        client,
         chain: getCachedChain(tx.chainId),
+        client,
       });
       const transaction: Record<string, unknown> = {
-        to: tx.to ? getAddress(tx.to) : undefined,
+        chainId: toHex(tx.chainId),
         data: tx.data,
-        value: hexlify(tx.value),
         gas: hexlify(tx.gas),
         nonce:
           hexlify(tx.nonce) ||
@@ -156,7 +155,8 @@ export class EnclaveWallet implements IWebWallet {
               }),
             ),
           ),
-        chainId: toHex(tx.chainId),
+        to: tx.to ? getAddress(tx.to) : undefined,
+        value: hexlify(tx.value),
       };
 
       if (tx.authorizationList && tx.authorizationList.length > 0) {
@@ -175,26 +175,16 @@ export class EnclaveWallet implements IWebWallet {
 
       return signEnclaveTransaction({
         client,
-        storage,
         payload: transaction,
+        storage,
       });
     };
     return {
       address: getAddress(address),
-      async signTransaction(tx) {
-        if (!tx.chainId) {
-          throw new Error("chainId required in tx to sign");
-        }
-
-        return _signTransaction({
-          chainId: tx.chainId,
-          ...tx,
-        });
-      },
       async sendTransaction(tx) {
         const rpcRequest = getRpcClient({
-          client,
           chain: getCachedChain(tx.chainId),
+          client,
         });
         const signedTx = await _signTransaction(tx);
 
@@ -204,31 +194,46 @@ export class EnclaveWallet implements IWebWallet {
         );
 
         trackTransaction({
+          chainId: tx.chainId,
           client,
+          contractAddress: tx.to ?? undefined,
           ecosystem,
-          chainId: tx.chainId,
+          gasPrice: tx.gasPrice,
+          transactionHash,
           walletAddress: address,
           walletType: "inApp",
-          transactionHash,
-          contractAddress: tx.to ?? undefined,
-          gasPrice: tx.gasPrice,
         });
 
         return { transactionHash };
       },
+      async signAuthorization(payload) {
+        const authorization = await signEnclaveAuthorization({
+          client,
+          payload,
+          storage,
+        });
+        return {
+          address: getAddress(authorization.address),
+          chainId: Number.parseInt(authorization.chainId),
+          nonce: BigInt(authorization.nonce),
+          r: BigInt(authorization.r),
+          s: BigInt(authorization.s),
+          yParity: Number.parseInt(authorization.yParity),
+        };
+      },
       async signMessage({ message, originalMessage, chainId }) {
         const messagePayload = (() => {
           if (typeof message === "string") {
-            return { message, isRaw: false, originalMessage, chainId };
+            return { chainId, isRaw: false, message, originalMessage };
           }
           return {
+            chainId,
+            isRaw: true,
             message:
               typeof message.raw === "string"
                 ? message.raw
                 : bytesToHex(message.raw),
-            isRaw: true,
             originalMessage,
-            chainId,
           };
         })();
 
@@ -239,6 +244,16 @@ export class EnclaveWallet implements IWebWallet {
         });
         return signature as Hex;
       },
+      async signTransaction(tx) {
+        if (!tx.chainId) {
+          throw new Error("chainId required in tx to sign");
+        }
+
+        return _signTransaction({
+          chainId: tx.chainId,
+          ...tx,
+        });
+      },
       async signTypedData(_typedData) {
         const parsedTypedData = parseTypedData(_typedData);
         const { signature } = await signEnclaveTypedData({
@@ -249,21 +264,6 @@ export class EnclaveWallet implements IWebWallet {
 
         return signature as Hex;
       },
-      async signAuthorization(payload) {
-        const authorization = await signEnclaveAuthorization({
-          client,
-          payload,
-          storage,
-        });
-        return {
-          address: getAddress(authorization.address),
-          chainId: Number.parseInt(authorization.chainId),
-          nonce: BigInt(authorization.nonce),
-          r: BigInt(authorization.r),
-          s: BigInt(authorization.s),
-          yParity: Number.parseInt(authorization.yParity),
-        };
-      },
     };
   }
 }
diff --git a/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.test.ts b/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.test.ts
index c92dd050060..6cf98258578 100644
--- a/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.test.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.test.ts
@@ -25,14 +25,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
   const mockChain = baseSepolia;
   const mockAccount = TEST_ACCOUNT_A;
   const mockUser = {
-    status: "Logged In, Wallet Initialized",
-    walletAddress: TEST_ACCOUNT_A.address,
+    account: mockAccount,
     authDetails: {
-      userWalletId: TEST_ACCOUNT_A.address,
-      recoveryShareManagement: "ENCLAVE",
       email: "test@test.com",
+      recoveryShareManagement: "ENCLAVE",
+      userWalletId: TEST_ACCOUNT_A.address,
     },
-    account: mockAccount,
+    status: "Logged In, Wallet Initialized",
+    walletAddress: TEST_ACCOUNT_A.address,
   } as const;
   const mockAuthResult: AuthLoginReturnType = {
     user: mockUser,
@@ -40,16 +40,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
 
   const mockConnectorFactory = vi.fn(() =>
     Promise.resolve({
-      connect: vi.fn().mockResolvedValue(mockAuthResult),
-      logout: vi.fn(() => Promise.resolve({ success: true })),
       authenticate: vi.fn(),
-      getAccounts: vi.fn(),
+      connect: vi.fn().mockResolvedValue(mockAuthResult),
       getAccount: vi.fn(),
+      getAccounts: vi.fn(),
       getProfiles: vi.fn(),
       getUser: vi.fn().mockResolvedValue(mockUser),
       linkProfile: vi.fn(),
-      unlinkProfile: vi.fn(),
+      logout: vi.fn(() => Promise.resolve({ success: true })),
       preAuthenticate: vi.fn(),
+      unlinkProfile: vi.fn(),
     } as InAppConnector),
   );
 
@@ -63,18 +63,18 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
     });
 
     const result = await wallet.connect({
-      client: mockClient,
       chain: mockChain,
-      strategy: "email",
+      client: mockClient,
       email: "",
+      strategy: "email",
       verificationCode: "",
     });
 
     expect(result).toBe(mockAccount);
     expect(InAppWallet.connectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
-        client: mockClient,
         chain: mockChain,
+        client: mockClient,
       }),
       undefined,
       expect.any(Object),
@@ -87,15 +87,15 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
     });
 
     const result = await wallet.autoConnect({
-      client: mockClient,
       chain: mockChain,
+      client: mockClient,
     });
 
     expect(result).toBe(mockAccount);
     expect(InAppWallet.autoConnectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
-        client: mockClient,
         chain: mockChain,
+        client: mockClient,
       }),
       undefined,
       expect.any(Object),
@@ -104,14 +104,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
 
   it("should handle ecosystem wallet connection with smart account settings", async () => {
     vi.mocked(getEcosystemInfo).mockResolvedValue({
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
       smartAccountOptions: {
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
-      authOptions: [],
-      name: "hello world",
-      slug: "test-ecosystem",
     });
 
     const wallet = createInAppWallet({
@@ -120,30 +120,30 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
     });
 
     const result = await wallet.connect({
-      client: mockClient,
       chain: mockChain,
-      strategy: "email",
+      client: mockClient,
       email: "",
+      strategy: "email",
       verificationCode: "",
     });
 
     const expectedSmartAccountAddress = await predictSmartAccountAddress({
-      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
-      chain: mockChain,
       adminAddress: TEST_ACCOUNT_A.address,
+      chain: mockChain,
       client: mockClient,
+      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
     });
     expect(result.address).toBe(expectedSmartAccountAddress);
     expect(InAppWallet.connectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
-        client: mockClient,
         chain: mockChain,
+        client: mockClient,
       }),
       expect.objectContaining({
         smartAccount: expect.objectContaining({
           chain: mockChain,
-          sponsorGas: true,
           factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+          sponsorGas: true,
         }),
       }),
       expect.any(Object),
@@ -151,14 +151,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
   });
   it("should handle ecosystem wallet connection with smart account settings even when no chain is set", async () => {
     vi.mocked(getEcosystemInfo).mockResolvedValue({
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
       smartAccountOptions: {
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
-      authOptions: [],
-      name: "hello world",
-      slug: "test-ecosystem",
     });
 
     const wallet = createInAppWallet({
@@ -168,16 +168,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
 
     const result = await wallet.connect({
       client: mockClient,
-      strategy: "email",
       email: "",
+      strategy: "email",
       verificationCode: "",
     });
 
     const expectedSmartAccountAddress = await predictSmartAccountAddress({
-      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
-      chain: mockChain,
       adminAddress: TEST_ACCOUNT_A.address,
+      chain: mockChain,
       client: mockClient,
+      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
     });
     expect(result.address).toBe(expectedSmartAccountAddress);
     expect(InAppWallet.connectInAppWallet).toHaveBeenCalledWith(
@@ -187,8 +187,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
       expect.objectContaining({
         smartAccount: expect.objectContaining({
           chain: mockChain,
-          sponsorGas: true,
           factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+          sponsorGas: true,
         }),
       }),
       expect.any(Object),
@@ -197,14 +197,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
 
   it("should handle ecosystem wallet auto connection with smart account settings", async () => {
     vi.mocked(getEcosystemInfo).mockResolvedValue({
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
       smartAccountOptions: {
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
-      authOptions: [],
-      name: "hello world",
-      slug: "test-ecosystem",
     });
 
     const wallet = createInAppWallet({
@@ -213,27 +213,27 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
     });
 
     const result = await wallet.autoConnect({
-      client: mockClient,
       chain: mockChain,
+      client: mockClient,
     });
 
     const expectedSmartAccountAddress = await predictSmartAccountAddress({
-      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
-      chain: mockChain,
       adminAddress: TEST_ACCOUNT_A.address,
+      chain: mockChain,
       client: mockClient,
+      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
     });
     expect(result.address).toBe(expectedSmartAccountAddress);
     expect(InAppWallet.autoConnectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
-        client: mockClient,
         chain: mockChain,
+        client: mockClient,
       }),
       expect.objectContaining({
         smartAccount: expect.objectContaining({
           chain: mockChain,
-          sponsorGas: true,
           factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+          sponsorGas: true,
         }),
       }),
       expect.any(Object),
@@ -242,14 +242,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
 
   it("should handle ecosystem wallet auto connection with smart account settings even when no chain is set", async () => {
     vi.mocked(getEcosystemInfo).mockResolvedValue({
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
       smartAccountOptions: {
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
-      authOptions: [],
-      name: "hello world",
-      slug: "test-ecosystem",
     });
 
     const wallet = createInAppWallet({
@@ -262,10 +262,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
     });
 
     const expectedSmartAccountAddress = await predictSmartAccountAddress({
-      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
-      chain: mockChain,
       adminAddress: TEST_ACCOUNT_A.address,
+      chain: mockChain,
       client: mockClient,
+      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
     });
     expect(result.address).toBe(expectedSmartAccountAddress);
     expect(InAppWallet.autoConnectInAppWallet).toHaveBeenCalledWith(
@@ -275,8 +275,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
       expect.objectContaining({
         smartAccount: expect.objectContaining({
           chain: mockChain,
-          sponsorGas: true,
           factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+          sponsorGas: true,
         }),
       }),
       expect.any(Object),
@@ -302,14 +302,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
   it("should return the admin account for a smart account", async () => {
     vi.unmock("./index.js");
     vi.mocked(getEcosystemInfo).mockResolvedValue({
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
       smartAccountOptions: {
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
-      authOptions: [],
-      name: "hello world",
-      slug: "test-ecosystem",
     });
 
     const wallet = createInAppWallet({
@@ -319,8 +319,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
 
     const smartAccount = await wallet.connect({
       client: mockClient,
-      strategy: "email",
       email: "",
+      strategy: "email",
       verificationCode: "",
     });
 
diff --git a/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.ts b/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.ts
index 9c3332f8a5e..57ebeed15da 100644
--- a/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.ts
@@ -51,9 +51,9 @@ export function createInAppWallet(args: {
   const walletId = ecosystem ? ecosystem.id : "inApp";
   const emitter = createWalletEmitter<"inApp">();
   let createOptions = _createOptions;
-  let account: Account | undefined = undefined;
-  let adminAccount: Account | undefined = undefined; // Admin account if smartAccountOptions were provided with connection
-  let chain: Chain | undefined = undefined;
+  let account: Account | undefined;
+  let adminAccount: Account | undefined; // Admin account if smartAccountOptions were provided with connection
+  let chain: Chain | undefined;
   let client: ThirdwebClient | undefined;
   let authToken: string | null = null;
 
@@ -89,8 +89,8 @@ export function createInAppWallet(args: {
             ...createOptions,
             smartAccount: {
               chain: preferredChain,
-              sponsorGas: smartAccountOptions.sponsorGas,
               factoryAddress: smartAccountOptions.accountFactoryAddress,
+              sponsorGas: smartAccountOptions.sponsorGas,
             },
           };
         }
@@ -99,19 +99,6 @@ export function createInAppWallet(args: {
   };
 
   return {
-    id: walletId,
-    getAuthToken: () => authToken,
-    subscribe: emitter.subscribe,
-    getChain() {
-      if (!chain) {
-        return undefined;
-      }
-
-      chain = getCachedChainIfExists(chain.id) || chain;
-      return chain;
-    },
-    getConfig: () => createOptions,
-    getAccount: () => account,
     autoConnect: async (options) => {
       const { autoConnectInAppWallet } = await import("./index.js");
 
@@ -141,11 +128,11 @@ export function createInAppWallet(args: {
         authToken = null;
       }
       trackConnect({
+        chainId: chain.id,
         client: options.client,
         ecosystem,
-        walletType: walletId,
         walletAddress: account.address,
-        chainId: chain.id,
+        walletType: walletId,
       });
       // return only the account
       return account;
@@ -178,11 +165,11 @@ export function createInAppWallet(args: {
         authToken = null;
       }
       trackConnect({
+        chainId: chain.id,
         client: options.client,
         ecosystem,
-        walletType: walletId,
         walletAddress: account.address,
-        chainId: chain.id,
+        walletType: walletId,
       });
       // return only the account
       return account;
@@ -206,6 +193,20 @@ export function createInAppWallet(args: {
       authToken = null;
       emitter.emit("disconnect", undefined);
     },
+    getAccount: () => account,
+    getAdminAccount: () => adminAccount,
+    getAuthToken: () => authToken,
+    getChain() {
+      if (!chain) {
+        return undefined;
+      }
+
+      chain = getCachedChainIfExists(chain.id) || chain;
+      return chain;
+    },
+    getConfig: () => createOptions,
+    id: walletId,
+    subscribe: emitter.subscribe,
     switchChain: async (newChain) => {
       if (
         (createOptions?.smartAccount ||
@@ -244,6 +245,5 @@ export function createInAppWallet(args: {
       }
       emitter.emit("chainChanged", newChain);
     },
-    getAdminAccount: () => adminAccount,
   };
 }
diff --git a/packages/thirdweb/src/wallets/in-app/core/wallet/index.ts b/packages/thirdweb/src/wallets/in-app/core/wallet/index.ts
index 17f378a3548..f26523aef02 100644
--- a/packages/thirdweb/src/wallets/in-app/core/wallet/index.ts
+++ b/packages/thirdweb/src/wallets/in-app/core/wallet/index.ts
@@ -12,11 +12,11 @@ import type {
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 import type { SmartWalletOptions } from "../../../smart/types.js";
 import type {
+  CreateWalletArgs,
   EcosystemWalletId,
   WalletAutoConnectionOption,
   WalletId,
 } from "../../../wallet-types.js";
-import type { CreateWalletArgs } from "../../../wallet-types.js";
 import { create7702MinimalAccount } from "../eip7702/minimal-account.js";
 import type { InAppConnector } from "../interfaces/connector.js";
 import type {
@@ -68,8 +68,8 @@ export async function connectInAppWallet(
   const authAccount = authResult.user.account;
 
   return createInAppAccount({
-    client: options.client,
     authAccount,
+    client: options.client,
     createOptions,
     desiredChain: options.chain,
   });
@@ -99,8 +99,8 @@ export async function autoConnectInAppWallet(
   const authAccount = user.account;
 
   return createInAppAccount({
-    client: options.client,
     authAccount,
+    client: options.client,
     createOptions,
     desiredChain: options.chain,
   });
@@ -116,9 +116,9 @@ async function convertToSmartAccount(options: {
 
   return connectSmartAccount(
     {
+      chain: options.chain,
       client: options.client,
       personalAccount: options.authAccount,
-      chain: options.chain,
     },
     options.smartAccountOptions,
   );
@@ -167,12 +167,12 @@ async function createInAppAccount(options: {
 
   if (smartAccountOptions) {
     const [account, chain] = await convertToSmartAccount({
-      client,
       authAccount,
-      smartAccountOptions,
       chain: desiredChain,
+      client,
+      smartAccountOptions,
     });
-    return { account, chain, adminAccount: authAccount };
+    return { account, adminAccount: authAccount, chain };
   }
 
   if (eip7702) {
@@ -183,14 +183,14 @@ async function createInAppAccount(options: {
       );
     }
     const account = create7702MinimalAccount({
-      client,
       adminAccount: authAccount,
+      client,
       sponsorGas: eip7702.sponsorGas,
     });
     return {
       account,
-      chain,
       adminAccount: authAccount,
+      chain,
     };
   }
 
diff --git a/packages/thirdweb/src/wallets/in-app/native/auth/native-auth.ts b/packages/thirdweb/src/wallets/in-app/native/auth/native-auth.ts
index 832e31252b4..752b66ead30 100644
--- a/packages/thirdweb/src/wallets/in-app/native/auth/native-auth.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/auth/native-auth.ts
@@ -19,19 +19,19 @@ export async function socialAuth(args: {
   const loginUrl = getLoginUrl({
     authOption: auth.strategy,
     client,
+    ecosystem,
     mode: "window",
     redirectUrl: auth.redirectUrl,
-    ecosystem,
   });
 
   const result = await WebBrowser.openAuthSessionAsync(
     loginUrl,
     auth.redirectUrl,
     {
+      enableBarCollapsing: false,
+      enableDefaultShareMenuItem: false,
       preferEphemeralSession: false,
       showTitle: false,
-      enableDefaultShareMenuItem: false,
-      enableBarCollapsing: false,
     },
   );
 
diff --git a/packages/thirdweb/src/wallets/in-app/native/auth/passkeys.ts b/packages/thirdweb/src/wallets/in-app/native/auth/passkeys.ts
index d8c42cd3245..319f13b6017 100644
--- a/packages/thirdweb/src/wallets/in-app/native/auth/passkeys.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/auth/passkeys.ts
@@ -32,25 +32,25 @@ export class PasskeyNativeClient implements PasskeyClient {
   }): Promise<RegisterResult> {
     const { name, challenge, rp } = args;
     const result = await Passkey.create({
-      challenge,
-      user: {
-        displayName: name,
-        name: name,
-        id: keccak256(toBytes(name)),
-      },
       authenticatorSelection: {
         authenticatorAttachment: "platform",
+        requireResidentKey: true,
         residentKey: "required",
         userVerification: "required",
-        requireResidentKey: true,
       },
-      rp,
+      challenge,
       pubKeyCredParams: [
         {
           alg: -7,
           type: "public-key",
         },
       ],
+      rp,
+      user: {
+        displayName: name,
+        id: keccak256(toBytes(name)),
+        name: name,
+      },
     });
 
     const parsedResult =
@@ -65,12 +65,12 @@ export class PasskeyNativeClient implements PasskeyClient {
 
     return {
       authenticatorData: authData,
-      credentialId: parsedResult.id,
       clientData: clientDataB64,
       credential: {
-        publicKey,
         algorithm: "ES256",
+        publicKey,
       },
+      credentialId: parsedResult.id,
       origin: clientDataParsed.origin,
     };
   }
@@ -82,18 +82,18 @@ export class PasskeyNativeClient implements PasskeyClient {
   }): Promise<AuthenticateResult> {
     const { credentialId, challenge, rp } = args;
     const result = await Passkey.get({
-      challenge,
-      rpId: rp.id,
       allowCredentials: credentialId
         ? [
             {
               id: credentialId,
-              type: "public-key",
               // biome-ignore lint/suspicious/noExplicitAny: enum not exported
               transports: ["hybrid" as any],
+              type: "public-key",
             },
           ]
         : [],
+      challenge,
+      rpId: rp.id,
     });
 
     const parsedResult =
@@ -105,10 +105,10 @@ export class PasskeyNativeClient implements PasskeyClient {
 
     return {
       authenticatorData: parsedResult.response.authenticatorData,
-      credentialId: parsedResult.id,
       clientData: clientDataB64,
-      signature: parsedResult.response.signature,
+      credentialId: parsedResult.id,
       origin: clientDataParsed.origin,
+      signature: parsedResult.response.signature,
     };
   }
 }
@@ -125,9 +125,9 @@ export async function hasStoredPasskey(
   storage?: AsyncStorage,
 ) {
   const clientStorage = new ClientScopedStorage({
-    storage: storage ?? nativeLocalStorage,
     clientId: client.clientId,
     ecosystem: ecosystemId ? { id: ecosystemId } : undefined,
+    storage: storage ?? nativeLocalStorage,
   });
   const credId = await clientStorage.getPasskeyCredentialId();
   return !!credId;
@@ -203,8 +203,8 @@ async function extractPublicKeyAndAuthData(response: {
   ]);
 
   return {
-    publicKey: uint8ArrayToBase64(pubKey),
     authData: uint8ArrayToBase64(authData),
+    publicKey: uint8ArrayToBase64(pubKey),
   };
 }
 
@@ -260,12 +260,12 @@ function decodeAuthData(authData: Uint8Array) {
   }
 
   return {
-    rpIdHash,
-    flags,
-    signCount,
     aaguid,
-    credentialIdLength,
     credentialId,
+    credentialIdLength,
+    flags,
     publicKey,
+    rpIdHash,
+    signCount,
   };
 }
diff --git a/packages/thirdweb/src/wallets/in-app/native/ecosystem.ts b/packages/thirdweb/src/wallets/in-app/native/ecosystem.ts
index c6dd26a9696..a69b04dfca2 100644
--- a/packages/thirdweb/src/wallets/in-app/native/ecosystem.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/ecosystem.ts
@@ -70,14 +70,6 @@ export function ecosystemWallet(
     partnerId: createOptions?.partnerId,
   };
   return createInAppWallet({
-    ecosystem,
-    createOptions: {
-      auth: {
-        ...createOptions?.auth,
-        options: [], // controlled by ecosystem
-      },
-      partnerId: createOptions?.partnerId,
-    },
     connectorFactory: async (client: ThirdwebClient) => {
       const { InAppNativeConnector } = await import("./native-connector.js");
       return new InAppNativeConnector({
@@ -87,5 +79,13 @@ export function ecosystemWallet(
         // TODO (enclave): passkeyDomain for ecosystem wallets
       });
     },
+    createOptions: {
+      auth: {
+        ...createOptions?.auth,
+        options: [], // controlled by ecosystem
+      },
+      partnerId: createOptions?.partnerId,
+    },
+    ecosystem,
   }) as Wallet<EcosystemWalletId>;
 }
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/api/fetchers.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/api/fetchers.ts
index 2fafa28584d..2663099e63b 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/api/fetchers.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/api/fetchers.ts
@@ -18,7 +18,7 @@ const PAPER_CLIENT_ID_HEADER = "x-thirdweb-client-id";
 const ECOSYSTEM_ID_HEADER = "x-ecosystem-id";
 const ECOSYSTEM_PARTNER_ID_HEADER = "x-ecosystem-partner-id";
 
-let sessionNonce: Hex | undefined = undefined;
+let sessionNonce: Hex | undefined;
 
 function getSessionHeaders() {
   if (!sessionNonce) {
@@ -32,11 +32,11 @@ function getSessionHeaders() {
 
 export const verifyClientId = async (client: ThirdwebClient) => {
   const resp = await getClientFetch(client)(ROUTE_VERIFY_THIRDWEB_CLIENT_ID, {
-    method: "POST",
+    body: stringify({ clientId: client.clientId, parentDomain: "" }),
     headers: {
       ...getSessionHeaders(),
     },
-    body: stringify({ clientId: client.clientId, parentDomain: "" }),
+    method: "POST",
   });
   if (!resp.ok) {
     const error = await resp.json();
@@ -95,10 +95,10 @@ export async function authFetchEmbeddedWalletUser(args: {
       await new Promise((resolve) => setTimeout(resolve, 500));
       return await authFetchEmbeddedWalletUser({
         client,
-        url,
         props: params,
-        storage,
         retries: retries - 1,
+        storage,
+        url,
       });
     }
     throw e;
@@ -118,11 +118,11 @@ export async function fetchUserDetails(args: {
   }
   const resp = await authFetchEmbeddedWalletUser({
     client: args.client,
-    url: url.href,
     props: {
       method: "GET",
     },
     storage: args.storage,
+    url: url.href,
   });
   if (!resp.ok) {
     const error = await resp.json();
@@ -152,17 +152,17 @@ export async function storeUserShares({
 }) {
   const resp = await authFetchEmbeddedWalletUser({
     client,
-    url: ROUTE_STORE_USER_SHARES,
     props: {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
       body: stringify({
-        walletAddress,
-        maybeEncryptedRecoveryShares,
         authShare,
+        maybeEncryptedRecoveryShares,
+        walletAddress,
       }),
+      headers: { "Content-Type": "application/json" },
+      method: "POST",
     },
     storage,
+    url: ROUTE_STORE_USER_SHARES,
   });
 
   if (!resp.ok) {
@@ -185,11 +185,11 @@ export async function getUserShares(args: {
 }) {
   const resp = await authFetchEmbeddedWalletUser({
     client: args.client,
-    url: args.getShareUrl.href,
     props: {
       method: "GET",
     },
     storage: args.storage,
+    url: args.getShareUrl.href,
   });
   if (!resp.ok) {
     const error = await resp.json();
@@ -222,11 +222,11 @@ export async function deleteAccount(args: {
   const url = new URL(ROUTE_EMBEDDED_WALLET_DETAILS);
   const resp = await authFetchEmbeddedWalletUser({
     client: args.client,
-    url: url.href,
     props: {
       method: "DELETE",
     },
     storage: args.storage,
+    url: url.href,
   });
   if (!resp.ok) {
     const error = await resp.json();
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/auth/middleware.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/auth/middleware.ts
index 6873dd63fd5..c0627cf49ce 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/auth/middleware.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/auth/middleware.ts
@@ -27,21 +27,21 @@ export async function postAuth({
 
   await setWallerUserDetails({
     clientId: client.clientId,
-    userId: storedToken.authDetails.userWalletId,
     email:
       "email" in storedToken.authDetails
         ? storedToken.authDetails.email
         : "phoneNumber" in storedToken.authDetails
           ? storedToken.authDetails.phoneNumber
           : undefined,
+    userId: storedToken.authDetails.userWalletId,
   });
 
   if (storedToken.isNewUser) {
     const _recoveryCode = await getRecoveryCode({
-      storedToken,
       client,
       recoveryCode: encryptionKey,
       storage,
+      storedToken,
     });
     if (!_recoveryCode) {
       throw new Error(ErrorMessages.missingRecoveryCode);
@@ -57,10 +57,10 @@ export async function postAuth({
       await getDeviceShare(client.clientId);
     } catch {
       const _recoveryCode = await getRecoveryCode({
-        storedToken,
         client,
         recoveryCode: encryptionKey,
         storage,
+        storedToken,
       });
       if (!_recoveryCode) {
         throw new Error(ErrorMessages.missingRecoveryCode);
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/storage/local.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/storage/local.ts
index 68bb1128edd..6768342ddff 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/storage/local.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/storage/local.ts
@@ -66,7 +66,7 @@ export async function setWallerUserDetails({
   await setItemInAsyncStorage(
     // ! Keep this in sync with getWalletUserDetails function below
     name,
-    stringify({ userId, email: newEmail }),
+    stringify({ email: newEmail, userId }),
   );
 }
 
@@ -108,7 +108,7 @@ export async function setDeviceShare({
   }
 
   const name = DEVICE_SHARE_LOCAL_STORAGE_NAME(clientId, userDetails.userId);
-  await setWallerUserDetails({ userId: userDetails.userId, clientId });
+  await setWallerUserDetails({ clientId, userId: userDetails.userId });
   await setItemInAsyncStorage(name, deviceShare);
   return deviceShare;
 }
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/creation.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/creation.ts
index f57a58fbc64..638731d7493 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/creation.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/creation.ts
@@ -54,28 +54,28 @@ async function generateWallet({
   const walletDetails = await createWalletShares();
 
   const maybeDeviceShare = await storeShares({
-    client,
-    storage,
-    walletAddress: walletDetails.publicAddress,
     authShare: walletDetails.shares[AUTH_SHARE_INDEX],
+    client,
     deviceShare: walletDetails.shares[DEVICE_SHARE_INDEX],
     recoveryShares: [
       {
+        recoveryCode,
         // biome-ignore lint/style/noNonNullAssertion: its there
         share: walletDetails.shares[RECOVERY_SHARE_INDEX]!,
-        recoveryCode,
       },
     ],
+    storage,
+    walletAddress: walletDetails.publicAddress,
   });
 
   if (!maybeDeviceShare?.deviceShareStored) {
     throw new Error(DEVICE_SHARE_MISSING_MESSAGE);
   }
   return {
-    walletAddress: walletDetails.publicAddress,
     deviceShareStored: maybeDeviceShare?.deviceShareStored,
     isIframeStorageEnabled: false,
     recoveryCode,
+    walletAddress: walletDetails.publicAddress,
   };
 }
 
@@ -138,11 +138,11 @@ export async function storeShares<R extends string | undefined>({
     maybeEncryptedRecoveryShares = await Promise.all(
       recoveryShares.map(async (recoveryShare) => {
         return {
+          isClientEncrypted: true,
           share: await encryptShareWeb(
             recoveryShare.share,
             recoveryShare.recoveryCode,
           ),
-          isClientEncrypted: true,
         };
       }),
     );
@@ -152,15 +152,15 @@ export async function storeShares<R extends string | undefined>({
     authShare,
     client,
     maybeEncryptedRecoveryShares,
-    walletAddress,
     storage,
+    walletAddress,
   });
 
   try {
     if (deviceShare) {
       const deviceShareStored = await setDeviceShare({
-        deviceShare,
         clientId: client.clientId,
+        deviceShare,
       });
       return { deviceShareStored };
     }
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/migration.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/migration.ts
index d2ed10d388c..21fe0bcf5b0 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/migration.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/migration.ts
@@ -37,15 +37,15 @@ export async function migrateToEnclaveWallet(args: {
 }): Promise<UserWallet> {
   // setup sharded wallet first, so we have the shares available
   await postAuth({
-    storedToken: args.storedToken,
     client: args.client,
-    storage: args.storage,
     encryptionKey: args.encryptionKey,
+    storage: args.storage,
+    storedToken: args.storedToken,
   });
 
   const { authShare, deviceShare } = await getShares({
-    client: args.client,
     authShare: { toRetrieve: true },
+    client: args.client,
     deviceShare: { toRetrieve: true },
     recoveryShare: { toRetrieve: false },
     storage: args.storage,
@@ -65,11 +65,11 @@ export async function migrateToEnclaveWallet(args: {
   // get cognito identity
   const idTokenResponse = await authFetchEmbeddedWalletUser({
     client: args.client,
-    url: ROUTE_AUTH_COGNITO_ID_TOKEN_V2,
     props: {
       method: "GET",
     },
     storage: args.storage,
+    url: ROUTE_AUTH_COGNITO_ID_TOKEN_V2,
   });
   if (!idTokenResponse.ok) {
     throw new Error(
@@ -95,8 +95,8 @@ export async function migrateToEnclaveWallet(args: {
 
   // get kms key
   const kmsClient = new KMSClient({
-    region: AWS_REGION,
     credentials: cognitoIdentity,
+    region: AWS_REGION,
   });
   const generateDataKeyCommand = new GenerateDataKeyCommand({
     KeyId: ENCLAVE_KMS_KEY_ARN,
@@ -123,8 +123,8 @@ export async function migrateToEnclaveWallet(args: {
   // @ts-ignore - default import buils but ts doesn't like it
   const encryptedPrivateKey = await QuickCrypto.subtle.encrypt(
     {
-      name: "AES-CBC",
       iv,
+      name: "AES-CBC",
     },
     key,
     stringToBytes(privateKey),
@@ -141,12 +141,12 @@ export async function migrateToEnclaveWallet(args: {
 
   // execute migration
   const result = await executeMigration({
-    client: args.client,
-    storage: args.storage,
     address,
-    kmsCiphertextB64: cipherTextB64,
+    client: args.client,
     encryptedPrivateKeyB64: encryptedPrivateKeyB64,
     ivB64,
+    kmsCiphertextB64: cipherTextB64,
+    storage: args.storage,
   });
 
   return result;
@@ -162,17 +162,17 @@ async function executeMigration(args: {
 }): Promise<UserWallet> {
   const migrationResponse = await authFetchEmbeddedWalletUser({
     client: args.client,
-    url: `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/migrate`,
     props: {
-      method: "POST",
       body: stringify({
         address: args.address,
-        kmsCiphertextB64: args.kmsCiphertextB64,
         encryptedPrivateKeyB64: args.encryptedPrivateKeyB64,
         ivB64: args.ivB64,
+        kmsCiphertextB64: args.kmsCiphertextB64,
       }),
+      method: "POST",
     },
     storage: args.storage,
+    url: `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/migrate`,
   });
   if (!migrationResponse.ok) {
     throw new Error(
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/recoveryCode.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/recoveryCode.ts
index 8fb9026a016..a58b620585d 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/recoveryCode.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/recoveryCode.ts
@@ -24,11 +24,11 @@ export async function getCognitoRecoveryPasswordV1(args: {
 }) {
   const idTokenResponse = await authFetchEmbeddedWalletUser({
     client: args.client,
-    url: ROUTE_AUTH_COGNITO_ID_TOKEN_V1,
     props: {
       method: "GET",
     },
     storage: args.storage,
+    url: ROUTE_AUTH_COGNITO_ID_TOKEN_V1,
   });
   if (!idTokenResponse.ok) {
     throw new Error(
@@ -55,8 +55,8 @@ export async function getCognitoRecoveryPasswordV1(args: {
 
   // ? Figure out how to potentially route things through API Gateway
   const lambdaClient = new LambdaClient({
-    region: AWS_REGION,
     credentials: credentials,
+    region: AWS_REGION,
   });
 
   const params = {
@@ -85,11 +85,11 @@ export async function getCognitoRecoveryPasswordV2(args: {
 }) {
   const idTokenResponse = await authFetchEmbeddedWalletUser({
     client: args.client,
-    url: ROUTE_AUTH_COGNITO_ID_TOKEN_V2,
     props: {
       method: "GET",
     },
     storage: args.storage,
+    url: ROUTE_AUTH_COGNITO_ID_TOKEN_V2,
   });
   if (!idTokenResponse.ok) {
     throw new Error(
@@ -115,8 +115,8 @@ export async function getCognitoRecoveryPasswordV2(args: {
 
   // ? Figure out how to potentially route things through API Gateway
   const lambdaClient = new LambdaClient({
-    region: AWS_REGION,
     credentials: cognitoIdentity,
+    region: AWS_REGION,
   });
 
   const params = {
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/retrieval.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/retrieval.ts
index d780bfc7d21..bd326e8cd85 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/retrieval.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/retrieval.ts
@@ -28,8 +28,8 @@ export async function getExistingUserAccount(args: {
 }) {
   const { client, storage } = args;
   const { authShare, deviceShare } = await getShares({
-    client,
     authShare: { toRetrieve: true },
+    client,
     deviceShare: { toRetrieve: true },
     recoveryShare: { toRetrieve: false },
     storage,
@@ -210,10 +210,10 @@ export async function setUpShareForNewDevice({
   storage: ClientScopedStorage;
 }): Promise<SetUpWalletRpcReturnType> {
   const { recoveryShare, authShare } = await getShares({
-    client,
     authShare: { toRetrieve: true },
-    recoveryShare: { toRetrieve: true, recoveryCode },
+    client,
     deviceShare: { toRetrieve: false },
+    recoveryShare: { recoveryCode, toRetrieve: true },
     storage,
   });
   // instead of recreating a new share, just save the recovery one as the new device share
@@ -225,17 +225,17 @@ export async function setUpShareForNewDevice({
 
   const maybeDeviceShare = await storeShares({
     client,
-    walletAddress,
     deviceShare,
     storage,
+    walletAddress,
   });
 
   if (!maybeDeviceShare?.deviceShareStored) {
     throw new Error(DEVICE_SHARE_MISSING_MESSAGE);
   }
   return {
-    walletAddress,
     deviceShareStored: maybeDeviceShare?.deviceShareStored,
     isIframeStorageEnabled: false,
+    walletAddress,
   };
 }
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sharded-wallet.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sharded-wallet.ts
index e0f08d22eae..3e8e2168f3a 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sharded-wallet.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sharded-wallet.ts
@@ -25,10 +25,10 @@ export class ShardedWallet implements IWebWallet {
 
   async postWalletSetUp(authResult: AuthResultAndRecoveryCode): Promise<void> {
     await postAuth({
-      storedToken: authResult.storedToken,
       client: this.client,
-      storage: this.storage,
       encryptionKey: authResult.encryptionKey,
+      storage: this.storage,
+      storedToken: authResult.storedToken,
     });
   }
 
@@ -41,23 +41,23 @@ export class ShardedWallet implements IWebWallet {
     });
     if (userStatus.status === "Logged In, Wallet Initialized") {
       return {
-        status: userStatus.status,
+        account: await this.getAccount(),
         authDetails: userStatus.storedToken.authDetails,
+        status: userStatus.status,
         walletAddress: userStatus.walletAddress,
-        account: await this.getAccount(),
       };
     }
     if (userStatus.status === "Logged In, New Device") {
       return {
-        status: "Logged In, New Device",
         authDetails: userStatus.storedToken.authDetails,
+        status: "Logged In, New Device",
         walletAddress: userStatus.walletAddress,
       };
     }
     if (userStatus.status === "Logged In, Wallet Uninitialized") {
       return {
-        status: "Logged In, Wallet Uninitialized",
         authDetails: userStatus.storedToken.authDetails,
+        status: "Logged In, Wallet Uninitialized",
       };
     }
     // Logged out
diff --git a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sss.ts b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sss.ts
index 77533403312..57e211186c7 100644
--- a/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sss.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/helpers/wallet/sss.ts
@@ -1,3 +1,4 @@
+/* biome-ignore-all lint: IGNORED */
 // @ts-nocheck - TODO typescript-ify this file
 // ported from https://github.com/34r7h/secrets.js/blob/master/secrets.js
 // with minimal changes to only allow using our own randomBytesBuffer function
@@ -8,11 +9,10 @@ var defaults, config, preGenPadding, runCSPRNGTest, CSPRNGTypes;
 function reset() {
   defaults = {
     bits: 8, // default number of bits
-    radix: 16, // work with HEX by default
+    bytesPerChar: 2, // work with HEX by default
+    maxBits: 20,
+    maxBytesPerChar: 6, // this permits 1,048,575 shares, though going this high is NOT recommended in JS!
     minBits: 3,
-    maxBits: 20, // this permits 1,048,575 shares, though going this high is NOT recommended in JS!
-    bytesPerChar: 2,
-    maxBytesPerChar: 6, // Math.pow(256,7) > Math.pow(2,53)
 
     // Primitive polynomials (in decimal form) for Galois Fields GF(2^n), for 2 <= n <= 30
     // The index of each term in the array corresponds to the n for that polynomial
@@ -49,7 +49,8 @@ function reset() {
       9,
       5,
       83,
-    ],
+    ], // Math.pow(256,7) > Math.pow(2,53)
+    radix: 16,
   };
   config = {};
   preGenPadding = new Array(1024).join("0"); // Pre-generate a string of 1024 0's for use by padLeft().
@@ -329,7 +330,7 @@ function constructPublicShareString(bits, id, data) {
   id = Number.parseInt(id, config.radix);
   bits = Number.parseInt(bits, 10) || config.bits;
   bitsBase36 = bits.toString(36).toUpperCase();
-  idMax = Math.pow(2, bits) - 1;
+  idMax = 2 ** bits - 1;
   idPaddingLen = idMax.toString(config.radix).length;
   idHex = padLeft(id.toString(config.radix), idPaddingLen);
 
@@ -348,79 +349,6 @@ function constructPublicShareString(bits, id, data) {
 // //////////////////
 
 export const secrets = {
-  init: function (bits, rngType) {
-    var logs = [],
-      exps = [],
-      x = 1,
-      primitive,
-      i;
-
-    // reset all config back to initial state
-    reset();
-
-    if (
-      bits &&
-      (typeof bits !== "number" ||
-        bits % 1 !== 0 ||
-        bits < defaults.minBits ||
-        bits > defaults.maxBits)
-    ) {
-      throw new Error(
-        "Number of bits must be an integer between " +
-          defaults.minBits +
-          " and " +
-          defaults.maxBits +
-          ", inclusive.",
-      );
-    }
-
-    if (rngType && CSPRNGTypes.indexOf(rngType) === -1) {
-      throw new Error("Invalid RNG type argument : '" + rngType + "'");
-    }
-
-    config.radix = defaults.radix;
-    config.bits = bits || defaults.bits;
-    config.size = Math.pow(2, config.bits);
-    config.maxShares = config.size - 1;
-
-    // Construct the exp and log tables for multiplication.
-    primitive = defaults.primitivePolynomials[config.bits];
-
-    for (i = 0; i < config.size; i++) {
-      exps[i] = x;
-      logs[x] = i;
-      x = x << 1; // Left shift assignment
-      if (x >= config.size) {
-        x = x ^ primitive; // Bitwise XOR assignment
-        x = x & config.maxShares; // Bitwise AND assignment
-      }
-    }
-
-    config.logs = logs;
-    config.exps = exps;
-
-    if (rngType) {
-      this.setRNG(rngType);
-    }
-
-    if (!isSetRNG()) {
-      this.setRNG();
-    }
-
-    if (
-      !isSetRNG() ||
-      !config.bits ||
-      !config.size ||
-      !config.maxShares ||
-      !config.logs ||
-      !config.exps ||
-      config.logs.length !== config.size ||
-      config.exps.length !== config.size
-    ) {
-      throw new Error("Initialization failed.");
-    }
-  },
-
   // Evaluates the Lagrange interpolation polynomial at x=`at` for
   // individual config.bits-length segments of each share in the `shares`
   // Array. Each share is expressed in base `inputRadix`. The output
@@ -512,16 +440,6 @@ export const secrets = {
     return bin2hex(at >= 1 ? result : result.slice(result.indexOf("1") + 1));
   },
 
-  getConfig: () => {
-    var obj = {};
-    obj.radix = config.radix;
-    obj.bits = config.bits;
-    obj.maxShares = config.maxShares;
-    obj.hasCSPRNG = isSetRNG();
-    obj.typeCSPRNG = config.typeCSPRNG;
-    return obj;
-  },
-
   // Given a public share, extract the bits (Integer), share ID (Integer), and share data (Hex)
   // and return an Object containing those components.
   extractShareComponents: (share) => {
@@ -553,10 +471,10 @@ export const secrets = {
     }
 
     // calc the max shares allowed for given bits
-    max = Math.pow(2, bits) - 1;
+    max = 2 ** bits - 1;
 
     // Determine the ID length which is variable and based on the bit count.
-    idLen = (Math.pow(2, bits) - 1).toString(config.radix).length;
+    idLen = (2 ** bits - 1).toString(config.radix).length;
 
     // Extract all the parts now that the segment sizes are known.
     regexStr = "^([a-kA-K3-9]{1})([a-fA-F0-9]{" + idLen + "})([a-fA-F0-9]+)$";
@@ -585,6 +503,163 @@ export const secrets = {
     throw new Error("The share data provided is invalid : " + share);
   },
 
+  getConfig: () => {
+    var obj = {};
+    obj.radix = config.radix;
+    obj.bits = config.bits;
+    obj.maxShares = config.maxShares;
+    obj.hasCSPRNG = isSetRNG();
+    obj.typeCSPRNG = config.typeCSPRNG;
+    return obj;
+  },
+
+  // Converts a given HEX number string to a UTF16 character string.
+  hex2str: (str, bytesPerChar) => {
+    var hexChars,
+      out = "",
+      i,
+      len;
+
+    if (typeof str !== "string") {
+      throw new Error("Input must be a hexadecimal string.");
+    }
+    bytesPerChar = bytesPerChar || defaults.bytesPerChar;
+
+    if (
+      typeof bytesPerChar !== "number" ||
+      bytesPerChar % 1 !== 0 ||
+      bytesPerChar < 1 ||
+      bytesPerChar > defaults.maxBytesPerChar
+    ) {
+      throw new Error(
+        "Bytes per character must be an integer between 1 and " +
+          defaults.maxBytesPerChar +
+          ", inclusive.",
+      );
+    }
+
+    hexChars = 2 * bytesPerChar;
+
+    str = padLeft(str, hexChars);
+
+    for (i = 0, len = str.length; i < len; i += hexChars) {
+      out =
+        String.fromCharCode(Number.parseInt(str.slice(i, i + hexChars), 16)) +
+        out;
+    }
+
+    return out;
+  },
+  init: function (bits, rngType) {
+    var logs = [],
+      exps = [],
+      x = 1,
+      primitive,
+      i;
+
+    // reset all config back to initial state
+    reset();
+
+    if (
+      bits &&
+      (typeof bits !== "number" ||
+        bits % 1 !== 0 ||
+        bits < defaults.minBits ||
+        bits > defaults.maxBits)
+    ) {
+      throw new Error(
+        "Number of bits must be an integer between " +
+          defaults.minBits +
+          " and " +
+          defaults.maxBits +
+          ", inclusive.",
+      );
+    }
+
+    if (rngType && CSPRNGTypes.indexOf(rngType) === -1) {
+      throw new Error("Invalid RNG type argument : '" + rngType + "'");
+    }
+
+    config.radix = defaults.radix;
+    config.bits = bits || defaults.bits;
+    config.size = 2 ** config.bits;
+    config.maxShares = config.size - 1;
+
+    // Construct the exp and log tables for multiplication.
+    primitive = defaults.primitivePolynomials[config.bits];
+
+    for (i = 0; i < config.size; i++) {
+      exps[i] = x;
+      logs[x] = i;
+      x = x << 1; // Left shift assignment
+      if (x >= config.size) {
+        x = x ^ primitive; // Bitwise XOR assignment
+        x = x & config.maxShares; // Bitwise AND assignment
+      }
+    }
+
+    config.logs = logs;
+    config.exps = exps;
+
+    if (rngType) {
+      this.setRNG(rngType);
+    }
+
+    if (!isSetRNG()) {
+      this.setRNG();
+    }
+
+    if (
+      !isSetRNG() ||
+      !config.bits ||
+      !config.size ||
+      !config.maxShares ||
+      !config.logs ||
+      !config.exps ||
+      config.logs.length !== config.size ||
+      config.exps.length !== config.size
+    ) {
+      throw new Error("Initialization failed.");
+    }
+  },
+
+  // Generate a new share with id `id` (a number between 1 and 2^bits-1)
+  // `id` can be a Number or a String in the default radix (16)
+  newShare: function (id, shares) {
+    var share, radid;
+
+    if (id && typeof id === "string") {
+      id = Number.parseInt(id, config.radix);
+    }
+
+    radid = id.toString(config.radix);
+
+    if (id && radid && shares && shares[0]) {
+      share = this.extractShareComponents(shares[0]);
+      return constructPublicShareString(
+        share.bits,
+        radid,
+        this.combine(shares, id),
+      );
+    }
+
+    throw new Error("Invalid 'id' or 'shares' Array argument to newShare().");
+  },
+
+  // Generates a random bits-length number string using the PRNG
+  random: (bits) => {
+    if (
+      typeof bits !== "number" ||
+      bits % 1 !== 0 ||
+      bits < 2 ||
+      bits > 65536
+    ) {
+      throw new Error("Number of bits must be an Integer between 1 and 65536.");
+    }
+
+    return bin2hex(config.rng(bits));
+  },
+
   // Set the PRNG to use. If no RNG function is supplied, pick a default using getRNG()
   setRNG: (rng) => {
     var errPrefix = "Random number generator is invalid ",
@@ -644,119 +719,6 @@ export const secrets = {
     return true;
   },
 
-  // Converts a given UTF16 character string to the HEX representation.
-  // Each character of the input string is represented by
-  // `bytesPerChar` bytes in the output string which defaults to 2.
-  str2hex: (str, bytesPerChar) => {
-    var hexChars,
-      max,
-      out = "",
-      neededBytes,
-      num,
-      i,
-      len;
-
-    if (typeof str !== "string") {
-      throw new Error("Input must be a character string.");
-    }
-
-    if (!bytesPerChar) {
-      bytesPerChar = defaults.bytesPerChar;
-    }
-
-    if (
-      typeof bytesPerChar !== "number" ||
-      bytesPerChar < 1 ||
-      bytesPerChar > defaults.maxBytesPerChar ||
-      bytesPerChar % 1 !== 0
-    ) {
-      throw new Error(
-        "Bytes per character must be an integer between 1 and " +
-          defaults.maxBytesPerChar +
-          ", inclusive.",
-      );
-    }
-
-    hexChars = 2 * bytesPerChar;
-    max = Math.pow(16, hexChars) - 1;
-
-    for (i = 0, len = str.length; i < len; i++) {
-      num = str[i].charCodeAt();
-
-      if (isNaN(num)) {
-        throw new Error("Invalid character: " + str[i]);
-      }
-
-      if (num > max) {
-        neededBytes = Math.ceil(Math.log(num + 1) / Math.log(256));
-        throw new Error(
-          "Invalid character code (" +
-            num +
-            "). Maximum allowable is 256^bytes-1 (" +
-            max +
-            "). To convert this character, use at least " +
-            neededBytes +
-            " bytes.",
-        );
-      }
-
-      out = padLeft(num.toString(16), hexChars) + out;
-    }
-    return out;
-  },
-
-  // Converts a given HEX number string to a UTF16 character string.
-  hex2str: (str, bytesPerChar) => {
-    var hexChars,
-      out = "",
-      i,
-      len;
-
-    if (typeof str !== "string") {
-      throw new Error("Input must be a hexadecimal string.");
-    }
-    bytesPerChar = bytesPerChar || defaults.bytesPerChar;
-
-    if (
-      typeof bytesPerChar !== "number" ||
-      bytesPerChar % 1 !== 0 ||
-      bytesPerChar < 1 ||
-      bytesPerChar > defaults.maxBytesPerChar
-    ) {
-      throw new Error(
-        "Bytes per character must be an integer between 1 and " +
-          defaults.maxBytesPerChar +
-          ", inclusive.",
-      );
-    }
-
-    hexChars = 2 * bytesPerChar;
-
-    str = padLeft(str, hexChars);
-
-    for (i = 0, len = str.length; i < len; i += hexChars) {
-      out =
-        String.fromCharCode(Number.parseInt(str.slice(i, i + hexChars), 16)) +
-        out;
-    }
-
-    return out;
-  },
-
-  // Generates a random bits-length number string using the PRNG
-  random: (bits) => {
-    if (
-      typeof bits !== "number" ||
-      bits % 1 !== 0 ||
-      bits < 2 ||
-      bits > 65536
-    ) {
-      throw new Error("Number of bits must be an Integer between 1 and 65536.");
-    }
-
-    return bin2hex(config.rng(bits));
-  },
-
   // Divides a `secret` number String str expressed in radix `inputRadix` (optional, default 16)
   // into `numShares` shares, each expressed in radix `outputRadix` (optional, default to `inputRadix`),
   // requiring `threshold` number of shares to reconstruct the secret.
@@ -861,27 +823,65 @@ export const secrets = {
     return x;
   },
 
-  // Generate a new share with id `id` (a number between 1 and 2^bits-1)
-  // `id` can be a Number or a String in the default radix (16)
-  newShare: function (id, shares) {
-    var share, radid;
+  // Converts a given UTF16 character string to the HEX representation.
+  // Each character of the input string is represented by
+  // `bytesPerChar` bytes in the output string which defaults to 2.
+  str2hex: (str, bytesPerChar) => {
+    var hexChars,
+      max,
+      out = "",
+      neededBytes,
+      num,
+      i,
+      len;
 
-    if (id && typeof id === "string") {
-      id = Number.parseInt(id, config.radix);
+    if (typeof str !== "string") {
+      throw new Error("Input must be a character string.");
     }
 
-    radid = id.toString(config.radix);
+    if (!bytesPerChar) {
+      bytesPerChar = defaults.bytesPerChar;
+    }
 
-    if (id && radid && shares && shares[0]) {
-      share = this.extractShareComponents(shares[0]);
-      return constructPublicShareString(
-        share.bits,
-        radid,
-        this.combine(shares, id),
+    if (
+      typeof bytesPerChar !== "number" ||
+      bytesPerChar < 1 ||
+      bytesPerChar > defaults.maxBytesPerChar ||
+      bytesPerChar % 1 !== 0
+    ) {
+      throw new Error(
+        "Bytes per character must be an integer between 1 and " +
+          defaults.maxBytesPerChar +
+          ", inclusive.",
       );
     }
 
-    throw new Error("Invalid 'id' or 'shares' Array argument to newShare().");
+    hexChars = 2 * bytesPerChar;
+    max = 16 ** hexChars - 1;
+
+    for (i = 0, len = str.length; i < len; i++) {
+      num = str[i].charCodeAt();
+
+      if (isNaN(num)) {
+        throw new Error("Invalid character: " + str[i]);
+      }
+
+      if (num > max) {
+        neededBytes = Math.ceil(Math.log(num + 1) / Math.log(256));
+        throw new Error(
+          "Invalid character code (" +
+            num +
+            "). Maximum allowable is 256^bytes-1 (" +
+            max +
+            "). To convert this character, use at least " +
+            neededBytes +
+            " bytes.",
+        );
+      }
+
+      out = padLeft(num.toString(16), hexChars) + out;
+    }
+    return out;
   },
 };
 
diff --git a/packages/thirdweb/src/wallets/in-app/native/in-app.ts b/packages/thirdweb/src/wallets/in-app/native/in-app.ts
index 68f56a99f47..80aba848d44 100644
--- a/packages/thirdweb/src/wallets/in-app/native/in-app.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/in-app.ts
@@ -59,7 +59,6 @@ export function inAppWallet(
   createOptions?: InAppWalletCreationOptions,
 ): Wallet<"inApp"> {
   return createInAppWallet({
-    createOptions,
     connectorFactory: async (client: ThirdwebClient) => {
       const { InAppNativeConnector } = await import("./native-connector.js");
       return new InAppNativeConnector({
@@ -68,5 +67,6 @@ export function inAppWallet(
         storage: createOptions?.storage,
       });
     },
+    createOptions,
   }) as Wallet<"inApp">;
 }
diff --git a/packages/thirdweb/src/wallets/in-app/native/native-connector.ts b/packages/thirdweb/src/wallets/in-app/native/native-connector.ts
index 7171d297c13..81e94c5a5ae 100644
--- a/packages/thirdweb/src/wallets/in-app/native/native-connector.ts
+++ b/packages/thirdweb/src/wallets/in-app/native/native-connector.ts
@@ -38,9 +38,9 @@ export class InAppNativeConnector implements InAppConnector {
     this.passkeyDomain = options.passkeyDomain;
     this.ecosystem = options.ecosystem;
     this.storage = new ClientScopedStorage({
-      storage: options.storage ?? nativeLocalStorage,
       clientId: this.client.clientId,
       ecosystem: options.ecosystem,
+      storage: options.storage ?? nativeLocalStorage,
     });
   }
 
@@ -75,9 +75,9 @@ export class InAppNativeConnector implements InAppConnector {
         );
         wallet = await migrateToEnclaveWallet({
           client: this.client,
+          encryptionKey,
           storage: this.storage,
           storedToken: authResult.storedToken,
-          encryptionKey,
         });
       } catch {
         console.warn(
@@ -103,9 +103,9 @@ export class InAppNativeConnector implements InAppConnector {
         "../core/wallet/enclave-wallet.js"
       );
       this.wallet = new EnclaveWallet({
+        address: wallet.address,
         client: this.client,
         ecosystem: this.ecosystem,
-        address: wallet.address,
         storage: this.storage,
       });
     } else {
@@ -174,8 +174,8 @@ export class InAppNativeConnector implements InAppConnector {
         );
         return backendAuthenticate({
           client: this.client,
-          walletSecret: params.walletSecret,
           ecosystem: params.ecosystem,
+          walletSecret: params.walletSecret,
         });
       }
       case "wallet": {
@@ -183,10 +183,10 @@ export class InAppNativeConnector implements InAppConnector {
           "../core/authentication/siwe.js"
         );
         return siweAuthenticate({
-          client: this.client,
-          wallet: params.wallet,
           chain: params.chain,
+          client: this.client,
           ecosystem: params.ecosystem,
+          wallet: params.wallet,
         });
       }
       case "github":
@@ -205,7 +205,7 @@ export class InAppNativeConnector implements InAppConnector {
         const redirectUrl =
           params.redirectUrl || (ExpoLinking.createURL("") as string);
         return socialAuth({
-          auth: { strategy, redirectUrl },
+          auth: { redirectUrl, strategy },
           client: this.client,
           ecosystem: this.ecosystem,
         });
@@ -215,9 +215,9 @@ export class InAppNativeConnector implements InAppConnector {
       case "jwt": {
         const { customJwt } = await import("../core/authentication/jwt.js");
         return customJwt({
-          jwt: params.jwt,
           client: this.client,
           ecosystem: this.ecosystem,
+          jwt: params.jwt,
         });
       }
       case "auth_endpoint": {
@@ -225,9 +225,9 @@ export class InAppNativeConnector implements InAppConnector {
           "../core/authentication/authEndpoint.js"
         );
         return authEndpoint({
-          payload: params.payload,
           client: this.client,
           ecosystem: this.ecosystem,
+          payload: params.payload,
         });
       }
       default:
@@ -260,9 +260,9 @@ export class InAppNativeConnector implements InAppConnector {
     const account = await this.getAccount();
     return {
       user: {
-        status: "Logged In, Wallet Initialized",
         account,
         authDetails: authResult.storedToken.authDetails,
+        status: "Logged In, Wallet Initialized",
         walletAddress: account.address,
       },
     };
@@ -301,13 +301,13 @@ export class InAppNativeConnector implements InAppConnector {
         authToken = await registerPasskey({
           client,
           ecosystem,
-          username: passkeyName,
           passkeyClient,
-          storage: storeLastUsedPasskey ? storage : undefined,
           rp: {
             id: domain,
             name: domain,
           },
+          storage: storeLastUsedPasskey ? storage : undefined,
+          username: passkeyName,
         });
       } else {
         const { loginWithPasskey } = await import(
@@ -317,11 +317,11 @@ export class InAppNativeConnector implements InAppConnector {
           client,
           ecosystem,
           passkeyClient,
-          storage: storeLastUsedPasskey ? storage : undefined,
           rp: {
             id: domain,
             name: domain,
           },
+          storage: storeLastUsedPasskey ? storage : undefined,
         });
       }
 
@@ -361,9 +361,9 @@ export class InAppNativeConnector implements InAppConnector {
     const { storedToken } = await this.authenticate(args);
     return await linkAccount({
       client: args.client,
-      tokenToLink: storedToken.cookieString,
-      storage: this.storage,
       ecosystem: args.ecosystem || this.ecosystem,
+      storage: this.storage,
+      tokenToLink: storedToken.cookieString,
     });
   }
 
@@ -372,11 +372,11 @@ export class InAppNativeConnector implements InAppConnector {
       "../core/authentication/linkAccount.js"
     );
     return await unlinkAccount({
+      allowAccountDeletion,
       client: this.client,
       ecosystem: this.ecosystem,
-      storage: this.storage,
       profileToUnlink: profile,
-      allowAccountDeletion,
+      storage: this.storage,
     });
   }
 
diff --git a/packages/thirdweb/src/wallets/in-app/web/ecosystem.ts b/packages/thirdweb/src/wallets/in-app/web/ecosystem.ts
index b2bdc3b2ea4..97a95d76b1b 100644
--- a/packages/thirdweb/src/wallets/in-app/web/ecosystem.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/ecosystem.ts
@@ -60,14 +60,6 @@ export function ecosystemWallet(
     partnerId: createOptions?.partnerId,
   };
   return createInAppWallet({
-    ecosystem,
-    createOptions: {
-      auth: {
-        ...createOptions?.auth,
-        options: [], // controlled by ecosystem
-      },
-      partnerId: ecosystem.partnerId,
-    },
     connectorFactory: async (client: ThirdwebClient) => {
       const { InAppWebConnector } = await import("./lib/web-connector.js");
       return new InAppWebConnector({
@@ -76,5 +68,13 @@ export function ecosystemWallet(
         storage: createOptions?.storage,
       });
     },
+    createOptions: {
+      auth: {
+        ...createOptions?.auth,
+        options: [], // controlled by ecosystem
+      },
+      partnerId: ecosystem.partnerId,
+    },
+    ecosystem,
   }) as Wallet<EcosystemWalletId>;
 }
diff --git a/packages/thirdweb/src/wallets/in-app/web/in-app.ts b/packages/thirdweb/src/wallets/in-app/web/in-app.ts
index 1e60d716543..81462ba3690 100644
--- a/packages/thirdweb/src/wallets/in-app/web/in-app.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/in-app.ts
@@ -304,7 +304,6 @@ export function inAppWallet(
   createOptions?: InAppWalletCreationOptions,
 ): Wallet<"inApp"> {
   return createInAppWallet({
-    createOptions,
     connectorFactory: async (client: ThirdwebClient) => {
       const { InAppWebConnector } = await import("./lib/web-connector.js");
       return new InAppWebConnector({
@@ -313,5 +312,6 @@ export function inAppWallet(
         storage: createOptions?.storage,
       });
     },
+    createOptions,
   }) as Wallet<"inApp">;
 }
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/auth/abstract-login.ts b/packages/thirdweb/src/wallets/in-app/web/lib/auth/abstract-login.ts
index f2de277e51f..e10bf16abab 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/auth/abstract-login.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/auth/abstract-login.ts
@@ -95,8 +95,8 @@ export abstract class AbstractLogin<
     email,
   }: LoginQuerierTypes["sendThirdwebEmailLoginOtp"]): Promise<SendEmailOtpReturnType> {
     const result = await this.LoginQuerier.call<SendEmailOtpReturnType>({
-      procedureName: "sendThirdwebEmailLoginOtp",
       params: { email },
+      procedureName: "sendThirdwebEmailLoginOtp",
     });
     return result;
   }
@@ -109,8 +109,8 @@ export abstract class AbstractLogin<
     phoneNumber,
   }: LoginQuerierTypes["sendThirdwebSmsLoginOtp"]): Promise<SendEmailOtpReturnType> {
     const result = await this.LoginQuerier.call<SendEmailOtpReturnType>({
-      procedureName: "sendThirdwebSmsLoginOtp",
       params: { phoneNumber },
+      procedureName: "sendThirdwebSmsLoginOtp",
     });
     return result;
   }
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/auth/base-login.ts b/packages/thirdweb/src/wallets/in-app/web/lib/auth/base-login.ts
index e57b15e71f8..78cb5e74d4a 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/auth/base-login.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/auth/base-login.ts
@@ -14,8 +14,8 @@ export class BaseLogin extends AbstractLogin<
 > {
   async authenticateWithModal(): Promise<AuthAndWalletRpcReturnType> {
     return this.LoginQuerier.call<AuthAndWalletRpcReturnType>({
-      procedureName: "loginWithThirdwebModal",
       params: undefined,
+      procedureName: "loginWithThirdwebModal",
       showIframe: true,
     });
   }
@@ -35,8 +35,8 @@ export class BaseLogin extends AbstractLogin<
     email: string;
   }): Promise<AuthAndWalletRpcReturnType> {
     return this.LoginQuerier.call<AuthAndWalletRpcReturnType>({
-      procedureName: "loginWithThirdwebModal",
       params: { email },
+      procedureName: "loginWithThirdwebModal",
       showIframe: true,
     });
   }
@@ -63,8 +63,8 @@ export class BaseLogin extends AbstractLogin<
     }
 
     return this.LoginQuerier.call<AuthAndWalletRpcReturnType>({
-      procedureName: "loginWithCustomJwt",
       params: { encryptionKey, jwt },
+      procedureName: "loginWithCustomJwt",
     });
   }
 
@@ -89,8 +89,8 @@ export class BaseLogin extends AbstractLogin<
     payload,
   }: LoginQuerierTypes["loginWithCustomAuthEndpoint"]): Promise<AuthAndWalletRpcReturnType> {
     return this.LoginQuerier.call<AuthAndWalletRpcReturnType>({
-      procedureName: "loginWithCustomAuthEndpoint",
       params: { encryptionKey, payload },
+      procedureName: "loginWithCustomAuthEndpoint",
     });
   }
 
@@ -119,8 +119,8 @@ export class BaseLogin extends AbstractLogin<
     recoveryCode,
   }: LoginQuerierTypes["verifyThirdwebEmailLoginOtp"]): Promise<AuthAndWalletRpcReturnType> {
     return this.LoginQuerier.call<AuthAndWalletRpcReturnType>({
-      procedureName: "verifyThirdwebEmailLoginOtp",
       params: { email, otp, recoveryCode },
+      procedureName: "verifyThirdwebEmailLoginOtp",
     });
   }
 
@@ -146,8 +146,8 @@ export class BaseLogin extends AbstractLogin<
     recoveryCode,
   }: LoginQuerierTypes["verifyThirdwebSmsLoginOtp"]): Promise<AuthAndWalletRpcReturnType> {
     return this.LoginQuerier.call<AuthAndWalletRpcReturnType>({
+      params: { otp, phoneNumber, recoveryCode },
       procedureName: "verifyThirdwebSmsLoginOtp",
-      params: { phoneNumber, otp, recoveryCode },
     });
   }
 
@@ -160,8 +160,8 @@ export class BaseLogin extends AbstractLogin<
     recoveryCode,
   }: LoginQuerierTypes["verifyThirdwebSmsLoginOtp"]): Promise<AuthLoginReturnType> {
     const result = await this.authenticateWithSmsOtp({
-      phoneNumber,
       otp,
+      phoneNumber,
       recoveryCode,
     });
     return this.postLogin(result);
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/auth/iframe-auth.ts b/packages/thirdweb/src/wallets/in-app/web/lib/auth/iframe-auth.ts
index 88d69da80d4..7e210b717d4 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/auth/iframe-auth.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/auth/iframe-auth.ts
@@ -72,16 +72,16 @@ export class Auth {
     this.localStorage = localStorage;
     this.onAuthSuccess = onAuthSuccess;
     this.BaseLogin = new BaseLogin({
+      baseUrl,
+      client,
+      ecosystem,
       postLogin: async (result) => {
         return this.postLogin(result);
       },
       preLogin: async () => {
         await this.preLogin();
       },
-      ecosystem,
       querier: querier,
-      client,
-      baseUrl,
     });
   }
 
@@ -148,11 +148,11 @@ export class Auth {
 
     // If this is an existing sharded wallet or in-app wallet, we'll login with the sharded wallet
     const result = await this.AuthQuerier.call<AuthAndWalletRpcReturnType>({
-      procedureName: "loginWithStoredTokenDetails",
       params: {
-        storedToken: authToken.storedToken,
         recoveryCode,
+        storedToken: authToken.storedToken,
       },
+      procedureName: "loginWithStoredTokenDetails",
     });
     return this.postLogin(result);
   }
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/auth/oauth.ts b/packages/thirdweb/src/wallets/in-app/web/lib/auth/oauth.ts
index 39629b20414..41d241f1363 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/auth/oauth.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/auth/oauth.ts
@@ -99,9 +99,9 @@ export const loginWithOauth = async (options: {
             window.removeEventListener("message", messageListener);
             clearInterval(pollTimer);
             closeWindow({
+              closeOpenedWindow: options.closeOpenedWindow,
               isWindowOpenedByFn,
               win,
-              closeOpenedWindow: options.closeOpenedWindow,
             });
             if (event.data.authResult) {
               resolve(event.data.authResult);
@@ -112,9 +112,9 @@ export const loginWithOauth = async (options: {
             window.removeEventListener("message", messageListener);
             clearInterval(pollTimer);
             closeWindow({
+              closeOpenedWindow: options.closeOpenedWindow,
               isWindowOpenedByFn,
               win,
-              closeOpenedWindow: options.closeOpenedWindow,
             });
             reject(new Error(event.data.errorString));
             break;
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/auth/otp.ts b/packages/thirdweb/src/wallets/in-app/web/lib/auth/otp.ts
index f854f18a242..b14fec04aca 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/auth/otp.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/auth/otp.ts
@@ -16,7 +16,7 @@ import type { Ecosystem } from "../../../core/wallet/types.js";
  */
 export const sendOtp = async (args: PreAuthArgsType): Promise<void> => {
   const { client, ecosystem } = args;
-  const url = getLoginUrl({ client, ecosystem, authOption: args.strategy });
+  const url = getLoginUrl({ authOption: args.strategy, client, ecosystem });
 
   const headers: Record<string, string> = {
     "Content-Type": "application/json",
@@ -45,9 +45,9 @@ export const sendOtp = async (args: PreAuthArgsType): Promise<void> => {
   })();
 
   const response = await fetch(url, {
-    method: "POST",
-    headers,
     body: stringify(body),
+    headers,
+    method: "POST",
   });
 
   if (!response.ok) {
@@ -90,21 +90,21 @@ export const verifyOtp = async (
     switch (args.strategy) {
       case "email":
         return {
-          email: args.email,
           code: args.verificationCode,
+          email: args.email,
         };
       case "phone":
         return {
-          phone: args.phoneNumber,
           code: args.verificationCode,
+          phone: args.phoneNumber,
         };
     }
   })();
 
   const response = await fetch(url, {
-    method: "POST",
-    headers,
     body: stringify(body),
+    headers,
+    method: "POST",
   });
 
   if (!response.ok) {
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/auth/passkeys.ts b/packages/thirdweb/src/wallets/in-app/web/lib/auth/passkeys.ts
index 22221b769ad..2341ffd1a99 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/auth/passkeys.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/auth/passkeys.ts
@@ -27,11 +27,11 @@ export class PasskeyWebClient implements PasskeyClient {
   }): Promise<RegisterResult> {
     const { name, challenge, rp } = args;
     const registration = await client.register({
-      user: name,
+      attestation: true,
       challenge,
-      userVerification: "required",
       domain: rp.id,
-      attestation: true,
+      user: name,
+      userVerification: "required",
     });
     const clientDataB64 = base64UrlToBase64(
       registration.response.clientDataJSON,
@@ -39,14 +39,14 @@ export class PasskeyWebClient implements PasskeyClient {
     const clientDataParsed = JSON.parse(base64ToString(clientDataB64));
     return {
       authenticatorData: registration.response.authenticatorData,
-      credentialId: registration.id,
       clientData: registration.response.clientDataJSON,
       credential: {
-        publicKey: registration.response.publicKey,
         algorithm: parsers.getAlgoName(
           registration.response.publicKeyAlgorithm,
         ),
+        publicKey: registration.response.publicKey,
       },
+      credentialId: registration.id,
       origin: clientDataParsed.origin,
     };
   }
@@ -60,17 +60,17 @@ export class PasskeyWebClient implements PasskeyClient {
     const result = await client.authenticate({
       allowCredentials: credentialId ? [credentialId] : [],
       challenge,
-      userVerification: "required",
       domain: rp.id,
+      userVerification: "required",
     });
     const clientDataB64 = base64UrlToBase64(result.response.clientDataJSON);
     const clientDataParsed = JSON.parse(base64ToString(clientDataB64));
     return {
       authenticatorData: result.response.authenticatorData,
-      credentialId: result.id,
       clientData: result.response.clientDataJSON,
-      signature: result.response.signature,
+      credentialId: result.id,
       origin: clientDataParsed.origin,
+      signature: result.response.signature,
     };
   }
 }
@@ -87,9 +87,9 @@ export async function hasStoredPasskey(
   storage?: AsyncStorage,
 ) {
   const clientStorage = new ClientScopedStorage({
-    storage: storage ?? webLocalStorage, // TODO (passkey) react native variant of this fn
-    clientId: client.clientId,
+    clientId: client.clientId, // TODO (passkey) react native variant of this fn
     ecosystem: ecosystemId ? { id: ecosystemId } : undefined,
+    storage: storage ?? webLocalStorage,
   });
   const credId = await clientStorage.getPasskeyCredentialId();
   return !!credId;
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/get-url-token.test.tsx b/packages/thirdweb/src/wallets/in-app/web/lib/get-url-token.test.tsx
index 2b8febadce5..3209675cfb6 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/get-url-token.test.tsx
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/get-url-token.test.tsx
@@ -48,10 +48,10 @@ describe.runIf(global.window !== undefined)("getUrlToken", () => {
     const result = getUrlToken();
 
     expect(result).toEqual({
-      walletId: "123",
-      authResult: { token: "abc" },
-      authProvider: null,
       authCookie: null,
+      authProvider: null,
+      authResult: { token: "abc" },
+      walletId: "123",
     });
   });
 
@@ -61,10 +61,10 @@ describe.runIf(global.window !== undefined)("getUrlToken", () => {
     const result = getUrlToken();
 
     expect(result).toEqual({
-      walletId: "123",
-      authResult: undefined,
-      authProvider: null,
       authCookie: "myCookie",
+      authProvider: null,
+      authResult: undefined,
+      walletId: "123",
     });
 
     // Check if URL has been updated correctly
@@ -78,10 +78,10 @@ describe.runIf(global.window !== undefined)("getUrlToken", () => {
     const result = getUrlToken();
 
     expect(result).toEqual({
-      walletId: "123",
-      authResult: { token: "xyz" },
-      authProvider: "provider1",
       authCookie: "myCookie",
+      authProvider: "provider1",
+      authResult: { token: "xyz" },
+      walletId: "123",
     });
 
     // Check if URL has been updated correctly
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/get-url-token.ts b/packages/thirdweb/src/wallets/in-app/web/lib/get-url-token.ts
index c6aacf0fc86..bee4daa1f31 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/get-url-token.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/get-url-token.ts
@@ -40,7 +40,7 @@ export function getUrlToken():
       "",
       `${window.location.pathname}?${params.toString()}`,
     );
-    return { walletId, authResult, authProvider, authCookie };
+    return { authCookie, authProvider, authResult, walletId };
   }
   return undefined;
 }
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/iframe-wallet.ts b/packages/thirdweb/src/wallets/in-app/web/lib/iframe-wallet.ts
index 8cc415914c0..5f63787fe15 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/iframe-wallet.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/iframe-wallet.ts
@@ -25,9 +25,9 @@ import type { IWebWallet } from "../../core/wallet/web-wallet.js";
 import type {
   ClientIdWithQuerierType,
   GetAddressReturnType,
+  SignedTypedDataReturnType,
   SignMessageReturnType,
   SignTransactionReturnType,
-  SignedTypedDataReturnType,
 } from "../types.js";
 import type { InAppWalletIframeCommunicator } from "../utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
 
@@ -151,8 +151,8 @@ export class IFrameWallet implements IWebWallet {
   async getUserWalletStatus(): Promise<GetUser> {
     const userStatus =
       await this.walletManagerQuerier.call<GetUserWalletStatusRpcReturnType>({
-        procedureName: "getUserStatus",
         params: undefined,
+        procedureName: "getUserStatus",
       });
     if (userStatus.status === "Logged In, Wallet Initialized") {
       return {
@@ -188,18 +188,18 @@ export class IFrameWallet implements IWebWallet {
     const partnerId = this.ecosystem?.partnerId;
 
     const { address } = await querier.call<GetAddressReturnType>({
-      procedureName: "getAddress",
       params: undefined,
+      procedureName: "getAddress",
     });
     const _signTransaction = async (tx: SendTransactionOption) => {
       // biome-ignore lint/suspicious/noExplicitAny: ethers tx transformation
       const transaction: Record<string, any> = {
-        to: tx.to ?? undefined,
+        chainId: tx.chainId,
         data: tx.data,
-        value: tx.value,
         gasLimit: tx.gas,
         nonce: tx.nonce,
-        chainId: tx.chainId,
+        to: tx.to ?? undefined,
+        value: tx.value,
       };
 
       if (tx.maxFeePerGas) {
@@ -216,31 +216,22 @@ export class IFrameWallet implements IWebWallet {
       const RPC_URL = getThirdwebDomains().rpc;
       const { signedTransaction } =
         await querier.call<SignTransactionReturnType>({
-          procedureName: "signTransaction",
           params: {
-            transaction,
             chainId: tx.chainId,
             partnerId,
-            rpcEndpoint: `https://${tx.chainId}.${RPC_URL}`, // TODO (ew) shouldnt be needed
+            rpcEndpoint: `https://${tx.chainId}.${RPC_URL}`,
+            transaction, // TODO (ew) shouldnt be needed
           },
+          procedureName: "signTransaction",
         });
       return signedTransaction as Hex;
     };
     return {
       address: getAddress(address),
-      async signTransaction(tx) {
-        if (!tx.chainId) {
-          throw new Error("chainId required in tx to sign");
-        }
-        return _signTransaction({
-          ...tx,
-          chainId: tx.chainId,
-        });
-      },
       async sendTransaction(tx) {
         const rpcRequest = getRpcClient({
-          client,
           chain: getCachedChain(tx.chainId),
+          client,
         });
         const signedTx = await _signTransaction(tx);
 
@@ -250,13 +241,13 @@ export class IFrameWallet implements IWebWallet {
         );
 
         trackTransaction({
-          client,
           chainId: tx.chainId,
-          walletAddress: address,
-          walletType: "inApp",
-          transactionHash,
+          client,
           contractAddress: tx.to ?? undefined,
           gasPrice: tx.gasPrice,
+          transactionHash,
+          walletAddress: address,
+          walletType: "inApp",
         });
 
         return { transactionHash };
@@ -274,16 +265,25 @@ export class IFrameWallet implements IWebWallet {
         })();
 
         const { signedMessage } = await querier.call<SignMessageReturnType>({
-          procedureName: "signMessage",
           params: {
+            chainId: 1, // needs bytes or string
             // biome-ignore lint/suspicious/noExplicitAny: ethers tx transformation
-            message: messageDecoded as any, // needs bytes or string
-            partnerId,
-            chainId: 1, // TODO check if we need this
+            message: messageDecoded as any,
+            partnerId, // TODO check if we need this
           },
+          procedureName: "signMessage",
         });
         return signedMessage as Hex;
       },
+      async signTransaction(tx) {
+        if (!tx.chainId) {
+          throw new Error("chainId required in tx to sign");
+        }
+        return _signTransaction({
+          ...tx,
+          chainId: tx.chainId,
+        });
+      },
       async signTypedData(_typedData) {
         const parsedTypedData = parseTypedData(_typedData);
         // deleting EIP712 Domain as it results in ambiguous primary type on some cases
@@ -309,17 +309,17 @@ export class IFrameWallet implements IWebWallet {
         const RPC_URL = getThirdwebDomains().rpc;
         const { signedTypedData } =
           await querier.call<SignedTypedDataReturnType>({
-            procedureName: "signTypedDataV4",
             params: {
+              chainId: Number.parseInt(BigInt(chainId || 1).toString()),
               domain: domainData,
-              types:
-                parsedTypedData.types as SignerProcedureTypes["signTypedDataV4"]["types"],
               message:
                 parsedTypedData.message as SignerProcedureTypes["signTypedDataV4"]["message"],
-              chainId: Number.parseInt(BigInt(chainId || 1).toString()),
               partnerId,
-              rpcEndpoint: `https://${chainId}.${RPC_URL}`, // TODO (ew) shouldnt be needed
+              rpcEndpoint: `https://${chainId}.${RPC_URL}`,
+              types:
+                parsedTypedData.types as SignerProcedureTypes["signTypedDataV4"]["types"], // TODO (ew) shouldnt be needed
             },
+            procedureName: "signTypedDataV4",
           });
         return signedTypedData as Hex;
       },
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/in-app-integration.test.ts b/packages/thirdweb/src/wallets/in-app/web/lib/in-app-integration.test.ts
index 80da9fa4543..7a80eab6507 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/in-app-integration.test.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/in-app-integration.test.ts
@@ -50,24 +50,24 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         },
       });
       const account = await wallet.connect({
+        chain,
         client: TEST_CLIENT,
         strategy: "guest",
-        chain,
       });
       expect(account.address).toBeDefined();
       const tx = await sendAndConfirmTransaction({
+        account,
         transaction: prepareTransaction({
           chain,
           client: TEST_CLIENT,
           to: account.address,
           value: 0n,
         }),
-        account,
       });
       expect(tx.transactionHash).toBeDefined();
       const logs = parseEventLogs({
-        logs: tx.logs,
         events: [executedEvent()],
+        logs: tx.logs,
       });
       const executedLog = logs[0];
       if (!executedLog) {
@@ -89,24 +89,24 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         },
       });
       const account = await wallet.connect({
+        chain,
         client: TEST_CLIENT,
         strategy: "guest",
-        chain,
       });
       expect(account.address).toBeDefined();
       const tx = await sendAndConfirmTransaction({
+        account,
         transaction: prepareTransaction({
           chain,
           client: TEST_CLIENT,
           to: account.address,
           value: 0n,
         }),
-        account,
       });
       expect(tx.transactionHash).toBeDefined();
       const logs = parseEventLogs({
-        logs: tx.logs,
         events: [userOperationEventEvent()],
+        logs: tx.logs,
       });
       const executedLog = logs[0];
       if (!executedLog) {
@@ -125,19 +125,19 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         },
       });
       const account = await iaw.connect({
+        chain,
         client: TEST_CLIENT,
         strategy: "guest",
-        chain,
       });
       const tx1 = prepareTransaction({
-        client: TEST_CLIENT,
         chain,
+        client: TEST_CLIENT,
         to: (await generateAccount({ client: TEST_CLIENT })).address,
         value: 0n,
       });
       const tx2 = prepareTransaction({
-        client: TEST_CLIENT,
         chain,
+        client: TEST_CLIENT,
         to: (await generateAccount({ client: TEST_CLIENT })).address,
         value: 0n,
       });
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/web-connector.test.ts b/packages/thirdweb/src/wallets/in-app/web/lib/web-connector.test.ts
index a1abf81a536..353b118916e 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/web-connector.test.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/web-connector.test.ts
@@ -39,8 +39,8 @@ describe("InAppWebConnector.connect", () => {
   const mockAuthToken = {
     storedToken: {
       authDetails: {
-        userWalletId: "123",
         recoveryShareManagement: "ENCLAVE" as const,
+        userWalletId: "123",
       },
       authProvider: "EmailOtp" as const,
       cookieString: "mock-cookie",
@@ -56,8 +56,8 @@ describe("InAppWebConnector.connect", () => {
   });
   const mockWallet = createWalletAdapter({
     adaptedAccount: TEST_ACCOUNT_A,
-    client: TEST_CLIENT,
     chain: ethereum,
+    client: TEST_CLIENT,
     onDisconnect: () => {},
     switchChain: () => {},
   });
@@ -70,17 +70,17 @@ describe("InAppWebConnector.connect", () => {
     vi.mocked(verifyOtp).mockResolvedValueOnce(mockAuthToken);
 
     const result = await connector.connect({
-      strategy: "email",
       email: "test@example.com",
+      strategy: "email",
       verificationCode: "123456",
     });
 
     expect(verifyOtp).toHaveBeenCalledWith({
-      strategy: "email",
-      email: "test@example.com",
-      verificationCode: "123456",
       client: TEST_CLIENT,
       ecosystem: undefined,
+      email: "test@example.com",
+      strategy: "email",
+      verificationCode: "123456",
     });
 
     expect(result).toBeDefined();
@@ -91,23 +91,23 @@ describe("InAppWebConnector.connect", () => {
 
     const mockWallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
-      client: TEST_CLIENT,
       chain: ethereum,
+      client: TEST_CLIENT,
       onDisconnect: () => {},
       switchChain: () => {},
     });
 
     await connector.connect({
-      strategy: "wallet",
       chain: ethereum,
+      strategy: "wallet",
       wallet: mockWallet,
     });
 
     expect(siweAuthenticate).toHaveBeenCalledWith({
-      wallet: mockWallet,
       chain: ethereum,
       client: TEST_CLIENT,
       ecosystem: undefined,
+      wallet: mockWallet,
     });
   });
 
@@ -130,9 +130,9 @@ describe("InAppWebConnector.connect", () => {
     });
 
     expect(backendAuthenticate).toHaveBeenCalledWith({
-      walletSecret: "secret123",
       client: TEST_CLIENT,
       ecosystem: undefined,
+      walletSecret: "secret123",
     });
   });
 
@@ -146,8 +146,8 @@ describe("InAppWebConnector.connect", () => {
     expect(loginWithOauth).toHaveBeenCalledWith({
       authOption: "google",
       client: TEST_CLIENT,
-      ecosystem: undefined,
       closeOpenedWindow: undefined,
+      ecosystem: undefined,
       openedWindow: undefined,
     });
   });
diff --git a/packages/thirdweb/src/wallets/in-app/web/lib/web-connector.ts b/packages/thirdweb/src/wallets/in-app/web/lib/web-connector.ts
index 79cfbdd7b68..b24e97692bd 100644
--- a/packages/thirdweb/src/wallets/in-app/web/lib/web-connector.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/lib/web-connector.ts
@@ -88,32 +88,31 @@ export class InAppWebConnector implements InAppConnector {
     this.ecosystem = ecosystem;
     this.passkeyDomain = passkeyDomain;
     this.storage = new ClientScopedStorage({
-      storage: storage ?? getDefaultStorage(),
       clientId: client.clientId,
       ecosystem: ecosystem,
+      storage: storage ?? getDefaultStorage(),
     });
     this.querier = new InAppWalletIframeCommunicator({
+      baseUrl,
       clientId: client.clientId,
       ecosystem,
-      baseUrl,
     });
 
     this.auth = new Auth({
-      client,
-      querier: this.querier,
       baseUrl,
-      localStorage: this.storage,
+      client,
       ecosystem,
+      localStorage: this.storage,
       onAuthSuccess: async (authResult) => {
         onAuthSuccess?.(authResult);
 
         if (authResult.storedToken.authDetails.walletType === "sharded") {
           // If this is an existing sharded ecosystem wallet, we'll need to migrate
           const result = await this.querier.call<boolean>({
-            procedureName: "migrateFromShardToEnclave",
             params: {
               storedToken: authResult.storedToken,
             },
+            procedureName: "migrateFromShardToEnclave",
           });
           if (!result) {
             console.warn(
@@ -136,37 +135,38 @@ export class InAppWebConnector implements InAppConnector {
             : undefined;
 
         await this.wallet.postWalletSetUp({
-          storedToken: authResult.storedToken,
           deviceShareStored,
+          storedToken: authResult.storedToken,
         });
 
         if (this.wallet instanceof IFrameWallet) {
           await this.querier.call({
-            procedureName: "initIframe",
             params: {
-              partnerId: ecosystem?.partnerId,
-              ecosystemId: ecosystem?.id,
+              authCookie: authResult.storedToken.cookieString,
               clientId: this.client.clientId,
               // For enclave wallets we won't have a device share
               deviceShareStored:
                 "deviceShareStored" in authResult.walletDetails
                   ? authResult.walletDetails.deviceShareStored
                   : null,
+              ecosystemId: ecosystem?.id,
+              partnerId: ecosystem?.partnerId,
               walletUserId: authResult.storedToken.authDetails.userWalletId,
-              authCookie: authResult.storedToken.cookieString,
             },
+            procedureName: "initIframe",
           });
         }
 
         return {
           user: {
-            status: "Logged In, Wallet Initialized",
-            authDetails: authResult.storedToken.authDetails,
             account: await this.wallet.getAccount(),
+            authDetails: authResult.storedToken.authDetails,
+            status: "Logged In, Wallet Initialized",
             walletAddress: authResult.walletDetails.walletAddress,
           },
         };
       },
+      querier: this.querier,
     });
   }
 
@@ -195,9 +195,9 @@ export class InAppWebConnector implements InAppConnector {
 
     if (user.wallets[0]?.type === "enclave") {
       return new EnclaveWallet({
+        address: user.wallets[0].address,
         client: this.client,
         ecosystem: this.ecosystem,
-        address: user.wallets[0].address,
         storage: this.storage,
       });
     }
@@ -205,8 +205,8 @@ export class InAppWebConnector implements InAppConnector {
     return new IFrameWallet({
       client: this.client,
       ecosystem: this.ecosystem,
-      querier: this.querier,
       localStorage: this.storage,
+      querier: this.querier,
     });
   }
 
@@ -272,8 +272,8 @@ export class InAppWebConnector implements InAppConnector {
       authOption: strategy,
       client: this.client,
       ecosystem: this.ecosystem,
-      redirectUrl,
       mode,
+      redirectUrl,
     });
   }
 
@@ -306,16 +306,16 @@ export class InAppWebConnector implements InAppConnector {
         });
       case "auth_endpoint": {
         return authEndpoint({
-          payload: args.payload,
           client: this.client,
           ecosystem: this.ecosystem,
+          payload: args.payload,
         });
       }
       case "jwt":
         return customJwt({
-          jwt: args.jwt,
           client: this.client,
           ecosystem: this.ecosystem,
+          jwt: args.jwt,
         });
       case "passkey": {
         return this.passkeyAuth(args);
@@ -343,8 +343,8 @@ export class InAppWebConnector implements InAppConnector {
         return loginWithOauth({
           authOption: strategy,
           client: this.client,
-          ecosystem: this.ecosystem,
           closeOpenedWindow: args.closeOpenedWindow,
+          ecosystem: this.ecosystem,
           openedWindow: args.openedWindow,
         });
       }
@@ -358,16 +358,16 @@ export class InAppWebConnector implements InAppConnector {
       case "backend": {
         return backendAuthenticate({
           client: this.client,
-          walletSecret: args.walletSecret,
           ecosystem: this.ecosystem,
+          walletSecret: args.walletSecret,
         });
       }
       case "wallet": {
         return siweAuthenticate({
-          ecosystem: this.ecosystem,
+          chain: args.chain,
           client: this.client,
+          ecosystem: this.ecosystem,
           wallet: args.wallet,
-          chain: args.chain,
         });
       }
     }
@@ -439,24 +439,24 @@ export class InAppWebConnector implements InAppConnector {
       return registerPasskey({
         client: this.client,
         ecosystem: this.ecosystem,
-        username: passkeyName,
         passkeyClient,
-        storage: storeLastUsedPasskey ? storage : undefined,
         rp: {
           id: this.passkeyDomain ?? window.location.hostname,
           name: this.passkeyDomain ?? window.document.title,
         },
+        storage: storeLastUsedPasskey ? storage : undefined,
+        username: passkeyName,
       });
     }
     return loginWithPasskey({
       client: this.client,
       ecosystem: this.ecosystem,
       passkeyClient,
-      storage: storeLastUsedPasskey ? storage : undefined,
       rp: {
         id: this.passkeyDomain ?? window.location.hostname,
         name: this.passkeyDomain ?? window.document.title,
       },
+      storage: storeLastUsedPasskey ? storage : undefined,
     });
   }
 
@@ -464,19 +464,19 @@ export class InAppWebConnector implements InAppConnector {
     const { storedToken } = await this.authenticate(args);
     return await linkAccount({
       client: args.client,
-      tokenToLink: storedToken.cookieString,
-      storage: this.storage,
       ecosystem: args.ecosystem || this.ecosystem,
+      storage: this.storage,
+      tokenToLink: storedToken.cookieString,
     });
   }
 
   async unlinkProfile(profile: Profile, allowAccountDeletion?: boolean) {
     return await unlinkAccount({
+      allowAccountDeletion,
       client: this.client,
-      storage: this.storage,
       ecosystem: this.ecosystem,
       profileToUnlink: profile,
-      allowAccountDeletion,
+      storage: this.storage,
     });
   }
 
diff --git a/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.test.tsx b/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.test.tsx
index 05999e4cc93..231902677f7 100644
--- a/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.test.tsx
+++ b/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.test.tsx
@@ -25,12 +25,12 @@ describe("IframeCommunicator", () => {
 
   it("should create an iframe with correct properties", () => {
     new IframeCommunicator({
-      link: "https://example.com",
       baseUrl: "https://example.com",
-      iframeId: "test-iframe",
+      clientId: "test-client",
       container: mockContainer,
+      iframeId: "test-iframe",
+      link: "https://example.com",
       localStorage: mockLocalStorage,
-      clientId: "test-client",
     });
 
     expect(document.createElement).toHaveBeenCalledWith("iframe");
@@ -41,12 +41,12 @@ describe("IframeCommunicator", () => {
 
   it("should initialize with correct variables", async () => {
     const communicator = new IframeCommunicator({
-      link: "https://example.com",
       baseUrl: "https://example.com",
-      iframeId: "test-iframe",
+      clientId: "test-client",
       container: mockContainer,
+      iframeId: "test-iframe",
+      link: "https://example.com",
       localStorage: mockLocalStorage,
-      clientId: "test-client",
     });
 
     // biome-ignore lint/complexity/useLiteralKeys: accessing protected method
@@ -54,11 +54,11 @@ describe("IframeCommunicator", () => {
 
     expect(vars).toEqual({
       authCookie: "mockAuthCookie",
-      deviceShareStored: "mockDeviceShare",
-      walletUserId: "mockWalletUserId",
       clientId: "test-client",
-      partnerId: undefined,
+      deviceShareStored: "mockDeviceShare",
       ecosystemId: undefined,
+      partnerId: undefined,
+      walletUserId: "mockWalletUserId",
     });
   });
 
@@ -68,17 +68,17 @@ describe("IframeCommunicator", () => {
     global.document = undefined;
 
     const communicator = new IframeCommunicator({
-      link: "https://example.com",
       baseUrl: "https://example.com",
+      clientId: "test-client",
       iframeId: "test-iframe",
+      link: "https://example.com",
       localStorage: mockLocalStorage,
-      clientId: "test-client",
     });
 
     await expect(
       communicator.call({
-        procedureName: "test",
         params: {},
+        procedureName: "test",
       }),
     ).rejects.toThrow("Iframe not found");
     global.document = temp;
@@ -86,12 +86,12 @@ describe("IframeCommunicator", () => {
 
   it("should cleanup on destroy", () => {
     const communicator = new IframeCommunicator({
-      link: "https://example.com",
       baseUrl: "https://example.com",
-      iframeId: "test-iframe",
+      clientId: "test-client",
       container: mockContainer,
+      iframeId: "test-iframe",
+      link: "https://example.com",
       localStorage: mockLocalStorage,
-      clientId: "test-client",
     });
 
     communicator.destroy();
diff --git a/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.ts b/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.ts
index 4860d1d18e1..c95370b65d2 100644
--- a/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.ts
@@ -14,17 +14,17 @@ type IFrameCommunicatorProps = {
 };
 
 const iframeBaseStyle = {
-  height: "100%",
-  width: "100%",
-  border: "none",
   backgroundColor: "transparent",
+  border: "none",
   colorScheme: "light",
+  display: "none",
+  height: "100%",
+  pointerEvents: "all",
   position: "fixed",
-  top: "0px",
   right: "0px",
+  top: "0px",
+  width: "100%",
   zIndex: "2147483646",
-  display: "none",
-  pointerEvents: "all",
 };
 
 // Global var to help track iframe state
@@ -109,11 +109,11 @@ export class IframeCommunicator<T extends { [key: string]: any }> {
   protected async onIframeLoadedInitVariables(): Promise<Record<string, any>> {
     return {
       authCookie: await this.localStorage.getAuthCookie(),
-      deviceShareStored: await this.localStorage.getDeviceShare(),
-      walletUserId: await this.localStorage.getWalletUserId(),
       clientId: this.clientId,
-      partnerId: this.ecosystem?.partnerId,
+      deviceShareStored: await this.localStorage.getDeviceShare(),
       ecosystemId: this.ecosystem?.id,
+      partnerId: this.ecosystem?.partnerId,
+      walletUserId: await this.localStorage.getWalletUserId(),
     };
   }
 
@@ -145,8 +145,8 @@ export class IframeCommunicator<T extends { [key: string]: any }> {
 
       iframe?.contentWindow?.postMessage(
         {
-          eventType: "initIframe",
           data: await this.onIframeLoadedInitVariables(),
+          eventType: "initIframe",
         },
         this.iframeBaseUrl,
         [channel.port2],
@@ -205,12 +205,12 @@ export class IframeCommunicator<T extends { [key: string]: any }> {
 
     this.iframe.contentWindow?.postMessage(
       {
-        eventType: procedureName,
         // Pass the initialization data on every request in case the iframe storage was reset (can happen in some environments such as iOS PWAs)
         data: {
           ...params,
           ...(await this.onIframeLoadedInitVariables()),
         },
+        eventType: procedureName,
       },
       this.iframeBaseUrl,
       [channel.port2],
diff --git a/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/InAppWalletIframeCommunicator.ts b/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/InAppWalletIframeCommunicator.ts
index 0200c36b4fc..213bc9d1e12 100644
--- a/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/InAppWalletIframeCommunicator.ts
+++ b/packages/thirdweb/src/wallets/in-app/web/utils/iFrameCommunication/InAppWalletIframeCommunicator.ts
@@ -24,22 +24,22 @@ export class InAppWalletIframeCommunicator<
     ecosystem?: Ecosystem;
   }) {
     super({
+      baseUrl,
+      clientId,
+      container: typeof document === "undefined" ? undefined : document.body,
+      ecosystem,
       iframeId: IN_APP_WALLET_IFRAME_ID + (ecosystem?.id || ""),
       link: createInAppWalletIframeLink({
+        baseUrl,
         clientId,
-        path: IN_APP_WALLET_PATH,
         ecosystem,
-        baseUrl,
+        path: IN_APP_WALLET_PATH,
       }).href,
-      baseUrl,
-      container: typeof document === "undefined" ? undefined : document.body,
       localStorage: new ClientScopedStorage({
-        storage: webLocalStorage,
         clientId,
         ecosystem,
+        storage: webLocalStorage,
       }),
-      clientId,
-      ecosystem,
     });
     this.clientId = clientId;
     this.ecosystem = ecosystem;
diff --git a/packages/thirdweb/src/wallets/injected/index.ts b/packages/thirdweb/src/wallets/injected/index.ts
index db5377eff91..ac61afbab62 100644
--- a/packages/thirdweb/src/wallets/injected/index.ts
+++ b/packages/thirdweb/src/wallets/injected/index.ts
@@ -1,13 +1,15 @@
 import type { EIP1193Provider } from "viem";
 import {
-  type SignTypedDataParameters,
   getTypesForEIP712Domain,
+  type SignTypedDataParameters,
   serializeTypedData,
   validateTypedData,
 } from "viem";
 import { isInsufficientFundsError } from "../../analytics/track/helpers.js";
-import { trackTransaction } from "../../analytics/track/transaction.js";
-import { trackInsufficientFundsError } from "../../analytics/track/transaction.js";
+import {
+  trackInsufficientFundsError,
+  trackTransaction,
+} from "../../analytics/track/transaction.js";
 import type { Chain } from "../../chains/types.js";
 import { getCachedChain, getChainMetadata } from "../../chains/utils.js";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -106,12 +108,12 @@ export async function connectEip1193Wallet({
   }
 
   return onConnect({
-    provider,
     address,
     chain: connectedChain,
-    emitter,
     client,
+    emitter,
     id,
+    provider,
   });
 }
 
@@ -153,12 +155,12 @@ export async function autoConnectEip1193Wallet({
     chain && chain.id === chainId ? chain : getCachedChain(chainId);
 
   return onConnect({
-    provider,
     address,
     chain: connectedChain,
-    emitter,
     client,
+    emitter,
     id,
+    provider,
   });
 }
 
@@ -191,13 +193,13 @@ function createAccount({
       const params = [
         {
           ...gasFees,
-          nonce: tx.nonce ? numberToHex(tx.nonce) : undefined,
           accessList: tx.accessList,
-          value: tx.value ? numberToHex(tx.value) : undefined,
-          gas: tx.gas ? numberToHex(tx.gas) : undefined,
+          data: tx.data,
           from: this.address,
+          gas: tx.gas ? numberToHex(tx.gas) : undefined,
+          nonce: tx.nonce ? numberToHex(tx.nonce) : undefined,
           to: tx.to ? getAddress(tx.to) : undefined,
-          data: tx.data,
+          value: tx.value ? numberToHex(tx.value) : undefined,
           ...tx.eip712,
         },
       ];
@@ -210,13 +212,13 @@ function createAccount({
         })) as Hex;
 
         trackTransaction({
-          client,
           chainId: tx.chainId,
-          walletAddress: getAddress(address),
-          walletType: id,
-          transactionHash,
+          client,
           contractAddress: tx.to ?? undefined,
           gasPrice: tx.gasPrice,
+          transactionHash,
+          walletAddress: getAddress(address),
+          walletType: id,
         });
 
         return {
@@ -226,12 +228,12 @@ function createAccount({
         // Track insufficient funds errors
         if (isInsufficientFundsError(error)) {
           trackInsufficientFundsError({
-            client,
-            error,
-            walletAddress: getAddress(address),
             chainId: tx.chainId,
+            client,
             contractAddress: tx.to || undefined,
+            error,
             transactionValue: tx.value,
+            walletAddress: getAddress(address),
           });
         }
 
@@ -322,7 +324,7 @@ async function onConnect({
   client: ThirdwebClient;
   id: WalletId | ({} & string);
 }): Promise<[Account, Chain, DisconnectFn, SwitchChainFn]> {
-  const account = createAccount({ provider, address, client, id });
+  const account = createAccount({ address, client, id, provider });
   async function disconnect() {
     provider.removeListener("accountsChanged", onAccountsChanged);
     provider.removeListener("chainChanged", onChainChanged);
@@ -337,10 +339,10 @@ async function onConnect({
   function onAccountsChanged(accounts: string[]) {
     if (accounts[0]) {
       const newAccount = createAccount({
-        provider,
         address: getAddress(accounts[0]),
         client,
         id,
+        provider,
       });
 
       emitter.emit("accountChanged", newAccount);
@@ -386,11 +388,11 @@ async function switchChain(provider: EIP1193Provider, chain: Chain) {
       method: "wallet_addEthereumChain",
       params: [
         {
+          blockExplorerUrls: apiChain.explorers?.map((x) => x.url),
           chainId: hexChainId,
           chainName: apiChain.name,
-          nativeCurrency: apiChain.nativeCurrency,
-          rpcUrls: getValidPublicRPCUrl(apiChain), // no client id on purpose here
-          blockExplorerUrls: apiChain.explorers?.map((x) => x.url),
+          nativeCurrency: apiChain.nativeCurrency, // no client id on purpose here
+          rpcUrls: getValidPublicRPCUrl(apiChain),
         },
       ],
     });
diff --git a/packages/thirdweb/src/wallets/injected/mipdStore.ts b/packages/thirdweb/src/wallets/injected/mipdStore.ts
index 097a7adc58b..9143909a7b8 100644
--- a/packages/thirdweb/src/wallets/injected/mipdStore.ts
+++ b/packages/thirdweb/src/wallets/injected/mipdStore.ts
@@ -1,4 +1,4 @@
-import { type EIP6963ProviderDetail, type Store, createStore } from "mipd";
+import { createStore, type EIP6963ProviderDetail, type Store } from "mipd";
 import { isBrowser } from "../../utils/platform.js";
 import type { InjectedSupportedWalletIds } from "../__generated__/wallet-ids.js";
 import { METAMASK } from "../constants.js";
diff --git a/packages/thirdweb/src/wallets/manager/connection-manager.test.ts b/packages/thirdweb/src/wallets/manager/connection-manager.test.ts
index 1deee83bb76..ccfa24b74ff 100644
--- a/packages/thirdweb/src/wallets/manager/connection-manager.test.ts
+++ b/packages/thirdweb/src/wallets/manager/connection-manager.test.ts
@@ -24,19 +24,19 @@ describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
   beforeEach(() => {
     storage = {
       getItem: vi.fn(),
-      setItem: vi.fn(),
       removeItem: vi.fn(),
+      setItem: vi.fn(),
     };
     client = TEST_CLIENT;
     account = TEST_ACCOUNT_A;
     wallet = {
-      id: "wallet-id",
-      getAccount: vi.fn().mockReturnValue(account),
-      subscribe: vi.fn().mockReturnValue(vi.fn()),
       disconnect: vi.fn(),
-      switchChain: vi.fn(),
+      getAccount: vi.fn().mockReturnValue(account),
       getChain: vi.fn().mockReturnValue(sepolia),
       getConfig: vi.fn(),
+      id: "wallet-id",
+      subscribe: vi.fn().mockReturnValue(vi.fn()),
+      switchChain: vi.fn(),
     } as unknown as Wallet;
     smartWalletOptions = {
       chain: sepolia,
@@ -57,8 +57,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
     const manager = createConnectionManager(storage);
 
     const smartWallet = await manager.handleConnection(wallet, {
-      client,
       accountAbstraction: smartWalletOptions,
+      client,
     });
 
     expect(manager.activeWalletStore.getValue()).toBe(smartWallet);
@@ -76,8 +76,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
     const manager = createConnectionManager(storage);
 
     const smartWallet = await manager.handleConnection(wallet, {
-      client,
       accountAbstraction: smartWalletOptions,
+      client,
     });
 
     expect(manager.activeWalletStore.getValue()).toBe(smartWallet);
@@ -113,13 +113,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
     const manager = createConnectionManager(storage);
 
     wallet = {
-      id: "wallet-id",
-      getAccount: vi.fn().mockReturnValue(null),
-      subscribe: vi.fn(),
       disconnect: vi.fn(),
-      switchChain: vi.fn(),
+      getAccount: vi.fn().mockReturnValue(null),
       getChain: vi.fn().mockReturnValue(sepolia),
       getConfig: vi.fn(),
+      id: "wallet-id",
+      subscribe: vi.fn(),
+      switchChain: vi.fn(),
     } as unknown as Wallet;
 
     await expect(manager.handleConnection(wallet, { client })).rejects.toThrow(
@@ -251,13 +251,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
     beforeEach(() => {
       client = TEST_CLIENT;
       eoaWallet = {
-        id: "eoa-wallet-id",
-        getAccount: vi.fn().mockReturnValue(TEST_ACCOUNT_A),
-        subscribe: vi.fn().mockReturnValue(vi.fn()),
         disconnect: vi.fn(),
-        switchChain: vi.fn(),
+        getAccount: vi.fn().mockReturnValue(TEST_ACCOUNT_A),
         getChain: vi.fn().mockReturnValue(sepolia),
         getConfig: vi.fn(),
+        id: "eoa-wallet-id",
+        subscribe: vi.fn().mockReturnValue(vi.fn()),
+        switchChain: vi.fn(),
       } as unknown as Wallet;
       smartWalletOptions = {
         chain: sepolia,
@@ -319,18 +319,18 @@ describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
     beforeEach(() => {
       storage = {
         getItem: vi.fn(),
-        setItem: vi.fn(),
         removeItem: vi.fn(),
+        setItem: vi.fn(),
       };
       client = TEST_CLIENT;
       wallet = {
-        id: "wallet-id",
-        getAccount: vi.fn().mockReturnValue(null), // Simulate wallet without an account
-        subscribe: vi.fn(),
         disconnect: vi.fn(),
-        switchChain: vi.fn(),
+        getAccount: vi.fn().mockReturnValue(null), // Simulate wallet without an account
         getChain: vi.fn().mockReturnValue(sepolia),
         getConfig: vi.fn(),
+        id: "wallet-id",
+        subscribe: vi.fn(),
+        switchChain: vi.fn(),
       } as unknown as Wallet;
     });
 
@@ -360,19 +360,19 @@ describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
     beforeEach(() => {
       storage = {
         getItem: vi.fn(),
-        setItem: vi.fn(),
         removeItem: vi.fn(),
+        setItem: vi.fn(),
       };
       client = TEST_CLIENT;
       account = TEST_ACCOUNT_A;
       wallet = {
-        id: "wallet-id",
-        getAccount: vi.fn().mockReturnValue(account),
-        subscribe: vi.fn().mockReturnValue(vi.fn()),
         disconnect: vi.fn(),
-        switchChain: vi.fn(),
+        getAccount: vi.fn().mockReturnValue(account),
         getChain: vi.fn().mockReturnValue(sepolia),
         getConfig: vi.fn(),
+        id: "wallet-id",
+        subscribe: vi.fn().mockReturnValue(vi.fn()),
+        switchChain: vi.fn(),
       } as unknown as Wallet;
     });
 
diff --git a/packages/thirdweb/src/wallets/manager/index.ts b/packages/thirdweb/src/wallets/manager/index.ts
index f7a896d3e15..5ff7b7c7c6d 100644
--- a/packages/thirdweb/src/wallets/manager/index.ts
+++ b/packages/thirdweb/src/wallets/manager/index.ts
@@ -309,20 +309,20 @@ export function createConnectionManager(storage: AsyncStorage) {
   }
 
   return {
-    activeWalletStore,
     activeAccountStore,
-    connectedWallets,
+    activeWalletChainStore,
+    activeWalletConnectionStatusStore,
+    activeWalletStore,
     addConnectedWallet,
-    disconnectWallet,
-    setActiveWallet,
     connect,
+    connectedWallets,
+    defineChains,
+    disconnectWallet,
     handleConnection,
-    activeWalletChainStore,
-    switchActiveWalletChain,
-    activeWalletConnectionStatusStore,
     isAutoConnecting,
     removeConnectedWallet,
-    defineChains,
+    setActiveWallet,
+    switchActiveWalletChain,
   };
 }
 
@@ -393,9 +393,9 @@ export const handleSmartWalletConnection = async (
   const wallet = smartWallet(options);
 
   await wallet.connect({
-    personalAccount: signer,
-    client: client,
     chain: options.chain,
+    client: client,
+    personalAccount: signer,
   });
 
   // Disconnect the active wallet when the EOA disconnects if it the active wallet is a smart wallet
diff --git a/packages/thirdweb/src/wallets/native/create-wallet.ts b/packages/thirdweb/src/wallets/native/create-wallet.ts
index e446ef887c3..6a5385f23a0 100644
--- a/packages/thirdweb/src/wallets/native/create-wallet.ts
+++ b/packages/thirdweb/src/wallets/native/create-wallet.ts
@@ -90,8 +90,8 @@ export function createWallet<const ID extends WalletId>(
      */
     default: {
       const emitter = createWalletEmitter<ID>();
-      let account: Account | undefined = undefined;
-      let chain: Chain | undefined = undefined;
+      let account: Account | undefined;
+      let chain: Chain | undefined;
 
       const unsubscribeChain = emitter.subscribe("chainChanged", (newChain) => {
         chain = newChain;
@@ -129,18 +129,6 @@ export function createWallet<const ID extends WalletId>(
       };
 
       const wallet: Wallet<ID> = {
-        id,
-        subscribe: emitter.subscribe,
-        getConfig: () => args[1],
-        getChain() {
-          if (!chain) {
-            return undefined;
-          }
-
-          chain = getCachedChainIfExists(chain.id) || chain;
-          return chain;
-        },
-        getAccount: () => account,
         autoConnect: async (
           options: WalletAutoConnectionOption<WCSupportedWalletIds>,
         ) => {
@@ -166,10 +154,10 @@ export function createWallet<const ID extends WalletId>(
             handleDisconnect = doDisconnect;
             handleSwitchChain = doSwitchChain;
             trackConnect({
+              chainId: chain.id,
               client: options.client,
-              walletType: id,
               walletAddress: account.address,
-              chainId: chain.id,
+              walletType: id,
             });
             // return account
             return account;
@@ -200,10 +188,10 @@ export function createWallet<const ID extends WalletId>(
             handleDisconnect = doDisconnect;
             handleSwitchChain = doSwitchChain;
             trackConnect({
+              chainId: chain.id,
               client: wcOptions.client,
-              walletType: id,
               walletAddress: account.address,
-              chainId: chain.id,
+              walletType: id,
             });
             return account;
           }
@@ -212,8 +200,8 @@ export function createWallet<const ID extends WalletId>(
             const { client, chain: _chain, ...walletConnectOptions } = options;
 
             return wcConnect({
-              client,
               chain: _chain,
+              client,
               walletConnect: {
                 ...walletConnectOptions,
               },
@@ -230,6 +218,18 @@ export function createWallet<const ID extends WalletId>(
           reset();
           await handleDisconnect();
         },
+        getAccount: () => account,
+        getChain() {
+          if (!chain) {
+            return undefined;
+          }
+
+          chain = getCachedChainIfExists(chain.id) || chain;
+          return chain;
+        },
+        getConfig: () => args[1],
+        id,
+        subscribe: emitter.subscribe,
         switchChain: (c) => handleSwitchChain(c),
       };
       return wallet;
diff --git a/packages/thirdweb/src/wallets/private-key.test.ts b/packages/thirdweb/src/wallets/private-key.test.ts
index 1dab08ce1ba..70fac1b0d7f 100644
--- a/packages/thirdweb/src/wallets/private-key.test.ts
+++ b/packages/thirdweb/src/wallets/private-key.test.ts
@@ -12,7 +12,7 @@ import { getWalletBalance } from "./utils/getWalletBalance.js";
 
 test("default", () => {
   expect(
-    privateKeyToAccount({ privateKey: ANVIL_PKEY_A, client: TEST_CLIENT }),
+    privateKeyToAccount({ client: TEST_CLIENT, privateKey: ANVIL_PKEY_A }),
   ).toMatchInlineSnapshot(`
     {
       "address": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
@@ -27,8 +27,8 @@ test("default", () => {
 
 test("sign message", async () => {
   const account = privateKeyToAccount({
-    privateKey: ANVIL_PKEY_A,
     client: TEST_CLIENT,
+    privateKey: ANVIL_PKEY_A,
   });
   expect(
     await account.signMessage({ message: "hello world" }),
@@ -39,8 +39,8 @@ test("sign message", async () => {
 
 test("sign transaction", async () => {
   const account = privateKeyToAccount({
-    privateKey: ANVIL_PKEY_A,
     client: TEST_CLIENT,
+    privateKey: ANVIL_PKEY_A,
   });
 
   if (!account.signTransaction) {
@@ -51,8 +51,8 @@ test("sign transaction", async () => {
   expect(
     await account.signTransaction({
       chainId: 1,
-      maxFeePerGas: toUnits("20", 9),
       gas: 21000n,
+      maxFeePerGas: toUnits("20", 9),
       to: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8",
       value: toUnits("1", 18),
     }),
@@ -63,8 +63,8 @@ test("sign transaction", async () => {
 
 test("sign typed data", async () => {
   const account = privateKeyToAccount({
-    privateKey: ANVIL_PKEY_A,
     client: TEST_CLIENT,
+    privateKey: ANVIL_PKEY_A,
   });
   expect(
     await account.signTypedData({ ...typedData.basic, primaryType: "Mail" }),
@@ -75,8 +75,8 @@ test("sign typed data", async () => {
 
 test("send transaction", async () => {
   const account = privateKeyToAccount({
-    privateKey: ANVIL_PKEY_A,
     client: TEST_CLIENT,
+    privateKey: ANVIL_PKEY_A,
   });
   const startingBalance = await getWalletBalance({
     address: account.address,
@@ -89,8 +89,8 @@ test("send transaction", async () => {
     client: TEST_CLIENT,
   });
   const tx = prepareTransaction({
-    client: TEST_CLIENT,
     chain: ANVIL_CHAIN,
+    client: TEST_CLIENT,
     to: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8",
     value: toUnits("1", 18),
   });
@@ -104,13 +104,13 @@ test("send transaction", async () => {
 
   const endingBalance = await getWalletBalance({
     address: account.address,
-    client: TEST_CLIENT,
     chain: ANVIL_CHAIN,
+    client: TEST_CLIENT,
   });
   const endingBalanceRecipient = await getWalletBalance({
     address: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8",
-    client: TEST_CLIENT,
     chain: ANVIL_CHAIN,
+    client: TEST_CLIENT,
   });
   expect(endingBalance.value).toBeLessThan(startingBalance.value);
   expect(endingBalanceRecipient.value).toBeGreaterThan(
diff --git a/packages/thirdweb/src/wallets/private-key.ts b/packages/thirdweb/src/wallets/private-key.ts
index 71af68b587a..573708801c7 100644
--- a/packages/thirdweb/src/wallets/private-key.ts
+++ b/packages/thirdweb/src/wallets/private-key.ts
@@ -85,12 +85,12 @@ export function privateKeyToAccount(
       tx: SerializableTransaction & { chainId: number },
     ) => {
       const rpcRequest = getRpcClient({
-        client: client,
         chain: getCachedChain(tx.chainId),
+        client: client,
       });
       const signedTx = signTransaction({
-        transaction: tx,
         privateKey,
+        transaction: tx,
       });
       const transactionHash = await eth_sendRawTransaction(
         rpcRequest,
@@ -100,12 +100,25 @@ export function privateKeyToAccount(
         transactionHash,
       };
     },
+    signAuthorization: async (authorization: AuthorizationRequest) => {
+      const signature = ox__Secp256k1.sign({
+        payload: ox__Authorization.getSignPayload(authorization),
+        privateKey: privateKey,
+      });
+      return ox__Authorization.from(authorization, { signature });
+    },
     signMessage: async ({ message }: { message: Message }) => {
       return signMessage({
         message,
         privateKey,
       });
     },
+    signTransaction: async (tx: SerializableTransaction) => {
+      return signTransaction({
+        privateKey,
+        transaction: tx,
+      });
+    },
     signTypedData: async <
       const typedData extends ox__TypedData.TypedData | Record<string, unknown>,
       primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
@@ -117,19 +130,6 @@ export function privateKeyToAccount(
         privateKey,
       });
     },
-    signTransaction: async (tx: SerializableTransaction) => {
-      return signTransaction({
-        transaction: tx,
-        privateKey,
-      });
-    },
-    signAuthorization: async (authorization: AuthorizationRequest) => {
-      const signature = ox__Secp256k1.sign({
-        payload: ox__Authorization.getSignPayload(authorization),
-        privateKey: privateKey,
-      });
-      return ox__Authorization.from(authorization, { signature });
-    },
   };
 
   return account satisfies Account;
diff --git a/packages/thirdweb/src/wallets/smart/index.ts b/packages/thirdweb/src/wallets/smart/index.ts
index 6ddc74713f4..993a96d663f 100644
--- a/packages/thirdweb/src/wallets/smart/index.ts
+++ b/packages/thirdweb/src/wallets/smart/index.ts
@@ -1,11 +1,13 @@
 import type * as ox__TypedData from "ox/TypedData";
 import { isInsufficientFundsError } from "../../analytics/track/helpers.js";
-import { trackTransaction } from "../../analytics/track/transaction.js";
-import { trackInsufficientFundsError } from "../../analytics/track/transaction.js";
+import {
+  trackInsufficientFundsError,
+  trackTransaction,
+} from "../../analytics/track/transaction.js";
 import type { Chain } from "../../chains/types.js";
 import { getCachedChain } from "../../chains/utils.js";
 import type { ThirdwebClient } from "../../client/client.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { allowance } from "../../extensions/erc20/__generated__/IERC20/read/allowance.js";
 import { approve } from "../../extensions/erc20/write/approve.js";
 import {
@@ -26,7 +28,7 @@ import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import type { Hex } from "../../utils/encoding/hex.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
 import { parseTypedData } from "../../utils/signatures/helpers/parse-typed-data.js";
-import { type SignableMessage, maxUint96 } from "../../utils/types.js";
+import { maxUint96, type SignableMessage } from "../../utils/types.js";
 import type { Account, SendTransactionOption } from "../interfaces/wallet.js";
 import {
   broadcastZkTransaction,
@@ -60,6 +62,7 @@ import type {
   UserOperationV06,
   UserOperationV07,
 } from "./types.js";
+
 export { isSmartWallet } from "./is-smart-wallet.js";
 
 /**
@@ -92,9 +95,9 @@ export async function connectSmartAccount(
   if (await isZkSyncChain(chain)) {
     return [
       createZkSyncAccount({
-        creationOptions,
-        connectionOptions,
         chain,
+        connectionOptions,
+        creationOptions,
         sponsorGas,
       }),
       chain,
@@ -132,17 +135,17 @@ export async function connectSmartAccount(
     getDefaultAccountFactory(options.overrides?.entrypointAddress);
 
   const factoryContract = getContract({
-    client: client,
     address: factoryAddress,
     chain: chain,
+    client: client,
   });
 
   const accountAddress = await predictAddress({
-    factoryContract,
+    accountAddress: options.overrides?.accountAddress,
+    accountSalt: options.overrides?.accountSalt,
     adminAddress: personalAccount.address,
+    factoryContract,
     predictAddressOverride: options.overrides?.predictAddress,
-    accountSalt: options.overrides?.accountSalt,
-    accountAddress: options.overrides?.accountAddress,
   })
     .then((address) => address)
     .catch((err) => {
@@ -153,19 +156,19 @@ export async function connectSmartAccount(
     });
 
   const accountContract = getContract({
-    client,
     address: accountAddress,
     chain,
+    client,
   });
 
   const account = await createSmartAccount({
     ...options,
-    chain,
-    sponsorGas,
-    personalAccount,
     accountContract,
-    factoryContract,
+    chain,
     client,
+    factoryContract,
+    personalAccount,
+    sponsorGas,
   });
 
   adminAccountToSmartAccountMap.set(personalAccount, account);
@@ -175,8 +178,8 @@ export async function connectSmartAccount(
     if (
       await shouldUpdateSessionKey({
         accountContract,
-        sessionKeyAddress: options.sessionKey.address,
         newPermissions: options.sessionKey.permissions,
+        sessionKeyAddress: options.sessionKey.address,
       })
     ) {
       const transaction = addSessionKey({
@@ -227,13 +230,48 @@ async function createSmartAccount(
   let accountContract = options.accountContract;
   const account: Account = {
     address: getAddress(accountContract.address),
+    async onTransactionRequested(transaction) {
+      return options.personalAccount.onTransactionRequested?.(transaction);
+    },
+    async sendBatchTransaction(transactions: SendTransactionOption[]) {
+      const executeTx = prepareBatchExecute({
+        accountContract,
+        executeBatchOverride: options.overrides?.executeBatch,
+        transactions,
+      });
+      if (transactions.length === 0) {
+        throw new Error("No transactions to send");
+      }
+      const firstTx = transactions[0];
+      if (!firstTx) {
+        throw new Error("No transactions to send");
+      }
+      const chain = getCachedChain(firstTx.chainId);
+      const result = await _sendUserOp({
+        executeTx,
+        options: {
+          ...options,
+          accountContract,
+          chain,
+        },
+      });
+      trackTransaction({
+        chainId: chain.id,
+        client: options.client,
+        contractAddress: transactions[0]?.to ?? undefined,
+        transactionHash: result.transactionHash,
+        walletAddress: options.accountContract.address,
+        walletType: "smart",
+      });
+      return result;
+    },
     async sendTransaction(transaction: SendTransactionOption) {
       // if erc20 paymaster - check allowance and approve if needed
       let paymasterOverride:
         | undefined
         | ((
             userOp: UserOperationV06 | UserOperationV07,
-          ) => Promise<PaymasterResult>) = undefined;
+          ) => Promise<PaymasterResult>);
       if (erc20Paymaster) {
         await approveERC20({
           accountContract,
@@ -262,8 +300,8 @@ async function createSmartAccount(
 
       const executeTx = prepareExecute({
         accountContract: accountContract,
-        transaction,
         executeOverride: options.overrides?.execute,
+        transaction,
       });
 
       const chain = getCachedChain(transaction.chainId);
@@ -271,8 +309,8 @@ async function createSmartAccount(
         executeTx,
         options: {
           ...options,
-          chain,
           accountContract,
+          chain,
           overrides: {
             ...options.overrides,
             paymaster: paymasterOverride,
@@ -280,53 +318,21 @@ async function createSmartAccount(
         },
       });
       trackTransaction({
-        client: options.client,
         chainId: chain.id,
-        transactionHash: result.transactionHash,
-        walletAddress: options.accountContract.address,
-        walletType: "smart",
-        contractAddress: transaction.to ?? undefined,
-      });
-      return result;
-    },
-    async sendBatchTransaction(transactions: SendTransactionOption[]) {
-      const executeTx = prepareBatchExecute({
-        accountContract,
-        transactions,
-        executeBatchOverride: options.overrides?.executeBatch,
-      });
-      if (transactions.length === 0) {
-        throw new Error("No transactions to send");
-      }
-      const firstTx = transactions[0];
-      if (!firstTx) {
-        throw new Error("No transactions to send");
-      }
-      const chain = getCachedChain(firstTx.chainId);
-      const result = await _sendUserOp({
-        executeTx,
-        options: {
-          ...options,
-          chain,
-          accountContract,
-        },
-      });
-      trackTransaction({
         client: options.client,
-        chainId: chain.id,
+        contractAddress: transaction.to ?? undefined,
         transactionHash: result.transactionHash,
         walletAddress: options.accountContract.address,
         walletType: "smart",
-        contractAddress: transactions[0]?.to ?? undefined,
       });
       return result;
     },
     async signMessage({ message }: { message: SignableMessage }) {
       if (options.overrides?.signMessage) {
         return options.overrides.signMessage({
+          accountContract,
           adminAccount: options.personalAccount,
           factoryContract: options.factoryContract,
-          accountContract,
           message,
         });
       }
@@ -335,8 +341,8 @@ async function createSmartAccount(
       return smartAccountSignMessage({
         accountContract,
         factoryContract: options.factoryContract,
-        options,
         message,
+        options,
       });
     },
     async signTypedData<
@@ -345,9 +351,9 @@ async function createSmartAccount(
     >(typedData: ox__TypedData.Definition<typedData, primaryType>) {
       if (options.overrides?.signTypedData) {
         return options.overrides.signTypedData({
+          accountContract,
           adminAccount: options.personalAccount,
           factoryContract: options.factoryContract,
-          accountContract,
           typedData,
         });
       }
@@ -360,9 +366,6 @@ async function createSmartAccount(
         typedData,
       });
     },
-    async onTransactionRequested(transaction) {
-      return options.personalAccount.onTransactionRequested?.(transaction);
-    },
   };
   return account;
 }
@@ -390,18 +393,18 @@ async function approveERC20(args: {
   }
 
   const approveTx = approve({
+    amountWei: maxUint96 - 1n,
     contract: tokenContract,
     spender: erc20Paymaster.paymasterAddress,
-    amountWei: maxUint96 - 1n,
   });
   const transaction = await toSerializableTransaction({
-    transaction: approveTx,
     from: accountContract.address,
+    transaction: approveTx,
   });
   const executeTx = prepareExecute({
     accountContract,
-    transaction,
     executeOverride: options.overrides?.execute,
+    transaction,
   });
   await _sendUserOp({
     executeTx,
@@ -424,15 +427,20 @@ function createZkSyncAccount(args: {
   const { creationOptions, connectionOptions, chain } = args;
   const account: Account = {
     address: getAddress(connectionOptions.personalAccount.address),
+    async onTransactionRequested(transaction) {
+      return connectionOptions.personalAccount.onTransactionRequested?.(
+        transaction,
+      );
+    },
     async sendTransaction(transaction: SendTransactionOption) {
       // override passed tx, we have to refetch gas and fees always
       const prepTx = {
-        data: transaction.data,
-        to: transaction.to ?? undefined,
-        value: transaction.value ?? 0n,
         chain: getCachedChain(transaction.chainId),
         client: connectionOptions.client,
+        data: transaction.data,
         eip712: transaction.eip712,
+        to: transaction.to ?? undefined,
+        value: transaction.value ?? 0n,
       };
 
       let serializableTransaction = await populateEip712Transaction({
@@ -444,9 +452,9 @@ function createZkSyncAccount(args: {
         // get paymaster input
         const pmData = await getZkPaymasterData({
           options: {
-            client: connectionOptions.client,
-            chain,
             bundlerUrl: creationOptions.overrides?.bundlerUrl,
+            chain,
+            client: connectionOptions.client,
             entrypointAddress: creationOptions.overrides?.entrypointAddress,
           },
           transaction: serializableTransaction,
@@ -467,28 +475,28 @@ function createZkSyncAccount(args: {
       // broadcast via bundler
       const txHash = await broadcastZkTransaction({
         options: {
-          client: connectionOptions.client,
-          chain,
           bundlerUrl: creationOptions.overrides?.bundlerUrl,
+          chain,
+          client: connectionOptions.client,
           entrypointAddress: creationOptions.overrides?.entrypointAddress,
         },
-        transaction: serializableTransaction,
         signedTransaction,
+        transaction: serializableTransaction,
       });
 
       trackTransaction({
-        client: connectionOptions.client,
         chainId: chain.id,
+        client: connectionOptions.client,
+        contractAddress: transaction.to ?? undefined,
         transactionHash: txHash.transactionHash,
         walletAddress: account.address,
         walletType: "smart",
-        contractAddress: transaction.to ?? undefined,
       });
 
       return {
-        transactionHash: txHash.transactionHash,
-        client: connectionOptions.client,
         chain: chain,
+        client: connectionOptions.client,
+        transactionHash: txHash.transactionHash,
       };
     },
     async signMessage({ message }: { message: SignableMessage }) {
@@ -501,11 +509,6 @@ function createZkSyncAccount(args: {
       const typedData = parseTypedData(_typedData);
       return connectionOptions.personalAccount.signTypedData(typedData);
     },
-    async onTransactionRequested(transaction) {
-      return connectionOptions.personalAccount.onTransactionRequested?.(
-        transaction,
-      );
-    },
   };
   return account;
 }
@@ -517,24 +520,24 @@ async function _sendUserOp(args: {
   const { executeTx, options } = args;
   try {
     const unsignedUserOp = await createUnsignedUserOp({
-      transaction: executeTx,
-      factoryContract: options.factoryContract,
       accountContract: options.accountContract,
       adminAddress: options.personalAccount.address,
-      sponsorGas: options.sponsorGas,
+      factoryContract: options.factoryContract,
       overrides: options.overrides,
+      sponsorGas: options.sponsorGas,
+      transaction: executeTx,
     });
     const signedUserOp = await signUserOp({
-      client: options.client,
-      chain: options.chain,
       adminAccount: options.personalAccount,
+      chain: options.chain,
+      client: options.client,
       entrypointAddress: options.overrides?.entrypointAddress,
       userOp: unsignedUserOp,
     });
     const bundlerOptions: BundlerOptions = {
+      bundlerUrl: options.overrides?.bundlerUrl,
       chain: options.chain,
       client: options.client,
-      bundlerUrl: options.overrides?.bundlerUrl,
       entrypointAddress: options.overrides?.entrypointAddress,
     };
     const userOpHash = await bundleUserOp({
@@ -548,29 +551,29 @@ async function _sendUserOp(args: {
     });
 
     trackTransaction({
-      client: options.client,
       chainId: options.chain.id,
+      client: options.client,
+      contractAddress: await resolvePromisedValue(executeTx.to ?? undefined),
       transactionHash: receipt.transactionHash,
       walletAddress: options.accountContract.address,
       walletType: "smart",
-      contractAddress: await resolvePromisedValue(executeTx.to ?? undefined),
     });
 
     return {
-      client: options.client,
       chain: options.chain,
+      client: options.client,
       transactionHash: receipt.transactionHash,
     };
   } catch (error) {
     // Track insufficient funds errors
     if (isInsufficientFundsError(error)) {
       trackInsufficientFundsError({
-        client: options.client,
-        error,
-        walletAddress: options.accountContract.address,
         chainId: options.chain.id,
+        client: options.client,
         contractAddress: await resolvePromisedValue(executeTx.to ?? undefined),
+        error,
         transactionValue: await resolvePromisedValue(executeTx.value),
+        walletAddress: options.accountContract.address,
       });
     }
 
@@ -588,8 +591,8 @@ export async function getEntrypointFromFactory(
 ) {
   const factoryContract = getContract({
     address: factoryAddress,
-    client,
     chain,
+    client,
   });
   try {
     const entrypointAddress = await readContract({
diff --git a/packages/thirdweb/src/wallets/smart/is-smart-wallet.test.ts b/packages/thirdweb/src/wallets/smart/is-smart-wallet.test.ts
index 1eb33cbe275..a96667ab551 100644
--- a/packages/thirdweb/src/wallets/smart/is-smart-wallet.test.ts
+++ b/packages/thirdweb/src/wallets/smart/is-smart-wallet.test.ts
@@ -15,31 +15,30 @@ describe("isSmartWallet", () => {
 
   it("should return true for wallet with smartAccount config", () => {
     const wallet = {
-      id: "inApp",
       getConfig: () => ({
         smartAccount: {
           chain: { id: 1, name: "test", rpc: "test" },
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(isSmartWallet(wallet)).toBe(true);
   });
 
   it("should return true for wallet with EIP7702 config", () => {
     const wallet = {
-      id: "inApp",
       getConfig: () => ({
         executionMode: {
           mode: "EIP7702",
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(isSmartWallet(wallet)).toBe(true);
   });
 
   it("should return true for wallet with EIP4337 config", () => {
     const wallet = {
-      id: "inApp",
       getConfig: () => ({
         executionMode: {
           mode: "EIP4337",
@@ -49,22 +48,23 @@ describe("isSmartWallet", () => {
           },
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(isSmartWallet(wallet)).toBe(true);
   });
 
   it("should return false for non-smart wallet", () => {
     const wallet = {
-      id: "inApp",
       getConfig: () => ({}),
+      id: "inApp",
     } as Wallet;
     expect(isSmartWallet(wallet)).toBe(false);
   });
 
   it("should return false when getConfig returns null", () => {
     const wallet = {
-      id: "inApp",
       getConfig: () => null,
+      id: "inApp",
       // biome-ignore lint/suspicious/noExplicitAny: Testing invalid config
     } as any as Wallet;
     expect(isSmartWallet(wallet)).toBe(false);
@@ -72,17 +72,17 @@ describe("isSmartWallet", () => {
 
   it("should return false when getConfig returns undefined", () => {
     const wallet = {
-      id: "inApp",
       getConfig: () => undefined,
+      id: "inApp",
     } as Wallet;
     expect(isSmartWallet(wallet)).toBe(false);
   });
 
   it("should return false when smartAccount is null", () => {
     const wallet = {
-      id: "inApp",
       // biome-ignore lint/suspicious/noExplicitAny: Testing invalid config
       getConfig: () => ({ smartAccount: null }) as any,
+      id: "inApp",
     } as Wallet;
     expect(isSmartWallet(wallet)).toBe(false);
   });
@@ -95,14 +95,14 @@ describe("hasSponsoredTransactionsEnabled", () => {
 
   it("should handle smart wallet with sponsorGas config", () => {
     const mockSmartWallet = {
-      id: "smart",
       getConfig: () => ({ sponsorGas: true }),
+      id: "smart",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockSmartWallet)).toBe(true);
 
     const mockSmartWalletDisabled = {
-      id: "smart",
       getConfig: () => ({ sponsorGas: false }),
+      id: "smart",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockSmartWalletDisabled)).toBe(
       false,
@@ -111,30 +111,30 @@ describe("hasSponsoredTransactionsEnabled", () => {
 
   it("should handle smart wallet with gasless config", () => {
     const mockSmartWallet = {
-      id: "smart",
       getConfig: () => ({ gasless: true }),
+      id: "smart",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockSmartWallet)).toBe(true);
   });
 
   it("should handle inApp wallet with smartAccount config", () => {
     const mockInAppWallet = {
-      id: "inApp",
       getConfig: () => ({
         smartAccount: {
           sponsorGas: true,
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWallet)).toBe(true);
 
     const mockInAppWalletDisabled = {
-      id: "inApp",
       getConfig: () => ({
         smartAccount: {
           sponsorGas: false,
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWalletDisabled)).toBe(
       false,
@@ -143,23 +143,23 @@ describe("hasSponsoredTransactionsEnabled", () => {
 
   it("should handle inApp wallet with EIP7702 config", () => {
     const mockInAppWallet = {
-      id: "inApp",
       getConfig: () => ({
         executionMode: {
           mode: "EIP7702",
           sponsorGas: true,
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWallet)).toBe(true);
 
     const mockInAppWalletDisabled = {
-      id: "inApp",
       getConfig: () => ({
         executionMode: {
           mode: "EIP7702",
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWalletDisabled)).toBe(
       false,
@@ -168,7 +168,6 @@ describe("hasSponsoredTransactionsEnabled", () => {
 
   it("should handle inApp wallet with EIP4337 config", () => {
     const mockInAppWallet = {
-      id: "inApp",
       getConfig: () => ({
         executionMode: {
           mode: "EIP4337",
@@ -178,11 +177,11 @@ describe("hasSponsoredTransactionsEnabled", () => {
           },
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWallet)).toBe(true);
 
     const mockInAppWalletDisabled = {
-      id: "inApp",
       getConfig: () => ({
         executionMode: {
           mode: "EIP4337",
@@ -192,6 +191,7 @@ describe("hasSponsoredTransactionsEnabled", () => {
           },
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWalletDisabled)).toBe(
       false,
@@ -200,20 +200,20 @@ describe("hasSponsoredTransactionsEnabled", () => {
 
   it("should handle inApp wallet with gasless config", () => {
     const mockInAppWallet = {
-      id: "inApp",
       getConfig: () => ({
         smartAccount: {
           gasless: true,
         },
       }),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockInAppWallet)).toBe(true);
   });
 
   it("should return false for regular wallet without smart account config", () => {
     const mockRegularWallet = {
-      id: "inApp",
       getConfig: () => ({}),
+      id: "inApp",
     } as Wallet;
     expect(hasSponsoredTransactionsEnabled(mockRegularWallet)).toBe(false);
   });
diff --git a/packages/thirdweb/src/wallets/smart/lib/bundler.ts b/packages/thirdweb/src/wallets/smart/lib/bundler.ts
index 0be5782b8e6..bec1d5a0b93 100644
--- a/packages/thirdweb/src/wallets/smart/lib/bundler.ts
+++ b/packages/thirdweb/src/wallets/smart/lib/bundler.ts
@@ -19,19 +19,19 @@ import { getEntrypointFromFactory } from "../index.js";
 import {
   type BundlerOptions,
   type EstimationResult,
+  formatUserOperationReceipt,
   type GasPriceResult,
   type PmTransactionData,
   type SmartWalletOptions,
   type UserOperationReceipt,
   type UserOperationV06,
   type UserOperationV07,
-  formatUserOperationReceipt,
 } from "../types.js";
 import { predictSmartAccountAddress } from "./calls.js";
 import {
   ENTRYPOINT_ADDRESS_v0_6,
-  MANAGED_ACCOUNT_GAS_BUFFER,
   getDefaultBundlerUrl,
+  MANAGED_ACCOUNT_GAS_BUFFER,
 } from "./constants.js";
 import { prepareUserOp } from "./userop.js";
 import { hexlifyUserOp } from "./utils.js";
@@ -105,21 +105,21 @@ export async function estimateUserOpGas(
 
   // add gas buffer for managed account factory delegate calls
   return {
-    preVerificationGas: hexToBigInt(res.preVerificationGas),
-    verificationGas:
-      res.verificationGas !== undefined
-        ? hexToBigInt(res.verificationGas)
-        : undefined,
-    verificationGasLimit: hexToBigInt(res.verificationGasLimit),
     callGasLimit: hexToBigInt(res.callGasLimit) + MANAGED_ACCOUNT_GAS_BUFFER,
+    paymasterPostOpGasLimit:
+      res.paymasterPostOpGasLimit !== undefined
+        ? hexToBigInt(res.paymasterPostOpGasLimit)
+        : undefined,
     paymasterVerificationGasLimit:
       res.paymasterVerificationGasLimit !== undefined
         ? hexToBigInt(res.paymasterVerificationGasLimit)
         : undefined,
-    paymasterPostOpGasLimit:
-      res.paymasterPostOpGasLimit !== undefined
-        ? hexToBigInt(res.paymasterPostOpGasLimit)
+    preVerificationGas: hexToBigInt(res.preVerificationGas),
+    verificationGas:
+      res.verificationGas !== undefined
+        ? hexToBigInt(res.verificationGas)
         : undefined,
+    verificationGasLimit: hexToBigInt(res.verificationGasLimit),
   };
 }
 
@@ -165,22 +165,22 @@ export async function estimateUserOpGasCost(args: {
   }
 
   const userOp = await prepareUserOp({
-    transactions: args.transactions,
     adminAccount: args.adminAccount,
     client: args.client,
-    smartWalletOptions: args.smartWalletOptions,
     isDeployedOverride: await isContractDeployed(
       getContract({
         address: await predictSmartAccountAddress({
           adminAddress: args.adminAccount.address,
-          factoryAddress: args.smartWalletOptions.factoryAddress,
           chain: args.smartWalletOptions.chain,
           client: args.client,
+          factoryAddress: args.smartWalletOptions.factoryAddress,
         }),
         chain: args.smartWalletOptions.chain,
         client: args.client,
       }),
     ),
+    smartWalletOptions: args.smartWalletOptions,
+    transactions: args.transactions,
     waitForDeployment: false,
   });
 
@@ -233,8 +233,8 @@ export async function getUserOpGasFees(args: {
   });
 
   return {
-    maxPriorityFeePerGas: hexToBigInt(res.maxPriorityFeePerGas),
     maxFeePerGas: hexToBigInt(res.maxFeePerGas),
+    maxPriorityFeePerGas: hexToBigInt(res.maxPriorityFeePerGas),
   };
 }
 
@@ -311,8 +311,8 @@ export async function getUserOpReceiptRaw(
   },
 ): Promise<UserOperationReceipt | undefined> {
   const res = await sendBundlerRequest({
-    options: args,
     operation: "eth_getUserOperationReceipt",
+    options: args,
     params: [args.userOpHash],
   });
   if (!res) {
@@ -329,8 +329,8 @@ export async function getZkPaymasterData(args: {
   transaction: SerializableTransaction;
 }): Promise<PmTransactionData> {
   const res = await sendBundlerRequest({
-    options: args.options,
     operation: "zk_paymasterData",
+    options: args.options,
     params: [args.transaction],
   });
 
@@ -389,8 +389,8 @@ export async function broadcastZkTransaction(args: {
   signedTransaction: Hex;
 }): Promise<{ transactionHash: Hex }> {
   const res = await sendBundlerRequest({
-    options: args.options,
     operation: "zk_broadcastTransaction",
+    options: args.options,
     params: [
       {
         ...args.transaction,
@@ -423,16 +423,16 @@ async function sendBundlerRequest(args: {
   const bundlerUrl = options.bundlerUrl ?? getDefaultBundlerUrl(options.chain);
   const fetchWithHeaders = getClientFetch(options.client);
   const response = await fetchWithHeaders(bundlerUrl, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
     body: stringify({
-      jsonrpc: "2.0",
       id: 1,
+      jsonrpc: "2.0",
       method: operation,
       params,
     }),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    method: "POST",
   });
   const res = await response.json();
   if (!response.ok || res.error) {
diff --git a/packages/thirdweb/src/wallets/smart/lib/calls.ts b/packages/thirdweb/src/wallets/smart/lib/calls.ts
index 681994c9184..3eede4ab808 100644
--- a/packages/thirdweb/src/wallets/smart/lib/calls.ts
+++ b/packages/thirdweb/src/wallets/smart/lib/calls.ts
@@ -1,8 +1,8 @@
 import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { prepareContractCall } from "../../../transaction/prepare-contract-call.js";
 import type { PreparedTransaction } from "../../../transaction/prepare-transaction.js";
@@ -36,8 +36,8 @@ export async function predictSmartAccountAddress(args: {
   accountSalt?: string;
 }): Promise<string> {
   return predictAddress({
-    adminAddress: args.adminAddress,
     accountSalt: args.accountSalt,
+    adminAddress: args.adminAddress,
     factoryContract: getContract({
       address: args.factoryAddress ?? DEFAULT_ACCOUNT_FACTORY_V0_6,
       chain: args.chain,
@@ -188,12 +188,12 @@ export function prepareExecute(args: {
   }
   return prepareContractCall({
     contract: accountContract,
-    method: "function execute(address, uint256, bytes)",
-    params: [transaction.to || "", value, transaction.data || "0x"],
     // if gas is specified for the inner tx, use that and add 21k for the execute call on the account contract
     // this avoids another estimateGas call when bundling the userOp
     // and also allows for passing custom gas limits for the inner tx
     gas: transaction.gas ? transaction.gas + 21000n : undefined,
+    method: "function execute(address, uint256, bytes)",
+    params: [transaction.to || "", value, transaction.data || "0x"],
   });
 }
 
diff --git a/packages/thirdweb/src/wallets/smart/lib/constants.ts b/packages/thirdweb/src/wallets/smart/lib/constants.ts
index cd61286b8c3..2018d628bfe 100644
--- a/packages/thirdweb/src/wallets/smart/lib/constants.ts
+++ b/packages/thirdweb/src/wallets/smart/lib/constants.ts
@@ -21,22 +21,22 @@ export const MANAGED_ACCOUNT_GAS_BUFFER = 50000n;
 type PAYMASTERS = "BASE_USDC" | "CELO_CUSD" | "LISK_LSK";
 export const TokenPaymaster: Record<PAYMASTERS, TokenPaymasterConfig> = {
   BASE_USDC: {
+    balanceStorageSlot: 9n,
     chainId: 8453,
     paymasterAddress: "0x2222f2738BE6bB7aA0Bfe4AEeAf2908172CF5539",
     tokenAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-    balanceStorageSlot: 9n,
   },
   CELO_CUSD: {
+    balanceStorageSlot: 9n,
     chainId: 42220,
     paymasterAddress: "0x3feA3c5744D715ff46e91C4e5C9a94426DfF2aF9",
     tokenAddress: "0x765DE816845861e75A25fCA122bb6898B8B1282a",
-    balanceStorageSlot: 9n,
   },
   LISK_LSK: {
+    balanceStorageSlot: 9n,
     chainId: 1135,
     paymasterAddress: "0x9eb8cf7fBa5ed9EeDCC97a0d52254cc0e9B1AC25",
     tokenAddress: "0xac485391EB2d7D88253a7F1eF18C37f4242D1A24",
-    balanceStorageSlot: 9n,
   },
 };
 
diff --git a/packages/thirdweb/src/wallets/smart/lib/packUserOp.ts b/packages/thirdweb/src/wallets/smart/lib/packUserOp.ts
index b20a5220125..2d1b2b33d66 100644
--- a/packages/thirdweb/src/wallets/smart/lib/packUserOp.ts
+++ b/packages/thirdweb/src/wallets/smart/lib/packUserOp.ts
@@ -1,4 +1,4 @@
-import { type Hex, concat, pad, toHex } from "viem";
+import { concat, type Hex, pad, toHex } from "viem";
 import type { PackedUserOperation, UserOperationV07 } from "../types.js";
 
 function getInitCode(unpackedUserOperation: UserOperationV07) {
@@ -52,14 +52,14 @@ export const getPackedUserOperation = (
   userOperation: UserOperationV07,
 ): PackedUserOperation => {
   return {
-    sender: userOperation.sender,
-    nonce: BigInt(userOperation.nonce),
-    initCode: getInitCode(userOperation),
-    callData: userOperation.callData,
     accountGasLimits: getAccountGasLimits(userOperation),
-    preVerificationGas: BigInt(userOperation.preVerificationGas),
+    callData: userOperation.callData,
     gasFees: getGasLimits(userOperation),
+    initCode: getInitCode(userOperation),
+    nonce: BigInt(userOperation.nonce),
     paymasterAndData: getPaymasterAndData(userOperation),
+    preVerificationGas: BigInt(userOperation.preVerificationGas),
+    sender: userOperation.sender,
     signature: userOperation.signature,
   };
 };
diff --git a/packages/thirdweb/src/wallets/smart/lib/paymaster.ts b/packages/thirdweb/src/wallets/smart/lib/paymaster.ts
index 00d90b753f8..f0ba2ee0b6e 100644
--- a/packages/thirdweb/src/wallets/smart/lib/paymaster.ts
+++ b/packages/thirdweb/src/wallets/smart/lib/paymaster.ts
@@ -52,8 +52,8 @@ export async function getPaymasterAndData(args: {
   const paymasterUrl = getDefaultBundlerUrl(chain);
 
   const body = {
-    jsonrpc: "2.0",
     id: 1,
+    jsonrpc: "2.0",
     method: "pm_sponsorUserOperation",
     params: [hexlifyUserOp(userOp), entrypoint],
   };
@@ -61,9 +61,9 @@ export async function getPaymasterAndData(args: {
   // Ask the paymaster to sign the transaction and return a valid paymasterAndData value.
   const fetchWithHeaders = getClientFetch(client);
   const response = await fetchWithHeaders(paymasterUrl, {
-    method: "POST",
-    headers,
     body: stringify(body),
+    headers,
+    method: "POST",
   });
 
   if (!response.ok) {
@@ -89,23 +89,23 @@ export async function getPaymasterAndData(args: {
     }
 
     return {
-      paymasterAndData: res.result.paymasterAndData,
-      verificationGasLimit: res.result.verificationGasLimit
-        ? hexToBigInt(res.result.verificationGasLimit)
-        : undefined,
-      preVerificationGas: res.result.preVerificationGas
-        ? hexToBigInt(res.result.preVerificationGas)
-        : undefined,
       callGasLimit: res.result.callGasLimit
         ? hexToBigInt(res.result.callGasLimit)
         : undefined,
       paymaster: res.result.paymaster,
+      paymasterAndData: res.result.paymasterAndData,
       paymasterData: res.result.paymasterData,
+      paymasterPostOpGasLimit: res.result.paymasterPostOpGasLimit
+        ? hexToBigInt(res.result.paymasterPostOpGasLimit)
+        : undefined,
       paymasterVerificationGasLimit: res.result.paymasterVerificationGasLimit
         ? hexToBigInt(res.result.paymasterVerificationGasLimit)
         : undefined,
-      paymasterPostOpGasLimit: res.result.paymasterPostOpGasLimit
-        ? hexToBigInt(res.result.paymasterPostOpGasLimit)
+      preVerificationGas: res.result.preVerificationGas
+        ? hexToBigInt(res.result.preVerificationGas)
+        : undefined,
+      verificationGasLimit: res.result.verificationGasLimit
+        ? hexToBigInt(res.result.verificationGasLimit)
         : undefined,
     };
   }
diff --git a/packages/thirdweb/src/wallets/smart/lib/signing.ts b/packages/thirdweb/src/wallets/smart/lib/signing.ts
index 5955c83e556..888dda585b5 100644
--- a/packages/thirdweb/src/wallets/smart/lib/signing.ts
+++ b/packages/thirdweb/src/wallets/smart/lib/signing.ts
@@ -7,8 +7,8 @@ import {
 import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { encode } from "../../../transaction/actions/encode.js";
 import { readContract } from "../../../transaction/read-contract.js";
@@ -41,8 +41,8 @@ export async function smartAccountSignMessage({
 }) {
   const originalMsgHash = hashMessage(message);
   const is712Factory = await checkFor712Factory({
-    factoryContract,
     accountContract,
+    factoryContract,
     originalMsgHash,
   });
 
@@ -55,14 +55,14 @@ export async function smartAccountSignMessage({
 
     sig = await options.personalAccount.signTypedData({
       domain: {
-        name: "Account",
-        version: "1",
         chainId: options.chain.id,
+        name: "Account",
         verifyingContract: accountContract.address,
+        version: "1",
       },
+      message: { message: wrappedMessageHash },
       primaryType: "AccountMessage",
       types: { AccountMessage: [{ name: "message", type: "bytes" }] },
-      message: { message: wrappedMessageHash },
     });
   } else {
     sig = await options.personalAccount.signMessage({ message });
@@ -71,9 +71,9 @@ export async function smartAccountSignMessage({
   const isDeployed = await isContractDeployed(accountContract);
   if (isDeployed) {
     const isValid = await verifyEip1271Signature({
+      contract: accountContract,
       hash: originalMsgHash,
       signature: sig,
-      contract: accountContract,
     });
     if (isValid) {
       return sig;
@@ -81,10 +81,10 @@ export async function smartAccountSignMessage({
     throw new Error("Failed to verify signature");
   } else {
     const deployTx = prepareCreateAccount({
-      factoryContract,
-      adminAddress: options.personalAccount.address,
       accountSalt: options.overrides?.accountSalt,
+      adminAddress: options.personalAccount.address,
       createAccountOverride: options.overrides?.createAccount,
+      factoryContract,
     });
     if (!deployTx) {
       throw new Error("Create account override not provided");
@@ -98,11 +98,11 @@ export async function smartAccountSignMessage({
 
     // check if the signature is valid
     const isValid = await verifyHash({
-      hash: originalMsgHash,
-      signature: erc6492Sig,
       address: accountContract.address,
       chain: accountContract.chain,
       client: accountContract.client,
+      hash: originalMsgHash,
+      signature: erc6492Sig,
     });
 
     if (isValid) {
@@ -140,8 +140,8 @@ export async function smartAccountSignTypedData<
   const originalMsgHash = hashTypedData(typedData);
   // check if the account contract supports EIP721 domain separator based signing
   const is712Factory = await checkFor712Factory({
-    factoryContract,
     accountContract,
+    factoryContract,
     originalMsgHash,
   });
 
@@ -153,14 +153,14 @@ export async function smartAccountSignTypedData<
     );
     sig = await options.personalAccount.signTypedData({
       domain: {
-        name: "Account",
-        version: "1",
         chainId: options.chain.id,
+        name: "Account",
         verifyingContract: accountContract.address,
+        version: "1",
       },
+      message: { message: wrappedMessageHash },
       primaryType: "AccountMessage",
       types: { AccountMessage: [{ name: "message", type: "bytes" }] },
-      message: { message: wrappedMessageHash },
     });
   } else {
     sig = await options.personalAccount.signTypedData(typedData);
@@ -169,9 +169,9 @@ export async function smartAccountSignTypedData<
   const isDeployed = await isContractDeployed(accountContract);
   if (isDeployed) {
     const isValid = await verifyEip1271Signature({
+      contract: accountContract,
       hash: originalMsgHash,
       signature: sig,
-      contract: accountContract,
     });
     if (isValid) {
       return sig;
@@ -179,10 +179,10 @@ export async function smartAccountSignTypedData<
     throw new Error("Failed to verify signature");
   } else {
     const deployTx = prepareCreateAccount({
-      factoryContract,
-      adminAddress: options.personalAccount.address,
       accountSalt: options.overrides?.accountSalt,
+      adminAddress: options.personalAccount.address,
       createAccountOverride: options.overrides?.createAccount,
+      factoryContract,
     });
     if (!deployTx) {
       throw new Error("Create account override not provided");
@@ -196,11 +196,11 @@ export async function smartAccountSignTypedData<
 
     // check if the signature is valid
     const isValid = await verifyHash({
-      hash: originalMsgHash,
-      signature: erc6492Sig,
       address: accountContract.address,
       chain: accountContract.chain,
       client: accountContract.client,
+      hash: originalMsgHash,
+      signature: erc6492Sig,
     });
 
     if (isValid) {
@@ -307,15 +307,15 @@ export async function deploySmartAccount(args: {
     import("../../../transaction/prepare-transaction.js"),
   ]);
   const dummyTx = prepareTransaction({
-    client: client,
     chain: chain,
+    client: client,
+    gas: 50000n,
     to: accountContract.address,
-    value: 0n,
-    gas: 50000n, // force gas to avoid simulation error
+    value: 0n, // force gas to avoid simulation error
   });
   const deployResult = await sendTransaction({
-    transaction: dummyTx,
     account: smartAccount,
+    transaction: dummyTx,
   });
 
   await confirmContractDeployment({
diff --git a/packages/thirdweb/src/wallets/smart/lib/smart-wallet-capabilities.ts b/packages/thirdweb/src/wallets/smart/lib/smart-wallet-capabilities.ts
index ba6639d950c..fb78363ec6a 100644
--- a/packages/thirdweb/src/wallets/smart/lib/smart-wallet-capabilities.ts
+++ b/packages/thirdweb/src/wallets/smart/lib/smart-wallet-capabilities.ts
@@ -3,9 +3,7 @@ import type { Wallet } from "../../interfaces/wallet.js";
 /**
  * @internal
  */
-export function smartWalletGetCapabilities(args: {
-  wallet: Wallet;
-}) {
+export function smartWalletGetCapabilities(args: { wallet: Wallet }) {
   const { wallet } = args;
 
   const chain = wallet.getChain();
@@ -20,15 +18,15 @@ export function smartWalletGetCapabilities(args: {
   const config = wallet.getConfig() ?? {};
   return {
     [chain.id]: {
-      paymasterService: {
-        supported: "sponsorGas" in config ? config.sponsorGas : false,
-      },
       atomic: {
         status:
           account?.sendBatchTransaction !== undefined
             ? "supported"
             : "unsupported",
       },
+      paymasterService: {
+        supported: "sponsorGas" in config ? config.sponsorGas : false,
+      },
     },
   };
 }
diff --git a/packages/thirdweb/src/wallets/smart/lib/userop.ts b/packages/thirdweb/src/wallets/smart/lib/userop.ts
index d20b1cdd66e..a0c3dbc6a87 100644
--- a/packages/thirdweb/src/wallets/smart/lib/userop.ts
+++ b/packages/thirdweb/src/wallets/smart/lib/userop.ts
@@ -3,8 +3,8 @@ import { concat } from "viem";
 import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { getNonce } from "../../../extensions/erc4337/__generated__/IEntryPoint/read/getNonce.js";
 import { getUserOpHash as getUserOpHashV06 } from "../../../extensions/erc4337/__generated__/IEntryPoint/read/getUserOpHash.js";
@@ -156,9 +156,9 @@ export async function createUnsignedUserOp(args: {
   const client = executeTx.client;
 
   const bundlerOptions = {
-    client,
-    chain,
     bundlerUrl: overrides?.bundlerUrl,
+    chain,
+    client,
     entrypointAddress: overrides?.entrypointAddress,
   };
 
@@ -176,10 +176,10 @@ export async function createUnsignedUserOp(args: {
       encode(executeTx),
       resolvePromisedValue(executeTx.gas),
       getGasFees({
-        executeTx,
         bundlerOptions,
         chain,
         client,
+        executeTx,
       }),
       getAccountNonce({
         accountContract,
@@ -194,36 +194,36 @@ export async function createUnsignedUserOp(args: {
 
   if (entrypointVersion === "v0.7") {
     return populateUserOp_v0_7({
-      bundlerOptions,
-      factoryContract,
       accountContract,
       adminAddress,
-      sponsorGas,
-      overrides,
-      isDeployed,
-      nonce,
+      bundlerOptions,
       callData,
       callGasLimit,
+      factoryContract,
+      isDeployed,
       maxFeePerGas,
       maxPriorityFeePerGas,
+      nonce,
+      overrides,
+      sponsorGas,
       waitForDeployment,
     });
   }
 
   // default to v0.6
   return populateUserOp_v0_6({
-    bundlerOptions,
-    factoryContract,
     accountContract,
     adminAddress,
-    sponsorGas,
-    overrides,
-    isDeployed,
-    nonce,
+    bundlerOptions,
     callData,
     callGasLimit,
+    factoryContract,
+    isDeployed,
     maxFeePerGas,
     maxPriorityFeePerGas,
+    nonce,
+    overrides,
+    sponsorGas,
     waitForDeployment,
   });
 }
@@ -318,10 +318,10 @@ async function populateUserOp_v0_7(args: {
     factory = factoryContract.address;
     factoryData = await encode(
       prepareCreateAccount({
-        factoryContract: factoryContract,
-        adminAddress,
         accountSalt: overrides?.accountSalt,
+        adminAddress,
         createAccountOverride: overrides?.createAccount,
+        factoryContract: factoryContract,
       }),
     );
     if (waitForDeployment) {
@@ -330,30 +330,30 @@ async function populateUserOp_v0_7(args: {
   }
 
   const partialOp: UserOperationV07 = {
-    sender: accountContract.address,
-    nonce,
     callData,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
     callGasLimit: callGasLimit ?? 0n,
-    verificationGasLimit: 0n,
-    preVerificationGas: 0n,
     factory,
     factoryData,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+    nonce,
     paymaster: undefined,
     paymasterData: "0x",
-    paymasterVerificationGasLimit: 0n,
     paymasterPostOpGasLimit: 0n,
+    paymasterVerificationGasLimit: 0n,
+    preVerificationGas: 0n,
+    sender: accountContract.address,
     signature: DUMMY_SIGNATURE,
+    verificationGasLimit: 0n,
   };
 
   if (sponsorGas) {
     const paymasterResult = (await getPaymasterAndData({
-      userOp: partialOp,
       chain,
       client,
       entrypointAddress: overrides?.entrypointAddress,
       paymasterOverride: overrides?.paymaster,
+      userOp: partialOp,
     })) as Extract<PaymasterResult, { paymaster: string }>;
     if (paymasterResult.paymaster && paymasterResult.paymasterData) {
       partialOp.paymaster = paymasterResult.paymaster;
@@ -395,8 +395,8 @@ async function populateUserOp_v0_7(args: {
         : undefined;
       const estimates = await estimateUserOpGas(
         {
-          userOp: partialOp,
           options: bundlerOptions,
+          userOp: partialOp,
         },
         stateOverrides,
       );
@@ -410,11 +410,11 @@ async function populateUserOp_v0_7(args: {
         estimates.paymasterVerificationGasLimit || 0n;
       // need paymaster to re-sign after estimates
       const paymasterResult2 = (await getPaymasterAndData({
-        userOp: partialOp,
         chain,
         client,
         entrypointAddress: overrides?.entrypointAddress,
         paymasterOverride: overrides?.paymaster,
+        userOp: partialOp,
       })) as Extract<PaymasterResult, { paymaster: string }>;
       if (paymasterResult2.paymaster && paymasterResult2.paymasterData) {
         partialOp.paymaster = paymasterResult2.paymaster;
@@ -424,8 +424,8 @@ async function populateUserOp_v0_7(args: {
   } else {
     // not gasless, so we just need to estimate gas limits
     const estimates = await estimateUserOpGas({
-      userOp: partialOp,
       options: bundlerOptions,
+      userOp: partialOp,
     });
     partialOp.callGasLimit = estimates.callGasLimit;
     partialOp.verificationGasLimit = estimates.verificationGasLimit;
@@ -481,10 +481,10 @@ async function populateUserOp_v0_6(args: {
     }
   } else {
     initCode = await getAccountInitCode({
-      factoryContract: factoryContract,
-      adminAddress,
       accountSalt: overrides?.accountSalt,
+      adminAddress,
       createAccountOverride: overrides?.createAccount,
+      factoryContract: factoryContract,
     });
     if (waitForDeployment) {
       markAccountDeploying(accountContract);
@@ -492,26 +492,26 @@ async function populateUserOp_v0_6(args: {
   }
 
   const partialOp: UserOperationV06 = {
-    sender: accountContract.address,
-    nonce,
-    initCode,
     callData,
+    callGasLimit: callGasLimit ?? 0n,
+    initCode,
     maxFeePerGas,
     maxPriorityFeePerGas,
-    callGasLimit: callGasLimit ?? 0n,
-    verificationGasLimit: 0n,
-    preVerificationGas: 0n,
+    nonce,
     paymasterAndData: "0x",
+    preVerificationGas: 0n,
+    sender: accountContract.address,
     signature: DUMMY_SIGNATURE,
+    verificationGasLimit: 0n,
   };
 
   if (sponsorGas) {
     const paymasterResult = await getPaymasterAndData({
-      userOp: partialOp,
       chain,
       client,
       entrypointAddress: overrides?.entrypointAddress,
       paymasterOverride: overrides?.paymaster,
+      userOp: partialOp,
     });
     const paymasterAndData =
       "paymasterAndData" in paymasterResult
@@ -532,8 +532,8 @@ async function populateUserOp_v0_6(args: {
     } else {
       // otherwise fallback to bundler for gas limits
       const estimates = await estimateUserOpGas({
-        userOp: partialOp,
         options: bundlerOptions,
+        userOp: partialOp,
       });
       partialOp.callGasLimit = estimates.callGasLimit;
       partialOp.verificationGasLimit = estimates.verificationGasLimit;
@@ -541,11 +541,11 @@ async function populateUserOp_v0_6(args: {
       // need paymaster to re-sign after estimates
       if (paymasterAndData && paymasterAndData !== "0x") {
         const paymasterResult2 = await getPaymasterAndData({
-          userOp: partialOp,
           chain,
           client,
           entrypointAddress: overrides?.entrypointAddress,
           paymasterOverride: overrides?.paymaster,
+          userOp: partialOp,
         });
         const paymasterAndData2 =
           "paymasterAndData" in paymasterResult2
@@ -559,8 +559,8 @@ async function populateUserOp_v0_6(args: {
   } else {
     // not gasless, so we just need to estimate gas limits
     const estimates = await estimateUserOpGas({
-      userOp: partialOp,
       options: bundlerOptions,
+      userOp: partialOp,
     });
     partialOp.callGasLimit = estimates.callGasLimit;
     partialOp.verificationGasLimit = estimates.verificationGasLimit;
@@ -601,19 +601,19 @@ export async function signUserOp(args: {
   const { userOp, chain, entrypointAddress, adminAccount } = args;
 
   const userOpHash = await getUserOpHash({
-    client: args.client,
-    userOp,
     chain,
+    client: args.client,
     entrypointAddress,
+    userOp,
   });
 
   if (adminAccount.signMessage) {
     const signature = await adminAccount.signMessage({
+      chainId: chain.id,
       message: {
         raw: hexToBytes(userOpHash),
       },
       originalMessage: stringify(userOp),
-      chainId: chain.id,
     });
     return {
       ...userOp,
@@ -689,10 +689,10 @@ async function getAccountInitCode(options: {
   const { factoryContract, adminAddress, accountSalt, createAccountOverride } =
     options;
   const deployTx = prepareCreateAccount({
-    factoryContract,
-    adminAddress,
     accountSalt,
+    adminAddress,
     createAccountOverride,
+    factoryContract,
   });
   return concat([factoryContract.address as Hex, await encode(deployTx)]);
 }
@@ -768,17 +768,17 @@ export async function createAndSignUserOp(options: {
     }
   }
   const unsignedUserOp = await prepareUserOp({
-    transactions: options.transactions,
     adminAccount: options.adminAccount,
     client: options.client,
+    isDeployedOverride: options.isDeployedOverride,
     smartWalletOptions: options.smartWalletOptions,
+    transactions: options.transactions,
     waitForDeployment: options.waitForDeployment,
-    isDeployedOverride: options.isDeployedOverride,
   });
   const signedUserOp = await signUserOp({
-    client: options.client,
-    chain: options.smartWalletOptions.chain,
     adminAccount: options.adminAccount,
+    chain: options.smartWalletOptions.chain,
+    client: options.client,
     entrypointAddress: options.smartWalletOptions.overrides?.entrypointAddress,
     userOp: unsignedUserOp,
   });
@@ -821,11 +821,11 @@ export async function prepareUserOp(options: {
     client: options.client,
   });
   const accountAddress = await predictAddress({
-    factoryContract,
+    accountAddress: config.overrides?.accountAddress,
+    accountSalt: config.overrides?.accountSalt,
     adminAddress: options.adminAccount.address,
+    factoryContract,
     predictAddressOverride: config.overrides?.predictAddress,
-    accountSalt: config.overrides?.accountSalt,
-    accountAddress: config.overrides?.accountAddress,
   });
   const accountContract = getContract({
     address: accountAddress,
@@ -838,13 +838,13 @@ export async function prepareUserOp(options: {
     const tx = options.transactions[0] as PreparedTransaction;
     // for single tx, simulate fully
     const serializedTx = await toSerializableTransaction({
-      transaction: tx,
       from: accountAddress,
+      transaction: tx,
     });
     executeTx = prepareExecute({
       accountContract,
-      transaction: serializedTx,
       executeOverride: config.overrides?.execute,
+      transaction: serializedTx,
     });
   } else {
     // for multiple txs, we can't simulate, just encode
@@ -856,29 +856,29 @@ export async function prepareUserOp(options: {
           resolvePromisedValue(tx.value),
         ]);
         return {
+          chainId: tx.chain.id,
           data,
           to,
           value,
-          chainId: tx.chain.id,
         };
       }),
     );
     executeTx = prepareBatchExecute({
       accountContract,
-      transactions: serializedTxs,
       executeBatchOverride: config.overrides?.executeBatch,
+      transactions: serializedTxs,
     });
   }
 
   return createUnsignedUserOp({
-    transaction: executeTx,
-    factoryContract,
     accountContract,
     adminAddress: options.adminAccount.address,
-    sponsorGas: "sponsorGas" in config ? config.sponsorGas : config.gasless,
+    factoryContract,
+    isDeployedOverride: options.isDeployedOverride,
     overrides: config.overrides,
+    sponsorGas: "sponsorGas" in config ? config.sponsorGas : config.gasless,
+    transaction: executeTx,
     waitForDeployment: options.waitForDeployment,
-    isDeployedOverride: options.isDeployedOverride,
   });
 }
 
diff --git a/packages/thirdweb/src/wallets/smart/presets/7579.ts b/packages/thirdweb/src/wallets/smart/presets/7579.ts
index 93adc23aac2..4b8ecfed3d1 100644
--- a/packages/thirdweb/src/wallets/smart/presets/7579.ts
+++ b/packages/thirdweb/src/wallets/smart/presets/7579.ts
@@ -4,8 +4,8 @@ import { serializeErc6492Signature } from "../../../auth/serialize-erc6492-signa
 import { verifyHash } from "../../../auth/verify-hash.js";
 import { ZERO_ADDRESS } from "../../../constants/addresses.js";
 import {
-  type ThirdwebContract,
   getContract,
+  type ThirdwebContract,
 } from "../../../contract/contract.js";
 import { getNonce } from "../../../extensions/erc4337/__generated__/IEntryPoint/read/getNonce.js";
 import { execute } from "../../../extensions/erc7579/__generated__/IERC7579Account/write/execute.js";
@@ -65,42 +65,32 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
     ...options,
     factoryAddress: options.factoryAddress,
     overrides: {
-      entrypointAddress: ENTRYPOINT_ADDRESS_v0_7,
       createAccount(factoryContract, admin) {
         // TODO (msa) - let ppl pass whatever modules they want here
         return createAccountWithModules({
-          contract: factoryContract,
           asyncParams: async () => {
             // default validator
             const modules = [
               {
-                moduleTypeId: 1n, // validator type id
+                initData: ox__Hex.fromString(""), // validator type id
                 module: defaultValidator,
-                initData: ox__Hex.fromString(""),
+                moduleTypeId: 1n,
               },
             ];
             return {
+              modules,
               owner: admin,
               salt: saltHex,
-              modules,
             };
           },
-        });
-      },
-      async predictAddress(factoryContract, admin) {
-        return readContract({
           contract: factoryContract,
-          method:
-            "function getAddress(address owner, bytes salt) returns (address)",
-          params: [admin, saltHex],
         });
       },
+      entrypointAddress: ENTRYPOINT_ADDRESS_v0_7,
       execute(accountContract, transaction) {
         return execute({
-          contract: accountContract,
           async asyncParams() {
             return {
-              mode: ox__Hex.padRight("0x00", 32), // single execution
               executionCalldata: ox__AbiParameters.encodePacked(
                 ["address", "uint256", "bytes"],
                 [
@@ -108,38 +98,40 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
                   transaction.value || 0n,
                   transaction.data || "0x",
                 ],
-              ),
+              ), // single execution
+              mode: ox__Hex.padRight("0x00", 32),
             };
           },
+          contract: accountContract,
         });
       },
       executeBatch(accountContract, transactions) {
         return execute({
-          contract: accountContract,
           async asyncParams() {
             return {
-              mode: ox__Hex.padRight("0x01", 32), // batch execution
               executionCalldata: ox__AbiParameters.encode(
                 [
                   {
-                    type: "tuple[]",
                     components: [
-                      { type: "address", name: "to" },
-                      { type: "uint256", name: "value" },
-                      { type: "bytes", name: "data" },
+                      { name: "to", type: "address" },
+                      { name: "value", type: "uint256" },
+                      { name: "data", type: "bytes" },
                     ],
+                    type: "tuple[]",
                   },
                 ],
                 [
                   transactions.map((t) => ({
+                    data: t.data || "0x",
                     to: t.to || ZERO_ADDRESS,
                     value: t.value || 0n,
-                    data: t.data || "0x",
                   })),
                 ],
-              ),
+              ), // batch execution
+              mode: ox__Hex.padRight("0x01", 32),
             };
           },
+          contract: accountContract,
         });
       },
       async getAccountNonce(accountContract) {
@@ -158,6 +150,14 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
         );
         return ox__Hex.toBigInt(withValidator);
       },
+      async predictAddress(factoryContract, admin) {
+        return readContract({
+          contract: factoryContract,
+          method:
+            "function getAddress(address owner, bytes salt) returns (address)",
+          params: [admin, saltHex],
+        });
+      },
       async signMessage(options) {
         const { accountContract, factoryContract, adminAccount, message } =
           options;
@@ -168,11 +168,11 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
         }
         return generateSignature({
           accountContract,
-          factoryContract,
           adminAccount,
-          originalMsgHash,
-          defaultValidator,
           createAccount,
+          defaultValidator,
+          factoryContract,
+          originalMsgHash,
         });
       },
       async signTypedData(options) {
@@ -185,11 +185,11 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
         }
         return generateSignature({
           accountContract,
-          factoryContract,
           adminAccount,
-          originalMsgHash,
-          defaultValidator,
           createAccount,
+          defaultValidator,
+          factoryContract,
+          originalMsgHash,
         });
       },
       ...options.overrides,
@@ -224,15 +224,15 @@ async function generateSignature(options: {
 
   const rawSig = await adminAccount.signTypedData({
     domain: {
+      chainId: accountContract.chain.id,
       // TODO (msa) - assumes our default validator here
       name: "DefaultValidator",
-      version: "1",
-      chainId: accountContract.chain.id,
       verifyingContract: defaultValidator,
+      version: "1",
     },
+    message: { message: wrappedMessageHash },
     primaryType: "AccountMessage",
     types: { AccountMessage: [{ name: "message", type: "bytes" }] },
-    message: { message: wrappedMessageHash },
   });
 
   // add the validator address to the signature
@@ -254,11 +254,11 @@ async function generateSignature(options: {
 
   // check if the signature is valid
   const isValid = await verifyHash({
-    hash: originalMsgHash,
-    signature: erc6492Sig,
     address: accountContract.address,
     chain: accountContract.chain,
     client: accountContract.client,
+    hash: originalMsgHash,
+    signature: erc6492Sig,
   });
 
   if (!isValid) {
diff --git a/packages/thirdweb/src/wallets/smart/presets/index.ts b/packages/thirdweb/src/wallets/smart/presets/index.ts
index 57d218c9c11..1dde2dc0688 100644
--- a/packages/thirdweb/src/wallets/smart/presets/index.ts
+++ b/packages/thirdweb/src/wallets/smart/presets/index.ts
@@ -1 +1 @@
-export { erc7579, type ERC7579Config } from "./7579.js";
+export { type ERC7579Config, erc7579 } from "./7579.js";
diff --git a/packages/thirdweb/src/wallets/smart/smart-wallet-dev.test.ts b/packages/thirdweb/src/wallets/smart/smart-wallet-dev.test.ts
index 8733f1330ee..33fcea8c349 100644
--- a/packages/thirdweb/src/wallets/smart/smart-wallet-dev.test.ts
+++ b/packages/thirdweb/src/wallets/smart/smart-wallet-dev.test.ts
@@ -1,7 +1,7 @@
 import { beforeAll, describe, expect, it } from "vitest";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum-sepolia.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { balanceOf } from "../../extensions/erc1155/__generated__/IERC1155/read/balanceOf.js";
 import { claimTo } from "../../extensions/erc1155/drops/write/claimTo.js";
 import { deployPublishedContract } from "../../extensions/prebuilts/deploy-published.js";
@@ -13,6 +13,7 @@ import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { generateAccount } from "../utils/generateAccount.js";
 import { smartWallet } from "./smart-wallet.js";
+
 let wallet: Wallet;
 
 let smartAccount: Account;
@@ -23,9 +24,9 @@ let accountContract: ThirdwebContract;
 const chain = arbitrumSepolia;
 const client = TEST_CLIENT;
 const contract = getContract({
-  client,
-  chain,
   address: "0x6A7a26c9a595E6893C255C9dF0b593e77518e0c3",
+  chain,
+  client,
 });
 describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
   "SmartWallet dev tests",
@@ -72,27 +73,27 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
 
     it("should send a transaction", async () => {
       const tx = prepareTransaction({
-        client,
         chain,
+        client,
         to: smartAccount.address,
         value: 0n,
       });
       const receipt = await sendTransaction({
-        transaction: tx,
         account: smartAccount,
+        transaction: tx,
       });
       expect(receipt.transactionHash).toBeDefined();
     });
 
     it.skip("can execute a tx", async () => {
       const tx = await sendAndConfirmTransaction({
+        account: smartAccount,
         transaction: claimTo({
           contract,
           quantity: 1n,
           to: smartWalletAddress,
           tokenId: 0n,
         }),
-        account: smartAccount,
       });
       expect(tx.transactionHash).toHaveLength(66);
       const isDeployed = await isContractDeployed(accountContract);
@@ -107,21 +108,21 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
 
     it.skip("should deploy a published autofactory contract", async () => {
       const address = await deployPublishedContract({
-        client: TEST_CLIENT,
-        chain,
         account: smartAccount,
+        chain,
+        client: TEST_CLIENT,
         contractId: "DropERC721",
         contractParams: {
-          defaultAdmin: smartAccount.address, // defaultAdmin
-          name: "test", // name
-          symbol: "test", // symbol
-          contractURI: "", // contractURI
-          trustedForwarders: [], // trustedForwarders
-          saleRecipient: smartAccount.address, // saleRecipient
+          contractURI: "", // defaultAdmin
+          defaultAdmin: smartAccount.address, // name
+          name: "test", // symbol
+          platformFeeBps: 0n, // contractURI
+          platformFeeRecipient: smartAccount.address, // trustedForwarders
+          royaltyBps: 0n, // saleRecipient
           royaltyRecipient: smartAccount.address, // royaltyRecipient
-          royaltyBps: 0n, // royaltyBps
-          platformFeeBps: 0n, // platformFeeBps
-          platformFeeRecipient: smartAccount.address, // platformFeeRecipient
+          saleRecipient: smartAccount.address, // royaltyBps
+          symbol: "test", // platformFeeBps
+          trustedForwarders: [], // platformFeeRecipient
         },
       });
       expect(address).toBeDefined();
diff --git a/packages/thirdweb/src/wallets/smart/smart-wallet-integration-v07.test.ts b/packages/thirdweb/src/wallets/smart/smart-wallet-integration-v07.test.ts
index e14f80e9161..4e016408d26 100644
--- a/packages/thirdweb/src/wallets/smart/smart-wallet-integration-v07.test.ts
+++ b/packages/thirdweb/src/wallets/smart/smart-wallet-integration-v07.test.ts
@@ -1,15 +1,14 @@
 import { beforeAll, describe, expect, it } from "vitest";
+import { TEST_WALLET_A } from "~test/addresses.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { typedData } from "../../../test/src/typed-data.js";
-import { verifySignature } from "../../auth/verify-signature.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
-import { parseEventLogs } from "../../event/actions/parse-logs.js";
-
-import { TEST_WALLET_A } from "~test/addresses.js";
 import { verifyEip1271Signature } from "../../auth/verify-hash.js";
+import { verifySignature } from "../../auth/verify-signature.js";
 import { verifyTypedData } from "../../auth/verify-typed-data.js";
 import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum-sepolia.js";
 import { baseSepolia } from "../../chains/chain-definitions/base-sepolia.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
+import { parseEventLogs } from "../../event/actions/parse-logs.js";
 import {
   addAdmin,
   adminUpdatedEvent,
@@ -45,9 +44,9 @@ let accountContract: ThirdwebContract;
 const chain = arbitrumSepolia;
 const client = TEST_CLIENT;
 const contract = getContract({
-  client,
-  chain,
   address: "0x6A7a26c9a595E6893C255C9dF0b593e77518e0c3",
+  chain,
+  client,
 });
 
 describe.runIf(process.env.TW_SECRET_KEY).sequential(
@@ -63,8 +62,8 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
       wallet = smartWallet({
         chain,
-        gasless: true,
         factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
+        gasless: true,
       });
       smartAccount = await wallet.connect({
         client: TEST_CLIENT,
@@ -81,9 +80,9 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
     it("can connect", async () => {
       expect(smartWalletAddress).toHaveLength(42);
       const predictedAddress = await predictSmartAccountAddress({
-        client,
-        chain,
         adminAddress: personalAccount.address,
+        chain,
+        client,
         factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
       });
       expect(predictedAddress).toEqual(smartWalletAddress);
@@ -91,6 +90,13 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can estimate gas cost", async () => {
       const gasCost = await estimateUserOpGasCost({
+        adminAccount: personalAccount,
+        client: TEST_CLIENT,
+        smartWalletOptions: {
+          chain,
+          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
+          sponsorGas: true,
+        },
         transactions: [
           claimTo({
             contract,
@@ -99,13 +105,6 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
             tokenId: 0n,
           }),
         ],
-        adminAccount: personalAccount,
-        client: TEST_CLIENT,
-        smartWalletOptions: {
-          chain,
-          sponsorGas: true,
-          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
-        },
       });
       expect(gasCost.ether).not.toBe("0");
     });
@@ -115,21 +114,21 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
         message: "hello world",
       });
       const isValid = await verifySignature({
-        message: "hello world",
-        signature,
         address: smartWalletAddress,
         chain,
         client,
+        message: "hello world",
+        signature,
       });
       expect(isValid).toEqual(true);
     });
 
     it("should use ERC-1271 signatures after deployment", async () => {
       await deploySmartAccount({
+        accountContract,
         chain,
         client,
         smartAccount,
-        accountContract,
       });
       await new Promise((resolve) => setTimeout(resolve, 3000)); // pause for a second to prevent race condition
 
@@ -140,9 +139,9 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
 
       const isValid = await verifyEip1271Signature({
+        contract: accountContract,
         hash: hashMessage("hello world"),
         signature,
-        contract: accountContract,
       });
       expect(isValid).toEqual(true);
     });
@@ -150,10 +149,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
     it("can sign typed data", async () => {
       const signature = await smartAccount.signTypedData(typedData.basic);
       const isValid = await verifyTypedData({
-        signature,
         address: smartWalletAddress,
         chain,
         client,
+        signature,
         ...typedData.basic,
       });
       expect(isValid).toEqual(true);
@@ -161,10 +160,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("should use ERC-1271 typed data signatures after deployment", async () => {
       await deploySmartAccount({
+        accountContract,
         chain,
         client,
         smartAccount,
-        accountContract,
       });
 
       await new Promise((resolve) => setTimeout(resolve, 1000)); // pause for a second to prevent race condition
@@ -173,34 +172,34 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
       const messageHash = hashTypedData(typedData.basic);
       const isValid = await verifyEip1271Signature({
-        signature,
-        hash: messageHash,
         contract: accountContract,
+        hash: messageHash,
+        signature,
       });
       expect(isValid).toEqual(true);
     });
 
     it("can send a transaction on another chain", async () => {
       const tx = await sendAndConfirmTransaction({
+        // biome-ignore lint/style/noNonNullAssertion: Just trust me
+        account: wallet.getAccount()!,
         transaction: prepareTransaction({
-          to: TEST_WALLET_A,
-          client: TEST_CLIENT,
           chain: baseSepolia,
+          client: TEST_CLIENT,
+          to: TEST_WALLET_A,
           value: 0n,
         }),
-        // biome-ignore lint/style/noNonNullAssertion: Just trust me
-        account: wallet.getAccount()!,
       });
       expect(tx.transactionHash).toHaveLength(66);
     });
 
     it("should revert on unsuccessful transactions", async () => {
       const tx = sendAndConfirmTransaction({
+        account: smartAccount,
         transaction: setContractURI({
           contract,
           uri: "https://example.com",
         }),
-        account: smartAccount,
       });
 
       await expect(tx).rejects.toMatchInlineSnapshot(`
@@ -213,13 +212,13 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can execute a tx", async () => {
       const tx = await sendAndConfirmTransaction({
+        account: smartAccount,
         transaction: claimTo({
           contract,
           quantity: 1n,
           to: smartWalletAddress,
           tokenId: 0n,
         }),
-        account: smartAccount,
       });
       expect(tx.transactionHash).toHaveLength(66);
       await confirmContractDeployment({ accountContract });
@@ -247,9 +246,9 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
       expect(tx.transactionHash).toHaveLength(66);
       const result = await waitForReceipt({
+        chain,
         client,
         transactionHash: tx.transactionHash,
-        chain,
       });
       expect(result.status).toEqual("success");
     });
@@ -258,11 +257,11 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       const message = "hello world";
       const signature = await smartAccount.signMessage({ message });
       const isValidV1 = await verifySignature({
-        message,
-        signature,
         address: smartWalletAddress,
         chain,
         client,
+        message,
+        signature,
       });
       expect(isValidV1).toEqual(true);
 
@@ -272,10 +271,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
         primaryType: "Mail",
       });
       const isValidV2 = await verifyTypedData({
-        signature: signatureTyped,
         address: smartWalletAddress,
         chain,
         client,
+        signature: signatureTyped,
         ...typedData.basic,
       });
       expect(isValidV2).toEqual(true);
@@ -305,8 +304,8 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
     it("can execute a 2 tx in parallel", async () => {
       const newSmartWallet = smartWallet({
         chain,
-        gasless: true,
         factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
+        gasless: true,
         overrides: {
           accountSalt: "test",
         },
@@ -326,38 +325,38 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       // sending transactions in parallel should deploy the account and not cause errors
       const txs = await Promise.all([
         sendAndConfirmTransaction({
+          account: newSmartAccount,
           transaction: claimTo({
             contract,
             quantity: 1n,
             to: newSmartAccount.address,
             tokenId: 0n,
           }),
-          account: newSmartAccount,
         }),
         sleep(1000).then(() =>
           sendAndConfirmTransaction({
+            account: newSmartAccount,
             transaction: claimTo({
               contract,
               quantity: 1n,
               to: newSmartAccount.address,
               tokenId: 0n,
             }),
-            account: newSmartAccount,
           }),
         ),
       ]);
       expect(txs.length).toEqual(2);
       expect(txs.every((t) => t.transactionHash.length === 66)).toBe(true);
       const result1 = await waitForReceipt({
+        chain,
         client,
         transactionHash: txs[0].transactionHash,
-        chain,
       });
       expect(result1.status).toEqual("success");
       const result2 = await waitForReceipt({
+        chain,
         client,
         transactionHash: txs[1].transactionHash,
-        chain,
       });
       expect(result2.status).toEqual("success");
 
@@ -367,20 +366,20 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can prep a 0.7 userop", async () => {
       const tx = prepareTransaction({
-        client,
         chain,
+        client,
         to: smartAccount.address,
         value: 0n,
       });
       const uo = await createAndSignUserOp({
-        transactions: [tx],
         adminAccount: personalAccount,
         client: TEST_CLIENT,
         smartWalletOptions: {
           chain,
-          sponsorGas: true,
           factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
+          sponsorGas: true,
         },
+        transactions: [tx],
       });
       expect(uo.callData.length).toBeGreaterThan(0);
     });
diff --git a/packages/thirdweb/src/wallets/smart/smart-wallet-integration.test.ts b/packages/thirdweb/src/wallets/smart/smart-wallet-integration.test.ts
index f395fa89770..7f92405b4ef 100644
--- a/packages/thirdweb/src/wallets/smart/smart-wallet-integration.test.ts
+++ b/packages/thirdweb/src/wallets/smart/smart-wallet-integration.test.ts
@@ -6,7 +6,7 @@ import { verifyEip1271Signature } from "../../auth/verify-hash.js";
 import { verifySignature } from "../../auth/verify-signature.js";
 import { verifyTypedData } from "../../auth/verify-typed-data.js";
 import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum-sepolia.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { parseEventLogs } from "../../event/actions/parse-logs.js";
 import { baseSepolia } from "../../exports/chains.js";
 import {
@@ -43,9 +43,9 @@ let accountContract: ThirdwebContract;
 const chain = arbitrumSepolia;
 const client = TEST_CLIENT;
 const contract = getContract({
-  client,
-  chain,
   address: "0x6A7a26c9a595E6893C255C9dF0b593e77518e0c3",
+  chain,
+  client,
 });
 const factoryAddress = "0x564cf6453a1b0FF8DB603E92EA4BbD410dea45F3"; // pre 712
 
@@ -78,6 +78,12 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can estimate gas cost", async () => {
       const gasCost = await estimateUserOpGasCost({
+        adminAccount: personalAccount,
+        client: TEST_CLIENT,
+        smartWalletOptions: {
+          chain,
+          sponsorGas: true,
+        },
         transactions: [
           claimTo({
             contract,
@@ -86,12 +92,6 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
             tokenId: 0n,
           }),
         ],
-        adminAccount: personalAccount,
-        client: TEST_CLIENT,
-        smartWalletOptions: {
-          chain,
-          sponsorGas: true,
-        },
       });
       expect(gasCost.ether).not.toBe("0");
     });
@@ -99,9 +99,9 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
     it("can connect", async () => {
       expect(smartWalletAddress).toHaveLength(42);
       const predictedAddress = await predictSmartAccountAddress({
-        client,
-        chain,
         adminAddress: personalAccount.address,
+        chain,
+        client,
       });
       expect(predictedAddress).toEqual(smartWalletAddress);
     });
@@ -111,21 +111,21 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
         message: "hello world",
       });
       const isValid = await verifySignature({
-        message: "hello world",
-        signature,
         address: smartWalletAddress,
         chain,
         client,
+        message: "hello world",
+        signature,
       });
       expect(isValid).toEqual(true);
     });
 
     it("should use ERC-1271 signatures after deployment", async () => {
       await deploySmartAccount({
+        accountContract,
         chain,
         client,
         smartAccount,
-        accountContract,
       });
       await new Promise((resolve) => setTimeout(resolve, 1000)); // pause for a second to prevent race condition
 
@@ -134,9 +134,9 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
 
       const isValid = await verifyEip1271Signature({
+        contract: accountContract,
         hash: hashMessage("hello world"),
         signature,
-        contract: accountContract,
       });
       expect(isValid).toEqual(true);
     });
@@ -144,10 +144,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
     it("can sign typed data", async () => {
       const signature = await smartAccount.signTypedData(typedData.basic);
       const isValid = await verifyTypedData({
-        signature,
         address: smartWalletAddress,
         chain,
         client,
+        signature,
         ...typedData.basic,
       });
       expect(isValid).toEqual(true);
@@ -155,10 +155,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("should use ERC-1271 typed data signatures after deployment", async () => {
       await deploySmartAccount({
+        accountContract,
         chain,
         client,
         smartAccount,
-        accountContract,
       });
 
       await new Promise((resolve) => setTimeout(resolve, 1000)); // pause for a second to prevent race condition
@@ -167,20 +167,20 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
       const messageHash = hashTypedData(typedData.basic);
       const isValid = await verifyEip1271Signature({
-        signature,
-        hash: messageHash,
         contract: accountContract,
+        hash: messageHash,
+        signature,
       });
       expect(isValid).toEqual(true);
     });
 
     it("should revert on unsuccessful transactions", async () => {
       const tx = sendAndConfirmTransaction({
+        account: smartAccount,
         transaction: setContractURI({
           contract,
           uri: "https://example.com",
         }),
-        account: smartAccount,
       });
 
       await expect(tx).rejects.toMatchInlineSnapshot(`
@@ -193,13 +193,13 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can execute a tx", async () => {
       const tx = await sendAndConfirmTransaction({
+        account: smartAccount,
         transaction: claimTo({
           contract,
           quantity: 1n,
           to: smartWalletAddress,
           tokenId: 0n,
         }),
-        account: smartAccount,
       });
       expect(tx.transactionHash).toHaveLength(66);
       await sleep(1000);
@@ -215,13 +215,13 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can estimate a tx", async () => {
       const estimates = await estimateGasCost({
+        account: smartAccount,
         transaction: claimTo({
           contract,
           quantity: 1n,
           to: smartWalletAddress,
           tokenId: 0n,
         }),
-        account: smartAccount,
       });
       expect(estimates.wei.toString()).not.toBe("0");
     });
@@ -246,9 +246,9 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
       expect(tx.transactionHash).toHaveLength(66);
       const result = await waitForReceipt({
+        chain,
         client,
         transactionHash: tx.transactionHash,
-        chain,
       });
       expect(result.status).toEqual("success");
     });
@@ -257,11 +257,11 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       const message = "hello world";
       const signature = await smartAccount.signMessage({ message });
       const isValidV1 = await verifySignature({
-        message,
-        signature,
         address: smartWalletAddress,
         chain,
         client,
+        message,
+        signature,
       });
       expect(isValidV1).toEqual(true);
 
@@ -271,10 +271,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
         primaryType: "Mail",
       });
       const isValidV2 = await verifyTypedData({
-        signature: signatureTyped,
         address: smartWalletAddress,
         chain,
         client,
+        signature: signatureTyped,
         ...typedData.basic,
       });
       expect(isValidV2).toEqual(true);
@@ -319,11 +319,11 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       const message = "hello world";
       const signature = await newAccount.signMessage({ message });
       const isValidV1 = await verifySignature({
-        message,
-        signature,
         address: newAccount.address,
         chain,
         client,
+        message,
+        signature,
       });
       expect(isValidV1).toEqual(true);
 
@@ -333,10 +333,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
         primaryType: "Mail",
       });
       const isValidV2 = await verifyTypedData({
-        signature: signatureTyped,
         address: newAccount.address,
         chain,
         client,
+        signature: signatureTyped,
         ...typedData.basic,
       });
       expect(isValidV2).toEqual(true);
@@ -381,14 +381,14 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can send a transaction on another chain", async () => {
       const tx = await sendAndConfirmTransaction({
+        // biome-ignore lint/style/noNonNullAssertion: Just trust me
+        account: wallet.getAccount()!,
         transaction: prepareTransaction({
-          to: TEST_WALLET_A,
-          client: TEST_CLIENT,
           chain: baseSepolia,
+          client: TEST_CLIENT,
+          to: TEST_WALLET_A,
           value: 0n,
         }),
-        // biome-ignore lint/style/noNonNullAssertion: Just trust me
-        account: wallet.getAccount()!,
       });
       expect(tx.transactionHash).toHaveLength(66);
     });
@@ -416,23 +416,23 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       // sending transactions in parallel should deploy the account and not cause errors
       const txs = await Promise.all([
         sendAndConfirmTransaction({
+          account: newSmartAccount,
           transaction: claimTo({
             contract,
             quantity: 1n,
             to: newSmartAccount.address,
             tokenId: 0n,
           }),
-          account: newSmartAccount,
         }),
         sleep(1000).then(() =>
           sendAndConfirmTransaction({
+            account: newSmartAccount,
             transaction: claimTo({
               contract,
               quantity: 1n,
               to: newSmartAccount.address,
               tokenId: 0n,
             }),
-            account: newSmartAccount,
           }),
         ),
       ]);
@@ -469,14 +469,14 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
         personalAccount,
       });
       const transaction = prepareTransaction({
-        client: TEST_CLIENT,
         chain,
+        client: TEST_CLIENT,
         value: 0n,
       });
       await expect(
         sendTransaction({
-          transaction,
           account: newSmartAccount,
+          transaction,
         }),
       ).rejects.toThrowError(/AA21 didn't pay prefund/);
     });
diff --git a/packages/thirdweb/src/wallets/smart/smart-wallet-modular.test.ts b/packages/thirdweb/src/wallets/smart/smart-wallet-modular.test.ts
index c6ff4fadf80..934eff82f1e 100644
--- a/packages/thirdweb/src/wallets/smart/smart-wallet-modular.test.ts
+++ b/packages/thirdweb/src/wallets/smart/smart-wallet-modular.test.ts
@@ -5,7 +5,7 @@ import { typedData } from "../../../test/src/typed-data.js";
 import { verifySignature } from "../../auth/verify-signature.js";
 import { verifyTypedData } from "../../auth/verify-typed-data.js";
 import { baseSepolia } from "../../chains/chain-definitions/base-sepolia.js";
-import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getContract, type ThirdwebContract } from "../../contract/contract.js";
 import { sendBatchTransaction } from "../../transaction/actions/send-batch-transaction.js";
 import { sendTransaction } from "../../transaction/actions/send-transaction.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
@@ -42,8 +42,8 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       wallet = smartWallet(
         Config.erc7579({
           chain,
-          sponsorGas: true,
           factoryAddress: DEFAULT_FACTORY_ADDRESS,
+          sponsorGas: true,
           validatorAddress: DEFAULT_VALIDATOR_ADDRESS,
         }),
       );
@@ -68,11 +68,11 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
         message: "hello world",
       });
       const isValid = await verifySignature({
-        message: "hello world",
-        signature,
         address: smartWalletAddress,
         chain,
         client,
+        message: "hello world",
+        signature,
       });
       expect(isValid).toEqual(true);
     });
@@ -80,10 +80,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
     it("can sign typed data", async () => {
       const signature = await smartAccount.signTypedData(typedData.basic);
       const isValid = await verifyTypedData({
-        signature,
         address: smartWalletAddress,
         chain,
         client,
+        signature,
         ...typedData.basic,
       });
       expect(isValid).toEqual(true);
@@ -91,15 +91,15 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("should send a transaction", async () => {
       const tx = prepareTransaction({
-        client,
         chain,
+        client,
         to: smartAccount.address,
         value: 0n,
       });
 
       const receipt = await sendTransaction({
-        transaction: tx,
         account: smartAccount,
+        transaction: tx,
       });
       expect(receipt.transactionHash).toBeDefined();
 
@@ -110,22 +110,22 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("should send a batch transaction", async () => {
       const tx = prepareTransaction({
-        client,
         chain,
+        client,
         to: smartAccount.address,
         value: 0n,
       });
 
       const tx2 = prepareTransaction({
-        client,
         chain,
+        client,
         to: TEST_ACCOUNT_A.address,
         value: 0n,
       });
 
       const receipt = await sendBatchTransaction({
-        transactions: [tx, tx2],
         account: smartAccount,
+        transactions: [tx, tx2],
       });
       expect(receipt.transactionHash).toBeDefined();
     });
diff --git a/packages/thirdweb/src/wallets/smart/smart-wallet-tokenpaymaster.test.ts b/packages/thirdweb/src/wallets/smart/smart-wallet-tokenpaymaster.test.ts
index 1ae1c23f126..adcb655bf03 100644
--- a/packages/thirdweb/src/wallets/smart/smart-wallet-tokenpaymaster.test.ts
+++ b/packages/thirdweb/src/wallets/smart/smart-wallet-tokenpaymaster.test.ts
@@ -38,14 +38,14 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         personalAccount,
       });
       const tx = prepareTransaction({
-        client,
         chain,
+        client,
         to: smartAccount.address,
         value: 0n,
       });
       const receipt = await sendTransaction({
-        transaction: tx,
         account: smartAccount,
+        transaction: tx,
       });
       expect(receipt.transactionHash).toBeDefined();
     });
@@ -70,14 +70,14 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         personalAccount,
       });
       const tx = prepareTransaction({
-        client,
         chain,
+        client,
         to: smartAccount.address,
         value: 0n,
       });
       const receipt = await sendTransaction({
-        transaction: tx,
         account: smartAccount,
+        transaction: tx,
       });
       expect(receipt.transactionHash).toBeDefined();
     });
@@ -102,14 +102,14 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         personalAccount,
       });
       const tx = prepareTransaction({
-        client,
         chain,
+        client,
         to: smartAccount.address,
         value: 0n,
       });
       const receipt = await sendTransaction({
-        transaction: tx,
         account: smartAccount,
+        transaction: tx,
       });
       expect(receipt.transactionHash).toBeDefined();
     });
diff --git a/packages/thirdweb/src/wallets/smart/smart-wallet-zksync.test.ts b/packages/thirdweb/src/wallets/smart/smart-wallet-zksync.test.ts
index 5b12c9d9d5d..d7c524228bd 100644
--- a/packages/thirdweb/src/wallets/smart/smart-wallet-zksync.test.ts
+++ b/packages/thirdweb/src/wallets/smart/smart-wallet-zksync.test.ts
@@ -53,25 +53,25 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
 
     it("should send a transactions", async () => {
       const tx = await sendAndConfirmTransaction({
+        account: smartAccount,
         transaction: claimTo({
           contract,
           quantity: 1n,
           to: smartWalletAddress,
           tokenId: 0n,
         }),
-        account: smartAccount,
       });
       expect(tx.transactionHash.length).toBe(66);
     });
 
     it("should send dummy a transactions", async () => {
       const tx = await sendAndConfirmTransaction({
+        account: smartAccount,
         transaction: prepareTransaction({
           chain,
           client,
           to: "0x611e71B12a2B1C0c884574042414Fe360aF0C5A7",
         }),
-        account: smartAccount,
       });
       expect(tx.transactionHash.length).toBe(66);
     });
@@ -90,13 +90,13 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
       const preparedTx = prepareTransaction({
         chain: defineChain(302),
         client: client,
+        data: "0x",
         to: zkCandySmartWalletAddress,
         value: BigInt(0),
-        data: "0x",
       });
       const tx = await sendTransaction({
-        transaction: preparedTx,
         account: zkCandySmartAccount,
+        transaction: preparedTx,
       });
       expect(tx.transactionHash.length).toBe(66);
     });
@@ -111,6 +111,7 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
         personalAccount,
       });
       const tx = await sendTransaction({
+        account: account,
         transaction: claimTo({
           contract: getContract({
             address: "0x8A24a7Df38fA5fCCcFD1259e90Fb6996fDdfcADa", // edition drop
@@ -121,7 +122,6 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
           to: account.address,
           tokenId: 0n,
         }),
-        account: account,
       });
       expect(tx.transactionHash.length).toBe(66);
     });
@@ -136,14 +136,14 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
         personalAccount,
       });
       const tx = await sendTransaction({
+        account: account,
         transaction: prepareTransaction({
           chain: defineChain(4654),
           client: TEST_CLIENT,
+          data: "0x",
           to: account.address,
           value: BigInt(0),
-          data: "0x",
         }),
-        account: account,
       });
       expect(tx.transactionHash.length).toBe(66);
     });
@@ -158,14 +158,14 @@ describe.runIf(process.env.TW_SECRET_KEY).todo(
         personalAccount,
       });
       const tx = await sendTransaction({
+        account: account,
         transaction: prepareTransaction({
           chain: defineChain(978658),
           client: TEST_CLIENT,
+          data: "0x",
           to: account.address,
           value: BigInt(0),
-          data: "0x",
         }),
-        account: account,
       });
       expect(tx.transactionHash.length).toBe(66);
     });
diff --git a/packages/thirdweb/src/wallets/smart/smart-wallet.ts b/packages/thirdweb/src/wallets/smart/smart-wallet.ts
index 66debc7daea..2faf124d494 100644
--- a/packages/thirdweb/src/wallets/smart/smart-wallet.ts
+++ b/packages/thirdweb/src/wallets/smart/smart-wallet.ts
@@ -132,25 +132,12 @@ export function smartWallet(
   createOptions: SmartWalletOptions,
 ): Wallet<"smart"> {
   const emitter = createWalletEmitter<"smart">();
-  let account: Account | undefined = undefined;
-  let adminAccount: Account | undefined = undefined;
-  let chain: Chain | undefined = undefined;
+  let account: Account | undefined;
+  let adminAccount: Account | undefined;
+  let chain: Chain | undefined;
   let lastConnectOptions: WalletConnectionOption<"smart"> | undefined;
 
   return {
-    id: "smart",
-    subscribe: emitter.subscribe,
-    getChain() {
-      if (!chain) {
-        return undefined;
-      }
-
-      chain = getCachedChainIfExists(chain.id) || chain;
-      return chain;
-    },
-    getConfig: () => createOptions,
-    getAccount: () => account,
-    getAdminAccount: () => adminAccount,
     autoConnect: async (options) => {
       const { connectSmartAccount: connectSmartWallet } = await import(
         "./index.js"
@@ -164,10 +151,10 @@ export function smartWallet(
       account = connectedAccount;
       chain = connectedChain;
       trackConnect({
+        chainId: chain.id,
         client: options.client,
-        walletType: "smart",
         walletAddress: account.address,
-        chainId: chain.id,
+        walletType: "smart",
       });
       // return account
       return account;
@@ -184,10 +171,10 @@ export function smartWallet(
       account = connectedAccount;
       chain = connectedChain;
       trackConnect({
+        chainId: chain.id,
         client: options.client,
-        walletType: "smart",
         walletAddress: account.address,
-        chainId: chain.id,
+        walletType: "smart",
       });
       // return account
       emitter.emit("accountChanged", account);
@@ -203,6 +190,19 @@ export function smartWallet(
       chain = undefined;
       emitter.emit("disconnect", undefined);
     },
+    getAccount: () => account,
+    getAdminAccount: () => adminAccount,
+    getChain() {
+      if (!chain) {
+        return undefined;
+      }
+
+      chain = getCachedChainIfExists(chain.id) || chain;
+      return chain;
+    },
+    getConfig: () => createOptions,
+    id: "smart",
+    subscribe: emitter.subscribe,
     switchChain: async (newChain: Chain) => {
       if (!lastConnectOptions) {
         throw new Error("Cannot switch chain without a previous connection");
diff --git a/packages/thirdweb/src/wallets/smart/types.ts b/packages/thirdweb/src/wallets/smart/types.ts
index 78498a07987..b8845464175 100644
--- a/packages/thirdweb/src/wallets/smart/types.ts
+++ b/packages/thirdweb/src/wallets/smart/types.ts
@@ -242,7 +242,6 @@ export function formatUserOperationReceipt(
 
   const receipt = {
     ...transactionReceipt,
-    transactionHash: transactionReceipt.transactionHash,
     blockNumber: transactionReceipt.blockNumber
       ? BigInt(transactionReceipt.blockNumber)
       : null,
@@ -259,9 +258,10 @@ export function formatUserOperationReceipt(
       ? BigInt(transactionReceipt.gasUsed)
       : null,
     logs: transactionReceipt.logs,
+    status: transactionReceipt.status,
     to: transactionReceipt.to ? transactionReceipt.to : null,
+    transactionHash: transactionReceipt.transactionHash,
     transactionIndex: transactionReceipt.transactionIndex,
-    status: transactionReceipt.status,
     type: transactionReceipt.type,
   } as TransactionReceipt;
 
@@ -272,11 +272,11 @@ export function formatUserOperationReceipt(
 
   const userOpReceipt = {
     ...userOpReceiptRaw,
-    receipt,
-    userOpHash: userOpReceiptRaw.userOpHash,
     actualGasCost: BigInt(userOpReceiptRaw.actualGasCost),
     actualGasUsed: BigInt(userOpReceiptRaw.actualGasUsed),
     nonce: BigInt(userOpReceiptRaw.nonce),
+    receipt,
+    userOpHash: userOpReceiptRaw.userOpHash,
   } as UserOperationReceipt;
   return userOpReceipt;
 }
diff --git a/packages/thirdweb/src/wallets/utils/chains.ts b/packages/thirdweb/src/wallets/utils/chains.ts
index 1dde3b9fb6b..334ef45a6b4 100644
--- a/packages/thirdweb/src/wallets/utils/chains.ts
+++ b/packages/thirdweb/src/wallets/utils/chains.ts
@@ -45,9 +45,11 @@ function getValidChainRPCs(
     }
 
     // Replace API_KEY placeholder with value
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: this is valid
     if (rpc.includes("${THIRDWEB_API_KEY}")) {
       if (clientId) {
         processedRPCs.push(
+          // biome-ignore lint/suspicious/noTemplateCurlyInString: this is what the string to replace looks like in this case
           rpc.replace("${THIRDWEB_API_KEY}", clientId) +
             (typeof globalThis !== "undefined" && "APP_BUNDLE_ID" in globalThis
               ? // @ts-expect-error
@@ -58,6 +60,7 @@ function getValidChainRPCs(
         // if no client id, let it through with empty string
         // if secretKey is present, it will be used in header
         // if none are passed, will have reduced access
+        // biome-ignore lint/suspicious/noTemplateCurlyInString: this is what the string to replace looks like in this case
         processedRPCs.push(rpc.replace("${THIRDWEB_API_KEY}", ""));
       }
     }
diff --git a/packages/thirdweb/src/wallets/utils/defaultDappMetadata.ts b/packages/thirdweb/src/wallets/utils/defaultDappMetadata.ts
index cec54a42e55..a5685bb7223 100644
--- a/packages/thirdweb/src/wallets/utils/defaultDappMetadata.ts
+++ b/packages/thirdweb/src/wallets/utils/defaultDappMetadata.ts
@@ -7,10 +7,10 @@ import type { AppMetadata } from "../types.js";
 export function getDefaultAppMetadata(): Required<AppMetadata> {
   if (!isBrowser()) {
     return {
-      name: "thirdweb powered dApp",
-      url: "https://thirdweb.com",
       description: "thirdweb powered dApp",
       logoUrl: "https://thirdweb.com/favicon.ico",
+      name: "thirdweb powered dApp",
+      url: "https://thirdweb.com",
     };
   }
 
@@ -25,9 +25,9 @@ export function getDefaultAppMetadata(): Required<AppMetadata> {
   const logoUrl = `${baseUrl}/favicon.ico`;
 
   return {
-    name: window.document.title || "thirdweb powered dApp",
-    url: baseUrl,
     description: window.document.title || "thirdweb powered dApp",
     logoUrl,
+    name: window.document.title || "thirdweb powered dApp",
+    url: baseUrl,
   };
 }
diff --git a/packages/thirdweb/src/wallets/utils/generateAccount.ts b/packages/thirdweb/src/wallets/utils/generateAccount.ts
index 467a1f88003..5385bf68feb 100644
--- a/packages/thirdweb/src/wallets/utils/generateAccount.ts
+++ b/packages/thirdweb/src/wallets/utils/generateAccount.ts
@@ -24,5 +24,5 @@ export async function generateAccount(
   options: GenerateAccountOptions,
 ): Promise<Account> {
   const privateKey = toHex(secp256k1.utils.randomPrivateKey());
-  return privateKeyToAccount({ privateKey, client: options.client });
+  return privateKeyToAccount({ client: options.client, privateKey });
 }
diff --git a/packages/thirdweb/src/wallets/utils/getDefaultAppMetadata_node.test.ts b/packages/thirdweb/src/wallets/utils/getDefaultAppMetadata_node.test.ts
index 641341e28a3..c1d7a82a96c 100644
--- a/packages/thirdweb/src/wallets/utils/getDefaultAppMetadata_node.test.ts
+++ b/packages/thirdweb/src/wallets/utils/getDefaultAppMetadata_node.test.ts
@@ -4,10 +4,10 @@ import { getDefaultAppMetadata } from "./defaultDappMetadata.js";
 describe("getDefaultAppMetadata: node environment", () => {
   it("should return the default value in non-browser env", () => {
     expect(getDefaultAppMetadata()).toEqual({
-      name: "thirdweb powered dApp",
-      url: "https://thirdweb.com",
       description: "thirdweb powered dApp",
       logoUrl: "https://thirdweb.com/favicon.ico",
+      name: "thirdweb powered dApp",
+      url: "https://thirdweb.com",
     });
   });
 });
diff --git a/packages/thirdweb/src/wallets/utils/getTokenBalance.test.ts b/packages/thirdweb/src/wallets/utils/getTokenBalance.test.ts
index b229d984e88..e8f8c4cce19 100644
--- a/packages/thirdweb/src/wallets/utils/getTokenBalance.test.ts
+++ b/packages/thirdweb/src/wallets/utils/getTokenBalance.test.ts
@@ -15,8 +15,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("getTokenBalance", () => {
   it("should work for native token", async () => {
     const result = await getTokenBalance({
       account,
-      client: TEST_CLIENT,
       chain: FORKED_ETHEREUM_CHAIN,
+      client: TEST_CLIENT,
     });
 
     expect(result).toStrictEqual({
@@ -30,40 +30,40 @@ describe.runIf(process.env.TW_SECRET_KEY)("getTokenBalance", () => {
 
   it("should work for ERC20 token", async () => {
     const erc20Address = await deployERC20Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account,
-      type: "TokenERC20",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "TokenERC20",
     });
     const erc20Contract = getContract({
+      address: erc20Address,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      address: erc20Address,
     });
 
     const amount = 1000;
 
     // Mint some tokens
     const tx = mintTo({
+      amount,
       contract: erc20Contract,
       to: account.address,
-      amount,
     });
 
     await sendAndConfirmTransaction({
-      transaction: tx,
       account,
+      transaction: tx,
     });
 
     const result = await getTokenBalance({
-      client: TEST_CLIENT,
       account,
-      tokenAddress: erc20Address,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
+      tokenAddress: erc20Address,
     });
 
     const expectedDecimal = 18;
diff --git a/packages/thirdweb/src/wallets/utils/getTokenBalance.ts b/packages/thirdweb/src/wallets/utils/getTokenBalance.ts
index af18e303532..b2fd482e410 100644
--- a/packages/thirdweb/src/wallets/utils/getTokenBalance.ts
+++ b/packages/thirdweb/src/wallets/utils/getTokenBalance.ts
@@ -50,12 +50,12 @@ export async function getTokenBalance(
       "../../extensions/erc20/read/getBalance.js"
     );
     return getBalance({
-      contract: getContract({ client, chain, address: tokenAddress }),
       address: account.address,
+      contract: getContract({ address: tokenAddress, chain, client }),
     });
   }
   // native token case
-  const rpcRequest = getRpcClient({ client, chain });
+  const rpcRequest = getRpcClient({ chain, client });
 
   const [nativeSymbol, nativeDecimals, nativeName, nativeBalance] =
     await Promise.all([
@@ -66,10 +66,10 @@ export async function getTokenBalance(
     ]);
 
   return {
-    value: nativeBalance,
     decimals: nativeDecimals,
     displayValue: toTokens(nativeBalance, nativeDecimals),
-    symbol: nativeSymbol,
     name: nativeName,
+    symbol: nativeSymbol,
+    value: nativeBalance,
   };
 }
diff --git a/packages/thirdweb/src/wallets/utils/getWalletBalance.test.ts b/packages/thirdweb/src/wallets/utils/getWalletBalance.test.ts
index 45f84ce1cba..66e47b64341 100644
--- a/packages/thirdweb/src/wallets/utils/getWalletBalance.test.ts
+++ b/packages/thirdweb/src/wallets/utils/getWalletBalance.test.ts
@@ -12,39 +12,39 @@ import { getWalletBalance } from "./getWalletBalance.js";
 describe.runIf(process.env.TW_SECRET_KEY)("getWalletBalance", () => {
   it("should work for erc20 token", async () => {
     const erc20Address = await deployERC20Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
-      type: "TokenERC20",
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       params: {
-        name: "",
         contractURI: TEST_CONTRACT_URI,
+        name: "",
       },
+      type: "TokenERC20",
     });
     const erc20Contract = getContract({
+      address: erc20Address,
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      address: erc20Address,
     });
 
     const amount = 1000;
 
     // Mint some tokens
     const tx = mintTo({
+      amount,
       contract: erc20Contract,
       to: TEST_ACCOUNT_A.address,
-      amount,
     });
 
     await sendAndConfirmTransaction({
-      transaction: tx,
       account: TEST_ACCOUNT_A,
+      transaction: tx,
     });
 
     const result = await getWalletBalance({
       address: TEST_ACCOUNT_A.address,
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
       tokenAddress: erc20Address,
     });
     const expectedDecimal = 18;
@@ -59,8 +59,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("getWalletBalance", () => {
   it("should work for native currency", async () => {
     const result = await getWalletBalance({
       address: TEST_ACCOUNT_A.address,
-      client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
     });
     expect(result).toBeDefined();
     expect(result.decimals).toBe(18);
diff --git a/packages/thirdweb/src/wallets/utils/getWalletBalance.ts b/packages/thirdweb/src/wallets/utils/getWalletBalance.ts
index 632b9126c4d..249aabf4fa4 100644
--- a/packages/thirdweb/src/wallets/utils/getWalletBalance.ts
+++ b/packages/thirdweb/src/wallets/utils/getWalletBalance.ts
@@ -50,12 +50,12 @@ export async function getWalletBalance(
       "../../extensions/erc20/read/getBalance.js"
     );
     return getBalance({
-      contract: getContract({ client, chain, address: tokenAddress }),
       address,
+      contract: getContract({ address: tokenAddress, chain, client }),
     });
   }
   // native token case
-  const rpcRequest = getRpcClient({ client, chain });
+  const rpcRequest = getRpcClient({ chain, client });
 
   const [nativeSymbol, nativeDecimals, nativeName, nativeBalance] =
     await Promise.all([
@@ -66,12 +66,12 @@ export async function getWalletBalance(
     ]);
 
   return {
-    value: nativeBalance,
+    chainId: chain.id,
     decimals: nativeDecimals,
     displayValue: toTokens(nativeBalance, nativeDecimals),
-    symbol: nativeSymbol,
     name: nativeName,
+    symbol: nativeSymbol,
     tokenAddress: tokenAddress ?? NATIVE_TOKEN_ADDRESS,
-    chainId: chain.id,
+    value: nativeBalance,
   };
 }
diff --git a/packages/thirdweb/src/wallets/wallet-connect/controller.ts b/packages/thirdweb/src/wallets/wallet-connect/controller.ts
index 07ffe1dba4d..5b279379228 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/controller.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/controller.ts
@@ -1,12 +1,12 @@
 import type { EthereumProvider } from "@walletconnect/ethereum-provider";
 import type { Address } from "abitype";
 import {
+  getTypesForEIP712Domain,
   type ProviderRpcError,
   type SignTypedDataParameters,
   SwitchChainError,
-  UserRejectedRequestError,
-  getTypesForEIP712Domain,
   serializeTypedData,
+  UserRejectedRequestError,
   validateTypedData,
 } from "viem";
 import { trackTransaction } from "../../analytics/track/transaction.js";
@@ -61,8 +61,8 @@ const ADD_ETH_CHAIN_METHOD = "wallet_addEthereumChain";
 const defaultShowQrModal = true;
 
 const storageKeys = {
-  requestedChains: "tw.wc.requestedChains",
   lastUsedChainId: "tw.wc.lastUsedChainId",
+  requestedChains: "tw.wc.requestedChains",
 };
 
 /**
@@ -128,8 +128,8 @@ export async function connectWC(
     requiredChain,
     optionalChains: chainsToRequest,
   } = getChainsToRequest({
-    client: options.client,
     chain: chainToRequest,
+    client: options.client,
     optionalChains: optionalChains,
   });
 
@@ -138,8 +138,8 @@ export async function connectWC(
       ...(wcOptions?.pairingTopic
         ? { pairingTopic: wcOptions?.pairingTopic }
         : {}),
-      optionalChains: chainsToRequest,
       chains: requiredChain ? [requiredChain.id] : undefined,
+      optionalChains: chainsToRequest,
       rpcMap: rpcMap,
     });
   }
@@ -161,8 +161,8 @@ export async function connectWC(
 
   if (options) {
     const savedParams: SavedConnectParams = {
-      optionalChains: options.walletConnect?.optionalChains,
       chain: options.chain,
+      optionalChains: options.walletConnect?.optionalChains,
       pairingTopic: options.walletConnect?.pairingTopic,
     };
 
@@ -199,8 +199,8 @@ export async function autoConnectWC(
           chain: savedConnectParams.chain,
           client: options.client,
           walletConnect: {
-            pairingTopic: savedConnectParams.pairingTopic,
             optionalChains: savedConnectParams.optionalChains,
+            pairingTopic: savedConnectParams.pairingTopic,
           },
         }
       : {
@@ -258,36 +258,36 @@ async function initProvider(
     requiredChain,
     optionalChains: chainsToRequest,
   } = getChainsToRequest({
-    client: options.client,
     chain: chainToRequest,
+    client: options.client,
     optionalChains: optionalChains,
   });
 
   const provider = await EthereumProvider.init({
-    showQrModal:
-      wcOptions?.showQrModal === undefined
-        ? sessionRequestHandler
-          ? false
-          : defaultShowQrModal
-        : wcOptions.showQrModal,
-    projectId: wcOptions?.projectId || DEFAULT_PROJECT_ID,
-    optionalMethods: OPTIONAL_METHODS,
-    optionalEvents: OPTIONAL_EVENTS,
-    optionalChains: chainsToRequest,
     chains: requiredChain ? [requiredChain.id] : undefined,
+    disableProviderPing: true,
     metadata: {
-      name: wcOptions?.appMetadata?.name || getDefaultAppMetadata().name,
       description:
         wcOptions?.appMetadata?.description ||
         getDefaultAppMetadata().description,
-      url: wcOptions?.appMetadata?.url || getDefaultAppMetadata().url,
       icons: [
         wcOptions?.appMetadata?.logoUrl || getDefaultAppMetadata().logoUrl,
       ],
+      name: wcOptions?.appMetadata?.name || getDefaultAppMetadata().name,
+      url: wcOptions?.appMetadata?.url || getDefaultAppMetadata().url,
     },
-    rpcMap: rpcMap,
+    optionalChains: chainsToRequest,
+    optionalEvents: OPTIONAL_EVENTS,
+    optionalMethods: OPTIONAL_METHODS,
+    projectId: wcOptions?.projectId || DEFAULT_PROJECT_ID,
     qrModalOptions: wcOptions?.qrModalOptions,
-    disableProviderPing: true,
+    rpcMap: rpcMap,
+    showQrModal:
+      wcOptions?.showQrModal === undefined
+        ? sessionRequestHandler
+          ? false
+          : defaultShowQrModal
+        : wcOptions.showQrModal,
   });
 
   provider.events.setMaxListeners(Number.POSITIVE_INFINITY);
@@ -339,23 +339,23 @@ function createAccount({
         method: "eth_sendTransaction",
         params: [
           {
-            gas: tx.gas ? numberToHex(tx.gas) : undefined,
-            value: tx.value ? numberToHex(tx.value) : undefined,
+            data: tx.data,
             from: getAddress(address),
+            gas: tx.gas ? numberToHex(tx.gas) : undefined,
             to: tx.to as Address,
-            data: tx.data,
+            value: tx.value ? numberToHex(tx.value) : undefined,
           },
         ],
       })) as Hex;
 
       trackTransaction({
-        client: client,
-        walletAddress: getAddress(address),
-        walletType: "walletConnect",
-        transactionHash,
         chainId: tx.chainId,
+        client: client,
         contractAddress: tx.to ?? undefined,
         gasPrice: tx.gasPrice,
+        transactionHash,
+        walletAddress: getAddress(address),
+        walletType: "walletConnect",
       });
 
       return {
@@ -416,7 +416,7 @@ function onConnect(
   storage: AsyncStorage,
   client: ThirdwebClient,
 ): [Account, Chain, DisconnectFn, SwitchChainFn] {
-  const account = createAccount({ provider, address, client });
+  const account = createAccount({ address, client, provider });
 
   async function disconnect() {
     provider.removeListener("accountsChanged", onAccountsChanged);
@@ -435,9 +435,9 @@ function onConnect(
   function onAccountsChanged(accounts: string[]) {
     if (accounts[0]) {
       const newAccount = createAccount({
-        provider,
         address: getAddress(accounts[0]),
         client,
+        provider,
       });
       emitter.emit("accountChanged", newAccount);
       emitter.emit("accountsChanged", accounts);
@@ -504,12 +504,12 @@ async function switchChainWC(
         method: ADD_ETH_CHAIN_METHOD,
         params: [
           {
-            chainId: numberToHex(apiChain.chainId),
-            chainName: apiChain.name,
-            nativeCurrency: apiChain.nativeCurrency,
-            rpcUrls: getValidPublicRPCUrl(apiChain), // no clientId on purpose
             blockExplorerUrls:
               blockExplorerUrls.length > 0 ? blockExplorerUrls : undefined,
+            chainId: numberToHex(apiChain.chainId),
+            chainName: apiChain.name,
+            nativeCurrency: apiChain.nativeCurrency, // no clientId on purpose
+            rpcUrls: getValidPublicRPCUrl(apiChain),
           },
         ],
       });
@@ -589,12 +589,12 @@ function getChainsToRequest(options: {
   }
 
   return {
-    rpcMap,
-    requiredChain: options.chain ? options.chain : undefined,
     optionalChains:
       optionalChains.length > 0
         ? (optionalChains.map((x) => x.id) as ArrayOneOrMore<number>)
         : [1],
+    requiredChain: options.chain ? options.chain : undefined,
+    rpcMap,
   };
 }
 
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/index.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/index.ts
index e9a18d26d40..9d87d5dc0c6 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/index.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/index.ts
@@ -7,9 +7,9 @@ import { getDefaultAppMetadata } from "../../utils/defaultDappMetadata.js";
 import { DEFAULT_PROJECT_ID } from "../constants.js";
 import { handleSendRawTransactionRequest } from "./request-handlers/send-raw-transaction.js";
 import { handleSendTransactionRequest } from "./request-handlers/send-transaction.js";
+import { handleSignRequest } from "./request-handlers/sign.js";
 import { handleSignTransactionRequest } from "./request-handlers/sign-transaction.js";
 import { handleSignTypedDataRequest } from "./request-handlers/sign-typed-data.js";
-import { handleSignRequest } from "./request-handlers/sign.js";
 import { handleSwitchChain } from "./request-handlers/switch-chain.js";
 import {
   getSessions,
@@ -94,13 +94,13 @@ export const clearWalletConnectClientCache = () => {
  * Default request handlers for WalletConnect requests.
  */
 export const DefaultWalletConnectRequestHandlers = {
-  personal_sign: handleSignRequest,
+  eth_sendRawTransaction: handleSendRawTransactionRequest,
+  eth_sendTransaction: handleSendTransactionRequest,
   eth_sign: handleSignRequest,
+  eth_signTransaction: handleSignTransactionRequest,
   eth_signTypedData: handleSignTypedDataRequest,
   eth_signTypedData_v4: handleSignTypedDataRequest,
-  eth_signTransaction: handleSignTransactionRequest,
-  eth_sendTransaction: handleSendTransactionRequest,
-  eth_sendRawTransaction: handleSendRawTransactionRequest,
+  personal_sign: handleSignRequest,
   wallet_addEthereumChain: (_: {
     wallet: Wallet;
     params: WalletConnectAddEthereumChainRequestParams;
@@ -183,13 +183,13 @@ export async function createWalletConnectClient(
 
   const defaults = getDefaultAppMetadata();
   const walletConnectClient = await SignClient.init({
-    projectId: options.projectId ?? DEFAULT_PROJECT_ID,
     metadata: {
-      name: options.appMetadata?.name ?? defaults.name,
-      url: options.appMetadata?.url ?? defaults.url,
       description: options.appMetadata?.description ?? defaults.description,
       icons: [options.appMetadata?.logoUrl ?? defaults.logoUrl],
+      name: options.appMetadata?.name ?? defaults.name,
+      url: options.appMetadata?.url ?? defaults.url,
     },
+    projectId: options.projectId ?? DEFAULT_PROJECT_ID,
   });
 
   walletConnectClient.on(
@@ -197,11 +197,11 @@ export async function createWalletConnectClient(
     async (event: WalletConnectSessionProposalEvent) => {
       const { onSessionProposal } = await import("./session-proposal.js");
       await onSessionProposal({
-        wallet,
-        walletConnectClient,
-        event,
         chains,
+        event,
         onConnect,
+        wallet,
+        walletConnectClient,
       }).catch((error) => {
         if (options.onError) {
           options.onError(error as Error);
@@ -217,11 +217,11 @@ export async function createWalletConnectClient(
     async (event: WalletConnectSessionRequestEvent) => {
       const { fulfillRequest } = await import("./session-request.js");
       await fulfillRequest({
-        wallet,
-        walletConnectClient,
         event,
         handlers: requestHandlers,
         thirdwebClient,
+        wallet,
+        walletConnectClient,
       }).catch((error) => {
         if (options.onError) {
           options.onError(error as Error);
@@ -270,7 +270,7 @@ export async function createWalletConnectClient(
     });
 
     if (onDisconnect) {
-      disconnectHook({ topic: args.topic, onDisconnect });
+      disconnectHook({ onDisconnect, topic: args.topic });
     }
     return result;
   };
@@ -346,11 +346,11 @@ export async function disconnectWalletConnectSession(options: {
 
   try {
     await options.walletConnectClient.disconnect({
-      topic: options.session.topic,
       reason: {
         code: 6000,
         message: "Disconnected",
       },
+      topic: options.session.topic,
     });
   } catch {
     // ignore, the session doesn't exist already
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/receiver.test.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/receiver.test.ts
index d4c30d3ab72..9a5f03bdc9c 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/receiver.test.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/receiver.test.ts
@@ -17,10 +17,10 @@ import * as SessionStore from "./session-store.js";
 import type { WalletConnectClient } from "./types.js";
 
 const TEST_METADATA = {
-  name: "test",
-  url: "https://test.com",
   description: "test",
   logoUrl: "https://test.com/favicon.ico",
+  name: "test",
+  url: "https://test.com",
 };
 const URI_MOCK =
   "wc:a34fc4c6f0db6277f7883c325629a8363eab950933e15caac9e6c7408a82541e@2?expiryTimestamp=1717021490&relay-protocol=irn&symKey=00626dec650109ed09de73bc9364589a3c14a77e57598417fe27f44062904b77";
@@ -30,16 +30,16 @@ const DEFAULT_METADATA = getDefaultAppMetadata();
 const listeners: Record<string, (_event?: unknown) => Promise<void>> = {};
 
 const signClientMock = {
-  on: vi.fn((event, listener) => {
-    listeners[event] = listener;
-  }),
-  respond: vi.fn(),
-  disconnect: vi.fn(),
   core: {
     pairing: {
       pair: vi.fn(),
     },
   },
+  disconnect: vi.fn(),
+  on: vi.fn((event, listener) => {
+    listeners[event] = listener;
+  }),
+  respond: vi.fn(),
 } as unknown as WalletConnectClient;
 
 const signClientInitMock = vi
@@ -71,19 +71,19 @@ describe("createWalletConnectClient", () => {
 
   it("creates a client with provided metadata", async () => {
     const client = await createWalletConnectClient({
-      projectId: "test",
       appMetadata: TEST_METADATA,
       client: TEST_CLIENT,
+      projectId: "test",
       wallet: TEST_IN_APP_WALLET_A,
     });
     expect(signClientInitMock).toHaveBeenCalledWith({
-      projectId: "test",
       metadata: {
-        name: TEST_METADATA.name,
-        url: TEST_METADATA.url,
         description: TEST_METADATA.description,
         icons: [TEST_METADATA.logoUrl],
+        name: TEST_METADATA.name,
+        url: TEST_METADATA.url,
       },
+      projectId: "test",
     });
     expect(client).toEqual(signClientMock);
     expect(signClientMock.on).toHaveBeenCalledWith(
@@ -110,13 +110,13 @@ describe("createWalletConnectClient", () => {
       wallet: TEST_IN_APP_WALLET_A,
     });
     expect(signClientInitMock).toHaveBeenCalledWith({
-      projectId: DEFAULT_PROJECT_ID,
       metadata: {
-        name: DEFAULT_METADATA.name,
-        url: DEFAULT_METADATA.url,
         description: DEFAULT_METADATA.description,
         icons: [DEFAULT_METADATA.logoUrl],
+        name: DEFAULT_METADATA.name,
+        url: DEFAULT_METADATA.url,
       },
+      projectId: DEFAULT_PROJECT_ID,
     });
     expect(client).toEqual(signClientMock);
   });
@@ -141,8 +141,8 @@ describe("createWalletConnectClient", () => {
     const onDisconnect = vi.fn();
     await createWalletConnectClient({
       client: TEST_CLIENT,
-      wallet: TEST_IN_APP_WALLET_A,
       onDisconnect,
+      wallet: TEST_IN_APP_WALLET_A,
     });
 
     await listeners.session_delete?.({ topic: "test" });
@@ -157,8 +157,8 @@ describe("createWalletConnectClient", () => {
 
       await createWalletConnectClient({
         client: TEST_CLIENT,
-        wallet: TEST_IN_APP_WALLET_A,
         onError,
+        wallet: TEST_IN_APP_WALLET_A,
       });
 
       await listeners.session_proposal?.();
@@ -173,8 +173,8 @@ describe("createWalletConnectClient", () => {
 
       await createWalletConnectClient({
         client: TEST_CLIENT,
-        wallet: TEST_IN_APP_WALLET_A,
         onError,
+        wallet: TEST_IN_APP_WALLET_A,
       });
 
       await listeners.session_request?.();
@@ -188,8 +188,8 @@ describe("createWalletConnectClient", () => {
 describe("createWalletConnectSession", () => {
   it("sends a session_proposal event", async () => {
     createWalletConnectSession({
-      walletConnectClient: signClientMock,
       uri: URI_MOCK,
+      walletConnectClient: signClientMock,
     });
 
     expect(signClientMock.core.pairing.pair).toHaveBeenCalledWith({
@@ -201,10 +201,10 @@ describe("createWalletConnectSession", () => {
 describe("disconnectWalletConnectSession", () => {
   it("disconnects a session", async () => {
     await disconnectWalletConnectSession({
-      walletConnectClient: signClientMock,
       session: {
         topic: "test",
       },
+      walletConnectClient: signClientMock,
     });
 
     expect(removeSession).toHaveBeenCalled();
@@ -213,10 +213,10 @@ describe("disconnectWalletConnectSession", () => {
   it("removes session anyway if disconnect throws", async () => {
     signClientMock.disconnect = vi.fn().mockRejectedValue(new Error("test"));
     await disconnectWalletConnectSession({
-      walletConnectClient: signClientMock,
       session: {
         topic: "test",
       },
+      walletConnectClient: signClientMock,
     });
     expect(removeSession).toHaveBeenCalled();
   });
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/send-raw-transaction.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/send-raw-transaction.ts
index c0810833e0b..da82d56c6c6 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/send-raw-transaction.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/send-raw-transaction.ts
@@ -23,8 +23,8 @@ export async function handleSendRawTransactionRequest(options: {
   }
 
   const txResult = await account.sendRawTransaction({
-    rawTransaction,
     chainId,
+    rawTransaction,
   });
   return txResult.transactionHash;
 }
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/send-transaction.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/send-transaction.ts
index 14776e58f73..1f8012c7c14 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/send-transaction.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/send-transaction.ts
@@ -28,20 +28,20 @@ export async function handleSendTransactionRequest(options: {
   }
 
   const preparedTransaction = prepareTransaction({
+    chain: getCachedChain(chainId),
+    client: thirdwebClient,
+    data: transaction.data,
     gas: transaction.gas ? hexToBigInt(transaction.gas) : undefined,
     gasPrice: transaction.gasPrice
       ? hexToBigInt(transaction.gasPrice)
       : undefined,
-    value: transaction.value ? hexToBigInt(transaction.value) : undefined,
     to: transaction.to,
-    data: transaction.data,
-    chain: getCachedChain(chainId),
-    client: thirdwebClient,
+    value: transaction.value ? hexToBigInt(transaction.value) : undefined,
   });
 
   const txResult = await sendTransaction({
-    transaction: preparedTransaction,
     account,
+    transaction: preparedTransaction,
   });
 
   return txResult.transactionHash;
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/sign-transaction.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/sign-transaction.ts
index 7d92ff1f113..c6dbf3ac81e 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/sign-transaction.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/request-handlers/sign-transaction.ts
@@ -30,13 +30,13 @@ export async function handleSignTransactionRequest(options: {
   }
 
   return account.signTransaction({
+    data: transaction.data,
     gas: transaction.gas ? hexToBigInt(transaction.gas) : undefined,
     gasPrice: transaction.gasPrice
       ? hexToBigInt(transaction.gasPrice)
       : undefined,
-    value: transaction.value ? hexToBigInt(transaction.value) : undefined,
     nonce: transaction.nonce ? hexToNumber(transaction.nonce) : undefined,
     to: transaction.to,
-    data: transaction.data,
+    value: transaction.value ? hexToBigInt(transaction.value) : undefined,
   });
 }
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-proposal.test.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-proposal.test.ts
index e77490ea375..ab03cf8a977 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-proposal.test.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-proposal.test.ts
@@ -16,12 +16,35 @@ import type {
 const PROPOSAL_EVENT_MOCK: WalletConnectSessionProposalEvent = {
   id: 1717020142228697,
   params: {
+    expiryTimestamp: 1717020442,
     id: 1717020142228697,
+    optionalNamespaces: {
+      eip155: {
+        events: ["disconnect"],
+        methods: ["eth_signTypedData_v4"],
+      },
+    },
     pairingTopic:
       "80630f62114d67a2c529f785ba5b7ed4b4b7894cc6be17153a548aa9305e89d7",
-    expiryTimestamp: 1717020442,
+    proposer: {
+      metadata: {
+        description: "Example Dapp",
+        icons: ["https://walletconnect.com/walletconnect-logo.png"],
+        name: "Example Dapp",
+        url: "#",
+      },
+      publicKey:
+        "61ae6e6f8f441822cf72e21060029681aec2f50d9cb8bf0c95df461ecd371703",
+    },
+    relays: [
+      {
+        protocol: "irn",
+      },
+    ],
     requiredNamespaces: {
       eip155: {
+        chains: ["eip155:1"],
+        events: ["chainChanged", "accountsChanged"],
         methods: [
           "eth_sendTransaction",
           "eth_signTransaction",
@@ -29,29 +52,6 @@ const PROPOSAL_EVENT_MOCK: WalletConnectSessionProposalEvent = {
           "personal_sign",
           "eth_signTypedData",
         ],
-        chains: ["eip155:1"],
-        events: ["chainChanged", "accountsChanged"],
-      },
-    },
-    optionalNamespaces: {
-      eip155: {
-        methods: ["eth_signTypedData_v4"],
-        events: ["disconnect"],
-      },
-    },
-    relays: [
-      {
-        protocol: "irn",
-      },
-    ],
-    proposer: {
-      publicKey:
-        "61ae6e6f8f441822cf72e21060029681aec2f50d9cb8bf0c95df461ecd371703",
-      metadata: {
-        name: "Example Dapp",
-        description: "Example Dapp",
-        url: "#",
-        icons: ["https://walletconnect.com/walletconnect-logo.png"],
       },
     },
   },
@@ -67,11 +67,11 @@ const walletMock = {
 };
 
 const signClientMock = {
-  on: vi.fn(),
-  disconnect: vi.fn(),
   approve: vi.fn().mockResolvedValue({
     acknowledged: vi.fn().mockResolvedValue(mocks.session),
   }),
+  disconnect: vi.fn(),
+  on: vi.fn(),
 } as unknown as WalletConnectClient;
 
 describe("session_proposal", () => {
@@ -87,9 +87,9 @@ describe("session_proposal", () => {
     walletMock.getAccount.mockReturnValueOnce(null);
 
     const promise = onSessionProposal({
+      event: PROPOSAL_EVENT_MOCK,
       wallet: walletMock,
       walletConnectClient: signClientMock,
-      event: PROPOSAL_EVENT_MOCK,
     });
 
     await expect(promise).rejects.toThrow(
@@ -99,9 +99,9 @@ describe("session_proposal", () => {
 
   it("should connect new session", async () => {
     await onSessionProposal({
-      walletConnectClient: signClientMock,
-      wallet: walletMock,
       event: PROPOSAL_EVENT_MOCK,
+      wallet: walletMock,
+      walletConnectClient: signClientMock,
     });
 
     expect(signClientMock.approve).toHaveBeenCalledWith({
@@ -109,18 +109,18 @@ describe("session_proposal", () => {
       namespaces: {
         eip155: {
           accounts: [`eip155:1:${TEST_ACCOUNT_A.address}`],
-          methods: [
-            ...(PROPOSAL_EVENT_MOCK.params.requiredNamespaces?.eip155
-              ?.methods ?? []),
-            ...(PROPOSAL_EVENT_MOCK.params.optionalNamespaces?.eip155
-              ?.methods ?? []),
-          ],
           events: [
             ...(PROPOSAL_EVENT_MOCK.params.requiredNamespaces?.eip155?.events ??
               []),
             ...(PROPOSAL_EVENT_MOCK.params.optionalNamespaces?.eip155?.events ??
               []),
           ],
+          methods: [
+            ...(PROPOSAL_EVENT_MOCK.params.requiredNamespaces?.eip155
+              ?.methods ?? []),
+            ...(PROPOSAL_EVENT_MOCK.params.optionalNamespaces?.eip155
+              ?.methods ?? []),
+          ],
         },
       },
     });
@@ -128,10 +128,10 @@ describe("session_proposal", () => {
 
   it("should connect new session with custom chains", async () => {
     await onSessionProposal({
-      walletConnectClient: signClientMock,
-      wallet: walletMock,
-      event: PROPOSAL_EVENT_MOCK,
       chains: [ANVIL_CHAIN],
+      event: PROPOSAL_EVENT_MOCK,
+      wallet: walletMock,
+      walletConnectClient: signClientMock,
     });
 
     expect(signClientMock.approve).toHaveBeenCalledWith({
@@ -142,18 +142,18 @@ describe("session_proposal", () => {
             `eip155:1:${TEST_ACCOUNT_A.address}`,
             `eip155:31337:${TEST_ACCOUNT_A.address}`,
           ],
-          methods: [
-            ...(PROPOSAL_EVENT_MOCK.params.requiredNamespaces?.eip155
-              ?.methods ?? []),
-            ...(PROPOSAL_EVENT_MOCK.params.optionalNamespaces?.eip155
-              ?.methods ?? []),
-          ],
           events: [
             ...(PROPOSAL_EVENT_MOCK.params.requiredNamespaces?.eip155?.events ??
               []),
             ...(PROPOSAL_EVENT_MOCK.params.optionalNamespaces?.eip155?.events ??
               []),
           ],
+          methods: [
+            ...(PROPOSAL_EVENT_MOCK.params.requiredNamespaces?.eip155
+              ?.methods ?? []),
+            ...(PROPOSAL_EVENT_MOCK.params.optionalNamespaces?.eip155
+              ?.methods ?? []),
+          ],
         },
       },
     });
@@ -162,8 +162,8 @@ describe("session_proposal", () => {
   it("should disconnect existing session", async () => {
     vi.spyOn(SessionStore, "getSessions").mockResolvedValueOnce([
       {
-        topic: "old-session",
         origin: "https://example.com",
+        topic: "old-session",
       },
     ]);
 
@@ -173,14 +173,14 @@ describe("session_proposal", () => {
       verified: { origin: "https://example.com" },
     };
     await onSessionProposal({
-      walletConnectClient: signClientMock,
-      wallet: walletMock,
       event: sessionProposal,
+      wallet: walletMock,
+      walletConnectClient: signClientMock,
     });
 
     expect(signClientMock.disconnect).toHaveBeenCalledWith({
-      topic: "old-session",
       reason: expect.anything(),
+      topic: "old-session",
     });
   });
 
@@ -189,15 +189,15 @@ describe("session_proposal", () => {
       ...PROPOSAL_EVENT_MOCK,
       params: {
         ...PROPOSAL_EVENT_MOCK.params,
-        requiredNamespaces: {},
         optionalNamespaces: {},
+        requiredNamespaces: {},
       },
     };
 
     const promise = onSessionProposal({
-      walletConnectClient: signClientMock,
-      wallet: walletMock,
       event: proposal,
+      wallet: walletMock,
+      walletConnectClient: signClientMock,
     });
     await expect(promise).rejects.toThrow(
       "No EIP155 namespace found in Wallet Connect session proposal",
@@ -207,10 +207,10 @@ describe("session_proposal", () => {
   it("should call onConnect on successful connection", async () => {
     const onConnect = vi.fn();
     await onSessionProposal({
-      walletConnectClient: signClientMock,
-      wallet: walletMock,
       event: PROPOSAL_EVENT_MOCK,
       onConnect,
+      wallet: walletMock,
+      walletConnectClient: signClientMock,
     });
     expect(onConnect).toHaveBeenCalledWith({
       origin: expect.anything(),
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-proposal.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-proposal.ts
index c258b817f5a..3b2083e9a82 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-proposal.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-proposal.ts
@@ -2,8 +2,8 @@ import type { Chain } from "../../../chains/types.js";
 import type { Account, Wallet } from "../../interfaces/wallet.js";
 import { disconnectWalletConnectSession } from "./index.js";
 import { getSessions, saveSession } from "./session-store.js";
-import type { WalletConnectClient } from "./types.js";
 import type {
+  WalletConnectClient,
   WalletConnectSession,
   WalletConnectSessionProposalEvent,
 } from "./types.js";
@@ -31,9 +31,9 @@ export async function onSessionProposal(options: {
   }
   const session = await acceptSessionProposal({
     account,
-    walletConnectClient,
-    sessionProposal: event,
     chains,
+    sessionProposal: event,
+    walletConnectClient,
   });
 
   await saveSession(session);
@@ -51,7 +51,10 @@ export async function onSessionProposal(options: {
 export async function disconnectExistingSessions({
   walletConnectClient,
   origin,
-}: { walletConnectClient: WalletConnectClient; origin: string }) {
+}: {
+  walletConnectClient: WalletConnectClient;
+  origin: string;
+}) {
   const sessions = await getSessions();
   for (const session of sessions) {
     if (session.origin === origin) {
@@ -98,29 +101,29 @@ export async function acceptSessionProposal({
         ]),
       ),
     ],
-    methods: [
-      ...(sessionProposal.params.requiredNamespaces?.eip155?.methods ?? []),
-      ...(sessionProposal.params.optionalNamespaces?.eip155?.methods ?? []),
-    ],
     events: [
       ...(sessionProposal.params.requiredNamespaces?.eip155?.events ?? []),
       ...(sessionProposal.params.optionalNamespaces?.eip155?.events ?? []),
     ],
+    methods: [
+      ...(sessionProposal.params.requiredNamespaces?.eip155?.methods ?? []),
+      ...(sessionProposal.params.optionalNamespaces?.eip155?.methods ?? []),
+    ],
   };
   const approval = await walletConnectClient.approve({
     id: sessionProposal.id,
     namespaces: {
       eip155: {
         accounts: namespaces.chains,
-        methods: namespaces.methods,
         events: namespaces.events,
+        methods: namespaces.methods,
       },
     },
   });
 
   const session = await approval.acknowledged();
   return {
-    topic: session.topic,
     origin: sessionProposal.verifyContext?.verified?.origin || "Unknown origin",
+    topic: session.topic,
   };
 }
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-request.test.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-request.test.ts
index 4455f4af42a..e7653041475 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-request.test.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-request.test.ts
@@ -21,46 +21,46 @@ import type {
 } from "./types.js";
 
 const TRANSACTION_MOCK = {
-  to: "0xd46e8dd67c5d32be8058bb8eb970870f07244567",
   data: "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675",
-  gas: "0x76c0", // 30400
-  gasPrice: "0x9184e72a000", // 10000000000000
-  value: "0x9184e72a", // 2441406250
-  nonce: "0x117", // 279
+  gas: "0x76c0",
+  gasPrice: "0x9184e72a000", // 30400
+  nonce: "0x117", // 10000000000000
+  to: "0xd46e8dd67c5d32be8058bb8eb970870f07244567", // 2441406250
+  value: "0x9184e72a", // 279
 };
 
 const REQUEST_EVENT_MOCK: WalletConnectSessionRequestEvent = {
   id: 1717020142228697,
-  topic: "session",
   params: {
+    chainId: "eip155:1",
     request: {
       method: "personal_sign",
       params: ["0x00", "0x00"],
     },
-    chainId: "eip155:1",
   },
+  topic: "session",
 };
 
 const walletMock = {
   ...TEST_IN_APP_WALLET_A,
   getAccount: vi.fn().mockReturnValue(TEST_IN_APP_WALLET_A.getAccount()),
-  switchChain: vi.fn(),
   getChain: vi.fn(),
+  switchChain: vi.fn(),
 };
 
 const mocks = vi.hoisted(() => ({
-  sendTransaction: vi.fn().mockResolvedValue({
+  sendRawTransaction: vi.fn().mockResolvedValue({
     transactionHash: "0xabcd",
   }),
-  sendRawTransaction: vi.fn().mockResolvedValue({
+  sendTransaction: vi.fn().mockResolvedValue({
     transactionHash: "0xabcd",
   }),
 }));
 
 const signClientMock = {
+  disconnect: vi.fn(),
   on: vi.fn(),
   respond: vi.fn(),
-  disconnect: vi.fn(),
 } as unknown as WalletConnectClient;
 
 describe("session_request", () => {
@@ -78,10 +78,10 @@ describe("session_request", () => {
   it("should throw if no account is connected", async () => {
     walletMock.getAccount.mockReturnValue(null);
     const promise = fulfillRequest({
-      walletConnectClient: signClientMock,
-      wallet: walletMock,
       event: REQUEST_EVENT_MOCK,
       thirdwebClient: TEST_CLIENT,
+      wallet: walletMock,
+      walletConnectClient: signClientMock,
     });
     await expect(promise).rejects.toThrow(
       "No account connected to provided wallet",
@@ -93,14 +93,13 @@ describe("session_request", () => {
     unsupportedRequest.params.request.method = "eth_unsupported";
 
     await fulfillRequest({
-      walletConnectClient: signClientMock,
-      wallet: walletMock,
       event: unsupportedRequest,
       thirdwebClient: TEST_CLIENT,
+      wallet: walletMock,
+      walletConnectClient: signClientMock,
     });
 
     expect(signClientMock.respond).toHaveBeenCalledWith({
-      topic: REQUEST_EVENT_MOCK.topic,
       response: {
         id: REQUEST_EVENT_MOCK.id,
         jsonrpc: "2.0",
@@ -109,6 +108,7 @@ describe("session_request", () => {
           message: "Unsupported request method: eth_unsupported",
         },
       },
+      topic: REQUEST_EVENT_MOCK.topic,
     });
   });
 
@@ -120,11 +120,11 @@ describe("session_request", () => {
     event.params.request.method = "eth_magic";
 
     const promise = fulfillRequest({
-      walletConnectClient: signClientMock,
-      wallet: walletMock,
       event,
       handlers: customHandlers,
       thirdwebClient: TEST_CLIENT,
+      wallet: walletMock,
+      walletConnectClient: signClientMock,
     });
 
     await expect(promise).resolves.not.toThrow();
@@ -148,19 +148,19 @@ describe("session_request", () => {
 
     it("should sign message", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: personalSignRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result:
             "0x7b7806017c0666b88ff1a51a2af716b808c4974bdb31a4fb734fe2d16c121766363847d2556eb466d1cd04b26541aa5a2a1f5be4154cfd9bef8137dfb7b711ff1c",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -168,14 +168,13 @@ describe("session_request", () => {
       personalSignRequest.params.request.params[1] = TEST_ACCOUNT_B.address;
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: personalSignRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -184,6 +183,7 @@ describe("session_request", () => {
             message: `Failed to validate account address (${TEST_ACCOUNT_A.address}), differs from ${TEST_ACCOUNT_B.address}`,
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -193,11 +193,11 @@ describe("session_request", () => {
       };
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: personalSignRequest,
         handlers: customHandlers,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(customHandlers.personal_sign).toHaveBeenCalledWith({
@@ -205,12 +205,12 @@ describe("session_request", () => {
         params: personalSignRequest.params.request.params,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result: "0xRESULT",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
   });
@@ -228,19 +228,19 @@ describe("session_request", () => {
 
     it("should sign message", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result:
             "0x7b7806017c0666b88ff1a51a2af716b808c4974bdb31a4fb734fe2d16c121766363847d2556eb466d1cd04b26541aa5a2a1f5be4154cfd9bef8137dfb7b711ff1c",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -251,14 +251,13 @@ describe("session_request", () => {
       ] as WalletConnectSignRequestPrams;
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -267,6 +266,7 @@ describe("session_request", () => {
             message: `Failed to validate account address (${TEST_ACCOUNT_A.address}), differs from ${TEST_ACCOUNT_B.address}`,
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -276,11 +276,11 @@ describe("session_request", () => {
       };
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignRequest,
         handlers: customHandlers,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(customHandlers.eth_sign).toHaveBeenCalledWith({
@@ -288,12 +288,12 @@ describe("session_request", () => {
         params: ethSignRequest.params.request.params,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result: "0xRESULT",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
   });
@@ -311,20 +311,20 @@ describe("session_request", () => {
 
     it("should sign typed data", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignTypedDataRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result:
             "0x32f3d5975ba38d6c2fba9b95d5cbed1febaa68003d3d588d51f2de522ad54117760cfc249470a75232552e43991f53953a3d74edf6944553c6bef2469bb9e5921b",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -335,20 +335,20 @@ describe("session_request", () => {
       ] as WalletConnectSignTypedDataRequestParams;
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignTypedDataRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result:
             "0x32f3d5975ba38d6c2fba9b95d5cbed1febaa68003d3d588d51f2de522ad54117760cfc249470a75232552e43991f53953a3d74edf6944553c6bef2469bb9e5921b",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
   });
@@ -366,20 +366,20 @@ describe("session_request", () => {
 
     it("should sign typed data", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignTypedDataRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result:
             "0x32f3d5975ba38d6c2fba9b95d5cbed1febaa68003d3d588d51f2de522ad54117760cfc249470a75232552e43991f53953a3d74edf6944553c6bef2469bb9e5921b",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -390,20 +390,20 @@ describe("session_request", () => {
       ] as WalletConnectSignTypedDataRequestParams;
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignTypedDataRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result:
             "0x32f3d5975ba38d6c2fba9b95d5cbed1febaa68003d3d588d51f2de522ad54117760cfc249470a75232552e43991f53953a3d74edf6944553c6bef2469bb9e5921b",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -414,14 +414,13 @@ describe("session_request", () => {
       ] as WalletConnectSignTypedDataRequestParams;
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignTypedDataRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -430,6 +429,7 @@ describe("session_request", () => {
             message: `Failed to validate account address (${TEST_ACCOUNT_A.address}), differs from ${TEST_ACCOUNT_B.address}`,
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -439,11 +439,11 @@ describe("session_request", () => {
       };
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: ethSignTypedDataRequest,
         handlers: customHandlers,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(customHandlers.eth_signTypedData_v4).toHaveBeenCalledWith({
@@ -451,12 +451,12 @@ describe("session_request", () => {
         params: ethSignTypedDataRequest.params.request.params,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result: "0xRESULT",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
   });
@@ -473,20 +473,20 @@ describe("session_request", () => {
 
     it("should sign transaction", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: signTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result:
             "0xf8948201178609184e72a0008276c094d46e8dd67c5d32be8058bb8eb970870f07244567849184e72aa9d46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f0724456751ca072ed60498356d3bc60fa9b175e1703e460c2362a8e20b14efdd871a098a96ee6a0548610ee213ea8a6db5e8efd9ece886e97097c106c0a03925a51dd93a7750112",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -497,14 +497,13 @@ describe("session_request", () => {
       });
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: signTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -514,6 +513,7 @@ describe("session_request", () => {
               "The current account does not support signing transactions",
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -527,14 +527,13 @@ describe("session_request", () => {
       ] as WalletConnectTransactionRequestParams;
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: signTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -543,6 +542,7 @@ describe("session_request", () => {
             message: `Failed to validate account address (${TEST_ACCOUNT_A.address}), differs from ${TEST_ACCOUNT_B.address}`,
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -552,11 +552,11 @@ describe("session_request", () => {
       };
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: signTransactionRequest,
         handlers: customHandlers,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(customHandlers.eth_signTransaction).toHaveBeenCalledWith({
@@ -564,12 +564,12 @@ describe("session_request", () => {
         params: signTransactionRequest.params.request.params,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result: "0xRESULT",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
   });
@@ -589,19 +589,19 @@ describe("session_request", () => {
 
     it("should send transaction", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: sendTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result: "0x1234",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -609,14 +609,13 @@ describe("session_request", () => {
       sendTransactionRequest.params.chainId = "eip155:?";
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: sendTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -626,6 +625,7 @@ describe("session_request", () => {
               "Invalid chainId eip155:?, should have the format 'eip155:1'",
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -640,14 +640,13 @@ describe("session_request", () => {
       ] as WalletConnectTransactionRequestParams;
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: sendTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -656,6 +655,7 @@ describe("session_request", () => {
             message: `Failed to validate account address (${TEST_ACCOUNT_A.address}), differs from ${TEST_ACCOUNT_B.address}`,
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -665,11 +665,11 @@ describe("session_request", () => {
       };
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: sendTransactionRequest,
         handlers: customHandlers,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(customHandlers.eth_sendTransaction).toHaveBeenCalledWith({
@@ -678,12 +678,12 @@ describe("session_request", () => {
         params: sendTransactionRequest.params.request.params,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result: "0xRESULT",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
   });
@@ -704,19 +704,19 @@ describe("session_request", () => {
 
     it("should send raw transaction", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: sendRawTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result: "0xabcde",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -724,14 +724,13 @@ describe("session_request", () => {
       TEST_ACCOUNT_A.sendRawTransaction = undefined;
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: sendRawTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -741,6 +740,7 @@ describe("session_request", () => {
               "The current account does not support sending raw transactions",
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -748,14 +748,13 @@ describe("session_request", () => {
       sendRawTransactionRequest.params.chainId = "eip155:?";
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: sendRawTransactionRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -765,6 +764,7 @@ describe("session_request", () => {
               "Invalid chainId eip155:?, should have the format 'eip155:1'",
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
 
@@ -774,11 +774,11 @@ describe("session_request", () => {
       };
 
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: sendRawTransactionRequest,
         handlers: customHandlers,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(customHandlers.eth_sendRawTransaction).toHaveBeenCalledWith({
@@ -787,12 +787,12 @@ describe("session_request", () => {
         params: sendRawTransactionRequest.params.request.params,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
           result: "0xRESULT",
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
   });
@@ -804,13 +804,13 @@ describe("session_request", () => {
       addEthereumChainRequest.params.request.method = "wallet_addEthereumChain";
       addEthereumChainRequest.params.request.params = [
         {
-          chainId: "0x1",
           blockExplorerUrls: ["https://etherscan.io"],
+          chainId: "0x1",
           chainName: "Ethereum",
           nativeCurrency: {
+            decimals: 18,
             name: "Ether",
             symbol: "ETH",
-            decimals: 18,
           },
           rpcUrls: ["https://rpc.ethereum.org"],
         },
@@ -819,14 +819,13 @@ describe("session_request", () => {
 
     it("is not supported", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: addEthereumChainRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
-        topic: REQUEST_EVENT_MOCK.topic,
         response: {
           id: REQUEST_EVENT_MOCK.id,
           jsonrpc: "2.0",
@@ -835,6 +834,7 @@ describe("session_request", () => {
             message: "Unsupported request method: wallet_addEthereumChain",
           },
         },
+        topic: REQUEST_EVENT_MOCK.topic,
       });
     });
   });
@@ -854,10 +854,10 @@ describe("session_request", () => {
 
     it("switches the chain", async () => {
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: switchEthereumChainRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(walletMock.switchChain).toHaveBeenCalledWith(
@@ -870,10 +870,10 @@ describe("session_request", () => {
     it("does not switch the chain if already set", async () => {
       walletMock.getChain.mockReturnValue(defineChain(1));
       await fulfillRequest({
-        walletConnectClient: signClientMock,
-        wallet: walletMock,
         event: switchEthereumChainRequest,
         thirdwebClient: TEST_CLIENT,
+        wallet: walletMock,
+        walletConnectClient: signClientMock,
       });
 
       expect(walletMock.switchChain).not.toHaveBeenCalled();
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-request.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-request.ts
index c3903a48861..b53d9214041 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-request.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-request.ts
@@ -3,22 +3,20 @@ import type { Hex } from "../../../utils/encoding/hex.js";
 import type { Wallet } from "../../interfaces/wallet.js";
 import { handleSendRawTransactionRequest } from "./request-handlers/send-raw-transaction.js";
 import { handleSendTransactionRequest } from "./request-handlers/send-transaction.js";
-import { handleSignTransactionRequest } from "./request-handlers/sign-transaction.js";
-import { handleSignTypedDataRequest } from "./request-handlers/sign-typed-data.js";
 // Due to some edge cases, we can't import these handlers dynamically
 import { handleSignRequest } from "./request-handlers/sign.js";
+import { handleSignTransactionRequest } from "./request-handlers/sign-transaction.js";
+import { handleSignTypedDataRequest } from "./request-handlers/sign-typed-data.js";
 import type {
   WalletConnectAddEthereumChainRequestParams,
   WalletConnectClient,
-  WalletConnectSwitchEthereumChainRequestParams,
-} from "./types.js";
-import type {
   WalletConnectRawTransactionRequestParams,
   WalletConnectRequestError,
   WalletConnectRequestHandlers,
   WalletConnectSessionRequestEvent,
   WalletConnectSignRequestPrams,
   WalletConnectSignTypedDataRequestParams,
+  WalletConnectSwitchEthereumChainRequestParams,
   WalletConnectTransactionRequestParams,
 } from "./types.js";
 import { parseEip155ChainId } from "./utils.js";
@@ -135,8 +133,8 @@ export async function fulfillRequest(options: {
           result = await handleSendTransactionRequest({
             account,
             chainId,
-            thirdwebClient,
             params: request.params as WalletConnectTransactionRequestParams,
+            thirdwebClient,
           });
         }
         break;
@@ -161,9 +159,9 @@ export async function fulfillRequest(options: {
       case "wallet_addEthereumChain": {
         if (handlers?.wallet_addEthereumChain) {
           result = await handlers.wallet_addEthereumChain({
-            wallet,
             params:
               request.params as WalletConnectAddEthereumChainRequestParams,
+            wallet,
           });
         } else {
           throw new Error(
@@ -175,9 +173,9 @@ export async function fulfillRequest(options: {
       case "wallet_switchEthereumChain": {
         if (handlers?.wallet_switchEthereumChain) {
           result = await handlers.wallet_switchEthereumChain({
-            wallet,
             params:
               request.params as WalletConnectSwitchEthereumChainRequestParams,
+            wallet,
           });
         } else {
           const { handleSwitchChain } = await import(
@@ -185,9 +183,9 @@ export async function fulfillRequest(options: {
           );
 
           result = await handleSwitchChain({
-            wallet,
             params:
               request.params as WalletConnectSwitchEthereumChainRequestParams,
+            wallet,
           });
         }
         break;
@@ -219,11 +217,11 @@ export async function fulfillRequest(options: {
   }
 
   walletConnectClient.respond({
-    topic,
     response: {
       id,
       jsonrpc: "2.0",
       result,
     },
+    topic,
   });
 }
diff --git a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-store.ts b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-store.ts
index 78a0277ea41..a9218670cf3 100644
--- a/packages/thirdweb/src/wallets/wallet-connect/receiver/session-store.ts
+++ b/packages/thirdweb/src/wallets/wallet-connect/receiver/session-store.ts
@@ -22,13 +22,11 @@ export async function getSessions(): Promise<WalletConnectSession[]> {
 /**
  * @internal
  */
-export function initializeSessionStore(options: {
-  clientId: string;
-}) {
+export function initializeSessionStore(options: { clientId: string }) {
   if (!walletConnectSessions) {
     walletConnectSessions = new ClientScopedStorage({
-      storage: null, // TODO: inject storage
-      clientId: options.clientId,
+      clientId: options.clientId, // TODO: inject storage
+      storage: null,
     });
   }
 }
diff --git a/packages/thirdweb/src/wallets/wallet-emitter.ts b/packages/thirdweb/src/wallets/wallet-emitter.ts
index 76e68670906..f7208fd8801 100644
--- a/packages/thirdweb/src/wallets/wallet-emitter.ts
+++ b/packages/thirdweb/src/wallets/wallet-emitter.ts
@@ -1,5 +1,5 @@
 import type { Chain } from "../chains/types.js";
-import { type Emitter, createEmitter } from "../utils/tiny-emitter.js";
+import { createEmitter, type Emitter } from "../utils/tiny-emitter.js";
 import type { Account } from "./interfaces/wallet.js";
 import type { WalletAutoConnectionOption, WalletId } from "./wallet-types.js";
 
diff --git a/packages/thirdweb/tsconfig.base.json b/packages/thirdweb/tsconfig.base.json
index 2b519cac7ea..25c55988d49 100644
--- a/packages/thirdweb/tsconfig.base.json
+++ b/packages/thirdweb/tsconfig.base.json
@@ -1,47 +1,48 @@
 {
   // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
-  "include": [],
   "compilerOptions": {
     // Incremental builds
     // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
-    "incremental": false,
-
-    // Type checking
-    "strict": true,
-    "useDefineForClassFields": true, // Not enabled by default in `strict` mode unless we bump `target` to ES2022.
-    "noFallthroughCasesInSwitch": true, // Not enabled by default in `strict` mode.
-    "noImplicitReturns": true, // Not enabled by default in `strict` mode.
-    "useUnknownInCatchVariables": true, // TODO: This would normally be enabled in `strict` mode but would require some adjustments to the codebase.
-    "noImplicitOverride": true, // Not enabled by default in `strict` mode.
-    "noUnusedLocals": true, // Not enabled by default in `strict` mode.
-    "noUnusedParameters": true, // Not enabled by default in `strict` mode.
-    "exactOptionalPropertyTypes": false, // Not enabled by default in `strict` mode.
-    "noUncheckedIndexedAccess": true, // Not enabled by default in `strict` mode.
-
-    // JavaScript support
     "allowJs": false,
+    "allowSyntheticDefaultImports": true,
     "checkJs": false,
 
     // Interop constraints
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
+    "exactOptionalPropertyTypes": false,
     "forceConsistentCasingInFileNames": true,
-    "verbatimModuleSyntax": true,
-    "importHelpers": true, // This is only used for build validation. Since we do not have `tslib` installed, this will fail if we accidentally make use of anything that'd require injection of helpers.
+    "importHelpers": true,
+    // Incremental builds
+    // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
+    "incremental": false,
 
-    // Language and environment
-    "moduleResolution": "NodeNext",
-    "module": "NodeNext",
-    "target": "ES2021", // Setting this to `ES2021` enables native support for `Node v16+`: https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping.
+    // jsx for "/react" portion
+    "jsx": "react-jsx",
     "lib": [
       "ES2022", // By using ES2022 we get access to the `.cause` property on `Error` instances.
       "DOM" // We are adding `DOM` here to get the `fetch`, etc. types. This should be removed once these types are available via DefinitelyTyped.
     ],
+    "module": "NodeNext",
+
+    // Language and environment
+    "moduleResolution": "NodeNext",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
 
     // Skip type checking for node modules
     "skipLibCheck": true,
 
-    // jsx for "/react" portion
-    "jsx": "react-jsx"
-  }
+    // Type checking
+    "strict": true,
+    "target": "ES2021",
+    "useDefineForClassFields": true,
+    "useUnknownInCatchVariables": true,
+    "verbatimModuleSyntax": true
+  },
+  // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
+  "include": []
 }
diff --git a/packages/thirdweb/tsconfig.build.json b/packages/thirdweb/tsconfig.build.json
index 3ae3943df87..63325457c67 100644
--- a/packages/thirdweb/tsconfig.build.json
+++ b/packages/thirdweb/tsconfig.build.json
@@ -1,6 +1,9 @@
 {
-  "extends": "./tsconfig.base.json",
-  "include": ["src"],
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "rootDir": "./src",
+    "sourceMap": true
+  },
   "exclude": [
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
@@ -8,9 +11,6 @@
     "src/**/*.bench.ts",
     "src/**/*.macro.ts"
   ],
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.base.json",
+  "include": ["src"]
 }
diff --git a/packages/thirdweb/tsconfig.json b/packages/thirdweb/tsconfig.json
index bc683d70754..b9912d33c04 100644
--- a/packages/thirdweb/tsconfig.json
+++ b/packages/thirdweb/tsconfig.json
@@ -1,14 +1,13 @@
 {
   // This configuration is used for local development and type checking.
-  "extends": "./tsconfig.base.json",
-  "include": ["src", "test"],
-  "exclude": [],
-  // "references": [{ "path": "./scripts/tsconfig.json" }],
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "./dist",
     "paths": {
       "~test/*": ["./test/src/*"]
     }
-  }
+  },
+  "exclude": [],
+  "extends": "./tsconfig.base.json",
+  "include": ["src", "test"]
 }
diff --git a/packages/thirdweb/tsconfig.typedoc.json b/packages/thirdweb/tsconfig.typedoc.json
index 33e50ea08bd..fcf19e47d4d 100644
--- a/packages/thirdweb/tsconfig.typedoc.json
+++ b/packages/thirdweb/tsconfig.typedoc.json
@@ -1,6 +1,9 @@
 {
-  "extends": "./tsconfig.base.json",
-  "include": ["src"],
+  "compilerOptions": {
+    "moduleResolution": "NodeNext",
+    "rootDir": "./src",
+    "sourceMap": true
+  },
   "exclude": [
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
@@ -8,9 +11,6 @@
     "src/**/*.bench.ts",
     "src/**/*.macro.ts"
   ],
-  "compilerOptions": {
-    "moduleResolution": "NodeNext",
-    "sourceMap": true,
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.base.json",
+  "include": ["src"]
 }
diff --git a/packages/thirdweb/tsdoc.json b/packages/thirdweb/tsdoc.json
index 68f207404d9..80973ced3e5 100644
--- a/packages/thirdweb/tsdoc.json
+++ b/packages/thirdweb/tsdoc.json
@@ -1,142 +1,142 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+  "supportForTags": {
+    "@account": true,
+    "@auth": true,
+    "@beta": true,
+    "@bridge": true,
+    "@buyCrypto": true,
+    "@chain": true,
+    "@client": true,
+    "@component": true,
+    "@connectWallet": true,
+    "@contract": true,
+    "@engine": true,
+    "@extension": true,
+    "@insight": true,
+    "@locale": true,
+    "@modules": true,
+    "@nebula": true,
+    "@nft": true,
+    "@rpc": true,
+    "@social": true,
+    "@storage": true,
+    "@theme": true,
+    "@transaction": true,
+    "@utils": true,
+    "@wallet": true,
+    "@walletConfig": true,
+    "@walletConnection": true,
+    "@walletUtils": true
+  },
   "tagDefinitions": [
     {
-      "tagName": "@example",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@example"
     },
     {
-      "tagName": "@contract",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@contract"
     },
     {
-      "tagName": "@wallet",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@wallet"
     },
     {
-      "tagName": "@extension",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@extension"
     },
     {
-      "tagName": "@rpc",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@rpc"
     },
     {
-      "tagName": "@transaction",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@transaction"
     },
     {
-      "tagName": "@connectWallet",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@connectWallet"
     },
     {
-      "tagName": "@theme",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@theme"
     },
     {
-      "tagName": "@locale",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@locale"
     },
     {
-      "tagName": "@component",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@component"
     },
     {
-      "tagName": "@walletConfig",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@walletConfig"
     },
     {
-      "tagName": "@walletConnection",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@walletConnection"
     },
     {
-      "tagName": "@walletUtils",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@walletUtils"
     },
     {
-      "tagName": "@buyCrypto",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@buyCrypto"
     },
     {
-      "tagName": "@bridge",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@bridge"
     },
     {
-      "tagName": "@storage",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@storage"
     },
     {
-      "tagName": "@auth",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@auth"
     },
     {
-      "tagName": "@utils",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@utils"
     },
     {
-      "tagName": "@chain",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@chain"
     },
     {
-      "tagName": "@modules",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@modules"
     },
     {
-      "tagName": "@social",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@social"
     },
     {
-      "tagName": "@client",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@client"
     },
     {
-      "tagName": "@nft",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@nft"
     },
     {
-      "tagName": "@account",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@account"
     },
     {
-      "tagName": "@nebula",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@nebula"
     },
     {
-      "tagName": "@insight",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@insight"
     },
     {
-      "tagName": "@engine",
-      "syntaxKind": "block"
+      "syntaxKind": "block",
+      "tagName": "@engine"
     }
-  ],
-  "supportForTags": {
-    "@contract": true,
-    "@wallet": true,
-    "@extension": true,
-    "@rpc": true,
-    "@transaction": true,
-    "@connectWallet": true,
-    "@theme": true,
-    "@locale": true,
-    "@component": true,
-    "@walletConfig": true,
-    "@walletConnection": true,
-    "@walletUtils": true,
-    "@buyCrypto": true,
-    "@bridge": true,
-    "@storage": true,
-    "@auth": true,
-    "@utils": true,
-    "@chain": true,
-    "@modules": true,
-    "@social": true,
-    "@client": true,
-    "@nft": true,
-    "@account": true,
-    "@beta": true,
-    "@nebula": true,
-    "@insight": true,
-    "@engine": true
-  }
+  ]
 }
diff --git a/packages/thirdweb/vite.config.ts b/packages/thirdweb/vite.config.ts
index c59a1bd7182..639fd032c8a 100644
--- a/packages/thirdweb/vite.config.ts
+++ b/packages/thirdweb/vite.config.ts
@@ -11,13 +11,13 @@ const quotesIfString = (value: string | undefined) => {
 };
 
 export default defineConfig({
-  plugins: [react()],
   define: {
-    "process.env.STORYBOOK_CLIENT_ID": quotesIfString(
-      process.env.STORYBOOK_CLIENT_ID,
-    ),
     "process.env.STORYBOOK_ACCOUNT_PRIVATE_KEY": quotesIfString(
       process.env.STORYBOOK_ACCOUNT_PRIVATE_KEY,
     ),
+    "process.env.STORYBOOK_CLIENT_ID": quotesIfString(
+      process.env.STORYBOOK_CLIENT_ID,
+    ),
   },
+  plugins: [react()],
 });
diff --git a/packages/vault-sdk/biome.json b/packages/vault-sdk/biome.json
new file mode 100644
index 00000000000..780bbdcd1af
--- /dev/null
+++ b/packages/vault-sdk/biome.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
+}
diff --git a/packages/vault-sdk/package.json b/packages/vault-sdk/package.json
index 0cc0b3fc486..919f6df5364 100644
--- a/packages/vault-sdk/package.json
+++ b/packages/vault-sdk/package.json
@@ -1,20 +1,22 @@
 {
-  "name": "@thirdweb-dev/vault-sdk",
-  "version": "0.0.3",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/thirdweb-dev/js.git#main"
-  },
-  "license": "Apache-2.0",
+  "author": "thirdweb eng <eng@thirdweb.com>",
   "bugs": {
     "url": "https://github.com/thirdweb-dev/js/issues"
   },
-  "author": "thirdweb eng <eng@thirdweb.com>",
-  "type": "module",
-  "main": "./dist/cjs/exports/thirdweb.js",
-  "module": "./dist/esm/exports/thirdweb.js",
-  "types": "./dist/types/exports/thirdweb.d.ts",
-  "typings": "./dist/types/exports/thirdweb.d.ts",
+  "dependencies": {
+    "@noble/ciphers": "^1.2.1",
+    "@noble/curves": "1.8.2",
+    "@noble/hashes": "1.7.2",
+    "abitype": "1.0.8",
+    "jose": "6.0.11"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "2.0.0",
+    "rimraf": "6.0.1"
+  },
+  "engines": {
+    "node": ">=18"
+  },
   "exports": {
     ".": {
       "types": "./dist/types/exports/thirdweb.d.ts",
@@ -27,16 +29,10 @@
     "dist/*",
     "src/*"
   ],
-  "dependencies": {
-    "@noble/ciphers": "^1.2.1",
-    "@noble/curves": "1.8.2",
-    "@noble/hashes": "1.7.2",
-    "abitype": "1.0.8",
-    "jose": "6.0.11"
-  },
-  "devDependencies": {
-    "rimraf": "6.0.1"
-  },
+  "license": "Apache-2.0",
+  "main": "./dist/cjs/exports/thirdweb.js",
+  "module": "./dist/esm/exports/thirdweb.js",
+  "name": "@thirdweb-dev/vault-sdk",
   "peerDependencies": {
     "typescript": ">=5.0.4"
   },
@@ -45,18 +41,23 @@
       "optional": true
     }
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thirdweb-dev/js.git#main"
+  },
   "scripts": {
-    "format": "biome format ./src --write",
-    "lint": "biome check ./src",
-    "fix": "biome check ./src --fix",
-    "dev": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm --watch",
     "build": "pnpm clean && pnpm build:cjs && pnpm build:esm && pnpm build:types",
     "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
     "build:esm": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
     "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
-    "clean": "rimraf dist"
+    "clean": "rimraf dist",
+    "dev": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm --watch",
+    "fix": "biome check ./src --fix",
+    "format": "biome format ./src --write",
+    "lint": "biome check ./src"
   },
-  "engines": {
-    "node": ">=18"
-  }
+  "type": "module",
+  "types": "./dist/types/exports/thirdweb.d.ts",
+  "typings": "./dist/types/exports/thirdweb.d.ts",
+  "version": "0.0.3"
 }
diff --git a/packages/vault-sdk/src/exports/thirdweb.ts b/packages/vault-sdk/src/exports/thirdweb.ts
index b97c7cf264f..51059bdc5a1 100644
--- a/packages/vault-sdk/src/exports/thirdweb.ts
+++ b/packages/vault-sdk/src/exports/thirdweb.ts
@@ -1,21 +1,21 @@
 export {
-  type VaultClient,
   createAccessToken,
   createEoa,
   createServiceAccount,
+  createSignedAccessToken,
   createVaultClient,
   getServiceAccount,
+  listAccessTokens,
   listEoas,
   ping,
   revokeAccessToken,
   rotateServiceAccount,
+  signAuthorization,
   signMessage,
+  signStructuredMessage,
   signTransaction,
   signTypedData,
-  listAccessTokens,
-  createSignedAccessToken,
-  signAuthorization,
-  signStructuredMessage,
+  type VaultClient,
 } from "../sdk.js";
 
 export {
@@ -45,15 +45,15 @@ export type {
   RotateServiceAccountPayload,
   SignAuthorizationData,
   SignAuthorizationOptions,
-  SignMessagePayload,
-  SignTransactionPayload,
-  SignTypedDataPayload,
   SignAuthorizationPayload,
   SignAuthorizationRules,
+  SignedAuthorization,
+  SignMessagePayload,
   SignStructuredMessageData,
   SignStructuredMessageOptions,
   SignStructuredMessagePayload,
-  SignedAuthorization,
+  SignTransactionPayload,
+  SignTypedDataPayload,
   StructuredMessageInput,
   UnencryptedErrorResponse,
   UserOperationV06Input,
diff --git a/packages/vault-sdk/src/sdk.ts b/packages/vault-sdk/src/sdk.ts
index 7f1e5eb8679..4ddeef31548 100644
--- a/packages/vault-sdk/src/sdk.ts
+++ b/packages/vault-sdk/src/sdk.ts
@@ -2,8 +2,7 @@ import { xchacha20poly1305 } from "@noble/ciphers/chacha";
 import { x25519 } from "@noble/curves/ed25519";
 import { hkdf } from "@noble/hashes/hkdf";
 import { sha256 } from "@noble/hashes/sha256";
-import { randomBytes } from "@noble/hashes/utils";
-import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
+import { bytesToHex, hexToBytes, randomBytes } from "@noble/hashes/utils";
 import type { TypedData } from "abitype";
 import * as jose from "jose";
 
@@ -60,9 +59,9 @@ function encryptForEnclave(
   // Format the encrypted package
   return {
     encryptedPayload: {
+      ciphertext: bytesToHex(ciphertext),
       ephemeralPublicKey: bytesToHex(ephemeralPublicKey),
       nonce: bytesToHex(nonce),
-      ciphertext: bytesToHex(ciphertext),
     },
     ephemeralPrivateKey: ephemeralPrivateKey,
   };
@@ -131,8 +130,8 @@ export async function createVaultClient(clientOptions?: {
 
   try {
     const response = await fetch(url, {
-      method: "GET",
       headers,
+      method: "GET",
     });
 
     // fetch doesn't throw on HTTP errors (like 4xx, 5xx) by default.
@@ -185,14 +184,14 @@ async function sendRequest<P extends Payload>({
 
   try {
     const response = await fetch(url, {
-      method: "POST",
+      // Stringify the JSON payload for the request body
+      body: JSON.stringify(encryptedPayload),
       headers: {
         ...client.headers,
-        "Content-Type": "application/json",
-        Accept: "application/json", // Good practice to specify accept header
+        Accept: "application/json",
+        "Content-Type": "application/json", // Good practice to specify accept header
       },
-      // Stringify the JSON payload for the request body
-      body: JSON.stringify(encryptedPayload),
+      method: "POST",
     });
 
     // IMPORTANT: Replicate ky's throwHttpErrors: false behavior.
@@ -207,7 +206,6 @@ async function sendRequest<P extends Payload>({
       // If JSON parsing fails (e.g., 500 error with HTML body),
       // construct a generic error response.
       return {
-        success: false,
         data: null,
         error: {
           code: "FETCH_PARSE_ERROR",
@@ -219,6 +217,7 @@ async function sendRequest<P extends Payload>({
               : String(parseError)
           }`,
         },
+        success: false,
       } as Prettify<P["output"]>; // Cast needed because error isn't strictly EncryptedError | UnencryptedError
     }
 
@@ -226,9 +225,9 @@ async function sendRequest<P extends Payload>({
     if (isErrorResponse(responseData)) {
       console.error("🚨 Error response from enclave:", responseData);
       return {
-        success: false,
         data: null,
-        error: responseData.error, // Use the error from the response body
+        error: responseData.error,
+        success: false, // Use the error from the response body
       } as Prettify<P["output"]>;
     }
 
@@ -244,13 +243,13 @@ async function sendRequest<P extends Payload>({
   } catch (error) {
     // Catch network errors during the fetch itself
     return {
-      success: false,
       data: null,
       error: {
         code: "FETCH_NETWORK_ERROR",
         message:
           error instanceof Error ? error.message : "Unknown network error",
       },
+      success: false,
     } as Prettify<P["output"]>; // Cast needed
   }
 }
@@ -264,11 +263,11 @@ type PayloadParams<P extends Payload> = {
 // ========== Helper functions ==========
 export function ping({ client, request: options }: PayloadParams<PingPayload>) {
   return sendRequest<PingPayload>({
+    client,
     request: {
       operation: "ping",
       ...options,
     },
-    client,
   });
 }
 
@@ -277,11 +276,11 @@ export function createServiceAccount({
   request: options,
 }: PayloadParams<CreateServiceAccountPayload>) {
   return sendRequest<CreateServiceAccountPayload>({
+    client,
     request: {
       operation: "serviceAccount:create",
       ...options,
     },
-    client,
   });
 }
 
@@ -290,11 +289,11 @@ export function getServiceAccount({
   request: options,
 }: PayloadParams<GetServiceAccountPayload>) {
   return sendRequest<GetServiceAccountPayload>({
+    client,
     request: {
       operation: "serviceAccount:get",
       ...options,
     },
-    client,
   });
 }
 
@@ -303,11 +302,11 @@ export function rotateServiceAccount({
   request: options,
 }: PayloadParams<RotateServiceAccountPayload>) {
   return sendRequest<RotateServiceAccountPayload>({
+    client,
     request: {
       operation: "serviceAccount:rotate",
       ...options,
     },
-    client,
   });
 }
 
@@ -316,11 +315,11 @@ export function createEoa({
   request: options,
 }: PayloadParams<CreateEoaPayload>) {
   return sendRequest<CreateEoaPayload>({
+    client,
     request: {
       operation: "eoa:create",
       ...options,
     },
-    client,
   });
 }
 
@@ -329,11 +328,11 @@ export function listEoas({
   request: options,
 }: PayloadParams<ListEoaPayload>) {
   return sendRequest<ListEoaPayload>({
+    client,
     request: {
       operation: "eoa:list",
       ...options,
     },
-    client,
   });
 }
 
@@ -342,11 +341,11 @@ export function signTransaction({
   request: options,
 }: PayloadParams<SignTransactionPayload>) {
   return sendRequest<SignTransactionPayload>({
+    client,
     request: {
       operation: "eoa:signTransaction",
       ...options,
     },
-    client,
   });
 }
 
@@ -355,11 +354,11 @@ export function signMessage({
   request: options,
 }: PayloadParams<SignMessagePayload>) {
   return sendRequest<SignMessagePayload>({
+    client,
     request: {
       operation: "eoa:signMessage",
       ...options,
     },
-    client,
   });
 }
 
@@ -368,11 +367,11 @@ export function createAccessToken({
   request: options,
 }: PayloadParams<CreateAccessTokenPayload>) {
   return sendRequest<CreateAccessTokenPayload>({
+    client,
     request: {
       operation: "accessToken:create",
       ...options,
     },
-    client,
   });
 }
 
@@ -384,15 +383,15 @@ export function signTypedData<
   request: options,
 }: PayloadParams<CheckedSignTypedDataPayload<Types, PrimaryType>>) {
   return sendRequest<CheckedSignTypedDataPayload<Types, PrimaryType>>({
+    client,
     request: {
-      operation: "eoa:signTypedData",
       auth: options.auth,
+      operation: "eoa:signTypedData",
       options: {
         from: options.options.from,
         typedData: options.options.typedData,
       },
     },
-    client,
   });
 }
 
@@ -401,11 +400,11 @@ export function revokeAccessToken({
   request: options,
 }: PayloadParams<RevokeAccessTokenPayload>) {
   return sendRequest<RevokeAccessTokenPayload>({
+    client,
     request: {
       operation: "accessToken:revoke",
       ...options,
     },
-    client,
   });
 }
 
@@ -414,11 +413,11 @@ export function signAuthorization({
   request: options,
 }: PayloadParams<SignAuthorizationPayload>) {
   return sendRequest<SignAuthorizationPayload>({
+    client,
     request: {
       operation: "eoa:signAuthorization",
       ...options,
     },
-    client,
   });
 }
 
@@ -427,11 +426,11 @@ export function signStructuredMessage({
   request: options,
 }: PayloadParams<SignStructuredMessagePayload>) {
   return sendRequest<SignStructuredMessagePayload>({
+    client,
     request: {
       operation: "eoa:signStructuredMessage",
       ...options,
     },
-    client,
   });
 }
 
@@ -440,11 +439,11 @@ export function listAccessTokens({
   request: options,
 }: PayloadParams<ListAccessTokensPayload>) {
   return sendRequest<ListAccessTokensPayload>({
+    client,
     request: {
       operation: "accessToken:list",
       ...options,
     },
-    client,
   });
 }
 
@@ -534,12 +533,12 @@ export async function createSignedAccessToken({
 
     // 6. Prepare JWT Claims
     const claims = {
+      encrypted_token: bytesToHex(ciphertext),
+      ephemeral_public_key: bytesToHex(clientEphemeralPublicKey),
       // Match Rust SignedTokenClaims struct (ensure names match server expectation)
       exp: expiryTimestamp,
       iat: Math.floor(Date.now() / 1000),
-      encrypted_token: bytesToHex(ciphertext),
       nonce: bytesToHex(nonce),
-      ephemeral_public_key: bytesToHex(clientEphemeralPublicKey),
       policies: additionalPolicies,
     };
 
diff --git a/packages/vault-sdk/src/transaction-parser.ts b/packages/vault-sdk/src/transaction-parser.ts
index 81720920531..bb50599b11f 100644
--- a/packages/vault-sdk/src/transaction-parser.ts
+++ b/packages/vault-sdk/src/transaction-parser.ts
@@ -106,20 +106,19 @@ function parseTransaction(
   try {
     // Normalize and validate basics first
     const normalizedTx = {
+      // Handle gas/gasLimit field, converting to hex
+      gasLimit: normalizeGasLimit(clientTx),
       // Handle string/data field, prioritizing input
       input: normalizeInputData(clientTx),
 
       // Convert nonce to hex string
       nonce: normalizeNonce(clientTx),
 
-      // Convert value to hex string
-      value: normalizeValue(clientTx),
-
       // Handle to address, null for contract creation
       to: normalizeTo(clientTx),
 
-      // Handle gas/gasLimit field, converting to hex
-      gasLimit: normalizeGasLimit(clientTx),
+      // Convert value to hex string
+      value: normalizeValue(clientTx),
     };
 
     // Determine transaction type
@@ -179,8 +178,7 @@ function toHexString(value: number | bigint | string | undefined): string {
   }
 
   // Convert to lowercase hex string with 0x prefix
-  // biome-ignore lint/style/useTemplate: <explanation>
-  return "0x" + bigIntValue.toString(16);
+  return `0x${bigIntValue.toString(16)}`;
 }
 
 /**
@@ -579,14 +577,14 @@ function createLegacyTransaction(
   assert(gasPrice, "Gas price is required for legacy transactions");
 
   return {
-    type: "0x00",
-    chainId: normalizeChainId(chainId), // Optional for legacy
-    nonce,
+    chainId: normalizeChainId(chainId),
+    gasLimit, // Optional for legacy
     gasPrice: normalizeGasPrice(gasPrice),
-    gasLimit,
+    input,
+    nonce,
     to,
+    type: "0x00",
     value,
-    input,
   };
 }
 
@@ -610,15 +608,15 @@ function createEip2930Transaction(
   assert(gasPrice, "Gas price is required for EIP-2930 transactions");
 
   return {
-    type: "0x01",
+    accessList: normalizeAccessList(clientTx),
     chainId: normalizeChainId(chainId) as string, // Required for EIP-2930
-    nonce,
-    gasPrice: normalizeGasPrice(gasPrice),
     gasLimit,
+    gasPrice: normalizeGasPrice(gasPrice),
+    input,
+    nonce,
     to,
+    type: "0x01",
     value,
-    accessList: normalizeAccessList(clientTx),
-    input,
   };
 }
 
@@ -646,16 +644,16 @@ function createEip1559Transaction(
   );
 
   return {
-    type: "0x02",
+    accessList: normalizeAccessList(clientTx),
     chainId: normalizeChainId(chainId) as string,
-    nonce,
     gasLimit,
+    input,
     maxFeePerGas: normalizeGasPrice(maxFeePerGas),
     maxPriorityFeePerGas: normalizeGasPrice(maxPriorityFeePerGas),
+    nonce,
     to,
+    type: "0x02", // Always provide access list, empty array if not specified
     value,
-    accessList: normalizeAccessList(clientTx), // Always provide access list, empty array if not specified
-    input,
   };
 }
 
@@ -701,18 +699,18 @@ function createEip4844Transaction(
 
   // Base transaction without sidecar
   const baseTransaction: TxEip4844 = {
-    type: "0x03",
+    accessList: normalizeAccessList(clientTx),
+    blobVersionedHashes,
     chainId: normalizeChainId(chainId) as string,
-    nonce,
     gasLimit,
+    input,
+    maxFeePerBlobGas: normalizeGasPrice(maxFeePerBlobGas),
     maxFeePerGas: normalizeGasPrice(maxFeePerGas),
     maxPriorityFeePerGas: normalizeGasPrice(maxPriorityFeePerGas),
+    nonce,
     to: to as Address,
+    type: "0x03",
     value,
-    accessList: normalizeAccessList(clientTx),
-    blobVersionedHashes,
-    maxFeePerBlobGas: normalizeGasPrice(maxFeePerBlobGas),
-    input,
   };
 
   // Check for blob data in any of the possible formats
@@ -761,17 +759,17 @@ function createEip7702Transaction(
   );
 
   return {
-    type: "0x05",
+    accessList: normalizeAccessList(clientTx),
+    authorizationList: normalizeAuthorizationList(authorizationList),
     chainId: normalizeChainId(chainId) as string,
-    nonce,
     gasLimit,
+    input,
     maxFeePerGas: normalizeGasPrice(maxFeePerGas),
     maxPriorityFeePerGas: normalizeGasPrice(maxPriorityFeePerGas),
+    nonce,
     to: to as Address,
+    type: "0x05",
     value,
-    accessList: normalizeAccessList(clientTx),
-    authorizationList: normalizeAuthorizationList(authorizationList),
-    input,
   };
 }
 
diff --git a/packages/vault-sdk/src/types.ts b/packages/vault-sdk/src/types.ts
index 5456b2a5d32..6ea9632234c 100644
--- a/packages/vault-sdk/src/types.ts
+++ b/packages/vault-sdk/src/types.ts
@@ -161,7 +161,7 @@ type CheckedSignTypedDataOptions<
   from: string;
 };
 
-// biome-ignore lint/suspicious/noExplicitAny: <explanation>
+// biome-ignore lint/suspicious/noExplicitAny: we truly want to accept anything here
 type SignedTypedDataOptions = CheckedSignTypedDataOptions<any, any>;
 
 // ========== User Operation Types ==========
diff --git a/packages/vault-sdk/tsconfig.base.json b/packages/vault-sdk/tsconfig.base.json
index 2b519cac7ea..25c55988d49 100644
--- a/packages/vault-sdk/tsconfig.base.json
+++ b/packages/vault-sdk/tsconfig.base.json
@@ -1,47 +1,48 @@
 {
   // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
-  "include": [],
   "compilerOptions": {
     // Incremental builds
     // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
-    "incremental": false,
-
-    // Type checking
-    "strict": true,
-    "useDefineForClassFields": true, // Not enabled by default in `strict` mode unless we bump `target` to ES2022.
-    "noFallthroughCasesInSwitch": true, // Not enabled by default in `strict` mode.
-    "noImplicitReturns": true, // Not enabled by default in `strict` mode.
-    "useUnknownInCatchVariables": true, // TODO: This would normally be enabled in `strict` mode but would require some adjustments to the codebase.
-    "noImplicitOverride": true, // Not enabled by default in `strict` mode.
-    "noUnusedLocals": true, // Not enabled by default in `strict` mode.
-    "noUnusedParameters": true, // Not enabled by default in `strict` mode.
-    "exactOptionalPropertyTypes": false, // Not enabled by default in `strict` mode.
-    "noUncheckedIndexedAccess": true, // Not enabled by default in `strict` mode.
-
-    // JavaScript support
     "allowJs": false,
+    "allowSyntheticDefaultImports": true,
     "checkJs": false,
 
     // Interop constraints
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
+    "exactOptionalPropertyTypes": false,
     "forceConsistentCasingInFileNames": true,
-    "verbatimModuleSyntax": true,
-    "importHelpers": true, // This is only used for build validation. Since we do not have `tslib` installed, this will fail if we accidentally make use of anything that'd require injection of helpers.
+    "importHelpers": true,
+    // Incremental builds
+    // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
+    "incremental": false,
 
-    // Language and environment
-    "moduleResolution": "NodeNext",
-    "module": "NodeNext",
-    "target": "ES2021", // Setting this to `ES2021` enables native support for `Node v16+`: https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping.
+    // jsx for "/react" portion
+    "jsx": "react-jsx",
     "lib": [
       "ES2022", // By using ES2022 we get access to the `.cause` property on `Error` instances.
       "DOM" // We are adding `DOM` here to get the `fetch`, etc. types. This should be removed once these types are available via DefinitelyTyped.
     ],
+    "module": "NodeNext",
+
+    // Language and environment
+    "moduleResolution": "NodeNext",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
 
     // Skip type checking for node modules
     "skipLibCheck": true,
 
-    // jsx for "/react" portion
-    "jsx": "react-jsx"
-  }
+    // Type checking
+    "strict": true,
+    "target": "ES2021",
+    "useDefineForClassFields": true,
+    "useUnknownInCatchVariables": true,
+    "verbatimModuleSyntax": true
+  },
+  // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
+  "include": []
 }
diff --git a/packages/vault-sdk/tsconfig.build.json b/packages/vault-sdk/tsconfig.build.json
index 3ae3943df87..63325457c67 100644
--- a/packages/vault-sdk/tsconfig.build.json
+++ b/packages/vault-sdk/tsconfig.build.json
@@ -1,6 +1,9 @@
 {
-  "extends": "./tsconfig.base.json",
-  "include": ["src"],
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "rootDir": "./src",
+    "sourceMap": true
+  },
   "exclude": [
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
@@ -8,9 +11,6 @@
     "src/**/*.bench.ts",
     "src/**/*.macro.ts"
   ],
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.base.json",
+  "include": ["src"]
 }
diff --git a/packages/vault-sdk/tsconfig.json b/packages/vault-sdk/tsconfig.json
index f8b525d0c97..bd4c14699e3 100644
--- a/packages/vault-sdk/tsconfig.json
+++ b/packages/vault-sdk/tsconfig.json
@@ -1,13 +1,13 @@
 {
   // This configuration is used for local development and type checking.
-  "extends": "./tsconfig.base.json",
-  "include": ["src", "test"],
-  "exclude": [],
-  // "references": [{ "path": "./scripts/tsconfig.json" }],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
       "~test/*": ["./test/src/*"]
     }
-  }
+  },
+  "exclude": [],
+  // This configuration is used for local development and type checking.
+  "extends": "./tsconfig.base.json",
+  "include": ["src", "test"]
 }
diff --git a/packages/wagmi-adapter/biome.json b/packages/wagmi-adapter/biome.json
new file mode 100644
index 00000000000..780bbdcd1af
--- /dev/null
+++ b/packages/wagmi-adapter/biome.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "extends": "//"
+}
diff --git a/packages/wagmi-adapter/package.json b/packages/wagmi-adapter/package.json
index 55516cdc7f6..a3adbf5dda8 100644
--- a/packages/wagmi-adapter/package.json
+++ b/packages/wagmi-adapter/package.json
@@ -1,20 +1,17 @@
 {
-  "name": "@thirdweb-dev/wagmi-adapter",
-  "version": "0.2.94",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/thirdweb-dev/js.git#main"
-  },
-  "license": "Apache-2.0",
+  "author": "thirdweb eng <eng@thirdweb.com>",
   "bugs": {
     "url": "https://github.com/thirdweb-dev/js/issues"
   },
-  "author": "thirdweb eng <eng@thirdweb.com>",
-  "type": "module",
-  "main": "./dist/cjs/exports/thirdweb.js",
-  "module": "./dist/esm/exports/thirdweb.js",
-  "types": "./dist/types/exports/thirdweb.d.ts",
-  "typings": "./dist/types/exports/thirdweb.d.ts",
+  "devDependencies": {
+    "@biomejs/biome": "2.0.0",
+    "@wagmi/core": "2.17.3",
+    "rimraf": "6.0.1",
+    "thirdweb": "workspace:*"
+  },
+  "engines": {
+    "node": ">=18"
+  },
   "exports": {
     ".": {
       "types": "./dist/types/exports/thirdweb.d.ts",
@@ -27,11 +24,10 @@
     "dist/*",
     "src/*"
   ],
-  "devDependencies": {
-    "@wagmi/core": "2.17.3",
-    "rimraf": "6.0.1",
-    "thirdweb": "workspace:*"
-  },
+  "license": "Apache-2.0",
+  "main": "./dist/cjs/exports/thirdweb.js",
+  "module": "./dist/esm/exports/thirdweb.js",
+  "name": "@thirdweb-dev/wagmi-adapter",
   "peerDependencies": {
     "@wagmi/core": "^2.16.0",
     "thirdweb": "^5.85.0",
@@ -42,17 +38,22 @@
       "optional": true
     }
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thirdweb-dev/js.git#main"
+  },
   "scripts": {
-    "format": "biome format ./src --write",
-    "lint": "biome check ./src",
-    "fix": "biome check ./src --fix",
     "build": "pnpm clean && pnpm build:cjs && pnpm build:esm && pnpm build:types",
     "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
     "build:esm": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
     "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
-    "clean": "rimraf dist"
+    "clean": "rimraf dist",
+    "fix": "biome check ./src --fix",
+    "format": "biome format ./src --write",
+    "lint": "biome check ./src"
   },
-  "engines": {
-    "node": ">=18"
-  }
+  "type": "module",
+  "types": "./dist/types/exports/thirdweb.d.ts",
+  "typings": "./dist/types/exports/thirdweb.d.ts",
+  "version": "0.2.94"
 }
diff --git a/packages/wagmi-adapter/src/connector.ts b/packages/wagmi-adapter/src/connector.ts
index 61e2ed2693b..1307d3f857a 100644
--- a/packages/wagmi-adapter/src/connector.ts
+++ b/packages/wagmi-adapter/src/connector.ts
@@ -1,13 +1,13 @@
 import { type CreateConnectorFn, createConnector } from "@wagmi/core";
 import type { Prettify } from "@wagmi/core/chains";
-import { type ThirdwebClient, defineChain, getAddress } from "thirdweb";
+import { defineChain, getAddress, type ThirdwebClient } from "thirdweb";
 import {
   EIP1193,
+  ecosystemWallet,
   type InAppWalletConnectionOptions,
   type InAppWalletCreationOptions,
   type MultiStepAuthArgsType,
   type SingleStepAuthArgsType,
-  ecosystemWallet,
   inAppWallet as thirdwebInAppWallet,
 } from "thirdweb/wallets";
 
@@ -93,10 +93,6 @@ export function inAppWalletConnector(
     : thirdwebInAppWallet(args);
   const client = args.client;
   return createConnector<Provider, Properties, StorageItem>((config) => ({
-    id: "in-app-wallet",
-    name: args.metadata?.name || "In-App wallet",
-    type: "in-app",
-    icon: args.metadata?.icon,
     connect: async (params) => {
       const rawStorage =
         typeof window !== "undefined" && window.localStorage
@@ -107,8 +103,8 @@ export function inAppWalletConnector(
         const { autoConnect } = await import("thirdweb/wallets");
         const chainId = lastChainId || args.smartAccount?.chain?.id || 1;
         await autoConnect({
-          client,
           chain: defineChain(chainId),
+          client,
           wallets: [wallet],
         });
 
@@ -136,8 +132,8 @@ export function inAppWalletConnector(
       );
       const decoratedOptions = {
         ...inAppOptions,
-        client,
         chain,
+        client,
       } as InAppWalletConnectionOptions;
       const account = await wallet.connect(decoratedOptions);
       // setting up raw local storage value for autoConnect
@@ -167,18 +163,30 @@ export function inAppWalletConnector(
       if (!wallet.getAccount()) {
         const { autoConnect } = await import("thirdweb/wallets");
         await autoConnect({
-          client,
           chain,
+          client,
           wallets: [wallet],
         });
       }
       return EIP1193.toProvider({
-        wallet,
-        client,
         chain: wallet.getChain() || chain,
+        client,
+        wallet,
       });
     },
-    isAuthorized: async () => true, // always try to reconnect
+    icon: args.metadata?.icon,
+    id: "in-app-wallet",
+    isAuthorized: async () => true,
+    name: args.metadata?.name || "In-App wallet",
+    onAccountsChanged: () => {
+      // no-op
+    }, // always try to reconnect
+    onChainChanged: () => {
+      // no-op
+    },
+    onDisconnect: () => {
+      // no-op
+    },
     switchChain: async (params) => {
       const chain = config.chains.find((x) => x.id === params.chainId);
       if (!chain) {
@@ -191,14 +199,6 @@ export function inAppWalletConnector(
       await config.storage?.setItem("thirdweb:lastChainId", chain.id);
       return chain;
     },
-    onAccountsChanged: () => {
-      // no-op
-    },
-    onChainChanged: () => {
-      // no-op
-    },
-    onDisconnect: () => {
-      // no-op
-    },
+    type: "in-app",
   }));
 }
diff --git a/packages/wagmi-adapter/src/exports/thirdweb.ts b/packages/wagmi-adapter/src/exports/thirdweb.ts
index 060e4570006..b5e93abebff 100644
--- a/packages/wagmi-adapter/src/exports/thirdweb.ts
+++ b/packages/wagmi-adapter/src/exports/thirdweb.ts
@@ -1,4 +1,4 @@
 export {
-  inAppWalletConnector,
   type InAppWalletParameters,
+  inAppWalletConnector,
 } from "../connector.js";
diff --git a/packages/wagmi-adapter/tsconfig.base.json b/packages/wagmi-adapter/tsconfig.base.json
index 2b519cac7ea..25c55988d49 100644
--- a/packages/wagmi-adapter/tsconfig.base.json
+++ b/packages/wagmi-adapter/tsconfig.base.json
@@ -1,47 +1,48 @@
 {
   // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
-  "include": [],
   "compilerOptions": {
     // Incremental builds
     // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
-    "incremental": false,
-
-    // Type checking
-    "strict": true,
-    "useDefineForClassFields": true, // Not enabled by default in `strict` mode unless we bump `target` to ES2022.
-    "noFallthroughCasesInSwitch": true, // Not enabled by default in `strict` mode.
-    "noImplicitReturns": true, // Not enabled by default in `strict` mode.
-    "useUnknownInCatchVariables": true, // TODO: This would normally be enabled in `strict` mode but would require some adjustments to the codebase.
-    "noImplicitOverride": true, // Not enabled by default in `strict` mode.
-    "noUnusedLocals": true, // Not enabled by default in `strict` mode.
-    "noUnusedParameters": true, // Not enabled by default in `strict` mode.
-    "exactOptionalPropertyTypes": false, // Not enabled by default in `strict` mode.
-    "noUncheckedIndexedAccess": true, // Not enabled by default in `strict` mode.
-
-    // JavaScript support
     "allowJs": false,
+    "allowSyntheticDefaultImports": true,
     "checkJs": false,
 
     // Interop constraints
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
+    "exactOptionalPropertyTypes": false,
     "forceConsistentCasingInFileNames": true,
-    "verbatimModuleSyntax": true,
-    "importHelpers": true, // This is only used for build validation. Since we do not have `tslib` installed, this will fail if we accidentally make use of anything that'd require injection of helpers.
+    "importHelpers": true,
+    // Incremental builds
+    // NOTE: Enabling incremental builds speeds up `tsc`. Keep in mind though that it does not reliably bust the cache when the `tsconfig.json` file changes.
+    "incremental": false,
 
-    // Language and environment
-    "moduleResolution": "NodeNext",
-    "module": "NodeNext",
-    "target": "ES2021", // Setting this to `ES2021` enables native support for `Node v16+`: https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping.
+    // jsx for "/react" portion
+    "jsx": "react-jsx",
     "lib": [
       "ES2022", // By using ES2022 we get access to the `.cause` property on `Error` instances.
       "DOM" // We are adding `DOM` here to get the `fetch`, etc. types. This should be removed once these types are available via DefinitelyTyped.
     ],
+    "module": "NodeNext",
+
+    // Language and environment
+    "moduleResolution": "NodeNext",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
 
     // Skip type checking for node modules
     "skipLibCheck": true,
 
-    // jsx for "/react" portion
-    "jsx": "react-jsx"
-  }
+    // Type checking
+    "strict": true,
+    "target": "ES2021",
+    "useDefineForClassFields": true,
+    "useUnknownInCatchVariables": true,
+    "verbatimModuleSyntax": true
+  },
+  // This tsconfig file contains the shared config for the build (tsconfig.build.json) and type checking (tsconfig.json) config.
+  "include": []
 }
diff --git a/packages/wagmi-adapter/tsconfig.build.json b/packages/wagmi-adapter/tsconfig.build.json
index 3ae3943df87..63325457c67 100644
--- a/packages/wagmi-adapter/tsconfig.build.json
+++ b/packages/wagmi-adapter/tsconfig.build.json
@@ -1,6 +1,9 @@
 {
-  "extends": "./tsconfig.base.json",
-  "include": ["src"],
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "rootDir": "./src",
+    "sourceMap": true
+  },
   "exclude": [
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
@@ -8,9 +11,6 @@
     "src/**/*.bench.ts",
     "src/**/*.macro.ts"
   ],
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.base.json",
+  "include": ["src"]
 }
diff --git a/packages/wagmi-adapter/tsconfig.json b/packages/wagmi-adapter/tsconfig.json
index f8b525d0c97..bd4c14699e3 100644
--- a/packages/wagmi-adapter/tsconfig.json
+++ b/packages/wagmi-adapter/tsconfig.json
@@ -1,13 +1,13 @@
 {
   // This configuration is used for local development and type checking.
-  "extends": "./tsconfig.base.json",
-  "include": ["src", "test"],
-  "exclude": [],
-  // "references": [{ "path": "./scripts/tsconfig.json" }],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
       "~test/*": ["./test/src/*"]
     }
-  }
+  },
+  "exclude": [],
+  // This configuration is used for local development and type checking.
+  "extends": "./tsconfig.base.json",
+  "include": ["src", "test"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 30ab38bfafe..b424d902e0d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -38,8 +38,8 @@ importers:
   .:
     devDependencies:
       '@biomejs/biome':
-        specifier: 1.9.4
-        version: 1.9.4
+        specifier: 2.0.0
+        version: 2.0.0
       '@changesets/changelog-github':
         specifier: 0.5.1
         version: 0.5.1(encoding@0.1.13)
@@ -308,6 +308,9 @@ importers:
         specifier: 3.25.62
         version: 3.25.62
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@chakra-ui/cli':
         specifier: ^2.4.1
         version: 2.5.6
@@ -408,97 +411,6 @@ importers:
         specifier: 5.8.3
         version: 5.8.3
 
-  apps/login:
-    dependencies:
-      '@radix-ui/react-dropdown-menu':
-        specifier: ^2.1.15
-        version: 2.1.15(@types/react-dom@19.1.6(@types/react@19.1.8))(@types/react@19.1.8)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      '@radix-ui/react-label':
-        specifier: ^2.1.7
-        version: 2.1.7(@types/react-dom@19.1.6(@types/react@19.1.8))(@types/react@19.1.8)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      '@radix-ui/react-select':
-        specifier: ^2.2.5
-        version: 2.2.5(@types/react-dom@19.1.6(@types/react@19.1.8))(@types/react@19.1.8)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      '@radix-ui/react-separator':
-        specifier: ^1.1.7
-        version: 1.1.7(@types/react-dom@19.1.6(@types/react@19.1.8))(@types/react@19.1.8)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      '@radix-ui/react-slot':
-        specifier: ^1.2.3
-        version: 1.2.3(@types/react@19.1.8)(react@19.1.0)
-      '@radix-ui/react-switch':
-        specifier: ^1.2.5
-        version: 1.2.5(@types/react-dom@19.1.6(@types/react@19.1.8))(@types/react@19.1.8)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      '@radix-ui/react-tooltip':
-        specifier: 1.2.7
-        version: 1.2.7(@types/react-dom@19.1.6(@types/react@19.1.8))(@types/react@19.1.8)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      class-variance-authority:
-        specifier: ^0.7.1
-        version: 0.7.1
-      clsx:
-        specifier: ^2.1.1
-        version: 2.1.1
-      jose:
-        specifier: 6.0.11
-        version: 6.0.11
-      lucide-react:
-        specifier: 0.514.0
-        version: 0.514.0(react@19.1.0)
-      next:
-        specifier: 15.3.3
-        version: 15.3.3(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      next-themes:
-        specifier: ^0.4.6
-        version: 0.4.6(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      react:
-        specifier: 19.1.0
-        version: 19.1.0
-      react-dom:
-        specifier: 19.1.0
-        version: 19.1.0(react@19.1.0)
-      server-only:
-        specifier: ^0.0.1
-        version: 0.0.1
-      sonner:
-        specifier: 2.0.5
-        version: 2.0.5(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      tailwind-merge:
-        specifier: ^2.6.0
-        version: 2.6.0
-      tailwindcss-animate:
-        specifier: ^1.0.7
-        version: 1.0.7(tailwindcss@3.4.17)
-      thirdweb:
-        specifier: workspace:*
-        version: link:../../packages/thirdweb
-    devDependencies:
-      '@eslint/eslintrc':
-        specifier: ^3.3.1
-        version: 3.3.1
-      '@types/node':
-        specifier: 22.14.1
-        version: 22.14.1
-      '@types/react':
-        specifier: 19.1.8
-        version: 19.1.8
-      '@types/react-dom':
-        specifier: 19.1.6
-        version: 19.1.6(@types/react@19.1.8)
-      eslint:
-        specifier: 9.24.0
-        version: 9.24.0(jiti@2.4.2)
-      eslint-config-next:
-        specifier: 15.3.3
-        version: 15.3.3(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-      postcss:
-        specifier: 8.5.5
-        version: 8.5.5
-      tailwindcss:
-        specifier: 3.4.17
-        version: 3.4.17
-      typescript:
-        specifier: 5.8.3
-        version: 5.8.3
-
   apps/nebula:
     dependencies:
       '@hookform/resolvers':
@@ -616,6 +528,9 @@ importers:
         specifier: 3.25.62
         version: 3.25.62
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@chromatic-com/storybook':
         specifier: 4.0.0
         version: 4.0.0(storybook@9.0.8(@testing-library/dom@10.4.0)(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5))
@@ -785,6 +700,9 @@ importers:
         specifier: 3.25.62
         version: 3.25.62
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@types/node':
         specifier: 22.14.1
         version: 22.14.1
@@ -945,6 +863,9 @@ importers:
         specifier: 0.9.4
         version: 0.9.4(typescript@5.8.3)
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@next/eslint-plugin-next':
         specifier: 15.3.3
         version: 15.3.3
@@ -1084,6 +1005,9 @@ importers:
         specifier: 3.25.62
         version: 3.25.62
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@next/eslint-plugin-next':
         specifier: 15.3.3
         version: 15.3.3
@@ -1136,6 +1060,9 @@ importers:
         specifier: '>=5.0.4'
         version: 5.8.3
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@hey-api/openapi-ts':
         specifier: 0.72.1
         version: 0.72.1(magicast@0.3.5)(typescript@5.8.3)
@@ -1155,6 +1082,9 @@ importers:
         specifier: '>=5.0.4'
         version: 5.8.3
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@hey-api/openapi-ts':
         specifier: 0.72.1
         version: 0.72.1(magicast@0.3.5)(typescript@5.8.3)
@@ -1176,6 +1106,9 @@ importers:
       '@aws-sdk/credential-providers':
         specifier: 3.592.0
         version: 3.592.0(@aws-sdk/client-sso-oidc@3.828.0)
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@coinbase/wallet-mobile-sdk':
         specifier: ^1
         version: 1.1.2(expo@53.0.11(@babel/core@7.27.4)(bufferutil@4.0.9)(graphql@16.11.0)(react-native@0.78.1(@babel/core@7.27.4)(@babel/preset-env@7.27.2(@babel/core@7.27.4))(@types/react@19.1.8)(bufferutil@4.0.9)(react@19.1.0)(utf-8-validate@5.0.10))(react@19.1.0)(utf-8-validate@5.0.10))(react-native@0.78.1(@babel/core@7.27.4)(@babel/preset-env@7.27.2(@babel/core@7.27.4))(@types/react@19.1.8)(bufferutil@4.0.9)(react@19.1.0)(utf-8-validate@5.0.10))(react@19.1.0)
@@ -1235,6 +1168,9 @@ importers:
         specifier: 3.25.62
         version: 3.25.62
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@cloudflare/workers-types':
         specifier: 4.20250612.0
         version: 4.20250612.0
@@ -1354,8 +1290,8 @@ importers:
         specifier: 3.592.0
         version: 3.592.0(@aws-sdk/client-sso-oidc@3.828.0)
       '@biomejs/biome':
-        specifier: 1.9.4
-        version: 1.9.4
+        specifier: 2.0.0
+        version: 2.0.0
       '@chromatic-com/storybook':
         specifier: 4.0.0
         version: 4.0.0(storybook@9.0.8(@testing-library/dom@10.4.0)(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@5.0.10))
@@ -1513,6 +1449,9 @@ importers:
         specifier: '>=5.0.4'
         version: 5.8.3
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       rimraf:
         specifier: 6.0.1
         version: 6.0.1
@@ -1523,6 +1462,9 @@ importers:
         specifier: '>=5.0.4'
         version: 5.8.3
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       '@wagmi/core':
         specifier: 2.17.3
         version: 2.17.3(@tanstack/query-core@5.80.7)(@types/react@19.1.8)(react@19.1.0)(typescript@5.8.3)(use-sync-external-store@1.5.0(react@19.1.0))(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@6.0.5)(zod@3.25.62))
@@ -2551,55 +2493,55 @@ packages:
     resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
     engines: {node: '>=18'}
 
-  '@biomejs/biome@1.9.4':
-    resolution: {integrity: sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==}
+  '@biomejs/biome@2.0.0':
+    resolution: {integrity: sha512-BlUoXEOI/UQTDEj/pVfnkMo8SrZw3oOWBDrXYFT43V7HTkIUDkBRY53IC5Jx1QkZbaB+0ai1wJIfYwp9+qaJTQ==}
     engines: {node: '>=14.21.3'}
     hasBin: true
 
-  '@biomejs/cli-darwin-arm64@1.9.4':
-    resolution: {integrity: sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==}
+  '@biomejs/cli-darwin-arm64@2.0.0':
+    resolution: {integrity: sha512-QvqWYtFFhhxdf8jMAdJzXW+Frc7X8XsnHQLY+TBM1fnT1TfeV/v9vsFI5L2J7GH6qN1+QEEJ19jHibCY2Ypplw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
-  '@biomejs/cli-darwin-x64@1.9.4':
-    resolution: {integrity: sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==}
+  '@biomejs/cli-darwin-x64@2.0.0':
+    resolution: {integrity: sha512-5JFhls1EfmuIH4QGFPlNpxJQFC6ic3X1ltcoLN+eSRRIPr6H/lUS1ttuD0Fj7rPgPhZqopK/jfH8UVj/1hIsQw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
-  '@biomejs/cli-linux-arm64-musl@1.9.4':
-    resolution: {integrity: sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==}
+  '@biomejs/cli-linux-arm64-musl@2.0.0':
+    resolution: {integrity: sha512-Bxsz8ki8+b3PytMnS5SgrGV+mbAWwIxI3ydChb/d1rURlJTMdxTTq5LTebUnlsUWAX6OvJuFeiVq9Gjn1YbCyA==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-arm64@1.9.4':
-    resolution: {integrity: sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==}
+  '@biomejs/cli-linux-arm64@2.0.0':
+    resolution: {integrity: sha512-BAH4QVi06TzAbVchXdJPsL0Z/P87jOfes15rI+p3EX9/EGTfIjaQ9lBVlHunxcmoptaA5y1Hdb9UYojIhmnjIw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64-musl@1.9.4':
-    resolution: {integrity: sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==}
+  '@biomejs/cli-linux-x64-musl@2.0.0':
+    resolution: {integrity: sha512-tiQ0ABxMJb9I6GlfNp0ulrTiQSFacJRJO8245FFwE3ty3bfsfxlU/miblzDIi+qNrgGsLq5wIZcVYGp4c+HXZA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64@1.9.4':
-    resolution: {integrity: sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==}
+  '@biomejs/cli-linux-x64@2.0.0':
+    resolution: {integrity: sha512-09PcOGYTtkopWRm6mZ/B6Mr6UHdkniUgIG/jLBv+2J8Z61ezRE+xQmpi3yNgUrFIAU4lPA9atg7mhvE/5Bo7Wg==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-win32-arm64@1.9.4':
-    resolution: {integrity: sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==}
+  '@biomejs/cli-win32-arm64@2.0.0':
+    resolution: {integrity: sha512-vrTtuGu91xNTEQ5ZcMJBZuDlqr32DWU1r14UfePIGndF//s2WUAmer4FmgoPgruo76rprk37e8S2A2c0psXdxw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
-  '@biomejs/cli-win32-x64@1.9.4':
-    resolution: {integrity: sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==}
+  '@biomejs/cli-win32-x64@2.0.0':
+    resolution: {integrity: sha512-2USVQ0hklNsph/KIR72ZdeptyXNnQ3JdzPn3NbjI4Sna34CnxeiYAaZcZzXPDl5PYNFBivV4xmvT3Z3rTmyDBg==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -3200,42 +3142,14 @@ packages:
     resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
-  '@eslint/config-array@0.20.0':
-    resolution: {integrity: sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/config-helpers@0.2.1':
-    resolution: {integrity: sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/core@0.12.0':
-    resolution: {integrity: sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@eslint/eslintrc@2.1.4':
     resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  '@eslint/eslintrc@3.3.1':
-    resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@eslint/js@8.57.0':
     resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  '@eslint/js@9.24.0':
-    resolution: {integrity: sha512-uIY/y3z0uvOGX8cp1C2fiC4+ZmBhp6yZWkojtHL1YEMnRt1Y63HB9TM17proGEmeG7HeUY+UP36F0aknKYTpYA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/object-schema@2.1.6':
-    resolution: {integrity: sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/plugin-kit@0.2.7':
-    resolution: {integrity: sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@ethereumjs/common@3.2.0':
     resolution: {integrity: sha512-pksvzI0VyLgmuEF2FA/JR/4/y6hcPq8OUail3/AvycBaW1d5VSauOZzqGvJ3RTmR4MU35lWE8KseKOsEhrFRBA==}
 
@@ -3509,14 +3423,6 @@ packages:
     peerDependencies:
       react-hook-form: ^7.0.0
 
-  '@humanfs/core@0.19.1':
-    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
-    engines: {node: '>=18.18.0'}
-
-  '@humanfs/node@0.16.6':
-    resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==}
-    engines: {node: '>=18.18.0'}
-
   '@humanwhocodes/config-array@0.11.14':
     resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
     engines: {node: '>=10.10.0'}
@@ -3530,14 +3436,6 @@ packages:
     resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
     deprecated: Use @eslint/object-schema instead
 
-  '@humanwhocodes/retry@0.3.1':
-    resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==}
-    engines: {node: '>=18.18'}
-
-  '@humanwhocodes/retry@0.4.2':
-    resolution: {integrity: sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==}
-    engines: {node: '>=18.18'}
-
   '@hyperjump/browser@1.3.1':
     resolution: {integrity: sha512-Le5XZUjnVqVjkgLYv6yyWgALat/0HpB1XaCPuCZ+GCFki9NvXloSZITIJ0H+wRW7mb9At1SxvohKBbNQbrr/cw==}
     engines: {node: '>=18.0.0'}
@@ -9724,10 +9622,6 @@ packages:
     resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  eslint-scope@8.3.0:
-    resolution: {integrity: sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   eslint-visitor-keys@3.4.3:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -9742,16 +9636,6 @@ packages:
     deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
 
-  eslint@9.24.0:
-    resolution: {integrity: sha512-eh/jxIEJyZrvbWRe4XuVclLPDYSYYYgLy5zXGGxD6j8zjSAxFEzI2fL/8xNq6O2yKqVt+eF2YhV+hxjV6UKXwQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    hasBin: true
-    peerDependencies:
-      jiti: '*'
-    peerDependenciesMeta:
-      jiti:
-        optional: true
-
   espree@10.3.0:
     resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -10113,10 +9997,6 @@ packages:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
 
-  file-entry-cache@8.0.0:
-    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
-    engines: {node: '>=16.0.0'}
-
   file-selector@2.1.2:
     resolution: {integrity: sha512-QgXo+mXTe8ljeqUFaX3QVHc5osSItJ/Km+xpocx0aSqWGMSCf6qYs/VnzZgS864Pjn5iceMRFigeAV7AfTlaig==}
     engines: {node: '>= 12'}
@@ -10186,10 +10066,6 @@ packages:
     resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
     engines: {node: ^10.12.0 || >=12.0.0}
 
-  flat-cache@4.0.1:
-    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
-    engines: {node: '>=16'}
-
   flatted@3.3.3:
     resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
 
@@ -10454,10 +10330,6 @@ packages:
     resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
     engines: {node: '>=8'}
 
-  globals@14.0.0:
-    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
-    engines: {node: '>=18'}
-
   globalthis@1.0.4:
     resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
     engines: {node: '>= 0.4'}
@@ -18007,39 +17879,39 @@ snapshots:
 
   '@bcoe/v8-coverage@1.0.2': {}
 
-  '@biomejs/biome@1.9.4':
+  '@biomejs/biome@2.0.0':
     optionalDependencies:
-      '@biomejs/cli-darwin-arm64': 1.9.4
-      '@biomejs/cli-darwin-x64': 1.9.4
-      '@biomejs/cli-linux-arm64': 1.9.4
-      '@biomejs/cli-linux-arm64-musl': 1.9.4
-      '@biomejs/cli-linux-x64': 1.9.4
-      '@biomejs/cli-linux-x64-musl': 1.9.4
-      '@biomejs/cli-win32-arm64': 1.9.4
-      '@biomejs/cli-win32-x64': 1.9.4
+      '@biomejs/cli-darwin-arm64': 2.0.0
+      '@biomejs/cli-darwin-x64': 2.0.0
+      '@biomejs/cli-linux-arm64': 2.0.0
+      '@biomejs/cli-linux-arm64-musl': 2.0.0
+      '@biomejs/cli-linux-x64': 2.0.0
+      '@biomejs/cli-linux-x64-musl': 2.0.0
+      '@biomejs/cli-win32-arm64': 2.0.0
+      '@biomejs/cli-win32-x64': 2.0.0
 
-  '@biomejs/cli-darwin-arm64@1.9.4':
+  '@biomejs/cli-darwin-arm64@2.0.0':
     optional: true
 
-  '@biomejs/cli-darwin-x64@1.9.4':
+  '@biomejs/cli-darwin-x64@2.0.0':
     optional: true
 
-  '@biomejs/cli-linux-arm64-musl@1.9.4':
+  '@biomejs/cli-linux-arm64-musl@2.0.0':
     optional: true
 
-  '@biomejs/cli-linux-arm64@1.9.4':
+  '@biomejs/cli-linux-arm64@2.0.0':
     optional: true
 
-  '@biomejs/cli-linux-x64-musl@1.9.4':
+  '@biomejs/cli-linux-x64-musl@2.0.0':
     optional: true
 
-  '@biomejs/cli-linux-x64@1.9.4':
+  '@biomejs/cli-linux-x64@2.0.0':
     optional: true
 
-  '@biomejs/cli-win32-arm64@1.9.4':
+  '@biomejs/cli-win32-arm64@2.0.0':
     optional: true
 
-  '@biomejs/cli-win32-x64@1.9.4':
+  '@biomejs/cli-win32-x64@2.0.0':
     optional: true
 
   '@bundled-es-modules/cookie@2.0.1':
@@ -18787,27 +18659,8 @@ snapshots:
       eslint: 8.57.0
       eslint-visitor-keys: 3.4.3
 
-  '@eslint-community/eslint-utils@4.7.0(eslint@9.24.0(jiti@2.4.2))':
-    dependencies:
-      eslint: 9.24.0(jiti@2.4.2)
-      eslint-visitor-keys: 3.4.3
-
   '@eslint-community/regexpp@4.12.1': {}
 
-  '@eslint/config-array@0.20.0':
-    dependencies:
-      '@eslint/object-schema': 2.1.6
-      debug: 4.4.1(supports-color@8.1.1)
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@eslint/config-helpers@0.2.1': {}
-
-  '@eslint/core@0.12.0':
-    dependencies:
-      '@types/json-schema': 7.0.15
-
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
@@ -18822,31 +18675,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/eslintrc@3.3.1':
-    dependencies:
-      ajv: 6.12.6
-      debug: 4.4.1(supports-color@8.1.1)
-      espree: 10.3.0
-      globals: 14.0.0
-      ignore: 5.3.2
-      import-fresh: 3.3.1
-      js-yaml: 4.1.0
-      minimatch: 3.1.2
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-
   '@eslint/js@8.57.0': {}
 
-  '@eslint/js@9.24.0': {}
-
-  '@eslint/object-schema@2.1.6': {}
-
-  '@eslint/plugin-kit@0.2.7':
-    dependencies:
-      '@eslint/core': 0.12.0
-      levn: 0.4.1
-
   '@ethereumjs/common@3.2.0':
     dependencies:
       '@ethereumjs/util': 10.0.0
@@ -19521,13 +19351,6 @@ snapshots:
     dependencies:
       react-hook-form: 7.55.0(react@19.1.0)
 
-  '@humanfs/core@0.19.1': {}
-
-  '@humanfs/node@0.16.6':
-    dependencies:
-      '@humanfs/core': 0.19.1
-      '@humanwhocodes/retry': 0.3.1
-
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
@@ -19540,10 +19363,6 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.3': {}
 
-  '@humanwhocodes/retry@0.3.1': {}
-
-  '@humanwhocodes/retry@0.4.2': {}
-
   '@hyperjump/browser@1.3.1':
     dependencies:
       '@hyperjump/json-pointer': 1.1.1
@@ -25360,24 +25179,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@7.14.1(@typescript-eslint/parser@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)':
-    dependencies:
-      '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-      '@typescript-eslint/scope-manager': 7.14.1
-      '@typescript-eslint/type-utils': 7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-      '@typescript-eslint/utils': 7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-      '@typescript-eslint/visitor-keys': 7.14.1
-      eslint: 9.24.0(jiti@2.4.2)
-      graphemer: 1.4.0
-      ignore: 5.3.2
-      natural-compare: 1.4.0
-      ts-api-utils: 1.4.3(typescript@5.8.3)
-    optionalDependencies:
-      typescript: 5.8.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 7.14.1
@@ -25391,19 +25192,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 7.14.1
-      '@typescript-eslint/types': 7.14.1
-      '@typescript-eslint/typescript-estree': 7.14.1(typescript@5.8.3)
-      '@typescript-eslint/visitor-keys': 7.14.1
-      debug: 4.4.1(supports-color@8.1.1)
-      eslint: 9.24.0(jiti@2.4.2)
-    optionalDependencies:
-      typescript: 5.8.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/project-service@8.34.0(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.34.0(typescript@5.8.3)
@@ -25439,18 +25227,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/type-utils@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)':
-    dependencies:
-      '@typescript-eslint/typescript-estree': 7.14.1(typescript@5.8.3)
-      '@typescript-eslint/utils': 7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-      debug: 4.4.1(supports-color@8.1.1)
-      eslint: 9.24.0(jiti@2.4.2)
-      ts-api-utils: 1.4.3(typescript@5.8.3)
-    optionalDependencies:
-      typescript: 5.8.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/types@7.14.1': {}
 
   '@typescript-eslint/types@8.34.0': {}
@@ -25497,17 +25273,6 @@ snapshots:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.7.0(eslint@9.24.0(jiti@2.4.2))
-      '@typescript-eslint/scope-manager': 7.14.1
-      '@typescript-eslint/types': 7.14.1
-      '@typescript-eslint/typescript-estree': 7.14.1(typescript@5.8.3)
-      eslint: 9.24.0(jiti@2.4.2)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   '@typescript-eslint/utils@8.34.0(eslint@8.57.0)(typescript@5.8.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.7.0(eslint@8.57.0)
@@ -29374,8 +29139,8 @@ snapshots:
       '@typescript-eslint/parser': 7.14.1(eslint@8.57.0)(typescript@5.8.3)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.0)
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.0)
       eslint-plugin-react: 7.37.5(eslint@8.57.0)
       eslint-plugin-react-hooks: 5.2.0(eslint@8.57.0)
@@ -29386,26 +29151,6 @@ snapshots:
       - eslint-plugin-import-x
       - supports-color
 
-  eslint-config-next@15.3.3(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3):
-    dependencies:
-      '@next/eslint-plugin-next': 15.3.3
-      '@rushstack/eslint-patch': 1.11.0
-      '@typescript-eslint/eslint-plugin': 7.14.1(@typescript-eslint/parser@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-      '@typescript-eslint/parser': 7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-      eslint: 9.24.0(jiti@2.4.2)
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0)(eslint@9.24.0(jiti@2.4.2))
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.24.0(jiti@2.4.2))
-      eslint-plugin-jsx-a11y: 6.10.2(eslint@9.24.0(jiti@2.4.2))
-      eslint-plugin-react: 7.37.5(eslint@9.24.0(jiti@2.4.2))
-      eslint-plugin-react-hooks: 5.2.0(eslint@9.24.0(jiti@2.4.2))
-    optionalDependencies:
-      typescript: 5.8.3
-    transitivePeerDependencies:
-      - eslint-import-resolver-webpack
-      - eslint-plugin-import-x
-      - supports-color
-
   eslint-import-resolver-node@0.3.9:
     dependencies:
       debug: 3.2.7
@@ -29414,7 +29159,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0):
+  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.4.1(supports-color@8.1.1)
@@ -29425,22 +29170,7 @@ snapshots:
       tinyglobby: 0.2.14
       unrs-resolver: 1.9.0
     optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@9.24.0(jiti@2.4.2)):
-    dependencies:
-      '@nolyfill/is-core-module': 1.0.39
-      debug: 4.4.1(supports-color@8.1.1)
-      eslint: 9.24.0(jiti@2.4.2)
-      get-tsconfig: 4.10.1
-      is-bun-module: 2.0.0
-      stable-hash: 0.0.5
-      tinyglobby: 0.2.14
-      unrs-resolver: 1.9.0
-    optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.24.0(jiti@2.4.2))
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -29465,29 +29195,18 @@ snapshots:
       - bluebird
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0))(eslint@8.57.0):
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 7.14.1(eslint@8.57.0)(typescript@5.8.3)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0)
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@9.24.0(jiti@2.4.2)))(eslint@9.24.0(jiti@2.4.2)):
-    dependencies:
-      debug: 3.2.7
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-      eslint: 9.24.0(jiti@2.4.2)
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0)(eslint@9.24.0(jiti@2.4.2))
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.0):
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -29498,7 +29217,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
@@ -29516,35 +29235,6 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.24.0(jiti@2.4.2)):
-    dependencies:
-      '@rtsao/scc': 1.1.0
-      array-includes: 3.1.9
-      array.prototype.findlastindex: 1.2.6
-      array.prototype.flat: 1.3.3
-      array.prototype.flatmap: 1.3.3
-      debug: 3.2.7
-      doctrine: 2.1.0
-      eslint: 9.24.0(jiti@2.4.2)
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@9.24.0(jiti@2.4.2)))(eslint@9.24.0(jiti@2.4.2))
-      hasown: 2.0.2
-      is-core-module: 2.16.1
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      object.groupby: 1.0.3
-      object.values: 1.2.1
-      semver: 7.7.2
-      string.prototype.trimend: 1.0.9
-      tsconfig-paths: 3.15.0
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.14.1(eslint@9.24.0(jiti@2.4.2))(typescript@5.8.3)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
   eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.0):
     dependencies:
       aria-query: 5.3.2
@@ -29564,25 +29254,6 @@ snapshots:
       safe-regex-test: 1.1.0
       string.prototype.includes: 2.0.1
 
-  eslint-plugin-jsx-a11y@6.10.2(eslint@9.24.0(jiti@2.4.2)):
-    dependencies:
-      aria-query: 5.3.2
-      array-includes: 3.1.9
-      array.prototype.flatmap: 1.3.3
-      ast-types-flow: 0.0.8
-      axe-core: 4.10.3
-      axobject-query: 4.1.0
-      damerau-levenshtein: 1.0.8
-      emoji-regex: 9.2.2
-      eslint: 9.24.0(jiti@2.4.2)
-      hasown: 2.0.2
-      jsx-ast-utils: 3.3.5
-      language-tags: 1.0.9
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      safe-regex-test: 1.1.0
-      string.prototype.includes: 2.0.1
-
   eslint-plugin-mdx@3.4.2(eslint@8.57.0):
     dependencies:
       eslint: 8.57.0
@@ -29618,10 +29289,6 @@ snapshots:
     dependencies:
       eslint: 8.57.0
 
-  eslint-plugin-react-hooks@5.2.0(eslint@9.24.0(jiti@2.4.2)):
-    dependencies:
-      eslint: 9.24.0(jiti@2.4.2)
-
   eslint-plugin-react@7.37.5(eslint@8.57.0):
     dependencies:
       array-includes: 3.1.9
@@ -29644,28 +29311,6 @@ snapshots:
       string.prototype.matchall: 4.0.12
       string.prototype.repeat: 1.0.0
 
-  eslint-plugin-react@7.37.5(eslint@9.24.0(jiti@2.4.2)):
-    dependencies:
-      array-includes: 3.1.9
-      array.prototype.findlast: 1.2.5
-      array.prototype.flatmap: 1.3.3
-      array.prototype.tosorted: 1.1.4
-      doctrine: 2.1.0
-      es-iterator-helpers: 1.2.1
-      eslint: 9.24.0(jiti@2.4.2)
-      estraverse: 5.3.0
-      hasown: 2.0.2
-      jsx-ast-utils: 3.3.5
-      minimatch: 3.1.2
-      object.entries: 1.1.9
-      object.fromentries: 2.0.8
-      object.values: 1.2.1
-      prop-types: 15.8.1
-      resolve: 2.0.0-next.5
-      semver: 7.7.2
-      string.prototype.matchall: 4.0.12
-      string.prototype.repeat: 1.0.0
-
   eslint-plugin-storybook@9.0.8(eslint@8.57.0)(storybook@9.0.8(@testing-library/dom@10.4.0)(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@5.0.10))(typescript@5.8.3):
     dependencies:
       '@typescript-eslint/utils': 8.34.0(eslint@8.57.0)(typescript@5.8.3)
@@ -29702,11 +29347,6 @@ snapshots:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
-  eslint-scope@8.3.0:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-
   eslint-visitor-keys@3.4.3: {}
 
   eslint-visitor-keys@4.2.1: {}
@@ -29754,48 +29394,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint@9.24.0(jiti@2.4.2):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.7.0(eslint@9.24.0(jiti@2.4.2))
-      '@eslint-community/regexpp': 4.12.1
-      '@eslint/config-array': 0.20.0
-      '@eslint/config-helpers': 0.2.1
-      '@eslint/core': 0.12.0
-      '@eslint/eslintrc': 3.3.1
-      '@eslint/js': 9.24.0
-      '@eslint/plugin-kit': 0.2.7
-      '@humanfs/node': 0.16.6
-      '@humanwhocodes/module-importer': 1.0.1
-      '@humanwhocodes/retry': 0.4.2
-      '@types/estree': 1.0.8
-      '@types/json-schema': 7.0.15
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.6
-      debug: 4.4.1(supports-color@8.1.1)
-      escape-string-regexp: 4.0.0
-      eslint-scope: 8.3.0
-      eslint-visitor-keys: 4.2.1
-      espree: 10.3.0
-      esquery: 1.6.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 8.0.0
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      ignore: 5.3.2
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      json-stable-stringify-without-jsonify: 1.0.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.4
-    optionalDependencies:
-      jiti: 2.4.2
-    transitivePeerDependencies:
-      - supports-color
-
   espree@10.3.0:
     dependencies:
       acorn: 8.15.0
@@ -30262,10 +29860,6 @@ snapshots:
     dependencies:
       flat-cache: 3.2.0
 
-  file-entry-cache@8.0.0:
-    dependencies:
-      flat-cache: 4.0.1
-
   file-selector@2.1.2:
     dependencies:
       tslib: 2.8.1
@@ -30349,11 +29943,6 @@ snapshots:
       keyv: 4.5.4
       rimraf: 3.0.2
 
-  flat-cache@4.0.1:
-    dependencies:
-      flatted: 3.3.3
-      keyv: 4.5.4
-
   flatted@3.3.3: {}
 
   flexsearch@0.7.43: {}
@@ -30647,8 +30236,6 @@ snapshots:
     dependencies:
       type-fest: 0.20.2
 
-  globals@14.0.0: {}
-
   globalthis@1.0.4:
     dependencies:
       define-properties: 1.2.1
diff --git a/scripts/pre-nightly.mjs b/scripts/pre-nightly.mjs
index 8b33a7c2999..3a174da671d 100644
--- a/scripts/pre-nightly.mjs
+++ b/scripts/pre-nightly.mjs
@@ -1,4 +1,5 @@
 import fs from "node:fs";
+
 // load the changesets config file
 const changesetsConfig = JSON.parse(
   fs.readFileSync("./.changeset/config.json", "utf8"),
diff --git a/turbo.json b/turbo.json
index 0fe4c7371f3..54375156430 100644
--- a/turbo.json
+++ b/turbo.json
@@ -2,23 +2,74 @@
   "$schema": "https://turborepo.org/schema.json",
   "globalEnv": ["CI", "TW_SECRET_KEY"],
   "tasks": {
-    "build": {
-      "outputs": ["dist/**"],
-      "dependsOn": ["^build"]
-    },
     "bench": {
       "cache": false,
       "dependsOn": []
     },
-    "typedoc": {
-      "outputs": ["typedoc/**"],
-      "dependsOn": ["^build"]
+    "build": {
+      "dependsOn": ["^build"],
+      "outputs": ["dist/**"]
     },
-    "thirdweb-login#build": {
-      "outputs": [".next/**", "!.next/cache/**"],
-      "dependsOn": ["^build"]
+    "clean": {
+      "cache": false
+    },
+    "dev": {
+      "cache": false,
+      "persistent": true
+    },
+    "e2e": {
+      "dependsOn": ["^build"],
+      "inputs": ["$TURBO_DEFAULT$", "src/**", "fixtures/**"],
+      "outputs": []
+    },
+    "e2e:legacy": {
+      "dependsOn": ["^build"],
+      "inputs": ["$TURBO_DEFAULT$", "src/**", "fixtures/**"],
+      "outputs": []
+    },
+    "fix": {
+      "cache": false,
+      "outputs": []
+    },
+    "format": {
+      "cache": false
+    },
+    "lint": {
+      "cache": false,
+      "dependsOn": ["^build"],
+      "outputs": []
+    },
+    "lint:legacy": {
+      "cache": false,
+      "outputs": []
+    },
+    "playground-web#build": {
+      "dependsOn": ["^build"],
+      "env": ["ENGINE_ACCESS_TOKEN", "ENGINE_BACKEND_WALLET", "ENGINE_URL"],
+      "outputs": [".next/**", "!.next/cache/**"]
+    },
+    "portal#build": {
+      "dependsOn": ["^build", "thirdweb#typedoc"],
+      "outputs": [".next/**", "!.next/cache/**", "searchIndex.json"]
+    },
+    "portal#dev": {
+      "dependsOn": ["^build", "thirdweb#typedoc"]
+    },
+    "storybook": {
+      "inputs": ["$TURBO_DEFAULT$", "src/**"]
+    },
+    "test": {
+      "dependsOn": ["^build"],
+      "inputs": ["$TURBO_DEFAULT$", "src/**", "test/**"],
+      "outputs": ["coverage/**"]
+    },
+    "test:legacy": {
+      "dependsOn": ["^build"],
+      "inputs": ["$TURBO_DEFAULT$", "src/**", "test/**"],
+      "outputs": ["coverage/**"]
     },
     "thirdweb-dashboard#build": {
+      "dependsOn": ["^build"],
       "env": [
         "SENTRY_AUTH_TOKEN",
         "MORALIS_API_KEY",
@@ -54,77 +105,22 @@
         "NEXT_PUBLIC_NEBULA_URL",
         "INSIGHT_SERVICE_API_KEY"
       ],
-      "outputs": [".next/**", "!.next/cache/**"],
-      "dependsOn": ["^build"]
-    },
-    "portal#build": {
-      "outputs": [".next/**", "!.next/cache/**", "searchIndex.json"],
-      "dependsOn": ["^build", "thirdweb#typedoc"]
-    },
-    "portal#dev": {
-      "dependsOn": ["^build", "thirdweb#typedoc"]
+      "outputs": [".next/**", "!.next/cache/**"]
     },
-    "playground-web#build": {
-      "env": ["ENGINE_ACCESS_TOKEN", "ENGINE_BACKEND_WALLET", "ENGINE_URL"],
-      "outputs": [".next/**", "!.next/cache/**"],
-      "dependsOn": ["^build"]
-    },
-    "wallet-ui#build": {
-      "outputs": [".next/**", "!.next/cache/**"],
+    "thirdweb-dashboard#dev": {
       "dependsOn": ["^build"]
     },
     "thirdweb#update-version": {
       "inputs": ["$TURBO_DEFAULT$", "package.json"],
       "outputs": ["src/version.ts"]
     },
-    "test": {
-      "outputs": ["coverage/**"],
-      "inputs": ["$TURBO_DEFAULT$", "src/**", "test/**"],
-      "dependsOn": ["^build"]
-    },
-    "storybook": {
-      "inputs": ["$TURBO_DEFAULT$", "src/**"]
-    },
-    "test:legacy": {
-      "outputs": ["coverage/**"],
-      "inputs": ["$TURBO_DEFAULT$", "src/**", "test/**"],
-      "dependsOn": ["^build"]
-    },
-    "e2e": {
-      "outputs": [],
-      "inputs": ["$TURBO_DEFAULT$", "src/**", "fixtures/**"],
-      "dependsOn": ["^build"]
-    },
-    "e2e:legacy": {
-      "outputs": [],
-      "inputs": ["$TURBO_DEFAULT$", "src/**", "fixtures/**"],
-      "dependsOn": ["^build"]
-    },
-    "lint": {
+    "typedoc": {
       "dependsOn": ["^build"],
-      "cache": false,
-      "outputs": []
-    },
-    "lint:legacy": {
-      "cache": false,
-      "outputs": []
-    },
-    "fix": {
-      "cache": false,
-      "outputs": []
+      "outputs": ["typedoc/**"]
     },
-    "format": {
-      "cache": false
-    },
-    "dev": {
-      "cache": false,
-      "persistent": true
-    },
-    "thirdweb-dashboard#dev": {
-      "dependsOn": ["^build"]
-    },
-    "clean": {
-      "cache": false
+    "wallet-ui#build": {
+      "dependsOn": ["^build"],
+      "outputs": [".next/**", "!.next/cache/**"]
     }
   }
 }